From a40bc999a87c9c4a492542b3ee63ecad436a400f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 5 Oct 2024 13:18:48 +0000
Subject: [PATCH] chore: Update EEA files

---
 ...nImplementation$InitializationAppender.eea |   2 +-
 .../ByteBuddy$EnumerationImplementation.eea   |   2 +-
 .../ByteBuddy$RecordConstructorStrategy.eea   |   2 +-
 ...sFileVersion$VersionLocator$Unresolved.eea |   2 +-
 .../net/bytebuddy/ClassFileVersion.eea        |   2 +-
 .../NamingStrategy$PrefixingRandom.eea        |   2 +-
 ...xing$BaseNameResolver$WithCallerSuffix.eea |   2 +-
 .../bytebuddy/NamingStrategy$Suffixing.eea    |   2 +-
 .../NamingStrategy$SuffixingRandom.eea        |   2 +-
 ...ecutingTransformer$Factory$ForLegacyVm.eea |   2 +-
 ...ntBuilder$Default$ExecutingTransformer.eea |   4 +-
 ...Default$NativeMethodStrategy$ForPrefix.eea |   4 +-
 .../AgentBuilder$Default$Redefining.eea       |   2 +-
 ...Builder$Default$WarmupStrategy$Enabled.eea |   2 +-
 ...entBuilder$Default$WarmupStrategy$NoOp.eea |   2 +-
 .../agent/builder/AgentBuilder$Default.eea    |   2 +-
 ...entBuilder$DescriptionStrategy$Default.eea |   4 +-
 ...Strategy$SuperTypeLoading$Asynchronous.eea |   2 +-
 ...r$DescriptionStrategy$SuperTypeLoading.eea |   2 +-
 ...ializationStrategy$SelfInjection$Eager.eea |   2 +-
 ...tializationStrategy$SelfInjection$Lazy.eea |   2 +-
 ...ializationStrategy$SelfInjection$Split.eea |   2 +-
 ...gentBuilder$InjectionStrategy$Disabled.eea |   2 +-
 ...gentBuilder$InjectionStrategy$UsingJna.eea |   2 +-
 ...lder$InjectionStrategy$UsingReflection.eea |   2 +-
 ...tBuilder$InjectionStrategy$UsingUnsafe.eea |   2 +-
 ...der$InstallationListener$StreamWriting.eea |   4 +-
 ...anceFactory$BridgeMethodImplementation.eea |   2 +-
 ...tanceFactory$ConstructorImplementation.eea |   2 +-
 ...aInstanceFactory$FactoryImplementation.eea |   2 +-
 ...lder$Listener$ModuleReadEdgeCompleting.eea |   2 +-
 .../AgentBuilder$Listener$StreamWriting.eea   |   8 +-
 ...AgentBuilder$LocationStrategy$Compound.eea |   2 +-
 ...uilder$LocationStrategy$ForClassLoader.eea |   2 +-
 .../AgentBuilder$PoolStrategy$Default.eea     |   2 +-
 .../AgentBuilder$PoolStrategy$Eager.eea       |   2 +-
 ...Builder$PoolStrategy$WithTypePoolCache.eea |   4 +-
 ...tBuilder$RawMatcher$ForResolvableTypes.eea |   2 +-
 ...onStrategy$BatchAllocator$ForFixedSize.eea |   2 +-
 ...onStrategy$BatchAllocator$Partitioning.eea |   2 +-
 ...initionStrategy$BatchAllocator$Slicing.eea |   2 +-
 ...rategy$Reiterating$ReiteratingIterable.eea |   2 +-
 ...rAssumption$OrderedReiteratingIterable.eea |   2 +-
 ...gy$Reiterating$WithSortOrderAssumption.eea |   2 +-
 ...Strategy$DiscoveryStrategy$Reiterating.eea |   2 +-
 ...egy$Listener$Compound$CompoundIterable.eea |   2 +-
 ...RedefinitionStrategy$Listener$Compound.eea |   2 +-
 ...initionStrategy$Listener$StreamWriting.eea |   4 +-
 ...Strategy$ResubmissionStrategy$Disabled.eea |   2 +-
 .../AgentBuilder$Transformer$ForAdvice.eea    |   2 +-
 ...tion$Substitutable$Factory$ForLegacyVm.eea |   2 +-
 ...ansformer$WithDelegation$Substitutable.eea |   2 +-
 .../build/BuildLogger$StreamWriting.eea       |   4 +-
 ...edReturnPlugin$CacheFieldOffsetMapping.eea |   2 +-
 .../bytebuddy/build/Plugin$Engine$Default.eea |   6 +-
 ...cher$ForParallelTransformation$Factory.eea |   2 +-
 ...n$WithThrowawayExecutorService$Factory.eea |   2 +-
 ...atcher$ForSerialTransformation$Factory.eea |   2 +-
 .../Plugin$Engine$Listener$StreamWriting.eea  |   8 +-
 .../Plugin$Engine$PoolStrategy$Default.eea    |   2 +-
 .../Plugin$Engine$PoolStrategy$Eager.eea      |   2 +-
 .../Plugin$Engine$Source$Compound$Origin.eea  |   4 +-
 ...gin$Engine$Source$Element$ForByteArray.eea |   2 +-
 .../Plugin$Engine$Source$Element$ForFile.eea  |   2 +-
 .../build/Plugin$Engine$Source$ForFolder.eea  |   2 +-
 ...ngine$Source$InMemory$MapEntryIterator.eea |   2 +-
 .../build/Plugin$Engine$Source$InMemory.eea   |   4 +-
 ...Plugin$Engine$Source$Origin$ForJarFile.eea |   2 +-
 .../build/Plugin$Engine$Target$ForJarFile.eea |   2 +-
 .../build/Plugin$Engine$Target$InMemory.eea   |   4 +-
 ...ingReflection$ArgumentResolver$ForType.eea |   2 +-
 ...UsingReflection$Instantiator$Ambiguous.eea |   2 +-
 ...singReflection$Instantiator$Unresolved.eea |   2 +-
 .../net/bytebuddy/build/Plugin$NoOp.eea       |   2 +-
 .../net/bytebuddy/build/RenamingPlugin.eea    |   2 +-
 .../ByteCodeElement$Token$TokenList.eea       |   4 +-
 .../AnnotationDescription$AbstractBase.eea    |   2 +-
 ...escription$AnnotationInvocationHandler.eea |   2 +-
 .../AnnotationDescription$Builder.eea         |   2 +-
 ...otationDescription$ForLoadedAnnotation.eea |   4 +-
 .../AnnotationDescription$Latent.eea          |   2 +-
 .../AnnotationList$AbstractBase.eea           |   6 +-
 .../annotation/AnnotationList$Empty.eea       |   4 +-
 .../annotation/AnnotationList$Explicit.eea    |   2 +-
 .../annotation/AnnotationSource$Empty.eea     |   2 +-
 .../annotation/AnnotationSource$Explicit.eea  |   2 +-
 ...notationValue$ForAnnotationDescription.eea |   4 +-
 .../AnnotationValue$ForConstant.eea           |  36 +++---
 .../AnnotationValue$ForDescriptionArray.eea   |   6 +-
 ...ion$Loaded$WithIncompatibleRuntimeType.eea |   2 +-
 ...Description$WithUnknownConstant$Loaded.eea |   2 +-
 ...erationDescription$WithUnknownConstant.eea |   2 +-
 ...otationValue$ForEnumerationDescription.eea |   4 +-
 ...tationValue$ForIncompatibleType$Loaded.eea |   2 +-
 .../AnnotationValue$ForIncompatibleType.eea   |   2 +-
 ...notationValue$ForMismatchedType$Loaded.eea |   2 +-
 .../AnnotationValue$ForMismatchedType.eea     |   4 +-
 .../AnnotationValue$ForMissingType$Loaded.eea |   2 +-
 .../AnnotationValue$ForMissingType.eea        |   2 +-
 ...AnnotationValue$ForMissingValue$Loaded.eea |   2 +-
 .../AnnotationValue$ForMissingValue.eea       |   4 +-
 .../AnnotationValue$ForTypeDescription.eea    |   4 +-
 .../AnnotationValue$RenderingDispatcher.eea   |   6 +-
 .../field/FieldDescription$AbstractBase.eea   |   6 +-
 .../field/FieldDescription$Latent.eea         |   2 +-
 .../field/FieldDescription$Token.eea          |   2 +-
 .../field/FieldList$AbstractBase.eea          |   6 +-
 .../field/FieldList$ForLoadedFields.eea       |   2 +-
 .../method/MethodDescription$AbstractBase.eea |  12 +-
 ...MethodDescription$ForLoadedConstructor.eea |   6 +-
 .../MethodDescription$ForLoadedMethod.eea     |   4 +-
 ...thodDescription$Latent$TypeInitializer.eea |  10 +-
 .../method/MethodDescription$Latent.eea       |   4 +-
 .../MethodDescription$SignatureToken.eea      |   2 +-
 .../method/MethodDescription$Token.eea        |   8 +-
 .../method/MethodList$AbstractBase.eea        |  10 +-
 .../ParameterDescription$AbstractBase.eea     |   4 +-
 ...ption$ForLoadedParameter$OfConstructor.eea |   2 +-
 ...rLoadedParameter$OfLegacyVmConstructor.eea |   2 +-
 ...on$ForLoadedParameter$OfLegacyVmMethod.eea |   2 +-
 ...escription$ForLoadedParameter$OfMethod.eea |   2 +-
 .../method/ParameterDescription$Latent.eea    |   2 +-
 .../ParameterDescription$Token$TypeList.eea   |   2 +-
 .../method/ParameterDescription$Token.eea     |   2 +-
 .../method/ParameterList$AbstractBase.eea     |   8 +-
 .../method/ParameterList$Empty.eea            |   2 +-
 .../ParameterList$ForLoadedExecutable.eea     |   4 +-
 .../modifier/ModifierContributor$Resolver.eea |   2 +-
 .../PackageDescription$ForLoadedPackage.eea   |   2 +-
 .../type/PackageDescription$Simple.eea        |   2 +-
 ...ecordComponentDescription$AbstractBase.eea |   2 +-
 ...ntDescription$ForLoadedRecordComponent.eea |   8 +-
 .../RecordComponentDescription$Latent.eea     |   2 +-
 .../type/RecordComponentDescription$Token.eea |   2 +-
 .../type/RecordComponentList$AbstractBase.eea |   8 +-
 .../type/RecordComponentList$Empty.eea        |   4 +-
 ...omponentList$ForLoadedRecordComponents.eea |   2 +-
 .../description/type/TypeDefinition$Sort.eea  |   2 +-
 ...eDescription$AbstractBase$OfSimpleType.eea |   2 +-
 .../type/TypeDescription$AbstractBase.eea     |   8 +-
 .../type/TypeDescription$ArrayProjection.eea  |  24 ++--
 .../type/TypeDescription$ForLoadedType.eea    |  12 +-
 .../TypeDescription$ForPackageDescription.eea |  16 +--
 ...Reader$Delegator$ForLoadedTypeVariable.eea |   2 +-
 ...ion$Generic$AnnotationReader$Delegator.eea |  16 +--
 ...cription$Generic$AnnotationReader$NoOp.eea |   2 +-
 ...ypeDescription$Generic$Builder$Visitor.eea |  10 +-
 .../type/TypeDescription$Generic$Builder.eea  |   8 +-
 ...eric$LazyProjection$ForLoadedFieldType.eea |   2 +-
 ...ric$LazyProjection$ForLoadedReturnType.eea |   2 +-
 ...ric$LazyProjection$ForLoadedSuperClass.eea |   2 +-
 ...neric$LazyProjection$OfRecordComponent.eea |   2 +-
 ...n$WithLazyNavigation$LazyInterfaceList.eea |   2 +-
 ...eric$LazyProjection$WithLazyNavigation.eea |   2 +-
 ...TypeDescription$Generic$OfGenericArray.eea |  22 ++--
 ...on$Generic$OfNonGenericType$ForErasure.eea |   2 +-
 ...ric$OfNonGenericType$ForReifiedErasure.eea |  10 +-
 ...peDescription$Generic$OfNonGenericType.eea |  12 +-
 ...ParameterizedType$ForGenerifiedErasure.eea |   6 +-
 ...ric$OfParameterizedType$ForReifiedType.eea |  10 +-
 ...ion$Generic$OfParameterizedType$Latent.eea |   2 +-
 ...escription$Generic$OfParameterizedType.eea |  22 ++--
 ...iption$Generic$OfTypeVariable$Symbolic.eea |  22 ++--
 ...TypeDescription$Generic$OfTypeVariable.eea |  16 +--
 ...cription$Generic$OfWildcardType$Latent.eea |  10 +-
 ...TypeDescription$Generic$OfWildcardType.eea |  24 ++--
 ...ationStripper$NonAnnotatedTypeVariable.eea |   2 +-
 ...ion$Generic$Visitor$AnnotationStripper.eea |   8 +-
 ...or$Assigner$Dispatcher$ForGenericArray.eea |   2 +-
 ...$Assigner$Dispatcher$ForNonGenericType.eea |   2 +-
 ...ForParameterizedType$ParameterAssigner.eea |  10 +-
 ...signer$Dispatcher$ForParameterizedType.eea |   2 +-
 ...or$Assigner$Dispatcher$ForTypeVariable.eea |   2 +-
 ...peDescription$Generic$Visitor$Assigner.eea |  10 +-
 ...Description$Generic$Visitor$ForRawType.eea |   2 +-
 ...tor$ForSignatureVisitor$OfTypeArgument.eea |   2 +-
 ...on$Generic$Visitor$ForSignatureVisitor.eea |   2 +-
 ...peDescription$Generic$Visitor$Reducing.eea |   2 +-
 ...peDescription$Generic$Visitor$Reifying.eea |   6 +-
 ...eric$Visitor$Substitutor$ForAttachment.eea |  12 +-
 ...eric$Visitor$Substitutor$ForDetachment.eea |   4 +-
 ...itor$Substitutor$ForTokenNormalization.eea |   2 +-
 ...escription$Generic$Visitor$Substitutor.eea |   4 +-
 ...escription$Generic$Visitor$TypeErasing.eea |   2 +-
 .../type/TypeDescription$Latent.eea           |  20 +--
 ...TypeLoading$ClassLoadingTypeProjection.eea |   2 +-
 .../type/TypeList$AbstractBase.eea            |   2 +-
 .../description/type/TypeList$Explicit.eea    |   2 +-
 .../type/TypeList$Generic$AbstractBase.eea    |  10 +-
 .../type/TypeList$Generic$Empty.eea           |   4 +-
 .../TypeList$Generic$ForDetachedTypes.eea     |  10 +-
 ...Generic$ForLoadedTypes$OfTypeVariables.eea |   2 +-
 ...st$Generic$OfConstructorExceptionTypes.eea |   2 +-
 ...ypeList$Generic$OfLoadedInterfaceTypes.eea |   2 +-
 ...ypeList$Generic$OfMethodExceptionTypes.eea |   2 +-
 .../description/type/TypeVariableToken.eea    |   6 +-
 .../dynamic/ClassFileLocator$Filtering.eea    |   2 +-
 ...ocator$ForClassLoader$WeaklyReferenced.eea |   2 +-
 .../ClassFileLocator$ForClassLoader.eea       |  10 +-
 .../dynamic/ClassFileLocator$ForFolder.eea    |   2 +-
 ...entation$ClassLoadingDelegate$Explicit.eea |   2 +-
 ...gClassLoader$Dispatcher$CreationAction.eea |   2 +-
 ...atingClassLoader$Dispatcher$Unresolved.eea |   2 +-
 ...ntation$ExtractionClassFileTransformer.eea |   2 +-
 .../ClassFileLocator$ForInstrumentation.eea   |   6 +-
 .../dynamic/ClassFileLocator$ForJarFile.eea   |   2 +-
 .../dynamic/ClassFileLocator$ForModule.eea    |   4 +-
 .../ClassFileLocator$ForModuleFile.eea        |   6 +-
 ...cator$ForUrl$ClassLoaderCreationAction.eea |   2 +-
 .../ClassFileLocator$MultiReleaseAware.eea    |   2 +-
 .../dynamic/ClassFileLocator$NoOp.eea         |   2 +-
 .../ClassFileLocator$Resolution$Illegal.eea   |   2 +-
 .../dynamic/ClassFileLocator$Simple.eea       |   8 +-
 ...hodDefinitionAdapter$AnnotationAdapter.eea |   2 +-
 ...tionAdapter$ParameterAnnotationAdapter.eea |   2 +-
 ...apter$SimpleParameterAnnotationAdapter.eea |   2 +-
 ...nAdapter$TypeVariableAnnotationAdapter.eea |   2 +-
 ...ctBase$Adapter$MethodDefinitionAdapter.eea |   6 +-
 ...r$MethodMatchAdapter$AnnotationAdapter.eea |   2 +-
 ...$Adapter$TypeVariableDefinitionAdapter.eea |   2 +-
 ...namicType$Builder$AbstractBase$Adapter.eea |  22 ++--
 .../bytebuddy/dynamic/DynamicType$Default.eea |   8 +-
 ...rmer$ForField$FieldModifierTransformer.eea |   2 +-
 .../dynamic/Transformer$ForField.eea          |   4 +-
 ...er$ForMethod$MethodModifierTransformer.eea |   2 +-
 ...ransformer$ForMethod$TransformedMethod.eea |   6 +-
 .../dynamic/Transformer$ForMethod.eea         |   4 +-
 .../dynamic/TypeResolutionStrategy$Active.eea |   2 +-
 .../TypeResolutionStrategy$Disabled.eea       |   2 +-
 .../TypeResolutionStrategy$Passive.eea        |   2 +-
 .../ByteArrayClassLoader$ChildFirst.eea       |   2 +-
 .../ByteArrayClassLoader$EmptyEnumeration.eea |   2 +-
 ...nitionAction$ByteArrayUrlStreamHandler.eea |   2 +-
 .../dynamic/loading/ByteArrayClassLoader.eea  |   4 +-
 .../loading/ClassInjector$AbstractBase.eea    |   2 +-
 .../ClassInjector$UsingInstrumentation.eea    |   4 +-
 ...tor$UsingJna$Dispatcher$CreationAction.eea |   2 +-
 ...jector$UsingJna$Dispatcher$Unavailable.eea |   2 +-
 .../loading/ClassInjector$UsingJna.eea        |   8 +-
 .../loading/ClassInjector$UsingLookup.eea     |   6 +-
 ...ctor$UsingReflection$Dispatcher$Direct.eea |   2 +-
 ...n$Dispatcher$Initializable$Unavailable.eea |   4 +-
 ...UsingReflection$Dispatcher$Unavailable.eea |   4 +-
 ...lection$Dispatcher$UsingUnsafeOverride.eea |   2 +-
 .../loading/ClassInjector$UsingReflection.eea |   4 +-
 ...$UsingUnsafe$Dispatcher$CreationAction.eea |   2 +-
 ...tor$UsingUnsafe$Dispatcher$Unavailable.eea |   4 +-
 .../ClassInjector$UsingUnsafe$Factory.eea     |   2 +-
 .../loading/ClassInjector$UsingUnsafe.eea     |   8 +-
 .../ClassLoadingStrategy$UsingLookup.eea      |   2 +-
 ...ngStrategy$BootstrapInjection$Disabled.eea |   2 +-
 ...$Strategy$ClassRedefinitionTransformer.eea |   2 +-
 ...egy$Strategy$ClassResettingTransformer.eea |   2 +-
 .../loading/ClassReloadingStrategy.eea        |   6 +-
 .../loading/InjectionClassLoader$Strategy.eea |   2 +-
 .../loading/MultipleParentClassLoader.eea     |   2 +-
 .../scaffold/ClassWriterStrategy$Default.eea  |   2 +-
 .../ClassWriterStrategy$Delegating.eea        |   2 +-
 ...FieldLocator$ForClassHierarchy$Factory.eea |   2 +-
 .../FieldLocator$ForExactType$Factory.eea     |   2 +-
 .../FieldLocator$ForTopLevelType$Factory.eea  |   2 +-
 .../FieldLocator$Resolution$Illegal.eea       |   2 +-
 .../scaffold/FieldRegistry$Compiled$NoOp.eea  |   2 +-
 .../scaffold/FieldRegistry$Default.eea        |   4 +-
 .../scaffold/InstrumentedType$Default.eea     |  14 +-
 .../scaffold/InstrumentedType$Frozen.eea      |  42 +++---
 ...mpiler$Default$Harmonizer$ForJVMMethod.eea |   2 +-
 ...piler$Default$Harmonizer$ForJavaMethod.eea |   2 +-
 ...hodGraph$Compiler$Default$Key$Detached.eea |   2 +-
 ...dGraph$Compiler$Default$Key$Harmonized.eea |   2 +-
 ...mpiler$Default$Key$Store$Entry$Initial.eea |  10 +-
 ...Graph$Compiler$Default$Key$Store$Graph.eea |   2 +-
 ...MethodGraph$Compiler$Default$Key$Store.eea |   2 +-
 .../scaffold/MethodGraph$Compiler$Default.eea |   6 +-
 ...ethodGraph$Compiler$ForDeclaredMethods.eea |   2 +-
 .../dynamic/scaffold/MethodGraph$Empty.eea    |   2 +-
 .../scaffold/MethodGraph$Node$Unresolved.eea  |   6 +-
 .../dynamic/scaffold/MethodGraph$NodeList.eea |   4 +-
 .../dynamic/scaffold/MethodGraph$Simple.eea   |   4 +-
 .../MethodRegistry$Default$Prepared$Entry.eea |   2 +-
 .../scaffold/MethodRegistry$Default.eea       |   6 +-
 ...thodRegistry$Handler$ForAbstractMethod.eea |   2 +-
 ...hodRegistry$Handler$ForAnnotationValue.eea |   2 +-
 ...try$Handler$ForImplementation$Compiled.eea |   2 +-
 ...thodRegistry$Handler$ForImplementation.eea |   2 +-
 ...odRegistry$Handler$ForVisibilityBridge.eea |   4 +-
 .../RecordComponentRegistry$Compiled$NoOp.eea |   2 +-
 .../RecordComponentRegistry$Default.eea       |   4 +-
 .../dynamic/scaffold/TypeInitializer$None.eea |   2 +-
 .../TypeWriter$Default$ForCreation.eea        |   2 +-
 ...Default$ForInlining$WithDecorationOnly.eea |   2 +-
 ...Default$ForInlining$WithFullProcessing.eea |   2 +-
 .../TypeWriter$Default$ForInlining.eea        |   2 +-
 .../dynamic/scaffold/TypeWriter$Default.eea   |  10 +-
 .../TypeWriter$FieldPool$Disabled.eea         |   2 +-
 ...iter$FieldPool$Record$ForImplicitField.eea |   2 +-
 ...ord$AccessBridgeWrapper$AccessorBridge.eea |   6 +-
 ...$MethodPool$Record$AccessBridgeWrapper.eea |   2 +-
 ...od$OfVisibilityBridge$VisibilityBridge.eea |   4 +-
 ...rd$ForDefinedMethod$OfVisibilityBridge.eea |   2 +-
 ...finedMethod$WithAnnotationDefaultValue.eea |   4 +-
 ...ol$Record$ForDefinedMethod$WithoutBody.eea |   4 +-
 ...hodPool$Record$ForNonImplementedMethod.eea |   2 +-
 ...ypeWriter$RecordComponentPool$Disabled.eea |   2 +-
 ...Pool$Record$ForImplicitRecordComponent.eea |   2 +-
 .../inline/DecoratingDynamicTypeBuilder.eea   |  22 ++--
 .../inline/InliningImplementationMatcher.eea  |   2 +-
 .../MethodNameTransformer$Prefixing.eea       |   2 +-
 .../MethodNameTransformer$Suffixing.eea       |   4 +-
 .../inline/MethodRebaseResolver$Default.eea   |   4 +-
 .../inline/MethodRebaseResolver$Disabled.eea  |   2 +-
 ...rRebasedConstructor$RebasedConstructor.eea |   6 +-
 ...olver$Resolution$ForRebasedConstructor.eea |   2 +-
 ...olution$ForRebasedMethod$RebasedMethod.eea |   6 +-
 ...seResolver$Resolution$ForRebasedMethod.eea |   4 +-
 ...hodRebaseResolver$Resolution$Preserved.eea |   2 +-
 .../inline/RebaseImplementationTarget.eea     |   2 +-
 .../subclass/ConstructorStrategy$Default.eea  |   6 +-
 .../subclass/SubclassDynamicTypeBuilder.eea   |   2 +-
 .../SubclassImplementationTarget$Factory.eea  |   2 +-
 .../net/bytebuddy/matcher/ElementMatchers.eea | 108 ++++++++--------
 .../matcher/FilterableList$Empty.eea          |   4 +-
 .../matcher/LatentMatcher$ForFieldToken.eea   |   2 +-
 .../matcher/LatentMatcher$ForMethodToken.eea  |   2 +-
 ...ePool$AbstractBase$ArrayTypeResolution.eea |   2 +-
 .../pool/TypePool$CacheProvider$Simple.eea    |   2 +-
 .../bytebuddy/pool/TypePool$ClassLoading.eea  |   2 +-
 ...orTypeVariable$WithIndex$DoubleIndexed.eea |   2 +-
 ...AbstractBase$ForTypeVariable$WithIndex.eea |   2 +-
 ...egistrant$AbstractBase$ForTypeVariable.eea |   2 +-
 ...egistrant$ForByteCodeElement$WithIndex.eea |   2 +-
 ...onentTypeLocator$ForAnnotationProperty.eea |   2 +-
 ...l$Default$ComponentTypeLocator$Illegal.eea |   2 +-
 ...ericTypeExtractor$ForSignature$OfField.eea |   2 +-
 ...ricTypeExtractor$ForSignature$OfMethod.eea |   6 +-
 ...tractor$ForSignature$OfRecordComponent.eea |   2 +-
 ...nericTypeExtractor$ForSignature$OfType.eea |   4 +-
 ...ault$GenericTypeExtractor$ForSignature.eea |   4 +-
 ...Extractor$IncompleteToken$AbstractBase.eea |   6 +-
 ...xtractor$IncompleteToken$ForInnerClass.eea |   4 +-
 ...ractor$IncompleteToken$ForTopLevelType.eea |   2 +-
 .../TypePool$Default$GenericTypeExtractor.eea |   4 +-
 ...peRegistrant$RejectingSignatureVisitor.eea |  18 +--
 ...ion$AnnotationToken$Resolution$Illegal.eea |   2 +-
 ...ption$GenericTypeToken$ForGenericArray.eea |   4 +-
 ...GenericTypeToken$ForLowerBoundWildcard.eea |   4 +-
 ...rizedType$Nested$LazyParameterizedType.eea |   2 +-
 ...cTypeToken$ForParameterizedType$Nested.eea |   2 +-
 ...tion$GenericTypeToken$ForPrimitiveType.eea |   4 +-
 ...escription$GenericTypeToken$ForRawType.eea |   4 +-
 ...ForTypeVariable$UnresolvedTypeVariable.eea |   2 +-
 ...ption$GenericTypeToken$ForTypeVariable.eea |   4 +-
 ...ForUnboundWildcard$LazyUnboundWildcard.eea |   2 +-
 ...on$GenericTypeToken$ForUnboundWildcard.eea |   2 +-
 ...erBoundWildcard$LazyUpperBoundWildcard.eea |   2 +-
 ...GenericTypeToken$ForUpperBoundWildcard.eea |   4 +-
 ...peToken$Resolution$ForMethod$Tokenized.eea |   6 +-
 ...TypeToken$Resolution$ForType$Tokenized.eea |   4 +-
 ...$GenericTypeToken$Resolution$Malformed.eea |  16 +--
 ...AnnotatedType$LazyRawAnnotatedTypeList.eea |   4 +-
 ...iption$GenericTypeToken$Resolution$Raw.eea |   2 +-
 ...meterizedReceiverType$TypeArgumentList.eea |   2 +-
 ...kenizedGenericType$Malformed$TokenList.eea |   2 +-
 ...ription$TokenizedGenericType$Malformed.eea |   4 +-
 ...ription$TokenizedGenericType$TokenList.eea |   2 +-
 .../TypePool$Default$LazyTypeDescription.eea  |   6 +-
 .../pool/TypePool$Default$TypeExtractor.eea   |   4 +-
 .../TypePool$Default$WithLazyResolution.eea   |   4 +-
 .../net/bytebuddy/pool/TypePool$Default.eea   |   2 +-
 .../net/bytebuddy/pool/TypePool$Empty.eea     |   2 +-
 .../net/bytebuddy/pool/TypePool$Explicit.eea  |   4 +-
 .../bytebuddy/pool/TypePool$LazyFacade.eea    |   2 +-
 .../pool/TypePool$Resolution$Illegal.eea      |   2 +-
 .../AsmClassReader$Factory$Default.eea        |   4 +-
 .../AsmClassWriter$Factory$Default.eea        |   2 +-
 .../utility/JavaConstant$Dynamic.eea          |   4 +-
 .../utility/JavaConstant$MethodHandle.eea     |  14 +-
 .../utility/JavaConstant$MethodType.eea       |  16 +--
 ...nstant$Simple$OfTrivialValue$ForString.eea |   2 +-
 .../bytebuddy/utility/JavaConstant$Simple.eea |   4 +-
 .../net/bytebuddy/utility/JavaModule.eea      |   4 +-
 .../bytebuddy/utility/OpenedClassReader.eea   |   6 +-
 .../net/bytebuddy/utility/RandomString.eea    |   4 +-
 .../net/bytebuddy/utility/StreamDrainer.eea   |   2 +-
 .../utility/dispatcher/JavaDispatcher.eea     |   2 +-
 .../visitor/StackAwareMethodVisitor.eea       |   2 +-
 .../github/classgraph/AnnotationEnumValue.eea |   4 +-
 .../github/classgraph/AnnotationInfoList.eea  |   4 +-
 .../classgraph/AnnotationParameterValue.eea   |   4 +-
 .../github/classgraph/ArrayTypeSignature.eea  |   2 +-
 .../github/classgraph/BaseTypeSignature.eea   |   2 +-
 .../io/github/classgraph/ClassInfo.eea        |   2 +-
 .../io/github/classgraph/ClassInfoList.eea    |   8 +-
 .../github/classgraph/ClassTypeSignature.eea  |   2 +-
 .../io/github/classgraph/FieldInfo.eea        |   2 +-
 .../io/github/classgraph/FieldInfoList.eea    |   2 +-
 .../io/github/classgraph/MethodInfo.eea       |   2 +-
 .../io/github/classgraph/MethodInfoList.eea   |   6 +-
 .../github/classgraph/MethodParameterInfo.eea |   4 +-
 .../github/classgraph/MethodTypeSignature.eea |   4 +-
 .../io/github/classgraph/ModuleInfo.eea       |   4 +-
 .../io/github/classgraph/ModuleInfoList.eea   |   2 +-
 .../io/github/classgraph/ModuleRef.eea        |   2 +-
 .../io/github/classgraph/PackageInfoList.eea  |   2 +-
 .../io/github/classgraph/Resource.eea         |   8 +-
 .../io/github/classgraph/ResourceList.eea     |  14 +-
 .../io/github/classgraph/ScanResult.eea       |  24 ++--
 .../io/github/classgraph/TypeArgument.eea     |   4 +-
 .../io/github/classgraph/TypeParameter.eea    |   4 +-
 .../configuration2/AbstractConfiguration.eea  |  14 +-
 .../AbstractHierarchicalConfiguration.eea     |   6 +-
 .../AbstractYAMLBasedConfiguration.eea        |   2 +-
 .../BaseHierarchicalConfiguration.eea         |   8 +-
 .../configuration2/CombinedConfiguration.eea  |   4 +-
 .../configuration2/CompositeConfiguration.eea |   4 +-
 .../configuration2/ConfigurationConverter.eea |   6 +-
 .../configuration2/ConfigurationMap.eea       |   2 +-
 .../configuration2/ConfigurationUtils.eea     |   2 +-
 .../configuration2/ConfigurationXMLReader.eea |   8 +-
 .../configuration2/DataConfiguration.eea      |   4 +-
 .../DynamicCombinedConfiguration.eea          |   8 +-
 .../configuration2/INIConfiguration.eea       |   4 +-
 .../configuration2/ImmutableConfiguration.eea |   2 +-
 .../configuration2/JNDIConfiguration.eea      |   4 +-
 .../PatternSubtreeConfigurationWrapper.eea    |   6 +-
 ...opertiesConfiguration$DefaultIOFactory.eea |   4 +-
 .../PropertiesConfiguration$IOFactory.eea     |   4 +-
 .../PropertiesConfiguration$JupIOFactory.eea  |   4 +-
 ...rtiesConfiguration$JupPropertiesReader.eea |   2 +-
 ...opertiesConfiguration$PropertiesReader.eea |   2 +-
 ...opertiesConfiguration$PropertiesWriter.eea |   2 +-
 .../PropertiesConfiguration.eea               |   2 +-
 .../configuration2/SubnodeConfiguration.eea   |   8 +-
 .../configuration2/SubsetConfiguration.eea    |   4 +-
 .../configuration2/XMLConfiguration.eea       |   6 +-
 .../beanutils/BeanCreationContext.eea         |   2 +-
 .../configuration2/beanutils/BeanFactory.eea  |   2 +-
 .../configuration2/beanutils/BeanHelper.eea   |   8 +-
 .../beanutils/ConfigurationDynaBean.eea       |   4 +-
 .../beanutils/ConfigurationDynaClass.eea      |   6 +-
 .../beanutils/ConstructorArg.eea              |   4 +-
 .../beanutils/DefaultBeanFactory.eea          |   6 +-
 .../beanutils/XMLBeanDeclaration.eea          |   2 +-
 .../builder/BasicBuilderParameters.eea        |   2 +-
 .../builder/BasicConfigurationBuilder.eea     |   6 +-
 .../BuilderConfigurationWrapperFactory.eea    |   4 +-
 .../DefaultReloadingDetectorFactory.eea       |   2 +-
 .../FileBasedBuilderParametersImpl.eea        |   6 +-
 .../builder/FileBasedConfigurationBuilder.eea |   2 +-
 .../builder/ReloadingDetectorFactory.eea      |   2 +-
 ...ReloadingFileBasedConfigurationBuilder.eea |   2 +-
 .../BaseConfigurationBuilderProvider.eea      |   4 +-
 .../CombinedBuilderParametersImpl.eea         |   6 +-
 .../combined/CombinedConfigurationBuilder.eea |   8 +-
 .../CombinedConfigurationBuilderProvider.eea  |   2 +-
 .../combined/ConfigurationDeclaration.eea     |   2 +-
 .../MultiFileBuilderParametersImpl.eea        |   4 +-
 .../MultiFileConfigurationBuilder.eea         |   8 +-
 .../ReloadingCombinedConfigurationBuilder.eea |   4 +-
 ...ReloadingMultiFileConfigurationBuilder.eea |   2 +-
 .../builder/fluent/Parameters.eea             |   2 +-
 .../convert/DefaultConversionHandler.eea      |   2 +-
 .../convert/DefaultListDelimiterHandler.eea   |   4 +-
 .../convert/DisabledListDelimiterHandler.eea  |   2 +-
 .../convert/LegacyListDelimiterHandler.eea    |   4 +-
 .../configuration2/event/BaseEventSource.eea  |   4 +-
 .../event/EventListenerList.eea               |   4 +-
 .../configuration2/event/EventType.eea        |   2 +-
 .../interpol/ConfigurationInterpolator.eea    |   6 +-
 .../configuration2/interpol/DummyLookup.eea   |   2 +-
 .../interpol/ExprLookup$Variables.eea         |   2 +-
 .../configuration2/interpol/ExprLookup.eea    |   4 +-
 .../InterpolatorSpecification$Builder.eea     |   2 +-
 .../io/AbsoluteNameLocationStrategy.eea       |   2 +-
 .../io/BasePathLocationStrategy.eea           |   2 +-
 .../io/CombinedLocationStrategy.eea           |   2 +-
 .../configuration2/io/ConfigurationLogger.eea |   2 +-
 .../configuration2/io/DefaultFileSystem.eea   |   8 +-
 .../commons/configuration2/io/FileHandler.eea |   6 +-
 .../io/FileLocator$FileLocatorBuilder.eea     |   2 +-
 .../configuration2/io/FileLocatorUtils.eea    |   4 +-
 .../io/HomeDirectoryLocationStrategy.eea      |   2 +-
 .../configuration2/io/VFSFileSystem.eea       |   8 +-
 .../configuration2/plist/SimpleCharStream.eea |   2 +-
 .../commons/configuration2/plist/Token.eea    |   4 +-
 .../configuration2/plist/TokenMgrError.eea    |   4 +-
 .../VFSFileHandlerReloadingDetector.eea       |   2 +-
 .../CatalogResolver$CatalogManager.eea        |   2 +-
 .../ConfigurationPropertiesFactoryBean.eea    |   4 +-
 .../spring/ConfigurationPropertySource.eea    |   2 +-
 .../tree/DefaultConfigurationKey.eea          |   6 +-
 .../tree/DefaultExpressionEngine.eea          |   8 +-
 ...DefaultExpressionEngineSymbols$Builder.eea |   2 +-
 .../tree/ImmutableNode$Builder.eea            |   2 +-
 .../configuration2/tree/InMemoryNodeModel.eea |   4 +-
 .../configuration2/tree/MergeCombiner.eea     |   2 +-
 .../configuration2/tree/NodeSelector.eea      |   4 +-
 .../configuration2/tree/OverrideCombiner.eea  |   2 +-
 .../configuration2/tree/QueryResult.eea       |   4 +-
 .../configuration2/tree/UnionCombiner.eea     |   2 +-
 .../xpath/ConfigurationNodePointerFactory.eea |   6 +-
 .../tree/xpath/XPathExpressionEngine.eea      |   2 +-
 .../web/ServletRequestConfiguration.eea       |   2 +-
 .../apache/commons/io/FileCleaningTracker.eea |   2 +-
 .../org/apache/commons/io/FileSystem.eea      |   2 +-
 .../org/apache/commons/io/FileUtils.eea       |  20 +--
 .../org/apache/commons/io/IOExceptionList.eea |   4 +-
 .../commons/io/RandomAccessFileMode.eea       |   6 +-
 .../org/apache/commons/io/StreamIterator.eea  |   2 +-
 .../io/file/AccumulatorPathVisitor.eea        |  12 +-
 .../org/apache/commons/io/file/Counters.eea   |   8 +-
 .../commons/io/file/CountingPathVisitor.eea   |   4 +-
 .../apache/commons/io/file/FilesUncheck.eea   |  18 +--
 .../org/apache/commons/io/file/PathUtils.eea  |  14 +-
 .../commons/io/file/attribute/FileTimes.eea   |   6 +-
 .../commons/io/filefilter/FalseFileFilter.eea |   6 +-
 .../commons/io/filefilter/FileFilterUtils.eea |  50 +++----
 .../commons/io/filefilter/IOFileFilter.eea    |   6 +-
 .../commons/io/filefilter/TrueFileFilter.eea  |   6 +-
 .../io/filefilter/WildcardFileFilter.eea      |   2 +-
 .../org/apache/commons/io/function/Erase.eea  |   2 +-
 .../io/input/AutoCloseInputStream$Builder.eea |   2 +-
 .../commons/io/input/AutoCloseInputStream.eea |   2 +-
 .../commons/io/input/BOMInputStream.eea       |   2 +-
 .../io/input/BoundedInputStream$Builder.eea   |   2 +-
 .../commons/io/input/BoundedInputStream.eea   |   2 +-
 ...BufferedFileChannelInputStream$Builder.eea |   2 +-
 .../input/BufferedFileChannelInputStream.eea  |   2 +-
 .../io/input/CharSequenceInputStream.eea      |   2 +-
 .../commons/io/input/ChecksumInputStream.eea  |   2 +-
 .../io/input/CloseShieldInputStream.eea       |   2 +-
 .../commons/io/input/CloseShieldReader.eea    |   2 +-
 .../MemoryMappedFileInputStream$Builder.eea   |   2 +-
 .../io/input/MemoryMappedFileInputStream.eea  |   2 +-
 ...geDigestCalculatingInputStream$Builder.eea |   2 +-
 .../MessageDigestCalculatingInputStream.eea   |   2 +-
 .../MessageDigestInputStream$Builder.eea      |   2 +-
 .../io/input/MessageDigestInputStream.eea     |   2 +-
 .../io/input/ObservableInputStream.eea        |   2 +-
 .../commons/io/input/QueueInputStream.eea     |   4 +-
 .../io/input/RandomAccessFileInputStream.eea  |   2 +-
 .../commons/io/input/ReadAheadInputStream.eea |   2 +-
 .../io/input/ReaderInputStream$Builder.eea    |   2 +-
 .../commons/io/input/ReaderInputStream.eea    |   2 +-
 .../input/ReversedLinesFileReader$Builder.eea |   2 +-
 .../io/input/ReversedLinesFileReader.eea      |   6 +-
 .../org/apache/commons/io/input/Tailer.eea    |  16 +--
 .../io/input/ThrottledInputStream$Builder.eea |   2 +-
 .../commons/io/input/ThrottledInputStream.eea |   2 +-
 .../io/input/UncheckedBufferedReader.eea      |   2 +-
 .../io/input/UncheckedFilterInputStream.eea   |   2 +-
 .../io/input/UncheckedFilterReader.eea        |   2 +-
 ...ynchronizedBufferedInputStream$Builder.eea |   2 +-
 .../io/input/UnsynchronizedBufferedReader.eea |   2 +-
 .../UnsynchronizedByteArrayInputStream.eea    |   2 +-
 ...nsynchronizedFilterInputStream$Builder.eea |   2 +-
 .../input/UnsynchronizedFilterInputStream.eea |   2 +-
 .../commons/io/input/XmlStreamReader.eea      |   2 +-
 .../io/monitor/FileAlterationMonitor.eea      |   2 +-
 .../io/monitor/FileAlterationObserver.eea     |   2 +-
 .../apache/commons/io/monitor/FileEntry.eea   |   2 +-
 .../output/AbstractByteArrayOutputStream.eea  |   4 +-
 .../io/output/ChunkedOutputStream$Builder.eea |   2 +-
 .../commons/io/output/ChunkedOutputStream.eea |   2 +-
 .../io/output/CloseShieldOutputStream.eea     |   2 +-
 .../commons/io/output/CloseShieldWriter.eea   |   2 +-
 .../io/output/DeferredFileOutputStream.eea    |   6 +-
 .../output/FileWriterWithEncoding$Builder.eea |   2 +-
 .../io/output/FileWriterWithEncoding.eea      |   2 +-
 .../commons/io/output/LockableFileWriter.eea  |   2 +-
 .../commons/io/output/UncheckedAppendable.eea |   2 +-
 .../UncheckedFilterOutputStream$Builder.eea   |   2 +-
 .../io/output/UncheckedFilterOutputStream.eea |   2 +-
 .../output/UncheckedFilterWriter$Builder.eea  |   2 +-
 .../io/output/UncheckedFilterWriter.eea       |   2 +-
 ...chronizedByteArrayOutputStream$Builder.eea |   2 +-
 .../UnsynchronizedByteArrayOutputStream.eea   |   2 +-
 .../commons/io/output/WriterOutputStream.eea  |   2 +-
 .../io/output/XmlStreamWriter$Builder.eea     |   2 +-
 .../commons/io/output/XmlStreamWriter.eea     |   2 +-
 .../apache/commons/lang3/AppendableJoiner.eea |   2 +-
 .../org/apache/commons/lang3/ArrayUtils.eea   |  40 +++---
 .../org/apache/commons/lang3/BooleanUtils.eea |   8 +-
 .../org/apache/commons/lang3/CharUtils.eea    |   6 +-
 .../apache/commons/lang3/ClassLoaderUtils.eea |   2 +-
 .../apache/commons/lang3/ClassPathUtils.eea   |   4 +-
 .../org/apache/commons/lang3/ClassUtils.eea   |   8 +-
 .../org/apache/commons/lang3/DoubleRange.eea  |   2 +-
 .../org/apache/commons/lang3/EnumUtils.eea    |   6 +-
 .../org/apache/commons/lang3/Functions.eea    |   6 +-
 .../org/apache/commons/lang3/IntegerRange.eea |   2 +-
 .../org/apache/commons/lang3/LongRange.eea    |   2 +-
 .../org/apache/commons/lang3/ObjectUtils.eea  |   8 +-
 .../org/apache/commons/lang3/RandomUtils.eea  |   2 +-
 .../org/apache/commons/lang3/Range.eea        |   4 +-
 .../commons/lang3/Streams$FailableStream.eea  |   2 +-
 .../org/apache/commons/lang3/Streams.eea      |   4 +-
 .../org/apache/commons/lang3/StringUtils.eea  |  24 ++--
 .../org/apache/commons/lang3/SystemUtils.eea  |   8 +-
 .../org/apache/commons/lang3/ThreadUtils.eea  |   4 +-
 .../org/apache/commons/lang3/builder/Diff.eea |   2 +-
 .../commons/lang3/builder/DiffBuilder.eea     |   2 +-
 .../lang3/builder/ReflectionDiffBuilder.eea   |   2 +-
 .../builder/ReflectionToStringBuilder.eea     |   2 +-
 .../commons/lang3/compare/ComparableUtils.eea |   2 +-
 .../concurrent/AtomicInitializer$Builder.eea  |   2 +-
 .../lang3/concurrent/AtomicInitializer.eea    |   4 +-
 .../AtomicSafeInitializer$Builder.eea         |   2 +-
 .../concurrent/AtomicSafeInitializer.eea      |   4 +-
 .../BackgroundInitializer$Builder.eea         |   2 +-
 .../concurrent/BackgroundInitializer.eea      |   6 +-
 .../CallableBackgroundInitializer.eea         |   2 +-
 .../lang3/concurrent/ConcurrentUtils.eea      |  12 +-
 .../commons/lang3/concurrent/FutureTasks.eea  |   2 +-
 .../concurrent/LazyInitializer$Builder.eea    |   2 +-
 .../lang3/concurrent/LazyInitializer.eea      |   4 +-
 .../concurrent/MultiBackgroundInitializer.eea |   2 +-
 .../lang3/concurrent/UncheckedFuture.eea      |   2 +-
 .../concurrent/locks/LockingVisitors.eea      |   4 +-
 .../lang3/event/EventListenerSupport.eea      |   4 +-
 .../exception/DefaultExceptionContext.eea     |   2 +-
 .../lang3/exception/ExceptionUtils.eea        |   8 +-
 .../commons/lang3/function/Failable.eea       |   6 +-
 .../commons/lang3/function/Functions.eea      |   2 +-
 .../apache/commons/lang3/math/Fraction.eea    |   2 +-
 .../apache/commons/lang3/math/NumberUtils.eea |  14 +-
 .../lang3/reflect/ConstructorUtils.eea        |   4 +-
 .../commons/lang3/reflect/FieldUtils.eea      |   4 +-
 .../commons/lang3/reflect/MethodUtils.eea     |  14 +-
 .../commons/lang3/reflect/TypeUtils.eea       |  14 +-
 .../lang3/stream/Streams$FailableStream.eea   |   2 +-
 .../apache/commons/lang3/stream/Streams.eea   |   4 +-
 .../apache/commons/lang3/text/StrBuilder.eea  |   8 +-
 .../apache/commons/lang3/text/StrLookup.eea   |   2 +-
 .../apache/commons/lang3/text/StrMatcher.eea  |   2 +-
 .../commons/lang3/text/StrSubstitutor.eea     |  18 +--
 .../commons/lang3/text/StrTokenizer.eea       |   6 +-
 .../apache/commons/lang3/text/WordUtils.eea   |   2 +-
 .../text/translate/CharSequenceTranslator.eea |   2 +-
 .../text/translate/JavaUnicodeEscaper.eea     |   2 +-
 .../lang3/text/translate/UnicodeEscaper.eea   |   2 +-
 .../commons/lang3/time/CalendarUtils.eea      |   2 +-
 .../apache/commons/lang3/time/DateUtils.eea   |   2 +-
 .../commons/lang3/time/FastDateParser.eea     |   4 +-
 .../commons/lang3/time/FastDatePrinter.eea    |   8 +-
 .../commons/lang3/time/FastTimeZone.eea       |   2 +-
 .../apache/commons/lang3/time/StopWatch.eea   |   6 +-
 .../commons/lang3/tuple/ImmutablePair.eea     |   2 +-
 .../commons/lang3/tuple/MutablePair.eea       |   4 +-
 .../commons/lang3/tuple/MutableTriple.eea     |   2 +-
 .../commons/lang3/util/FluentBitSet.eea       |   2 +-
 .../watcher/DirectoryChangeListener.eea       |   2 +-
 .../io/methvin/watcher/DirectoryWatcher.eea   |   2 +-
 .../io/methvin/watcher/PathUtils.eea          |   6 +-
 .../methvin/watcher/changeset/ChangeSet.eea   |   2 +-
 .../io/methvin/watcher/hashing/FileHash.eea   |   4 +-
 .../io/methvin/watcher/hashing/Murmur3F.eea   |   6 +-
 .../MacOSXListeningWatchService.eea           |   2 +-
 .../io/methvin/watchservice/jna/CFIndex.eea   |   2 +-
 .../org/eclipse/core/commands/Command.eea     |   6 +-
 .../eclipse/core/commands/CommandManager.eea  |  10 +-
 .../org/eclipse/core/commands/IHandler.eea    |   2 +-
 .../core/commands/ParameterizedCommand.eea    |   2 +-
 .../commands/common/HandleObjectManager.eea   |   2 +-
 .../core/commands/contexts/ContextManager.eea |   2 +-
 .../operations/DefaultOperationHistory.eea    |   4 +-
 .../commands/operations/ObjectUndoContext.eea |   2 +-
 .../core/commands/operations/UndoContext.eea  |   2 +-
 .../core/databinding/BindingProperties.eea    |  12 +-
 .../core/databinding/DataBindingContext.eea   |  18 +--
 .../core/databinding/UpdateListStrategy.eea   |   2 +-
 .../core/databinding/UpdateSetStrategy.eea    |   2 +-
 .../core/databinding/UpdateValueStrategy.eea  |   4 +-
 .../databinding/conversion/IConverter.eea     |   4 +-
 .../text/NumberToStringConverter.eea          |   4 +-
 .../text/StringToNumberConverter.eea          |   4 +-
 .../core/databinding/observable/Diffs.eea     |  32 ++---
 .../databinding/observable/Observables.eea    |  24 ++--
 .../observable/list/ComputedList.eea          |   2 +-
 .../databinding/observable/list/MultiList.eea |   6 +-
 .../observable/list/ObservableList.eea        |   4 +-
 .../observable/list/WritableList.eea          |   6 +-
 .../observable/map/AbstractObservableMap.eea  |   4 +-
 .../observable/map/CompositeMap.eea           |   4 +-
 .../observable/map/ComputedObservableMap.eea  |   4 +-
 .../databinding/observable/map/MapDiff.eea    |   2 +-
 .../observable/map/ObservableMap.eea          |   4 +-
 .../observable/map/WritableMap.eea            |   4 +-
 .../masterdetail/IObservableFactory.eea       |   2 +-
 .../masterdetail/MasterDetailObservables.eea  |  14 +-
 .../observable/set/ComputedSet.eea            |   2 +-
 .../databinding/observable/set/SetDiff.eea    |   2 +-
 .../observable/set/WritableSet.eea            |   2 +-
 .../observable/sideeffect/ISideEffect.eea     |  10 +-
 .../sideeffect/ISideEffectFactory.eea         |  12 +-
 .../observable/value/ComputedValue.eea        |   2 +-
 .../value/DateAndTimeObservableValue.eea      |   4 +-
 .../value/DuplexingObservableValue.eea        |   2 +-
 .../value/LocalDateTimeObservableValue.eea    |   4 +-
 .../observable/value/WritableValue.eea        |   2 +-
 .../core/databinding/property/Properties.eea  |  16 +--
 .../property/list/DelegatingListProperty.eea  |   2 +-
 .../property/list/ListProperty.eea            |   4 +-
 .../property/list/MultiListProperty.eea       |   4 +-
 .../property/list/SimpleListProperty.eea      |   4 +-
 .../property/map/DelegatingMapProperty.eea    |   2 +-
 .../databinding/property/map/MapProperty.eea  |   4 +-
 .../property/map/SimpleMapProperty.eea        |   4 +-
 .../property/set/DelegatingSetProperty.eea    |   2 +-
 .../databinding/property/set/SetProperty.eea  |   4 +-
 .../property/set/SimpleSetProperty.eea        |   4 +-
 .../property/set/UnionSetProperty.eea         |   4 +-
 .../value/DelegatingValueProperty.eea         |   6 +-
 .../property/value/SimpleValueProperty.eea    |   8 +-
 .../property/value/ValueProperty.eea          |   8 +-
 .../databinding/validation/MultiValidator.eea |   8 +-
 .../core/expressions/ElementHandler.eea       |   4 +-
 .../core/expressions/EvaluationContext.eea    |   6 +-
 .../eclipse/core/expressions/Expression.eea   |   2 +-
 .../core/expressions/ExpressionConverter.eea  |   4 +-
 .../core/expressions/ExpressionInfo.eea       |   2 +-
 .../eclipse/core/filebuffers/FileBuffers.eea  |   8 +-
 .../filebuffers/IAnnotationModelFactory.eea   |   2 +-
 .../core/filebuffers/IDocumentFactory.eea     |   2 +-
 .../filebuffers/ITextFileBufferManager.eea    |   8 +-
 .../manipulation/ContainerCreator.eea         |   2 +-
 .../ConvertLineDelimitersOperation.eea        |   2 +-
 .../GenericFileBufferOperationRunner.eea      |   2 +-
 .../RemoveTrailingWhitespaceOperation.eea     |   2 +-
 .../org/eclipse/core/filesystem/EFS.eea       |   2 +-
 .../org/eclipse/core/filesystem/URIUtil.eea   |   2 +-
 .../core/filesystem/provider/FileInfo.eea     |   2 +-
 .../core/filesystem/provider/FileSystem.eea   |   4 +-
 .../org/eclipse/core/resources/IContainer.eea |   2 +-
 .../org/eclipse/core/resources/IResource.eea  |   2 +-
 .../core/resources/IResourceRuleFactory.eea   |   2 +-
 .../core/resources/mapping/ModelProvider.eea  |   4 +-
 .../mapping/RemoteResourceMappingContext.eea  |   4 +-
 .../mapping/ResourceChangeValidator.eea       |   2 +-
 .../resources/refresh/RefreshProvider.eea     |   4 +-
 .../resources/team/ResourceRuleFactory.eea    |  10 +-
 .../undo/snapshot/IMarkerSnapshot.eea         |   2 +-
 .../undo/snapshot/IResourceSnapshot.eea       |   4 +-
 .../undo/snapshot/ResourceSnapshotFactory.eea |  10 +-
 .../PathVariableResolver.eea                  |   2 +-
 .../core/runtime/ContributorFactoryOSGi.eea   |   4 +-
 .../core/runtime/ContributorFactorySimple.eea |   2 +-
 .../runtime/IExecutableExtensionFactory.eea   |   2 +-
 .../org/eclipse/core/runtime/Platform.eea     |   2 +-
 .../org/eclipse/core/runtime/Preferences.eea  |   4 +-
 .../eclipse/core/runtime/RegistryFactory.eea  |   6 +-
 .../org/eclipse/core/runtime/SafeRunner.eea   |   2 +-
 .../org/eclipse/core/runtime/URIUtil.eea      |  10 +-
 .../core/runtime/adaptor/EclipseStarter.eea   |   4 +-
 .../content/BinarySignatureDescriber.eea      |   2 +-
 .../dynamichelpers/ExtensionTracker.eea       |   6 +-
 .../eclipse/core/runtime/jobs/IJobManager.eea |   2 +-
 .../core/runtime/jobs/ProgressProvider.eea    |   8 +-
 .../preferences/AbstractPreferenceStorage.eea |   2 +-
 .../core/runtime/preferences/IScope.eea       |   2 +-
 .../core/runtime/spi/RegistryStrategy.eea     |   8 +-
 .../core/variables/VariablesPlugin.eea        |   2 +-
 .../org/eclipse/debug/core/DebugPlugin.eea    |   4 +-
 .../org/eclipse/debug/core/RefreshUtil.eea    |   2 +-
 .../core/commands/AbstractDebugCommand.eea    |  10 +-
 .../model/LaunchConfigurationDelegate.eea     |   8 +-
 .../debug/core/model/RuntimeProcess.eea       |   2 +-
 .../AbstractSourceLookupDirector.eea          |   6 +-
 .../ISourceContainerTypeDelegate.eea          |   2 +-
 .../containers/AbstractSourceContainer.eea    |   2 +-
 .../containers/CompositeSourceContainer.eea   |   4 +-
 .../containers/ContainerSourceContainer.eea   |   2 +-
 .../containers/DefaultSourceContainer.eea     |   4 +-
 .../containers/DirectorySourceContainer.eea   |   2 +-
 .../containers/LocalFileStorage.eea           |   4 +-
 .../containers/ProjectSourceContainer.eea     |   2 +-
 .../containers/WorkspaceSourceContainer.eea   |   2 +-
 .../AbstractBreakpointOrganizerDelegate.eea   |   2 +-
 .../eclipse/debug/ui/AbstractDebugView.eea    |  20 +--
 .../ui/AbstractLaunchConfigurationTab.eea     |  16 +--
 .../debug/ui/BreakpointTypeCategory.eea       |   4 +-
 .../org/eclipse/debug/ui/CommonTab.eea        |   4 +-
 .../org/eclipse/debug/ui/DebugPopup.eea       |   6 +-
 .../org/eclipse/debug/ui/DebugUITools.eea     |  20 +--
 .../DeferredDebugElementWorkbenchAdapter.eea  |   2 +-
 .../org/eclipse/debug/ui/EnvironmentTab.eea   |   4 +-
 .../eclipse/debug/ui/IDetailPaneFactory.eea   |   2 +-
 .../eclipse/debug/ui/InspectPopupDialog.eea   |   2 +-
 .../org/eclipse/debug/ui/PrototypeTab.eea     |   4 +-
 .../org/eclipse/debug/ui/RefreshTab.eea       |   6 +-
 .../ui/StringVariableSelectionDialog.eea      |   2 +-
 .../debug/ui/WorkingDirectoryBlock.eea        |   2 +-
 .../actions/AbstractLaunchToolbarAction.eea   |   2 +-
 .../ui/actions/ContextualLaunchAction.eea     |   4 +-
 .../eclipse/debug/ui/actions/DebugAction.eea  |   2 +-
 .../ui/actions/ExportBreakpointsOperation.eea |   2 +-
 .../IWatchExpressionFactoryAdapter.eea        |   2 +-
 .../IWatchExpressionFactoryAdapter2.eea       |   2 +-
 .../ui/actions/ImportBreakpointsOperation.eea |   4 +-
 .../debug/ui/actions/LaunchAsAction.eea       |   2 +-
 .../ui/actions/LaunchShortcutsAction.eea      |   2 +-
 .../ui/actions/RulerBreakpointAction.eea      |   2 +-
 ...rEnableDisableBreakpointActionDelegate.eea |   2 +-
 .../actions/RulerRunToLineActionDelegate.eea  |   2 +-
 .../RulerToggleBreakpointActionDelegate.eea   |   2 +-
 .../eclipse/debug/ui/actions/RunAction.eea    |   2 +-
 .../debug/ui/console/ConsoleColorProvider.eea |   2 +-
 .../ui/memory/AbstractTableRendering.eea      |   6 +-
 .../debug/ui/memory/AbstractTextRendering.eea |   2 +-
 .../debug/ui/memory/IMemoryRenderingType.eea  |   2 +-
 .../memory/IMemoryRenderingTypeDelegate.eea   |   2 +-
 .../AbstractSourceContainerBrowser.eea        |   4 +-
 .../CommonSourceNotFoundEditor.eea            |   4 +-
 .../debug/ui/sourcelookup/SourceLookupTab.eea |   4 +-
 .../WorkingSetSourceContainer.eea             |   2 +-
 .../e4/core/commands/ECommandService.eea      |   4 +-
 .../e4/core/commands/ExpressionContext.eea    |   4 +-
 .../e4/core/contexts/ContextFunction.eea      |   2 +-
 .../core/contexts/EclipseContextFactory.eea   |   6 +-
 .../e4/core/contexts/IEclipseContext.eea      |   4 +-
 .../eclipse/e4/core/di/InjectorFactory.eea    |   2 +-
 .../di/suppliers/PrimaryObjectSupplier.eea    |   2 +-
 .../e4/core/services/about/AboutSections.eea  |   2 +-
 .../contributions/IContributionFactory.eea    |   4 +-
 .../contributions/IContributionFactorySpi.eea |   2 +-
 .../core/services/nls/BaseMessageRegistry.eea |   4 +-
 .../e4/ui/bindings/EBindingService.eea        |   4 +-
 .../e4/ui/css/core/css2/CSS2ColorHelper.eea   |   6 +-
 .../e4/ui/css/core/css2/CSS2FontHelper.eea    |   8 +-
 .../core/css2/CSS2FontPropertiesHelpers.eea   |   2 +-
 .../css/core/css2/CSS2PrimitiveValueImpl.eea  |   8 +-
 .../e4/ui/css/core/dom/ElementAdapter.eea     |  22 ++--
 .../css/core/dom/parsers/CSSParserFactory.eea |   2 +-
 .../dom/properties/ICSSPropertyHandler.eea    |   2 +-
 .../CSSValueBooleanConverterImpl.eea          |   2 +-
 ...tCSSPropertyBackgroundCompositeHandler.eea |   2 +-
 .../AbstractCSSPropertyBackgroundHandler.eea  |   2 +-
 ...tractCSSPropertyBorderCompositeHandler.eea |   2 +-
 .../css2/AbstractCSSPropertyBorderHandler.eea |  42 +++---
 ...stractCSSPropertyClassificationHandler.eea |  14 +-
 .../AbstractCSSPropertyDimensionHandler.eea   |  10 +-
 ...bstractCSSPropertyFontCompositeHandler.eea |   2 +-
 .../css2/AbstractCSSPropertyFontHandler.eea   |   2 +-
 .../css2/AbstractCSSPropertyMarginHandler.eea |   2 +-
 .../AbstractCSSPropertyPaddingHandler.eea     |   2 +-
 .../css2/AbstractCSSPropertyTextHandler.eea   |   6 +-
 .../css2/CSS2FontPropertiesImpl.eea           |   2 +-
 .../css2/CSS2PaddingPropertiesImpl.eea        |   2 +-
 .../css2/ICSSPropertyBackgroundHandler.eea    |   8 +-
 .../AbstractCSSPropertyHandlerProvider.eea    |   4 +-
 .../CSSPropertyHandlerLazyProviderImpl.eea    |   4 +-
 .../CSSPropertyHandlerSimpleProviderImpl.eea  |   2 +-
 .../ui/css/core/impl/dom/AbstractCSSNode.eea  |   2 +-
 .../css/core/impl/dom/CSSFontFaceRuleImpl.eea |   2 +-
 .../css/core/impl/dom/CSSImportRuleImpl.eea   |   2 +-
 .../ui/css/core/impl/dom/CSSMediaRuleImpl.eea |   4 +-
 .../ui/css/core/impl/dom/CSSPageRuleImpl.eea  |   4 +-
 .../css/core/impl/dom/CSSPropertyListImpl.eea |   2 +-
 .../e4/ui/css/core/impl/dom/CSSRuleImpl.eea   |   2 +-
 .../core/impl/dom/CSSStyleDeclarationImpl.eea |   8 +-
 .../ui/css/core/impl/dom/CSSStyleRuleImpl.eea |   6 +-
 .../css/core/impl/dom/CSSStyleSheetImpl.eea   |  14 +-
 .../ui/css/core/impl/dom/CSSValueFactory.eea  |   2 +-
 .../e4/ui/css/core/impl/dom/CSSValueImpl.eea  |  10 +-
 .../e4/ui/css/core/impl/dom/CounterImpl.eea   |   6 +-
 .../ui/css/core/impl/dom/DocumentCSSImpl.eea  |   4 +-
 .../e4/ui/css/core/impl/dom/Measure.eea       |   4 +-
 .../e4/ui/css/core/impl/dom/MediaListImpl.eea |   4 +-
 .../e4/ui/css/core/impl/dom/RGBColorImpl.eea  |   4 +-
 .../e4/ui/css/core/impl/dom/RectImpl.eea      |   8 +-
 .../css/core/impl/dom/StyleSheetListImpl.eea  |   2 +-
 .../e4/ui/css/core/impl/dom/ViewCSSImpl.eea   |   2 +-
 .../impl/dom/parsers/AbstractCSSParser.eea    |   4 +-
 .../impl/dom/parsers/CSSParserFactoryImpl.eea |   2 +-
 .../core/impl/engine/AbstractCSSEngine.eea    |  22 ++--
 .../impl/engine/CSSElementContextImpl.eea     |   2 +-
 .../engine/RegistryCSSElementProvider.eea     |   2 +-
 .../RegistryCSSPropertyHandlerProvider.eea    |   6 +-
 .../core/impl/sac/CSSConditionFactoryImpl.eea |  28 ++--
 .../core/impl/sac/CSSDocumentHandlerImpl.eea  |   2 +-
 .../impl/sac/CSSPseudoClassConditionImpl.eea  |   2 +-
 .../core/impl/sac/CSSSelectorFactoryImpl.eea  |  26 ++--
 .../impl/sac/DocumentHandlerFactoryImpl.eea   |   2 +-
 .../resources/AbstractResourcesRegistry.eea   |   2 +-
 .../core/resources/CSSResourcesHelpers.eea    |  10 +-
 .../resources/ResourceRegistryKeyFactory.eea  |   2 +-
 .../css/core/sac/DocumentHandlerFactory.eea   |   2 +-
 .../e4/ui/css/core/sac/SACParserFactory.eea   |   2 +-
 .../resources/FileResourcesLocatorImpl.eea    |   4 +-
 .../resources/HttpResourcesLocatorImpl.eea    |   2 +-
 .../impl/resources/OSGiResourceLocator.eea    |   2 +-
 .../resources/ResourcesLocatorManager.eea     |   4 +-
 .../e4/ui/css/core/utils/ClassUtils.eea       |   2 +-
 .../e4/ui/css/swt/dom/CTabFolderElement.eea   |   4 +-
 .../e4/ui/css/swt/dom/CompositeElement.eea    |   2 +-
 .../e4/ui/css/swt/dom/SWTElementProvider.eea  |   2 +-
 .../e4/ui/css/swt/dom/ShellElement.eea        |   2 +-
 .../e4/ui/css/swt/dom/TableElement.eea        |   2 +-
 .../e4/ui/css/swt/dom/ToolBarElement.eea      |   2 +-
 .../e4/ui/css/swt/dom/ToolItemElement.eea     |   2 +-
 .../eclipse/e4/ui/css/swt/dom/TreeElement.eea |   2 +-
 .../e4/ui/css/swt/dom/WidgetElement.eea       |  10 +-
 .../dom/definition/ThemeDefinitionElement.eea |   6 +-
 .../ThemeElementDefinitionProvider.eea        |   2 +-
 .../dom/definition/ThemesExtensionElement.eea |   8 +-
 .../e4/ui/css/swt/dom/html/SWTHTMLElement.eea |   4 +-
 .../swt/dom/html/SWTHTMLElementProvider.eea   |   2 +-
 .../preference/EclipsePreferencesElement.eea  |   6 +-
 .../preference/EclipsePreferencesProvider.eea |   2 +-
 .../swt/engine/AbstractCSSSWTEngineImpl.eea   |   2 +-
 .../ui/css/swt/helpers/CSSSWTColorHelper.eea  |  16 +--
 .../ui/css/swt/helpers/CSSSWTCursorHelper.eea |   4 +-
 .../ui/css/swt/helpers/CSSSWTFontHelper.eea   |  16 +--
 .../e4/ui/css/swt/helpers/CSSSWTHelpers.eea   |   2 +-
 .../ui/css/swt/helpers/CSSSWTImageHelper.eea  |   2 +-
 .../ui/css/swt/helpers/SWTElementHelpers.eea  |   8 +-
 .../e4/ui/css/swt/helpers/SWTStyleHelpers.eea |   2 +-
 .../org/eclipse/e4/ui/css/swt/helpers/URI.eea |  48 +++----
 .../AbstractCSSPropertySWTHandler.eea         |   2 +-
 ...AbstractConvertedCSSPropertySWTHandler.eea |   2 +-
 .../CSSValueSWTFontConverterImpl.eea          |   4 +-
 .../CSSValueSWTFontDataConverterImpl.eea      |   6 +-
 .../CSSValueSWTGradientConverterImpl.eea      |   4 +-
 .../CSSValueSWTImageConverterImpl.eea         |   2 +-
 .../css2/CSSPropertyBackgroundSWTHandler.eea  |   2 +-
 .../CSSPropertyClassificationSWTHandler.eea   |   6 +-
 .../css2/CSSPropertyFontSWTHandler.eea        |   8 +-
 .../css2/CSSPropertyMarginSWTHandler.eea      |  10 +-
 .../css2/CSSPropertyPaddingSWTHandler.eea     |  10 +-
 .../css2/CSSPropertyTextSWTHandler.eea        |   6 +-
 .../CSSBackgroundModePropertyHandler.eea      |   2 +-
 .../custom/CSSPropertyAlignmentSWTHandler.eea |   2 +-
 .../CSSPropertyBorderVisibleSWTHandler.eea    |   2 +-
 .../CSSPropertyCornerRadiusSWTHandler.eea     |   2 +-
 ...tyCustomTabContentBackgroundSWTHandler.eea |   2 +-
 .../custom/CSSPropertyHeaderHandler.eea       |   2 +-
 .../CSSPropertyInnerKeylineSWTHandler.eea     |   2 +-
 .../CSSPropertyLinesVisibleSWTHandler.eea     |   2 +-
 .../CSSPropertyMaximizeVisibleSWTHandler.eea  |   2 +-
 .../custom/CSSPropertyMaximizedSWTHandler.eea |   2 +-
 .../CSSPropertyMinimizeVisibleSWTHandler.eea  |   2 +-
 .../custom/CSSPropertyMinimizedSWTHandler.eea |   2 +-
 .../CSSPropertyOuterKeylineSWTHandler.eea     |   2 +-
 ...PropertySelectedImageVisibleSWTHandler.eea |   2 +-
 .../CSSPropertySelectedTabsSWTHandler.eea     |   2 +-
 .../custom/CSSPropertySimpleSWTHandler.eea    |   2 +-
 .../custom/CSSPropertySingleSWTHandler.eea    |   2 +-
 .../custom/CSSPropertyTabHeightHandler.eea    |   2 +-
 .../CSSPropertyTabPositionSWTHandler.eea      |   2 +-
 .../CSSPropertyTabRendererSWTHandler.eea      |   2 +-
 ...ertyTabTextMinimumCharactersSWTHandler.eea |   2 +-
 ...yUnselectHotTabsColorBackgroundHandler.eea |   2 +-
 ...opertyUnselectedCloseVisibleSWTHandler.eea |   2 +-
 ...opertyUnselectedImageVisibleSWTHandler.eea |   2 +-
 .../CSSPropertyUnselectedTabsSWTHandler.eea   |   2 +-
 .../CSSPropertye4SelectedTabFillHandler.eea   |   2 +-
 .../custom/CSSPropertye4TabOutline.eea        |   2 +-
 .../CSSPropertyFontDefinitionHandler.eea      |  16 +--
 ...SPropertyThemeElementDefinitionHandler.eea |   2 +-
 .../CSSPropertyThemesExtensionHandler.eea     |   2 +-
 .../SWTResourceRegistryKeyFactory.eea         |   2 +-
 .../swt/resources/SWTResourcesRegistry.eea    |   4 +-
 .../ui/dialogs/filteredtree/FilteredTree.eea  |   8 +-
 .../e4/ui/model/LocalizationHelper.eea        |   8 +-
 .../model/application/MApplicationFactory.eea |   4 +-
 .../application/commands/MCommandsFactory.eea |  16 +--
 .../commands/impl/CategoryImpl.eea            |   2 +-
 .../application/commands/impl/CommandImpl.eea |   2 +-
 .../commands/impl/CommandsFactoryImpl.eea     |  22 ++--
 .../commands/util/CommandsAdapterFactory.eea  |  34 ++---
 .../commands/util/CommandsSwitch.eea          |  32 ++---
 .../descriptor/basic/MBasicFactory.eea        |   2 +-
 .../basic/impl/BasicFactoryImpl.eea           |   4 +-
 .../basic/impl/PartDescriptorImpl.eea         |   2 +-
 .../basic/util/BasicAdapterFactory.eea        |  18 +--
 .../descriptor/basic/util/BasicSwitch.eea     |  16 +--
 .../impl/ApplicationFactoryImpl.eea           |  14 +-
 .../application/impl/ApplicationImpl.eea      |   2 +-
 .../e4/ui/model/application/ui/MUiFactory.eea |   4 +-
 .../e4/ui/model/application/ui/SideValue.eea  |   6 +-
 .../ui/advanced/MAdvancedFactory.eea          |   8 +-
 .../ui/advanced/impl/AdvancedFactoryImpl.eea  |  10 +-
 .../application/ui/advanced/impl/AreaImpl.eea |   2 +-
 .../ui/advanced/impl/PerspectiveImpl.eea      |   2 +-
 .../advanced/util/AdvancedAdapterFactory.eea  |  40 +++---
 .../ui/advanced/util/AdvancedSwitch.eea       |  38 +++---
 .../application/ui/basic/MBasicFactory.eea    |  14 +-
 .../ui/basic/impl/BasicFactoryImpl.eea        |  16 +--
 .../application/ui/basic/impl/PartImpl.eea    |   2 +-
 .../application/ui/basic/impl/WindowImpl.eea  |   2 +-
 .../ui/basic/util/BasicAdapterFactory.eea     |  54 ++++----
 .../application/ui/basic/util/BasicSwitch.eea |  52 ++++----
 .../application/ui/impl/UIElementImpl.eea     |   4 +-
 .../application/ui/impl/UiFactoryImpl.eea     |  12 +-
 .../ui/model/application/ui/menu/ItemType.eea |   6 +-
 .../application/ui/menu/MMenuFactory.eea      |  28 ++--
 .../application/ui/menu/impl/ItemImpl.eea     |   2 +-
 .../ui/menu/impl/MenuElementImpl.eea          |   4 +-
 .../ui/menu/impl/MenuFactoryImpl.eea          |  36 +++---
 .../application/ui/menu/impl/MenuItemImpl.eea |   4 +-
 .../ui/menu/util/MenuAdapterFactory.eea       |  66 +++++-----
 .../application/ui/menu/util/MenuSwitch.eea   |  64 ++++-----
 .../application/ui/util/UiAdapterFactory.eea  |  34 ++---
 .../ui/model/application/ui/util/UiSwitch.eea |  32 ++---
 .../util/ApplicationAdapterFactory.eea        |  40 +++---
 .../application/util/ApplicationSwitch.eea    |  38 +++---
 .../e4/ui/model/fragment/MFragmentFactory.eea |   4 +-
 .../fragment/impl/FragmentFactoryImpl.eea     |   6 +-
 .../model/fragment/impl/ModelFragmentImpl.eea |   2 +-
 .../fragment/impl/StringModelFragmentImpl.eea |   2 +-
 .../fragment/util/FragmentAdapterFactory.eea  |  10 +-
 .../ui/model/fragment/util/FragmentSwitch.eea |   8 +-
 .../e4/ui/workbench/IModelResourceHandler.eea |   2 +-
 .../e4/ui/workbench/IPresentationEngine.eea   |   4 +-
 .../org/eclipse/e4/ui/workbench/UIEvents.eea  |   6 +-
 .../addons/dndaddon/IBFDragAgent.eea          |   2 +-
 .../addons/dndaddon/PartDragAgent.eea         |   2 +-
 .../addons/minmax/MinMaxAddonUtil.eea         |   2 +-
 .../addons/minmax/TrimStackIdHelper.eea       |   4 +-
 .../PerspectiveSwitcher.eea                   |   2 +-
 .../ui/workbench/modeling/EModelService.eea   |   4 +-
 .../workbench/modeling/EObjModelHandler.eea   |   6 +-
 .../e4/ui/workbench/modeling/EPartService.eea |   6 +-
 .../modeling/IModelProcessorContribution.eea  |   2 +-
 .../workbench/modeling/ModelHandlerBase.eea   |   6 +-
 .../swt/AbstractContributionItem.eea          |   4 +-
 .../workbench/renderers/swt/AreaRenderer.eea  |   4 +-
 .../workbench/renderers/swt/CTabRendering.eea |   4 +-
 .../renderers/swt/ContributedPartRenderer.eea |   2 +-
 .../swt/ElementReferenceRenderer.eea          |   2 +-
 .../renderers/swt/MenuManagerRenderer.eea     |   2 +-
 .../renderers/swt/PerspectiveRenderer.eea     |   4 +-
 .../swt/PerspectiveStackRenderer.eea          |   2 +-
 .../renderers/swt/SWTPartRenderer.eea         |   2 +-
 .../ui/workbench/renderers/swt/SashLayout.eea |   2 +-
 .../workbench/renderers/swt/SashRenderer.eea  |   4 +-
 .../renderers/swt/SeparatorRenderer.eea       |   2 +-
 .../workbench/renderers/swt/StackRenderer.eea |   6 +-
 .../renderers/swt/ToolBarManagerRenderer.eea  |   6 +-
 .../renderers/swt/ToolControlRenderer.eea     |   2 +-
 .../workbench/renderers/swt/TrimBarLayout.eea |   2 +-
 .../renderers/swt/TrimBarRenderer.eea         |   2 +-
 .../renderers/swt/TrimmedPartLayout.eea       |   4 +-
 .../workbench/renderers/swt/WBWRenderer.eea   |   2 +-
 .../swt/WorkbenchRendererFactory.eea          |   2 +-
 .../equinox/bidi/StructuredTextProcessor.eea  |   2 +-
 .../p2/core/IProvisioningAgentProvider.eea    |   2 +-
 .../p2/core/spi/IAgentServiceFactory.eea      |   2 +-
 .../org/eclipse/equinox/p2/engine/IEngine.eea |   2 +-
 .../equinox/p2/engine/PhaseSetFactory.eea     |   8 +-
 .../equinox/p2/engine/ProvisioningContext.eea |   6 +-
 .../equinox/p2/metadata/MetadataFactory.eea   |  48 +++----
 .../eclipse/equinox/p2/metadata/Version.eea   |   6 +-
 .../equinox/p2/metadata/VersionRange.eea      |   4 +-
 .../p2/metadata/expression/ExpressionUtil.eea |   2 +-
 .../expression/IContextExpression.eea         |   4 +-
 .../expression/IExpressionFactory.eea         |   4 +-
 .../metadata/expression/IMatchExpression.eea  |   2 +-
 .../p2/metadata/expression/SimplePattern.eea  |   2 +-
 .../equinox/p2/query/CollectionResult.eea     |   2 +-
 .../eclipse/equinox/p2/query/Collector.eea    |   2 +-
 .../equinox/p2/query/CompoundQueryable.eea    |   4 +-
 .../equinox/p2/query/ExpressionMatchQuery.eea |   2 +-
 .../equinox/p2/query/ExpressionQuery.eea      |   2 +-
 .../eclipse/equinox/p2/query/MatchQuery.eea   |   4 +-
 .../eclipse/equinox/p2/query/QueryUtil.eea    |  56 ++++----
 .../p2/repository/IRepositoryManager.eea      |   2 +-
 .../artifact/IArtifactRepository.eea          |   4 +-
 .../artifact/IArtifactRepositoryManager.eea   |   6 +-
 .../spi/AbstractArtifactRepository.eea        |   4 +-
 .../spi/ArtifactRepositoryFactory.eea         |   2 +-
 .../metadata/IMetadataRepositoryManager.eea   |   2 +-
 .../spi/MetadataRepositoryFactory.eea         |   2 +-
 .../security/auth/LoginContextFactory.eea     |   6 +-
 .../auth/credentials/CredentialsFactory.eea   |   6 +-
 .../org/eclipse/jface/action/Action.eea       |   2 +-
 .../jface/action/ContributionManager.eea      |   8 +-
 .../ExternalActionManager$CommandCallback.eea |   4 +-
 .../jface/action/LegacyActionTools.eea        |   6 +-
 .../org/eclipse/jface/action/MenuManager.eea  |  14 +-
 .../action/StatusLineContributionItem.eea     |   2 +-
 .../jface/action/StatusLineManager.eea        |   6 +-
 .../jface/action/SubContributionManager.eea   |   8 +-
 .../jface/action/SubCoolBarManager.eea        |   2 +-
 .../eclipse/jface/action/SubMenuManager.eea   |   4 +-
 .../jface/action/ToolBarContributionItem.eea  |   2 +-
 .../eclipse/jface/action/ToolBarManager.eea   |   2 +-
 .../eclipse/jface/bindings/BindingManager.eea |  10 +-
 .../jface/bindings/TriggerSequence.eea        |   2 +-
 .../jface/bindings/keys/KeySequence.eea       |  12 +-
 .../eclipse/jface/bindings/keys/KeyStroke.eea |   4 +-
 .../keys/formatting/AbstractKeyFormatter.eea  |   4 +-
 .../keys/formatting/EmacsKeyFormatter.eea     |   2 +-
 .../keys/formatting/FormalKeyFormatter.eea    |   6 +-
 .../keys/formatting/NativeKeyFormatter.eea    |   2 +-
 .../eclipse/jface/commands/ActionHandler.eea  |   2 +-
 .../ComboContentAssistSubjectAdapter.eea      |   2 +-
 .../TextContentAssistSubjectAdapter.eea       |   2 +-
 .../databinding/dialog/DialogPageSupport.eea  |   2 +-
 .../dialog/TitleAreaDialogSupport.eea         |   2 +-
 .../dialog/ValidationMessageProvider.eea      |   2 +-
 .../fieldassist/ControlDecorationSupport.eea  |  18 +--
 .../preference/PreferencePageSupport.eea      |   2 +-
 .../databinding/swt/WidgetListProperty.eea    |   2 +-
 .../databinding/swt/WidgetSideEffects.eea     |   2 +-
 .../databinding/swt/WidgetValueProperty.eea   |   6 +-
 .../swt/typed/WidgetProperties.eea            |  62 ++++-----
 .../databinding/util/JFaceProperties.eea      |   2 +-
 .../viewers/CellEditorProperties.eea          |   2 +-
 .../viewers/ObservableValueEditingSupport.eea |   6 +-
 .../viewers/TreeStructureAdvisor.eea          |   4 +-
 .../viewers/ViewerListProperty.eea            |   2 +-
 .../databinding/viewers/ViewerSetProperty.eea |   2 +-
 .../viewers/ViewerValueProperty.eea           |   4 +-
 .../viewers/typed/ViewerProperties.eea        |  10 +-
 .../databinding/wizard/WizardPageSupport.eea  |   2 +-
 .../jface/dialogs/AbstractSelectionDialog.eea |   2 +-
 .../eclipse/jface/dialogs/AnimatorFactory.eea |   2 +-
 .../jface/dialogs/ControlEnableState.eea      |   4 +-
 .../org/eclipse/jface/dialogs/DialogPage.eea  |   4 +-
 .../eclipse/jface/dialogs/DialogSettings.eea  |   4 +-
 .../org/eclipse/jface/dialogs/DialogTray.eea  |   2 +-
 .../org/eclipse/jface/dialogs/ErrorDialog.eea |   2 +-
 .../jface/dialogs/ErrorSupportProvider.eea    |   2 +-
 .../jface/dialogs/IconAndMessageDialog.eea    |   2 +-
 .../org/eclipse/jface/dialogs/InputDialog.eea |   2 +-
 .../jface/dialogs/MessageDialogWithToggle.eea |   2 +-
 .../jface/dialogs/PlainMessageDialog.eea      |   4 +-
 .../org/eclipse/jface/dialogs/PopupDialog.eea |   8 +-
 .../org/eclipse/jface/dialogs/TrayDialog.eea  |   2 +-
 .../fieldassist/ContentProposalAdapter.eea    |   2 +-
 .../jface/fieldassist/FieldAssistColors.eea   |   2 +-
 .../fieldassist/FieldDecorationRegistry.eea   |   2 +-
 .../AbstractNotificationPopup.eea             |   4 +-
 .../jface/notifications/NotificationPopup.eea |   2 +-
 .../jface/operation/ProgressMonitorUtil.eea   |   4 +-
 .../jface/preference/DirectoryFieldEditor.eea |   2 +-
 .../eclipse/jface/preference/FieldEditor.eea  |   2 +-
 .../jface/preference/FileFieldEditor.eea      |   2 +-
 .../jface/preference/FontFieldEditor.eea      |   2 +-
 .../eclipse/jface/preference/ListEditor.eea   |   4 +-
 .../eclipse/jface/preference/PathEditor.eea   |   4 +-
 .../jface/preference/PreferenceConverter.eea  |   2 +-
 .../jface/preference/PreferenceDialog.eea     |  16 +--
 .../jface/preference/PreferenceManager.eea    |   6 +-
 .../jface/preference/PreferenceNode.eea       |   2 +-
 .../jface/preference/PreferencePage.eea       |   4 +-
 .../preference/StringButtonFieldEditor.eea    |   2 +-
 .../jface/resource/ColorDescriptor.eea        |  10 +-
 .../eclipse/jface/resource/ColorRegistry.eea  |   2 +-
 .../resource/CompositeImageDescriptor.eea     |   6 +-
 .../resource/DeviceResourceDescriptor.eea     |   2 +-
 .../eclipse/jface/resource/FontDescriptor.eea |  18 +--
 .../eclipse/jface/resource/FontRegistry.eea   |   6 +-
 .../jface/resource/ImageDescriptor.eea        |  28 ++--
 .../eclipse/jface/resource/ImageRegistry.eea  |   4 +-
 .../eclipse/jface/resource/JFaceResources.eea |   6 +-
 .../jface/resource/LazyResourceManager.eea    |   4 +-
 .../jface/resource/ResourceManager.eea        |  12 +-
 .../jface/resource/StringConverter.eea        |  22 ++--
 .../eclipse/jface/text/AbstractDocument.eea   |   2 +-
 ...AbstractHoverInformationControlManager.eea |   2 +-
 .../jface/text/AbstractInformationControl.eea |   4 +-
 .../AbstractInformationControlManager.eea     |   8 +-
 ...tractReusableInformationControlCreator.eea |   2 +-
 .../jface/text/ConfigurableLineTracker.eea    |   2 +-
 .../jface/text/DefaultInformationControl.eea  |   2 +-
 .../eclipse/jface/text/DefaultLineTracker.eea |   2 +-
 .../text/DefaultTextDoubleClickStrategy.eea   |   2 +-
 .../text/DocumentPartitioningChangedEvent.eea |   2 +-
 .../org/eclipse/jface/text/GapTextStore.eea   |   2 +-
 .../jface/text/IInformationControlCreator.eea |   2 +-
 .../jface/text/ISlaveDocumentManager.eea      |   4 +-
 .../eclipse/jface/text/TextPresentation.eea   |   8 +-
 .../org/eclipse/jface/text/TextUtilities.eea  |   4 +-
 .../org/eclipse/jface/text/TextViewer.eea     |  28 ++--
 .../jface/text/TextViewerUndoManager.eea      |   2 +-
 .../codemining/AbstractCodeMiningProvider.eea |   2 +-
 .../text/contentassist/ContentAssistant.eea   |  10 +-
 .../jface/text/formatter/ContentFormatter.eea |   2 +-
 .../ContextBasedFormattingStrategy.eea        |   2 +-
 .../text/formatter/FormattingContext.eea      |   2 +-
 .../formatter/MultiPassContentFormatter.eea   |   2 +-
 .../hyperlink/AbstractHyperlinkDetector.eea   |   2 +-
 .../jface/text/hyperlink/HyperlinkManager.eea |   2 +-
 .../jface/text/hyperlink/URLHyperlink.eea     |   2 +-
 .../text/information/InformationPresenter.eea |   2 +-
 .../jface/text/link/LinkedModeModel.eea       |   4 +-
 .../text/link/LinkedModeUI$IExitPolicy.eea    |   2 +-
 .../eclipse/jface/text/link/LinkedModeUI.eea  |   2 +-
 .../presentation/PresentationReconciler.eea   |   6 +-
 .../jface/text/projection/ChildDocument.eea   |   2 +-
 .../text/projection/ChildDocumentManager.eea  |   2 +-
 .../text/projection/ProjectionDocument.eea    |   6 +-
 .../projection/ProjectionDocumentManager.eea  |  10 +-
 .../text/projection/ProjectionMapping.eea     |   4 +-
 .../eclipse/jface/text/revisions/Revision.eea |   2 +-
 .../jface/text/rules/DefaultPartitioner.eea   |   4 +-
 .../jface/text/rules/FastPartitioner.eea      |   4 +-
 .../jface/text/rules/RuleBasedPartitioner.eea |   4 +-
 .../jface/text/source/AbstractRulerColumn.eea |   4 +-
 .../text/source/AnnotationBarHoverManager.eea |   2 +-
 .../jface/text/source/AnnotationModel.eea     |   2 +-
 .../text/source/AnnotationModelEvent.eea      |   6 +-
 .../jface/text/source/AnnotationPainter.eea   |   2 +-
 .../jface/text/source/ChangeRulerColumn.eea   |   2 +-
 .../jface/text/source/CompositeRuler.eea      |   2 +-
 .../text/source/DefaultAnnotationHover.eea    |   4 +-
 .../jface/text/source/LineChangeHover.eea     |   8 +-
 .../source/LineNumberChangeRulerColumn.eea    |   4 +-
 .../text/source/LineNumberRulerColumn.eea     |   2 +-
 .../jface/text/source/SourceViewer.eea        |  16 +--
 .../text/source/SourceViewerConfiguration.eea |  32 ++---
 .../inlined/AbstractInlinedAnnotation.eea     |   2 +-
 .../inlined/InlinedAnnotationSupport.eea      |   2 +-
 .../text/source/projection/AnnotationBag.eea  |   2 +-
 .../source/projection/ProjectionSupport.eea   |   2 +-
 .../source/projection/ProjectionViewer.eea    |  12 +-
 .../templates/DocumentTemplateContext.eea     |   2 +-
 .../templates/TemplateCompletionProcessor.eea |   6 +-
 .../text/templates/TemplateTranslator.eea     |   4 +-
 .../persistence/TemplateReaderWriter.eea      |   8 +-
 .../templates/persistence/TemplateStore.eea   |   6 +-
 .../org/eclipse/jface/util/BidiUtils.eea      |   2 +-
 .../jface/util/DelegatingDragAdapter.eea      |   2 +-
 .../jface/util/DelegatingDropAdapter.eea      |   2 +-
 .../org/eclipse/jface/util/Geometry.eea       |   8 +-
 .../jface/util/LocalSelectionTransfer.eea     |   2 +-
 .../resources/org/eclipse/jface/util/Util.eea |   2 +-
 .../jface/viewers/AbstractListViewer.eea      |   6 +-
 .../jface/viewers/AbstractTableViewer.eea     |  10 +-
 .../jface/viewers/AbstractTreeViewer.eea      |  26 ++--
 .../org/eclipse/jface/viewers/CellEditor.eea  |   4 +-
 .../jface/viewers/CellLabelProvider.eea       |  10 +-
 .../jface/viewers/CellNavigationStrategy.eea  |   2 +-
 .../eclipse/jface/viewers/ColorCellEditor.eea |   2 +-
 .../eclipse/jface/viewers/ColumnViewer.eea    |  12 +-
 .../jface/viewers/ColumnViewerEditor.eea      |   2 +-
 .../viewers/ColumnViewerToolTipSupport.eea    |   2 +-
 .../jface/viewers/ComboBoxCellEditor.eea      |   2 +-
 .../viewers/ComboBoxViewerCellEditor.eea      |   2 +-
 .../DecoratingStyledCellLabelProvider.eea     |   6 +-
 .../DelegatingStyledCellLabelProvider.eea     |   6 +-
 .../jface/viewers/DialogCellEditor.eea        |   4 +-
 .../viewers/FocusCellOwnerDrawHighlighter.eea |   6 +-
 .../eclipse/jface/viewers/LabelProvider.eea   |   6 +-
 .../viewers/LabelProviderChangedEvent.eea     |   4 +-
 .../jface/viewers/StructuredViewer.eea        |   8 +-
 .../eclipse/jface/viewers/StyledString.eea    |   4 +-
 .../org/eclipse/jface/viewers/TableViewer.eea |   4 +-
 .../jface/viewers/TableViewerEditor.eea       |   2 +-
 .../eclipse/jface/viewers/TableViewerRow.eea  |   4 +-
 .../eclipse/jface/viewers/TextCellEditor.eea  |   2 +-
 .../org/eclipse/jface/viewers/TreeNode.eea    |   2 +-
 .../org/eclipse/jface/viewers/TreePath.eea    |   8 +-
 .../eclipse/jface/viewers/TreeSelection.eea   |   4 +-
 .../org/eclipse/jface/viewers/TreeViewer.eea  |  16 +--
 .../jface/viewers/TreeViewerEditor.eea        |   2 +-
 .../eclipse/jface/viewers/TreeViewerRow.eea   |   6 +-
 .../org/eclipse/jface/viewers/ViewerCell.eea  |   4 +-
 .../jface/viewers/ViewerDropAdapter.eea       |   4 +-
 .../org/eclipse/jface/viewers/ViewerRow.eea   |   6 +-
 .../deferred/AbstractConcurrentModel.eea      |   2 +-
 .../viewers/deferred/LazySortedCollection.eea |   2 +-
 .../jface/widgets/AbstractWidgetFactory.eea   |   2 +-
 .../eclipse/jface/widgets/BrowserFactory.eea  |   2 +-
 .../eclipse/jface/widgets/ButtonFactory.eea   |   2 +-
 .../jface/widgets/CompositeFactory.eea        |   2 +-
 .../eclipse/jface/widgets/DateTimeFactory.eea |   2 +-
 .../eclipse/jface/widgets/GroupFactory.eea    |   2 +-
 .../eclipse/jface/widgets/LabelFactory.eea    |   2 +-
 .../org/eclipse/jface/widgets/LinkFactory.eea |   2 +-
 .../org/eclipse/jface/widgets/SashFactory.eea |   2 +-
 .../eclipse/jface/widgets/SashFormFactory.eea |   2 +-
 .../eclipse/jface/widgets/ShellFactory.eea    |   4 +-
 .../eclipse/jface/widgets/SpinnerFactory.eea  |   2 +-
 .../jface/widgets/TableColumnFactory.eea      |   2 +-
 .../eclipse/jface/widgets/TableFactory.eea    |   2 +-
 .../org/eclipse/jface/widgets/TextFactory.eea |   2 +-
 .../jface/widgets/TreeColumnFactory.eea       |   2 +-
 .../org/eclipse/jface/widgets/TreeFactory.eea |   2 +-
 .../eclipse/jface/widgets/WidgetSupplier.eea  |   2 +-
 .../org/eclipse/jface/wizard/IWizard.eea      |   2 +-
 .../org/eclipse/jface/wizard/IWizardPage.eea  |   2 +-
 .../org/eclipse/jface/wizard/Wizard.eea       |  10 +-
 .../org/eclipse/jface/wizard/WizardDialog.eea |   2 +-
 .../org/eclipse/jface/wizard/WizardPage.eea   |   8 +-
 .../jface/wizard/WizardSelectionPage.eea      |   2 +-
 .../lsp4j/FullDocumentDiagnosticReport.eea    |   2 +-
 .../UnchangedDocumentDiagnosticReport.eea     |   2 +-
 .../adapters/CodeActionResponseAdapter.eea    |   2 +-
 ...letionItemDefaultsEditRangeTypeAdapter.eea |   2 +-
 .../CompletionItemTextEditTypeAdapter.eea     |   2 +-
 .../adapters/DocumentChangeListAdapter.eea    |   2 +-
 .../DocumentDiagnosticReportTypeAdapter.eea   |   2 +-
 .../DocumentSymbolResponseAdapter.eea         |   2 +-
 .../adapters/HoverTypeAdapter$Factory.eea     |   2 +-
 .../lsp4j/adapters/HoverTypeAdapter.eea       |   2 +-
 .../InitializeParamsTypeAdapter$Factory.eea   |   2 +-
 .../adapters/InitializeParamsTypeAdapter.eea  |   2 +-
 .../adapters/InlineValueResponseAdapter.eea   |   2 +-
 .../adapters/LocationLinkListAdapter.eea      |   2 +-
 .../adapters/PrepareRenameResponseAdapter.eea |   2 +-
 .../adapters/ProgressNotificationAdapter.eea  |   2 +-
 .../adapters/ResourceOperationTypeAdapter.eea |   2 +-
 ...SemanticTokensFullDeltaResponseAdapter.eea |   2 +-
 .../SymbolInformationTypeAdapter$Factory.eea  |   2 +-
 .../adapters/SymbolInformationTypeAdapter.eea |   2 +-
 ...tDocumentIdentifierTypeAdapter$Factory.eea |   2 +-
 ...ionedTextDocumentIdentifierTypeAdapter.eea |   2 +-
 ...oneProgressNotificationAdapter$Factory.eea |   2 +-
 .../WorkDoneProgressNotificationAdapter.eea   |   2 +-
 ...aceDocumentDiagnosticReportListAdapter.eea |   2 +-
 .../WorkspaceSymbolLocationTypeAdapter.eea    |   2 +-
 .../WorkspaceSymbolResponseAdapter.eea        |   2 +-
 .../RestartArgumentsArgumentsTypeAdapter.eea  |   2 +-
 .../lsp4j/debug/launch/DSPLauncher.eea        |  12 +-
 .../debug/services/IDebugProtocolServer.eea   |  84 ++++++------
 .../lsp4j/jsonrpc/Launcher$Builder.eea        |  14 +-
 .../org/eclipse/lsp4j/jsonrpc/Launcher.eea    |  14 +-
 .../eclipse/lsp4j/jsonrpc/RemoteEndpoint.eea  |  14 +-
 .../jsonrpc/debug/DebugLauncher$Builder.eea   |   4 +-
 .../lsp4j/jsonrpc/debug/DebugLauncher.eea     |  10 +-
 .../jsonrpc/debug/DebugRemoteEndpoint.eea     |   6 +-
 .../adapters/DebugEnumTypeAdapter$Factory.eea |   2 +-
 .../debug/adapters/DebugEnumTypeAdapter.eea   |   2 +-
 .../DebugMessageTypeAdapter$Factory.eea       |   2 +-
 .../adapters/DebugMessageTypeAdapter.eea      |   4 +-
 .../messages/DebugNotificationMessage.eea     |   2 +-
 .../debug/messages/DebugResponseMessage.eea   |   2 +-
 .../json/ConcurrentMessageProcessor.eea       |   2 +-
 .../lsp4j/jsonrpc/json/MessageJsonHandler.eea |   6 +-
 .../jsonrpc/json/StreamMessageConsumer.eea    |   4 +-
 .../CollectionTypeAdapter$Factory.eea         |   4 +-
 .../json/adapters/CollectionTypeAdapter.eea   |   2 +-
 .../adapters/EitherTypeAdapter$Factory.eea    |   2 +-
 .../json/adapters/EitherTypeAdapter.eea       |   8 +-
 .../json/adapters/EnumTypeAdapter$Factory.eea |   2 +-
 .../jsonrpc/json/adapters/EnumTypeAdapter.eea |   2 +-
 .../JsonElementTypeAdapter$Factory.eea        |   2 +-
 .../adapters/MessageTypeAdapter$Factory.eea   |   2 +-
 .../json/adapters/MessageTypeAdapter.eea      |  10 +-
 .../adapters/ThrowableTypeAdapter$Factory.eea |   2 +-
 .../json/adapters/ThrowableTypeAdapter.eea    |   2 +-
 .../TupleTypeAdapters$TwoTypeAdapter.eea      |   2 +-
 ...upleTypeAdapters$TwoTypeAdapterFactory.eea |   2 +-
 .../lsp4j/jsonrpc/json/adapters/TypeUtils.eea |   2 +-
 .../lsp4j/jsonrpc/messages/CancelParams.eea   |   4 +-
 .../eclipse/lsp4j/jsonrpc/messages/Either.eea |   8 +-
 .../lsp4j/jsonrpc/messages/Either3.eea        |  16 +--
 .../jsonrpc/messages/IdentifiableMessage.eea  |   2 +-
 .../lsp4j/jsonrpc/messages/Message.eea        |   2 +-
 .../lsp4j/jsonrpc/messages/ResponseError.eea  |   2 +-
 .../eclipse/lsp4j/jsonrpc/messages/Tuple.eea  |   2 +-
 .../lsp4j/jsonrpc/services/AnnotationUtil.eea |  10 +-
 .../lsp4j/jsonrpc/services/EndpointProxy.eea  |   2 +-
 .../jsonrpc/services/ServiceEndpoints.eea     |   4 +-
 .../validation/ReflectiveMessageValidator.eea |   4 +-
 .../org/eclipse/lsp4j/launch/LSPLauncher.eea  |  12 +-
 .../eclipse/lsp4j/services/LanguageServer.eea |   2 +-
 .../lsp4j/services/WorkspaceService.eea       |  14 +-
 .../eclipse/lsp4j/util/DocumentSymbols.eea    |   2 +-
 .../ltk/core/refactoring/CompositeChange.eea  |   4 +-
 .../refactoring/CreateChangeOperation.eea     |   2 +-
 .../IValidationCheckResultQueryFactory.eea    |   2 +-
 .../refactoring/MultiStateTextFileChange.eea  |   4 +-
 .../ltk/core/refactoring/NullChange.eea       |   2 +-
 .../refactoring/PerformChangeOperation.eea    |   2 +-
 .../PerformRefactoringHistoryOperation.eea    |   8 +-
 .../refactoring/RefactoringContribution.eea   |   4 +-
 .../refactoring/RefactoringDescriptor.eea     |   6 +-
 .../RefactoringSessionDescriptor.eea          |   4 +-
 .../core/refactoring/RefactoringStatus.eea    |  28 ++--
 .../refactoring/RefactoringStatusEntry.eea    |   2 +-
 .../ltk/core/refactoring/TextChange.eea       |   2 +-
 .../ltk/core/refactoring/TextFileChange.eea   |   2 +-
 .../core/refactoring/UndoTextFileChange.eea   |   2 +-
 ...ctRefactoringDescriptorResourceMapping.eea |   4 +-
 ...tractRefactoringHistoryResourceMapping.eea |   4 +-
 .../participants/CheckConditionsContext.eea   |   2 +-
 .../participants/ParticipantManager.eea       |  10 +-
 .../ProcessorBasedRefactoring.eea             |   2 +-
 .../participants/RefactoringParticipant.eea   |   4 +-
 .../participants/RefactoringProcessor.eea     |   2 +-
 .../participants/ValidateEditChecker.eea      |   2 +-
 .../resource/DeleteResourcesDescriptor.eea    |   2 +-
 .../resource/MoveRenameResourceDescriptor.eea |   2 +-
 .../resource/MoveResourcesDescriptor.eea      |   2 +-
 .../resource/RenameResourceDescriptor.eea     |   2 +-
 .../ui/refactoring/RedoRefactoringAction.eea  |   4 +-
 .../ltk/ui/refactoring/RefactoringUI.eea      |  10 +-
 .../ltk/ui/refactoring/RefactoringWizard.eea  |   4 +-
 .../ui/refactoring/RefactoringWizardPage.eea  |   6 +-
 .../ltk/ui/refactoring/TextEditChangeNode.eea |   6 +-
 .../refactoring/TextStatusContextViewer.eea   |   2 +-
 .../ui/refactoring/UndoRefactoringAction.eea  |   4 +-
 .../ui/refactoring/UserInputWizardPage.eea    |   2 +-
 ...RefactoringHistoryControlConfiguration.eea |   4 +-
 .../history/RefactoringHistoryWizard.eea      |  18 +--
 ...AbstractSynchronizationContentProvider.eea |   2 +-
 ...meResourceRefactoringConfigurationPage.eea |   2 +-
 .../osgi/container/ModuleContainer.eea        |   8 +-
 .../osgi/container/ModuleContainerAdaptor.eea |  16 +--
 .../org/eclipse/osgi/container/ModuleWire.eea |   4 +-
 .../eclipse/osgi/container/ModuleWiring.eea   |  10 +-
 .../builders/OSGiManifestBuilderFactory.eea   |   4 +-
 .../eclipse/osgi/framework/util/ArrayMap.eea  |   8 +-
 .../util/CaseInsensitiveDictionaryMap.eea     |   4 +-
 .../eclipse/osgi/framework/util/FilePath.eea  |   2 +-
 .../eclipse/osgi/framework/util/Headers.eea   |   2 +-
 .../osgi/framework/util/SecureAction.eea      |   4 +-
 .../osgi/framework/util/ThreadInfoReport.eea  |   2 +-
 .../eclipse/osgi/launch/EquinoxFactory.eea    |   2 +-
 .../osgi/service/datalocation/Location.eea    |   2 +-
 .../osgi/service/resolver/PlatformAdmin.eea   |   2 +-
 ...eObjectFactory$StateObjectFactoryProxy.eea |  60 ++++-----
 .../service/resolver/StateObjectFactory.eea   |  60 ++++-----
 .../osgi/storage/BundleInfo$Generation.eea    |   6 +-
 .../org/eclipse/osgi/storage/BundleInfo.eea   |   2 +-
 .../eclipse/osgi/storage/PermissionData.eea   |   2 +-
 .../org/eclipse/osgi/storage/Storage.eea      |  18 +--
 .../org/eclipse/osgi/storage/StorageUtil.eea  |   2 +-
 .../eclipse/osgi/storage/SystemBundleFile.eea |   6 +-
 .../osgi/storage/bundlefile/BundleFile.eea    |   6 +-
 .../storage/bundlefile/BundleFileWrapper.eea  |   2 +-
 .../bundlefile/BundleFileWrapperChain.eea     |   2 +-
 .../bundlefile/CloseableBundleFile.eea        |   8 +-
 .../osgi/storage/bundlefile/DirBundleFile.eea |   6 +-
 .../storage/bundlefile/DirZipBundleEntry.eea  |   4 +-
 .../storage/bundlefile/FileBundleEntry.eea    |   2 +-
 .../bundlefile/NestedDirBundleFile.eea        |   6 +-
 .../storage/bundlefile/ZipBundleEntry.eea     |   4 +-
 .../osgi/storage/bundlefile/ZipBundleFile.eea |   2 +-
 .../storage/url/BundleResourceHandler.eea     |   6 +-
 .../osgi/storage/url/BundleURLConnection.eea  |   2 +-
 .../osgi/storage/url/reference/Handler.eea    |   2 +-
 .../osgi/storagemanager/StorageManager.eea    |  12 +-
 .../org/eclipse/osgi/util/ManifestElement.eea |   4 +-
 .../org/eclipse/osgi/util/TextProcessor.eea   |   2 +-
 .../search/core/text/TextSearchEngine.eea     |   6 +-
 .../ui/text/AbstractTextSearchViewPage.eea    |   8 +-
 .../search/ui/text/FileTextSearchScope.eea    |   6 +-
 .../ui/text/TextSearchQueryProvider.eea       |   8 +-
 .../eclipse/swt/accessibility/Accessible.eea  |   2 +-
 .../swt/accessibility/AccessibleListener.eea  |   8 +-
 .../resources/org/eclipse/swt/awt/SWT_AWT.eea |   2 +-
 .../eclipse/swt/browser/BrowserFunction.eea   |   2 +-
 .../eclipse/swt/browser/LocationListener.eea  |   4 +-
 .../eclipse/swt/browser/ProgressListener.eea  |   4 +-
 .../swt/browser/VisibilityWindowListener.eea  |   4 +-
 .../browser/WebBrowser$EvaluateFunction.eea   |   2 +-
 .../org/eclipse/swt/custom/CTabFolder.eea     |   6 +-
 .../swt/custom/CTabFolder2Listener.eea        |  12 +-
 .../eclipse/swt/custom/CTabFolderRenderer.eea |   2 +-
 .../org/eclipse/swt/custom/SashForm.eea       |   2 +-
 .../org/eclipse/swt/custom/StyledText.eea     |   8 +-
 .../org/eclipse/swt/dnd/ByteArrayTransfer.eea |   4 +-
 .../org/eclipse/swt/dnd/Clipboard.eea         |   6 +-
 .../org/eclipse/swt/dnd/DropTargetEffect.eea  |   2 +-
 .../org/eclipse/swt/dnd/FileTransfer.eea      |   2 +-
 .../org/eclipse/swt/dnd/HTMLTransfer.eea      |   2 +-
 .../org/eclipse/swt/dnd/ImageTransfer.eea     |   2 +-
 .../org/eclipse/swt/dnd/RTFTransfer.eea       |   2 +-
 .../org/eclipse/swt/dnd/TextTransfer.eea      |   2 +-
 .../org/eclipse/swt/dnd/URLTransfer.eea       |   2 +-
 .../org/eclipse/swt/graphics/Cursor.eea       |   2 +-
 .../org/eclipse/swt/graphics/Font.eea         |   4 +-
 .../org/eclipse/swt/graphics/FontData.eea     |   2 +-
 .../org/eclipse/swt/graphics/FontMetrics.eea  |   2 +-
 .../org/eclipse/swt/graphics/Image.eea        |   6 +-
 .../org/eclipse/swt/graphics/ImageData.eea    |   2 +-
 .../org/eclipse/swt/graphics/ImageLoader.eea  |   2 +-
 .../org/eclipse/swt/graphics/TextLayout.eea   |   8 +-
 .../eclipse/swt/ole/win32/OleAutomation.eea   |  28 ++--
 .../eclipse/swt/ole/win32/OleClientSite.eea   |   4 +-
 .../eclipse/swt/ole/win32/OleControlSite.eea  |   2 +-
 .../org/eclipse/swt/ole/win32/Variant.eea     |   2 +-
 .../org/eclipse/swt/opengl/GLCanvas.eea       |   2 +-
 .../org/eclipse/swt/printing/PrintDialog.eea  |   2 +-
 .../org/eclipse/swt/printing/Printer.eea      |   4 +-
 .../org/eclipse/swt/widgets/CoolBar.eea       |   6 +-
 .../org/eclipse/swt/widgets/Decorations.eea   |   4 +-
 .../eclipse/swt/widgets/DirectoryDialog.eea   |   2 +-
 .../org/eclipse/swt/widgets/Display.eea       |   4 +-
 .../org/eclipse/swt/widgets/ExpandBar.eea     |   2 +-
 .../org/eclipse/swt/widgets/FileDialog.eea    |   2 +-
 .../org/eclipse/swt/widgets/FontDialog.eea    |   4 +-
 .../resources/org/eclipse/swt/widgets/IME.eea |   4 +-
 .../org/eclipse/swt/widgets/List.eea          |   2 +-
 .../org/eclipse/swt/widgets/Menu.eea          |   6 +-
 .../org/eclipse/swt/widgets/Shell.eea         |   4 +-
 .../org/eclipse/swt/widgets/TabFolder.eea     |   4 +-
 .../org/eclipse/swt/widgets/Table.eea         |  10 +-
 .../org/eclipse/swt/widgets/TableItem.eea     |   2 +-
 .../org/eclipse/swt/widgets/TaskBar.eea       |   2 +-
 .../org/eclipse/swt/widgets/Text.eea          |   2 +-
 .../org/eclipse/swt/widgets/Tray.eea          |   2 +-
 .../org/eclipse/swt/widgets/Tree.eea          |   6 +-
 .../org/eclipse/swt/widgets/TreeItem.eea      |   4 +-
 .../org/eclipse/ui/ExtensionFactory.eea       |   2 +-
 .../org/eclipse/ui/IElementFactory.eea        |   2 +-
 .../resources/org/eclipse/ui/IMemento.eea     |   4 +-
 .../ui/INavigationLocationProvider.eea        |   4 +-
 .../resources/org/eclipse/ui/IPageLayout.eea  |   4 +-
 .../resources/org/eclipse/ui/IWorkbench.eea   |   2 +-
 .../org/eclipse/ui/IWorkingSetManager.eea     |  16 +--
 .../org/eclipse/ui/NavigationLocation.eea     |   2 +-
 .../resources/org/eclipse/ui/PlatformUI.eea   |   2 +-
 .../resources/org/eclipse/ui/Saveable.eea     |   2 +-
 .../eclipse/ui/SelectionListenerFactory.eea   |  12 +-
 .../org/eclipse/ui/SubActionBars.eea          |   6 +-
 .../org/eclipse/ui/SubActionBars2.eea         |   2 +-
 .../resources/org/eclipse/ui/XMLMemento.eea   |  30 ++---
 .../org/eclipse/ui/about/InstallationPage.eea |   2 +-
 .../org/eclipse/ui/actions/ActionFactory.eea  |   2 +-
 .../ui/actions/ContributionItemFactory.eea    |   2 +-
 .../actions/CopyFilesAndFoldersOperation.eea  |   6 +-
 .../eclipse/ui/actions/CopyProjectAction.eea  |   2 +-
 .../eclipse/ui/actions/CopyResourceAction.eea |   4 +-
 .../actions/MoveFilesAndFoldersOperation.eea  |   4 +-
 .../eclipse/ui/actions/MoveResourceAction.eea |   2 +-
 .../ui/actions/OpenPerspectiveAction.eea      |   2 +-
 .../eclipse/ui/actions/PerspectiveMenu.eea    |   2 +-
 .../eclipse/ui/actions/QuickMenuCreator.eea   |   6 +-
 .../org/eclipse/ui/actions/RefreshAction.eea  |   2 +-
 .../ui/actions/RenameResourceAction.eea       |   4 +-
 .../eclipse/ui/actions/WorkspaceAction.eea    |   2 +-
 .../activities/IWorkbenchActivitySupport.eea  |   2 +-
 .../ui/activities/WorkbenchActivityHelper.eea |  14 +-
 .../WorkbenchTriggerPointAdvisor.eea          |   2 +-
 .../ui/application/WorkbenchWindowAdvisor.eea |   4 +-
 .../org/eclipse/ui/browser/BrowserFactory.eea |   2 +-
 .../ui/browser/IWorkbenchBrowserSupport.eea   |   4 +-
 .../CheatSheetExtensionFactory.eea            |   2 +-
 .../cheatsheets/CheatSheetViewerFactory.eea   |   2 +-
 .../eclipse/ui/console/AbstractConsole.eea    |   2 +-
 .../org/eclipse/ui/console/IConsole.eea       |   2 +-
 .../org/eclipse/ui/console/IOConsole.eea      |   6 +-
 .../org/eclipse/ui/console/MessageConsole.eea |   4 +-
 .../org/eclipse/ui/console/TextConsole.eea    |  10 +-
 .../eclipse/ui/console/TextConsolePage.eea    |   2 +-
 .../eclipse/ui/console/TextConsoleViewer.eea  |   4 +-
 .../ui/contentassist/ContentAssistHandler.eea |   4 +-
 .../databinding/typed/WorkbenchProperties.eea |  14 +-
 .../AbstractElementListSelectionDialog.eea    |   6 +-
 .../ui/dialogs/CheckedTreeSelectionDialog.eea |   4 +-
 .../ui/dialogs/ElementTreeSelectionDialog.eea |   4 +-
 .../dialogs/FilteredItemsSelectionDialog.eea  |   4 +-
 .../org/eclipse/ui/dialogs/FilteredList.eea   |   4 +-
 .../FilteredResourcesSelectionDialog.eea      |   4 +-
 .../org/eclipse/ui/dialogs/FilteredTree.eea   |   8 +-
 .../dialogs/ListSelectionDialog$Builder.eea   |   2 +-
 .../ui/dialogs/ListSelectionDialog.eea        |   2 +-
 .../eclipse/ui/dialogs/PreferencesUtil.eea    |  10 +-
 .../ui/dialogs/PropertyDialogAction.eea       |   2 +-
 .../eclipse/ui/dialogs/SelectionDialog.eea    |   4 +-
 .../ui/dialogs/SelectionStatusDialog.eea      |   2 +-
 .../ui/dialogs/StyledStringHighlighter.eea    |   2 +-
 .../ui/dialogs/TwoPaneElementSelector.eea     |   6 +-
 .../ui/dialogs/WizardDataTransferPage.eea     |   8 +-
 .../ui/dialogs/WizardExportResourcesPage.eea  |   6 +-
 .../ui/dialogs/WizardNewFileCreationPage.eea  |   8 +-
 .../ui/dialogs/WizardNewFolderMainPage.eea    |   6 +-
 .../eclipse/ui/dialogs/WizardNewLinkPage.eea  |   2 +-
 .../dialogs/WizardNewProjectCreationPage.eea  |   2 +-
 .../dialogs/WizardNewProjectReferencePage.eea |   4 +-
 .../ui/dialogs/WizardResourceImportPage.eea   |   4 +-
 .../editors/text/DefaultEncodingSupport.eea   |  10 +-
 .../text/FileBufferOperationHandler.eea       |   2 +-
 .../ui/editors/text/FileDocumentProvider.eea  |  20 +--
 .../text/ForwardingDocumentProvider.eea       |  10 +-
 .../editors/text/StorageDocumentProvider.eea  |  16 +--
 .../eclipse/ui/editors/text/TextEditor.eea    |   4 +-
 .../TextFileDocumentProvider$NullProvider.eea |  12 +-
 .../editors/text/TextFileDocumentProvider.eea |  10 +-
 .../text/TextSourceViewerConfiguration.eea    |  16 +--
 .../ContributionContextTypeRegistry.eea       |   2 +-
 .../org/eclipse/ui/forms/DetailsPart.eea      |   2 +-
 .../org/eclipse/ui/forms/FormColors.eea       |   6 +-
 .../org/eclipse/ui/forms/IMessageManager.eea  |   2 +-
 .../eclipse/ui/forms/editor/FormEditor.eea    |  16 +--
 .../org/eclipse/ui/forms/editor/FormPage.eea  |   4 +-
 .../forms/editor/SharedHeaderFormEditor.eea   |   2 +-
 .../ui/forms/widgets/ExpandableComposite.eea  |   4 +-
 .../org/eclipse/ui/forms/widgets/FormText.eea |   6 +-
 .../eclipse/ui/forms/widgets/FormToolkit.eea  |  38 +++---
 .../ui/forms/widgets/ScrolledPageBook.eea     |   2 +-
 .../org/eclipse/ui/forms/widgets/Section.eea  |  12 +-
 .../ui/forms/widgets/SectionFactory.eea       |   2 +-
 .../eclipse/ui/forms/widgets/SizeCache.eea    |   2 +-
 .../org/eclipse/ui/handlers/HandlerUtil.eea   |  32 ++---
 .../eclipse/ui/handlers/IHandlerService.eea   |   6 +-
 .../org/eclipse/ui/help/AbstractHelpUI.eea    |   2 +-
 .../eclipse/ui/ide/FileStoreEditorInput.eea   |   2 +-
 .../ui/ide/FileStoreEditorInputFactory.eea    |   2 +-
 .../main/resources/org/eclipse/ui/ide/IDE.eea |  14 +-
 .../org/eclipse/ui/ide/IDEEncoding.eea        |   4 +-
 .../eclipse/ui/ide/ResourceSelectionUtil.eea  |   2 +-
 .../org/eclipse/ui/ide/ResourceUtil.eea       |   4 +-
 .../dialogs/AbstractEncodingFieldEditor.eea   |   2 +-
 .../ui/ide/dialogs/ImportTypeDialog.eea       |   2 +-
 .../dialogs/ResourceEncodingFieldEditor.eea   |   2 +-
 .../ide/dialogs/ResourceTreeAndListGroup.eea  |   2 +-
 .../dialogs/UIResourceFilterDescription.eea   |   2 +-
 .../ui/ide/undo/ResourceDescription.eea       |   6 +-
 .../eclipse/ui/ide/undo/WorkspaceUndoUtil.eea |   2 +-
 .../ui/intro/config/IntroConfigurer.eea       |   6 +-
 .../ui/intro/config/IntroURLFactory.eea       |   2 +-
 .../org/eclipse/ui/keys/CharacterKey.eea      |   2 +-
 .../org/eclipse/ui/keys/KeySequence.eea       |  12 +-
 .../org/eclipse/ui/keys/KeyStroke.eea         |  10 +-
 .../ui/menus/AbstractWorkbenchTrimWidget.eea  |   2 +-
 .../org/eclipse/ui/menus/MenuUtil.eea         |   8 +-
 .../org/eclipse/ui/model/WorkbenchAdapter.eea |  14 +-
 .../ui/model/WorkbenchLabelProvider.eea       |   2 +-
 .../ui/navigator/CommonDropAdapter.eea        |   2 +-
 .../eclipse/ui/navigator/CommonNavigator.eea  |  14 +-
 .../org/eclipse/ui/navigator/CommonViewer.eea |   4 +-
 .../ui/navigator/CommonViewerSiteFactory.eea  |   8 +-
 .../ui/navigator/INavigatorContentService.eea |   6 +-
 .../NavigatorContentServiceFactory.eea        |   4 +-
 .../ui/navigator/WizardActionGroup.eea        |   4 +-
 .../navigator/resources/ProjectExplorer.eea   |  10 +-
 .../eclipse/ui/part/EditorInputTransfer.eea   |   4 +-
 .../ui/part/FileEditorInputFactory.eea        |   4 +-
 .../org/eclipse/ui/part/MarkerTransfer.eea    |   2 +-
 .../org/eclipse/ui/part/MultiEditor.eea       |   4 +-
 .../eclipse/ui/part/MultiPageEditorPart.eea   |  16 +--
 .../eclipse/ui/part/MultiPageEditorSite.eea   |   8 +-
 .../org/eclipse/ui/part/PageBookView.eea      |  10 +-
 .../org/eclipse/ui/part/PluginDropAdapter.eea |   2 +-
 .../org/eclipse/ui/part/PluginTransfer.eea    |   2 +-
 .../org/eclipse/ui/part/ResourceTransfer.eea  |   2 +-
 .../ui/preferences/WizardPropertyPage.eea     |   2 +-
 .../ui/preferences/WorkingCopyManager.eea     |   2 +-
 .../progress/DeferredTreeContentManager.eea   |   6 +-
 .../ui/progress/PendingUpdateAdapter.eea      |   6 +-
 .../ui/services/AbstractServiceFactory.eea    |   2 +-
 .../ui/splash/AbstractSplashHandler.eea       |   2 +-
 .../eclipse/ui/splash/BasicSplashHandler.eea  |   2 +-
 .../AbstractStatusAreaProvider.eea            |   4 +-
 .../statushandlers/AbstractStatusHandler.eea  |   2 +-
 .../ui/statushandlers/StatusAdapter.eea       |   2 +-
 .../AbstractDecoratedTextEditor.eea           |  24 ++--
 .../texteditor/AbstractDocumentProvider.eea   |  20 +--
 .../AbstractMarkerAnnotationModel.eea         |   8 +-
 .../AbstractRulerActionDelegate.eea           |   2 +-
 .../ui/texteditor/AbstractTextEditor.eea      |  18 +--
 .../eclipse/ui/texteditor/AddMarkerAction.eea |   4 +-
 .../ui/texteditor/AnnotationPreference.eea    |   2 +-
 .../texteditor/AnnotationPreferenceLookup.eea |   2 +-
 .../ui/texteditor/AnnotationTypeLookup.eea    |   4 +-
 .../ui/texteditor/BasicMarkerUpdater.eea      |   2 +-
 .../ui/texteditor/BookmarkRulerAction.eea     |   2 +-
 .../DefaultMarkerAnnotationAccess.eea         |   2 +-
 .../texteditor/DocumentProviderRegistry.eea   |   2 +-
 .../HyperlinkDetectorDescriptor.eea           |   4 +-
 .../texteditor/HyperlinkDetectorRegistry.eea  |   4 +-
 .../HyperlinkDetectorTargetDescriptor.eea     |   2 +-
 .../ui/texteditor/MarkerAnnotation.eea        |   4 +-
 .../ui/texteditor/MarkerRulerAction.eea       |   8 +-
 .../eclipse/ui/texteditor/MarkerUtilities.eea |   2 +-
 .../ResourceMarkerAnnotationModelFactory.eea  |   2 +-
 .../ui/texteditor/SelectMarkerRulerAction.eea |   4 +-
 .../ui/texteditor/SelectRulerAction.eea       |   2 +-
 .../SourceViewerDecorationSupport.eea         |   2 +-
 .../ui/texteditor/StatusTextEditor.eea        |   6 +-
 .../eclipse/ui/texteditor/TaskRulerAction.eea |   2 +-
 .../ui/texteditor/TextNavigationAction.eea    |  16 +--
 .../ui/texteditor/quickdiff/QuickDiff.eea     |   6 +-
 .../quickdiff/ReferenceProviderDescriptor.eea |   2 +-
 .../rulers/RulerColumnDescriptor.eea          |   2 +-
 .../spelling/SpellingCorrectionProcessor.eea  |   2 +-
 .../spelling/SpellingEngineDescriptor.eea     |   4 +-
 .../spelling/SpellingReconcileStrategy.eea    |   2 +-
 .../texteditor/spelling/SpellingService.eea   |   4 +-
 .../templates/AbstractTemplatesPage.eea       |   4 +-
 ...platePreferencePage$EditTemplateDialog.eea |   2 +-
 .../templates/TemplatePreferencePage.eea      |   8 +-
 .../ui/texteditor/templates/TemplatesView.eea |  10 +-
 .../org/eclipse/ui/themes/ColorUtil.eea       |   6 +-
 .../org/eclipse/ui/themes/IColorFactory.eea   |   2 +-
 .../ui/themes/RGBBlendColorFactory.eea        |   2 +-
 .../org/eclipse/ui/views/IViewDescriptor.eea  |   2 +-
 .../views/contentoutline/ContentOutline.eea   |   6 +-
 .../eclipse/ui/views/framelist/FrameList.eea  |   2 +-
 .../views/framelist/TreeViewerFrameSource.eea |   8 +-
 .../eclipse/ui/views/markers/MarkerField.eea  |   4 +-
 .../eclipse/ui/views/markers/MarkerItem.eea   |   6 +-
 .../ui/views/markers/MarkerViewHandler.eea    |   2 +-
 .../ui/views/markers/MarkerViewUtil.eea       |   2 +-
 .../properties/ColorPropertyDescriptor.eea    |   2 +-
 .../properties/ComboBoxPropertyDescriptor.eea |   2 +-
 .../views/properties/FilePropertySource.eea   |   4 +-
 .../views/properties/IPropertyDescriptor.eea  |   2 +-
 .../views/properties/PropertyDescriptor.eea   |   2 +-
 .../properties/PropertyEditingSupport.eea     |   2 +-
 .../ui/views/properties/PropertySheet.eea     |  12 +-
 .../views/properties/PropertySheetEntry.eea   |  10 +-
 .../ui/views/properties/PropertySheetPage.eea |   2 +-
 .../properties/ResourcePropertySource.eea     |   4 +-
 .../properties/TextPropertyDescriptor.eea     |   2 +-
 ...tractOverridableTabListPropertySection.eea |   2 +-
 .../tabbed/AbstractSectionDescriptor.eea      |   6 +-
 .../tabbed/AbstractTabDescriptor.eea          |   6 +-
 .../properties/tabbed/ITabDescriptor.eea      |   2 +-
 .../views/properties/tabbed/TabContents.eea   |   2 +-
 .../tabbed/TabbedPropertySheetPage.eea        |   4 +-
 .../TabbedPropertySheetWidgetFactory.eea      |  26 ++--
 .../eclipse/ui/wizards/IWizardDescriptor.eea  |   2 +-
 .../FileStoreStructureProvider.eea            |   2 +-
 .../FileSystemStructureProvider.eea           |   4 +-
 .../datatransfer/PopulateRootOperation.eea    |   4 +-
 .../datatransfer/SelectFilesOperation.eea     |   2 +-
 .../datatransfer/ZipFileImportWizard.eea      |   2 +-
 .../datatransfer/ZipFileStructureProvider.eea |   2 +-
 .../main/resources/com/google/gson/Gson.eea   |   2 +-
 .../com/google/gson/InstanceCreator.eea       |   2 +-
 .../resources/com/google/gson/JsonArray.eea   |   4 +-
 .../resources/com/google/gson/JsonObject.eea  |   2 +-
 .../com/google/common/base/Ascii.eea          |   2 +-
 .../com/google/common/base/CaseFormat.eea     |   2 +-
 .../com/google/common/base/CharMatcher.eea    |  22 ++--
 .../com/google/common/base/Converter.eea      |   4 +-
 .../com/google/common/base/Enums.eea          |   2 +-
 .../com/google/common/base/Equivalence.eea    |   8 +-
 .../com/google/common/base/Functions.eea      |  12 +-
 .../google/common/base/Joiner$MapJoiner.eea   |   2 +-
 .../com/google/common/base/Joiner.eea         |  12 +-
 .../com/google/common/base/Predicates.eea     |  26 ++--
 .../com/google/common/base/Splitter.eea       |   8 +-
 .../com/google/common/base/Stopwatch.eea      |   8 +-
 .../com/google/common/base/Suppliers.eea      |   8 +-
 .../com/google/common/base/Throwables.eea     |   4 +-
 .../com/google/common/cache/AbstractCache.eea |   2 +-
 .../com/google/common/cache/CacheBuilder.eea  |   4 +-
 .../google/common/cache/CacheBuilderSpec.eea  |   2 +-
 .../com/google/common/cache/CacheLoader.eea   |   8 +-
 .../common/cache/RemovalNotification.eea      |   2 +-
 .../common/collect/ArrayListMultimap.eea      |   6 +-
 .../com/google/common/collect/ArrayTable.eea  |   4 +-
 .../google/common/collect/Collections2.eea    |   6 +-
 .../com/google/common/collect/Comparators.eea |   2 +-
 .../common/collect/ConcurrentHashMultiset.eea |   8 +-
 .../google/common/collect/ContiguousSet.eea   |   4 +-
 .../google/common/collect/DiscreteDomain.eea  |   4 +-
 .../com/google/common/collect/EnumBiMap.eea   |   4 +-
 .../google/common/collect/EnumHashBiMap.eea   |   4 +-
 .../google/common/collect/EnumMultiset.eea    |   6 +-
 .../google/common/collect/EvictingQueue.eea   |   2 +-
 .../google/common/collect/FluentIterable.eea  |   4 +-
 .../common/collect/ForwardingMapEntry.eea     |   2 +-
 .../common/collect/ForwardingMultiset.eea     |   2 +-
 ...dingNavigableMap$StandardDescendingMap.eea |   2 +-
 .../google/common/collect/HashMultiset.eea    |   6 +-
 .../common/collect/ImmutableBiMap$Builder.eea |   2 +-
 .../google/common/collect/ImmutableBiMap.eea  |   6 +-
 .../collect/ImmutableClassToInstanceMap.eea   |   4 +-
 .../google/common/collect/ImmutableList.eea   |  10 +-
 .../common/collect/ImmutableListMultimap.eea  |   8 +-
 .../google/common/collect/ImmutableMap.eea    |   2 +-
 .../common/collect/ImmutableMultimap.eea      |   8 +-
 .../common/collect/ImmutableMultiset.eea      |   4 +-
 .../common/collect/ImmutableRangeMap.eea      |   4 +-
 .../common/collect/ImmutableRangeSet.eea      |   2 +-
 .../google/common/collect/ImmutableSet.eea    |   2 +-
 .../common/collect/ImmutableSetMultimap.eea   |   8 +-
 .../collect/ImmutableSortedMap$Builder.eea    |   2 +-
 .../common/collect/ImmutableSortedMap.eea     |  36 +++---
 .../collect/ImmutableSortedMultiset.eea       |  26 ++--
 .../common/collect/ImmutableSortedSet.eea     |  28 ++--
 .../google/common/collect/ImmutableTable.eea  |   4 +-
 .../com/google/common/collect/Interners.eea   |   4 +-
 .../com/google/common/collect/Iterables.eea   |  18 +--
 .../com/google/common/collect/Iterators.eea   |  18 +--
 .../common/collect/LinkedHashMultimap.eea     |   6 +-
 .../common/collect/LinkedHashMultiset.eea     |   6 +-
 .../common/collect/LinkedListMultimap.eea     |   8 +-
 .../com/google/common/collect/Lists.eea       |  26 ++--
 .../com/google/common/collect/Maps.eea        |  58 ++++-----
 .../collect/MinMaxPriorityQueue$Builder.eea   |   4 +-
 .../common/collect/MinMaxPriorityQueue.eea    |   6 +-
 ...ultimapBuilder$MultimapBuilderWithKeys.eea |  12 +-
 .../google/common/collect/MultimapBuilder.eea |   8 +-
 .../com/google/common/collect/Multimaps.eea   |  18 +--
 .../com/google/common/collect/Multisets.eea   |  14 +-
 .../collect/MutableClassToInstanceMap.eea     |   6 +-
 .../com/google/common/collect/Ordering.eea    |  14 +-
 .../com/google/common/collect/Queues.eea      |  32 ++---
 .../com/google/common/collect/Sets.eea        |  30 ++---
 .../com/google/common/collect/Tables.eea      |  12 +-
 .../google/common/collect/TreeBasedTable.eea  |   8 +-
 .../google/common/collect/TreeMultiset.eea    |   6 +-
 .../google/common/collect/TreeRangeMap.eea    |   6 +-
 .../google/common/collect/TreeRangeSet.eea    |   8 +-
 .../google/common/collect/TreeTraverser.eea   |   8 +-
 .../common/escape/ArrayBasedEscaperMap.eea    |   2 +-
 .../common/escape/CharEscaperBuilder.eea      |   4 +-
 .../com/google/common/escape/Escapers.eea     |   2 +-
 .../google/common/graph/AbstractNetwork.eea   |   2 +-
 .../common/graph/AbstractValueGraph.eea       |   2 +-
 .../com/google/common/graph/ElementOrder.eea  |  10 +-
 .../com/google/common/graph/EndpointPair.eea  |   4 +-
 .../com/google/common/graph/GraphBuilder.eea  |   2 +-
 .../google/common/graph/ImmutableNetwork.eea  |   4 +-
 .../common/graph/ImmutableValueGraph.eea      |   4 +-
 .../google/common/graph/NetworkBuilder.eea    |   2 +-
 .../com/google/common/graph/Traverser.eea     |  10 +-
 .../google/common/graph/ValueGraphBuilder.eea |   2 +-
 .../com/google/common/hash/BloomFilter.eea    |  10 +-
 .../com/google/common/hash/Funnels.eea        |   6 +-
 .../com/google/common/hash/HashCode.eea       |   4 +-
 .../com/google/common/hash/Hashing.eea        |  10 +-
 .../com/google/common/io/BaseEncoding.eea     |   6 +-
 .../com/google/common/io/ByteSink.eea         |   4 +-
 .../com/google/common/io/ByteSource.eea       |  10 +-
 .../com/google/common/io/ByteStreams.eea      |   6 +-
 .../com/google/common/io/CharSink.eea         |   2 +-
 .../com/google/common/io/CharSource.eea       |   8 +-
 .../com/google/common/io/CharStreams.eea      |   4 +-
 .../resources/com/google/common/io/Closer.eea |   8 +-
 .../resources/com/google/common/io/Files.eea  |  12 +-
 .../com/google/common/io/MoreFiles.eea        |   8 +-
 .../com/google/common/io/Resources.eea        |   2 +-
 ...sformation$LinearTransformationBuilder.eea |   2 +-
 .../common/math/LinearTransformation.eea      |   6 +-
 .../com/google/common/math/PairedStats.eea    |   2 +-
 .../google/common/math/Quantiles$Scale.eea    |   6 +-
 .../com/google/common/math/Quantiles.eea      |   2 +-
 .../com/google/common/net/HostAndPort.eea     |   2 +-
 .../com/google/common/net/HostSpecifier.eea   |   2 +-
 .../com/google/common/net/InetAddresses.eea   |   2 +-
 .../google/common/net/InternetDomainName.eea  |   2 +-
 .../com/google/common/net/MediaType.eea       |   2 +-
 .../com/google/common/primitives/Booleans.eea |   4 +-
 .../com/google/common/primitives/Bytes.eea    |   2 +-
 .../com/google/common/primitives/Chars.eea    |   4 +-
 .../com/google/common/primitives/Doubles.eea  |   4 +-
 .../com/google/common/primitives/Floats.eea   |   4 +-
 .../primitives/ImmutableDoubleArray.eea       |  10 +-
 .../common/primitives/ImmutableIntArray.eea   |  10 +-
 .../common/primitives/ImmutableLongArray.eea  |  10 +-
 .../com/google/common/primitives/Ints.eea     |   4 +-
 .../com/google/common/primitives/Longs.eea    |   6 +-
 .../com/google/common/primitives/Shorts.eea   |   4 +-
 .../google/common/primitives/SignedBytes.eea  |   2 +-
 .../common/primitives/UnsignedBytes.eea       |   2 +-
 .../common/primitives/UnsignedInteger.eea     |   2 +-
 .../google/common/primitives/UnsignedInts.eea |   2 +-
 .../google/common/primitives/UnsignedLong.eea |   2 +-
 .../common/primitives/UnsignedLongs.eea       |   2 +-
 .../com/google/common/reflect/ClassPath.eea   |   2 +-
 .../reflect/ImmutableTypeToInstanceMap.eea    |   4 +-
 .../com/google/common/reflect/Invokable.eea   |   4 +-
 .../common/reflect/TypeToken$TypeSet.eea      |   4 +-
 .../com/google/common/reflect/TypeToken.eea   |  12 +-
 .../AbstractScheduledService$Scheduler.eea    |   4 +-
 .../common/util/concurrent/AtomicLongMap.eea  |   4 +-
 .../google/common/util/concurrent/Atomics.eea |   8 +-
 .../concurrent/ClosingFuture$Combiner.eea     |   4 +-
 .../common/util/concurrent/ClosingFuture.eea  |  18 +--
 ...ectingLockFactory$WithExplicitOrdering.eea |   4 +-
 .../concurrent/CycleDetectingLockFactory.eea  |   8 +-
 .../util/concurrent/ExecutionSequencer.eea    |   2 +-
 .../common/util/concurrent/FluentFuture.eea   |   2 +-
 .../util/concurrent/ListenableFutureTask.eea  |   4 +-
 .../google/common/util/concurrent/Monitor.eea |   2 +-
 .../common/util/concurrent/MoreExecutors.eea  |   8 +-
 .../common/util/concurrent/RateLimiter.eea    |   6 +-
 .../util/concurrent/SimpleTimeLimiter.eea     |   2 +-
 .../concurrent/UncaughtExceptionHandlers.eea  |   2 +-
 .../annotation/JacksonInject$Value.eea        |   2 +-
 .../annotation/JsonAutoDetect$Value.eea       |   4 +-
 .../annotation/JsonFormat$Features.eea        |   8 +-
 .../jackson/annotation/JsonFormat$Value.eea   |  12 +-
 .../annotation/JsonIgnoreProperties$Value.eea |   2 +-
 .../jackson/annotation/JsonInclude$Value.eea  |   2 +-
 .../JsonIncludeProperties$Value.eea           |   2 +-
 .../jackson/annotation/JsonSetter$Value.eea   |   2 +-
 .../jackson/annotation/JsonTypeInfo$Value.eea |   4 +-
 ...bjectIdGenerators$IntSequenceGenerator.eea |   6 +-
 .../ObjectIdGenerators$StringIdGenerator.eea  |   4 +-
 .../ObjectIdGenerators$UUIDGenerator.eea      |   2 +-
 .../jackson/annotation/OptBoolean.eea         |   2 +-
 .../annotation/SimpleObjectIdResolver.eea     |   2 +-
 .../fasterxml/jackson/core/Base64Variant.eea  |   6 +-
 .../jackson/core/ErrorReportConfiguration.eea |   4 +-
 .../fasterxml/jackson/core/JsonFactory.eea    |  40 +++---
 .../fasterxml/jackson/core/JsonGenerator.eea  |  12 +-
 .../fasterxml/jackson/core/JsonLocation.eea   |   2 +-
 .../jackson/core/JsonParseException.eea       |   2 +-
 .../com/fasterxml/jackson/core/JsonParser.eea |  18 +--
 .../fasterxml/jackson/core/JsonPointer.eea    |   6 +-
 .../jackson/core/JsonProcessingException.eea  |   4 +-
 .../jackson/core/JsonStreamContext.eea        |   6 +-
 .../com/fasterxml/jackson/core/JsonToken.eea  |   2 +-
 .../jackson/core/JsonpCharacterEscapes.eea    |   2 +-
 .../fasterxml/jackson/core/ObjectCodec.eea    |   4 +-
 .../jackson/core/StreamReadConstraints.eea    |   8 +-
 .../jackson/core/StreamWriteConstraints.eea   |   8 +-
 .../com/fasterxml/jackson/core/TSFBuilder.eea |   2 +-
 .../jackson/core/TokenStreamFactory.eea       |  44 +++----
 .../com/fasterxml/jackson/core/TreeCodec.eea  |   8 +-
 .../com/fasterxml/jackson/core/Version.eea    |   2 +-
 .../jackson/core/base/GeneratorBase.eea       |   2 +-
 .../jackson/core/base/ParserBase.eea          |   8 +-
 .../jackson/core/base/ParserMinimalBase.eea   |   8 +-
 .../jackson/core/exc/StreamReadException.eea  |   2 +-
 .../core/filter/FilteringParserDelegate.eea   |   4 +-
 .../core/filter/JsonPointerBasedFilter.eea    |   6 +-
 .../core/filter/TokenFilterContext.eea        |  12 +-
 .../jackson/core/format/DataFormatMatcher.eea |   4 +-
 .../jackson/core/format/InputAccessor$Std.eea |   2 +-
 .../jackson/core/io/ContentReference.eea      |  16 +--
 .../fasterxml/jackson/core/io/IOContext.eea   |   2 +-
 .../jackson/core/io/InputDecorator.eea        |   2 +-
 .../fasterxml/jackson/core/io/UTF8Writer.eea  |   2 +-
 .../jackson/core/json/DupDetector.eea         |   8 +-
 .../jackson/core/json/JsonGeneratorImpl.eea   |   4 +-
 .../jackson/core/json/JsonParserBase.eea      |   2 +-
 .../jackson/core/json/JsonReadContext.eea     |  10 +-
 .../jackson/core/json/JsonWriteContext.eea    |  14 +-
 .../core/json/ReaderBasedJsonParser.eea       |  14 +-
 .../core/json/UTF8DataInputJsonParser.eea     |  16 +--
 .../jackson/core/json/UTF8JsonGenerator.eea   |   2 +-
 .../core/json/UTF8StreamJsonParser.eea        |  14 +-
 .../core/json/WriterBasedJsonGenerator.eea    |   2 +-
 .../async/NonBlockingByteBufferJsonParser.eea |   2 +-
 .../json/async/NonBlockingJsonParserBase.eea  |   8 +-
 .../async/NonBlockingUtf8JsonParserBase.eea   |   6 +-
 .../core/sym/ByteQuadsCanonicalizer.eea       |  12 +-
 .../core/sym/CharsToNameCanonicalizer.eea     |   8 +-
 .../com/fasterxml/jackson/core/sym/NameN.eea  |   2 +-
 .../jackson/core/util/BufferRecycler.eea      |   4 +-
 .../jackson/core/util/BufferRecyclers.eea     |   2 +-
 .../jackson/core/util/ByteArrayBuilder.eea    |   2 +-
 .../core/util/DefaultPrettyPrinter.eea        |   4 +-
 .../jackson/core/util/Instantiatable.eea      |   2 +-
 .../jackson/core/util/JacksonFeatureSet.eea   |   8 +-
 .../core/util/JsonGeneratorDelegate.eea       |   8 +-
 .../jackson/core/util/JsonParserDelegate.eea  |  12 +-
 .../jackson/core/util/JsonParserSequence.eea  |   8 +-
 .../util/JsonRecyclerPools$BoundedPool.eea    |   4 +-
 .../JsonRecyclerPools$ConcurrentDequePool.eea |   2 +-
 .../util/JsonRecyclerPools$LockFreePool.eea   |   2 +-
 .../JsonRecyclerPools$NonRecyclingPool.eea    |   2 +-
 .../util/RecyclerPool$StatefulImplBase.eea    |   2 +-
 .../jackson/core/util/Separators$Spacing.eea  |   2 +-
 .../jackson/core/util/Separators.eea          |   2 +-
 .../jackson/core/util/TextBuffer.eea          |   2 +-
 .../jackson/core/util/VersionUtil.eea         |   2 +-
 .../jackson/databind/AbstractTypeResolver.eea |   6 +-
 ...notationIntrospector$ReferenceProperty.eea |   4 +-
 .../databind/AnnotationIntrospector.eea       | 114 ++++++++--------
 .../jackson/databind/BeanDescription.eea      |   8 +-
 .../jackson/databind/BeanProperty$Bogus.eea   |  12 +-
 .../jackson/databind/BeanProperty$Std.eea     |   4 +-
 .../jackson/databind/DatabindContext.eea      |  12 +-
 .../databind/DeserializationConfig.eea        |  12 +-
 .../databind/DeserializationContext.eea       |  32 ++---
 .../fasterxml/jackson/databind/JavaType.eea   |   6 +-
 .../jackson/databind/JsonMappingException.eea |  22 ++--
 .../fasterxml/jackson/databind/JsonNode.eea   |   2 +-
 .../jackson/databind/JsonSerializer.eea       |   6 +-
 .../jackson/databind/MappingIterator.eea      |   6 +-
 ...bjectMapper$DefaultTypeResolverBuilder.eea |   6 +-
 .../jackson/databind/ObjectMapper.eea         |  10 +-
 .../jackson/databind/ObjectReader.eea         |  50 +++----
 .../jackson/databind/ObjectWriter.eea         |  12 +-
 .../databind/PropertyMetadata$MergeInfo.eea   |   6 +-
 ...amingStrategies$UpperSnakeCaseStrategy.eea |   2 +-
 .../jackson/databind/SerializationConfig.eea  |  14 +-
 .../jackson/databind/SerializerProvider.eea   |  18 +--
 .../jackson/databind/cfg/CoercionConfigs.eea  |   4 +-
 .../jackson/databind/cfg/ConfigOverrides.eea  |   6 +-
 .../databind/cfg/ContextAttributes$Impl.eea   |   8 +-
 .../jackson/databind/cfg/DatatypeFeatures.eea |   2 +-
 .../databind/cfg/DefaultCacheProvider.eea     |   4 +-
 .../cfg/DeserializerFactoryConfig.eea         |  10 +-
 .../databind/cfg/HandlerInstantiator.eea      |  14 +-
 .../jackson/databind/cfg/MapperBuilder.eea    |   2 +-
 .../jackson/databind/cfg/MapperConfig.eea     |   4 +-
 .../jackson/databind/cfg/MapperConfigBase.eea |   4 +-
 .../databind/cfg/MutableCoercionConfig.eea    |   2 +-
 .../databind/cfg/MutableConfigOverride.eea    |   2 +-
 .../databind/cfg/SerializerFactoryConfig.eea  |   6 +-
 .../databind/deser/AbstractDeserializer.eea   |   6 +-
 .../deser/BasicDeserializerFactory.eea        |  52 ++++----
 .../databind/deser/BeanDeserializer.eea       |  10 +-
 .../databind/deser/BeanDeserializerBase.eea   |  10 +-
 .../deser/BeanDeserializerBuilder.eea         |   2 +-
 .../deser/BeanDeserializerFactory.eea         |  10 +-
 .../deser/BuilderBasedDeserializer.eea        |  10 +-
 .../databind/deser/ContextualDeserializer.eea |   2 +-
 .../deser/ContextualKeyDeserializer.eea       |   2 +-
 .../databind/deser/CreatorProperty.eea        |  10 +-
 .../DataFormatReaders$AccessorForReader.eea   |   2 +-
 .../deser/DataFormatReaders$Match.eea         |   2 +-
 .../DefaultDeserializationContext$Impl.eea    |  10 +-
 .../deser/DefaultDeserializationContext.eea   |  12 +-
 .../deser/DeserializationProblemHandler.eea   |   4 +-
 .../databind/deser/DeserializerCache.eea      |  10 +-
 .../databind/deser/DeserializerFactory.eea    |  22 ++--
 .../databind/deser/Deserializers$Base.eea     |  18 +--
 .../databind/deser/SettableAnyProperty.eea    |   6 +-
 .../deser/SettableBeanProperty$Delegating.eea |   4 +-
 .../databind/deser/SettableBeanProperty.eea   |   6 +-
 .../databind/deser/ValueInstantiator$Base.eea |   2 +-
 .../deser/ValueInstantiator$Delegating.eea    |  42 +++---
 .../databind/deser/ValueInstantiator.eea      |  46 +++----
 .../impl/BeanAsArrayBuilderDeserializer.eea   |   2 +-
 .../deser/impl/BeanAsArrayDeserializer.eea    |   2 +-
 .../databind/deser/impl/BeanPropertyMap.eea   |  10 +-
 .../deser/impl/CreatorCandidate$Param.eea     |   2 +-
 .../databind/deser/impl/CreatorCandidate.eea  |   8 +-
 .../databind/deser/impl/CreatorCollector.eea  |   2 +-
 .../deser/impl/ErrorThrowingDeserializer.eea  |   2 +-
 .../deser/impl/ExternalTypeHandler.eea        |   6 +-
 .../deser/impl/FailingDeserializer.eea        |   2 +-
 .../databind/deser/impl/FieldProperty.eea     |   4 +-
 .../deser/impl/JDKValueInstantiators.eea      |   2 +-
 .../impl/JavaUtilCollectionsDeserializers.eea |   4 +-
 .../deser/impl/ManagedReferenceProperty.eea   |   2 +-
 .../impl/MergingSettableBeanProperty.eea      |   4 +-
 .../databind/deser/impl/MethodProperty.eea    |   8 +-
 .../databind/deser/impl/NullsFailProvider.eea |   6 +-
 .../databind/deser/impl/ObjectIdReader.eea    |   2 +-
 .../deser/impl/ObjectIdReferenceProperty.eea  |   6 +-
 .../deser/impl/ObjectIdValueProperty.eea      |  10 +-
 .../deser/impl/PropertyBasedCreator.eea       |   4 +-
 .../impl/PropertyBasedObjectIdGenerator.eea   |   6 +-
 .../deser/impl/SetterlessProperty.eea         |   4 +-
 .../impl/UnsupportedTypeDeserializer.eea      |   2 +-
 .../deser/impl/UnwrappedPropertyHandler.eea   |   2 +-
 .../std/ArrayBlockingQueueDeserializer.eea    |   2 +-
 .../deser/std/AtomicIntegerDeserializer.eea   |   2 +-
 .../deser/std/AtomicReferenceDeserializer.eea |   4 +-
 ...ializer$CollectionReferringAccumulator.eea |   2 +-
 .../deser/std/CollectionDeserializer.eea      |   4 +-
 .../deser/std/ContainerDeserializerBase.eea   |   2 +-
 ...DateDeserializers$CalendarDeserializer.eea |   4 +-
 ...ateDeserializers$DateBasedDeserializer.eea |   4 +-
 .../DateDeserializers$DateDeserializer.eea    |   2 +-
 .../DateDeserializers$SqlDateDeserializer.eea |   4 +-
 ...ateDeserializers$TimestampDeserializer.eea |   4 +-
 .../databind/deser/std/DateDeserializers.eea  |   2 +-
 .../deser/std/DelegatingDeserializer.eea      |   2 +-
 .../databind/deser/std/EnumDeserializer.eea   |   6 +-
 .../deser/std/EnumMapDeserializer.eea         |   4 +-
 .../deser/std/EnumSetDeserializer.eea         |   2 +-
 .../deser/std/FromStringDeserializer.eea      |   2 +-
 .../databind/deser/std/JdkDeserializers.eea   |   2 +-
 .../deser/std/JsonLocationInstantiator.eea    |   4 +-
 .../deser/std/JsonNodeDeserializer.eea        |   2 +-
 .../databind/deser/std/MapDeserializer.eea    |   4 +-
 .../deser/std/MapEntryDeserializer.eea        |   6 +-
 .../deser/std/NullifyingDeserializer.eea      |   2 +-
 .../deser/std/NumberDeserializers.eea         |   2 +-
 .../deser/std/ObjectArrayDeserializer.eea     |   4 +-
 .../deser/std/PrimitiveArrayDeserializers.eea |   2 +-
 .../deser/std/ReferenceTypeDeserializer.eea   |   2 +-
 .../std/StackTraceElementDeserializer.eea     |   4 +-
 .../deser/std/StdDelegatingDeserializer.eea   |   6 +-
 .../databind/deser/std/StdDeserializer.eea    |  28 ++--
 .../databind/deser/std/StdKeyDeserializer.eea |   4 +-
 .../deser/std/StdKeyDeserializers.eea         |  12 +-
 .../deser/std/StdValueInstantiator.eea        |  40 +++---
 .../deser/std/StringArrayDeserializer.eea     |   2 +-
 .../std/StringCollectionDeserializer.eea      |   2 +-
 .../deser/std/ThrowableDeserializer.eea       |   2 +-
 .../std/UntypedObjectDeserializer$Vanilla.eea |   2 +-
 .../deser/std/UntypedObjectDeserializer.eea   |   6 +-
 .../databind/exc/IgnoredPropertyException.eea |   2 +-
 .../exc/InvalidDefinitionException.eea        |   8 +-
 .../databind/exc/InvalidFormatException.eea   |   2 +-
 .../databind/exc/InvalidNullException.eea     |   2 +-
 .../databind/exc/InvalidTypeIdException.eea   |   2 +-
 .../databind/exc/MismatchedInputException.eea |   4 +-
 .../databind/exc/PropertyBindingException.eea |   4 +-
 .../exc/UnrecognizedPropertyException.eea     |   2 +-
 .../exc/ValueInstantiationException.eea       |   4 +-
 .../databind/ext/CoreXMLDeserializers.eea     |   2 +-
 ...alizers$XMLGregorianCalendarSerializer.eea |   4 +-
 .../databind/ext/CoreXMLSerializers.eea       |   2 +-
 .../databind/ext/Java7HandlersImpl.eea        |   4 +-
 .../jackson/databind/ext/Java7SupportImpl.eea |   6 +-
 .../databind/ext/OptionalHandlerFactory.eea   |   4 +-
 .../AccessorNamingStrategy$Base.eea           |   6 +-
 .../introspect/AnnotatedAndMetadata.eea       |   2 +-
 .../introspect/AnnotatedConstructor.eea       |   6 +-
 .../databind/introspect/AnnotatedMember.eea   |   4 +-
 .../databind/introspect/AnnotatedMethod.eea   |   6 +-
 .../introspect/AnnotatedMethodMap.eea         |   4 +-
 .../introspect/AnnotatedParameter.eea         |   6 +-
 .../introspect/AnnotatedWithParams.eea        |   4 +-
 .../AnnotationCollector$NoAnnotations.eea     |   2 +-
 .../AnnotationCollector$OneAnnotation.eea     |   2 +-
 .../AnnotationCollector$TwoAnnotations.eea    |   2 +-
 .../introspect/AnnotationCollector.eea        |   2 +-
 .../introspect/AnnotationIntrospectorPair.eea | 116 ++++++++---------
 .../databind/introspect/AnnotationMap.eea     |   4 +-
 .../introspect/BasicBeanDescription.eea       |  36 +++---
 .../introspect/BasicClassIntrospector.eea     |  10 +-
 .../introspect/BeanPropertyDefinition.eea     |   6 +-
 ...NamingStrategy$FirstCharBasedValidator.eea |   2 +-
 ...DefaultAccessorNamingStrategy$Provider.eea |   4 +-
 ...ultAccessorNamingStrategy$RecordNaming.eea |   2 +-
 .../DefaultAccessorNamingStrategy.eea         |  10 +-
 .../introspect/EnumNamingStrategyFactory.eea  |   2 +-
 .../JacksonAnnotationIntrospector.eea         | 122 +++++++++---------
 .../introspect/POJOPropertiesCollector.eea    |  16 +--
 .../introspect/POJOPropertyBuilder.eea        |  24 ++--
 .../introspect/SimpleMixInResolver.eea        |   6 +-
 .../introspect/VirtualAnnotatedMember.eea     |   6 +-
 .../JsonFormatVisitorWrapper$Base.eea         |  18 +--
 .../BasicPolymorphicTypeValidator.eea         |   2 +-
 .../databind/jsontype/TypeDeserializer.eea    |   2 +-
 .../databind/jsontype/TypeSerializer.eea      |   2 +-
 .../jsontype/impl/AsArrayTypeDeserializer.eea |   4 +-
 .../jsontype/impl/AsArrayTypeSerializer.eea   |   2 +-
 .../impl/AsDeductionTypeDeserializer.eea      |   4 +-
 .../impl/AsDeductionTypeSerializer.eea        |   2 +-
 .../impl/AsExternalTypeDeserializer.eea       |   2 +-
 .../impl/AsExternalTypeSerializer.eea         |   2 +-
 .../impl/AsPropertyTypeDeserializer.eea       |   4 +-
 .../impl/AsPropertyTypeSerializer.eea         |   2 +-
 .../impl/AsWrapperTypeDeserializer.eea        |   2 +-
 .../jsontype/impl/AsWrapperTypeSerializer.eea |   2 +-
 .../jsontype/impl/ClassNameIdResolver.eea     |   6 +-
 .../impl/MinimalClassNameIdResolver.eea       |   2 +-
 .../jsontype/impl/SimpleNameIdResolver.eea    |   6 +-
 .../jsontype/impl/StdSubtypeResolver.eea      |   8 +-
 .../jsontype/impl/StdTypeResolverBuilder.eea  |  10 +-
 .../jsontype/impl/TypeDeserializerBase.eea    |   2 +-
 .../jsontype/impl/TypeIdResolverBase.eea      |   4 +-
 .../jsontype/impl/TypeNameIdResolver.eea      |   6 +-
 .../jsontype/impl/TypeSerializerBase.eea      |   4 +-
 .../module/SimpleAbstractTypeResolver.eea     |   6 +-
 .../databind/module/SimpleDeserializers.eea   |  18 +--
 .../module/SimpleKeyDeserializers.eea         |   2 +-
 .../databind/module/SimpleSerializers.eea     |  14 +-
 .../jackson/databind/node/ArrayNode.eea       |   8 +-
 .../jackson/databind/node/BaseJsonNode.eea    |  10 +-
 .../jackson/databind/node/ContainerNode.eea   |   2 +-
 .../jackson/databind/node/JsonNodeFactory.eea |  12 +-
 .../databind/node/NodeCursor$ArrayCursor.eea  |   4 +-
 .../databind/node/NodeCursor$ObjectCursor.eea |   4 +-
 .../databind/node/NodeCursor$RootCursor.eea   |   8 +-
 .../jackson/databind/node/ObjectNode.eea      |   8 +-
 .../databind/node/TreeTraversingParser.eea    |  10 +-
 .../jackson/databind/node/ValueNode.eea       |   2 +-
 .../databind/ser/BasicSerializerFactory.eea   |  44 +++----
 .../databind/ser/BeanPropertyWriter.eea       |  10 +-
 .../jackson/databind/ser/BeanSerializer.eea   |  16 +--
 .../databind/ser/BeanSerializerBuilder.eea    |   2 +-
 .../databind/ser/BeanSerializerFactory.eea    |  14 +-
 .../databind/ser/ContextualSerializer.eea     |   2 +-
 .../ser/DefaultSerializerProvider$Impl.eea    |   6 +-
 .../ser/DefaultSerializerProvider.eea         |  12 +-
 .../jackson/databind/ser/FilterProvider.eea   |   2 +-
 .../jackson/databind/ser/PropertyBuilder.eea  |   6 +-
 .../databind/ser/SerializerFactory.eea        |   8 +-
 .../jackson/databind/ser/Serializers$Base.eea |  12 +-
 .../ser/VirtualBeanPropertyWriter.eea         |   2 +-
 .../ser/impl/AttributePropertyWriter.eea      |   4 +-
 .../ser/impl/BeanAsArraySerializer.eea        |   4 +-
 .../ser/impl/IndexedListSerializer.eea        |   2 +-
 .../ser/impl/IndexedStringListSerializer.eea  |   2 +-
 .../databind/ser/impl/IteratorSerializer.eea  |   2 +-
 .../databind/ser/impl/MapEntrySerializer.eea  |   4 +-
 .../databind/ser/impl/ObjectIdWriter.eea      |   2 +-
 .../impl/PropertyBasedObjectIdGenerator.eea   |   4 +-
 .../ser/impl/PropertySerializerMap.eea        |  18 +--
 .../ser/impl/ReadOnlyClassToSerializerMap.eea |  10 +-
 .../ser/impl/SimpleBeanPropertyFilter.eea     |  12 +-
 .../ser/impl/SimpleFilterProvider.eea         |   4 +-
 .../ser/impl/StringArraySerializer.eea        |   4 +-
 .../ser/impl/StringCollectionSerializer.eea   |   2 +-
 .../ser/impl/TypeWrappedSerializer.eea        |   4 +-
 .../ser/impl/UnwrappingBeanPropertyWriter.eea |   2 +-
 .../ser/impl/UnwrappingBeanSerializer.eea     |  10 +-
 .../databind/ser/std/ArraySerializerBase.eea  |   2 +-
 .../ser/std/AsArraySerializerBase.eea         |   2 +-
 .../databind/ser/std/BeanSerializerBase.eea   |   6 +-
 .../databind/ser/std/BooleanSerializer.eea    |   2 +-
 .../databind/ser/std/CalendarSerializer.eea   |   2 +-
 .../databind/ser/std/CollectionSerializer.eea |   2 +-
 .../databind/ser/std/DateSerializer.eea       |   2 +-
 .../ser/std/DateTimeSerializerBase.eea        |   2 +-
 .../databind/ser/std/EnumSerializer.eea       |   4 +-
 .../databind/ser/std/EnumSetSerializer.eea    |   2 +-
 .../ser/std/InetAddressSerializer.eea         |   2 +-
 .../databind/ser/std/IterableSerializer.eea   |   2 +-
 .../databind/ser/std/JsonValueSerializer.eea  |   4 +-
 .../jackson/databind/ser/std/MapProperty.eea  |   2 +-
 .../databind/ser/std/MapSerializer.eea        |   4 +-
 .../databind/ser/std/NumberSerializer.eea     |   2 +-
 .../ser/std/NumberSerializers$Base.eea        |   2 +-
 .../ser/std/ObjectArraySerializer.eea         |   2 +-
 .../ser/std/ReferenceTypeSerializer.eea       |   2 +-
 .../databind/ser/std/SqlDateSerializer.eea    |   2 +-
 .../ser/std/StaticListSerializerBase.eea      |   2 +-
 ...rraySerializers$BooleanArraySerializer.eea |   4 +-
 ...ArraySerializers$DoubleArraySerializer.eea |   4 +-
 ...dArraySerializers$FloatArraySerializer.eea |   4 +-
 ...StdArraySerializers$IntArraySerializer.eea |   4 +-
 ...tdArraySerializers$LongArraySerializer.eea |   4 +-
 ...dArraySerializers$ShortArraySerializer.eea |   4 +-
 .../ser/std/StdDelegatingSerializer.eea       |   6 +-
 .../StdKeySerializers$EnumKeySerializer.eea   |   4 +-
 .../databind/ser/std/StdKeySerializers.eea    |   2 +-
 .../databind/ser/std/StdSerializer.eea        |  10 +-
 .../ser/std/ToEmptyObjectSerializer.eea       |   2 +-
 .../databind/ser/std/ToStringSerializer.eea   |   2 +-
 .../databind/ser/std/UUIDSerializer.eea       |   2 +-
 .../jackson/databind/type/ArrayType.eea       |   8 +-
 .../jackson/databind/type/ClassStack.eea      |   4 +-
 .../databind/type/CollectionLikeType.eea      |  10 +-
 .../jackson/databind/type/IterationType.eea   |   8 +-
 .../jackson/databind/type/MapLikeType.eea     |  10 +-
 .../databind/type/PlaceholderForType.eea      |   2 +-
 .../jackson/databind/type/ReferenceType.eea   |   8 +-
 .../databind/type/ResolvedRecursiveType.eea   |   2 +-
 .../jackson/databind/type/SimpleType.eea      |   6 +-
 .../jackson/databind/type/TypeBase.eea        |   4 +-
 .../jackson/databind/type/TypeBindings.eea    |  24 ++--
 .../jackson/databind/type/TypeFactory.eea     |  14 +-
 .../jackson/databind/type/TypeParser.eea      |   4 +-
 .../util/ArrayBuilders$BooleanBuilder.eea     |   2 +-
 .../util/ArrayBuilders$ByteBuilder.eea        |   2 +-
 .../util/ArrayBuilders$DoubleBuilder.eea      |   2 +-
 .../util/ArrayBuilders$FloatBuilder.eea       |   2 +-
 .../util/ArrayBuilders$IntBuilder.eea         |   2 +-
 .../util/ArrayBuilders$LongBuilder.eea        |   2 +-
 .../util/ArrayBuilders$ShortBuilder.eea       |   2 +-
 .../jackson/databind/util/ArrayBuilders.eea   |   4 +-
 .../jackson/databind/util/BeanUtil.eea        |  14 +-
 .../jackson/databind/util/ClassUtil.eea       |  26 ++--
 .../databind/util/CompactStringObjectMap.eea  |   2 +-
 .../jackson/databind/util/EnumResolver.eea    |  12 +-
 .../jackson/databind/util/EnumValues.eea      |   4 +-
 .../jackson/databind/util/ExceptionUtil.eea   |   2 +-
 .../databind/util/ISO8601DateFormat.eea       |   2 +-
 .../jackson/databind/util/ISO8601Utils.eea    |   2 +-
 .../util/IgnorePropertiesUtil$Checker.eea     |   2 +-
 .../databind/util/IgnorePropertiesUtil.eea    |   2 +-
 .../jackson/databind/util/LRUMap.eea          |   2 +-
 .../jackson/databind/util/LookupCache.eea     |   2 +-
 .../jackson/databind/util/NameTransformer.eea |   2 +-
 .../jackson/databind/util/ObjectBuffer.eea    |   4 +-
 .../util/SimpleBeanPropertyDefinition.eea     |  16 +--
 .../jackson/databind/util/StdDateFormat.eea   |   6 +-
 .../databind/util/TokenBuffer$Parser.eea      |  18 +--
 .../databind/util/TokenBuffer$Segment.eea     |   8 +-
 .../jackson/databind/util/TokenBuffer.eea     |   2 +-
 .../databind/util/TokenBufferReadContext.eea  |   8 +-
 .../resources/jakarta/mail/Authenticator.eea  |   2 +-
 .../resources/jakarta/mail/FetchProfile.eea   |   4 +-
 .../src/main/resources/jakarta/mail/Flags.eea |   4 +-
 .../main/resources/jakarta/mail/Folder.eea    |   8 +-
 .../resources/jakarta/mail/MessageContext.eea |   4 +-
 .../main/resources/jakarta/mail/Session.eea   |   8 +-
 .../src/main/resources/jakarta/mail/Store.eea |   4 +-
 .../main/resources/jakarta/mail/URLName.eea   |   2 +-
 .../mail/internet/ContentDisposition.eea      |   2 +-
 .../jakarta/mail/internet/ContentType.eea     |   4 +-
 .../jakarta/mail/internet/HeaderTokenizer.eea |   2 +-
 .../jakarta/mail/internet/InternetAddress.eea |  12 +-
 .../jakarta/mail/internet/InternetHeaders.eea |   4 +-
 .../jakarta/mail/internet/MailDateFormat.eea  |   4 +-
 .../jakarta/mail/internet/MimeBodyPart.eea    |   2 +-
 .../jakarta/mail/internet/MimeMessage.eea     |  12 +-
 .../jakarta/mail/internet/MimeMultipart.eea   |   8 +-
 .../mail/internet/MimePartDataSource.eea      |   2 +-
 .../jakarta/mail/internet/MimeUtility.eea     |   6 +-
 .../jakarta/mail/internet/NewsAddress.eea     |   4 +-
 .../jakarta/mail/internet/ParameterList.eea   |   4 +-
 .../jakarta/mail/search/DateTerm.eea          |   2 +-
 .../jakarta/mail/util/ByteArrayDataSource.eea |   2 +-
 .../resources/jakarta/servlet/http/Cookie.eea |   2 +-
 .../servlet/http/HttpServletRequest.eea       |   4 +-
 .../http/HttpServletRequestWrapper.eea        |   4 +-
 .../servlet/http/HttpServletResponse.eea      |   2 +-
 .../http/HttpServletResponseWrapper.eea       |   2 +-
 .../jakarta/servlet/http/HttpSession.eea      |   2 +-
 .../src/main/resources/java/applet/Applet.eea |   8 +-
 .../src/main/resources/java/awt/AWTEvent.eea  |   2 +-
 .../main/resources/java/awt/AWTKeyStroke.eea  |   2 +-
 .../resources/java/awt/AlphaComposite.eea     |   2 +-
 .../main/resources/java/awt/BasicStroke.eea   |   4 +-
 .../main/resources/java/awt/BorderLayout.eea  |   4 +-
 .../java/awt/Button$AccessibleAWTButton.eea   |   6 +-
 .../src/main/resources/java/awt/Button.eea    |   2 +-
 .../main/resources/java/awt/CardLayout.eea    |   2 +-
 .../awt/Checkbox$AccessibleAWTCheckbox.eea    |  12 +-
 .../src/main/resources/java/awt/Checkbox.eea  |   4 +-
 ...MenuItem$AccessibleAWTCheckboxMenuItem.eea |  12 +-
 .../resources/java/awt/CheckboxMenuItem.eea   |   4 +-
 .../java/awt/Choice$AccessibleAWTChoice.eea   |   4 +-
 .../src/main/resources/java/awt/Choice.eea    |   6 +-
 .../src/main/resources/java/awt/Color.eea     |   8 +-
 .../awt/Component$AccessibleAWTComponent.eea  |   8 +-
 .../src/main/resources/java/awt/Component.eea |  28 ++--
 .../src/main/resources/java/awt/Composite.eea |   2 +-
 .../awt/Container$AccessibleAWTContainer.eea  |   4 +-
 .../src/main/resources/java/awt/Container.eea |  10 +-
 .../ContainerOrderFocusTraversalPolicy.eea    |   8 +-
 .../src/main/resources/java/awt/Cursor.eea    |   4 +-
 .../src/main/resources/java/awt/Desktop.eea   |   2 +-
 .../src/main/resources/java/awt/Dialog.eea    |   2 +-
 .../src/main/resources/java/awt/Event.eea     |   2 +-
 .../main/resources/java/awt/EventQueue.eea    |   6 +-
 .../main/resources/java/awt/FileDialog.eea    |   2 +-
 .../src/main/resources/java/awt/Font.eea      |  22 ++--
 .../main/resources/java/awt/FontMetrics.eea   |   2 +-
 .../src/main/resources/java/awt/Frame.eea     |   6 +-
 .../main/resources/java/awt/GradientPaint.eea |   2 +-
 .../src/main/resources/java/awt/Graphics.eea  |   4 +-
 .../java/awt/GraphicsConfiguration.eea        |  12 +-
 .../main/resources/java/awt/GridBagLayout.eea |   4 +-
 .../java/awt/KeyboardFocusManager.eea         |   4 +-
 .../src/main/resources/java/awt/Label.eea     |   2 +-
 .../java/awt/LinearGradientPaint.eea          |   2 +-
 ...cessibleAWTList$AccessibleAWTListChild.eea |  12 +-
 .../java/awt/List$AccessibleAWTList.eea       |   6 +-
 .../src/main/resources/java/awt/List.eea      |  10 +-
 .../main/resources/java/awt/MediaTracker.eea  |   4 +-
 .../src/main/resources/java/awt/Menu.eea      |   2 +-
 .../src/main/resources/java/awt/MenuBar.eea   |   2 +-
 ...nuComponent$AccessibleAWTMenuComponent.eea |  28 ++--
 .../main/resources/java/awt/MenuComponent.eea |   4 +-
 .../awt/MenuItem$AccessibleAWTMenuItem.eea    |   6 +-
 .../src/main/resources/java/awt/MenuItem.eea  |   2 +-
 .../main/resources/java/awt/MenuShortcut.eea  |   2 +-
 .../java/awt/MultipleGradientPaint.eea        |   2 +-
 .../resources/java/awt/PageAttributes.eea     |   2 +-
 .../src/main/resources/java/awt/Paint.eea     |   2 +-
 .../src/main/resources/java/awt/Polygon.eea   |   2 +-
 .../src/main/resources/java/awt/PopupMenu.eea |   2 +-
 .../java/awt/RadialGradientPaint.eea          |   2 +-
 .../src/main/resources/java/awt/Rectangle.eea |   4 +-
 .../src/main/resources/java/awt/Robot.eea     |   4 +-
 .../main/resources/java/awt/ScrollPane.eea    |   2 +-
 .../java/awt/ScrollPaneAdjustable.eea         |   2 +-
 .../awt/Scrollbar$AccessibleAWTScrollBar.eea  |   2 +-
 .../src/main/resources/java/awt/Scrollbar.eea |   2 +-
 .../main/resources/java/awt/SplashScreen.eea  |   2 +-
 .../src/main/resources/java/awt/Stroke.eea    |   2 +-
 .../src/main/resources/java/awt/Taskbar.eea   |   2 +-
 .../src/main/resources/java/awt/TextArea.eea  |   6 +-
 ...xtComponent$AccessibleAWTTextComponent.eea |  14 +-
 .../main/resources/java/awt/TextComponent.eea |   6 +-
 .../src/main/resources/java/awt/TextField.eea |   6 +-
 .../main/resources/java/awt/TexturePaint.eea  |   2 +-
 .../src/main/resources/java/awt/Toolkit.eea   |  18 +--
 .../src/main/resources/java/awt/Window.eea    |  16 +--
 .../java/awt/color/ICC_ColorSpace.eea         |   8 +-
 .../resources/java/awt/color/ICC_Profile.eea  |   4 +-
 .../java/awt/datatransfer/DataFlavor.eea      |  10 +-
 .../java/awt/datatransfer/SystemFlavorMap.eea |  12 +-
 .../resources/java/awt/desktop/FilesEvent.eea |   2 +-
 .../resources/java/awt/dnd/DragSource.eea     |   6 +-
 .../java/awt/dnd/DragSourceEvent.eea          |   2 +-
 .../resources/java/awt/dnd/DropTarget.eea     |   4 +-
 .../java/awt/dnd/DropTargetContext.eea        |   4 +-
 .../resources/java/awt/event/ActionEvent.eea  |   2 +-
 .../java/awt/event/AdjustmentEvent.eea        |   2 +-
 .../java/awt/event/ComponentEvent.eea         |   4 +-
 .../java/awt/event/ContainerEvent.eea         |   4 +-
 .../resources/java/awt/event/FocusEvent.eea   |   4 +-
 .../java/awt/event/HierarchyEvent.eea         |   4 +-
 .../resources/java/awt/event/InputEvent.eea   |   2 +-
 .../java/awt/event/InputMethodEvent.eea       |   2 +-
 .../java/awt/event/InvocationEvent.eea        |   6 +-
 .../resources/java/awt/event/ItemEvent.eea    |   2 +-
 .../resources/java/awt/event/KeyEvent.eea     |   4 +-
 .../resources/java/awt/event/MouseEvent.eea   |   6 +-
 .../java/awt/event/MouseWheelEvent.eea        |   2 +-
 .../resources/java/awt/event/PaintEvent.eea   |   2 +-
 .../resources/java/awt/event/TextEvent.eea    |   2 +-
 .../resources/java/awt/event/WindowEvent.eea  |   6 +-
 .../java/awt/font/FontRenderContext.eea       |   2 +-
 .../resources/java/awt/font/GlyphVector.eea   |   2 +-
 .../java/awt/font/LineBreakMeasurer.eea       |   2 +-
 .../resources/java/awt/font/NumericShaper.eea |  10 +-
 .../java/awt/font/ShapeGraphicAttribute.eea   |   2 +-
 .../resources/java/awt/font/TextLayout.eea    |  16 +--
 .../java/awt/font/TransformAttribute.eea      |   2 +-
 .../java/awt/geom/AffineTransform.eea         |  28 ++--
 .../resources/java/awt/geom/Arc2D$Double.eea  |   2 +-
 .../main/resources/java/awt/geom/Arc2D.eea    |   6 +-
 .../src/main/resources/java/awt/geom/Area.eea |   6 +-
 .../resources/java/awt/geom/CubicCurve2D.eea  |   4 +-
 .../resources/java/awt/geom/Ellipse2D.eea     |   2 +-
 .../resources/java/awt/geom/Line2D$Double.eea |   2 +-
 .../resources/java/awt/geom/Line2D$Float.eea  |   2 +-
 .../main/resources/java/awt/geom/Line2D.eea   |   4 +-
 .../resources/java/awt/geom/Path2D$Double.eea |   2 +-
 .../resources/java/awt/geom/Path2D$Float.eea  |   2 +-
 .../main/resources/java/awt/geom/Path2D.eea   |   6 +-
 .../resources/java/awt/geom/QuadCurve2D.eea   |   4 +-
 .../java/awt/geom/Rectangle2D$Double.eea      |   4 +-
 .../java/awt/geom/Rectangle2D$Float.eea       |   4 +-
 .../resources/java/awt/geom/Rectangle2D.eea   |   8 +-
 .../java/awt/geom/RectangularShape.eea        |   4 +-
 .../java/awt/geom/RoundRectangle2D.eea        |   2 +-
 .../resources/java/awt/im/InputContext.eea    |   6 +-
 .../java/awt/im/spi/InputMethodContext.eea    |   4 +-
 .../java/awt/im/spi/InputMethodDescriptor.eea |   2 +-
 .../image/AbstractMultiResolutionImage.eea    |   2 +-
 .../java/awt/image/AffineTransformOp.eea      |   4 +-
 .../java/awt/image/BandCombineOp.eea          |   6 +-
 .../java/awt/image/BandedSampleModel.eea      |  12 +-
 .../java/awt/image/BufferedImage.eea          |   8 +-
 .../java/awt/image/BufferedImageOp.eea        |   2 +-
 .../java/awt/image/ByteLookupTable.eea        |   4 +-
 .../java/awt/image/ColorConvertOp.eea         |   8 +-
 .../resources/java/awt/image/ColorModel.eea   |  22 ++--
 .../java/awt/image/ComponentColorModel.eea    |  22 ++--
 .../java/awt/image/ComponentSampleModel.eea   |  14 +-
 .../resources/java/awt/image/ConvolveOp.eea   |   6 +-
 .../java/awt/image/DirectColorModel.eea       |  12 +-
 .../java/awt/image/IndexColorModel.eea        |  14 +-
 .../main/resources/java/awt/image/Kernel.eea  |   2 +-
 .../resources/java/awt/image/LookupOp.eea     |   6 +-
 .../awt/image/MultiPixelPackedSampleModel.eea |   8 +-
 .../java/awt/image/PackedColorModel.eea       |   4 +-
 .../awt/image/PixelInterleavedSampleModel.eea |   4 +-
 .../java/awt/image/RGBImageFilter.eea         |   2 +-
 .../main/resources/java/awt/image/Raster.eea  |  38 +++---
 .../resources/java/awt/image/RasterOp.eea     |   2 +-
 .../resources/java/awt/image/RescaleOp.eea    |   6 +-
 .../resources/java/awt/image/SampleModel.eea  |  24 ++--
 .../java/awt/image/ShortLookupTable.eea       |   4 +-
 .../image/SinglePixelPackedSampleModel.eea    |  12 +-
 .../java/awt/image/VolatileImage.eea          |   2 +-
 .../java/awt/image/WritableRaster.eea         |   4 +-
 .../ContextualRenderedImageFactory.eea        |   2 +-
 .../awt/image/renderable/ParameterBlock.eea   |   4 +-
 .../awt/image/renderable/RenderableImage.eea  |   6 +-
 .../image/renderable/RenderableImageOp.eea    |   6 +-
 .../image/renderable/RenderedImageFactory.eea |   2 +-
 .../resources/java/awt/peer/ComponentPeer.eea |   6 +-
 .../resources/java/awt/peer/TaskbarPeer.eea   |   4 +-
 .../resources/java/awt/print/PageFormat.eea   |   2 +-
 .../resources/java/awt/print/PrinterJob.eea   |   2 +-
 .../resources/java/beans/BeanDescriptor.eea   |   4 +-
 .../java/beans/DefaultPersistenceDelegate.eea |   2 +-
 .../resources/java/beans/EventHandler.eea     |   6 +-
 .../java/beans/EventSetDescriptor.eea         |   6 +-
 .../java/beans/IndexedPropertyDescriptor.eea  |   4 +-
 .../resources/java/beans/MethodDescriptor.eea |   2 +-
 .../java/beans/PropertyDescriptor.eea         |   8 +-
 .../java/beans/PropertyEditorSupport.eea      |   8 +-
 .../resources/java/beans/SimpleBeanInfo.eea   |  14 +-
 .../main/resources/java/beans/XMLDecoder.eea  |   2 +-
 ...rvicesSupport$BCSSProxyServiceProvider.eea |   2 +-
 .../BeanContextServicesSupport.eea            |  12 +-
 .../beans/beancontext/BeanContextSupport.eea  |  14 +-
 .../resources/java/io/ObjectInputStream.eea   |   6 +-
 .../resources/java/io/ObjectStreamClass.eea   |   2 +-
 .../lang/instrument/ClassFileTransformer.eea  |   2 +-
 .../lang/invoke/ClassSpecializer$Factory.eea  |   2 +-
 .../invoke/ClassSpecializer$SpeciesData.eea   |   2 +-
 .../java/lang/invoke/ConstantBootstraps.eea   |   2 +-
 .../java/lang/invoke/MethodHandle.eea         |   4 +-
 .../java/lang/invoke/MethodHandles$Lookup.eea |   2 +-
 .../java/lang/invoke/MethodHandles.eea        |   2 +-
 .../resources/java/lang/invoke/VarHandle.eea  |  44 +++----
 .../java/lang/module/Configuration.eea        |   4 +-
 .../lang/module/ModuleDescriptor$Version.eea  |   2 +-
 .../java/lang/module/ModuleFinder.eea         |   2 +-
 .../main/resources/java/net/Authenticator.eea |  10 +-
 .../resources/java/net/ContentHandler.eea     |   2 +-
 .../java/net/ContentHandlerFactory.eea        |   2 +-
 .../resources/java/net/DatagramPacket.eea     |   2 +-
 .../resources/java/net/DatagramSocket.eea     |   8 +-
 .../java/net/DatagramSocketImplFactory.eea    |   2 +-
 .../resources/java/net/HttpURLConnection.eea  |   4 +-
 .../src/main/resources/java/net/IDN.eea       |   4 +-
 .../resources/java/net/InetSocketAddress.eea  |   2 +-
 .../resources/java/net/NetworkInterface.eea   |   2 +-
 .../main/resources/java/net/ServerSocket.eea  |   6 +-
 .../src/main/resources/java/net/Socket.eea    |   6 +-
 .../resources/java/net/SocketImplFactory.eea  |   2 +-
 .../resources/java/net/URLClassLoader.eea     |   2 +-
 .../main/resources/java/net/URLConnection.eea |   8 +-
 .../resources/java/net/URLStreamHandler.eea   |   4 +-
 .../java/net/URLStreamHandlerFactory.eea      |   2 +-
 .../resources/java/net/http/HttpClient.eea    |   2 +-
 .../resources/java/net/http/HttpRequest.eea   |   4 +-
 .../net/http/HttpResponse$BodySubscribers.eea |  16 +--
 .../http/HttpResponse$PushPromiseHandler.eea  |   2 +-
 .../resources/java/nio/channels/Channels.eea  |   8 +-
 .../resources/java/nio/channels/FileLock.eea  |   2 +-
 .../nio/channels/spi/SelectorProvider.eea     |   2 +-
 .../java/nio/charset/CharsetDecoder.eea       |   2 +-
 .../main/resources/java/nio/file/Files.eea    |  16 +--
 .../java/nio/file/attribute/AclEntry.eea      |   6 +-
 .../java/nio/file/attribute/FileTime.eea      |   4 +-
 .../file/attribute/PosixFilePermissions.eea   |   4 +-
 .../java/nio/file/spi/FileSystemProvider.eea  |   8 +-
 .../resources/java/rmi/MarshalledObject.eea   |   2 +-
 .../java/rmi/activation/ActivationGroup.eea   |   2 +-
 .../rmi/activation/ActivationGroupDesc.eea    |   2 +-
 .../java/rmi/registry/LocateRegistry.eea      |   4 +-
 .../resources/java/rmi/server/LogStream.eea   |   2 +-
 .../main/resources/java/rmi/server/ObjID.eea  |   2 +-
 .../rmi/server/RMIClientSocketFactory.eea     |   2 +-
 .../rmi/server/RMIServerSocketFactory.eea     |   2 +-
 .../java/rmi/server/RMISocketFactory.eea      |   4 +-
 .../main/resources/java/rmi/server/UID.eea    |   2 +-
 .../java/security/AccessController.eea        |   8 +-
 .../resources/java/security/CodeSource.eea    |   4 +-
 .../security/DomainLoadStoreParameter.eea     |   2 +-
 .../java/security/DrbgParameters.eea          |   6 +-
 .../main/resources/java/security/Identity.eea |   4 +-
 .../java/security/KeyStore$Builder.eea        |   6 +-
 .../resources/java/security/KeyStoreSpi.eea   |   2 +-
 .../resources/java/security/Permissions.eea   |   2 +-
 .../main/resources/java/security/Policy.eea   |   8 +-
 .../main/resources/java/security/Provider.eea |   2 +-
 .../java/security/SecureClassLoader.eea       |   2 +-
 .../java/security/SecureRandomSpi.eea         |   2 +-
 .../main/resources/java/security/Security.eea |   4 +-
 .../resources/java/security/SignatureSpi.eea  |   2 +-
 .../resources/java/security/Timestamp.eea     |   2 +-
 .../java/security/cert/CertPathBuilderSpi.eea |   2 +-
 .../security/cert/CertPathValidatorSpi.eea    |   2 +-
 .../java/security/cert/CertStore.eea          |   2 +-
 .../security/cert/CertificateFactorySpi.eea   |   8 +-
 .../cert/CertificateRevokedException.eea      |   2 +-
 .../java/security/cert/PKIXParameters.eea     |   4 +-
 .../security/cert/PKIXRevocationChecker.eea   |   2 +-
 .../security/cert/URICertStoreParameters.eea  |   2 +-
 .../resources/java/security/cert/X509CRL.eea  |   2 +-
 .../java/security/cert/X509CRLEntry.eea       |   4 +-
 .../java/security/cert/X509CRLSelector.eea    |   6 +-
 .../java/security/cert/X509CertSelector.eea   |  18 +--
 .../java/security/interfaces/RSAKey.eea       |   2 +-
 .../java/security/spec/ECFieldF2m.eea         |   2 +-
 .../java/security/spec/EllipticCurve.eea      |   2 +-
 .../security/spec/PKCS8EncodedKeySpec.eea     |   2 +-
 .../spec/RSAMultiPrimePrivateCrtKeySpec.eea   |   2 +-
 .../java/security/spec/X509EncodedKeySpec.eea |   2 +-
 .../main/resources/java/sql/Connection.eea    |  18 +--
 .../src/main/resources/java/sql/JDBCType.eea  |   2 +-
 .../main/resources/java/sql/SQLException.eea  |   2 +-
 .../src/main/resources/java/sql/SQLInput.eea  |   2 +-
 .../src/main/resources/java/sql/Statement.eea |   6 +-
 .../src/main/resources/java/sql/Time.eea      |   4 +-
 .../resources/java/text/AttributedString.eea  |   2 +-
 .../src/main/resources/java/text/Bidi.eea     |   2 +-
 .../main/resources/java/text/ChoiceFormat.eea |   2 +-
 .../resources/java/text/DecimalFormat.eea     |   2 +-
 .../resources/java/text/MessageFormat.eea     |   2 +-
 .../resources/java/text/RuleBasedCollator.eea |   4 +-
 .../resources/java/text/SimpleDateFormat.eea  |   2 +-
 .../src/main/resources/java/time/Clock.eea    |  10 +-
 .../src/main/resources/java/time/MonthDay.eea |   2 +-
 .../main/resources/java/time/OffsetTime.eea   |   8 +-
 .../src/main/resources/java/time/Year.eea     |   2 +-
 .../main/resources/java/time/YearMonth.eea    |   2 +-
 .../java/time/chrono/AbstractChronology.eea   |   2 +-
 .../resources/java/time/chrono/Chronology.eea |   2 +-
 .../java/time/chrono/IsoChronology.eea        |   4 +-
 .../java/time/chrono/JapaneseChronology.eea   |  10 +-
 .../java/time/chrono/JapaneseDate.eea         |   6 +-
 .../java/time/chrono/MinguoChronology.eea     |   6 +-
 .../resources/java/time/chrono/MinguoDate.eea |   2 +-
 .../time/chrono/ThaiBuddhistChronology.eea    |   6 +-
 .../java/time/chrono/ThaiBuddhistDate.eea     |   2 +-
 .../java/time/zone/ZoneOffsetTransition.eea   |   2 +-
 ...oneOffsetTransitionRule$TimeDefinition.eea |   2 +-
 .../time/zone/ZoneOffsetTransitionRule.eea    |   4 +-
 .../resources/java/time/zone/ZoneRules.eea    |   6 +-
 .../main/resources/java/util/AbstractList.eea |   4 +-
 .../util/AbstractMap$SimpleImmutableEntry.eea |   2 +-
 .../java/util/AbstractSequentialList.eea      |   4 +-
 .../main/resources/java/util/ArrayList.eea    |   4 +-
 .../main/resources/java/util/Collections.eea  |   2 +-
 .../main/resources/java/util/Enumeration.eea  |   2 +-
 .../resources/java/util/GregorianCalendar.eea |   4 +-
 .../main/resources/java/util/LinkedList.eea   |   4 +-
 .../src/main/resources/java/util/Locale.eea   |   8 +-
 .../resources/java/util/OptionalDouble.eea    |   2 +-
 .../main/resources/java/util/OptionalInt.eea  |   2 +-
 .../main/resources/java/util/OptionalLong.eea |   2 +-
 .../java/util/ResourceBundle$Control.eea      |   6 +-
 .../src/main/resources/java/util/Scanner.eea  |   4 +-
 .../resources/java/util/ServiceLoader.eea     |  10 +-
 ...Spliterators$AbstractDoubleSpliterator.eea |   2 +-
 .../Spliterators$AbstractIntSpliterator.eea   |   2 +-
 .../Spliterators$AbstractLongSpliterator.eea  |   2 +-
 .../resources/java/util/SplittableRandom.eea  |   2 +-
 .../src/main/resources/java/util/Vector.eea   |   6 +-
 .../util/concurrent/ConcurrentSkipListMap.eea |   4 +-
 .../java/util/concurrent/CountedCompleter.eea |   2 +-
 .../java/util/concurrent/RecursiveAction.eea  |   2 +-
 .../util/concurrent/SubmissionPublisher.eea   |   4 +-
 .../atomic/AtomicLongFieldUpdater.eea         |   2 +-
 .../atomic/AtomicReferenceFieldUpdater.eea    |   2 +-
 ...QueuedLongSynchronizer$ConditionObject.eea |   2 +-
 .../locks/AbstractQueuedLongSynchronizer.eea  |   6 +-
 ...ractQueuedSynchronizer$ConditionObject.eea |   2 +-
 .../locks/AbstractQueuedSynchronizer.eea      |   6 +-
 .../java/util/prefs/AbstractPreferences.eea   |   2 +-
 .../java/util/spi/CurrencyNameProvider.eea    |   2 +-
 .../java/util/spi/LocaleNameProvider.eea      |   6 +-
 .../java/util/spi/TimeZoneNameProvider.eea    |   2 +-
 .../java/util/stream/DoubleStream.eea         |   2 +-
 .../java/util/stream/Node$OfPrimitive.eea     |   2 +-
 .../javax/accessibility/AccessibleContext.eea |  16 +--
 .../accessibility/AccessibleRelation.eea      |   2 +-
 .../accessibility/AccessibleRelationSet.eea   |   4 +-
 .../accessibility/AccessibleStateSet.eea      |   2 +-
 .../annotation/processing/Completions.eea     |   4 +-
 .../javax/annotation/processing/Filer.eea     |   6 +-
 .../main/resources/javax/crypto/CipherSpi.eea |   4 +-
 .../javax/crypto/EncryptedPrivateKeyInfo.eea  |   2 +-
 .../resources/javax/crypto/KeyAgreement.eea   |   2 +-
 .../src/main/resources/javax/crypto/Mac.eea   |   2 +-
 .../javax/crypto/SecretKeyFactory.eea         |   2 +-
 .../javax/crypto/spec/PBEKeySpec.eea          |   2 +-
 .../main/resources/javax/imageio/IIOParam.eea |   4 +-
 .../main/resources/javax/imageio/ImageIO.eea  |  10 +-
 .../javax/imageio/ImageReadParam.eea          |   2 +-
 .../resources/javax/imageio/ImageReader.eea   |  10 +-
 .../javax/imageio/ImageTypeSpecifier.eea      |  18 +--
 .../javax/imageio/ImageWriteParam.eea         |   6 +-
 .../resources/javax/imageio/ImageWriter.eea   |   4 +-
 .../javax/imageio/metadata/IIOMetadata.eea    |  22 ++--
 .../metadata/IIOMetadataFormatImpl.eea        |   2 +-
 .../imageio/metadata/IIOMetadataNode.eea      |  16 +--
 .../plugins/jpeg/JPEGImageReadParam.eea       |   6 +-
 .../plugins/jpeg/JPEGImageWriteParam.eea      |  10 +-
 .../javax/imageio/plugins/jpeg/JPEGQTable.eea |   2 +-
 .../imageio/plugins/tiff/TIFFDirectory.eea    |   6 +-
 .../javax/imageio/plugins/tiff/TIFFField.eea  |   6 +-
 .../javax/imageio/plugins/tiff/TIFFTag.eea    |   4 +-
 .../javax/imageio/spi/IIORegistry.eea         |   2 +-
 .../javax/imageio/spi/ImageInputStreamSpi.eea |   4 +-
 .../imageio/spi/ImageOutputStreamSpi.eea      |   4 +-
 .../javax/imageio/spi/ImageReaderSpi.eea      |   4 +-
 .../javax/imageio/spi/ImageTranscoderSpi.eea  |   2 +-
 .../javax/imageio/spi/ImageWriterSpi.eea      |   4 +-
 .../javax/imageio/spi/ServiceRegistry.eea     |   4 +-
 .../ModuleElement$DirectiveVisitor.eea        |   2 +-
 .../util/AbstractAnnotationValueVisitor6.eea  |   2 +-
 .../javax/lang/model/util/Elements.eea        |   8 +-
 .../javax/management/AttributeValueExp.eea    |   4 +-
 .../javax/management/ImmutableDescriptor.eea  |   4 +-
 .../javax/management/MBeanServer.eea          |  14 +-
 .../management/MBeanServerConnection.eea      |   8 +-
 .../javax/management/MBeanServerDelegate.eea  |  12 +-
 .../resources/javax/management/ObjectName.eea |  14 +-
 .../main/resources/javax/management/Query.eea |  30 ++---
 .../javax/management/StandardMBean.eea        |   2 +-
 .../javax/management/loading/MLet.eea         |   2 +-
 .../modelmbean/DescriptorSupport.eea          |   8 +-
 .../modelmbean/ModelMBeanInfoSupport.eea      |   4 +-
 .../modelmbean/RequiredModelMBean.eea         |   6 +-
 .../management/monitor/CounterMonitor.eea     |   4 +-
 .../javax/management/monitor/GaugeMonitor.eea |   2 +-
 .../javax/management/monitor/Monitor.eea      |   4 +-
 .../management/monitor/StringMonitor.eea      |   2 +-
 .../openmbean/CompositeDataSupport.eea        |   2 +-
 .../MBeanServerNotificationFilter.eea         |   4 +-
 .../management/relation/RelationService.eea   |  14 +-
 .../management/relation/RelationSupport.eea   |   4 +-
 .../relation/RelationTypeSupport.eea          |   2 +-
 .../javax/management/relation/Role.eea        |   2 +-
 .../management/remote/rmi/RMIConnection.eea   |   8 +-
 .../remote/rmi/RMIConnectionImpl.eea          |  12 +-
 .../remote/rmi/RMIConnectionImpl_Stub.eea     |   8 +-
 .../remote/rmi/RMIConnectorServer.eea         |   4 +-
 .../remote/rmi/RMIIIOPServerImpl.eea          |   6 +-
 .../remote/rmi/RMIJRMPServerImpl.eea          |   4 +-
 .../management/remote/rmi/RMIServerImpl.eea   |   2 +-
 .../javax/management/timer/Timer.eea          |  18 +--
 .../resources/javax/naming/CompositeName.eea  |   4 +-
 .../resources/javax/naming/CompoundName.eea   |   4 +-
 .../main/resources/javax/naming/Context.eea   |   4 +-
 .../resources/javax/naming/InitialContext.eea |   4 +-
 .../resources/javax/naming/LinkException.eea  |   2 +-
 .../javax/naming/NamingException.eea          |   2 +-
 .../main/resources/javax/naming/Reference.eea |   2 +-
 .../javax/naming/directory/BasicAttribute.eea |   4 +-
 .../naming/directory/BasicAttributes.eea      |   2 +-
 .../javax/naming/directory/DirContext.eea     |   4 +-
 .../naming/directory/InitialDirContext.eea    |   4 +-
 .../javax/naming/ldap/ExtendedRequest.eea     |   2 +-
 .../resources/javax/naming/ldap/LdapName.eea  |   8 +-
 .../ldap/PagedResultsResponseControl.eea      |   2 +-
 .../javax/naming/ldap/StartTlsRequest.eea     |   6 +-
 .../javax/naming/ldap/StartTlsResponse.eea    |   4 +-
 .../javax/naming/spi/DirectoryManager.eea     |   4 +-
 .../spi/InitialContextFactoryBuilder.eea      |   2 +-
 .../javax/naming/spi/NamingManager.eea        |   2 +-
 .../javax/naming/spi/ObjectFactoryBuilder.eea |   2 +-
 .../javax/net/ServerSocketFactory.eea         |   8 +-
 .../resources/javax/net/SocketFactory.eea     |  10 +-
 .../javax/net/ssl/ExtendedSSLSession.eea      |   4 +-
 .../javax/net/ssl/HttpsURLConnection.eea      |   2 +-
 .../javax/net/ssl/KeyManagerFactory.eea       |   2 +-
 .../resources/javax/net/ssl/SNIHostName.eea   |   2 +-
 .../resources/javax/net/ssl/SSLContext.eea    |   4 +-
 .../resources/javax/net/ssl/SSLEngine.eea     |  10 +-
 .../resources/javax/net/ssl/SSLParameters.eea |   4 +-
 .../javax/net/ssl/SSLServerSocket.eea         |   2 +-
 .../resources/javax/net/ssl/SSLSocket.eea     |  10 +-
 .../javax/net/ssl/SSLSocketFactory.eea        |   4 +-
 .../javax/net/ssl/X509ExtendedKeyManager.eea  |   4 +-
 .../javax/print/MultiDocPrintService.eea      |   2 +-
 .../resources/javax/print/PrintService.eea    |   2 +-
 .../javax/print/PrintServiceLookup.eea        |   2 +-
 .../print/attribute/AttributeSetUtilities.eea |  20 +--
 .../javax/print/attribute/DateTimeSyntax.eea  |   2 +-
 .../javax/print/attribute/EnumSyntax.eea      |   4 +-
 .../print/attribute/HashAttributeSet.eea      |   2 +-
 .../print/attribute/ResolutionSyntax.eea      |   2 +-
 .../print/attribute/SetOfIntegerSyntax.eea    |   2 +-
 .../javax/print/attribute/Size2DSyntax.eea    |   2 +-
 .../print/attribute/standard/Chromaticity.eea |   8 +-
 .../attribute/standard/ColorSupported.eea     |   8 +-
 .../print/attribute/standard/Compression.eea  |   8 +-
 .../javax/print/attribute/standard/Copies.eea |   4 +-
 .../attribute/standard/CopiesSupported.eea    |   4 +-
 .../standard/DateTimeAtCompleted.eea          |   4 +-
 .../attribute/standard/DateTimeAtCreation.eea |   4 +-
 .../standard/DateTimeAtProcessing.eea         |   4 +-
 .../print/attribute/standard/Destination.eea  |   4 +-
 .../print/attribute/standard/DialogOwner.eea  |   4 +-
 .../standard/DialogTypeSelection.eea          |   8 +-
 .../print/attribute/standard/DocumentName.eea |   4 +-
 .../print/attribute/standard/Fidelity.eea     |   8 +-
 .../print/attribute/standard/Finishings.eea   |   8 +-
 .../print/attribute/standard/JobHoldUntil.eea |   4 +-
 .../attribute/standard/JobImpressions.eea     |   4 +-
 .../standard/JobImpressionsCompleted.eea      |   4 +-
 .../standard/JobImpressionsSupported.eea      |   4 +-
 .../print/attribute/standard/JobKOctets.eea   |   4 +-
 .../standard/JobKOctetsProcessed.eea          |   4 +-
 .../standard/JobKOctetsSupported.eea          |   4 +-
 .../attribute/standard/JobMediaSheets.eea     |   4 +-
 .../standard/JobMediaSheetsCompleted.eea      |   4 +-
 .../standard/JobMediaSheetsSupported.eea      |   4 +-
 .../standard/JobMessageFromOperator.eea       |   4 +-
 .../print/attribute/standard/JobName.eea      |   4 +-
 .../standard/JobOriginatingUserName.eea       |   4 +-
 .../print/attribute/standard/JobPriority.eea  |   4 +-
 .../standard/JobPrioritySupported.eea         |   4 +-
 .../print/attribute/standard/JobSheets.eea    |   8 +-
 .../print/attribute/standard/JobState.eea     |   8 +-
 .../attribute/standard/JobStateReason.eea     |   8 +-
 .../attribute/standard/JobStateReasons.eea    |   4 +-
 .../javax/print/attribute/standard/Media.eea  |   4 +-
 .../print/attribute/standard/MediaName.eea    |   4 +-
 .../attribute/standard/MediaPrintableArea.eea |   6 +-
 .../print/attribute/standard/MediaSize.eea    |   4 +-
 .../attribute/standard/MediaSizeName.eea      |   4 +-
 .../print/attribute/standard/MediaTray.eea    |   4 +-
 .../standard/MultipleDocumentHandling.eea     |   8 +-
 .../attribute/standard/NumberOfDocuments.eea  |   4 +-
 .../standard/NumberOfInterveningJobs.eea      |   4 +-
 .../print/attribute/standard/NumberUp.eea     |   4 +-
 .../attribute/standard/NumberUpSupported.eea  |   4 +-
 .../standard/OrientationRequested.eea         |   8 +-
 .../standard/OutputDeviceAssigned.eea         |   4 +-
 .../standard/PDLOverrideSupported.eea         |   8 +-
 .../print/attribute/standard/PageRanges.eea   |   4 +-
 .../attribute/standard/PagesPerMinute.eea     |   4 +-
 .../standard/PagesPerMinuteColor.eea          |   4 +-
 .../standard/PresentationDirection.eea        |   8 +-
 .../print/attribute/standard/PrintQuality.eea |   8 +-
 .../print/attribute/standard/PrinterInfo.eea  |   4 +-
 .../standard/PrinterIsAcceptingJobs.eea       |   8 +-
 .../attribute/standard/PrinterLocation.eea    |   4 +-
 .../standard/PrinterMakeAndModel.eea          |   4 +-
 .../standard/PrinterMessageFromOperator.eea   |   4 +-
 .../attribute/standard/PrinterMoreInfo.eea    |   4 +-
 .../standard/PrinterMoreInfoManufacturer.eea  |   4 +-
 .../print/attribute/standard/PrinterName.eea  |   4 +-
 .../attribute/standard/PrinterResolution.eea  |   4 +-
 .../print/attribute/standard/PrinterState.eea |   8 +-
 .../attribute/standard/PrinterStateReason.eea |   8 +-
 .../standard/PrinterStateReasons.eea          |   6 +-
 .../print/attribute/standard/PrinterURI.eea   |   4 +-
 .../attribute/standard/QueuedJobCount.eea     |   4 +-
 .../standard/ReferenceUriSchemesSupported.eea |   8 +-
 .../attribute/standard/RequestingUserName.eea |   4 +-
 .../print/attribute/standard/Severity.eea     |   8 +-
 .../print/attribute/standard/SheetCollate.eea |   8 +-
 .../javax/print/attribute/standard/Sides.eea  |   8 +-
 .../rmi/ssl/SslRMIClientSocketFactory.eea     |   2 +-
 .../rmi/ssl/SslRMIServerSocketFactory.eea     |   2 +-
 .../javax/script/AbstractScriptEngine.eea     |   2 +-
 .../resources/javax/script/ScriptEngine.eea   |   2 +-
 .../javax/script/ScriptEngineManager.eea      |   6 +-
 .../javax/script/SimpleScriptContext.eea      |   6 +-
 .../security/auth/SubjectDomainCombiner.eea   |   2 +-
 .../javax/security/auth/kerberos/KeyTab.eea   |   2 +-
 .../security/auth/login/Configuration.eea     |   6 +-
 .../security/auth/login/LoginContext.eea      |   2 +-
 .../javax/security/sasl/AuthorizeCallback.eea |   2 +-
 .../resources/javax/security/sasl/Sasl.eea    |   8 +-
 .../javax/security/sasl/SaslClientFactory.eea |   2 +-
 .../javax/security/sasl/SaslServerFactory.eea |   2 +-
 .../main/resources/javax/smartcardio/ATR.eea  |   2 +-
 .../javax/smartcardio/CardTerminals.eea       |   2 +-
 .../javax/smartcardio/CommandAPDU.eea         |   2 +-
 .../javax/smartcardio/ResponseAPDU.eea        |   2 +-
 .../javax/sound/midi/MetaMessage.eea          |   2 +-
 .../javax/sound/midi/MidiFileFormat.eea       |   2 +-
 .../javax/sound/midi/MidiMessage.eea          |   2 +-
 .../resources/javax/sound/midi/MidiSystem.eea |   8 +-
 .../resources/javax/sound/midi/Sequence.eea   |   4 +-
 .../javax/sound/midi/SysexMessage.eea         |   2 +-
 .../javax/sound/sampled/AudioFileFormat.eea   |   2 +-
 .../javax/sound/sampled/AudioFormat.eea       |   2 +-
 .../javax/sound/sampled/AudioSystem.eea       |   4 +-
 .../resources/javax/sql/CommonDataSource.eea  |   2 +-
 .../javax/sql/ConnectionPoolDataSource.eea    |   2 +-
 .../main/resources/javax/sql/DataSource.eea   |   2 +-
 .../main/resources/javax/sql/XADataSource.eea |   2 +-
 .../resources/javax/sql/rowset/BaseRowSet.eea |   2 +-
 .../javax/sql/rowset/CachedRowSet.eea         |   8 +-
 .../javax/sql/rowset/RowSetFactory.eea        |  10 +-
 .../javax/sql/rowset/serial/SerialArray.eea   |  16 +--
 .../javax/sql/rowset/serial/SerialBlob.eea    |   4 +-
 .../javax/sql/rowset/serial/SerialClob.eea    |   2 +-
 .../sql/rowset/serial/SerialDatalink.eea      |   2 +-
 .../resources/javax/swing/AbstractAction.eea  |   4 +-
 ...bstractButton$AccessibleAbstractButton.eea |  26 ++--
 .../resources/javax/swing/AbstractButton.eea  |  12 +-
 .../main/resources/javax/swing/ActionMap.eea  |   2 +-
 .../resources/javax/swing/BorderFactory.eea   |  68 +++++-----
 .../src/main/resources/javax/swing/Box.eea    |  16 +--
 .../resources/javax/swing/ButtonModel.eea     |   2 +-
 .../resources/javax/swing/DebugGraphics.eea   |   4 +-
 .../javax/swing/DefaultButtonModel.eea        |   4 +-
 .../javax/swing/DefaultFocusManager.eea       |   8 +-
 .../javax/swing/DefaultListModel.eea          |   2 +-
 .../swing/DefaultRowSorter$ModelWrapper.eea   |   2 +-
 .../javax/swing/DefaultRowSorter.eea          |   2 +-
 .../main/resources/javax/swing/GrayFilter.eea |   2 +-
 .../resources/javax/swing/GroupLayout.eea     |  10 +-
 .../swing/ImageIcon$AccessibleImageIcon.eea   |   8 +-
 .../main/resources/javax/swing/InputMap.eea   |   4 +-
 .../main/resources/javax/swing/JApplet.eea    |   6 +-
 .../main/resources/javax/swing/JButton.eea    |   4 +-
 .../main/resources/javax/swing/JCheckBox.eea  |   4 +-
 .../javax/swing/JCheckBoxMenuItem.eea         |   6 +-
 .../resources/javax/swing/JColorChooser.eea   |   6 +-
 .../swing/JComboBox$AccessibleJComboBox.eea   |  12 +-
 .../main/resources/javax/swing/JComboBox.eea  |  10 +-
 .../swing/JComponent$AccessibleJComponent.eea |   8 +-
 .../main/resources/javax/swing/JComponent.eea |  26 ++--
 .../resources/javax/swing/JDesktopPane.eea    |   6 +-
 .../main/resources/javax/swing/JDialog.eea    |   6 +-
 .../JEditorPane$AccessibleJEditorPaneHTML.eea |   6 +-
 ...aneAccessibleHypertextSupport$HTMLLink.eea |   4 +-
 ...$JEditorPaneAccessibleHypertextSupport.eea |   4 +-
 .../resources/javax/swing/JEditorPane.eea     |  14 +-
 .../resources/javax/swing/JFileChooser.eea    |   8 +-
 .../JFormattedTextField$AbstractFormatter.eea |   6 +-
 .../javax/swing/JFormattedTextField.eea       |   2 +-
 .../src/main/resources/javax/swing/JFrame.eea |   6 +-
 ...InternalFrame$AccessibleJInternalFrame.eea |   2 +-
 ...me$JDesktopIcon$AccessibleJDesktopIcon.eea |   8 +-
 .../swing/JInternalFrame$JDesktopIcon.eea     |   4 +-
 .../resources/javax/swing/JInternalFrame.eea  |  12 +-
 .../javax/swing/JLabel$AccessibleJLabel.eea   |  20 +--
 .../src/main/resources/javax/swing/JLabel.eea |   4 +-
 .../src/main/resources/javax/swing/JLayer.eea |   4 +-
 .../resources/javax/swing/JLayeredPane.eea    |   4 +-
 ...t$AccessibleJList$AccessibleJListChild.eea |  46 +++----
 .../javax/swing/JList$AccessibleJList.eea     |   8 +-
 .../src/main/resources/javax/swing/JList.eea  |  12 +-
 .../javax/swing/JMenu$AccessibleJMenu.eea     |   6 +-
 .../src/main/resources/javax/swing/JMenu.eea  |  20 +--
 .../swing/JMenuBar$AccessibleJMenuBar.eea     |   4 +-
 .../main/resources/javax/swing/JMenuBar.eea   |  12 +-
 .../main/resources/javax/swing/JMenuItem.eea  |   6 +-
 .../resources/javax/swing/JOptionPane.eea     |  14 +-
 .../src/main/resources/javax/swing/JPanel.eea |   4 +-
 ...PasswordField$AccessibleJPasswordField.eea |  14 +-
 .../resources/javax/swing/JPasswordField.eea  |   8 +-
 .../javax/swing/JPopupMenu$Separator.eea      |   2 +-
 .../main/resources/javax/swing/JPopupMenu.eea |  10 +-
 .../JProgressBar$AccessibleJProgressBar.eea   |   2 +-
 .../resources/javax/swing/JProgressBar.eea    |   6 +-
 .../resources/javax/swing/JRadioButton.eea    |   4 +-
 .../javax/swing/JRadioButtonMenuItem.eea      |   4 +-
 .../swing/JRootPane$AccessibleJRootPane.eea   |   2 +-
 .../main/resources/javax/swing/JRootPane.eea  |  12 +-
 .../swing/JScrollBar$AccessibleJScrollBar.eea |   2 +-
 .../main/resources/javax/swing/JScrollBar.eea |   6 +-
 .../resources/javax/swing/JScrollPane.eea     |  14 +-
 .../main/resources/javax/swing/JSeparator.eea |   4 +-
 .../javax/swing/JSlider$AccessibleJSlider.eea |   2 +-
 .../main/resources/javax/swing/JSlider.eea    |  10 +-
 .../swing/JSpinner$AccessibleJSpinner.eea     |  30 ++---
 .../javax/swing/JSpinner$DefaultEditor.eea    |   2 +-
 .../main/resources/javax/swing/JSpinner.eea   |   4 +-
 .../swing/JSplitPane$AccessibleJSplitPane.eea |   2 +-
 .../main/resources/javax/swing/JSplitPane.eea |   4 +-
 .../JTabbedPane$AccessibleJTabbedPane.eea     |   8 +-
 .../resources/javax/swing/JTabbedPane.eea     |  10 +-
 ...$AccessibleJTable$AccessibleJTableCell.eea |  38 +++---
 .../javax/swing/JTable$AccessibleJTable.eea   |  18 +--
 .../src/main/resources/javax/swing/JTable.eea |  22 ++--
 .../main/resources/javax/swing/JTextArea.eea  |   6 +-
 .../main/resources/javax/swing/JTextField.eea |   8 +-
 .../main/resources/javax/swing/JTextPane.eea  |  10 +-
 .../resources/javax/swing/JToggleButton.eea   |   4 +-
 .../javax/swing/JToolBar$Separator.eea        |   2 +-
 .../main/resources/javax/swing/JToolBar.eea   |  10 +-
 .../main/resources/javax/swing/JToolTip.eea   |   4 +-
 ...ee$AccessibleJTree$AccessibleJTreeNode.eea |  40 +++---
 .../javax/swing/JTree$AccessibleJTree.eea     |   8 +-
 .../src/main/resources/javax/swing/JTree.eea  |  34 ++---
 .../main/resources/javax/swing/JViewport.eea  |  16 +--
 .../main/resources/javax/swing/JWindow.eea    |   6 +-
 .../main/resources/javax/swing/KeyStroke.eea  |   2 +-
 .../swing/LayoutFocusTraversalPolicy.eea      |   8 +-
 .../javax/swing/ListSelectionModel.eea        |   2 +-
 .../resources/javax/swing/LookAndFeel.eea     |  10 +-
 .../javax/swing/MenuSelectionManager.eea      |   4 +-
 .../resources/javax/swing/PopupFactory.eea    |   2 +-
 ...gressMonitor$AccessibleProgressMonitor.eea |  28 ++--
 .../resources/javax/swing/RepaintManager.eea  |   2 +-
 .../resources/javax/swing/RowFilter$Entry.eea |   2 +-
 .../main/resources/javax/swing/RowFilter.eea  |  12 +-
 .../javax/swing/ScrollPaneLayout.eea          |   6 +-
 .../javax/swing/SizeRequirements.eea          |   6 +-
 .../resources/javax/swing/SizeSequence.eea    |   2 +-
 .../swing/SortingFocusTraversalPolicy.eea     |   8 +-
 .../javax/swing/SpinnerDateModel.eea          |   4 +-
 .../src/main/resources/javax/swing/Spring.eea |  14 +-
 .../javax/swing/SpringLayout$Constraints.eea  |   2 +-
 .../resources/javax/swing/SpringLayout.eea    |   2 +-
 .../resources/javax/swing/SwingUtilities.eea  |  20 +--
 .../swing/TransferHandler$DropLocation.eea    |   2 +-
 .../resources/javax/swing/TransferHandler.eea |   4 +-
 .../javax/swing/UIDefaults$ActiveValue.eea    |   2 +-
 .../javax/swing/UIDefaults$LazyInputMap.eea   |   2 +-
 .../javax/swing/UIDefaults$LazyValue.eea      |   2 +-
 .../javax/swing/UIDefaults$ProxyLazyValue.eea |   2 +-
 .../main/resources/javax/swing/UIDefaults.eea |  30 ++---
 .../main/resources/javax/swing/UIManager.eea  |   6 +-
 .../javax/swing/border/LineBorder.eea         |   4 +-
 .../AbstractColorChooserPanel.eea             |   4 +-
 .../ColorChooserComponentFactory.eea          |   2 +-
 .../javax/swing/event/InternalFrameEvent.eea  |   4 +-
 .../javax/swing/event/TreeModelEvent.eea      |   6 +-
 .../javax/swing/event/TreeSelectionEvent.eea  |   2 +-
 .../filechooser/FileNameExtensionFilter.eea   |   2 +-
 .../swing/filechooser/FileSystemView.eea      |  18 +--
 .../javax/swing/filechooser/FileView.eea      |  10 +-
 .../javax/swing/plaf/ComponentUI.eea          |   4 +-
 .../javax/swing/plaf/FileChooserUI.eea        |   2 +-
 .../resources/javax/swing/plaf/LayerUI.eea    |   2 +-
 .../resources/javax/swing/plaf/TextUI.eea     |   2 +-
 .../swing/plaf/basic/BasicArrowButton.eea     |   2 +-
 .../javax/swing/plaf/basic/BasicBorders.eea   |  14 +-
 .../javax/swing/plaf/basic/BasicButtonUI.eea  |   8 +-
 .../plaf/basic/BasicCheckBoxMenuItemUI.eea    |   4 +-
 .../swing/plaf/basic/BasicCheckBoxUI.eea      |   4 +-
 .../swing/plaf/basic/BasicColorChooserUI.eea  |   6 +-
 .../swing/plaf/basic/BasicComboBoxEditor.eea  |   2 +-
 .../swing/plaf/basic/BasicComboBoxUI.eea      |  28 ++--
 .../swing/plaf/basic/BasicComboPopup.eea      |  24 ++--
 .../swing/plaf/basic/BasicDesktopIconUI.eea   |   8 +-
 .../swing/plaf/basic/BasicDesktopPaneUI.eea   |   8 +-
 .../swing/plaf/basic/BasicEditorPaneUI.eea    |   4 +-
 .../BasicFileChooserUI$BasicFileView.eea      |   8 +-
 .../swing/plaf/basic/BasicFileChooserUI.eea   |  20 +--
 .../plaf/basic/BasicFormattedTextFieldUI.eea  |   4 +-
 .../swing/plaf/basic/BasicGraphicsUtils.eea   |   2 +-
 .../javax/swing/plaf/basic/BasicHTML.eea      |   2 +-
 .../swing/plaf/basic/BasicIconFactory.eea     |   2 +-
 .../basic/BasicInternalFrameTitlePane.eea     |   8 +-
 .../swing/plaf/basic/BasicInternalFrameUI.eea |  26 ++--
 .../javax/swing/plaf/basic/BasicLabelUI.eea   |   4 +-
 .../javax/swing/plaf/basic/BasicListUI.eea    |  18 +--
 .../swing/plaf/basic/BasicLookAndFeel.eea     |   6 +-
 .../javax/swing/plaf/basic/BasicMenuBarUI.eea |  10 +-
 .../swing/plaf/basic/BasicMenuItemUI.eea      |  18 +--
 .../javax/swing/plaf/basic/BasicMenuUI.eea    |  20 +--
 .../swing/plaf/basic/BasicOptionPaneUI.eea    |  22 ++--
 .../javax/swing/plaf/basic/BasicPanelUI.eea   |   2 +-
 .../swing/plaf/basic/BasicPasswordFieldUI.eea |   6 +-
 .../plaf/basic/BasicPopupMenuSeparatorUI.eea  |   4 +-
 .../swing/plaf/basic/BasicPopupMenuUI.eea     |   2 +-
 .../swing/plaf/basic/BasicProgressBarUI.eea   |   6 +-
 .../plaf/basic/BasicRadioButtonMenuItemUI.eea |   4 +-
 .../swing/plaf/basic/BasicRadioButtonUI.eea   |   6 +-
 .../swing/plaf/basic/BasicRootPaneUI.eea      |   2 +-
 .../swing/plaf/basic/BasicScrollBarUI.eea     |  20 +--
 .../swing/plaf/basic/BasicScrollPaneUI.eea    |  12 +-
 .../swing/plaf/basic/BasicSeparatorUI.eea     |   8 +-
 .../javax/swing/plaf/basic/BasicSliderUI.eea  |  28 ++--
 .../javax/swing/plaf/basic/BasicSpinnerUI.eea |  12 +-
 .../plaf/basic/BasicSplitPaneDivider.eea      |   4 +-
 ...litPaneUI$BasicHorizontalLayoutManager.eea |   8 +-
 .../swing/plaf/basic/BasicSplitPaneUI.eea     |  24 ++--
 .../swing/plaf/basic/BasicTabbedPaneUI.eea    |  20 +--
 .../swing/plaf/basic/BasicTableHeaderUI.eea   |   6 +-
 .../javax/swing/plaf/basic/BasicTableUI.eea   |  10 +-
 .../swing/plaf/basic/BasicTextAreaUI.eea      |  10 +-
 .../swing/plaf/basic/BasicTextFieldUI.eea     |   6 +-
 .../swing/plaf/basic/BasicTextPaneUI.eea      |   4 +-
 .../javax/swing/plaf/basic/BasicTextUI.eea    |  20 +--
 .../swing/plaf/basic/BasicToggleButtonUI.eea  |   4 +-
 .../plaf/basic/BasicToolBarSeparatorUI.eea    |   4 +-
 .../javax/swing/plaf/basic/BasicToolBarUI.eea |  22 ++--
 .../javax/swing/plaf/basic/BasicToolTipUI.eea |   4 +-
 .../basic/BasicTreeUI$ComponentHandler.eea    |   2 +-
 .../BasicTreeUI$NodeDimensionsHandler.eea     |   2 +-
 .../javax/swing/plaf/basic/BasicTreeUI.eea    |  46 +++----
 .../swing/plaf/basic/BasicViewportUI.eea      |   2 +-
 .../swing/plaf/metal/DefaultMetalTheme.eea    |   2 +-
 .../javax/swing/plaf/metal/MetalButtonUI.eea  |   4 +-
 .../swing/plaf/metal/MetalCheckBoxUI.eea      |   4 +-
 .../swing/plaf/metal/MetalComboBoxButton.eea  |   2 +-
 .../swing/plaf/metal/MetalComboBoxUI.eea      |  14 +-
 .../swing/plaf/metal/MetalDesktopIconUI.eea   |   6 +-
 ...MetalFileChooserUI$FilterComboBoxModel.eea |   2 +-
 .../swing/plaf/metal/MetalFileChooserUI.eea   |  30 ++---
 .../swing/plaf/metal/MetalIconFactory.eea     |  16 +--
 .../metal/MetalInternalFrameTitlePane.eea     |   4 +-
 .../swing/plaf/metal/MetalInternalFrameUI.eea |   6 +-
 .../javax/swing/plaf/metal/MetalLabelUI.eea   |   2 +-
 .../swing/plaf/metal/MetalLookAndFeel.eea     |  12 +-
 .../javax/swing/plaf/metal/MetalMenuBarUI.eea |   2 +-
 .../plaf/metal/MetalPopupMenuSeparatorUI.eea  |   4 +-
 .../swing/plaf/metal/MetalProgressBarUI.eea   |   2 +-
 .../swing/plaf/metal/MetalRadioButtonUI.eea   |   2 +-
 .../swing/plaf/metal/MetalRootPaneUI.eea      |   2 +-
 .../swing/plaf/metal/MetalScrollBarUI.eea     |  10 +-
 .../swing/plaf/metal/MetalScrollButton.eea    |   2 +-
 .../swing/plaf/metal/MetalScrollPaneUI.eea    |   4 +-
 .../swing/plaf/metal/MetalSeparatorUI.eea     |   4 +-
 .../javax/swing/plaf/metal/MetalSliderUI.eea  |   6 +-
 .../swing/plaf/metal/MetalSplitPaneUI.eea     |   4 +-
 .../swing/plaf/metal/MetalTabbedPaneUI.eea    |   4 +-
 .../swing/plaf/metal/MetalTextFieldUI.eea     |   2 +-
 .../swing/plaf/metal/MetalToggleButtonUI.eea  |   2 +-
 .../javax/swing/plaf/metal/MetalToolBarUI.eea |  12 +-
 .../javax/swing/plaf/metal/MetalToolTipUI.eea |   6 +-
 .../javax/swing/plaf/metal/MetalTreeUI.eea    |   2 +-
 .../javax/swing/plaf/metal/OceanTheme.eea     |   2 +-
 .../javax/swing/plaf/multi/MultiButtonUI.eea  |   4 +-
 .../swing/plaf/multi/MultiColorChooserUI.eea  |   4 +-
 .../swing/plaf/multi/MultiComboBoxUI.eea      |   4 +-
 .../swing/plaf/multi/MultiDesktopIconUI.eea   |   4 +-
 .../swing/plaf/multi/MultiDesktopPaneUI.eea   |   4 +-
 .../swing/plaf/multi/MultiFileChooserUI.eea   |   4 +-
 .../swing/plaf/multi/MultiInternalFrameUI.eea |   4 +-
 .../javax/swing/plaf/multi/MultiLabelUI.eea   |   4 +-
 .../javax/swing/plaf/multi/MultiListUI.eea    |   4 +-
 .../swing/plaf/multi/MultiLookAndFeel.eea     |  12 +-
 .../javax/swing/plaf/multi/MultiMenuBarUI.eea |   4 +-
 .../swing/plaf/multi/MultiMenuItemUI.eea      |   4 +-
 .../swing/plaf/multi/MultiOptionPaneUI.eea    |   4 +-
 .../javax/swing/plaf/multi/MultiPanelUI.eea   |   4 +-
 .../swing/plaf/multi/MultiPopupMenuUI.eea     |   4 +-
 .../swing/plaf/multi/MultiProgressBarUI.eea   |   4 +-
 .../swing/plaf/multi/MultiRootPaneUI.eea      |   4 +-
 .../swing/plaf/multi/MultiScrollBarUI.eea     |   4 +-
 .../swing/plaf/multi/MultiScrollPaneUI.eea    |   4 +-
 .../swing/plaf/multi/MultiSeparatorUI.eea     |   4 +-
 .../javax/swing/plaf/multi/MultiSliderUI.eea  |   4 +-
 .../javax/swing/plaf/multi/MultiSpinnerUI.eea |   4 +-
 .../swing/plaf/multi/MultiSplitPaneUI.eea     |   4 +-
 .../swing/plaf/multi/MultiTabbedPaneUI.eea    |   4 +-
 .../swing/plaf/multi/MultiTableHeaderUI.eea   |   4 +-
 .../javax/swing/plaf/multi/MultiTableUI.eea   |   4 +-
 .../javax/swing/plaf/multi/MultiTextUI.eea    |   6 +-
 .../javax/swing/plaf/multi/MultiToolBarUI.eea |   4 +-
 .../javax/swing/plaf/multi/MultiToolTipUI.eea |   4 +-
 .../javax/swing/plaf/multi/MultiTreeUI.eea    |   4 +-
 .../swing/plaf/multi/MultiViewportUI.eea      |   4 +-
 .../plaf/nimbus/AbstractRegionPainter.eea     |   8 +-
 .../swing/plaf/nimbus/Effect$ArrayCache.eea   |   8 +-
 .../swing/plaf/nimbus/NimbusLookAndFeel.eea   |  12 +-
 .../javax/swing/plaf/nimbus/NimbusStyle.eea   |   2 +-
 .../javax/swing/plaf/synth/SynthButtonUI.eea  |   8 +-
 .../plaf/synth/SynthCheckBoxMenuItemUI.eea    |   4 +-
 .../swing/plaf/synth/SynthCheckBoxUI.eea      |   4 +-
 .../swing/plaf/synth/SynthColorChooserUI.eea  |   4 +-
 .../swing/plaf/synth/SynthComboBoxUI.eea      |  10 +-
 .../swing/plaf/synth/SynthDesktopIconUI.eea   |   2 +-
 .../swing/plaf/synth/SynthDesktopPaneUI.eea   |   2 +-
 .../swing/plaf/synth/SynthEditorPaneUI.eea    |   2 +-
 .../plaf/synth/SynthFormattedTextFieldUI.eea  |   4 +-
 .../swing/plaf/synth/SynthInternalFrameUI.eea |   6 +-
 .../javax/swing/plaf/synth/SynthLabelUI.eea   |   4 +-
 .../javax/swing/plaf/synth/SynthListUI.eea    |   2 +-
 .../swing/plaf/synth/SynthLookAndFeel.eea     |  10 +-
 .../javax/swing/plaf/synth/SynthMenuBarUI.eea |   2 +-
 .../swing/plaf/synth/SynthMenuItemUI.eea      |   4 +-
 .../javax/swing/plaf/synth/SynthMenuUI.eea    |   4 +-
 .../swing/plaf/synth/SynthOptionPaneUI.eea    |   6 +-
 .../javax/swing/plaf/synth/SynthPanelUI.eea   |   2 +-
 .../swing/plaf/synth/SynthPasswordFieldUI.eea |   6 +-
 .../swing/plaf/synth/SynthPopupMenuUI.eea     |   2 +-
 .../swing/plaf/synth/SynthProgressBarUI.eea   |   6 +-
 .../plaf/synth/SynthRadioButtonMenuItemUI.eea |   4 +-
 .../swing/plaf/synth/SynthRadioButtonUI.eea   |   4 +-
 .../swing/plaf/synth/SynthRootPaneUI.eea      |   2 +-
 .../swing/plaf/synth/SynthScrollBarUI.eea     |   8 +-
 .../swing/plaf/synth/SynthScrollPaneUI.eea    |   2 +-
 .../swing/plaf/synth/SynthSeparatorUI.eea     |   4 +-
 .../javax/swing/plaf/synth/SynthSliderUI.eea  |  10 +-
 .../javax/swing/plaf/synth/SynthSpinnerUI.eea |  10 +-
 .../swing/plaf/synth/SynthSplitPaneUI.eea     |   6 +-
 .../javax/swing/plaf/synth/SynthStyle.eea     |   4 +-
 .../swing/plaf/synth/SynthTabbedPaneUI.eea    |   8 +-
 .../swing/plaf/synth/SynthTableHeaderUI.eea   |   2 +-
 .../javax/swing/plaf/synth/SynthTableUI.eea   |   2 +-
 .../swing/plaf/synth/SynthTextAreaUI.eea      |   2 +-
 .../swing/plaf/synth/SynthTextFieldUI.eea     |   2 +-
 .../swing/plaf/synth/SynthTextPaneUI.eea      |   4 +-
 .../swing/plaf/synth/SynthToggleButtonUI.eea  |   4 +-
 .../javax/swing/plaf/synth/SynthToolBarUI.eea |   4 +-
 .../javax/swing/plaf/synth/SynthToolTipUI.eea |   4 +-
 .../javax/swing/plaf/synth/SynthTreeUI.eea    |   6 +-
 .../swing/plaf/synth/SynthViewportUI.eea      |   2 +-
 .../javax/swing/table/AbstractTableModel.eea  |   4 +-
 .../swing/table/DefaultTableColumnModel.eea   |   2 +-
 .../javax/swing/table/DefaultTableModel.eea   |   2 +-
 ...ableHeader$AccessibleJTableHeaderEntry.eea |  28 ++--
 .../JTableHeader$AccessibleJTableHeader.eea   |   4 +-
 .../javax/swing/table/JTableHeader.eea        |  10 +-
 .../javax/swing/table/TableColumn.eea         |   2 +-
 .../javax/swing/table/TableRowSorter.eea      |   2 +-
 .../text/AbstractDocument$AbstractElement.eea |   2 +-
 .../text/AbstractDocument$BranchElement.eea   |   8 +-
 .../swing/text/AbstractDocument$Content.eea   |   2 +-
 .../AbstractDocument$DefaultDocumentEvent.eea |   8 +-
 .../text/AbstractDocument$LeafElement.eea     |   6 +-
 .../javax/swing/text/AbstractDocument.eea     |  12 +-
 .../javax/swing/text/AsyncBoxView.eea         |   6 +-
 .../resources/javax/swing/text/BoxView.eea    |  10 +-
 .../javax/swing/text/ComponentView.eea        |   2 +-
 .../javax/swing/text/CompositeView.eea        |  10 +-
 .../javax/swing/text/DefaultEditorKit.eea     |   8 +-
 .../javax/swing/text/DefaultFormatter.eea     |   6 +-
 ...ultHighlighter$DefaultHighlightPainter.eea |   2 +-
 .../javax/swing/text/DefaultHighlighter.eea   |   2 +-
 .../DefaultStyledDocument$SectionElement.eea  |   2 +-
 .../swing/text/DefaultStyledDocument.eea      |   2 +-
 .../resources/javax/swing/text/Document.eea   |   2 +-
 .../resources/javax/swing/text/EditorKit.eea  |   4 +-
 .../javax/swing/text/ElementIterator.eea      |   8 +-
 .../resources/javax/swing/text/FieldView.eea  |   2 +-
 .../swing/text/FlowView$FlowStrategy.eea      |   2 +-
 .../resources/javax/swing/text/FlowView.eea   |   4 +-
 .../resources/javax/swing/text/GapContent.eea |   8 +-
 .../resources/javax/swing/text/GlyphView.eea  |   8 +-
 .../swing/text/InternationalFormatter.eea     |   4 +-
 ...TextComponent$AccessibleJTextComponent.eea |  12 +-
 .../javax/swing/text/JTextComponent.eea       |   8 +-
 .../resources/javax/swing/text/LabelView.eea  |   6 +-
 .../javax/swing/text/LayoutQueue.eea          |   2 +-
 .../javax/swing/text/MaskFormatter.eea        |   2 +-
 .../javax/swing/text/ParagraphView.eea        |   4 +-
 .../javax/swing/text/PasswordView.eea         |   2 +-
 .../javax/swing/text/PlainDocument.eea        |   2 +-
 .../javax/swing/text/StringContent.eea        |   8 +-
 .../javax/swing/text/StyleConstants.eea       |   2 +-
 .../swing/text/StyleContext$NamedStyle.eea    |   4 +-
 .../javax/swing/text/StyleContext.eea         |   8 +-
 .../text/StyledEditorKit$StyledTextAction.eea |   2 +-
 .../javax/swing/text/StyledEditorKit.eea      |   4 +-
 .../javax/swing/text/TableView$TableRow.eea   |   4 +-
 .../resources/javax/swing/text/TableView.eea  |   8 +-
 .../resources/javax/swing/text/TextAction.eea |   2 +-
 .../resources/javax/swing/text/Utilities.eea  |   2 +-
 .../main/resources/javax/swing/text/View.eea  |  12 +-
 .../javax/swing/text/ViewFactory.eea          |   2 +-
 .../resources/javax/swing/text/ZoneView.eea   |   2 +-
 .../AccessibleHTML$HTMLAccessibleContext.eea  |  14 +-
 ...$IconElementInfo$IconAccessibleContext.eea |   2 +-
 ...cessibleContext$AccessibleHeadersTable.eea |  18 +--
 ...ableElementInfo$TableAccessibleContext.eea |  26 ++--
 ...$TextElementInfo$TextAccessibleContext.eea |   8 +-
 .../javax/swing/text/html/BlockView.eea       |   4 +-
 .../resources/javax/swing/text/html/CSS.eea   |   2 +-
 .../javax/swing/text/html/FormView.eea        |   2 +-
 .../resources/javax/swing/text/html/HTML.eea  |   6 +-
 .../text/html/HTMLDocument$BlockElement.eea   |   4 +-
 .../text/html/HTMLDocument$RunElement.eea     |   4 +-
 .../javax/swing/text/html/HTMLDocument.eea    |  10 +-
 .../text/html/HTMLEditorKit$HTMLFactory.eea   |   2 +-
 .../javax/swing/text/html/HTMLEditorKit.eea   |  10 +-
 .../javax/swing/text/html/ImageView.eea       |   6 +-
 .../javax/swing/text/html/ObjectView.eea      |   2 +-
 .../javax/swing/text/html/ParagraphView.eea   |   2 +-
 .../javax/swing/text/html/StyleSheet.eea      |  14 +-
 .../swing/text/html/TableView$RowView.eea     |   6 +-
 .../swing/text/html/parser/AttributeList.eea  |   2 +-
 .../swing/text/html/parser/ContentModel.eea   |   2 +-
 .../javax/swing/text/html/parser/DTD.eea      |  10 +-
 .../javax/swing/text/html/parser/Element.eea  |   4 +-
 .../javax/swing/text/html/parser/Parser.eea   |   4 +-
 .../text/html/parser/ParserDelegator.eea      |   2 +-
 .../javax/swing/text/rtf/RTFEditorKit.eea     |   2 +-
 .../javax/swing/tree/AbstractLayoutCache.eea  |   4 +-
 .../swing/tree/DefaultMutableTreeNode.eea     |  26 ++--
 .../swing/tree/DefaultTreeCellEditor.eea      |   4 +-
 .../javax/swing/tree/DefaultTreeModel.eea     |   2 +-
 .../swing/tree/DefaultTreeSelectionModel.eea  |   6 +-
 .../swing/tree/FixedHeightLayoutCache.eea     |   8 +-
 .../resources/javax/swing/tree/TreePath.eea   |   4 +-
 .../swing/tree/VariableHeightLayoutCache.eea  |   8 +-
 .../javax/swing/undo/AbstractUndoableEdit.eea |   2 +-
 .../javax/swing/undo/CompoundEdit.eea         |   4 +-
 .../resources/javax/swing/undo/StateEdit.eea  |   2 +-
 .../javax/swing/undo/UndoManager.eea          |   4 +-
 .../javax/swing/undo/UndoableEditSupport.eea  |   2 +-
 .../javax/tools/ForwardingJavaFileManager.eea |  10 +-
 .../resources/javax/tools/JavaFileManager.eea |  10 +-
 .../javax/tools/SimpleJavaFileObject.eea      |   8 +-
 .../javax/tools/StandardJavaFileManager.eea   |   2 +-
 .../src/main/resources/javax/tools/Tool.eea   |   2 +-
 .../resources/javax/tools/ToolProvider.eea    |   2 +-
 .../javax/xml/catalog/CatalogFeatures.eea     |   2 +-
 .../javax/xml/catalog/CatalogManager.eea      |   6 +-
 .../xml/catalog/GroupEntry$ResolveType.eea    |   2 +-
 .../javax/xml/crypto/KeySelector.eea          |   2 +-
 .../javax/xml/datatype/DatatypeFactory.eea    |   2 +-
 .../xml/parsers/DocumentBuilderFactory.eea    |   4 +-
 .../resources/javax/xml/parsers/SAXParser.eea |   2 +-
 .../javax/xml/parsers/SAXParserFactory.eea    |   4 +-
 .../javax/xml/stream/XMLEventFactory.eea      |  52 ++++----
 .../xml/transform/TransformerException.eea    |   4 +-
 .../xml/transform/TransformerFactory.eea      |   2 +-
 .../javax/xml/transform/sax/SAXSource.eea     |   4 +-
 .../javax/xml/transform/stax/StAXResult.eea   |   2 +-
 .../javax/xml/validation/SchemaFactory.eea    |   4 +-
 .../javax/xml/validation/Validator.eea        |   2 +-
 .../javax/xml/validation/ValidatorHandler.eea |   2 +-
 .../XPathEvaluationResult$XPathResultType.eea |   2 +-
 .../javax/xml/xpath/XPathFactory.eea          |   2 +-
 .../org/w3c/dom/DOMImplementation.eea         |   4 +-
 .../main/resources/org/w3c/dom/Document.eea   |   2 +-
 .../bootstrap/DOMImplementationRegistry.eea   |   6 +-
 .../org/w3c/dom/css/DOMImplementationCSS.eea  |   2 +-
 .../org/w3c/dom/events/DocumentEvent.eea      |   2 +-
 .../w3c/dom/html/HTMLDOMImplementation.eea    |   2 +-
 .../org/w3c/dom/html/HTMLTableElement.eea     |   6 +-
 .../org/w3c/dom/ls/DOMImplementationLS.eea    |   8 +-
 .../org/w3c/dom/ranges/DocumentRange.eea      |   2 +-
 .../w3c/dom/traversal/DocumentTraversal.eea   |   4 +-
 .../org/w3c/dom/xpath/XPathEvaluator.eea      |   4 +-
 .../org/xml/sax/ext/DefaultHandler2.eea       |   4 +-
 .../org/xml/sax/helpers/AttributeListImpl.eea |   6 +-
 .../org/xml/sax/helpers/AttributesImpl.eea    |  18 +--
 .../org/xml/sax/helpers/NamespaceSupport.eea  |   2 +-
 .../org/xml/sax/helpers/ParserAdapter.eea     |   2 +-
 .../org/xml/sax/helpers/XMLReaderFactory.eea  |   4 +-
 .../src/main/resources/java/applet/Applet.eea |   8 +-
 .../src/main/resources/java/awt/AWTEvent.eea  |   2 +-
 .../main/resources/java/awt/AWTKeyStroke.eea  |   2 +-
 .../resources/java/awt/AlphaComposite.eea     |   2 +-
 .../main/resources/java/awt/BasicStroke.eea   |   4 +-
 .../main/resources/java/awt/BorderLayout.eea  |   4 +-
 .../java/awt/Button$AccessibleAWTButton.eea   |   6 +-
 .../src/main/resources/java/awt/Button.eea    |   2 +-
 .../main/resources/java/awt/CardLayout.eea    |   2 +-
 .../awt/Checkbox$AccessibleAWTCheckbox.eea    |  12 +-
 .../src/main/resources/java/awt/Checkbox.eea  |   4 +-
 ...MenuItem$AccessibleAWTCheckboxMenuItem.eea |  12 +-
 .../resources/java/awt/CheckboxMenuItem.eea   |   4 +-
 .../java/awt/Choice$AccessibleAWTChoice.eea   |   4 +-
 .../src/main/resources/java/awt/Choice.eea    |   6 +-
 .../src/main/resources/java/awt/Color.eea     |   8 +-
 .../awt/Component$AccessibleAWTComponent.eea  |   8 +-
 .../src/main/resources/java/awt/Component.eea |  28 ++--
 .../src/main/resources/java/awt/Composite.eea |   2 +-
 .../awt/Container$AccessibleAWTContainer.eea  |   4 +-
 .../src/main/resources/java/awt/Container.eea |  10 +-
 .../ContainerOrderFocusTraversalPolicy.eea    |   8 +-
 .../src/main/resources/java/awt/Cursor.eea    |   4 +-
 .../src/main/resources/java/awt/Desktop.eea   |   2 +-
 .../src/main/resources/java/awt/Dialog.eea    |   2 +-
 .../src/main/resources/java/awt/Event.eea     |   2 +-
 .../main/resources/java/awt/EventQueue.eea    |   6 +-
 .../main/resources/java/awt/FileDialog.eea    |   2 +-
 .../src/main/resources/java/awt/Font.eea      |  22 ++--
 .../main/resources/java/awt/FontMetrics.eea   |   2 +-
 .../src/main/resources/java/awt/Frame.eea     |   6 +-
 .../main/resources/java/awt/GradientPaint.eea |   2 +-
 .../src/main/resources/java/awt/Graphics.eea  |   4 +-
 .../java/awt/GraphicsConfiguration.eea        |  12 +-
 .../main/resources/java/awt/GridBagLayout.eea |   4 +-
 .../java/awt/KeyboardFocusManager.eea         |   4 +-
 .../src/main/resources/java/awt/Label.eea     |   2 +-
 .../java/awt/LinearGradientPaint.eea          |   2 +-
 ...cessibleAWTList$AccessibleAWTListChild.eea |  12 +-
 .../java/awt/List$AccessibleAWTList.eea       |   6 +-
 .../src/main/resources/java/awt/List.eea      |  10 +-
 .../main/resources/java/awt/MediaTracker.eea  |   4 +-
 .../src/main/resources/java/awt/Menu.eea      |   2 +-
 .../src/main/resources/java/awt/MenuBar.eea   |   2 +-
 ...nuComponent$AccessibleAWTMenuComponent.eea |  28 ++--
 .../main/resources/java/awt/MenuComponent.eea |   4 +-
 .../awt/MenuItem$AccessibleAWTMenuItem.eea    |   6 +-
 .../src/main/resources/java/awt/MenuItem.eea  |   2 +-
 .../main/resources/java/awt/MenuShortcut.eea  |   2 +-
 .../java/awt/MultipleGradientPaint.eea        |   2 +-
 .../resources/java/awt/PageAttributes.eea     |   2 +-
 .../src/main/resources/java/awt/Paint.eea     |   2 +-
 .../src/main/resources/java/awt/Polygon.eea   |   2 +-
 .../src/main/resources/java/awt/PopupMenu.eea |   2 +-
 .../java/awt/RadialGradientPaint.eea          |   2 +-
 .../src/main/resources/java/awt/Rectangle.eea |   4 +-
 .../src/main/resources/java/awt/Robot.eea     |   4 +-
 .../main/resources/java/awt/ScrollPane.eea    |   2 +-
 .../java/awt/ScrollPaneAdjustable.eea         |   2 +-
 .../awt/Scrollbar$AccessibleAWTScrollBar.eea  |   2 +-
 .../src/main/resources/java/awt/Scrollbar.eea |   2 +-
 .../main/resources/java/awt/SplashScreen.eea  |   2 +-
 .../src/main/resources/java/awt/Stroke.eea    |   2 +-
 .../src/main/resources/java/awt/Taskbar.eea   |   2 +-
 .../src/main/resources/java/awt/TextArea.eea  |   6 +-
 ...xtComponent$AccessibleAWTTextComponent.eea |  14 +-
 .../main/resources/java/awt/TextComponent.eea |   6 +-
 .../src/main/resources/java/awt/TextField.eea |   6 +-
 .../main/resources/java/awt/TexturePaint.eea  |   2 +-
 .../src/main/resources/java/awt/Toolkit.eea   |  18 +--
 .../src/main/resources/java/awt/Window.eea    |  16 +--
 .../java/awt/color/ICC_ColorSpace.eea         |   8 +-
 .../resources/java/awt/color/ICC_Profile.eea  |   6 +-
 .../java/awt/datatransfer/DataFlavor.eea      |  12 +-
 .../java/awt/datatransfer/SystemFlavorMap.eea |  12 +-
 .../resources/java/awt/desktop/FilesEvent.eea |   2 +-
 .../resources/java/awt/dnd/DragSource.eea     |   6 +-
 .../java/awt/dnd/DragSourceEvent.eea          |   2 +-
 .../resources/java/awt/dnd/DropTarget.eea     |   4 +-
 .../java/awt/dnd/DropTargetContext.eea        |   4 +-
 .../resources/java/awt/event/ActionEvent.eea  |   2 +-
 .../java/awt/event/AdjustmentEvent.eea        |   2 +-
 .../java/awt/event/ComponentEvent.eea         |   4 +-
 .../java/awt/event/ContainerEvent.eea         |   4 +-
 .../resources/java/awt/event/FocusEvent.eea   |   4 +-
 .../java/awt/event/HierarchyEvent.eea         |   4 +-
 .../resources/java/awt/event/InputEvent.eea   |   2 +-
 .../java/awt/event/InputMethodEvent.eea       |   2 +-
 .../java/awt/event/InvocationEvent.eea        |   6 +-
 .../resources/java/awt/event/ItemEvent.eea    |   2 +-
 .../resources/java/awt/event/KeyEvent.eea     |   4 +-
 .../resources/java/awt/event/MouseEvent.eea   |   6 +-
 .../java/awt/event/MouseWheelEvent.eea        |   2 +-
 .../resources/java/awt/event/PaintEvent.eea   |   2 +-
 .../resources/java/awt/event/TextEvent.eea    |   2 +-
 .../resources/java/awt/event/WindowEvent.eea  |   6 +-
 .../java/awt/font/FontRenderContext.eea       |   2 +-
 .../resources/java/awt/font/GlyphVector.eea   |   2 +-
 .../java/awt/font/LineBreakMeasurer.eea       |   2 +-
 .../resources/java/awt/font/NumericShaper.eea |  10 +-
 .../java/awt/font/ShapeGraphicAttribute.eea   |   2 +-
 .../resources/java/awt/font/TextLayout.eea    |  16 +--
 .../java/awt/font/TransformAttribute.eea      |   2 +-
 .../java/awt/geom/AffineTransform.eea         |  28 ++--
 .../resources/java/awt/geom/Arc2D$Double.eea  |   2 +-
 .../main/resources/java/awt/geom/Arc2D.eea    |   6 +-
 .../src/main/resources/java/awt/geom/Area.eea |   6 +-
 .../resources/java/awt/geom/CubicCurve2D.eea  |   4 +-
 .../resources/java/awt/geom/Ellipse2D.eea     |   2 +-
 .../resources/java/awt/geom/Line2D$Double.eea |   2 +-
 .../resources/java/awt/geom/Line2D$Float.eea  |   2 +-
 .../main/resources/java/awt/geom/Line2D.eea   |   4 +-
 .../resources/java/awt/geom/Path2D$Double.eea |   2 +-
 .../resources/java/awt/geom/Path2D$Float.eea  |   2 +-
 .../main/resources/java/awt/geom/Path2D.eea   |   6 +-
 .../resources/java/awt/geom/QuadCurve2D.eea   |   4 +-
 .../java/awt/geom/Rectangle2D$Double.eea      |   4 +-
 .../java/awt/geom/Rectangle2D$Float.eea       |   4 +-
 .../resources/java/awt/geom/Rectangle2D.eea   |   8 +-
 .../java/awt/geom/RectangularShape.eea        |   4 +-
 .../java/awt/geom/RoundRectangle2D.eea        |   2 +-
 .../resources/java/awt/im/InputContext.eea    |   6 +-
 .../java/awt/im/spi/InputMethodContext.eea    |   4 +-
 .../java/awt/im/spi/InputMethodDescriptor.eea |   2 +-
 .../image/AbstractMultiResolutionImage.eea    |   2 +-
 .../java/awt/image/AffineTransformOp.eea      |   4 +-
 .../java/awt/image/BandCombineOp.eea          |   6 +-
 .../java/awt/image/BandedSampleModel.eea      |  12 +-
 .../java/awt/image/BufferedImage.eea          |   8 +-
 .../java/awt/image/BufferedImageOp.eea        |   2 +-
 .../java/awt/image/ByteLookupTable.eea        |   4 +-
 .../java/awt/image/ColorConvertOp.eea         |   8 +-
 .../resources/java/awt/image/ColorModel.eea   |  22 ++--
 .../java/awt/image/ComponentColorModel.eea    |  22 ++--
 .../java/awt/image/ComponentSampleModel.eea   |  14 +-
 .../resources/java/awt/image/ConvolveOp.eea   |   6 +-
 .../java/awt/image/DirectColorModel.eea       |  12 +-
 .../java/awt/image/IndexColorModel.eea        |  14 +-
 .../main/resources/java/awt/image/Kernel.eea  |   2 +-
 .../resources/java/awt/image/LookupOp.eea     |   6 +-
 .../awt/image/MultiPixelPackedSampleModel.eea |   8 +-
 .../java/awt/image/PackedColorModel.eea       |   4 +-
 .../awt/image/PixelInterleavedSampleModel.eea |   4 +-
 .../java/awt/image/RGBImageFilter.eea         |   2 +-
 .../main/resources/java/awt/image/Raster.eea  |  38 +++---
 .../resources/java/awt/image/RasterOp.eea     |   2 +-
 .../resources/java/awt/image/RescaleOp.eea    |   6 +-
 .../resources/java/awt/image/SampleModel.eea  |  24 ++--
 .../java/awt/image/ShortLookupTable.eea       |   4 +-
 .../image/SinglePixelPackedSampleModel.eea    |  12 +-
 .../java/awt/image/VolatileImage.eea          |   2 +-
 .../java/awt/image/WritableRaster.eea         |   4 +-
 .../ContextualRenderedImageFactory.eea        |   2 +-
 .../awt/image/renderable/ParameterBlock.eea   |   4 +-
 .../awt/image/renderable/RenderableImage.eea  |   6 +-
 .../image/renderable/RenderableImageOp.eea    |   6 +-
 .../image/renderable/RenderedImageFactory.eea |   2 +-
 .../resources/java/awt/peer/ComponentPeer.eea |   4 +-
 .../resources/java/awt/peer/TaskbarPeer.eea   |   4 +-
 .../resources/java/awt/print/PageFormat.eea   |   2 +-
 .../resources/java/awt/print/PrinterJob.eea   |   2 +-
 .../resources/java/beans/BeanDescriptor.eea   |   4 +-
 .../java/beans/DefaultPersistenceDelegate.eea |   2 +-
 .../resources/java/beans/EventHandler.eea     |   6 +-
 .../java/beans/EventSetDescriptor.eea         |   6 +-
 .../java/beans/IndexedPropertyDescriptor.eea  |   4 +-
 .../resources/java/beans/MethodDescriptor.eea |   2 +-
 .../java/beans/PropertyDescriptor.eea         |   8 +-
 .../java/beans/PropertyEditorSupport.eea      |   8 +-
 .../resources/java/beans/SimpleBeanInfo.eea   |  14 +-
 .../main/resources/java/beans/XMLDecoder.eea  |   2 +-
 ...rvicesSupport$BCSSProxyServiceProvider.eea |   2 +-
 .../BeanContextServicesSupport.eea            |  12 +-
 .../beans/beancontext/BeanContextSupport.eea  |  14 +-
 .../resources/java/io/ObjectInputFilter.eea   |   8 +-
 .../resources/java/io/ObjectInputStream.eea   |   6 +-
 .../resources/java/io/ObjectStreamClass.eea   |   2 +-
 .../src/main/resources/java/lang/Class.eea    |   6 +-
 .../resources/java/lang/Enum$EnumDesc.eea     |   2 +-
 .../src/main/resources/java/lang/String.eea   |   2 +-
 .../java/lang/constant/ClassDesc.eea          |   4 +-
 .../lang/constant/DynamicCallSiteDesc.eea     |   4 +-
 .../lang/constant/DynamicConstantDesc.eea     |   2 +-
 .../java/lang/constant/MethodHandleDesc.eea   |   6 +-
 .../java/lang/constant/MethodTypeDesc.eea     |   2 +-
 .../lang/instrument/ClassFileTransformer.eea  |   2 +-
 .../lang/invoke/ClassSpecializer$Factory.eea  |   2 +-
 .../invoke/ClassSpecializer$SpeciesData.eea   |   2 +-
 .../java/lang/invoke/ConstantBootstraps.eea   |   2 +-
 .../java/lang/invoke/MethodHandle.eea         |   4 +-
 .../java/lang/invoke/MethodHandles$Lookup.eea |   2 +-
 .../java/lang/invoke/MethodHandles.eea        |   6 +-
 .../java/lang/invoke/StringConcatFactory.eea  |   2 +-
 .../lang/invoke/VarHandle$VarHandleDesc.eea   |   6 +-
 .../resources/java/lang/invoke/VarHandle.eea  |  44 +++----
 .../java/lang/module/Configuration.eea        |   4 +-
 .../lang/module/ModuleDescriptor$Version.eea  |   2 +-
 .../java/lang/module/ModuleFinder.eea         |   2 +-
 .../java/lang/runtime/SwitchBootstraps.eea    |   4 +-
 .../main/resources/java/net/Authenticator.eea |  10 +-
 .../resources/java/net/ContentHandler.eea     |   2 +-
 .../java/net/ContentHandlerFactory.eea        |   2 +-
 .../resources/java/net/DatagramPacket.eea     |   2 +-
 .../resources/java/net/DatagramSocket.eea     |   8 +-
 .../resources/java/net/DatagramSocketImpl.eea |   2 +-
 .../java/net/DatagramSocketImplFactory.eea    |   2 +-
 .../resources/java/net/HttpURLConnection.eea  |   4 +-
 .../src/main/resources/java/net/IDN.eea       |   4 +-
 .../resources/java/net/InetSocketAddress.eea  |   2 +-
 .../resources/java/net/NetworkInterface.eea   |   2 +-
 .../main/resources/java/net/ServerSocket.eea  |   6 +-
 .../src/main/resources/java/net/Socket.eea    |   6 +-
 .../main/resources/java/net/SocketImpl.eea    |   2 +-
 .../resources/java/net/SocketImplFactory.eea  |   2 +-
 .../resources/java/net/URLClassLoader.eea     |   2 +-
 .../main/resources/java/net/URLConnection.eea |   8 +-
 .../resources/java/net/URLStreamHandler.eea   |   4 +-
 .../java/net/URLStreamHandlerFactory.eea      |   2 +-
 .../java/net/UnixDomainSocketAddress.eea      |   2 +-
 .../resources/java/net/http/HttpClient.eea    |   2 +-
 .../resources/java/net/http/HttpRequest.eea   |   4 +-
 .../net/http/HttpResponse$BodySubscribers.eea |  16 +--
 .../http/HttpResponse$PushPromiseHandler.eea  |   2 +-
 .../resources/java/nio/channels/Channels.eea  |   8 +-
 .../resources/java/nio/channels/FileLock.eea  |   2 +-
 .../nio/channels/spi/SelectorProvider.eea     |   6 +-
 .../java/nio/charset/CharsetDecoder.eea       |   2 +-
 .../main/resources/java/nio/file/Files.eea    |  16 +--
 .../java/nio/file/attribute/AclEntry.eea      |   6 +-
 .../java/nio/file/attribute/FileTime.eea      |   4 +-
 .../file/attribute/PosixFilePermissions.eea   |   4 +-
 .../java/nio/file/spi/FileSystemProvider.eea  |   8 +-
 .../resources/java/rmi/MarshalledObject.eea   |   2 +-
 .../java/rmi/registry/LocateRegistry.eea      |   4 +-
 .../resources/java/rmi/server/LogStream.eea   |   2 +-
 .../main/resources/java/rmi/server/ObjID.eea  |   2 +-
 .../rmi/server/RMIClientSocketFactory.eea     |   2 +-
 .../rmi/server/RMIServerSocketFactory.eea     |   2 +-
 .../java/rmi/server/RMISocketFactory.eea      |   4 +-
 .../main/resources/java/rmi/server/UID.eea    |   2 +-
 .../java/security/AccessController.eea        |   8 +-
 .../resources/java/security/CodeSource.eea    |   4 +-
 .../security/DomainLoadStoreParameter.eea     |   2 +-
 .../java/security/DrbgParameters.eea          |   6 +-
 .../main/resources/java/security/Identity.eea |   4 +-
 .../java/security/KeyStore$Builder.eea        |   6 +-
 .../resources/java/security/KeyStoreSpi.eea   |   2 +-
 .../resources/java/security/Permissions.eea   |   2 +-
 .../main/resources/java/security/Policy.eea   |   8 +-
 .../main/resources/java/security/Provider.eea |   2 +-
 .../java/security/SecureClassLoader.eea       |   2 +-
 .../java/security/SecureRandomSpi.eea         |   2 +-
 .../main/resources/java/security/Security.eea |   4 +-
 .../resources/java/security/SignatureSpi.eea  |   2 +-
 .../resources/java/security/Timestamp.eea     |   2 +-
 .../java/security/cert/CertPathBuilderSpi.eea |   2 +-
 .../security/cert/CertPathValidatorSpi.eea    |   2 +-
 .../java/security/cert/CertStore.eea          |   2 +-
 .../security/cert/CertificateFactorySpi.eea   |   8 +-
 .../cert/CertificateRevokedException.eea      |   2 +-
 .../java/security/cert/PKIXParameters.eea     |   4 +-
 .../security/cert/PKIXRevocationChecker.eea   |   2 +-
 .../security/cert/URICertStoreParameters.eea  |   2 +-
 .../resources/java/security/cert/X509CRL.eea  |   2 +-
 .../java/security/cert/X509CRLEntry.eea       |   4 +-
 .../java/security/cert/X509CRLSelector.eea    |   6 +-
 .../java/security/cert/X509CertSelector.eea   |  18 +--
 .../java/security/interfaces/RSAKey.eea       |   2 +-
 .../java/security/spec/ECFieldF2m.eea         |   2 +-
 .../java/security/spec/EllipticCurve.eea      |   2 +-
 .../security/spec/PKCS8EncodedKeySpec.eea     |   2 +-
 .../spec/RSAMultiPrimePrivateCrtKeySpec.eea   |   2 +-
 .../java/security/spec/X509EncodedKeySpec.eea |   2 +-
 .../main/resources/java/sql/Connection.eea    |  18 +--
 .../src/main/resources/java/sql/JDBCType.eea  |   2 +-
 .../main/resources/java/sql/SQLException.eea  |   2 +-
 .../src/main/resources/java/sql/SQLInput.eea  |   2 +-
 .../src/main/resources/java/sql/Statement.eea |   6 +-
 .../src/main/resources/java/sql/Time.eea      |   4 +-
 .../resources/java/text/AttributedString.eea  |   2 +-
 .../src/main/resources/java/text/Bidi.eea     |   2 +-
 .../main/resources/java/text/ChoiceFormat.eea |   2 +-
 .../resources/java/text/DecimalFormat.eea     |   2 +-
 .../resources/java/text/MessageFormat.eea     |   2 +-
 .../resources/java/text/RuleBasedCollator.eea |   4 +-
 .../resources/java/text/SimpleDateFormat.eea  |   2 +-
 .../java/text/spi/NumberFormatProvider.eea    |   2 +-
 .../src/main/resources/java/time/Clock.eea    |  12 +-
 .../resources/java/time/InstantSource.eea     |   2 +-
 .../src/main/resources/java/time/MonthDay.eea |   2 +-
 .../main/resources/java/time/OffsetTime.eea   |   8 +-
 .../src/main/resources/java/time/Year.eea     |   2 +-
 .../main/resources/java/time/YearMonth.eea    |   2 +-
 .../java/time/chrono/AbstractChronology.eea   |   2 +-
 .../resources/java/time/chrono/Chronology.eea |   2 +-
 .../java/time/chrono/IsoChronology.eea        |   4 +-
 .../java/time/chrono/JapaneseChronology.eea   |  10 +-
 .../java/time/chrono/JapaneseDate.eea         |   6 +-
 .../java/time/chrono/MinguoChronology.eea     |   6 +-
 .../resources/java/time/chrono/MinguoDate.eea |   2 +-
 .../time/chrono/ThaiBuddhistChronology.eea    |   6 +-
 .../java/time/chrono/ThaiBuddhistDate.eea     |   2 +-
 .../java/time/zone/ZoneOffsetTransition.eea   |   2 +-
 ...oneOffsetTransitionRule$TimeDefinition.eea |   2 +-
 .../time/zone/ZoneOffsetTransitionRule.eea    |   4 +-
 .../resources/java/time/zone/ZoneRules.eea    |   6 +-
 .../main/resources/java/util/AbstractList.eea |   4 +-
 .../util/AbstractMap$SimpleImmutableEntry.eea |   2 +-
 .../java/util/AbstractSequentialList.eea      |   4 +-
 .../main/resources/java/util/ArrayList.eea    |   4 +-
 .../main/resources/java/util/Collections.eea  |   2 +-
 .../main/resources/java/util/Enumeration.eea  |   2 +-
 .../resources/java/util/GregorianCalendar.eea |   4 +-
 .../main/resources/java/util/HexFormat.eea    |   4 +-
 .../main/resources/java/util/LinkedList.eea   |   4 +-
 .../src/main/resources/java/util/Locale.eea   |   8 +-
 .../resources/java/util/OptionalDouble.eea    |   2 +-
 .../main/resources/java/util/OptionalInt.eea  |   2 +-
 .../main/resources/java/util/OptionalLong.eea |   2 +-
 .../java/util/ResourceBundle$Control.eea      |   6 +-
 .../src/main/resources/java/util/Scanner.eea  |   4 +-
 .../resources/java/util/ServiceLoader.eea     |  10 +-
 ...Spliterators$AbstractDoubleSpliterator.eea |   2 +-
 .../Spliterators$AbstractIntSpliterator.eea   |   2 +-
 .../Spliterators$AbstractLongSpliterator.eea  |   2 +-
 .../resources/java/util/SplittableRandom.eea  |   4 +-
 .../src/main/resources/java/util/Vector.eea   |   6 +-
 .../util/concurrent/ConcurrentSkipListMap.eea |   4 +-
 .../java/util/concurrent/CountedCompleter.eea |   2 +-
 .../java/util/concurrent/RecursiveAction.eea  |   2 +-
 .../util/concurrent/SubmissionPublisher.eea   |   4 +-
 .../atomic/AtomicLongFieldUpdater.eea         |   2 +-
 .../atomic/AtomicReferenceFieldUpdater.eea    |   2 +-
 ...QueuedLongSynchronizer$ConditionObject.eea |   2 +-
 .../locks/AbstractQueuedLongSynchronizer.eea  |   6 +-
 ...ractQueuedSynchronizer$ConditionObject.eea |   2 +-
 .../locks/AbstractQueuedSynchronizer.eea      |   6 +-
 .../java/util/prefs/AbstractPreferences.eea   |   2 +-
 .../util/random/RandomGeneratorFactory.eea    |   6 +-
 .../java/util/spi/CurrencyNameProvider.eea    |   2 +-
 .../java/util/spi/LocaleNameProvider.eea      |   6 +-
 .../java/util/spi/TimeZoneNameProvider.eea    |   2 +-
 .../java/util/stream/DoubleStream.eea         |   2 +-
 .../java/util/stream/Node$OfPrimitive.eea     |   2 +-
 .../javax/accessibility/AccessibleContext.eea |  16 +--
 .../accessibility/AccessibleRelation.eea      |   2 +-
 .../accessibility/AccessibleRelationSet.eea   |   4 +-
 .../accessibility/AccessibleStateSet.eea      |   2 +-
 .../annotation/processing/Completions.eea     |   4 +-
 .../javax/annotation/processing/Filer.eea     |   6 +-
 .../main/resources/javax/crypto/CipherSpi.eea |   4 +-
 .../javax/crypto/EncryptedPrivateKeyInfo.eea  |   2 +-
 .../resources/javax/crypto/KeyAgreement.eea   |   2 +-
 .../src/main/resources/javax/crypto/Mac.eea   |   2 +-
 .../javax/crypto/SecretKeyFactory.eea         |   2 +-
 .../javax/crypto/spec/PBEKeySpec.eea          |   2 +-
 .../main/resources/javax/imageio/IIOParam.eea |   4 +-
 .../main/resources/javax/imageio/ImageIO.eea  |  10 +-
 .../javax/imageio/ImageReadParam.eea          |   2 +-
 .../resources/javax/imageio/ImageReader.eea   |  10 +-
 .../javax/imageio/ImageTypeSpecifier.eea      |  18 +--
 .../javax/imageio/ImageWriteParam.eea         |   6 +-
 .../resources/javax/imageio/ImageWriter.eea   |   4 +-
 .../javax/imageio/metadata/IIOMetadata.eea    |  22 ++--
 .../metadata/IIOMetadataFormatImpl.eea        |   2 +-
 .../imageio/metadata/IIOMetadataNode.eea      |  16 +--
 .../plugins/jpeg/JPEGImageReadParam.eea       |   6 +-
 .../plugins/jpeg/JPEGImageWriteParam.eea      |  10 +-
 .../javax/imageio/plugins/jpeg/JPEGQTable.eea |   2 +-
 .../imageio/plugins/tiff/TIFFDirectory.eea    |   6 +-
 .../javax/imageio/plugins/tiff/TIFFField.eea  |   6 +-
 .../javax/imageio/plugins/tiff/TIFFTag.eea    |   4 +-
 .../javax/imageio/spi/IIORegistry.eea         |   2 +-
 .../javax/imageio/spi/ImageInputStreamSpi.eea |   4 +-
 .../imageio/spi/ImageOutputStreamSpi.eea      |   4 +-
 .../javax/imageio/spi/ImageReaderSpi.eea      |   4 +-
 .../javax/imageio/spi/ImageTranscoderSpi.eea  |   2 +-
 .../javax/imageio/spi/ImageWriterSpi.eea      |   4 +-
 .../javax/imageio/spi/ServiceRegistry.eea     |   4 +-
 .../ModuleElement$DirectiveVisitor.eea        |   2 +-
 .../util/AbstractAnnotationValueVisitor6.eea  |   2 +-
 .../javax/lang/model/util/Elements.eea        |  10 +-
 .../javax/management/AttributeValueExp.eea    |   4 +-
 .../javax/management/ImmutableDescriptor.eea  |   4 +-
 .../javax/management/MBeanServer.eea          |  14 +-
 .../management/MBeanServerConnection.eea      |   8 +-
 .../javax/management/MBeanServerDelegate.eea  |  12 +-
 .../resources/javax/management/ObjectName.eea |  14 +-
 .../main/resources/javax/management/Query.eea |  30 ++---
 .../javax/management/StandardMBean.eea        |   2 +-
 .../javax/management/loading/MLet.eea         |   2 +-
 .../modelmbean/DescriptorSupport.eea          |   8 +-
 .../modelmbean/ModelMBeanInfoSupport.eea      |   4 +-
 .../modelmbean/RequiredModelMBean.eea         |   6 +-
 .../management/monitor/CounterMonitor.eea     |   4 +-
 .../javax/management/monitor/GaugeMonitor.eea |   2 +-
 .../javax/management/monitor/Monitor.eea      |   4 +-
 .../management/monitor/StringMonitor.eea      |   2 +-
 .../openmbean/CompositeDataSupport.eea        |   2 +-
 .../MBeanServerNotificationFilter.eea         |   4 +-
 .../management/relation/RelationService.eea   |  14 +-
 .../management/relation/RelationSupport.eea   |   4 +-
 .../relation/RelationTypeSupport.eea          |   2 +-
 .../javax/management/relation/Role.eea        |   2 +-
 .../management/remote/rmi/RMIConnection.eea   |   8 +-
 .../remote/rmi/RMIConnectionImpl.eea          |  12 +-
 .../remote/rmi/RMIConnectionImpl_Stub.eea     |   8 +-
 .../remote/rmi/RMIConnectorServer.eea         |   4 +-
 .../remote/rmi/RMIIIOPServerImpl.eea          |   6 +-
 .../remote/rmi/RMIJRMPServerImpl.eea          |   4 +-
 .../management/remote/rmi/RMIServerImpl.eea   |   2 +-
 .../javax/management/timer/Timer.eea          |  18 +--
 .../resources/javax/naming/CompositeName.eea  |   4 +-
 .../resources/javax/naming/CompoundName.eea   |   4 +-
 .../main/resources/javax/naming/Context.eea   |   4 +-
 .../resources/javax/naming/InitialContext.eea |   4 +-
 .../resources/javax/naming/LinkException.eea  |   2 +-
 .../javax/naming/NamingException.eea          |   2 +-
 .../main/resources/javax/naming/Reference.eea |   2 +-
 .../javax/naming/directory/BasicAttribute.eea |   4 +-
 .../naming/directory/BasicAttributes.eea      |   2 +-
 .../javax/naming/directory/DirContext.eea     |   4 +-
 .../naming/directory/InitialDirContext.eea    |   4 +-
 .../javax/naming/ldap/ExtendedRequest.eea     |   2 +-
 .../resources/javax/naming/ldap/LdapName.eea  |   8 +-
 .../ldap/PagedResultsResponseControl.eea      |   2 +-
 .../javax/naming/ldap/StartTlsRequest.eea     |   6 +-
 .../javax/naming/ldap/StartTlsResponse.eea    |   4 +-
 .../javax/naming/spi/DirectoryManager.eea     |   4 +-
 .../spi/InitialContextFactoryBuilder.eea      |   2 +-
 .../javax/naming/spi/NamingManager.eea        |   2 +-
 .../javax/naming/spi/ObjectFactoryBuilder.eea |   2 +-
 .../javax/net/ServerSocketFactory.eea         |   8 +-
 .../resources/javax/net/SocketFactory.eea     |  10 +-
 .../javax/net/ssl/ExtendedSSLSession.eea      |   4 +-
 .../javax/net/ssl/HttpsURLConnection.eea      |   2 +-
 .../javax/net/ssl/KeyManagerFactory.eea       |   2 +-
 .../resources/javax/net/ssl/SNIHostName.eea   |   2 +-
 .../resources/javax/net/ssl/SSLContext.eea    |   4 +-
 .../resources/javax/net/ssl/SSLEngine.eea     |  10 +-
 .../resources/javax/net/ssl/SSLParameters.eea |   4 +-
 .../javax/net/ssl/SSLServerSocket.eea         |   2 +-
 .../resources/javax/net/ssl/SSLSession.eea    |   2 +-
 .../resources/javax/net/ssl/SSLSocket.eea     |  10 +-
 .../javax/net/ssl/SSLSocketFactory.eea        |   4 +-
 .../javax/net/ssl/X509ExtendedKeyManager.eea  |   4 +-
 .../javax/print/MultiDocPrintService.eea      |   2 +-
 .../resources/javax/print/PrintService.eea    |   2 +-
 .../javax/print/PrintServiceLookup.eea        |   2 +-
 .../print/attribute/AttributeSetUtilities.eea |  20 +--
 .../javax/print/attribute/DateTimeSyntax.eea  |   2 +-
 .../javax/print/attribute/EnumSyntax.eea      |   4 +-
 .../print/attribute/HashAttributeSet.eea      |   2 +-
 .../print/attribute/ResolutionSyntax.eea      |   2 +-
 .../print/attribute/SetOfIntegerSyntax.eea    |   2 +-
 .../javax/print/attribute/Size2DSyntax.eea    |   2 +-
 .../print/attribute/standard/Chromaticity.eea |   8 +-
 .../attribute/standard/ColorSupported.eea     |   8 +-
 .../print/attribute/standard/Compression.eea  |   8 +-
 .../javax/print/attribute/standard/Copies.eea |   4 +-
 .../attribute/standard/CopiesSupported.eea    |   4 +-
 .../standard/DateTimeAtCompleted.eea          |   4 +-
 .../attribute/standard/DateTimeAtCreation.eea |   4 +-
 .../standard/DateTimeAtProcessing.eea         |   4 +-
 .../print/attribute/standard/Destination.eea  |   4 +-
 .../print/attribute/standard/DialogOwner.eea  |   4 +-
 .../standard/DialogTypeSelection.eea          |   8 +-
 .../print/attribute/standard/DocumentName.eea |   4 +-
 .../print/attribute/standard/Fidelity.eea     |   8 +-
 .../print/attribute/standard/Finishings.eea   |   8 +-
 .../print/attribute/standard/JobHoldUntil.eea |   4 +-
 .../attribute/standard/JobImpressions.eea     |   4 +-
 .../standard/JobImpressionsCompleted.eea      |   4 +-
 .../standard/JobImpressionsSupported.eea      |   4 +-
 .../print/attribute/standard/JobKOctets.eea   |   4 +-
 .../standard/JobKOctetsProcessed.eea          |   4 +-
 .../standard/JobKOctetsSupported.eea          |   4 +-
 .../attribute/standard/JobMediaSheets.eea     |   4 +-
 .../standard/JobMediaSheetsCompleted.eea      |   4 +-
 .../standard/JobMediaSheetsSupported.eea      |   4 +-
 .../standard/JobMessageFromOperator.eea       |   4 +-
 .../print/attribute/standard/JobName.eea      |   4 +-
 .../standard/JobOriginatingUserName.eea       |   4 +-
 .../print/attribute/standard/JobPriority.eea  |   4 +-
 .../standard/JobPrioritySupported.eea         |   4 +-
 .../print/attribute/standard/JobSheets.eea    |   8 +-
 .../print/attribute/standard/JobState.eea     |   8 +-
 .../attribute/standard/JobStateReason.eea     |   8 +-
 .../attribute/standard/JobStateReasons.eea    |   4 +-
 .../javax/print/attribute/standard/Media.eea  |   4 +-
 .../print/attribute/standard/MediaName.eea    |   4 +-
 .../attribute/standard/MediaPrintableArea.eea |   6 +-
 .../print/attribute/standard/MediaSize.eea    |   4 +-
 .../attribute/standard/MediaSizeName.eea      |   4 +-
 .../print/attribute/standard/MediaTray.eea    |   4 +-
 .../standard/MultipleDocumentHandling.eea     |   8 +-
 .../attribute/standard/NumberOfDocuments.eea  |   4 +-
 .../standard/NumberOfInterveningJobs.eea      |   4 +-
 .../print/attribute/standard/NumberUp.eea     |   4 +-
 .../attribute/standard/NumberUpSupported.eea  |   4 +-
 .../standard/OrientationRequested.eea         |   8 +-
 .../standard/OutputDeviceAssigned.eea         |   4 +-
 .../standard/PDLOverrideSupported.eea         |   8 +-
 .../print/attribute/standard/PageRanges.eea   |   4 +-
 .../attribute/standard/PagesPerMinute.eea     |   4 +-
 .../standard/PagesPerMinuteColor.eea          |   4 +-
 .../standard/PresentationDirection.eea        |   8 +-
 .../print/attribute/standard/PrintQuality.eea |   8 +-
 .../print/attribute/standard/PrinterInfo.eea  |   4 +-
 .../standard/PrinterIsAcceptingJobs.eea       |   8 +-
 .../attribute/standard/PrinterLocation.eea    |   4 +-
 .../standard/PrinterMakeAndModel.eea          |   4 +-
 .../standard/PrinterMessageFromOperator.eea   |   4 +-
 .../attribute/standard/PrinterMoreInfo.eea    |   4 +-
 .../standard/PrinterMoreInfoManufacturer.eea  |   4 +-
 .../print/attribute/standard/PrinterName.eea  |   4 +-
 .../attribute/standard/PrinterResolution.eea  |   4 +-
 .../print/attribute/standard/PrinterState.eea |   8 +-
 .../attribute/standard/PrinterStateReason.eea |   8 +-
 .../standard/PrinterStateReasons.eea          |   6 +-
 .../print/attribute/standard/PrinterURI.eea   |   4 +-
 .../attribute/standard/QueuedJobCount.eea     |   4 +-
 .../standard/ReferenceUriSchemesSupported.eea |   8 +-
 .../attribute/standard/RequestingUserName.eea |   4 +-
 .../print/attribute/standard/Severity.eea     |   8 +-
 .../print/attribute/standard/SheetCollate.eea |   8 +-
 .../javax/print/attribute/standard/Sides.eea  |   8 +-
 .../rmi/ssl/SslRMIClientSocketFactory.eea     |   2 +-
 .../rmi/ssl/SslRMIServerSocketFactory.eea     |   2 +-
 .../javax/script/AbstractScriptEngine.eea     |   2 +-
 .../resources/javax/script/ScriptEngine.eea   |   2 +-
 .../javax/script/ScriptEngineManager.eea      |   6 +-
 .../javax/script/SimpleScriptContext.eea      |   6 +-
 .../security/auth/SubjectDomainCombiner.eea   |   2 +-
 .../javax/security/auth/kerberos/KeyTab.eea   |   2 +-
 .../security/auth/login/Configuration.eea     |   6 +-
 .../security/auth/login/LoginContext.eea      |   2 +-
 .../javax/security/sasl/AuthorizeCallback.eea |   2 +-
 .../resources/javax/security/sasl/Sasl.eea    |   8 +-
 .../javax/security/sasl/SaslClientFactory.eea |   2 +-
 .../javax/security/sasl/SaslServerFactory.eea |   2 +-
 .../main/resources/javax/smartcardio/ATR.eea  |   2 +-
 .../javax/smartcardio/CardTerminals.eea       |   2 +-
 .../javax/smartcardio/CommandAPDU.eea         |   2 +-
 .../javax/smartcardio/ResponseAPDU.eea        |   2 +-
 .../javax/sound/midi/MetaMessage.eea          |   2 +-
 .../javax/sound/midi/MidiFileFormat.eea       |   2 +-
 .../javax/sound/midi/MidiMessage.eea          |   2 +-
 .../resources/javax/sound/midi/MidiSystem.eea |   8 +-
 .../resources/javax/sound/midi/Sequence.eea   |   4 +-
 .../javax/sound/midi/SysexMessage.eea         |   2 +-
 .../javax/sound/sampled/AudioFileFormat.eea   |   2 +-
 .../javax/sound/sampled/AudioFormat.eea       |   2 +-
 .../javax/sound/sampled/AudioSystem.eea       |   4 +-
 .../resources/javax/sql/CommonDataSource.eea  |   2 +-
 .../javax/sql/ConnectionPoolDataSource.eea    |   2 +-
 .../main/resources/javax/sql/DataSource.eea   |   2 +-
 .../main/resources/javax/sql/XADataSource.eea |   2 +-
 .../resources/javax/sql/rowset/BaseRowSet.eea |   2 +-
 .../javax/sql/rowset/CachedRowSet.eea         |   8 +-
 .../javax/sql/rowset/RowSetFactory.eea        |  10 +-
 .../javax/sql/rowset/serial/SerialArray.eea   |  16 +--
 .../javax/sql/rowset/serial/SerialBlob.eea    |   4 +-
 .../javax/sql/rowset/serial/SerialClob.eea    |   2 +-
 .../sql/rowset/serial/SerialDatalink.eea      |   2 +-
 .../resources/javax/swing/AbstractAction.eea  |   4 +-
 ...bstractButton$AccessibleAbstractButton.eea |  26 ++--
 .../resources/javax/swing/AbstractButton.eea  |  12 +-
 .../main/resources/javax/swing/ActionMap.eea  |   2 +-
 .../resources/javax/swing/BorderFactory.eea   |  68 +++++-----
 .../src/main/resources/javax/swing/Box.eea    |  16 +--
 .../resources/javax/swing/ButtonModel.eea     |   2 +-
 .../resources/javax/swing/DebugGraphics.eea   |   4 +-
 .../javax/swing/DefaultButtonModel.eea        |   4 +-
 .../javax/swing/DefaultFocusManager.eea       |   8 +-
 .../javax/swing/DefaultListModel.eea          |   2 +-
 .../swing/DefaultRowSorter$ModelWrapper.eea   |   2 +-
 .../javax/swing/DefaultRowSorter.eea          |   2 +-
 .../main/resources/javax/swing/GrayFilter.eea |   2 +-
 .../resources/javax/swing/GroupLayout.eea     |  10 +-
 .../swing/ImageIcon$AccessibleImageIcon.eea   |   8 +-
 .../main/resources/javax/swing/InputMap.eea   |   4 +-
 .../main/resources/javax/swing/JApplet.eea    |   6 +-
 .../main/resources/javax/swing/JButton.eea    |   4 +-
 .../main/resources/javax/swing/JCheckBox.eea  |   4 +-
 .../javax/swing/JCheckBoxMenuItem.eea         |   6 +-
 .../resources/javax/swing/JColorChooser.eea   |   6 +-
 .../swing/JComboBox$AccessibleJComboBox.eea   |  12 +-
 .../main/resources/javax/swing/JComboBox.eea  |  10 +-
 .../swing/JComponent$AccessibleJComponent.eea |   8 +-
 .../main/resources/javax/swing/JComponent.eea |  26 ++--
 .../resources/javax/swing/JDesktopPane.eea    |   6 +-
 .../main/resources/javax/swing/JDialog.eea    |   6 +-
 .../JEditorPane$AccessibleJEditorPaneHTML.eea |   6 +-
 ...aneAccessibleHypertextSupport$HTMLLink.eea |   4 +-
 ...$JEditorPaneAccessibleHypertextSupport.eea |   4 +-
 .../resources/javax/swing/JEditorPane.eea     |  14 +-
 .../resources/javax/swing/JFileChooser.eea    |   8 +-
 .../JFormattedTextField$AbstractFormatter.eea |   6 +-
 .../javax/swing/JFormattedTextField.eea       |   2 +-
 .../src/main/resources/javax/swing/JFrame.eea |   6 +-
 ...InternalFrame$AccessibleJInternalFrame.eea |   2 +-
 ...me$JDesktopIcon$AccessibleJDesktopIcon.eea |   8 +-
 .../swing/JInternalFrame$JDesktopIcon.eea     |   4 +-
 .../resources/javax/swing/JInternalFrame.eea  |  12 +-
 .../javax/swing/JLabel$AccessibleJLabel.eea   |  20 +--
 .../src/main/resources/javax/swing/JLabel.eea |   4 +-
 .../src/main/resources/javax/swing/JLayer.eea |   4 +-
 .../resources/javax/swing/JLayeredPane.eea    |   4 +-
 ...t$AccessibleJList$AccessibleJListChild.eea |  46 +++----
 .../javax/swing/JList$AccessibleJList.eea     |   8 +-
 .../src/main/resources/javax/swing/JList.eea  |  12 +-
 .../javax/swing/JMenu$AccessibleJMenu.eea     |   6 +-
 .../src/main/resources/javax/swing/JMenu.eea  |  20 +--
 .../swing/JMenuBar$AccessibleJMenuBar.eea     |   4 +-
 .../main/resources/javax/swing/JMenuBar.eea   |  12 +-
 .../main/resources/javax/swing/JMenuItem.eea  |   6 +-
 .../resources/javax/swing/JOptionPane.eea     |  14 +-
 .../src/main/resources/javax/swing/JPanel.eea |   4 +-
 ...PasswordField$AccessibleJPasswordField.eea |  14 +-
 .../resources/javax/swing/JPasswordField.eea  |   8 +-
 .../javax/swing/JPopupMenu$Separator.eea      |   2 +-
 .../main/resources/javax/swing/JPopupMenu.eea |  10 +-
 .../JProgressBar$AccessibleJProgressBar.eea   |   2 +-
 .../resources/javax/swing/JProgressBar.eea    |   6 +-
 .../resources/javax/swing/JRadioButton.eea    |   4 +-
 .../javax/swing/JRadioButtonMenuItem.eea      |   4 +-
 .../swing/JRootPane$AccessibleJRootPane.eea   |   2 +-
 .../main/resources/javax/swing/JRootPane.eea  |  12 +-
 .../swing/JScrollBar$AccessibleJScrollBar.eea |   2 +-
 .../main/resources/javax/swing/JScrollBar.eea |   6 +-
 .../resources/javax/swing/JScrollPane.eea     |  14 +-
 .../main/resources/javax/swing/JSeparator.eea |   4 +-
 .../javax/swing/JSlider$AccessibleJSlider.eea |   6 +-
 .../main/resources/javax/swing/JSlider.eea    |  10 +-
 .../swing/JSpinner$AccessibleJSpinner.eea     |  30 ++---
 .../javax/swing/JSpinner$DefaultEditor.eea    |   2 +-
 .../main/resources/javax/swing/JSpinner.eea   |   4 +-
 .../swing/JSplitPane$AccessibleJSplitPane.eea |   2 +-
 .../main/resources/javax/swing/JSplitPane.eea |   4 +-
 .../JTabbedPane$AccessibleJTabbedPane.eea     |   8 +-
 .../resources/javax/swing/JTabbedPane.eea     |  10 +-
 ...$AccessibleJTable$AccessibleJTableCell.eea |  38 +++---
 .../javax/swing/JTable$AccessibleJTable.eea   |  18 +--
 .../src/main/resources/javax/swing/JTable.eea |  22 ++--
 .../main/resources/javax/swing/JTextArea.eea  |   6 +-
 .../main/resources/javax/swing/JTextField.eea |   8 +-
 .../main/resources/javax/swing/JTextPane.eea  |  10 +-
 .../resources/javax/swing/JToggleButton.eea   |   4 +-
 .../javax/swing/JToolBar$Separator.eea        |   2 +-
 .../main/resources/javax/swing/JToolBar.eea   |  10 +-
 .../main/resources/javax/swing/JToolTip.eea   |   4 +-
 ...ee$AccessibleJTree$AccessibleJTreeNode.eea |  40 +++---
 .../javax/swing/JTree$AccessibleJTree.eea     |   8 +-
 .../src/main/resources/javax/swing/JTree.eea  |  34 ++---
 .../main/resources/javax/swing/JViewport.eea  |  16 +--
 .../main/resources/javax/swing/JWindow.eea    |   6 +-
 .../main/resources/javax/swing/KeyStroke.eea  |   2 +-
 .../swing/LayoutFocusTraversalPolicy.eea      |   8 +-
 .../javax/swing/ListSelectionModel.eea        |   2 +-
 .../resources/javax/swing/LookAndFeel.eea     |  10 +-
 .../javax/swing/MenuSelectionManager.eea      |   4 +-
 .../resources/javax/swing/PopupFactory.eea    |   2 +-
 ...gressMonitor$AccessibleProgressMonitor.eea |  28 ++--
 .../resources/javax/swing/RepaintManager.eea  |   2 +-
 .../resources/javax/swing/RowFilter$Entry.eea |   2 +-
 .../main/resources/javax/swing/RowFilter.eea  |  12 +-
 .../javax/swing/ScrollPaneLayout.eea          |   6 +-
 .../javax/swing/SizeRequirements.eea          |   6 +-
 .../resources/javax/swing/SizeSequence.eea    |   2 +-
 .../swing/SortingFocusTraversalPolicy.eea     |   8 +-
 .../javax/swing/SpinnerDateModel.eea          |   4 +-
 .../src/main/resources/javax/swing/Spring.eea |  14 +-
 .../javax/swing/SpringLayout$Constraints.eea  |   2 +-
 .../resources/javax/swing/SpringLayout.eea    |   2 +-
 .../resources/javax/swing/SwingUtilities.eea  |  20 +--
 .../swing/TransferHandler$DropLocation.eea    |   2 +-
 .../resources/javax/swing/TransferHandler.eea |   4 +-
 .../javax/swing/UIDefaults$ActiveValue.eea    |   2 +-
 .../javax/swing/UIDefaults$LazyInputMap.eea   |   2 +-
 .../javax/swing/UIDefaults$LazyValue.eea      |   2 +-
 .../javax/swing/UIDefaults$ProxyLazyValue.eea |   2 +-
 .../main/resources/javax/swing/UIDefaults.eea |  30 ++---
 .../main/resources/javax/swing/UIManager.eea  |   6 +-
 .../javax/swing/border/LineBorder.eea         |   4 +-
 .../AbstractColorChooserPanel.eea             |   4 +-
 .../ColorChooserComponentFactory.eea          |   2 +-
 .../javax/swing/event/InternalFrameEvent.eea  |   4 +-
 .../javax/swing/event/TreeModelEvent.eea      |   6 +-
 .../javax/swing/event/TreeSelectionEvent.eea  |   2 +-
 .../filechooser/FileNameExtensionFilter.eea   |   2 +-
 .../swing/filechooser/FileSystemView.eea      |  20 +--
 .../javax/swing/filechooser/FileView.eea      |  10 +-
 .../javax/swing/plaf/ComponentUI.eea          |   4 +-
 .../javax/swing/plaf/FileChooserUI.eea        |   2 +-
 .../resources/javax/swing/plaf/LayerUI.eea    |   2 +-
 .../resources/javax/swing/plaf/TextUI.eea     |   2 +-
 .../swing/plaf/basic/BasicArrowButton.eea     |   2 +-
 .../javax/swing/plaf/basic/BasicBorders.eea   |  14 +-
 .../javax/swing/plaf/basic/BasicButtonUI.eea  |   8 +-
 .../plaf/basic/BasicCheckBoxMenuItemUI.eea    |   4 +-
 .../swing/plaf/basic/BasicCheckBoxUI.eea      |   4 +-
 .../swing/plaf/basic/BasicColorChooserUI.eea  |   6 +-
 .../swing/plaf/basic/BasicComboBoxEditor.eea  |   2 +-
 .../swing/plaf/basic/BasicComboBoxUI.eea      |  28 ++--
 .../swing/plaf/basic/BasicComboPopup.eea      |  24 ++--
 .../swing/plaf/basic/BasicDesktopIconUI.eea   |   8 +-
 .../swing/plaf/basic/BasicDesktopPaneUI.eea   |   8 +-
 .../swing/plaf/basic/BasicEditorPaneUI.eea    |   4 +-
 .../BasicFileChooserUI$BasicFileView.eea      |   8 +-
 .../swing/plaf/basic/BasicFileChooserUI.eea   |  20 +--
 .../plaf/basic/BasicFormattedTextFieldUI.eea  |   4 +-
 .../swing/plaf/basic/BasicGraphicsUtils.eea   |   2 +-
 .../javax/swing/plaf/basic/BasicHTML.eea      |   2 +-
 .../swing/plaf/basic/BasicIconFactory.eea     |   2 +-
 .../basic/BasicInternalFrameTitlePane.eea     |   8 +-
 .../swing/plaf/basic/BasicInternalFrameUI.eea |  26 ++--
 .../javax/swing/plaf/basic/BasicLabelUI.eea   |   4 +-
 .../javax/swing/plaf/basic/BasicListUI.eea    |  18 +--
 .../swing/plaf/basic/BasicLookAndFeel.eea     |   6 +-
 .../javax/swing/plaf/basic/BasicMenuBarUI.eea |  10 +-
 .../swing/plaf/basic/BasicMenuItemUI.eea      |  18 +--
 .../javax/swing/plaf/basic/BasicMenuUI.eea    |  20 +--
 .../swing/plaf/basic/BasicOptionPaneUI.eea    |  22 ++--
 .../javax/swing/plaf/basic/BasicPanelUI.eea   |   2 +-
 .../swing/plaf/basic/BasicPasswordFieldUI.eea |   6 +-
 .../plaf/basic/BasicPopupMenuSeparatorUI.eea  |   4 +-
 .../swing/plaf/basic/BasicPopupMenuUI.eea     |   2 +-
 .../swing/plaf/basic/BasicProgressBarUI.eea   |   6 +-
 .../plaf/basic/BasicRadioButtonMenuItemUI.eea |   4 +-
 .../swing/plaf/basic/BasicRadioButtonUI.eea   |   6 +-
 .../swing/plaf/basic/BasicRootPaneUI.eea      |   2 +-
 .../swing/plaf/basic/BasicScrollBarUI.eea     |  20 +--
 .../swing/plaf/basic/BasicScrollPaneUI.eea    |  12 +-
 .../swing/plaf/basic/BasicSeparatorUI.eea     |   8 +-
 .../javax/swing/plaf/basic/BasicSliderUI.eea  |  28 ++--
 .../javax/swing/plaf/basic/BasicSpinnerUI.eea |  12 +-
 .../plaf/basic/BasicSplitPaneDivider.eea      |   4 +-
 ...litPaneUI$BasicHorizontalLayoutManager.eea |   8 +-
 .../swing/plaf/basic/BasicSplitPaneUI.eea     |  24 ++--
 .../swing/plaf/basic/BasicTabbedPaneUI.eea    |  20 +--
 .../swing/plaf/basic/BasicTableHeaderUI.eea   |   6 +-
 .../javax/swing/plaf/basic/BasicTableUI.eea   |  10 +-
 .../swing/plaf/basic/BasicTextAreaUI.eea      |  10 +-
 .../swing/plaf/basic/BasicTextFieldUI.eea     |   6 +-
 .../swing/plaf/basic/BasicTextPaneUI.eea      |   4 +-
 .../javax/swing/plaf/basic/BasicTextUI.eea    |  20 +--
 .../swing/plaf/basic/BasicToggleButtonUI.eea  |   4 +-
 .../plaf/basic/BasicToolBarSeparatorUI.eea    |   4 +-
 .../javax/swing/plaf/basic/BasicToolBarUI.eea |  22 ++--
 .../javax/swing/plaf/basic/BasicToolTipUI.eea |   4 +-
 .../basic/BasicTreeUI$ComponentHandler.eea    |   2 +-
 .../BasicTreeUI$NodeDimensionsHandler.eea     |   2 +-
 .../javax/swing/plaf/basic/BasicTreeUI.eea    |  46 +++----
 .../swing/plaf/basic/BasicViewportUI.eea      |   2 +-
 .../swing/plaf/metal/DefaultMetalTheme.eea    |   2 +-
 .../javax/swing/plaf/metal/MetalButtonUI.eea  |   4 +-
 .../swing/plaf/metal/MetalCheckBoxUI.eea      |   4 +-
 .../swing/plaf/metal/MetalComboBoxButton.eea  |   2 +-
 .../swing/plaf/metal/MetalComboBoxUI.eea      |  14 +-
 .../swing/plaf/metal/MetalDesktopIconUI.eea   |   6 +-
 ...MetalFileChooserUI$FilterComboBoxModel.eea |   2 +-
 .../swing/plaf/metal/MetalFileChooserUI.eea   |  30 ++---
 .../swing/plaf/metal/MetalIconFactory.eea     |  16 +--
 .../metal/MetalInternalFrameTitlePane.eea     |   4 +-
 .../swing/plaf/metal/MetalInternalFrameUI.eea |   6 +-
 .../javax/swing/plaf/metal/MetalLabelUI.eea   |   2 +-
 .../swing/plaf/metal/MetalLookAndFeel.eea     |  12 +-
 .../javax/swing/plaf/metal/MetalMenuBarUI.eea |   2 +-
 .../plaf/metal/MetalPopupMenuSeparatorUI.eea  |   4 +-
 .../swing/plaf/metal/MetalProgressBarUI.eea   |   2 +-
 .../swing/plaf/metal/MetalRadioButtonUI.eea   |   2 +-
 .../swing/plaf/metal/MetalRootPaneUI.eea      |   2 +-
 .../swing/plaf/metal/MetalScrollBarUI.eea     |  10 +-
 .../swing/plaf/metal/MetalScrollButton.eea    |   2 +-
 .../swing/plaf/metal/MetalScrollPaneUI.eea    |   4 +-
 .../swing/plaf/metal/MetalSeparatorUI.eea     |   4 +-
 .../javax/swing/plaf/metal/MetalSliderUI.eea  |   6 +-
 .../swing/plaf/metal/MetalSplitPaneUI.eea     |   4 +-
 .../swing/plaf/metal/MetalTabbedPaneUI.eea    |   4 +-
 .../swing/plaf/metal/MetalTextFieldUI.eea     |   2 +-
 .../swing/plaf/metal/MetalToggleButtonUI.eea  |   2 +-
 .../javax/swing/plaf/metal/MetalToolBarUI.eea |  12 +-
 .../javax/swing/plaf/metal/MetalToolTipUI.eea |   6 +-
 .../javax/swing/plaf/metal/MetalTreeUI.eea    |   2 +-
 .../javax/swing/plaf/metal/OceanTheme.eea     |   2 +-
 .../javax/swing/plaf/multi/MultiButtonUI.eea  |   4 +-
 .../swing/plaf/multi/MultiColorChooserUI.eea  |   4 +-
 .../swing/plaf/multi/MultiComboBoxUI.eea      |   4 +-
 .../swing/plaf/multi/MultiDesktopIconUI.eea   |   4 +-
 .../swing/plaf/multi/MultiDesktopPaneUI.eea   |   4 +-
 .../swing/plaf/multi/MultiFileChooserUI.eea   |   4 +-
 .../swing/plaf/multi/MultiInternalFrameUI.eea |   4 +-
 .../javax/swing/plaf/multi/MultiLabelUI.eea   |   4 +-
 .../javax/swing/plaf/multi/MultiListUI.eea    |   4 +-
 .../swing/plaf/multi/MultiLookAndFeel.eea     |  12 +-
 .../javax/swing/plaf/multi/MultiMenuBarUI.eea |   4 +-
 .../swing/plaf/multi/MultiMenuItemUI.eea      |   4 +-
 .../swing/plaf/multi/MultiOptionPaneUI.eea    |   4 +-
 .../javax/swing/plaf/multi/MultiPanelUI.eea   |   4 +-
 .../swing/plaf/multi/MultiPopupMenuUI.eea     |   4 +-
 .../swing/plaf/multi/MultiProgressBarUI.eea   |   4 +-
 .../swing/plaf/multi/MultiRootPaneUI.eea      |   4 +-
 .../swing/plaf/multi/MultiScrollBarUI.eea     |   4 +-
 .../swing/plaf/multi/MultiScrollPaneUI.eea    |   4 +-
 .../swing/plaf/multi/MultiSeparatorUI.eea     |   4 +-
 .../javax/swing/plaf/multi/MultiSliderUI.eea  |   4 +-
 .../javax/swing/plaf/multi/MultiSpinnerUI.eea |   4 +-
 .../swing/plaf/multi/MultiSplitPaneUI.eea     |   4 +-
 .../swing/plaf/multi/MultiTabbedPaneUI.eea    |   4 +-
 .../swing/plaf/multi/MultiTableHeaderUI.eea   |   4 +-
 .../javax/swing/plaf/multi/MultiTableUI.eea   |   4 +-
 .../javax/swing/plaf/multi/MultiTextUI.eea    |   6 +-
 .../javax/swing/plaf/multi/MultiToolBarUI.eea |   4 +-
 .../javax/swing/plaf/multi/MultiToolTipUI.eea |   4 +-
 .../javax/swing/plaf/multi/MultiTreeUI.eea    |   4 +-
 .../swing/plaf/multi/MultiViewportUI.eea      |   4 +-
 .../plaf/nimbus/AbstractRegionPainter.eea     |   8 +-
 .../swing/plaf/nimbus/Effect$ArrayCache.eea   |   8 +-
 .../swing/plaf/nimbus/NimbusLookAndFeel.eea   |  12 +-
 .../javax/swing/plaf/nimbus/NimbusStyle.eea   |   2 +-
 .../javax/swing/plaf/synth/SynthButtonUI.eea  |   8 +-
 .../plaf/synth/SynthCheckBoxMenuItemUI.eea    |   4 +-
 .../swing/plaf/synth/SynthCheckBoxUI.eea      |   4 +-
 .../swing/plaf/synth/SynthColorChooserUI.eea  |   4 +-
 .../swing/plaf/synth/SynthComboBoxUI.eea      |  10 +-
 .../swing/plaf/synth/SynthDesktopIconUI.eea   |   2 +-
 .../swing/plaf/synth/SynthDesktopPaneUI.eea   |   2 +-
 .../swing/plaf/synth/SynthEditorPaneUI.eea    |   2 +-
 .../plaf/synth/SynthFormattedTextFieldUI.eea  |   4 +-
 .../swing/plaf/synth/SynthInternalFrameUI.eea |   6 +-
 .../javax/swing/plaf/synth/SynthLabelUI.eea   |   4 +-
 .../javax/swing/plaf/synth/SynthListUI.eea    |   2 +-
 .../swing/plaf/synth/SynthLookAndFeel.eea     |  10 +-
 .../javax/swing/plaf/synth/SynthMenuBarUI.eea |   2 +-
 .../swing/plaf/synth/SynthMenuItemUI.eea      |   4 +-
 .../javax/swing/plaf/synth/SynthMenuUI.eea    |   4 +-
 .../swing/plaf/synth/SynthOptionPaneUI.eea    |   6 +-
 .../javax/swing/plaf/synth/SynthPanelUI.eea   |   2 +-
 .../swing/plaf/synth/SynthPasswordFieldUI.eea |   6 +-
 .../swing/plaf/synth/SynthPopupMenuUI.eea     |   2 +-
 .../swing/plaf/synth/SynthProgressBarUI.eea   |   6 +-
 .../plaf/synth/SynthRadioButtonMenuItemUI.eea |   4 +-
 .../swing/plaf/synth/SynthRadioButtonUI.eea   |   4 +-
 .../swing/plaf/synth/SynthRootPaneUI.eea      |   2 +-
 .../swing/plaf/synth/SynthScrollBarUI.eea     |   8 +-
 .../swing/plaf/synth/SynthScrollPaneUI.eea    |   2 +-
 .../swing/plaf/synth/SynthSeparatorUI.eea     |   4 +-
 .../javax/swing/plaf/synth/SynthSliderUI.eea  |  10 +-
 .../javax/swing/plaf/synth/SynthSpinnerUI.eea |  10 +-
 .../swing/plaf/synth/SynthSplitPaneUI.eea     |   6 +-
 .../javax/swing/plaf/synth/SynthStyle.eea     |   4 +-
 .../swing/plaf/synth/SynthTabbedPaneUI.eea    |   8 +-
 .../swing/plaf/synth/SynthTableHeaderUI.eea   |   2 +-
 .../javax/swing/plaf/synth/SynthTableUI.eea   |   2 +-
 .../swing/plaf/synth/SynthTextAreaUI.eea      |   2 +-
 .../swing/plaf/synth/SynthTextFieldUI.eea     |   2 +-
 .../swing/plaf/synth/SynthTextPaneUI.eea      |   4 +-
 .../swing/plaf/synth/SynthToggleButtonUI.eea  |   4 +-
 .../javax/swing/plaf/synth/SynthToolBarUI.eea |   4 +-
 .../javax/swing/plaf/synth/SynthToolTipUI.eea |   4 +-
 .../javax/swing/plaf/synth/SynthTreeUI.eea    |   6 +-
 .../swing/plaf/synth/SynthViewportUI.eea      |   2 +-
 .../javax/swing/table/AbstractTableModel.eea  |   4 +-
 .../swing/table/DefaultTableColumnModel.eea   |   2 +-
 .../javax/swing/table/DefaultTableModel.eea   |   2 +-
 ...ableHeader$AccessibleJTableHeaderEntry.eea |  28 ++--
 .../JTableHeader$AccessibleJTableHeader.eea   |   4 +-
 .../javax/swing/table/JTableHeader.eea        |  10 +-
 .../javax/swing/table/TableColumn.eea         |   2 +-
 .../javax/swing/table/TableRowSorter.eea      |   2 +-
 .../text/AbstractDocument$AbstractElement.eea |   2 +-
 .../text/AbstractDocument$BranchElement.eea   |   8 +-
 .../swing/text/AbstractDocument$Content.eea   |   2 +-
 .../AbstractDocument$DefaultDocumentEvent.eea |   8 +-
 .../text/AbstractDocument$LeafElement.eea     |   6 +-
 .../javax/swing/text/AbstractDocument.eea     |  12 +-
 .../javax/swing/text/AsyncBoxView.eea         |   6 +-
 .../resources/javax/swing/text/BoxView.eea    |  10 +-
 .../javax/swing/text/ComponentView.eea        |   2 +-
 .../javax/swing/text/CompositeView.eea        |  10 +-
 .../javax/swing/text/DefaultEditorKit.eea     |   8 +-
 .../javax/swing/text/DefaultFormatter.eea     |   6 +-
 ...ultHighlighter$DefaultHighlightPainter.eea |   2 +-
 .../javax/swing/text/DefaultHighlighter.eea   |   2 +-
 .../DefaultStyledDocument$SectionElement.eea  |   2 +-
 .../swing/text/DefaultStyledDocument.eea      |   2 +-
 .../resources/javax/swing/text/Document.eea   |   2 +-
 .../resources/javax/swing/text/EditorKit.eea  |   4 +-
 .../javax/swing/text/ElementIterator.eea      |   8 +-
 .../resources/javax/swing/text/FieldView.eea  |   2 +-
 .../swing/text/FlowView$FlowStrategy.eea      |   2 +-
 .../resources/javax/swing/text/FlowView.eea   |   4 +-
 .../resources/javax/swing/text/GapContent.eea |   8 +-
 .../resources/javax/swing/text/GlyphView.eea  |   8 +-
 .../swing/text/InternationalFormatter.eea     |   4 +-
 ...TextComponent$AccessibleJTextComponent.eea |  12 +-
 .../javax/swing/text/JTextComponent.eea       |   8 +-
 .../resources/javax/swing/text/LabelView.eea  |   6 +-
 .../javax/swing/text/LayoutQueue.eea          |   2 +-
 .../javax/swing/text/MaskFormatter.eea        |   2 +-
 .../javax/swing/text/ParagraphView.eea        |   4 +-
 .../javax/swing/text/PasswordView.eea         |   2 +-
 .../javax/swing/text/PlainDocument.eea        |   2 +-
 .../javax/swing/text/StringContent.eea        |   8 +-
 .../javax/swing/text/StyleConstants.eea       |   2 +-
 .../swing/text/StyleContext$NamedStyle.eea    |   4 +-
 .../javax/swing/text/StyleContext.eea         |   8 +-
 .../text/StyledEditorKit$StyledTextAction.eea |   2 +-
 .../javax/swing/text/StyledEditorKit.eea      |   4 +-
 .../javax/swing/text/TableView$TableRow.eea   |   4 +-
 .../resources/javax/swing/text/TableView.eea  |   8 +-
 .../resources/javax/swing/text/TextAction.eea |   2 +-
 .../resources/javax/swing/text/Utilities.eea  |   2 +-
 .../main/resources/javax/swing/text/View.eea  |  12 +-
 .../javax/swing/text/ViewFactory.eea          |   2 +-
 .../resources/javax/swing/text/ZoneView.eea   |   2 +-
 .../AccessibleHTML$HTMLAccessibleContext.eea  |  14 +-
 ...$IconElementInfo$IconAccessibleContext.eea |   2 +-
 ...cessibleContext$AccessibleHeadersTable.eea |  18 +--
 ...ableElementInfo$TableAccessibleContext.eea |  26 ++--
 ...$TextElementInfo$TextAccessibleContext.eea |   8 +-
 .../javax/swing/text/html/BlockView.eea       |   4 +-
 .../resources/javax/swing/text/html/CSS.eea   |   2 +-
 .../javax/swing/text/html/FormView.eea        |   2 +-
 .../resources/javax/swing/text/html/HTML.eea  |   6 +-
 .../text/html/HTMLDocument$BlockElement.eea   |   4 +-
 .../text/html/HTMLDocument$RunElement.eea     |   4 +-
 .../javax/swing/text/html/HTMLDocument.eea    |  10 +-
 .../text/html/HTMLEditorKit$HTMLFactory.eea   |   2 +-
 .../javax/swing/text/html/HTMLEditorKit.eea   |  10 +-
 .../javax/swing/text/html/ImageView.eea       |   6 +-
 .../javax/swing/text/html/ObjectView.eea      |   2 +-
 .../javax/swing/text/html/ParagraphView.eea   |   2 +-
 .../javax/swing/text/html/StyleSheet.eea      |  14 +-
 .../swing/text/html/TableView$RowView.eea     |   6 +-
 .../swing/text/html/parser/AttributeList.eea  |   2 +-
 .../swing/text/html/parser/ContentModel.eea   |   2 +-
 .../javax/swing/text/html/parser/DTD.eea      |  10 +-
 .../javax/swing/text/html/parser/Element.eea  |   4 +-
 .../javax/swing/text/html/parser/Parser.eea   |   4 +-
 .../text/html/parser/ParserDelegator.eea      |   2 +-
 .../javax/swing/text/rtf/RTFEditorKit.eea     |   2 +-
 .../javax/swing/tree/AbstractLayoutCache.eea  |   4 +-
 .../swing/tree/DefaultMutableTreeNode.eea     |  26 ++--
 .../swing/tree/DefaultTreeCellEditor.eea      |   4 +-
 .../javax/swing/tree/DefaultTreeModel.eea     |   2 +-
 .../swing/tree/DefaultTreeSelectionModel.eea  |   6 +-
 .../swing/tree/FixedHeightLayoutCache.eea     |   8 +-
 .../resources/javax/swing/tree/TreePath.eea   |   4 +-
 .../swing/tree/VariableHeightLayoutCache.eea  |   8 +-
 .../javax/swing/undo/AbstractUndoableEdit.eea |   2 +-
 .../javax/swing/undo/CompoundEdit.eea         |   4 +-
 .../resources/javax/swing/undo/StateEdit.eea  |   2 +-
 .../javax/swing/undo/UndoManager.eea          |   4 +-
 .../javax/swing/undo/UndoableEditSupport.eea  |   2 +-
 .../javax/tools/ForwardingJavaFileManager.eea |  10 +-
 .../resources/javax/tools/JavaFileManager.eea |  10 +-
 .../javax/tools/SimpleJavaFileObject.eea      |   8 +-
 .../javax/tools/StandardJavaFileManager.eea   |   2 +-
 .../src/main/resources/javax/tools/Tool.eea   |   2 +-
 .../resources/javax/tools/ToolProvider.eea    |   2 +-
 .../javax/xml/catalog/CatalogFeatures.eea     |   2 +-
 .../javax/xml/catalog/CatalogManager.eea      |   6 +-
 .../xml/catalog/GroupEntry$ResolveType.eea    |   2 +-
 .../javax/xml/crypto/KeySelector.eea          |   2 +-
 .../javax/xml/datatype/DatatypeFactory.eea    |   2 +-
 .../xml/parsers/DocumentBuilderFactory.eea    |   4 +-
 .../resources/javax/xml/parsers/SAXParser.eea |   2 +-
 .../javax/xml/parsers/SAXParserFactory.eea    |   4 +-
 .../javax/xml/stream/XMLEventFactory.eea      |  52 ++++----
 .../xml/transform/TransformerException.eea    |   4 +-
 .../xml/transform/TransformerFactory.eea      |   2 +-
 .../javax/xml/transform/sax/SAXSource.eea     |   4 +-
 .../javax/xml/transform/stax/StAXResult.eea   |   2 +-
 .../javax/xml/validation/SchemaFactory.eea    |   4 +-
 .../javax/xml/validation/Validator.eea        |   2 +-
 .../javax/xml/validation/ValidatorHandler.eea |   2 +-
 .../XPathEvaluationResult$XPathResultType.eea |   2 +-
 .../javax/xml/xpath/XPathFactory.eea          |   2 +-
 .../org/w3c/dom/DOMImplementation.eea         |   4 +-
 .../main/resources/org/w3c/dom/Document.eea   |   2 +-
 .../bootstrap/DOMImplementationRegistry.eea   |   6 +-
 .../org/w3c/dom/css/DOMImplementationCSS.eea  |   2 +-
 .../org/w3c/dom/events/DocumentEvent.eea      |   2 +-
 .../w3c/dom/html/HTMLDOMImplementation.eea    |   2 +-
 .../org/w3c/dom/html/HTMLTableElement.eea     |   6 +-
 .../org/w3c/dom/ls/DOMImplementationLS.eea    |   8 +-
 .../org/w3c/dom/ranges/DocumentRange.eea      |   2 +-
 .../w3c/dom/traversal/DocumentTraversal.eea   |   4 +-
 .../org/w3c/dom/xpath/XPathEvaluator.eea      |   4 +-
 .../org/xml/sax/ext/DefaultHandler2.eea       |   4 +-
 .../org/xml/sax/helpers/AttributeListImpl.eea |   6 +-
 .../org/xml/sax/helpers/AttributesImpl.eea    |  18 +--
 .../org/xml/sax/helpers/NamespaceSupport.eea  |   2 +-
 .../org/xml/sax/helpers/ParserAdapter.eea     |   2 +-
 .../org/xml/sax/helpers/XMLReaderFactory.eea  |   4 +-
 .../src/main/resources/java/applet/Applet.eea |   8 +-
 .../src/main/resources/java/awt/AWTEvent.eea  |   2 +-
 .../main/resources/java/awt/AWTKeyStroke.eea  |   2 +-
 .../resources/java/awt/AlphaComposite.eea     |   2 +-
 .../main/resources/java/awt/BasicStroke.eea   |   4 +-
 .../main/resources/java/awt/BorderLayout.eea  |   4 +-
 .../java/awt/Button$AccessibleAWTButton.eea   |   6 +-
 .../src/main/resources/java/awt/Button.eea    |   2 +-
 .../main/resources/java/awt/CardLayout.eea    |   2 +-
 .../awt/Checkbox$AccessibleAWTCheckbox.eea    |  12 +-
 .../src/main/resources/java/awt/Checkbox.eea  |   4 +-
 ...MenuItem$AccessibleAWTCheckboxMenuItem.eea |  12 +-
 .../resources/java/awt/CheckboxMenuItem.eea   |   4 +-
 .../java/awt/Choice$AccessibleAWTChoice.eea   |   4 +-
 .../src/main/resources/java/awt/Choice.eea    |   6 +-
 .../src/main/resources/java/awt/Color.eea     |   8 +-
 .../awt/Component$AccessibleAWTComponent.eea  |   8 +-
 .../src/main/resources/java/awt/Component.eea |  28 ++--
 .../src/main/resources/java/awt/Composite.eea |   2 +-
 .../awt/Container$AccessibleAWTContainer.eea  |   4 +-
 .../src/main/resources/java/awt/Container.eea |  10 +-
 .../ContainerOrderFocusTraversalPolicy.eea    |   8 +-
 .../src/main/resources/java/awt/Cursor.eea    |   4 +-
 .../src/main/resources/java/awt/Desktop.eea   |   2 +-
 .../src/main/resources/java/awt/Dialog.eea    |   2 +-
 .../src/main/resources/java/awt/Event.eea     |   2 +-
 .../main/resources/java/awt/EventQueue.eea    |   6 +-
 .../main/resources/java/awt/FileDialog.eea    |   2 +-
 .../src/main/resources/java/awt/Font.eea      |  22 ++--
 .../main/resources/java/awt/FontMetrics.eea   |   2 +-
 .../src/main/resources/java/awt/Frame.eea     |   6 +-
 .../main/resources/java/awt/GradientPaint.eea |   2 +-
 .../src/main/resources/java/awt/Graphics.eea  |   4 +-
 .../java/awt/GraphicsConfiguration.eea        |  12 +-
 .../main/resources/java/awt/GridBagLayout.eea |   4 +-
 .../java/awt/KeyboardFocusManager.eea         |   4 +-
 .../src/main/resources/java/awt/Label.eea     |   2 +-
 .../java/awt/LinearGradientPaint.eea          |   2 +-
 ...cessibleAWTList$AccessibleAWTListChild.eea |  12 +-
 .../java/awt/List$AccessibleAWTList.eea       |   6 +-
 .../src/main/resources/java/awt/List.eea      |  10 +-
 .../main/resources/java/awt/MediaTracker.eea  |   4 +-
 .../src/main/resources/java/awt/Menu.eea      |   2 +-
 .../src/main/resources/java/awt/MenuBar.eea   |   2 +-
 ...nuComponent$AccessibleAWTMenuComponent.eea |  28 ++--
 .../main/resources/java/awt/MenuComponent.eea |   4 +-
 .../awt/MenuItem$AccessibleAWTMenuItem.eea    |   6 +-
 .../src/main/resources/java/awt/MenuItem.eea  |   2 +-
 .../main/resources/java/awt/MenuShortcut.eea  |   2 +-
 .../java/awt/MultipleGradientPaint.eea        |   2 +-
 .../resources/java/awt/PageAttributes.eea     |   2 +-
 .../src/main/resources/java/awt/Paint.eea     |   2 +-
 .../src/main/resources/java/awt/Polygon.eea   |   2 +-
 .../src/main/resources/java/awt/PopupMenu.eea |   2 +-
 .../java/awt/RadialGradientPaint.eea          |   2 +-
 .../src/main/resources/java/awt/Rectangle.eea |   4 +-
 .../src/main/resources/java/awt/Robot.eea     |   4 +-
 .../main/resources/java/awt/ScrollPane.eea    |   2 +-
 .../java/awt/ScrollPaneAdjustable.eea         |   2 +-
 .../awt/Scrollbar$AccessibleAWTScrollBar.eea  |   2 +-
 .../src/main/resources/java/awt/Scrollbar.eea |   2 +-
 .../main/resources/java/awt/SplashScreen.eea  |   2 +-
 .../src/main/resources/java/awt/Stroke.eea    |   2 +-
 .../src/main/resources/java/awt/Taskbar.eea   |   2 +-
 .../src/main/resources/java/awt/TextArea.eea  |   6 +-
 ...xtComponent$AccessibleAWTTextComponent.eea |  14 +-
 .../main/resources/java/awt/TextComponent.eea |   6 +-
 .../src/main/resources/java/awt/TextField.eea |   6 +-
 .../main/resources/java/awt/TexturePaint.eea  |   2 +-
 .../src/main/resources/java/awt/Toolkit.eea   |  18 +--
 .../src/main/resources/java/awt/Window.eea    |  16 +--
 .../java/awt/color/ICC_ColorSpace.eea         |   8 +-
 .../resources/java/awt/color/ICC_Profile.eea  |   6 +-
 .../java/awt/datatransfer/DataFlavor.eea      |  12 +-
 .../java/awt/datatransfer/SystemFlavorMap.eea |  12 +-
 .../resources/java/awt/desktop/FilesEvent.eea |   2 +-
 .../resources/java/awt/dnd/DragSource.eea     |   6 +-
 .../java/awt/dnd/DragSourceEvent.eea          |   2 +-
 .../resources/java/awt/dnd/DropTarget.eea     |   4 +-
 .../java/awt/dnd/DropTargetContext.eea        |   4 +-
 .../resources/java/awt/event/ActionEvent.eea  |   2 +-
 .../java/awt/event/AdjustmentEvent.eea        |   2 +-
 .../java/awt/event/ComponentEvent.eea         |   4 +-
 .../java/awt/event/ContainerEvent.eea         |   4 +-
 .../resources/java/awt/event/FocusEvent.eea   |   4 +-
 .../java/awt/event/HierarchyEvent.eea         |   4 +-
 .../resources/java/awt/event/InputEvent.eea   |   2 +-
 .../java/awt/event/InputMethodEvent.eea       |   2 +-
 .../java/awt/event/InvocationEvent.eea        |   6 +-
 .../resources/java/awt/event/ItemEvent.eea    |   2 +-
 .../resources/java/awt/event/KeyEvent.eea     |   4 +-
 .../resources/java/awt/event/MouseEvent.eea   |   6 +-
 .../java/awt/event/MouseWheelEvent.eea        |   2 +-
 .../resources/java/awt/event/PaintEvent.eea   |   2 +-
 .../resources/java/awt/event/TextEvent.eea    |   2 +-
 .../resources/java/awt/event/WindowEvent.eea  |   6 +-
 .../java/awt/font/FontRenderContext.eea       |   2 +-
 .../resources/java/awt/font/GlyphVector.eea   |   2 +-
 .../java/awt/font/LineBreakMeasurer.eea       |   2 +-
 .../resources/java/awt/font/NumericShaper.eea |  10 +-
 .../java/awt/font/ShapeGraphicAttribute.eea   |   2 +-
 .../resources/java/awt/font/TextLayout.eea    |  16 +--
 .../java/awt/font/TransformAttribute.eea      |   2 +-
 .../java/awt/geom/AffineTransform.eea         |  28 ++--
 .../resources/java/awt/geom/Arc2D$Double.eea  |   2 +-
 .../main/resources/java/awt/geom/Arc2D.eea    |   6 +-
 .../src/main/resources/java/awt/geom/Area.eea |   6 +-
 .../resources/java/awt/geom/CubicCurve2D.eea  |   4 +-
 .../resources/java/awt/geom/Ellipse2D.eea     |   2 +-
 .../resources/java/awt/geom/Line2D$Double.eea |   2 +-
 .../resources/java/awt/geom/Line2D$Float.eea  |   2 +-
 .../main/resources/java/awt/geom/Line2D.eea   |   4 +-
 .../resources/java/awt/geom/Path2D$Double.eea |   2 +-
 .../resources/java/awt/geom/Path2D$Float.eea  |   2 +-
 .../main/resources/java/awt/geom/Path2D.eea   |   6 +-
 .../resources/java/awt/geom/QuadCurve2D.eea   |   4 +-
 .../java/awt/geom/Rectangle2D$Double.eea      |   4 +-
 .../java/awt/geom/Rectangle2D$Float.eea       |   4 +-
 .../resources/java/awt/geom/Rectangle2D.eea   |   8 +-
 .../java/awt/geom/RectangularShape.eea        |   4 +-
 .../java/awt/geom/RoundRectangle2D.eea        |   2 +-
 .../resources/java/awt/im/InputContext.eea    |   6 +-
 .../java/awt/im/spi/InputMethodContext.eea    |   4 +-
 .../java/awt/im/spi/InputMethodDescriptor.eea |   2 +-
 .../image/AbstractMultiResolutionImage.eea    |   2 +-
 .../java/awt/image/AffineTransformOp.eea      |   4 +-
 .../java/awt/image/BandCombineOp.eea          |   6 +-
 .../java/awt/image/BandedSampleModel.eea      |  12 +-
 .../java/awt/image/BufferedImage.eea          |   8 +-
 .../java/awt/image/BufferedImageOp.eea        |   2 +-
 .../java/awt/image/ByteLookupTable.eea        |   4 +-
 .../java/awt/image/ColorConvertOp.eea         |   8 +-
 .../resources/java/awt/image/ColorModel.eea   |  22 ++--
 .../java/awt/image/ComponentColorModel.eea    |  22 ++--
 .../java/awt/image/ComponentSampleModel.eea   |  14 +-
 .../resources/java/awt/image/ConvolveOp.eea   |   6 +-
 .../java/awt/image/DirectColorModel.eea       |  12 +-
 .../java/awt/image/IndexColorModel.eea        |  14 +-
 .../main/resources/java/awt/image/Kernel.eea  |   2 +-
 .../resources/java/awt/image/LookupOp.eea     |   6 +-
 .../awt/image/MultiPixelPackedSampleModel.eea |   8 +-
 .../java/awt/image/PackedColorModel.eea       |   4 +-
 .../awt/image/PixelInterleavedSampleModel.eea |   4 +-
 .../java/awt/image/RGBImageFilter.eea         |   2 +-
 .../main/resources/java/awt/image/Raster.eea  |  38 +++---
 .../resources/java/awt/image/RasterOp.eea     |   2 +-
 .../resources/java/awt/image/RescaleOp.eea    |   6 +-
 .../resources/java/awt/image/SampleModel.eea  |  24 ++--
 .../java/awt/image/ShortLookupTable.eea       |   4 +-
 .../image/SinglePixelPackedSampleModel.eea    |  12 +-
 .../java/awt/image/VolatileImage.eea          |   2 +-
 .../java/awt/image/WritableRaster.eea         |   4 +-
 .../ContextualRenderedImageFactory.eea        |   2 +-
 .../awt/image/renderable/ParameterBlock.eea   |   4 +-
 .../awt/image/renderable/RenderableImage.eea  |   6 +-
 .../image/renderable/RenderableImageOp.eea    |   6 +-
 .../image/renderable/RenderedImageFactory.eea |   2 +-
 .../resources/java/awt/peer/ComponentPeer.eea |   4 +-
 .../resources/java/awt/peer/TaskbarPeer.eea   |   4 +-
 .../resources/java/awt/print/PageFormat.eea   |   2 +-
 .../resources/java/awt/print/PrinterJob.eea   |   2 +-
 .../resources/java/beans/BeanDescriptor.eea   |   4 +-
 .../java/beans/DefaultPersistenceDelegate.eea |   2 +-
 .../resources/java/beans/EventHandler.eea     |   6 +-
 .../java/beans/EventSetDescriptor.eea         |   6 +-
 .../java/beans/IndexedPropertyDescriptor.eea  |   4 +-
 .../resources/java/beans/MethodDescriptor.eea |   2 +-
 .../java/beans/PropertyDescriptor.eea         |   8 +-
 .../java/beans/PropertyEditorSupport.eea      |   8 +-
 .../resources/java/beans/SimpleBeanInfo.eea   |  14 +-
 .../main/resources/java/beans/XMLDecoder.eea  |   2 +-
 ...rvicesSupport$BCSSProxyServiceProvider.eea |   2 +-
 .../BeanContextServicesSupport.eea            |  12 +-
 .../beans/beancontext/BeanContextSupport.eea  |  14 +-
 .../src/main/resources/java/io/Console.eea    |   4 +-
 .../resources/java/io/ObjectInputFilter.eea   |   8 +-
 .../resources/java/io/ObjectInputStream.eea   |   6 +-
 .../resources/java/io/ObjectStreamClass.eea   |   2 +-
 .../src/main/resources/java/lang/Class.eea    |   6 +-
 .../resources/java/lang/Enum$EnumDesc.eea     |   2 +-
 .../main/resources/java/lang/ScopedValue.eea  |   2 +-
 .../src/main/resources/java/lang/String.eea   |   2 +-
 .../resources/java/lang/StringTemplate.eea    |   2 +-
 .../src/main/resources/java/lang/Thread.eea   |   4 +-
 .../java/lang/constant/ClassDesc.eea          |   4 +-
 .../lang/constant/DynamicCallSiteDesc.eea     |   4 +-
 .../lang/constant/DynamicConstantDesc.eea     |   2 +-
 .../java/lang/constant/MethodHandleDesc.eea   |   6 +-
 .../java/lang/constant/MethodTypeDesc.eea     |   2 +-
 .../java/lang/constant/ModuleDesc.eea         |   2 +-
 .../java/lang/constant/PackageDesc.eea        |   4 +-
 .../java/lang/foreign/Linker$Option.eea       |   4 +-
 .../java/lang/foreign/SegmentAllocator.eea    |   2 +-
 .../lang/instrument/ClassFileTransformer.eea  |   2 +-
 .../java/lang/invoke/ConstantBootstraps.eea   |   2 +-
 .../java/lang/invoke/MethodHandle.eea         |   4 +-
 .../java/lang/invoke/MethodHandles$Lookup.eea |   2 +-
 .../java/lang/invoke/MethodHandles.eea        |   6 +-
 .../java/lang/invoke/StringConcatFactory.eea  |   2 +-
 .../lang/invoke/VarHandle$VarHandleDesc.eea   |   6 +-
 .../resources/java/lang/invoke/VarHandle.eea  |  44 +++----
 .../java/lang/module/Configuration.eea        |   4 +-
 .../lang/module/ModuleDescriptor$Version.eea  |   2 +-
 .../java/lang/module/ModuleFinder.eea         |   2 +-
 .../lang/reflect/ClassFileFormatVersion.eea   |   2 +-
 .../java/lang/reflect/Executable.eea          |   2 +-
 .../resources/java/lang/reflect/Field.eea     |   2 +-
 .../resources/java/lang/reflect/Member.eea    |   2 +-
 .../java/lang/runtime/SwitchBootstraps.eea    |   4 +-
 .../java/lang/runtime/TemplateRuntime.eea     |   6 +-
 .../main/resources/java/net/Authenticator.eea |  10 +-
 .../resources/java/net/ContentHandler.eea     |   2 +-
 .../java/net/ContentHandlerFactory.eea        |   2 +-
 .../resources/java/net/DatagramPacket.eea     |   2 +-
 .../resources/java/net/DatagramSocket.eea     |   8 +-
 .../resources/java/net/DatagramSocketImpl.eea |   2 +-
 .../java/net/DatagramSocketImplFactory.eea    |   2 +-
 .../resources/java/net/HttpURLConnection.eea  |   4 +-
 .../src/main/resources/java/net/IDN.eea       |   4 +-
 .../resources/java/net/InetSocketAddress.eea  |   2 +-
 .../resources/java/net/NetworkInterface.eea   |   2 +-
 .../main/resources/java/net/ServerSocket.eea  |   6 +-
 .../src/main/resources/java/net/Socket.eea    |   6 +-
 .../main/resources/java/net/SocketImpl.eea    |   2 +-
 .../resources/java/net/SocketImplFactory.eea  |   2 +-
 .../src/main/resources/java/net/URL.eea       |   2 +-
 .../resources/java/net/URLClassLoader.eea     |   2 +-
 .../main/resources/java/net/URLConnection.eea |   8 +-
 .../resources/java/net/URLStreamHandler.eea   |   4 +-
 .../java/net/URLStreamHandlerFactory.eea      |   2 +-
 .../java/net/UnixDomainSocketAddress.eea      |   2 +-
 .../resources/java/net/http/HttpClient.eea    |   2 +-
 .../resources/java/net/http/HttpRequest.eea   |   4 +-
 .../net/http/HttpResponse$BodySubscribers.eea |  16 +--
 .../http/HttpResponse$PushPromiseHandler.eea  |   2 +-
 .../spi/InetAddressResolver$LookupPolicy.eea  |   2 +-
 .../resources/java/nio/channels/Channels.eea  |   8 +-
 .../java/nio/channels/FileChannel.eea         |   2 +-
 .../resources/java/nio/channels/FileLock.eea  |   2 +-
 .../nio/channels/spi/SelectorProvider.eea     |   6 +-
 .../java/nio/charset/CharsetDecoder.eea       |   2 +-
 .../main/resources/java/nio/file/Files.eea    |  16 +--
 .../java/nio/file/attribute/AclEntry.eea      |   6 +-
 .../java/nio/file/attribute/FileTime.eea      |   4 +-
 .../file/attribute/PosixFilePermissions.eea   |   4 +-
 .../java/nio/file/spi/FileSystemProvider.eea  |  10 +-
 .../resources/java/rmi/MarshalledObject.eea   |   2 +-
 .../java/rmi/registry/LocateRegistry.eea      |   4 +-
 .../resources/java/rmi/server/LogStream.eea   |   2 +-
 .../main/resources/java/rmi/server/ObjID.eea  |   2 +-
 .../rmi/server/RMIClientSocketFactory.eea     |   2 +-
 .../rmi/server/RMIServerSocketFactory.eea     |   2 +-
 .../java/rmi/server/RMISocketFactory.eea      |   4 +-
 .../main/resources/java/rmi/server/UID.eea    |   2 +-
 .../java/security/AccessController.eea        |   8 +-
 .../resources/java/security/CodeSource.eea    |   4 +-
 .../security/DomainLoadStoreParameter.eea     |   2 +-
 .../java/security/DrbgParameters.eea          |   6 +-
 .../main/resources/java/security/Identity.eea |   4 +-
 .../java/security/KeyStore$Builder.eea        |   6 +-
 .../resources/java/security/KeyStoreSpi.eea   |   2 +-
 .../resources/java/security/Permissions.eea   |   2 +-
 .../main/resources/java/security/Policy.eea   |   8 +-
 .../main/resources/java/security/Provider.eea |   2 +-
 .../java/security/SecureClassLoader.eea       |   2 +-
 .../java/security/SecureRandomSpi.eea         |   2 +-
 .../main/resources/java/security/Security.eea |   4 +-
 .../resources/java/security/SignatureSpi.eea  |   2 +-
 .../resources/java/security/Timestamp.eea     |   2 +-
 .../java/security/cert/CertPathBuilderSpi.eea |   2 +-
 .../security/cert/CertPathValidatorSpi.eea    |   2 +-
 .../java/security/cert/CertStore.eea          |   2 +-
 .../security/cert/CertificateFactorySpi.eea   |   8 +-
 .../cert/CertificateRevokedException.eea      |   2 +-
 .../java/security/cert/PKIXParameters.eea     |   4 +-
 .../security/cert/PKIXRevocationChecker.eea   |   2 +-
 .../security/cert/URICertStoreParameters.eea  |   2 +-
 .../resources/java/security/cert/X509CRL.eea  |   2 +-
 .../java/security/cert/X509CRLEntry.eea       |   4 +-
 .../java/security/cert/X509CRLSelector.eea    |   6 +-
 .../java/security/cert/X509CertSelector.eea   |  18 +--
 .../java/security/interfaces/RSAKey.eea       |   2 +-
 .../java/security/spec/ECFieldF2m.eea         |   2 +-
 .../java/security/spec/EllipticCurve.eea      |   2 +-
 .../security/spec/PKCS8EncodedKeySpec.eea     |   2 +-
 .../spec/RSAMultiPrimePrivateCrtKeySpec.eea   |   2 +-
 .../java/security/spec/X509EncodedKeySpec.eea |   2 +-
 .../main/resources/java/sql/Connection.eea    |  18 +--
 .../src/main/resources/java/sql/JDBCType.eea  |   2 +-
 .../main/resources/java/sql/SQLException.eea  |   2 +-
 .../src/main/resources/java/sql/SQLInput.eea  |   2 +-
 .../src/main/resources/java/sql/Statement.eea |   6 +-
 .../src/main/resources/java/sql/Time.eea      |   4 +-
 .../resources/java/text/AttributedString.eea  |   2 +-
 .../src/main/resources/java/text/Bidi.eea     |   2 +-
 .../main/resources/java/text/ChoiceFormat.eea |   2 +-
 .../resources/java/text/DecimalFormat.eea     |   2 +-
 .../resources/java/text/MessageFormat.eea     |   2 +-
 .../resources/java/text/RuleBasedCollator.eea |   4 +-
 .../resources/java/text/SimpleDateFormat.eea  |   2 +-
 .../java/text/spi/NumberFormatProvider.eea    |   2 +-
 .../src/main/resources/java/time/Clock.eea    |  12 +-
 .../resources/java/time/InstantSource.eea     |   2 +-
 .../src/main/resources/java/time/MonthDay.eea |   2 +-
 .../main/resources/java/time/OffsetTime.eea   |   8 +-
 .../src/main/resources/java/time/Year.eea     |   2 +-
 .../main/resources/java/time/YearMonth.eea    |   2 +-
 .../java/time/chrono/AbstractChronology.eea   |   2 +-
 .../resources/java/time/chrono/Chronology.eea |   2 +-
 .../java/time/chrono/IsoChronology.eea        |   4 +-
 .../java/time/chrono/JapaneseChronology.eea   |  10 +-
 .../java/time/chrono/JapaneseDate.eea         |   6 +-
 .../java/time/chrono/MinguoChronology.eea     |   6 +-
 .../resources/java/time/chrono/MinguoDate.eea |   2 +-
 .../time/chrono/ThaiBuddhistChronology.eea    |   6 +-
 .../java/time/chrono/ThaiBuddhistDate.eea     |   2 +-
 .../java/time/zone/ZoneOffsetTransition.eea   |   2 +-
 ...oneOffsetTransitionRule$TimeDefinition.eea |   2 +-
 .../time/zone/ZoneOffsetTransitionRule.eea    |   4 +-
 .../resources/java/time/zone/ZoneRules.eea    |   6 +-
 .../main/resources/java/util/AbstractList.eea |   4 +-
 .../util/AbstractMap$SimpleImmutableEntry.eea |   2 +-
 .../java/util/AbstractSequentialList.eea      |   4 +-
 .../main/resources/java/util/ArrayList.eea    |   4 +-
 .../main/resources/java/util/Collections.eea  |   4 +-
 .../main/resources/java/util/Enumeration.eea  |   2 +-
 .../resources/java/util/FormatProcessor.eea   |   4 +-
 .../resources/java/util/GregorianCalendar.eea |   4 +-
 .../src/main/resources/java/util/HashMap.eea  |   2 +-
 .../src/main/resources/java/util/HashSet.eea  |   2 +-
 .../main/resources/java/util/HexFormat.eea    |   4 +-
 .../resources/java/util/LinkedHashMap.eea     |  14 +-
 .../resources/java/util/LinkedHashSet.eea     |   4 +-
 .../main/resources/java/util/LinkedList.eea   |   6 +-
 .../src/main/resources/java/util/Locale.eea   |   8 +-
 .../main/resources/java/util/NavigableMap.eea |   8 +-
 .../src/main/resources/java/util/Objects.eea  |   2 +-
 .../resources/java/util/OptionalDouble.eea    |   2 +-
 .../main/resources/java/util/OptionalInt.eea  |   2 +-
 .../main/resources/java/util/OptionalLong.eea |   2 +-
 .../java/util/ResourceBundle$Control.eea      |   6 +-
 .../src/main/resources/java/util/Scanner.eea  |   4 +-
 .../main/resources/java/util/SequencedMap.eea |  18 +--
 .../resources/java/util/ServiceLoader.eea     |  10 +-
 .../main/resources/java/util/SortedMap.eea    |   4 +-
 ...Spliterators$AbstractDoubleSpliterator.eea |   2 +-
 .../Spliterators$AbstractIntSpliterator.eea   |   2 +-
 .../Spliterators$AbstractLongSpliterator.eea  |   2 +-
 .../resources/java/util/SplittableRandom.eea  |   4 +-
 .../src/main/resources/java/util/TreeMap.eea  |  12 +-
 .../src/main/resources/java/util/Vector.eea   |   6 +-
 .../main/resources/java/util/WeakHashMap.eea  |   2 +-
 .../util/concurrent/CompletableFuture.eea     |   2 +-
 .../util/concurrent/ConcurrentSkipListMap.eea |  16 +--
 .../util/concurrent/CopyOnWriteArrayList.eea  |   2 +-
 .../java/util/concurrent/CountedCompleter.eea |   2 +-
 .../java/util/concurrent/ForkJoinTask.eea     |   2 +-
 .../java/util/concurrent/RecursiveAction.eea  |   2 +-
 .../StructuredTaskScope$ShutdownOnSuccess.eea |   2 +-
 .../util/concurrent/StructuredTaskScope.eea   |   2 +-
 .../util/concurrent/SubmissionPublisher.eea   |   4 +-
 .../atomic/AtomicLongFieldUpdater.eea         |   2 +-
 .../atomic/AtomicReferenceFieldUpdater.eea    |   2 +-
 ...QueuedLongSynchronizer$ConditionObject.eea |   2 +-
 .../locks/AbstractQueuedLongSynchronizer.eea  |   6 +-
 ...ractQueuedSynchronizer$ConditionObject.eea |   2 +-
 .../locks/AbstractQueuedSynchronizer.eea      |   6 +-
 .../java/util/prefs/AbstractPreferences.eea   |   2 +-
 .../util/random/RandomGeneratorFactory.eea    |   6 +-
 .../resources/java/util/regex/MatchResult.eea |   2 +-
 .../resources/java/util/regex/Matcher.eea     |   2 +-
 .../java/util/spi/CurrencyNameProvider.eea    |   2 +-
 .../java/util/spi/LocaleNameProvider.eea      |   6 +-
 .../java/util/spi/TimeZoneNameProvider.eea    |   2 +-
 .../java/util/stream/DoubleStream.eea         |   2 +-
 .../java/util/stream/Node$OfPrimitive.eea     |   2 +-
 .../javax/accessibility/AccessibleContext.eea |  16 +--
 .../accessibility/AccessibleRelation.eea      |   2 +-
 .../accessibility/AccessibleRelationSet.eea   |   4 +-
 .../accessibility/AccessibleStateSet.eea      |   2 +-
 .../annotation/processing/Completions.eea     |   4 +-
 .../javax/annotation/processing/Filer.eea     |   6 +-
 .../main/resources/javax/crypto/CipherSpi.eea |   4 +-
 .../javax/crypto/EncryptedPrivateKeyInfo.eea  |   2 +-
 .../resources/javax/crypto/KeyAgreement.eea   |   2 +-
 .../src/main/resources/javax/crypto/Mac.eea   |   2 +-
 .../javax/crypto/SecretKeyFactory.eea         |   2 +-
 .../javax/crypto/spec/PBEKeySpec.eea          |   2 +-
 .../main/resources/javax/imageio/IIOParam.eea |   4 +-
 .../main/resources/javax/imageio/ImageIO.eea  |  10 +-
 .../javax/imageio/ImageReadParam.eea          |   2 +-
 .../resources/javax/imageio/ImageReader.eea   |  10 +-
 .../javax/imageio/ImageTypeSpecifier.eea      |  18 +--
 .../javax/imageio/ImageWriteParam.eea         |   6 +-
 .../resources/javax/imageio/ImageWriter.eea   |   4 +-
 .../javax/imageio/metadata/IIOMetadata.eea    |  22 ++--
 .../metadata/IIOMetadataFormatImpl.eea        |   2 +-
 .../imageio/metadata/IIOMetadataNode.eea      |  16 +--
 .../plugins/jpeg/JPEGImageReadParam.eea       |   6 +-
 .../plugins/jpeg/JPEGImageWriteParam.eea      |  10 +-
 .../javax/imageio/plugins/jpeg/JPEGQTable.eea |   2 +-
 .../imageio/plugins/tiff/TIFFDirectory.eea    |   6 +-
 .../javax/imageio/plugins/tiff/TIFFField.eea  |   6 +-
 .../javax/imageio/plugins/tiff/TIFFTag.eea    |   4 +-
 .../javax/imageio/spi/IIORegistry.eea         |   2 +-
 .../javax/imageio/spi/ImageInputStreamSpi.eea |   4 +-
 .../imageio/spi/ImageOutputStreamSpi.eea      |   4 +-
 .../javax/imageio/spi/ImageReaderSpi.eea      |   4 +-
 .../javax/imageio/spi/ImageTranscoderSpi.eea  |   2 +-
 .../javax/imageio/spi/ImageWriterSpi.eea      |   4 +-
 .../javax/imageio/spi/ServiceRegistry.eea     |   4 +-
 .../javax/lang/model/SourceVersion.eea        |   2 +-
 .../ModuleElement$DirectiveVisitor.eea        |   2 +-
 .../util/AbstractAnnotationValueVisitor6.eea  |   2 +-
 .../javax/lang/model/util/Elements.eea        |  12 +-
 .../javax/management/AttributeValueExp.eea    |   4 +-
 .../javax/management/ImmutableDescriptor.eea  |   4 +-
 .../javax/management/MBeanServer.eea          |  14 +-
 .../management/MBeanServerConnection.eea      |   8 +-
 .../javax/management/MBeanServerDelegate.eea  |  12 +-
 .../resources/javax/management/ObjectName.eea |  14 +-
 .../main/resources/javax/management/Query.eea |  30 ++---
 .../javax/management/StandardMBean.eea        |   2 +-
 .../javax/management/loading/MLet.eea         |   2 +-
 .../modelmbean/DescriptorSupport.eea          |   8 +-
 .../modelmbean/ModelMBeanInfoSupport.eea      |   4 +-
 .../modelmbean/RequiredModelMBean.eea         |   6 +-
 .../management/monitor/CounterMonitor.eea     |   4 +-
 .../javax/management/monitor/GaugeMonitor.eea |   2 +-
 .../javax/management/monitor/Monitor.eea      |   4 +-
 .../management/monitor/StringMonitor.eea      |   2 +-
 .../openmbean/CompositeDataSupport.eea        |   2 +-
 .../MBeanServerNotificationFilter.eea         |   4 +-
 .../management/relation/RelationService.eea   |  14 +-
 .../management/relation/RelationSupport.eea   |   4 +-
 .../relation/RelationTypeSupport.eea          |   2 +-
 .../javax/management/relation/Role.eea        |   2 +-
 .../management/remote/rmi/RMIConnection.eea   |   8 +-
 .../remote/rmi/RMIConnectionImpl.eea          |  12 +-
 .../remote/rmi/RMIConnectionImpl_Stub.eea     |   8 +-
 .../remote/rmi/RMIConnectorServer.eea         |   4 +-
 .../remote/rmi/RMIJRMPServerImpl.eea          |   4 +-
 .../management/remote/rmi/RMIServerImpl.eea   |   2 +-
 .../javax/management/timer/Timer.eea          |  18 +--
 .../resources/javax/naming/CompositeName.eea  |   4 +-
 .../resources/javax/naming/CompoundName.eea   |   4 +-
 .../main/resources/javax/naming/Context.eea   |   4 +-
 .../resources/javax/naming/InitialContext.eea |   4 +-
 .../resources/javax/naming/LinkException.eea  |   2 +-
 .../javax/naming/NamingException.eea          |   2 +-
 .../main/resources/javax/naming/Reference.eea |   2 +-
 .../javax/naming/directory/BasicAttribute.eea |   4 +-
 .../naming/directory/BasicAttributes.eea      |   2 +-
 .../javax/naming/directory/DirContext.eea     |   4 +-
 .../naming/directory/InitialDirContext.eea    |   4 +-
 .../javax/naming/ldap/ExtendedRequest.eea     |   2 +-
 .../resources/javax/naming/ldap/LdapName.eea  |   8 +-
 .../ldap/PagedResultsResponseControl.eea      |   2 +-
 .../javax/naming/ldap/StartTlsRequest.eea     |   6 +-
 .../javax/naming/ldap/StartTlsResponse.eea    |   4 +-
 .../javax/naming/spi/DirectoryManager.eea     |   4 +-
 .../spi/InitialContextFactoryBuilder.eea      |   2 +-
 .../javax/naming/spi/NamingManager.eea        |   2 +-
 .../javax/naming/spi/ObjectFactoryBuilder.eea |   2 +-
 .../javax/net/ServerSocketFactory.eea         |   8 +-
 .../resources/javax/net/SocketFactory.eea     |  10 +-
 .../javax/net/ssl/ExtendedSSLSession.eea      |   4 +-
 .../javax/net/ssl/HttpsURLConnection.eea      |   2 +-
 .../javax/net/ssl/KeyManagerFactory.eea       |   2 +-
 .../resources/javax/net/ssl/SNIHostName.eea   |   2 +-
 .../resources/javax/net/ssl/SSLContext.eea    |   4 +-
 .../resources/javax/net/ssl/SSLEngine.eea     |  10 +-
 .../resources/javax/net/ssl/SSLParameters.eea |   4 +-
 .../javax/net/ssl/SSLServerSocket.eea         |   2 +-
 .../resources/javax/net/ssl/SSLSession.eea    |   2 +-
 .../resources/javax/net/ssl/SSLSocket.eea     |  10 +-
 .../javax/net/ssl/SSLSocketFactory.eea        |   4 +-
 .../javax/net/ssl/X509ExtendedKeyManager.eea  |   4 +-
 .../javax/print/MultiDocPrintService.eea      |   2 +-
 .../resources/javax/print/PrintService.eea    |   2 +-
 .../javax/print/PrintServiceLookup.eea        |   2 +-
 .../print/attribute/AttributeSetUtilities.eea |  20 +--
 .../javax/print/attribute/DateTimeSyntax.eea  |   2 +-
 .../javax/print/attribute/EnumSyntax.eea      |   4 +-
 .../print/attribute/HashAttributeSet.eea      |   2 +-
 .../print/attribute/ResolutionSyntax.eea      |   2 +-
 .../print/attribute/SetOfIntegerSyntax.eea    |   2 +-
 .../javax/print/attribute/Size2DSyntax.eea    |   2 +-
 .../print/attribute/standard/Chromaticity.eea |   8 +-
 .../attribute/standard/ColorSupported.eea     |   8 +-
 .../print/attribute/standard/Compression.eea  |   8 +-
 .../javax/print/attribute/standard/Copies.eea |   4 +-
 .../attribute/standard/CopiesSupported.eea    |   4 +-
 .../standard/DateTimeAtCompleted.eea          |   4 +-
 .../attribute/standard/DateTimeAtCreation.eea |   4 +-
 .../standard/DateTimeAtProcessing.eea         |   4 +-
 .../print/attribute/standard/Destination.eea  |   4 +-
 .../print/attribute/standard/DialogOwner.eea  |   4 +-
 .../standard/DialogTypeSelection.eea          |   8 +-
 .../print/attribute/standard/DocumentName.eea |   4 +-
 .../print/attribute/standard/Fidelity.eea     |   8 +-
 .../print/attribute/standard/Finishings.eea   |   8 +-
 .../print/attribute/standard/JobHoldUntil.eea |   4 +-
 .../attribute/standard/JobImpressions.eea     |   4 +-
 .../standard/JobImpressionsCompleted.eea      |   4 +-
 .../standard/JobImpressionsSupported.eea      |   4 +-
 .../print/attribute/standard/JobKOctets.eea   |   4 +-
 .../standard/JobKOctetsProcessed.eea          |   4 +-
 .../standard/JobKOctetsSupported.eea          |   4 +-
 .../attribute/standard/JobMediaSheets.eea     |   4 +-
 .../standard/JobMediaSheetsCompleted.eea      |   4 +-
 .../standard/JobMediaSheetsSupported.eea      |   4 +-
 .../standard/JobMessageFromOperator.eea       |   4 +-
 .../print/attribute/standard/JobName.eea      |   4 +-
 .../standard/JobOriginatingUserName.eea       |   4 +-
 .../print/attribute/standard/JobPriority.eea  |   4 +-
 .../standard/JobPrioritySupported.eea         |   4 +-
 .../print/attribute/standard/JobSheets.eea    |   8 +-
 .../print/attribute/standard/JobState.eea     |   8 +-
 .../attribute/standard/JobStateReason.eea     |   8 +-
 .../attribute/standard/JobStateReasons.eea    |   4 +-
 .../javax/print/attribute/standard/Media.eea  |   4 +-
 .../print/attribute/standard/MediaName.eea    |   4 +-
 .../attribute/standard/MediaPrintableArea.eea |   6 +-
 .../print/attribute/standard/MediaSize.eea    |   4 +-
 .../attribute/standard/MediaSizeName.eea      |   4 +-
 .../print/attribute/standard/MediaTray.eea    |   4 +-
 .../standard/MultipleDocumentHandling.eea     |   8 +-
 .../attribute/standard/NumberOfDocuments.eea  |   4 +-
 .../standard/NumberOfInterveningJobs.eea      |   4 +-
 .../print/attribute/standard/NumberUp.eea     |   4 +-
 .../attribute/standard/NumberUpSupported.eea  |   4 +-
 .../standard/OrientationRequested.eea         |   8 +-
 .../standard/OutputDeviceAssigned.eea         |   4 +-
 .../standard/PDLOverrideSupported.eea         |   8 +-
 .../print/attribute/standard/PageRanges.eea   |   4 +-
 .../attribute/standard/PagesPerMinute.eea     |   4 +-
 .../standard/PagesPerMinuteColor.eea          |   4 +-
 .../standard/PresentationDirection.eea        |   8 +-
 .../print/attribute/standard/PrintQuality.eea |   8 +-
 .../print/attribute/standard/PrinterInfo.eea  |   4 +-
 .../standard/PrinterIsAcceptingJobs.eea       |   8 +-
 .../attribute/standard/PrinterLocation.eea    |   4 +-
 .../standard/PrinterMakeAndModel.eea          |   4 +-
 .../standard/PrinterMessageFromOperator.eea   |   4 +-
 .../attribute/standard/PrinterMoreInfo.eea    |   4 +-
 .../standard/PrinterMoreInfoManufacturer.eea  |   4 +-
 .../print/attribute/standard/PrinterName.eea  |   4 +-
 .../attribute/standard/PrinterResolution.eea  |   4 +-
 .../print/attribute/standard/PrinterState.eea |   8 +-
 .../attribute/standard/PrinterStateReason.eea |   8 +-
 .../standard/PrinterStateReasons.eea          |   6 +-
 .../print/attribute/standard/PrinterURI.eea   |   4 +-
 .../attribute/standard/QueuedJobCount.eea     |   4 +-
 .../standard/ReferenceUriSchemesSupported.eea |   8 +-
 .../attribute/standard/RequestingUserName.eea |   4 +-
 .../print/attribute/standard/Severity.eea     |   8 +-
 .../print/attribute/standard/SheetCollate.eea |   8 +-
 .../javax/print/attribute/standard/Sides.eea  |   8 +-
 .../rmi/ssl/SslRMIClientSocketFactory.eea     |   2 +-
 .../rmi/ssl/SslRMIServerSocketFactory.eea     |   2 +-
 .../javax/script/AbstractScriptEngine.eea     |   2 +-
 .../resources/javax/script/ScriptEngine.eea   |   2 +-
 .../javax/script/ScriptEngineManager.eea      |   6 +-
 .../javax/script/SimpleScriptContext.eea      |   6 +-
 .../security/auth/SubjectDomainCombiner.eea   |   2 +-
 .../javax/security/auth/kerberos/KeyTab.eea   |   2 +-
 .../security/auth/login/Configuration.eea     |   6 +-
 .../security/auth/login/LoginContext.eea      |   2 +-
 .../javax/security/sasl/AuthorizeCallback.eea |   2 +-
 .../resources/javax/security/sasl/Sasl.eea    |   8 +-
 .../javax/security/sasl/SaslClientFactory.eea |   2 +-
 .../javax/security/sasl/SaslServerFactory.eea |   2 +-
 .../main/resources/javax/smartcardio/ATR.eea  |   2 +-
 .../javax/smartcardio/CardTerminals.eea       |   2 +-
 .../javax/smartcardio/CommandAPDU.eea         |   2 +-
 .../javax/smartcardio/ResponseAPDU.eea        |   2 +-
 .../javax/sound/midi/MetaMessage.eea          |   2 +-
 .../javax/sound/midi/MidiFileFormat.eea       |   2 +-
 .../javax/sound/midi/MidiMessage.eea          |   2 +-
 .../resources/javax/sound/midi/MidiSystem.eea |   8 +-
 .../resources/javax/sound/midi/Sequence.eea   |   4 +-
 .../javax/sound/midi/SysexMessage.eea         |   2 +-
 .../javax/sound/sampled/AudioFileFormat.eea   |   2 +-
 .../javax/sound/sampled/AudioFormat.eea       |   2 +-
 .../javax/sound/sampled/AudioSystem.eea       |   4 +-
 .../resources/javax/sql/CommonDataSource.eea  |   2 +-
 .../javax/sql/ConnectionPoolDataSource.eea    |   2 +-
 .../main/resources/javax/sql/DataSource.eea   |   2 +-
 .../main/resources/javax/sql/XADataSource.eea |   2 +-
 .../resources/javax/sql/rowset/BaseRowSet.eea |   2 +-
 .../javax/sql/rowset/CachedRowSet.eea         |   8 +-
 .../javax/sql/rowset/RowSetFactory.eea        |  10 +-
 .../javax/sql/rowset/serial/SerialArray.eea   |  16 +--
 .../javax/sql/rowset/serial/SerialBlob.eea    |   4 +-
 .../javax/sql/rowset/serial/SerialClob.eea    |   2 +-
 .../sql/rowset/serial/SerialDatalink.eea      |   2 +-
 .../resources/javax/swing/AbstractAction.eea  |   4 +-
 ...bstractButton$AccessibleAbstractButton.eea |  26 ++--
 .../resources/javax/swing/AbstractButton.eea  |  12 +-
 .../main/resources/javax/swing/ActionMap.eea  |   2 +-
 .../resources/javax/swing/BorderFactory.eea   |  68 +++++-----
 .../src/main/resources/javax/swing/Box.eea    |  16 +--
 .../resources/javax/swing/ButtonModel.eea     |   2 +-
 .../resources/javax/swing/DebugGraphics.eea   |   4 +-
 .../javax/swing/DefaultButtonModel.eea        |   4 +-
 .../javax/swing/DefaultFocusManager.eea       |   8 +-
 .../javax/swing/DefaultListModel.eea          |   2 +-
 .../swing/DefaultRowSorter$ModelWrapper.eea   |   2 +-
 .../javax/swing/DefaultRowSorter.eea          |   2 +-
 .../main/resources/javax/swing/GrayFilter.eea |   2 +-
 .../resources/javax/swing/GroupLayout.eea     |  10 +-
 .../swing/ImageIcon$AccessibleImageIcon.eea   |   8 +-
 .../main/resources/javax/swing/InputMap.eea   |   4 +-
 .../main/resources/javax/swing/JApplet.eea    |   6 +-
 .../main/resources/javax/swing/JButton.eea    |   4 +-
 .../main/resources/javax/swing/JCheckBox.eea  |   4 +-
 .../javax/swing/JCheckBoxMenuItem.eea         |   6 +-
 .../resources/javax/swing/JColorChooser.eea   |   6 +-
 .../swing/JComboBox$AccessibleJComboBox.eea   |  12 +-
 .../main/resources/javax/swing/JComboBox.eea  |  10 +-
 .../swing/JComponent$AccessibleJComponent.eea |   8 +-
 .../main/resources/javax/swing/JComponent.eea |  26 ++--
 .../resources/javax/swing/JDesktopPane.eea    |   6 +-
 .../main/resources/javax/swing/JDialog.eea    |   6 +-
 .../JEditorPane$AccessibleJEditorPaneHTML.eea |   6 +-
 ...aneAccessibleHypertextSupport$HTMLLink.eea |   4 +-
 ...$JEditorPaneAccessibleHypertextSupport.eea |   4 +-
 .../resources/javax/swing/JEditorPane.eea     |  14 +-
 .../resources/javax/swing/JFileChooser.eea    |   8 +-
 .../JFormattedTextField$AbstractFormatter.eea |   6 +-
 .../javax/swing/JFormattedTextField.eea       |   2 +-
 .../src/main/resources/javax/swing/JFrame.eea |   6 +-
 ...InternalFrame$AccessibleJInternalFrame.eea |   2 +-
 ...me$JDesktopIcon$AccessibleJDesktopIcon.eea |   8 +-
 .../swing/JInternalFrame$JDesktopIcon.eea     |   4 +-
 .../resources/javax/swing/JInternalFrame.eea  |  12 +-
 .../javax/swing/JLabel$AccessibleJLabel.eea   |  20 +--
 .../src/main/resources/javax/swing/JLabel.eea |   4 +-
 .../src/main/resources/javax/swing/JLayer.eea |   4 +-
 .../resources/javax/swing/JLayeredPane.eea    |   4 +-
 ...t$AccessibleJList$AccessibleJListChild.eea |  46 +++----
 .../javax/swing/JList$AccessibleJList.eea     |   8 +-
 .../src/main/resources/javax/swing/JList.eea  |  12 +-
 .../javax/swing/JMenu$AccessibleJMenu.eea     |   6 +-
 .../src/main/resources/javax/swing/JMenu.eea  |  20 +--
 .../swing/JMenuBar$AccessibleJMenuBar.eea     |   4 +-
 .../main/resources/javax/swing/JMenuBar.eea   |  12 +-
 .../main/resources/javax/swing/JMenuItem.eea  |   6 +-
 .../resources/javax/swing/JOptionPane.eea     |  14 +-
 .../src/main/resources/javax/swing/JPanel.eea |   4 +-
 ...PasswordField$AccessibleJPasswordField.eea |  14 +-
 .../resources/javax/swing/JPasswordField.eea  |   8 +-
 .../javax/swing/JPopupMenu$Separator.eea      |   2 +-
 .../main/resources/javax/swing/JPopupMenu.eea |  10 +-
 .../JProgressBar$AccessibleJProgressBar.eea   |   2 +-
 .../resources/javax/swing/JProgressBar.eea    |   6 +-
 .../resources/javax/swing/JRadioButton.eea    |   4 +-
 .../javax/swing/JRadioButtonMenuItem.eea      |   4 +-
 .../swing/JRootPane$AccessibleJRootPane.eea   |   2 +-
 .../main/resources/javax/swing/JRootPane.eea  |  12 +-
 .../swing/JScrollBar$AccessibleJScrollBar.eea |   2 +-
 .../main/resources/javax/swing/JScrollBar.eea |   6 +-
 .../resources/javax/swing/JScrollPane.eea     |  14 +-
 .../main/resources/javax/swing/JSeparator.eea |   4 +-
 .../javax/swing/JSlider$AccessibleJSlider.eea |   6 +-
 .../main/resources/javax/swing/JSlider.eea    |  10 +-
 .../swing/JSpinner$AccessibleJSpinner.eea     |  30 ++---
 .../javax/swing/JSpinner$DefaultEditor.eea    |   2 +-
 .../main/resources/javax/swing/JSpinner.eea   |   4 +-
 .../swing/JSplitPane$AccessibleJSplitPane.eea |   2 +-
 .../main/resources/javax/swing/JSplitPane.eea |   4 +-
 .../JTabbedPane$AccessibleJTabbedPane.eea     |   8 +-
 .../resources/javax/swing/JTabbedPane.eea     |  10 +-
 ...$AccessibleJTable$AccessibleJTableCell.eea |  38 +++---
 .../javax/swing/JTable$AccessibleJTable.eea   |  18 +--
 .../src/main/resources/javax/swing/JTable.eea |  22 ++--
 .../main/resources/javax/swing/JTextArea.eea  |   6 +-
 .../main/resources/javax/swing/JTextField.eea |   8 +-
 .../main/resources/javax/swing/JTextPane.eea  |  10 +-
 .../resources/javax/swing/JToggleButton.eea   |   4 +-
 .../javax/swing/JToolBar$Separator.eea        |   2 +-
 .../main/resources/javax/swing/JToolBar.eea   |  10 +-
 .../main/resources/javax/swing/JToolTip.eea   |   4 +-
 ...ee$AccessibleJTree$AccessibleJTreeNode.eea |  40 +++---
 .../javax/swing/JTree$AccessibleJTree.eea     |   8 +-
 .../src/main/resources/javax/swing/JTree.eea  |  34 ++---
 .../main/resources/javax/swing/JViewport.eea  |  16 +--
 .../main/resources/javax/swing/JWindow.eea    |   6 +-
 .../main/resources/javax/swing/KeyStroke.eea  |   2 +-
 .../swing/LayoutFocusTraversalPolicy.eea      |   8 +-
 .../javax/swing/ListSelectionModel.eea        |   2 +-
 .../resources/javax/swing/LookAndFeel.eea     |  10 +-
 .../javax/swing/MenuSelectionManager.eea      |   4 +-
 .../resources/javax/swing/PopupFactory.eea    |   2 +-
 ...gressMonitor$AccessibleProgressMonitor.eea |  28 ++--
 .../resources/javax/swing/RepaintManager.eea  |   2 +-
 .../resources/javax/swing/RowFilter$Entry.eea |   2 +-
 .../main/resources/javax/swing/RowFilter.eea  |  12 +-
 .../javax/swing/ScrollPaneLayout.eea          |   6 +-
 .../javax/swing/SizeRequirements.eea          |   6 +-
 .../resources/javax/swing/SizeSequence.eea    |   2 +-
 .../swing/SortingFocusTraversalPolicy.eea     |   8 +-
 .../javax/swing/SpinnerDateModel.eea          |   4 +-
 .../src/main/resources/javax/swing/Spring.eea |  14 +-
 .../javax/swing/SpringLayout$Constraints.eea  |   2 +-
 .../resources/javax/swing/SpringLayout.eea    |   2 +-
 .../resources/javax/swing/SwingUtilities.eea  |  20 +--
 .../swing/TransferHandler$DropLocation.eea    |   2 +-
 .../resources/javax/swing/TransferHandler.eea |   4 +-
 .../javax/swing/UIDefaults$ActiveValue.eea    |   2 +-
 .../javax/swing/UIDefaults$LazyInputMap.eea   |   2 +-
 .../javax/swing/UIDefaults$LazyValue.eea      |   2 +-
 .../javax/swing/UIDefaults$ProxyLazyValue.eea |   2 +-
 .../main/resources/javax/swing/UIDefaults.eea |  30 ++---
 .../main/resources/javax/swing/UIManager.eea  |   6 +-
 .../javax/swing/border/LineBorder.eea         |   4 +-
 .../AbstractColorChooserPanel.eea             |   4 +-
 .../ColorChooserComponentFactory.eea          |   2 +-
 .../javax/swing/event/InternalFrameEvent.eea  |   4 +-
 .../javax/swing/event/TreeModelEvent.eea      |   6 +-
 .../javax/swing/event/TreeSelectionEvent.eea  |   2 +-
 .../filechooser/FileNameExtensionFilter.eea   |   2 +-
 .../swing/filechooser/FileSystemView.eea      |  20 +--
 .../javax/swing/filechooser/FileView.eea      |  10 +-
 .../javax/swing/plaf/ComponentUI.eea          |   4 +-
 .../javax/swing/plaf/FileChooserUI.eea        |   2 +-
 .../resources/javax/swing/plaf/LayerUI.eea    |   2 +-
 .../resources/javax/swing/plaf/TextUI.eea     |   2 +-
 .../swing/plaf/basic/BasicArrowButton.eea     |   2 +-
 .../javax/swing/plaf/basic/BasicBorders.eea   |  14 +-
 .../javax/swing/plaf/basic/BasicButtonUI.eea  |   8 +-
 .../plaf/basic/BasicCheckBoxMenuItemUI.eea    |   4 +-
 .../swing/plaf/basic/BasicCheckBoxUI.eea      |   4 +-
 .../swing/plaf/basic/BasicColorChooserUI.eea  |   6 +-
 .../swing/plaf/basic/BasicComboBoxEditor.eea  |   2 +-
 .../swing/plaf/basic/BasicComboBoxUI.eea      |  28 ++--
 .../swing/plaf/basic/BasicComboPopup.eea      |  24 ++--
 .../swing/plaf/basic/BasicDesktopIconUI.eea   |   8 +-
 .../swing/plaf/basic/BasicDesktopPaneUI.eea   |   8 +-
 .../swing/plaf/basic/BasicEditorPaneUI.eea    |   4 +-
 .../BasicFileChooserUI$BasicFileView.eea      |   8 +-
 .../swing/plaf/basic/BasicFileChooserUI.eea   |  20 +--
 .../plaf/basic/BasicFormattedTextFieldUI.eea  |   4 +-
 .../swing/plaf/basic/BasicGraphicsUtils.eea   |   2 +-
 .../javax/swing/plaf/basic/BasicHTML.eea      |   2 +-
 .../swing/plaf/basic/BasicIconFactory.eea     |   2 +-
 .../basic/BasicInternalFrameTitlePane.eea     |   8 +-
 .../swing/plaf/basic/BasicInternalFrameUI.eea |  26 ++--
 .../javax/swing/plaf/basic/BasicLabelUI.eea   |   4 +-
 .../javax/swing/plaf/basic/BasicListUI.eea    |  18 +--
 .../swing/plaf/basic/BasicLookAndFeel.eea     |   6 +-
 .../javax/swing/plaf/basic/BasicMenuBarUI.eea |  10 +-
 .../swing/plaf/basic/BasicMenuItemUI.eea      |  18 +--
 .../javax/swing/plaf/basic/BasicMenuUI.eea    |  20 +--
 .../swing/plaf/basic/BasicOptionPaneUI.eea    |  22 ++--
 .../javax/swing/plaf/basic/BasicPanelUI.eea   |   2 +-
 .../swing/plaf/basic/BasicPasswordFieldUI.eea |   6 +-
 .../plaf/basic/BasicPopupMenuSeparatorUI.eea  |   4 +-
 .../swing/plaf/basic/BasicPopupMenuUI.eea     |   2 +-
 .../swing/plaf/basic/BasicProgressBarUI.eea   |   6 +-
 .../plaf/basic/BasicRadioButtonMenuItemUI.eea |   4 +-
 .../swing/plaf/basic/BasicRadioButtonUI.eea   |   6 +-
 .../swing/plaf/basic/BasicRootPaneUI.eea      |   2 +-
 .../swing/plaf/basic/BasicScrollBarUI.eea     |  20 +--
 .../swing/plaf/basic/BasicScrollPaneUI.eea    |  12 +-
 .../swing/plaf/basic/BasicSeparatorUI.eea     |   8 +-
 .../javax/swing/plaf/basic/BasicSliderUI.eea  |  28 ++--
 .../javax/swing/plaf/basic/BasicSpinnerUI.eea |  12 +-
 .../plaf/basic/BasicSplitPaneDivider.eea      |   4 +-
 ...litPaneUI$BasicHorizontalLayoutManager.eea |   8 +-
 .../swing/plaf/basic/BasicSplitPaneUI.eea     |  24 ++--
 .../swing/plaf/basic/BasicTabbedPaneUI.eea    |  20 +--
 .../swing/plaf/basic/BasicTableHeaderUI.eea   |   6 +-
 .../javax/swing/plaf/basic/BasicTableUI.eea   |  10 +-
 .../swing/plaf/basic/BasicTextAreaUI.eea      |  10 +-
 .../swing/plaf/basic/BasicTextFieldUI.eea     |   6 +-
 .../swing/plaf/basic/BasicTextPaneUI.eea      |   4 +-
 .../javax/swing/plaf/basic/BasicTextUI.eea    |  20 +--
 .../swing/plaf/basic/BasicToggleButtonUI.eea  |   4 +-
 .../plaf/basic/BasicToolBarSeparatorUI.eea    |   4 +-
 .../javax/swing/plaf/basic/BasicToolBarUI.eea |  22 ++--
 .../javax/swing/plaf/basic/BasicToolTipUI.eea |   4 +-
 .../basic/BasicTreeUI$ComponentHandler.eea    |   2 +-
 .../BasicTreeUI$NodeDimensionsHandler.eea     |   2 +-
 .../javax/swing/plaf/basic/BasicTreeUI.eea    |  46 +++----
 .../swing/plaf/basic/BasicViewportUI.eea      |   2 +-
 .../swing/plaf/metal/DefaultMetalTheme.eea    |   2 +-
 .../javax/swing/plaf/metal/MetalButtonUI.eea  |   4 +-
 .../swing/plaf/metal/MetalCheckBoxUI.eea      |   4 +-
 .../swing/plaf/metal/MetalComboBoxButton.eea  |   2 +-
 .../swing/plaf/metal/MetalComboBoxUI.eea      |  14 +-
 .../swing/plaf/metal/MetalDesktopIconUI.eea   |   6 +-
 ...MetalFileChooserUI$FilterComboBoxModel.eea |   2 +-
 .../swing/plaf/metal/MetalFileChooserUI.eea   |  30 ++---
 .../swing/plaf/metal/MetalIconFactory.eea     |  16 +--
 .../metal/MetalInternalFrameTitlePane.eea     |   4 +-
 .../swing/plaf/metal/MetalInternalFrameUI.eea |   6 +-
 .../javax/swing/plaf/metal/MetalLabelUI.eea   |   2 +-
 .../swing/plaf/metal/MetalLookAndFeel.eea     |  12 +-
 .../javax/swing/plaf/metal/MetalMenuBarUI.eea |   2 +-
 .../plaf/metal/MetalPopupMenuSeparatorUI.eea  |   4 +-
 .../swing/plaf/metal/MetalProgressBarUI.eea   |   2 +-
 .../swing/plaf/metal/MetalRadioButtonUI.eea   |   2 +-
 .../swing/plaf/metal/MetalRootPaneUI.eea      |   2 +-
 .../swing/plaf/metal/MetalScrollBarUI.eea     |  10 +-
 .../swing/plaf/metal/MetalScrollButton.eea    |   2 +-
 .../swing/plaf/metal/MetalScrollPaneUI.eea    |   4 +-
 .../swing/plaf/metal/MetalSeparatorUI.eea     |   4 +-
 .../javax/swing/plaf/metal/MetalSliderUI.eea  |   6 +-
 .../swing/plaf/metal/MetalSplitPaneUI.eea     |   4 +-
 .../swing/plaf/metal/MetalTabbedPaneUI.eea    |   4 +-
 .../swing/plaf/metal/MetalTextFieldUI.eea     |   2 +-
 .../swing/plaf/metal/MetalToggleButtonUI.eea  |   2 +-
 .../javax/swing/plaf/metal/MetalToolBarUI.eea |  12 +-
 .../javax/swing/plaf/metal/MetalToolTipUI.eea |   6 +-
 .../javax/swing/plaf/metal/MetalTreeUI.eea    |   2 +-
 .../javax/swing/plaf/metal/OceanTheme.eea     |   2 +-
 .../javax/swing/plaf/multi/MultiButtonUI.eea  |   4 +-
 .../swing/plaf/multi/MultiColorChooserUI.eea  |   4 +-
 .../swing/plaf/multi/MultiComboBoxUI.eea      |   4 +-
 .../swing/plaf/multi/MultiDesktopIconUI.eea   |   4 +-
 .../swing/plaf/multi/MultiDesktopPaneUI.eea   |   4 +-
 .../swing/plaf/multi/MultiFileChooserUI.eea   |   4 +-
 .../swing/plaf/multi/MultiInternalFrameUI.eea |   4 +-
 .../javax/swing/plaf/multi/MultiLabelUI.eea   |   4 +-
 .../javax/swing/plaf/multi/MultiListUI.eea    |   4 +-
 .../swing/plaf/multi/MultiLookAndFeel.eea     |  12 +-
 .../javax/swing/plaf/multi/MultiMenuBarUI.eea |   4 +-
 .../swing/plaf/multi/MultiMenuItemUI.eea      |   4 +-
 .../swing/plaf/multi/MultiOptionPaneUI.eea    |   4 +-
 .../javax/swing/plaf/multi/MultiPanelUI.eea   |   4 +-
 .../swing/plaf/multi/MultiPopupMenuUI.eea     |   4 +-
 .../swing/plaf/multi/MultiProgressBarUI.eea   |   4 +-
 .../swing/plaf/multi/MultiRootPaneUI.eea      |   4 +-
 .../swing/plaf/multi/MultiScrollBarUI.eea     |   4 +-
 .../swing/plaf/multi/MultiScrollPaneUI.eea    |   4 +-
 .../swing/plaf/multi/MultiSeparatorUI.eea     |   4 +-
 .../javax/swing/plaf/multi/MultiSliderUI.eea  |   4 +-
 .../javax/swing/plaf/multi/MultiSpinnerUI.eea |   4 +-
 .../swing/plaf/multi/MultiSplitPaneUI.eea     |   4 +-
 .../swing/plaf/multi/MultiTabbedPaneUI.eea    |   4 +-
 .../swing/plaf/multi/MultiTableHeaderUI.eea   |   4 +-
 .../javax/swing/plaf/multi/MultiTableUI.eea   |   4 +-
 .../javax/swing/plaf/multi/MultiTextUI.eea    |   6 +-
 .../javax/swing/plaf/multi/MultiToolBarUI.eea |   4 +-
 .../javax/swing/plaf/multi/MultiToolTipUI.eea |   4 +-
 .../javax/swing/plaf/multi/MultiTreeUI.eea    |   4 +-
 .../swing/plaf/multi/MultiViewportUI.eea      |   4 +-
 .../plaf/nimbus/AbstractRegionPainter.eea     |   8 +-
 .../swing/plaf/nimbus/Effect$ArrayCache.eea   |   8 +-
 .../swing/plaf/nimbus/NimbusLookAndFeel.eea   |  12 +-
 .../javax/swing/plaf/nimbus/NimbusStyle.eea   |   2 +-
 .../javax/swing/plaf/synth/SynthButtonUI.eea  |   8 +-
 .../plaf/synth/SynthCheckBoxMenuItemUI.eea    |   4 +-
 .../swing/plaf/synth/SynthCheckBoxUI.eea      |   4 +-
 .../swing/plaf/synth/SynthColorChooserUI.eea  |   4 +-
 .../swing/plaf/synth/SynthComboBoxUI.eea      |  12 +-
 .../swing/plaf/synth/SynthDesktopIconUI.eea   |   2 +-
 .../swing/plaf/synth/SynthDesktopPaneUI.eea   |   2 +-
 .../swing/plaf/synth/SynthEditorPaneUI.eea    |   2 +-
 .../plaf/synth/SynthFormattedTextFieldUI.eea  |   4 +-
 .../swing/plaf/synth/SynthInternalFrameUI.eea |   6 +-
 .../javax/swing/plaf/synth/SynthLabelUI.eea   |   4 +-
 .../javax/swing/plaf/synth/SynthListUI.eea    |   2 +-
 .../swing/plaf/synth/SynthLookAndFeel.eea     |  10 +-
 .../javax/swing/plaf/synth/SynthMenuBarUI.eea |   2 +-
 .../swing/plaf/synth/SynthMenuItemUI.eea      |   4 +-
 .../javax/swing/plaf/synth/SynthMenuUI.eea    |   4 +-
 .../swing/plaf/synth/SynthOptionPaneUI.eea    |   6 +-
 .../javax/swing/plaf/synth/SynthPanelUI.eea   |   2 +-
 .../swing/plaf/synth/SynthPasswordFieldUI.eea |   6 +-
 .../swing/plaf/synth/SynthPopupMenuUI.eea     |   2 +-
 .../swing/plaf/synth/SynthProgressBarUI.eea   |   6 +-
 .../plaf/synth/SynthRadioButtonMenuItemUI.eea |   4 +-
 .../swing/plaf/synth/SynthRadioButtonUI.eea   |   4 +-
 .../swing/plaf/synth/SynthRootPaneUI.eea      |   2 +-
 .../swing/plaf/synth/SynthScrollBarUI.eea     |   8 +-
 .../swing/plaf/synth/SynthScrollPaneUI.eea    |   2 +-
 .../swing/plaf/synth/SynthSeparatorUI.eea     |   4 +-
 .../javax/swing/plaf/synth/SynthSliderUI.eea  |  10 +-
 .../javax/swing/plaf/synth/SynthSpinnerUI.eea |  10 +-
 .../swing/plaf/synth/SynthSplitPaneUI.eea     |   6 +-
 .../javax/swing/plaf/synth/SynthStyle.eea     |   4 +-
 .../swing/plaf/synth/SynthTabbedPaneUI.eea    |   8 +-
 .../swing/plaf/synth/SynthTableHeaderUI.eea   |   2 +-
 .../javax/swing/plaf/synth/SynthTableUI.eea   |   2 +-
 .../swing/plaf/synth/SynthTextAreaUI.eea      |   2 +-
 .../swing/plaf/synth/SynthTextFieldUI.eea     |   2 +-
 .../swing/plaf/synth/SynthTextPaneUI.eea      |   4 +-
 .../swing/plaf/synth/SynthToggleButtonUI.eea  |   4 +-
 .../javax/swing/plaf/synth/SynthToolBarUI.eea |   4 +-
 .../javax/swing/plaf/synth/SynthToolTipUI.eea |   4 +-
 .../javax/swing/plaf/synth/SynthTreeUI.eea    |   6 +-
 .../swing/plaf/synth/SynthViewportUI.eea      |   2 +-
 .../javax/swing/table/AbstractTableModel.eea  |   4 +-
 .../swing/table/DefaultTableColumnModel.eea   |   2 +-
 .../javax/swing/table/DefaultTableModel.eea   |   2 +-
 ...ableHeader$AccessibleJTableHeaderEntry.eea |  28 ++--
 .../JTableHeader$AccessibleJTableHeader.eea   |   4 +-
 .../javax/swing/table/JTableHeader.eea        |  10 +-
 .../javax/swing/table/TableColumn.eea         |   2 +-
 .../javax/swing/table/TableRowSorter.eea      |   2 +-
 .../text/AbstractDocument$AbstractElement.eea |   2 +-
 .../text/AbstractDocument$BranchElement.eea   |   8 +-
 .../swing/text/AbstractDocument$Content.eea   |   2 +-
 .../AbstractDocument$DefaultDocumentEvent.eea |   8 +-
 .../text/AbstractDocument$LeafElement.eea     |   6 +-
 .../javax/swing/text/AbstractDocument.eea     |  12 +-
 .../javax/swing/text/AsyncBoxView.eea         |   6 +-
 .../resources/javax/swing/text/BoxView.eea    |  10 +-
 .../javax/swing/text/ComponentView.eea        |   2 +-
 .../javax/swing/text/CompositeView.eea        |  10 +-
 .../javax/swing/text/DefaultEditorKit.eea     |   8 +-
 .../javax/swing/text/DefaultFormatter.eea     |   6 +-
 ...ultHighlighter$DefaultHighlightPainter.eea |   2 +-
 .../javax/swing/text/DefaultHighlighter.eea   |   2 +-
 .../DefaultStyledDocument$SectionElement.eea  |   2 +-
 .../swing/text/DefaultStyledDocument.eea      |   2 +-
 .../resources/javax/swing/text/Document.eea   |   2 +-
 .../resources/javax/swing/text/EditorKit.eea  |   4 +-
 .../javax/swing/text/ElementIterator.eea      |   8 +-
 .../resources/javax/swing/text/FieldView.eea  |   2 +-
 .../swing/text/FlowView$FlowStrategy.eea      |   2 +-
 .../resources/javax/swing/text/FlowView.eea   |   4 +-
 .../resources/javax/swing/text/GapContent.eea |   8 +-
 .../resources/javax/swing/text/GlyphView.eea  |   8 +-
 .../swing/text/InternationalFormatter.eea     |   4 +-
 ...TextComponent$AccessibleJTextComponent.eea |  12 +-
 .../javax/swing/text/JTextComponent.eea       |   8 +-
 .../resources/javax/swing/text/LabelView.eea  |   6 +-
 .../javax/swing/text/LayoutQueue.eea          |   2 +-
 .../javax/swing/text/MaskFormatter.eea        |   2 +-
 .../javax/swing/text/ParagraphView.eea        |   4 +-
 .../javax/swing/text/PasswordView.eea         |   2 +-
 .../javax/swing/text/PlainDocument.eea        |   2 +-
 .../javax/swing/text/StringContent.eea        |   8 +-
 .../javax/swing/text/StyleConstants.eea       |   2 +-
 .../swing/text/StyleContext$NamedStyle.eea    |   4 +-
 .../text/StyleContext$SmallAttributeSet.eea   |   2 +-
 .../javax/swing/text/StyleContext.eea         |   8 +-
 .../text/StyledEditorKit$StyledTextAction.eea |   2 +-
 .../javax/swing/text/StyledEditorKit.eea      |   4 +-
 .../javax/swing/text/TableView$TableRow.eea   |   4 +-
 .../resources/javax/swing/text/TableView.eea  |   8 +-
 .../resources/javax/swing/text/TextAction.eea |   2 +-
 .../resources/javax/swing/text/Utilities.eea  |   2 +-
 .../main/resources/javax/swing/text/View.eea  |  12 +-
 .../javax/swing/text/ViewFactory.eea          |   2 +-
 .../resources/javax/swing/text/ZoneView.eea   |   2 +-
 .../AccessibleHTML$HTMLAccessibleContext.eea  |  14 +-
 ...$IconElementInfo$IconAccessibleContext.eea |   2 +-
 ...cessibleContext$AccessibleHeadersTable.eea |  18 +--
 ...ableElementInfo$TableAccessibleContext.eea |  26 ++--
 ...$TextElementInfo$TextAccessibleContext.eea |   8 +-
 .../javax/swing/text/html/BlockView.eea       |   4 +-
 .../resources/javax/swing/text/html/CSS.eea   |   2 +-
 .../javax/swing/text/html/FormView.eea        |   2 +-
 .../resources/javax/swing/text/html/HTML.eea  |   6 +-
 .../text/html/HTMLDocument$BlockElement.eea   |   4 +-
 .../text/html/HTMLDocument$RunElement.eea     |   4 +-
 .../javax/swing/text/html/HTMLDocument.eea    |  10 +-
 .../text/html/HTMLEditorKit$HTMLFactory.eea   |   2 +-
 .../javax/swing/text/html/HTMLEditorKit.eea   |  10 +-
 .../javax/swing/text/html/ImageView.eea       |   6 +-
 .../javax/swing/text/html/ObjectView.eea      |   2 +-
 .../javax/swing/text/html/ParagraphView.eea   |   2 +-
 .../javax/swing/text/html/StyleSheet.eea      |  14 +-
 .../swing/text/html/TableView$RowView.eea     |   6 +-
 .../swing/text/html/parser/AttributeList.eea  |   2 +-
 .../swing/text/html/parser/ContentModel.eea   |   2 +-
 .../javax/swing/text/html/parser/DTD.eea      |  10 +-
 .../javax/swing/text/html/parser/Element.eea  |   4 +-
 .../javax/swing/text/html/parser/Entity.eea   |   2 +-
 .../javax/swing/text/html/parser/Parser.eea   |   4 +-
 .../text/html/parser/ParserDelegator.eea      |   2 +-
 .../javax/swing/text/rtf/RTFEditorKit.eea     |   2 +-
 .../javax/swing/tree/AbstractLayoutCache.eea  |   4 +-
 .../swing/tree/DefaultMutableTreeNode.eea     |  26 ++--
 .../swing/tree/DefaultTreeCellEditor.eea      |   4 +-
 .../javax/swing/tree/DefaultTreeModel.eea     |   2 +-
 .../swing/tree/DefaultTreeSelectionModel.eea  |   6 +-
 .../swing/tree/FixedHeightLayoutCache.eea     |   8 +-
 .../resources/javax/swing/tree/TreePath.eea   |   4 +-
 .../swing/tree/VariableHeightLayoutCache.eea  |   8 +-
 .../javax/swing/undo/AbstractUndoableEdit.eea |   2 +-
 .../javax/swing/undo/CompoundEdit.eea         |   4 +-
 .../resources/javax/swing/undo/StateEdit.eea  |   2 +-
 .../javax/swing/undo/UndoManager.eea          |   4 +-
 .../javax/swing/undo/UndoableEditSupport.eea  |   2 +-
 .../javax/tools/ForwardingJavaFileManager.eea |  10 +-
 .../resources/javax/tools/JavaFileManager.eea |  10 +-
 .../javax/tools/SimpleJavaFileObject.eea      |   8 +-
 .../javax/tools/StandardJavaFileManager.eea   |   2 +-
 .../src/main/resources/javax/tools/Tool.eea   |   2 +-
 .../resources/javax/tools/ToolProvider.eea    |   2 +-
 .../javax/xml/catalog/CatalogFeatures.eea     |   2 +-
 .../javax/xml/catalog/CatalogManager.eea      |   6 +-
 .../xml/catalog/GroupEntry$ResolveType.eea    |   2 +-
 .../javax/xml/crypto/KeySelector.eea          |   2 +-
 .../javax/xml/datatype/DatatypeFactory.eea    |   2 +-
 .../xml/parsers/DocumentBuilderFactory.eea    |   4 +-
 .../resources/javax/xml/parsers/SAXParser.eea |   2 +-
 .../javax/xml/parsers/SAXParserFactory.eea    |   4 +-
 .../javax/xml/stream/XMLEventFactory.eea      |  52 ++++----
 .../xml/transform/TransformerException.eea    |   4 +-
 .../xml/transform/TransformerFactory.eea      |   2 +-
 .../javax/xml/transform/sax/SAXSource.eea     |   4 +-
 .../javax/xml/transform/stax/StAXResult.eea   |   2 +-
 .../javax/xml/validation/SchemaFactory.eea    |   4 +-
 .../javax/xml/validation/Validator.eea        |   2 +-
 .../javax/xml/validation/ValidatorHandler.eea |   2 +-
 .../XPathEvaluationResult$XPathResultType.eea |   2 +-
 .../javax/xml/xpath/XPathFactory.eea          |   4 +-
 .../org/w3c/dom/DOMImplementation.eea         |   4 +-
 .../main/resources/org/w3c/dom/Document.eea   |   2 +-
 .../bootstrap/DOMImplementationRegistry.eea   |   6 +-
 .../org/w3c/dom/css/DOMImplementationCSS.eea  |   2 +-
 .../org/w3c/dom/events/DocumentEvent.eea      |   2 +-
 .../w3c/dom/html/HTMLDOMImplementation.eea    |   2 +-
 .../org/w3c/dom/html/HTMLTableElement.eea     |   6 +-
 .../org/w3c/dom/ls/DOMImplementationLS.eea    |   8 +-
 .../org/w3c/dom/ranges/DocumentRange.eea      |   2 +-
 .../w3c/dom/traversal/DocumentTraversal.eea   |   4 +-
 .../org/w3c/dom/xpath/XPathEvaluator.eea      |   4 +-
 .../org/xml/sax/ext/DefaultHandler2.eea       |   4 +-
 .../org/xml/sax/helpers/AttributeListImpl.eea |   6 +-
 .../org/xml/sax/helpers/AttributesImpl.eea    |  18 +--
 .../org/xml/sax/helpers/NamespaceSupport.eea  |   2 +-
 .../org/xml/sax/helpers/ParserAdapter.eea     |   2 +-
 .../org/xml/sax/helpers/XMLReaderFactory.eea  |   4 +-
 .../resources/javax/mail/Authenticator.eea    |   2 +-
 .../resources/javax/mail/FetchProfile.eea     |   4 +-
 .../src/main/resources/javax/mail/Flags.eea   |   4 +-
 .../src/main/resources/javax/mail/Folder.eea  |   8 +-
 .../resources/javax/mail/MessageContext.eea   |   4 +-
 .../src/main/resources/javax/mail/Session.eea |   8 +-
 .../src/main/resources/javax/mail/Store.eea   |   4 +-
 .../src/main/resources/javax/mail/URLName.eea |   2 +-
 .../mail/internet/ContentDisposition.eea      |   2 +-
 .../javax/mail/internet/ContentType.eea       |   4 +-
 .../javax/mail/internet/HeaderTokenizer.eea   |   2 +-
 .../javax/mail/internet/InternetAddress.eea   |  12 +-
 .../javax/mail/internet/InternetHeaders.eea   |   4 +-
 .../javax/mail/internet/MailDateFormat.eea    |   4 +-
 .../javax/mail/internet/MimeBodyPart.eea      |   2 +-
 .../javax/mail/internet/MimeMessage.eea       |  12 +-
 .../javax/mail/internet/MimeMultipart.eea     |   8 +-
 .../mail/internet/MimePartDataSource.eea      |   2 +-
 .../javax/mail/internet/MimeUtility.eea       |   4 +-
 .../javax/mail/internet/NewsAddress.eea       |   4 +-
 .../javax/mail/internet/ParameterList.eea     |   4 +-
 .../resources/javax/mail/search/DateTerm.eea  |   2 +-
 .../javax/mail/util/ByteArrayDataSource.eea   |   2 +-
 .../javax/portlet/ActionResponse.eea          |   2 +-
 .../javax/portlet/GenericPortlet.eea          |   2 +-
 .../resources/javax/portlet/MimeResponse.eea  |  10 +-
 .../javax/portlet/PortletAsyncContext.eea     |   2 +-
 .../javax/portlet/PortletResponse.eea         |   2 +-
 .../javax/portlet/ResourceResponse.eea        |  10 +-
 .../portlet/filter/ActionResponseWrapper.eea  |   2 +-
 .../portlet/filter/MimeResponseWrapper.eea    |  10 +-
 .../filter/PortletAsyncContextWrapper.eea     |   2 +-
 .../portlet/filter/PortletResponseWrapper.eea |   2 +-
 .../resources/javax/servlet/AsyncContext.eea  |   2 +-
 .../javax/servlet/http/HttpServletRequest.eea |   4 +-
 .../http/HttpServletRequestWrapper.eea        |   4 +-
 .../servlet/http/HttpServletResponse.eea      |   2 +-
 .../http/HttpServletResponseWrapper.eea       |   2 +-
 .../javax/servlet/http/HttpUtils.eea          |   4 +-
 .../com/sun/codemodel/CodeWriter.eea          |   2 +-
 .../sun/codemodel/JAnnotationArrayMember.eea  |   2 +-
 .../com/sun/codemodel/JAnnotationUse.eea      |   6 +-
 .../resources/com/sun/codemodel/JBlock.eea    |   8 +-
 .../resources/com/sun/codemodel/JClass.eea    |  22 ++--
 .../com/sun/codemodel/JCodeModel.eea          |  10 +-
 .../com/sun/codemodel/JDefinedClass.eea       |  18 +--
 .../com/sun/codemodel/JDocComment.eea         |   4 +-
 .../com/sun/codemodel/JEnumConstant.eea       |   2 +-
 .../resources/com/sun/codemodel/JExpr.eea     |  38 +++---
 .../resources/com/sun/codemodel/JForLoop.eea  |   2 +-
 .../resources/com/sun/codemodel/JMethod.eea   |   8 +-
 .../resources/com/sun/codemodel/JNullType.eea |   6 +-
 .../main/resources/com/sun/codemodel/JOp.eea  |  46 +++----
 .../resources/com/sun/codemodel/JPackage.eea  |   6 +-
 .../resources/com/sun/codemodel/JSwitch.eea   |   2 +-
 .../resources/com/sun/codemodel/JTryBlock.eea |   2 +-
 .../resources/com/sun/codemodel/JType.eea     |   2 +-
 .../resources/com/sun/codemodel/JTypeVar.eea  |   2 +-
 .../main/resources/com/sun/codemodel/JVar.eea |   2 +-
 .../com/sun/codemodel/util/EncoderFactory.eea |   2 +-
 .../sun/codemodel/writer/FileCodeWriter.eea   |   4 +-
 .../sun/codemodel/writer/FilterCodeWriter.eea |   2 +-
 .../codemodel/writer/LicenseCodeWriter.eea    |   2 +-
 .../writer/OutputStreamCodeWriter.eea         |   2 +-
 .../codemodel/writer/ProgressCodeWriter.eea   |   2 +-
 .../sun/codemodel/writer/PrologCodeWriter.eea |   2 +-
 .../writer/SingleStreamCodeWriter.eea         |   2 +-
 .../com/sun/tools/xjc/ModelLoader.eea         |  10 +-
 .../resources/com/sun/tools/xjc/Options.eea   |   6 +-
 .../resources/com/sun/tools/xjc/XJCBase.eea   |   6 +-
 .../resources/com/sun/tools/xjc/XJCFacade.eea |   2 +-
 .../resources/com/sun/tools/xjc/XJCTask.eea   |   4 +-
 .../tools/xjc/addon/accessors/PluginImpl.eea  |   4 +-
 .../xjc/addon/at_generated/PluginImpl.eea     |   4 +-
 .../xjc/addon/code_injector/PluginImpl.eea    |   4 +-
 .../tools/xjc/addon/episode/PluginImpl.eea    |   4 +-
 .../xjc/addon/locator/SourceLocationAddOn.eea |   4 +-
 .../addon/sync/SynchronizedMethodAddOn.eea    |   4 +-
 .../com/sun/tools/xjc/api/SpecVersion.eea     |   2 +-
 .../resources/com/sun/tools/xjc/api/XJC.eea   |   2 +-
 .../s2j/ElementAdapter$FieldAccessorImpl.eea  |   2 +-
 .../tools/xjc/api/impl/s2j/PropertyImpl.eea   |   2 +-
 .../xjc/api/impl/s2j/SchemaCompilerImpl.eea   |   2 +-
 .../xjc/generator/bean/BeanGenerator.eea      |   8 +-
 .../xjc/generator/bean/ClassOutlineImpl.eea   |   2 +-
 .../generator/bean/ImplStructureStrategy.eea  |   4 +-
 .../bean/field/FieldRendererFactory.eea       |   4 +-
 .../bean/field/UntypedListFieldRenderer.eea   |   2 +-
 .../xjc/generator/util/LazyBlockReference.eea |   2 +-
 .../com/sun/tools/xjc/model/CArrayInfo.eea    |   2 +-
 .../sun/tools/xjc/model/CBuiltinLeafInfo.eea  |  12 +-
 .../com/sun/tools/xjc/model/CClassInfo.eea    |  12 +-
 .../com/sun/tools/xjc/model/CClassRef.eea     |   8 +-
 .../sun/tools/xjc/model/CCustomizations.eea   |   4 +-
 .../com/sun/tools/xjc/model/CDefaultValue.eea |   2 +-
 .../com/sun/tools/xjc/model/CElementInfo.eea  |   2 +-
 .../tools/xjc/model/CElementPropertyInfo.eea  |   6 +-
 .../com/sun/tools/xjc/model/CEnumLeafInfo.eea |  16 +--
 .../com/sun/tools/xjc/model/CPropertyInfo.eea |   6 +-
 .../xjc/model/CReferencePropertyInfo.eea      |  14 +-
 .../com/sun/tools/xjc/model/CTypeRef.eea      |   6 +-
 .../com/sun/tools/xjc/model/Model.eea         |  16 +--
 .../com/sun/tools/xjc/model/Multiplicity.eea  |   6 +-
 .../com/sun/tools/xjc/model/TypeUse.eea       |   2 +-
 .../sun/tools/xjc/model/TypeUseFactory.eea    |   6 +-
 .../sun/tools/xjc/model/nav/NavigatorImpl.eea |  54 ++++----
 .../sun/tools/xjc/outline/ClassOutline.eea    |   4 +-
 .../AbstractExtensionBindingChecker.eea       |   2 +-
 .../sun/tools/xjc/reader/RawTypeSet$Ref.eea   |   2 +-
 .../com/sun/tools/xjc/reader/RawTypeSet.eea   |   2 +-
 .../com/sun/tools/xjc/reader/Util.eea         |   4 +-
 .../sun/tools/xjc/reader/dtd/TDTDReader.eea   |   4 +-
 .../xjc/reader/dtd/bindinfo/BIAttribute.eea   |   4 +-
 .../xjc/reader/dtd/bindinfo/BIContent.eea     |   4 +-
 .../xjc/reader/dtd/bindinfo/BIElement.eea     |   2 +-
 .../xjc/reader/dtd/bindinfo/BindInfo.eea      |   6 +-
 .../tools/xjc/reader/dtd/bindinfo/DOMUtil.eea |   8 +-
 .../xjc/reader/internalizer/DOMForest.eea     |  10 +-
 .../internalizer/InternalizationLogic.eea     |   2 +-
 .../relaxng/RELAXNGInternalizationLogic.eea   |   2 +-
 .../xjc/reader/relaxng/RawTypeSetBuilder.eea  |   4 +-
 .../tools/xjc/reader/xmlschema/BGMBuilder.eea |   8 +-
 .../reader/xmlschema/ExpressionBuilder.eea    |   8 +-
 .../xjc/reader/xmlschema/ParticleBinder.eea   |   2 +-
 .../RawTypeSetBuilder$CElementInfoRef.eea     |   2 +-
 .../RawTypeSetBuilder$WildcardRef.eea         |   2 +-
 .../RawTypeSetBuilder$XmlTypeRef.eea          |   2 +-
 .../reader/xmlschema/RawTypeSetBuilder.eea    |   2 +-
 .../xmlschema/WildcardNameClassBuilder.eea    |   4 +-
 .../bindinfo/AnnotationParserFactoryImpl.eea  |   2 +-
 .../xjc/reader/xmlschema/bindinfo/BIClass.eea |   2 +-
 .../xmlschema/bindinfo/BIGlobalBinding.eea    |   4 +-
 .../reader/xmlschema/bindinfo/BIProperty.eea  |  22 ++--
 .../bindinfo/BISchemaBinding$NamingRule.eea   |   2 +-
 .../reader/xmlschema/bindinfo/BindInfo.eea    |   6 +-
 .../xmlschema/parser/LSInputSAXWrapper.eea    |   4 +-
 .../parser/XMLSchemaInternalizationLogic.eea  |   2 +-
 .../tools/xjc/runtime/JAXBContextFactory.eea  |   4 +-
 .../xjc/runtime/ZeroOneBooleanAdapter.eea     |   2 +-
 .../tools/xjc/util/CodeModelClassFactory.eea  |  12 +-
 .../com/sun/tools/xjc/util/DOMUtils.eea       |  10 +-
 .../sun/tools/xjc/util/ForkContentHandler.eea |   2 +-
 .../com/sun/tools/xjc/util/MimeTypeRange.eea  |   4 +-
 .../sun/tools/xjc/util/ReadOnlyAdapter.eea    |   2 +-
 .../resources/com/sun/tools/xjc/util/Util.eea |   2 +-
 .../jakarta/xml/bind/JAXBContext.eea          |  10 +-
 .../jakarta/xml/bind/JAXBContextFactory.eea   |   4 +-
 .../xml/bind/annotation/DomHandler.eea        |   2 +-
 .../xml/bind/annotation/W3CDomHandler.eea     |   4 +-
 .../bind/helpers/AbstractMarshallerImpl.eea   |  10 +-
 .../bind/helpers/AbstractUnmarshallerImpl.eea |  24 ++--
 .../jupiter/api/AssertionFailureBuilder.eea   |   2 +-
 .../api/Assertions$TimeoutFailureFactory.eea  |   2 +-
 .../org/junit/jupiter/api/Assertions.eea      |   2 +-
 .../org/junit/jupiter/api/Assumptions.eea     |   6 +-
 ...splayNameGenerator$IndicativeSentences.eea |   2 +-
 ...isplayNameGenerator$ReplaceUnderscores.eea |   2 +-
 .../api/DisplayNameGenerator$Simple.eea       |   2 +-
 .../api/DisplayNameGenerator$Standard.eea     |   2 +-
 .../jupiter/api/DisplayNameGenerator.eea      |   2 +-
 .../junit/jupiter/api/DynamicContainer.eea    |   2 +-
 .../org/junit/jupiter/api/DynamicTest.eea     |   4 +-
 .../resources/org/junit/jupiter/api/Named.eea |   2 +-
 .../org/junit/jupiter/api/NamedExecutable.eea |   2 +-
 .../extension/ExtensionContext$Namespace.eea  |   4 +-
 .../api/extension/TestInstanceFactory.eea     |   2 +-
 .../TestTemplateInvocationContext.eea         |   2 +-
 .../api/io/TempDirFactory$Standard.eea        |   2 +-
 .../junit/jupiter/api/io/TempDirFactory.eea   |   2 +-
 .../org/osgi/framework/BundleContext.eea      |   2 +-
 .../service/condpermadmin/ConditionInfo.eea   |   2 +-
 .../permissionadmin/PermissionInfo.eea        |   2 +-
 .../osgi/service/resolver/ResolveContext.eea  |   2 +-
 .../url/AbstractURLStreamHandlerService.eea   |   2 +-
 .../org/osgi/util/tracker/BundleTracker.eea   |   4 +-
 .../CalendarIntervalScheduleBuilder.eea       |   2 +-
 .../resources/org/quartz/CronExpression.eea   |  14 +-
 .../org/quartz/CronScheduleBuilder.eea        |   2 +-
 .../DailyTimeIntervalScheduleBuilder.eea      |   2 +-
 .../main/resources/org/quartz/DateBuilder.eea |  10 +-
 .../main/resources/org/quartz/JobDataMap.eea  |   8 +-
 .../src/main/resources/org/quartz/JobKey.eea  |   4 +-
 .../org/quartz/SchedulerMetaData.eea          |   2 +-
 .../org/quartz/SimpleScheduleBuilder.eea      |   2 +-
 .../main/resources/org/quartz/TimeOfDay.eea   |   4 +-
 .../resources/org/quartz/TriggerBuilder.eea   |   2 +-
 .../main/resources/org/quartz/TriggerKey.eea  |   4 +-
 .../resources/org/quartz/TriggerUtils.eea     |   2 +-
 .../org/quartz/core/JobRunShellFactory.eea    |   2 +-
 .../org/quartz/core/QuartzScheduler.eea       |   6 +-
 .../quartz/core/QuartzSchedulerMBeanImpl.eea  |   6 +-
 .../quartz/core/QuartzSchedulerResources.eea  |   4 +-
 .../quartz/core/jmx/CronTriggerSupport.eea    |   6 +-
 .../org/quartz/core/jmx/JobDataMapSupport.eea |   6 +-
 .../org/quartz/core/jmx/JobDetailSupport.eea  |   6 +-
 .../core/jmx/JobExecutionContextSupport.eea   |   2 +-
 .../quartz/core/jmx/SimpleTriggerSupport.eea  |   6 +-
 .../org/quartz/core/jmx/TriggerSupport.eea    |   4 +-
 .../jboss/JBoss4RMIRemoteMBeanScheduler.eea   |   2 +-
 .../org/quartz/ee/jmx/jboss/QuartzService.eea |   4 +-
 .../JTAAnnotationAwareJobRunShellFactory.eea  |   2 +-
 .../quartz/ee/jta/JTAJobRunShellFactory.eea   |   2 +-
 .../quartz/ee/jta/UserTransactionHelper.eea   |   2 +-
 .../ee/servlet/QuartzInitializerListener.eea  |   2 +-
 .../ee/servlet/QuartzInitializerServlet.eea   |   2 +-
 .../org/quartz/impl/JobDetailImpl.eea         |   4 +-
 .../org/quartz/impl/RemoteMBeanScheduler.eea  |  22 ++--
 .../org/quartz/impl/RemoteScheduler.eea       |   4 +-
 .../org/quartz/impl/StdJobRunShellFactory.eea |   2 +-
 .../org/quartz/impl/StdScheduler.eea          |   2 +-
 .../org/quartz/impl/StdSchedulerFactory.eea   |   2 +-
 .../org/quartz/impl/calendar/BaseCalendar.eea |   4 +-
 .../impl/jdbcjobstore/CUBRIDDelegate.eea      |   2 +-
 .../impl/jdbcjobstore/CacheDelegate.eea       |   4 +-
 ...ndarIntervalTriggerPersistenceDelegate.eea |   6 +-
 .../CronTriggerPersistenceDelegate.eea        |   4 +-
 ...TimeIntervalTriggerPersistenceDelegate.eea |   6 +-
 .../impl/jdbcjobstore/HSQLDBDelegate.eea      |   4 +-
 ...obStoreSupport$VoidTransactionCallback.eea |   2 +-
 .../impl/jdbcjobstore/JobStoreSupport.eea     |  12 +-
 .../impl/jdbcjobstore/MSSQLDelegate.eea       |   4 +-
 .../impl/jdbcjobstore/PointbaseDelegate.eea   |   2 +-
 .../impl/jdbcjobstore/PostgreSQLDelegate.eea  |   2 +-
 .../SimpleTriggerPersistenceDelegate.eea      |   4 +-
 .../impl/jdbcjobstore/StdJDBCDelegate.eea     |  70 +++++-----
 .../impl/jdbcjobstore/SybaseDelegate.eea      |   4 +-
 .../impl/jdbcjobstore/WebLogicDelegate.eea    |   2 +-
 .../jdbcjobstore/oracle/OracleDelegate.eea    |   2 +-
 .../org/quartz/impl/matchers/AndMatcher.eea   |   2 +-
 .../impl/matchers/EverythingMatcher.eea       |   4 +-
 .../org/quartz/impl/matchers/GroupMatcher.eea |  10 +-
 .../org/quartz/impl/matchers/KeyMatcher.eea   |   2 +-
 .../org/quartz/impl/matchers/NameMatcher.eea  |   8 +-
 .../org/quartz/impl/matchers/NotMatcher.eea   |   2 +-
 .../org/quartz/impl/matchers/OrMatcher.eea    |   2 +-
 .../quartz/impl/triggers/AbstractTrigger.eea  |   8 +-
 .../triggers/CalendarIntervalTriggerImpl.eea  |   6 +-
 .../quartz/impl/triggers/CronTriggerImpl.eea  |   4 +-
 .../triggers/DailyTimeIntervalTriggerImpl.eea |   6 +-
 .../impl/triggers/SimpleTriggerImpl.eea       |   6 +-
 .../ManagementRESTServiceConfiguration.eea    |   2 +-
 .../org/quartz/simpl/RAMJobStore.eea          |  26 ++--
 .../simpl/SimpleInstanceIdGenerator.eea       |   2 +-
 .../org/quartz/simpl/SimpleThreadPool.eea     |   2 +-
 .../org/quartz/simpl/SimpleTimeBroker.eea     |   2 +-
 .../SystemPropertyInstanceIdGenerator.eea     |   2 +-
 .../org/quartz/utils/CircularLossyQueue.eea   |   2 +-
 .../resources/org/quartz/utils/ClassUtils.eea |   2 +-
 .../main/resources/org/quartz/utils/Key.eea   |   2 +-
 .../org/quartz/utils/PropertiesParser.eea     |   2 +-
 .../quartz/utils/counter/CounterConfig.eea    |   2 +-
 .../quartz/utils/counter/CounterManager.eea   |   2 +-
 .../utils/counter/CounterManagerImpl.eea      |   2 +-
 .../counter/sampled/SampledCounterConfig.eea  |   2 +-
 .../sampled/SampledRateCounterConfig.eea      |   2 +-
 .../quartz/xml/XMLSchedulingDataProcessor.eea |   6 +-
 .../src/main/resources/org/slf4j/MDC.eea      |   2 +-
 .../org/slf4j/helpers/BasicMDCAdapter.eea     |   6 +-
 .../org/slf4j/helpers/MessageFormatter.eea    |   6 +-
 .../org/slf4j/helpers/NOPMDCAdapter.eea       |   4 +-
 .../slf4j/helpers/SubstituteLoggerFactory.eea |   4 +-
 .../main/resources/org/slf4j/helpers/Util.eea |   2 +-
 .../src/main/resources/org/slf4j/MDC.eea      |   2 +-
 .../org/slf4j/event/DefaultLoggingEvent.eea   |   2 +-
 .../org/slf4j/event/EventRecordingLogger.eea  |   2 +-
 .../org/slf4j/event/LoggingEvent.eea          |   2 +-
 .../slf4j/event/SubstituteLoggingEvent.eea    |   2 +-
 .../org/slf4j/helpers/BasicMDCAdapter.eea     |   6 +-
 .../org/slf4j/helpers/MessageFormatter.eea    |   6 +-
 .../org/slf4j/helpers/NOPMDCAdapter.eea       |   8 +-
 .../slf4j/helpers/NormalizedParameters.eea    |   6 +-
 .../slf4j/helpers/SubstituteLoggerFactory.eea |   4 +-
 .../helpers/SubstituteServiceProvider.eea     |   2 +-
 .../slf4j/helpers/ThreadLocalMapOfStacks.eea  |   4 +-
 .../main/resources/org/slf4j/helpers/Util.eea |   2 +-
 .../snakeyaml/DumperOptions$ScalarStyle.eea   |   2 +-
 .../yaml/snakeyaml/DumperOptions$Version.eea  |   2 +-
 .../org/yaml/snakeyaml/TypeDescription.eea    |   6 +-
 .../resources/org/yaml/snakeyaml/Yaml.eea     |  10 +-
 .../comments/CommentEventsCollector.eea       |   2 +-
 .../org/yaml/snakeyaml/composer/Composer.eea  |   6 +-
 .../snakeyaml/constructor/BaseConstructor.eea |   8 +-
 .../SafeConstructor$ConstructUndefined.eea    |   2 +-
 .../SafeConstructor$ConstructYamlNull.eea     |   2 +-
 .../SafeConstructor$ConstructYamlOmap.eea     |   2 +-
 .../SafeConstructor$ConstructYamlPairs.eea    |   2 +-
 .../snakeyaml/constructor/SafeConstructor.eea |   2 +-
 .../org/yaml/snakeyaml/error/Mark.eea         |   2 +-
 .../snakeyaml/events/CollectionStartEvent.eea |   2 +-
 .../yaml/snakeyaml/events/CommentEvent.eea    |   2 +-
 .../org/yaml/snakeyaml/events/Event.eea       |   2 +-
 .../org/yaml/snakeyaml/events/NodeEvent.eea   |   2 +-
 .../org/yaml/snakeyaml/events/ScalarEvent.eea |   2 +-
 .../compactnotation/CompactConstructor.eea    |   6 +-
 .../external/biz/base64Coder/Base64Coder.eea  |  10 +-
 .../gdata/util/common/base/PercentEscaper.eea |   2 +-
 .../gdata/util/common/base/UnicodeEscaper.eea |   2 +-
 .../org/yaml/snakeyaml/internal/Logger.eea    |   2 +-
 .../introspector/MissingProperty.eea          |   2 +-
 .../snakeyaml/introspector/PropertyUtils.eea  |   4 +-
 .../snakeyaml/representer/BaseRepresenter.eea |   6 +-
 .../org/yaml/snakeyaml/util/ArrayUtils.eea    |   4 +-
 .../org/yaml/snakeyaml/util/MergeUtils.eea    |   2 +-
 .../org/yaml/snakeyaml/util/UriEncoder.eea    |   2 +-
 .../aop/aspectj/AbstractAspectJAdvice.eea     |   8 +-
 .../aop/aspectj/AspectJAroundAdvice.eea       |   2 +-
 .../MethodInvocationProceedingJoinPoint.eea   |   6 +-
 .../ReflectiveAspectJAdvisorFactory.eea       |   2 +-
 ...terceptorDrivenBeanDefinitionDecorator.eea |   6 +-
 .../aop/config/AdvisorComponentDefinition.eea |   4 +-
 .../aop/config/AspectComponentDefinition.eea  |   4 +-
 .../aop/config/MethodLocatingFactoryBean.eea  |   2 +-
 .../config/PointcutComponentDefinition.eea    |   2 +-
 .../AbstractAdvisingBeanPostProcessor.eea     |   2 +-
 .../AbstractSingletonProxyFactoryBean.eea     |   4 +-
 .../aop/framework/AdvisedSupport.eea          |   2 +-
 .../aop/framework/AopProxyFactory.eea         |   2 +-
 .../aop/framework/DefaultAopProxyFactory.eea  |   2 +-
 .../aop/framework/ProxyCreatorSupport.eea     |   2 +-
 .../aop/framework/ProxyFactoryBean.eea        |   2 +-
 .../autoproxy/AbstractAutoProxyCreator.eea    |   4 +-
 ...tBeanFactoryAwareAdvisingPostProcessor.eea |   2 +-
 .../BeanFactoryAdvisorRetrievalHelper.eea     |   2 +-
 .../AbstractMonitoringInterceptor.eea         |   2 +-
 .../CustomizableTraceInterceptor.eea          |   2 +-
 .../aop/interceptor/DebugInterceptor.eea      |   2 +-
 .../interceptor/ExposeBeanNameAdvisors.eea    |   4 +-
 .../interceptor/SimpleTraceInterceptor.eea    |   2 +-
 .../aop/scope/ScopedProxyUtils.eea            |   4 +-
 .../aop/support/ClassFilters.eea              |   4 +-
 .../aop/support/MethodMatchers.eea            |   4 +-
 .../support/RegexpMethodPointcutAdvisor.eea   |   2 +-
 .../annotation/AnnotationMatchingPointcut.eea |   4 +-
 .../springframework/asm/AnnotationVisitor.eea |   4 +-
 .../org/springframework/asm/Attribute.eea     |   6 +-
 .../org/springframework/asm/ClassReader.eea   |   4 +-
 .../org/springframework/asm/ClassVisitor.eea  |  12 +-
 .../org/springframework/asm/ClassWriter.eea   |  12 +-
 .../org/springframework/asm/FieldVisitor.eea  |   4 +-
 .../org/springframework/asm/MethodVisitor.eea |  14 +-
 .../asm/RecordComponentVisitor.eea            |   4 +-
 .../org/springframework/asm/Type.eea          |  12 +-
 .../org/springframework/asm/TypePath.eea      |   2 +-
 .../AbstractNestablePropertyAccessor.eea      |   2 +-
 .../springframework/beans/BeanWrapperImpl.eea |   4 +-
 .../beans/DirectFieldAccessor.eea             |   4 +-
 .../beans/MethodInvocationException.eea       |   2 +-
 .../beans/MutablePropertyValues.eea           |   2 +-
 .../beans/PropertyAccessorFactory.eea         |   4 +-
 .../beans/PropertyAccessorUtils.eea           |   2 +-
 .../springframework/beans/PropertyMatches.eea |   4 +-
 .../beans/TypeMismatchException.eea           |   2 +-
 .../beans/factory/ObjectProvider.eea          |   4 +-
 .../factory/annotation/InjectionMetadata.eea  |   2 +-
 .../factory/config/AbstractFactoryBean.eea    |   2 +-
 .../config/AutowireCapableBeanFactory.eea     |   4 +-
 .../factory/config/BeanDefinitionHolder.eea   |   4 +-
 .../factory/config/DependencyDescriptor.eea   |   4 +-
 .../beans/factory/config/ListFactoryBean.eea  |   4 +-
 .../beans/factory/config/MapFactoryBean.eea   |   4 +-
 .../factory/config/MethodInvokingBean.eea     |   2 +-
 .../ObjectFactoryCreatingFactoryBean.eea      |   2 +-
 .../factory/config/PropertiesFactoryBean.eea  |   4 +-
 .../config/ProviderCreatingFactoryBean.eea    |   2 +-
 .../config/ServiceLocatorFactoryBean.eea      |   2 +-
 .../beans/factory/config/SetFactoryBean.eea   |   4 +-
 .../factory/config/YamlMapFactoryBean.eea     |   2 +-
 .../beans/factory/config/YamlProcessor.eea    |   4 +-
 .../config/YamlPropertiesFactoryBean.eea      |   2 +-
 .../groovy/GroovyBeanDefinitionReader.eea     |   2 +-
 .../parsing/AbstractComponentDefinition.eea   |   6 +-
 .../beans/factory/parsing/ParseState.eea      |   2 +-
 .../AbstractServiceLoaderBasedFactoryBean.eea |   2 +-
 .../serviceloader/ServiceListFactoryBean.eea  |   2 +-
 .../AbstractAutowireCapableBeanFactory.eea    |  12 +-
 .../support/AbstractBeanDefinition.eea        |   2 +-
 .../factory/support/AbstractBeanFactory.eea   |   4 +-
 .../factory/support/BeanDefinitionBuilder.eea |  16 +--
 .../support/BeanDefinitionReaderUtils.eea     |   4 +-
 .../CglibSubclassingInstantiationStrategy.eea |   4 +-
 .../factory/support/ChildBeanDefinition.eea   |   2 +-
 .../support/DefaultListableBeanFactory.eea    |   4 +-
 .../factory/support/GenericBeanDefinition.eea |   2 +-
 .../beans/factory/support/ManagedList.eea     |   2 +-
 .../beans/factory/support/ManagedMap.eea      |   2 +-
 .../beans/factory/support/ManagedSet.eea      |   2 +-
 .../factory/support/RootBeanDefinition.eea    |   2 +-
 .../support/SimpleInstantiationStrategy.eea   |   6 +-
 .../support/StaticListableBeanFactory.eea     |   4 +-
 .../xml/BeanDefinitionParserDelegate.eea      |  16 +--
 .../DefaultBeanDefinitionDocumentReader.eea   |   2 +-
 .../factory/xml/DefaultDocumentLoader.eea     |   4 +-
 .../factory/xml/XmlBeanDefinitionReader.eea   |   6 +-
 .../ByteArrayPropertyEditor.eea               |   2 +-
 .../CharArrayPropertyEditor.eea               |   2 +-
 .../beans/propertyeditors/CharacterEditor.eea |   2 +-
 .../beans/propertyeditors/CharsetEditor.eea   |   2 +-
 .../propertyeditors/ClassArrayEditor.eea      |   2 +-
 .../beans/propertyeditors/ClassEditor.eea     |   2 +-
 .../beans/propertyeditors/CurrencyEditor.eea  |   2 +-
 .../propertyeditors/CustomBooleanEditor.eea   |   2 +-
 .../CustomCollectionEditor.eea                |   4 +-
 .../propertyeditors/CustomDateEditor.eea      |   2 +-
 .../beans/propertyeditors/CustomMapEditor.eea |   4 +-
 .../propertyeditors/CustomNumberEditor.eea    |   2 +-
 .../beans/propertyeditors/FileEditor.eea      |   2 +-
 .../propertyeditors/InputSourceEditor.eea     |   2 +-
 .../propertyeditors/InputStreamEditor.eea     |   2 +-
 .../beans/propertyeditors/LocaleEditor.eea    |   2 +-
 .../beans/propertyeditors/PathEditor.eea      |   2 +-
 .../beans/propertyeditors/PatternEditor.eea   |   2 +-
 .../beans/propertyeditors/ReaderEditor.eea    |   2 +-
 .../StringArrayPropertyEditor.eea             |   2 +-
 .../propertyeditors/StringTrimmerEditor.eea   |   2 +-
 .../beans/propertyeditors/TimeZoneEditor.eea  |   2 +-
 .../beans/propertyeditors/URIEditor.eea       |   4 +-
 .../beans/propertyeditors/URLEditor.eea       |   2 +-
 .../beans/propertyeditors/UUIDEditor.eea      |   2 +-
 .../beans/propertyeditors/ZoneIdEditor.eea    |   2 +-
 .../ArgumentConvertingMethodInvoker.eea       |   2 +-
 .../beans/support/PagedListHolder.eea         |   2 +-
 .../annotation/ProxyCachingConfiguration.eea  |   6 +-
 .../concurrent/ConcurrentMapCacheManager.eea  |   2 +-
 .../AbstractFallbackCacheOperationSource.eea  |   2 +-
 .../cache/interceptor/CacheAspectSupport.eea  |   4 +-
 .../CacheEvictOperation$Builder.eea           |   2 +-
 .../interceptor/CacheOperation$Builder.eea    |   2 +-
 .../interceptor/CacheProxyFactoryBean.eea     |   2 +-
 .../interceptor/CachePutOperation$Builder.eea |   2 +-
 .../CacheableOperation$Builder.eea            |   2 +-
 .../cglib/beans/BeanCopier$Generator.eea      |   4 +-
 .../cglib/beans/BeanCopier.eea                |   2 +-
 .../cglib/beans/BeanGenerator.eea             |   8 +-
 .../cglib/beans/BeanMap$Generator.eea         |   4 +-
 .../springframework/cglib/beans/BeanMap.eea   |   4 +-
 .../cglib/beans/BulkBean$Generator.eea        |   4 +-
 .../springframework/cglib/beans/BulkBean.eea  |   4 +-
 .../cglib/beans/ImmutableBean$Generator.eea   |   4 +-
 .../cglib/beans/ImmutableBean.eea             |   2 +-
 .../cglib/core/AbstractClassGenerator.eea     |   6 +-
 .../cglib/core/ClassEmitter.eea               |   4 +-
 .../springframework/cglib/core/ClassesKey.eea |   2 +-
 .../cglib/core/CodeEmitter.eea                |   6 +-
 .../cglib/core/CollectionUtils.eea            |   6 +-
 .../cglib/core/DefaultGeneratorStrategy.eea   |   2 +-
 .../cglib/core/DefaultNamingPolicy.eea        |   4 +-
 .../cglib/core/KeyFactory$Generator.eea       |   4 +-
 .../springframework/cglib/core/KeyFactory.eea |  10 +-
 .../cglib/core/MethodWrapper.eea              |   4 +-
 .../cglib/core/ReflectUtils.eea               |  12 +-
 .../cglib/core/SpringNamingPolicy.eea         |   2 +-
 .../springframework/cglib/core/TypeUtils.eea  |  16 +--
 .../springframework/cglib/proxy/Enhancer.eea  |  18 +--
 .../cglib/proxy/InterfaceMaker.eea            |   6 +-
 .../cglib/proxy/MethodProxy.eea               |   2 +-
 .../cglib/proxy/Mixin$Generator.eea           |   4 +-
 .../org/springframework/cglib/proxy/Mixin.eea |   8 +-
 .../reflect/ConstructorDelegate$Generator.eea |   4 +-
 .../cglib/reflect/ConstructorDelegate.eea     |   2 +-
 .../cglib/reflect/FastClass$Generator.eea     |   4 +-
 .../cglib/reflect/FastClass.eea               |  10 +-
 .../reflect/MethodDelegate$Generator.eea      |   4 +-
 .../cglib/reflect/MethodDelegate.eea          |   4 +-
 .../reflect/MulticastDelegate$Generator.eea   |   4 +-
 .../cglib/reflect/MulticastDelegate.eea       |   4 +-
 .../AbstractClassFilterTransformer.eea        |   6 +-
 .../cglib/transform/AbstractClassLoader.eea   |   4 +-
 .../cglib/transform/AbstractTransformTask.eea |   2 +-
 .../cglib/transform/AnnotationVisitorTee.eea  |   4 +-
 .../cglib/transform/ClassTransformerChain.eea |   2 +-
 .../cglib/transform/ClassVisitorTee.eea       |   8 +-
 .../cglib/transform/FieldVisitorTee.eea       |   4 +-
 .../transform/MethodFilterTransformer.eea     |   2 +-
 .../cglib/transform/MethodVisitorTee.eea      |  14 +-
 .../transform/TransformingClassLoader.eea     |   2 +-
 .../impl/InterceptFieldTransformer.eea        |   2 +-
 .../impl/UndeclaredThrowableStrategy.eea      |   2 +-
 .../cglib/util/ParallelSorter$Generator.eea   |   4 +-
 .../cglib/util/ParallelSorter.eea             |   2 +-
 .../cglib/util/StringSwitcher$Generator.eea   |   2 +-
 .../cglib/util/StringSwitcher.eea             |   2 +-
 .../annotation/AdviceModeImportSelector.eea   |   2 +-
 .../AnnotationScopeMetadataResolver.eea       |   2 +-
 .../ClassPathBeanDefinitionScanner.eea        |   2 +-
 .../ComponentScanBeanDefinitionParser.eea     |   4 +-
 .../Jsr330ScopeMetadataResolver.eea           |   2 +-
 .../LoadTimeWeavingConfiguration.eea          |   2 +-
 .../annotation/MBeanExportConfiguration.eea   |   2 +-
 .../context/annotation/TypeFilterUtils.eea    |   2 +-
 .../ApplicationListenerMethodAdapter.eea      |   6 +-
 .../event/DefaultEventListenerFactory.eea     |   2 +-
 .../context/event/EventListenerFactory.eea    |   2 +-
 .../GenericApplicationListenerAdapter.eea     |   2 +-
 .../event/SmartApplicationListener.eea        |   2 +-
 .../context/event/SourceFilteringListener.eea |   2 +-
 .../BeanExpressionContextAccessor.eea         |   2 +-
 .../expression/BeanFactoryAccessor.eea        |   2 +-
 .../expression/EnvironmentAccessor.eea        |   2 +-
 .../context/expression/MapAccessor.eea        |   4 +-
 .../support/AbstractApplicationContext.eea    |   6 +-
 .../context/support/AbstractMessageSource.eea |   2 +-
 .../AbstractRefreshableApplicationContext.eea |   2 +-
 .../support/ApplicationObjectSupport.eea      |   2 +-
 .../support/ConversionServiceFactoryBean.eea  |   4 +-
 .../support/DefaultLifecycleProcessor.eea     |   2 +-
 .../DefaultMessageSourceResolvable.eea        |   2 +-
 .../FileSystemXmlApplicationContext.eea       |   2 +-
 .../context/support/LiveBeansView.eea         |   2 +-
 .../context/support/MessageSourceAccessor.eea |   8 +-
 .../context/support/MessageSourceSupport.eea  |   4 +-
 .../ReloadableResourceBundleMessageSource.eea |   2 +-
 .../support/ResourceBundleMessageSource.eea   |   4 +-
 .../core/CollectionFactory.eea                |  18 +--
 .../core/ConfigurableObjectInputStream.eea    |   2 +-
 .../org/springframework/core/Constants.eea    |  12 +-
 .../org/springframework/core/Conventions.eea  |   4 +-
 .../core/GenericTypeResolver.eea              |   2 +-
 .../core/MethodIntrospector.eea               |   2 +-
 .../springframework/core/MethodParameter.eea  |   4 +-
 .../core/ParameterizedTypeReference.eea       |   2 +-
 .../core/ReactiveAdapterRegistry.eea          |   2 +-
 .../springframework/core/ResolvableType.eea   |  10 +-
 .../springframework/core/SmartClassLoader.eea |   2 +-
 .../core/annotation/AnnotatedElementUtils.eea |   2 +-
 .../core/annotation/AnnotationFilter.eea      |   2 +-
 .../annotation/MergedAnnotationPredicates.eea |   4 +-
 .../core/annotation/RepeatableContainers.eea  |   4 +-
 .../SynthesizingMethodParameter.eea           |   4 +-
 .../core/codec/AbstractDataBufferDecoder.eea  |   2 +-
 .../core/codec/AbstractDecoder.eea            |   2 +-
 .../core/codec/ByteArrayDecoder.eea           |   2 +-
 .../springframework/core/codec/Encoder.eea    |   2 +-
 .../org/springframework/core/codec/Hints.eea  |   2 +-
 .../core/codec/ResourceDecoder.eea            |   2 +-
 .../core/codec/StringDecoder.eea              |   2 +-
 .../core/convert/TypeDescriptor.eea           |   2 +-
 .../ConvertingPropertyEditorAdapter.eea       |   2 +-
 .../support/DefaultConversionService.eea      |   2 +-
 .../core/env/AbstractEnvironment.eea          |   2 +-
 .../core/env/AbstractPropertyResolver.eea     |   2 +-
 .../core/env/PropertySource.eea               |   2 +-
 .../core/io/AbstractFileResolvingResource.eea |   2 +-
 .../core/io/AbstractResource.eea              |   6 +-
 .../core/io/ByteArrayResource.eea             |   4 +-
 .../core/io/ClassPathResource.eea             |   6 +-
 .../core/io/ClassRelativeResourceLoader.eea   |   2 +-
 ...esourceLoader$ClassPathContextResource.eea |   2 +-
 .../core/io/DefaultResourceLoader.eea         |   2 +-
 .../core/io/DescriptiveResource.eea           |   2 +-
 .../core/io/FileSystemResource.eea            |   8 +-
 .../core/io/FileSystemResourceLoader.eea      |   2 +-
 .../core/io/FileUrlResource.eea               |   4 +-
 .../core/io/InputStreamResource.eea           |   2 +-
 .../springframework/core/io/PathResource.eea  |  10 +-
 .../org/springframework/core/io/Resource.eea  |   2 +-
 .../core/io/ResourceEditor.eea                |   2 +-
 .../springframework/core/io/UrlResource.eea   |  10 +-
 .../springframework/core/io/VfsResource.eea   |   8 +-
 .../core/io/buffer/DataBufferUtils.eea        |   2 +-
 .../core/io/buffer/DefaultDataBuffer.eea      |  10 +-
 .../core/io/buffer/LimitedDataBufferList.eea  |   4 +-
 .../core/io/buffer/NettyDataBuffer.eea        |  10 +-
 .../core/io/buffer/NettyDataBufferFactory.eea |  10 +-
 .../support/DefaultPropertySourceFactory.eea  |   2 +-
 .../PathMatchingResourcePatternResolver.eea   |   6 +-
 .../io/support/PropertiesLoaderSupport.eea    |   2 +-
 .../core/io/support/PropertiesLoaderUtils.eea |   6 +-
 .../core/io/support/PropertySourceFactory.eea |   2 +-
 .../core/io/support/SpringFactoriesLoader.eea |   2 +-
 .../core/log/LogDelegateFactory.eea           |   2 +-
 .../core/log/LogFormatUtils.eea               |   2 +-
 .../springframework/core/log/LogMessage.eea   |  12 +-
 .../jfr/FlightRecorderApplicationStartup.eea  |   2 +-
 .../core/task/SimpleAsyncTaskExecutor.eea     |   8 +-
 .../core/task/support/TaskExecutorAdapter.eea |   4 +-
 .../core/type/StandardClassMetadata.eea       |   2 +-
 .../AnnotationMetadataReadingVisitor.eea      |   6 +-
 .../CachingMetadataReaderFactory.eea          |   2 +-
 .../MethodMetadataReadingVisitor.eea          |   4 +-
 .../SimpleMetadataReaderFactory.eea           |   2 +-
 ...istenceExceptionTranslationInterceptor.eea |   2 +-
 .../access/AbstractSlsbInvokerInterceptor.eea |   2 +-
 .../common/CompositeStringExpression.eea      |   8 +-
 .../expression/spel/CodeFlow.eea              |  10 +-
 .../expression/spel/ExpressionState.eea       |   2 +-
 .../expression/spel/SpelMessage.eea           |   2 +-
 .../expression/spel/ast/Assign.eea            |   2 +-
 .../expression/spel/ast/BeanReference.eea     |   4 +-
 .../spel/ast/CompoundExpression.eea           |   6 +-
 .../spel/ast/ConstructorReference.eea         |   2 +-
 .../expression/spel/ast/Elvis.eea             |   2 +-
 .../expression/spel/ast/FunctionReference.eea |   2 +-
 .../expression/spel/ast/Identifier.eea        |   2 +-
 .../expression/spel/ast/Indexer.eea           |   6 +-
 .../expression/spel/ast/InlineList.eea        |   2 +-
 .../expression/spel/ast/InlineMap.eea         |   2 +-
 .../expression/spel/ast/Literal.eea           |   8 +-
 .../expression/spel/ast/MethodReference.eea   |   4 +-
 .../expression/spel/ast/OpDec.eea             |   4 +-
 .../expression/spel/ast/OpInc.eea             |   4 +-
 .../expression/spel/ast/OpMinus.eea           |   2 +-
 .../expression/spel/ast/OpPlus.eea            |   2 +-
 .../expression/spel/ast/Operator.eea          |   2 +-
 .../expression/spel/ast/OperatorNot.eea       |   2 +-
 .../expression/spel/ast/Projection.eea        |   4 +-
 .../spel/ast/PropertyOrFieldReference.eea     |   4 +-
 .../spel/ast/QualifiedIdentifier.eea          |   2 +-
 .../expression/spel/ast/Selection.eea         |   4 +-
 .../expression/spel/ast/SpelNodeImpl.eea      |   4 +-
 .../expression/spel/ast/Ternary.eea           |   2 +-
 .../expression/spel/ast/TypeReference.eea     |   4 +-
 .../expression/spel/ast/VariableReference.eea |   6 +-
 .../expression/spel/standard/SpelCompiler.eea |   2 +-
 .../support/DataBindingMethodResolver.eea     |   2 +-
 .../support/ReflectiveConstructorExecutor.eea |   2 +-
 ...opertyAccessor$OptimalPropertyAccessor.eea |   2 +-
 .../support/ReflectivePropertyAccessor.eea    |   4 +-
 .../spel/support/SimpleEvaluationContext.eea  |   4 +-
 .../support/StandardOperatorOverloader.eea    |   2 +-
 ...teTimeFormatAnnotationFormatterFactory.eea |   2 +-
 .../joda/DateTimeFormatterFactory.eea         |   4 +-
 ...teTimeFormatAnnotationFormatterFactory.eea |   4 +-
 .../standard/DateTimeFormatterFactory.eea     |   4 +-
 .../datetime/standard/InstantFormatter.eea    |   2 +-
 ...teTimeFormatAnnotationFormatterFactory.eea |   2 +-
 .../FormatterPropertyEditorAdapter.eea        |   2 +-
 ...FormattingConversionServiceFactoryBean.eea |   2 +-
 .../org/springframework/http/CacheControl.eea |   8 +-
 .../http/ContentDisposition.eea               |   6 +-
 .../org/springframework/http/ETag.eea         |   4 +-
 .../org/springframework/http/HttpHeaders.eea  |  10 +-
 .../org/springframework/http/HttpRange.eea    |   8 +-
 .../org/springframework/http/MediaType.eea    |   4 +-
 .../springframework/http/MediaTypeEditor.eea  |   2 +-
 .../springframework/http/RequestEntity.eea    |   6 +-
 .../springframework/http/ResponseEntity.eea   |   6 +-
 ...bstractClientHttpRequestFactoryWrapper.eea |   4 +-
 .../client/AsyncClientHttpRequestFactory.eea  |   2 +-
 .../BufferingClientHttpRequestFactory.eea     |   2 +-
 .../http/client/ClientHttpRequestFactory.eea  |   2 +-
 ...omponentsAsyncClientHttpRequestFactory.eea |   2 +-
 ...HttpComponentsClientHttpRequestFactory.eea |   4 +-
 ...erceptingAsyncClientHttpRequestFactory.eea |   2 +-
 .../InterceptingClientHttpRequestFactory.eea  |   2 +-
 .../http/client/MultipartBodyBuilder.eea      |   4 +-
 .../client/Netty4ClientHttpRequestFactory.eea |   4 +-
 .../OkHttp3ClientHttpRequestFactory.eea       |   4 +-
 .../client/SimpleClientHttpRequestFactory.eea |   4 +-
 .../http/client/support/AsyncHttpAccessor.eea |   2 +-
 .../http/client/support/HttpAccessor.eea      |   2 +-
 .../http/codec/ClientCodecConfigurer.eea      |   2 +-
 .../http/codec/FormHttpMessageWriter.eea      |   2 +-
 .../http/codec/ServerCodecConfigurer.eea      |   2 +-
 .../http/codec/ServerSentEvent.eea            |   4 +-
 .../http/codec/cbor/Jackson2CborDecoder.eea   |   2 +-
 .../http/codec/cbor/Jackson2CborEncoder.eea   |   2 +-
 .../http/codec/json/Jackson2CodecSupport.eea  |   2 +-
 .../multipart/MultipartParser$BodyToken.eea   |   2 +-
 .../MultipartParser$HeadersToken.eea          |   2 +-
 .../multipart/MultipartWriterSupport.eea      |   2 +-
 .../support/DefaultClientCodecConfigurer.eea  |   4 +-
 .../support/DefaultServerCodecConfigurer.eea  |   4 +-
 .../converter/FormHttpMessageConverter.eea    |   4 +-
 .../ResourceHttpMessageConverter.eea          |   2 +-
 .../ResourceRegionHttpMessageConverter.eea    |   4 +-
 .../converter/StringHttpMessageConverter.eea  |   2 +-
 .../AbstractJackson2HttpMessageConverter.eea  |   2 +-
 .../http/converter/json/GsonBuilderUtils.eea  |   2 +-
 .../json/Jackson2ObjectMapperBuilder.eea      |   2 +-
 .../xml/AbstractJaxb2HttpMessageConverter.eea |   4 +-
 .../Jaxb2CollectionHttpMessageConverter.eea   |   6 +-
 .../http/server/PathContainer$Options.eea     |   2 +-
 .../http/server/RequestPath.eea               |   2 +-
 .../AbstractListenerServerHttpResponse.eea    |   2 +-
 .../AbstractListenerWriteFlushProcessor.eea   |   2 +-
 .../reactive/AbstractServerHttpRequest.eea    |   2 +-
 .../reactive/JettyHttpHandlerAdapter.eea      |   4 +-
 .../server/reactive/ServerHttpRequest.eea     |   2 +-
 .../reactive/ServletHttpHandlerAdapter.eea    |   6 +-
 .../reactive/TomcatHttpHandlerAdapter.eea     |   4 +-
 .../InstrumentationLoadTimeWeaver.eea         |   2 +-
 .../classloading/ReflectiveLoadTimeWeaver.eea |   2 +-
 .../classloading/SimpleLoadTimeWeaver.eea     |   2 +-
 .../jboss/JBossLoadTimeWeaver.eea             |   2 +-
 .../connection/CciLocalTransactionManager.eea |   4 +-
 .../connection/NotSupportedRecordFactory.eea  |   4 +-
 .../connection/SingleConnectionFactory.eea    |   2 +-
 .../jca/cci/core/CciTemplate.eea              |   8 +-
 .../jca/cci/core/RecordCreator.eea            |   2 +-
 .../jca/cci/core/support/CciDaoSupport.eea    |   2 +-
 .../cci/object/MappingCommAreaOperation.eea   |   2 +-
 ...ppingRecordOperation$RecordCreatorImpl.eea |   2 +-
 .../jca/cci/object/MappingRecordOperation.eea |   2 +-
 .../context/SpringContextResourceAdapter.eea  |   4 +-
 .../AbstractMessageEndpointFactory.eea        |   6 +-
 .../GenericMessageEndpointFactory.eea         |   4 +-
 .../support/ResourceAdapterFactoryBean.eea    |   2 +-
 .../jca/support/SimpleBootstrapContext.eea    |   2 +-
 .../jca/work/WorkManagerTaskExecutor.eea      |  10 +-
 .../config/SortedResourcesFactoryBean.eea     |   4 +-
 .../jdbc/core/BeanPropertyRowMapper.eea       |   4 +-
 .../jdbc/core/CallableStatementCreator.eea    |   2 +-
 .../core/CallableStatementCreatorFactory.eea  |   2 +-
 .../jdbc/core/ColumnMapRowMapper.eea          |   2 +-
 .../jdbc/core/DataClassRowMapper.eea          |   2 +-
 .../jdbc/core/JdbcTemplate.eea                |  14 +-
 .../jdbc/core/ParameterMapper.eea             |   2 +-
 .../jdbc/core/PreparedStatementCreator.eea    |   2 +-
 .../jdbc/core/RowMapperResultSetExtractor.eea |   2 +-
 .../jdbc/core/SingleColumnRowMapper.eea       |   2 +-
 .../jdbc/core/SqlRowSetResultSetExtractor.eea |   2 +-
 .../core/metadata/CallMetaDataContext.eea     |  10 +-
 .../core/metadata/CallMetaDataProvider.eea    |   6 +-
 .../metadata/CallMetaDataProviderFactory.eea  |   2 +-
 .../metadata/GenericCallMetaDataProvider.eea  |   6 +-
 .../metadata/OracleCallMetaDataProvider.eea   |   2 +-
 .../metadata/PostgresCallMetaDataProvider.eea |   2 +-
 .../core/metadata/TableMetaDataContext.eea    |  10 +-
 .../metadata/TableMetaDataProviderFactory.eea |   2 +-
 .../namedparam/NamedParameterJdbcTemplate.eea |   2 +-
 .../core/namedparam/NamedParameterUtils.eea   |   8 +-
 .../namedparam/SqlParameterSourceUtils.eea    |   8 +-
 .../core/support/AbstractSqlTypeValue.eea     |   2 +-
 .../jdbc/core/support/JdbcDaoSupport.eea      |   2 +-
 .../jdbc/datasource/AbstractDataSource.eea    |   2 +-
 .../jdbc/datasource/ConnectionHolder.eea      |   2 +-
 .../DataSourceTransactionManager.eea          |   6 +-
 .../JdbcTransactionObjectSupport.eea          |   2 +-
 .../datasource/WebSphereDataSourceAdapter.eea |   2 +-
 .../embedded/EmbeddedDatabaseFactory.eea      |   2 +-
 .../embedded/EmbeddedDatabaseFactoryBean.eea  |   2 +-
 .../embedded/OutputStreamFactory.eea          |   2 +-
 .../jdbc/datasource/init/ScriptUtils.eea      |   2 +-
 .../jdbc/object/BatchSqlUpdate.eea            |   2 +-
 .../object/MappingSqlQueryWithParameters.eea  |   2 +-
 .../jdbc/object/UpdatableSqlQuery.eea         |   2 +-
 ...AbstractFallbackSQLExceptionTranslator.eea |   2 +-
 .../jdbc/support/JdbcTransactionManager.eea   |   2 +-
 .../jdbc/support/JdbcUtils.eea                |   2 +-
 .../jdbc/support/SQLErrorCodesFactory.eea     |   2 +-
 .../AbstractDataFieldMaxValueIncrementer.eea  |   2 +-
 ...tractIdentityColumnMaxValueIncrementer.eea |   2 +-
 ...B2MainframeSequenceMaxValueIncrementer.eea |   2 +-
 .../incrementer/Db2LuwMaxValueIncrementer.eea |   2 +-
 .../Db2MainframeMaxValueIncrementer.eea       |   2 +-
 .../incrementer/DerbyMaxValueIncrementer.eea  |   4 +-
 .../H2SequenceMaxValueIncrementer.eea         |   2 +-
 .../HanaSequenceMaxValueIncrementer.eea       |   2 +-
 .../incrementer/HsqlMaxValueIncrementer.eea   |   4 +-
 .../HsqlSequenceMaxValueIncrementer.eea       |   2 +-
 .../OracleSequenceMaxValueIncrementer.eea     |   2 +-
 .../PostgresSequenceMaxValueIncrementer.eea   |   2 +-
 .../SqlServerMaxValueIncrementer.eea          |   4 +-
 .../SybaseAnywhereMaxValueIncrementer.eea     |   2 +-
 .../incrementer/SybaseMaxValueIncrementer.eea |   4 +-
 .../jdbc/support/lob/DefaultLobHandler.eea    |   2 +-
 .../jdbc/support/xml/Jdbc4SqlXmlHandler.eea   |  10 +-
 .../jmx/export/MBeanExporter.eea              |   4 +-
 .../jmx/export/SpringModelMBean.eea           |   4 +-
 ...AbstractConfigurableMBeanInfoAssembler.eea |   2 +-
 .../assembler/AbstractMBeanInfoAssembler.eea  |   6 +-
 .../AbstractReflectiveMBeanInfoAssembler.eea  |   4 +-
 .../assembler/MetadataMBeanInfoAssembler.eea  |   6 +-
 .../jmx/export/metadata/JmxMetadataUtils.eea  |   2 +-
 .../support/ConnectorServerFactoryBean.eea    |   2 +-
 .../springframework/jmx/support/JmxUtils.eea  |   2 +-
 .../MBeanServerConnectionFactoryBean.eea      |   2 +-
 .../jmx/support/MBeanServerFactoryBean.eea    |   4 +-
 .../WebSphereMBeanServerFactoryBean.eea       |   2 +-
 .../jndi/JndiLocatorDelegate.eea              |   2 +-
 .../jndi/JndiLocatorSupport.eea               |   2 +-
 .../jndi/JndiObjectFactoryBean.eea            |   2 +-
 .../org/springframework/jndi/JndiTemplate.eea |   2 +-
 .../jndi/support/SimpleJndiBeanFactory.eea    |   6 +-
 .../messaging/MessageHeaders.eea              |   4 +-
 .../handler/CompositeMessageCondition.eea     |   4 +-
 .../DestinationPatternsMessageCondition.eea   |   4 +-
 .../HandlerMethod$HandlerMethodParameter.eea  |   2 +-
 .../messaging/handler/HandlerMethod.eea       |  10 +-
 ...stractNamedValueMethodArgumentResolver.eea |   2 +-
 ...tinationVariableMethodArgumentResolver.eea |   2 +-
 .../reactive/HeaderMethodArgumentResolver.eea |   2 +-
 .../reactive/MessageMappingMessageHandler.eea |   6 +-
 ...stractNamedValueMethodArgumentResolver.eea |   2 +-
 .../DefaultMessageHandlerMethodFactory.eea    |   4 +-
 ...tinationVariableMethodArgumentResolver.eea |   2 +-
 .../support/HeaderMethodArgumentResolver.eea  |   2 +-
 .../support/MessageHandlerMethodFactory.eea   |   2 +-
 ...AbstractExceptionHandlerMethodResolver.eea |   2 +-
 .../AbstractMethodMessageHandler.eea          |   4 +-
 .../reactive/AbstractMethodMessageHandler.eea |   4 +-
 .../rsocket/DefaultMetadataExtractor.eea      |   2 +-
 .../messaging/rsocket/PayloadUtils.eea        |   4 +-
 .../messaging/rsocket/RSocketRequester.eea    |   4 +-
 .../messaging/rsocket/RSocketStrategies.eea   |   6 +-
 .../RSocketFrameTypeMessageCondition.eea      |   4 +-
 .../support/RSocketMessageHandler.eea         |   2 +-
 .../messaging/simp/SimpAttributes.eea         |   2 +-
 .../simp/SimpMessageHeaderAccessor.eea        |  12 +-
 .../simp/SimpMessageTypeMessageCondition.eea  |   2 +-
 .../SimpAnnotationMethodMessageHandler.eea    |   8 +-
 .../AbstractMessageBrokerConfiguration.eea    |  26 ++--
 .../simp/config/SimpleBrokerRegistration.eea  |   2 +-
 .../config/StompBrokerRelayRegistration.eea   |   2 +-
 .../simp/stomp/DefaultStompSession.eea        |   6 +-
 .../stomp/StompBrokerRelayMessageHandler.eea  |   2 +-
 .../simp/stomp/StompClientSupport.eea         |   4 +-
 .../messaging/simp/stomp/StompDecoder.eea     |   2 +-
 .../simp/stomp/StompHeaderAccessor.eea        |  14 +-
 .../simp/stomp/StompSessionHandlerAdapter.eea |   2 +-
 .../simp/user/MultiServerUserRegistry.eea     |   4 +-
 .../support/AbstractHeaderMapper.eea          |   4 +-
 .../messaging/support/MessageBuilder.eea      |   6 +-
 .../support/MessageHeaderAccessor.eea         |  14 +-
 .../tcp/reactor/ReactorNettyTcpClient.eea     |   2 +-
 .../tcp/reactor/ReactorNettyTcpConnection.eea |   2 +-
 .../client/MockAsyncClientHttpRequest.eea     |   2 +-
 .../http/client/MockClientHttpResponse.eea    |   2 +-
 .../server/reactive/MockServerHttpRequest.eea |   6 +-
 .../reactive/MockServerHttpResponse.eea       |   2 +-
 .../mock/jndi/SimpleNamingContext.eea         |  24 ++--
 .../mock/jndi/SimpleNamingContextBuilder.eea  |   4 +-
 .../mock/web/MockAsyncContext.eea             |   2 +-
 .../mock/web/MockBodyContent.eea              |   2 +-
 .../springframework/mock/web/MockCookie.eea   |   2 +-
 .../mock/web/MockExpressionEvaluator.eea      |   2 +-
 .../mock/web/MockHttpServletRequest.eea       |   6 +-
 .../mock/web/MockHttpSession.eea              |   4 +-
 .../mock/web/MockMultipartFile.eea            |   2 +-
 .../web/MockMultipartHttpServletRequest.eea   |   4 +-
 .../mock/web/MockPageContext.eea              |   2 +-
 .../org/springframework/mock/web/MockPart.eea |   2 +-
 .../mock/web/MockServletContext.eea           |  30 ++---
 .../function/server/MockServerRequest.eea     |   2 +-
 .../mock/web/server/MockServerWebExchange.eea |   4 +-
 .../basic/FailingInstantiator.eea             |   2 +-
 .../instantiator/basic/NullInstantiator.eea   |   2 +-
 .../instantiator/util/ClassUtils.eea          |   4 +-
 .../strategy/PlatformDescription.eea          |   2 +-
 .../SerializingInstantiatorStrategy.eea       |   2 +-
 .../strategy/StdInstantiatorStrategy.eea      |   2 +-
 .../orm/hibernate5/HibernateTemplate.eea      |   2 +-
 .../HibernateTransactionManager.eea           |   4 +-
 .../support/HibernateDaoSupport.eea           |   2 +-
 .../support/OpenSessionInViewInterceptor.eea  |   2 +-
 .../jpa/AbstractEntityManagerFactoryBean.eea  |   8 +-
 .../orm/jpa/EntityManagerFactoryAccessor.eea  |   2 +-
 .../orm/jpa/EntityManagerFactoryInfo.eea      |   2 +-
 .../orm/jpa/ExtendedEntityManagerCreator.eea  |  12 +-
 .../orm/jpa/JpaTransactionManager.eea         |   6 +-
 .../orm/jpa/JpaVendorAdapter.eea              |   4 +-
 ...LocalContainerEntityManagerFactoryBean.eea |   2 +-
 .../orm/jpa/LocalEntityManagerFactoryBean.eea |   2 +-
 .../orm/jpa/SharedEntityManagerCreator.eea    |  10 +-
 .../MutablePersistenceUnitInfo.eea            |   2 +-
 .../support/OpenEntityManagerInViewFilter.eea |   2 +-
 .../OpenEntityManagerInViewInterceptor.eea    |   2 +-
 .../jpa/support/SharedEntityManagerBean.eea   |   2 +-
 .../jpa/vendor/AbstractJpaVendorAdapter.eea   |   4 +-
 .../vendor/EclipseLinkJpaVendorAdapter.eea    |   4 +-
 .../jpa/vendor/HibernateJpaVendorAdapter.eea  |   4 +-
 .../oxm/jaxb/Jaxb2Marshaller.eea              |   6 +-
 .../oxm/jibx/JibxMarshaller.eea               |   6 +-
 .../oxm/support/AbstractMarshaller.eea        |   6 +-
 .../oxm/support/SaxResourceUtils.eea          |   2 +-
 .../oxm/xstream/CatchAllConverter.eea         |   2 +-
 .../oxm/xstream/XStreamMarshaller.eea         |   4 +-
 .../caucho/HessianClientInterceptor.eea       |   4 +-
 .../AbstractHttpInvokerRequestExecutor.eea    |   2 +-
 ...tpComponentsHttpInvokerRequestExecutor.eea |   2 +-
 .../jaxws/AbstractJaxWsServiceExporter.eea    |   2 +-
 .../jaxws/LocalJaxWsServiceFactory.eea        |   4 +-
 .../jaxws/LocalJaxWsServiceFactoryBean.eea    |   2 +-
 .../SimpleHttpServerJaxWsServiceExporter.eea  |   2 +-
 .../jaxws/SimpleJaxWsServiceExporter.eea      |   2 +-
 .../rmi/CodebaseAwareObjectInputStream.eea    |   2 +-
 .../remoting/rmi/JndiRmiClientInterceptor.eea |   2 +-
 .../RemoteInvocationSerializingExporter.eea   |   4 +-
 .../rmi/RmiClientInterceptorUtils.eea         |   2 +-
 .../remoting/rmi/RmiRegistryFactoryBean.eea   |   2 +-
 .../DefaultRemoteInvocationFactory.eea        |   2 +-
 .../support/RemoteInvocationBasedAccessor.eea |   2 +-
 .../support/RemoteInvocationBasedExporter.eea |   2 +-
 .../support/RemoteInvocationFactory.eea       |   2 +-
 .../support/SimpleHttpServerFactoryBean.eea   |   2 +-
 .../annotation/AsyncAnnotationAdvisor.eea     |   2 +-
 .../scheduling/annotation/AsyncResult.eea     |   4 +-
 .../annotation/ProxyAsyncConfiguration.eea    |   2 +-
 .../ScheduledAnnotationBeanPostProcessor.eea  |   4 +-
 .../annotation/SchedulingConfiguration.eea    |   2 +-
 .../ScheduledExecutorFactoryBean.eea          |   6 +-
 .../ThreadPoolExecutorFactoryBean.eea         |   6 +-
 .../concurrent/ThreadPoolTaskExecutor.eea     |   6 +-
 .../concurrent/ThreadPoolTaskScheduler.eea    |   6 +-
 .../config/TaskExecutorFactoryBean.eea        |   2 +-
 .../scheduling/support/CronExpression.eea     |   2 +-
 .../scheduling/support/CronTrigger.eea        |   2 +-
 .../support/MethodInvokingRunnable.eea        |   2 +-
 .../scripting/bsh/BshScriptUtils.eea          |   6 +-
 .../scripting/config/LangNamespaceUtils.eea   |   2 +-
 .../scripting/groovy/GroovyScriptFactory.eea  |   2 +-
 .../support/ScriptFactoryPostProcessor.eea    |  12 +-
 .../context/MergedContextConfiguration.eea    |   2 +-
 ...ationUtils$UntypedAnnotationDescriptor.eea |   2 +-
 .../junit4/SpringJUnit4ClassRunner.eea        |  18 +--
 .../AbstractDelegatingSmartContextLoader.eea  |   4 +-
 .../support/AbstractGenericContextLoader.eea  |   4 +-
 .../AbstractTestContextBootstrapper.eea       |   4 +-
 .../support/AnnotationConfigContextLoader.eea |   8 +-
 .../DefaultTestContextBootstrapper.eea        |   2 +-
 .../support/GenericGroovyXmlContextLoader.eea |   2 +-
 .../GenericPropertiesContextLoader.eea        |   4 +-
 .../support/GenericXmlContextLoader.eea       |   4 +-
 .../support/TestPropertySourceUtils.eea       |   2 +-
 .../TestContextTransactionUtils.eea           |   2 +-
 .../context/util/TestContextResourceUtils.eea |   2 +-
 .../web/AbstractGenericWebContextLoader.eea   |   4 +-
 .../web/AnnotationConfigWebContextLoader.eea  |   6 +-
 .../web/GenericGroovyXmlWebContextLoader.eea  |   2 +-
 .../web/GenericXmlWebContextLoader.eea        |   2 +-
 .../web/WebTestContextBootstrapper.eea        |   2 +-
 ...ationUtils$UntypedAnnotationDescriptor.eea |   2 +-
 .../AbstractRequestExpectationManager.eea     |   8 +-
 .../web/client/DefaultRequestExpectation.eea  |   2 +-
 .../test/web/client/ExpectedCount.eea         |   6 +-
 .../MockMvcClientHttpRequestFactory.eea       |   4 +-
 .../test/web/client/MockRestServiceServer.eea |  12 +-
 .../test/web/client/ResponseCreator.eea       |   2 +-
 .../SimpleRequestExpectationManager.eea       |   2 +-
 .../UnorderedRequestExpectationManager.eea    |   2 +-
 .../client/match/ContentRequestMatchers.eea   |   6 +-
 .../client/match/JsonPathRequestMatchers.eea  |  28 ++--
 .../client/match/MockRestRequestMatchers.eea  |   8 +-
 .../response/DefaultResponseCreator.eea       |   2 +-
 .../response/MockRestResponseCreators.eea     |  14 +-
 .../web/reactive/server/WebTestClient.eea     |  12 +-
 .../test/web/servlet/MockMvc.eea              |   2 +-
 .../web/servlet/MockMvcBuilderSupport.eea     |   4 +-
 .../servlet/client/MockMvcWebTestClient.eea   |   6 +-
 .../htmlunit/MockMvcWebClientBuilder.eea      |   6 +-
 .../MockMvcWebConnectionBuilderSupport.eea    |   2 +-
 .../MockMvcHtmlUnitDriverBuilder.eea          |   6 +-
 .../request/MockHttpServletRequestBuilder.eea |   2 +-
 ...MockMultipartHttpServletRequestBuilder.eea |   2 +-
 .../request/MockMvcRequestBuilders.eea        |  46 +++----
 .../servlet/result/MockMvcResultHandlers.eea  |   2 +-
 .../servlet/result/MockMvcResultMatchers.eea  |  24 ++--
 .../servlet/result/PrintingResultHandler.eea  |   6 +-
 .../web/servlet/setup/MockMvcBuilders.eea     |   4 +-
 .../setup/SharedHttpSessionConfigurer.eea     |   2 +-
 .../setup/StandaloneMockMvcBuilder.eea        |   2 +-
 .../HeuristicCompletionException.eea          |   2 +-
 .../transaction/SavepointManager.eea          |   2 +-
 ...ractTransactionManagementConfiguration.eea |   2 +-
 .../Ejb3TransactionAnnotationParser.eea       |   2 +-
 .../JtaTransactionAnnotationParser.eea        |   2 +-
 ...roxyTransactionManagementConfiguration.eea |   6 +-
 .../SpringTransactionAnnotationParser.eea     |   2 +-
 ...TransactionManagerBeanDefinitionParser.eea |   2 +-
 .../TransactionalApplicationListener.eea      |   2 +-
 ...ransactionalApplicationListenerAdapter.eea |   2 +-
 .../TransactionalEventListenerFactory.eea     |   2 +-
 ...ractFallbackTransactionAttributeSource.eea |   2 +-
 .../interceptor/TransactionAspectSupport.eea  |   4 +-
 .../TransactionProxyFactoryBean.eea           |   2 +-
 .../transaction/jta/JtaTransactionManager.eea |   6 +-
 .../jta/SimpleTransactionFactory.eea          |   2 +-
 .../transaction/jta/TransactionFactory.eea    |   2 +-
 .../jta/WebLogicJtaTransactionManager.eea     |   2 +-
 .../AbstractReactiveTransactionManager.eea    |   6 +-
 .../reactive/TransactionContext.eea           |   2 +-
 .../reactive/TransactionContextManager.eea    |   2 +-
 .../reactive/TransactionalOperator.eea        |   4 +-
 .../AbstractPlatformTransactionManager.eea    |   4 +-
 .../support/AbstractTransactionStatus.eea     |   4 +-
 .../support/DefaultTransactionDefinition.eea  |   2 +-
 .../support/DefaultTransactionStatus.eea      |   2 +-
 .../support/ResourceBundleThemeSource.eea     |   2 +-
 .../util/AlternativeJdkIdGenerator.eea        |   2 +-
 .../springframework/util/AntPathMatcher.eea   |   8 +-
 .../AutoPopulatingList$ElementFactory.eea     |   2 +-
 .../org/springframework/util/Base64Utils.eea  |   4 +-
 .../org/springframework/util/ClassUtils.eea   |  12 +-
 .../springframework/util/CollectionUtils.eea  |   6 +-
 ...rrentReferenceHashMap$ReferenceManager.eea |   2 +-
 .../util/ConcurrentReferenceHashMap.eea       |   2 +-
 .../util/CustomizableThreadCreator.eea        |   6 +-
 .../util/FastByteArrayOutputStream.eea        |   2 +-
 .../springframework/util/FileCopyUtils.eea    |   2 +-
 .../util/LinkedCaseInsensitiveMap.eea         |   6 +-
 .../util/LinkedMultiValueMap.eea              |   4 +-
 .../springframework/util/MimeTypeUtils.eea    |   6 +-
 .../org/springframework/util/ObjectUtils.eea  |  22 ++--
 .../springframework/util/ResourceUtils.eea    |   6 +-
 .../util/SimpleRouteMatcher.eea               |   2 +-
 .../org/springframework/util/StopWatch.eea    |   4 +-
 .../org/springframework/util/StreamUtils.eea  |   8 +-
 .../org/springframework/util/StringUtils.eea  |   8 +-
 .../util/backoff/ExponentialBackOff.eea       |   2 +-
 .../util/backoff/FixedBackOff.eea             |   2 +-
 .../CompletableToListenableFutureAdapter.eea  |   2 +-
 .../util/concurrent/ListenableFuture.eea      |   2 +-
 .../util/concurrent/ListenableFutureTask.eea  |   2 +-
 .../concurrent/SettableListenableFuture.eea   |   2 +-
 .../util/function/SingletonSupplier.eea       |   4 +-
 .../springframework/util/unit/DataSize.eea    |  12 +-
 .../org/springframework/util/xml/DomUtils.eea |   8 +-
 .../springframework/util/xml/StaxUtils.eea    |  36 +++---
 .../validation/AbstractBindingResult.eea      |   2 +-
 .../validation/BeanPropertyBindingResult.eea  |   2 +-
 .../validation/BindException.eea              |   2 +-
 .../validation/BindingResult.eea              |   2 +-
 .../springframework/validation/DataBinder.eea |   4 +-
 .../DefaultMessageCodesResolver$Format.eea    |   2 +-
 .../DefaultMessageCodesResolver.eea           |   2 +-
 .../validation/DirectFieldBindingResult.eea   |   2 +-
 .../MessageSourceResourceBundleLocator.eea    |   2 +-
 .../MethodValidationInterceptor.eea           |   2 +-
 .../MethodValidationPostProcessor.eea         |   2 +-
 .../beanvalidation/SpringValidatorAdapter.eea |   4 +-
 .../MappingMediaTypeFileExtensionResolver.eea |   2 +-
 .../bind/support/DefaultDataBinderFactory.eea |   4 +-
 .../support/DefaultSessionAttributeStore.eea  |   2 +-
 .../web/bind/support/WebDataBinderFactory.eea |   2 +-
 .../bind/support/WebExchangeBindException.eea |   2 +-
 .../web/client/AsyncRestTemplate.eea          |   8 +-
 .../web/client/HttpClientErrorException.eea   |   4 +-
 .../web/client/HttpServerErrorException.eea   |   4 +-
 .../web/client/RestTemplate.eea               |   8 +-
 .../web/context/ContextLoader.eea             |   4 +-
 .../request/FacesRequestAttributes.eea        |   2 +-
 .../web/context/request/FacesWebRequest.eea   |   2 +-
 .../web/context/request/ServletWebRequest.eea |   2 +-
 .../TimeoutCallableProcessingInterceptor.eea  |   2 +-
 .../context/request/async/WebAsyncUtils.eea   |   6 +-
 ...stractRefreshableWebApplicationContext.eea |   8 +-
 .../AnnotationConfigWebApplicationContext.eea |   2 +-
 .../support/GenericWebApplicationContext.eea  |   8 +-
 .../context/support/LiveBeansViewServlet.eea  |   2 +-
 .../context/support/RequestHandledEvent.eea   |   4 +-
 .../support/ServletContextLiveBeansView.eea   |   2 +-
 .../ServletContextParameterFactoryBean.eea    |   2 +-
 .../support/ServletContextResource.eea        |   8 +-
 .../support/ServletContextResourceLoader.eea  |   2 +-
 .../support/ServletRequestHandledEvent.eea    |   4 +-
 .../support/StaticWebApplicationContext.eea   |   6 +-
 .../filter/AbstractRequestLoggingFilter.eea   |   2 +-
 .../web/filter/GenericFilterBean.eea          |   2 +-
 .../web/filter/OncePerRequestFilter.eea       |   2 +-
 .../web/filter/ShallowEtagHeaderFilter.eea    |   2 +-
 .../jsf/DelegatingNavigationHandlerProxy.eea  |   2 +-
 .../web/jsf/el/SpringBeanFacesELResolver.eea  |   2 +-
 .../WebApplicationContextFacesELResolver.eea  |   2 +-
 .../web/method/ControllerAdviceBean.eea       |   2 +-
 .../HandlerMethod$HandlerMethodParameter.eea  |   2 +-
 .../web/method/HandlerMethod.eea              |  10 +-
 .../web/method/HandlerTypePredicate.eea       |   4 +-
 ...tractCookieValueMethodArgumentResolver.eea |   2 +-
 ...stractNamedValueMethodArgumentResolver.eea |   2 +-
 .../ExpressionValueMethodArgumentResolver.eea |   2 +-
 .../ModelAttributeMethodProcessor.eea         |   2 +-
 .../RequestHeaderMethodArgumentResolver.eea   |   2 +-
 .../RequestParamMethodArgumentResolver.eea    |   2 +-
 .../annotation/SessionAttributesHandler.eea   |   2 +-
 .../web/multipart/MultipartFile.eea           |   2 +-
 .../commons/CommonsFileUploadSupport.eea      |   8 +-
 .../commons/CommonsMultipartFile.eea          |   4 +-
 .../commons/CommonsMultipartResolver.eea      |   4 +-
 .../AbstractMultipartHttpServletRequest.eea   |   2 +-
 .../support/ByteArrayMultipartFileEditor.eea  |   2 +-
 .../DefaultMultipartHttpServletRequest.eea    |   2 +-
 .../StandardServletMultipartResolver.eea      |   2 +-
 .../support/StandardServletPartUtils.eea      |   2 +-
 .../web/server/ServerWebExchange.eea          |   2 +-
 .../AbstractReactiveWebInitializer.eea        |   6 +-
 .../server/adapter/HttpWebHandlerAdapter.eea  |   4 +-
 .../server/adapter/WebHttpHandlerBuilder.eea  |   4 +-
 .../AcceptHeaderLocaleContextResolver.eea     |   2 +-
 .../i18n/FixedLocaleContextResolver.eea       |   2 +-
 .../session/InMemoryWebSessionStore.eea       |   2 +-
 .../web/server/session/WebSessionStore.eea    |   2 +-
 .../web/util/ContentCachingRequestWrapper.eea |   2 +-
 .../web/util/CookieGenerator.eea              |   2 +-
 .../web/util/DefaultUriBuilderFactory.eea     |   4 +-
 .../springframework/web/util/HtmlUtils.eea    |   6 +-
 .../web/util/JavaScriptUtils.eea              |   2 +-
 .../web/util/UriComponentsBuilder.eea         |  12 +-
 .../org/springframework/web/util/UriUtils.eea |   2 +-
 .../org/springframework/web/util/WebUtils.eea |   4 +-
 .../util/pattern/PathPatternRouteMatcher.eea  |   2 +-
 .../util/pattern/PatternParseException.eea    |   2 +-
 .../aop/aspectj/AbstractAspectJAdvice.eea     |   8 +-
 .../aop/aspectj/AspectJAroundAdvice.eea       |   2 +-
 .../MethodInvocationProceedingJoinPoint.eea   |   6 +-
 .../ReflectiveAspectJAdvisorFactory.eea       |   2 +-
 ...terceptorDrivenBeanDefinitionDecorator.eea |   6 +-
 .../aop/config/AdvisorComponentDefinition.eea |   4 +-
 .../aop/config/AspectComponentDefinition.eea  |   4 +-
 .../aop/config/MethodLocatingFactoryBean.eea  |   2 +-
 .../config/PointcutComponentDefinition.eea    |   2 +-
 .../AbstractAdvisingBeanPostProcessor.eea     |   2 +-
 .../AbstractSingletonProxyFactoryBean.eea     |   4 +-
 .../aop/framework/AdvisedSupport.eea          |   2 +-
 .../aop/framework/AopProxyFactory.eea         |   2 +-
 .../aop/framework/DefaultAopProxyFactory.eea  |   2 +-
 .../aop/framework/ProxyCreatorSupport.eea     |   2 +-
 .../autoproxy/AbstractAutoProxyCreator.eea    |   4 +-
 ...tBeanFactoryAwareAdvisingPostProcessor.eea |   2 +-
 .../BeanFactoryAdvisorRetrievalHelper.eea     |   2 +-
 .../AbstractMonitoringInterceptor.eea         |   2 +-
 .../CustomizableTraceInterceptor.eea          |   2 +-
 .../aop/interceptor/DebugInterceptor.eea      |   2 +-
 .../interceptor/ExposeBeanNameAdvisors.eea    |   4 +-
 .../interceptor/SimpleTraceInterceptor.eea    |   2 +-
 .../aop/scope/ScopedProxyUtils.eea            |   4 +-
 .../aop/support/ClassFilters.eea              |   6 +-
 .../aop/support/MethodMatchers.eea            |   6 +-
 .../support/RegexpMethodPointcutAdvisor.eea   |   2 +-
 .../annotation/AnnotationMatchingPointcut.eea |   4 +-
 .../aot/generate/AccessControl.eea            |   6 +-
 .../aot/generate/DefaultGenerationContext.eea |   2 +-
 .../aot/generate/GeneratedMethods.eea         |   2 +-
 .../aot/generate/GeneratedTypeReference.eea   |   2 +-
 .../aot/generate/ValueCodeGenerator.eea       |   6 +-
 .../predicate/ReflectionHintsPredicates.eea   |  14 +-
 .../springframework/asm/AnnotationVisitor.eea |   4 +-
 .../org/springframework/asm/Attribute.eea     |   6 +-
 .../org/springframework/asm/ClassReader.eea   |   4 +-
 .../org/springframework/asm/ClassVisitor.eea  |  12 +-
 .../org/springframework/asm/ClassWriter.eea   |  12 +-
 .../org/springframework/asm/FieldVisitor.eea  |   4 +-
 .../org/springframework/asm/MethodVisitor.eea |  14 +-
 .../asm/RecordComponentVisitor.eea            |   4 +-
 .../org/springframework/asm/Type.eea          |  12 +-
 .../org/springframework/asm/TypePath.eea      |   2 +-
 .../AbstractNestablePropertyAccessor.eea      |   2 +-
 .../springframework/beans/BeanWrapperImpl.eea |   4 +-
 .../beans/DirectFieldAccessor.eea             |   4 +-
 .../beans/MethodInvocationException.eea       |   2 +-
 .../beans/MutablePropertyValues.eea           |   2 +-
 .../beans/PropertyAccessorFactory.eea         |   4 +-
 .../beans/PropertyAccessorUtils.eea           |   2 +-
 .../springframework/beans/PropertyMatches.eea |   4 +-
 .../beans/TypeMismatchException.eea           |   2 +-
 .../beans/factory/ObjectProvider.eea          |   4 +-
 .../factory/annotation/InjectionMetadata.eea  |   2 +-
 .../beans/factory/aot/AotServices$Loader.eea  |   2 +-
 .../beans/factory/aot/AotServices.eea         |   4 +-
 .../factory/aot/BeanInstanceSupplier.eea      |   8 +-
 .../aot/BeanRegistrationAotContribution.eea   |   2 +-
 .../factory/config/AbstractFactoryBean.eea    |   2 +-
 .../config/AutowireCapableBeanFactory.eea     |   4 +-
 .../factory/config/BeanDefinitionHolder.eea   |   4 +-
 .../factory/config/DependencyDescriptor.eea   |   4 +-
 .../beans/factory/config/ListFactoryBean.eea  |   4 +-
 .../beans/factory/config/MapFactoryBean.eea   |   4 +-
 .../factory/config/MethodInvokingBean.eea     |   2 +-
 .../ObjectFactoryCreatingFactoryBean.eea      |   2 +-
 .../factory/config/PropertiesFactoryBean.eea  |   4 +-
 .../config/ProviderCreatingFactoryBean.eea    |   2 +-
 .../config/ServiceLocatorFactoryBean.eea      |   2 +-
 .../beans/factory/config/SetFactoryBean.eea   |   4 +-
 .../factory/config/YamlMapFactoryBean.eea     |   2 +-
 .../beans/factory/config/YamlProcessor.eea    |   4 +-
 .../config/YamlPropertiesFactoryBean.eea      |   2 +-
 .../groovy/GroovyBeanDefinitionReader.eea     |   2 +-
 .../parsing/AbstractComponentDefinition.eea   |   6 +-
 .../beans/factory/parsing/ParseState.eea      |   2 +-
 .../AbstractServiceLoaderBasedFactoryBean.eea |   2 +-
 .../serviceloader/ServiceListFactoryBean.eea  |   2 +-
 .../AbstractAutowireCapableBeanFactory.eea    |  10 +-
 .../support/AbstractBeanDefinition.eea        |   6 +-
 .../factory/support/AbstractBeanFactory.eea   |   4 +-
 .../factory/support/BeanDefinitionBuilder.eea |  16 +--
 .../support/BeanDefinitionReaderUtils.eea     |   4 +-
 .../CglibSubclassingInstantiationStrategy.eea |   4 +-
 .../factory/support/ChildBeanDefinition.eea   |   2 +-
 .../support/DefaultListableBeanFactory.eea    |   6 +-
 .../factory/support/GenericBeanDefinition.eea |   2 +-
 .../factory/support/InstanceSupplier.eea      |   4 +-
 .../beans/factory/support/ManagedList.eea     |   2 +-
 .../beans/factory/support/ManagedMap.eea      |   2 +-
 .../beans/factory/support/ManagedSet.eea      |   2 +-
 .../beans/factory/support/RegisteredBean.eea  |   2 +-
 .../factory/support/RootBeanDefinition.eea    |   2 +-
 .../support/SimpleInstantiationStrategy.eea   |   6 +-
 .../support/StaticListableBeanFactory.eea     |   4 +-
 .../xml/BeanDefinitionParserDelegate.eea      |  16 +--
 .../DefaultBeanDefinitionDocumentReader.eea   |   2 +-
 .../factory/xml/DefaultDocumentLoader.eea     |   4 +-
 .../factory/xml/XmlBeanDefinitionReader.eea   |   6 +-
 .../ByteArrayPropertyEditor.eea               |   2 +-
 .../CharArrayPropertyEditor.eea               |   2 +-
 .../beans/propertyeditors/CharacterEditor.eea |   2 +-
 .../beans/propertyeditors/CharsetEditor.eea   |   2 +-
 .../propertyeditors/ClassArrayEditor.eea      |   2 +-
 .../beans/propertyeditors/ClassEditor.eea     |   2 +-
 .../beans/propertyeditors/CurrencyEditor.eea  |   2 +-
 .../propertyeditors/CustomBooleanEditor.eea   |   2 +-
 .../CustomCollectionEditor.eea                |   4 +-
 .../propertyeditors/CustomDateEditor.eea      |   2 +-
 .../beans/propertyeditors/CustomMapEditor.eea |   4 +-
 .../propertyeditors/CustomNumberEditor.eea    |   2 +-
 .../beans/propertyeditors/FileEditor.eea      |   2 +-
 .../propertyeditors/InputSourceEditor.eea     |   2 +-
 .../propertyeditors/InputStreamEditor.eea     |   2 +-
 .../beans/propertyeditors/LocaleEditor.eea    |   2 +-
 .../beans/propertyeditors/PathEditor.eea      |   2 +-
 .../beans/propertyeditors/PatternEditor.eea   |   2 +-
 .../beans/propertyeditors/ReaderEditor.eea    |   2 +-
 .../StringArrayPropertyEditor.eea             |   2 +-
 .../propertyeditors/StringTrimmerEditor.eea   |   2 +-
 .../beans/propertyeditors/TimeZoneEditor.eea  |   2 +-
 .../beans/propertyeditors/URIEditor.eea       |   4 +-
 .../beans/propertyeditors/URLEditor.eea       |   2 +-
 .../beans/propertyeditors/UUIDEditor.eea      |   2 +-
 .../beans/propertyeditors/ZoneIdEditor.eea    |   2 +-
 .../ArgumentConvertingMethodInvoker.eea       |   2 +-
 .../beans/support/PagedListHolder.eea         |   2 +-
 .../org/springframework/cache/Cache.eea       |   2 +-
 .../annotation/ProxyCachingConfiguration.eea  |   6 +-
 .../cache/concurrent/ConcurrentMapCache.eea   |   2 +-
 .../concurrent/ConcurrentMapCacheManager.eea  |   2 +-
 .../AbstractFallbackCacheOperationSource.eea  |   2 +-
 .../cache/interceptor/CacheAspectSupport.eea  |   4 +-
 .../CacheEvictOperation$Builder.eea           |   2 +-
 .../interceptor/CacheOperation$Builder.eea    |   2 +-
 .../interceptor/CacheProxyFactoryBean.eea     |   2 +-
 .../interceptor/CachePutOperation$Builder.eea |   2 +-
 .../CacheableOperation$Builder.eea            |   2 +-
 .../cache/support/NoOpCache.eea               |   2 +-
 .../cglib/beans/BeanCopier$Generator.eea      |   4 +-
 .../cglib/beans/BeanCopier.eea                |   2 +-
 .../cglib/beans/BeanGenerator.eea             |   8 +-
 .../cglib/beans/BeanMap$Generator.eea         |   4 +-
 .../springframework/cglib/beans/BeanMap.eea   |   4 +-
 .../cglib/beans/BulkBean$Generator.eea        |   4 +-
 .../springframework/cglib/beans/BulkBean.eea  |   4 +-
 .../cglib/beans/ImmutableBean$Generator.eea   |   4 +-
 .../cglib/beans/ImmutableBean.eea             |   2 +-
 .../cglib/core/AbstractClassGenerator.eea     |   6 +-
 .../cglib/core/ClassEmitter.eea               |   4 +-
 .../springframework/cglib/core/ClassesKey.eea |   2 +-
 .../cglib/core/CodeEmitter.eea                |   6 +-
 .../cglib/core/CollectionUtils.eea            |   6 +-
 .../cglib/core/DefaultGeneratorStrategy.eea   |   2 +-
 .../cglib/core/DefaultNamingPolicy.eea        |   4 +-
 .../cglib/core/KeyFactory$Generator.eea       |   4 +-
 .../springframework/cglib/core/KeyFactory.eea |  10 +-
 .../cglib/core/MethodWrapper.eea              |   4 +-
 .../cglib/core/ReflectUtils.eea               |  12 +-
 .../cglib/core/SpringNamingPolicy.eea         |   2 +-
 .../springframework/cglib/core/TypeUtils.eea  |  16 +--
 .../springframework/cglib/proxy/Enhancer.eea  |  18 +--
 .../cglib/proxy/InterfaceMaker.eea            |   6 +-
 .../cglib/proxy/MethodProxy.eea               |   2 +-
 .../cglib/proxy/Mixin$Generator.eea           |   4 +-
 .../org/springframework/cglib/proxy/Mixin.eea |   8 +-
 .../reflect/ConstructorDelegate$Generator.eea |   4 +-
 .../cglib/reflect/ConstructorDelegate.eea     |   2 +-
 .../cglib/reflect/FastClass$Generator.eea     |   4 +-
 .../cglib/reflect/FastClass.eea               |  10 +-
 .../reflect/MethodDelegate$Generator.eea      |   4 +-
 .../cglib/reflect/MethodDelegate.eea          |   4 +-
 .../reflect/MulticastDelegate$Generator.eea   |   4 +-
 .../cglib/reflect/MulticastDelegate.eea       |   4 +-
 .../AbstractClassFilterTransformer.eea        |   6 +-
 .../cglib/transform/AbstractClassLoader.eea   |   4 +-
 .../cglib/transform/AnnotationVisitorTee.eea  |   4 +-
 .../cglib/transform/ClassTransformerChain.eea |   2 +-
 .../cglib/transform/ClassVisitorTee.eea       |   8 +-
 .../cglib/transform/FieldVisitorTee.eea       |   4 +-
 .../transform/MethodFilterTransformer.eea     |   2 +-
 .../cglib/transform/MethodVisitorTee.eea      |  14 +-
 .../transform/TransformingClassLoader.eea     |   2 +-
 .../impl/InterceptFieldTransformer.eea        |   2 +-
 .../impl/UndeclaredThrowableStrategy.eea      |   2 +-
 .../cglib/util/ParallelSorter$Generator.eea   |   4 +-
 .../cglib/util/ParallelSorter.eea             |   2 +-
 .../cglib/util/StringSwitcher$Generator.eea   |   2 +-
 .../cglib/util/StringSwitcher.eea             |   2 +-
 .../annotation/AdviceModeImportSelector.eea   |   2 +-
 .../AnnotationScopeMetadataResolver.eea       |   2 +-
 .../ClassPathBeanDefinitionScanner.eea        |   2 +-
 .../ComponentScanBeanDefinitionParser.eea     |   4 +-
 .../Jsr330ScopeMetadataResolver.eea           |   2 +-
 .../LoadTimeWeavingConfiguration.eea          |   2 +-
 .../annotation/MBeanExportConfiguration.eea   |   2 +-
 .../context/annotation/TypeFilterUtils.eea    |   2 +-
 .../aot/AbstractAotProcessor$Settings.eea     |   2 +-
 .../context/aot/AbstractAotProcessor.eea      |   2 +-
 .../context/aot/ContextAotProcessor.eea       |   4 +-
 .../ApplicationListenerMethodAdapter.eea      |   6 +-
 .../event/DefaultEventListenerFactory.eea     |   2 +-
 .../context/event/EventListenerFactory.eea    |   2 +-
 .../event/GenericApplicationListener.eea      |   2 +-
 .../GenericApplicationListenerAdapter.eea     |   2 +-
 .../event/SmartApplicationListener.eea        |   2 +-
 .../context/event/SourceFilteringListener.eea |   2 +-
 .../BeanExpressionContextAccessor.eea         |   2 +-
 .../expression/BeanFactoryAccessor.eea        |   2 +-
 .../expression/EnvironmentAccessor.eea        |   2 +-
 .../context/expression/MapAccessor.eea        |   4 +-
 .../support/AbstractApplicationContext.eea    |   6 +-
 .../context/support/AbstractMessageSource.eea |   2 +-
 .../AbstractRefreshableApplicationContext.eea |   2 +-
 .../support/ApplicationObjectSupport.eea      |   2 +-
 .../support/ConversionServiceFactoryBean.eea  |   4 +-
 .../support/DefaultLifecycleProcessor.eea     |   2 +-
 .../DefaultMessageSourceResolvable.eea        |   2 +-
 .../FileSystemXmlApplicationContext.eea       |   2 +-
 .../context/support/MessageSourceAccessor.eea |   8 +-
 .../context/support/MessageSourceSupport.eea  |   4 +-
 .../PropertySourcesPlaceholderConfigurer.eea  |   2 +-
 .../ReloadableResourceBundleMessageSource.eea |   4 +-
 .../support/ResourceBundleMessageSource.eea   |   4 +-
 .../core/CollectionFactory.eea                |  18 +--
 .../core/ConfigurableObjectInputStream.eea    |   2 +-
 .../org/springframework/core/Constants.eea    |  12 +-
 .../org/springframework/core/Conventions.eea  |   4 +-
 .../core/GenericTypeResolver.eea              |   2 +-
 .../core/MethodIntrospector.eea               |   2 +-
 .../springframework/core/MethodParameter.eea  |   6 +-
 .../springframework/core/NamedThreadLocal.eea |   2 +-
 .../core/ParameterizedTypeReference.eea       |   2 +-
 .../core/ReactiveAdapterRegistry.eea          |   2 +-
 .../springframework/core/ResolvableType.eea   |  10 +-
 .../springframework/core/SmartClassLoader.eea |   2 +-
 .../core/annotation/AnnotatedElementUtils.eea |   2 +-
 ...notatedMethod$AnnotatedMethodParameter.eea |   2 +-
 .../core/annotation/AnnotatedMethod.eea       |   4 +-
 .../core/annotation/AnnotationFilter.eea      |   2 +-
 .../annotation/MergedAnnotationPredicates.eea |   4 +-
 .../core/annotation/MergedAnnotations.eea     |   2 +-
 .../core/annotation/RepeatableContainers.eea  |   4 +-
 .../SynthesizingMethodParameter.eea           |   4 +-
 .../core/codec/AbstractDataBufferDecoder.eea  |   2 +-
 .../core/codec/AbstractDecoder.eea            |   2 +-
 .../core/codec/ByteArrayDecoder.eea           |   2 +-
 .../springframework/core/codec/Encoder.eea    |   2 +-
 .../org/springframework/core/codec/Hints.eea  |   2 +-
 .../core/codec/ResourceDecoder.eea            |   2 +-
 .../core/convert/TypeDescriptor.eea           |   2 +-
 .../ConvertingPropertyEditorAdapter.eea       |   2 +-
 .../support/DefaultConversionService.eea      |   2 +-
 .../core/env/AbstractEnvironment.eea          |   2 +-
 .../core/env/AbstractPropertyResolver.eea     |   2 +-
 .../core/env/PropertySource.eea               |   2 +-
 .../core/io/AbstractFileResolvingResource.eea |   2 +-
 .../core/io/AbstractResource.eea              |   6 +-
 .../core/io/ByteArrayResource.eea             |   8 +-
 .../core/io/ClassPathResource.eea             |   6 +-
 .../core/io/ClassRelativeResourceLoader.eea   |   2 +-
 ...esourceLoader$ClassPathContextResource.eea |   2 +-
 .../core/io/DefaultResourceLoader.eea         |   2 +-
 .../core/io/DescriptiveResource.eea           |   2 +-
 .../core/io/FileSystemResource.eea            |   8 +-
 .../core/io/FileSystemResourceLoader.eea      |   2 +-
 .../core/io/FileUrlResource.eea               |   4 +-
 .../core/io/InputStreamResource.eea           |   2 +-
 .../core/io/ModuleResource.eea                |   4 +-
 .../springframework/core/io/PathResource.eea  |  10 +-
 .../org/springframework/core/io/Resource.eea  |   2 +-
 .../core/io/ResourceEditor.eea                |   2 +-
 .../springframework/core/io/UrlResource.eea   |  14 +-
 .../springframework/core/io/VfsResource.eea   |   8 +-
 .../core/io/buffer/DataBuffer.eea             |   4 +-
 .../core/io/buffer/DataBufferUtils.eea        |   4 +-
 .../core/io/buffer/DataBufferWrapper.eea      |   4 +-
 .../core/io/buffer/DefaultDataBuffer.eea      |  10 +-
 .../core/io/buffer/LimitedDataBufferList.eea  |   4 +-
 .../core/io/buffer/Netty5DataBuffer.eea       |   4 +-
 .../io/buffer/Netty5DataBufferFactory.eea     |  10 +-
 .../core/io/buffer/NettyDataBuffer.eea        |   6 +-
 .../core/io/buffer/NettyDataBufferFactory.eea |  10 +-
 .../support/DefaultPropertySourceFactory.eea  |   2 +-
 .../PathMatchingResourcePatternResolver.eea   |   4 +-
 .../io/support/PropertiesLoaderSupport.eea    |   2 +-
 .../core/io/support/PropertiesLoaderUtils.eea |   6 +-
 .../core/io/support/PropertySourceFactory.eea |   2 +-
 ...SpringFactoriesLoader$ArgumentResolver.eea |   2 +-
 .../core/io/support/SpringFactoriesLoader.eea |   4 +-
 .../core/log/LogDelegateFactory.eea           |   2 +-
 .../core/log/LogFormatUtils.eea               |   2 +-
 .../springframework/core/log/LogMessage.eea   |  12 +-
 .../jfr/FlightRecorderApplicationStartup.eea  |   2 +-
 .../core/style/DefaultValueStyler.eea         |  16 +--
 .../core/style/SimpleValueStyler.eea          |  12 +-
 .../core/task/AsyncTaskExecutor.eea           |   4 +-
 .../core/task/SimpleAsyncTaskExecutor.eea     |   8 +-
 .../core/task/support/TaskExecutorAdapter.eea |   8 +-
 .../core/type/StandardClassMetadata.eea       |   2 +-
 .../CachingMetadataReaderFactory.eea          |   2 +-
 .../SimpleMetadataReaderFactory.eea           |   2 +-
 ...istenceExceptionTranslationInterceptor.eea |   2 +-
 .../common/CompositeStringExpression.eea      |   8 +-
 .../expression/spel/CodeFlow.eea              |  10 +-
 .../expression/spel/ExpressionState.eea       |   2 +-
 .../expression/spel/SpelMessage.eea           |   2 +-
 .../expression/spel/ast/Assign.eea            |   2 +-
 .../expression/spel/ast/BeanReference.eea     |   4 +-
 .../spel/ast/CompoundExpression.eea           |   6 +-
 .../spel/ast/ConstructorReference.eea         |   2 +-
 .../expression/spel/ast/Elvis.eea             |   2 +-
 .../expression/spel/ast/FunctionReference.eea |   2 +-
 .../expression/spel/ast/Identifier.eea        |   2 +-
 .../expression/spel/ast/Indexer.eea           |   6 +-
 .../expression/spel/ast/InlineList.eea        |   2 +-
 .../expression/spel/ast/InlineMap.eea         |   2 +-
 .../expression/spel/ast/Literal.eea           |   8 +-
 .../expression/spel/ast/MethodReference.eea   |   4 +-
 .../expression/spel/ast/OpDec.eea             |   4 +-
 .../expression/spel/ast/OpInc.eea             |   4 +-
 .../expression/spel/ast/OpMinus.eea           |   2 +-
 .../expression/spel/ast/OpPlus.eea            |   2 +-
 .../expression/spel/ast/Operator.eea          |   2 +-
 .../expression/spel/ast/OperatorNot.eea       |   2 +-
 .../expression/spel/ast/Projection.eea        |   4 +-
 .../spel/ast/PropertyOrFieldReference.eea     |   4 +-
 .../spel/ast/QualifiedIdentifier.eea          |   2 +-
 .../expression/spel/ast/Selection.eea         |   4 +-
 .../expression/spel/ast/SpelNodeImpl.eea      |   4 +-
 .../expression/spel/ast/Ternary.eea           |   2 +-
 .../expression/spel/ast/TypeReference.eea     |   4 +-
 .../expression/spel/ast/VariableReference.eea |   6 +-
 .../expression/spel/standard/SpelCompiler.eea |   2 +-
 .../support/DataBindingMethodResolver.eea     |   2 +-
 .../support/ReflectiveConstructorExecutor.eea |   2 +-
 ...opertyAccessor$OptimalPropertyAccessor.eea |   2 +-
 .../support/ReflectivePropertyAccessor.eea    |   4 +-
 .../spel/support/SimpleEvaluationContext.eea  |   4 +-
 .../support/StandardOperatorOverloader.eea    |   2 +-
 ...teTimeFormatAnnotationFormatterFactory.eea |   2 +-
 .../standard/DateTimeFormatterFactory.eea     |   4 +-
 .../datetime/standard/InstantFormatter.eea    |   2 +-
 ...teTimeFormatAnnotationFormatterFactory.eea |   2 +-
 .../FormatterPropertyEditorAdapter.eea        |   2 +-
 ...FormattingConversionServiceFactoryBean.eea |   2 +-
 .../org/springframework/http/CacheControl.eea |   8 +-
 .../http/ContentDisposition.eea               |   6 +-
 .../org/springframework/http/ETag.eea         |   4 +-
 .../org/springframework/http/HttpHeaders.eea  |  10 +-
 .../org/springframework/http/HttpMethod.eea   |   4 +-
 .../org/springframework/http/HttpRange.eea    |   8 +-
 .../org/springframework/http/MediaType.eea    |   4 +-
 .../springframework/http/MediaTypeEditor.eea  |   2 +-
 .../springframework/http/ProblemDetail.eea    |   4 +-
 .../springframework/http/RequestEntity.eea    |   6 +-
 .../springframework/http/ResponseEntity.eea   |   8 +-
 ...bstractClientHttpRequestFactoryWrapper.eea |   4 +-
 .../BufferingClientHttpRequestFactory.eea     |   2 +-
 .../http/client/ClientHttpRequestFactory.eea  |   2 +-
 ...HttpComponentsClientHttpRequestFactory.eea |   4 +-
 .../InterceptingClientHttpRequestFactory.eea  |   2 +-
 .../client/JdkClientHttpRequestFactory.eea    |   2 +-
 .../client/JettyClientHttpRequestFactory.eea  |   2 +-
 .../http/client/MultipartBodyBuilder.eea      |   4 +-
 .../OkHttp3ClientHttpRequestFactory.eea       |   2 +-
 .../ReactorNettyClientRequestFactory.eea      |   2 +-
 .../client/SimpleClientHttpRequestFactory.eea |   2 +-
 .../http/client/support/HttpAccessor.eea      |   2 +-
 .../http/codec/ClientCodecConfigurer.eea      |   2 +-
 .../http/codec/FormHttpMessageWriter.eea      |   2 +-
 .../http/codec/ServerCodecConfigurer.eea      |   2 +-
 .../http/codec/ServerSentEvent.eea            |   4 +-
 .../http/codec/cbor/Jackson2CborDecoder.eea   |   2 +-
 .../http/codec/cbor/Jackson2CborEncoder.eea   |   2 +-
 .../http/codec/json/Jackson2CodecSupport.eea  |   2 +-
 .../http/codec/multipart/FilePartEvent.eea    |  12 +-
 .../http/codec/multipart/FormPartEvent.eea    |   4 +-
 .../multipart/MultipartParser$BodyToken.eea   |   2 +-
 .../MultipartParser$HeadersToken.eea          |   2 +-
 .../multipart/MultipartWriterSupport.eea      |   2 +-
 .../support/DefaultClientCodecConfigurer.eea  |   4 +-
 .../support/DefaultServerCodecConfigurer.eea  |   4 +-
 .../converter/FormHttpMessageConverter.eea    |   4 +-
 .../ResourceHttpMessageConverter.eea          |   2 +-
 .../ResourceRegionHttpMessageConverter.eea    |   4 +-
 .../converter/StringHttpMessageConverter.eea  |   4 +-
 .../AbstractJackson2HttpMessageConverter.eea  |   2 +-
 .../http/converter/json/GsonBuilderUtils.eea  |   2 +-
 .../json/Jackson2ObjectMapperBuilder.eea      |   2 +-
 .../xml/AbstractJaxb2HttpMessageConverter.eea |   4 +-
 .../Jaxb2CollectionHttpMessageConverter.eea   |   6 +-
 .../http/server/PathContainer$Options.eea     |   2 +-
 .../http/server/RequestPath.eea               |   2 +-
 .../http/server/ServletServerHttpRequest.eea  |   2 +-
 ...aultServerRequestObservationConvention.eea |   2 +-
 .../AbstractListenerServerHttpResponse.eea    |   2 +-
 .../AbstractListenerWriteFlushProcessor.eea   |   2 +-
 .../reactive/AbstractServerHttpRequest.eea    |   2 +-
 .../reactive/JettyHttpHandlerAdapter.eea      |   2 +-
 .../server/reactive/ServerHttpRequest.eea     |   2 +-
 .../reactive/ServletHttpHandlerAdapter.eea    |   6 +-
 .../reactive/TomcatHttpHandlerAdapter.eea     |   4 +-
 ...aultServerRequestObservationConvention.eea |   2 +-
 .../support/HttpComponentsHeadersAdapter.eea  |   6 +-
 .../http/support/JettyHeadersAdapter.eea      |   4 +-
 .../http/support/Netty4HeadersAdapter.eea     |   4 +-
 .../http/support/Netty5HeadersAdapter.eea     |   6 +-
 .../InstrumentationLoadTimeWeaver.eea         |   2 +-
 .../classloading/ReflectiveLoadTimeWeaver.eea |   2 +-
 .../classloading/SimpleLoadTimeWeaver.eea     |   2 +-
 .../jboss/JBossLoadTimeWeaver.eea             |   2 +-
 .../javapoet/AnnotationSpec.eea               |   4 +-
 .../javapoet/ArrayTypeName.eea                |   6 +-
 .../springframework/javapoet/ClassName.eea    |   6 +-
 .../springframework/javapoet/CodeBlock.eea    |   4 +-
 .../org/springframework/javapoet/JavaFile.eea |   4 +-
 .../springframework/javapoet/MethodSpec.eea   |   6 +-
 .../javapoet/NameAllocator.eea                |   6 +-
 .../javapoet/ParameterizedTypeName.eea        |  10 +-
 .../org/springframework/javapoet/TypeName.eea |   6 +-
 .../org/springframework/javapoet/TypeSpec.eea |   2 +-
 .../javapoet/TypeVariableName.eea             |   2 +-
 .../javapoet/WildcardTypeName.eea             |   6 +-
 .../AbstractMessageEndpointFactory.eea        |   6 +-
 .../GenericMessageEndpointFactory.eea         |   4 +-
 .../support/ResourceAdapterFactoryBean.eea    |   2 +-
 .../jca/support/SimpleBootstrapContext.eea    |   2 +-
 .../config/SortedResourcesFactoryBean.eea     |   4 +-
 .../jdbc/core/BeanPropertyRowMapper.eea       |   4 +-
 .../jdbc/core/CallableStatementCreator.eea    |   2 +-
 .../core/CallableStatementCreatorFactory.eea  |   2 +-
 .../jdbc/core/ColumnMapRowMapper.eea          |   2 +-
 .../jdbc/core/DataClassRowMapper.eea          |   2 +-
 .../jdbc/core/JdbcTemplate.eea                |  14 +-
 .../jdbc/core/ParameterMapper.eea             |   2 +-
 .../jdbc/core/PreparedStatementCreator.eea    |   2 +-
 .../jdbc/core/RowMapperResultSetExtractor.eea |   2 +-
 .../jdbc/core/SingleColumnRowMapper.eea       |   2 +-
 .../jdbc/core/SqlRowSetResultSetExtractor.eea |   2 +-
 .../core/metadata/CallMetaDataContext.eea     |  10 +-
 .../core/metadata/CallMetaDataProvider.eea    |   6 +-
 .../metadata/CallMetaDataProviderFactory.eea  |   2 +-
 .../metadata/GenericCallMetaDataProvider.eea  |   8 +-
 .../metadata/OracleCallMetaDataProvider.eea   |   2 +-
 .../metadata/PostgresCallMetaDataProvider.eea |   2 +-
 .../SqlServerCallMetaDataProvider.eea         |   2 +-
 .../metadata/SybaseCallMetaDataProvider.eea   |   2 +-
 .../core/metadata/TableMetaDataContext.eea    |  10 +-
 .../metadata/TableMetaDataProviderFactory.eea |   2 +-
 .../namedparam/NamedParameterJdbcTemplate.eea |   2 +-
 .../core/namedparam/NamedParameterUtils.eea   |   8 +-
 .../namedparam/SqlParameterSourceUtils.eea    |   8 +-
 .../simple/JdbcClient$MappedQuerySpec.eea     |   2 +-
 .../jdbc/core/simple/JdbcClient.eea           |   6 +-
 .../core/support/AbstractSqlTypeValue.eea     |   2 +-
 .../jdbc/core/support/JdbcDaoSupport.eea      |   2 +-
 .../jdbc/datasource/AbstractDataSource.eea    |   2 +-
 .../jdbc/datasource/ConnectionHolder.eea      |   2 +-
 .../DataSourceTransactionManager.eea          |   6 +-
 .../jdbc/datasource/DelegatingDataSource.eea  |   4 +-
 .../JdbcTransactionObjectSupport.eea          |   2 +-
 .../ShardingKeyDataSourceAdapter.eea          |   2 +-
 .../embedded/EmbeddedDatabaseFactory.eea      |   2 +-
 .../embedded/EmbeddedDatabaseFactoryBean.eea  |   2 +-
 .../embedded/OutputStreamFactory.eea          |   2 +-
 .../lookup/AbstractRoutingDataSource.eea      |   4 +-
 .../jdbc/object/BatchSqlUpdate.eea            |   2 +-
 .../object/MappingSqlQueryWithParameters.eea  |   2 +-
 .../jdbc/object/UpdatableSqlQuery.eea         |   2 +-
 ...AbstractFallbackSQLExceptionTranslator.eea |   2 +-
 .../jdbc/support/JdbcTransactionManager.eea   |   2 +-
 .../jdbc/support/JdbcUtils.eea                |   4 +-
 .../jdbc/support/SQLErrorCodesFactory.eea     |   2 +-
 .../AbstractDataFieldMaxValueIncrementer.eea  |   2 +-
 ...tractIdentityColumnMaxValueIncrementer.eea |   2 +-
 .../incrementer/Db2LuwMaxValueIncrementer.eea |   2 +-
 .../Db2MainframeMaxValueIncrementer.eea       |   2 +-
 .../incrementer/DerbyMaxValueIncrementer.eea  |   4 +-
 .../H2SequenceMaxValueIncrementer.eea         |   2 +-
 .../HanaSequenceMaxValueIncrementer.eea       |   2 +-
 .../incrementer/HsqlMaxValueIncrementer.eea   |   4 +-
 .../HsqlSequenceMaxValueIncrementer.eea       |   2 +-
 .../MariaDBSequenceMaxValueIncrementer.eea    |   2 +-
 ...MySQLIdentityColumnMaxValueIncrementer.eea |   4 +-
 .../OracleSequenceMaxValueIncrementer.eea     |   2 +-
 .../PostgresSequenceMaxValueIncrementer.eea   |   2 +-
 .../SqlServerMaxValueIncrementer.eea          |   4 +-
 .../SqlServerSequenceMaxValueIncrementer.eea  |   2 +-
 .../SybaseAnywhereMaxValueIncrementer.eea     |   2 +-
 .../incrementer/SybaseMaxValueIncrementer.eea |   4 +-
 .../jdbc/support/lob/DefaultLobHandler.eea    |   2 +-
 .../jdbc/support/xml/Jdbc4SqlXmlHandler.eea   |  10 +-
 .../jmx/export/MBeanExporter.eea              |   4 +-
 .../jmx/export/SpringModelMBean.eea           |   4 +-
 ...AbstractConfigurableMBeanInfoAssembler.eea |   2 +-
 .../assembler/AbstractMBeanInfoAssembler.eea  |   6 +-
 .../AbstractReflectiveMBeanInfoAssembler.eea  |   4 +-
 .../assembler/MetadataMBeanInfoAssembler.eea  |   6 +-
 .../jmx/export/metadata/JmxMetadataUtils.eea  |   2 +-
 .../support/ConnectorServerFactoryBean.eea    |   2 +-
 .../springframework/jmx/support/JmxUtils.eea  |   2 +-
 .../MBeanServerConnectionFactoryBean.eea      |   2 +-
 .../jmx/support/MBeanServerFactoryBean.eea    |   4 +-
 .../jndi/JndiLocatorDelegate.eea              |   2 +-
 .../jndi/JndiLocatorSupport.eea               |   2 +-
 .../jndi/JndiObjectFactoryBean.eea            |   2 +-
 .../org/springframework/jndi/JndiTemplate.eea |   2 +-
 .../jndi/support/SimpleJndiBeanFactory.eea    |   6 +-
 .../messaging/MessageHeaders.eea              |   4 +-
 .../handler/CompositeMessageCondition.eea     |   2 +-
 .../DestinationPatternsMessageCondition.eea   |   4 +-
 .../messaging/handler/HandlerMethod.eea       |   6 +-
 ...stractNamedValueMethodArgumentResolver.eea |   2 +-
 ...tinationVariableMethodArgumentResolver.eea |   2 +-
 .../reactive/HeaderMethodArgumentResolver.eea |   2 +-
 .../reactive/MessageMappingMessageHandler.eea |   6 +-
 ...stractNamedValueMethodArgumentResolver.eea |   2 +-
 .../DefaultMessageHandlerMethodFactory.eea    |   4 +-
 ...tinationVariableMethodArgumentResolver.eea |   2 +-
 .../support/HeaderMethodArgumentResolver.eea  |   2 +-
 .../support/MessageHandlerMethodFactory.eea   |   2 +-
 ...AbstractExceptionHandlerMethodResolver.eea |   2 +-
 .../AbstractMethodMessageHandler.eea          |   4 +-
 .../reactive/AbstractMethodMessageHandler.eea |   4 +-
 .../rsocket/DefaultMetadataExtractor.eea      |   2 +-
 .../messaging/rsocket/PayloadUtils.eea        |   4 +-
 .../messaging/rsocket/RSocketRequester.eea    |   4 +-
 .../messaging/rsocket/RSocketStrategies.eea   |   6 +-
 .../RSocketFrameTypeMessageCondition.eea      |   2 +-
 .../support/RSocketMessageHandler.eea         |   2 +-
 .../rsocket/service/RSocketRequestValues.eea  |   2 +-
 .../service/RSocketServiceProxyFactory.eea    |   4 +-
 .../messaging/simp/SimpAttributes.eea         |   2 +-
 .../simp/SimpMessageHeaderAccessor.eea        |  12 +-
 .../simp/SimpMessageTypeMessageCondition.eea  |   2 +-
 .../SimpAnnotationMethodMessageHandler.eea    |   8 +-
 .../AbstractMessageBrokerConfiguration.eea    |  26 ++--
 .../simp/config/SimpleBrokerRegistration.eea  |   2 +-
 .../config/StompBrokerRelayRegistration.eea   |   2 +-
 .../stomp/ConnectionHandlingStompSession.eea  |   2 +-
 .../simp/stomp/DefaultStompSession.eea        |   6 +-
 .../simp/stomp/ReactorNettyTcpStompClient.eea |   2 +-
 .../stomp/StompBrokerRelayMessageHandler.eea  |   2 +-
 .../simp/stomp/StompClientSupport.eea         |   4 +-
 .../messaging/simp/stomp/StompDecoder.eea     |   2 +-
 .../simp/stomp/StompHeaderAccessor.eea        |  14 +-
 .../simp/stomp/StompSessionHandlerAdapter.eea |   2 +-
 .../simp/user/MultiServerUserRegistry.eea     |   4 +-
 .../support/AbstractHeaderMapper.eea          |   4 +-
 .../messaging/support/MessageBuilder.eea      |   6 +-
 .../support/MessageHeaderAccessor.eea         |  14 +-
 .../messaging/tcp/TcpConnection.eea           |   2 +-
 .../messaging/tcp/TcpOperations.eea           |   6 +-
 .../http/client/MockClientHttpResponse.eea    |   2 +-
 .../server/reactive/MockServerHttpRequest.eea |   6 +-
 .../reactive/MockServerHttpResponse.eea       |   2 +-
 .../mock/web/MockAsyncContext.eea             |   2 +-
 .../mock/web/MockBodyContent.eea              |   2 +-
 .../springframework/mock/web/MockCookie.eea   |   2 +-
 .../mock/web/MockHttpServletRequest.eea       |  12 +-
 .../mock/web/MockHttpSession.eea              |   2 +-
 .../mock/web/MockMultipartFile.eea            |   2 +-
 .../web/MockMultipartHttpServletRequest.eea   |   4 +-
 .../org/springframework/mock/web/MockPart.eea |   2 +-
 .../mock/web/MockServletContext.eea           |  30 ++---
 .../function/server/MockServerRequest.eea     |   2 +-
 .../mock/web/server/MockServerWebExchange.eea |   4 +-
 .../basic/FailingInstantiator.eea             |   2 +-
 .../instantiator/basic/NullInstantiator.eea   |   2 +-
 .../instantiator/util/ClassUtils.eea          |   4 +-
 .../strategy/PlatformDescription.eea          |   2 +-
 .../SerializingInstantiatorStrategy.eea       |   2 +-
 .../strategy/StdInstantiatorStrategy.eea      |   2 +-
 .../orm/hibernate5/HibernateTemplate.eea      |   2 +-
 .../HibernateTransactionManager.eea           |   4 +-
 .../support/HibernateDaoSupport.eea           |   2 +-
 .../support/OpenSessionInViewInterceptor.eea  |   2 +-
 .../jpa/AbstractEntityManagerFactoryBean.eea  |   8 +-
 .../orm/jpa/EntityManagerFactoryAccessor.eea  |   2 +-
 .../orm/jpa/EntityManagerFactoryInfo.eea      |   2 +-
 .../orm/jpa/ExtendedEntityManagerCreator.eea  |  12 +-
 .../orm/jpa/JpaTransactionManager.eea         |   6 +-
 .../orm/jpa/JpaVendorAdapter.eea              |   4 +-
 ...LocalContainerEntityManagerFactoryBean.eea |   2 +-
 .../orm/jpa/LocalEntityManagerFactoryBean.eea |   2 +-
 .../orm/jpa/SharedEntityManagerCreator.eea    |  10 +-
 .../MutablePersistenceUnitInfo.eea            |   2 +-
 .../PersistenceManagedTypes.eea               |   4 +-
 .../support/OpenEntityManagerInViewFilter.eea |   2 +-
 .../OpenEntityManagerInViewInterceptor.eea    |   2 +-
 .../jpa/support/SharedEntityManagerBean.eea   |   2 +-
 .../jpa/vendor/AbstractJpaVendorAdapter.eea   |   4 +-
 .../vendor/EclipseLinkJpaVendorAdapter.eea    |   4 +-
 .../jpa/vendor/HibernateJpaVendorAdapter.eea  |   4 +-
 .../oxm/jaxb/Jaxb2Marshaller.eea              |   6 +-
 .../oxm/support/AbstractMarshaller.eea        |   6 +-
 .../oxm/support/SaxResourceUtils.eea          |   2 +-
 .../oxm/xstream/CatchAllConverter.eea         |   2 +-
 .../oxm/xstream/XStreamMarshaller.eea         |   4 +-
 .../annotation/AsyncAnnotationAdvisor.eea     |   2 +-
 .../scheduling/annotation/AsyncResult.eea     |   4 +-
 .../annotation/ProxyAsyncConfiguration.eea    |   2 +-
 .../ScheduledAnnotationBeanPostProcessor.eea  |   6 +-
 .../annotation/SchedulingConfiguration.eea    |   2 +-
 .../concurrent/ConcurrentTaskExecutor.eea     |   4 +-
 .../ScheduledExecutorFactoryBean.eea          |   6 +-
 .../ThreadPoolExecutorFactoryBean.eea         |   6 +-
 .../concurrent/ThreadPoolTaskExecutor.eea     |  10 +-
 .../concurrent/ThreadPoolTaskScheduler.eea    |  10 +-
 .../config/TaskExecutorFactoryBean.eea        |   2 +-
 .../scheduling/support/CronExpression.eea     |   2 +-
 .../scheduling/support/CronTrigger.eea        |  10 +-
 ...aultScheduledTaskObservationConvention.eea |   4 +-
 .../support/MethodInvokingRunnable.eea        |   2 +-
 .../scheduling/support/NoOpTaskScheduler.eea  |  10 +-
 .../scripting/bsh/BshScriptUtils.eea          |   6 +-
 .../scripting/config/LangNamespaceUtils.eea   |   2 +-
 .../scripting/groovy/GroovyScriptFactory.eea  |   2 +-
 .../support/ScriptFactoryPostProcessor.eea    |  12 +-
 .../context/MergedContextConfiguration.eea    |   2 +-
 .../test/context/SmartContextLoader.eea       |   4 +-
 ...ationUtils$UntypedAnnotationDescriptor.eea |   2 +-
 .../test/context/aot/AotTestAttributes.eea    |   2 +-
 .../test/context/aot/TestAotProcessor.eea     |   2 +-
 .../junit4/SpringJUnit4ClassRunner.eea        |  18 +--
 .../context/support/AbstractContextLoader.eea |   2 +-
 .../support/AbstractGenericContextLoader.eea  |   4 +-
 .../AbstractTestContextBootstrapper.eea       |   4 +-
 .../support/AnnotationConfigContextLoader.eea |   8 +-
 .../DefaultTestContextBootstrapper.eea        |   2 +-
 .../support/GenericGroovyXmlContextLoader.eea |   2 +-
 .../support/GenericXmlContextLoader.eea       |   4 +-
 .../support/TestPropertySourceUtils.eea       |   2 +-
 .../TestContextTransactionUtils.eea           |   4 +-
 .../context/util/TestContextResourceUtils.eea |   2 +-
 .../web/AbstractGenericWebContextLoader.eea   |   4 +-
 .../web/AnnotationConfigWebContextLoader.eea  |   6 +-
 .../web/GenericGroovyXmlWebContextLoader.eea  |   2 +-
 .../web/GenericXmlWebContextLoader.eea        |   2 +-
 .../web/WebTestContextBootstrapper.eea        |   2 +-
 .../AbstractRequestExpectationManager.eea     |   8 +-
 .../web/client/DefaultRequestExpectation.eea  |   2 +-
 .../test/web/client/ExpectedCount.eea         |   6 +-
 .../MockMvcClientHttpRequestFactory.eea       |   2 +-
 .../test/web/client/MockRestServiceServer.eea |  10 +-
 .../test/web/client/ResponseCreator.eea       |   2 +-
 .../SimpleRequestExpectationManager.eea       |   2 +-
 .../UnorderedRequestExpectationManager.eea    |   2 +-
 .../client/match/ContentRequestMatchers.eea   |   6 +-
 .../client/match/JsonPathRequestMatchers.eea  |  28 ++--
 .../client/match/MockRestRequestMatchers.eea  |   8 +-
 .../response/DefaultResponseCreator.eea       |   2 +-
 .../response/ExecutingResponseCreator.eea     |   2 +-
 .../response/MockRestResponseCreators.eea     |  30 ++---
 .../web/reactive/server/WebTestClient.eea     |  12 +-
 .../test/web/servlet/MockMvc.eea              |   2 +-
 .../web/servlet/MockMvcBuilderSupport.eea     |   4 +-
 .../servlet/client/MockMvcHttpConnector.eea   |   2 +-
 .../servlet/client/MockMvcWebTestClient.eea   |   6 +-
 .../htmlunit/MockMvcWebClientBuilder.eea      |   6 +-
 .../MockMvcWebConnectionBuilderSupport.eea    |   2 +-
 .../MockMvcHtmlUnitDriverBuilder.eea          |   6 +-
 .../request/MockHttpServletRequestBuilder.eea |   2 +-
 ...MockMultipartHttpServletRequestBuilder.eea |   2 +-
 .../request/MockMvcRequestBuilders.eea        |  42 +++---
 .../servlet/result/MockMvcResultHandlers.eea  |   2 +-
 .../servlet/result/MockMvcResultMatchers.eea  |  24 ++--
 .../servlet/result/PrintingResultHandler.eea  |   6 +-
 .../web/servlet/setup/MockMvcBuilders.eea     |   4 +-
 .../setup/SharedHttpSessionConfigurer.eea     |   2 +-
 .../setup/StandaloneMockMvcBuilder.eea        |   2 +-
 .../HeuristicCompletionException.eea          |   2 +-
 .../transaction/SavepointManager.eea          |   2 +-
 .../transaction/TransactionExecution.eea      |   2 +-
 ...ractTransactionManagementConfiguration.eea |   2 +-
 .../Ejb3TransactionAnnotationParser.eea       |   2 +-
 .../JtaTransactionAnnotationParser.eea        |   2 +-
 ...roxyTransactionManagementConfiguration.eea |   6 +-
 ...ictedTransactionalEventListenerFactory.eea |   2 +-
 .../SpringTransactionAnnotationParser.eea     |   2 +-
 ...TransactionManagerBeanDefinitionParser.eea |   2 +-
 .../TransactionalApplicationListener.eea      |   2 +-
 ...ransactionalApplicationListenerAdapter.eea |   2 +-
 .../TransactionalEventListenerFactory.eea     |   2 +-
 ...ractFallbackTransactionAttributeSource.eea |   2 +-
 .../interceptor/TransactionAspectSupport.eea  |   4 +-
 .../TransactionProxyFactoryBean.eea           |   2 +-
 .../transaction/jta/JtaTransactionManager.eea |   6 +-
 .../jta/SimpleTransactionFactory.eea          |   2 +-
 .../transaction/jta/TransactionFactory.eea    |   2 +-
 .../AbstractReactiveTransactionManager.eea    |   6 +-
 .../reactive/GenericReactiveTransaction.eea   |   2 +-
 .../reactive/TransactionContextManager.eea    |   2 +-
 .../reactive/TransactionalOperator.eea        |   4 +-
 .../AbstractPlatformTransactionManager.eea    |   2 +-
 .../support/AbstractTransactionStatus.eea     |   4 +-
 .../support/DefaultTransactionDefinition.eea  |   2 +-
 .../support/DefaultTransactionStatus.eea      |   4 +-
 .../support/ResourceBundleThemeSource.eea     |   2 +-
 .../util/AlternativeJdkIdGenerator.eea        |   2 +-
 .../springframework/util/AntPathMatcher.eea   |   8 +-
 .../AutoPopulatingList$ElementFactory.eea     |   2 +-
 .../org/springframework/util/Base64Utils.eea  |   4 +-
 .../org/springframework/util/ClassUtils.eea   |  12 +-
 .../springframework/util/CollectionUtils.eea  |   6 +-
 ...rrentReferenceHashMap$ReferenceManager.eea |   2 +-
 .../util/ConcurrentReferenceHashMap.eea       |   2 +-
 .../util/CustomizableThreadCreator.eea        |   6 +-
 .../util/FastByteArrayOutputStream.eea        |   2 +-
 .../springframework/util/FileCopyUtils.eea    |   2 +-
 .../util/LinkedCaseInsensitiveMap.eea         |   6 +-
 .../util/LinkedMultiValueMap.eea              |   4 +-
 .../springframework/util/MimeTypeUtils.eea    |   6 +-
 .../org/springframework/util/ObjectUtils.eea  |  22 ++--
 .../springframework/util/ResourceUtils.eea    |   6 +-
 .../util/SimpleRouteMatcher.eea               |   2 +-
 .../org/springframework/util/StopWatch.eea    |   6 +-
 .../org/springframework/util/StreamUtils.eea  |   8 +-
 .../org/springframework/util/StringUtils.eea  |   6 +-
 .../util/backoff/ExponentialBackOff.eea       |   2 +-
 .../util/backoff/FixedBackOff.eea             |   2 +-
 .../CompletableToListenableFutureAdapter.eea  |   2 +-
 .../util/concurrent/ListenableFuture.eea      |   2 +-
 .../util/concurrent/ListenableFutureTask.eea  |   2 +-
 .../concurrent/SettableListenableFuture.eea   |   2 +-
 .../util/function/SingletonSupplier.eea       |   4 +-
 .../util/function/ThrowingBiFunction.eea      |   2 +-
 .../util/function/ThrowingConsumer.eea        |   2 +-
 .../util/function/ThrowingFunction.eea        |   2 +-
 .../util/function/ThrowingSupplier.eea        |   2 +-
 .../springframework/util/unit/DataSize.eea    |  12 +-
 .../org/springframework/util/xml/DomUtils.eea |   8 +-
 .../springframework/util/xml/StaxUtils.eea    |  36 +++---
 .../validation/AbstractBindingResult.eea      |   2 +-
 .../validation/AbstractErrors.eea             |   2 +-
 .../validation/BeanPropertyBindingResult.eea  |   2 +-
 .../validation/BindException.eea              |   4 +-
 .../validation/BindingResult.eea              |   2 +-
 .../springframework/validation/DataBinder.eea |   4 +-
 .../DefaultMessageCodesResolver$Format.eea    |   2 +-
 .../DefaultMessageCodesResolver.eea           |   2 +-
 .../validation/DirectFieldBindingResult.eea   |   2 +-
 .../org/springframework/validation/Errors.eea |   2 +-
 .../springframework/validation/Validator.eea  |   2 +-
 .../MessageSourceResourceBundleLocator.eea    |   2 +-
 .../MethodValidationAdapter.eea               |   2 +-
 .../MethodValidationInterceptor.eea           |   2 +-
 .../MethodValidationPostProcessor.eea         |   2 +-
 .../beanvalidation/SpringValidatorAdapter.eea |   4 +-
 .../method/MethodValidationResult.eea         |   4 +-
 .../validation/method/ParameterErrors.eea     |   2 +-
 .../org/springframework/web/ErrorResponse.eea |  10 +-
 .../MappingMediaTypeFileExtensionResolver.eea |   2 +-
 .../web/bind/EscapedErrors.eea                |   2 +-
 ...DataBinder$ServletRequestValueResolver.eea |   2 +-
 .../web/bind/ServletRequestDataBinder.eea     |   4 +-
 .../bind/support/DefaultDataBinderFactory.eea |   6 +-
 .../support/DefaultSessionAttributeStore.eea  |   2 +-
 .../web/bind/support/WebDataBinderFactory.eea |   4 +-
 .../bind/support/WebExchangeBindException.eea |   4 +-
 .../web/client/HttpClientErrorException.eea   |   4 +-
 .../web/client/HttpServerErrorException.eea   |   4 +-
 .../springframework/web/client/RestClient.eea |  10 +-
 .../web/client/RestTemplate.eea               |   8 +-
 .../web/client/support/RestClientAdapter.eea  |   2 +-
 .../client/support/RestTemplateAdapter.eea    |   2 +-
 .../web/context/ContextLoader.eea             |   4 +-
 .../request/FacesRequestAttributes.eea        |   2 +-
 .../web/context/request/FacesWebRequest.eea   |   2 +-
 .../web/context/request/ServletWebRequest.eea |   2 +-
 .../TimeoutCallableProcessingInterceptor.eea  |   2 +-
 .../context/request/async/WebAsyncUtils.eea   |   6 +-
 ...stractRefreshableWebApplicationContext.eea |   8 +-
 .../AnnotationConfigWebApplicationContext.eea |   2 +-
 .../support/GenericWebApplicationContext.eea  |   8 +-
 .../context/support/RequestHandledEvent.eea   |   4 +-
 .../ServletContextParameterFactoryBean.eea    |   2 +-
 .../support/ServletContextResource.eea        |   8 +-
 .../support/ServletContextResourceLoader.eea  |   2 +-
 .../support/ServletRequestHandledEvent.eea    |   4 +-
 .../support/StaticWebApplicationContext.eea   |   6 +-
 .../filter/AbstractRequestLoggingFilter.eea   |   2 +-
 .../web/filter/ForwardedHeaderFilter.eea      |   2 +-
 .../web/filter/GenericFilterBean.eea          |   2 +-
 .../web/filter/OncePerRequestFilter.eea       |   2 +-
 .../web/filter/ShallowEtagHeaderFilter.eea    |   2 +-
 .../jsf/DelegatingNavigationHandlerProxy.eea  |   2 +-
 .../web/jsf/el/SpringBeanFacesELResolver.eea  |   2 +-
 .../WebApplicationContextFacesELResolver.eea  |   2 +-
 .../web/method/ControllerAdviceBean.eea       |   2 +-
 .../web/method/HandlerMethod.eea              |   8 +-
 .../web/method/HandlerTypePredicate.eea       |   4 +-
 ...tractCookieValueMethodArgumentResolver.eea |   2 +-
 ...stractNamedValueMethodArgumentResolver.eea |   2 +-
 .../ExpressionValueMethodArgumentResolver.eea |   2 +-
 .../ModelAttributeMethodProcessor.eea         |   2 +-
 .../RequestHeaderMethodArgumentResolver.eea   |   2 +-
 .../RequestParamMethodArgumentResolver.eea    |   2 +-
 .../annotation/SessionAttributesHandler.eea   |   2 +-
 .../web/multipart/MultipartFile.eea           |   2 +-
 .../AbstractMultipartHttpServletRequest.eea   |   2 +-
 .../support/ByteArrayMultipartFileEditor.eea  |   2 +-
 .../DefaultMultipartHttpServletRequest.eea    |   2 +-
 .../StandardServletMultipartResolver.eea      |   2 +-
 .../support/StandardServletPartUtils.eea      |   2 +-
 .../web/server/ServerWebExchange.eea          |   2 +-
 .../AbstractReactiveWebInitializer.eea        |   6 +-
 .../server/adapter/HttpWebHandlerAdapter.eea  |   4 +-
 .../server/adapter/WebHttpHandlerBuilder.eea  |   4 +-
 .../AcceptHeaderLocaleContextResolver.eea     |   2 +-
 .../i18n/FixedLocaleContextResolver.eea       |   2 +-
 .../session/InMemoryWebSessionStore.eea       |   2 +-
 .../web/server/session/WebSessionStore.eea    |   2 +-
 .../web/service/invoker/HttpClientAdapter.eea |   2 +-
 .../invoker/HttpRequestValues$Builder.eea     |   4 +-
 .../web/service/invoker/HttpRequestValues.eea |   2 +-
 .../invoker/HttpServiceProxyFactory.eea       |   4 +-
 .../ReactiveHttpRequestValues$Builder.eea     |   2 +-
 .../invoker/ReactiveHttpRequestValues.eea     |   2 +-
 .../web/util/BindErrorUtils.eea               |   2 +-
 .../web/util/ContentCachingRequestWrapper.eea |   2 +-
 .../web/util/CookieGenerator.eea              |   2 +-
 .../web/util/DefaultUriBuilderFactory.eea     |   4 +-
 .../springframework/web/util/HtmlUtils.eea    |   6 +-
 .../web/util/JavaScriptUtils.eea              |   2 +-
 .../web/util/UriComponentsBuilder.eea         |  12 +-
 .../org/springframework/web/util/UriUtils.eea |   2 +-
 .../org/springframework/web/util/WebUtils.eea |   4 +-
 .../util/pattern/PathPatternRouteMatcher.eea  |   2 +-
 .../util/pattern/PatternParseException.eea    |   2 +-
 .../org/apache/wicket/Application.eea         |  16 +--
 .../org/apache/wicket/AttributeModifier.eea   |   4 +-
 .../resources/org/apache/wicket/Component.eea |  26 ++--
 .../apache/wicket/DefaultExceptionMapper.eea  |   6 +-
 .../apache/wicket/DefaultMapperContext.eea    |   8 +-
 .../wicket/DefaultMarkupIdGenerator.eea       |   2 +-
 .../wicket/DefaultPageManagerProvider.eea     |  14 +-
 .../org/apache/wicket/DequeueContext.eea      |   6 +-
 .../resources/org/apache/wicket/Localizer.eea |   8 +-
 .../org/apache/wicket/MarkupContainer.eea     |  16 +--
 .../org/apache/wicket/MetaDataKey.eea         |   4 +-
 .../main/resources/org/apache/wicket/Page.eea |   6 +-
 .../org/apache/wicket/ResourceBundles.eea     |   2 +-
 .../resources/org/apache/wicket/Session.eea   |   4 +-
 .../org/apache/wicket/SystemMapper.eea        |  10 +-
 .../org/apache/wicket/ThreadContext.eea       |   8 +-
 .../wicket/ajax/AbstractAjaxTimerBehavior.eea |   4 +-
 .../ajax/AbstractDefaultAjaxBehavior.eea      |  12 +-
 .../wicket/ajax/AjaxClientInfoBehavior.eea    |   4 +-
 .../apache/wicket/ajax/AjaxEventBehavior.eea  |   2 +-
 .../ajax/AjaxNewWindowNotifyingBehavior.eea   |   4 +-
 .../ajax/AjaxOnDomReadyClientInfoBehavior.eea |   4 +-
 .../ajax/AjaxSelfUpdatingTimerBehavior.eea    |   2 +-
 .../wicket/ajax/CancelEventIfAjaxListener.eea |   2 +-
 .../WicketAjaxJQueryResourceReference.eea     |   2 +-
 .../ajax/attributes/AjaxCallListener.eea      |  18 +--
 .../ajax/attributes/CallbackParameter.eea     |   8 +-
 .../ajax/attributes/IAjaxCallListener.eea     |  18 +--
 ...jaxFormChoiceComponentUpdatingBehavior.eea |   2 +-
 .../AjaxFormComponentUpdatingBehavior.eea     |   2 +-
 .../ajax/form/AjaxFormSubmitBehavior.eea      |   2 +-
 .../wicket/ajax/form/OnChangeAjaxBehavior.eea |   2 +-
 .../apache/wicket/ajax/json/JSONFunction.eea  |   2 +-
 .../org/apache/wicket/ajax/json/JsonUtils.eea |   2 +-
 .../ajax/markup/html/AjaxFallbackLink.eea     |   2 +-
 .../wicket/ajax/markup/html/AjaxLink.eea      |   2 +-
 .../ajax/markup/html/form/AjaxButton.eea      |   2 +-
 .../markup/html/form/AjaxFallbackButton.eea   |   2 +-
 .../ajax/markup/html/form/AjaxSubmitLink.eea  |   2 +-
 .../paging/AjaxPagingNavigation.eea           |   2 +-
 .../AjaxPagingNavigationIncrementLink.eea     |   2 +-
 .../paging/AjaxPagingNavigationLink.eea       |   2 +-
 .../navigation/paging/AjaxPagingNavigator.eea |   4 +-
 .../application/WildcardMatcherHelper.eea     |   2 +-
 .../DefaultAuthenticationStrategy.eea         |   6 +-
 .../strategy/NoOpAuthenticationStrategy.eea   |   2 +-
 .../org/apache/wicket/behavior/Behavior.eea   |   4 +-
 .../core/random/ISecureRandomSupplier.eea     |   2 +-
 .../request/handler/IPageRequestHandler.eea   |   2 +-
 .../core/request/handler/PageProvider.eea     |   2 +-
 .../request/handler/logger/PageLogData.eea    |   2 +-
 .../mapper/AbstractBookmarkableMapper.eea     |  14 +-
 .../request/mapper/BookmarkableMapper.eea     |   2 +-
 .../CryptoMapper$HashedSegmentGenerator.eea   |   2 +-
 .../core/request/mapper/CryptoMapper.eea      |   8 +-
 .../core/request/mapper/HomePageMapper.eea    |   2 +-
 .../core/request/mapper/MapperUtils.eea       |   4 +-
 .../core/request/mapper/MountedMapper.eea     |   4 +-
 .../core/request/mapper/PackageMapper.eea     |   4 +-
 .../core/request/mapper/ResourceMapper.eea    |   4 +-
 .../wicket/core/util/crypt/AESCrypt.eea       |   2 +-
 .../core/util/crypt/AbstractJceCrypt.eea      |   4 +-
 .../AbstractKeyInSessionCryptFactory.eea      |   2 +-
 .../crypt/KeyInSessionSunJceCryptFactory.eea  |   4 +-
 .../core/util/file/WebApplicationPath.eea     |   2 +-
 .../PropertyResolver$AbstractGetAndSet.eea    |   8 +-
 ...ropertyResolver$CachingPropertyLocator.eea |   2 +-
 ...ropertyResolver$DefaultPropertyLocator.eea |   2 +-
 .../core/util/lang/PropertyResolver.eea       |   2 +-
 .../wicket/core/util/lang/WicketObjects.eea   |   2 +-
 .../checker/CheckingObjectOutputStream.eea    |   2 +-
 .../objects/checker/DifferentPageChecker.eea  |   2 +-
 .../checker/NotDetachedModelChecker.eea       |   2 +-
 .../checker/ObjectSerializationChecker.eea    |   2 +-
 .../checker/OrphanComponentChecker.eea        |   2 +-
 .../util/objects/checker/SessionChecker.eea   |   2 +-
 .../util/resource/ClassPathResourceFinder.eea |   2 +-
 .../util/resource/PackageResourceStream.eea   |   6 +-
 .../core/util/resource/UrlResourceStream.eea  |   6 +-
 .../resource/WebExternalResourceStream.eea    |   6 +-
 .../locator/LocaleResourceNameIterator.eea    |   4 +-
 .../locator/OsgiResourceStreamLocator.eea     |   2 +-
 .../resource/locator/ResourceNameIterator.eea |   8 +-
 .../locator/ResourceStreamLocator.eea         |   6 +-
 .../StyleAndVariationResourceNameIterator.eea |   6 +-
 .../core/util/string/ComponentRenderer.eea    |   2 +-
 .../core/util/string/ComponentStrings.eea     |   2 +-
 .../wicket/core/util/string/CssUtils.eea      |   2 +-
 .../PropertyVariableInterpolator.eea          |   2 +-
 .../org/apache/wicket/csp/CSPDirective.eea    |   2 +-
 .../org/apache/wicket/csp/CSPHeaderMode.eea   |   2 +-
 .../csp/ContentSecurityPolicySettings.eea     |   2 +-
 .../ajax/AjaxDisableComponentListener.eea     |   6 +-
 .../markup/html/AjaxEditableChoiceLabel.eea   |   4 +-
 .../ajax/markup/html/AjaxEditableLabel.eea    |   8 +-
 .../html/AjaxEditableMultiLineLabel.eea       |   8 +-
 .../markup/html/AjaxIndicatorAppender.eea     |   4 +-
 .../ajax/markup/html/IndicatingAjaxButton.eea |   2 +-
 .../ajax/markup/html/IndicatingAjaxLink.eea   |   2 +-
 .../AbstractAutoCompleteBehavior.eea          |   2 +-
 .../AbstractAutoCompleteRenderer.eea          |   2 +-
 .../autocomplete/AutoCompleteTextField.eea    |   2 +-
 .../html/form/upload/UploadProgressBar.eea    |   6 +-
 .../ajax/markup/html/modal/ModalDialog.eea    |   4 +-
 .../data/sort/AjaxFallbackOrderByBorder.eea   |   2 +-
 .../repeater/data/sort/AjaxOrderByLink.eea    |   2 +-
 .../data/table/AjaxFallbackHeadersToolbar.eea |   2 +-
 .../data/table/AjaxNavigationToolbar.eea      |   2 +-
 .../ajax/markup/html/tabs/AjaxTabbedPanel.eea |   2 +-
 .../extensions/breadcrumb/BreadCrumbBar.eea   |   4 +-
 .../panel/BreadCrumbPanelFactory.eea          |   2 +-
 .../panel/IBreadCrumbPanelFactory.eea         |   2 +-
 .../markup/html/basic/SmartLinkLabel.eea      |   2 +-
 .../html/basic/SmartLinkMultiLineLabel.eea    |   2 +-
 .../markup/html/form/DateTextField.eea        |   4 +-
 .../html/form/datetime/LocalDateTextField.eea |   2 +-
 .../html/form/datetime/LocalDateTimeField.eea |   2 +-
 .../form/datetime/LocalDateTimeTextField.eea  |   2 +-
 .../html/form/datetime/LocalTimeTextField.eea |   2 +-
 .../form/datetime/TimeField$HoursModel.eea    |   2 +-
 .../markup/html/form/datetime/TimeField.eea   |   6 +-
 .../html/form/datetime/ZonedDateTimeField.eea |   2 +-
 .../datetime/ZonedToLocalDateTimeModel.eea    |   4 +-
 .../markup/html/form/palette/Palette.eea      |  28 ++--
 .../palette/component/AbstractOptions.eea     |   4 +-
 .../html/form/palette/component/Recorder.eea  |   4 +-
 .../markup/html/form/select/Select.eea        |   2 +-
 .../markup/html/form/select/SelectOption.eea  |   2 +-
 .../markup/html/form/select/SelectOptions.eea |   2 +-
 .../data/grid/AbstractDataGridView.eea        |   6 +-
 .../html/repeater/data/sort/OrderByBorder.eea |   2 +-
 .../repeater/data/table/AbstractColumn.eea    |   4 +-
 .../repeater/data/table/DataTable$Caption.eea |   2 +-
 .../html/repeater/data/table/DataTable.eea    |   8 +-
 .../repeater/data/table/HeaderlessColumn.eea  |   2 +-
 .../repeater/data/table/HeadersToolbar.eea    |   2 +-
 .../html/repeater/data/table/LambdaColumn.eea |   2 +-
 .../repeater/data/table/NavigationToolbar.eea |   4 +-
 .../repeater/data/table/PropertyColumn.eea    |   2 +-
 .../table/export/AbstractExportableColumn.eea |   2 +-
 .../data/table/export/CSVDataExporter.eea     |   4 +-
 ...Toolbar$DataExportResourceStreamWriter.eea |   2 +-
 .../data/table/export/ExportToolbar.eea       |   2 +-
 .../data/table/filter/ChoiceFilter.eea        |   2 +-
 .../filter/ChoiceFilteredPropertyColumn.eea   |   4 +-
 .../repeater/data/table/filter/FilterForm.eea |   2 +-
 .../filter/TextFilteredPropertyColumn.eea     |   2 +-
 .../html/repeater/tree/AbstractTree.eea       |   2 +-
 .../html/repeater/tree/DefaultNestedTree.eea  |   2 +-
 .../html/repeater/tree/DefaultTableTree.eea   |   4 +-
 .../markup/html/repeater/tree/NestedTree.eea  |   4 +-
 .../markup/html/repeater/tree/Node.eea        |   4 +-
 .../markup/html/repeater/tree/TableTree.eea   |   6 +-
 .../repeater/tree/content/CheckedFolder.eea   |   2 +-
 .../html/repeater/tree/content/Folder.eea     |   2 +-
 .../repeater/tree/content/StyledLinkLabel.eea |   4 +-
 .../html/repeater/tree/nested/Subtree.eea     |   2 +-
 .../html/repeater/tree/table/NodeModel.eea    |   2 +-
 .../html/repeater/tree/table/TreeColumn.eea   |   2 +-
 .../repeater/tree/table/TreeDataProvider.eea  |   2 +-
 .../html/repeater/util/ProviderSubset.eea     |   4 +-
 .../html/repeater/util/TreeModelProvider.eea  |   2 +-
 .../markup/html/tabs/TabbedPanel.eea          |   8 +-
 .../wicket/extensions/rating/RatingPanel.eea  |   8 +-
 .../extensions/util/encoding/CharSetMap.eea   |   6 +-
 .../extensions/wizard/StaticContentStep.eea   |   2 +-
 .../wicket/extensions/wizard/Wizard.eea       |   6 +-
 .../extensions/wizard/WizardButtonBar.eea     |  12 +-
 .../wicket/extensions/wizard/WizardStep.eea   |   6 +-
 .../wizard/dynamic/DynamicWizardModel.eea     |   2 +-
 .../wizard/dynamic/DynamicWizardStep.eea      |   2 +-
 .../wicket/feedback/FeedbackCollector.eea     |   2 +-
 .../wicket/feedback/FeedbackMessages.eea      |   4 +-
 .../wicket/feedback/FencedFeedbackPanel.eea   |   2 +-
 .../org/apache/wicket/markup/ComponentTag.eea |   2 +-
 .../apache/wicket/markup/ContainerInfo.eea    |   2 +-
 .../markup/DefaultMarkupCacheKeyProvider.eea  |   2 +-
 .../DefaultMarkupResourceStreamProvider.eea   |   2 +-
 .../org/apache/wicket/markup/Markup.eea       |   2 +-
 .../org/apache/wicket/markup/MarkupCache.eea  |   8 +-
 .../apache/wicket/markup/MarkupFactory.eea    |  12 +-
 .../apache/wicket/markup/MarkupFragment.eea   |   6 +-
 .../org/apache/wicket/markup/MarkupParser.eea |   2 +-
 .../wicket/markup/MarkupResourceStream.eea    |   4 +-
 .../org/apache/wicket/markup/MarkupStream.eea |   8 +-
 .../org/apache/wicket/markup/MergedMarkup.eea |   2 +-
 .../org/apache/wicket/markup/RawMarkup.eea    |   2 +-
 .../org/apache/wicket/markup/TagUtils.eea     |   2 +-
 .../wicket/markup/head/CssHeaderItem.eea      |  10 +-
 .../markup/head/CssReferenceHeaderItem.eea    |   6 +-
 .../apache/wicket/markup/head/HeaderItem.eea  |   2 +-
 .../markup/head/JavaScriptHeaderItem.eea      |   6 +-
 .../head/JavaScriptReferenceHeaderItem.eea    |   2 +-
 .../wicket/markup/head/MetaDataHeaderItem.eea |   8 +-
 .../markup/head/OnDomReadyHeaderItem.eea      |   4 +-
 .../wicket/markup/head/OnEventHeaderItem.eea  |   6 +-
 .../wicket/markup/head/OnLoadHeaderItem.eea   |   4 +-
 .../wicket/markup/head/PriorityHeaderItem.eea |   4 +-
 .../wicket/markup/head/StringHeaderItem.eea   |   2 +-
 .../markup/head/filter/FilteredHeaderItem.eea |   4 +-
 ...ScriptFilteredIntoFooterHeaderResponse.eea |   4 +-
 .../markup/head/http2/PushHeaderItem.eea      |   2 +-
 .../apache/wicket/markup/html/MarkupUtil.eea  |   2 +-
 .../html/TransparentWebMarkupContainer.eea    |   2 +-
 .../org/apache/wicket/markup/html/WebPage.eea |   2 +-
 .../wicket/markup/html/basic/EnumLabel.eea    |   4 +-
 .../border/Border$BorderBodyContainer.eea     |   6 +-
 .../wicket/markup/html/border/Border.eea      |   6 +-
 .../wicket/markup/html/border/BorderPanel.eea |   2 +-
 .../markup/html/form/AbstractChoice.eea       |   6 +-
 .../html/form/AbstractSingleSelectChoice.eea  |   8 +-
 .../markup/html/form/AutoLabelResolver.eea    |   4 +-
 .../html/form/AutoLabelTextResolver.eea       |   2 +-
 .../apache/wicket/markup/html/form/Button.eea |   4 +-
 .../apache/wicket/markup/html/form/Check.eea  |   2 +-
 .../wicket/markup/html/form/CheckBox.eea      |   2 +-
 .../html/form/CheckBoxMultipleChoice.eea      |   6 +-
 .../markup/html/form/CheckBoxSelector.eea     |   2 +-
 .../wicket/markup/html/form/CheckGroup.eea    |   2 +-
 .../markup/html/form/EmailTextField.eea       |   2 +-
 .../markup/html/form/EnumChoiceRenderer.eea   |   2 +-
 .../apache/wicket/markup/html/form/Form.eea   |  12 +-
 .../wicket/markup/html/form/FormComponent.eea |  12 +-
 .../markup/html/form/FormComponentPanel.eea   |   2 +-
 .../form/FormComponentUpdatingBehavior.eea    |   2 +-
 .../wicket/markup/html/form/HiddenField.eea   |   2 +-
 .../markup/html/form/IChoiceRenderer.eea      |   2 +-
 .../markup/html/form/ListMultipleChoice.eea   |   4 +-
 .../markup/html/form/NumberTextField.eea      |   2 +-
 .../markup/html/form/PasswordTextField.eea    |   2 +-
 .../apache/wicket/markup/html/form/Radio.eea  |   2 +-
 .../wicket/markup/html/form/RadioChoice.eea   |   6 +-
 .../wicket/markup/html/form/RadioGroup.eea    |   2 +-
 .../markup/html/form/RangeTextField.eea       |   2 +-
 .../wicket/markup/html/form/SubmitLink.eea    |   2 +-
 .../wicket/markup/html/form/TextField.eea     |   2 +-
 .../wicket/markup/html/form/UrlTextField.eea  |   2 +-
 .../html/form/upload/FileUploadField.eea      |   4 +-
 .../form/upload/FilesSelectedBehavior.eea     |   2 +-
 .../resource/AbstractFileUploadResource.eea   |   4 +-
 .../resource/FileUploadResourceReference.eea  |   4 +-
 .../FileUploadToResourceField$UploadInfo.eea  |   4 +-
 .../resource/FileUploadToResourceField.eea    |  18 +--
 .../resource/FolderUploadsFileManager.eea     |   2 +-
 .../FormComponentFeedbackBorder.eea           |   2 +-
 .../markup/html/image/ExternalSource.eea      |   2 +-
 .../apache/wicket/markup/html/image/Image.eea |   2 +-
 .../wicket/markup/html/image/Source.eea       |   2 +-
 .../resource/DefaultButtonImageResource.eea   |   8 +-
 .../DefaultButtonImageResourceFactory.eea     |   2 +-
 .../wicket/markup/html/include/Include.eea    |   2 +-
 .../wicket/markup/html/internal/Enclosure.eea |   2 +-
 .../html/internal/HtmlHeaderContainer.eea     |   2 +-
 .../apache/wicket/markup/html/link/Link.eea   |   4 +-
 .../wicket/markup/html/link/PopupSettings.eea |   2 +-
 .../wicket/markup/html/list/ListView.eea      |  12 +-
 .../apache/wicket/markup/html/list/Loop.eea   |   4 +-
 .../markup/html/list/PageableListView.eea     |   4 +-
 .../markup/html/list/PropertyListView.eea     |   2 +-
 .../navigation/paging/PagingNavigation.eea    |   2 +-
 .../navigation/paging/PagingNavigator.eea     |   4 +-
 .../markup/html/pages/BrowserInfoForm.eea     |   2 +-
 .../markup/html/pages/BrowserInfoPage.eea     |   2 +-
 .../markup/html/pages/ExceptionErrorPage.eea  |   4 +-
 .../panel/BorderMarkupSourcingStrategy.eea    |   2 +-
 .../panel/DefaultMarkupSourcingStrategy.eea   |   2 +-
 .../markup/html/panel/FeedbackPanel.eea       |   8 +-
 .../wicket/markup/html/panel/Fragment.eea     |   4 +-
 .../apache/wicket/markup/html/panel/Panel.eea |   2 +-
 .../apache/wicket/markup/parser/TagStack.eea  |   2 +-
 .../wicket/markup/parser/XmlPullParser.eea    |   2 +-
 .../apache/wicket/markup/parser/XmlTag.eea    |   6 +-
 .../markup/parser/filter/EnclosureHandler.eea |   2 +-
 .../parser/filter/InlineEnclosureHandler.eea  |   2 +-
 .../filter/RelativePathPrefixHandler.eea      |   2 +-
 .../markup/parser/filter/RootMarkupFilter.eea |   4 +-
 .../parser/filter/WicketLinkTagHandler.eea    |   2 +-
 .../parser/filter/WicketMessageTagHandler.eea |   2 +-
 .../parser/filter/WicketTagIdentifier.eea     |   2 +-
 .../markup/repeater/AbstractPageableView.eea  |   2 +-
 .../repeater/DefaultItemReuseStrategy.eea     |   2 +-
 .../wicket/markup/repeater/RefreshingView.eea |   4 +-
 .../repeater/ReuseIfModelsEqualStrategy.eea   |   2 +-
 .../markup/repeater/data/DataViewBase.eea     |   2 +-
 .../repeater/data/EmptyDataProvider.eea       |   2 +-
 .../wicket/markup/repeater/data/GridView.eea  |   6 +-
 .../markup/repeater/data/ListDataProvider.eea |   2 +-
 ...olver$AbstractAutolinkResolverDelegate.eea |   2 +-
 ...kResolver$AutolinkBookmarkablePageLink.eea |   2 +-
 .../markup/resolver/AutoLinkResolver.eea      |   2 +-
 .../markup/resolver/ComponentResolvers.eea    |   4 +-
 .../markup/resolver/HtmlHeaderResolver.eea    |   4 +-
 .../resolver/WicketContainerResolver.eea      |   2 +-
 .../markup/resolver/WicketMessageResolver.eea |   2 +-
 .../AbstractOutputTransformerContainer.eea    |   2 +-
 .../AbstractTransformerBehavior.eea           |   2 +-
 .../apache/wicket/mock/MockApplication.eea    |   4 +-
 .../apache/wicket/mock/MockPageManager.eea    |   2 +-
 .../org/apache/wicket/mock/MockPageStore.eea  |   2 +-
 .../wicket/mock/MockRequestParameters.eea     |   2 +-
 .../org/apache/wicket/mock/MockWebRequest.eea |   6 +-
 .../apache/wicket/mock/MockWebResponse.eea    |   6 +-
 .../wicket/model/AbstractPropertyModel.eea    |  10 +-
 .../org/apache/wicket/model/ChainingModel.eea |   2 +-
 .../wicket/model/ComponentDetachableModel.eea |   6 +-
 .../apache/wicket/model/ComponentModel.eea    |   6 +-
 .../wicket/model/ComponentPropertyModel.eea   |   4 +-
 .../wicket/model/CompoundPropertyModel.eea    |   8 +-
 .../org/apache/wicket/model/IModel.eea        |  14 +-
 .../org/apache/wicket/model/IWrapModel.eea    |   2 +-
 .../org/apache/wicket/model/LambdaModel.eea   |   4 +-
 .../wicket/model/LoadableDetachableModel.eea  |   2 +-
 .../org/apache/wicket/model/Model.eea         |   2 +-
 .../org/apache/wicket/model/PropertyModel.eea |   2 +-
 .../org/apache/wicket/model/ResourceModel.eea |   2 +-
 .../wicket/model/StringResourceModel.eea      |   2 +-
 .../wicket/model/util/CollectionModel.eea     |   2 +-
 .../wicket/model/util/GenericBaseModel.eea    |   4 +-
 .../apache/wicket/model/util/ListModel.eea    |   2 +-
 .../org/apache/wicket/model/util/MapModel.eea |   2 +-
 .../org/apache/wicket/model/util/SetModel.eea |   2 +-
 .../wicket/page/PageAccessSynchronizer.eea    |   2 +-
 .../org/apache/wicket/page/PageManager.eea    |   2 +-
 .../pageStore/AbstractPersistentPageStore.eea |   4 +-
 .../pageStore/AsynchronousPageStore.eea       |   2 +-
 .../wicket/pageStore/CryptingPageStore.eea    |   2 +-
 .../pageStore/DiskPageStore$DiskData.eea      |   2 +-
 .../apache/wicket/pageStore/DiskPageStore.eea |   4 +-
 .../apache/wicket/pageStore/FilePageStore.eea |  10 +-
 .../wicket/pageStore/GroupingPageStore.eea    |   4 +-
 .../InMemoryPageStore$MemoryData.eea          |   4 +-
 .../InMemoryPageStore$SizeLimitedData.eea     |   2 +-
 .../wicket/pageStore/InMemoryPageStore.eea    |   2 +-
 .../InSessionPageStore$SessionData.eea        |   4 +-
 .../wicket/pageStore/InSessionPageStore.eea   |   2 +-
 .../apache/wicket/pageStore/NoopPageStore.eea |   2 +-
 .../wicket/pageStore/disk/NestedFolders.eea   |   4 +-
 .../pageStore/disk/PageWindowManager.eea      |   6 +-
 .../protocol/http/AbstractRequestLogger.eea   |   2 +-
 .../protocol/http/BufferedWebResponse.eea     |   6 +-
 .../ContextParamWebApplicationFactory.eea     |   4 +-
 .../http/IRequestLogger$RequestData.eea       |   2 +-
 .../http/IRequestLogger$SessionData.eea       |   4 +-
 .../protocol/http/IWebApplicationFactory.eea  |   2 +-
 .../http/OriginResourceIsolationPolicy.eea    |   4 +-
 .../protocol/http/ReloadingWicketServlet.eea  |   2 +-
 .../wicket/protocol/http/RequestUtils.eea     |   2 +-
 .../wicket/protocol/http/WebApplication.eea   |  12 +-
 .../wicket/protocol/http/WebSession.eea       |   2 +-
 .../wicket/protocol/http/WicketFilter.eea     |   4 +-
 .../wicket/protocol/http/WicketServlet.eea    |   2 +-
 .../protocol/http/mock/CookieCollection.eea   |   6 +-
 .../wicket/protocol/http/mock/Cookies.eea     |   4 +-
 .../http/mock/MockHttpServletRequest.eea      |  54 ++++----
 .../http/mock/MockHttpServletResponse.eea     |   8 +-
 .../protocol/http/mock/MockServletContext.eea |  38 +++---
 .../protocol/http/servlet/ErrorAttributes.eea |   2 +-
 .../http/servlet/ForwardAttributes.eea        |   2 +-
 .../servlet/MultipartServletWebRequest.eea    |   2 +-
 .../MultipartServletWebRequestImpl.eea        |   8 +-
 ...uredRemoteAddressRequestWrapperFactory.eea |   2 +-
 .../http/servlet/ServletWebRequest.eea        |   8 +-
 .../protocol/http/servlet/UploadInfo.eea      |   2 +-
 .../http/servlet/XForwardedRequestWrapper.eea |   2 +-
 .../XForwardedRequestWrapperFactory.eea       |   2 +-
 .../wicket/protocol/https/HttpsMapper.eea     |   4 +-
 .../wicket/request/HttpHeaderCollection.eea   |   4 +-
 .../org/apache/wicket/request/Response.eea    |   2 +-
 .../org/apache/wicket/request/Url.eea         |  12 +-
 .../org/apache/wicket/request/UrlRenderer.eea |   2 +-
 .../request/cycle/IRequestCycleListener.eea   |   2 +-
 .../wicket/request/cycle/RequestCycle.eea     |   2 +-
 .../cycle/RequestCycleListenerCollection.eea  |   2 +-
 .../request/handler/render/PageRenderer.eea   |   2 +-
 .../handler/render/WebPageRenderer.eea        |   2 +-
 .../apache/wicket/request/http/WebRequest.eea |   4 +-
 .../wicket/request/mapper/AbstractMapper.eea  |   6 +-
 .../request/mapper/info/ComponentInfo.eea     |   2 +-
 .../request/mapper/info/PageComponentInfo.eea |   2 +-
 .../wicket/request/mapper/info/PageInfo.eea   |   2 +-
 .../parameter/PageParametersEncoder.eea       |   4 +-
 .../UrlPathPageParametersEncoder.eea          |   4 +-
 .../CombinedRequestParametersAdapter.eea      |   2 +-
 .../parameter/EmptyRequestParameters.eea      |   2 +-
 .../parameter/UrlRequestParametersAdapter.eea |   2 +-
 .../request/resource/BaseDataResource.eea     |   2 +-
 .../request/resource/CharSequenceResource.eea |   2 +-
 .../resource/ContextRelativeResource.eea      |   6 +-
 .../ContextRelativeResourceReference.eea      |   2 +-
 .../request/resource/CssResourceReference.eea |   2 +-
 .../request/resource/DynamicImageResource.eea |   2 +-
 .../resource/IResourceReferenceFactory.eea    |   2 +-
 .../resource/JavaScriptResourceReference.eea  |   2 +-
 .../MetaInfStaticResourceReference.eea        |   2 +-
 .../request/resource/PackageResource.eea      |   4 +-
 .../resource/PackageResourceReference.eea     |   4 +-
 .../request/resource/ResourceReference.eea    |  10 +-
 ...gistry$DefaultResourceReferenceFactory.eea |   2 +-
 .../resource/ResourceReferenceRegistry.eea    |   2 +-
 .../resource/ResourceStreamResource.eea       |   2 +-
 .../request/resource/UrlResourceReference.eea |   4 +-
 .../version/CachingResourceVersion.eea        |   2 +-
 .../version/LastModifiedResourceVersion.eea   |   2 +-
 .../version/MessageDigestResourceVersion.eea  |   2 +-
 .../wicket/resource/FileSystemResource.eea    |   2 +-
 .../resource/FileSystemResourceReference.eea  |   2 +-
 .../IsoPropertiesFilePropertiesLoader.eea     |   4 +-
 .../JQueryPluginResourceReference.eea         |   2 +-
 .../wicket/resource/PropertiesFactory.eea     |   6 +-
 .../apache/wicket/resource/ResourceUtil.eea   |  10 +-
 .../UtfPropertiesFilePropertiesLoader.eea     |   4 +-
 .../resource/XmlFilePropertiesLoader.eea      |   4 +-
 .../resource/bundles/ConcatBundleResource.eea |   6 +-
 .../bundles/ConcatResourceBundleReference.eea |   4 +-
 .../ReplacementResourceBundleReference.eea    |   2 +-
 .../bundles/ResourceBundleReference.eea       |   2 +-
 .../loader/BundleStringResourceLoader.eea     |   2 +-
 .../loader/ClassStringResourceLoader.eea      |   2 +-
 .../loader/ComponentStringResourceLoader.eea  |   4 +-
 .../InitializerStringResourceLoader.eea       |   2 +-
 .../loader/PackageStringResourceLoader.eea    |   2 +-
 .../loader/ValidatorStringResourceLoader.eea  |   4 +-
 .../wicket/response/ByteArrayResponse.eea     |   2 +-
 .../apache/wicket/response/NullResponse.eea   |   4 +-
 .../apache/wicket/response/StringResponse.eea |   6 +-
 .../serialize/java/DeflatedJavaSerializer.eea |   6 +-
 .../wicket/serialize/java/JavaSerializer.eea  |   6 +-
 .../wicket/session/HttpSessionStore.eea       |   6 +-
 ...ultUnauthorizedResourceRequestListener.eea |   2 +-
 .../wicket/settings/RequestCycleSettings.eea  |   2 +-
 .../apache/wicket/util/LazyInitializer.eea    |   2 +-
 .../org/apache/wicket/util/LongEncoder.eea    |   2 +-
 .../org/apache/wicket/util/NullProvider.eea   |   2 +-
 .../org/apache/wicket/util/ValueProvider.eea  |   2 +-
 .../util/collections/ClassMetaCache.eea       |   2 +-
 .../wicket/util/collections/IntHashMap.eea    |   4 +-
 .../wicket/util/collections/MultiMap.eea      |   2 +-
 .../convert/converter/AbstractConverter.eea   |   2 +-
 .../converter/AbstractDateConverter.eea       |   4 +-
 .../converter/AbstractJavaTimeConverter.eea   |   4 +-
 .../converter/AbstractNumberConverter.eea     |   2 +-
 .../convert/converter/BigDecimalConverter.eea |   2 +-
 .../convert/converter/BigIntegerConverter.eea |   4 +-
 .../convert/converter/BooleanConverter.eea    |   2 +-
 .../util/convert/converter/ByteConverter.eea  |   4 +-
 .../convert/converter/CalendarConverter.eea   |   2 +-
 .../convert/converter/CharacterConverter.eea  |   4 +-
 .../util/convert/converter/DateConverter.eea  |   4 +-
 .../convert/converter/DoubleConverter.eea     |   4 +-
 .../util/convert/converter/FloatConverter.eea |   4 +-
 .../convert/converter/IntegerConverter.eea    |   4 +-
 .../convert/converter/LocalDateConverter.eea  |   4 +-
 .../converter/LocalDateTimeConverter.eea      |   4 +-
 .../convert/converter/LocalTimeConverter.eea  |   4 +-
 .../util/convert/converter/LongConverter.eea  |   4 +-
 .../util/convert/converter/ShortConverter.eea |   4 +-
 .../convert/converter/SqlDateConverter.eea    |   4 +-
 .../convert/converter/SqlTimeConverter.eea    |   4 +-
 .../converter/SqlTimestampConverter.eea       |   4 +-
 .../converter/ZonedDateTimeConverter.eea      |   4 +-
 .../wicket/util/cookies/CookieUtils.eea       |   4 +-
 .../wicket/util/crypt/AbstractCrypt.eea       |   4 +-
 .../apache/wicket/util/crypt/CipherUtils.eea  |   2 +-
 .../apache/wicket/util/crypt/StringUtils.eea  |   2 +-
 .../apache/wicket/util/crypt/SunJceCrypt.eea  |   8 +-
 .../apache/wicket/util/crypt/TrivialCrypt.eea |   2 +-
 .../org/apache/wicket/util/diff/Chunk.eea     |   2 +-
 .../org/apache/wicket/util/diff/Delta.eea     |   4 +-
 .../org/apache/wicket/util/diff/Diff.eea      |   6 +-
 .../org/apache/wicket/util/diff/Revision.eea  |   2 +-
 .../org/apache/wicket/util/diff/ToString.eea  |   2 +-
 .../wicket/util/diff/myers/MyersDiff.eea      |   2 +-
 .../wicket/util/diff/myers/PathNode.eea       |   2 +-
 .../org/apache/wicket/util/file/File.eea      |  14 +-
 .../org/apache/wicket/util/file/Files.eea     |   8 +-
 .../org/apache/wicket/util/file/Folder.eea    |   6 +-
 .../org/apache/wicket/util/file/Path.eea      |   2 +-
 .../apache/wicket/util/file/WebXmlFile.eea    |   2 +-
 .../apache/wicket/util/image/ImageUtil.eea    |   2 +-
 .../wicket/util/io/ByteArrayOutputStream.eea  |   4 +-
 .../apache/wicket/util/io/ByteOrderMark.eea   |   2 +-
 .../org/apache/wicket/util/io/Connections.eea |   2 +-
 .../DeferredFileOutputStream$FileFactory.eea  |   2 +-
 .../util/io/DeferredFileOutputStream.eea      |   2 +-
 .../org/apache/wicket/util/io/IOUtils.eea     |   6 +-
 .../org/apache/wicket/util/io/Streams.eea     |   2 +-
 .../org/apache/wicket/util/lang/Bytes.eea     |   2 +-
 .../wicket/util/lang/EnumeratedType.eea       |   2 +-
 .../apache/wicket/util/lang/Exceptions.eea    |   2 +-
 .../org/apache/wicket/util/lang/Generics.eea  |  12 +-
 .../apache/wicket/util/lang/PackageName.eea   |   4 +-
 .../wicket/util/reference/ClassReference.eea  |   2 +-
 .../util/resource/AbstractResourceStream.eea  |   6 +-
 .../resource/AbstractResourceStreamWriter.eea |   6 +-
 .../resource/AbstractStringResourceStream.eea |  10 +-
 .../util/resource/FileResourceStream.eea      |   8 +-
 .../resource/FileSystemResourceStream.eea     |   8 +-
 .../wicket/util/resource/ResourceUtils.eea    |   2 +-
 .../resource/StringBufferResourceStream.eea   |   2 +-
 .../util/resource/StringResourceStream.eea    |   2 +-
 .../util/resource/XSLTResourceStream.eea      |  10 +-
 .../util/resource/ZipResourceStream.eea       |   8 +-
 .../wicket/util/string/AbstractStringList.eea |   6 +-
 .../apache/wicket/util/string/StringList.eea  |  16 +--
 .../apache/wicket/util/string/StringValue.eea |   4 +-
 .../org/apache/wicket/util/string/Strings.eea |   8 +-
 .../interpolator/MapVariableInterpolator.eea  |   2 +-
 .../wicket/util/template/CssTemplate.eea      |   4 +-
 .../util/template/JavaScriptTemplate.eea      |   4 +-
 .../util/template/PackageTextTemplate.eea     |   2 +-
 .../util/template/TextTemplateDecorator.eea   |   8 +-
 .../apache/wicket/util/value/AttributeMap.eea |   2 +-
 .../org/apache/wicket/util/value/ValueMap.eea |  16 +--
 .../wicket/util/watch/ModificationWatcher.eea |   2 +-
 ...EntityResolver$ServletApiEntityLocator.eea |   2 +-
 .../wicket/util/xml/CustomEntityResolver.eea  |   2 +-
 .../wicket/validation/ValidationError.eea     |   2 +-
 .../validation/validator/DateValidator.eea    |  12 +-
 .../validation/validator/RangeValidator.eea   |   6 +-
 .../validation/validator/StringValidator.eea  |   8 +-
 .../wicketstuff/datetime/DateConverter.eea    |   4 +-
 .../yui/calendar/AbstractCalendar.eea         |   4 +-
 .../extensions/yui/calendar/DatePicker.eea    |  12 +-
 .../extensions/yui/calendar/DateTimeField.eea |  14 +-
 .../datetime/markup/html/basic/DateLabel.eea  |   2 +-
 .../markup/html/form/DateTextField.eea        |   6 +-
 .../minis/behavior/apanel/APanel.eea          |   2 +-
 .../minis/behavior/apanel/FlowLayout.eea      |   2 +-
 .../minis/behavior/apanel/GridLayout.eea      |   2 +-
 .../apanel/RenderersList$BaseRenderer.eea     |   2 +-
 .../apanel/RenderersList$ButtonRenderer.eea   |   2 +-
 .../apanel/RenderersList$DefaultRenderer.eea  |   2 +-
 ...List$DefaultWebMarkupContainerRenderer.eea |   2 +-
 .../apanel/RenderersList$FormRenderer.eea     |   2 +-
 .../apanel/RenderersList$LabelRenderer.eea    |   2 +-
 .../apanel/RenderersList$LinkRenderer.eea     |   2 +-
 .../apanel/RenderersList$ListViewRenderer.eea |   2 +-
 .../RenderersList$RepeatingViewRenderer.eea   |   2 +-
 .../ie/DocumentCompatibilityBehavior.eea      |  18 +--
 .../behavior/prototip/PrototipBehaviour.eea   |   2 +-
 .../behavior/prototip/PrototipSettings.eea    |   2 +-
 .../ReflectionBehavior$Javascript.eea         |   4 +-
 .../safari/PersistedCacheBehavior.eea         |   2 +-
 .../minis/behavior/spinner/Spinner.eea        |   4 +-
 .../StyleSwitcher$Javascript.eea              |   2 +-
 ...oltipsyOptions$TooltipsyOptionsBuilder.eea |   2 +-
 .../behavior/tooltipsy/TooltipsyOptions.eea   |   4 +-
 .../StringValidatorWithMaxLength.eea          |   6 +-
 .../veil/VeilResources$Javascript$Generic.eea |   6 +-
 .../minis/model/ReplacingResourceModel.eea    |   2 +-
 .../model/collection/DetachableHashSet.eea    |   2 +-
 .../com/thoughtworks/xstream/XStream.eea      |  26 ++--
 .../com/thoughtworks/xstream/XStreamer.eea    |   2 +-
 .../basic/AbstractSingleValueConverter.eea    |   2 +-
 .../converters/basic/BigDecimalConverter.eea  |   2 +-
 .../converters/basic/BigIntegerConverter.eea  |   2 +-
 .../converters/basic/BooleanConverter.eea     |   2 +-
 .../converters/basic/CharConverter.eea        |   2 +-
 .../converters/basic/DateConverter.eea        |   2 +-
 .../basic/StringBufferConverter.eea           |   2 +-
 .../basic/StringBuilderConverter.eea          |   2 +-
 .../xstream/converters/basic/URIConverter.eea |   2 +-
 .../xstream/converters/basic/URLConverter.eea |   2 +-
 .../AbstractCollectionConverter.eea           |   2 +-
 .../collections/CollectionConverter.eea       |   2 +-
 .../converters/collections/MapConverter.eea   |   2 +-
 .../collections/TreeMapConverter.eea          |   2 +-
 .../enums/EnumSingleValueConverter.eea        |   2 +-
 .../enums/EnumToStringConverter.eea           |   2 +-
 .../extended/AtomicBooleanConverter.eea       |   4 +-
 .../extended/AtomicIntegerConverter.eea       |   4 +-
 .../extended/AtomicLongConverter.eea          |   4 +-
 .../converters/extended/CharsetConverter.eea  |   2 +-
 .../converters/extended/FileConverter.eea     |   4 +-
 .../extended/ISO8601DateConverter.eea         |   2 +-
 .../ISO8601GregorianCalendarConverter.eea     |   2 +-
 .../extended/ISO8601SqlTimestampConverter.eea |   4 +-
 .../extended/JavaClassConverter.eea           |   2 +-
 .../converters/extended/LocaleConverter.eea   |   2 +-
 .../extended/NamedCollectionConverter.eea     |   2 +-
 .../converters/extended/NamedMapConverter.eea |   2 +-
 .../extended/OptionalDoubleConverter.eea      |   2 +-
 .../extended/OptionalIntConverter.eea         |   2 +-
 .../extended/OptionalLongConverter.eea        |   2 +-
 .../converters/extended/PathConverter.eea     |   2 +-
 .../extended/SqlTimestampConverter.eea        |   2 +-
 .../extended/StackTraceElementConverter.eea   |   2 +-
 .../extended/StackTraceElementFactory.eea     |   2 +-
 .../converters/extended/SubjectConverter.eea  |   2 +-
 .../converters/extended/ToStringConverter.eea |   2 +-
 .../converters/javabean/BeanProvider.eea      |   2 +-
 .../javabean/ComparingPropertySorter.eea      |   2 +-
 .../javabean/PropertyDictionary.eea           |   2 +-
 ...tedCharacterIteratorAttributeConverter.eea |   2 +-
 .../reflection/CGLIBEnhancedConverter.eea     |   2 +-
 .../reflection/NativeFieldKeySorter.eea       |   2 +-
 .../reflection/SerializableConverter.eea      |   2 +-
 .../converters/time/HijrahDateConverter.eea   |   2 +-
 .../core/AbstractReferenceMarshaller.eea      |   4 +-
 .../core/AbstractTreeMarshallingStrategy.eea  |   4 +-
 .../xstream/core/DefaultConverterLookup.eea   |   2 +-
 .../com/thoughtworks/xstream/core/JVM.eea     |   6 +-
 .../xstream/core/ReferenceByIdMarshaller.eea  |   4 +-
 .../core/ReferenceByIdMarshallingStrategy.eea |   4 +-
 .../core/ReferenceByXPathMarshaller.eea       |   4 +-
 .../ReferenceByXPathMarshallingStrategy.eea   |   4 +-
 .../xstream/core/TreeMarshaller.eea           |   2 +-
 .../xstream/core/TreeMarshallingStrategy.eea  |   4 +-
 .../xstream/core/TreeUnmarshaller.eea         |   4 +-
 .../xstream/core/util/Base64Encoder.eea       |   2 +-
 .../xstream/core/util/Cloneables.eea          |   2 +-
 .../core/util/CustomObjectInputStream.eea     |   6 +-
 .../core/util/CustomObjectOutputStream.eea    |   4 +-
 .../core/util/ISO8601JavaTimeConverter.eea    |   2 +-
 .../core/util/ISO8601JodaTimeConverter.eea    |   2 +-
 .../xstream/core/util/PresortedMap.eea        |  20 +--
 .../xstream/core/util/PresortedSet.eea        |   6 +-
 .../xstream/core/util/PrioritizedList.eea     |   2 +-
 .../xstream/core/util/WeakCache.eea           |   8 +-
 .../xstream/io/AbstractDriver.eea             |   4 +-
 .../xstream/io/AbstractReader.eea             |   2 +-
 .../xstream/io/HierarchicalStreamDriver.eea   |  12 +-
 .../xstream/io/binary/BinaryStreamDriver.eea  |   8 +-
 .../xstream/io/binary/BinaryStreamReader.eea  |   2 +-
 .../io/json/JettisonMappedXmlDriver.eea       |  12 +-
 .../io/json/JsonHierarchicalStreamDriver.eea  |  12 +-
 .../com/thoughtworks/xstream/io/path/Path.eea |   2 +-
 .../xstream/io/xml/AbstractDocumentReader.eea |   2 +-
 .../xstream/io/xml/AbstractDocumentWriter.eea |   2 +-
 .../xstream/io/xml/AbstractPullReader.eea     |   4 +-
 .../xstream/io/xml/AbstractXmlDriver.eea      |   2 +-
 .../xstream/io/xml/AbstractXppDomDriver.eea   |  10 +-
 .../xstream/io/xml/AbstractXppDriver.eea      |  10 +-
 .../xstream/io/xml/BEAStaxDriver.eea          |   4 +-
 .../xstream/io/xml/Dom4JDriver.eea            |  14 +-
 .../xstream/io/xml/Dom4JReader.eea            |   2 +-
 .../xstream/io/xml/Dom4JWriter.eea            |   2 +-
 .../thoughtworks/xstream/io/xml/DomDriver.eea |  14 +-
 .../thoughtworks/xstream/io/xml/DomReader.eea |   4 +-
 .../thoughtworks/xstream/io/xml/DomWriter.eea |   2 +-
 .../xstream/io/xml/JDom2Driver.eea            |  14 +-
 .../xstream/io/xml/JDom2Reader.eea            |   2 +-
 .../xstream/io/xml/JDom2Writer.eea            |   2 +-
 .../xstream/io/xml/JDomDriver.eea             |  14 +-
 .../xstream/io/xml/JDomReader.eea             |   2 +-
 .../xstream/io/xml/JDomWriter.eea             |   2 +-
 .../xstream/io/xml/KXml2DomDriver.eea         |   2 +-
 .../xstream/io/xml/KXml2Driver.eea            |   2 +-
 .../xstream/io/xml/MXParserDomDriver.eea      |   2 +-
 .../xstream/io/xml/MXParserDriver.eea         |   2 +-
 .../xstream/io/xml/SjsxpDriver.eea            |   4 +-
 .../xstream/io/xml/StandardStaxDriver.eea     |   4 +-
 .../xstream/io/xml/StaxDriver.eea             |  28 ++--
 .../xstream/io/xml/WstxDriver.eea             |   4 +-
 .../xstream/io/xml/XmlFriendlyNameCoder.eea   |   2 +-
 .../thoughtworks/xstream/io/xml/XomDriver.eea |  14 +-
 .../thoughtworks/xstream/io/xml/XomReader.eea |   4 +-
 .../thoughtworks/xstream/io/xml/XomWriter.eea |   2 +-
 .../xstream/io/xml/Xpp3DomDriver.eea          |   2 +-
 .../xstream/io/xml/Xpp3Driver.eea             |   2 +-
 .../xstream/io/xml/XppDomDriver.eea           |   2 +-
 .../xstream/io/xml/XppDomReader.eea           |   2 +-
 .../xstream/io/xml/XppDomWriter.eea           |   2 +-
 .../thoughtworks/xstream/io/xml/XppDriver.eea |   4 +-
 .../thoughtworks/xstream/io/xml/XppReader.eea |   2 +-
 .../xstream/io/xml/xppdom/XppDom.eea          |   2 +-
 .../xstream/io/xml/xppdom/XppFactory.eea      |   2 +-
 .../mapper/AbstractXmlFriendlyMapper.eea      |   6 +-
 .../xstream/mapper/AttributeMapper.eea        |   6 +-
 .../xstream/mapper/DefaultMapper.eea          |  22 ++--
 .../mapper/ImplicitCollectionMapper.eea       |   6 +-
 ...sistenceStrategy$XmlMapEntriesIterator.eea |   2 +-
 .../AbstractFilePersistenceStrategy.eea       |   2 +-
 .../persistence/FilePersistenceStrategy.eea   |   8 +-
 .../persistence/FileStreamStrategy.eea        |   6 +-
 .../xstream/persistence/XmlMap.eea            |   2 +-
 7891 files changed, 20418 insertions(+), 20418 deletions(-)

diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/ByteBuddy$EnumerationImplementation$InitializationAppender.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/ByteBuddy$EnumerationImplementation$InitializationAppender.eea
index b814a0618e..139bff9102 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/ByteBuddy$EnumerationImplementation$InitializationAppender.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/ByteBuddy$EnumerationImplementation$InitializationAppender.eea
@@ -5,7 +5,7 @@ class net/bytebuddy/ByteBuddy$EnumerationImplementation$InitializationAppender
  (Ljava/util/List<Ljava/lang/String;>;)V
 apply
  (Lnet/bytebuddy/jar/asm/MethodVisitor;Lnet/bytebuddy/implementation/Implementation$Context;Lnet/bytebuddy/description/method/MethodDescription;)Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender$Size;
- (Lnet/bytebuddy/jar/asm/MethodVisitor;Lnet/bytebuddy/implementation/Implementation$Context;Lnet/bytebuddy/description/method/MethodDescription;)Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender$Size;
+ (Lnet/bytebuddy/jar/asm/MethodVisitor;Lnet/bytebuddy/implementation/Implementation$Context;Lnet/bytebuddy/description/method/MethodDescription;)L1net/bytebuddy/implementation/bytecode/ByteCodeAppender$Size;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/ByteBuddy$EnumerationImplementation.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/ByteBuddy$EnumerationImplementation.eea
index cc50d0e939..f0e142d238 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/ByteBuddy$EnumerationImplementation.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/ByteBuddy$EnumerationImplementation.eea
@@ -15,7 +15,7 @@ ENUM_VALUE_OF_METHOD_NAME
  (Ljava/util/List<Ljava/lang/String;>;)V
 appender
  (Lnet/bytebuddy/implementation/Implementation$Target;)Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender;
- (Lnet/bytebuddy/implementation/Implementation$Target;)Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender;
+ (Lnet/bytebuddy/implementation/Implementation$Target;)L1net/bytebuddy/implementation/bytecode/ByteCodeAppender;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/ByteBuddy$RecordConstructorStrategy.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/ByteBuddy$RecordConstructorStrategy.eea
index 1db16500cc..2000ce999b 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/ByteBuddy$RecordConstructorStrategy.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/ByteBuddy$RecordConstructorStrategy.eea
@@ -6,7 +6,7 @@ super java/lang/Enum
 
 appender
  (Lnet/bytebuddy/implementation/Implementation$Target;)Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender;
- (Lnet/bytebuddy/implementation/Implementation$Target;)Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender;
+ (Lnet/bytebuddy/implementation/Implementation$Target;)L1net/bytebuddy/implementation/bytecode/ByteCodeAppender;
 extractConstructors
  (Lnet/bytebuddy/description/type/TypeDescription;)Ljava/util/List<Lnet/bytebuddy/description/method/MethodDescription$Token;>;
  (Lnet/bytebuddy/description/type/TypeDescription;)Ljava/util/List<Lnet/bytebuddy/description/method/MethodDescription$Token;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/ClassFileVersion$VersionLocator$Unresolved.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/ClassFileVersion$VersionLocator$Unresolved.eea
index eef780b4b5..414ce9bee0 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/ClassFileVersion$VersionLocator$Unresolved.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/ClassFileVersion$VersionLocator$Unresolved.eea
@@ -8,4 +8,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 resolve
  ()Lnet/bytebuddy/ClassFileVersion;
- ()Lnet/bytebuddy/ClassFileVersion;
+ ()L1net/bytebuddy/ClassFileVersion;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/ClassFileVersion.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/ClassFileVersion.eea
index 408b288151..c3d92d87e7 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/ClassFileVersion.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/ClassFileVersion.eea
@@ -97,7 +97,7 @@ ofJavaVersionString
  (Ljava/lang/String;)Lnet/bytebuddy/ClassFileVersion;
 ofMinorMajor
  (I)Lnet/bytebuddy/ClassFileVersion;
- (I)Lnet/bytebuddy/ClassFileVersion;
+ (I)L1net/bytebuddy/ClassFileVersion;
 ofThisVm
  ()Lnet/bytebuddy/ClassFileVersion;
  ()Lnet/bytebuddy/ClassFileVersion;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/NamingStrategy$PrefixingRandom.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/NamingStrategy$PrefixingRandom.eea
index 6ad9c6970f..81e3080877 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/NamingStrategy$PrefixingRandom.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/NamingStrategy$PrefixingRandom.eea
@@ -8,4 +8,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 name
  (Lnet/bytebuddy/description/type/TypeDescription;)Ljava/lang/String;
- (Lnet/bytebuddy/description/type/TypeDescription;)Ljava/lang/String;
+ (Lnet/bytebuddy/description/type/TypeDescription;)L1java/lang/String;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/NamingStrategy$Suffixing$BaseNameResolver$WithCallerSuffix.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/NamingStrategy$Suffixing$BaseNameResolver$WithCallerSuffix.eea
index 246b9e24b6..3ce20683e0 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/NamingStrategy$Suffixing$BaseNameResolver$WithCallerSuffix.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/NamingStrategy$Suffixing$BaseNameResolver$WithCallerSuffix.eea
@@ -8,4 +8,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 resolve
  (Lnet/bytebuddy/description/type/TypeDescription;)Ljava/lang/String;
- (Lnet/bytebuddy/description/type/TypeDescription;)Ljava/lang/String;
+ (Lnet/bytebuddy/description/type/TypeDescription;)L1java/lang/String;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/NamingStrategy$Suffixing.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/NamingStrategy$Suffixing.eea
index 9aefd321c6..673f0de087 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/NamingStrategy$Suffixing.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/NamingStrategy$Suffixing.eea
@@ -17,4 +17,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 name
  (Lnet/bytebuddy/description/type/TypeDescription;)Ljava/lang/String;
- (Lnet/bytebuddy/description/type/TypeDescription;)Ljava/lang/String;
+ (Lnet/bytebuddy/description/type/TypeDescription;)L1java/lang/String;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/NamingStrategy$SuffixingRandom.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/NamingStrategy$SuffixingRandom.eea
index 5b54518408..3e38e6e5a8 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/NamingStrategy$SuffixingRandom.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/NamingStrategy$SuffixingRandom.eea
@@ -29,4 +29,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(net.bytebuddy.NamingStrategy$Suffixing)
 name
  (Lnet/bytebuddy/description/type/TypeDescription;)Ljava/lang/String;
- (Lnet/bytebuddy/description/type/TypeDescription;)Ljava/lang/String;
+ (Lnet/bytebuddy/description/type/TypeDescription;)L1java/lang/String; # @Inherited(net.bytebuddy.NamingStrategy$Suffixing)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default$ExecutingTransformer$Factory$ForLegacyVm.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default$ExecutingTransformer$Factory$ForLegacyVm.eea
index 4967e9216e..c755547250 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default$ExecutingTransformer$Factory$ForLegacyVm.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default$ExecutingTransformer$Factory$ForLegacyVm.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 make
  (Lnet/bytebuddy/ByteBuddy;Lnet/bytebuddy/agent/builder/AgentBuilder$Listener;Lnet/bytebuddy/agent/builder/AgentBuilder$PoolStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$TypeStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$LocationStrategy;Lnet/bytebuddy/dynamic/ClassFileLocator;Lnet/bytebuddy/agent/builder/AgentBuilder$Default$NativeMethodStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$InjectionStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$LambdaInstrumentationStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$FallbackStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$ClassFileBufferStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$InstallationListener;Lnet/bytebuddy/agent/builder/AgentBuilder$RawMatcher;Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$ResubmissionEnforcer;Ljava/util/List<Lnet/bytebuddy/agent/builder/AgentBuilder$Default$Transformation;>;Lnet/bytebuddy/agent/builder/AgentBuilder$CircularityLock;)Lnet/bytebuddy/agent/builder/ResettableClassFileTransformer;
- (Lnet/bytebuddy/ByteBuddy;Lnet/bytebuddy/agent/builder/AgentBuilder$Listener;Lnet/bytebuddy/agent/builder/AgentBuilder$PoolStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$TypeStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$LocationStrategy;Lnet/bytebuddy/dynamic/ClassFileLocator;Lnet/bytebuddy/agent/builder/AgentBuilder$Default$NativeMethodStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$InjectionStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$LambdaInstrumentationStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$FallbackStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$ClassFileBufferStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$InstallationListener;Lnet/bytebuddy/agent/builder/AgentBuilder$RawMatcher;Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$ResubmissionEnforcer;Ljava/util/List<Lnet/bytebuddy/agent/builder/AgentBuilder$Default$Transformation;>;Lnet/bytebuddy/agent/builder/AgentBuilder$CircularityLock;)Lnet/bytebuddy/agent/builder/ResettableClassFileTransformer;
+ (Lnet/bytebuddy/ByteBuddy;Lnet/bytebuddy/agent/builder/AgentBuilder$Listener;Lnet/bytebuddy/agent/builder/AgentBuilder$PoolStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$TypeStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$LocationStrategy;Lnet/bytebuddy/dynamic/ClassFileLocator;Lnet/bytebuddy/agent/builder/AgentBuilder$Default$NativeMethodStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$InjectionStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$LambdaInstrumentationStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$FallbackStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$ClassFileBufferStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$InstallationListener;Lnet/bytebuddy/agent/builder/AgentBuilder$RawMatcher;Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$ResubmissionEnforcer;Ljava/util/List<Lnet/bytebuddy/agent/builder/AgentBuilder$Default$Transformation;>;Lnet/bytebuddy/agent/builder/AgentBuilder$CircularityLock;)L1net/bytebuddy/agent/builder/ResettableClassFileTransformer;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default$ExecutingTransformer.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default$ExecutingTransformer.eea
index 6be994e1b7..a3425d2ab0 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default$ExecutingTransformer.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default$ExecutingTransformer.eea
@@ -9,13 +9,13 @@ FACTORY
  (Lnet/bytebuddy/ByteBuddy;Lnet/bytebuddy/agent/builder/AgentBuilder$Listener;Lnet/bytebuddy/agent/builder/AgentBuilder$PoolStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$TypeStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$LocationStrategy;Lnet/bytebuddy/dynamic/ClassFileLocator;Lnet/bytebuddy/agent/builder/AgentBuilder$Default$NativeMethodStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$InjectionStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$LambdaInstrumentationStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$FallbackStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$ClassFileBufferStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$InstallationListener;Lnet/bytebuddy/agent/builder/AgentBuilder$RawMatcher;Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$ResubmissionEnforcer;Ljava/util/List<Lnet/bytebuddy/agent/builder/AgentBuilder$Default$Transformation;>;Lnet/bytebuddy/agent/builder/AgentBuilder$CircularityLock;)V
 iterator
  (Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/ClassLoader;Lnet/bytebuddy/utility/JavaModule;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;)Ljava/util/Iterator<Lnet/bytebuddy/agent/builder/AgentBuilder$Transformer;>;
- (Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/ClassLoader;Lnet/bytebuddy/utility/JavaModule;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;)Ljava/util/Iterator<Lnet/bytebuddy/agent/builder/AgentBuilder$Transformer;>;
+ (Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/ClassLoader;Lnet/bytebuddy/utility/JavaModule;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;)L1java/util/Iterator<Lnet/bytebuddy/agent/builder/AgentBuilder$Transformer;>;
 reset
  (Ljava/lang/instrument/Instrumentation;Lnet/bytebuddy/agent/builder/ResettableClassFileTransformer;Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$DiscoveryStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator;Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$Listener;)Z
  (Ljava/lang/instrument/Instrumentation;Lnet/bytebuddy/agent/builder/ResettableClassFileTransformer;Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$DiscoveryStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator;Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$Listener;)Z
 transform
  (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[B
- (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[0B
+ (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[0B # @Inherited(java.lang.instrument.ClassFileTransformer)
 transform
  (Ljava/lang/Object;Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[B
  (Ljava/lang/Object;Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[0B
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default$NativeMethodStrategy$ForPrefix.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default$NativeMethodStrategy$ForPrefix.eea
index 7b039d74d8..fe4e20e77e 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default$NativeMethodStrategy$ForPrefix.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default$NativeMethodStrategy$ForPrefix.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/agent/builder/AgentBuilder$Default$NativeMethodStrategy$ForP
 
 of
  (Ljava/lang/String;)Lnet/bytebuddy/agent/builder/AgentBuilder$Default$NativeMethodStrategy;
- (Ljava/lang/String;)Lnet/bytebuddy/agent/builder/AgentBuilder$Default$NativeMethodStrategy;
+ (Ljava/lang/String;)L1net/bytebuddy/agent/builder/AgentBuilder$Default$NativeMethodStrategy;
 
 <init>
  (Ljava/lang/String;)V
@@ -15,4 +15,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 resolve
  ()Lnet/bytebuddy/dynamic/scaffold/inline/MethodNameTransformer;
- ()Lnet/bytebuddy/dynamic/scaffold/inline/MethodNameTransformer;
+ ()L1net/bytebuddy/dynamic/scaffold/inline/MethodNameTransformer;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default$Redefining.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default$Redefining.eea
index d00b612f90..126476659d 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default$Redefining.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default$Redefining.eea
@@ -17,4 +17,4 @@ with
  (Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$Listener;)Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionListenable;
 withResubmission
  (Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$ResubmissionScheduler;)Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionListenable$WithoutResubmissionSpecification;
- (Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$ResubmissionScheduler;)Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionListenable$WithoutResubmissionSpecification;
+ (Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$ResubmissionScheduler;)L1net/bytebuddy/agent/builder/AgentBuilder$RedefinitionListenable$WithoutResubmissionSpecification;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default$WarmupStrategy$Enabled.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default$WarmupStrategy$Enabled.eea
index 87d0d53bcb..ebeed1dfd5 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default$WarmupStrategy$Enabled.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default$WarmupStrategy$Enabled.eea
@@ -11,4 +11,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 with
  (Ljava/util/Collection<Ljava/lang/Class<*>;>;)Lnet/bytebuddy/agent/builder/AgentBuilder$Default$WarmupStrategy;
- (Ljava/util/Collection<Ljava/lang/Class<*>;>;)Lnet/bytebuddy/agent/builder/AgentBuilder$Default$WarmupStrategy;
+ (Ljava/util/Collection<Ljava/lang/Class<*>;>;)L1net/bytebuddy/agent/builder/AgentBuilder$Default$WarmupStrategy;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default$WarmupStrategy$NoOp.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default$WarmupStrategy$NoOp.eea
index fd68dfcf83..9aa5ac69cd 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default$WarmupStrategy$NoOp.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default$WarmupStrategy$NoOp.eea
@@ -9,4 +9,4 @@ apply
  (Lnet/bytebuddy/agent/builder/ResettableClassFileTransformer;Lnet/bytebuddy/agent/builder/AgentBuilder$LocationStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$CircularityLock;Lnet/bytebuddy/agent/builder/AgentBuilder$InstallationListener;)V
 with
  (Ljava/util/Collection<Ljava/lang/Class<*>;>;)Lnet/bytebuddy/agent/builder/AgentBuilder$Default$WarmupStrategy;
- (Ljava/util/Collection<Ljava/lang/Class<*>;>;)Lnet/bytebuddy/agent/builder/AgentBuilder$Default$WarmupStrategy;
+ (Ljava/util/Collection<Ljava/lang/Class<*>;>;)L1net/bytebuddy/agent/builder/AgentBuilder$Default$WarmupStrategy;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default.eea
index 5c01bb3b7a..ab2cb0a9b5 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Default.eea
@@ -136,7 +136,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 ignore
  (Lnet/bytebuddy/agent/builder/AgentBuilder$RawMatcher;)Lnet/bytebuddy/agent/builder/AgentBuilder$Ignored;
- (Lnet/bytebuddy/agent/builder/AgentBuilder$RawMatcher;)Lnet/bytebuddy/agent/builder/AgentBuilder$Ignored;
+ (Lnet/bytebuddy/agent/builder/AgentBuilder$RawMatcher;)L1net/bytebuddy/agent/builder/AgentBuilder$Ignored;
 ignore
  (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/agent/builder/AgentBuilder$Ignored;
  (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/agent/builder/AgentBuilder$Ignored;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy$Default.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy$Default.eea
index b5863e06f3..a63927a647 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy$Default.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy$Default.eea
@@ -6,7 +6,7 @@ super java/lang/Enum
 
 withSuperTypeLoading
  ()Lnet/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy;
- ()Lnet/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy;
+ ()L1net/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy;
 withSuperTypeLoading
  (Ljava/util/concurrent/ExecutorService;)Lnet/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy;
- (Ljava/util/concurrent/ExecutorService;)Lnet/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy;
+ (Ljava/util/concurrent/ExecutorService;)L1net/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy$SuperTypeLoading$Asynchronous.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy$SuperTypeLoading$Asynchronous.eea
index a2c1c8263f..2caba00d0b 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy$SuperTypeLoading$Asynchronous.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy$SuperTypeLoading$Asynchronous.eea
@@ -5,7 +5,7 @@ class net/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy$SuperTypeLoad
  (Lnet/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy;Ljava/util/concurrent/ExecutorService;)V
 apply
  (Ljava/lang/String;Ljava/lang/Class<*>;Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/agent/builder/AgentBuilder$CircularityLock;Ljava/lang/ClassLoader;Lnet/bytebuddy/utility/JavaModule;)Lnet/bytebuddy/description/type/TypeDescription;
- (Ljava/lang/String;Ljava/lang/Class<*>;Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/agent/builder/AgentBuilder$CircularityLock;Ljava/lang/ClassLoader;Lnet/bytebuddy/utility/JavaModule;)Lnet/bytebuddy/description/type/TypeDescription;
+ (Ljava/lang/String;Ljava/lang/Class<*>;Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/agent/builder/AgentBuilder$CircularityLock;Ljava/lang/ClassLoader;Lnet/bytebuddy/utility/JavaModule;)L1net/bytebuddy/description/type/TypeDescription;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy$SuperTypeLoading.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy$SuperTypeLoading.eea
index ae30fa4f54..11685444a0 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy$SuperTypeLoading.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy$SuperTypeLoading.eea
@@ -5,7 +5,7 @@ class net/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy$SuperTypeLoad
  (Lnet/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy;)V
 apply
  (Ljava/lang/String;Ljava/lang/Class<*>;Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/agent/builder/AgentBuilder$CircularityLock;Ljava/lang/ClassLoader;Lnet/bytebuddy/utility/JavaModule;)Lnet/bytebuddy/description/type/TypeDescription;
- (Ljava/lang/String;Ljava/lang/Class<*>;Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/agent/builder/AgentBuilder$CircularityLock;Ljava/lang/ClassLoader;Lnet/bytebuddy/utility/JavaModule;)Lnet/bytebuddy/description/type/TypeDescription;
+ (Ljava/lang/String;Ljava/lang/Class<*>;Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/agent/builder/AgentBuilder$CircularityLock;Ljava/lang/ClassLoader;Lnet/bytebuddy/utility/JavaModule;)L1net/bytebuddy/description/type/TypeDescription;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy$SelfInjection$Eager.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy$SelfInjection$Eager.eea
index 4da0026974..96b3d82075 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy$SelfInjection$Eager.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy$SelfInjection$Eager.eea
@@ -5,4 +5,4 @@ class net/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy$SelfInject
  (Lnet/bytebuddy/dynamic/NexusAccessor;)V
 dispatcher
  (I)Lnet/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy$Dispatcher;
- (I)Lnet/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy$Dispatcher;
+ (I)L1net/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy$Dispatcher;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy$SelfInjection$Lazy.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy$SelfInjection$Lazy.eea
index eb40410580..4d04aedde9 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy$SelfInjection$Lazy.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy$SelfInjection$Lazy.eea
@@ -5,4 +5,4 @@ class net/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy$SelfInject
  (Lnet/bytebuddy/dynamic/NexusAccessor;)V
 dispatcher
  (I)Lnet/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy$Dispatcher;
- (I)Lnet/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy$Dispatcher;
+ (I)L1net/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy$Dispatcher;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy$SelfInjection$Split.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy$SelfInjection$Split.eea
index 4eb0b130b3..0c080536d9 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy$SelfInjection$Split.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy$SelfInjection$Split.eea
@@ -5,4 +5,4 @@ class net/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy$SelfInject
  (Lnet/bytebuddy/dynamic/NexusAccessor;)V
 dispatcher
  (I)Lnet/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy$Dispatcher;
- (I)Lnet/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy$Dispatcher;
+ (I)L1net/bytebuddy/agent/builder/AgentBuilder$InitializationStrategy$Dispatcher;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InjectionStrategy$Disabled.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InjectionStrategy$Disabled.eea
index 8b4384e03f..d0283f314f 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InjectionStrategy$Disabled.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InjectionStrategy$Disabled.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 resolve
  (Ljava/lang/ClassLoader;Ljava/security/ProtectionDomain;)Lnet/bytebuddy/dynamic/loading/ClassInjector;
- (Ljava/lang/ClassLoader;Ljava/security/ProtectionDomain;)Lnet/bytebuddy/dynamic/loading/ClassInjector;
+ (Ljava/lang/ClassLoader;Ljava/security/ProtectionDomain;)L1net/bytebuddy/dynamic/loading/ClassInjector;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InjectionStrategy$UsingJna.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InjectionStrategy$UsingJna.eea
index 893f6bb356..ae2d08510c 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InjectionStrategy$UsingJna.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InjectionStrategy$UsingJna.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 resolve
  (Ljava/lang/ClassLoader;Ljava/security/ProtectionDomain;)Lnet/bytebuddy/dynamic/loading/ClassInjector;
- (Ljava/lang/ClassLoader;Ljava/security/ProtectionDomain;)Lnet/bytebuddy/dynamic/loading/ClassInjector;
+ (Ljava/lang/ClassLoader;Ljava/security/ProtectionDomain;)L1net/bytebuddy/dynamic/loading/ClassInjector;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InjectionStrategy$UsingReflection.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InjectionStrategy$UsingReflection.eea
index 15319b6b7c..17cba540ed 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InjectionStrategy$UsingReflection.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InjectionStrategy$UsingReflection.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 resolve
  (Ljava/lang/ClassLoader;Ljava/security/ProtectionDomain;)Lnet/bytebuddy/dynamic/loading/ClassInjector;
- (Ljava/lang/ClassLoader;Ljava/security/ProtectionDomain;)Lnet/bytebuddy/dynamic/loading/ClassInjector;
+ (Ljava/lang/ClassLoader;Ljava/security/ProtectionDomain;)L1net/bytebuddy/dynamic/loading/ClassInjector;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InjectionStrategy$UsingUnsafe.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InjectionStrategy$UsingUnsafe.eea
index e077f2bb5d..1ddd832988 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InjectionStrategy$UsingUnsafe.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InjectionStrategy$UsingUnsafe.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 resolve
  (Ljava/lang/ClassLoader;Ljava/security/ProtectionDomain;)Lnet/bytebuddy/dynamic/loading/ClassInjector;
- (Ljava/lang/ClassLoader;Ljava/security/ProtectionDomain;)Lnet/bytebuddy/dynamic/loading/ClassInjector;
+ (Ljava/lang/ClassLoader;Ljava/security/ProtectionDomain;)L1net/bytebuddy/dynamic/loading/ClassInjector;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InstallationListener$StreamWriting.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InstallationListener$StreamWriting.eea
index b6459ed5af..d038855fbd 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InstallationListener$StreamWriting.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$InstallationListener$StreamWriting.eea
@@ -6,10 +6,10 @@ PREFIX
 
 toSystemError
  ()Lnet/bytebuddy/agent/builder/AgentBuilder$InstallationListener;
- ()Lnet/bytebuddy/agent/builder/AgentBuilder$InstallationListener;
+ ()L1net/bytebuddy/agent/builder/AgentBuilder$InstallationListener;
 toSystemOut
  ()Lnet/bytebuddy/agent/builder/AgentBuilder$InstallationListener;
- ()Lnet/bytebuddy/agent/builder/AgentBuilder$InstallationListener;
+ ()L1net/bytebuddy/agent/builder/AgentBuilder$InstallationListener;
 
 <init>
  (Ljava/io/PrintStream;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$LambdaInstrumentationStrategy$LambdaInstanceFactory$BridgeMethodImplementation.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$LambdaInstrumentationStrategy$LambdaInstanceFactory$BridgeMethodImplementation.eea
index 5411740923..bfe2eab575 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$LambdaInstrumentationStrategy$LambdaInstanceFactory$BridgeMethodImplementation.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$LambdaInstrumentationStrategy$LambdaInstanceFactory$BridgeMethodImplementation.eea
@@ -5,7 +5,7 @@ class net/bytebuddy/agent/builder/AgentBuilder$LambdaInstrumentationStrategy$Lam
  (Ljava/lang/String;Lnet/bytebuddy/utility/JavaConstant$MethodType;)V
 appender
  (Lnet/bytebuddy/implementation/Implementation$Target;)Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender;
- (Lnet/bytebuddy/implementation/Implementation$Target;)Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender;
+ (Lnet/bytebuddy/implementation/Implementation$Target;)L1net/bytebuddy/implementation/bytecode/ByteCodeAppender;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$LambdaInstrumentationStrategy$LambdaInstanceFactory$ConstructorImplementation.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$LambdaInstrumentationStrategy$LambdaInstanceFactory$ConstructorImplementation.eea
index f407489789..6713407f11 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$LambdaInstrumentationStrategy$LambdaInstanceFactory$ConstructorImplementation.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$LambdaInstrumentationStrategy$LambdaInstanceFactory$ConstructorImplementation.eea
@@ -6,7 +6,7 @@ super java/lang/Enum
 
 appender
  (Lnet/bytebuddy/implementation/Implementation$Target;)Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender;
- (Lnet/bytebuddy/implementation/Implementation$Target;)Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender;
+ (Lnet/bytebuddy/implementation/Implementation$Target;)L1net/bytebuddy/implementation/bytecode/ByteCodeAppender;
 prepare
  (Lnet/bytebuddy/dynamic/scaffold/InstrumentedType;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType;
  (Lnet/bytebuddy/dynamic/scaffold/InstrumentedType;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$LambdaInstrumentationStrategy$LambdaInstanceFactory$FactoryImplementation.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$LambdaInstrumentationStrategy$LambdaInstanceFactory$FactoryImplementation.eea
index 992ba798c6..b9218ffbe9 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$LambdaInstrumentationStrategy$LambdaInstanceFactory$FactoryImplementation.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$LambdaInstrumentationStrategy$LambdaInstanceFactory$FactoryImplementation.eea
@@ -6,7 +6,7 @@ super java/lang/Enum
 
 appender
  (Lnet/bytebuddy/implementation/Implementation$Target;)Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender;
- (Lnet/bytebuddy/implementation/Implementation$Target;)Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender;
+ (Lnet/bytebuddy/implementation/Implementation$Target;)L1net/bytebuddy/implementation/bytecode/ByteCodeAppender;
 prepare
  (Lnet/bytebuddy/dynamic/scaffold/InstrumentedType;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType;
  (Lnet/bytebuddy/dynamic/scaffold/InstrumentedType;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Listener$ModuleReadEdgeCompleting.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Listener$ModuleReadEdgeCompleting.eea
index fd0ef003e1..4f8214475d 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Listener$ModuleReadEdgeCompleting.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Listener$ModuleReadEdgeCompleting.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/agent/builder/AgentBuilder$Listener$ModuleReadEdgeCompleting
 
 of
  (Ljava/lang/instrument/Instrumentation;Z[Ljava/lang/Class<*>;)Lnet/bytebuddy/agent/builder/AgentBuilder$Listener;
- (Ljava/lang/instrument/Instrumentation;Z[Ljava/lang/Class<*>;)Lnet/bytebuddy/agent/builder/AgentBuilder$Listener;
+ (Ljava/lang/instrument/Instrumentation;Z[Ljava/lang/Class<*>;)L1net/bytebuddy/agent/builder/AgentBuilder$Listener;
 
 <init>
  (Ljava/lang/instrument/Instrumentation;ZLjava/util/Set<+Lnet/bytebuddy/utility/JavaModule;>;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Listener$StreamWriting.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Listener$StreamWriting.eea
index cc610c01f7..5633be6e3d 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Listener$StreamWriting.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Listener$StreamWriting.eea
@@ -6,10 +6,10 @@ PREFIX
 
 toSystemError
  ()Lnet/bytebuddy/agent/builder/AgentBuilder$Listener$StreamWriting;
- ()Lnet/bytebuddy/agent/builder/AgentBuilder$Listener$StreamWriting;
+ ()L1net/bytebuddy/agent/builder/AgentBuilder$Listener$StreamWriting;
 toSystemOut
  ()Lnet/bytebuddy/agent/builder/AgentBuilder$Listener$StreamWriting;
- ()Lnet/bytebuddy/agent/builder/AgentBuilder$Listener$StreamWriting;
+ ()L1net/bytebuddy/agent/builder/AgentBuilder$Listener$StreamWriting;
 
 <init>
  (Ljava/io/PrintStream;)V
@@ -34,7 +34,7 @@ onTransformation
  (Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/ClassLoader;Lnet/bytebuddy/utility/JavaModule;ZLnet/bytebuddy/dynamic/DynamicType;)V
 withErrorsOnly
  ()Lnet/bytebuddy/agent/builder/AgentBuilder$Listener;
- ()Lnet/bytebuddy/agent/builder/AgentBuilder$Listener;
+ ()L1net/bytebuddy/agent/builder/AgentBuilder$Listener;
 withTransformationsOnly
  ()Lnet/bytebuddy/agent/builder/AgentBuilder$Listener;
- ()Lnet/bytebuddy/agent/builder/AgentBuilder$Listener;
+ ()L1net/bytebuddy/agent/builder/AgentBuilder$Listener;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$LocationStrategy$Compound.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$LocationStrategy$Compound.eea
index c5fd2ace62..488b140e88 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$LocationStrategy$Compound.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$LocationStrategy$Compound.eea
@@ -8,7 +8,7 @@ class net/bytebuddy/agent/builder/AgentBuilder$LocationStrategy$Compound
  ([Lnet/bytebuddy/agent/builder/AgentBuilder$LocationStrategy;)V
 classFileLocator
  (Ljava/lang/ClassLoader;Lnet/bytebuddy/utility/JavaModule;)Lnet/bytebuddy/dynamic/ClassFileLocator;
- (Ljava/lang/ClassLoader;Lnet/bytebuddy/utility/JavaModule;)Lnet/bytebuddy/dynamic/ClassFileLocator;
+ (Ljava/lang/ClassLoader;Lnet/bytebuddy/utility/JavaModule;)L1net/bytebuddy/dynamic/ClassFileLocator;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$LocationStrategy$ForClassLoader.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$LocationStrategy$ForClassLoader.eea
index 13290c3ec9..ee56b654c0 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$LocationStrategy$ForClassLoader.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$LocationStrategy$ForClassLoader.eea
@@ -9,7 +9,7 @@ withFallbackTo
  (Ljava/util/Collection<+Lnet/bytebuddy/dynamic/ClassFileLocator;>;)Lnet/bytebuddy/agent/builder/AgentBuilder$LocationStrategy;
 withFallbackTo
  (Ljava/util/List<+Lnet/bytebuddy/agent/builder/AgentBuilder$LocationStrategy;>;)Lnet/bytebuddy/agent/builder/AgentBuilder$LocationStrategy;
- (Ljava/util/List<+Lnet/bytebuddy/agent/builder/AgentBuilder$LocationStrategy;>;)Lnet/bytebuddy/agent/builder/AgentBuilder$LocationStrategy;
+ (Ljava/util/List<+Lnet/bytebuddy/agent/builder/AgentBuilder$LocationStrategy;>;)L1net/bytebuddy/agent/builder/AgentBuilder$LocationStrategy;
 withFallbackTo
  ([Lnet/bytebuddy/agent/builder/AgentBuilder$LocationStrategy;)Lnet/bytebuddy/agent/builder/AgentBuilder$LocationStrategy;
  ([Lnet/bytebuddy/agent/builder/AgentBuilder$LocationStrategy;)Lnet/bytebuddy/agent/builder/AgentBuilder$LocationStrategy;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$PoolStrategy$Default.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$PoolStrategy$Default.eea
index c756407675..d8a909647d 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$PoolStrategy$Default.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$PoolStrategy$Default.eea
@@ -6,7 +6,7 @@ super java/lang/Enum
 
 typePool
  (Lnet/bytebuddy/dynamic/ClassFileLocator;Ljava/lang/ClassLoader;)Lnet/bytebuddy/pool/TypePool;
- (Lnet/bytebuddy/dynamic/ClassFileLocator;Ljava/lang/ClassLoader;)Lnet/bytebuddy/pool/TypePool;
+ (Lnet/bytebuddy/dynamic/ClassFileLocator;Ljava/lang/ClassLoader;)L1net/bytebuddy/pool/TypePool;
 typePool
  (Lnet/bytebuddy/dynamic/ClassFileLocator;Ljava/lang/ClassLoader;Ljava/lang/String;)Lnet/bytebuddy/pool/TypePool;
  (Lnet/bytebuddy/dynamic/ClassFileLocator;Ljava/lang/ClassLoader;Ljava/lang/String;)Lnet/bytebuddy/pool/TypePool;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$PoolStrategy$Eager.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$PoolStrategy$Eager.eea
index 0d539f2ce4..84af3c75c0 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$PoolStrategy$Eager.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$PoolStrategy$Eager.eea
@@ -6,7 +6,7 @@ super java/lang/Enum
 
 typePool
  (Lnet/bytebuddy/dynamic/ClassFileLocator;Ljava/lang/ClassLoader;)Lnet/bytebuddy/pool/TypePool;
- (Lnet/bytebuddy/dynamic/ClassFileLocator;Ljava/lang/ClassLoader;)Lnet/bytebuddy/pool/TypePool;
+ (Lnet/bytebuddy/dynamic/ClassFileLocator;Ljava/lang/ClassLoader;)L1net/bytebuddy/pool/TypePool;
 typePool
  (Lnet/bytebuddy/dynamic/ClassFileLocator;Ljava/lang/ClassLoader;Ljava/lang/String;)Lnet/bytebuddy/pool/TypePool;
  (Lnet/bytebuddy/dynamic/ClassFileLocator;Ljava/lang/ClassLoader;Ljava/lang/String;)Lnet/bytebuddy/pool/TypePool;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$PoolStrategy$WithTypePoolCache.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$PoolStrategy$WithTypePoolCache.eea
index 478a3b7893..0bb6fc0e62 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$PoolStrategy$WithTypePoolCache.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$PoolStrategy$WithTypePoolCache.eea
@@ -15,7 +15,7 @@ locate
  (Ljava/lang/ClassLoader;)Lnet/bytebuddy/pool/TypePool$CacheProvider;
 typePool
  (Lnet/bytebuddy/dynamic/ClassFileLocator;Ljava/lang/ClassLoader;)Lnet/bytebuddy/pool/TypePool;
- (Lnet/bytebuddy/dynamic/ClassFileLocator;Ljava/lang/ClassLoader;)Lnet/bytebuddy/pool/TypePool;
+ (Lnet/bytebuddy/dynamic/ClassFileLocator;Ljava/lang/ClassLoader;)L1net/bytebuddy/pool/TypePool;
 typePool
  (Lnet/bytebuddy/dynamic/ClassFileLocator;Ljava/lang/ClassLoader;Ljava/lang/String;)Lnet/bytebuddy/pool/TypePool;
- (Lnet/bytebuddy/dynamic/ClassFileLocator;Ljava/lang/ClassLoader;Ljava/lang/String;)Lnet/bytebuddy/pool/TypePool;
+ (Lnet/bytebuddy/dynamic/ClassFileLocator;Ljava/lang/ClassLoader;Ljava/lang/String;)L1net/bytebuddy/pool/TypePool;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RawMatcher$ForResolvableTypes.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RawMatcher$ForResolvableTypes.eea
index f210006e44..0c812edb62 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RawMatcher$ForResolvableTypes.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RawMatcher$ForResolvableTypes.eea
@@ -6,7 +6,7 @@ super java/lang/Enum
 
 inverted
  ()Lnet/bytebuddy/agent/builder/AgentBuilder$RawMatcher;
- ()Lnet/bytebuddy/agent/builder/AgentBuilder$RawMatcher;
+ ()L1net/bytebuddy/agent/builder/AgentBuilder$RawMatcher;
 matches
  (Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/ClassLoader;Lnet/bytebuddy/utility/JavaModule;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;)Z
  (Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/ClassLoader;Lnet/bytebuddy/utility/JavaModule;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;)Z
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator$ForFixedSize.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator$ForFixedSize.eea
index 2d40a67919..f6f4f605c5 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator$ForFixedSize.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator$ForFixedSize.eea
@@ -6,7 +6,7 @@ ofSize
 
 batch
  (Ljava/util/List<Ljava/lang/Class<*>;>;)Ljava/lang/Iterable<+Ljava/util/List<Ljava/lang/Class<*>;>;>;
- (Ljava/util/List<Ljava/lang/Class<*>;>;)Ljava/lang/Iterable<+Ljava/util/List<Ljava/lang/Class<*>;>;>;
+ (Ljava/util/List<Ljava/lang/Class<*>;>;)L1java/lang/Iterable<+Ljava/util/List<Ljava/lang/Class<*>;>;>;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator$Partitioning.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator$Partitioning.eea
index ae9ee17859..16947995ef 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator$Partitioning.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator$Partitioning.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocat
 
 of
  (I)Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator;
- (I)Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator;
+ (I)L1net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator;
 
 batch
  (Ljava/util/List<Ljava/lang/Class<*>;>;)Ljava/lang/Iterable<+Ljava/util/List<Ljava/lang/Class<*>;>;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator$Slicing.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator$Slicing.eea
index 6b4ae04753..165e55f7e2 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator$Slicing.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator$Slicing.eea
@@ -8,7 +8,7 @@ withMinimum
  (ILnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator;)Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator;
 withinRange
  (IILnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator;)Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator;
- (IILnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator;)Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator;
+ (IILnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator;)L1net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator;
 
 <init>
  (IILnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$DiscoveryStrategy$Reiterating$ReiteratingIterable.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$DiscoveryStrategy$Reiterating$ReiteratingIterable.eea
index fb3ec8c7ab..d779101371 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$DiscoveryStrategy$Reiterating$ReiteratingIterable.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$DiscoveryStrategy$Reiterating$ReiteratingIterable.eea
@@ -12,4 +12,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 iterator
  ()Ljava/util/Iterator<Ljava/lang/Iterable<Ljava/lang/Class<*>;>;>;
- ()Ljava/util/Iterator<Ljava/lang/Iterable<Ljava/lang/Class<*>;>;>;
+ ()L1java/util/Iterator<Ljava/lang/Iterable<Ljava/lang/Class<*>;>;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$DiscoveryStrategy$Reiterating$WithSortOrderAssumption$OrderedReiteratingIterable.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$DiscoveryStrategy$Reiterating$WithSortOrderAssumption$OrderedReiteratingIterable.eea
index f10a488e90..ddf98a80e9 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$DiscoveryStrategy$Reiterating$WithSortOrderAssumption$OrderedReiteratingIterable.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$DiscoveryStrategy$Reiterating$WithSortOrderAssumption$OrderedReiteratingIterable.eea
@@ -12,4 +12,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 iterator
  ()Ljava/util/Iterator<Ljava/lang/Iterable<Ljava/lang/Class<*>;>;>;
- ()Ljava/util/Iterator<Ljava/lang/Iterable<Ljava/lang/Class<*>;>;>;
+ ()L1java/util/Iterator<Ljava/lang/Iterable<Ljava/lang/Class<*>;>;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$DiscoveryStrategy$Reiterating$WithSortOrderAssumption.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$DiscoveryStrategy$Reiterating$WithSortOrderAssumption.eea
index c68e127381..f6f3ffef88 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$DiscoveryStrategy$Reiterating$WithSortOrderAssumption.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$DiscoveryStrategy$Reiterating$WithSortOrderAssumption.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 resolve
  (Ljava/lang/instrument/Instrumentation;)Ljava/lang/Iterable<Ljava/lang/Iterable<Ljava/lang/Class<*>;>;>;
- (Ljava/lang/instrument/Instrumentation;)Ljava/lang/Iterable<Ljava/lang/Iterable<Ljava/lang/Class<*>;>;>;
+ (Ljava/lang/instrument/Instrumentation;)L1java/lang/Iterable<Ljava/lang/Iterable<Ljava/lang/Class<*>;>;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$DiscoveryStrategy$Reiterating.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$DiscoveryStrategy$Reiterating.eea
index c9d58da520..dbd144333f 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$DiscoveryStrategy$Reiterating.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$DiscoveryStrategy$Reiterating.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 resolve
  (Ljava/lang/instrument/Instrumentation;)Ljava/lang/Iterable<Ljava/lang/Iterable<Ljava/lang/Class<*>;>;>;
- (Ljava/lang/instrument/Instrumentation;)Ljava/lang/Iterable<Ljava/lang/Iterable<Ljava/lang/Class<*>;>;>;
+ (Ljava/lang/instrument/Instrumentation;)L1java/lang/Iterable<Ljava/lang/Iterable<Ljava/lang/Class<*>;>;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$Listener$Compound$CompoundIterable.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$Listener$Compound$CompoundIterable.eea
index c7f1800d27..35e2bac7d9 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$Listener$Compound$CompoundIterable.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$Listener$Compound$CompoundIterable.eea
@@ -12,4 +12,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 iterator
  ()Ljava/util/Iterator<Ljava/util/List<Ljava/lang/Class<*>;>;>;
- ()Ljava/util/Iterator<Ljava/util/List<Ljava/lang/Class<*>;>;>;
+ ()L1java/util/Iterator<Ljava/util/List<Ljava/lang/Class<*>;>;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$Listener$Compound.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$Listener$Compound.eea
index df35222af8..e9c2734a7b 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$Listener$Compound.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$Listener$Compound.eea
@@ -17,4 +17,4 @@ onComplete
  (ILjava/util/List<Ljava/lang/Class<*>;>;Ljava/util/Map<Ljava/util/List<Ljava/lang/Class<*>;>;Ljava/lang/Throwable;>;)V
 onError
  (ILjava/util/List<Ljava/lang/Class<*>;>;Ljava/lang/Throwable;Ljava/util/List<Ljava/lang/Class<*>;>;)Ljava/lang/Iterable<+Ljava/util/List<Ljava/lang/Class<*>;>;>;
- (ILjava/util/List<Ljava/lang/Class<*>;>;Ljava/lang/Throwable;Ljava/util/List<Ljava/lang/Class<*>;>;)Ljava/lang/Iterable<+Ljava/util/List<Ljava/lang/Class<*>;>;>;
+ (ILjava/util/List<Ljava/lang/Class<*>;>;Ljava/lang/Throwable;Ljava/util/List<Ljava/lang/Class<*>;>;)L1java/lang/Iterable<+Ljava/util/List<Ljava/lang/Class<*>;>;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$Listener$StreamWriting.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$Listener$StreamWriting.eea
index 3a4b813253..5a207ecb42 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$Listener$StreamWriting.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$Listener$StreamWriting.eea
@@ -2,10 +2,10 @@ class net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$Listener$Str
 
 toSystemError
  ()Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$Listener;
- ()Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$Listener;
+ ()L1net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$Listener;
 toSystemOut
  ()Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$Listener;
- ()Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$Listener;
+ ()L1net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$Listener;
 
 <init>
  (Ljava/io/PrintStream;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$ResubmissionStrategy$Disabled.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$ResubmissionStrategy$Disabled.eea
index ff3d44d96c..f0eeff259c 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$ResubmissionStrategy$Disabled.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$ResubmissionStrategy$Disabled.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 apply
  (Ljava/lang/instrument/Instrumentation;Lnet/bytebuddy/agent/builder/AgentBuilder$PoolStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$LocationStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$FallbackStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$Listener;Lnet/bytebuddy/agent/builder/AgentBuilder$InstallationListener;Lnet/bytebuddy/agent/builder/AgentBuilder$CircularityLock;Lnet/bytebuddy/agent/builder/AgentBuilder$RawMatcher;Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator;Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$Listener;)Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$ResubmissionStrategy$Installation;
- (Ljava/lang/instrument/Instrumentation;Lnet/bytebuddy/agent/builder/AgentBuilder$PoolStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$LocationStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$FallbackStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$Listener;Lnet/bytebuddy/agent/builder/AgentBuilder$InstallationListener;Lnet/bytebuddy/agent/builder/AgentBuilder$CircularityLock;Lnet/bytebuddy/agent/builder/AgentBuilder$RawMatcher;Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator;Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$Listener;)Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$ResubmissionStrategy$Installation;
+ (Ljava/lang/instrument/Instrumentation;Lnet/bytebuddy/agent/builder/AgentBuilder$PoolStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$LocationStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$DescriptionStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$FallbackStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$Listener;Lnet/bytebuddy/agent/builder/AgentBuilder$InstallationListener;Lnet/bytebuddy/agent/builder/AgentBuilder$CircularityLock;Lnet/bytebuddy/agent/builder/AgentBuilder$RawMatcher;Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$BatchAllocator;Lnet/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$Listener;)L1net/bytebuddy/agent/builder/AgentBuilder$RedefinitionStrategy$ResubmissionStrategy$Installation;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Transformer$ForAdvice.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Transformer$ForAdvice.eea
index 6a89650e50..7b31746b93 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Transformer$ForAdvice.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/AgentBuilder$Transformer$ForAdvice.eea
@@ -32,7 +32,7 @@ include
  ([Lnet/bytebuddy/dynamic/ClassFileLocator;)Lnet/bytebuddy/agent/builder/AgentBuilder$Transformer$ForAdvice;
 make
  (Lnet/bytebuddy/asm/Advice$WithCustomMapping;Lnet/bytebuddy/asm/Advice$ExceptionHandler;Lnet/bytebuddy/implementation/bytecode/assign/Assigner;Lnet/bytebuddy/dynamic/ClassFileLocator;Lnet/bytebuddy/agent/builder/AgentBuilder$PoolStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$LocationStrategy;Ljava/util/List<Lnet/bytebuddy/agent/builder/AgentBuilder$Transformer$ForAdvice$Entry;>;)Lnet/bytebuddy/agent/builder/AgentBuilder$Transformer$ForAdvice;
- (Lnet/bytebuddy/asm/Advice$WithCustomMapping;Lnet/bytebuddy/asm/Advice$ExceptionHandler;Lnet/bytebuddy/implementation/bytecode/assign/Assigner;Lnet/bytebuddy/dynamic/ClassFileLocator;Lnet/bytebuddy/agent/builder/AgentBuilder$PoolStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$LocationStrategy;Ljava/util/List<Lnet/bytebuddy/agent/builder/AgentBuilder$Transformer$ForAdvice$Entry;>;)Lnet/bytebuddy/agent/builder/AgentBuilder$Transformer$ForAdvice;
+ (Lnet/bytebuddy/asm/Advice$WithCustomMapping;Lnet/bytebuddy/asm/Advice$ExceptionHandler;Lnet/bytebuddy/implementation/bytecode/assign/Assigner;Lnet/bytebuddy/dynamic/ClassFileLocator;Lnet/bytebuddy/agent/builder/AgentBuilder$PoolStrategy;Lnet/bytebuddy/agent/builder/AgentBuilder$LocationStrategy;Ljava/util/List<Lnet/bytebuddy/agent/builder/AgentBuilder$Transformer$ForAdvice$Entry;>;)L1net/bytebuddy/agent/builder/AgentBuilder$Transformer$ForAdvice;
 transform
  (Lnet/bytebuddy/dynamic/DynamicType$Builder<*>;Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/ClassLoader;Lnet/bytebuddy/utility/JavaModule;Ljava/security/ProtectionDomain;)Lnet/bytebuddy/dynamic/DynamicType$Builder<*>;
  (Lnet/bytebuddy/dynamic/DynamicType$Builder<*>;Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/ClassLoader;Lnet/bytebuddy/utility/JavaModule;Ljava/security/ProtectionDomain;)Lnet/bytebuddy/dynamic/DynamicType$Builder<*>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/ResettableClassFileTransformer$WithDelegation$Substitutable$Factory$ForLegacyVm.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/ResettableClassFileTransformer$WithDelegation$Substitutable$Factory$ForLegacyVm.eea
index f071c65f72..bf7785b7a8 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/ResettableClassFileTransformer$WithDelegation$Substitutable$Factory$ForLegacyVm.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/ResettableClassFileTransformer$WithDelegation$Substitutable$Factory$ForLegacyVm.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 make
  (Lnet/bytebuddy/agent/builder/ResettableClassFileTransformer;)Lnet/bytebuddy/agent/builder/ResettableClassFileTransformer$Substitutable;
- (Lnet/bytebuddy/agent/builder/ResettableClassFileTransformer;)Lnet/bytebuddy/agent/builder/ResettableClassFileTransformer$Substitutable;
+ (Lnet/bytebuddy/agent/builder/ResettableClassFileTransformer;)L1net/bytebuddy/agent/builder/ResettableClassFileTransformer$Substitutable;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/ResettableClassFileTransformer$WithDelegation$Substitutable.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/ResettableClassFileTransformer$WithDelegation$Substitutable.eea
index 4f4fe59992..68fe2314a9 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/ResettableClassFileTransformer$WithDelegation$Substitutable.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/agent/builder/ResettableClassFileTransformer$WithDelegation$Substitutable.eea
@@ -25,7 +25,7 @@ substitute
  (Lnet/bytebuddy/agent/builder/ResettableClassFileTransformer;)V
 transform
  (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[B
- (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[B
+ (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[0B # @Inherited(java.lang.instrument.ClassFileTransformer)
 unwrap
  ()Lnet/bytebuddy/agent/builder/ResettableClassFileTransformer;
  ()Lnet/bytebuddy/agent/builder/ResettableClassFileTransformer;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/BuildLogger$StreamWriting.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/BuildLogger$StreamWriting.eea
index df848299a1..b9c48c6c63 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/BuildLogger$StreamWriting.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/BuildLogger$StreamWriting.eea
@@ -2,10 +2,10 @@ class net/bytebuddy/build/BuildLogger$StreamWriting
 
 toSystemError
  ()Lnet/bytebuddy/build/BuildLogger;
- ()Lnet/bytebuddy/build/BuildLogger;
+ ()L1net/bytebuddy/build/BuildLogger;
 toSystemOut
  ()Lnet/bytebuddy/build/BuildLogger;
- ()Lnet/bytebuddy/build/BuildLogger;
+ ()L1net/bytebuddy/build/BuildLogger;
 
 <init>
  (Ljava/io/PrintStream;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/CachedReturnPlugin$CacheFieldOffsetMapping.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/CachedReturnPlugin$CacheFieldOffsetMapping.eea
index d73137e1de..d66cdd61c7 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/CachedReturnPlugin$CacheFieldOffsetMapping.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/CachedReturnPlugin$CacheFieldOffsetMapping.eea
@@ -8,4 +8,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 resolve
  (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/method/MethodDescription;Lnet/bytebuddy/implementation/bytecode/assign/Assigner;Lnet/bytebuddy/asm/Advice$ArgumentHandler;Lnet/bytebuddy/asm/Advice$OffsetMapping$Sort;)Lnet/bytebuddy/asm/Advice$OffsetMapping$Target;
- (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/method/MethodDescription;Lnet/bytebuddy/implementation/bytecode/assign/Assigner;Lnet/bytebuddy/asm/Advice$ArgumentHandler;Lnet/bytebuddy/asm/Advice$OffsetMapping$Sort;)Lnet/bytebuddy/asm/Advice$OffsetMapping$Target;
+ (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/method/MethodDescription;Lnet/bytebuddy/implementation/bytecode/assign/Assigner;Lnet/bytebuddy/asm/Advice$ArgumentHandler;Lnet/bytebuddy/asm/Advice$OffsetMapping$Sort;)L1net/bytebuddy/asm/Advice$OffsetMapping$Target;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Default.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Default.eea
index 5c27d2aa48..9665ef3cf3 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Default.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Default.eea
@@ -5,10 +5,10 @@ main
  ([Ljava/lang/String;)V
 of
  (Lnet/bytebuddy/build/EntryPoint;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/dynamic/scaffold/inline/MethodNameTransformer;)Lnet/bytebuddy/build/Plugin$Engine;
- (Lnet/bytebuddy/build/EntryPoint;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/dynamic/scaffold/inline/MethodNameTransformer;)Lnet/bytebuddy/build/Plugin$Engine;
+ (Lnet/bytebuddy/build/EntryPoint;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/dynamic/scaffold/inline/MethodNameTransformer;)L1net/bytebuddy/build/Plugin$Engine;
 scan
  (Ljava/lang/ClassLoader;)Ljava/util/Set<Ljava/lang/String;>;
- (Ljava/lang/ClassLoader;)Ljava/util/Set<Ljava/lang/String;>;
+ (Ljava/lang/ClassLoader;)L1java/util/Set<Ljava/lang/String;>;
 
 <init>
  (Lnet/bytebuddy/ByteBuddy;)V
@@ -21,7 +21,7 @@ scan
  (Lnet/bytebuddy/ByteBuddy;Lnet/bytebuddy/build/Plugin$Engine$TypeStrategy;Lnet/bytebuddy/build/Plugin$Engine$PoolStrategy;Lnet/bytebuddy/dynamic/ClassFileLocator;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/build/Plugin$Engine$Listener;Lnet/bytebuddy/build/Plugin$Engine$ErrorHandler;Lnet/bytebuddy/build/Plugin$Engine$Dispatcher$Factory;Lnet/bytebuddy/matcher/ElementMatcher$Junction<-Lnet/bytebuddy/description/type/TypeDescription;>;)V
 apply
  (Lnet/bytebuddy/build/Plugin$Engine$Source;Lnet/bytebuddy/build/Plugin$Engine$Target;Ljava/util/List<+Lnet/bytebuddy/build/Plugin$Factory;>;)Lnet/bytebuddy/build/Plugin$Engine$Summary;
- (Lnet/bytebuddy/build/Plugin$Engine$Source;Lnet/bytebuddy/build/Plugin$Engine$Target;Ljava/util/List<+Lnet/bytebuddy/build/Plugin$Factory;>;)Lnet/bytebuddy/build/Plugin$Engine$Summary;
+ (Lnet/bytebuddy/build/Plugin$Engine$Source;Lnet/bytebuddy/build/Plugin$Engine$Target;Ljava/util/List<+Lnet/bytebuddy/build/Plugin$Factory;>;)L1net/bytebuddy/build/Plugin$Engine$Summary;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Dispatcher$ForParallelTransformation$Factory.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Dispatcher$ForParallelTransformation$Factory.eea
index 0d1a5fdb74..21a328beaf 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Dispatcher$ForParallelTransformation$Factory.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Dispatcher$ForParallelTransformation$Factory.eea
@@ -8,4 +8,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 make
  (Lnet/bytebuddy/build/Plugin$Engine$Target$Sink;Ljava/util/List<Lnet/bytebuddy/description/type/TypeDescription;>;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/List<Ljava/lang/Throwable;>;>;Ljava/util/List<Ljava/lang/String;>;)Lnet/bytebuddy/build/Plugin$Engine$Dispatcher;
- (Lnet/bytebuddy/build/Plugin$Engine$Target$Sink;Ljava/util/List<Lnet/bytebuddy/description/type/TypeDescription;>;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/List<Ljava/lang/Throwable;>;>;Ljava/util/List<Ljava/lang/String;>;)Lnet/bytebuddy/build/Plugin$Engine$Dispatcher;
+ (Lnet/bytebuddy/build/Plugin$Engine$Target$Sink;Ljava/util/List<Lnet/bytebuddy/description/type/TypeDescription;>;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/List<Ljava/lang/Throwable;>;>;Ljava/util/List<Ljava/lang/String;>;)L1net/bytebuddy/build/Plugin$Engine$Dispatcher;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Dispatcher$ForParallelTransformation$WithThrowawayExecutorService$Factory.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Dispatcher$ForParallelTransformation$WithThrowawayExecutorService$Factory.eea
index 83bba3ff2a..9e96ccec37 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Dispatcher$ForParallelTransformation$WithThrowawayExecutorService$Factory.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Dispatcher$ForParallelTransformation$WithThrowawayExecutorService$Factory.eea
@@ -5,4 +5,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 make
  (Lnet/bytebuddy/build/Plugin$Engine$Target$Sink;Ljava/util/List<Lnet/bytebuddy/description/type/TypeDescription;>;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/List<Ljava/lang/Throwable;>;>;Ljava/util/List<Ljava/lang/String;>;)Lnet/bytebuddy/build/Plugin$Engine$Dispatcher;
- (Lnet/bytebuddy/build/Plugin$Engine$Target$Sink;Ljava/util/List<Lnet/bytebuddy/description/type/TypeDescription;>;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/List<Ljava/lang/Throwable;>;>;Ljava/util/List<Ljava/lang/String;>;)Lnet/bytebuddy/build/Plugin$Engine$Dispatcher;
+ (Lnet/bytebuddy/build/Plugin$Engine$Target$Sink;Ljava/util/List<Lnet/bytebuddy/description/type/TypeDescription;>;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/List<Ljava/lang/Throwable;>;>;Ljava/util/List<Ljava/lang/String;>;)L1net/bytebuddy/build/Plugin$Engine$Dispatcher;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Dispatcher$ForSerialTransformation$Factory.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Dispatcher$ForSerialTransformation$Factory.eea
index c1a72e29cc..49fbcc4305 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Dispatcher$ForSerialTransformation$Factory.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Dispatcher$ForSerialTransformation$Factory.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 make
  (Lnet/bytebuddy/build/Plugin$Engine$Target$Sink;Ljava/util/List<Lnet/bytebuddy/description/type/TypeDescription;>;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/List<Ljava/lang/Throwable;>;>;Ljava/util/List<Ljava/lang/String;>;)Lnet/bytebuddy/build/Plugin$Engine$Dispatcher;
- (Lnet/bytebuddy/build/Plugin$Engine$Target$Sink;Ljava/util/List<Lnet/bytebuddy/description/type/TypeDescription;>;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/List<Ljava/lang/Throwable;>;>;Ljava/util/List<Ljava/lang/String;>;)Lnet/bytebuddy/build/Plugin$Engine$Dispatcher;
+ (Lnet/bytebuddy/build/Plugin$Engine$Target$Sink;Ljava/util/List<Lnet/bytebuddy/description/type/TypeDescription;>;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/List<Ljava/lang/Throwable;>;>;Ljava/util/List<Ljava/lang/String;>;)L1net/bytebuddy/build/Plugin$Engine$Dispatcher;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Listener$StreamWriting.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Listener$StreamWriting.eea
index d2b78b8753..abaeba2ef4 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Listener$StreamWriting.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Listener$StreamWriting.eea
@@ -6,10 +6,10 @@ PREFIX
 
 toSystemError
  ()Lnet/bytebuddy/build/Plugin$Engine$Listener$StreamWriting;
- ()Lnet/bytebuddy/build/Plugin$Engine$Listener$StreamWriting;
+ ()L1net/bytebuddy/build/Plugin$Engine$Listener$StreamWriting;
 toSystemOut
  ()Lnet/bytebuddy/build/Plugin$Engine$Listener$StreamWriting;
- ()Lnet/bytebuddy/build/Plugin$Engine$Listener$StreamWriting;
+ ()L1net/bytebuddy/build/Plugin$Engine$Listener$StreamWriting;
 
 <init>
  (Ljava/io/PrintStream;)V
@@ -49,7 +49,7 @@ onUnresolved
  (Ljava/lang/String;)V
 withErrorsOnly
  ()Lnet/bytebuddy/build/Plugin$Engine$Listener;
- ()Lnet/bytebuddy/build/Plugin$Engine$Listener;
+ ()L1net/bytebuddy/build/Plugin$Engine$Listener;
 withTransformationsOnly
  ()Lnet/bytebuddy/build/Plugin$Engine$Listener;
- ()Lnet/bytebuddy/build/Plugin$Engine$Listener;
+ ()L1net/bytebuddy/build/Plugin$Engine$Listener;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$PoolStrategy$Default.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$PoolStrategy$Default.eea
index 2441589b14..0c949db202 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$PoolStrategy$Default.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$PoolStrategy$Default.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 typePool
  (Lnet/bytebuddy/dynamic/ClassFileLocator;)Lnet/bytebuddy/pool/TypePool;
- (Lnet/bytebuddy/dynamic/ClassFileLocator;)Lnet/bytebuddy/pool/TypePool;
+ (Lnet/bytebuddy/dynamic/ClassFileLocator;)L1net/bytebuddy/pool/TypePool;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$PoolStrategy$Eager.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$PoolStrategy$Eager.eea
index 0e613457a3..51184a5a4e 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$PoolStrategy$Eager.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$PoolStrategy$Eager.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 typePool
  (Lnet/bytebuddy/dynamic/ClassFileLocator;)Lnet/bytebuddy/pool/TypePool;
- (Lnet/bytebuddy/dynamic/ClassFileLocator;)Lnet/bytebuddy/pool/TypePool;
+ (Lnet/bytebuddy/dynamic/ClassFileLocator;)L1net/bytebuddy/pool/TypePool;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$Compound$Origin.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$Compound$Origin.eea
index e72107e9cf..a8482ae72d 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$Compound$Origin.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$Compound$Origin.eea
@@ -11,7 +11,7 @@ getManifest
  ()L0java/util/jar/Manifest; # @Inherited(net.bytebuddy.build.Plugin$Engine$Source$Origin)
 iterator
  ()Ljava/util/Iterator<Lnet/bytebuddy/build/Plugin$Engine$Source$Element;>;
- ()Ljava/util/Iterator<Lnet/bytebuddy/build/Plugin$Engine$Source$Element;>;
+ ()L1java/util/Iterator<Lnet/bytebuddy/build/Plugin$Engine$Source$Element;>;
 toClassFileLocator
  (Lnet/bytebuddy/ClassFileVersion;)Lnet/bytebuddy/dynamic/ClassFileLocator;
- (Lnet/bytebuddy/ClassFileVersion;)Lnet/bytebuddy/dynamic/ClassFileLocator;
+ (Lnet/bytebuddy/ClassFileVersion;)L1net/bytebuddy/dynamic/ClassFileLocator;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$Element$ForByteArray.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$Element$ForByteArray.eea
index 5815dad5fd..ed6e88eb47 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$Element$ForByteArray.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$Element$ForByteArray.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getInputStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$Element$ForFile.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$Element$ForFile.eea
index 544b9091df..082a595b86 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$Element$ForFile.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$Element$ForFile.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getInputStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$ForFolder.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$ForFolder.eea
index 64e8ea76ca..9825f5c37d 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$ForFolder.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$ForFolder.eea
@@ -11,7 +11,7 @@ getManifest
  ()L0java/util/jar/Manifest; # @Inherited(net.bytebuddy.build.Plugin$Engine$Source$Origin)
 iterator
  ()Ljava/util/Iterator<Lnet/bytebuddy/build/Plugin$Engine$Source$Element;>;
- ()Ljava/util/Iterator<Lnet/bytebuddy/build/Plugin$Engine$Source$Element;>;
+ ()L1java/util/Iterator<Lnet/bytebuddy/build/Plugin$Engine$Source$Element;>;
 read
  ()Lnet/bytebuddy/build/Plugin$Engine$Source$Origin;
  ()Lnet/bytebuddy/build/Plugin$Engine$Source$Origin;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$InMemory$MapEntryIterator.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$InMemory$MapEntryIterator.eea
index b761839dec..75dc36c0ba 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$InMemory$MapEntryIterator.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$InMemory$MapEntryIterator.eea
@@ -9,4 +9,4 @@ super java/util/Iterator
  (Ljava/util/Iterator<Ljava/util/Map$Entry<Ljava/lang/String;[B>;>;)V
 next
  ()Lnet/bytebuddy/build/Plugin$Engine$Source$Element;
- ()Lnet/bytebuddy/build/Plugin$Engine$Source$Element;
+ ()L1net/bytebuddy/build/Plugin$Engine$Source$Element;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$InMemory.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$InMemory.eea
index 67e8dee4eb..e5fb06d057 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$InMemory.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$InMemory.eea
@@ -11,7 +11,7 @@ ofTypes
  (Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;)Lnet/bytebuddy/build/Plugin$Engine$Source;
 ofTypes
  (Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;Ljava/util/Map<Lnet/bytebuddy/ClassFileVersion;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;>;)Lnet/bytebuddy/build/Plugin$Engine$Source;
- (Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;Ljava/util/Map<Lnet/bytebuddy/ClassFileVersion;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;>;)Lnet/bytebuddy/build/Plugin$Engine$Source;
+ (Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;Ljava/util/Map<Lnet/bytebuddy/ClassFileVersion;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;>;)L1net/bytebuddy/build/Plugin$Engine$Source;
 ofTypes
  ([Ljava/lang/Class<*>;)Lnet/bytebuddy/build/Plugin$Engine$Source;
  ([Ljava/lang/Class<*>;)Lnet/bytebuddy/build/Plugin$Engine$Source;
@@ -27,7 +27,7 @@ getManifest
  ()L0java/util/jar/Manifest; # @Inherited(net.bytebuddy.build.Plugin$Engine$Source$Origin)
 iterator
  ()Ljava/util/Iterator<Lnet/bytebuddy/build/Plugin$Engine$Source$Element;>;
- ()Ljava/util/Iterator<Lnet/bytebuddy/build/Plugin$Engine$Source$Element;>;
+ ()L1java/util/Iterator<Lnet/bytebuddy/build/Plugin$Engine$Source$Element;>;
 read
  ()Lnet/bytebuddy/build/Plugin$Engine$Source$Origin;
  ()Lnet/bytebuddy/build/Plugin$Engine$Source$Origin;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$Origin$ForJarFile.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$Origin$ForJarFile.eea
index ca5f31639e..d6d3fe09f8 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$Origin$ForJarFile.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Source$Origin$ForJarFile.eea
@@ -8,7 +8,7 @@ getManifest
  ()L0java/util/jar/Manifest; # @Inherited(net.bytebuddy.build.Plugin$Engine$Source$Origin)
 iterator
  ()Ljava/util/Iterator<Lnet/bytebuddy/build/Plugin$Engine$Source$Element;>;
- ()Ljava/util/Iterator<Lnet/bytebuddy/build/Plugin$Engine$Source$Element;>;
+ ()L1java/util/Iterator<Lnet/bytebuddy/build/Plugin$Engine$Source$Element;>;
 toClassFileLocator
  (Lnet/bytebuddy/ClassFileVersion;)Lnet/bytebuddy/dynamic/ClassFileLocator;
  (Lnet/bytebuddy/ClassFileVersion;)Lnet/bytebuddy/dynamic/ClassFileLocator;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Target$ForJarFile.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Target$ForJarFile.eea
index 5792dce960..5c777a0e85 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Target$ForJarFile.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Target$ForJarFile.eea
@@ -8,4 +8,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 write
  (Ljava/util/jar/Manifest;)Lnet/bytebuddy/build/Plugin$Engine$Target$Sink;
- (Ljava/util/jar/Manifest;)Lnet/bytebuddy/build/Plugin$Engine$Target$Sink;
+ (Ljava/util/jar/Manifest;)L1net/bytebuddy/build/Plugin$Engine$Target$Sink;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Target$InMemory.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Target$InMemory.eea
index f1a5bacf77..d7e690160f 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Target$InMemory.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Engine$Target$InMemory.eea
@@ -20,10 +20,10 @@ store
  (Lnet/bytebuddy/ClassFileVersion;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;)V
 toTypeMap
  ()Ljava/util/Map<Ljava/lang/String;[B>;
- ()Ljava/util/Map<Ljava/lang/String;[B>;
+ ()L1java/util/Map<Ljava/lang/String;[B>;
 toTypeMap
  (Lnet/bytebuddy/ClassFileVersion;)Ljava/util/Map<Ljava/lang/String;[B>;
- (Lnet/bytebuddy/ClassFileVersion;)Ljava/util/Map<Ljava/lang/String;[B>;
+ (Lnet/bytebuddy/ClassFileVersion;)L1java/util/Map<Ljava/lang/String;[B>;
 write
  (Ljava/util/jar/Manifest;)Lnet/bytebuddy/build/Plugin$Engine$Target$Sink;
  (Ljava/util/jar/Manifest;)Lnet/bytebuddy/build/Plugin$Engine$Target$Sink;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Factory$UsingReflection$ArgumentResolver$ForType.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Factory$UsingReflection$ArgumentResolver$ForType.eea
index d90076abc5..ed899e27cd 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Factory$UsingReflection$ArgumentResolver$ForType.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Factory$UsingReflection$ArgumentResolver$ForType.eea
@@ -4,7 +4,7 @@ class net/bytebuddy/build/Plugin$Factory$UsingReflection$ArgumentResolver$ForTyp
 
 of
  <S:Ljava/lang/Object;>(Ljava/lang/Class<+TS;>;TS;)Lnet/bytebuddy/build/Plugin$Factory$UsingReflection$ArgumentResolver;
- <S:Ljava/lang/Object;>(Ljava/lang/Class<+TS;>;TS;)Lnet/bytebuddy/build/Plugin$Factory$UsingReflection$ArgumentResolver;
+ <S:Ljava/lang/Object;>(Ljava/lang/Class<+TS;>;TS;)L1net/bytebuddy/build/Plugin$Factory$UsingReflection$ArgumentResolver;
 
 <init>
  (Ljava/lang/Class<+TT;>;TT;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Factory$UsingReflection$Instantiator$Ambiguous.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Factory$UsingReflection$Instantiator$Ambiguous.eea
index 72a769abe2..e8b9ac9c88 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Factory$UsingReflection$Instantiator$Ambiguous.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Factory$UsingReflection$Instantiator$Ambiguous.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 instantiate
  ()Lnet/bytebuddy/build/Plugin;
- ()Lnet/bytebuddy/build/Plugin;
+ ()L1net/bytebuddy/build/Plugin;
 replaceBy
  (Lnet/bytebuddy/build/Plugin$Factory$UsingReflection$Instantiator$Resolved;)Lnet/bytebuddy/build/Plugin$Factory$UsingReflection$Instantiator;
  (Lnet/bytebuddy/build/Plugin$Factory$UsingReflection$Instantiator$Resolved;)Lnet/bytebuddy/build/Plugin$Factory$UsingReflection$Instantiator;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Factory$UsingReflection$Instantiator$Unresolved.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Factory$UsingReflection$Instantiator$Unresolved.eea
index 8024a5b391..f026aaf76e 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Factory$UsingReflection$Instantiator$Unresolved.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$Factory$UsingReflection$Instantiator$Unresolved.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 instantiate
  ()Lnet/bytebuddy/build/Plugin;
- ()Lnet/bytebuddy/build/Plugin;
+ ()L1net/bytebuddy/build/Plugin;
 replaceBy
  (Lnet/bytebuddy/build/Plugin$Factory$UsingReflection$Instantiator$Resolved;)Lnet/bytebuddy/build/Plugin$Factory$UsingReflection$Instantiator;
  (Lnet/bytebuddy/build/Plugin$Factory$UsingReflection$Instantiator$Resolved;)Lnet/bytebuddy/build/Plugin$Factory$UsingReflection$Instantiator;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$NoOp.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$NoOp.eea
index 1cfc720041..ed54741ec9 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$NoOp.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/Plugin$NoOp.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/build/Plugin$NoOp
 
 apply
  (Lnet/bytebuddy/dynamic/DynamicType$Builder<*>;Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/dynamic/ClassFileLocator;)Lnet/bytebuddy/dynamic/DynamicType$Builder<*>;
- (Lnet/bytebuddy/dynamic/DynamicType$Builder<*>;Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/dynamic/ClassFileLocator;)Lnet/bytebuddy/dynamic/DynamicType$Builder<*>;
+ (Lnet/bytebuddy/dynamic/DynamicType$Builder<*>;Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/dynamic/ClassFileLocator;)L1net/bytebuddy/dynamic/DynamicType$Builder<*>;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/RenamingPlugin.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/RenamingPlugin.eea
index 0388d30d45..f831886ff5 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/RenamingPlugin.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/build/RenamingPlugin.eea
@@ -23,4 +23,4 @@ matches
  (Lnet/bytebuddy/description/type/TypeDescription;)Z
 wrap
  (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/jar/asm/ClassVisitor;Lnet/bytebuddy/implementation/Implementation$Context;Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;Lnet/bytebuddy/description/method/MethodList<*>;II)Lnet/bytebuddy/jar/asm/ClassVisitor;
- (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/jar/asm/ClassVisitor;Lnet/bytebuddy/implementation/Implementation$Context;Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;Lnet/bytebuddy/description/method/MethodList<*>;II)Lnet/bytebuddy/jar/asm/ClassVisitor;
+ (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/jar/asm/ClassVisitor;Lnet/bytebuddy/implementation/Implementation$Context;Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;Lnet/bytebuddy/description/method/MethodList<*>;II)L1net/bytebuddy/jar/asm/ClassVisitor;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/ByteCodeElement$Token$TokenList.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/ByteCodeElement$Token$TokenList.eea
index c6730c94ca..ee685c58cb 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/ByteCodeElement$Token$TokenList.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/ByteCodeElement$Token$TokenList.eea
@@ -14,10 +14,10 @@ super net/bytebuddy/matcher/FilterableList$AbstractBase
  ([TS;)V
 accept
  (Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/description/ByteCodeElement$Token$TokenList<TS;>;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/description/ByteCodeElement$Token$TokenList<TS;>;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)L1net/bytebuddy/description/ByteCodeElement$Token$TokenList<TS;>;
 get
  (I)TS;
  (I)TS;
 wrap
  (Ljava/util/List<TS;>;)Lnet/bytebuddy/description/ByteCodeElement$Token$TokenList<TS;>;
- (Ljava/util/List<TS;>;)Lnet/bytebuddy/description/ByteCodeElement$Token$TokenList<TS;>;
+ (Ljava/util/List<TS;>;)L1net/bytebuddy/description/ByteCodeElement$Token$TokenList<TS;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationDescription$AbstractBase.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationDescription$AbstractBase.eea
index d445f747f6..0c24d0232f 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationDescription$AbstractBase.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationDescription$AbstractBase.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getElementTypes
  ()Ljava/util/Set<Ljava/lang/annotation/ElementType;>;
- ()Ljava/util/Set<Ljava/lang/annotation/ElementType;>;
+ ()L1java/util/Set<Ljava/lang/annotation/ElementType;>;
 getRetention
  ()Ljava/lang/annotation/RetentionPolicy;
  ()Ljava/lang/annotation/RetentionPolicy;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationDescription$AnnotationInvocationHandler.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationDescription$AnnotationInvocationHandler.eea
index 0e9e228d98..1e3d831b3c 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationDescription$AnnotationInvocationHandler.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationDescription$AnnotationInvocationHandler.eea
@@ -17,4 +17,4 @@ invoke
  (L1java/lang/Object;L1java/lang/reflect/Method;[0L0java/lang/Object;)L0java/lang/Object; # @Inherited(java.lang.reflect.InvocationHandler)
 toStringRepresentation
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationDescription$Builder.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationDescription$Builder.eea
index 0ffcfb15af..0c0e188466 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationDescription$Builder.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationDescription$Builder.eea
@@ -5,7 +5,7 @@ ofType
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lnet/bytebuddy/description/annotation/AnnotationDescription$Builder;
 ofType
  (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/description/annotation/AnnotationDescription$Builder;
- (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/description/annotation/AnnotationDescription$Builder;
+ (Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/description/annotation/AnnotationDescription$Builder;
 
 <init>
  (Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/Map<Ljava/lang/String;Lnet/bytebuddy/description/annotation/AnnotationValue<**>;>;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationDescription$ForLoadedAnnotation.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationDescription$ForLoadedAnnotation.eea
index 901e69e56a..05efcf3d4a 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationDescription$ForLoadedAnnotation.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationDescription$ForLoadedAnnotation.eea
@@ -11,7 +11,7 @@ asValue
  (Ljava/lang/Object;Ljava/lang/Class<*>;)Lnet/bytebuddy/description/annotation/AnnotationValue<**>;
 of
  <U::Ljava/lang/annotation/Annotation;>(TU;)Lnet/bytebuddy/description/annotation/AnnotationDescription$Loadable<TU;>;
- <U::Ljava/lang/annotation/Annotation;>(TU;)Lnet/bytebuddy/description/annotation/AnnotationDescription$Loadable<TU;>;
+ <U::Ljava/lang/annotation/Annotation;>(TU;)L1net/bytebuddy/description/annotation/AnnotationDescription$Loadable<TU;>;
 
 <init>
  (TS;)V
@@ -27,4 +27,4 @@ load
  ()TS;
 prepare
  <T::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TT;>;)Lnet/bytebuddy/description/annotation/AnnotationDescription$Loadable<TT;>;
- <T::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TT;>;)Lnet/bytebuddy/description/annotation/AnnotationDescription$Loadable<TT;>;
+ <T::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TT;>;)L1net/bytebuddy/description/annotation/AnnotationDescription$Loadable<TT;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationDescription$Latent.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationDescription$Latent.eea
index 19bc57f3d9..d9263b934f 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationDescription$Latent.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationDescription$Latent.eea
@@ -11,4 +11,4 @@ getValue
  (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)Lnet/bytebuddy/description/annotation/AnnotationValue<**>;
 prepare
  <T::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TT;>;)Lnet/bytebuddy/description/annotation/AnnotationDescription$Latent$Loadable<TT;>;
- <T::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TT;>;)Lnet/bytebuddy/description/annotation/AnnotationDescription$Latent$Loadable<TT;>;
+ <T::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TT;>;)L1net/bytebuddy/description/annotation/AnnotationDescription$Latent$Loadable<TT;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationList$AbstractBase.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationList$AbstractBase.eea
index f43f6c2d82..59566403f5 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationList$AbstractBase.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationList$AbstractBase.eea
@@ -6,10 +6,10 @@ super net/bytebuddy/matcher/FilterableList$AbstractBase
 
 asTypeList
  ()Lnet/bytebuddy/description/type/TypeList;
- ()Lnet/bytebuddy/description/type/TypeList;
+ ()L1net/bytebuddy/description/type/TypeList;
 asTypeNames
  ()Ljava/util/List<Ljava/lang/String;>;
- ()Ljava/util/List<Ljava/lang/String;>;
+ ()L1java/util/List<Ljava/lang/String;>;
 inherited
  (Ljava/util/Set<+Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/annotation/AnnotationList;
  (Ljava/util/Set<+Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/annotation/AnnotationList;
@@ -30,4 +30,4 @@ visibility
  (Lnet/bytebuddy/matcher/ElementMatcher<-Ljava/lang/annotation/RetentionPolicy;>;)Lnet/bytebuddy/description/annotation/AnnotationList;
 wrap
  (Ljava/util/List<Lnet/bytebuddy/description/annotation/AnnotationDescription;>;)Lnet/bytebuddy/description/annotation/AnnotationList;
- (Ljava/util/List<Lnet/bytebuddy/description/annotation/AnnotationDescription;>;)Lnet/bytebuddy/description/annotation/AnnotationList;
+ (Ljava/util/List<Lnet/bytebuddy/description/annotation/AnnotationDescription;>;)L1net/bytebuddy/description/annotation/AnnotationList;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationList$Empty.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationList$Empty.eea
index 832067d554..a477fdccb1 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationList$Empty.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationList$Empty.eea
@@ -6,11 +6,11 @@ super net/bytebuddy/matcher/FilterableList$Empty
 
 asList
  (I)Ljava/util/List<Lnet/bytebuddy/description/annotation/AnnotationList;>;
- (I)Ljava/util/List<Lnet/bytebuddy/description/annotation/AnnotationList;>;
+ (I)L1java/util/List<Lnet/bytebuddy/description/annotation/AnnotationList;>;
 
 asTypeList
  ()Lnet/bytebuddy/description/type/TypeList;
- ()Lnet/bytebuddy/description/type/TypeList;
+ ()L1net/bytebuddy/description/type/TypeList;
 asTypeNames
  ()Ljava/util/List<Ljava/lang/String;>;
  ()Ljava/util/List<Ljava/lang/String;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationList$Explicit.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationList$Explicit.eea
index 9d3c6727c3..0450c62652 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationList$Explicit.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationList$Explicit.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/description/annotation/AnnotationList$Explicit
 
 asList
  (Ljava/util/List<+Ljava/util/List<+Lnet/bytebuddy/description/annotation/AnnotationDescription;>;>;)Ljava/util/List<Lnet/bytebuddy/description/annotation/AnnotationList;>;
- (Ljava/util/List<+Ljava/util/List<+Lnet/bytebuddy/description/annotation/AnnotationDescription;>;>;)Ljava/util/List<Lnet/bytebuddy/description/annotation/AnnotationList;>;
+ (Ljava/util/List<+Ljava/util/List<+Lnet/bytebuddy/description/annotation/AnnotationDescription;>;>;)L1java/util/List<Lnet/bytebuddy/description/annotation/AnnotationList;>;
 
 <init>
  (Ljava/util/List<+Lnet/bytebuddy/description/annotation/AnnotationDescription;>;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationSource$Empty.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationSource$Empty.eea
index 7cdd225f63..24f51b23a2 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationSource$Empty.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationSource$Empty.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationSource$Explicit.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationSource$Explicit.eea
index 6da0efc479..71d018f411 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationSource$Explicit.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationSource$Explicit.eea
@@ -11,4 +11,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForAnnotationDescription.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForAnnotationDescription.eea
index 4e623d5129..ba97ceffbd 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForAnnotationDescription.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForAnnotationDescription.eea
@@ -8,7 +8,7 @@ super net/bytebuddy/description/annotation/AnnotationValue$AbstractBase
 
 of
  <V::Ljava/lang/annotation/Annotation;>(Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/Map<Ljava/lang/String;+Lnet/bytebuddy/description/annotation/AnnotationValue<**>;>;)Lnet/bytebuddy/description/annotation/AnnotationValue<Lnet/bytebuddy/description/annotation/AnnotationDescription;TV;>;
- <V::Ljava/lang/annotation/Annotation;>(Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/Map<Ljava/lang/String;+Lnet/bytebuddy/description/annotation/AnnotationValue<**>;>;)Lnet/bytebuddy/description/annotation/AnnotationValue<Lnet/bytebuddy/description/annotation/AnnotationDescription;TV;>;
+ <V::Ljava/lang/annotation/Annotation;>(Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/Map<Ljava/lang/String;+Lnet/bytebuddy/description/annotation/AnnotationValue<**>;>;)L1net/bytebuddy/description/annotation/AnnotationValue<Lnet/bytebuddy/description/annotation/AnnotationDescription;TV;>;
 
 <init>
  (Lnet/bytebuddy/description/annotation/AnnotationDescription;)V
@@ -18,7 +18,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 filter
  (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/description/type/TypeDefinition;)Lnet/bytebuddy/description/annotation/AnnotationValue<Lnet/bytebuddy/description/annotation/AnnotationDescription;TU;>;
- (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/description/type/TypeDefinition;)Lnet/bytebuddy/description/annotation/AnnotationValue<Lnet/bytebuddy/description/annotation/AnnotationDescription;TU;>;
+ (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/description/type/TypeDefinition;)L1net/bytebuddy/description/annotation/AnnotationValue<Lnet/bytebuddy/description/annotation/AnnotationDescription;TU;>;
 getSort
  ()Lnet/bytebuddy/description/annotation/AnnotationValue$Sort;
  ()Lnet/bytebuddy/description/annotation/AnnotationValue$Sort;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForConstant.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForConstant.eea
index d4ca4b44f1..dca83e4547 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForConstant.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForConstant.eea
@@ -8,61 +8,61 @@ super net/bytebuddy/description/annotation/AnnotationValue$AbstractBase
 
 of
  (B)Lnet/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/Byte;Ljava/lang/Byte;>;
- (B)Lnet/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/Byte;Ljava/lang/Byte;>;
+ (B)L1net/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/Byte;Ljava/lang/Byte;>;
 of
  (C)Lnet/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/Character;Ljava/lang/Character;>;
- (C)Lnet/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/Character;Ljava/lang/Character;>;
+ (C)L1net/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/Character;Ljava/lang/Character;>;
 of
  (D)Lnet/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/Double;Ljava/lang/Double;>;
- (D)Lnet/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/Double;Ljava/lang/Double;>;
+ (D)L1net/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/Double;Ljava/lang/Double;>;
 of
  (F)Lnet/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/Float;Ljava/lang/Float;>;
- (F)Lnet/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/Float;Ljava/lang/Float;>;
+ (F)L1net/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/Float;Ljava/lang/Float;>;
 of
  (I)Lnet/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/Integer;Ljava/lang/Integer;>;
- (I)Lnet/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/Integer;Ljava/lang/Integer;>;
+ (I)L1net/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/Integer;Ljava/lang/Integer;>;
 of
  (J)Lnet/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/Long;Ljava/lang/Long;>;
- (J)Lnet/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/Long;Ljava/lang/Long;>;
+ (J)L1net/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/Long;Ljava/lang/Long;>;
 of
  (Ljava/lang/Object;)Lnet/bytebuddy/description/annotation/AnnotationValue<**>;
  (Ljava/lang/Object;)Lnet/bytebuddy/description/annotation/AnnotationValue<**>;
 of
  (Ljava/lang/String;)Lnet/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/String;Ljava/lang/String;>;
- (Ljava/lang/String;)Lnet/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/String;Ljava/lang/String;>;
+ (Ljava/lang/String;)L1net/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/String;Ljava/lang/String;>;
 of
  (S)Lnet/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/Short;Ljava/lang/Short;>;
- (S)Lnet/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/Short;Ljava/lang/Short;>;
+ (S)L1net/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/Short;Ljava/lang/Short;>;
 of
  (Z)Lnet/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/Boolean;Ljava/lang/Boolean;>;
- (Z)Lnet/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/Boolean;Ljava/lang/Boolean;>;
+ (Z)L1net/bytebuddy/description/annotation/AnnotationValue<Ljava/lang/Boolean;Ljava/lang/Boolean;>;
 of
  ([B)Lnet/bytebuddy/description/annotation/AnnotationValue<[B[B>;
- ([B)Lnet/bytebuddy/description/annotation/AnnotationValue<[B[B>;
+ ([B)L1net/bytebuddy/description/annotation/AnnotationValue<[B[B>;
 of
  ([C)Lnet/bytebuddy/description/annotation/AnnotationValue<[C[C>;
- ([C)Lnet/bytebuddy/description/annotation/AnnotationValue<[C[C>;
+ ([C)L1net/bytebuddy/description/annotation/AnnotationValue<[C[C>;
 of
  ([D)Lnet/bytebuddy/description/annotation/AnnotationValue<[D[D>;
- ([D)Lnet/bytebuddy/description/annotation/AnnotationValue<[D[D>;
+ ([D)L1net/bytebuddy/description/annotation/AnnotationValue<[D[D>;
 of
  ([F)Lnet/bytebuddy/description/annotation/AnnotationValue<[F[F>;
- ([F)Lnet/bytebuddy/description/annotation/AnnotationValue<[F[F>;
+ ([F)L1net/bytebuddy/description/annotation/AnnotationValue<[F[F>;
 of
  ([I)Lnet/bytebuddy/description/annotation/AnnotationValue<[I[I>;
- ([I)Lnet/bytebuddy/description/annotation/AnnotationValue<[I[I>;
+ ([I)L1net/bytebuddy/description/annotation/AnnotationValue<[I[I>;
 of
  ([J)Lnet/bytebuddy/description/annotation/AnnotationValue<[J[J>;
- ([J)Lnet/bytebuddy/description/annotation/AnnotationValue<[J[J>;
+ ([J)L1net/bytebuddy/description/annotation/AnnotationValue<[J[J>;
 of
  ([Ljava/lang/String;)Lnet/bytebuddy/description/annotation/AnnotationValue<[Ljava/lang/String;[Ljava/lang/String;>;
- ([Ljava/lang/String;)Lnet/bytebuddy/description/annotation/AnnotationValue<[Ljava/lang/String;[Ljava/lang/String;>;
+ ([Ljava/lang/String;)L1net/bytebuddy/description/annotation/AnnotationValue<[Ljava/lang/String;[Ljava/lang/String;>;
 of
  ([S)Lnet/bytebuddy/description/annotation/AnnotationValue<[S[S>;
- ([S)Lnet/bytebuddy/description/annotation/AnnotationValue<[S[S>;
+ ([S)L1net/bytebuddy/description/annotation/AnnotationValue<[S[S>;
 of
  ([Z)Lnet/bytebuddy/description/annotation/AnnotationValue<[Z[Z>;
- ([Z)Lnet/bytebuddy/description/annotation/AnnotationValue<[Z[Z>;
+ ([Z)L1net/bytebuddy/description/annotation/AnnotationValue<[Z[Z>;
 
 <init>
  (TU;Lnet/bytebuddy/description/annotation/AnnotationValue$ForConstant$PropertyDelegate;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForDescriptionArray.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForDescriptionArray.eea
index 8de753a611..1527697957 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForDescriptionArray.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForDescriptionArray.eea
@@ -8,13 +8,13 @@ super net/bytebuddy/description/annotation/AnnotationValue$AbstractBase
 
 of
  ([Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/description/annotation/AnnotationValue<[Lnet/bytebuddy/description/type/TypeDescription;[Ljava/lang/Class<*>;>;
- ([Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/description/annotation/AnnotationValue<[Lnet/bytebuddy/description/type/TypeDescription;[Ljava/lang/Class<*>;>;
+ ([Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/description/annotation/AnnotationValue<[Lnet/bytebuddy/description/type/TypeDescription;[Ljava/lang/Class<*>;>;
 of
  <W::Ljava/lang/annotation/Annotation;>(Lnet/bytebuddy/description/type/TypeDescription;[Lnet/bytebuddy/description/annotation/AnnotationDescription;)Lnet/bytebuddy/description/annotation/AnnotationValue<[Lnet/bytebuddy/description/annotation/AnnotationDescription;[TW;>;
- <W::Ljava/lang/annotation/Annotation;>(Lnet/bytebuddy/description/type/TypeDescription;[Lnet/bytebuddy/description/annotation/AnnotationDescription;)Lnet/bytebuddy/description/annotation/AnnotationValue<[Lnet/bytebuddy/description/annotation/AnnotationDescription;[TW;>;
+ <W::Ljava/lang/annotation/Annotation;>(Lnet/bytebuddy/description/type/TypeDescription;[Lnet/bytebuddy/description/annotation/AnnotationDescription;)L1net/bytebuddy/description/annotation/AnnotationValue<[Lnet/bytebuddy/description/annotation/AnnotationDescription;[TW;>;
 of
  <W:Ljava/lang/Enum<TW;>;>(Lnet/bytebuddy/description/type/TypeDescription;[Lnet/bytebuddy/description/enumeration/EnumerationDescription;)Lnet/bytebuddy/description/annotation/AnnotationValue<[Lnet/bytebuddy/description/enumeration/EnumerationDescription;[TW;>;
- <W:Ljava/lang/Enum<TW;>;>(Lnet/bytebuddy/description/type/TypeDescription;[Lnet/bytebuddy/description/enumeration/EnumerationDescription;)Lnet/bytebuddy/description/annotation/AnnotationValue<[Lnet/bytebuddy/description/enumeration/EnumerationDescription;[TW;>;
+ <W:Ljava/lang/Enum<TW;>;>(Lnet/bytebuddy/description/type/TypeDescription;[Lnet/bytebuddy/description/enumeration/EnumerationDescription;)L1net/bytebuddy/description/annotation/AnnotationValue<[Lnet/bytebuddy/description/enumeration/EnumerationDescription;[TW;>;
 
 <init>
  (Ljava/lang/Class<*>;Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/List<+Lnet/bytebuddy/description/annotation/AnnotationValue<**>;>;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForEnumerationDescription$Loaded$WithIncompatibleRuntimeType.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForEnumerationDescription$Loaded$WithIncompatibleRuntimeType.eea
index d4b5c4d617..809fcb2748 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForEnumerationDescription$Loaded$WithIncompatibleRuntimeType.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForEnumerationDescription$Loaded$WithIncompatibleRuntimeType.eea
@@ -15,4 +15,4 @@ represents
  (Ljava/lang/Object;)Z
 resolve
  ()Ljava/lang/Enum<*>;
- ()Ljava/lang/Enum<*>;
+ ()L1java/lang/Enum<*>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForEnumerationDescription$WithUnknownConstant$Loaded.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForEnumerationDescription$WithUnknownConstant$Loaded.eea
index a933321285..e0e21e9181 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForEnumerationDescription$WithUnknownConstant$Loaded.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForEnumerationDescription$WithUnknownConstant$Loaded.eea
@@ -9,7 +9,7 @@ super net/bytebuddy/description/annotation/AnnotationValue$Loaded$AbstractBase$F
  (Ljava/lang/Class<+Ljava/lang/Enum<*>;>;Ljava/lang/String;)V
 resolve
  ()Ljava/lang/Enum<*>;
- ()Ljava/lang/Enum<*>;
+ ()L1java/lang/Enum<*>;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForEnumerationDescription$WithUnknownConstant.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForEnumerationDescription$WithUnknownConstant.eea
index b737bbc1f3..5c0bb9595e 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForEnumerationDescription$WithUnknownConstant.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForEnumerationDescription$WithUnknownConstant.eea
@@ -23,7 +23,7 @@ load
  (Ljava/lang/ClassLoader;)Lnet/bytebuddy/description/annotation/AnnotationValue$Loaded<TU;>;
 resolve
  ()Lnet/bytebuddy/description/enumeration/EnumerationDescription;
- ()Lnet/bytebuddy/description/enumeration/EnumerationDescription;
+ ()L1net/bytebuddy/description/enumeration/EnumerationDescription;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForEnumerationDescription.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForEnumerationDescription.eea
index 79c4c95ad6..c05ae44d01 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForEnumerationDescription.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForEnumerationDescription.eea
@@ -8,7 +8,7 @@ super net/bytebuddy/description/annotation/AnnotationValue$AbstractBase
 
 of
  <V:Ljava/lang/Enum<TV;>;>(Lnet/bytebuddy/description/enumeration/EnumerationDescription;)Lnet/bytebuddy/description/annotation/AnnotationValue<Lnet/bytebuddy/description/enumeration/EnumerationDescription;TV;>;
- <V:Ljava/lang/Enum<TV;>;>(Lnet/bytebuddy/description/enumeration/EnumerationDescription;)Lnet/bytebuddy/description/annotation/AnnotationValue<Lnet/bytebuddy/description/enumeration/EnumerationDescription;TV;>;
+ <V:Ljava/lang/Enum<TV;>;>(Lnet/bytebuddy/description/enumeration/EnumerationDescription;)L1net/bytebuddy/description/annotation/AnnotationValue<Lnet/bytebuddy/description/enumeration/EnumerationDescription;TV;>;
 
 <init>
  (Lnet/bytebuddy/description/enumeration/EnumerationDescription;)V
@@ -18,7 +18,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 filter
  (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/description/type/TypeDefinition;)Lnet/bytebuddy/description/annotation/AnnotationValue<Lnet/bytebuddy/description/enumeration/EnumerationDescription;TU;>;
- (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/description/type/TypeDefinition;)Lnet/bytebuddy/description/annotation/AnnotationValue<Lnet/bytebuddy/description/enumeration/EnumerationDescription;TU;>;
+ (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/description/type/TypeDefinition;)L1net/bytebuddy/description/annotation/AnnotationValue<Lnet/bytebuddy/description/enumeration/EnumerationDescription;TU;>;
 getSort
  ()Lnet/bytebuddy/description/annotation/AnnotationValue$Sort;
  ()Lnet/bytebuddy/description/annotation/AnnotationValue$Sort;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForIncompatibleType$Loaded.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForIncompatibleType$Loaded.eea
index 912932d69a..19695a9b66 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForIncompatibleType$Loaded.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForIncompatibleType$Loaded.eea
@@ -11,7 +11,7 @@ super net/bytebuddy/description/annotation/AnnotationValue$Loaded$AbstractBase$F
  (Ljava/lang/Class<*>;)V
 resolve
  ()TW;
- ()TW;
+ ()T1W;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForIncompatibleType.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForIncompatibleType.eea
index ac3b50191d..86e7021e4c 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForIncompatibleType.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForIncompatibleType.eea
@@ -23,7 +23,7 @@ load
  (Ljava/lang/ClassLoader;)Lnet/bytebuddy/description/annotation/AnnotationValue$Loaded<TV;>;
 resolve
  ()TU;
- ()TU;
+ ()T1U;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForMismatchedType$Loaded.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForMismatchedType$Loaded.eea
index 935b067f66..6a3020f0ea 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForMismatchedType$Loaded.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForMismatchedType$Loaded.eea
@@ -11,7 +11,7 @@ super net/bytebuddy/description/annotation/AnnotationValue$Loaded$AbstractBase$F
  (Ljava/lang/reflect/Method;Ljava/lang/String;)V
 resolve
  ()TW;
- ()TW;
+ ()T1W;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForMismatchedType.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForMismatchedType.eea
index b4f16988dc..bfe3c689f6 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForMismatchedType.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForMismatchedType.eea
@@ -11,7 +11,7 @@ super net/bytebuddy/description/annotation/AnnotationValue$AbstractBase
  (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Ljava/lang/String;)V
 filter
  (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/description/type/TypeDefinition;)Lnet/bytebuddy/description/annotation/AnnotationValue<TU;TV;>;
- (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/description/type/TypeDefinition;)Lnet/bytebuddy/description/annotation/AnnotationValue<TU;TV;>;
+ (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/description/type/TypeDefinition;)L1net/bytebuddy/description/annotation/AnnotationValue<TU;TV;>;
 getSort
  ()Lnet/bytebuddy/description/annotation/AnnotationValue$Sort;
  ()Lnet/bytebuddy/description/annotation/AnnotationValue$Sort;
@@ -23,7 +23,7 @@ load
  (Ljava/lang/ClassLoader;)Lnet/bytebuddy/description/annotation/AnnotationValue$Loaded<TV;>;
 resolve
  ()TU;
- ()TU;
+ ()T1U;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForMissingType$Loaded.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForMissingType$Loaded.eea
index 4a0e3332aa..c3293928db 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForMissingType$Loaded.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForMissingType$Loaded.eea
@@ -11,7 +11,7 @@ super net/bytebuddy/description/annotation/AnnotationValue$Loaded$AbstractBase$F
  (Ljava/lang/String;Ljava/lang/ClassNotFoundException;)V
 resolve
  ()TU;
- ()TU;
+ ()T1U;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForMissingType.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForMissingType.eea
index 3a9f91cab6..240fc217a3 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForMissingType.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForMissingType.eea
@@ -23,7 +23,7 @@ load
  (Ljava/lang/ClassLoader;)Lnet/bytebuddy/description/annotation/AnnotationValue$Loaded<TV;>;
 resolve
  ()TU;
- ()TU;
+ ()T1U;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForMissingValue$Loaded.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForMissingValue$Loaded.eea
index 38a9f418cd..77ea2c68e0 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForMissingValue$Loaded.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForMissingValue$Loaded.eea
@@ -17,4 +17,4 @@ represents
  (Ljava/lang/Object;)Z
 resolve
  ()TW;
- ()TW;
+ ()T1W;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForMissingValue.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForMissingValue.eea
index 60d129a377..fbdbb63dee 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForMissingValue.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForMissingValue.eea
@@ -20,7 +20,7 @@ getState
  ()Lnet/bytebuddy/description/annotation/AnnotationValue$State;
 load
  (Ljava/lang/ClassLoader;)Lnet/bytebuddy/description/annotation/AnnotationValue$Loaded<TV;>;
- (Ljava/lang/ClassLoader;)Lnet/bytebuddy/description/annotation/AnnotationValue$Loaded<TV;>;
+ (Ljava/lang/ClassLoader;)L1net/bytebuddy/description/annotation/AnnotationValue$Loaded<TV;>;
 resolve
  ()TU;
- ()TU;
+ ()T1U;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForTypeDescription.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForTypeDescription.eea
index 31fa39b707..3a84231719 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForTypeDescription.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$ForTypeDescription.eea
@@ -8,7 +8,7 @@ super net/bytebuddy/description/annotation/AnnotationValue$AbstractBase
 
 of
  <V:Ljava/lang/Class<TV;>;>(Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/description/annotation/AnnotationValue<Lnet/bytebuddy/description/type/TypeDescription;TV;>;
- <V:Ljava/lang/Class<TV;>;>(Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/description/annotation/AnnotationValue<Lnet/bytebuddy/description/type/TypeDescription;TV;>;
+ <V:Ljava/lang/Class<TV;>;>(Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/description/annotation/AnnotationValue<Lnet/bytebuddy/description/type/TypeDescription;TV;>;
 
 <init>
  (Lnet/bytebuddy/description/type/TypeDescription;)V
@@ -18,7 +18,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 filter
  (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/description/type/TypeDefinition;)Lnet/bytebuddy/description/annotation/AnnotationValue<Lnet/bytebuddy/description/type/TypeDescription;TU;>;
- (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/description/type/TypeDefinition;)Lnet/bytebuddy/description/annotation/AnnotationValue<Lnet/bytebuddy/description/type/TypeDescription;TU;>;
+ (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/description/type/TypeDefinition;)L1net/bytebuddy/description/annotation/AnnotationValue<Lnet/bytebuddy/description/type/TypeDescription;TU;>;
 getSort
  ()Lnet/bytebuddy/description/annotation/AnnotationValue$Sort;
  ()Lnet/bytebuddy/description/annotation/AnnotationValue$Sort;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$RenderingDispatcher.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$RenderingDispatcher.eea
index 4212b32e5f..46b444728d 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$RenderingDispatcher.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/annotation/AnnotationValue$RenderingDispatcher.eea
@@ -6,7 +6,7 @@ super java/lang/Enum
 
 toArrayErrorString
  (Lnet/bytebuddy/description/annotation/AnnotationValue$Sort;)Ljava/lang/String;
- (Lnet/bytebuddy/description/annotation/AnnotationValue$Sort;)Ljava/lang/String;
+ (Lnet/bytebuddy/description/annotation/AnnotationValue$Sort;)L1java/lang/String;
 toSourceString
  (B)Ljava/lang/String;
  (B)Ljava/lang/String;
@@ -30,7 +30,7 @@ toSourceString
  (Ljava/lang/String;)Ljava/lang/String;
 toSourceString
  (Ljava/util/List<*>;)Ljava/lang/String;
- (Ljava/util/List<*>;)Ljava/lang/String;
+ (Ljava/util/List<*>;)L1java/lang/String;
 toSourceString
  (Lnet/bytebuddy/description/type/TypeDescription;)Ljava/lang/String;
  (Lnet/bytebuddy/description/type/TypeDescription;)Ljava/lang/String;
@@ -42,4 +42,4 @@ toSourceString
  (Z)Ljava/lang/String;
 toTypeErrorString
  (Ljava/lang/Class<*>;)Ljava/lang/String;
- (Ljava/lang/Class<*>;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;)L1java/lang/String;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/field/FieldDescription$AbstractBase.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/field/FieldDescription$AbstractBase.eea
index f81244ff4d..6f4fa82aad 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/field/FieldDescription$AbstractBase.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/field/FieldDescription$AbstractBase.eea
@@ -2,10 +2,10 @@ class net/bytebuddy/description/field/FieldDescription$AbstractBase
 
 asSignatureToken
  ()Lnet/bytebuddy/description/field/FieldDescription$SignatureToken;
- ()Lnet/bytebuddy/description/field/FieldDescription$SignatureToken;
+ ()L1net/bytebuddy/description/field/FieldDescription$SignatureToken;
 asToken
  (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/field/FieldDescription$Token;
- (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/field/FieldDescription$Token;
+ (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)L1net/bytebuddy/description/field/FieldDescription$Token;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -29,7 +29,7 @@ isVisibleTo
  (Lnet/bytebuddy/description/type/TypeDescription;)Z
 toGenericString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/field/FieldDescription$Latent.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/field/FieldDescription$Latent.eea
index c0aab0efd7..2eadc4fb3e 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/field/FieldDescription$Latent.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/field/FieldDescription$Latent.eea
@@ -8,7 +8,7 @@ class net/bytebuddy/description/field/FieldDescription$Latent
  (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/field/FieldDescription$Token;)V
 getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getDeclaringType
  ()Lnet/bytebuddy/description/type/TypeDescription;
  ()L1net/bytebuddy/description/type/TypeDescription; # @Inherited(net.bytebuddy.description.field.FieldDescription$InDefinedShape)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/field/FieldDescription$Token.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/field/FieldDescription$Token.eea
index e5d4e79b8d..6a85ae8973 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/field/FieldDescription$Token.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/field/FieldDescription$Token.eea
@@ -21,7 +21,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/field/FieldList$AbstractBase.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/field/FieldList$AbstractBase.eea
index 6358dd4c2c..7a63e8d6b3 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/field/FieldList$AbstractBase.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/field/FieldList$AbstractBase.eea
@@ -11,10 +11,10 @@ super net/bytebuddy/description/field/FieldList
 
 asDefined
  ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;
 asTokenList
  (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/ByteCodeElement$Token$TokenList<Lnet/bytebuddy/description/field/FieldDescription$Token;>;
- (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/ByteCodeElement$Token$TokenList<Lnet/bytebuddy/description/field/FieldDescription$Token;>;
+ (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)L1net/bytebuddy/description/ByteCodeElement$Token$TokenList<Lnet/bytebuddy/description/field/FieldDescription$Token;>;
 wrap
  (Ljava/util/List<TS;>;)Lnet/bytebuddy/description/field/FieldList<TS;>;
- (Ljava/util/List<TS;>;)Lnet/bytebuddy/description/field/FieldList<TS;>;
+ (Ljava/util/List<TS;>;)L1net/bytebuddy/description/field/FieldList<TS;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/field/FieldList$ForLoadedFields.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/field/FieldList$ForLoadedFields.eea
index 03402aa381..b407c41956 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/field/FieldList$ForLoadedFields.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/field/FieldList$ForLoadedFields.eea
@@ -12,4 +12,4 @@ super net/bytebuddy/description/field/FieldList$AbstractBase
  ([Ljava/lang/reflect/Field;)V
 get
  (I)Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;
- (I)Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;
+ (I)L1net/bytebuddy/description/field/FieldDescription$InDefinedShape;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$AbstractBase.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$AbstractBase.eea
index c620a3b765..48c0b1b038 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$AbstractBase.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$AbstractBase.eea
@@ -5,13 +5,13 @@ accept
  <T:Ljava/lang/Object;>(Lnet/bytebuddy/description/TypeVariableSource$Visitor<TT;>;)TT;
 asSignatureToken
  ()Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;
- ()Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;
+ ()L1net/bytebuddy/description/method/MethodDescription$SignatureToken;
 asToken
  (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/method/MethodDescription$Token;
  (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/method/MethodDescription$Token;
 asTypeToken
  ()Lnet/bytebuddy/description/method/MethodDescription$TypeToken;
- ()Lnet/bytebuddy/description/method/MethodDescription$TypeToken;
+ ()L1net/bytebuddy/description/method/MethodDescription$TypeToken;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -20,13 +20,13 @@ getActualModifiers
  (ZLnet/bytebuddy/description/modifier/Visibility;)I
 getActualName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getDefaultValue
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)T0T; # @Inherited(net.bytebuddy.description.method.MethodDescription)
 getDescriptor
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getEnclosingSource
  ()Lnet/bytebuddy/description/TypeVariableSource;
  ()L0net/bytebuddy/description/TypeVariableSource; # @Inherited(net.bytebuddy.description.TypeVariableSource)
@@ -68,10 +68,10 @@ represents
  (Ljava/lang/reflect/Method;)Z
 toGenericString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toSafeString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$ForLoadedConstructor.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$ForLoadedConstructor.eea
index db3eeee483..740cd56f94 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$ForLoadedConstructor.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$ForLoadedConstructor.eea
@@ -18,13 +18,13 @@ getDefaultValue
  ()L0net/bytebuddy/description/annotation/AnnotationValue<**>; # @Inherited(net.bytebuddy.description.method.MethodDescription)
 getDescriptor
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(net.bytebuddy.description.method.MethodDescription$AbstractBase)
 getExceptionTypes
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getInternalName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$ForLoadedMethod.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$ForLoadedMethod.eea
index 5113302c29..95aab8017c 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$ForLoadedMethod.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$ForLoadedMethod.eea
@@ -18,10 +18,10 @@ getDefaultValue
  ()L0net/bytebuddy/description/annotation/AnnotationValue<**>; # @Inherited(net.bytebuddy.description.method.MethodDescription)
 getDescriptor
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(net.bytebuddy.description.method.MethodDescription$AbstractBase)
 getExceptionTypes
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getInternalName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$Latent$TypeInitializer.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$Latent$TypeInitializer.eea
index f8db8bad36..e9975f52da 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$Latent$TypeInitializer.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$Latent$TypeInitializer.eea
@@ -5,7 +5,7 @@ class net/bytebuddy/description/method/MethodDescription$Latent$TypeInitializer
  (Lnet/bytebuddy/description/type/TypeDescription;)V
 getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getDeclaringType
  ()Lnet/bytebuddy/description/type/TypeDescription;
  ()L1net/bytebuddy/description/type/TypeDescription; # @Inherited(net.bytebuddy.description.method.MethodDescription$InDefinedShape)
@@ -14,16 +14,16 @@ getDefaultValue
  ()L0net/bytebuddy/description/annotation/AnnotationValue<**>; # @Inherited(net.bytebuddy.description.method.MethodDescription)
 getExceptionTypes
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getInternalName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getParameters
  ()Lnet/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
 getReturnType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
 getTypeVariables
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$Latent.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$Latent.eea
index 36fc6360bf..f3a78e218c 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$Latent.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$Latent.eea
@@ -8,7 +8,7 @@ class net/bytebuddy/description/method/MethodDescription$Latent
  (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/method/MethodDescription$Token;)V
 getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getDeclaringType
  ()Lnet/bytebuddy/description/type/TypeDescription;
  ()L1net/bytebuddy/description/type/TypeDescription; # @Inherited(net.bytebuddy.description.method.MethodDescription$InDefinedShape)
@@ -23,7 +23,7 @@ getInternalName
  ()Ljava/lang/String;
 getParameters
  ()Lnet/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
 getReceiverType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.method.MethodDescription$InDefinedShape$AbstractBase)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$SignatureToken.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$SignatureToken.eea
index 0ceb68d6c0..1a7683d345 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$SignatureToken.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$SignatureToken.eea
@@ -14,7 +14,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getDescriptor
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$Token.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$Token.eea
index 9419a68eca..da6634b1fd 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$Token.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodDescription$Token.eea
@@ -24,19 +24,19 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getDefaultValue
  ()Lnet/bytebuddy/description/annotation/AnnotationValue<**>;
  ()L0net/bytebuddy/description/annotation/AnnotationValue<**>;
 getExceptionTypes
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getParameterTokens
  ()Lnet/bytebuddy/description/ByteCodeElement$Token$TokenList<Lnet/bytebuddy/description/method/ParameterDescription$Token;>;
- ()Lnet/bytebuddy/description/ByteCodeElement$Token$TokenList<Lnet/bytebuddy/description/method/ParameterDescription$Token;>;
+ ()L1net/bytebuddy/description/ByteCodeElement$Token$TokenList<Lnet/bytebuddy/description/method/ParameterDescription$Token;>;
 getReceiverType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()L0net/bytebuddy/description/type/TypeDescription$Generic;
@@ -45,7 +45,7 @@ getReturnType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
 getTypeVariableTokens
  ()Lnet/bytebuddy/description/ByteCodeElement$Token$TokenList<Lnet/bytebuddy/description/type/TypeVariableToken;>;
- ()Lnet/bytebuddy/description/ByteCodeElement$Token$TokenList<Lnet/bytebuddy/description/type/TypeVariableToken;>;
+ ()L1net/bytebuddy/description/ByteCodeElement$Token$TokenList<Lnet/bytebuddy/description/type/TypeVariableToken;>;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodList$AbstractBase.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodList$AbstractBase.eea
index be738b47e0..97ca89ce71 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodList$AbstractBase.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/MethodList$AbstractBase.eea
@@ -11,16 +11,16 @@ super net/bytebuddy/description/method/MethodList
 
 asDefined
  ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;>;
 asSignatureTokenList
  ()Ljava/util/List<Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;>;
- ()Ljava/util/List<Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;>;
+ ()L1java/util/List<Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;>;
 asSignatureTokenList
  (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;Lnet/bytebuddy/description/type/TypeDescription;)Ljava/util/List<Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;>;
- (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;Lnet/bytebuddy/description/type/TypeDescription;)Ljava/util/List<Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;>;
+ (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;Lnet/bytebuddy/description/type/TypeDescription;)L1java/util/List<Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;>;
 asTokenList
  (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/ByteCodeElement$Token$TokenList<Lnet/bytebuddy/description/method/MethodDescription$Token;>;
- (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/ByteCodeElement$Token$TokenList<Lnet/bytebuddy/description/method/MethodDescription$Token;>;
+ (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)L1net/bytebuddy/description/ByteCodeElement$Token$TokenList<Lnet/bytebuddy/description/method/MethodDescription$Token;>;
 wrap
  (Ljava/util/List<TS;>;)Lnet/bytebuddy/description/method/MethodList<TS;>;
- (Ljava/util/List<TS;>;)Lnet/bytebuddy/description/method/MethodList<TS;>;
+ (Ljava/util/List<TS;>;)L1net/bytebuddy/description/method/MethodList<TS;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$AbstractBase.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$AbstractBase.eea
index e110ab8f1b..d8dcf78685 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$AbstractBase.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$AbstractBase.eea
@@ -2,13 +2,13 @@ class net/bytebuddy/description/method/ParameterDescription$AbstractBase
 
 asToken
  (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/method/ParameterDescription$Token;
- (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/method/ParameterDescription$Token;
+ (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)L1net/bytebuddy/description/method/ParameterDescription$Token;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getActualName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getInternalName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$ForLoadedParameter$OfConstructor.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$ForLoadedParameter$OfConstructor.eea
index a126309d7d..b78948c208 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$ForLoadedParameter$OfConstructor.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$ForLoadedParameter$OfConstructor.eea
@@ -12,7 +12,7 @@ getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
 getDeclaringMethod
  ()Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;
- ()Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;
+ ()L1net/bytebuddy/description/method/MethodDescription$InDefinedShape;
 getType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$ForLoadedParameter$OfLegacyVmConstructor.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$ForLoadedParameter$OfLegacyVmConstructor.eea
index aea6f60f84..0fccb3c26e 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$ForLoadedParameter$OfLegacyVmConstructor.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$ForLoadedParameter$OfLegacyVmConstructor.eea
@@ -8,7 +8,7 @@ getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
 getDeclaringMethod
  ()Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;
- ()Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;
+ ()L1net/bytebuddy/description/method/MethodDescription$InDefinedShape;
 getType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$ForLoadedParameter$OfLegacyVmMethod.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$ForLoadedParameter$OfLegacyVmMethod.eea
index 7aeeb1fb99..431179309b 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$ForLoadedParameter$OfLegacyVmMethod.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$ForLoadedParameter$OfLegacyVmMethod.eea
@@ -8,7 +8,7 @@ getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
 getDeclaringMethod
  ()Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;
- ()Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;
+ ()L1net/bytebuddy/description/method/MethodDescription$InDefinedShape;
 getType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$ForLoadedParameter$OfMethod.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$ForLoadedParameter$OfMethod.eea
index 0559d48368..41f2d786d5 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$ForLoadedParameter$OfMethod.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$ForLoadedParameter$OfMethod.eea
@@ -12,7 +12,7 @@ getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
 getDeclaringMethod
  ()Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;
- ()Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;
+ ()L1net/bytebuddy/description/method/MethodDescription$InDefinedShape;
 getType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$Latent.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$Latent.eea
index 77f4eca39f..207283c46f 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$Latent.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$Latent.eea
@@ -11,7 +11,7 @@ class net/bytebuddy/description/method/ParameterDescription$Latent
  (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/description/type/TypeDescription$Generic;Ljava/util/List<+Lnet/bytebuddy/description/annotation/AnnotationDescription;>;Ljava/lang/String;Ljava/lang/Integer;II)V
 getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getDeclaringMethod
  ()Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;
  ()Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$Token$TypeList.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$Token$TypeList.eea
index ee38434bf7..717c8b60bb 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$Token$TypeList.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$Token$TypeList.eea
@@ -9,4 +9,4 @@ super java/util/AbstractList
  (Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDefinition;>;)V
 get
  (I)Lnet/bytebuddy/description/method/ParameterDescription$Token;
- (I)Lnet/bytebuddy/description/method/ParameterDescription$Token;
+ (I)L1net/bytebuddy/description/method/ParameterDescription$Token;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$Token.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$Token.eea
index 75efb008a4..8662b0c668 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$Token.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterDescription$Token.eea
@@ -31,7 +31,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getModifiers
  ()Ljava/lang/Integer;
  ()L0java/lang/Integer;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterList$AbstractBase.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterList$AbstractBase.eea
index 0d065ce57a..630e9cfec8 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterList$AbstractBase.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterList$AbstractBase.eea
@@ -11,13 +11,13 @@ super net/bytebuddy/description/method/ParameterList
 
 asDefined
  ()Lnet/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
 asTokenList
  (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/ByteCodeElement$Token$TokenList<Lnet/bytebuddy/description/method/ParameterDescription$Token;>;
- (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/ByteCodeElement$Token$TokenList<Lnet/bytebuddy/description/method/ParameterDescription$Token;>;
+ (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)L1net/bytebuddy/description/ByteCodeElement$Token$TokenList<Lnet/bytebuddy/description/method/ParameterDescription$Token;>;
 asTypeList
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 wrap
  (Ljava/util/List<TS;>;)Lnet/bytebuddy/description/method/ParameterList<TS;>;
- (Ljava/util/List<TS;>;)Lnet/bytebuddy/description/method/ParameterList<TS;>;
+ (Ljava/util/List<TS;>;)L1net/bytebuddy/description/method/ParameterList<TS;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterList$Empty.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterList$Empty.eea
index 3def918dd8..5f81ebfbf8 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterList$Empty.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterList$Empty.eea
@@ -17,4 +17,4 @@ asTokenList
  (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/ByteCodeElement$Token$TokenList<Lnet/bytebuddy/description/method/ParameterDescription$Token;>;
 asTypeList
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterList$ForLoadedExecutable.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterList$ForLoadedExecutable.eea
index 95403765d7..c05fab21d7 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterList$ForLoadedExecutable.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/method/ParameterList$ForLoadedExecutable.eea
@@ -15,13 +15,13 @@ of
  (Ljava/lang/reflect/Constructor<*>;)Lnet/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
 of
  (Ljava/lang/reflect/Constructor<*>;Lnet/bytebuddy/description/method/ParameterDescription$ForLoadedParameter$ParameterAnnotationSource;)Lnet/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
- (Ljava/lang/reflect/Constructor<*>;Lnet/bytebuddy/description/method/ParameterDescription$ForLoadedParameter$ParameterAnnotationSource;)Lnet/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
+ (Ljava/lang/reflect/Constructor<*>;Lnet/bytebuddy/description/method/ParameterDescription$ForLoadedParameter$ParameterAnnotationSource;)L1net/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
 of
  (Ljava/lang/reflect/Method;)Lnet/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
  (Ljava/lang/reflect/Method;)Lnet/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
 of
  (Ljava/lang/reflect/Method;Lnet/bytebuddy/description/method/ParameterDescription$ForLoadedParameter$ParameterAnnotationSource;)Lnet/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
- (Ljava/lang/reflect/Method;Lnet/bytebuddy/description/method/ParameterDescription$ForLoadedParameter$ParameterAnnotationSource;)Lnet/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
+ (Ljava/lang/reflect/Method;Lnet/bytebuddy/description/method/ParameterDescription$ForLoadedParameter$ParameterAnnotationSource;)L1net/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
 
 executable
  TT;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/modifier/ModifierContributor$Resolver.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/modifier/ModifierContributor$Resolver.eea
index 55696acc10..0aad51d324 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/modifier/ModifierContributor$Resolver.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/modifier/ModifierContributor$Resolver.eea
@@ -16,7 +16,7 @@ of
  ([Lnet/bytebuddy/description/modifier/ModifierContributor$ForType;)Lnet/bytebuddy/description/modifier/ModifierContributor$Resolver<Lnet/bytebuddy/description/modifier/ModifierContributor$ForType;>;
 of
  <S::Lnet/bytebuddy/description/modifier/ModifierContributor;>(Ljava/util/Collection<+TS;>;)Lnet/bytebuddy/description/modifier/ModifierContributor$Resolver<TS;>;
- <S::Lnet/bytebuddy/description/modifier/ModifierContributor;>(Ljava/util/Collection<+TS;>;)Lnet/bytebuddy/description/modifier/ModifierContributor$Resolver<TS;>;
+ <S::Lnet/bytebuddy/description/modifier/ModifierContributor;>(Ljava/util/Collection<+TS;>;)L1net/bytebuddy/description/modifier/ModifierContributor$Resolver<TS;>;
 
 <init>
  (Ljava/util/Collection<+TT;>;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/PackageDescription$ForLoadedPackage.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/PackageDescription$ForLoadedPackage.eea
index 2d1fd1659f..c8feaaa577 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/PackageDescription$ForLoadedPackage.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/PackageDescription$ForLoadedPackage.eea
@@ -5,7 +5,7 @@ class net/bytebuddy/description/type/PackageDescription$ForLoadedPackage
  (Ljava/lang/Package;)V
 getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/PackageDescription$Simple.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/PackageDescription$Simple.eea
index 74e4b1a790..67b4f27af8 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/PackageDescription$Simple.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/PackageDescription$Simple.eea
@@ -5,7 +5,7 @@ class net/bytebuddy/description/type/PackageDescription$Simple
  (Ljava/lang/String;)V
 getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentDescription$AbstractBase.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentDescription$AbstractBase.eea
index 0c777a32c6..a61a9c7c72 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentDescription$AbstractBase.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentDescription$AbstractBase.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/description/type/RecordComponentDescription$AbstractBase
 
 asToken
  (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/type/RecordComponentDescription$Token;
- (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/type/RecordComponentDescription$Token;
+ (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)L1net/bytebuddy/description/type/RecordComponentDescription$Token;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentDescription$ForLoadedRecordComponent.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentDescription$ForLoadedRecordComponent.eea
index 45140f7a0f..6ab47fbd20 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentDescription$ForLoadedRecordComponent.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentDescription$ForLoadedRecordComponent.eea
@@ -6,20 +6,20 @@ RECORD_COMPONENT
 
 of
  (Ljava/lang/Object;)Lnet/bytebuddy/description/type/RecordComponentDescription;
- (Ljava/lang/Object;)Lnet/bytebuddy/description/type/RecordComponentDescription;
+ (Ljava/lang/Object;)L1net/bytebuddy/description/type/RecordComponentDescription;
 
 <init>
  (Ljava/lang/reflect/AnnotatedElement;)V
  (Ljava/lang/reflect/AnnotatedElement;)V
 getAccessor
  ()Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;
- ()Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;
+ ()L1net/bytebuddy/description/method/MethodDescription$InDefinedShape;
 getActualName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getDeclaringType
  ()Lnet/bytebuddy/description/type/TypeDescription;
  ()L1net/bytebuddy/description/type/TypeDescription; # @Inherited(net.bytebuddy.description.type.RecordComponentDescription$InDefinedShape)
@@ -28,4 +28,4 @@ getGenericSignature
  ()L0java/lang/String; # @Inherited(net.bytebuddy.description.type.RecordComponentDescription$AbstractBase)
 getType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
- ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ ()L1net/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentDescription$Latent.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentDescription$Latent.eea
index d5f69f6a5a..5f43455ae9 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentDescription$Latent.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentDescription$Latent.eea
@@ -11,7 +11,7 @@ getActualName
  ()Ljava/lang/String;
 getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getDeclaringType
  ()Lnet/bytebuddy/description/type/TypeDescription;
  ()L1net/bytebuddy/description/type/TypeDescription; # @Inherited(net.bytebuddy.description.type.RecordComponentDescription$InDefinedShape)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentDescription$Token.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentDescription$Token.eea
index 71d6f3a069..77e41c81e7 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentDescription$Token.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentDescription$Token.eea
@@ -18,7 +18,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentList$AbstractBase.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentList$AbstractBase.eea
index 3a4915c814..9dca096df9 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentList$AbstractBase.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentList$AbstractBase.eea
@@ -11,13 +11,13 @@ super net/bytebuddy/description/type/RecordComponentList
 
 asDefined
  ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;
 asTokenList
  (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/ByteCodeElement$Token$TokenList<Lnet/bytebuddy/description/type/RecordComponentDescription$Token;>;
- (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/ByteCodeElement$Token$TokenList<Lnet/bytebuddy/description/type/RecordComponentDescription$Token;>;
+ (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)L1net/bytebuddy/description/ByteCodeElement$Token$TokenList<Lnet/bytebuddy/description/type/RecordComponentDescription$Token;>;
 asTypeList
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 wrap
  (Ljava/util/List<TS;>;)Lnet/bytebuddy/description/type/RecordComponentList<TS;>;
- (Ljava/util/List<TS;>;)Lnet/bytebuddy/description/type/RecordComponentList<TS;>;
+ (Ljava/util/List<TS;>;)L1net/bytebuddy/description/type/RecordComponentList<TS;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentList$Empty.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentList$Empty.eea
index 7214309808..dfa2bfb200 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentList$Empty.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentList$Empty.eea
@@ -11,10 +11,10 @@ super net/bytebuddy/description/type/RecordComponentList
 
 asDefined
  ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;
 asTokenList
  (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/ByteCodeElement$Token$TokenList<Lnet/bytebuddy/description/type/RecordComponentDescription$Token;>;
  (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/ByteCodeElement$Token$TokenList<Lnet/bytebuddy/description/type/RecordComponentDescription$Token;>;
 asTypeList
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentList$ForLoadedRecordComponents.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentList$ForLoadedRecordComponents.eea
index 31e17c4aff..b798ca40b5 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentList$ForLoadedRecordComponents.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/RecordComponentList$ForLoadedRecordComponents.eea
@@ -12,4 +12,4 @@ super net/bytebuddy/description/type/RecordComponentList$AbstractBase
  ([Ljava/lang/Object;)V
 get
  (I)Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;
- (I)Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;
+ (I)L1net/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDefinition$Sort.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDefinition$Sort.eea
index 4bfdaa8356..1d47aee17a 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDefinition$Sort.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDefinition$Sort.eea
@@ -9,7 +9,7 @@ describe
  (Ljava/lang/reflect/Type;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
 describe
  (Ljava/lang/reflect/Type;Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Ljava/lang/reflect/Type;Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Ljava/lang/reflect/Type;Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;)L1net/bytebuddy/description/type/TypeDescription$Generic;
 describeAnnotated
  (Ljava/lang/reflect/AnnotatedElement;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
  (Ljava/lang/reflect/AnnotatedElement;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$AbstractBase$OfSimpleType.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$AbstractBase$OfSimpleType.eea
index c66c7d6266..f9bf69358a 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$AbstractBase$OfSimpleType.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$AbstractBase$OfSimpleType.eea
@@ -8,7 +8,7 @@ getComponentType
  ()L0net/bytebuddy/description/type/TypeDescription; # @Inherited(net.bytebuddy.description.type.TypeDescription)
 getDescriptor
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSimpleName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$AbstractBase.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$AbstractBase.eea
index ce2a735eed..bbc8c87dc2 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$AbstractBase.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$AbstractBase.eea
@@ -11,7 +11,7 @@ asErasure
  ()Lnet/bytebuddy/description/type/TypeDescription;
 asGenericType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
- ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ ()L1net/bytebuddy/description/type/TypeDescription$Generic;
 asUnboxed
  ()Lnet/bytebuddy/description/type/TypeDescription;
  ()Lnet/bytebuddy/description/type/TypeDescription;
@@ -41,7 +41,7 @@ getInternalName
  ()Ljava/lang/String;
 getLongSimpleName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSort
  ()Lnet/bytebuddy/description/type/TypeDefinition$Sort;
  ()Lnet/bytebuddy/description/type/TypeDefinition$Sort;
@@ -89,13 +89,13 @@ isVisibleTo
  (Lnet/bytebuddy/description/type/TypeDescription;)Z
 iterator
  ()Ljava/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
- ()Ljava/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
+ ()L1java/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
 represents
  (Ljava/lang/reflect/Type;)Z
  (Ljava/lang/reflect/Type;)Z
 toSafeString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$ArrayProjection.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$ArrayProjection.eea
index cc17f281ee..3574516db8 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$ArrayProjection.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$ArrayProjection.eea
@@ -5,7 +5,7 @@ of
  (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/description/type/TypeDescription;
 of
  (Lnet/bytebuddy/description/type/TypeDescription;I)Lnet/bytebuddy/description/type/TypeDescription;
- (Lnet/bytebuddy/description/type/TypeDescription;I)Lnet/bytebuddy/description/type/TypeDescription;
+ (Lnet/bytebuddy/description/type/TypeDescription;I)L1net/bytebuddy/description/type/TypeDescription;
 
 <init>
  (Lnet/bytebuddy/description/type/TypeDescription;I)V
@@ -18,22 +18,22 @@ getComponentType
  ()L0net/bytebuddy/description/type/TypeDescription; # @Inherited(net.bytebuddy.description.type.TypeDescription)
 getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getDeclaredFields
  ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;
 getDeclaredMethods
  ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;>;
 getDeclaredTypes
  ()Lnet/bytebuddy/description/type/TypeList;
- ()Lnet/bytebuddy/description/type/TypeList;
+ ()L1net/bytebuddy/description/type/TypeList;
 getDeclaringType
  ()Lnet/bytebuddy/description/type/TypeDescription;
  ()L0net/bytebuddy/description/type/TypeDescription; # @Inherited(net.bytebuddy.description.type.TypeDescription)
 getDescriptor
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getEnclosingMethod
  ()Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;
  ()L0net/bytebuddy/description/method/MethodDescription$InDefinedShape; # @Inherited(net.bytebuddy.description.type.TypeDescription)
@@ -42,13 +42,13 @@ getEnclosingType
  ()L0net/bytebuddy/description/type/TypeDescription; # @Inherited(net.bytebuddy.description.type.TypeDescription)
 getInheritedAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getInterfaces
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getNestHost
  ()Lnet/bytebuddy/description/type/TypeDescription;
  ()Lnet/bytebuddy/description/type/TypeDescription;
@@ -60,13 +60,13 @@ getPackage
  ()L0net/bytebuddy/description/type/PackageDescription; # @Inherited(net.bytebuddy.description.type.TypeDescription)
 getPermittedSubtypes
  ()Lnet/bytebuddy/description/type/TypeList;
- ()Lnet/bytebuddy/description/type/TypeList;
+ ()L1net/bytebuddy/description/type/TypeList;
 getRecordComponents
  ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;
 getSimpleName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStackSize
  ()Lnet/bytebuddy/implementation/bytecode/StackSize;
  ()Lnet/bytebuddy/implementation/bytecode/StackSize;
@@ -75,4 +75,4 @@ getSuperClass
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDefinition)
 getTypeVariables
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$ForLoadedType.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$ForLoadedType.eea
index 09e231e2bd..7a584a0f58 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$ForLoadedType.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$ForLoadedType.eea
@@ -12,7 +12,7 @@ of
  (Ljava/lang/Class<*>;)V
 asGenericType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
- ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ ()L1net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDescription$AbstractBase)
 getCanonicalName
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(net.bytebuddy.description.type.TypeDescription)
@@ -33,13 +33,13 @@ getDeclaredMethods
  ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;>;
 getDeclaredTypes
  ()Lnet/bytebuddy/description/type/TypeList;
- ()Lnet/bytebuddy/description/type/TypeList;
+ ()L1net/bytebuddy/description/type/TypeList;
 getDeclaringType
  ()Lnet/bytebuddy/description/type/TypeDescription;
  ()L0net/bytebuddy/description/type/TypeDescription; # @Inherited(net.bytebuddy.description.type.TypeDescription)
 getDescriptor
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getEnclosingMethod
  ()Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;
  ()L0net/bytebuddy/description/method/MethodDescription$InDefinedShape; # @Inherited(net.bytebuddy.description.type.TypeDescription)
@@ -48,7 +48,7 @@ getEnclosingType
  ()L0net/bytebuddy/description/type/TypeDescription; # @Inherited(net.bytebuddy.description.type.TypeDescription)
 getInterfaces
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -63,10 +63,10 @@ getPackage
  ()L0net/bytebuddy/description/type/PackageDescription; # @Inherited(net.bytebuddy.description.type.TypeDescription)
 getPermittedSubtypes
  ()Lnet/bytebuddy/description/type/TypeList;
- ()Lnet/bytebuddy/description/type/TypeList;
+ ()L1net/bytebuddy/description/type/TypeList;
 getRecordComponents
  ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;
 getSimpleName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$ForPackageDescription.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$ForPackageDescription.eea
index da9e5f860c..c1c63913ac 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$ForPackageDescription.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$ForPackageDescription.eea
@@ -8,13 +8,13 @@ getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
 getDeclaredFields
  ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;
 getDeclaredMethods
  ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;>;
 getDeclaredTypes
  ()Lnet/bytebuddy/description/type/TypeList;
- ()Lnet/bytebuddy/description/type/TypeList;
+ ()L1net/bytebuddy/description/type/TypeList;
 getDeclaringType
  ()Lnet/bytebuddy/description/type/TypeDescription;
  ()L0net/bytebuddy/description/type/TypeDescription; # @Inherited(net.bytebuddy.description.type.TypeDescription)
@@ -26,10 +26,10 @@ getEnclosingType
  ()L0net/bytebuddy/description/type/TypeDescription; # @Inherited(net.bytebuddy.description.type.TypeDescription)
 getInterfaces
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getNestHost
  ()Lnet/bytebuddy/description/type/TypeDescription;
  ()Lnet/bytebuddy/description/type/TypeDescription;
@@ -41,13 +41,13 @@ getPackage
  ()L0net/bytebuddy/description/type/PackageDescription; # @Inherited(net.bytebuddy.description.type.TypeDescription)
 getPermittedSubtypes
  ()Lnet/bytebuddy/description/type/TypeList;
- ()Lnet/bytebuddy/description/type/TypeList;
+ ()L1net/bytebuddy/description/type/TypeList;
 getRecordComponents
  ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;
 getSuperClass
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDefinition)
 getTypeVariables
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader$Delegator$ForLoadedTypeVariable.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader$Delegator$ForLoadedTypeVariable.eea
index a64551f29b..094b11d6ce 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader$Delegator$ForLoadedTypeVariable.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader$Delegator$ForLoadedTypeVariable.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 ofTypeVariableBoundType
  (I)Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
- (I)Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
+ (I)L1net/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader; # @Inherited(net.bytebuddy.description.type.TypeDescription$Generic$AnnotationReader$Delegator)
 resolve
  ()Ljava/lang/reflect/AnnotatedElement;
  ()Ljava/lang/reflect/AnnotatedElement;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader$Delegator.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader$Delegator.eea
index 2f62b62c64..16afa4be5a 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader$Delegator.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader$Delegator.eea
@@ -2,25 +2,25 @@ class net/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader$De
 
 asList
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 ofComponentType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
- ()Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
+ ()L1net/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
 ofOuterClass
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
- ()Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
+ ()L1net/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
 ofOwnerType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
- ()Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
+ ()L1net/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
 ofTypeArgument
  (I)Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
- (I)Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
+ (I)L1net/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
 ofTypeVariableBoundType
  (I)Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
- (I)Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
+ (I)L1net/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
 ofWildcardLowerBoundType
  (I)Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
- (I)Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
+ (I)L1net/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
 ofWildcardUpperBoundType
  (I)Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
- (I)Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
+ (I)L1net/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader$NoOp.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader$NoOp.eea
index 2cd5092ce3..16ec12f726 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader$NoOp.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader$NoOp.eea
@@ -6,7 +6,7 @@ super java/lang/Enum
 
 asList
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getAnnotation
  <T::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TT;>;)TT;
  <T::Ljava/lang/annotation/Annotation;>(L1java/lang/Class<TT;>;)T0T; # @Inherited(java.lang.reflect.AnnotatedElement)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Builder$Visitor.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Builder$Visitor.eea
index 084fb852b0..706f9984c0 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Builder$Visitor.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Builder$Visitor.eea
@@ -9,16 +9,16 @@ super net/bytebuddy/description/type/TypeDescription$Generic$Visitor
 
 onGenericArray
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Builder;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Builder;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic$Builder;
 onNonGenericType
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Builder;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Builder;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic$Builder;
 onParameterizedType
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Builder;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Builder;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic$Builder;
 onTypeVariable
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Builder;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Builder;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic$Builder;
 onWildcard
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Builder;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Builder;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic$Builder;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Builder.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Builder.eea
index 95f812ff21..9eadac2677 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Builder.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Builder.eea
@@ -20,7 +20,7 @@ parameterizedType
  (Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/Collection<+Lnet/bytebuddy/description/type/TypeDefinition;>;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Builder;
 parameterizedType
  (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/type/TypeDescription$Generic;Ljava/util/Collection<+Lnet/bytebuddy/description/type/TypeDefinition;>;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Builder;
- (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/type/TypeDescription$Generic;Ljava/util/Collection<+Lnet/bytebuddy/description/type/TypeDefinition;>;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Builder;
+ (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/type/TypeDescription$Generic;Ljava/util/Collection<+Lnet/bytebuddy/description/type/TypeDefinition;>;)L1net/bytebuddy/description/type/TypeDescription$Generic$Builder;
 parameterizedType
  (Lnet/bytebuddy/description/type/TypeDescription;[Lnet/bytebuddy/description/type/TypeDefinition;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Builder;
  (Lnet/bytebuddy/description/type/TypeDescription;[Lnet/bytebuddy/description/type/TypeDefinition;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Builder;
@@ -32,13 +32,13 @@ rawType
  (Ljava/lang/Class<*>;Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Builder;
 rawType
  (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Builder;
- (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Builder;
+ (Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/description/type/TypeDescription$Generic$Builder;
 rawType
  (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Builder;
- (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Builder;
+ (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic$Builder;
 typeVariable
  (Ljava/lang/String;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Builder;
- (Ljava/lang/String;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Builder;
+ (Ljava/lang/String;)L1net/bytebuddy/description/type/TypeDescription$Generic$Builder;
 unboundWildcard
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$LazyProjection$ForLoadedFieldType.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$LazyProjection$ForLoadedFieldType.eea
index 2cdccf1f88..d0df3d5656 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$LazyProjection$ForLoadedFieldType.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$LazyProjection$ForLoadedFieldType.eea
@@ -8,7 +8,7 @@ asErasure
  ()Lnet/bytebuddy/description/type/TypeDescription;
 getAnnotationReader
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
- ()Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
+ ()L1net/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
 resolve
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$LazyProjection$ForLoadedReturnType.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$LazyProjection$ForLoadedReturnType.eea
index 4d4ff2b9a5..369902466a 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$LazyProjection$ForLoadedReturnType.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$LazyProjection$ForLoadedReturnType.eea
@@ -8,7 +8,7 @@ asErasure
  ()Lnet/bytebuddy/description/type/TypeDescription;
 getAnnotationReader
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
- ()Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
+ ()L1net/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
 resolve
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$LazyProjection$ForLoadedSuperClass.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$LazyProjection$ForLoadedSuperClass.eea
index ecd21cd85e..ea5fb7d548 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$LazyProjection$ForLoadedSuperClass.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$LazyProjection$ForLoadedSuperClass.eea
@@ -12,7 +12,7 @@ asErasure
  ()Lnet/bytebuddy/description/type/TypeDescription;
 getAnnotationReader
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
- ()Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
+ ()L1net/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
 resolve
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$LazyProjection$OfRecordComponent.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$LazyProjection$OfRecordComponent.eea
index e105ef9beb..3ff42fae72 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$LazyProjection$OfRecordComponent.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$LazyProjection$OfRecordComponent.eea
@@ -8,7 +8,7 @@ asErasure
  ()Lnet/bytebuddy/description/type/TypeDescription;
 getAnnotationReader
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
- ()Lnet/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
+ ()L1net/bytebuddy/description/type/TypeDescription$Generic$AnnotationReader;
 resolve
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$LazyProjection$WithLazyNavigation$LazyInterfaceList.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$LazyProjection$WithLazyNavigation$LazyInterfaceList.eea
index 1bb03ae746..c454db4a2b 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$LazyProjection$WithLazyNavigation$LazyInterfaceList.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$LazyProjection$WithLazyNavigation$LazyInterfaceList.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/description/type/TypeDescription$Generic$LazyProjection$With
 
 of
  (Lnet/bytebuddy/description/type/TypeDescription$Generic$LazyProjection;)Lnet/bytebuddy/description/type/TypeList$Generic;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic$LazyProjection;)Lnet/bytebuddy/description/type/TypeList$Generic;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic$LazyProjection;)L1net/bytebuddy/description/type/TypeList$Generic;
 
 <init>
  (Lnet/bytebuddy/description/type/TypeDescription$Generic$LazyProjection;Lnet/bytebuddy/description/type/TypeList$Generic;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$LazyProjection$WithLazyNavigation.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$LazyProjection$WithLazyNavigation.eea
index c3afaf52fb..389c780d54 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$LazyProjection$WithLazyNavigation.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$LazyProjection$WithLazyNavigation.eea
@@ -8,4 +8,4 @@ getSuperClass
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDefinition)
 iterator
  ()Ljava/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
- ()Ljava/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
+ ()L1java/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfGenericArray.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfGenericArray.eea
index 0656598dbc..17cdddd669 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfGenericArray.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfGenericArray.eea
@@ -14,25 +14,25 @@ findBindingOf
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDescription$Generic)
 getActualName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getDeclaredFields
  ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InGenericShape;>;
- ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InGenericShape;>;
+ ()L1net/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InGenericShape;>;
 getDeclaredMethods
  ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InGenericShape;>;
- ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InGenericShape;>;
+ ()L1net/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InGenericShape;>;
 getInterfaces
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
 getLowerBounds
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getOwnerType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDescription$Generic)
 getRecordComponents
  ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InGenericShape;>;
- ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InGenericShape;>;
+ ()L1net/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InGenericShape;>;
 getSort
  ()Lnet/bytebuddy/description/type/TypeDefinition$Sort;
  ()Lnet/bytebuddy/description/type/TypeDefinition$Sort;
@@ -44,22 +44,22 @@ getSuperClass
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDefinition)
 getSymbol
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getTypeArguments
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getTypeName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getTypeVariableSource
  ()Lnet/bytebuddy/description/TypeVariableSource;
- ()Lnet/bytebuddy/description/TypeVariableSource;
+ ()L1net/bytebuddy/description/TypeVariableSource;
 getUpperBounds
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 iterator
  ()Ljava/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
- ()Ljava/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
+ ()L1java/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfNonGenericType$ForErasure.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfNonGenericType$ForErasure.eea
index 9aa7130ada..819657f502 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfNonGenericType$ForErasure.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfNonGenericType$ForErasure.eea
@@ -11,7 +11,7 @@ getComponentType
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDescription$Generic)
 getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getOwnerType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDescription$Generic)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfNonGenericType$ForReifiedErasure.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfNonGenericType$ForReifiedErasure.eea
index 5f3fc79682..8e8521e6a2 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfNonGenericType$ForReifiedErasure.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfNonGenericType$ForReifiedErasure.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/description/type/TypeDescription$Generic$OfNonGenericType$Fo
 
 of
  (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/description/type/TypeDescription$Generic;
 
 <init>
  (Lnet/bytebuddy/description/type/TypeDescription;)V
@@ -15,16 +15,16 @@ getComponentType
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDescription$Generic)
 getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getDeclaredFields
  ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InGenericShape;>;
- ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InGenericShape;>;
+ ()L1net/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InGenericShape;>;
 getDeclaredMethods
  ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InGenericShape;>;
- ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InGenericShape;>;
+ ()L1net/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InGenericShape;>;
 getInterfaces
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getOwnerType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDescription$Generic)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfNonGenericType.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfNonGenericType.eea
index e1371e4ab0..164321de2a 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfNonGenericType.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfNonGenericType.eea
@@ -23,7 +23,7 @@ getInterfaces
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
 getLowerBounds
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getRecordComponents
  ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InGenericShape;>;
  ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InGenericShape;>;
@@ -38,22 +38,22 @@ getSuperClass
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDefinition)
 getSymbol
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getTypeArguments
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getTypeName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getTypeVariableSource
  ()Lnet/bytebuddy/description/TypeVariableSource;
- ()Lnet/bytebuddy/description/TypeVariableSource;
+ ()L1net/bytebuddy/description/TypeVariableSource;
 getUpperBounds
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 iterator
  ()Ljava/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
- ()Ljava/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
+ ()L1java/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
 represents
  (Ljava/lang/reflect/Type;)Z
  (Ljava/lang/reflect/Type;)Z
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfParameterizedType$ForGenerifiedErasure.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfParameterizedType$ForGenerifiedErasure.eea
index 7e320e9cf5..c836df60bb 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfParameterizedType$ForGenerifiedErasure.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfParameterizedType$ForGenerifiedErasure.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/description/type/TypeDescription$Generic$OfParameterizedType
 
 of
  (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/description/type/TypeDescription$Generic;
 
 <init>
  (Lnet/bytebuddy/description/type/TypeDescription;)V
@@ -12,10 +12,10 @@ asErasure
  ()Lnet/bytebuddy/description/type/TypeDescription;
 getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getOwnerType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDescription$Generic)
 getTypeArguments
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfParameterizedType$ForReifiedType.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfParameterizedType$ForReifiedType.eea
index bb6b72c1fa..ce1d57a234 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfParameterizedType$ForReifiedType.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfParameterizedType$ForReifiedType.eea
@@ -8,16 +8,16 @@ asErasure
  ()Lnet/bytebuddy/description/type/TypeDescription;
 getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getDeclaredFields
  ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InGenericShape;>;
- ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InGenericShape;>;
+ ()L1net/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InGenericShape;>; # @Inherited(net.bytebuddy.description.type.TypeDescription$Generic$OfParameterizedType)
 getDeclaredMethods
  ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InGenericShape;>;
- ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InGenericShape;>;
+ ()L1net/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InGenericShape;>; # @Inherited(net.bytebuddy.description.type.TypeDescription$Generic$OfParameterizedType)
 getInterfaces
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic; # @Inherited(net.bytebuddy.description.type.TypeDescription$Generic$OfParameterizedType)
 getOwnerType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDescription$Generic)
@@ -26,4 +26,4 @@ getSuperClass
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDescription$Generic$OfParameterizedType)
 getTypeArguments
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfParameterizedType$Latent.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfParameterizedType$Latent.eea
index 183ac210d5..0d4701696d 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfParameterizedType$Latent.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfParameterizedType$Latent.eea
@@ -14,4 +14,4 @@ getOwnerType
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDescription$Generic)
 getTypeArguments
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfParameterizedType.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfParameterizedType.eea
index 8ed662e8f0..7e741befcd 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfParameterizedType.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfParameterizedType.eea
@@ -11,25 +11,25 @@ findBindingOf
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDescription$Generic)
 getActualName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getComponentType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDescription$Generic)
 getDeclaredFields
  ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InGenericShape;>;
- ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InGenericShape;>;
+ ()L1net/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InGenericShape;>;
 getDeclaredMethods
  ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InGenericShape;>;
- ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InGenericShape;>;
+ ()L1net/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InGenericShape;>;
 getInterfaces
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getLowerBounds
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getRecordComponents
  ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InGenericShape;>;
- ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InGenericShape;>;
+ ()L1net/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InGenericShape;>;
 getSort
  ()Lnet/bytebuddy/description/type/TypeDefinition$Sort;
  ()Lnet/bytebuddy/description/type/TypeDefinition$Sort;
@@ -41,19 +41,19 @@ getSuperClass
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDefinition)
 getSymbol
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getTypeName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getTypeVariableSource
  ()Lnet/bytebuddy/description/TypeVariableSource;
- ()Lnet/bytebuddy/description/TypeVariableSource;
+ ()L1net/bytebuddy/description/TypeVariableSource;
 getUpperBounds
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 iterator
  ()Ljava/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
- ()Ljava/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
+ ()L1java/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
 represents
  (Ljava/lang/reflect/Type;)Z
  (Ljava/lang/reflect/Type;)Z
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfTypeVariable$Symbolic.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfTypeVariable$Symbolic.eea
index ebcfc48e98..2fef4d0f68 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfTypeVariable$Symbolic.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfTypeVariable$Symbolic.eea
@@ -8,7 +8,7 @@ accept
  <T:Ljava/lang/Object;>(Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor<TT;>;)TT;
 asErasure
  ()Lnet/bytebuddy/description/type/TypeDescription;
- ()Lnet/bytebuddy/description/type/TypeDescription;
+ ()L1net/bytebuddy/description/type/TypeDescription;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -26,22 +26,22 @@ getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
 getDeclaredFields
  ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InGenericShape;>;
- ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InGenericShape;>;
+ ()L1net/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InGenericShape;>;
 getDeclaredMethods
  ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InGenericShape;>;
- ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InGenericShape;>;
+ ()L1net/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InGenericShape;>;
 getInterfaces
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getLowerBounds
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getOwnerType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDescription$Generic)
 getRecordComponents
  ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InGenericShape;>;
- ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InGenericShape;>;
+ ()L1net/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InGenericShape;>;
 getSort
  ()Lnet/bytebuddy/description/type/TypeDefinition$Sort;
  ()Lnet/bytebuddy/description/type/TypeDefinition$Sort;
@@ -56,19 +56,19 @@ getSymbol
  ()Ljava/lang/String;
 getTypeArguments
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getTypeName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getTypeVariableSource
  ()Lnet/bytebuddy/description/TypeVariableSource;
- ()Lnet/bytebuddy/description/TypeVariableSource;
+ ()L1net/bytebuddy/description/TypeVariableSource;
 getUpperBounds
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 iterator
  ()Ljava/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
- ()Ljava/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
+ ()L1java/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
 represents
  (Ljava/lang/reflect/Type;)Z
  (Ljava/lang/reflect/Type;)Z
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfTypeVariable.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfTypeVariable.eea
index 96b45e1cda..e5445f3211 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfTypeVariable.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfTypeVariable.eea
@@ -20,22 +20,22 @@ getComponentType
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDescription$Generic)
 getDeclaredFields
  ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InGenericShape;>;
- ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InGenericShape;>;
+ ()L1net/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InGenericShape;>;
 getDeclaredMethods
  ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InGenericShape;>;
- ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InGenericShape;>;
+ ()L1net/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InGenericShape;>;
 getInterfaces
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getLowerBounds
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getOwnerType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDescription$Generic)
 getRecordComponents
  ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InGenericShape;>;
- ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InGenericShape;>;
+ ()L1net/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InGenericShape;>;
 getSort
  ()Lnet/bytebuddy/description/type/TypeDefinition$Sort;
  ()Lnet/bytebuddy/description/type/TypeDefinition$Sort;
@@ -47,13 +47,13 @@ getSuperClass
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDefinition)
 getTypeArguments
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getTypeName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 iterator
  ()Ljava/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
- ()Ljava/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
+ ()L1java/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
 represents
  (Ljava/lang/reflect/Type;)Z
  (Ljava/lang/reflect/Type;)Z
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfWildcardType$Latent.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfWildcardType$Latent.eea
index b25d099677..6b74e23fe6 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfWildcardType$Latent.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfWildcardType$Latent.eea
@@ -2,13 +2,13 @@ class net/bytebuddy/description/type/TypeDescription$Generic$OfWildcardType$Late
 
 boundedAbove
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;Lnet/bytebuddy/description/annotation/AnnotationSource;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;Lnet/bytebuddy/description/annotation/AnnotationSource;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;Lnet/bytebuddy/description/annotation/AnnotationSource;)L1net/bytebuddy/description/type/TypeDescription$Generic;
 boundedBelow
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;Lnet/bytebuddy/description/annotation/AnnotationSource;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;Lnet/bytebuddy/description/annotation/AnnotationSource;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;Lnet/bytebuddy/description/annotation/AnnotationSource;)L1net/bytebuddy/description/type/TypeDescription$Generic;
 unbounded
  (Lnet/bytebuddy/description/annotation/AnnotationSource;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Lnet/bytebuddy/description/annotation/AnnotationSource;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Lnet/bytebuddy/description/annotation/AnnotationSource;)L1net/bytebuddy/description/type/TypeDescription$Generic;
 
 <init>
  (Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;Lnet/bytebuddy/description/annotation/AnnotationSource;)V
@@ -18,7 +18,7 @@ getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
 getLowerBounds
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getUpperBounds
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfWildcardType.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfWildcardType.eea
index 72185080fe..9f9b672062 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfWildcardType.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$OfWildcardType.eea
@@ -9,7 +9,7 @@ accept
  <T:Ljava/lang/Object;>(Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor<TT;>;)TT;
 asErasure
  ()Lnet/bytebuddy/description/type/TypeDescription;
- ()Lnet/bytebuddy/description/type/TypeDescription;
+ ()L1net/bytebuddy/description/type/TypeDescription;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -18,49 +18,49 @@ findBindingOf
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDescription$Generic)
 getActualName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getComponentType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDescription$Generic)
 getDeclaredFields
  ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InGenericShape;>;
- ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InGenericShape;>;
+ ()L1net/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InGenericShape;>;
 getDeclaredMethods
  ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InGenericShape;>;
- ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InGenericShape;>;
+ ()L1net/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InGenericShape;>;
 getInterfaces
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getOwnerType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDescription$Generic)
 getRecordComponents
  ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InGenericShape;>;
- ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InGenericShape;>;
+ ()L1net/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InGenericShape;>;
 getSort
  ()Lnet/bytebuddy/description/type/TypeDefinition$Sort;
  ()Lnet/bytebuddy/description/type/TypeDefinition$Sort;
 getStackSize
  ()Lnet/bytebuddy/implementation/bytecode/StackSize;
- ()Lnet/bytebuddy/implementation/bytecode/StackSize;
+ ()L1net/bytebuddy/implementation/bytecode/StackSize;
 getSuperClass
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDefinition)
 getSymbol
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getTypeArguments
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getTypeName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getTypeVariableSource
  ()Lnet/bytebuddy/description/TypeVariableSource;
- ()Lnet/bytebuddy/description/TypeVariableSource;
+ ()L1net/bytebuddy/description/TypeVariableSource;
 iterator
  ()Ljava/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
- ()Ljava/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
+ ()L1java/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
 represents
  (Ljava/lang/reflect/Type;)Z
  (Ljava/lang/reflect/Type;)Z
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$AnnotationStripper$NonAnnotatedTypeVariable.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$AnnotationStripper$NonAnnotatedTypeVariable.eea
index c65a00f847..f3ccae3fc1 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$AnnotationStripper$NonAnnotatedTypeVariable.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$AnnotationStripper$NonAnnotatedTypeVariable.eea
@@ -5,7 +5,7 @@ class net/bytebuddy/description/type/TypeDescription$Generic$Visitor$AnnotationS
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)V
 getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getSymbol
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$AnnotationStripper.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$AnnotationStripper.eea
index db6f906b47..ff323b2570 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$AnnotationStripper.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$AnnotationStripper.eea
@@ -9,16 +9,16 @@ super net/bytebuddy/description/type/TypeDescription$Generic$Visitor
 
 onGenericArray
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic;
 onNonGenericType
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic;
 onParameterizedType
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
 onTypeVariable
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic;
 onWildcard
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher$ForGenericArray.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher$ForGenericArray.eea
index 01cb35ac2b..14a7956cac 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher$ForGenericArray.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher$ForGenericArray.eea
@@ -20,4 +20,4 @@ onTypeVariable
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Ljava/lang/Boolean;
 onWildcard
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Ljava/lang/Boolean;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Ljava/lang/Boolean;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1java/lang/Boolean;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher$ForNonGenericType.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher$ForNonGenericType.eea
index 500b1b4ee4..aa168d5378 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher$ForNonGenericType.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher$ForNonGenericType.eea
@@ -20,4 +20,4 @@ onTypeVariable
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Ljava/lang/Boolean;
 onWildcard
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Ljava/lang/Boolean;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Ljava/lang/Boolean;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1java/lang/Boolean;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher$ForParameterizedType$ParameterAssigner.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher$ForParameterizedType$ParameterAssigner.eea
index 4a3467b5ea..2425511c47 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher$ForParameterizedType$ParameterAssigner.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher$ForParameterizedType$ParameterAssigner.eea
@@ -9,16 +9,16 @@ super net/bytebuddy/description/type/TypeDescription$Generic$Visitor
 
 onGenericArray
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
 onNonGenericType
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
 onParameterizedType
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
 onTypeVariable
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
 onWildcard
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher$ForParameterizedType.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher$ForParameterizedType.eea
index 90dff53599..4b2e7d4523 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher$ForParameterizedType.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher$ForParameterizedType.eea
@@ -20,4 +20,4 @@ onTypeVariable
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Ljava/lang/Boolean;
 onWildcard
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Ljava/lang/Boolean;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Ljava/lang/Boolean;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1java/lang/Boolean;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher$ForTypeVariable.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher$ForTypeVariable.eea
index d82dd1605a..b0164bcb99 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher$ForTypeVariable.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher$ForTypeVariable.eea
@@ -20,4 +20,4 @@ onTypeVariable
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Ljava/lang/Boolean;
 onWildcard
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Ljava/lang/Boolean;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Ljava/lang/Boolean;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1java/lang/Boolean;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner.eea
index 86ec9689e5..6c79fc0c48 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner.eea
@@ -9,16 +9,16 @@ super net/bytebuddy/description/type/TypeDescription$Generic$Visitor
 
 onGenericArray
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
 onNonGenericType
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
 onParameterizedType
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
 onTypeVariable
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
 onWildcard
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Assigner$Dispatcher;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$ForRawType.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$ForRawType.eea
index 59b05bda5f..73cbbf218c 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$ForRawType.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$ForRawType.eea
@@ -21,4 +21,4 @@ onTypeVariable
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
 onWildcard
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$ForSignatureVisitor$OfTypeArgument.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$ForSignatureVisitor$OfTypeArgument.eea
index 393bd49679..62018e0a12 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$ForSignatureVisitor$OfTypeArgument.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$ForSignatureVisitor$OfTypeArgument.eea
@@ -17,4 +17,4 @@ onTypeVariable
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
 onWildcard
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/jar/asm/signature/SignatureVisitor; # @Inherited(net.bytebuddy.description.type.TypeDescription$Generic$Visitor$ForSignatureVisitor)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$ForSignatureVisitor.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$ForSignatureVisitor.eea
index 701b4fbb65..5eae16fd83 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$ForSignatureVisitor.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$ForSignatureVisitor.eea
@@ -28,4 +28,4 @@ onTypeVariable
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
 onWildcard
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/jar/asm/signature/SignatureVisitor;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Reducing.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Reducing.eea
index fb62ba8ab2..fa8992e905 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Reducing.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Reducing.eea
@@ -27,4 +27,4 @@ onTypeVariable
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription;
 onWildcard
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Reifying.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Reifying.eea
index c04d37df95..023ac54f1b 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Reifying.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Reifying.eea
@@ -9,13 +9,13 @@ super net/bytebuddy/description/type/TypeDescription$Generic$Visitor
 
 onGenericArray
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic;
 onNonGenericType
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
 onTypeVariable
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic;
 onWildcard
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForAttachment.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForAttachment.eea
index 26d7b6d3c0..a4160e3c89 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForAttachment.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForAttachment.eea
@@ -2,19 +2,19 @@ class net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor
 
 of
  (Lnet/bytebuddy/description/field/FieldDescription;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForAttachment;
- (Lnet/bytebuddy/description/field/FieldDescription;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForAttachment;
+ (Lnet/bytebuddy/description/field/FieldDescription;)L1net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForAttachment;
 of
  (Lnet/bytebuddy/description/method/MethodDescription;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForAttachment;
- (Lnet/bytebuddy/description/method/MethodDescription;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForAttachment;
+ (Lnet/bytebuddy/description/method/MethodDescription;)L1net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForAttachment;
 of
  (Lnet/bytebuddy/description/method/ParameterDescription;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForAttachment;
- (Lnet/bytebuddy/description/method/ParameterDescription;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForAttachment;
+ (Lnet/bytebuddy/description/method/ParameterDescription;)L1net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForAttachment;
 of
  (Lnet/bytebuddy/description/type/RecordComponentDescription;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForAttachment;
- (Lnet/bytebuddy/description/type/RecordComponentDescription;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForAttachment;
+ (Lnet/bytebuddy/description/type/RecordComponentDescription;)L1net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForAttachment;
 of
  (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForAttachment;
- (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForAttachment;
+ (Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForAttachment;
 
 <init>
  (Lnet/bytebuddy/description/type/TypeDefinition;Lnet/bytebuddy/description/TypeVariableSource;)V
@@ -30,4 +30,4 @@ onSimpleType
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
 onTypeVariable
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForDetachment.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForDetachment.eea
index 9757ee7720..008b45525e 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForDetachment.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForDetachment.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor
 
 of
  (Lnet/bytebuddy/description/type/TypeDefinition;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor<Lnet/bytebuddy/description/type/TypeDescription$Generic;>;
- (Lnet/bytebuddy/description/type/TypeDefinition;)Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor<Lnet/bytebuddy/description/type/TypeDescription$Generic;>;
+ (Lnet/bytebuddy/description/type/TypeDefinition;)L1net/bytebuddy/description/type/TypeDescription$Generic$Visitor<Lnet/bytebuddy/description/type/TypeDescription$Generic;>;
 
 <init>
  (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)V
@@ -15,4 +15,4 @@ onSimpleType
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
 onTypeVariable
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForTokenNormalization.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForTokenNormalization.eea
index e6cd57ac5a..f9817b677a 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForTokenNormalization.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor$ForTokenNormalization.eea
@@ -11,4 +11,4 @@ onSimpleType
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
 onTypeVariable
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor.eea
index 6b417d6ad2..16112dd2fc 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$Substitutor.eea
@@ -6,7 +6,7 @@ super net/bytebuddy/description/type/TypeDescription$Generic$Visitor
 
 onGenericArray
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic;
 onNonGenericType
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
@@ -18,4 +18,4 @@ onSimpleType
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
 onWildcard
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$TypeErasing.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$TypeErasing.eea
index 4479d8c0cb..e88d141c5d 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$TypeErasing.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Generic$Visitor$TypeErasing.eea
@@ -21,4 +21,4 @@ onTypeVariable
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
 onWildcard
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;)L1net/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Latent.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Latent.eea
index 0db007dfb6..3e262da4ea 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Latent.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$Latent.eea
@@ -8,16 +8,16 @@ class net/bytebuddy/description/type/TypeDescription$Latent
  (Ljava/lang/String;ILnet/bytebuddy/description/type/TypeDescription$Generic;[Lnet/bytebuddy/description/type/TypeDescription$Generic;)V
 getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getDeclaredFields
  ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;
 getDeclaredMethods
  ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;>;
 getDeclaredTypes
  ()Lnet/bytebuddy/description/type/TypeList;
- ()Lnet/bytebuddy/description/type/TypeList;
+ ()L1net/bytebuddy/description/type/TypeList;
 getDeclaringType
  ()Lnet/bytebuddy/description/type/TypeDescription;
  ()L0net/bytebuddy/description/type/TypeDescription; # @Inherited(net.bytebuddy.description.type.TypeDescription)
@@ -29,28 +29,28 @@ getEnclosingType
  ()L0net/bytebuddy/description/type/TypeDescription; # @Inherited(net.bytebuddy.description.type.TypeDescription)
 getInterfaces
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getNestHost
  ()Lnet/bytebuddy/description/type/TypeDescription;
- ()Lnet/bytebuddy/description/type/TypeDescription;
+ ()L1net/bytebuddy/description/type/TypeDescription;
 getNestMembers
  ()Lnet/bytebuddy/description/type/TypeList;
- ()Lnet/bytebuddy/description/type/TypeList;
+ ()L1net/bytebuddy/description/type/TypeList;
 getPackage
  ()Lnet/bytebuddy/description/type/PackageDescription;
  ()L0net/bytebuddy/description/type/PackageDescription; # @Inherited(net.bytebuddy.description.type.TypeDescription)
 getPermittedSubtypes
  ()Lnet/bytebuddy/description/type/TypeList;
- ()Lnet/bytebuddy/description/type/TypeList;
+ ()L1net/bytebuddy/description/type/TypeList;
 getRecordComponents
  ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;
 getSuperClass
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDefinition)
 getTypeVariables
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$SuperTypeLoading$ClassLoadingTypeProjection.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$SuperTypeLoading$ClassLoadingTypeProjection.eea
index 1f71cf1ff9..f717f5f176 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$SuperTypeLoading$ClassLoadingTypeProjection.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeDescription$SuperTypeLoading$ClassLoadingTypeProjection.eea
@@ -17,7 +17,7 @@ getSuperClass
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDefinition)
 iterator
  ()Ljava/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
- ()Ljava/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
+ ()L1java/util/Iterator<Lnet/bytebuddy/description/type/TypeDefinition;>;
 resolve
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$AbstractBase.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$AbstractBase.eea
index 9e09fc1173..69a5a91afc 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$AbstractBase.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$AbstractBase.eea
@@ -9,4 +9,4 @@ toInternalNames
  ()[0Ljava/lang/String; # @Inherited(net.bytebuddy.description.type.TypeList)
 wrap
  (Ljava/util/List<Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/type/TypeList;
- (Ljava/util/List<Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/type/TypeList;
+ (Ljava/util/List<Lnet/bytebuddy/description/type/TypeDescription;>;)L1net/bytebuddy/description/type/TypeList;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Explicit.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Explicit.eea
index 563a6b9be1..f262169350 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Explicit.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Explicit.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/description/type/TypeList$Explicit
 
 of
  (Ljava/util/List<+Lnet/bytebuddy/utility/JavaConstant;>;)Lnet/bytebuddy/description/type/TypeList;
- (Ljava/util/List<+Lnet/bytebuddy/utility/JavaConstant;>;)Lnet/bytebuddy/description/type/TypeList;
+ (Ljava/util/List<+Lnet/bytebuddy/utility/JavaConstant;>;)L1net/bytebuddy/description/type/TypeList;
 
 <init>
  (Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDescription;>;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$AbstractBase.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$AbstractBase.eea
index 15b03be78e..6f9dafca0c 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$AbstractBase.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$AbstractBase.eea
@@ -6,16 +6,16 @@ super net/bytebuddy/matcher/FilterableList$AbstractBase
 
 accept
  (Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/description/type/TypeList$Generic;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/description/type/TypeList$Generic;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)L1net/bytebuddy/description/type/TypeList$Generic;
 asErasures
  ()Lnet/bytebuddy/description/type/TypeList;
- ()Lnet/bytebuddy/description/type/TypeList;
+ ()L1net/bytebuddy/description/type/TypeList;
 asRawTypes
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 asTokenList
  (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/ByteCodeElement$Token$TokenList<Lnet/bytebuddy/description/type/TypeVariableToken;>;
- (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/ByteCodeElement$Token$TokenList<Lnet/bytebuddy/description/type/TypeVariableToken;>;
+ (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)L1net/bytebuddy/description/ByteCodeElement$Token$TokenList<Lnet/bytebuddy/description/type/TypeVariableToken;>;
 wrap
  (Ljava/util/List<Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/description/type/TypeList$Generic;
- (Ljava/util/List<Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/description/type/TypeList$Generic;
+ (Ljava/util/List<Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)L1net/bytebuddy/description/type/TypeList$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$Empty.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$Empty.eea
index 482d2dc174..ea87e3ead0 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$Empty.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$Empty.eea
@@ -6,10 +6,10 @@ super net/bytebuddy/matcher/FilterableList$Empty
 
 accept
  (Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/description/type/TypeList$Generic;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/description/type/TypeList$Generic;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)L1net/bytebuddy/description/type/TypeList$Generic;
 asErasures
  ()Lnet/bytebuddy/description/type/TypeList;
- ()Lnet/bytebuddy/description/type/TypeList;
+ ()L1net/bytebuddy/description/type/TypeList;
 asRawTypes
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$ForDetachedTypes.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$ForDetachedTypes.eea
index 646491923c..dcc1b91c64 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$ForDetachedTypes.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$ForDetachedTypes.eea
@@ -2,19 +2,19 @@ class net/bytebuddy/description/type/TypeList$Generic$ForDetachedTypes
 
 attach
  (Lnet/bytebuddy/description/field/FieldDescription;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/description/type/TypeList$Generic;
- (Lnet/bytebuddy/description/field/FieldDescription;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/description/type/TypeList$Generic;
+ (Lnet/bytebuddy/description/field/FieldDescription;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)L1net/bytebuddy/description/type/TypeList$Generic;
 attach
  (Lnet/bytebuddy/description/method/MethodDescription;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/description/type/TypeList$Generic;
- (Lnet/bytebuddy/description/method/MethodDescription;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/description/type/TypeList$Generic;
+ (Lnet/bytebuddy/description/method/MethodDescription;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)L1net/bytebuddy/description/type/TypeList$Generic;
 attach
  (Lnet/bytebuddy/description/method/ParameterDescription;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/description/type/TypeList$Generic;
- (Lnet/bytebuddy/description/method/ParameterDescription;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/description/type/TypeList$Generic;
+ (Lnet/bytebuddy/description/method/ParameterDescription;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)L1net/bytebuddy/description/type/TypeList$Generic;
 attachVariables
  (Lnet/bytebuddy/description/method/MethodDescription;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeVariableToken;>;)Lnet/bytebuddy/description/type/TypeList$Generic;
- (Lnet/bytebuddy/description/method/MethodDescription;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeVariableToken;>;)Lnet/bytebuddy/description/type/TypeList$Generic;
+ (Lnet/bytebuddy/description/method/MethodDescription;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeVariableToken;>;)L1net/bytebuddy/description/type/TypeList$Generic;
 attachVariables
  (Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeVariableToken;>;)Lnet/bytebuddy/description/type/TypeList$Generic;
- (Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeVariableToken;>;)Lnet/bytebuddy/description/type/TypeList$Generic;
+ (Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeVariableToken;>;)L1net/bytebuddy/description/type/TypeList$Generic;
 
 <init>
  (Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$ForLoadedTypes$OfTypeVariables.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$ForLoadedTypes$OfTypeVariables.eea
index f531a16c0a..bf3c42246b 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$ForLoadedTypes$OfTypeVariables.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$ForLoadedTypes$OfTypeVariables.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/description/type/TypeList$Generic$ForLoadedTypes$OfTypeVaria
 
 of
  (Ljava/lang/reflect/GenericDeclaration;)Lnet/bytebuddy/description/type/TypeList$Generic;
- (Ljava/lang/reflect/GenericDeclaration;)Lnet/bytebuddy/description/type/TypeList$Generic;
+ (Ljava/lang/reflect/GenericDeclaration;)L1net/bytebuddy/description/type/TypeList$Generic;
 
 <init>
  (Ljava/util/List<Ljava/lang/reflect/TypeVariable<*>;>;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$OfConstructorExceptionTypes.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$OfConstructorExceptionTypes.eea
index 8f9e872cec..f2e18b7465 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$OfConstructorExceptionTypes.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$OfConstructorExceptionTypes.eea
@@ -5,7 +5,7 @@ class net/bytebuddy/description/type/TypeList$Generic$OfConstructorExceptionType
  (Ljava/lang/reflect/Constructor<*>;)V
 asErasures
  ()Lnet/bytebuddy/description/type/TypeList;
- ()Lnet/bytebuddy/description/type/TypeList;
+ ()L1net/bytebuddy/description/type/TypeList; # @Inherited(net.bytebuddy.description.type.TypeList$Generic$AbstractBase)
 get
  (I)Lnet/bytebuddy/description/type/TypeDescription$Generic;
  (I)Lnet/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$OfLoadedInterfaceTypes.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$OfLoadedInterfaceTypes.eea
index 95b204b134..9431e5c553 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$OfLoadedInterfaceTypes.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$OfLoadedInterfaceTypes.eea
@@ -5,7 +5,7 @@ class net/bytebuddy/description/type/TypeList$Generic$OfLoadedInterfaceTypes
  (Ljava/lang/Class<*>;)V
 asErasures
  ()Lnet/bytebuddy/description/type/TypeList;
- ()Lnet/bytebuddy/description/type/TypeList;
+ ()L1net/bytebuddy/description/type/TypeList; # @Inherited(net.bytebuddy.description.type.TypeList$Generic$AbstractBase)
 get
  (I)Lnet/bytebuddy/description/type/TypeDescription$Generic;
  (I)Lnet/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$OfMethodExceptionTypes.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$OfMethodExceptionTypes.eea
index 4e86f8fe8e..b5a1e23a47 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$OfMethodExceptionTypes.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeList$Generic$OfMethodExceptionTypes.eea
@@ -5,7 +5,7 @@ class net/bytebuddy/description/type/TypeList$Generic$OfMethodExceptionTypes
  (Ljava/lang/reflect/Method;)V
 asErasures
  ()Lnet/bytebuddy/description/type/TypeList;
- ()Lnet/bytebuddy/description/type/TypeList;
+ ()L1net/bytebuddy/description/type/TypeList; # @Inherited(net.bytebuddy.description.type.TypeList$Generic$AbstractBase)
 get
  (I)Lnet/bytebuddy/description/type/TypeDescription$Generic;
  (I)Lnet/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeVariableToken.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeVariableToken.eea
index ddfb4dee10..e233b49ff5 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeVariableToken.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/description/type/TypeVariableToken.eea
@@ -6,7 +6,7 @@ super net/bytebuddy/description/ByteCodeElement$Token
 
 of
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/type/TypeVariableToken;
- (Lnet/bytebuddy/description/type/TypeDescription$Generic;Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/description/type/TypeVariableToken;
+ (Lnet/bytebuddy/description/type/TypeDescription$Generic;Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)L1net/bytebuddy/description/type/TypeVariableToken;
 
 <init>
  (Ljava/lang/String;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)V
@@ -22,10 +22,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getBounds
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getSymbol
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$Filtering.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$Filtering.eea
index 33b6f055b7..ec96cd700a 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$Filtering.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$Filtering.eea
@@ -8,4 +8,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 locate
  (Ljava/lang/String;)Lnet/bytebuddy/dynamic/ClassFileLocator$Resolution;
- (Ljava/lang/String;)Lnet/bytebuddy/dynamic/ClassFileLocator$Resolution;
+ (Ljava/lang/String;)L1net/bytebuddy/dynamic/ClassFileLocator$Resolution;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForClassLoader$WeaklyReferenced.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForClassLoader$WeaklyReferenced.eea
index cbb7f7295e..efd28c6ccc 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForClassLoader$WeaklyReferenced.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForClassLoader$WeaklyReferenced.eea
@@ -6,7 +6,7 @@ super java/lang/ref/WeakReference
 
 of
  (Ljava/lang/ClassLoader;)Lnet/bytebuddy/dynamic/ClassFileLocator;
- (Ljava/lang/ClassLoader;)Lnet/bytebuddy/dynamic/ClassFileLocator;
+ (Ljava/lang/ClassLoader;)L1net/bytebuddy/dynamic/ClassFileLocator;
 
 <init>
  (Ljava/lang/ClassLoader;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForClassLoader.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForClassLoader.eea
index 46cb3ce42a..0976f2c29b 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForClassLoader.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForClassLoader.eea
@@ -2,31 +2,31 @@ class net/bytebuddy/dynamic/ClassFileLocator$ForClassLoader
 
 locate
  (Ljava/lang/ClassLoader;Ljava/lang/String;)Lnet/bytebuddy/dynamic/ClassFileLocator$Resolution;
- (Ljava/lang/ClassLoader;Ljava/lang/String;)Lnet/bytebuddy/dynamic/ClassFileLocator$Resolution;
+ (Ljava/lang/ClassLoader;Ljava/lang/String;)L1net/bytebuddy/dynamic/ClassFileLocator$Resolution;
 of
  (Ljava/lang/ClassLoader;)Lnet/bytebuddy/dynamic/ClassFileLocator;
  (Ljava/lang/ClassLoader;)Lnet/bytebuddy/dynamic/ClassFileLocator;
 ofBootLoader
  ()Lnet/bytebuddy/dynamic/ClassFileLocator;
- ()Lnet/bytebuddy/dynamic/ClassFileLocator;
+ ()L1net/bytebuddy/dynamic/ClassFileLocator;
 ofPlatformLoader
  ()Lnet/bytebuddy/dynamic/ClassFileLocator;
  ()Lnet/bytebuddy/dynamic/ClassFileLocator;
 ofSystemLoader
  ()Lnet/bytebuddy/dynamic/ClassFileLocator;
- ()Lnet/bytebuddy/dynamic/ClassFileLocator;
+ ()L1net/bytebuddy/dynamic/ClassFileLocator;
 read
  (Ljava/lang/Class<*>;)[B
  (Ljava/lang/Class<*>;)[B
 read
  (Ljava/util/Collection<+Ljava/lang/Class<*>;>;)Ljava/util/Map<Ljava/lang/Class<*>;[B>;
- (Ljava/util/Collection<+Ljava/lang/Class<*>;>;)Ljava/util/Map<Ljava/lang/Class<*>;[B>;
+ (Ljava/util/Collection<+Ljava/lang/Class<*>;>;)L1java/util/Map<Ljava/lang/Class<*>;[B>;
 read
  ([Ljava/lang/Class<*>;)Ljava/util/Map<Ljava/lang/Class<*>;[B>;
  ([Ljava/lang/Class<*>;)Ljava/util/Map<Ljava/lang/Class<*>;[B>;
 readToNames
  (Ljava/util/Collection<+Ljava/lang/Class<*>;>;)Ljava/util/Map<Ljava/lang/String;[B>;
- (Ljava/util/Collection<+Ljava/lang/Class<*>;>;)Ljava/util/Map<Ljava/lang/String;[B>;
+ (Ljava/util/Collection<+Ljava/lang/Class<*>;>;)L1java/util/Map<Ljava/lang/String;[B>;
 readToNames
  ([Ljava/lang/Class<*>;)Ljava/util/Map<Ljava/lang/String;[B>;
  ([Ljava/lang/Class<*>;)Ljava/util/Map<Ljava/lang/String;[B>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForFolder.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForFolder.eea
index ec39967383..ed526d836a 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForFolder.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForFolder.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/dynamic/ClassFileLocator$ForFolder
 
 of
  (Ljava/io/File;Lnet/bytebuddy/ClassFileVersion;)Lnet/bytebuddy/dynamic/ClassFileLocator;
- (Ljava/io/File;Lnet/bytebuddy/ClassFileVersion;)Lnet/bytebuddy/dynamic/ClassFileLocator;
+ (Ljava/io/File;Lnet/bytebuddy/ClassFileVersion;)L1net/bytebuddy/dynamic/ClassFileLocator;
 
 <init>
  (Ljava/io/File;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ClassLoadingDelegate$Explicit.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ClassLoadingDelegate$Explicit.eea
index 19a7610d38..41d1a7fc84 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ClassLoadingDelegate$Explicit.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ClassLoadingDelegate$Explicit.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ClassLoadingDele
 
 of
  (Ljava/lang/Class<*>;)Lnet/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ClassLoadingDelegate;
- (Ljava/lang/Class<*>;)Lnet/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ClassLoadingDelegate;
+ (Ljava/lang/Class<*>;)L1net/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ClassLoadingDelegate;
 
 <init>
  (Ljava/lang/ClassLoader;Ljava/util/Collection<+Ljava/lang/Class<*>;>;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ClassLoadingDelegate$ForDelegatingClassLoader$Dispatcher$CreationAction.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ClassLoadingDelegate$ForDelegatingClassLoader$Dispatcher$CreationAction.eea
index d805d9ce18..76433db627 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ClassLoadingDelegate$ForDelegatingClassLoader$Dispatcher$CreationAction.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ClassLoadingDelegate$ForDelegatingClassLoader$Dispatcher$CreationAction.eea
@@ -9,4 +9,4 @@ super java/security/PrivilegedAction
 
 run
  ()Lnet/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ClassLoadingDelegate$ForDelegatingClassLoader$Dispatcher$Initializable;
- ()Lnet/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ClassLoadingDelegate$ForDelegatingClassLoader$Dispatcher$Initializable;
+ ()L1net/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ClassLoadingDelegate$ForDelegatingClassLoader$Dispatcher$Initializable;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ClassLoadingDelegate$ForDelegatingClassLoader$Dispatcher$Unresolved.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ClassLoadingDelegate$ForDelegatingClassLoader$Dispatcher$Unresolved.eea
index e7dd2d8896..c92fdb2cd5 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ClassLoadingDelegate$ForDelegatingClassLoader$Dispatcher$Unresolved.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ClassLoadingDelegate$ForDelegatingClassLoader$Dispatcher$Unresolved.eea
@@ -8,4 +8,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 initialize
  ()Lnet/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ClassLoadingDelegate$ForDelegatingClassLoader$Dispatcher;
- ()Lnet/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ClassLoadingDelegate$ForDelegatingClassLoader$Dispatcher;
+ ()L1net/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ClassLoadingDelegate$ForDelegatingClassLoader$Dispatcher;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ExtractionClassFileTransformer.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ExtractionClassFileTransformer.eea
index 54cf1ea95d..3188f4f653 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ExtractionClassFileTransformer.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation$ExtractionClassFileTransformer.eea
@@ -8,4 +8,4 @@ getBinaryRepresentation
  ()[0B
 transform
  (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[B
- (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[0B
+ (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[0B # @Inherited(java.lang.instrument.ClassFileTransformer)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation.eea
index 48b5a9c5b1..7e1283b7f7 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation.eea
@@ -2,10 +2,10 @@ class net/bytebuddy/dynamic/ClassFileLocator$ForInstrumentation
 
 fromInstalledAgent
  (Ljava/lang/ClassLoader;)Lnet/bytebuddy/dynamic/ClassFileLocator;
- (Ljava/lang/ClassLoader;)Lnet/bytebuddy/dynamic/ClassFileLocator;
+ (Ljava/lang/ClassLoader;)L1net/bytebuddy/dynamic/ClassFileLocator;
 of
  (Ljava/lang/instrument/Instrumentation;Ljava/lang/Class<*>;)Lnet/bytebuddy/dynamic/ClassFileLocator;
- (Ljava/lang/instrument/Instrumentation;Ljava/lang/Class<*>;)Lnet/bytebuddy/dynamic/ClassFileLocator;
+ (Ljava/lang/instrument/Instrumentation;Ljava/lang/Class<*>;)L1net/bytebuddy/dynamic/ClassFileLocator;
 
 <init>
  (Ljava/lang/instrument/Instrumentation;Ljava/lang/ClassLoader;)V
@@ -18,4 +18,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 locate
  (Ljava/lang/String;)Lnet/bytebuddy/dynamic/ClassFileLocator$Resolution;
- (Ljava/lang/String;)Lnet/bytebuddy/dynamic/ClassFileLocator$Resolution;
+ (Ljava/lang/String;)L1net/bytebuddy/dynamic/ClassFileLocator$Resolution;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForJarFile.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForJarFile.eea
index a3a01f4ee0..5afa877c10 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForJarFile.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForJarFile.eea
@@ -14,7 +14,7 @@ ofClassPath
  ()Lnet/bytebuddy/dynamic/ClassFileLocator;
 ofClassPath
  (Ljava/lang/String;)Lnet/bytebuddy/dynamic/ClassFileLocator;
- (Ljava/lang/String;)Lnet/bytebuddy/dynamic/ClassFileLocator;
+ (Ljava/lang/String;)L1net/bytebuddy/dynamic/ClassFileLocator;
 ofRuntimeJar
  ()Lnet/bytebuddy/dynamic/ClassFileLocator;
  ()Lnet/bytebuddy/dynamic/ClassFileLocator;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForModule.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForModule.eea
index dadbe5cec8..f2f1c87231 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForModule.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForModule.eea
@@ -2,13 +2,13 @@ class net/bytebuddy/dynamic/ClassFileLocator$ForModule
 
 locate
  (Lnet/bytebuddy/utility/JavaModule;Ljava/lang/String;)Lnet/bytebuddy/dynamic/ClassFileLocator$Resolution;
- (Lnet/bytebuddy/utility/JavaModule;Ljava/lang/String;)Lnet/bytebuddy/dynamic/ClassFileLocator$Resolution;
+ (Lnet/bytebuddy/utility/JavaModule;Ljava/lang/String;)L1net/bytebuddy/dynamic/ClassFileLocator$Resolution;
 of
  (Lnet/bytebuddy/utility/JavaModule;)Lnet/bytebuddy/dynamic/ClassFileLocator;
  (Lnet/bytebuddy/utility/JavaModule;)Lnet/bytebuddy/dynamic/ClassFileLocator;
 ofBootLayer
  ()Lnet/bytebuddy/dynamic/ClassFileLocator;
- ()Lnet/bytebuddy/dynamic/ClassFileLocator;
+ ()L1net/bytebuddy/dynamic/ClassFileLocator;
 
 <init>
  (Lnet/bytebuddy/utility/JavaModule;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForModuleFile.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForModuleFile.eea
index b669db57ce..f8eddb45d3 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForModuleFile.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForModuleFile.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/dynamic/ClassFileLocator$ForModuleFile
 
 of
  (Ljava/io/File;)Lnet/bytebuddy/dynamic/ClassFileLocator;
- (Ljava/io/File;)Lnet/bytebuddy/dynamic/ClassFileLocator;
+ (Ljava/io/File;)L1net/bytebuddy/dynamic/ClassFileLocator;
 ofBootPath
  ()Lnet/bytebuddy/dynamic/ClassFileLocator;
  ()Lnet/bytebuddy/dynamic/ClassFileLocator;
@@ -17,7 +17,7 @@ ofModulePath
  (Ljava/lang/String;)Lnet/bytebuddy/dynamic/ClassFileLocator;
 ofModulePath
  (Ljava/lang/String;Ljava/lang/String;)Lnet/bytebuddy/dynamic/ClassFileLocator;
- (Ljava/lang/String;Ljava/lang/String;)Lnet/bytebuddy/dynamic/ClassFileLocator;
+ (Ljava/lang/String;Ljava/lang/String;)L1net/bytebuddy/dynamic/ClassFileLocator;
 
 <init>
  (Ljava/util/zip/ZipFile;)V
@@ -27,4 +27,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 locate
  (Ljava/lang/String;)Lnet/bytebuddy/dynamic/ClassFileLocator$Resolution;
- (Ljava/lang/String;)Lnet/bytebuddy/dynamic/ClassFileLocator$Resolution;
+ (Ljava/lang/String;)L1net/bytebuddy/dynamic/ClassFileLocator$Resolution;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForUrl$ClassLoaderCreationAction.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForUrl$ClassLoaderCreationAction.eea
index 0c9778db01..78cb794e69 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForUrl$ClassLoaderCreationAction.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$ForUrl$ClassLoaderCreationAction.eea
@@ -12,4 +12,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 run
  ()Ljava/lang/ClassLoader;
- ()Ljava/lang/ClassLoader;
+ ()L1java/lang/ClassLoader;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$MultiReleaseAware.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$MultiReleaseAware.eea
index 39c3c61c1d..08ada72506 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$MultiReleaseAware.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$MultiReleaseAware.eea
@@ -15,4 +15,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 locate
  (Ljava/lang/String;)Lnet/bytebuddy/dynamic/ClassFileLocator$Resolution;
- (Ljava/lang/String;)Lnet/bytebuddy/dynamic/ClassFileLocator$Resolution;
+ (Ljava/lang/String;)L1net/bytebuddy/dynamic/ClassFileLocator$Resolution;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$NoOp.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$NoOp.eea
index a86a8238fc..f4277c4ebf 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$NoOp.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$NoOp.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 locate
  (Ljava/lang/String;)Lnet/bytebuddy/dynamic/ClassFileLocator$Resolution;
- (Ljava/lang/String;)Lnet/bytebuddy/dynamic/ClassFileLocator$Resolution;
+ (Ljava/lang/String;)L1net/bytebuddy/dynamic/ClassFileLocator$Resolution;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$Resolution$Illegal.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$Resolution$Illegal.eea
index 9619b4efd8..0a8d674640 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$Resolution$Illegal.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$Resolution$Illegal.eea
@@ -8,4 +8,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 resolve
  ()[B
- ()[B
+ ()[1B
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$Simple.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$Simple.eea
index 9f8df838ea..afcc06ab23 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$Simple.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/ClassFileLocator$Simple.eea
@@ -2,16 +2,16 @@ class net/bytebuddy/dynamic/ClassFileLocator$Simple
 
 of
  (Ljava/lang/String;[B)Lnet/bytebuddy/dynamic/ClassFileLocator;
- (Ljava/lang/String;[B)Lnet/bytebuddy/dynamic/ClassFileLocator;
+ (Ljava/lang/String;[B)L1net/bytebuddy/dynamic/ClassFileLocator;
 of
  (Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;)Lnet/bytebuddy/dynamic/ClassFileLocator;
- (Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;)Lnet/bytebuddy/dynamic/ClassFileLocator;
+ (Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;)L1net/bytebuddy/dynamic/ClassFileLocator;
 of
  (Lnet/bytebuddy/dynamic/DynamicType;)Lnet/bytebuddy/dynamic/ClassFileLocator;
  (Lnet/bytebuddy/dynamic/DynamicType;)Lnet/bytebuddy/dynamic/ClassFileLocator;
 ofResources
  (Ljava/util/Map<Ljava/lang/String;[B>;)Lnet/bytebuddy/dynamic/ClassFileLocator;
- (Ljava/util/Map<Ljava/lang/String;[B>;)Lnet/bytebuddy/dynamic/ClassFileLocator;
+ (Ljava/util/Map<Ljava/lang/String;[B>;)L1net/bytebuddy/dynamic/ClassFileLocator;
 
 <init>
  (Ljava/util/Map<Ljava/lang/String;[B>;)V
@@ -21,4 +21,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 locate
  (Ljava/lang/String;)Lnet/bytebuddy/dynamic/ClassFileLocator$Resolution;
- (Ljava/lang/String;)Lnet/bytebuddy/dynamic/ClassFileLocator$Resolution;
+ (Ljava/lang/String;)L1net/bytebuddy/dynamic/ClassFileLocator$Resolution;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodDefinitionAdapter$AnnotationAdapter.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodDefinitionAdapter$AnnotationAdapter.eea
index 15ad4d39a2..68e188c142 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodDefinitionAdapter$AnnotationAdapter.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodDefinitionAdapter$AnnotationAdapter.eea
@@ -24,7 +24,7 @@ materialize
  ()Lnet/bytebuddy/dynamic/DynamicType$Builder<TU;>;
 materialize
  (Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Handler;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender$Factory;Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/method/MethodDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition<TU;>;
- (Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Handler;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender$Factory;Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/method/MethodDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition<TU;>;
+ (Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Handler;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender$Factory;Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/method/MethodDescription;>;)L1net/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition<TU;>;
 receiverType
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition<TU;>;
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition<TU;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodDefinitionAdapter$ParameterAnnotationAdapter.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodDefinitionAdapter$ParameterAnnotationAdapter.eea
index 6eacfe1247..07e824ee93 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodDefinitionAdapter$ParameterAnnotationAdapter.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodDefinitionAdapter$ParameterAnnotationAdapter.eea
@@ -9,7 +9,7 @@ super net/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefini
  (Lnet/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodDefinitionAdapter;Lnet/bytebuddy/description/method/ParameterDescription$Token;)V
 annotateParameter
  (Ljava/util/Collection<+Lnet/bytebuddy/description/annotation/AnnotationDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefinition$Annotatable<TU;>;
- (Ljava/util/Collection<+Lnet/bytebuddy/description/annotation/AnnotationDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefinition$Annotatable<TU;>;
+ (Ljava/util/Collection<+Lnet/bytebuddy/description/annotation/AnnotationDescription;>;)L1net/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefinition$Annotatable<TU;>;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodDefinitionAdapter$SimpleParameterAnnotationAdapter.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodDefinitionAdapter$SimpleParameterAnnotationAdapter.eea
index f88f0b7bce..6287791743 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodDefinitionAdapter$SimpleParameterAnnotationAdapter.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodDefinitionAdapter$SimpleParameterAnnotationAdapter.eea
@@ -9,7 +9,7 @@ super net/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefini
  (Lnet/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodDefinitionAdapter;Lnet/bytebuddy/description/method/ParameterDescription$Token;)V
 annotateParameter
  (Ljava/util/Collection<+Lnet/bytebuddy/description/annotation/AnnotationDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefinition$Simple$Annotatable<TU;>;
- (Ljava/util/Collection<+Lnet/bytebuddy/description/annotation/AnnotationDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefinition$Simple$Annotatable<TU;>;
+ (Ljava/util/Collection<+Lnet/bytebuddy/description/annotation/AnnotationDescription;>;)L1net/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefinition$Simple$Annotatable<TU;>;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodDefinitionAdapter$TypeVariableAnnotationAdapter.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodDefinitionAdapter$TypeVariableAnnotationAdapter.eea
index 93f7603f00..31c5e59bc5 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodDefinitionAdapter$TypeVariableAnnotationAdapter.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodDefinitionAdapter$TypeVariableAnnotationAdapter.eea
@@ -9,7 +9,7 @@ super net/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$TypeVariableDef
  (Lnet/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodDefinitionAdapter;Lnet/bytebuddy/description/type/TypeVariableToken;)V
 annotateTypeVariable
  (Ljava/util/Collection<+Lnet/bytebuddy/description/annotation/AnnotationDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$TypeVariableDefinition$Annotatable<TU;>;
- (Ljava/util/Collection<+Lnet/bytebuddy/description/annotation/AnnotationDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$TypeVariableDefinition$Annotatable<TU;>;
+ (Ljava/util/Collection<+Lnet/bytebuddy/description/annotation/AnnotationDescription;>;)L1net/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$TypeVariableDefinition$Annotatable<TU;>;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodDefinitionAdapter.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodDefinitionAdapter.eea
index cd0d645087..6f2fd2d15b 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodDefinitionAdapter.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodDefinitionAdapter.eea
@@ -21,13 +21,13 @@ throwing
  (Ljava/util/Collection<+Lnet/bytebuddy/description/type/TypeDefinition;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ExceptionDefinition<TU;>;
 typeVariable
  (Ljava/lang/String;Ljava/util/Collection<+Lnet/bytebuddy/description/type/TypeDefinition;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$TypeVariableDefinition$Annotatable<TU;>;
- (Ljava/lang/String;Ljava/util/Collection<+Lnet/bytebuddy/description/type/TypeDefinition;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$TypeVariableDefinition$Annotatable<TU;>;
+ (Ljava/lang/String;Ljava/util/Collection<+Lnet/bytebuddy/description/type/TypeDefinition;>;)L1net/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$TypeVariableDefinition$Annotatable<TU;>;
 withParameter
  (Lnet/bytebuddy/description/type/TypeDefinition;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefinition$Simple$Annotatable<TU;>;
- (Lnet/bytebuddy/description/type/TypeDefinition;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefinition$Simple$Annotatable<TU;>;
+ (Lnet/bytebuddy/description/type/TypeDefinition;)L1net/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefinition$Simple$Annotatable<TU;>;
 withParameter
  (Lnet/bytebuddy/description/type/TypeDefinition;Ljava/lang/String;I)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefinition$Annotatable<TU;>;
- (Lnet/bytebuddy/description/type/TypeDefinition;Ljava/lang/String;I)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefinition$Annotatable<TU;>;
+ (Lnet/bytebuddy/description/type/TypeDefinition;Ljava/lang/String;I)L1net/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefinition$Annotatable<TU;>;
 withoutCode
  ()Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ReceiverTypeDefinition<TU;>;
  ()Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ReceiverTypeDefinition<TU;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodMatchAdapter$AnnotationAdapter.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodMatchAdapter$AnnotationAdapter.eea
index 164981a78e..73c453f2ad 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodMatchAdapter$AnnotationAdapter.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$MethodMatchAdapter$AnnotationAdapter.eea
@@ -24,7 +24,7 @@ materialize
  ()Lnet/bytebuddy/dynamic/DynamicType$Builder<TU;>;
 materialize
  (Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Handler;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender$Factory;Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/method/MethodDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition<TU;>;
- (Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Handler;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender$Factory;Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/method/MethodDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition<TU;>;
+ (Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Handler;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender$Factory;Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/method/MethodDescription;>;)L1net/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition<TU;>;
 receiverType
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition<TU;>;
  (Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition<TU;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$TypeVariableDefinitionAdapter.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$TypeVariableDefinitionAdapter.eea
index 99c387b81b..eeba7613a3 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$TypeVariableDefinitionAdapter.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter$TypeVariableDefinitionAdapter.eea
@@ -9,7 +9,7 @@ super net/bytebuddy/dynamic/DynamicType$Builder$TypeVariableDefinition$AbstractB
  (Lnet/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter;Lnet/bytebuddy/description/type/TypeVariableToken;)V
 annotateTypeVariable
  (Ljava/util/Collection<+Lnet/bytebuddy/description/annotation/AnnotationDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$TypeVariableDefinition<TU;>;
- (Ljava/util/Collection<+Lnet/bytebuddy/description/annotation/AnnotationDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$TypeVariableDefinition<TU;>;
+ (Ljava/util/Collection<+Lnet/bytebuddy/description/annotation/AnnotationDescription;>;)L1net/bytebuddy/dynamic/DynamicType$Builder$TypeVariableDefinition<TU;>;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter.eea
index 371bdb7661..cec698a7e5 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Builder$AbstractBase$Adapter.eea
@@ -75,28 +75,28 @@ declaredTypes
  (Ljava/util/Collection<+Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder<TU;>;
 defineConstructor
  (I)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefinition$Initial<TU;>;
- (I)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefinition$Initial<TU;>;
+ (I)L1net/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefinition$Initial<TU;>;
 defineField
  (Ljava/lang/String;Lnet/bytebuddy/description/type/TypeDefinition;I)Lnet/bytebuddy/dynamic/DynamicType$Builder$FieldDefinition$Optional$Valuable<TU;>;
- (Ljava/lang/String;Lnet/bytebuddy/description/type/TypeDefinition;I)Lnet/bytebuddy/dynamic/DynamicType$Builder$FieldDefinition$Optional$Valuable<TU;>;
+ (Ljava/lang/String;Lnet/bytebuddy/description/type/TypeDefinition;I)L1net/bytebuddy/dynamic/DynamicType$Builder$FieldDefinition$Optional$Valuable<TU;>;
 defineMethod
  (Ljava/lang/String;Lnet/bytebuddy/description/type/TypeDefinition;I)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefinition$Initial<TU;>;
- (Ljava/lang/String;Lnet/bytebuddy/description/type/TypeDefinition;I)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefinition$Initial<TU;>;
+ (Ljava/lang/String;Lnet/bytebuddy/description/type/TypeDefinition;I)L1net/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefinition$Initial<TU;>;
 defineRecordComponent
  (Ljava/lang/String;Lnet/bytebuddy/description/type/TypeDefinition;)Lnet/bytebuddy/dynamic/DynamicType$Builder$RecordComponentDefinition$Optional<TU;>;
- (Ljava/lang/String;Lnet/bytebuddy/description/type/TypeDefinition;)Lnet/bytebuddy/dynamic/DynamicType$Builder$RecordComponentDefinition$Optional<TU;>;
+ (Ljava/lang/String;Lnet/bytebuddy/description/type/TypeDefinition;)L1net/bytebuddy/dynamic/DynamicType$Builder$RecordComponentDefinition$Optional<TU;>;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 field
  (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/field/FieldDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$FieldDefinition$Valuable<TU;>;
- (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/field/FieldDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$FieldDefinition$Valuable<TU;>;
+ (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/field/FieldDescription;>;)L1net/bytebuddy/dynamic/DynamicType$Builder$FieldDefinition$Valuable<TU;>;
 ignoreAlso
  (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder<TU;>;
  (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder<TU;>;
 implement
  (Ljava/util/Collection<+Lnet/bytebuddy/description/type/TypeDefinition;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ImplementationDefinition$Optional<TU;>;
- (Ljava/util/Collection<+Lnet/bytebuddy/description/type/TypeDefinition;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ImplementationDefinition$Optional<TU;>;
+ (Ljava/util/Collection<+Lnet/bytebuddy/description/type/TypeDefinition;>;)L1net/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ImplementationDefinition$Optional<TU;>;
 initializer
  (Lnet/bytebuddy/implementation/LoadedTypeInitializer;)Lnet/bytebuddy/dynamic/DynamicType$Builder<TU;>;
  (Lnet/bytebuddy/implementation/LoadedTypeInitializer;)Lnet/bytebuddy/dynamic/DynamicType$Builder<TU;>;
@@ -105,13 +105,13 @@ initializer
  (Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender;)Lnet/bytebuddy/dynamic/DynamicType$Builder<TU;>;
 innerTypeOf
  (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)Lnet/bytebuddy/dynamic/DynamicType$Builder$InnerTypeDefinition<TU;>;
- (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)Lnet/bytebuddy/dynamic/DynamicType$Builder$InnerTypeDefinition<TU;>;
+ (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)L1net/bytebuddy/dynamic/DynamicType$Builder$InnerTypeDefinition<TU;>;
 innerTypeOf
  (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/DynamicType$Builder$InnerTypeDefinition$ForType<TU;>;
- (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/DynamicType$Builder$InnerTypeDefinition$ForType<TU;>;
+ (Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/dynamic/DynamicType$Builder$InnerTypeDefinition$ForType<TU;>;
 invokable
  (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ImplementationDefinition<TU;>;
- (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ImplementationDefinition<TU;>;
+ (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;)L1net/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ImplementationDefinition<TU;>;
 materialize
  (Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;Lnet/bytebuddy/dynamic/scaffold/FieldRegistry;Lnet/bytebuddy/dynamic/scaffold/MethodRegistry;Lnet/bytebuddy/dynamic/scaffold/RecordComponentRegistry;Lnet/bytebuddy/implementation/attribute/TypeAttributeAppender;Lnet/bytebuddy/asm/AsmVisitorWrapper;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/implementation/auxiliary/AuxiliaryType$NamingStrategy;Lnet/bytebuddy/implementation/attribute/AnnotationValueFilter$Factory;Lnet/bytebuddy/implementation/attribute/AnnotationRetention;Lnet/bytebuddy/implementation/Implementation$Context$Factory;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler;Lnet/bytebuddy/dynamic/scaffold/TypeValidation;Lnet/bytebuddy/dynamic/VisibilityBridgeStrategy;Lnet/bytebuddy/utility/AsmClassReader$Factory;Lnet/bytebuddy/utility/AsmClassWriter$Factory;Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;Ljava/util/List<+Lnet/bytebuddy/dynamic/DynamicType;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder<TU;>;
  (Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;Lnet/bytebuddy/dynamic/scaffold/FieldRegistry;Lnet/bytebuddy/dynamic/scaffold/MethodRegistry;Lnet/bytebuddy/dynamic/scaffold/RecordComponentRegistry;Lnet/bytebuddy/implementation/attribute/TypeAttributeAppender;Lnet/bytebuddy/asm/AsmVisitorWrapper;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/implementation/auxiliary/AuxiliaryType$NamingStrategy;Lnet/bytebuddy/implementation/attribute/AnnotationValueFilter$Factory;Lnet/bytebuddy/implementation/attribute/AnnotationRetention;Lnet/bytebuddy/implementation/Implementation$Context$Factory;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler;Lnet/bytebuddy/dynamic/scaffold/TypeValidation;Lnet/bytebuddy/dynamic/VisibilityBridgeStrategy;Lnet/bytebuddy/utility/AsmClassReader$Factory;Lnet/bytebuddy/utility/AsmClassWriter$Factory;Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;Ljava/util/List<+Lnet/bytebuddy/dynamic/DynamicType;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder<TU;>;
@@ -135,7 +135,7 @@ permittedSubclass
  (Ljava/util/Collection<+Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder<TU;>;
 recordComponent
  (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/type/RecordComponentDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$RecordComponentDefinition<TU;>;
- (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/type/RecordComponentDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$RecordComponentDefinition<TU;>;
+ (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/type/RecordComponentDescription;>;)L1net/bytebuddy/dynamic/DynamicType$Builder$RecordComponentDefinition<TU;>;
 require
  (Ljava/util/Collection<Lnet/bytebuddy/dynamic/DynamicType;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder<TU;>;
  (Ljava/util/Collection<Lnet/bytebuddy/dynamic/DynamicType;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder<TU;>;
@@ -153,7 +153,7 @@ transform
  (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/type/TypeVariableToken;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder<TU;>;
 typeVariable
  (Ljava/lang/String;Ljava/util/Collection<+Lnet/bytebuddy/description/type/TypeDefinition;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$TypeVariableDefinition<TU;>;
- (Ljava/lang/String;Ljava/util/Collection<+Lnet/bytebuddy/description/type/TypeDefinition;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$TypeVariableDefinition<TU;>;
+ (Ljava/lang/String;Ljava/util/Collection<+Lnet/bytebuddy/description/type/TypeDefinition;>;)L1net/bytebuddy/dynamic/DynamicType$Builder$TypeVariableDefinition<TU;>;
 unsealed
  ()Lnet/bytebuddy/dynamic/DynamicType$Builder<TU;>;
  ()Lnet/bytebuddy/dynamic/DynamicType$Builder<TU;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Default.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Default.eea
index f6b69173cc..1178de9c85 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Default.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/DynamicType$Default.eea
@@ -21,16 +21,16 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getAllTypes
  ()Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;
- ()Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;
+ ()L1java/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;
 getAuxiliaryTypes
  ()Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;
- ()Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;
+ ()L1java/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;
 getBytes
  ()[B
  ()[B
 getLoadedTypeInitializers
  ()Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/implementation/LoadedTypeInitializer;>;
- ()Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/implementation/LoadedTypeInitializer;>;
+ ()L1java/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/implementation/LoadedTypeInitializer;>;
 getTypeDescription
  ()Lnet/bytebuddy/description/type/TypeDescription;
  ()Lnet/bytebuddy/description/type/TypeDescription;
@@ -45,7 +45,7 @@ locate
  (Ljava/lang/String;)Lnet/bytebuddy/dynamic/ClassFileLocator$Resolution;
 saveIn
  (Ljava/io/File;)Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/io/File;>;
- (Ljava/io/File;)Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/io/File;>;
+ (Ljava/io/File;)L1java/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/io/File;>;
 toJar
  (Ljava/io/File;)Ljava/io/File;
  (Ljava/io/File;)Ljava/io/File;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/Transformer$ForField$FieldModifierTransformer.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/Transformer$ForField$FieldModifierTransformer.eea
index 98d4b8b219..f85b0e5673 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/Transformer$ForField$FieldModifierTransformer.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/Transformer$ForField$FieldModifierTransformer.eea
@@ -12,4 +12,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 transform
  (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/field/FieldDescription$Token;)Lnet/bytebuddy/description/field/FieldDescription$Token;
- (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/field/FieldDescription$Token;)Lnet/bytebuddy/description/field/FieldDescription$Token;
+ (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/field/FieldDescription$Token;)L1net/bytebuddy/description/field/FieldDescription$Token;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/Transformer$ForField.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/Transformer$ForField.eea
index 3304af2690..4f9b0d2932 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/Transformer$ForField.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/Transformer$ForField.eea
@@ -6,7 +6,7 @@ super net/bytebuddy/dynamic/Transformer
 
 withModifiers
  (Ljava/util/List<+Lnet/bytebuddy/description/modifier/ModifierContributor$ForField;>;)Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/field/FieldDescription;>;
- (Ljava/util/List<+Lnet/bytebuddy/description/modifier/ModifierContributor$ForField;>;)Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/field/FieldDescription;>;
+ (Ljava/util/List<+Lnet/bytebuddy/description/modifier/ModifierContributor$ForField;>;)L1net/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/field/FieldDescription;>;
 withModifiers
  ([Lnet/bytebuddy/description/modifier/ModifierContributor$ForField;)Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/field/FieldDescription;>;
  ([Lnet/bytebuddy/description/modifier/ModifierContributor$ForField;)Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/field/FieldDescription;>;
@@ -19,4 +19,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 transform
  (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/field/FieldDescription;)Lnet/bytebuddy/description/field/FieldDescription;
- (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/field/FieldDescription;)Lnet/bytebuddy/description/field/FieldDescription;
+ (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/field/FieldDescription;)L1net/bytebuddy/description/field/FieldDescription;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/Transformer$ForMethod$MethodModifierTransformer.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/Transformer$ForMethod$MethodModifierTransformer.eea
index 6cd4648e06..75e5d91b87 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/Transformer$ForMethod$MethodModifierTransformer.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/Transformer$ForMethod$MethodModifierTransformer.eea
@@ -12,4 +12,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 transform
  (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/method/MethodDescription$Token;)Lnet/bytebuddy/description/method/MethodDescription$Token;
- (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/method/MethodDescription$Token;)Lnet/bytebuddy/description/method/MethodDescription$Token;
+ (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/method/MethodDescription$Token;)L1net/bytebuddy/description/method/MethodDescription$Token;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/Transformer$ForMethod$TransformedMethod.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/Transformer$ForMethod$TransformedMethod.eea
index 64a633ac2c..637fd4da17 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/Transformer$ForMethod$TransformedMethod.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/Transformer$ForMethod$TransformedMethod.eea
@@ -17,13 +17,13 @@ getDefaultValue
  ()L0net/bytebuddy/description/annotation/AnnotationValue<**>; # @Inherited(net.bytebuddy.description.method.MethodDescription)
 getExceptionTypes
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getInternalName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getParameters
  ()Lnet/bytebuddy/description/method/ParameterList<*>;
- ()Lnet/bytebuddy/description/method/ParameterList<*>;
+ ()L1net/bytebuddy/description/method/ParameterList<*>;
 getReceiverType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.method.MethodDescription)
@@ -32,4 +32,4 @@ getReturnType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
 getTypeVariables
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/Transformer$ForMethod.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/Transformer$ForMethod.eea
index d03ca21b15..01537caea2 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/Transformer$ForMethod.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/Transformer$ForMethod.eea
@@ -6,7 +6,7 @@ super net/bytebuddy/dynamic/Transformer
 
 withModifiers
  (Ljava/util/List<+Lnet/bytebuddy/description/modifier/ModifierContributor$ForMethod;>;)Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/method/MethodDescription;>;
- (Ljava/util/List<+Lnet/bytebuddy/description/modifier/ModifierContributor$ForMethod;>;)Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/method/MethodDescription;>;
+ (Ljava/util/List<+Lnet/bytebuddy/description/modifier/ModifierContributor$ForMethod;>;)L1net/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/method/MethodDescription;>;
 withModifiers
  ([Lnet/bytebuddy/description/modifier/ModifierContributor$ForMethod;)Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/method/MethodDescription;>;
  ([Lnet/bytebuddy/description/modifier/ModifierContributor$ForMethod;)Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/method/MethodDescription;>;
@@ -19,4 +19,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 transform
  (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/method/MethodDescription;)Lnet/bytebuddy/description/method/MethodDescription;
- (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/method/MethodDescription;)Lnet/bytebuddy/description/method/MethodDescription;
+ (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/method/MethodDescription;)L1net/bytebuddy/description/method/MethodDescription;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/TypeResolutionStrategy$Active.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/TypeResolutionStrategy$Active.eea
index b3c8281485..78a58e42fa 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/TypeResolutionStrategy$Active.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/TypeResolutionStrategy$Active.eea
@@ -8,4 +8,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 resolve
  ()Lnet/bytebuddy/dynamic/TypeResolutionStrategy$Resolved;
- ()Lnet/bytebuddy/dynamic/TypeResolutionStrategy$Resolved;
+ ()L1net/bytebuddy/dynamic/TypeResolutionStrategy$Resolved;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/TypeResolutionStrategy$Disabled.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/TypeResolutionStrategy$Disabled.eea
index 7fbe52e8d5..24406b8e1c 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/TypeResolutionStrategy$Disabled.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/TypeResolutionStrategy$Disabled.eea
@@ -6,7 +6,7 @@ super java/lang/Enum
 
 initialize
  <S:Ljava/lang/ClassLoader;>(Lnet/bytebuddy/dynamic/DynamicType;TS;Lnet/bytebuddy/dynamic/loading/ClassLoadingStrategy<-TS;>;)Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/Class<*>;>;
- <S:Ljava/lang/ClassLoader;>(Lnet/bytebuddy/dynamic/DynamicType;TS;Lnet/bytebuddy/dynamic/loading/ClassLoadingStrategy<-TS;>;)Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/Class<*>;>;
+ <S:Ljava/lang/ClassLoader;>(Lnet/bytebuddy/dynamic/DynamicType;TS;Lnet/bytebuddy/dynamic/loading/ClassLoadingStrategy<-TS;>;)L1java/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/Class<*>;>;
 injectedInto
  (Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;)Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;
  (Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;)Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/TypeResolutionStrategy$Passive.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/TypeResolutionStrategy$Passive.eea
index 5c2d564ae3..6284b42465 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/TypeResolutionStrategy$Passive.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/TypeResolutionStrategy$Passive.eea
@@ -6,7 +6,7 @@ super java/lang/Enum
 
 initialize
  <S:Ljava/lang/ClassLoader;>(Lnet/bytebuddy/dynamic/DynamicType;TS;Lnet/bytebuddy/dynamic/loading/ClassLoadingStrategy<-TS;>;)Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/Class<*>;>;
- <S:Ljava/lang/ClassLoader;>(Lnet/bytebuddy/dynamic/DynamicType;TS;Lnet/bytebuddy/dynamic/loading/ClassLoadingStrategy<-TS;>;)Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/Class<*>;>;
+ <S:Ljava/lang/ClassLoader;>(Lnet/bytebuddy/dynamic/DynamicType;TS;Lnet/bytebuddy/dynamic/loading/ClassLoadingStrategy<-TS;>;)L1java/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/Class<*>;>;
 injectedInto
  (Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;)Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;
  (Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;)Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ByteArrayClassLoader$ChildFirst.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ByteArrayClassLoader$ChildFirst.eea
index 13bd0775c6..c22d1d381e 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ByteArrayClassLoader$ChildFirst.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ByteArrayClassLoader$ChildFirst.eea
@@ -5,7 +5,7 @@ load
  (Ljava/lang/ClassLoader;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;)Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/Class<*>;>;
 load
  (Ljava/lang/ClassLoader;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;Ljava/security/ProtectionDomain;Lnet/bytebuddy/dynamic/loading/ByteArrayClassLoader$PersistenceHandler;Lnet/bytebuddy/dynamic/loading/PackageDefinitionStrategy;ZZ)Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/Class<*>;>;
- (Ljava/lang/ClassLoader;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;Ljava/security/ProtectionDomain;Lnet/bytebuddy/dynamic/loading/ByteArrayClassLoader$PersistenceHandler;Lnet/bytebuddy/dynamic/loading/PackageDefinitionStrategy;ZZ)Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/Class<*>;>;
+ (Ljava/lang/ClassLoader;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;Ljava/security/ProtectionDomain;Lnet/bytebuddy/dynamic/loading/ByteArrayClassLoader$PersistenceHandler;Lnet/bytebuddy/dynamic/loading/PackageDefinitionStrategy;ZZ)L1java/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/Class<*>;>;
 
 <init>
  (Ljava/lang/ClassLoader;Ljava/util/Map<Ljava/lang/String;[B>;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ByteArrayClassLoader$EmptyEnumeration.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ByteArrayClassLoader$EmptyEnumeration.eea
index 6dd46ef90d..686abd5c6a 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ByteArrayClassLoader$EmptyEnumeration.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ByteArrayClassLoader$EmptyEnumeration.eea
@@ -9,4 +9,4 @@ super java/util/Enumeration
 
 nextElement
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L1java/net/URL;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ByteArrayClassLoader$PersistenceHandler$UrlDefinitionAction$ByteArrayUrlStreamHandler.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ByteArrayClassLoader$PersistenceHandler$UrlDefinitionAction$ByteArrayUrlStreamHandler.eea
index 0bea47a066..008b5348d4 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ByteArrayClassLoader$PersistenceHandler$UrlDefinitionAction$ByteArrayUrlStreamHandler.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ByteArrayClassLoader$PersistenceHandler$UrlDefinitionAction$ByteArrayUrlStreamHandler.eea
@@ -8,4 +8,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 openConnection
  (Ljava/net/URL;)Ljava/net/URLConnection;
- (Ljava/net/URL;)Ljava/net/URLConnection;
+ (Ljava/net/URL;)L1java/net/URLConnection;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ByteArrayClassLoader.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ByteArrayClassLoader.eea
index 119880f3f1..59b76bbdd4 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ByteArrayClassLoader.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ByteArrayClassLoader.eea
@@ -12,7 +12,7 @@ load
  (Ljava/lang/ClassLoader;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;)Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/Class<*>;>;
 load
  (Ljava/lang/ClassLoader;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;Ljava/security/ProtectionDomain;Lnet/bytebuddy/dynamic/loading/ByteArrayClassLoader$PersistenceHandler;Lnet/bytebuddy/dynamic/loading/PackageDefinitionStrategy;ZZ)Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/Class<*>;>;
- (Ljava/lang/ClassLoader;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;Ljava/security/ProtectionDomain;Lnet/bytebuddy/dynamic/loading/ByteArrayClassLoader$PersistenceHandler;Lnet/bytebuddy/dynamic/loading/PackageDefinitionStrategy;ZZ)Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/Class<*>;>;
+ (Ljava/lang/ClassLoader;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;Ljava/security/ProtectionDomain;Lnet/bytebuddy/dynamic/loading/ByteArrayClassLoader$PersistenceHandler;Lnet/bytebuddy/dynamic/loading/PackageDefinitionStrategy;ZZ)L1java/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/Class<*>;>;
 
 accessControlContext
  Ljava/lang/Object;
@@ -59,7 +59,7 @@ typeDefinitions
  (Ljava/lang/ClassLoader;ZLjava/util/Map<Ljava/lang/String;[B>;Lnet/bytebuddy/dynamic/loading/ByteArrayClassLoader$PersistenceHandler;)V
 doDefineClasses
  (Ljava/util/Map<Ljava/lang/String;[B>;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;
- (Ljava/util/Map<Ljava/lang/String;[B>;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;
+ (Ljava/util/Map<Ljava/lang/String;[B>;)L1java/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;
 findClass
  (Ljava/lang/String;)Ljava/lang/Class<*>;
  (L0java/lang/String;)L1java/lang/Class<*>; # @Inherited(java.lang.ClassLoader)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$AbstractBase.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$AbstractBase.eea
index 5b6907fddd..bda0dc7d0a 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$AbstractBase.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$AbstractBase.eea
@@ -2,4 +2,4 @@ class net/bytebuddy/dynamic/loading/ClassInjector$AbstractBase
 
 inject
  (Ljava/util/Map<+Lnet/bytebuddy/description/type/TypeDescription;[B>;)Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/Class<*>;>;
- (Ljava/util/Map<+Lnet/bytebuddy/description/type/TypeDescription;[B>;)Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/Class<*>;>;
+ (Ljava/util/Map<+Lnet/bytebuddy/description/type/TypeDescription;[B>;)L1java/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/Class<*>;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingInstrumentation.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingInstrumentation.eea
index d1c6e96a77..6818650a71 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingInstrumentation.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingInstrumentation.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/dynamic/loading/ClassInjector$UsingInstrumentation
 
 of
  (Ljava/io/File;Lnet/bytebuddy/dynamic/loading/ClassInjector$UsingInstrumentation$Target;Ljava/lang/instrument/Instrumentation;)Lnet/bytebuddy/dynamic/loading/ClassInjector;
- (Ljava/io/File;Lnet/bytebuddy/dynamic/loading/ClassInjector$UsingInstrumentation$Target;Ljava/lang/instrument/Instrumentation;)Lnet/bytebuddy/dynamic/loading/ClassInjector;
+ (Ljava/io/File;Lnet/bytebuddy/dynamic/loading/ClassInjector$UsingInstrumentation$Target;Ljava/lang/instrument/Instrumentation;)L1net/bytebuddy/dynamic/loading/ClassInjector;
 redefineModule
  (Ljava/lang/instrument/Instrumentation;Lnet/bytebuddy/utility/JavaModule;Ljava/util/Set<Lnet/bytebuddy/utility/JavaModule;>;Ljava/util/Map<Ljava/lang/String;Ljava/util/Set<Lnet/bytebuddy/utility/JavaModule;>;>;Ljava/util/Map<Ljava/lang/String;Ljava/util/Set<Lnet/bytebuddy/utility/JavaModule;>;>;Ljava/util/Set<Ljava/lang/Class<*>;>;Ljava/util/Map<Ljava/lang/Class<*>;Ljava/util/List<Ljava/lang/Class<*>;>;>;)V
  (Ljava/lang/instrument/Instrumentation;Lnet/bytebuddy/utility/JavaModule;Ljava/util/Set<Lnet/bytebuddy/utility/JavaModule;>;Ljava/util/Map<Ljava/lang/String;Ljava/util/Set<Lnet/bytebuddy/utility/JavaModule;>;>;Ljava/util/Map<Ljava/lang/String;Ljava/util/Set<Lnet/bytebuddy/utility/JavaModule;>;>;Ljava/util/Set<Ljava/lang/Class<*>;>;Ljava/util/Map<Ljava/lang/Class<*>;Ljava/util/List<Ljava/lang/Class<*>;>;>;)V
@@ -15,4 +15,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 injectRaw
  (Ljava/util/Map<+Ljava/lang/String;[B>;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;
- (Ljava/util/Map<+Ljava/lang/String;[B>;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;
+ (Ljava/util/Map<+Ljava/lang/String;[B>;)L1java/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingJna$Dispatcher$CreationAction.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingJna$Dispatcher$CreationAction.eea
index c56b2ec439..e0eb8cd3e1 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingJna$Dispatcher$CreationAction.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingJna$Dispatcher$CreationAction.eea
@@ -9,4 +9,4 @@ super java/security/PrivilegedAction
 
 run
  ()Lnet/bytebuddy/dynamic/loading/ClassInjector$UsingJna$Dispatcher;
- ()Lnet/bytebuddy/dynamic/loading/ClassInjector$UsingJna$Dispatcher;
+ ()L1net/bytebuddy/dynamic/loading/ClassInjector$UsingJna$Dispatcher;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingJna$Dispatcher$Unavailable.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingJna$Dispatcher$Unavailable.eea
index a3fe2eb486..1cee652f75 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingJna$Dispatcher$Unavailable.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingJna$Dispatcher$Unavailable.eea
@@ -5,7 +5,7 @@ class net/bytebuddy/dynamic/loading/ClassInjector$UsingJna$Dispatcher$Unavailabl
  (Ljava/lang/String;)V
 defineClass
  (Ljava/lang/ClassLoader;Ljava/lang/String;[BLjava/security/ProtectionDomain;)Ljava/lang/Class<*>;
- (Ljava/lang/ClassLoader;Ljava/lang/String;[BLjava/security/ProtectionDomain;)Ljava/lang/Class<*>;
+ (Ljava/lang/ClassLoader;Ljava/lang/String;[BLjava/security/ProtectionDomain;)L1java/lang/Class<*>;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingJna.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingJna.eea
index 8bf1bda3c7..ea6dae7cb3 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingJna.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingJna.eea
@@ -2,13 +2,13 @@ class net/bytebuddy/dynamic/loading/ClassInjector$UsingJna
 
 ofBootLoader
  ()Lnet/bytebuddy/dynamic/loading/ClassInjector;
- ()Lnet/bytebuddy/dynamic/loading/ClassInjector;
+ ()L1net/bytebuddy/dynamic/loading/ClassInjector;
 ofPlatformLoader
  ()Lnet/bytebuddy/dynamic/loading/ClassInjector;
- ()Lnet/bytebuddy/dynamic/loading/ClassInjector;
+ ()L1net/bytebuddy/dynamic/loading/ClassInjector;
 ofSystemLoader
  ()Lnet/bytebuddy/dynamic/loading/ClassInjector;
- ()Lnet/bytebuddy/dynamic/loading/ClassInjector;
+ ()L1net/bytebuddy/dynamic/loading/ClassInjector;
 
 <init>
  (Ljava/lang/ClassLoader;)V
@@ -21,4 +21,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 injectRaw
  (Ljava/util/Map<+Ljava/lang/String;[B>;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;
- (Ljava/util/Map<+Ljava/lang/String;[B>;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;
+ (Ljava/util/Map<+Ljava/lang/String;[B>;)L1java/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingLookup.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingLookup.eea
index 41c935410f..d928c8944c 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingLookup.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingLookup.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/dynamic/loading/ClassInjector$UsingLookup
 
 of
  (Ljava/lang/Object;)Lnet/bytebuddy/dynamic/loading/ClassInjector$UsingLookup;
- (Ljava/lang/Object;)Lnet/bytebuddy/dynamic/loading/ClassInjector$UsingLookup;
+ (Ljava/lang/Object;)L1net/bytebuddy/dynamic/loading/ClassInjector$UsingLookup;
 
 <init>
  (Ljava/lang/Object;)V
@@ -12,10 +12,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 in
  (Ljava/lang/Class<*>;)Lnet/bytebuddy/dynamic/loading/ClassInjector$UsingLookup;
- (Ljava/lang/Class<*>;)Lnet/bytebuddy/dynamic/loading/ClassInjector$UsingLookup;
+ (Ljava/lang/Class<*>;)L1net/bytebuddy/dynamic/loading/ClassInjector$UsingLookup;
 injectRaw
  (Ljava/util/Map<+Ljava/lang/String;[B>;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;
- (Ljava/util/Map<+Ljava/lang/String;[B>;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;
+ (Ljava/util/Map<+Ljava/lang/String;[B>;)L1java/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;
 lookupType
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$Direct.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$Direct.eea
index 8335267095..3766372827 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$Direct.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$Direct.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$Dir
 
 make
  ()Lnet/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$Initializable;
- ()Lnet/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$Initializable;
+ ()L1net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$Initializable;
 
 defineClass
  Ljava/lang/reflect/Method;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$Initializable$Unavailable.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$Initializable$Unavailable.eea
index f82b7f935c..89de469372 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$Initializable$Unavailable.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$Initializable$Unavailable.eea
@@ -5,10 +5,10 @@ class net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$Ini
  (Ljava/lang/String;)V
 defineClass
  (Ljava/lang/ClassLoader;Ljava/lang/String;[BLjava/security/ProtectionDomain;)Ljava/lang/Class<*>;
- (Ljava/lang/ClassLoader;Ljava/lang/String;[BLjava/security/ProtectionDomain;)Ljava/lang/Class<*>;
+ (Ljava/lang/ClassLoader;Ljava/lang/String;[BLjava/security/ProtectionDomain;)L1java/lang/Class<*>;
 definePackage
  (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/URL;)Ljava/lang/Package;
- (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/URL;)Ljava/lang/Package;
+ (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/URL;)L1java/lang/Package;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$Unavailable.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$Unavailable.eea
index 2f21bd8878..2c3c884e06 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$Unavailable.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$Unavailable.eea
@@ -5,10 +5,10 @@ class net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$Una
  (Ljava/lang/String;)V
 defineClass
  (Ljava/lang/ClassLoader;Ljava/lang/String;[BLjava/security/ProtectionDomain;)Ljava/lang/Class<*>;
- (Ljava/lang/ClassLoader;Ljava/lang/String;[BLjava/security/ProtectionDomain;)Ljava/lang/Class<*>;
+ (Ljava/lang/ClassLoader;Ljava/lang/String;[BLjava/security/ProtectionDomain;)L1java/lang/Class<*>;
 definePackage
  (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/URL;)Ljava/lang/Package;
- (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/URL;)Ljava/lang/Package;
+ (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/URL;)L1java/lang/Package;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$UsingUnsafeOverride.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$UsingUnsafeOverride.eea
index fcb350ee52..3f26325ea1 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$UsingUnsafeOverride.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$UsingUnsafeOverride.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$Usi
 
 make
  ()Lnet/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$Initializable;
- ()Lnet/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$Initializable;
+ ()L1net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection$Dispatcher$Initializable;
 
 defineClass
  Ljava/lang/reflect/Method;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection.eea
index 5414b32af4..f99b0700bc 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/dynamic/loading/ClassInjector$UsingReflection
 
 ofSystemClassLoader
  ()Lnet/bytebuddy/dynamic/loading/ClassInjector;
- ()Lnet/bytebuddy/dynamic/loading/ClassInjector;
+ ()L1net/bytebuddy/dynamic/loading/ClassInjector;
 
 <init>
  (Ljava/lang/ClassLoader;)V
@@ -18,4 +18,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 injectRaw
  (Ljava/util/Map<+Ljava/lang/String;[B>;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;
- (Ljava/util/Map<+Ljava/lang/String;[B>;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;
+ (Ljava/util/Map<+Ljava/lang/String;[B>;)L1java/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingUnsafe$Dispatcher$CreationAction.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingUnsafe$Dispatcher$CreationAction.eea
index ab139821d9..0a4074dd9a 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingUnsafe$Dispatcher$CreationAction.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingUnsafe$Dispatcher$CreationAction.eea
@@ -9,4 +9,4 @@ super java/security/PrivilegedAction
 
 run
  ()Lnet/bytebuddy/dynamic/loading/ClassInjector$UsingUnsafe$Dispatcher$Initializable;
- ()Lnet/bytebuddy/dynamic/loading/ClassInjector$UsingUnsafe$Dispatcher$Initializable;
+ ()L1net/bytebuddy/dynamic/loading/ClassInjector$UsingUnsafe$Dispatcher$Initializable;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingUnsafe$Dispatcher$Unavailable.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingUnsafe$Dispatcher$Unavailable.eea
index 432f50eee7..25273bfcc6 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingUnsafe$Dispatcher$Unavailable.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingUnsafe$Dispatcher$Unavailable.eea
@@ -5,10 +5,10 @@ class net/bytebuddy/dynamic/loading/ClassInjector$UsingUnsafe$Dispatcher$Unavail
  (Ljava/lang/String;)V
 defineClass
  (Ljava/lang/ClassLoader;Ljava/lang/String;[BLjava/security/ProtectionDomain;)Ljava/lang/Class<*>;
- (Ljava/lang/ClassLoader;Ljava/lang/String;[BLjava/security/ProtectionDomain;)Ljava/lang/Class<*>;
+ (Ljava/lang/ClassLoader;Ljava/lang/String;[BLjava/security/ProtectionDomain;)L1java/lang/Class<*>;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 initialize
  ()Lnet/bytebuddy/dynamic/loading/ClassInjector$UsingUnsafe$Dispatcher;
- ()Lnet/bytebuddy/dynamic/loading/ClassInjector$UsingUnsafe$Dispatcher;
+ ()L1net/bytebuddy/dynamic/loading/ClassInjector$UsingUnsafe$Dispatcher;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingUnsafe$Factory.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingUnsafe$Factory.eea
index 5aead00c14..1b49376859 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingUnsafe$Factory.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingUnsafe$Factory.eea
@@ -21,4 +21,4 @@ make
  (Ljava/lang/ClassLoader;)Lnet/bytebuddy/dynamic/loading/ClassInjector;
 make
  (Ljava/lang/ClassLoader;Ljava/security/ProtectionDomain;)Lnet/bytebuddy/dynamic/loading/ClassInjector;
- (Ljava/lang/ClassLoader;Ljava/security/ProtectionDomain;)Lnet/bytebuddy/dynamic/loading/ClassInjector;
+ (Ljava/lang/ClassLoader;Ljava/security/ProtectionDomain;)L1net/bytebuddy/dynamic/loading/ClassInjector;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingUnsafe.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingUnsafe.eea
index 7cf1326de0..957517b9f5 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingUnsafe.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassInjector$UsingUnsafe.eea
@@ -6,13 +6,13 @@ SAFE_PROPERTY
 
 ofBootLoader
  ()Lnet/bytebuddy/dynamic/loading/ClassInjector;
- ()Lnet/bytebuddy/dynamic/loading/ClassInjector;
+ ()L1net/bytebuddy/dynamic/loading/ClassInjector;
 ofPlatformLoader
  ()Lnet/bytebuddy/dynamic/loading/ClassInjector;
- ()Lnet/bytebuddy/dynamic/loading/ClassInjector;
+ ()L1net/bytebuddy/dynamic/loading/ClassInjector;
 ofSystemLoader
  ()Lnet/bytebuddy/dynamic/loading/ClassInjector;
- ()Lnet/bytebuddy/dynamic/loading/ClassInjector;
+ ()L1net/bytebuddy/dynamic/loading/ClassInjector;
 
 <init>
  (Ljava/lang/ClassLoader;)V
@@ -28,4 +28,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 injectRaw
  (Ljava/util/Map<+Ljava/lang/String;[B>;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;
- (Ljava/util/Map<+Ljava/lang/String;[B>;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;
+ (Ljava/util/Map<+Ljava/lang/String;[B>;)L1java/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassLoadingStrategy$UsingLookup.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassLoadingStrategy$UsingLookup.eea
index 1592d82f66..845f5db421 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassLoadingStrategy$UsingLookup.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassLoadingStrategy$UsingLookup.eea
@@ -6,7 +6,7 @@ super net/bytebuddy/dynamic/loading/ClassLoadingStrategy
 
 of
  (Ljava/lang/Object;)Lnet/bytebuddy/dynamic/loading/ClassLoadingStrategy<Ljava/lang/ClassLoader;>;
- (Ljava/lang/Object;)Lnet/bytebuddy/dynamic/loading/ClassLoadingStrategy<Ljava/lang/ClassLoader;>;
+ (Ljava/lang/Object;)L1net/bytebuddy/dynamic/loading/ClassLoadingStrategy<Ljava/lang/ClassLoader;>;
 withFallback
  (Ljava/util/concurrent/Callable<*>;)Lnet/bytebuddy/dynamic/loading/ClassLoadingStrategy<Ljava/lang/ClassLoader;>;
  (Ljava/util/concurrent/Callable<*>;)Lnet/bytebuddy/dynamic/loading/ClassLoadingStrategy<Ljava/lang/ClassLoader;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassReloadingStrategy$BootstrapInjection$Disabled.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassReloadingStrategy$BootstrapInjection$Disabled.eea
index 3bb8690da9..ecdf7cc508 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassReloadingStrategy$BootstrapInjection$Disabled.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassReloadingStrategy$BootstrapInjection$Disabled.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 make
  (Ljava/lang/instrument/Instrumentation;)Lnet/bytebuddy/dynamic/loading/ClassInjector;
- (Ljava/lang/instrument/Instrumentation;)Lnet/bytebuddy/dynamic/loading/ClassInjector;
+ (Ljava/lang/instrument/Instrumentation;)L1net/bytebuddy/dynamic/loading/ClassInjector;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassReloadingStrategy$Strategy$ClassRedefinitionTransformer.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassReloadingStrategy$Strategy$ClassRedefinitionTransformer.eea
index 10ec8019b5..be572e9d63 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassReloadingStrategy$Strategy$ClassRedefinitionTransformer.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassReloadingStrategy$Strategy$ClassRedefinitionTransformer.eea
@@ -5,4 +5,4 @@ class net/bytebuddy/dynamic/loading/ClassReloadingStrategy$Strategy$ClassRedefin
  (Ljava/util/Map<Ljava/lang/Class<*>;Ljava/lang/instrument/ClassDefinition;>;)V
 transform
  (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[B
- (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[0B
+ (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[0B # @Inherited(java.lang.instrument.ClassFileTransformer)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassReloadingStrategy$Strategy$ClassResettingTransformer.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassReloadingStrategy$Strategy$ClassResettingTransformer.eea
index 83c49bb425..ead31b7dfb 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassReloadingStrategy$Strategy$ClassResettingTransformer.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassReloadingStrategy$Strategy$ClassResettingTransformer.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 transform
  (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[B
- (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[0B
+ (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[0B # @Inherited(java.lang.instrument.ClassFileTransformer)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassReloadingStrategy.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassReloadingStrategy.eea
index 5963de644c..2d9d443322 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassReloadingStrategy.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/ClassReloadingStrategy.eea
@@ -13,10 +13,10 @@ fromInstalledAgent
  ()Lnet/bytebuddy/dynamic/loading/ClassReloadingStrategy;
 fromInstalledAgent
  (Lnet/bytebuddy/dynamic/loading/ClassReloadingStrategy$Strategy;)Lnet/bytebuddy/dynamic/loading/ClassReloadingStrategy;
- (Lnet/bytebuddy/dynamic/loading/ClassReloadingStrategy$Strategy;)Lnet/bytebuddy/dynamic/loading/ClassReloadingStrategy;
+ (Lnet/bytebuddy/dynamic/loading/ClassReloadingStrategy$Strategy;)L1net/bytebuddy/dynamic/loading/ClassReloadingStrategy;
 of
  (Ljava/lang/instrument/Instrumentation;)Lnet/bytebuddy/dynamic/loading/ClassReloadingStrategy;
- (Ljava/lang/instrument/Instrumentation;)Lnet/bytebuddy/dynamic/loading/ClassReloadingStrategy;
+ (Ljava/lang/instrument/Instrumentation;)L1net/bytebuddy/dynamic/loading/ClassReloadingStrategy;
 
 <init>
  (Ljava/lang/instrument/Instrumentation;Lnet/bytebuddy/dynamic/loading/ClassReloadingStrategy$Strategy;)V
@@ -32,7 +32,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 load
  (Ljava/lang/ClassLoader;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;)Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/Class<*>;>;
- (Ljava/lang/ClassLoader;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;)Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/Class<*>;>;
+ (Ljava/lang/ClassLoader;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;)L1java/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/Class<*>;>;
 preregistered
  ([Ljava/lang/Class<*>;)Lnet/bytebuddy/dynamic/loading/ClassReloadingStrategy;
  ([Ljava/lang/Class<*>;)Lnet/bytebuddy/dynamic/loading/ClassReloadingStrategy;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/InjectionClassLoader$Strategy.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/InjectionClassLoader$Strategy.eea
index 49a8bf4c06..05bee3a0f8 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/InjectionClassLoader$Strategy.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/InjectionClassLoader$Strategy.eea
@@ -9,4 +9,4 @@ super net/bytebuddy/dynamic/loading/ClassLoadingStrategy
 
 load
  (Lnet/bytebuddy/dynamic/loading/InjectionClassLoader;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;)Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/Class<*>;>;
- (Lnet/bytebuddy/dynamic/loading/InjectionClassLoader;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;)Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/Class<*>;>;
+ (Lnet/bytebuddy/dynamic/loading/InjectionClassLoader;Ljava/util/Map<Lnet/bytebuddy/description/type/TypeDescription;[B>;)L1java/util/Map<Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/Class<*>;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/MultipleParentClassLoader.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/MultipleParentClassLoader.eea
index d281b57446..2be363189b 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/MultipleParentClassLoader.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/loading/MultipleParentClassLoader.eea
@@ -11,7 +11,7 @@ class net/bytebuddy/dynamic/loading/MultipleParentClassLoader
  (Ljava/util/List<+Ljava/lang/ClassLoader;>;)V
 doDefineClasses
  (Ljava/util/Map<Ljava/lang/String;[B>;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;
- (Ljava/util/Map<Ljava/lang/String;[B>;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;
+ (Ljava/util/Map<Ljava/lang/String;[B>;)L1java/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;
 getResource
  (Ljava/lang/String;)Ljava/net/URL;
  (L1java/lang/String;)L0java/net/URL; # @Inherited(java.lang.ClassLoader)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/ClassWriterStrategy$Default.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/ClassWriterStrategy$Default.eea
index 50e7478248..d195434efa 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/ClassWriterStrategy$Default.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/ClassWriterStrategy$Default.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 resolve
  (ILnet/bytebuddy/pool/TypePool;)Lnet/bytebuddy/jar/asm/ClassWriter;
- (ILnet/bytebuddy/pool/TypePool;)Lnet/bytebuddy/jar/asm/ClassWriter;
+ (ILnet/bytebuddy/pool/TypePool;)L1net/bytebuddy/jar/asm/ClassWriter;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/ClassWriterStrategy$Delegating.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/ClassWriterStrategy$Delegating.eea
index 62a3961bc9..a893372bdf 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/ClassWriterStrategy$Delegating.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/ClassWriterStrategy$Delegating.eea
@@ -11,7 +11,7 @@ make
  (I)Lnet/bytebuddy/utility/AsmClassWriter;
 make
  (ILnet/bytebuddy/pool/TypePool;)Lnet/bytebuddy/utility/AsmClassWriter;
- (ILnet/bytebuddy/pool/TypePool;)Lnet/bytebuddy/utility/AsmClassWriter;
+ (ILnet/bytebuddy/pool/TypePool;)L1net/bytebuddy/utility/AsmClassWriter;
 make
  (ILnet/bytebuddy/utility/AsmClassReader;)Lnet/bytebuddy/utility/AsmClassWriter;
  (ILnet/bytebuddy/utility/AsmClassReader;)Lnet/bytebuddy/utility/AsmClassWriter;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/FieldLocator$ForClassHierarchy$Factory.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/FieldLocator$ForClassHierarchy$Factory.eea
index 4ad3a1ffe2..634aaabff7 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/FieldLocator$ForClassHierarchy$Factory.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/FieldLocator$ForClassHierarchy$Factory.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 make
  (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/scaffold/FieldLocator;
- (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/scaffold/FieldLocator;
+ (Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/dynamic/scaffold/FieldLocator;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/FieldLocator$ForExactType$Factory.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/FieldLocator$ForExactType$Factory.eea
index ab5d477416..56aa6390fb 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/FieldLocator$ForExactType$Factory.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/FieldLocator$ForExactType$Factory.eea
@@ -8,4 +8,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 make
  (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/scaffold/FieldLocator;
- (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/scaffold/FieldLocator;
+ (Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/dynamic/scaffold/FieldLocator;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/FieldLocator$ForTopLevelType$Factory.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/FieldLocator$ForTopLevelType$Factory.eea
index 8ff01aacc8..bedfd049ba 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/FieldLocator$ForTopLevelType$Factory.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/FieldLocator$ForTopLevelType$Factory.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 make
  (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/scaffold/FieldLocator;
- (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/scaffold/FieldLocator;
+ (Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/dynamic/scaffold/FieldLocator;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/FieldLocator$Resolution$Illegal.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/FieldLocator$Resolution$Illegal.eea
index 0032c213f8..e14564b666 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/FieldLocator$Resolution$Illegal.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/FieldLocator$Resolution$Illegal.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 getField
  ()Lnet/bytebuddy/description/field/FieldDescription;
- ()Lnet/bytebuddy/description/field/FieldDescription;
+ ()L1net/bytebuddy/description/field/FieldDescription;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/FieldRegistry$Compiled$NoOp.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/FieldRegistry$Compiled$NoOp.eea
index 10d047d886..cbde11ba01 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/FieldRegistry$Compiled$NoOp.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/FieldRegistry$Compiled$NoOp.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 target
  (Lnet/bytebuddy/description/field/FieldDescription;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool$Record;
- (Lnet/bytebuddy/description/field/FieldDescription;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool$Record;
+ (Lnet/bytebuddy/description/field/FieldDescription;)L1net/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool$Record;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/FieldRegistry$Default.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/FieldRegistry$Default.eea
index 2b354128d5..00b7d6f472 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/FieldRegistry$Default.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/FieldRegistry$Default.eea
@@ -2,10 +2,10 @@ class net/bytebuddy/dynamic/scaffold/FieldRegistry$Default
 
 compile
  (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/scaffold/FieldRegistry$Compiled;
- (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/scaffold/FieldRegistry$Compiled;
+ (Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/dynamic/scaffold/FieldRegistry$Compiled;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 prepend
  (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/field/FieldDescription;>;Lnet/bytebuddy/implementation/attribute/FieldAttributeAppender$Factory;Ljava/lang/Object;Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/field/FieldDescription;>;)Lnet/bytebuddy/dynamic/scaffold/FieldRegistry;
- (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/field/FieldDescription;>;Lnet/bytebuddy/implementation/attribute/FieldAttributeAppender$Factory;Ljava/lang/Object;Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/field/FieldDescription;>;)Lnet/bytebuddy/dynamic/scaffold/FieldRegistry;
+ (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/field/FieldDescription;>;Lnet/bytebuddy/implementation/attribute/FieldAttributeAppender$Factory;Ljava/lang/Object;Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/field/FieldDescription;>;)L1net/bytebuddy/dynamic/scaffold/FieldRegistry;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/InstrumentedType$Default.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/InstrumentedType$Default.eea
index d78dc6197b..948c09c3b6 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/InstrumentedType$Default.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/InstrumentedType$Default.eea
@@ -12,16 +12,16 @@ of
  (Ljava/lang/String;ILnet/bytebuddy/description/type/TypeDescription$Generic;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeVariableToken;>;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;Ljava/util/List<+Lnet/bytebuddy/description/field/FieldDescription$Token;>;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Ljava/util/List<+Lnet/bytebuddy/description/method/MethodDescription$Token;>;Ljava/util/List<+Lnet/bytebuddy/description/type/RecordComponentDescription$Token;>;Ljava/util/List<+Lnet/bytebuddy/description/annotation/AnnotationDescription;>;Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;Lnet/bytebuddy/implementation/LoadedTypeInitializer;Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDescription;>;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDescription;>;ZZZLnet/bytebuddy/description/type/TypeDescription;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDescription;>;)V
 getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getDeclaredFields
  ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;
 getDeclaredMethods
  ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;>;
 getDeclaredTypes
  ()Lnet/bytebuddy/description/type/TypeList;
- ()Lnet/bytebuddy/description/type/TypeList;
+ ()L1net/bytebuddy/description/type/TypeList;
 getDeclaringType
  ()Lnet/bytebuddy/description/type/TypeDescription;
  ()L0net/bytebuddy/description/type/TypeDescription; # @Inherited(net.bytebuddy.description.type.TypeDescription)
@@ -33,7 +33,7 @@ getEnclosingType
  ()L0net/bytebuddy/description/type/TypeDescription; # @Inherited(net.bytebuddy.description.type.TypeDescription)
 getInterfaces
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getLoadedTypeInitializer
  ()Lnet/bytebuddy/implementation/LoadedTypeInitializer;
  ()Lnet/bytebuddy/implementation/LoadedTypeInitializer;
@@ -51,10 +51,10 @@ getPackage
  ()L0net/bytebuddy/description/type/PackageDescription; # @Inherited(net.bytebuddy.description.type.TypeDescription)
 getPermittedSubtypes
  ()Lnet/bytebuddy/description/type/TypeList;
- ()Lnet/bytebuddy/description/type/TypeList;
+ ()L1net/bytebuddy/description/type/TypeList;
 getRecordComponents
  ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;
 getSuperClass
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDefinition)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/InstrumentedType$Frozen.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/InstrumentedType$Frozen.eea
index 809650083d..1dbc61985a 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/InstrumentedType$Frozen.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/InstrumentedType$Frozen.eea
@@ -68,67 +68,67 @@ validated
  ()Lnet/bytebuddy/description/type/TypeDescription;
 withAnnotations
  (Ljava/util/List<+Lnet/bytebuddy/description/annotation/AnnotationDescription;>;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
- (Ljava/util/List<+Lnet/bytebuddy/description/annotation/AnnotationDescription;>;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
+ (Ljava/util/List<+Lnet/bytebuddy/description/annotation/AnnotationDescription;>;)L1net/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
 withAnonymousClass
  (Z)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
- (Z)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
+ (Z)L1net/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
 withAuxiliaryField
  (Lnet/bytebuddy/description/field/FieldDescription$Token;Ljava/lang/Object;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
- (Lnet/bytebuddy/description/field/FieldDescription$Token;Ljava/lang/Object;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
+ (Lnet/bytebuddy/description/field/FieldDescription$Token;Ljava/lang/Object;)L1net/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
 withDeclaredTypes
  (Lnet/bytebuddy/description/type/TypeList;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
- (Lnet/bytebuddy/description/type/TypeList;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
+ (Lnet/bytebuddy/description/type/TypeList;)L1net/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
 withDeclaringType
  (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
- (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
+ (Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
 withEnclosingMethod
  (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
- (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
+ (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)L1net/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
 withEnclosingType
  (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
- (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
+ (Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
 withField
  (Lnet/bytebuddy/description/field/FieldDescription$Token;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
- (Lnet/bytebuddy/description/field/FieldDescription$Token;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
+ (Lnet/bytebuddy/description/field/FieldDescription$Token;)L1net/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
 withInitializer
  (Lnet/bytebuddy/implementation/LoadedTypeInitializer;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
  (Lnet/bytebuddy/implementation/LoadedTypeInitializer;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
 withInitializer
  (Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
- (Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
+ (Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender;)L1net/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
 withInterfaces
  (Lnet/bytebuddy/description/type/TypeList$Generic;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
- (Lnet/bytebuddy/description/type/TypeList$Generic;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
+ (Lnet/bytebuddy/description/type/TypeList$Generic;)L1net/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
 withLocalClass
  (Z)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
- (Z)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
+ (Z)L1net/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
 withMethod
  (Lnet/bytebuddy/description/method/MethodDescription$Token;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
- (Lnet/bytebuddy/description/method/MethodDescription$Token;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
+ (Lnet/bytebuddy/description/method/MethodDescription$Token;)L1net/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
 withModifiers
  (I)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
- (I)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
+ (I)L1net/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
 withName
  (Ljava/lang/String;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
- (Ljava/lang/String;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
+ (Ljava/lang/String;)L1net/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
 withNestHost
  (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
- (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
+ (Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
 withNestMembers
  (Lnet/bytebuddy/description/type/TypeList;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
- (Lnet/bytebuddy/description/type/TypeList;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
+ (Lnet/bytebuddy/description/type/TypeList;)L1net/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
 withPermittedSubclasses
  (Lnet/bytebuddy/description/type/TypeList;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
- (Lnet/bytebuddy/description/type/TypeList;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
+ (Lnet/bytebuddy/description/type/TypeList;)L1net/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
 withRecord
  (Z)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
- (Z)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
+ (Z)L1net/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
 withRecordComponent
  (Lnet/bytebuddy/description/type/RecordComponentDescription$Token;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
- (Lnet/bytebuddy/description/type/RecordComponentDescription$Token;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
+ (Lnet/bytebuddy/description/type/RecordComponentDescription$Token;)L1net/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
 withTypeVariable
  (Lnet/bytebuddy/description/type/TypeVariableToken;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
- (Lnet/bytebuddy/description/type/TypeVariableToken;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
+ (Lnet/bytebuddy/description/type/TypeVariableToken;)L1net/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
 withTypeVariables
  (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/type/TypeVariableToken;>;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
- (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/type/TypeVariableToken;>;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
+ (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/type/TypeVariableToken;>;)L1net/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer$ForJVMMethod.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer$ForJVMMethod.eea
index 507a1247ce..7fa3cb346f 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer$ForJVMMethod.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer$ForJVMMethod.eea
@@ -9,4 +9,4 @@ super net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer
 
 harmonize
  (Lnet/bytebuddy/description/method/MethodDescription$TypeToken;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer$ForJVMMethod$Token;
- (Lnet/bytebuddy/description/method/MethodDescription$TypeToken;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer$ForJVMMethod$Token;
+ (Lnet/bytebuddy/description/method/MethodDescription$TypeToken;)L1net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer$ForJVMMethod$Token;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer$ForJavaMethod.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer$ForJavaMethod.eea
index 78c4c91888..41ba0d8069 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer$ForJavaMethod.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer$ForJavaMethod.eea
@@ -9,4 +9,4 @@ super net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer
 
 harmonize
  (Lnet/bytebuddy/description/method/MethodDescription$TypeToken;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer$ForJavaMethod$Token;
- (Lnet/bytebuddy/description/method/MethodDescription$TypeToken;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer$ForJavaMethod$Token;
+ (Lnet/bytebuddy/description/method/MethodDescription$TypeToken;)L1net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer$ForJavaMethod$Token;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Detached.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Detached.eea
index 47f27bba27..bdc6c6cd34 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Detached.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Detached.eea
@@ -6,7 +6,7 @@ super net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key
 
 of
  (Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Detached;
- (Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Detached;
+ (Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;)L1net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Detached;
 
 <init>
  (Ljava/lang/String;ILjava/util/Set<Lnet/bytebuddy/description/method/MethodDescription$TypeToken;>;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Harmonized.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Harmonized.eea
index 1e75b93292..33e6c7ac8c 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Harmonized.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Harmonized.eea
@@ -8,7 +8,7 @@ super net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key
 
 of
  <Q:Ljava/lang/Object;>(Lnet/bytebuddy/description/method/MethodDescription;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer<TQ;>;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Harmonized<TQ;>;
- <Q:Ljava/lang/Object;>(Lnet/bytebuddy/description/method/MethodDescription;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer<TQ;>;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Harmonized<TQ;>;
+ <Q:Ljava/lang/Object;>(Lnet/bytebuddy/description/method/MethodDescription;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer<TQ;>;)L1net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Harmonized<TQ;>;
 
 <init>
  (Ljava/lang/String;ILjava/util/Map<TV;Ljava/util/Set<Lnet/bytebuddy/description/method/MethodDescription$TypeToken;>;>;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Store$Entry$Initial.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Store$Entry$Initial.eea
index aa346c177a..7c88a18295 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Store$Entry$Initial.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Store$Entry$Initial.eea
@@ -11,7 +11,7 @@ super net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Store$Entr
  (Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Harmonized<TU;>;)V
 asNode
  (Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Merger;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Node;
- (Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Merger;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Node;
+ (Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Merger;)L1net/bytebuddy/dynamic/scaffold/MethodGraph$Node;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -20,13 +20,13 @@ extendBy
  (Lnet/bytebuddy/description/method/MethodDescription;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer<TU;>;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Store$Entry<TU;>;
 getCandidates
  ()Ljava/util/Set<Lnet/bytebuddy/description/method/MethodDescription;>;
- ()Ljava/util/Set<Lnet/bytebuddy/description/method/MethodDescription;>;
+ ()L1java/util/Set<Lnet/bytebuddy/description/method/MethodDescription;>;
 getKey
  ()Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Harmonized<TU;>;
- ()Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Harmonized<TU;>;
+ ()L1net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Harmonized<TU;>;
 getVisibility
  ()Lnet/bytebuddy/description/modifier/Visibility;
- ()Lnet/bytebuddy/description/modifier/Visibility;
+ ()L1net/bytebuddy/description/modifier/Visibility;
 inject
  (Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Store$Entry<TU;>;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Store$Entry<TU;>;
- (Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Store$Entry<TU;>;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Store$Entry<TU;>;
+ (Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Store$Entry<TU;>;)L1net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Store$Entry<TU;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Store$Graph.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Store$Graph.eea
index e3d2036dda..e1d353d9db 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Store$Graph.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Store$Graph.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 listNodes
  ()Lnet/bytebuddy/dynamic/scaffold/MethodGraph$NodeList;
- ()Lnet/bytebuddy/dynamic/scaffold/MethodGraph$NodeList;
+ ()L1net/bytebuddy/dynamic/scaffold/MethodGraph$NodeList;
 locate
  (Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Node;
  (Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Node;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Store.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Store.eea
index c1c89eae65..57c3c4c982 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Store.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Store.eea
@@ -4,7 +4,7 @@ class net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Store
 
 asGraph
  (Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Merger;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph;
- (Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Merger;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph;
+ (Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Merger;)L1net/bytebuddy/dynamic/scaffold/MethodGraph;
 combineWith
  (Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Store<TV;>;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Store<TV;>;
  (Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Store<TV;>;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Key$Store<TV;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default.eea
index 9f1010de0e..3e37749715 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default.eea
@@ -10,13 +10,13 @@ forJavaHierarchy
  ()Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler;
 of
  <S:Ljava/lang/Object;>(Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer<TS;>;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Merger;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler;
- <S:Ljava/lang/Object;>(Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer<TS;>;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Merger;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler;
+ <S:Ljava/lang/Object;>(Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer<TS;>;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Merger;)L1net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler;
 of
  <S:Ljava/lang/Object;>(Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer<TS;>;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Merger;Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler;
- <S:Ljava/lang/Object;>(Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer<TS;>;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Merger;Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler;
+ <S:Ljava/lang/Object;>(Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer<TS;>;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Merger;Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)L1net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler;
 of
  <S:Ljava/lang/Object;>(Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer<TS;>;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Merger;Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler;
- <S:Ljava/lang/Object;>(Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer<TS;>;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Merger;Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler;
+ <S:Ljava/lang/Object;>(Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer<TS;>;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Merger;Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;)L1net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler;
 
 <init>
  (Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Harmonizer<TT;>;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$Default$Merger;Lnet/bytebuddy/description/type/TypeDescription$Generic$Visitor<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$ForDeclaredMethods.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$ForDeclaredMethods.eea
index 9f4bf0ff22..3a34a127f2 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$ForDeclaredMethods.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Compiler$ForDeclaredMethods.eea
@@ -9,7 +9,7 @@ compile
  (Lnet/bytebuddy/description/type/TypeDefinition;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Linked;
 compile
  (Lnet/bytebuddy/description/type/TypeDefinition;Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Linked;
- (Lnet/bytebuddy/description/type/TypeDefinition;Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Linked;
+ (Lnet/bytebuddy/description/type/TypeDefinition;Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/dynamic/scaffold/MethodGraph$Linked;
 compile
  (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Linked;
  (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Linked;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Empty.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Empty.eea
index 8fa6c35fbc..dade709fba 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Empty.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Empty.eea
@@ -24,7 +24,7 @@ getSuperClassGraph
  ()Lnet/bytebuddy/dynamic/scaffold/MethodGraph;
 listNodes
  ()Lnet/bytebuddy/dynamic/scaffold/MethodGraph$NodeList;
- ()Lnet/bytebuddy/dynamic/scaffold/MethodGraph$NodeList;
+ ()L1net/bytebuddy/dynamic/scaffold/MethodGraph$NodeList;
 locate
  (Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Node;
  (Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Node;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Node$Unresolved.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Node$Unresolved.eea
index c768d1b317..c2b133a78c 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Node$Unresolved.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Node$Unresolved.eea
@@ -6,13 +6,13 @@ super java/lang/Enum
 
 getMethodTypes
  ()Ljava/util/Set<Lnet/bytebuddy/description/method/MethodDescription$TypeToken;>;
- ()Ljava/util/Set<Lnet/bytebuddy/description/method/MethodDescription$TypeToken;>;
+ ()L1java/util/Set<Lnet/bytebuddy/description/method/MethodDescription$TypeToken;>;
 getRepresentative
  ()Lnet/bytebuddy/description/method/MethodDescription;
- ()Lnet/bytebuddy/description/method/MethodDescription;
+ ()L1net/bytebuddy/description/method/MethodDescription;
 getSort
  ()Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Node$Sort;
  ()Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Node$Sort;
 getVisibility
  ()Lnet/bytebuddy/description/modifier/Visibility;
- ()Lnet/bytebuddy/description/modifier/Visibility;
+ ()L1net/bytebuddy/description/modifier/Visibility;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$NodeList.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$NodeList.eea
index 94b064f3f1..d606b2dc64 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$NodeList.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$NodeList.eea
@@ -9,10 +9,10 @@ super net/bytebuddy/matcher/FilterableList$AbstractBase
  (Ljava/util/List<+Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Node;>;)V
 asMethodList
  ()Lnet/bytebuddy/description/method/MethodList<*>;
- ()Lnet/bytebuddy/description/method/MethodList<*>;
+ ()L1net/bytebuddy/description/method/MethodList<*>;
 get
  (I)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Node;
  (I)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Node;
 wrap
  (Ljava/util/List<Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Node;>;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$NodeList;
- (Ljava/util/List<Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Node;>;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$NodeList;
+ (Ljava/util/List<Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Node;>;)L1net/bytebuddy/dynamic/scaffold/MethodGraph$NodeList;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Simple.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Simple.eea
index 32f1d8f7b5..5e4af427a5 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Simple.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodGraph$Simple.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/dynamic/scaffold/MethodGraph$Simple
 
 of
  (Ljava/util/List<+Lnet/bytebuddy/description/method/MethodDescription;>;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph;
- (Ljava/util/List<+Lnet/bytebuddy/description/method/MethodDescription;>;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph;
+ (Ljava/util/List<+Lnet/bytebuddy/description/method/MethodDescription;>;)L1net/bytebuddy/dynamic/scaffold/MethodGraph;
 
 <init>
  (Ljava/util/LinkedHashMap<Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Node;>;)V
@@ -12,7 +12,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 listNodes
  ()Lnet/bytebuddy/dynamic/scaffold/MethodGraph$NodeList;
- ()Lnet/bytebuddy/dynamic/scaffold/MethodGraph$NodeList;
+ ()L1net/bytebuddy/dynamic/scaffold/MethodGraph$NodeList;
 locate
  (Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Node;
  (Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;)Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Node;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Default$Prepared$Entry.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Default$Prepared$Entry.eea
index 9b2d56b626..56dec61b58 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Default$Prepared$Entry.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Default$Prepared$Entry.eea
@@ -24,4 +24,4 @@ getVisibility
  ()Lnet/bytebuddy/description/modifier/Visibility;
 resolveBridgeTypes
  ()Ljava/util/Set<Lnet/bytebuddy/description/method/MethodDescription$TypeToken;>;
- ()Ljava/util/Set<Lnet/bytebuddy/description/method/MethodDescription$TypeToken;>;
+ ()L1java/util/Set<Lnet/bytebuddy/description/method/MethodDescription$TypeToken;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Default.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Default.eea
index 1a5c648fa3..53eb290b1c 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Default.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Default.eea
@@ -2,13 +2,13 @@ class net/bytebuddy/dynamic/scaffold/MethodRegistry$Default
 
 append
  (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Handler;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender$Factory;Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/method/MethodDescription;>;)Lnet/bytebuddy/dynamic/scaffold/MethodRegistry;
- (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Handler;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender$Factory;Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/method/MethodDescription;>;)Lnet/bytebuddy/dynamic/scaffold/MethodRegistry;
+ (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Handler;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender$Factory;Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/method/MethodDescription;>;)L1net/bytebuddy/dynamic/scaffold/MethodRegistry;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 prepare
  (Lnet/bytebuddy/dynamic/scaffold/InstrumentedType;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler;Lnet/bytebuddy/dynamic/scaffold/TypeValidation;Lnet/bytebuddy/dynamic/VisibilityBridgeStrategy;Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;)Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Prepared;
- (Lnet/bytebuddy/dynamic/scaffold/InstrumentedType;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler;Lnet/bytebuddy/dynamic/scaffold/TypeValidation;Lnet/bytebuddy/dynamic/VisibilityBridgeStrategy;Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;)Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Prepared;
+ (Lnet/bytebuddy/dynamic/scaffold/InstrumentedType;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler;Lnet/bytebuddy/dynamic/scaffold/TypeValidation;Lnet/bytebuddy/dynamic/VisibilityBridgeStrategy;Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;)L1net/bytebuddy/dynamic/scaffold/MethodRegistry$Prepared;
 prepend
  (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Handler;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender$Factory;Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/method/MethodDescription;>;)Lnet/bytebuddy/dynamic/scaffold/MethodRegistry;
- (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Handler;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender$Factory;Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/method/MethodDescription;>;)Lnet/bytebuddy/dynamic/scaffold/MethodRegistry;
+ (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Handler;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender$Factory;Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/method/MethodDescription;>;)L1net/bytebuddy/dynamic/scaffold/MethodRegistry;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForAbstractMethod.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForAbstractMethod.eea
index 512e53f24a..068f8d9c41 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForAbstractMethod.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForAbstractMethod.eea
@@ -6,7 +6,7 @@ super java/lang/Enum
 
 assemble
  (Lnet/bytebuddy/description/method/MethodDescription;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender;Lnet/bytebuddy/description/modifier/Visibility;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;
- (Lnet/bytebuddy/description/method/MethodDescription;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender;Lnet/bytebuddy/description/modifier/Visibility;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;
+ (Lnet/bytebuddy/description/method/MethodDescription;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender;Lnet/bytebuddy/description/modifier/Visibility;)L1net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;
 compile
  (Lnet/bytebuddy/implementation/Implementation$Target;)Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$Compiled;
  (Lnet/bytebuddy/implementation/Implementation$Target;)Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$Compiled;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForAnnotationValue.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForAnnotationValue.eea
index e2a8aa6d38..4679ab97ba 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForAnnotationValue.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForAnnotationValue.eea
@@ -5,7 +5,7 @@ class net/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForAnnotationValue
  (Lnet/bytebuddy/description/annotation/AnnotationValue<**>;)V
 assemble
  (Lnet/bytebuddy/description/method/MethodDescription;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender;Lnet/bytebuddy/description/modifier/Visibility;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;
- (Lnet/bytebuddy/description/method/MethodDescription;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender;Lnet/bytebuddy/description/modifier/Visibility;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;
+ (Lnet/bytebuddy/description/method/MethodDescription;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender;Lnet/bytebuddy/description/modifier/Visibility;)L1net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;
 compile
  (Lnet/bytebuddy/implementation/Implementation$Target;)Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$Compiled;
  (Lnet/bytebuddy/implementation/Implementation$Target;)Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$Compiled;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForImplementation$Compiled.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForImplementation$Compiled.eea
index 7fcc5debd8..363ce34c5b 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForImplementation$Compiled.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForImplementation$Compiled.eea
@@ -5,7 +5,7 @@ class net/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForImplementation$Co
  (Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender;)V
 assemble
  (Lnet/bytebuddy/description/method/MethodDescription;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender;Lnet/bytebuddy/description/modifier/Visibility;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;
- (Lnet/bytebuddy/description/method/MethodDescription;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender;Lnet/bytebuddy/description/modifier/Visibility;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;
+ (Lnet/bytebuddy/description/method/MethodDescription;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender;Lnet/bytebuddy/description/modifier/Visibility;)L1net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForImplementation.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForImplementation.eea
index e20c8f819e..e9aa263693 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForImplementation.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForImplementation.eea
@@ -5,7 +5,7 @@ class net/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForImplementation
  (Lnet/bytebuddy/implementation/Implementation;)V
 compile
  (Lnet/bytebuddy/implementation/Implementation$Target;)Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForImplementation$Compiled;
- (Lnet/bytebuddy/implementation/Implementation$Target;)Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForImplementation$Compiled;
+ (Lnet/bytebuddy/implementation/Implementation$Target;)L1net/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForImplementation$Compiled;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForVisibilityBridge.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForVisibilityBridge.eea
index 2388c2e023..032f08bf77 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForVisibilityBridge.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForVisibilityBridge.eea
@@ -6,7 +6,7 @@ super java/lang/Enum
 
 compile
  (Lnet/bytebuddy/implementation/Implementation$Target;)Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForVisibilityBridge$Compiled;
- (Lnet/bytebuddy/implementation/Implementation$Target;)Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForVisibilityBridge$Compiled;
+ (Lnet/bytebuddy/implementation/Implementation$Target;)L1net/bytebuddy/dynamic/scaffold/MethodRegistry$Handler$ForVisibilityBridge$Compiled;
 prepare
  (Lnet/bytebuddy/dynamic/scaffold/InstrumentedType;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType;
- (Lnet/bytebuddy/dynamic/scaffold/InstrumentedType;)Lnet/bytebuddy/dynamic/scaffold/InstrumentedType;
+ (Lnet/bytebuddy/dynamic/scaffold/InstrumentedType;)L1net/bytebuddy/dynamic/scaffold/InstrumentedType;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/RecordComponentRegistry$Compiled$NoOp.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/RecordComponentRegistry$Compiled$NoOp.eea
index 144eba2f2e..af2fd8bdb0 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/RecordComponentRegistry$Compiled$NoOp.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/RecordComponentRegistry$Compiled$NoOp.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 target
  (Lnet/bytebuddy/description/type/RecordComponentDescription;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool$Record;
- (Lnet/bytebuddy/description/type/RecordComponentDescription;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool$Record;
+ (Lnet/bytebuddy/description/type/RecordComponentDescription;)L1net/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool$Record;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/RecordComponentRegistry$Default.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/RecordComponentRegistry$Default.eea
index 2f508eccf9..7468fad547 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/RecordComponentRegistry$Default.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/RecordComponentRegistry$Default.eea
@@ -2,10 +2,10 @@ class net/bytebuddy/dynamic/scaffold/RecordComponentRegistry$Default
 
 compile
  (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/scaffold/RecordComponentRegistry$Compiled;
- (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/scaffold/RecordComponentRegistry$Compiled;
+ (Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/dynamic/scaffold/RecordComponentRegistry$Compiled;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 prepend
  (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/type/RecordComponentDescription;>;Lnet/bytebuddy/implementation/attribute/RecordComponentAttributeAppender$Factory;Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/type/RecordComponentDescription;>;)Lnet/bytebuddy/dynamic/scaffold/RecordComponentRegistry;
- (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/type/RecordComponentDescription;>;Lnet/bytebuddy/implementation/attribute/RecordComponentAttributeAppender$Factory;Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/type/RecordComponentDescription;>;)Lnet/bytebuddy/dynamic/scaffold/RecordComponentRegistry;
+ (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/type/RecordComponentDescription;>;Lnet/bytebuddy/implementation/attribute/RecordComponentAttributeAppender$Factory;Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/type/RecordComponentDescription;>;)L1net/bytebuddy/dynamic/scaffold/RecordComponentRegistry;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeInitializer$None.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeInitializer$None.eea
index cce5a634e4..123a33da11 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeInitializer$None.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeInitializer$None.eea
@@ -9,7 +9,7 @@ apply
  (Lnet/bytebuddy/jar/asm/MethodVisitor;Lnet/bytebuddy/implementation/Implementation$Context;Lnet/bytebuddy/description/method/MethodDescription;)Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender$Size;
 expandWith
  (Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender;)Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;
- (Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender;)Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;
+ (Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender;)L1net/bytebuddy/dynamic/scaffold/TypeInitializer;
 wrap
  (Lnet/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;
  (Lnet/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$Default$ForCreation.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$Default$ForCreation.eea
index ddd11f8057..8e9171a93d 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$Default$ForCreation.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$Default$ForCreation.eea
@@ -11,7 +11,7 @@ super net/bytebuddy/dynamic/scaffold/TypeWriter$Default
  (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool;Ljava/util/List<+Lnet/bytebuddy/dynamic/DynamicType;>;Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;Lnet/bytebuddy/description/method/MethodList<*>;Lnet/bytebuddy/description/method/MethodList<*>;Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;Lnet/bytebuddy/implementation/LoadedTypeInitializer;Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;Lnet/bytebuddy/implementation/attribute/TypeAttributeAppender;Lnet/bytebuddy/asm/AsmVisitorWrapper;Lnet/bytebuddy/implementation/attribute/AnnotationValueFilter$Factory;Lnet/bytebuddy/implementation/attribute/AnnotationRetention;Lnet/bytebuddy/implementation/auxiliary/AuxiliaryType$NamingStrategy;Lnet/bytebuddy/implementation/Implementation$Context$Factory;Lnet/bytebuddy/dynamic/scaffold/TypeValidation;Lnet/bytebuddy/utility/AsmClassReader$Factory;Lnet/bytebuddy/utility/AsmClassWriter$Factory;Lnet/bytebuddy/pool/TypePool;)V
 create
  (Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$Default$ClassDumpAction$Dispatcher;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$Default<TU;>.UnresolvedType;
- (Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$Default$ClassDumpAction$Dispatcher;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$Default<TU;>.UnresolvedType;
+ (Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$Default$ClassDumpAction$Dispatcher;)L1net/bytebuddy/dynamic/scaffold/TypeWriter$Default<TU;>.UnresolvedType;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(net.bytebuddy.dynamic.scaffold.TypeWriter$Default)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$Default$ForInlining$WithDecorationOnly.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$Default$ForInlining$WithDecorationOnly.eea
index 961900aec2..087942d8f6 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$Default$ForInlining$WithDecorationOnly.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$Default$ForInlining$WithDecorationOnly.eea
@@ -11,4 +11,4 @@ super net/bytebuddy/dynamic/scaffold/TypeWriter$Default$ForInlining
  (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/ClassFileVersion;Ljava/util/List<+Lnet/bytebuddy/dynamic/DynamicType;>;Lnet/bytebuddy/description/method/MethodList<*>;Lnet/bytebuddy/implementation/attribute/TypeAttributeAppender;Lnet/bytebuddy/asm/AsmVisitorWrapper;Lnet/bytebuddy/implementation/attribute/AnnotationValueFilter$Factory;Lnet/bytebuddy/implementation/attribute/AnnotationRetention;Lnet/bytebuddy/implementation/auxiliary/AuxiliaryType$NamingStrategy;Lnet/bytebuddy/implementation/Implementation$Context$Factory;Lnet/bytebuddy/dynamic/scaffold/TypeValidation;Lnet/bytebuddy/utility/AsmClassReader$Factory;Lnet/bytebuddy/utility/AsmClassWriter$Factory;Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/dynamic/ClassFileLocator;)V
 writeTo
  (Lnet/bytebuddy/jar/asm/ClassVisitor;Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$Default$ForInlining$ContextRegistry;II)Lnet/bytebuddy/jar/asm/ClassVisitor;
- (Lnet/bytebuddy/jar/asm/ClassVisitor;Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$Default$ForInlining$ContextRegistry;II)Lnet/bytebuddy/jar/asm/ClassVisitor;
+ (Lnet/bytebuddy/jar/asm/ClassVisitor;Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$Default$ForInlining$ContextRegistry;II)L1net/bytebuddy/jar/asm/ClassVisitor;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$Default$ForInlining$WithFullProcessing.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$Default$ForInlining$WithFullProcessing.eea
index cdc2a91e7d..a783c60022 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$Default$ForInlining$WithFullProcessing.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$Default$ForInlining$WithFullProcessing.eea
@@ -14,4 +14,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(net.bytebuddy.dynamic.scaffold.TypeWriter$Default$ForInlining)
 writeTo
  (Lnet/bytebuddy/jar/asm/ClassVisitor;Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$Default$ForInlining$ContextRegistry;II)Lnet/bytebuddy/jar/asm/ClassVisitor;
- (Lnet/bytebuddy/jar/asm/ClassVisitor;Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$Default$ForInlining$ContextRegistry;II)Lnet/bytebuddy/jar/asm/ClassVisitor;
+ (Lnet/bytebuddy/jar/asm/ClassVisitor;Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$Default$ForInlining$ContextRegistry;II)L1net/bytebuddy/jar/asm/ClassVisitor;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$Default$ForInlining.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$Default$ForInlining.eea
index ad46a1d3d8..2866a591fa 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$Default$ForInlining.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$Default$ForInlining.eea
@@ -18,7 +18,7 @@ originalType
  (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool;Ljava/util/List<+Lnet/bytebuddy/dynamic/DynamicType;>;Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;Lnet/bytebuddy/description/method/MethodList<*>;Lnet/bytebuddy/description/method/MethodList<*>;Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;Lnet/bytebuddy/implementation/LoadedTypeInitializer;Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;Lnet/bytebuddy/implementation/attribute/TypeAttributeAppender;Lnet/bytebuddy/asm/AsmVisitorWrapper;Lnet/bytebuddy/implementation/attribute/AnnotationValueFilter$Factory;Lnet/bytebuddy/implementation/attribute/AnnotationRetention;Lnet/bytebuddy/implementation/auxiliary/AuxiliaryType$NamingStrategy;Lnet/bytebuddy/implementation/Implementation$Context$Factory;Lnet/bytebuddy/dynamic/scaffold/TypeValidation;Lnet/bytebuddy/utility/AsmClassReader$Factory;Lnet/bytebuddy/utility/AsmClassWriter$Factory;Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/dynamic/ClassFileLocator;)V
 create
  (Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$Default$ClassDumpAction$Dispatcher;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$Default<TU;>.UnresolvedType;
- (Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$Default$ClassDumpAction$Dispatcher;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$Default<TU;>.UnresolvedType;
+ (Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$Default$ClassDumpAction$Dispatcher;)L1net/bytebuddy/dynamic/scaffold/TypeWriter$Default<TU;>.UnresolvedType;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(net.bytebuddy.dynamic.scaffold.TypeWriter$Default)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$Default.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$Default.eea
index ce3c7def8b..8cfaebfe92 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$Default.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$Default.eea
@@ -12,16 +12,16 @@ DUMP_FOLDER
 
 forCreation
  <U:Ljava/lang/Object;>(Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Compiled;Ljava/util/List<+Lnet/bytebuddy/dynamic/DynamicType;>;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool;Lnet/bytebuddy/implementation/attribute/TypeAttributeAppender;Lnet/bytebuddy/asm/AsmVisitorWrapper;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/implementation/attribute/AnnotationValueFilter$Factory;Lnet/bytebuddy/implementation/attribute/AnnotationRetention;Lnet/bytebuddy/implementation/auxiliary/AuxiliaryType$NamingStrategy;Lnet/bytebuddy/implementation/Implementation$Context$Factory;Lnet/bytebuddy/dynamic/scaffold/TypeValidation;Lnet/bytebuddy/utility/AsmClassReader$Factory;Lnet/bytebuddy/utility/AsmClassWriter$Factory;Lnet/bytebuddy/pool/TypePool;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter<TU;>;
- <U:Ljava/lang/Object;>(Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Compiled;Ljava/util/List<+Lnet/bytebuddy/dynamic/DynamicType;>;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool;Lnet/bytebuddy/implementation/attribute/TypeAttributeAppender;Lnet/bytebuddy/asm/AsmVisitorWrapper;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/implementation/attribute/AnnotationValueFilter$Factory;Lnet/bytebuddy/implementation/attribute/AnnotationRetention;Lnet/bytebuddy/implementation/auxiliary/AuxiliaryType$NamingStrategy;Lnet/bytebuddy/implementation/Implementation$Context$Factory;Lnet/bytebuddy/dynamic/scaffold/TypeValidation;Lnet/bytebuddy/utility/AsmClassReader$Factory;Lnet/bytebuddy/utility/AsmClassWriter$Factory;Lnet/bytebuddy/pool/TypePool;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter<TU;>;
+ <U:Ljava/lang/Object;>(Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Compiled;Ljava/util/List<+Lnet/bytebuddy/dynamic/DynamicType;>;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool;Lnet/bytebuddy/implementation/attribute/TypeAttributeAppender;Lnet/bytebuddy/asm/AsmVisitorWrapper;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/implementation/attribute/AnnotationValueFilter$Factory;Lnet/bytebuddy/implementation/attribute/AnnotationRetention;Lnet/bytebuddy/implementation/auxiliary/AuxiliaryType$NamingStrategy;Lnet/bytebuddy/implementation/Implementation$Context$Factory;Lnet/bytebuddy/dynamic/scaffold/TypeValidation;Lnet/bytebuddy/utility/AsmClassReader$Factory;Lnet/bytebuddy/utility/AsmClassWriter$Factory;Lnet/bytebuddy/pool/TypePool;)L1net/bytebuddy/dynamic/scaffold/TypeWriter<TU;>;
 forDecoration
  <U:Ljava/lang/Object;>(Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/ClassFileVersion;Ljava/util/List<+Lnet/bytebuddy/dynamic/DynamicType;>;Ljava/util/List<+Lnet/bytebuddy/description/method/MethodDescription;>;Lnet/bytebuddy/implementation/attribute/TypeAttributeAppender;Lnet/bytebuddy/asm/AsmVisitorWrapper;Lnet/bytebuddy/implementation/attribute/AnnotationValueFilter$Factory;Lnet/bytebuddy/implementation/attribute/AnnotationRetention;Lnet/bytebuddy/implementation/auxiliary/AuxiliaryType$NamingStrategy;Lnet/bytebuddy/implementation/Implementation$Context$Factory;Lnet/bytebuddy/dynamic/scaffold/TypeValidation;Lnet/bytebuddy/utility/AsmClassReader$Factory;Lnet/bytebuddy/utility/AsmClassWriter$Factory;Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/dynamic/ClassFileLocator;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter<TU;>;
- <U:Ljava/lang/Object;>(Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/ClassFileVersion;Ljava/util/List<+Lnet/bytebuddy/dynamic/DynamicType;>;Ljava/util/List<+Lnet/bytebuddy/description/method/MethodDescription;>;Lnet/bytebuddy/implementation/attribute/TypeAttributeAppender;Lnet/bytebuddy/asm/AsmVisitorWrapper;Lnet/bytebuddy/implementation/attribute/AnnotationValueFilter$Factory;Lnet/bytebuddy/implementation/attribute/AnnotationRetention;Lnet/bytebuddy/implementation/auxiliary/AuxiliaryType$NamingStrategy;Lnet/bytebuddy/implementation/Implementation$Context$Factory;Lnet/bytebuddy/dynamic/scaffold/TypeValidation;Lnet/bytebuddy/utility/AsmClassReader$Factory;Lnet/bytebuddy/utility/AsmClassWriter$Factory;Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/dynamic/ClassFileLocator;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter<TU;>;
+ <U:Ljava/lang/Object;>(Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/ClassFileVersion;Ljava/util/List<+Lnet/bytebuddy/dynamic/DynamicType;>;Ljava/util/List<+Lnet/bytebuddy/description/method/MethodDescription;>;Lnet/bytebuddy/implementation/attribute/TypeAttributeAppender;Lnet/bytebuddy/asm/AsmVisitorWrapper;Lnet/bytebuddy/implementation/attribute/AnnotationValueFilter$Factory;Lnet/bytebuddy/implementation/attribute/AnnotationRetention;Lnet/bytebuddy/implementation/auxiliary/AuxiliaryType$NamingStrategy;Lnet/bytebuddy/implementation/Implementation$Context$Factory;Lnet/bytebuddy/dynamic/scaffold/TypeValidation;Lnet/bytebuddy/utility/AsmClassReader$Factory;Lnet/bytebuddy/utility/AsmClassWriter$Factory;Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/dynamic/ClassFileLocator;)L1net/bytebuddy/dynamic/scaffold/TypeWriter<TU;>;
 forRebasing
  <U:Ljava/lang/Object;>(Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Prepared;Ljava/util/List<+Lnet/bytebuddy/dynamic/DynamicType;>;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool;Lnet/bytebuddy/implementation/attribute/TypeAttributeAppender;Lnet/bytebuddy/asm/AsmVisitorWrapper;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/implementation/attribute/AnnotationValueFilter$Factory;Lnet/bytebuddy/implementation/attribute/AnnotationRetention;Lnet/bytebuddy/implementation/auxiliary/AuxiliaryType$NamingStrategy;Lnet/bytebuddy/implementation/Implementation$Context$Factory;Lnet/bytebuddy/dynamic/scaffold/TypeValidation;Lnet/bytebuddy/utility/AsmClassReader$Factory;Lnet/bytebuddy/utility/AsmClassWriter$Factory;Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/dynamic/ClassFileLocator;Lnet/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter<TU;>;
- <U:Ljava/lang/Object;>(Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Prepared;Ljava/util/List<+Lnet/bytebuddy/dynamic/DynamicType;>;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool;Lnet/bytebuddy/implementation/attribute/TypeAttributeAppender;Lnet/bytebuddy/asm/AsmVisitorWrapper;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/implementation/attribute/AnnotationValueFilter$Factory;Lnet/bytebuddy/implementation/attribute/AnnotationRetention;Lnet/bytebuddy/implementation/auxiliary/AuxiliaryType$NamingStrategy;Lnet/bytebuddy/implementation/Implementation$Context$Factory;Lnet/bytebuddy/dynamic/scaffold/TypeValidation;Lnet/bytebuddy/utility/AsmClassReader$Factory;Lnet/bytebuddy/utility/AsmClassWriter$Factory;Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/dynamic/ClassFileLocator;Lnet/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter<TU;>;
+ <U:Ljava/lang/Object;>(Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Prepared;Ljava/util/List<+Lnet/bytebuddy/dynamic/DynamicType;>;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool;Lnet/bytebuddy/implementation/attribute/TypeAttributeAppender;Lnet/bytebuddy/asm/AsmVisitorWrapper;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/implementation/attribute/AnnotationValueFilter$Factory;Lnet/bytebuddy/implementation/attribute/AnnotationRetention;Lnet/bytebuddy/implementation/auxiliary/AuxiliaryType$NamingStrategy;Lnet/bytebuddy/implementation/Implementation$Context$Factory;Lnet/bytebuddy/dynamic/scaffold/TypeValidation;Lnet/bytebuddy/utility/AsmClassReader$Factory;Lnet/bytebuddy/utility/AsmClassWriter$Factory;Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/dynamic/ClassFileLocator;Lnet/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver;)L1net/bytebuddy/dynamic/scaffold/TypeWriter<TU;>;
 forRedefinition
  <U:Ljava/lang/Object;>(Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Prepared;Ljava/util/List<+Lnet/bytebuddy/dynamic/DynamicType;>;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool;Lnet/bytebuddy/implementation/attribute/TypeAttributeAppender;Lnet/bytebuddy/asm/AsmVisitorWrapper;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/implementation/attribute/AnnotationValueFilter$Factory;Lnet/bytebuddy/implementation/attribute/AnnotationRetention;Lnet/bytebuddy/implementation/auxiliary/AuxiliaryType$NamingStrategy;Lnet/bytebuddy/implementation/Implementation$Context$Factory;Lnet/bytebuddy/dynamic/scaffold/TypeValidation;Lnet/bytebuddy/utility/AsmClassReader$Factory;Lnet/bytebuddy/utility/AsmClassWriter$Factory;Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/dynamic/ClassFileLocator;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter<TU;>;
- <U:Ljava/lang/Object;>(Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Prepared;Ljava/util/List<+Lnet/bytebuddy/dynamic/DynamicType;>;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool;Lnet/bytebuddy/implementation/attribute/TypeAttributeAppender;Lnet/bytebuddy/asm/AsmVisitorWrapper;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/implementation/attribute/AnnotationValueFilter$Factory;Lnet/bytebuddy/implementation/attribute/AnnotationRetention;Lnet/bytebuddy/implementation/auxiliary/AuxiliaryType$NamingStrategy;Lnet/bytebuddy/implementation/Implementation$Context$Factory;Lnet/bytebuddy/dynamic/scaffold/TypeValidation;Lnet/bytebuddy/utility/AsmClassReader$Factory;Lnet/bytebuddy/utility/AsmClassWriter$Factory;Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/dynamic/ClassFileLocator;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter<TU;>;
+ <U:Ljava/lang/Object;>(Lnet/bytebuddy/dynamic/scaffold/MethodRegistry$Prepared;Ljava/util/List<+Lnet/bytebuddy/dynamic/DynamicType;>;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool;Lnet/bytebuddy/implementation/attribute/TypeAttributeAppender;Lnet/bytebuddy/asm/AsmVisitorWrapper;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/implementation/attribute/AnnotationValueFilter$Factory;Lnet/bytebuddy/implementation/attribute/AnnotationRetention;Lnet/bytebuddy/implementation/auxiliary/AuxiliaryType$NamingStrategy;Lnet/bytebuddy/implementation/Implementation$Context$Factory;Lnet/bytebuddy/dynamic/scaffold/TypeValidation;Lnet/bytebuddy/utility/AsmClassReader$Factory;Lnet/bytebuddy/utility/AsmClassWriter$Factory;Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/dynamic/ClassFileLocator;)L1net/bytebuddy/dynamic/scaffold/TypeWriter<TU;>;
 
 annotationRetention
  Lnet/bytebuddy/implementation/attribute/AnnotationRetention;
@@ -92,7 +92,7 @@ typeValidation
  (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool;Ljava/util/List<+Lnet/bytebuddy/dynamic/DynamicType;>;Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;Lnet/bytebuddy/description/method/MethodList<*>;Lnet/bytebuddy/description/method/MethodList<*>;Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;Lnet/bytebuddy/implementation/LoadedTypeInitializer;Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;Lnet/bytebuddy/implementation/attribute/TypeAttributeAppender;Lnet/bytebuddy/asm/AsmVisitorWrapper;Lnet/bytebuddy/implementation/attribute/AnnotationValueFilter$Factory;Lnet/bytebuddy/implementation/attribute/AnnotationRetention;Lnet/bytebuddy/implementation/auxiliary/AuxiliaryType$NamingStrategy;Lnet/bytebuddy/implementation/Implementation$Context$Factory;Lnet/bytebuddy/dynamic/scaffold/TypeValidation;Lnet/bytebuddy/utility/AsmClassReader$Factory;Lnet/bytebuddy/utility/AsmClassWriter$Factory;Lnet/bytebuddy/pool/TypePool;)V
 create
  (Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$Default$ClassDumpAction$Dispatcher;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$Default<TS;>.UnresolvedType;
- (Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$Default$ClassDumpAction$Dispatcher;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$Default<TS;>.UnresolvedType;
+ (Lnet/bytebuddy/dynamic/scaffold/TypeInitializer;Lnet/bytebuddy/dynamic/scaffold/TypeWriter$Default$ClassDumpAction$Dispatcher;)L1net/bytebuddy/dynamic/scaffold/TypeWriter$Default<TS;>.UnresolvedType;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool$Disabled.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool$Disabled.eea
index a2bd15503e..b9a5cf0d52 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool$Disabled.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool$Disabled.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 target
  (Lnet/bytebuddy/description/field/FieldDescription;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool$Record;
- (Lnet/bytebuddy/description/field/FieldDescription;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool$Record;
+ (Lnet/bytebuddy/description/field/FieldDescription;)L1net/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool$Record;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool$Record$ForImplicitField.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool$Record$ForImplicitField.eea
index 069012b14b..5f54466168 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool$Record$ForImplicitField.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$FieldPool$Record$ForImplicitField.eea
@@ -17,7 +17,7 @@ getField
  ()Lnet/bytebuddy/description/field/FieldDescription;
 getFieldAppender
  ()Lnet/bytebuddy/implementation/attribute/FieldAttributeAppender;
- ()Lnet/bytebuddy/implementation/attribute/FieldAttributeAppender;
+ ()L1net/bytebuddy/implementation/attribute/FieldAttributeAppender;
 resolveDefault
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)L0java/lang/Object; # @Inherited(net.bytebuddy.dynamic.scaffold.TypeWriter$FieldPool$Record)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$AccessBridgeWrapper$AccessorBridge.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$AccessBridgeWrapper$AccessorBridge.eea
index b6e957c3f6..dc55f71b5c 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$AccessBridgeWrapper$AccessorBridge.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$AccessBridgeWrapper$AccessorBridge.eea
@@ -5,7 +5,7 @@ class net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$AccessBridgeWr
  (Lnet/bytebuddy/description/method/MethodDescription;Lnet/bytebuddy/description/method/MethodDescription$TypeToken;Lnet/bytebuddy/description/type/TypeDescription;)V
 getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getDeclaringType
  ()Lnet/bytebuddy/description/type/TypeDescription;
  ()L1net/bytebuddy/description/type/TypeDescription; # @Inherited(net.bytebuddy.description.method.MethodDescription$InDefinedShape)
@@ -20,10 +20,10 @@ getInternalName
  ()Ljava/lang/String;
 getParameters
  ()Lnet/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
 getReturnType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
 getTypeVariables
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$AccessBridgeWrapper.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$AccessBridgeWrapper.eea
index dffa6c9b4c..c4c72fba0b 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$AccessBridgeWrapper.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$AccessBridgeWrapper.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$AccessBridgeWr
 
 of
  (Lnet/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/method/MethodDescription;Ljava/util/Set<Lnet/bytebuddy/description/method/MethodDescription$TypeToken;>;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;
- (Lnet/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/method/MethodDescription;Ljava/util/Set<Lnet/bytebuddy/description/method/MethodDescription$TypeToken;>;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;
+ (Lnet/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/method/MethodDescription;Ljava/util/Set<Lnet/bytebuddy/description/method/MethodDescription$TypeToken;>;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender;)L1net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;
 
 <init>
  (Lnet/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/method/MethodDescription;Ljava/util/Set<Lnet/bytebuddy/description/method/MethodDescription$TypeToken;>;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$ForDefinedMethod$OfVisibilityBridge$VisibilityBridge.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$ForDefinedMethod$OfVisibilityBridge$VisibilityBridge.eea
index af2953a1bc..865a41c8bb 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$ForDefinedMethod$OfVisibilityBridge$VisibilityBridge.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$ForDefinedMethod$OfVisibilityBridge$VisibilityBridge.eea
@@ -20,10 +20,10 @@ getInternalName
  ()Ljava/lang/String;
 getParameters
  ()Lnet/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
 getReturnType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
 getTypeVariables
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$ForDefinedMethod$OfVisibilityBridge.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$ForDefinedMethod$OfVisibilityBridge.eea
index a869d32d8d..8dd1a2221a 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$ForDefinedMethod$OfVisibilityBridge.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$ForDefinedMethod$OfVisibilityBridge.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$ForDefinedMeth
 
 of
  (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/method/MethodDescription;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;
- (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/method/MethodDescription;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;
+ (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/method/MethodDescription;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender;)L1net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;
 
 <init>
  (Lnet/bytebuddy/description/method/MethodDescription;Lnet/bytebuddy/description/method/MethodDescription;Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$ForDefinedMethod$WithAnnotationDefaultValue.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$ForDefinedMethod$WithAnnotationDefaultValue.eea
index 72eaa2f788..b00e44a8ea 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$ForDefinedMethod$WithAnnotationDefaultValue.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$ForDefinedMethod$WithAnnotationDefaultValue.eea
@@ -11,7 +11,7 @@ applyBody
  (Lnet/bytebuddy/jar/asm/MethodVisitor;Lnet/bytebuddy/implementation/Implementation$Context;Lnet/bytebuddy/implementation/attribute/AnnotationValueFilter$Factory;)V
 applyCode
  (Lnet/bytebuddy/jar/asm/MethodVisitor;Lnet/bytebuddy/implementation/Implementation$Context;)Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender$Size;
- (Lnet/bytebuddy/jar/asm/MethodVisitor;Lnet/bytebuddy/implementation/Implementation$Context;)Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender$Size;
+ (Lnet/bytebuddy/jar/asm/MethodVisitor;Lnet/bytebuddy/implementation/Implementation$Context;)L1net/bytebuddy/implementation/bytecode/ByteCodeAppender$Size;
 applyHead
  (Lnet/bytebuddy/jar/asm/MethodVisitor;)V
  (Lnet/bytebuddy/jar/asm/MethodVisitor;)V
@@ -29,4 +29,4 @@ getVisibility
  ()Lnet/bytebuddy/description/modifier/Visibility;
 prepend
  (Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;
- (Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;
+ (Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender;)L1net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$ForDefinedMethod$WithoutBody.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$ForDefinedMethod$WithoutBody.eea
index 83e8daf6a8..e8246c45a5 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$ForDefinedMethod$WithoutBody.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$ForDefinedMethod$WithoutBody.eea
@@ -11,7 +11,7 @@ applyBody
  (Lnet/bytebuddy/jar/asm/MethodVisitor;Lnet/bytebuddy/implementation/Implementation$Context;Lnet/bytebuddy/implementation/attribute/AnnotationValueFilter$Factory;)V
 applyCode
  (Lnet/bytebuddy/jar/asm/MethodVisitor;Lnet/bytebuddy/implementation/Implementation$Context;)Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender$Size;
- (Lnet/bytebuddy/jar/asm/MethodVisitor;Lnet/bytebuddy/implementation/Implementation$Context;)Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender$Size;
+ (Lnet/bytebuddy/jar/asm/MethodVisitor;Lnet/bytebuddy/implementation/Implementation$Context;)L1net/bytebuddy/implementation/bytecode/ByteCodeAppender$Size;
 applyHead
  (Lnet/bytebuddy/jar/asm/MethodVisitor;)V
  (Lnet/bytebuddy/jar/asm/MethodVisitor;)V
@@ -29,4 +29,4 @@ getVisibility
  ()Lnet/bytebuddy/description/modifier/Visibility;
 prepend
  (Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;
- (Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;
+ (Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender;)L1net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$ForNonImplementedMethod.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$ForNonImplementedMethod.eea
index 51f8424eaf..bb55de244f 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$ForNonImplementedMethod.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$MethodPool$Record$ForNonImplementedMethod.eea
@@ -14,7 +14,7 @@ applyBody
  (Lnet/bytebuddy/jar/asm/MethodVisitor;Lnet/bytebuddy/implementation/Implementation$Context;Lnet/bytebuddy/implementation/attribute/AnnotationValueFilter$Factory;)V
 applyCode
  (Lnet/bytebuddy/jar/asm/MethodVisitor;Lnet/bytebuddy/implementation/Implementation$Context;)Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender$Size;
- (Lnet/bytebuddy/jar/asm/MethodVisitor;Lnet/bytebuddy/implementation/Implementation$Context;)Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender$Size;
+ (Lnet/bytebuddy/jar/asm/MethodVisitor;Lnet/bytebuddy/implementation/Implementation$Context;)L1net/bytebuddy/implementation/bytecode/ByteCodeAppender$Size;
 applyHead
  (Lnet/bytebuddy/jar/asm/MethodVisitor;)V
  (Lnet/bytebuddy/jar/asm/MethodVisitor;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool$Disabled.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool$Disabled.eea
index 967daf319e..d63059047a 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool$Disabled.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool$Disabled.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 target
  (Lnet/bytebuddy/description/type/RecordComponentDescription;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool$Record;
- (Lnet/bytebuddy/description/type/RecordComponentDescription;)Lnet/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool$Record;
+ (Lnet/bytebuddy/description/type/RecordComponentDescription;)L1net/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool$Record;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool$Record$ForImplicitRecordComponent.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool$Record$ForImplicitRecordComponent.eea
index 4cec1b4c68..8b51cfd50f 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool$Record$ForImplicitRecordComponent.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/TypeWriter$RecordComponentPool$Record$ForImplicitRecordComponent.eea
@@ -17,4 +17,4 @@ getRecordComponent
  ()Lnet/bytebuddy/description/type/RecordComponentDescription;
 getRecordComponentAppender
  ()Lnet/bytebuddy/implementation/attribute/RecordComponentAttributeAppender;
- ()Lnet/bytebuddy/implementation/attribute/RecordComponentAttributeAppender;
+ ()L1net/bytebuddy/implementation/attribute/RecordComponentAttributeAppender;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/DecoratingDynamicTypeBuilder.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/DecoratingDynamicTypeBuilder.eea
index 80e7c08db8..a3065f52b5 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/DecoratingDynamicTypeBuilder.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/DecoratingDynamicTypeBuilder.eea
@@ -23,28 +23,28 @@ declaredTypes
  (Ljava/util/Collection<+Lnet/bytebuddy/description/type/TypeDescription;>;)L1net/bytebuddy/dynamic/DynamicType$Builder<TT;>; # @Inherited(net.bytebuddy.dynamic.DynamicType$Builder)
 defineConstructor
  (I)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefinition$Initial<TT;>;
- (I)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefinition$Initial<TT;>;
+ (I)L1net/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefinition$Initial<TT;>;
 defineField
  (Ljava/lang/String;Lnet/bytebuddy/description/type/TypeDefinition;I)Lnet/bytebuddy/dynamic/DynamicType$Builder$FieldDefinition$Optional$Valuable<TT;>;
- (Ljava/lang/String;Lnet/bytebuddy/description/type/TypeDefinition;I)Lnet/bytebuddy/dynamic/DynamicType$Builder$FieldDefinition$Optional$Valuable<TT;>;
+ (Ljava/lang/String;Lnet/bytebuddy/description/type/TypeDefinition;I)L1net/bytebuddy/dynamic/DynamicType$Builder$FieldDefinition$Optional$Valuable<TT;>;
 defineMethod
  (Ljava/lang/String;Lnet/bytebuddy/description/type/TypeDefinition;I)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefinition$Initial<TT;>;
- (Ljava/lang/String;Lnet/bytebuddy/description/type/TypeDefinition;I)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefinition$Initial<TT;>;
+ (Ljava/lang/String;Lnet/bytebuddy/description/type/TypeDefinition;I)L1net/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ParameterDefinition$Initial<TT;>;
 defineRecordComponent
  (Ljava/lang/String;Lnet/bytebuddy/description/type/TypeDefinition;)Lnet/bytebuddy/dynamic/DynamicType$Builder$RecordComponentDefinition$Optional<TT;>;
- (Ljava/lang/String;Lnet/bytebuddy/description/type/TypeDefinition;)Lnet/bytebuddy/dynamic/DynamicType$Builder$RecordComponentDefinition$Optional<TT;>;
+ (Ljava/lang/String;Lnet/bytebuddy/description/type/TypeDefinition;)L1net/bytebuddy/dynamic/DynamicType$Builder$RecordComponentDefinition$Optional<TT;>;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 field
  (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/field/FieldDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$FieldDefinition$Valuable<TT;>;
- (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/field/FieldDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$FieldDefinition$Valuable<TT;>;
+ (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/field/FieldDescription;>;)L1net/bytebuddy/dynamic/DynamicType$Builder$FieldDefinition$Valuable<TT;>;
 ignoreAlso
  (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder<TT;>;
  (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;)L1net/bytebuddy/dynamic/DynamicType$Builder<TT;>; # @Inherited(net.bytebuddy.dynamic.DynamicType$Builder)
 implement
  (Ljava/util/Collection<+Lnet/bytebuddy/description/type/TypeDefinition;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ImplementationDefinition$Optional<TT;>;
- (Ljava/util/Collection<+Lnet/bytebuddy/description/type/TypeDefinition;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ImplementationDefinition$Optional<TT;>;
+ (Ljava/util/Collection<+Lnet/bytebuddy/description/type/TypeDefinition;>;)L1net/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ImplementationDefinition$Optional<TT;>;
 initializer
  (Lnet/bytebuddy/implementation/LoadedTypeInitializer;)Lnet/bytebuddy/dynamic/DynamicType$Builder<TT;>;
  (Lnet/bytebuddy/implementation/LoadedTypeInitializer;)L1net/bytebuddy/dynamic/DynamicType$Builder<TT;>; # @Inherited(net.bytebuddy.dynamic.DynamicType$Builder)
@@ -53,13 +53,13 @@ initializer
  (Lnet/bytebuddy/implementation/bytecode/ByteCodeAppender;)L1net/bytebuddy/dynamic/DynamicType$Builder<TT;>; # @Inherited(net.bytebuddy.dynamic.DynamicType$Builder)
 innerTypeOf
  (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)Lnet/bytebuddy/dynamic/DynamicType$Builder$InnerTypeDefinition<TT;>;
- (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)Lnet/bytebuddy/dynamic/DynamicType$Builder$InnerTypeDefinition<TT;>;
+ (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)L1net/bytebuddy/dynamic/DynamicType$Builder$InnerTypeDefinition<TT;>;
 innerTypeOf
  (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/DynamicType$Builder$InnerTypeDefinition$ForType<TT;>;
- (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/DynamicType$Builder$InnerTypeDefinition$ForType<TT;>;
+ (Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/dynamic/DynamicType$Builder$InnerTypeDefinition$ForType<TT;>;
 invokable
  (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ImplementationDefinition<TT;>;
- (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ImplementationDefinition<TT;>;
+ (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;)L1net/bytebuddy/dynamic/DynamicType$Builder$MethodDefinition$ImplementationDefinition<TT;>;
 merge
  (Ljava/util/Collection<+Lnet/bytebuddy/description/modifier/ModifierContributor$ForType;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder<TT;>;
  (Ljava/util/Collection<+Lnet/bytebuddy/description/modifier/ModifierContributor$ForType;>;)L1net/bytebuddy/dynamic/DynamicType$Builder<TT;>; # @Inherited(net.bytebuddy.dynamic.DynamicType$Builder)
@@ -80,7 +80,7 @@ permittedSubclass
  (Ljava/util/Collection<+Lnet/bytebuddy/description/type/TypeDescription;>;)L1net/bytebuddy/dynamic/DynamicType$Builder<TT;>; # @Inherited(net.bytebuddy.dynamic.DynamicType$Builder)
 recordComponent
  (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/type/RecordComponentDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$RecordComponentDefinition<TT;>;
- (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/type/RecordComponentDescription;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$RecordComponentDefinition<TT;>;
+ (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/type/RecordComponentDescription;>;)L1net/bytebuddy/dynamic/DynamicType$Builder$RecordComponentDefinition<TT;>;
 require
  (Ljava/util/Collection<Lnet/bytebuddy/dynamic/DynamicType;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder<TT;>;
  (Ljava/util/Collection<Lnet/bytebuddy/dynamic/DynamicType;>;)L1net/bytebuddy/dynamic/DynamicType$Builder<TT;>; # @Inherited(net.bytebuddy.dynamic.DynamicType$Builder)
@@ -104,7 +104,7 @@ transform
  (Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;Lnet/bytebuddy/dynamic/Transformer<Lnet/bytebuddy/description/type/TypeVariableToken;>;)L1net/bytebuddy/dynamic/DynamicType$Builder<TT;>; # @Inherited(net.bytebuddy.dynamic.DynamicType$Builder)
 typeVariable
  (Ljava/lang/String;Ljava/util/Collection<+Lnet/bytebuddy/description/type/TypeDefinition;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$TypeVariableDefinition<TT;>;
- (Ljava/lang/String;Ljava/util/Collection<+Lnet/bytebuddy/description/type/TypeDefinition;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder$TypeVariableDefinition<TT;>;
+ (Ljava/lang/String;Ljava/util/Collection<+Lnet/bytebuddy/description/type/TypeDefinition;>;)L1net/bytebuddy/dynamic/DynamicType$Builder$TypeVariableDefinition<TT;>;
 unsealed
  ()Lnet/bytebuddy/dynamic/DynamicType$Builder<TT;>;
  ()L1net/bytebuddy/dynamic/DynamicType$Builder<TT;>; # @Inherited(net.bytebuddy.dynamic.DynamicType$Builder)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/InliningImplementationMatcher.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/InliningImplementationMatcher.eea
index 24c84e7ccc..a830c4919b 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/InliningImplementationMatcher.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/InliningImplementationMatcher.eea
@@ -6,7 +6,7 @@ super net/bytebuddy/matcher/LatentMatcher
 
 of
  (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/matcher/LatentMatcher<Lnet/bytebuddy/description/method/MethodDescription;>;
- (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/matcher/LatentMatcher<Lnet/bytebuddy/description/method/MethodDescription;>;
+ (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/matcher/LatentMatcher<Lnet/bytebuddy/description/method/MethodDescription;>;
 
 <init>
  (Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodNameTransformer$Prefixing.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodNameTransformer$Prefixing.eea
index 6161eb4ddd..c3f9329486 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodNameTransformer$Prefixing.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodNameTransformer$Prefixing.eea
@@ -8,4 +8,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 transform
  (Lnet/bytebuddy/description/method/MethodDescription;)Ljava/lang/String;
- (Lnet/bytebuddy/description/method/MethodDescription;)Ljava/lang/String;
+ (Lnet/bytebuddy/description/method/MethodDescription;)L1java/lang/String;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodNameTransformer$Suffixing.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodNameTransformer$Suffixing.eea
index 9f1943970e..2ff8498f89 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodNameTransformer$Suffixing.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodNameTransformer$Suffixing.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/dynamic/scaffold/inline/MethodNameTransformer$Suffixing
 
 withRandomSuffix
  ()Lnet/bytebuddy/dynamic/scaffold/inline/MethodNameTransformer;
- ()Lnet/bytebuddy/dynamic/scaffold/inline/MethodNameTransformer;
+ ()L1net/bytebuddy/dynamic/scaffold/inline/MethodNameTransformer;
 
 <init>
  (Ljava/lang/String;)V
@@ -12,4 +12,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 transform
  (Lnet/bytebuddy/description/method/MethodDescription;)Ljava/lang/String;
- (Lnet/bytebuddy/description/method/MethodDescription;)Ljava/lang/String;
+ (Lnet/bytebuddy/description/method/MethodDescription;)L1java/lang/String;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Default.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Default.eea
index c51064dcd5..4bfc1485b5 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Default.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Default.eea
@@ -2,14 +2,14 @@ class net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Default
 
 make
  (Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/Set<+Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;>;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/implementation/auxiliary/AuxiliaryType$NamingStrategy;Lnet/bytebuddy/dynamic/scaffold/inline/MethodNameTransformer;)Lnet/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver;
- (Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/Set<+Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;>;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/implementation/auxiliary/AuxiliaryType$NamingStrategy;Lnet/bytebuddy/dynamic/scaffold/inline/MethodNameTransformer;)Lnet/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver;
+ (Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/Set<+Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;>;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/implementation/auxiliary/AuxiliaryType$NamingStrategy;Lnet/bytebuddy/dynamic/scaffold/inline/MethodNameTransformer;)L1net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver;
 
 <init>
  (Ljava/util/Map<Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution;>;Ljava/util/List<Lnet/bytebuddy/dynamic/DynamicType;>;)V
  (Ljava/util/Map<Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution;>;Ljava/util/List<Lnet/bytebuddy/dynamic/DynamicType;>;)V
 asTokenMap
  ()Ljava/util/Map<Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;Lnet/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution;>;
- ()Ljava/util/Map<Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;Lnet/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution;>;
+ ()L1java/util/Map<Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;Lnet/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution;>;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Disabled.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Disabled.eea
index 02b31f6b17..87d384b1c4 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Disabled.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Disabled.eea
@@ -12,4 +12,4 @@ getAuxiliaryTypes
  ()Ljava/util/List<Lnet/bytebuddy/dynamic/DynamicType;>;
 resolve
  (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)Lnet/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution;
- (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)Lnet/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution;
+ (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)L1net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution$ForRebasedConstructor$RebasedConstructor.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution$ForRebasedConstructor$RebasedConstructor.eea
index 7c4ed9b8ab..90672308fa 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution$ForRebasedConstructor$RebasedConstructor.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution$ForRebasedConstructor$RebasedConstructor.eea
@@ -5,7 +5,7 @@ class net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution$ForR
  (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/description/type/TypeDescription;)V
 getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getDeclaringType
  ()Lnet/bytebuddy/description/type/TypeDescription;
  ()L1net/bytebuddy/description/type/TypeDescription; # @Inherited(net.bytebuddy.description.method.MethodDescription$InDefinedShape)
@@ -17,7 +17,7 @@ getExceptionTypes
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
 getInternalName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getParameters
  ()Lnet/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
  ()Lnet/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
@@ -26,4 +26,4 @@ getReturnType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
 getTypeVariables
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution$ForRebasedConstructor.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution$ForRebasedConstructor.eea
index 1ee809b5c7..703716f479 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution$ForRebasedConstructor.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution$ForRebasedConstructor.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution$ForR
 
 of
  (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution;
- (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution;
+ (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution;
 
 <init>
  (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/description/type/TypeDescription;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution$ForRebasedMethod$RebasedMethod.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution$ForRebasedMethod$RebasedMethod.eea
index 08d9f19e32..174946d126 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution$ForRebasedMethod$RebasedMethod.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution$ForRebasedMethod$RebasedMethod.eea
@@ -5,7 +5,7 @@ class net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution$ForR
  (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/dynamic/scaffold/inline/MethodNameTransformer;)V
 getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getDeclaringType
  ()Lnet/bytebuddy/description/type/TypeDescription;
  ()L1net/bytebuddy/description/type/TypeDescription; # @Inherited(net.bytebuddy.description.method.MethodDescription$InDefinedShape)
@@ -20,10 +20,10 @@ getInternalName
  ()Ljava/lang/String;
 getParameters
  ()Lnet/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/method/ParameterList<Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;
 getReturnType
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
 getTypeVariables
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution$ForRebasedMethod.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution$ForRebasedMethod.eea
index 58adb750eb..2727e15634 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution$ForRebasedMethod.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution$ForRebasedMethod.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution$ForR
 
 of
  (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/dynamic/scaffold/inline/MethodNameTransformer;)Lnet/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution;
- (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/dynamic/scaffold/inline/MethodNameTransformer;)Lnet/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution;
+ (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/dynamic/scaffold/inline/MethodNameTransformer;)L1net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution;
 
 <init>
  (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)V
@@ -12,7 +12,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getAppendedParameters
  ()Lnet/bytebuddy/description/type/TypeList;
- ()Lnet/bytebuddy/description/type/TypeList;
+ ()L1net/bytebuddy/description/type/TypeList;
 getResolvedMethod
  ()Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;
  ()Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution$Preserved.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution$Preserved.eea
index 048f72ea1f..66f3fababc 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution$Preserved.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution$Preserved.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getAppendedParameters
  ()Lnet/bytebuddy/description/type/TypeList;
- ()Lnet/bytebuddy/description/type/TypeList;
+ ()L1net/bytebuddy/description/type/TypeList;
 getResolvedMethod
  ()Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;
  ()Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/RebaseImplementationTarget.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/RebaseImplementationTarget.eea
index dbd802dc3d..b3838805ec 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/RebaseImplementationTarget.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/inline/RebaseImplementationTarget.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/dynamic/scaffold/inline/RebaseImplementationTarget
 
 of
  (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Linked;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver;)Lnet/bytebuddy/implementation/Implementation$Target;
- (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Linked;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver;)Lnet/bytebuddy/implementation/Implementation$Target;
+ (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Linked;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver;)L1net/bytebuddy/implementation/Implementation$Target;
 
 <init>
  (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Linked;Lnet/bytebuddy/implementation/Implementation$Target$AbstractBase$DefaultMethodInvocation;Ljava/util/Map<Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;Lnet/bytebuddy/dynamic/scaffold/inline/MethodRebaseResolver$Resolution;>;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/subclass/ConstructorStrategy$Default.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/subclass/ConstructorStrategy$Default.eea
index 87813df55e..6fc058c935 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/subclass/ConstructorStrategy$Default.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/subclass/ConstructorStrategy$Default.eea
@@ -12,13 +12,13 @@ doInject
  (Lnet/bytebuddy/dynamic/scaffold/MethodRegistry;Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender$Factory;)Lnet/bytebuddy/dynamic/scaffold/MethodRegistry;
 extractConstructors
  (Lnet/bytebuddy/description/type/TypeDescription;)Ljava/util/List<Lnet/bytebuddy/description/method/MethodDescription$Token;>;
- (Lnet/bytebuddy/description/type/TypeDescription;)Ljava/util/List<Lnet/bytebuddy/description/method/MethodDescription$Token;>;
+ (Lnet/bytebuddy/description/type/TypeDescription;)L1java/util/List<Lnet/bytebuddy/description/method/MethodDescription$Token;>;
 inject
  (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/dynamic/scaffold/MethodRegistry;)Lnet/bytebuddy/dynamic/scaffold/MethodRegistry;
  (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/dynamic/scaffold/MethodRegistry;)Lnet/bytebuddy/dynamic/scaffold/MethodRegistry;
 with
  (Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender$Factory;)Lnet/bytebuddy/dynamic/scaffold/subclass/ConstructorStrategy;
- (Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender$Factory;)Lnet/bytebuddy/dynamic/scaffold/subclass/ConstructorStrategy;
+ (Lnet/bytebuddy/implementation/attribute/MethodAttributeAppender$Factory;)L1net/bytebuddy/dynamic/scaffold/subclass/ConstructorStrategy;
 withInheritedAnnotations
  ()Lnet/bytebuddy/dynamic/scaffold/subclass/ConstructorStrategy;
- ()Lnet/bytebuddy/dynamic/scaffold/subclass/ConstructorStrategy;
+ ()L1net/bytebuddy/dynamic/scaffold/subclass/ConstructorStrategy;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/subclass/SubclassDynamicTypeBuilder.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/subclass/SubclassDynamicTypeBuilder.eea
index efb5d9a893..8403da96ad 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/subclass/SubclassDynamicTypeBuilder.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/subclass/SubclassDynamicTypeBuilder.eea
@@ -17,7 +17,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(net.bytebuddy.dynamic.DynamicType$Builder$AbstractBase$Adapter)
 materialize
  (Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;Lnet/bytebuddy/dynamic/scaffold/FieldRegistry;Lnet/bytebuddy/dynamic/scaffold/MethodRegistry;Lnet/bytebuddy/dynamic/scaffold/RecordComponentRegistry;Lnet/bytebuddy/implementation/attribute/TypeAttributeAppender;Lnet/bytebuddy/asm/AsmVisitorWrapper;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/implementation/auxiliary/AuxiliaryType$NamingStrategy;Lnet/bytebuddy/implementation/attribute/AnnotationValueFilter$Factory;Lnet/bytebuddy/implementation/attribute/AnnotationRetention;Lnet/bytebuddy/implementation/Implementation$Context$Factory;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler;Lnet/bytebuddy/dynamic/scaffold/TypeValidation;Lnet/bytebuddy/dynamic/VisibilityBridgeStrategy;Lnet/bytebuddy/utility/AsmClassReader$Factory;Lnet/bytebuddy/utility/AsmClassWriter$Factory;Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;Ljava/util/List<+Lnet/bytebuddy/dynamic/DynamicType;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder<TT;>;
- (Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;Lnet/bytebuddy/dynamic/scaffold/FieldRegistry;Lnet/bytebuddy/dynamic/scaffold/MethodRegistry;Lnet/bytebuddy/dynamic/scaffold/RecordComponentRegistry;Lnet/bytebuddy/implementation/attribute/TypeAttributeAppender;Lnet/bytebuddy/asm/AsmVisitorWrapper;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/implementation/auxiliary/AuxiliaryType$NamingStrategy;Lnet/bytebuddy/implementation/attribute/AnnotationValueFilter$Factory;Lnet/bytebuddy/implementation/attribute/AnnotationRetention;Lnet/bytebuddy/implementation/Implementation$Context$Factory;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler;Lnet/bytebuddy/dynamic/scaffold/TypeValidation;Lnet/bytebuddy/dynamic/VisibilityBridgeStrategy;Lnet/bytebuddy/utility/AsmClassReader$Factory;Lnet/bytebuddy/utility/AsmClassWriter$Factory;Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;Ljava/util/List<+Lnet/bytebuddy/dynamic/DynamicType;>;)Lnet/bytebuddy/dynamic/DynamicType$Builder<TT;>;
+ (Lnet/bytebuddy/dynamic/scaffold/InstrumentedType$WithFlexibleName;Lnet/bytebuddy/dynamic/scaffold/FieldRegistry;Lnet/bytebuddy/dynamic/scaffold/MethodRegistry;Lnet/bytebuddy/dynamic/scaffold/RecordComponentRegistry;Lnet/bytebuddy/implementation/attribute/TypeAttributeAppender;Lnet/bytebuddy/asm/AsmVisitorWrapper;Lnet/bytebuddy/ClassFileVersion;Lnet/bytebuddy/implementation/auxiliary/AuxiliaryType$NamingStrategy;Lnet/bytebuddy/implementation/attribute/AnnotationValueFilter$Factory;Lnet/bytebuddy/implementation/attribute/AnnotationRetention;Lnet/bytebuddy/implementation/Implementation$Context$Factory;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Compiler;Lnet/bytebuddy/dynamic/scaffold/TypeValidation;Lnet/bytebuddy/dynamic/VisibilityBridgeStrategy;Lnet/bytebuddy/utility/AsmClassReader$Factory;Lnet/bytebuddy/utility/AsmClassWriter$Factory;Lnet/bytebuddy/matcher/LatentMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;Ljava/util/List<+Lnet/bytebuddy/dynamic/DynamicType;>;)L1net/bytebuddy/dynamic/DynamicType$Builder<TT;>;
 toTypeWriter
  ()Lnet/bytebuddy/dynamic/scaffold/TypeWriter<TT;>;
  ()Lnet/bytebuddy/dynamic/scaffold/TypeWriter<TT;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/subclass/SubclassImplementationTarget$Factory.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/subclass/SubclassImplementationTarget$Factory.eea
index d159800d5d..e239fed863 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/subclass/SubclassImplementationTarget$Factory.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/dynamic/scaffold/subclass/SubclassImplementationTarget$Factory.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 make
  (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Linked;Lnet/bytebuddy/ClassFileVersion;)Lnet/bytebuddy/implementation/Implementation$Target;
- (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Linked;Lnet/bytebuddy/ClassFileVersion;)Lnet/bytebuddy/implementation/Implementation$Target;
+ (Lnet/bytebuddy/description/type/TypeDescription;Lnet/bytebuddy/dynamic/scaffold/MethodGraph$Linked;Lnet/bytebuddy/ClassFileVersion;)L1net/bytebuddy/implementation/Implementation$Target;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/matcher/ElementMatchers.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/matcher/ElementMatchers.eea
index 9a36785582..2211c2c1ed 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/matcher/ElementMatchers.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/matcher/ElementMatchers.eea
@@ -8,7 +8,7 @@ annotationType
  <T::Lnet/bytebuddy/description/annotation/AnnotationDescription;>(Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 annotationType
  <T::Lnet/bytebuddy/description/annotation/AnnotationDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/annotation/AnnotationDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/annotation/AnnotationDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 any
  <T:Ljava/lang/Object;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T:Ljava/lang/Object;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
@@ -35,10 +35,10 @@ anyOf
  <T:Ljava/lang/Object;>([Ljava/lang/Object;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 cached
  <T:Ljava/lang/Object;>(Lnet/bytebuddy/matcher/ElementMatcher<-TT;>;I)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T:Ljava/lang/Object;>(Lnet/bytebuddy/matcher/ElementMatcher<-TT;>;I)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T:Ljava/lang/Object;>(Lnet/bytebuddy/matcher/ElementMatcher<-TT;>;I)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 cached
  <T:Ljava/lang/Object;>(Lnet/bytebuddy/matcher/ElementMatcher<-TT;>;Ljava/util/concurrent/ConcurrentMap<-TT;Ljava/lang/Boolean;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T:Ljava/lang/Object;>(Lnet/bytebuddy/matcher/ElementMatcher<-TT;>;Ljava/util/concurrent/ConcurrentMap<-TT;Ljava/lang/Boolean;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T:Ljava/lang/Object;>(Lnet/bytebuddy/matcher/ElementMatcher<-TT;>;Ljava/util/concurrent/ConcurrentMap<-TT;Ljava/lang/Boolean;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 canThrow
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Ljava/lang/Class<+Ljava/lang/Throwable;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Ljava/lang/Class<+Ljava/lang/Throwable;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
@@ -47,7 +47,7 @@ canThrow
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 declaresAnnotation
  <T::Lnet/bytebuddy/description/annotation/AnnotationSource;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/annotation/AnnotationDescription;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/annotation/AnnotationSource;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/annotation/AnnotationDescription;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/annotation/AnnotationSource;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/annotation/AnnotationDescription;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 declaresException
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Ljava/lang/Class<+Ljava/lang/Throwable;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Ljava/lang/Class<+Ljava/lang/Throwable;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
@@ -56,7 +56,7 @@ declaresException
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 declaresField
  <T::Lnet/bytebuddy/description/type/TypeDefinition;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/field/FieldDescription;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/type/TypeDefinition;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/field/FieldDescription;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/type/TypeDefinition;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/field/FieldDescription;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 declaresGenericException
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Ljava/lang/reflect/Type;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Ljava/lang/reflect/Type;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
@@ -65,19 +65,19 @@ declaresGenericException
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 declaresGenericException
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Ljava/lang/Iterable<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Ljava/lang/Iterable<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Ljava/lang/Iterable<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 declaresMethod
  <T::Lnet/bytebuddy/description/type/TypeDefinition;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/type/TypeDefinition;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/type/TypeDefinition;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 definedField
  <T::Lnet/bytebuddy/description/field/FieldDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/field/FieldDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/field/FieldDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 definedMethod
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 definedParameter
  <T::Lnet/bytebuddy/description/method/ParameterDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/method/ParameterDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/method/ParameterDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/method/ParameterDescription$InDefinedShape;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 erasure
  <T::Lnet/bytebuddy/description/type/TypeDescription$Generic;>(Ljava/lang/Class<*>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Lnet/bytebuddy/description/type/TypeDescription$Generic;>(Ljava/lang/Class<*>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
@@ -86,13 +86,13 @@ erasure
  <T::Lnet/bytebuddy/description/type/TypeDescription$Generic;>(Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 erasure
  <T::Lnet/bytebuddy/description/type/TypeDescription$Generic;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/type/TypeDescription$Generic;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/type/TypeDescription$Generic;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 erasures
  <T::Ljava/lang/Iterable<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;>(Ljava/lang/Iterable<+Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Ljava/lang/Iterable<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;>(Ljava/lang/Iterable<+Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 erasures
  <T::Ljava/lang/Iterable<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;>(Lnet/bytebuddy/matcher/ElementMatcher<-Ljava/lang/Iterable<+Lnet/bytebuddy/description/type/TypeDescription;>;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Ljava/lang/Iterable<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;>(Lnet/bytebuddy/matcher/ElementMatcher<-Ljava/lang/Iterable<+Lnet/bytebuddy/description/type/TypeDescription;>;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Ljava/lang/Iterable<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;>(Lnet/bytebuddy/matcher/ElementMatcher<-Ljava/lang/Iterable<+Lnet/bytebuddy/description/type/TypeDescription;>;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 erasures
  <T::Ljava/lang/Iterable<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;>([Ljava/lang/Class<*>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Ljava/lang/Iterable<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;>([Ljava/lang/Class<*>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
@@ -119,13 +119,13 @@ genericFieldType
  <T::Lnet/bytebuddy/description/field/FieldDescription;>(Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 genericFieldType
  <T::Lnet/bytebuddy/description/field/FieldDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/field/FieldDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/field/FieldDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 hasAnnotation
  <T::Lnet/bytebuddy/description/type/TypeDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/annotation/AnnotationDescription;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/type/TypeDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/annotation/AnnotationDescription;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/type/TypeDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/annotation/AnnotationDescription;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 hasChild
  <T:Ljava/lang/ClassLoader;>(Lnet/bytebuddy/matcher/ElementMatcher<-Ljava/lang/ClassLoader;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T:Ljava/lang/ClassLoader;>(Lnet/bytebuddy/matcher/ElementMatcher<-Ljava/lang/ClassLoader;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T:Ljava/lang/ClassLoader;>(Lnet/bytebuddy/matcher/ElementMatcher<-Ljava/lang/ClassLoader;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 hasClassFileVersionAtLeast
  <T::Lnet/bytebuddy/description/type/TypeDescription;>(Lnet/bytebuddy/ClassFileVersion;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Lnet/bytebuddy/description/type/TypeDescription;>(Lnet/bytebuddy/ClassFileVersion;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
@@ -134,25 +134,25 @@ hasClassFileVersionAtMost
  <T::Lnet/bytebuddy/description/type/TypeDescription;>(Lnet/bytebuddy/ClassFileVersion;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 hasDescriptor
  <T::Lnet/bytebuddy/description/NamedElement$WithDescriptor;>(Ljava/lang/String;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/NamedElement$WithDescriptor;>(Ljava/lang/String;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/NamedElement$WithDescriptor;>(Ljava/lang/String;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 hasGenericSuperClass
  <T::Lnet/bytebuddy/description/type/TypeDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/type/TypeDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/type/TypeDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 hasGenericSuperType
  <T::Lnet/bytebuddy/description/type/TypeDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/type/TypeDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/type/TypeDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 hasGenericType
  <T::Lnet/bytebuddy/description/method/ParameterDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/method/ParameterDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/method/ParameterDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 hasMethodName
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Ljava/lang/String;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Ljava/lang/String;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 hasParameters
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Ljava/lang/Iterable<+Lnet/bytebuddy/description/method/ParameterDescription;>;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Ljava/lang/Iterable<+Lnet/bytebuddy/description/method/ParameterDescription;>;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Ljava/lang/Iterable<+Lnet/bytebuddy/description/method/ParameterDescription;>;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 hasSignature
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/description/method/MethodDescription$SignatureToken;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 hasSuperClass
  <T::Lnet/bytebuddy/description/type/TypeDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Lnet/bytebuddy/description/type/TypeDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
@@ -197,7 +197,7 @@ is
  <T::Lnet/bytebuddy/description/type/TypeDefinition;>(Ljava/lang/reflect/Type;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 is
  <T:Ljava/lang/Object;>(Ljava/lang/Object;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Object;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Object;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isAbstract
  <T::Lnet/bytebuddy/description/ModifierReviewable$OfAbstraction;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Lnet/bytebuddy/description/ModifierReviewable$OfAbstraction;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
@@ -206,7 +206,7 @@ isAccessibleTo
  <T::Lnet/bytebuddy/description/ByteCodeElement;>(Ljava/lang/Class<*>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isAccessibleTo
  <T::Lnet/bytebuddy/description/ByteCodeElement;>(Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/ByteCodeElement;>(Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/ByteCodeElement;>(Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isAnnotatedWith
  <T::Lnet/bytebuddy/description/annotation/AnnotationSource;>(Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Lnet/bytebuddy/description/annotation/AnnotationSource;>(Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
@@ -221,7 +221,7 @@ isAnnotation
  <T::Lnet/bytebuddy/description/type/TypeDescription;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isArray
  <T::Lnet/bytebuddy/description/type/TypeDefinition;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/type/TypeDefinition;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/type/TypeDefinition;>()L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isBootstrapClassLoader
  <T:Ljava/lang/ClassLoader;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T:Ljava/lang/ClassLoader;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
@@ -254,7 +254,7 @@ isDeclaredByGeneric
  <T::Lnet/bytebuddy/description/ByteCodeElement;>(Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isDeclaredByGeneric
  <T::Lnet/bytebuddy/description/ByteCodeElement;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/ByteCodeElement;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/ByteCodeElement;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isDefaultConstructor
  <T::Lnet/bytebuddy/description/method/MethodDescription;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Lnet/bytebuddy/description/method/MethodDescription;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
@@ -272,7 +272,7 @@ isEquals
  <T::Lnet/bytebuddy/description/method/MethodDescription;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isExtensionClassLoader
  <T:Ljava/lang/ClassLoader;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T:Ljava/lang/ClassLoader;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T:Ljava/lang/ClassLoader;>()L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isFinal
  <T::Lnet/bytebuddy/description/ModifierReviewable;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Lnet/bytebuddy/description/ModifierReviewable;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
@@ -329,7 +329,7 @@ isMethod
  <T::Lnet/bytebuddy/description/method/MethodDescription;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isNamed
  <T::Lnet/bytebuddy/description/NamedElement$WithOptionalName;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/NamedElement$WithOptionalName;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/NamedElement$WithOptionalName;>()L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isNative
  <T::Lnet/bytebuddy/description/ModifierReviewable$ForMethodDescription;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Lnet/bytebuddy/description/ModifierReviewable$ForMethodDescription;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
@@ -350,16 +350,16 @@ isOverriddenFromGeneric
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isOverriddenFromGeneric
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isPackagePrivate
  <T::Lnet/bytebuddy/description/ModifierReviewable$OfByteCodeElement;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Lnet/bytebuddy/description/ModifierReviewable$OfByteCodeElement;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isParentOf
  <T:Ljava/lang/ClassLoader;>(Ljava/lang/ClassLoader;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T:Ljava/lang/ClassLoader;>(Ljava/lang/ClassLoader;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T:Ljava/lang/ClassLoader;>(Ljava/lang/ClassLoader;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isPrimitive
  <T::Lnet/bytebuddy/description/type/TypeDefinition;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/type/TypeDefinition;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/type/TypeDefinition;>()L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isPrivate
  <T::Lnet/bytebuddy/description/ModifierReviewable$OfByteCodeElement;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Lnet/bytebuddy/description/ModifierReviewable$OfByteCodeElement;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
@@ -371,7 +371,7 @@ isPublic
  <T::Lnet/bytebuddy/description/ModifierReviewable$OfByteCodeElement;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isRecord
  <T::Lnet/bytebuddy/description/type/TypeDefinition;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/type/TypeDefinition;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/type/TypeDefinition;>()L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isSetter
  <T::Lnet/bytebuddy/description/method/MethodDescription;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Lnet/bytebuddy/description/method/MethodDescription;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
@@ -398,13 +398,13 @@ isSubTypeOf
  <T::Lnet/bytebuddy/description/type/TypeDescription;>(Ljava/lang/Class<*>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isSubTypeOf
  <T::Lnet/bytebuddy/description/type/TypeDescription;>(Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/type/TypeDescription;>(Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/type/TypeDescription;>(Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isSuperTypeOf
  <T::Lnet/bytebuddy/description/type/TypeDescription;>(Ljava/lang/Class<*>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Lnet/bytebuddy/description/type/TypeDescription;>(Ljava/lang/Class<*>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isSuperTypeOf
  <T::Lnet/bytebuddy/description/type/TypeDescription;>(Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/type/TypeDescription;>(Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/type/TypeDescription;>(Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isSynchronized
  <T::Lnet/bytebuddy/description/ModifierReviewable$ForMethodDescription;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Lnet/bytebuddy/description/ModifierReviewable$ForMethodDescription;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
@@ -413,7 +413,7 @@ isSynthetic
  <T::Lnet/bytebuddy/description/ModifierReviewable;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isSystemClassLoader
  <T:Ljava/lang/ClassLoader;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T:Ljava/lang/ClassLoader;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T:Ljava/lang/ClassLoader;>()L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isToString
  <T::Lnet/bytebuddy/description/method/MethodDescription;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Lnet/bytebuddy/description/method/MethodDescription;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
@@ -440,40 +440,40 @@ isVisibleTo
  <T::Lnet/bytebuddy/description/ByteCodeElement;>(Ljava/lang/Class<*>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isVisibleTo
  <T::Lnet/bytebuddy/description/ByteCodeElement;>(Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/ByteCodeElement;>(Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/ByteCodeElement;>(Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 isVolatile
  <T::Lnet/bytebuddy/description/field/FieldDescription;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Lnet/bytebuddy/description/field/FieldDescription;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 nameContains
  <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 nameContainsIgnoreCase
  <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 nameEndsWith
  <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 nameEndsWithIgnoreCase
  <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 nameMatches
  <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 nameStartsWith
  <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 nameStartsWithIgnoreCase
  <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 named
  <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 namedIgnoreCase
  <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/NamedElement;>(Ljava/lang/String;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 namedOneOf
  <T::Lnet/bytebuddy/description/NamedElement;>([Ljava/lang/String;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/NamedElement;>([Ljava/lang/String;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/NamedElement;>([Ljava/lang/String;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 none
  <T:Ljava/lang/Object;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T:Ljava/lang/Object;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
@@ -500,16 +500,16 @@ noneOf
  <T:Ljava/lang/Object;>([Ljava/lang/Object;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 not
  <T:Ljava/lang/Object;>(Lnet/bytebuddy/matcher/ElementMatcher<-TT;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T:Ljava/lang/Object;>(Lnet/bytebuddy/matcher/ElementMatcher<-TT;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T:Ljava/lang/Object;>(Lnet/bytebuddy/matcher/ElementMatcher<-TT;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 ofSort
  <T::Lnet/bytebuddy/description/type/TypeDefinition;>(Lnet/bytebuddy/description/type/TypeDefinition$Sort;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Lnet/bytebuddy/description/type/TypeDefinition;>(Lnet/bytebuddy/description/type/TypeDefinition$Sort;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 ofSort
  <T::Lnet/bytebuddy/description/type/TypeDefinition;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDefinition$Sort;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/type/TypeDefinition;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDefinition$Sort;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/type/TypeDefinition;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDefinition$Sort;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 ofType
  <T:Ljava/lang/ClassLoader;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T:Ljava/lang/ClassLoader;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T:Ljava/lang/ClassLoader;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 returns
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Ljava/lang/Class<*>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Ljava/lang/Class<*>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
@@ -527,7 +527,7 @@ returnsGeneric
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/description/type/TypeDescription$Generic;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 returnsGeneric
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 supportsModules
  <T:Lnet/bytebuddy/utility/JavaModule;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T:Lnet/bytebuddy/utility/JavaModule;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
@@ -542,13 +542,13 @@ takesArgument
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(ILnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 takesArguments
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(I)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/method/MethodDescription;>(I)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/method/MethodDescription;>(I)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 takesArguments
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Ljava/lang/Iterable<+Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Ljava/lang/Iterable<+Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 takesArguments
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Ljava/lang/Iterable<+Lnet/bytebuddy/description/type/TypeDescription;>;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Ljava/lang/Iterable<+Lnet/bytebuddy/description/type/TypeDescription;>;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Ljava/lang/Iterable<+Lnet/bytebuddy/description/type/TypeDescription;>;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 takesArguments
  <T::Lnet/bytebuddy/description/method/MethodDescription;>([Ljava/lang/Class<*>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Lnet/bytebuddy/description/method/MethodDescription;>([Ljava/lang/Class<*>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
@@ -569,7 +569,7 @@ takesGenericArguments
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDefinition;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 takesGenericArguments
  <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Ljava/lang/Iterable<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Ljava/lang/Iterable<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/method/MethodDescription;>(Lnet/bytebuddy/matcher/ElementMatcher<-Ljava/lang/Iterable<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 takesGenericArguments
  <T::Lnet/bytebuddy/description/method/MethodDescription;>([Ljava/lang/reflect/Type;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
  <T::Lnet/bytebuddy/description/method/MethodDescription;>([Ljava/lang/reflect/Type;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
@@ -581,10 +581,10 @@ takesNoArguments
  <T::Lnet/bytebuddy/description/method/MethodDescription;>()Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 targetsElement
  <T::Lnet/bytebuddy/description/annotation/AnnotationDescription;>(Ljava/lang/annotation/ElementType;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
- <T::Lnet/bytebuddy/description/annotation/AnnotationDescription;>(Ljava/lang/annotation/ElementType;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
+ <T::Lnet/bytebuddy/description/annotation/AnnotationDescription;>(Ljava/lang/annotation/ElementType;)L1net/bytebuddy/matcher/ElementMatcher$Junction<TT;>;
 whereAny
  <T:Ljava/lang/Object;>(Lnet/bytebuddy/matcher/ElementMatcher<-TT;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<Ljava/lang/Iterable<+TT;>;>;
- <T:Ljava/lang/Object;>(Lnet/bytebuddy/matcher/ElementMatcher<-TT;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<Ljava/lang/Iterable<+TT;>;>;
+ <T:Ljava/lang/Object;>(Lnet/bytebuddy/matcher/ElementMatcher<-TT;>;)L1net/bytebuddy/matcher/ElementMatcher$Junction<Ljava/lang/Iterable<+TT;>;>;
 whereNone
  <T:Ljava/lang/Object;>(Lnet/bytebuddy/matcher/ElementMatcher<-TT;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<Ljava/lang/Iterable<+TT;>;>;
  <T:Ljava/lang/Object;>(Lnet/bytebuddy/matcher/ElementMatcher<-TT;>;)Lnet/bytebuddy/matcher/ElementMatcher$Junction<Ljava/lang/Iterable<+TT;>;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/matcher/FilterableList$Empty.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/matcher/FilterableList$Empty.eea
index 46a119abde..e797a7290b 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/matcher/FilterableList$Empty.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/matcher/FilterableList$Empty.eea
@@ -14,10 +14,10 @@ filter
  (Lnet/bytebuddy/matcher/ElementMatcher<-TT;>;)TS;
 get
  (I)TT;
- (I)TT;
+ (I)T1T;
 getOnly
  ()TT;
- ()TT;
+ ()T1T;
 subList
  (II)TS;
  (II)TS;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/matcher/LatentMatcher$ForFieldToken.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/matcher/LatentMatcher$ForFieldToken.eea
index 927ecae860..8b93281da8 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/matcher/LatentMatcher$ForFieldToken.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/matcher/LatentMatcher$ForFieldToken.eea
@@ -12,4 +12,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 resolve
  (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/field/FieldDescription;>;
- (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/field/FieldDescription;>;
+ (Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/field/FieldDescription;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/matcher/LatentMatcher$ForMethodToken.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/matcher/LatentMatcher$ForMethodToken.eea
index 519c746638..e6b9b3d0db 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/matcher/LatentMatcher$ForMethodToken.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/matcher/LatentMatcher$ForMethodToken.eea
@@ -12,4 +12,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 resolve
  (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;
- (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;
+ (Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/matcher/ElementMatcher<-Lnet/bytebuddy/description/method/MethodDescription;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$AbstractBase$ArrayTypeResolution.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$AbstractBase$ArrayTypeResolution.eea
index a5b8e48d60..a184559e67 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$AbstractBase$ArrayTypeResolution.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$AbstractBase$ArrayTypeResolution.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/pool/TypePool$AbstractBase$ArrayTypeResolution
 
 of
  (Lnet/bytebuddy/pool/TypePool$Resolution;I)Lnet/bytebuddy/pool/TypePool$Resolution;
- (Lnet/bytebuddy/pool/TypePool$Resolution;I)Lnet/bytebuddy/pool/TypePool$Resolution;
+ (Lnet/bytebuddy/pool/TypePool$Resolution;I)L1net/bytebuddy/pool/TypePool$Resolution;
 
 <init>
  (Lnet/bytebuddy/pool/TypePool$Resolution;I)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$CacheProvider$Simple.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$CacheProvider$Simple.eea
index f4bb25e5df..84c995f727 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$CacheProvider$Simple.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$CacheProvider$Simple.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/pool/TypePool$CacheProvider$Simple
 
 withObjectType
  ()Lnet/bytebuddy/pool/TypePool$CacheProvider;
- ()Lnet/bytebuddy/pool/TypePool$CacheProvider;
+ ()L1net/bytebuddy/pool/TypePool$CacheProvider;
 
 <init>
  (Ljava/util/concurrent/ConcurrentMap<Ljava/lang/String;Lnet/bytebuddy/pool/TypePool$Resolution;>;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$ClassLoading.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$ClassLoading.eea
index 1eaddc9544..3a744ec8cc 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$ClassLoading.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$ClassLoading.eea
@@ -5,7 +5,7 @@ of
  (Ljava/lang/ClassLoader;)Lnet/bytebuddy/pool/TypePool;
 of
  (Ljava/lang/ClassLoader;Lnet/bytebuddy/pool/TypePool;)Lnet/bytebuddy/pool/TypePool;
- (Ljava/lang/ClassLoader;Lnet/bytebuddy/pool/TypePool;)Lnet/bytebuddy/pool/TypePool;
+ (Ljava/lang/ClassLoader;Lnet/bytebuddy/pool/TypePool;)L1net/bytebuddy/pool/TypePool;
 ofBootLoader
  ()Lnet/bytebuddy/pool/TypePool;
  ()Lnet/bytebuddy/pool/TypePool;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$AnnotationRegistrant$AbstractBase$ForTypeVariable$WithIndex$DoubleIndexed.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$AnnotationRegistrant$AbstractBase$ForTypeVariable$WithIndex$DoubleIndexed.eea
index 198d6c564f..b71e85d22a 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$AnnotationRegistrant$AbstractBase$ForTypeVariable$WithIndex$DoubleIndexed.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$AnnotationRegistrant$AbstractBase$ForTypeVariable$WithIndex$DoubleIndexed.eea
@@ -8,4 +8,4 @@ getDoubleIndexedPathMap
  ()Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;>;
 getIndexedPathMap
  ()Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;
- ()Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;
+ ()L1java/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$AnnotationRegistrant$AbstractBase$ForTypeVariable$WithIndex.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$AnnotationRegistrant$AbstractBase$ForTypeVariable$WithIndex.eea
index cc22ee7d3f..014c6e87a8 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$AnnotationRegistrant$AbstractBase$ForTypeVariable$WithIndex.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$AnnotationRegistrant$AbstractBase$ForTypeVariable$WithIndex.eea
@@ -8,4 +8,4 @@ getIndexedPathMap
  ()Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;
 getPathMap
  ()Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;
- ()Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;
+ ()L1java/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$AnnotationRegistrant$AbstractBase$ForTypeVariable.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$AnnotationRegistrant$AbstractBase$ForTypeVariable.eea
index c521c6a424..499d89d65e 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$AnnotationRegistrant$AbstractBase$ForTypeVariable.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$AnnotationRegistrant$AbstractBase$ForTypeVariable.eea
@@ -8,4 +8,4 @@ getPathMap
  ()Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;
 getTokens
  ()Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;
- ()Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;
+ ()L1java/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$AnnotationRegistrant$ForByteCodeElement$WithIndex.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$AnnotationRegistrant$ForByteCodeElement$WithIndex.eea
index 15b741ee58..8e787566b6 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$AnnotationRegistrant$ForByteCodeElement$WithIndex.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$AnnotationRegistrant$ForByteCodeElement$WithIndex.eea
@@ -5,4 +5,4 @@ class net/bytebuddy/pool/TypePool$Default$AnnotationRegistrant$ForByteCodeElemen
  (Ljava/lang/String;ILjava/util/Map<Ljava/lang/Integer;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;)V
 getTokens
  ()Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;
- ()Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;
+ ()L1java/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$ComponentTypeLocator$ForAnnotationProperty.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$ComponentTypeLocator$ForAnnotationProperty.eea
index 39ece00609..f204d02e1c 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$ComponentTypeLocator$ForAnnotationProperty.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$ComponentTypeLocator$ForAnnotationProperty.eea
@@ -5,7 +5,7 @@ class net/bytebuddy/pool/TypePool$Default$ComponentTypeLocator$ForAnnotationProp
  (Lnet/bytebuddy/pool/TypePool;Ljava/lang/String;)V
 bind
  (Ljava/lang/String;)Lnet/bytebuddy/pool/TypePool$AbstractBase$ComponentTypeReference;
- (Ljava/lang/String;)Lnet/bytebuddy/pool/TypePool$AbstractBase$ComponentTypeReference;
+ (Ljava/lang/String;)L1net/bytebuddy/pool/TypePool$AbstractBase$ComponentTypeReference;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$ComponentTypeLocator$Illegal.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$ComponentTypeLocator$Illegal.eea
index 3a1540d30c..5ba593e1c5 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$ComponentTypeLocator$Illegal.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$ComponentTypeLocator$Illegal.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 bind
  (Ljava/lang/String;)Lnet/bytebuddy/pool/TypePool$AbstractBase$ComponentTypeReference;
- (Ljava/lang/String;)Lnet/bytebuddy/pool/TypePool$AbstractBase$ComponentTypeReference;
+ (Ljava/lang/String;)L1net/bytebuddy/pool/TypePool$AbstractBase$ComponentTypeReference;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$ForSignature$OfField.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$ForSignature$OfField.eea
index 62413b0308..0dcb2b1df5 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$ForSignature$OfField.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$ForSignature$OfField.eea
@@ -9,4 +9,4 @@ register
  (Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken;)V
 resolve
  ()Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$ForField;
- ()Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$ForField;
+ ()L1net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$ForField;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$ForSignature$OfMethod.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$ForSignature$OfMethod.eea
index cf97468399..674cfc0930 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$ForSignature$OfMethod.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$ForSignature$OfMethod.eea
@@ -13,10 +13,10 @@ resolve
  ()Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$ForMethod;
 visitExceptionType
  ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
- ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
+ ()L1net/bytebuddy/jar/asm/signature/SignatureVisitor; # @Inherited(net.bytebuddy.pool.TypePool$Default$GenericTypeRegistrant$RejectingSignatureVisitor)
 visitParameterType
  ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
- ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
+ ()L1net/bytebuddy/jar/asm/signature/SignatureVisitor; # @Inherited(net.bytebuddy.pool.TypePool$Default$GenericTypeRegistrant$RejectingSignatureVisitor)
 visitReturnType
  ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
- ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
+ ()L1net/bytebuddy/jar/asm/signature/SignatureVisitor; # @Inherited(net.bytebuddy.pool.TypePool$Default$GenericTypeRegistrant$RejectingSignatureVisitor)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$ForSignature$OfRecordComponent.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$ForSignature$OfRecordComponent.eea
index 55f488f793..368f5ddf3d 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$ForSignature$OfRecordComponent.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$ForSignature$OfRecordComponent.eea
@@ -9,4 +9,4 @@ register
  (Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken;)V
 resolve
  ()Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$ForRecordComponent;
- ()Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$ForRecordComponent;
+ ()L1net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$ForRecordComponent;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$ForSignature$OfType.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$ForSignature$OfType.eea
index 19c725d3b9..2cf95b221a 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$ForSignature$OfType.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$ForSignature$OfType.eea
@@ -13,7 +13,7 @@ resolve
  ()Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$ForType;
 visitInterface
  ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
- ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
+ ()L1net/bytebuddy/jar/asm/signature/SignatureVisitor; # @Inherited(net.bytebuddy.pool.TypePool$Default$GenericTypeRegistrant$RejectingSignatureVisitor)
 visitSuperclass
  ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
- ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
+ ()L1net/bytebuddy/jar/asm/signature/SignatureVisitor; # @Inherited(net.bytebuddy.pool.TypePool$Default$GenericTypeRegistrant$RejectingSignatureVisitor)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$ForSignature.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$ForSignature.eea
index 369ecf2663..1e204bb0b7 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$ForSignature.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$ForSignature.eea
@@ -24,10 +24,10 @@ resolve
  ()TT;
 visitClassBound
  ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
- ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
+ ()L1net/bytebuddy/jar/asm/signature/SignatureVisitor; # @Inherited(net.bytebuddy.pool.TypePool$Default$GenericTypeRegistrant$RejectingSignatureVisitor)
 visitFormalTypeParameter
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
 visitInterfaceBound
  ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
- ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
+ ()L1net/bytebuddy/jar/asm/signature/SignatureVisitor; # @Inherited(net.bytebuddy.pool.TypePool$Default$GenericTypeRegistrant$RejectingSignatureVisitor)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$IncompleteToken$AbstractBase.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$IncompleteToken$AbstractBase.eea
index 724fef360e..0cd214666e 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$IncompleteToken$AbstractBase.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$IncompleteToken$AbstractBase.eea
@@ -6,10 +6,10 @@ parameters
 
 appendDirectBound
  ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
- ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
+ ()L1net/bytebuddy/jar/asm/signature/SignatureVisitor;
 appendLowerBound
  ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
- ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
+ ()L1net/bytebuddy/jar/asm/signature/SignatureVisitor;
 appendUpperBound
  ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
- ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
+ ()L1net/bytebuddy/jar/asm/signature/SignatureVisitor;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$IncompleteToken$ForInnerClass.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$IncompleteToken$ForInnerClass.eea
index 5024f21fa5..1d0e9bd5e4 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$IncompleteToken$ForInnerClass.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$IncompleteToken$ForInnerClass.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toToken
  ()Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken;
- ()Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken;
+ ()L1net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$IncompleteToken$ForTopLevelType.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$IncompleteToken$ForTopLevelType.eea
index 0c3865d909..f19650025b 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$IncompleteToken$ForTopLevelType.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor$IncompleteToken$ForTopLevelType.eea
@@ -11,4 +11,4 @@ getName
  ()Ljava/lang/String;
 toToken
  ()Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken;
- ()Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken;
+ ()L1net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor.eea
index 471437abca..cecbb2736a 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeExtractor.eea
@@ -8,7 +8,7 @@ register
  (Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken;)V
 visitArrayType
  ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
- ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
+ ()L1net/bytebuddy/jar/asm/signature/SignatureVisitor; # @Inherited(net.bytebuddy.pool.TypePool$Default$GenericTypeRegistrant$RejectingSignatureVisitor)
 visitClassType
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
@@ -17,7 +17,7 @@ visitInnerClassType
  (Ljava/lang/String;)V
 visitTypeArgument
  (C)Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
- (C)Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
+ (C)L1net/bytebuddy/jar/asm/signature/SignatureVisitor; # @Inherited(net.bytebuddy.pool.TypePool$Default$GenericTypeRegistrant$RejectingSignatureVisitor)
 visitTypeVariable
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeRegistrant$RejectingSignatureVisitor.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeRegistrant$RejectingSignatureVisitor.eea
index caf7b00aef..0e0b4c1b45 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeRegistrant$RejectingSignatureVisitor.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$GenericTypeRegistrant$RejectingSignatureVisitor.eea
@@ -2,16 +2,16 @@ class net/bytebuddy/pool/TypePool$Default$GenericTypeRegistrant$RejectingSignatu
 
 visitArrayType
  ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
- ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
+ ()L1net/bytebuddy/jar/asm/signature/SignatureVisitor;
 visitClassBound
  ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
- ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
+ ()L1net/bytebuddy/jar/asm/signature/SignatureVisitor;
 visitClassType
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
 visitExceptionType
  ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
- ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
+ ()L1net/bytebuddy/jar/asm/signature/SignatureVisitor;
 visitFormalTypeParameter
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
@@ -20,22 +20,22 @@ visitInnerClassType
  (Ljava/lang/String;)V
 visitInterface
  ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
- ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
+ ()L1net/bytebuddy/jar/asm/signature/SignatureVisitor;
 visitInterfaceBound
  ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
- ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
+ ()L1net/bytebuddy/jar/asm/signature/SignatureVisitor;
 visitParameterType
  ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
- ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
+ ()L1net/bytebuddy/jar/asm/signature/SignatureVisitor;
 visitReturnType
  ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
- ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
+ ()L1net/bytebuddy/jar/asm/signature/SignatureVisitor;
 visitSuperclass
  ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
- ()Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
+ ()L1net/bytebuddy/jar/asm/signature/SignatureVisitor;
 visitTypeArgument
  (C)Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
- (C)Lnet/bytebuddy/jar/asm/signature/SignatureVisitor;
+ (C)L1net/bytebuddy/jar/asm/signature/SignatureVisitor;
 visitTypeVariable
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken$Resolution$Illegal.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken$Resolution$Illegal.eea
index 9f2726635f..692bb67f2e 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken$Resolution$Illegal.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken$Resolution$Illegal.eea
@@ -8,4 +8,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 resolve
  ()Lnet/bytebuddy/description/annotation/AnnotationDescription;
- ()Lnet/bytebuddy/description/annotation/AnnotationDescription;
+ ()L1net/bytebuddy/description/annotation/AnnotationDescription;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForGenericArray.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForGenericArray.eea
index 3f6efa1695..d48b64ae5e 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForGenericArray.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForGenericArray.eea
@@ -8,10 +8,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getTypePathPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 isPrimaryBound
  (Lnet/bytebuddy/pool/TypePool;)Z
  (Lnet/bytebuddy/pool/TypePool;)Z
 toGenericType
  (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;)L1net/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForLowerBoundWildcard.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForLowerBoundWildcard.eea
index fb5acb1d86..54b63d4c86 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForLowerBoundWildcard.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForLowerBoundWildcard.eea
@@ -8,10 +8,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getTypePathPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 isPrimaryBound
  (Lnet/bytebuddy/pool/TypePool;)Z
  (Lnet/bytebuddy/pool/TypePool;)Z
 toGenericType
  (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;)L1net/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForParameterizedType$Nested$LazyParameterizedType.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForParameterizedType$Nested$LazyParameterizedType.eea
index cf0e210845..682a29aba6 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForParameterizedType$Nested$LazyParameterizedType.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForParameterizedType$Nested$LazyParameterizedType.eea
@@ -14,4 +14,4 @@ getOwnerType
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDescription$Generic)
 getTypeArguments
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForParameterizedType$Nested.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForParameterizedType$Nested.eea
index 55195d69ab..186bad6d57 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForParameterizedType$Nested.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForParameterizedType$Nested.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getTypePathPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 isPrimaryBound
  (Lnet/bytebuddy/pool/TypePool;)Z
  (Lnet/bytebuddy/pool/TypePool;)Z
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForPrimitiveType.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForPrimitiveType.eea
index 43703c579c..87c596e666 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForPrimitiveType.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForPrimitiveType.eea
@@ -10,10 +10,10 @@ of
 
 getTypePathPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 isPrimaryBound
  (Lnet/bytebuddy/pool/TypePool;)Z
  (Lnet/bytebuddy/pool/TypePool;)Z
 toGenericType
  (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;)L1net/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForRawType.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForRawType.eea
index de08693f13..7f32c358e6 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForRawType.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForRawType.eea
@@ -8,10 +8,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getTypePathPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 isPrimaryBound
  (Lnet/bytebuddy/pool/TypePool;)Z
  (Lnet/bytebuddy/pool/TypePool;)Z
 toGenericType
  (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;)L1net/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForTypeVariable$UnresolvedTypeVariable.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForTypeVariable$UnresolvedTypeVariable.eea
index 6f725529a6..3502faeeba 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForTypeVariable$UnresolvedTypeVariable.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForTypeVariable$UnresolvedTypeVariable.eea
@@ -14,4 +14,4 @@ getTypeVariableSource
  ()Lnet/bytebuddy/description/TypeVariableSource;
 getUpperBounds
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForTypeVariable.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForTypeVariable.eea
index 927205ff54..e4b2381aef 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForTypeVariable.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForTypeVariable.eea
@@ -8,10 +8,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getTypePathPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 isPrimaryBound
  (Lnet/bytebuddy/pool/TypePool;)Z
  (Lnet/bytebuddy/pool/TypePool;)Z
 toGenericType
  (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;)L1net/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForUnboundWildcard$LazyUnboundWildcard.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForUnboundWildcard$LazyUnboundWildcard.eea
index 85dcbf6b1d..0a058bad48 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForUnboundWildcard$LazyUnboundWildcard.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForUnboundWildcard$LazyUnboundWildcard.eea
@@ -8,7 +8,7 @@ getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
 getLowerBounds
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getUpperBounds
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForUnboundWildcard.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForUnboundWildcard.eea
index 6c7e471b8c..f1c1e488b1 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForUnboundWildcard.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForUnboundWildcard.eea
@@ -6,7 +6,7 @@ super java/lang/Enum
 
 getTypePathPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 isPrimaryBound
  (Lnet/bytebuddy/pool/TypePool;)Z
  (Lnet/bytebuddy/pool/TypePool;)Z
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForUpperBoundWildcard$LazyUpperBoundWildcard.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForUpperBoundWildcard$LazyUpperBoundWildcard.eea
index 01c6118ec0..cc5dad2b14 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForUpperBoundWildcard$LazyUpperBoundWildcard.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForUpperBoundWildcard$LazyUpperBoundWildcard.eea
@@ -8,7 +8,7 @@ getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
 getLowerBounds
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic;
 getUpperBounds
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForUpperBoundWildcard.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForUpperBoundWildcard.eea
index e96166c2d2..8d3ea38c2e 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForUpperBoundWildcard.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$ForUpperBoundWildcard.eea
@@ -8,10 +8,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getTypePathPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 isPrimaryBound
  (Lnet/bytebuddy/pool/TypePool;)Z
  (Lnet/bytebuddy/pool/TypePool;)Z
 toGenericType
  (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;)L1net/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$ForMethod$Tokenized.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$ForMethod$Tokenized.eea
index 4316222072..91ef73f2c8 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$ForMethod$Tokenized.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$ForMethod$Tokenized.eea
@@ -8,13 +8,13 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 resolveExceptionTypes
  (Ljava/util/List<Ljava/lang/String;>;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)Lnet/bytebuddy/description/type/TypeList$Generic;
- (Ljava/util/List<Ljava/lang/String;>;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)Lnet/bytebuddy/description/type/TypeList$Generic;
+ (Ljava/util/List<Ljava/lang/String;>;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)L1net/bytebuddy/description/type/TypeList$Generic;
 resolveParameterTypes
  (Ljava/util/List<Ljava/lang/String;>;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)Lnet/bytebuddy/description/type/TypeList$Generic;
- (Ljava/util/List<Ljava/lang/String;>;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)Lnet/bytebuddy/description/type/TypeList$Generic;
+ (Ljava/util/List<Ljava/lang/String;>;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)L1net/bytebuddy/description/type/TypeList$Generic;
 resolveReturnType
  (Ljava/lang/String;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
  (Ljava/lang/String;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
 resolveTypeVariables
  (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;>;)Lnet/bytebuddy/description/type/TypeList$Generic;
- (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;>;)Lnet/bytebuddy/description/type/TypeList$Generic;
+ (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;>;)L1net/bytebuddy/description/type/TypeList$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$ForType$Tokenized.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$ForType$Tokenized.eea
index a431cb07a0..5e4740e3a4 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$ForType$Tokenized.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$ForType$Tokenized.eea
@@ -8,10 +8,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 resolveInterfaceTypes
  (Ljava/util/List<Ljava/lang/String;>;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/description/type/TypeList$Generic;
- (Ljava/util/List<Ljava/lang/String;>;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/description/type/TypeList$Generic;
+ (Ljava/util/List<Ljava/lang/String;>;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/description/type/TypeList$Generic;
 resolveSuperClass
  (Ljava/lang/String;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
  (Ljava/lang/String;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
 resolveTypeVariables
  (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;>;)Lnet/bytebuddy/description/type/TypeList$Generic;
- (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;>;)Lnet/bytebuddy/description/type/TypeList$Generic;
+ (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;>;)L1net/bytebuddy/description/type/TypeList$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$Malformed.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$Malformed.eea
index dada5d04c1..506ad5959b 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$Malformed.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$Malformed.eea
@@ -6,25 +6,25 @@ super java/lang/Enum
 
 resolveExceptionTypes
  (Ljava/util/List<Ljava/lang/String;>;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)Lnet/bytebuddy/description/type/TypeList$Generic;
- (Ljava/util/List<Ljava/lang/String;>;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)Lnet/bytebuddy/description/type/TypeList$Generic;
+ (Ljava/util/List<Ljava/lang/String;>;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)L1net/bytebuddy/description/type/TypeList$Generic;
 resolveFieldType
  (Ljava/lang/String;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Ljava/lang/String;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Ljava/lang/String;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;)L1net/bytebuddy/description/type/TypeDescription$Generic;
 resolveInterfaceTypes
  (Ljava/util/List<Ljava/lang/String;>;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/description/type/TypeList$Generic;
- (Ljava/util/List<Ljava/lang/String;>;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/description/type/TypeList$Generic;
+ (Ljava/util/List<Ljava/lang/String;>;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/description/type/TypeList$Generic;
 resolveParameterTypes
  (Ljava/util/List<Ljava/lang/String;>;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)Lnet/bytebuddy/description/type/TypeList$Generic;
- (Ljava/util/List<Ljava/lang/String;>;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)Lnet/bytebuddy/description/type/TypeList$Generic;
+ (Ljava/util/List<Ljava/lang/String;>;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)L1net/bytebuddy/description/type/TypeList$Generic;
 resolveRecordType
  (Ljava/lang/String;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Ljava/lang/String;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Ljava/lang/String;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;)L1net/bytebuddy/description/type/TypeDescription$Generic;
 resolveReturnType
  (Ljava/lang/String;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Ljava/lang/String;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Ljava/lang/String;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)L1net/bytebuddy/description/type/TypeDescription$Generic;
 resolveSuperClass
  (Ljava/lang/String;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (Ljava/lang/String;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (Ljava/lang/String;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/description/type/TypeDescription$Generic;
 resolveTypeVariables
  (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;>;)Lnet/bytebuddy/description/type/TypeList$Generic;
- (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;>;)Lnet/bytebuddy/description/type/TypeList$Generic;
+ (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;>;)L1net/bytebuddy/description/type/TypeList$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$Raw$RawAnnotatedType$LazyRawAnnotatedTypeList.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$Raw$RawAnnotatedType$LazyRawAnnotatedTypeList.eea
index d40e5aa49a..09f1d862e7 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$Raw$RawAnnotatedType$LazyRawAnnotatedTypeList.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$Raw$RawAnnotatedType$LazyRawAnnotatedTypeList.eea
@@ -9,10 +9,10 @@ of
  (Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Ljava/util/List<Ljava/lang/String;>;)V
 asErasures
  ()Lnet/bytebuddy/description/type/TypeList;
- ()Lnet/bytebuddy/description/type/TypeList;
+ ()L1net/bytebuddy/description/type/TypeList; # @Inherited(net.bytebuddy.description.type.TypeList$Generic$AbstractBase)
 asRawTypes
  ()Lnet/bytebuddy/description/type/TypeList$Generic;
- ()Lnet/bytebuddy/description/type/TypeList$Generic;
+ ()L1net/bytebuddy/description/type/TypeList$Generic; # @Inherited(net.bytebuddy.description.type.TypeList$Generic$AbstractBase)
 get
  (I)Lnet/bytebuddy/description/type/TypeDescription$Generic;
  (I)Lnet/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$Raw.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$Raw.eea
index 659e022832..33a4d0e88f 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$Raw.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$GenericTypeToken$Resolution$Raw.eea
@@ -27,4 +27,4 @@ resolveSuperClass
  (Ljava/lang/String;Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/description/type/TypeDescription$Generic;
 resolveTypeVariables
  (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;>;)Lnet/bytebuddy/description/type/TypeList$Generic;
- (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;>;)Lnet/bytebuddy/description/type/TypeList$Generic;
+ (Lnet/bytebuddy/pool/TypePool;Lnet/bytebuddy/description/TypeVariableSource;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/Integer;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lnet/bytebuddy/pool/TypePool$Default$LazyTypeDescription$AnnotationToken;>;>;>;>;)L1net/bytebuddy/description/type/TypeList$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$LazyMethodDescription$LazyParameterizedReceiverType$TypeArgumentList.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$LazyMethodDescription$LazyParameterizedReceiverType$TypeArgumentList.eea
index 2ae716bd0d..1ceec15de6 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$LazyMethodDescription$LazyParameterizedReceiverType$TypeArgumentList.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$LazyMethodDescription$LazyParameterizedReceiverType$TypeArgumentList.eea
@@ -5,4 +5,4 @@ class net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$LazyMethodDescript
  (Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDescription$Generic;>;)V
 get
  (I)Lnet/bytebuddy/description/type/TypeDescription$Generic;
- (I)Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ (I)L1net/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$TokenizedGenericType$Malformed$TokenList.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$TokenizedGenericType$Malformed$TokenList.eea
index d7789ab1f0..45f74c68d1 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$TokenizedGenericType$Malformed$TokenList.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$TokenizedGenericType$Malformed$TokenList.eea
@@ -5,7 +5,7 @@ class net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$TokenizedGenericTy
  (Lnet/bytebuddy/pool/TypePool;Ljava/util/List<Ljava/lang/String;>;)V
 asErasures
  ()Lnet/bytebuddy/description/type/TypeList;
- ()Lnet/bytebuddy/description/type/TypeList;
+ ()L1net/bytebuddy/description/type/TypeList; # @Inherited(net.bytebuddy.description.type.TypeList$Generic$AbstractBase)
 get
  (I)Lnet/bytebuddy/description/type/TypeDescription$Generic;
  (I)Lnet/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$TokenizedGenericType$Malformed.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$TokenizedGenericType$Malformed.eea
index c66bd89e8f..9d7f66d51d 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$TokenizedGenericType$Malformed.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$TokenizedGenericType$Malformed.eea
@@ -8,7 +8,7 @@ asErasure
  ()Lnet/bytebuddy/description/type/TypeDescription;
 getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 resolve
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
- ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
+ ()L1net/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$TokenizedGenericType$TokenList.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$TokenizedGenericType$TokenList.eea
index 027b710f03..793eebcdcf 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$TokenizedGenericType$TokenList.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$TokenizedGenericType$TokenList.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/pool/TypePool$Default$LazyTypeDescription$TokenizedGenericTy
 
 asErasures
  ()Lnet/bytebuddy/description/type/TypeList;
- ()Lnet/bytebuddy/description/type/TypeList;
+ ()L1net/bytebuddy/description/type/TypeList; # @Inherited(net.bytebuddy.description.type.TypeList$Generic$AbstractBase)
 get
  (I)Lnet/bytebuddy/description/type/TypeDescription$Generic;
  (I)Lnet/bytebuddy/description/type/TypeDescription$Generic;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription.eea
index bb9b954996..8ce8913774 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$LazyTypeDescription.eea
@@ -11,10 +11,10 @@ getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
 getDeclaredFields
  ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/field/FieldList<Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;>;
 getDeclaredMethods
  ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/method/MethodList<Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;>;
 getDeclaredTypes
  ()Lnet/bytebuddy/description/type/TypeList;
  ()Lnet/bytebuddy/description/type/TypeList;
@@ -50,7 +50,7 @@ getPermittedSubtypes
  ()Lnet/bytebuddy/description/type/TypeList;
 getRecordComponents
  ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;
- ()Lnet/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;
+ ()L1net/bytebuddy/description/type/RecordComponentList<Lnet/bytebuddy/description/type/RecordComponentDescription$InDefinedShape;>;
 getSuperClass
  ()Lnet/bytebuddy/description/type/TypeDescription$Generic;
  ()L0net/bytebuddy/description/type/TypeDescription$Generic; # @Inherited(net.bytebuddy.description.type.TypeDefinition)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$TypeExtractor.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$TypeExtractor.eea
index 9b612da7c4..f2e9220245 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$TypeExtractor.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$TypeExtractor.eea
@@ -35,7 +35,7 @@ visitPermittedSubclass
  (Ljava/lang/String;)V
 visitRecordComponent
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lnet/bytebuddy/jar/asm/RecordComponentVisitor;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lnet/bytebuddy/jar/asm/RecordComponentVisitor;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1net/bytebuddy/jar/asm/RecordComponentVisitor;
 visitTypeAnnotation
  (ILnet/bytebuddy/jar/asm/TypePath;Ljava/lang/String;Z)Lnet/bytebuddy/jar/asm/AnnotationVisitor;
- (ILnet/bytebuddy/jar/asm/TypePath;Ljava/lang/String;Z)Lnet/bytebuddy/jar/asm/AnnotationVisitor;
+ (ILnet/bytebuddy/jar/asm/TypePath;Ljava/lang/String;Z)L1net/bytebuddy/jar/asm/AnnotationVisitor;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$WithLazyResolution.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$WithLazyResolution.eea
index a65b47d023..0d44fdaf75 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$WithLazyResolution.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default$WithLazyResolution.eea
@@ -5,7 +5,7 @@ of
  (Ljava/lang/ClassLoader;)Lnet/bytebuddy/pool/TypePool;
 of
  (Lnet/bytebuddy/dynamic/ClassFileLocator;)Lnet/bytebuddy/pool/TypePool;
- (Lnet/bytebuddy/dynamic/ClassFileLocator;)Lnet/bytebuddy/pool/TypePool;
+ (Lnet/bytebuddy/dynamic/ClassFileLocator;)L1net/bytebuddy/pool/TypePool;
 ofBootLoader
  ()Lnet/bytebuddy/pool/TypePool;
  ()Lnet/bytebuddy/pool/TypePool;
@@ -33,7 +33,7 @@ doCache
  (Ljava/lang/String;Lnet/bytebuddy/pool/TypePool$Resolution;)Lnet/bytebuddy/pool/TypePool$Resolution;
 doDescribe
  (Ljava/lang/String;)Lnet/bytebuddy/pool/TypePool$Resolution;
- (Ljava/lang/String;)Lnet/bytebuddy/pool/TypePool$Resolution;
+ (Ljava/lang/String;)L1net/bytebuddy/pool/TypePool$Resolution; # @Inherited(net.bytebuddy.pool.TypePool$Default)
 doResolve
  (Ljava/lang/String;)Lnet/bytebuddy/pool/TypePool$Resolution;
  (Ljava/lang/String;)Lnet/bytebuddy/pool/TypePool$Resolution;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default.eea
index fde232012b..9fa075286a 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Default.eea
@@ -40,7 +40,7 @@ readerMode
  (Lnet/bytebuddy/pool/TypePool$CacheProvider;Lnet/bytebuddy/dynamic/ClassFileLocator;Lnet/bytebuddy/pool/TypePool$Default$ReaderMode;Lnet/bytebuddy/utility/AsmClassReader$Factory;Lnet/bytebuddy/pool/TypePool;)V
 doDescribe
  (Ljava/lang/String;)Lnet/bytebuddy/pool/TypePool$Resolution;
- (Ljava/lang/String;)Lnet/bytebuddy/pool/TypePool$Resolution;
+ (Ljava/lang/String;)L1net/bytebuddy/pool/TypePool$Resolution;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(net.bytebuddy.pool.TypePool$AbstractBase$Hierarchical)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Empty.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Empty.eea
index 7d1aab344e..87af30b020 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Empty.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Empty.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 describe
  (Ljava/lang/String;)Lnet/bytebuddy/pool/TypePool$Resolution;
- (Ljava/lang/String;)Lnet/bytebuddy/pool/TypePool$Resolution;
+ (Ljava/lang/String;)L1net/bytebuddy/pool/TypePool$Resolution;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Explicit.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Explicit.eea
index c9fdf03200..96f312621c 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Explicit.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Explicit.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/pool/TypePool$Explicit
 
 wrap
  (Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/List<+Lnet/bytebuddy/dynamic/DynamicType;>;Lnet/bytebuddy/pool/TypePool;)Lnet/bytebuddy/pool/TypePool;
- (Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/List<+Lnet/bytebuddy/dynamic/DynamicType;>;Lnet/bytebuddy/pool/TypePool;)Lnet/bytebuddy/pool/TypePool;
+ (Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/List<+Lnet/bytebuddy/dynamic/DynamicType;>;Lnet/bytebuddy/pool/TypePool;)L1net/bytebuddy/pool/TypePool;
 
 <init>
  (Ljava/util/Map<Ljava/lang/String;Lnet/bytebuddy/description/type/TypeDescription;>;)V
@@ -12,7 +12,7 @@ wrap
  (Lnet/bytebuddy/pool/TypePool;Ljava/util/Map<Ljava/lang/String;Lnet/bytebuddy/description/type/TypeDescription;>;)V
 doDescribe
  (Ljava/lang/String;)Lnet/bytebuddy/pool/TypePool$Resolution;
- (Ljava/lang/String;)Lnet/bytebuddy/pool/TypePool$Resolution;
+ (Ljava/lang/String;)L1net/bytebuddy/pool/TypePool$Resolution;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(net.bytebuddy.pool.TypePool$AbstractBase$Hierarchical)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$LazyFacade.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$LazyFacade.eea
index 1eb15a15de..1fdfc07b33 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$LazyFacade.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$LazyFacade.eea
@@ -5,7 +5,7 @@ class net/bytebuddy/pool/TypePool$LazyFacade
  (Lnet/bytebuddy/pool/TypePool;)V
 doDescribe
  (Ljava/lang/String;)Lnet/bytebuddy/pool/TypePool$Resolution;
- (Ljava/lang/String;)Lnet/bytebuddy/pool/TypePool$Resolution;
+ (Ljava/lang/String;)L1net/bytebuddy/pool/TypePool$Resolution;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(net.bytebuddy.pool.TypePool$AbstractBase)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Resolution$Illegal.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Resolution$Illegal.eea
index 0245cd71f2..d6e074bb70 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Resolution$Illegal.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/pool/TypePool$Resolution$Illegal.eea
@@ -8,4 +8,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 resolve
  ()Lnet/bytebuddy/description/type/TypeDescription;
- ()Lnet/bytebuddy/description/type/TypeDescription;
+ ()L1net/bytebuddy/description/type/TypeDescription;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/AsmClassReader$Factory$Default.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/AsmClassReader$Factory$Default.eea
index 62f056a6d9..7ff1b7d9e8 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/AsmClassReader$Factory$Default.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/AsmClassReader$Factory$Default.eea
@@ -6,7 +6,7 @@ super java/lang/Enum
 
 make
  ([B)Lnet/bytebuddy/utility/AsmClassReader;
- ([B)Lnet/bytebuddy/utility/AsmClassReader;
+ ([B)L1net/bytebuddy/utility/AsmClassReader;
 make
  ([BZ)Lnet/bytebuddy/utility/AsmClassReader;
- ([BZ)Lnet/bytebuddy/utility/AsmClassReader;
+ ([BZ)L1net/bytebuddy/utility/AsmClassReader;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/AsmClassWriter$Factory$Default.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/AsmClassWriter$Factory$Default.eea
index a8597e67be..48d840233f 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/AsmClassWriter$Factory$Default.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/AsmClassWriter$Factory$Default.eea
@@ -9,7 +9,7 @@ make
  (I)Lnet/bytebuddy/utility/AsmClassWriter;
 make
  (ILnet/bytebuddy/pool/TypePool;)Lnet/bytebuddy/utility/AsmClassWriter;
- (ILnet/bytebuddy/pool/TypePool;)Lnet/bytebuddy/utility/AsmClassWriter;
+ (ILnet/bytebuddy/pool/TypePool;)L1net/bytebuddy/utility/AsmClassWriter;
 make
  (ILnet/bytebuddy/utility/AsmClassReader;)Lnet/bytebuddy/utility/AsmClassWriter;
  (ILnet/bytebuddy/utility/AsmClassReader;)Lnet/bytebuddy/utility/AsmClassWriter;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/JavaConstant$Dynamic.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/JavaConstant$Dynamic.eea
index 553e0ca16a..5d421040c0 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/JavaConstant$Dynamic.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/JavaConstant$Dynamic.eea
@@ -100,7 +100,7 @@ toDescription
  ()Ljava/lang/Object;
 toStackManipulation
  ()Lnet/bytebuddy/implementation/bytecode/StackManipulation;
- ()Lnet/bytebuddy/implementation/bytecode/StackManipulation;
+ ()L1net/bytebuddy/implementation/bytecode/StackManipulation;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
@@ -109,4 +109,4 @@ withType
  (Ljava/lang/Class<*>;)Lnet/bytebuddy/utility/JavaConstant;
 withType
  (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/utility/JavaConstant;
- (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/utility/JavaConstant;
+ (Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/utility/JavaConstant;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/JavaConstant$MethodHandle.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/JavaConstant$MethodHandle.eea
index 6150b1ed24..433ff380a3 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/JavaConstant$MethodHandle.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/JavaConstant$MethodHandle.eea
@@ -24,31 +24,31 @@ of
  (Ljava/lang/reflect/Method;)Lnet/bytebuddy/utility/JavaConstant$MethodHandle;
 of
  (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)Lnet/bytebuddy/utility/JavaConstant$MethodHandle;
- (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)Lnet/bytebuddy/utility/JavaConstant$MethodHandle;
+ (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;)L1net/bytebuddy/utility/JavaConstant$MethodHandle;
 ofGetter
  (Ljava/lang/reflect/Field;)Lnet/bytebuddy/utility/JavaConstant$MethodHandle;
  (Ljava/lang/reflect/Field;)Lnet/bytebuddy/utility/JavaConstant$MethodHandle;
 ofGetter
  (Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;)Lnet/bytebuddy/utility/JavaConstant$MethodHandle;
- (Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;)Lnet/bytebuddy/utility/JavaConstant$MethodHandle;
+ (Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;)L1net/bytebuddy/utility/JavaConstant$MethodHandle;
 ofLoaded
  (Ljava/lang/Object;)Lnet/bytebuddy/utility/JavaConstant$MethodHandle;
  (Ljava/lang/Object;)Lnet/bytebuddy/utility/JavaConstant$MethodHandle;
 ofLoaded
  (Ljava/lang/Object;Ljava/lang/Object;)Lnet/bytebuddy/utility/JavaConstant$MethodHandle;
- (Ljava/lang/Object;Ljava/lang/Object;)Lnet/bytebuddy/utility/JavaConstant$MethodHandle;
+ (Ljava/lang/Object;Ljava/lang/Object;)L1net/bytebuddy/utility/JavaConstant$MethodHandle;
 ofSetter
  (Ljava/lang/reflect/Field;)Lnet/bytebuddy/utility/JavaConstant$MethodHandle;
  (Ljava/lang/reflect/Field;)Lnet/bytebuddy/utility/JavaConstant$MethodHandle;
 ofSetter
  (Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;)Lnet/bytebuddy/utility/JavaConstant$MethodHandle;
- (Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;)Lnet/bytebuddy/utility/JavaConstant$MethodHandle;
+ (Lnet/bytebuddy/description/field/FieldDescription$InDefinedShape;)L1net/bytebuddy/utility/JavaConstant$MethodHandle;
 ofSpecial
  (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Lnet/bytebuddy/utility/JavaConstant$MethodHandle;
  (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Lnet/bytebuddy/utility/JavaConstant$MethodHandle;
 ofSpecial
  (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/utility/JavaConstant$MethodHandle;
- (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/utility/JavaConstant$MethodHandle;
+ (Lnet/bytebuddy/description/method/MethodDescription$InDefinedShape;Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/utility/JavaConstant$MethodHandle;
 
 <init>
  (Lnet/bytebuddy/utility/JavaConstant$MethodHandle$HandleType;Lnet/bytebuddy/description/type/TypeDescription;Ljava/lang/String;Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDescription;>;)V
@@ -73,7 +73,7 @@ getOwnerType
  ()Lnet/bytebuddy/description/type/TypeDescription;
 getParameterTypes
  ()Lnet/bytebuddy/description/type/TypeList;
- ()Lnet/bytebuddy/description/type/TypeList;
+ ()L1net/bytebuddy/description/type/TypeList;
 getReturnType
  ()Lnet/bytebuddy/description/type/TypeDescription;
  ()Lnet/bytebuddy/description/type/TypeDescription;
@@ -85,7 +85,7 @@ toDescription
  ()Ljava/lang/Object;
 toStackManipulation
  ()Lnet/bytebuddy/implementation/bytecode/StackManipulation;
- ()Lnet/bytebuddy/implementation/bytecode/StackManipulation;
+ ()L1net/bytebuddy/implementation/bytecode/StackManipulation;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/JavaConstant$MethodType.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/JavaConstant$MethodType.eea
index 6b3712c6f4..4b2cc256f7 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/JavaConstant$MethodType.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/JavaConstant$MethodType.eea
@@ -11,13 +11,13 @@ of
  (Ljava/lang/reflect/Method;)Lnet/bytebuddy/utility/JavaConstant$MethodType;
 of
  (Lnet/bytebuddy/description/method/MethodDescription;)Lnet/bytebuddy/utility/JavaConstant$MethodType;
- (Lnet/bytebuddy/description/method/MethodDescription;)Lnet/bytebuddy/utility/JavaConstant$MethodType;
+ (Lnet/bytebuddy/description/method/MethodDescription;)L1net/bytebuddy/utility/JavaConstant$MethodType;
 of
  (Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/utility/JavaConstant$MethodType;
- (Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDescription;>;)Lnet/bytebuddy/utility/JavaConstant$MethodType;
+ (Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDescription;>;)L1net/bytebuddy/utility/JavaConstant$MethodType;
 of
  (Lnet/bytebuddy/description/type/TypeDescription;[Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/utility/JavaConstant$MethodType;
- (Lnet/bytebuddy/description/type/TypeDescription;[Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/utility/JavaConstant$MethodType;
+ (Lnet/bytebuddy/description/type/TypeDescription;[Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/utility/JavaConstant$MethodType;
 ofConstant
  (Ljava/lang/Class<*>;)Lnet/bytebuddy/utility/JavaConstant$MethodType;
  (Ljava/lang/Class<*>;)Lnet/bytebuddy/utility/JavaConstant$MethodType;
@@ -26,7 +26,7 @@ ofConstant
  (Ljava/lang/Object;)Lnet/bytebuddy/utility/JavaConstant$MethodType;
 ofConstant
  (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/utility/JavaConstant$MethodType;
- (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/utility/JavaConstant$MethodType;
+ (Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/utility/JavaConstant$MethodType;
 ofGetter
  (Ljava/lang/reflect/Field;)Lnet/bytebuddy/utility/JavaConstant$MethodType;
  (Ljava/lang/reflect/Field;)Lnet/bytebuddy/utility/JavaConstant$MethodType;
@@ -50,7 +50,7 @@ ofSignature
  (Ljava/lang/reflect/Method;)Lnet/bytebuddy/utility/JavaConstant$MethodType;
 ofSignature
  (Lnet/bytebuddy/description/method/MethodDescription;)Lnet/bytebuddy/utility/JavaConstant$MethodType;
- (Lnet/bytebuddy/description/method/MethodDescription;)Lnet/bytebuddy/utility/JavaConstant$MethodType;
+ (Lnet/bytebuddy/description/method/MethodDescription;)L1net/bytebuddy/utility/JavaConstant$MethodType;
 
 <init>
  (Lnet/bytebuddy/description/type/TypeDescription;Ljava/util/List<+Lnet/bytebuddy/description/type/TypeDescription;>;)V
@@ -63,10 +63,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getDescriptor
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getParameterTypes
  ()Lnet/bytebuddy/description/type/TypeList;
- ()Lnet/bytebuddy/description/type/TypeList;
+ ()L1net/bytebuddy/description/type/TypeList;
 getReturnType
  ()Lnet/bytebuddy/description/type/TypeDescription;
  ()Lnet/bytebuddy/description/type/TypeDescription;
@@ -78,7 +78,7 @@ toDescription
  ()Ljava/lang/Object;
 toStackManipulation
  ()Lnet/bytebuddy/implementation/bytecode/StackManipulation;
- ()Lnet/bytebuddy/implementation/bytecode/StackManipulation;
+ ()L1net/bytebuddy/implementation/bytecode/StackManipulation;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/JavaConstant$Simple$OfTrivialValue$ForString.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/JavaConstant$Simple$OfTrivialValue$ForString.eea
index 1536505b60..54f32a0506 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/JavaConstant$Simple$OfTrivialValue$ForString.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/JavaConstant$Simple$OfTrivialValue$ForString.eea
@@ -9,4 +9,4 @@ super net/bytebuddy/utility/JavaConstant$Simple$OfTrivialValue
  (Ljava/lang/String;)V
 toStackManipulation
  ()Lnet/bytebuddy/implementation/bytecode/StackManipulation;
- ()Lnet/bytebuddy/implementation/bytecode/StackManipulation;
+ ()L1net/bytebuddy/implementation/bytecode/StackManipulation;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/JavaConstant$Simple.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/JavaConstant$Simple.eea
index e69235d663..036b6a1fa2 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/JavaConstant$Simple.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/JavaConstant$Simple.eea
@@ -26,7 +26,7 @@ METHOD_TYPE_DESC
 
 of
  (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/utility/JavaConstant;
- (Lnet/bytebuddy/description/type/TypeDescription;)Lnet/bytebuddy/utility/JavaConstant;
+ (Lnet/bytebuddy/description/type/TypeDescription;)L1net/bytebuddy/utility/JavaConstant;
 ofDescription
  (Ljava/lang/Object;Ljava/lang/ClassLoader;)Lnet/bytebuddy/utility/JavaConstant;
  (Ljava/lang/Object;Ljava/lang/ClassLoader;)Lnet/bytebuddy/utility/JavaConstant;
@@ -47,7 +47,7 @@ wrap
  (Ljava/lang/Object;)Lnet/bytebuddy/utility/JavaConstant;
 wrap
  (Ljava/util/List<*>;)Ljava/util/List<Lnet/bytebuddy/utility/JavaConstant;>;
- (Ljava/util/List<*>;)Ljava/util/List<Lnet/bytebuddy/utility/JavaConstant;>;
+ (Ljava/util/List<*>;)L1java/util/List<Lnet/bytebuddy/utility/JavaConstant;>;
 
 value
  TT;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/JavaModule.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/JavaModule.eea
index 3557735b72..95afc956ff 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/JavaModule.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/JavaModule.eea
@@ -12,7 +12,7 @@ UNSUPPORTED
 
 of
  (Ljava/lang/Object;)Lnet/bytebuddy/utility/JavaModule;
- (Ljava/lang/Object;)Lnet/bytebuddy/utility/JavaModule;
+ (Ljava/lang/Object;)L1net/bytebuddy/utility/JavaModule;
 ofType
  (Ljava/lang/Class<*>;)Lnet/bytebuddy/utility/JavaModule;
  (Ljava/lang/Class<*>;)L0net/bytebuddy/utility/JavaModule;
@@ -34,7 +34,7 @@ getClassLoader
  ()L0java/lang/ClassLoader;
 getDeclaredAnnotations
  ()Lnet/bytebuddy/description/annotation/AnnotationList;
- ()Lnet/bytebuddy/description/annotation/AnnotationList;
+ ()L1net/bytebuddy/description/annotation/AnnotationList;
 getPackages
  ()Ljava/util/Set<Ljava/lang/String;>;
  ()Ljava/util/Set<Ljava/lang/String;>;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/OpenedClassReader.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/OpenedClassReader.eea
index 74ed3fe6ed..ffff5a476b 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/OpenedClassReader.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/OpenedClassReader.eea
@@ -9,11 +9,11 @@ of
  ([B)Lnet/bytebuddy/jar/asm/ClassReader;
 of
  ([BZ)Lnet/bytebuddy/jar/asm/ClassReader;
- ([BZ)Lnet/bytebuddy/jar/asm/ClassReader;
+ ([BZ)L1net/bytebuddy/jar/asm/ClassReader;
 
 make
  ([B)Lnet/bytebuddy/utility/AsmClassReader;
- ([B)Lnet/bytebuddy/utility/AsmClassReader;
+ ([B)L1net/bytebuddy/utility/AsmClassReader;
 make
  ([BZ)Lnet/bytebuddy/utility/AsmClassReader;
- ([BZ)Lnet/bytebuddy/utility/AsmClassReader;
+ ([BZ)L1net/bytebuddy/utility/AsmClassReader;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/RandomString.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/RandomString.eea
index 93307b281e..56890c8e3f 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/RandomString.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/RandomString.eea
@@ -2,7 +2,7 @@ class net/bytebuddy/utility/RandomString
 
 hashOf
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 hashOf
  (Ljava/lang/Object;)Ljava/lang/String;
  (Ljava/lang/Object;)Ljava/lang/String;
@@ -18,4 +18,4 @@ make
  (ILjava/util/Random;)V
 nextString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/StreamDrainer.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/StreamDrainer.eea
index 0ac7e2dc2c..48c38235ee 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/StreamDrainer.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/StreamDrainer.eea
@@ -6,7 +6,7 @@ DEFAULT
 
 drain
  (Ljava/io/InputStream;)[B
- (Ljava/io/InputStream;)[B
+ (Ljava/io/InputStream;)[1B
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/dispatcher/JavaDispatcher.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/dispatcher/JavaDispatcher.eea
index d190a1d4aa..22c6557a30 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/dispatcher/JavaDispatcher.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/dispatcher/JavaDispatcher.eea
@@ -18,7 +18,7 @@ of
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/ClassLoader;)Ljava/security/PrivilegedAction<TT;>;
 of
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/ClassLoader;Z)Ljava/security/PrivilegedAction<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/ClassLoader;Z)Ljava/security/PrivilegedAction<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/ClassLoader;Z)L1java/security/PrivilegedAction<TT;>;
 
 <init>
  (Ljava/lang/Class<TT;>;Ljava/lang/ClassLoader;Z)V
diff --git a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/visitor/StackAwareMethodVisitor.eea b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/visitor/StackAwareMethodVisitor.eea
index 88da595e50..29b576ec8e 100644
--- a/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/visitor/StackAwareMethodVisitor.eea
+++ b/libs/eea-byte-buddy-1/src/main/resources/net/bytebuddy/utility/visitor/StackAwareMethodVisitor.eea
@@ -6,7 +6,7 @@ UNADJUSTED_PROPERTY
 
 of
  (Lnet/bytebuddy/jar/asm/MethodVisitor;Lnet/bytebuddy/description/method/MethodDescription;)Lnet/bytebuddy/jar/asm/MethodVisitor;
- (Lnet/bytebuddy/jar/asm/MethodVisitor;Lnet/bytebuddy/description/method/MethodDescription;)Lnet/bytebuddy/jar/asm/MethodVisitor;
+ (Lnet/bytebuddy/jar/asm/MethodVisitor;Lnet/bytebuddy/description/method/MethodDescription;)L1net/bytebuddy/jar/asm/MethodVisitor;
 
 <init>
  (Lnet/bytebuddy/jar/asm/MethodVisitor;Lnet/bytebuddy/description/method/MethodDescription;)V
diff --git a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/AnnotationEnumValue.eea b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/AnnotationEnumValue.eea
index 6b6a272646..fcac31b415 100644
--- a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/AnnotationEnumValue.eea
+++ b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/AnnotationEnumValue.eea
@@ -15,7 +15,7 @@ getClassName
  ()Ljava/lang/String;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getValueName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -24,7 +24,7 @@ loadClassAndReturnEnumValue
  ()Ljava/lang/Object;
 loadClassAndReturnEnumValue
  (Z)Ljava/lang/Object;
- (Z)Ljava/lang/Object;
+ (Z)L0java/lang/Object;
 toString
  (ZLjava/lang/StringBuilder;)V
  (ZLjava/lang/StringBuilder;)V
diff --git a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/AnnotationInfoList.eea b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/AnnotationInfoList.eea
index b02a0c35d1..79c75a0dfd 100644
--- a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/AnnotationInfoList.eea
+++ b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/AnnotationInfoList.eea
@@ -13,13 +13,13 @@ emptyList
  (Lio/github/classgraph/AnnotationInfoList;)V
 directOnly
  ()Lio/github/classgraph/AnnotationInfoList;
- ()Lio/github/classgraph/AnnotationInfoList;
+ ()L1io/github/classgraph/AnnotationInfoList;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(io.github.classgraph.InfoList)
 filter
  (Lio/github/classgraph/AnnotationInfoList$AnnotationInfoFilter;)Lio/github/classgraph/AnnotationInfoList;
- (Lio/github/classgraph/AnnotationInfoList$AnnotationInfoFilter;)Lio/github/classgraph/AnnotationInfoList;
+ (Lio/github/classgraph/AnnotationInfoList$AnnotationInfoFilter;)L1io/github/classgraph/AnnotationInfoList;
 findReferencedClassInfo
  (Ljava/util/Map<Ljava/lang/String;Lio/github/classgraph/ClassInfo;>;Ljava/util/Set<Lio/github/classgraph/ClassInfo;>;Lnonapi/io/github/classgraph/utils/LogNode;)V
  (Ljava/util/Map<Ljava/lang/String;Lio/github/classgraph/ClassInfo;>;Ljava/util/Set<Lio/github/classgraph/ClassInfo;>;Lnonapi/io/github/classgraph/utils/LogNode;)V
diff --git a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/AnnotationParameterValue.eea b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/AnnotationParameterValue.eea
index a162b427c6..9c58e510c2 100644
--- a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/AnnotationParameterValue.eea
+++ b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/AnnotationParameterValue.eea
@@ -15,10 +15,10 @@ findReferencedClassInfo
  (Ljava/util/Map<Ljava/lang/String;Lio/github/classgraph/ClassInfo;>;Ljava/util/Set<Lio/github/classgraph/ClassInfo;>;Lnonapi/io/github/classgraph/utils/LogNode;)V
 getClassInfo
  ()Lio/github/classgraph/ClassInfo;
- ()Lio/github/classgraph/ClassInfo;
+ ()L1io/github/classgraph/ClassInfo;
 getClassName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ArrayTypeSignature.eea b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ArrayTypeSignature.eea
index 426a51b327..b5a98a432b 100644
--- a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ArrayTypeSignature.eea
+++ b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ArrayTypeSignature.eea
@@ -38,7 +38,7 @@ loadClass
  ()Ljava/lang/Class<*>;
 loadClass
  (Z)Ljava/lang/Class<*>;
- (Z)Ljava/lang/Class<*>;
+ (Z)L0java/lang/Class<*>;
 loadElementClass
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
diff --git a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/BaseTypeSignature.eea b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/BaseTypeSignature.eea
index f0edc0943b..4b15ff42db 100644
--- a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/BaseTypeSignature.eea
+++ b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/BaseTypeSignature.eea
@@ -14,7 +14,7 @@ findReferencedClassNames
  (Ljava/util/Set<Ljava/lang/String;>;)V
 getClassInfo
  ()Lio/github/classgraph/ClassInfo;
- ()Lio/github/classgraph/ClassInfo;
+ ()L0io/github/classgraph/ClassInfo;
 getClassName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ClassInfo.eea b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ClassInfo.eea
index caa3facfc8..566ad9a430 100644
--- a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ClassInfo.eea
+++ b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ClassInfo.eea
@@ -148,7 +148,7 @@ getMethodParameterAnnotations
  ()L1io/github/classgraph/ClassInfoList;
 getModifiersStr
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getModuleInfo
  ()Lio/github/classgraph/ModuleInfo;
  ()L0io/github/classgraph/ModuleInfo;
diff --git a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ClassInfoList.eea b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ClassInfoList.eea
index ce1fce90f8..f81cd1635a 100644
--- a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ClassInfoList.eea
+++ b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ClassInfoList.eea
@@ -19,10 +19,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(io.github.classgraph.InfoList)
 exclude
  (Lio/github/classgraph/ClassInfoList;)Lio/github/classgraph/ClassInfoList;
- (Lio/github/classgraph/ClassInfoList;)Lio/github/classgraph/ClassInfoList;
+ (Lio/github/classgraph/ClassInfoList;)L1io/github/classgraph/ClassInfoList;
 filter
  (Lio/github/classgraph/ClassInfoList$ClassInfoFilter;)Lio/github/classgraph/ClassInfoList;
- (Lio/github/classgraph/ClassInfoList$ClassInfoFilter;)Lio/github/classgraph/ClassInfoList;
+ (Lio/github/classgraph/ClassInfoList$ClassInfoFilter;)L1io/github/classgraph/ClassInfoList;
 generateGraphVizDotFile
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -76,7 +76,7 @@ getStandardClasses
  ()Lio/github/classgraph/ClassInfoList;
 intersect
  ([Lio/github/classgraph/ClassInfoList;)Lio/github/classgraph/ClassInfoList;
- ([Lio/github/classgraph/ClassInfoList;)Lio/github/classgraph/ClassInfoList;
+ ([Lio/github/classgraph/ClassInfoList;)L1io/github/classgraph/ClassInfoList;
 loadClasses
  ()Ljava/util/List<Ljava/lang/Class<*>;>;
  ()Ljava/util/List<Ljava/lang/Class<*>;>;
@@ -91,4 +91,4 @@ loadClasses
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Z)Ljava/util/List<Ljava/lang/Class<TT;>;>;
 union
  ([Lio/github/classgraph/ClassInfoList;)Lio/github/classgraph/ClassInfoList;
- ([Lio/github/classgraph/ClassInfoList;)Lio/github/classgraph/ClassInfoList;
+ ([Lio/github/classgraph/ClassInfoList;)L1io/github/classgraph/ClassInfoList;
diff --git a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ClassTypeSignature.eea b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ClassTypeSignature.eea
index 87a82b161e..23978cf27a 100644
--- a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ClassTypeSignature.eea
+++ b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ClassTypeSignature.eea
@@ -17,7 +17,7 @@ getClassInfo
  ()Lio/github/classgraph/ClassInfo;
 getClassName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getSuperclassSignature
  ()Lio/github/classgraph/ClassRefTypeSignature;
  ()Lio/github/classgraph/ClassRefTypeSignature;
diff --git a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/FieldInfo.eea b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/FieldInfo.eea
index cd72625734..95df372e19 100644
--- a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/FieldInfo.eea
+++ b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/FieldInfo.eea
@@ -21,7 +21,7 @@ getModifierStr
  ()Ljava/lang/String;
 getModifiersStr
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getTypeDescriptor
  ()Lio/github/classgraph/TypeSignature;
  ()Lio/github/classgraph/TypeSignature;
diff --git a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/FieldInfoList.eea b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/FieldInfoList.eea
index 8f9bc05955..3734a0e909 100644
--- a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/FieldInfoList.eea
+++ b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/FieldInfoList.eea
@@ -13,7 +13,7 @@ emptyList
  (Ljava/util/Collection<Lio/github/classgraph/FieldInfo;>;)V
 filter
  (Lio/github/classgraph/FieldInfoList$FieldInfoFilter;)Lio/github/classgraph/FieldInfoList;
- (Lio/github/classgraph/FieldInfoList$FieldInfoFilter;)Lio/github/classgraph/FieldInfoList;
+ (Lio/github/classgraph/FieldInfoList$FieldInfoFilter;)L1io/github/classgraph/FieldInfoList;
 findReferencedClassInfo
  (Ljava/util/Map<Ljava/lang/String;Lio/github/classgraph/ClassInfo;>;Ljava/util/Set<Lio/github/classgraph/ClassInfo;>;Lnonapi/io/github/classgraph/utils/LogNode;)V
  (Ljava/util/Map<Ljava/lang/String;Lio/github/classgraph/ClassInfo;>;Ljava/util/Set<Lio/github/classgraph/ClassInfo;>;Lnonapi/io/github/classgraph/utils/LogNode;)V
diff --git a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/MethodInfo.eea b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/MethodInfo.eea
index 1ed2b2239b..fec048c3ab 100644
--- a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/MethodInfo.eea
+++ b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/MethodInfo.eea
@@ -15,7 +15,7 @@ findReferencedClassInfo
  (Ljava/util/Map<Ljava/lang/String;Lio/github/classgraph/ClassInfo;>;Ljava/util/Set<Lio/github/classgraph/ClassInfo;>;Lnonapi/io/github/classgraph/utils/LogNode;)V
 getModifiersStr
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getName
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(io.github.classgraph.ClassMemberInfo)
diff --git a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/MethodInfoList.eea b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/MethodInfoList.eea
index bfb7ca9122..2866e20469 100644
--- a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/MethodInfoList.eea
+++ b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/MethodInfoList.eea
@@ -13,13 +13,13 @@ emptyList
  (Ljava/util/Collection<Lio/github/classgraph/MethodInfo;>;)V
 asMap
  ()Ljava/util/Map<Ljava/lang/String;Lio/github/classgraph/MethodInfoList;>;
- ()Ljava/util/Map<Ljava/lang/String;Lio/github/classgraph/MethodInfoList;>;
+ ()L1java/util/Map<Ljava/lang/String;Lio/github/classgraph/MethodInfoList;>;
 containsName
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
 filter
  (Lio/github/classgraph/MethodInfoList$MethodInfoFilter;)Lio/github/classgraph/MethodInfoList;
- (Lio/github/classgraph/MethodInfoList$MethodInfoFilter;)Lio/github/classgraph/MethodInfoList;
+ (Lio/github/classgraph/MethodInfoList$MethodInfoFilter;)L1io/github/classgraph/MethodInfoList;
 findReferencedClassInfo
  (Ljava/util/Map<Ljava/lang/String;Lio/github/classgraph/ClassInfo;>;Ljava/util/Set<Lio/github/classgraph/ClassInfo;>;Lnonapi/io/github/classgraph/utils/LogNode;)V
  (Ljava/util/Map<Ljava/lang/String;Lio/github/classgraph/ClassInfo;>;Ljava/util/Set<Lio/github/classgraph/ClassInfo;>;Lnonapi/io/github/classgraph/utils/LogNode;)V
@@ -28,4 +28,4 @@ get
  (Ljava/lang/String;)Lio/github/classgraph/MethodInfoList;
 getSingleMethod
  (Ljava/lang/String;)Lio/github/classgraph/MethodInfo;
- (Ljava/lang/String;)Lio/github/classgraph/MethodInfo;
+ (Ljava/lang/String;)L0io/github/classgraph/MethodInfo;
diff --git a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/MethodParameterInfo.eea b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/MethodParameterInfo.eea
index 75862ebc35..1857bb7a29 100644
--- a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/MethodParameterInfo.eea
+++ b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/MethodParameterInfo.eea
@@ -23,7 +23,7 @@ getMethodInfo
  ()Lio/github/classgraph/MethodInfo;
 getModifiersStr
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -53,4 +53,4 @@ toString
  (ZLjava/lang/StringBuilder;)V
 toStringWithSimpleNames
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/MethodTypeSignature.eea b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/MethodTypeSignature.eea
index ac2b6e6ec5..d87e18dc77 100644
--- a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/MethodTypeSignature.eea
+++ b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/MethodTypeSignature.eea
@@ -14,10 +14,10 @@ findReferencedClassNames
  (Ljava/util/Set<Ljava/lang/String;>;)V
 getClassInfo
  ()Lio/github/classgraph/ClassInfo;
- ()Lio/github/classgraph/ClassInfo;
+ ()L1io/github/classgraph/ClassInfo;
 getClassName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getReceiverTypeAnnotationInfo
  ()Lio/github/classgraph/AnnotationInfoList;
  ()Lio/github/classgraph/AnnotationInfoList;
diff --git a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ModuleInfo.eea b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ModuleInfo.eea
index 9cd9c4cfee..6ed2ba6067 100644
--- a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ModuleInfo.eea
+++ b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ModuleInfo.eea
@@ -24,7 +24,7 @@ getClassInfo
  ()Lio/github/classgraph/ClassInfoList;
 getClassInfo
  (Ljava/lang/String;)Lio/github/classgraph/ClassInfo;
- (Ljava/lang/String;)Lio/github/classgraph/ClassInfo;
+ (Ljava/lang/String;)L0io/github/classgraph/ClassInfo;
 getLocation
  ()Ljava/net/URI;
  ()Ljava/net/URI;
@@ -39,7 +39,7 @@ getPackageInfo
  ()Lio/github/classgraph/PackageInfoList;
 getPackageInfo
  (Ljava/lang/String;)Lio/github/classgraph/PackageInfo;
- (Ljava/lang/String;)Lio/github/classgraph/PackageInfo;
+ (Ljava/lang/String;)L0io/github/classgraph/PackageInfo;
 hasAnnotation
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Z
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Z
diff --git a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ModuleInfoList.eea b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ModuleInfoList.eea
index ccd85dc05f..1693dfde25 100644
--- a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ModuleInfoList.eea
+++ b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ModuleInfoList.eea
@@ -6,4 +6,4 @@ super io/github/classgraph/MappableInfoList
 
 filter
  (Lio/github/classgraph/ModuleInfoList$ModuleInfoFilter;)Lio/github/classgraph/ModuleInfoList;
- (Lio/github/classgraph/ModuleInfoList$ModuleInfoFilter;)Lio/github/classgraph/ModuleInfoList;
+ (Lio/github/classgraph/ModuleInfoList$ModuleInfoFilter;)L1io/github/classgraph/ModuleInfoList;
diff --git a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ModuleRef.eea b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ModuleRef.eea
index 0ab873735d..52b8df37e2 100644
--- a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ModuleRef.eea
+++ b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ModuleRef.eea
@@ -45,7 +45,7 @@ getReference
  ()Ljava/lang/Object;
 open
  ()Lio/github/classgraph/ModuleReaderProxy;
- ()Lio/github/classgraph/ModuleReaderProxy;
+ ()L1io/github/classgraph/ModuleReaderProxy;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/PackageInfoList.eea b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/PackageInfoList.eea
index e02938e1d5..ea7531d5ea 100644
--- a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/PackageInfoList.eea
+++ b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/PackageInfoList.eea
@@ -6,4 +6,4 @@ super io/github/classgraph/MappableInfoList
 
 filter
  (Lio/github/classgraph/PackageInfoList$PackageInfoFilter;)Lio/github/classgraph/PackageInfoList;
- (Lio/github/classgraph/PackageInfoList$PackageInfoFilter;)Lio/github/classgraph/PackageInfoList;
+ (Lio/github/classgraph/PackageInfoList$PackageInfoFilter;)L1io/github/classgraph/PackageInfoList;
diff --git a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/Resource.eea b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/Resource.eea
index c1e496b3c4..75bfb78769 100644
--- a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/Resource.eea
+++ b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/Resource.eea
@@ -31,10 +31,10 @@ getClasspathElementURL
  ()Ljava/net/URL;
 getContentAsString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getModuleRef
  ()Lio/github/classgraph/ModuleRef;
- ()Lio/github/classgraph/ModuleRef;
+ ()L0io/github/classgraph/ModuleRef;
 getPath
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -46,7 +46,7 @@ getPosixFilePermissions
  ()Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;
 getURI
  ()Ljava/net/URI;
- ()Ljava/net/URI;
+ ()L1java/net/URI;
 getURL
  ()Ljava/net/URL;
  ()Ljava/net/URL;
@@ -61,7 +61,7 @@ read
  ()Ljava/nio/ByteBuffer;
 readCloseable
  ()Lio/github/classgraph/CloseableByteBuffer;
- ()Lio/github/classgraph/CloseableByteBuffer;
+ ()L1io/github/classgraph/CloseableByteBuffer;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ResourceList.eea b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ResourceList.eea
index fa4865f657..b0fd9a6ecd 100644
--- a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ResourceList.eea
+++ b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ResourceList.eea
@@ -13,16 +13,16 @@ emptyList
  (Ljava/util/Collection<Lio/github/classgraph/Resource;>;)V
 asMap
  ()Ljava/util/Map<Ljava/lang/String;Lio/github/classgraph/ResourceList;>;
- ()Ljava/util/Map<Ljava/lang/String;Lio/github/classgraph/ResourceList;>;
+ ()L1java/util/Map<Ljava/lang/String;Lio/github/classgraph/ResourceList;>;
 classFilesOnly
  ()Lio/github/classgraph/ResourceList;
  ()Lio/github/classgraph/ResourceList;
 filter
  (Lio/github/classgraph/ResourceList$ResourceFilter;)Lio/github/classgraph/ResourceList;
- (Lio/github/classgraph/ResourceList$ResourceFilter;)Lio/github/classgraph/ResourceList;
+ (Lio/github/classgraph/ResourceList$ResourceFilter;)L1io/github/classgraph/ResourceList;
 findDuplicatePaths
  ()Ljava/util/List<Ljava/util/Map$Entry<Ljava/lang/String;Lio/github/classgraph/ResourceList;>;>;
- ()Ljava/util/List<Ljava/util/Map$Entry<Ljava/lang/String;Lio/github/classgraph/ResourceList;>;>;
+ ()L1java/util/List<Ljava/util/Map$Entry<Ljava/lang/String;Lio/github/classgraph/ResourceList;>;>;
 forEachByteArray
  (Lio/github/classgraph/ResourceList$ByteArrayConsumer;)V
  (Lio/github/classgraph/ResourceList$ByteArrayConsumer;)V
@@ -64,16 +64,16 @@ get
  (Ljava/lang/String;)Lio/github/classgraph/ResourceList;
 getPaths
  ()Ljava/util/List<Ljava/lang/String;>;
- ()Ljava/util/List<Ljava/lang/String;>;
+ ()L1java/util/List<Ljava/lang/String;>;
 getPathsRelativeToClasspathElement
  ()Ljava/util/List<Ljava/lang/String;>;
- ()Ljava/util/List<Ljava/lang/String;>;
+ ()L1java/util/List<Ljava/lang/String;>;
 getURIs
  ()Ljava/util/List<Ljava/net/URI;>;
- ()Ljava/util/List<Ljava/net/URI;>;
+ ()L1java/util/List<Ljava/net/URI;>;
 getURLs
  ()Ljava/util/List<Ljava/net/URL;>;
- ()Ljava/util/List<Ljava/net/URL;>;
+ ()L1java/util/List<Ljava/net/URL;>;
 nonClassFilesOnly
  ()Lio/github/classgraph/ResourceList;
  ()Lio/github/classgraph/ResourceList;
diff --git a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ScanResult.eea b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ScanResult.eea
index ebd313bf0f..1fe79e31ef 100644
--- a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ScanResult.eea
+++ b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/ScanResult.eea
@@ -43,7 +43,7 @@ getAnnotationsOnClass
  (Ljava/lang/String;)Lio/github/classgraph/ClassInfoList;
 getClassDependencyMap
  ()Ljava/util/Map<Lio/github/classgraph/ClassInfo;Lio/github/classgraph/ClassInfoList;>;
- ()Ljava/util/Map<Lio/github/classgraph/ClassInfo;Lio/github/classgraph/ClassInfoList;>;
+ ()L1java/util/Map<Lio/github/classgraph/ClassInfo;Lio/github/classgraph/ClassInfoList;>;
 getClassInfo
  (Ljava/lang/String;)Lio/github/classgraph/ClassInfo;
  (Ljava/lang/String;)Lio/github/classgraph/ClassInfo;
@@ -94,13 +94,13 @@ getClasspath
  ()Ljava/lang/String;
 getClasspathFiles
  ()Ljava/util/List<Ljava/io/File;>;
- ()Ljava/util/List<Ljava/io/File;>;
+ ()L1java/util/List<Ljava/io/File;>;
 getClasspathURIs
  ()Ljava/util/List<Ljava/net/URI;>;
- ()Ljava/util/List<Ljava/net/URI;>;
+ ()L1java/util/List<Ljava/net/URI;>;
 getClasspathURLs
  ()Ljava/util/List<Ljava/net/URL;>;
- ()Ljava/util/List<Ljava/net/URL;>;
+ ()L1java/util/List<Ljava/net/URL;>;
 getInterfaces
  (Ljava/lang/Class<*>;)Lio/github/classgraph/ClassInfoList;
  (Ljava/lang/Class<*>;)Lio/github/classgraph/ClassInfoList;
@@ -109,7 +109,7 @@ getInterfaces
  (Ljava/lang/String;)Lio/github/classgraph/ClassInfoList;
 getModuleInfo
  ()Lio/github/classgraph/ModuleInfoList;
- ()Lio/github/classgraph/ModuleInfoList;
+ ()L1io/github/classgraph/ModuleInfoList;
 getModuleInfo
  (Ljava/lang/String;)Lio/github/classgraph/ModuleInfo;
  (Ljava/lang/String;)Lio/github/classgraph/ModuleInfo;
@@ -118,10 +118,10 @@ getModulePathInfo
  ()Lio/github/classgraph/ModulePathInfo;
 getModules
  ()Ljava/util/List<Lio/github/classgraph/ModuleRef;>;
- ()Ljava/util/List<Lio/github/classgraph/ModuleRef;>;
+ ()L1java/util/List<Lio/github/classgraph/ModuleRef;>;
 getPackageInfo
  ()Lio/github/classgraph/PackageInfoList;
- ()Lio/github/classgraph/PackageInfoList;
+ ()L1io/github/classgraph/PackageInfoList;
 getPackageInfo
  (Ljava/lang/String;)Lio/github/classgraph/PackageInfo;
  (Ljava/lang/String;)Lio/github/classgraph/PackageInfo;
@@ -139,16 +139,16 @@ getResourcesWithLeafName
  (Ljava/lang/String;)Lio/github/classgraph/ResourceList;
 getResourcesWithPath
  (Ljava/lang/String;)Lio/github/classgraph/ResourceList;
- (Ljava/lang/String;)Lio/github/classgraph/ResourceList;
+ (Ljava/lang/String;)L1io/github/classgraph/ResourceList;
 getResourcesWithPathIgnoringAccept
  (Ljava/lang/String;)Lio/github/classgraph/ResourceList;
- (Ljava/lang/String;)Lio/github/classgraph/ResourceList;
+ (Ljava/lang/String;)L1io/github/classgraph/ResourceList;
 getResourcesWithPathIgnoringWhitelist
  (Ljava/lang/String;)Lio/github/classgraph/ResourceList;
  (Ljava/lang/String;)Lio/github/classgraph/ResourceList;
 getReverseClassDependencyMap
  ()Ljava/util/Map<Lio/github/classgraph/ClassInfo;Lio/github/classgraph/ClassInfoList;>;
- ()Ljava/util/Map<Lio/github/classgraph/ClassInfo;Lio/github/classgraph/ClassInfoList;>;
+ ()L1java/util/Map<Lio/github/classgraph/ClassInfo;Lio/github/classgraph/ClassInfoList;>;
 getSubclasses
  (Ljava/lang/Class<*>;)Lio/github/classgraph/ClassInfoList;
  (Ljava/lang/Class<*>;)Lio/github/classgraph/ClassInfoList;
@@ -163,10 +163,10 @@ getSuperclasses
  (Ljava/lang/String;)Lio/github/classgraph/ClassInfoList;
 loadClass
  (Ljava/lang/String;Z)Ljava/lang/Class<*>;
- (Ljava/lang/String;Z)Ljava/lang/Class<*>;
+ (Ljava/lang/String;Z)L0java/lang/Class<*>;
 loadClass
  <T:Ljava/lang/Object;>(Ljava/lang/String;Ljava/lang/Class<TT;>;Z)Ljava/lang/Class<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/String;Ljava/lang/Class<TT;>;Z)Ljava/lang/Class<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/String;Ljava/lang/Class<TT;>;Z)L0java/lang/Class<TT;>;
 toJSON
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/TypeArgument.eea b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/TypeArgument.eea
index 23c6a45bf1..b161ab698f 100644
--- a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/TypeArgument.eea
+++ b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/TypeArgument.eea
@@ -11,10 +11,10 @@ findReferencedClassNames
  (Ljava/util/Set<Ljava/lang/String;>;)V
 getClassInfo
  ()Lio/github/classgraph/ClassInfo;
- ()Lio/github/classgraph/ClassInfo;
+ ()L1io/github/classgraph/ClassInfo;
 getClassName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getTypeSignature
  ()Lio/github/classgraph/ReferenceTypeSignature;
  ()Lio/github/classgraph/ReferenceTypeSignature;
diff --git a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/TypeParameter.eea b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/TypeParameter.eea
index 0388d9c034..c8c6d4064a 100644
--- a/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/TypeParameter.eea
+++ b/libs/eea-classgraph-4/src/main/resources/io/github/classgraph/TypeParameter.eea
@@ -17,10 +17,10 @@ getClassBound
  ()Lio/github/classgraph/ReferenceTypeSignature;
 getClassInfo
  ()Lio/github/classgraph/ClassInfo;
- ()Lio/github/classgraph/ClassInfo;
+ ()L1io/github/classgraph/ClassInfo;
 getClassName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getInterfaceBounds
  ()Ljava/util/List<Lio/github/classgraph/ReferenceTypeSignature;>;
  ()Ljava/util/List<Lio/github/classgraph/ReferenceTypeSignature;>;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/AbstractConfiguration.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/AbstractConfiguration.eea
index 652a65228c..7bdd0c609a 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/AbstractConfiguration.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/AbstractConfiguration.eea
@@ -113,7 +113,7 @@ getEncodedString
  (Ljava/lang/String;)Ljava/lang/String;
 getEncodedString
  (Ljava/lang/String;Lorg/apache/commons/configuration2/ConfigurationDecoder;)Ljava/lang/String;
- (Ljava/lang/String;Lorg/apache/commons/configuration2/ConfigurationDecoder;)Ljava/lang/String;
+ (Ljava/lang/String;Lorg/apache/commons/configuration2/ConfigurationDecoder;)L0java/lang/String;
 getFloat
  (Ljava/lang/String;)F
  (Ljava/lang/String;)F
@@ -143,16 +143,16 @@ getKeys
  (Ljava/lang/String;)Ljava/util/Iterator<Ljava/lang/String;>;
 getKeys
  (Ljava/lang/String;Ljava/lang/String;)Ljava/util/Iterator<Ljava/lang/String;>;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/util/Iterator<Ljava/lang/String;>;
+ (Ljava/lang/String;Ljava/lang/String;)L0java/util/Iterator<Ljava/lang/String;>; # @Inherited(org.apache.commons.configuration2.ImmutableConfiguration)
 getKeysInternal
  ()Ljava/util/Iterator<Ljava/lang/String;>;
  ()Ljava/util/Iterator<Ljava/lang/String;>;
 getKeysInternal
  (Ljava/lang/String;)Ljava/util/Iterator<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/Iterator<Ljava/lang/String;>;
+ (Ljava/lang/String;)L1java/util/Iterator<Ljava/lang/String;>;
 getKeysInternal
  (Ljava/lang/String;Ljava/lang/String;)Ljava/util/Iterator<Ljava/lang/String;>;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/util/Iterator<Ljava/lang/String;>;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/util/Iterator<Ljava/lang/String;>;
 getList
  (Ljava/lang/String;)Ljava/util/List<Ljava/lang/Object;>;
  (Ljava/lang/String;)Ljava/util/List<Ljava/lang/Object;>;
@@ -164,7 +164,7 @@ getList
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/String;)Ljava/util/List<TT;>;
 getList
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/String;Ljava/util/List<TT;>;)Ljava/util/List<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/String;Ljava/util/List<TT;>;)Ljava/util/List<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/String;Ljava/util/List<TT;>;)L0java/util/List<TT;>;
 getListDelimiterHandler
  ()Lorg/apache/commons/configuration2/convert/ListDelimiterHandler;
  ()Lorg/apache/commons/configuration2/convert/ListDelimiterHandler;
@@ -185,7 +185,7 @@ getProperties
  (Ljava/lang/String;)Ljava/util/Properties;
 getProperties
  (Ljava/lang/String;Ljava/util/Properties;)Ljava/util/Properties;
- (Ljava/lang/String;Ljava/util/Properties;)Ljava/util/Properties;
+ (Ljava/lang/String;Ljava/util/Properties;)L1java/util/Properties;
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;)Ljava/lang/Object;
@@ -272,7 +272,7 @@ setSynchronizer
  (Lorg/apache/commons/configuration2/sync/Synchronizer;)V
 subset
  (Ljava/lang/String;)Lorg/apache/commons/configuration2/Configuration;
- (Ljava/lang/String;)Lorg/apache/commons/configuration2/Configuration;
+ (Ljava/lang/String;)L1org/apache/commons/configuration2/Configuration;
 unlock
  (Lorg/apache/commons/configuration2/sync/LockMode;)V
  (Lorg/apache/commons/configuration2/sync/LockMode;)V
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.eea
index bbd484a1e8..37ace5d26f 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.eea
@@ -56,7 +56,7 @@ getKeysInternal
  ()Ljava/util/Iterator<Ljava/lang/String;>;
 getKeysInternal
  (Ljava/lang/String;)Ljava/util/Iterator<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/Iterator<Ljava/lang/String;>;
+ (Ljava/lang/String;)L1java/util/Iterator<Ljava/lang/String;>; # @Inherited(org.apache.commons.configuration2.AbstractConfiguration)
 getMaxIndex
  (Ljava/lang/String;)I
  (Ljava/lang/String;)I
@@ -71,7 +71,7 @@ getNodeModel
  ()Lorg/apache/commons/configuration2/tree/NodeModel<TT;>;
 getPropertyInternal
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 getRootElementName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -95,7 +95,7 @@ resolveNodeKey
  (TT;Ljava/lang/String;Lorg/apache/commons/configuration2/tree/NodeHandler<TT;>;)Ljava/util/List<TT;>;
 resolveUpdateKey
  (TT;Ljava/lang/String;Ljava/lang/Object;Lorg/apache/commons/configuration2/tree/NodeHandler<TT;>;)Lorg/apache/commons/configuration2/tree/NodeUpdateData<TT;>;
- (TT;Ljava/lang/String;Ljava/lang/Object;Lorg/apache/commons/configuration2/tree/NodeHandler<TT;>;)Lorg/apache/commons/configuration2/tree/NodeUpdateData<TT;>;
+ (TT;Ljava/lang/String;Ljava/lang/Object;Lorg/apache/commons/configuration2/tree/NodeHandler<TT;>;)L1org/apache/commons/configuration2/tree/NodeUpdateData<TT;>;
 setExpressionEngine
  (Lorg/apache/commons/configuration2/tree/ExpressionEngine;)V
  (Lorg/apache/commons/configuration2/tree/ExpressionEngine;)V
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/AbstractYAMLBasedConfiguration.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/AbstractYAMLBasedConfiguration.eea
index 17c3a36bf8..860b3b6293 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/AbstractYAMLBasedConfiguration.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/AbstractYAMLBasedConfiguration.eea
@@ -5,7 +5,7 @@ class org/apache/commons/configuration2/AbstractYAMLBasedConfiguration
  (Lorg/apache/commons/configuration2/HierarchicalConfiguration<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;)V
 constructMap
  (Lorg/apache/commons/configuration2/tree/ImmutableNode;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- (Lorg/apache/commons/configuration2/tree/ImmutableNode;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ (Lorg/apache/commons/configuration2/tree/ImmutableNode;)L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 load
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)V
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)V
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/BaseHierarchicalConfiguration.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/BaseHierarchicalConfiguration.eea
index 1703c8a7c3..a5c4a32704 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/BaseHierarchicalConfiguration.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/BaseHierarchicalConfiguration.eea
@@ -18,7 +18,7 @@ childConfigurationsAt
  (Ljava/lang/String;Z)Ljava/util/List<Lorg/apache/commons/configuration2/HierarchicalConfiguration<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;>;
 cloneNodeModel
  ()Lorg/apache/commons/configuration2/tree/NodeModel<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;
- ()Lorg/apache/commons/configuration2/tree/NodeModel<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;
+ ()L1org/apache/commons/configuration2/tree/NodeModel<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;
 configurationAt
  (Ljava/lang/String;)Lorg/apache/commons/configuration2/HierarchicalConfiguration<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;
  (Ljava/lang/String;)Lorg/apache/commons/configuration2/HierarchicalConfiguration<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;
@@ -33,13 +33,13 @@ configurationsAt
  (Ljava/lang/String;Z)Ljava/util/List<Lorg/apache/commons/configuration2/HierarchicalConfiguration<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;>;
 createSubConfigurationForTrackedNode
  (Lorg/apache/commons/configuration2/tree/NodeSelector;Lorg/apache/commons/configuration2/tree/InMemoryNodeModelSupport;)Lorg/apache/commons/configuration2/SubnodeConfiguration;
- (Lorg/apache/commons/configuration2/tree/NodeSelector;Lorg/apache/commons/configuration2/tree/InMemoryNodeModelSupport;)Lorg/apache/commons/configuration2/SubnodeConfiguration;
+ (Lorg/apache/commons/configuration2/tree/NodeSelector;Lorg/apache/commons/configuration2/tree/InMemoryNodeModelSupport;)L1org/apache/commons/configuration2/SubnodeConfiguration;
 getNodeModel
  ()Lorg/apache/commons/configuration2/tree/InMemoryNodeModel;
  ()Lorg/apache/commons/configuration2/tree/InMemoryNodeModel;
 getSubConfigurationNodeSelector
  (Ljava/lang/String;)Lorg/apache/commons/configuration2/tree/NodeSelector;
- (Ljava/lang/String;)Lorg/apache/commons/configuration2/tree/NodeSelector;
+ (Ljava/lang/String;)L1org/apache/commons/configuration2/tree/NodeSelector;
 getSubConfigurationParentModel
  ()Lorg/apache/commons/configuration2/tree/InMemoryNodeModel;
  ()Lorg/apache/commons/configuration2/tree/InMemoryNodeModel;
@@ -66,4 +66,4 @@ subnodeConfigurationChanged
  (Lorg/apache/commons/configuration2/event/ConfigurationEvent;)V
 subset
  (Ljava/lang/String;)Lorg/apache/commons/configuration2/Configuration;
- (Ljava/lang/String;)Lorg/apache/commons/configuration2/Configuration;
+ (Ljava/lang/String;)L1org/apache/commons/configuration2/Configuration; # @Inherited(org.apache.commons.configuration2.AbstractConfiguration)
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/CombinedConfiguration.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/CombinedConfiguration.eea
index 9e38ec6eec..1a6a4be276 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/CombinedConfiguration.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/CombinedConfiguration.eea
@@ -46,10 +46,10 @@ getNodeCombiner
  ()Lorg/apache/commons/configuration2/tree/NodeCombiner;
 getSource
  (Ljava/lang/String;)Lorg/apache/commons/configuration2/Configuration;
- (Ljava/lang/String;)Lorg/apache/commons/configuration2/Configuration;
+ (Ljava/lang/String;)L0org/apache/commons/configuration2/Configuration;
 getSources
  (Ljava/lang/String;)Ljava/util/Set<Lorg/apache/commons/configuration2/Configuration;>;
- (Ljava/lang/String;)Ljava/util/Set<Lorg/apache/commons/configuration2/Configuration;>;
+ (Ljava/lang/String;)L1java/util/Set<Lorg/apache/commons/configuration2/Configuration;>;
 onEvent
  (Lorg/apache/commons/configuration2/event/ConfigurationEvent;)V
  (Lorg/apache/commons/configuration2/event/ConfigurationEvent;)V
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/CompositeConfiguration.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/CompositeConfiguration.eea
index a32a8368a6..04abefcac8 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/CompositeConfiguration.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/CompositeConfiguration.eea
@@ -47,7 +47,7 @@ getKeysInternal
  ()Ljava/util/Iterator<Ljava/lang/String;>;
 getKeysInternal
  (Ljava/lang/String;)Ljava/util/Iterator<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/Iterator<Ljava/lang/String;>;
+ (Ljava/lang/String;)L1java/util/Iterator<Ljava/lang/String;>; # @Inherited(org.apache.commons.configuration2.AbstractConfiguration)
 getList
  (Ljava/lang/String;Ljava/util/List<*>;)Ljava/util/List<Ljava/lang/Object;>;
  (Ljava/lang/String;Ljava/util/List<*>;)Ljava/util/List<Ljava/lang/Object;>;
@@ -59,7 +59,7 @@ getSource
  (Ljava/lang/String;)Lorg/apache/commons/configuration2/Configuration;
 getStringArray
  (Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/String;)[1Ljava/lang/String;
 removeConfiguration
  (Lorg/apache/commons/configuration2/Configuration;)V
  (Lorg/apache/commons/configuration2/Configuration;)V
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/ConfigurationConverter.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/ConfigurationConverter.eea
index 261792a163..c2ce77ecd2 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/ConfigurationConverter.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/ConfigurationConverter.eea
@@ -2,13 +2,13 @@ class org/apache/commons/configuration2/ConfigurationConverter
 
 getConfiguration
  (Ljava/util/Properties;)Lorg/apache/commons/configuration2/Configuration;
- (Ljava/util/Properties;)Lorg/apache/commons/configuration2/Configuration;
+ (Ljava/util/Properties;)L1org/apache/commons/configuration2/Configuration;
 getMap
  (Lorg/apache/commons/configuration2/Configuration;)Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
- (Lorg/apache/commons/configuration2/Configuration;)Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
+ (Lorg/apache/commons/configuration2/Configuration;)L1java/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
 getProperties
  (Lorg/apache/commons/configuration2/Configuration;)Ljava/util/Properties;
  (Lorg/apache/commons/configuration2/Configuration;)Ljava/util/Properties;
 getProperties
  (Lorg/apache/commons/configuration2/ImmutableConfiguration;)Ljava/util/Properties;
- (Lorg/apache/commons/configuration2/ImmutableConfiguration;)Ljava/util/Properties;
+ (Lorg/apache/commons/configuration2/ImmutableConfiguration;)L1java/util/Properties;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/ConfigurationMap.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/ConfigurationMap.eea
index 5b59dc6b83..22e6bc26c8 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/ConfigurationMap.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/ConfigurationMap.eea
@@ -9,7 +9,7 @@ super java/util/AbstractMap
  (Lorg/apache/commons/configuration2/Configuration;)V
 entrySet
  ()Ljava/util/Set<Ljava/util/Map$Entry<Ljava/lang/Object;Ljava/lang/Object;>;>;
- ()Ljava/util/Set<Ljava/util/Map$Entry<Ljava/lang/Object;Ljava/lang/Object;>;>;
+ ()L1java/util/Set<Ljava/util/Map$Entry<Ljava/lang/Object;Ljava/lang/Object;>;>;
 get
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/ConfigurationUtils.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/ConfigurationUtils.eea
index c8000e27e7..09adc0a9bf 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/ConfigurationUtils.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/ConfigurationUtils.eea
@@ -56,7 +56,7 @@ toString
  (Lorg/apache/commons/configuration2/Configuration;)Ljava/lang/String;
 toString
  (Lorg/apache/commons/configuration2/ImmutableConfiguration;)Ljava/lang/String;
- (Lorg/apache/commons/configuration2/ImmutableConfiguration;)Ljava/lang/String;
+ (Lorg/apache/commons/configuration2/ImmutableConfiguration;)L1java/lang/String;
 unmodifiableConfiguration
  (Lorg/apache/commons/configuration2/Configuration;)Lorg/apache/commons/configuration2/ImmutableConfiguration;
  (Lorg/apache/commons/configuration2/Configuration;)Lorg/apache/commons/configuration2/ImmutableConfiguration;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/ConfigurationXMLReader.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/ConfigurationXMLReader.eea
index d98e7f805d..59bda7d79e 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/ConfigurationXMLReader.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/ConfigurationXMLReader.eea
@@ -18,13 +18,13 @@ getContentHandler
  ()Lorg/xml/sax/ContentHandler;
 getDTDHandler
  ()Lorg/xml/sax/DTDHandler;
- ()Lorg/xml/sax/DTDHandler;
+ ()L0org/xml/sax/DTDHandler;
 getEntityResolver
  ()Lorg/xml/sax/EntityResolver;
- ()Lorg/xml/sax/EntityResolver;
+ ()L0org/xml/sax/EntityResolver;
 getErrorHandler
  ()Lorg/xml/sax/ErrorHandler;
- ()Lorg/xml/sax/ErrorHandler;
+ ()L0org/xml/sax/ErrorHandler;
 getException
  ()Lorg/xml/sax/SAXException;
  ()Lorg/xml/sax/SAXException;
@@ -36,7 +36,7 @@ getParsedConfiguration
  ()Lorg/apache/commons/configuration2/Configuration;
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 getRootName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/DataConfiguration.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/DataConfiguration.eea
index 21ad99e8d0..95f91e8cd2 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/DataConfiguration.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/DataConfiguration.eea
@@ -78,7 +78,7 @@ getCalendar
  (Ljava/lang/String;)Ljava/util/Calendar;
 getCalendar
  (Ljava/lang/String;Ljava/lang/String;)Ljava/util/Calendar;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/util/Calendar;
+ (Ljava/lang/String;Ljava/lang/String;)L0java/util/Calendar;
 getCalendar
  (Ljava/lang/String;Ljava/util/Calendar;)Ljava/util/Calendar;
  (Ljava/lang/String;Ljava/util/Calendar;)Ljava/util/Calendar;
@@ -138,7 +138,7 @@ getDate
  (Ljava/lang/String;)Ljava/util/Date;
 getDate
  (Ljava/lang/String;Ljava/lang/String;)Ljava/util/Date;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/util/Date;
+ (Ljava/lang/String;Ljava/lang/String;)L0java/util/Date;
 getDate
  (Ljava/lang/String;Ljava/util/Date;)Ljava/util/Date;
  (Ljava/lang/String;Ljava/util/Date;)Ljava/util/Date;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/DynamicCombinedConfiguration.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/DynamicCombinedConfiguration.eea
index d6b6e865e7..2686e8e81d 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/DynamicCombinedConfiguration.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/DynamicCombinedConfiguration.eea
@@ -110,7 +110,7 @@ getKeysInternal
  ()Ljava/util/Iterator<Ljava/lang/String;>;
 getKeysInternal
  (Ljava/lang/String;)Ljava/util/Iterator<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/Iterator<Ljava/lang/String;>;
+ (Ljava/lang/String;)L1java/util/Iterator<Ljava/lang/String;>; # @Inherited(org.apache.commons.configuration2.AbstractHierarchicalConfiguration)
 getList
  (Ljava/lang/String;)Ljava/util/List<Ljava/lang/Object;>;
  (Ljava/lang/String;)Ljava/util/List<Ljava/lang/Object;>;
@@ -137,7 +137,7 @@ getProperties
  (Ljava/lang/String;)Ljava/util/Properties;
 getPropertyInternal
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object; # @Inherited(org.apache.commons.configuration2.AbstractHierarchicalConfiguration)
 getShort
  (Ljava/lang/String;)S
  (Ljava/lang/String;)S
@@ -149,7 +149,7 @@ getShort
  (Ljava/lang/String;S)S
 getSource
  (Ljava/lang/String;)Lorg/apache/commons/configuration2/Configuration;
- (Ljava/lang/String;)Lorg/apache/commons/configuration2/Configuration;
+ (Ljava/lang/String;)L0org/apache/commons/configuration2/Configuration; # @Inherited(org.apache.commons.configuration2.CombinedConfiguration)
 getString
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
@@ -188,4 +188,4 @@ setPropertyInternal
  (Ljava/lang/String;Ljava/lang/Object;)V
 subset
  (Ljava/lang/String;)Lorg/apache/commons/configuration2/Configuration;
- (Ljava/lang/String;)Lorg/apache/commons/configuration2/Configuration;
+ (Ljava/lang/String;)L1org/apache/commons/configuration2/Configuration; # @Inherited(org.apache.commons.configuration2.BaseHierarchicalConfiguration)
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/INIConfiguration.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/INIConfiguration.eea
index 9786e80819..c569f13423 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/INIConfiguration.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/INIConfiguration.eea
@@ -9,7 +9,7 @@ SEPARATOR_CHARS
 
 builder
  ()Lorg/apache/commons/configuration2/INIConfiguration$Builder;
- ()Lorg/apache/commons/configuration2/INIConfiguration$Builder;
+ ()L1org/apache/commons/configuration2/INIConfiguration$Builder;
 
 <init>
  (Lorg/apache/commons/configuration2/HierarchicalConfiguration<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;)V
@@ -22,7 +22,7 @@ getSection
  (Ljava/lang/String;)Lorg/apache/commons/configuration2/SubnodeConfiguration;
 getSections
  ()Ljava/util/Set<Ljava/lang/String;>;
- ()Ljava/util/Set<Ljava/lang/String;>;
+ ()L1java/util/Set<Ljava/lang/String;>;
 getSeparatorUsedInInput
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/ImmutableConfiguration.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/ImmutableConfiguration.eea
index 7b55580750..3b7ce26ed9 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/ImmutableConfiguration.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/ImmutableConfiguration.eea
@@ -107,7 +107,7 @@ getKeys
  (Ljava/lang/String;)Ljava/util/Iterator<Ljava/lang/String;>;
 getKeys
  (Ljava/lang/String;Ljava/lang/String;)Ljava/util/Iterator<Ljava/lang/String;>;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/util/Iterator<Ljava/lang/String;>;
+ (Ljava/lang/String;Ljava/lang/String;)L0java/util/Iterator<Ljava/lang/String;>;
 getList
  (Ljava/lang/String;)Ljava/util/List<Ljava/lang/Object;>;
  (Ljava/lang/String;)Ljava/util/List<Ljava/lang/Object;>;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/JNDIConfiguration.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/JNDIConfiguration.eea
index df8c02b687..4e9e03eda5 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/JNDIConfiguration.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/JNDIConfiguration.eea
@@ -32,13 +32,13 @@ getKeysInternal
  ()Ljava/util/Iterator<Ljava/lang/String;>;
 getKeysInternal
  (Ljava/lang/String;)Ljava/util/Iterator<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/Iterator<Ljava/lang/String;>;
+ (Ljava/lang/String;)L1java/util/Iterator<Ljava/lang/String;>; # @Inherited(org.apache.commons.configuration2.AbstractConfiguration)
 getPrefix
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getPropertyInternal
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 setContext
  (Ljavax/naming/Context;)V
  (Ljavax/naming/Context;)V
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.eea
index c98a2c12ab..8d43343200 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.eea
@@ -101,7 +101,7 @@ getKeysInternal
  ()Ljava/util/Iterator<Ljava/lang/String;>;
 getKeysInternal
  (Ljava/lang/String;)Ljava/util/Iterator<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/Iterator<Ljava/lang/String;>;
+ (Ljava/lang/String;)L1java/util/Iterator<Ljava/lang/String;>; # @Inherited(org.apache.commons.configuration2.AbstractHierarchicalConfiguration)
 getList
  (Ljava/lang/String;)Ljava/util/List<Ljava/lang/Object;>;
  (Ljava/lang/String;)Ljava/util/List<Ljava/lang/Object;>;
@@ -125,7 +125,7 @@ getProperties
  (Ljava/lang/String;)Ljava/util/Properties;
 getPropertyInternal
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object; # @Inherited(org.apache.commons.configuration2.AbstractHierarchicalConfiguration)
 getShort
  (Ljava/lang/String;)S
  (Ljava/lang/String;)S
@@ -161,7 +161,7 @@ setPropertyInternal
  (Ljava/lang/String;Ljava/lang/Object;)V
 subset
  (Ljava/lang/String;)Lorg/apache/commons/configuration2/Configuration;
- (Ljava/lang/String;)Lorg/apache/commons/configuration2/Configuration;
+ (Ljava/lang/String;)L1org/apache/commons/configuration2/Configuration; # @Inherited(org.apache.commons.configuration2.BaseHierarchicalConfiguration)
 write
  (Ljava/io/Writer;)V
  (Ljava/io/Writer;)V
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration$DefaultIOFactory.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration$DefaultIOFactory.eea
index 2395224686..cef9b3abef 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration$DefaultIOFactory.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration$DefaultIOFactory.eea
@@ -2,7 +2,7 @@ class org/apache/commons/configuration2/PropertiesConfiguration$DefaultIOFactory
 
 createPropertiesReader
  (Ljava/io/Reader;)Lorg/apache/commons/configuration2/PropertiesConfiguration$PropertiesReader;
- (Ljava/io/Reader;)Lorg/apache/commons/configuration2/PropertiesConfiguration$PropertiesReader;
+ (Ljava/io/Reader;)L1org/apache/commons/configuration2/PropertiesConfiguration$PropertiesReader; # @Inherited(org.apache.commons.configuration2.PropertiesConfiguration$IOFactory)
 createPropertiesWriter
  (Ljava/io/Writer;Lorg/apache/commons/configuration2/convert/ListDelimiterHandler;)Lorg/apache/commons/configuration2/PropertiesConfiguration$PropertiesWriter;
- (Ljava/io/Writer;Lorg/apache/commons/configuration2/convert/ListDelimiterHandler;)Lorg/apache/commons/configuration2/PropertiesConfiguration$PropertiesWriter;
+ (Ljava/io/Writer;Lorg/apache/commons/configuration2/convert/ListDelimiterHandler;)L1org/apache/commons/configuration2/PropertiesConfiguration$PropertiesWriter; # @Inherited(org.apache.commons.configuration2.PropertiesConfiguration$IOFactory)
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration$IOFactory.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration$IOFactory.eea
index 9dab3fd96a..d17c542e12 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration$IOFactory.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration$IOFactory.eea
@@ -2,7 +2,7 @@ class org/apache/commons/configuration2/PropertiesConfiguration$IOFactory
 
 createPropertiesReader
  (Ljava/io/Reader;)Lorg/apache/commons/configuration2/PropertiesConfiguration$PropertiesReader;
- (Ljava/io/Reader;)Lorg/apache/commons/configuration2/PropertiesConfiguration$PropertiesReader;
+ (Ljava/io/Reader;)L1org/apache/commons/configuration2/PropertiesConfiguration$PropertiesReader;
 createPropertiesWriter
  (Ljava/io/Writer;Lorg/apache/commons/configuration2/convert/ListDelimiterHandler;)Lorg/apache/commons/configuration2/PropertiesConfiguration$PropertiesWriter;
- (Ljava/io/Writer;Lorg/apache/commons/configuration2/convert/ListDelimiterHandler;)Lorg/apache/commons/configuration2/PropertiesConfiguration$PropertiesWriter;
+ (Ljava/io/Writer;Lorg/apache/commons/configuration2/convert/ListDelimiterHandler;)L1org/apache/commons/configuration2/PropertiesConfiguration$PropertiesWriter;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration$JupIOFactory.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration$JupIOFactory.eea
index e2def82cf5..f2c79f4fab 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration$JupIOFactory.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration$JupIOFactory.eea
@@ -2,7 +2,7 @@ class org/apache/commons/configuration2/PropertiesConfiguration$JupIOFactory
 
 createPropertiesReader
  (Ljava/io/Reader;)Lorg/apache/commons/configuration2/PropertiesConfiguration$PropertiesReader;
- (Ljava/io/Reader;)Lorg/apache/commons/configuration2/PropertiesConfiguration$PropertiesReader;
+ (Ljava/io/Reader;)L1org/apache/commons/configuration2/PropertiesConfiguration$PropertiesReader; # @Inherited(org.apache.commons.configuration2.PropertiesConfiguration$IOFactory)
 createPropertiesWriter
  (Ljava/io/Writer;Lorg/apache/commons/configuration2/convert/ListDelimiterHandler;)Lorg/apache/commons/configuration2/PropertiesConfiguration$PropertiesWriter;
- (Ljava/io/Writer;Lorg/apache/commons/configuration2/convert/ListDelimiterHandler;)Lorg/apache/commons/configuration2/PropertiesConfiguration$PropertiesWriter;
+ (Ljava/io/Writer;Lorg/apache/commons/configuration2/convert/ListDelimiterHandler;)L1org/apache/commons/configuration2/PropertiesConfiguration$PropertiesWriter; # @Inherited(org.apache.commons.configuration2.PropertiesConfiguration$IOFactory)
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration$JupPropertiesReader.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration$JupPropertiesReader.eea
index 0adf03daed..e7a69b4a99 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration$JupPropertiesReader.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration$JupPropertiesReader.eea
@@ -8,7 +8,7 @@ parseProperty
  (Ljava/lang/String;)V
 readProperty
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(org.apache.commons.configuration2.PropertiesConfiguration$PropertiesReader)
 unescapePropertyValue
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration$PropertiesReader.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration$PropertiesReader.eea
index bec86b2194..8c9f4382a8 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration$PropertiesReader.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration$PropertiesReader.eea
@@ -29,7 +29,7 @@ parseProperty
  (Ljava/lang/String;)V
 readProperty
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 unescapePropertyName
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration$PropertiesWriter.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration$PropertiesWriter.eea
index 9bcfb3842f..2d853362e2 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration$PropertiesWriter.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration$PropertiesWriter.eea
@@ -8,7 +8,7 @@ class org/apache/commons/configuration2/PropertiesConfiguration$PropertiesWriter
  (Ljava/io/Writer;Lorg/apache/commons/configuration2/convert/ListDelimiterHandler;Lorg/apache/commons/configuration2/convert/ValueTransformer;)V
 escapeKey
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 fetchSeparator
  (Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;
  (Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration.eea
index 2ac59fcab7..366f94ef4e 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/PropertiesConfiguration.eea
@@ -27,7 +27,7 @@ unescapeJava
  (Ljava/lang/String;)Ljava/lang/String;
 unescapeJava
  (Ljava/lang/String;Z)Ljava/lang/String;
- (Ljava/lang/String;Z)Ljava/lang/String;
+ (Ljava/lang/String;Z)Ljava/lang/String; # @PolyNull
 
 clone
  ()Ljava/lang/Object;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/SubnodeConfiguration.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/SubnodeConfiguration.eea
index 2b5d26ef6c..9910e6765e 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/SubnodeConfiguration.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/SubnodeConfiguration.eea
@@ -5,13 +5,13 @@ class org/apache/commons/configuration2/SubnodeConfiguration
  (Lorg/apache/commons/configuration2/BaseHierarchicalConfiguration;Lorg/apache/commons/configuration2/tree/TrackedNodeModel;)V
 cloneNodeModel
  ()Lorg/apache/commons/configuration2/tree/NodeModel<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;
- ()Lorg/apache/commons/configuration2/tree/NodeModel<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;
+ ()L1org/apache/commons/configuration2/tree/NodeModel<Lorg/apache/commons/configuration2/tree/ImmutableNode;>; # @Inherited(org.apache.commons.configuration2.BaseHierarchicalConfiguration)
 createSubConfigurationForTrackedNode
  (Lorg/apache/commons/configuration2/tree/NodeSelector;Lorg/apache/commons/configuration2/tree/InMemoryNodeModelSupport;)Lorg/apache/commons/configuration2/SubnodeConfiguration;
- (Lorg/apache/commons/configuration2/tree/NodeSelector;Lorg/apache/commons/configuration2/tree/InMemoryNodeModelSupport;)Lorg/apache/commons/configuration2/SubnodeConfiguration;
+ (Lorg/apache/commons/configuration2/tree/NodeSelector;Lorg/apache/commons/configuration2/tree/InMemoryNodeModelSupport;)L1org/apache/commons/configuration2/SubnodeConfiguration; # @Inherited(org.apache.commons.configuration2.BaseHierarchicalConfiguration)
 getNodeModel
  ()Lorg/apache/commons/configuration2/tree/InMemoryNodeModel;
- ()Lorg/apache/commons/configuration2/tree/InMemoryNodeModel;
+ ()L1org/apache/commons/configuration2/tree/InMemoryNodeModel;
 getParent
  ()Lorg/apache/commons/configuration2/BaseHierarchicalConfiguration;
  ()Lorg/apache/commons/configuration2/BaseHierarchicalConfiguration;
@@ -23,7 +23,7 @@ getRootSelector
  ()Lorg/apache/commons/configuration2/tree/NodeSelector;
 getSubConfigurationNodeSelector
  (Ljava/lang/String;)Lorg/apache/commons/configuration2/tree/NodeSelector;
- (Ljava/lang/String;)Lorg/apache/commons/configuration2/tree/NodeSelector;
+ (Ljava/lang/String;)L1org/apache/commons/configuration2/tree/NodeSelector; # @Inherited(org.apache.commons.configuration2.BaseHierarchicalConfiguration)
 getSubConfigurationParentModel
  ()Lorg/apache/commons/configuration2/tree/InMemoryNodeModel;
  ()Lorg/apache/commons/configuration2/tree/InMemoryNodeModel;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/SubsetConfiguration.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/SubsetConfiguration.eea
index 15ea13c773..d015bb3fbe 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/SubsetConfiguration.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/SubsetConfiguration.eea
@@ -36,7 +36,7 @@ getKeysInternal
  ()Ljava/util/Iterator<Ljava/lang/String;>;
 getKeysInternal
  (Ljava/lang/String;)Ljava/util/Iterator<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/Iterator<Ljava/lang/String;>;
+ (Ljava/lang/String;)L1java/util/Iterator<Ljava/lang/String;>; # @Inherited(org.apache.commons.configuration2.AbstractConfiguration)
 getListDelimiterHandler
  ()Lorg/apache/commons/configuration2/convert/ListDelimiterHandler;
  ()Lorg/apache/commons/configuration2/convert/ListDelimiterHandler;
@@ -60,4 +60,4 @@ setPrefix
  (Ljava/lang/String;)V
 subset
  (Ljava/lang/String;)Lorg/apache/commons/configuration2/Configuration;
- (Ljava/lang/String;)Lorg/apache/commons/configuration2/Configuration;
+ (Ljava/lang/String;)L1org/apache/commons/configuration2/Configuration; # @Inherited(org.apache.commons.configuration2.AbstractConfiguration)
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/XMLConfiguration.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/XMLConfiguration.eea
index ccaa3aa560..f3515d5c38 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/XMLConfiguration.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/XMLConfiguration.eea
@@ -5,13 +5,13 @@ class org/apache/commons/configuration2/XMLConfiguration
  (Lorg/apache/commons/configuration2/HierarchicalConfiguration<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;)V
 createDocumentBuilder
  ()Ljavax/xml/parsers/DocumentBuilder;
- ()Ljavax/xml/parsers/DocumentBuilder;
+ ()L1javax/xml/parsers/DocumentBuilder;
 createTransformer
  ()Ljavax/xml/transform/Transformer;
- ()Ljavax/xml/transform/Transformer;
+ ()L1javax/xml/transform/Transformer;
 getDocument
  ()Lorg/w3c/dom/Document;
- ()Lorg/w3c/dom/Document;
+ ()L0org/w3c/dom/Document;
 getDocumentBuilder
  ()Ljavax/xml/parsers/DocumentBuilder;
  ()Ljavax/xml/parsers/DocumentBuilder;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/BeanCreationContext.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/BeanCreationContext.eea
index 1c947619a7..6515a6e714 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/BeanCreationContext.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/BeanCreationContext.eea
@@ -2,7 +2,7 @@ class org/apache/commons/configuration2/beanutils/BeanCreationContext
 
 createBean
  (Lorg/apache/commons/configuration2/beanutils/BeanDeclaration;)Ljava/lang/Object;
- (Lorg/apache/commons/configuration2/beanutils/BeanDeclaration;)Ljava/lang/Object;
+ (Lorg/apache/commons/configuration2/beanutils/BeanDeclaration;)L1java/lang/Object;
 getBeanClass
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/BeanFactory.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/BeanFactory.eea
index 9dfc80b799..5c03aca878 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/BeanFactory.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/BeanFactory.eea
@@ -2,7 +2,7 @@ class org/apache/commons/configuration2/beanutils/BeanFactory
 
 createBean
  (Lorg/apache/commons/configuration2/beanutils/BeanCreationContext;)Ljava/lang/Object;
- (Lorg/apache/commons/configuration2/beanutils/BeanCreationContext;)Ljava/lang/Object;
+ (Lorg/apache/commons/configuration2/beanutils/BeanCreationContext;)L1java/lang/Object;
 getDefaultBeanClass
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/BeanHelper.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/BeanHelper.eea
index 954b659430..5752af08bd 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/BeanHelper.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/BeanHelper.eea
@@ -9,7 +9,7 @@ copyProperties
  (Ljava/lang/Object;Ljava/lang/Object;)V
 createWrapDynaBean
  (Ljava/lang/Object;)Lorg/apache/commons/beanutils/DynaBean;
- (Ljava/lang/Object;)Lorg/apache/commons/beanutils/DynaBean;
+ (Ljava/lang/Object;)L1org/apache/commons/beanutils/DynaBean;
 initBeanProperties
  (Ljava/lang/Object;Lorg/apache/commons/configuration2/beanutils/BeanDeclaration;)V
  (Ljava/lang/Object;Lorg/apache/commons/configuration2/beanutils/BeanDeclaration;)V
@@ -22,13 +22,13 @@ setProperty
  (Lorg/apache/commons/configuration2/beanutils/BeanFactory;)V
 createBean
  (Lorg/apache/commons/configuration2/beanutils/BeanDeclaration;)Ljava/lang/Object;
- (Lorg/apache/commons/configuration2/beanutils/BeanDeclaration;)Ljava/lang/Object;
+ (Lorg/apache/commons/configuration2/beanutils/BeanDeclaration;)L1java/lang/Object;
 createBean
  (Lorg/apache/commons/configuration2/beanutils/BeanDeclaration;Ljava/lang/Class<*>;)Ljava/lang/Object;
- (Lorg/apache/commons/configuration2/beanutils/BeanDeclaration;Ljava/lang/Class<*>;)Ljava/lang/Object;
+ (Lorg/apache/commons/configuration2/beanutils/BeanDeclaration;Ljava/lang/Class<*>;)L1java/lang/Object;
 createBean
  (Lorg/apache/commons/configuration2/beanutils/BeanDeclaration;Ljava/lang/Class<*>;Ljava/lang/Object;)Ljava/lang/Object;
- (Lorg/apache/commons/configuration2/beanutils/BeanDeclaration;Ljava/lang/Class<*>;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lorg/apache/commons/configuration2/beanutils/BeanDeclaration;Ljava/lang/Class<*>;Ljava/lang/Object;)L1java/lang/Object;
 deregisterBeanFactory
  (Ljava/lang/String;)Lorg/apache/commons/configuration2/beanutils/BeanFactory;
  (Ljava/lang/String;)Lorg/apache/commons/configuration2/beanutils/BeanFactory;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.eea
index 0c5297d733..1f16ff6b97 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.eea
@@ -8,7 +8,7 @@ contains
  (Ljava/lang/String;Ljava/lang/String;)Z
 get
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
 get
  (Ljava/lang/String;I)Ljava/lang/Object;
  (Ljava/lang/String;I)Ljava/lang/Object;
@@ -17,7 +17,7 @@ get
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;
 getDynaClass
  ()Lorg/apache/commons/beanutils/DynaClass;
- ()Lorg/apache/commons/beanutils/DynaClass;
+ ()L1org/apache/commons/beanutils/DynaClass;
 remove
  (Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.eea
index 5033509e16..557703cf31 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.eea
@@ -5,13 +5,13 @@ class org/apache/commons/configuration2/beanutils/ConfigurationDynaClass
  (Lorg/apache/commons/configuration2/Configuration;)V
 getDynaProperties
  ()[Lorg/apache/commons/beanutils/DynaProperty;
- ()[Lorg/apache/commons/beanutils/DynaProperty;
+ ()[1Lorg/apache/commons/beanutils/DynaProperty;
 getDynaProperty
  (Ljava/lang/String;)Lorg/apache/commons/beanutils/DynaProperty;
- (Ljava/lang/String;)Lorg/apache/commons/beanutils/DynaProperty;
+ (Ljava/lang/String;)L0org/apache/commons/beanutils/DynaProperty;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 newInstance
  ()Lorg/apache/commons/beanutils/DynaBean;
- ()Lorg/apache/commons/beanutils/DynaBean;
+ ()L1org/apache/commons/beanutils/DynaBean;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/ConstructorArg.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/ConstructorArg.eea
index 191f60a935..69b2239daa 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/ConstructorArg.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/ConstructorArg.eea
@@ -5,13 +5,13 @@ forBeanDeclaration
  (Lorg/apache/commons/configuration2/beanutils/BeanDeclaration;)Lorg/apache/commons/configuration2/beanutils/ConstructorArg;
 forBeanDeclaration
  (Lorg/apache/commons/configuration2/beanutils/BeanDeclaration;Ljava/lang/String;)Lorg/apache/commons/configuration2/beanutils/ConstructorArg;
- (Lorg/apache/commons/configuration2/beanutils/BeanDeclaration;Ljava/lang/String;)Lorg/apache/commons/configuration2/beanutils/ConstructorArg;
+ (Lorg/apache/commons/configuration2/beanutils/BeanDeclaration;Ljava/lang/String;)L1org/apache/commons/configuration2/beanutils/ConstructorArg;
 forValue
  (Ljava/lang/Object;)Lorg/apache/commons/configuration2/beanutils/ConstructorArg;
  (Ljava/lang/Object;)Lorg/apache/commons/configuration2/beanutils/ConstructorArg;
 forValue
  (Ljava/lang/Object;Ljava/lang/String;)Lorg/apache/commons/configuration2/beanutils/ConstructorArg;
- (Ljava/lang/Object;Ljava/lang/String;)Lorg/apache/commons/configuration2/beanutils/ConstructorArg;
+ (Ljava/lang/Object;Ljava/lang/String;)L1org/apache/commons/configuration2/beanutils/ConstructorArg;
 
 getBeanDeclaration
  ()Lorg/apache/commons/configuration2/beanutils/BeanDeclaration;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.eea
index b7fbca134b..a3b3a2ce1e 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.eea
@@ -13,16 +13,16 @@ findMatchingConstructor
  (Lorg/apache/commons/configuration2/convert/ConversionHandler;)V
 createBean
  (Lorg/apache/commons/configuration2/beanutils/BeanCreationContext;)Ljava/lang/Object;
- (Lorg/apache/commons/configuration2/beanutils/BeanCreationContext;)Ljava/lang/Object;
+ (Lorg/apache/commons/configuration2/beanutils/BeanCreationContext;)L1java/lang/Object; # @Inherited(org.apache.commons.configuration2.beanutils.BeanFactory)
 createBeanInstance
  (Lorg/apache/commons/configuration2/beanutils/BeanCreationContext;)Ljava/lang/Object;
- (Lorg/apache/commons/configuration2/beanutils/BeanCreationContext;)Ljava/lang/Object;
+ (Lorg/apache/commons/configuration2/beanutils/BeanCreationContext;)L1java/lang/Object;
 getConversionHandler
  ()Lorg/apache/commons/configuration2/convert/ConversionHandler;
  ()Lorg/apache/commons/configuration2/convert/ConversionHandler;
 getDefaultBeanClass
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L0java/lang/Class<*>;
 initBeanInstance
  (Ljava/lang/Object;Lorg/apache/commons/configuration2/beanutils/BeanCreationContext;)V
  (Ljava/lang/Object;Lorg/apache/commons/configuration2/beanutils/BeanCreationContext;)V
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.eea
index a0fd863d85..c73610a882 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.eea
@@ -54,7 +54,7 @@ getDefaultBeanClassName
  ()Ljava/lang/String;
 getNestedBeanDeclarations
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ ()L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 interpolate
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/BasicBuilderParameters.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/BasicBuilderParameters.eea
index 0f545ee132..dd30fde13b 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/BasicBuilderParameters.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/BasicBuilderParameters.eea
@@ -22,7 +22,7 @@ fetchProperty
  (Ljava/lang/String;)Ljava/lang/Object;
 getParameters
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ ()L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 inheritFrom
  (Ljava/util/Map<Ljava/lang/String;*>;)V
  (Ljava/util/Map<Ljava/lang/String;*>;)V
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.eea
index 97477d4792..436ea0e9e1 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.eea
@@ -35,13 +35,13 @@ copyEventListeners
  (Lorg/apache/commons/configuration2/builder/BasicConfigurationBuilder<*>;Lorg/apache/commons/configuration2/event/EventListenerList;)V
 createResult
  ()TT;
- ()TT;
+ ()T1T;
 createResultDeclaration
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/apache/commons/configuration2/beanutils/BeanDeclaration;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/apache/commons/configuration2/beanutils/BeanDeclaration;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1org/apache/commons/configuration2/beanutils/BeanDeclaration;
 createResultInstance
  ()TT;
- ()TT;
+ ()T1T;
 fetchBeanHelper
  ()Lorg/apache/commons/configuration2/beanutils/BeanHelper;
  ()Lorg/apache/commons/configuration2/beanutils/BeanHelper;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory.eea
index bcba77c0c0..55f4870701 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory.eea
@@ -2,14 +2,14 @@ class org/apache/commons/configuration2/builder/BuilderConfigurationWrapperFacto
 
 createBuilderConfigurationWrapper
  <T::Lorg/apache/commons/configuration2/ImmutableConfiguration;>(Ljava/lang/Class<TT;>;Lorg/apache/commons/configuration2/builder/ConfigurationBuilder<+TT;>;Lorg/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory$EventSourceSupport;)TT;
- <T::Lorg/apache/commons/configuration2/ImmutableConfiguration;>(Ljava/lang/Class<TT;>;Lorg/apache/commons/configuration2/builder/ConfigurationBuilder<+TT;>;Lorg/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory$EventSourceSupport;)TT;
+ <T::Lorg/apache/commons/configuration2/ImmutableConfiguration;>(Ljava/lang/Class<TT;>;Lorg/apache/commons/configuration2/builder/ConfigurationBuilder<+TT;>;Lorg/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory$EventSourceSupport;)T1T;
 
 <init>
  (Lorg/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory$EventSourceSupport;)V
  (Lorg/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory$EventSourceSupport;)V
 createBuilderConfigurationWrapper
  <T::Lorg/apache/commons/configuration2/ImmutableConfiguration;>(Ljava/lang/Class<TT;>;Lorg/apache/commons/configuration2/builder/ConfigurationBuilder<+TT;>;)TT;
- <T::Lorg/apache/commons/configuration2/ImmutableConfiguration;>(Ljava/lang/Class<TT;>;Lorg/apache/commons/configuration2/builder/ConfigurationBuilder<+TT;>;)TT;
+ <T::Lorg/apache/commons/configuration2/ImmutableConfiguration;>(Ljava/lang/Class<TT;>;Lorg/apache/commons/configuration2/builder/ConfigurationBuilder<+TT;>;)T1T;
 getEventSourceSupport
  ()Lorg/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory$EventSourceSupport;
  ()Lorg/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory$EventSourceSupport;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/DefaultReloadingDetectorFactory.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/DefaultReloadingDetectorFactory.eea
index d48d29a1aa..15035d8268 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/DefaultReloadingDetectorFactory.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/DefaultReloadingDetectorFactory.eea
@@ -2,4 +2,4 @@ class org/apache/commons/configuration2/builder/DefaultReloadingDetectorFactory
 
 createReloadingDetector
  (Lorg/apache/commons/configuration2/io/FileHandler;Lorg/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl;)Lorg/apache/commons/configuration2/reloading/ReloadingDetector;
- (Lorg/apache/commons/configuration2/io/FileHandler;Lorg/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl;)Lorg/apache/commons/configuration2/reloading/ReloadingDetector;
+ (Lorg/apache/commons/configuration2/io/FileHandler;Lorg/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl;)L1org/apache/commons/configuration2/reloading/ReloadingDetector; # @Inherited(org.apache.commons.configuration2.builder.ReloadingDetectorFactory)
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl.eea
index a4697b897f..cfd9efb3e2 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl.eea
@@ -6,13 +6,13 @@ super org/apache/commons/configuration2/builder/FileBasedBuilderProperties
 
 fromMap
  (Ljava/util/Map<Ljava/lang/String;*>;)Lorg/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl;
- (Ljava/util/Map<Ljava/lang/String;*>;)Lorg/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl;
+ (Ljava/util/Map<Ljava/lang/String;*>;)L1org/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl;
 fromParameters
  (Ljava/util/Map<Ljava/lang/String;*>;)Lorg/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl;
  (Ljava/util/Map<Ljava/lang/String;*>;)Lorg/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl;
 fromParameters
  (Ljava/util/Map<Ljava/lang/String;*>;Z)Lorg/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl;
- (Ljava/util/Map<Ljava/lang/String;*>;Z)Lorg/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl;
+ (Ljava/util/Map<Ljava/lang/String;*>;Z)L1org/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl;
 
 <init>
  (Lorg/apache/commons/configuration2/io/FileHandler;)V
@@ -25,7 +25,7 @@ getFileHandler
  ()Lorg/apache/commons/configuration2/io/FileHandler;
 getParameters
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ ()L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>; # @Inherited(org.apache.commons.configuration2.builder.BasicBuilderParameters)
 getReloadingDetectorFactory
  ()Lorg/apache/commons/configuration2/builder/ReloadingDetectorFactory;
  ()Lorg/apache/commons/configuration2/builder/ReloadingDetectorFactory;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.eea
index a284d48f92..ecc5a758bc 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.eea
@@ -8,7 +8,7 @@ super org/apache/commons/configuration2/builder/BasicConfigurationBuilder
 
 getDefaultEncoding
  (Ljava/lang/Class<*>;)Ljava/lang/String;
- (Ljava/lang/Class<*>;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;)L0java/lang/String;
 setDefaultEncoding
  (Ljava/lang/Class<*>;Ljava/lang/String;)V
  (Ljava/lang/Class<*>;Ljava/lang/String;)V
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/ReloadingDetectorFactory.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/ReloadingDetectorFactory.eea
index 3d73c034a8..6358c5d698 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/ReloadingDetectorFactory.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/ReloadingDetectorFactory.eea
@@ -2,4 +2,4 @@ class org/apache/commons/configuration2/builder/ReloadingDetectorFactory
 
 createReloadingDetector
  (Lorg/apache/commons/configuration2/io/FileHandler;Lorg/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl;)Lorg/apache/commons/configuration2/reloading/ReloadingDetector;
- (Lorg/apache/commons/configuration2/io/FileHandler;Lorg/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl;)Lorg/apache/commons/configuration2/reloading/ReloadingDetector;
+ (Lorg/apache/commons/configuration2/io/FileHandler;Lorg/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl;)L1org/apache/commons/configuration2/reloading/ReloadingDetector;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/ReloadingFileBasedConfigurationBuilder.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/ReloadingFileBasedConfigurationBuilder.eea
index 04270e6be2..fd1f44bcac 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/ReloadingFileBasedConfigurationBuilder.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/ReloadingFileBasedConfigurationBuilder.eea
@@ -20,7 +20,7 @@ configure
  ([Lorg/apache/commons/configuration2/builder/BuilderParameters;)L1org/apache/commons/configuration2/builder/ReloadingFileBasedConfigurationBuilder<TT;>;
 createReloadingDetector
  (Lorg/apache/commons/configuration2/io/FileHandler;Lorg/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl;)Lorg/apache/commons/configuration2/reloading/ReloadingDetector;
- (Lorg/apache/commons/configuration2/io/FileHandler;Lorg/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl;)Lorg/apache/commons/configuration2/reloading/ReloadingDetector;
+ (Lorg/apache/commons/configuration2/io/FileHandler;Lorg/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl;)L1org/apache/commons/configuration2/reloading/ReloadingDetector;
 getReloadingController
  ()Lorg/apache/commons/configuration2/reloading/ReloadingController;
  ()Lorg/apache/commons/configuration2/reloading/ReloadingController;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.eea
index 4811dcff14..8f9154d57c 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.eea
@@ -8,10 +8,10 @@ configureBuilder
  (Lorg/apache/commons/configuration2/builder/BasicConfigurationBuilder<+Lorg/apache/commons/configuration2/Configuration;>;Lorg/apache/commons/configuration2/builder/combined/ConfigurationDeclaration;Ljava/util/Collection<Lorg/apache/commons/configuration2/builder/BuilderParameters;>;)V
 createBuilder
  (Lorg/apache/commons/configuration2/builder/combined/ConfigurationDeclaration;Ljava/util/Collection<Lorg/apache/commons/configuration2/builder/BuilderParameters;>;)Lorg/apache/commons/configuration2/builder/BasicConfigurationBuilder<+Lorg/apache/commons/configuration2/Configuration;>;
- (Lorg/apache/commons/configuration2/builder/combined/ConfigurationDeclaration;Ljava/util/Collection<Lorg/apache/commons/configuration2/builder/BuilderParameters;>;)Lorg/apache/commons/configuration2/builder/BasicConfigurationBuilder<+Lorg/apache/commons/configuration2/Configuration;>;
+ (Lorg/apache/commons/configuration2/builder/combined/ConfigurationDeclaration;Ljava/util/Collection<Lorg/apache/commons/configuration2/builder/BuilderParameters;>;)L1org/apache/commons/configuration2/builder/BasicConfigurationBuilder<+Lorg/apache/commons/configuration2/Configuration;>;
 createParameterObjects
  ()Ljava/util/Collection<Lorg/apache/commons/configuration2/builder/BuilderParameters;>;
- ()Ljava/util/Collection<Lorg/apache/commons/configuration2/builder/BuilderParameters;>;
+ ()L1java/util/Collection<Lorg/apache/commons/configuration2/builder/BuilderParameters;>;
 determineBuilderClass
  (Lorg/apache/commons/configuration2/builder/combined/ConfigurationDeclaration;)Ljava/lang/String;
  (Lorg/apache/commons/configuration2/builder/combined/ConfigurationDeclaration;)Ljava/lang/String;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.eea
index a07645258d..1d5b286df2 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.eea
@@ -9,7 +9,7 @@ fromParameters
  (Ljava/util/Map<Ljava/lang/String;*>;)Lorg/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl;
 fromParameters
  (Ljava/util/Map<Ljava/lang/String;*>;Z)Lorg/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl;
- (Ljava/util/Map<Ljava/lang/String;*>;Z)Lorg/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl;
+ (Ljava/util/Map<Ljava/lang/String;*>;Z)L1org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl;
 
 clone
  ()Lorg/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl;
@@ -22,7 +22,7 @@ getChildDefaultParametersManager
  ()Lorg/apache/commons/configuration2/builder/DefaultParametersManager;
 getDefaultChildParameters
  ()Ljava/util/Collection<+Lorg/apache/commons/configuration2/builder/BuilderParameters;>;
- ()Ljava/util/Collection<+Lorg/apache/commons/configuration2/builder/BuilderParameters;>;
+ ()L1java/util/Collection<+Lorg/apache/commons/configuration2/builder/BuilderParameters;>;
 getDefinitionBuilder
  ()Lorg/apache/commons/configuration2/builder/ConfigurationBuilder<+Lorg/apache/commons/configuration2/HierarchicalConfiguration<*>;>;
  ()Lorg/apache/commons/configuration2/builder/ConfigurationBuilder<+Lorg/apache/commons/configuration2/HierarchicalConfiguration<*>;>;
@@ -31,7 +31,7 @@ getDefinitionBuilderParameters
  ()Lorg/apache/commons/configuration2/builder/BuilderParameters;
 getParameters
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ ()L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>; # @Inherited(org.apache.commons.configuration2.builder.BasicBuilderParameters)
 getProviders
  ()Ljava/util/Map<Ljava/lang/String;Lorg/apache/commons/configuration2/builder/combined/ConfigurationBuilderProvider;>;
  ()Ljava/util/Map<Ljava/lang/String;Lorg/apache/commons/configuration2/builder/combined/ConfigurationBuilderProvider;>;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.eea
index 09e622d68e..d514f51b39 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.eea
@@ -25,13 +25,13 @@ configureEntityResolver
  (Lorg/apache/commons/configuration2/HierarchicalConfiguration<*>;Lorg/apache/commons/configuration2/builder/XMLBuilderParametersImpl;)V
 createAdditionalsConfiguration
  (Lorg/apache/commons/configuration2/CombinedConfiguration;)Lorg/apache/commons/configuration2/CombinedConfiguration;
- (Lorg/apache/commons/configuration2/CombinedConfiguration;)Lorg/apache/commons/configuration2/CombinedConfiguration;
+ (Lorg/apache/commons/configuration2/CombinedConfiguration;)L1org/apache/commons/configuration2/CombinedConfiguration;
 createResultDeclaration
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/apache/commons/configuration2/beanutils/BeanDeclaration;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/apache/commons/configuration2/beanutils/BeanDeclaration;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1org/apache/commons/configuration2/beanutils/BeanDeclaration; # @Inherited(org.apache.commons.configuration2.builder.BasicConfigurationBuilder)
 createXMLDefinitionBuilder
  (Lorg/apache/commons/configuration2/builder/BuilderParameters;)Lorg/apache/commons/configuration2/builder/ConfigurationBuilder<+Lorg/apache/commons/configuration2/HierarchicalConfiguration<*>;>;
- (Lorg/apache/commons/configuration2/builder/BuilderParameters;)Lorg/apache/commons/configuration2/builder/ConfigurationBuilder<+Lorg/apache/commons/configuration2/HierarchicalConfiguration<*>;>;
+ (Lorg/apache/commons/configuration2/builder/BuilderParameters;)L1org/apache/commons/configuration2/builder/ConfigurationBuilder<+Lorg/apache/commons/configuration2/HierarchicalConfiguration<*>;>;
 getChildBuilders
  ()Ljava/util/Collection<Lorg/apache/commons/configuration2/builder/ConfigurationBuilder<+Lorg/apache/commons/configuration2/Configuration;>;>;
  ()Ljava/util/Collection<Lorg/apache/commons/configuration2/builder/ConfigurationBuilder<+Lorg/apache/commons/configuration2/Configuration;>;>;
@@ -49,7 +49,7 @@ initChildBuilderParameters
  (Lorg/apache/commons/configuration2/builder/BuilderParameters;)V
 initFileSystem
  (Lorg/apache/commons/configuration2/HierarchicalConfiguration<*>;)Lorg/apache/commons/configuration2/io/FileSystem;
- (Lorg/apache/commons/configuration2/HierarchicalConfiguration<*>;)Lorg/apache/commons/configuration2/io/FileSystem;
+ (Lorg/apache/commons/configuration2/HierarchicalConfiguration<*>;)L0org/apache/commons/configuration2/io/FileSystem;
 initResultInstance
  (Lorg/apache/commons/configuration2/CombinedConfiguration;)V
  (Lorg/apache/commons/configuration2/CombinedConfiguration;)V
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.eea
index c203b77633..63eb17abb5 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.eea
@@ -2,7 +2,7 @@ class org/apache/commons/configuration2/builder/combined/CombinedConfigurationBu
 
 createBuilder
  (Lorg/apache/commons/configuration2/builder/combined/ConfigurationDeclaration;Ljava/util/Collection<Lorg/apache/commons/configuration2/builder/BuilderParameters;>;)Lorg/apache/commons/configuration2/builder/BasicConfigurationBuilder<+Lorg/apache/commons/configuration2/Configuration;>;
- (Lorg/apache/commons/configuration2/builder/combined/ConfigurationDeclaration;Ljava/util/Collection<Lorg/apache/commons/configuration2/builder/BuilderParameters;>;)Lorg/apache/commons/configuration2/builder/BasicConfigurationBuilder<+Lorg/apache/commons/configuration2/Configuration;>;
+ (Lorg/apache/commons/configuration2/builder/combined/ConfigurationDeclaration;Ljava/util/Collection<Lorg/apache/commons/configuration2/builder/BuilderParameters;>;)L1org/apache/commons/configuration2/builder/BasicConfigurationBuilder<+Lorg/apache/commons/configuration2/Configuration;>; # @Inherited(org.apache.commons.configuration2.builder.combined.BaseConfigurationBuilderProvider)
 initializeParameterObjects
  (Lorg/apache/commons/configuration2/builder/combined/ConfigurationDeclaration;Ljava/util/Collection<Lorg/apache/commons/configuration2/builder/BuilderParameters;>;)V
  (Lorg/apache/commons/configuration2/builder/combined/ConfigurationDeclaration;Ljava/util/Collection<Lorg/apache/commons/configuration2/builder/BuilderParameters;>;)V
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.eea
index c8b403a96a..2dc603fbcb 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.eea
@@ -8,7 +8,7 @@ getAt
  ()Ljava/lang/String;
 getBeanClassName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getBeanFactoryName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl.eea
index 5b2fca8b2f..d7561ef434 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl.eea
@@ -9,7 +9,7 @@ fromParameters
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl;
 fromParameters
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Z)Lorg/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Z)Lorg/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Z)L1org/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl;
 
 clone
  ()Lorg/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl;
@@ -22,7 +22,7 @@ getManagedBuilderParameters
  ()Lorg/apache/commons/configuration2/builder/BuilderParameters;
 getParameters
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ ()L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>; # @Inherited(org.apache.commons.configuration2.builder.BasicBuilderParameters)
 setFilePattern
  (Ljava/lang/String;)Lorg/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl;
  (Ljava/lang/String;)Lorg/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.eea
index 08f0d6b11a..e1dabe5727 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.eea
@@ -23,16 +23,16 @@ configure
  ([Lorg/apache/commons/configuration2/builder/BuilderParameters;)L1org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder<TT;>;
 constructFileName
  (Lorg/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl;)Ljava/lang/String;
- (Lorg/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl;)Ljava/lang/String;
+ (Lorg/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl;)L1java/lang/String;
 createInitializedManagedBuilder
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/apache/commons/configuration2/builder/FileBasedConfigurationBuilder<TT;>;
- (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/apache/commons/configuration2/builder/FileBasedConfigurationBuilder<TT;>;
+ (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder<TT;>;
 createInterpolator
  ()Lorg/apache/commons/configuration2/interpol/ConfigurationInterpolator;
- ()Lorg/apache/commons/configuration2/interpol/ConfigurationInterpolator;
+ ()L1org/apache/commons/configuration2/interpol/ConfigurationInterpolator;
 createManagedBuilder
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/apache/commons/configuration2/builder/FileBasedConfigurationBuilder<TT;>;
- (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/apache/commons/configuration2/builder/FileBasedConfigurationBuilder<TT;>;
+ (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder<TT;>;
 getConfiguration
  ()TT;
  ()TT;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/ReloadingCombinedConfigurationBuilder.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/ReloadingCombinedConfigurationBuilder.eea
index edc8729dea..5a8e2a8920 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/ReloadingCombinedConfigurationBuilder.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/ReloadingCombinedConfigurationBuilder.eea
@@ -15,10 +15,10 @@ configure
  ([Lorg/apache/commons/configuration2/builder/BuilderParameters;)L1org/apache/commons/configuration2/builder/combined/ReloadingCombinedConfigurationBuilder;
 createReloadingController
  ()Lorg/apache/commons/configuration2/reloading/ReloadingController;
- ()Lorg/apache/commons/configuration2/reloading/ReloadingController;
+ ()L1org/apache/commons/configuration2/reloading/ReloadingController;
 createXMLDefinitionBuilder
  (Lorg/apache/commons/configuration2/builder/BuilderParameters;)Lorg/apache/commons/configuration2/builder/ConfigurationBuilder<+Lorg/apache/commons/configuration2/HierarchicalConfiguration<*>;>;
- (Lorg/apache/commons/configuration2/builder/BuilderParameters;)Lorg/apache/commons/configuration2/builder/ConfigurationBuilder<+Lorg/apache/commons/configuration2/HierarchicalConfiguration<*>;>;
+ (Lorg/apache/commons/configuration2/builder/BuilderParameters;)L1org/apache/commons/configuration2/builder/ConfigurationBuilder<+Lorg/apache/commons/configuration2/HierarchicalConfiguration<*>;>; # @Inherited(org.apache.commons.configuration2.builder.combined.CombinedConfigurationBuilder)
 getConfiguration
  ()Lorg/apache/commons/configuration2/CombinedConfiguration;
  ()Lorg/apache/commons/configuration2/CombinedConfiguration;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.eea
index cf1d2b179c..17a161e035 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.eea
@@ -17,7 +17,7 @@ super org/apache/commons/configuration2/builder/combined/MultiFileConfigurationB
  (Ljava/lang/Class<TT;>;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Z)V
 createManagedBuilder
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/apache/commons/configuration2/builder/FileBasedConfigurationBuilder<TT;>;
- (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/apache/commons/configuration2/builder/FileBasedConfigurationBuilder<TT;>;
+ (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder<TT;>; # @Inherited(org.apache.commons.configuration2.builder.combined.MultiFileConfigurationBuilder)
 getReloadingController
  ()Lorg/apache/commons/configuration2/reloading/ReloadingController;
  ()Lorg/apache/commons/configuration2/reloading/ReloadingController;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/fluent/Parameters.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/fluent/Parameters.eea
index 08b320e6e2..3bf6b007dd 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/fluent/Parameters.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/builder/fluent/Parameters.eea
@@ -5,7 +5,7 @@ class org/apache/commons/configuration2/builder/fluent/Parameters
  (Lorg/apache/commons/configuration2/builder/DefaultParametersManager;)V
 basic
  ()Lorg/apache/commons/configuration2/builder/BasicBuilderParameters;
- ()Lorg/apache/commons/configuration2/builder/BasicBuilderParameters;
+ ()L1org/apache/commons/configuration2/builder/BasicBuilderParameters;
 combined
  ()Lorg/apache/commons/configuration2/builder/fluent/CombinedBuilderParameters;
  ()Lorg/apache/commons/configuration2/builder/fluent/CombinedBuilderParameters;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/convert/DefaultConversionHandler.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/convert/DefaultConversionHandler.eea
index 4a4709ac8a..1af00573d0 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/convert/DefaultConversionHandler.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/convert/DefaultConversionHandler.eea
@@ -24,7 +24,7 @@ extractValues
  (Ljava/lang/Object;I)Ljava/util/Collection<*>;
 getDateFormat
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getListDelimiterHandler
  ()Lorg/apache/commons/configuration2/convert/ListDelimiterHandler;
  ()Lorg/apache/commons/configuration2/convert/ListDelimiterHandler;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/convert/DefaultListDelimiterHandler.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/convert/DefaultListDelimiterHandler.eea
index 27d1008811..42ed6b3553 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/convert/DefaultListDelimiterHandler.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/convert/DefaultListDelimiterHandler.eea
@@ -5,7 +5,7 @@ escapeList
  (Ljava/util/List<*>;Lorg/apache/commons/configuration2/convert/ValueTransformer;)Ljava/lang/Object;
 escapeString
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 splitString
  (Ljava/lang/String;Z)Ljava/util/Collection<Ljava/lang/String;>;
- (Ljava/lang/String;Z)Ljava/util/Collection<Ljava/lang/String;>;
+ (Ljava/lang/String;Z)L1java/util/Collection<Ljava/lang/String;>;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/convert/DisabledListDelimiterHandler.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/convert/DisabledListDelimiterHandler.eea
index 0d477774c2..ca758eaec1 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/convert/DisabledListDelimiterHandler.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/convert/DisabledListDelimiterHandler.eea
@@ -6,7 +6,7 @@ INSTANCE
 
 escapeList
  (Ljava/util/List<*>;Lorg/apache/commons/configuration2/convert/ValueTransformer;)Ljava/lang/Object;
- (Ljava/util/List<*>;Lorg/apache/commons/configuration2/convert/ValueTransformer;)Ljava/lang/Object;
+ (Ljava/util/List<*>;Lorg/apache/commons/configuration2/convert/ValueTransformer;)L1java/lang/Object;
 escapeString
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.eea
index 0ce8622ec0..50a6902401 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.eea
@@ -8,10 +8,10 @@ escapeBackslashs
  (Ljava/lang/Object;Z)Ljava/lang/String;
 escapeList
  (Ljava/util/List<*>;Lorg/apache/commons/configuration2/convert/ValueTransformer;)Ljava/lang/Object;
- (Ljava/util/List<*>;Lorg/apache/commons/configuration2/convert/ValueTransformer;)Ljava/lang/Object;
+ (Ljava/util/List<*>;Lorg/apache/commons/configuration2/convert/ValueTransformer;)L0java/lang/Object;
 escapeString
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 escapeValue
  (Ljava/lang/Object;ZLorg/apache/commons/configuration2/convert/ValueTransformer;)Ljava/lang/String;
  (Ljava/lang/Object;ZLorg/apache/commons/configuration2/convert/ValueTransformer;)Ljava/lang/String;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/event/BaseEventSource.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/event/BaseEventSource.eea
index 0dd4083ac3..9291be815a 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/event/BaseEventSource.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/event/BaseEventSource.eea
@@ -11,10 +11,10 @@ copyEventListeners
  (Lorg/apache/commons/configuration2/event/BaseEventSource;)V
 createErrorEvent
  (Lorg/apache/commons/configuration2/event/EventType<+Lorg/apache/commons/configuration2/event/ConfigurationErrorEvent;>;Lorg/apache/commons/configuration2/event/EventType<*>;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Throwable;)Lorg/apache/commons/configuration2/event/ConfigurationErrorEvent;
- (Lorg/apache/commons/configuration2/event/EventType<+Lorg/apache/commons/configuration2/event/ConfigurationErrorEvent;>;Lorg/apache/commons/configuration2/event/EventType<*>;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Throwable;)Lorg/apache/commons/configuration2/event/ConfigurationErrorEvent;
+ (Lorg/apache/commons/configuration2/event/EventType<+Lorg/apache/commons/configuration2/event/ConfigurationErrorEvent;>;Lorg/apache/commons/configuration2/event/EventType<*>;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Throwable;)L1org/apache/commons/configuration2/event/ConfigurationErrorEvent;
 createEvent
  <T:Lorg/apache/commons/configuration2/event/ConfigurationEvent;>(Lorg/apache/commons/configuration2/event/EventType<TT;>;Ljava/lang/String;Ljava/lang/Object;Z)Lorg/apache/commons/configuration2/event/ConfigurationEvent;
- <T:Lorg/apache/commons/configuration2/event/ConfigurationEvent;>(Lorg/apache/commons/configuration2/event/EventType<TT;>;Ljava/lang/String;Ljava/lang/Object;Z)Lorg/apache/commons/configuration2/event/ConfigurationEvent;
+ <T:Lorg/apache/commons/configuration2/event/ConfigurationEvent;>(Lorg/apache/commons/configuration2/event/EventType<TT;>;Ljava/lang/String;Ljava/lang/Object;Z)L1org/apache/commons/configuration2/event/ConfigurationEvent;
 fireError
  <T:Lorg/apache/commons/configuration2/event/ConfigurationErrorEvent;>(Lorg/apache/commons/configuration2/event/EventType<TT;>;Lorg/apache/commons/configuration2/event/EventType<*>;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Throwable;)V
  <T:Lorg/apache/commons/configuration2/event/ConfigurationErrorEvent;>(Lorg/apache/commons/configuration2/event/EventType<TT;>;Lorg/apache/commons/configuration2/event/EventType<*>;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Throwable;)V
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/event/EventListenerList.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/event/EventListenerList.eea
index d442ec859d..fd885146d1 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/event/EventListenerList.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/event/EventListenerList.eea
@@ -14,7 +14,7 @@ fire
  (Lorg/apache/commons/configuration2/event/Event;)V
 getEventListenerIterator
  <T:Lorg/apache/commons/configuration2/event/Event;>(Lorg/apache/commons/configuration2/event/EventType<TT;>;)Lorg/apache/commons/configuration2/event/EventListenerList$EventListenerIterator<TT;>;
- <T:Lorg/apache/commons/configuration2/event/Event;>(Lorg/apache/commons/configuration2/event/EventType<TT;>;)Lorg/apache/commons/configuration2/event/EventListenerList$EventListenerIterator<TT;>;
+ <T:Lorg/apache/commons/configuration2/event/Event;>(Lorg/apache/commons/configuration2/event/EventType<TT;>;)L1org/apache/commons/configuration2/event/EventListenerList$EventListenerIterator<TT;>;
 getEventListeners
  <T:Lorg/apache/commons/configuration2/event/Event;>(Lorg/apache/commons/configuration2/event/EventType<TT;>;)Ljava/lang/Iterable<Lorg/apache/commons/configuration2/event/EventListener<-TT;>;>;
  <T:Lorg/apache/commons/configuration2/event/Event;>(Lorg/apache/commons/configuration2/event/EventType<TT;>;)Ljava/lang/Iterable<Lorg/apache/commons/configuration2/event/EventListener<-TT;>;>;
@@ -23,7 +23,7 @@ getRegistrations
  ()Ljava/util/List<Lorg/apache/commons/configuration2/event/EventListenerRegistrationData<*>;>;
 getRegistrationsForSuperType
  <T:Lorg/apache/commons/configuration2/event/Event;>(Lorg/apache/commons/configuration2/event/EventType<TT;>;)Ljava/util/List<Lorg/apache/commons/configuration2/event/EventListenerRegistrationData<+TT;>;>;
- <T:Lorg/apache/commons/configuration2/event/Event;>(Lorg/apache/commons/configuration2/event/EventType<TT;>;)Ljava/util/List<Lorg/apache/commons/configuration2/event/EventListenerRegistrationData<+TT;>;>;
+ <T:Lorg/apache/commons/configuration2/event/Event;>(Lorg/apache/commons/configuration2/event/EventType<TT;>;)L1java/util/List<Lorg/apache/commons/configuration2/event/EventListenerRegistrationData<+TT;>;>;
 removeEventListener
  <T:Lorg/apache/commons/configuration2/event/Event;>(Lorg/apache/commons/configuration2/event/EventListenerRegistrationData<TT;>;)Z
  <T:Lorg/apache/commons/configuration2/event/Event;>(Lorg/apache/commons/configuration2/event/EventListenerRegistrationData<TT;>;)Z
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/event/EventType.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/event/EventType.eea
index 60d7b267da..b0c7cf9ef6 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/event/EventType.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/event/EventType.eea
@@ -4,7 +4,7 @@ class org/apache/commons/configuration2/event/EventType
 
 fetchSuperEventTypes
  (Lorg/apache/commons/configuration2/event/EventType<*>;)Ljava/util/Set<Lorg/apache/commons/configuration2/event/EventType<*>;>;
- (Lorg/apache/commons/configuration2/event/EventType<*>;)Ljava/util/Set<Lorg/apache/commons/configuration2/event/EventType<*>;>;
+ (Lorg/apache/commons/configuration2/event/EventType<*>;)L1java/util/Set<Lorg/apache/commons/configuration2/event/EventType<*>;>;
 isInstanceOf
  (Lorg/apache/commons/configuration2/event/EventType<*>;Lorg/apache/commons/configuration2/event/EventType<*>;)Z
  (Lorg/apache/commons/configuration2/event/EventType<*>;Lorg/apache/commons/configuration2/event/EventType<*>;)Z
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.eea
index f9c0559e76..5328241a0f 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.eea
@@ -28,10 +28,10 @@ fetchLookupForPrefix
  (Ljava/lang/String;)Lorg/apache/commons/configuration2/interpol/Lookup;
 getDefaultLookups
  ()Ljava/util/List<Lorg/apache/commons/configuration2/interpol/Lookup;>;
- ()Ljava/util/List<Lorg/apache/commons/configuration2/interpol/Lookup;>;
+ ()L1java/util/List<Lorg/apache/commons/configuration2/interpol/Lookup;>;
 getLookups
  ()Ljava/util/Map<Ljava/lang/String;Lorg/apache/commons/configuration2/interpol/Lookup;>;
- ()Ljava/util/Map<Ljava/lang/String;Lorg/apache/commons/configuration2/interpol/Lookup;>;
+ ()L1java/util/Map<Ljava/lang/String;Lorg/apache/commons/configuration2/interpol/Lookup;>;
 getParentInterpolator
  ()Lorg/apache/commons/configuration2/interpol/ConfigurationInterpolator;
  ()Lorg/apache/commons/configuration2/interpol/ConfigurationInterpolator;
@@ -55,7 +55,7 @@ removeDefaultLookup
  (Lorg/apache/commons/configuration2/interpol/Lookup;)Z
 resolve
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 setParentInterpolator
  (Lorg/apache/commons/configuration2/interpol/ConfigurationInterpolator;)V
  (Lorg/apache/commons/configuration2/interpol/ConfigurationInterpolator;)V
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/interpol/DummyLookup.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/interpol/DummyLookup.eea
index 536f776fac..c799bcd3a1 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/interpol/DummyLookup.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/interpol/DummyLookup.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 lookup
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/interpol/ExprLookup$Variables.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/interpol/ExprLookup$Variables.eea
index 109859f69e..b505d70bcb 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/interpol/ExprLookup$Variables.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/interpol/ExprLookup$Variables.eea
@@ -9,4 +9,4 @@ super java/util/ArrayList
  (Lorg/apache/commons/configuration2/interpol/ExprLookup$Variables;)V
 getVariable
  ()Lorg/apache/commons/configuration2/interpol/ExprLookup$Variable;
- ()Lorg/apache/commons/configuration2/interpol/ExprLookup$Variable;
+ ()L0org/apache/commons/configuration2/interpol/ExprLookup$Variable;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/interpol/ExprLookup.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/interpol/ExprLookup.eea
index ae35b6ad83..544fd05365 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/interpol/ExprLookup.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/interpol/ExprLookup.eea
@@ -14,10 +14,10 @@ getLogger
  ()Lorg/apache/commons/configuration2/io/ConfigurationLogger;
 getVariables
  ()Lorg/apache/commons/configuration2/interpol/ExprLookup$Variables;
- ()Lorg/apache/commons/configuration2/interpol/ExprLookup$Variables;
+ ()L1org/apache/commons/configuration2/interpol/ExprLookup$Variables;
 lookup
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 setInterpolator
  (Lorg/apache/commons/configuration2/interpol/ConfigurationInterpolator;)V
  (Lorg/apache/commons/configuration2/interpol/ConfigurationInterpolator;)V
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/interpol/InterpolatorSpecification$Builder.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/interpol/InterpolatorSpecification$Builder.eea
index 0cbc67c1de..25310015e4 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/interpol/InterpolatorSpecification$Builder.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/interpol/InterpolatorSpecification$Builder.eea
@@ -2,7 +2,7 @@ class org/apache/commons/configuration2/interpol/InterpolatorSpecification$Build
 
 create
  ()Lorg/apache/commons/configuration2/interpol/InterpolatorSpecification;
- ()Lorg/apache/commons/configuration2/interpol/InterpolatorSpecification;
+ ()L1org/apache/commons/configuration2/interpol/InterpolatorSpecification;
 withDefaultLookup
  (Lorg/apache/commons/configuration2/interpol/Lookup;)Lorg/apache/commons/configuration2/interpol/InterpolatorSpecification$Builder;
  (Lorg/apache/commons/configuration2/interpol/Lookup;)L1org/apache/commons/configuration2/interpol/InterpolatorSpecification$Builder;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/AbsoluteNameLocationStrategy.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/AbsoluteNameLocationStrategy.eea
index ebb209bac4..cc6351e221 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/AbsoluteNameLocationStrategy.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/AbsoluteNameLocationStrategy.eea
@@ -2,4 +2,4 @@ class org/apache/commons/configuration2/io/AbsoluteNameLocationStrategy
 
 locate
  (Lorg/apache/commons/configuration2/io/FileSystem;Lorg/apache/commons/configuration2/io/FileLocator;)Ljava/net/URL;
- (Lorg/apache/commons/configuration2/io/FileSystem;Lorg/apache/commons/configuration2/io/FileLocator;)Ljava/net/URL;
+ (Lorg/apache/commons/configuration2/io/FileSystem;Lorg/apache/commons/configuration2/io/FileLocator;)L0java/net/URL;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/BasePathLocationStrategy.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/BasePathLocationStrategy.eea
index 7873e835d9..93c47023c7 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/BasePathLocationStrategy.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/BasePathLocationStrategy.eea
@@ -2,4 +2,4 @@ class org/apache/commons/configuration2/io/BasePathLocationStrategy
 
 locate
  (Lorg/apache/commons/configuration2/io/FileSystem;Lorg/apache/commons/configuration2/io/FileLocator;)Ljava/net/URL;
- (Lorg/apache/commons/configuration2/io/FileSystem;Lorg/apache/commons/configuration2/io/FileLocator;)Ljava/net/URL;
+ (Lorg/apache/commons/configuration2/io/FileSystem;Lorg/apache/commons/configuration2/io/FileLocator;)L0java/net/URL;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/CombinedLocationStrategy.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/CombinedLocationStrategy.eea
index 799d4027c2..6f9281a013 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/CombinedLocationStrategy.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/CombinedLocationStrategy.eea
@@ -8,4 +8,4 @@ getSubStrategies
  ()Ljava/util/Collection<Lorg/apache/commons/configuration2/io/FileLocationStrategy;>;
 locate
  (Lorg/apache/commons/configuration2/io/FileSystem;Lorg/apache/commons/configuration2/io/FileLocator;)Ljava/net/URL;
- (Lorg/apache/commons/configuration2/io/FileSystem;Lorg/apache/commons/configuration2/io/FileLocator;)Ljava/net/URL;
+ (Lorg/apache/commons/configuration2/io/FileSystem;Lorg/apache/commons/configuration2/io/FileLocator;)L0java/net/URL;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/ConfigurationLogger.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/ConfigurationLogger.eea
index b20984f6f9..6b8e8f49b4 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/ConfigurationLogger.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/ConfigurationLogger.eea
@@ -2,7 +2,7 @@ class org/apache/commons/configuration2/io/ConfigurationLogger
 
 newDummyLogger
  ()Lorg/apache/commons/configuration2/io/ConfigurationLogger;
- ()Lorg/apache/commons/configuration2/io/ConfigurationLogger;
+ ()L1org/apache/commons/configuration2/io/ConfigurationLogger;
 
 <init>
  (Ljava/lang/Class<*>;)V
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/DefaultFileSystem.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/DefaultFileSystem.eea
index 89d78f0908..a3c6b23f04 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/DefaultFileSystem.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/DefaultFileSystem.eea
@@ -2,10 +2,10 @@ class org/apache/commons/configuration2/io/DefaultFileSystem
 
 getBasePath
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getFileName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getInputStream
  (Ljava/net/URL;)Ljava/io/InputStream;
  (Ljava/net/URL;)Ljava/io/InputStream;
@@ -14,7 +14,7 @@ getInputStream
  (Ljava/net/URL;Lorg/apache/commons/configuration2/io/URLConnectionOptions;)Ljava/io/InputStream;
 getOutputStream
  (Ljava/io/File;)Ljava/io/OutputStream;
- (Ljava/io/File;)Ljava/io/OutputStream;
+ (Ljava/io/File;)L1java/io/OutputStream;
 getOutputStream
  (Ljava/net/URL;)Ljava/io/OutputStream;
  (Ljava/net/URL;)Ljava/io/OutputStream;
@@ -26,4 +26,4 @@ getURL
  (Ljava/lang/String;Ljava/lang/String;)Ljava/net/URL;
 locateFromURL
  (Ljava/lang/String;Ljava/lang/String;)Ljava/net/URL;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/net/URL;
+ (Ljava/lang/String;Ljava/lang/String;)L0java/net/URL;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/FileHandler.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/FileHandler.eea
index b71454b20f..777d795117 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/FileHandler.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/FileHandler.eea
@@ -2,7 +2,7 @@ class org/apache/commons/configuration2/io/FileHandler
 
 fromMap
  (Ljava/util/Map<Ljava/lang/String;*>;)Lorg/apache/commons/configuration2/io/FileHandler;
- (Ljava/util/Map<Ljava/lang/String;*>;)Lorg/apache/commons/configuration2/io/FileHandler;
+ (Ljava/util/Map<Ljava/lang/String;*>;)L1org/apache/commons/configuration2/io/FileHandler;
 
 <init>
  (Lorg/apache/commons/configuration2/io/FileBased;)V
@@ -15,7 +15,7 @@ addFileHandlerListener
  (L1org/apache/commons/configuration2/io/FileHandlerListener;)V
 getBasePath
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getContent
  ()Lorg/apache/commons/configuration2/io/FileBased;
  ()Lorg/apache/commons/configuration2/io/FileBased;
@@ -30,7 +30,7 @@ getFileLocator
  ()Lorg/apache/commons/configuration2/io/FileLocator;
 getFileName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getFileSystem
  ()Lorg/apache/commons/configuration2/io/FileSystem;
  ()Lorg/apache/commons/configuration2/io/FileSystem;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/FileLocator$FileLocatorBuilder.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/FileLocator$FileLocatorBuilder.eea
index 0b3768596b..c6777e8271 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/FileLocator$FileLocatorBuilder.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/FileLocator$FileLocatorBuilder.eea
@@ -5,7 +5,7 @@ basePath
  (Ljava/lang/String;)L1org/apache/commons/configuration2/io/FileLocator$FileLocatorBuilder;
 create
  ()Lorg/apache/commons/configuration2/io/FileLocator;
- ()Lorg/apache/commons/configuration2/io/FileLocator;
+ ()L1org/apache/commons/configuration2/io/FileLocator;
 encoding
  (Ljava/lang/String;)Lorg/apache/commons/configuration2/io/FileLocator$FileLocatorBuilder;
  (Ljava/lang/String;)L1org/apache/commons/configuration2/io/FileLocator$FileLocatorBuilder;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/FileLocatorUtils.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/FileLocatorUtils.eea
index cb9160d43d..b9607bea0a 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/FileLocatorUtils.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/FileLocatorUtils.eea
@@ -15,13 +15,13 @@ fileLocator
  ()Lorg/apache/commons/configuration2/io/FileLocator$FileLocatorBuilder;
 fileLocator
  (Lorg/apache/commons/configuration2/io/FileLocator;)Lorg/apache/commons/configuration2/io/FileLocator$FileLocatorBuilder;
- (Lorg/apache/commons/configuration2/io/FileLocator;)Lorg/apache/commons/configuration2/io/FileLocator$FileLocatorBuilder;
+ (Lorg/apache/commons/configuration2/io/FileLocator;)L1org/apache/commons/configuration2/io/FileLocator$FileLocatorBuilder;
 fromMap
  (Ljava/util/Map<Ljava/lang/String;*>;)Lorg/apache/commons/configuration2/io/FileLocator;
  (Ljava/util/Map<Ljava/lang/String;*>;)Lorg/apache/commons/configuration2/io/FileLocator;
 fullyInitializedLocator
  (Lorg/apache/commons/configuration2/io/FileLocator;)Lorg/apache/commons/configuration2/io/FileLocator;
- (Lorg/apache/commons/configuration2/io/FileLocator;)Lorg/apache/commons/configuration2/io/FileLocator;
+ (Lorg/apache/commons/configuration2/io/FileLocator;)L0org/apache/commons/configuration2/io/FileLocator;
 isFullyInitialized
  (Lorg/apache/commons/configuration2/io/FileLocator;)Z
  (Lorg/apache/commons/configuration2/io/FileLocator;)Z
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/HomeDirectoryLocationStrategy.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/HomeDirectoryLocationStrategy.eea
index 65ad5605ec..b0c9d4cd1c 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/HomeDirectoryLocationStrategy.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/HomeDirectoryLocationStrategy.eea
@@ -8,4 +8,4 @@ getHomeDirectory
  ()Ljava/lang/String;
 locate
  (Lorg/apache/commons/configuration2/io/FileSystem;Lorg/apache/commons/configuration2/io/FileLocator;)Ljava/net/URL;
- (Lorg/apache/commons/configuration2/io/FileSystem;Lorg/apache/commons/configuration2/io/FileLocator;)Ljava/net/URL;
+ (Lorg/apache/commons/configuration2/io/FileSystem;Lorg/apache/commons/configuration2/io/FileLocator;)L0java/net/URL;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/VFSFileSystem.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/VFSFileSystem.eea
index 73c3fcd8d5..1506db9201 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/VFSFileSystem.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/io/VFSFileSystem.eea
@@ -2,10 +2,10 @@ class org/apache/commons/configuration2/io/VFSFileSystem
 
 getBasePath
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String; # @Inherited(org.apache.commons.configuration2.io.DefaultFileSystem)
 getFileName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String; # @Inherited(org.apache.commons.configuration2.io.DefaultFileSystem)
 getInputStream
  (Ljava/net/URL;)Ljava/io/InputStream;
  (Ljava/net/URL;)Ljava/io/InputStream;
@@ -14,10 +14,10 @@ getOutputStream
  (Ljava/net/URL;)Ljava/io/OutputStream;
 getPath
  (Ljava/io/File;Ljava/net/URL;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/io/File;Ljava/net/URL;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/io/File;Ljava/net/URL;Ljava/lang/String;Ljava/lang/String;)L0java/lang/String;
 getURL
  (Ljava/lang/String;Ljava/lang/String;)Ljava/net/URL;
  (Ljava/lang/String;Ljava/lang/String;)Ljava/net/URL;
 locateFromURL
  (Ljava/lang/String;Ljava/lang/String;)Ljava/net/URL;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/net/URL;
+ (Ljava/lang/String;Ljava/lang/String;)L0java/net/URL; # @Inherited(org.apache.commons.configuration2.io.DefaultFileSystem)
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/plist/SimpleCharStream.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/plist/SimpleCharStream.eea
index f93138b4ef..683101cd0e 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/plist/SimpleCharStream.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/plist/SimpleCharStream.eea
@@ -45,7 +45,7 @@ GetImage
  ()Ljava/lang/String;
 GetSuffix
  (I)[C
- (I)[C
+ (I)[1C
 ReInit
  (Ljava/io/InputStream;)V
  (Ljava/io/InputStream;)V
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/plist/Token.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/plist/Token.eea
index 9a030068f0..53bf5c66ab 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/plist/Token.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/plist/Token.eea
@@ -5,7 +5,7 @@ newToken
  (I)Lorg/apache/commons/configuration2/plist/Token;
 newToken
  (ILjava/lang/String;)Lorg/apache/commons/configuration2/plist/Token;
- (ILjava/lang/String;)Lorg/apache/commons/configuration2/plist/Token;
+ (ILjava/lang/String;)L1org/apache/commons/configuration2/plist/Token;
 
 image
  Ljava/lang/String;
@@ -22,7 +22,7 @@ specialToken
  (ILjava/lang/String;)V
 getValue
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/plist/TokenMgrError.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/plist/TokenMgrError.eea
index 7b039facaa..2cc052137d 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/plist/TokenMgrError.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/plist/TokenMgrError.eea
@@ -2,10 +2,10 @@ class org/apache/commons/configuration2/plist/TokenMgrError
 
 LexicalError
  (ZIIILjava/lang/String;C)Ljava/lang/String;
- (ZIIILjava/lang/String;C)Ljava/lang/String;
+ (ZIIILjava/lang/String;C)L1java/lang/String;
 addEscapes
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 
 <init>
  (Ljava/lang/String;I)V
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/reloading/VFSFileHandlerReloadingDetector.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/reloading/VFSFileHandlerReloadingDetector.eea
index 9de77f3166..b0276502c6 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/reloading/VFSFileHandlerReloadingDetector.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/reloading/VFSFileHandlerReloadingDetector.eea
@@ -8,7 +8,7 @@ class org/apache/commons/configuration2/reloading/VFSFileHandlerReloadingDetecto
  (Lorg/apache/commons/configuration2/io/FileHandler;J)V
 getFileObject
  ()Lorg/apache/commons/vfs2/FileObject;
- ()Lorg/apache/commons/vfs2/FileObject;
+ ()L0org/apache/commons/vfs2/FileObject;
 resolveFileURI
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/resolver/CatalogResolver$CatalogManager.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/resolver/CatalogResolver$CatalogManager.eea
index d30dedb8a4..b833410924 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/resolver/CatalogResolver$CatalogManager.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/resolver/CatalogResolver$CatalogManager.eea
@@ -14,7 +14,7 @@ getInterpolator
  ()Lorg/apache/commons/configuration2/interpol/ConfigurationInterpolator;
 getPrivateCatalog
  ()Lorg/apache/xml/resolver/Catalog;
- ()Lorg/apache/xml/resolver/Catalog;
+ ()L1org/apache/xml/resolver/Catalog;
 setBaseDir
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/spring/ConfigurationPropertiesFactoryBean.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/spring/ConfigurationPropertiesFactoryBean.eea
index 517cafdc5c..c36478db4d 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/spring/ConfigurationPropertiesFactoryBean.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/spring/ConfigurationPropertiesFactoryBean.eea
@@ -18,10 +18,10 @@ getLocations
  ()[Lorg/springframework/core/io/Resource;
 getObject
  ()Ljava/util/Properties;
- ()Ljava/util/Properties;
+ ()L0java/util/Properties;
 getObjectType
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L1java/lang/Class<*>;
 setConfigurations
  ([Lorg/apache/commons/configuration2/Configuration;)V
  ([Lorg/apache/commons/configuration2/Configuration;)V
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/spring/ConfigurationPropertySource.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/spring/ConfigurationPropertySource.eea
index fda30b40a6..1b70d0a958 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/spring/ConfigurationPropertySource.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/spring/ConfigurationPropertySource.eea
@@ -12,7 +12,7 @@ super org/springframework/core/env/EnumerablePropertySource
  (Ljava/lang/String;Lorg/apache/commons/configuration2/Configuration;)V
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 getPropertyNames
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/DefaultConfigurationKey.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/DefaultConfigurationKey.eea
index 8b97ec9f12..64caf81eae 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/DefaultConfigurationKey.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/DefaultConfigurationKey.eea
@@ -23,13 +23,13 @@ attributeName
  (Ljava/lang/String;)Ljava/lang/String;
 commonKey
  (Lorg/apache/commons/configuration2/tree/DefaultConfigurationKey;)Lorg/apache/commons/configuration2/tree/DefaultConfigurationKey;
- (Lorg/apache/commons/configuration2/tree/DefaultConfigurationKey;)Lorg/apache/commons/configuration2/tree/DefaultConfigurationKey;
+ (Lorg/apache/commons/configuration2/tree/DefaultConfigurationKey;)L1org/apache/commons/configuration2/tree/DefaultConfigurationKey;
 constructAttributeKey
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
 differenceKey
  (Lorg/apache/commons/configuration2/tree/DefaultConfigurationKey;)Lorg/apache/commons/configuration2/tree/DefaultConfigurationKey;
- (Lorg/apache/commons/configuration2/tree/DefaultConfigurationKey;)Lorg/apache/commons/configuration2/tree/DefaultConfigurationKey;
+ (Lorg/apache/commons/configuration2/tree/DefaultConfigurationKey;)L1org/apache/commons/configuration2/tree/DefaultConfigurationKey;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -41,7 +41,7 @@ isAttributeKey
  (Ljava/lang/String;)Z
 iterator
  ()Lorg/apache/commons/configuration2/tree/DefaultConfigurationKey$KeyIterator;
- ()Lorg/apache/commons/configuration2/tree/DefaultConfigurationKey$KeyIterator;
+ ()L1org/apache/commons/configuration2/tree/DefaultConfigurationKey$KeyIterator;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/DefaultExpressionEngine.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/DefaultExpressionEngine.eea
index 9d7789e315..dfd84265e5 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/DefaultExpressionEngine.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/DefaultExpressionEngine.eea
@@ -12,10 +12,10 @@ INSTANCE
  (Lorg/apache/commons/configuration2/tree/DefaultExpressionEngineSymbols;Lorg/apache/commons/configuration2/tree/NodeMatcher<Ljava/lang/String;>;)V
 attributeKey
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 canonicalKey
  <T:Ljava/lang/Object;>(TT;Ljava/lang/String;Lorg/apache/commons/configuration2/tree/NodeHandler<TT;>;)Ljava/lang/String;
- <T:Ljava/lang/Object;>(TT;Ljava/lang/String;Lorg/apache/commons/configuration2/tree/NodeHandler<TT;>;)Ljava/lang/String;
+ <T:Ljava/lang/Object;>(TT;Ljava/lang/String;Lorg/apache/commons/configuration2/tree/NodeHandler<TT;>;)L1java/lang/String;
 findLastPathNode
  <T:Ljava/lang/Object;>(Lorg/apache/commons/configuration2/tree/DefaultConfigurationKey$KeyIterator;TT;Lorg/apache/commons/configuration2/tree/NodeHandler<TT;>;)TT;
  <T:Ljava/lang/Object;>(Lorg/apache/commons/configuration2/tree/DefaultConfigurationKey$KeyIterator;TT;Lorg/apache/commons/configuration2/tree/NodeHandler<TT;>;)TT;
@@ -27,10 +27,10 @@ getSymbols
  ()Lorg/apache/commons/configuration2/tree/DefaultExpressionEngineSymbols;
 nodeKey
  <T:Ljava/lang/Object;>(TT;Ljava/lang/String;Lorg/apache/commons/configuration2/tree/NodeHandler<TT;>;)Ljava/lang/String;
- <T:Ljava/lang/Object;>(TT;Ljava/lang/String;Lorg/apache/commons/configuration2/tree/NodeHandler<TT;>;)Ljava/lang/String;
+ <T:Ljava/lang/Object;>(TT;Ljava/lang/String;Lorg/apache/commons/configuration2/tree/NodeHandler<TT;>;)L1java/lang/String;
 prepareAdd
  <T:Ljava/lang/Object;>(TT;Ljava/lang/String;Lorg/apache/commons/configuration2/tree/NodeHandler<TT;>;)Lorg/apache/commons/configuration2/tree/NodeAddData<TT;>;
  <T:Ljava/lang/Object;>(TT;Ljava/lang/String;Lorg/apache/commons/configuration2/tree/NodeHandler<TT;>;)Lorg/apache/commons/configuration2/tree/NodeAddData<TT;>;
 query
  <T:Ljava/lang/Object;>(TT;Ljava/lang/String;Lorg/apache/commons/configuration2/tree/NodeHandler<TT;>;)Ljava/util/List<Lorg/apache/commons/configuration2/tree/QueryResult<TT;>;>;
- <T:Ljava/lang/Object;>(TT;Ljava/lang/String;Lorg/apache/commons/configuration2/tree/NodeHandler<TT;>;)Ljava/util/List<Lorg/apache/commons/configuration2/tree/QueryResult<TT;>;>;
+ <T:Ljava/lang/Object;>(TT;Ljava/lang/String;Lorg/apache/commons/configuration2/tree/NodeHandler<TT;>;)L1java/util/List<Lorg/apache/commons/configuration2/tree/QueryResult<TT;>;>;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/DefaultExpressionEngineSymbols$Builder.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/DefaultExpressionEngineSymbols$Builder.eea
index 521b9a7626..e611dac321 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/DefaultExpressionEngineSymbols$Builder.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/DefaultExpressionEngineSymbols$Builder.eea
@@ -5,7 +5,7 @@ class org/apache/commons/configuration2/tree/DefaultExpressionEngineSymbols$Buil
  (Lorg/apache/commons/configuration2/tree/DefaultExpressionEngineSymbols;)V
 create
  ()Lorg/apache/commons/configuration2/tree/DefaultExpressionEngineSymbols;
- ()Lorg/apache/commons/configuration2/tree/DefaultExpressionEngineSymbols;
+ ()L1org/apache/commons/configuration2/tree/DefaultExpressionEngineSymbols;
 setAttributeEnd
  (Ljava/lang/String;)Lorg/apache/commons/configuration2/tree/DefaultExpressionEngineSymbols$Builder;
  (Ljava/lang/String;)L1org/apache/commons/configuration2/tree/DefaultExpressionEngineSymbols$Builder;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/ImmutableNode$Builder.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/ImmutableNode$Builder.eea
index 9cf8bc675a..e97ef8f0eb 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/ImmutableNode$Builder.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/ImmutableNode$Builder.eea
@@ -14,7 +14,7 @@ addChildren
  (Ljava/util/Collection<+Lorg/apache/commons/configuration2/tree/ImmutableNode;>;)L1org/apache/commons/configuration2/tree/ImmutableNode$Builder;
 create
  ()Lorg/apache/commons/configuration2/tree/ImmutableNode;
- ()Lorg/apache/commons/configuration2/tree/ImmutableNode;
+ ()L1org/apache/commons/configuration2/tree/ImmutableNode;
 name
  (Ljava/lang/String;)Lorg/apache/commons/configuration2/tree/ImmutableNode$Builder;
  (Ljava/lang/String;)L1org/apache/commons/configuration2/tree/ImmutableNode$Builder;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/InMemoryNodeModel.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/InMemoryNodeModel.eea
index 4a408e129b..d681bc06c6 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/InMemoryNodeModel.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/InMemoryNodeModel.eea
@@ -33,7 +33,7 @@ clearTree
  (Ljava/lang/String;Lorg/apache/commons/configuration2/tree/NodeKeyResolver<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;)Ljava/util/List<Lorg/apache/commons/configuration2/tree/QueryResult<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;>;
 clearTree
  (Ljava/lang/String;Lorg/apache/commons/configuration2/tree/NodeSelector;Lorg/apache/commons/configuration2/tree/NodeKeyResolver<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;)Ljava/util/List<Lorg/apache/commons/configuration2/tree/QueryResult<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;>;
- (Ljava/lang/String;Lorg/apache/commons/configuration2/tree/NodeSelector;Lorg/apache/commons/configuration2/tree/NodeKeyResolver<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;)Ljava/util/List<Lorg/apache/commons/configuration2/tree/QueryResult<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;>;
+ (Ljava/lang/String;Lorg/apache/commons/configuration2/tree/NodeSelector;Lorg/apache/commons/configuration2/tree/NodeKeyResolver<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;)L1java/util/List<Lorg/apache/commons/configuration2/tree/QueryResult<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;>;
 getInMemoryRepresentation
  ()Lorg/apache/commons/configuration2/tree/ImmutableNode;
  ()Lorg/apache/commons/configuration2/tree/ImmutableNode;
@@ -51,7 +51,7 @@ getTrackedNode
  (Lorg/apache/commons/configuration2/tree/NodeSelector;)Lorg/apache/commons/configuration2/tree/ImmutableNode;
 getTrackedNodeHandler
  (Lorg/apache/commons/configuration2/tree/NodeSelector;)Lorg/apache/commons/configuration2/tree/NodeHandler<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;
- (Lorg/apache/commons/configuration2/tree/NodeSelector;)Lorg/apache/commons/configuration2/tree/NodeHandler<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;
+ (Lorg/apache/commons/configuration2/tree/NodeSelector;)L1org/apache/commons/configuration2/tree/NodeHandler<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;
 isTrackedNodeDetached
  (Lorg/apache/commons/configuration2/tree/NodeSelector;)Z
  (Lorg/apache/commons/configuration2/tree/NodeSelector;)Z
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/MergeCombiner.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/MergeCombiner.eea
index 560c598c83..98b5e7d382 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/MergeCombiner.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/MergeCombiner.eea
@@ -5,7 +5,7 @@ addAttributes
  (Lorg/apache/commons/configuration2/tree/ImmutableNode$Builder;Lorg/apache/commons/configuration2/tree/ImmutableNode;Lorg/apache/commons/configuration2/tree/ImmutableNode;)V
 canCombine
  (Lorg/apache/commons/configuration2/tree/ImmutableNode;Lorg/apache/commons/configuration2/tree/ImmutableNode;Ljava/util/List<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;)Lorg/apache/commons/configuration2/tree/ImmutableNode;
- (Lorg/apache/commons/configuration2/tree/ImmutableNode;Lorg/apache/commons/configuration2/tree/ImmutableNode;Ljava/util/List<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;)Lorg/apache/commons/configuration2/tree/ImmutableNode;
+ (Lorg/apache/commons/configuration2/tree/ImmutableNode;Lorg/apache/commons/configuration2/tree/ImmutableNode;Ljava/util/List<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;)L0org/apache/commons/configuration2/tree/ImmutableNode;
 combine
  (Lorg/apache/commons/configuration2/tree/ImmutableNode;Lorg/apache/commons/configuration2/tree/ImmutableNode;)Lorg/apache/commons/configuration2/tree/ImmutableNode;
  (Lorg/apache/commons/configuration2/tree/ImmutableNode;Lorg/apache/commons/configuration2/tree/ImmutableNode;)Lorg/apache/commons/configuration2/tree/ImmutableNode;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/NodeSelector.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/NodeSelector.eea
index fe2aeb4bb9..fa988b4ab3 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/NodeSelector.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/NodeSelector.eea
@@ -8,10 +8,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 select
  (Lorg/apache/commons/configuration2/tree/ImmutableNode;Lorg/apache/commons/configuration2/tree/NodeKeyResolver<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;Lorg/apache/commons/configuration2/tree/NodeHandler<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;)Lorg/apache/commons/configuration2/tree/ImmutableNode;
- (Lorg/apache/commons/configuration2/tree/ImmutableNode;Lorg/apache/commons/configuration2/tree/NodeKeyResolver<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;Lorg/apache/commons/configuration2/tree/NodeHandler<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;)Lorg/apache/commons/configuration2/tree/ImmutableNode;
+ (Lorg/apache/commons/configuration2/tree/ImmutableNode;Lorg/apache/commons/configuration2/tree/NodeKeyResolver<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;Lorg/apache/commons/configuration2/tree/NodeHandler<Lorg/apache/commons/configuration2/tree/ImmutableNode;>;)L0org/apache/commons/configuration2/tree/ImmutableNode;
 subSelector
  (Ljava/lang/String;)Lorg/apache/commons/configuration2/tree/NodeSelector;
- (Ljava/lang/String;)Lorg/apache/commons/configuration2/tree/NodeSelector;
+ (Ljava/lang/String;)L1org/apache/commons/configuration2/tree/NodeSelector;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/OverrideCombiner.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/OverrideCombiner.eea
index bb16f74997..0a61339e8b 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/OverrideCombiner.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/OverrideCombiner.eea
@@ -5,7 +5,7 @@ addAttributes
  (Lorg/apache/commons/configuration2/tree/ImmutableNode$Builder;Lorg/apache/commons/configuration2/tree/ImmutableNode;Lorg/apache/commons/configuration2/tree/ImmutableNode;)V
 canCombine
  (Lorg/apache/commons/configuration2/tree/ImmutableNode;Lorg/apache/commons/configuration2/tree/ImmutableNode;Lorg/apache/commons/configuration2/tree/ImmutableNode;)Lorg/apache/commons/configuration2/tree/ImmutableNode;
- (Lorg/apache/commons/configuration2/tree/ImmutableNode;Lorg/apache/commons/configuration2/tree/ImmutableNode;Lorg/apache/commons/configuration2/tree/ImmutableNode;)Lorg/apache/commons/configuration2/tree/ImmutableNode;
+ (Lorg/apache/commons/configuration2/tree/ImmutableNode;Lorg/apache/commons/configuration2/tree/ImmutableNode;Lorg/apache/commons/configuration2/tree/ImmutableNode;)L0org/apache/commons/configuration2/tree/ImmutableNode;
 combine
  (Lorg/apache/commons/configuration2/tree/ImmutableNode;Lorg/apache/commons/configuration2/tree/ImmutableNode;)Lorg/apache/commons/configuration2/tree/ImmutableNode;
  (Lorg/apache/commons/configuration2/tree/ImmutableNode;Lorg/apache/commons/configuration2/tree/ImmutableNode;)Lorg/apache/commons/configuration2/tree/ImmutableNode;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/QueryResult.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/QueryResult.eea
index 86534a6e7e..b5a11353e4 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/QueryResult.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/QueryResult.eea
@@ -4,10 +4,10 @@ class org/apache/commons/configuration2/tree/QueryResult
 
 createAttributeResult
  <T:Ljava/lang/Object;>(TT;Ljava/lang/String;)Lorg/apache/commons/configuration2/tree/QueryResult<TT;>;
- <T:Ljava/lang/Object;>(TT;Ljava/lang/String;)Lorg/apache/commons/configuration2/tree/QueryResult<TT;>;
+ <T:Ljava/lang/Object;>(TT;Ljava/lang/String;)L1org/apache/commons/configuration2/tree/QueryResult<TT;>;
 createNodeResult
  <T:Ljava/lang/Object;>(TT;)Lorg/apache/commons/configuration2/tree/QueryResult<TT;>;
- <T:Ljava/lang/Object;>(TT;)Lorg/apache/commons/configuration2/tree/QueryResult<TT;>;
+ <T:Ljava/lang/Object;>(TT;)L1org/apache/commons/configuration2/tree/QueryResult<TT;>;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/UnionCombiner.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/UnionCombiner.eea
index 95951e01b4..7716738e94 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/UnionCombiner.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/UnionCombiner.eea
@@ -5,4 +5,4 @@ combine
  (Lorg/apache/commons/configuration2/tree/ImmutableNode;Lorg/apache/commons/configuration2/tree/ImmutableNode;)Lorg/apache/commons/configuration2/tree/ImmutableNode;
 findCombineNode
  (Lorg/apache/commons/configuration2/tree/ImmutableNode;Lorg/apache/commons/configuration2/tree/ImmutableNode;Lorg/apache/commons/configuration2/tree/ImmutableNode;)Lorg/apache/commons/configuration2/tree/ImmutableNode;
- (Lorg/apache/commons/configuration2/tree/ImmutableNode;Lorg/apache/commons/configuration2/tree/ImmutableNode;Lorg/apache/commons/configuration2/tree/ImmutableNode;)Lorg/apache/commons/configuration2/tree/ImmutableNode;
+ (Lorg/apache/commons/configuration2/tree/ImmutableNode;Lorg/apache/commons/configuration2/tree/ImmutableNode;Lorg/apache/commons/configuration2/tree/ImmutableNode;)L0org/apache/commons/configuration2/tree/ImmutableNode;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.eea
index 5dd8dfa873..db9065e862 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.eea
@@ -2,11 +2,11 @@ class org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFacto
 
 wrapNode
  <T:Ljava/lang/Object;>(TT;Lorg/apache/commons/configuration2/tree/NodeHandler<TT;>;)Ljava/lang/Object;
- <T:Ljava/lang/Object;>(TT;Lorg/apache/commons/configuration2/tree/NodeHandler<TT;>;)Ljava/lang/Object;
+ <T:Ljava/lang/Object;>(TT;Lorg/apache/commons/configuration2/tree/NodeHandler<TT;>;)L1java/lang/Object;
 
 createNodePointer
  (Lorg/apache/commons/jxpath/ri/QName;Ljava/lang/Object;Ljava/util/Locale;)Lorg/apache/commons/jxpath/ri/model/NodePointer;
- (Lorg/apache/commons/jxpath/ri/QName;Ljava/lang/Object;Ljava/util/Locale;)Lorg/apache/commons/jxpath/ri/model/NodePointer;
+ (Lorg/apache/commons/jxpath/ri/QName;Ljava/lang/Object;Ljava/util/Locale;)L0org/apache/commons/jxpath/ri/model/NodePointer;
 createNodePointer
  (Lorg/apache/commons/jxpath/ri/model/NodePointer;Lorg/apache/commons/jxpath/ri/QName;Ljava/lang/Object;)Lorg/apache/commons/jxpath/ri/model/NodePointer;
- (Lorg/apache/commons/jxpath/ri/model/NodePointer;Lorg/apache/commons/jxpath/ri/QName;Ljava/lang/Object;)Lorg/apache/commons/jxpath/ri/model/NodePointer;
+ (Lorg/apache/commons/jxpath/ri/model/NodePointer;Lorg/apache/commons/jxpath/ri/QName;Ljava/lang/Object;)L0org/apache/commons/jxpath/ri/model/NodePointer;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.eea
index fc49ce8a94..2f0afed44e 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.eea
@@ -2,7 +2,7 @@ class org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine
 
 attributeKey
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 canonicalKey
  <T:Ljava/lang/Object;>(TT;Ljava/lang/String;Lorg/apache/commons/configuration2/tree/NodeHandler<TT;>;)Ljava/lang/String;
  <T:Ljava/lang/Object;>(TT;Ljava/lang/String;Lorg/apache/commons/configuration2/tree/NodeHandler<TT;>;)Ljava/lang/String;
diff --git a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/web/ServletRequestConfiguration.eea b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/web/ServletRequestConfiguration.eea
index 04fd95e8a8..1e3017ad2e 100644
--- a/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/web/ServletRequestConfiguration.eea
+++ b/libs/eea-commons-configuration-2/src/main/resources/org/apache/commons/configuration2/web/ServletRequestConfiguration.eea
@@ -12,4 +12,4 @@ getKeysInternal
  ()Ljava/util/Iterator<Ljava/lang/String;>;
 getPropertyInternal
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/FileCleaningTracker.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/FileCleaningTracker.eea
index 25df38943c..b3c849854a 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/FileCleaningTracker.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/FileCleaningTracker.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/FileCleaningTracker
 
 getDeleteFailures
  ()Ljava/util/List<Ljava/lang/String;>;
- ()Ljava/util/List<Ljava/lang/String;>;
+ ()L1java/util/List<Ljava/lang/String;>;
 track
  (Ljava/io/File;Ljava/lang/Object;)V
  (Ljava/io/File;Ljava/lang/Object;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/FileSystem.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/FileSystem.eea
index b1bcf927de..ade93243ef 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/FileSystem.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/FileSystem.eea
@@ -10,7 +10,7 @@ getCurrent
 
 getIllegalFileNameChars
  ()[C
- ()[C
+ ()[1C
 getIllegalFileNameCodePoints
  ()[I
  ()[I
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/FileUtils.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/FileUtils.eea
index 5dbbcc31b8..2de3227049 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/FileUtils.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/FileUtils.eea
@@ -36,7 +36,7 @@ byteCountToDisplaySize
  (Ljava/lang/Number;)Ljava/lang/String;
 byteCountToDisplaySize
  (Ljava/math/BigInteger;)Ljava/lang/String;
- (Ljava/math/BigInteger;)Ljava/lang/String;
+ (Ljava/math/BigInteger;)L1java/lang/String;
 checksum
  (Ljava/io/File;Ljava/util/zip/Checksum;)Ljava/util/zip/Checksum;
  (Ljava/io/File;Ljava/util/zip/Checksum;)Ljava/util/zip/Checksum;
@@ -114,7 +114,7 @@ copyURLToFile
  (Ljava/net/URL;Ljava/io/File;II)V
 createParentDirectories
  (Ljava/io/File;)Ljava/io/File;
- (Ljava/io/File;)Ljava/io/File;
+ (Ljava/io/File;)L1java/io/File;
 current
  ()Ljava/io/File;
  ()Ljava/io/File;
@@ -144,19 +144,19 @@ forceMkdirParent
  (Ljava/io/File;)V
 getFile
  (Ljava/io/File;[Ljava/lang/String;)Ljava/io/File;
- (Ljava/io/File;[Ljava/lang/String;)Ljava/io/File;
+ (Ljava/io/File;[Ljava/lang/String;)L1java/io/File;
 getFile
  ([Ljava/lang/String;)Ljava/io/File;
- ([Ljava/lang/String;)Ljava/io/File;
+ ([Ljava/lang/String;)L1java/io/File;
 getTempDirectory
  ()Ljava/io/File;
- ()Ljava/io/File;
+ ()L1java/io/File;
 getTempDirectoryPath
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getUserDirectory
  ()Ljava/io/File;
- ()Ljava/io/File;
+ ()L1java/io/File;
 getUserDirectoryPath
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -300,13 +300,13 @@ newOutputStream
  (Ljava/io/File;Z)Ljava/io/OutputStream;
 openInputStream
  (Ljava/io/File;)Ljava/io/FileInputStream;
- (Ljava/io/File;)Ljava/io/FileInputStream;
+ (Ljava/io/File;)L1java/io/FileInputStream;
 openOutputStream
  (Ljava/io/File;)Ljava/io/FileOutputStream;
  (Ljava/io/File;)Ljava/io/FileOutputStream;
 openOutputStream
  (Ljava/io/File;Z)Ljava/io/FileOutputStream;
- (Ljava/io/File;Z)Ljava/io/FileOutputStream;
+ (Ljava/io/File;Z)L1java/io/FileOutputStream;
 readFileToByteArray
  (Ljava/io/File;)[B
  (Ljava/io/File;)[B
@@ -345,13 +345,13 @@ streamFiles
  (Ljava/io/File;Z[Ljava/lang/String;)Ljava/util/stream/Stream<Ljava/io/File;>;
 toFile
  (Ljava/net/URL;)Ljava/io/File;
- (Ljava/net/URL;)Ljava/io/File;
+ (Ljava/net/URL;)L0java/io/File;
 toFiles
  ([Ljava/net/URL;)[Ljava/io/File;
  ([Ljava/net/URL;)[Ljava/io/File;
 toURLs
  ([Ljava/io/File;)[Ljava/net/URL;
- ([Ljava/io/File;)[Ljava/net/URL;
+ ([Ljava/io/File;)[1Ljava/net/URL;
 touch
  (Ljava/io/File;)V
  (Ljava/io/File;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/IOExceptionList.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/IOExceptionList.eea
index 646a454ca0..97e8bbba6c 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/IOExceptionList.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/IOExceptionList.eea
@@ -22,10 +22,10 @@ getCause
  <T:Ljava/lang/Throwable;>(ILjava/lang/Class<TT;>;)TT;
 getCauseList
  <T:Ljava/lang/Throwable;>()Ljava/util/List<TT;>;
- <T:Ljava/lang/Throwable;>()Ljava/util/List<TT;>;
+ <T:Ljava/lang/Throwable;>()L1java/util/List<TT;>;
 getCauseList
  <T:Ljava/lang/Throwable;>(Ljava/lang/Class<TT;>;)Ljava/util/List<TT;>;
- <T:Ljava/lang/Throwable;>(Ljava/lang/Class<TT;>;)Ljava/util/List<TT;>;
+ <T:Ljava/lang/Throwable;>(Ljava/lang/Class<TT;>;)L1java/util/List<TT;>;
 iterator
  ()Ljava/util/Iterator<Ljava/lang/Throwable;>;
  ()Ljava/util/Iterator<Ljava/lang/Throwable;>;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/RandomAccessFileMode.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/RandomAccessFileMode.eea
index 9f0fc1b7f6..4dfcc954e9 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/RandomAccessFileMode.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/RandomAccessFileMode.eea
@@ -6,13 +6,13 @@ super java/lang/Enum
 
 create
  (Ljava/io/File;)Ljava/io/RandomAccessFile;
- (Ljava/io/File;)Ljava/io/RandomAccessFile;
+ (Ljava/io/File;)L1java/io/RandomAccessFile;
 create
  (Ljava/lang/String;)Ljava/io/RandomAccessFile;
- (Ljava/lang/String;)Ljava/io/RandomAccessFile;
+ (Ljava/lang/String;)L1java/io/RandomAccessFile;
 create
  (Ljava/nio/file/Path;)Ljava/io/RandomAccessFile;
- (Ljava/nio/file/Path;)Ljava/io/RandomAccessFile;
+ (Ljava/nio/file/Path;)L1java/io/RandomAccessFile;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Enum)
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/StreamIterator.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/StreamIterator.eea
index d3a9f7ac28..1850b1b402 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/StreamIterator.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/StreamIterator.eea
@@ -8,7 +8,7 @@ super java/util/Iterator
 
 iterator
  <T:Ljava/lang/Object;>(Ljava/util/stream/Stream<TT;>;)Lorg/apache/commons/io/StreamIterator<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/stream/Stream<TT;>;)Lorg/apache/commons/io/StreamIterator<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/stream/Stream<TT;>;)L1org/apache/commons/io/StreamIterator<TT;>;
 
 next
  ()TE;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/file/AccumulatorPathVisitor.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/file/AccumulatorPathVisitor.eea
index 1753fba6ff..33f4623648 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/file/AccumulatorPathVisitor.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/file/AccumulatorPathVisitor.eea
@@ -2,16 +2,16 @@ class org/apache/commons/io/file/AccumulatorPathVisitor
 
 withBigIntegerCounters
  ()Lorg/apache/commons/io/file/AccumulatorPathVisitor;
- ()Lorg/apache/commons/io/file/AccumulatorPathVisitor;
+ ()L1org/apache/commons/io/file/AccumulatorPathVisitor;
 withBigIntegerCounters
  (Lorg/apache/commons/io/file/PathFilter;Lorg/apache/commons/io/file/PathFilter;)Lorg/apache/commons/io/file/AccumulatorPathVisitor;
- (Lorg/apache/commons/io/file/PathFilter;Lorg/apache/commons/io/file/PathFilter;)Lorg/apache/commons/io/file/AccumulatorPathVisitor;
+ (Lorg/apache/commons/io/file/PathFilter;Lorg/apache/commons/io/file/PathFilter;)L1org/apache/commons/io/file/AccumulatorPathVisitor;
 withLongCounters
  ()Lorg/apache/commons/io/file/AccumulatorPathVisitor;
- ()Lorg/apache/commons/io/file/AccumulatorPathVisitor;
+ ()L1org/apache/commons/io/file/AccumulatorPathVisitor;
 withLongCounters
  (Lorg/apache/commons/io/file/PathFilter;Lorg/apache/commons/io/file/PathFilter;)Lorg/apache/commons/io/file/AccumulatorPathVisitor;
- (Lorg/apache/commons/io/file/PathFilter;Lorg/apache/commons/io/file/PathFilter;)Lorg/apache/commons/io/file/AccumulatorPathVisitor;
+ (Lorg/apache/commons/io/file/PathFilter;Lorg/apache/commons/io/file/PathFilter;)L1org/apache/commons/io/file/AccumulatorPathVisitor;
 
 <init>
  (Lorg/apache/commons/io/file/Counters$PathCounters;)V
@@ -27,10 +27,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(org.apache.commons.io.file.CountingPathVisitor)
 getDirList
  ()Ljava/util/List<Ljava/nio/file/Path;>;
- ()Ljava/util/List<Ljava/nio/file/Path;>;
+ ()L1java/util/List<Ljava/nio/file/Path;>;
 getFileList
  ()Ljava/util/List<Ljava/nio/file/Path;>;
- ()Ljava/util/List<Ljava/nio/file/Path;>;
+ ()L1java/util/List<Ljava/nio/file/Path;>;
 relativizeDirectories
  (Ljava/nio/file/Path;ZLjava/util/Comparator<-Ljava/nio/file/Path;>;)Ljava/util/List<Ljava/nio/file/Path;>;
  (Ljava/nio/file/Path;ZLjava/util/Comparator<-Ljava/nio/file/Path;>;)Ljava/util/List<Ljava/nio/file/Path;>;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/file/Counters.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/file/Counters.eea
index 032a001113..790b33207c 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/file/Counters.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/file/Counters.eea
@@ -2,16 +2,16 @@ class org/apache/commons/io/file/Counters
 
 bigIntegerCounter
  ()Lorg/apache/commons/io/file/Counters$Counter;
- ()Lorg/apache/commons/io/file/Counters$Counter;
+ ()L1org/apache/commons/io/file/Counters$Counter;
 bigIntegerPathCounters
  ()Lorg/apache/commons/io/file/Counters$PathCounters;
- ()Lorg/apache/commons/io/file/Counters$PathCounters;
+ ()L1org/apache/commons/io/file/Counters$PathCounters;
 longCounter
  ()Lorg/apache/commons/io/file/Counters$Counter;
- ()Lorg/apache/commons/io/file/Counters$Counter;
+ ()L1org/apache/commons/io/file/Counters$Counter;
 longPathCounters
  ()Lorg/apache/commons/io/file/Counters$PathCounters;
- ()Lorg/apache/commons/io/file/Counters$PathCounters;
+ ()L1org/apache/commons/io/file/Counters$PathCounters;
 noopCounter
  ()Lorg/apache/commons/io/file/Counters$Counter;
  ()Lorg/apache/commons/io/file/Counters$Counter;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/file/CountingPathVisitor.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/file/CountingPathVisitor.eea
index b528013687..b113379a94 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/file/CountingPathVisitor.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/file/CountingPathVisitor.eea
@@ -2,10 +2,10 @@ class org/apache/commons/io/file/CountingPathVisitor
 
 withBigIntegerCounters
  ()Lorg/apache/commons/io/file/CountingPathVisitor;
- ()Lorg/apache/commons/io/file/CountingPathVisitor;
+ ()L1org/apache/commons/io/file/CountingPathVisitor;
 withLongCounters
  ()Lorg/apache/commons/io/file/CountingPathVisitor;
- ()Lorg/apache/commons/io/file/CountingPathVisitor;
+ ()L1org/apache/commons/io/file/CountingPathVisitor;
 
 <init>
  (Lorg/apache/commons/io/file/Counters$PathCounters;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/file/FilesUncheck.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/file/FilesUncheck.eea
index 6fac460f7a..cddb50b50f 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/file/FilesUncheck.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/file/FilesUncheck.eea
@@ -11,31 +11,31 @@ copy
  (Ljava/nio/file/Path;Ljava/nio/file/Path;[Ljava/nio/file/CopyOption;)Ljava/nio/file/Path;
 createDirectories
  (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createDirectory
  (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createFile
  (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createLink
  (Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;Ljava/nio/file/Path;)L1java/nio/file/Path;
 createSymbolicLink
  (Ljava/nio/file/Path;Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createTempDirectory
  (Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createTempDirectory
  (Ljava/nio/file/Path;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createTempFile
  (Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createTempFile
  (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 delete
  (Ljava/nio/file/Path;)V
  (Ljava/nio/file/Path;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/file/PathUtils.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/file/PathUtils.eea
index 274e96cacf..d33ec3f050 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/file/PathUtils.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/file/PathUtils.eea
@@ -54,10 +54,10 @@ countDirectoryAsBigInteger
  (Ljava/nio/file/Path;)Lorg/apache/commons/io/file/Counters$PathCounters;
 createParentDirectories
  (Ljava/nio/file/Path;Ljava/nio/file/LinkOption;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;Ljava/nio/file/LinkOption;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;Ljava/nio/file/LinkOption;[Ljava/nio/file/attribute/FileAttribute<*>;)L0java/nio/file/Path;
 createParentDirectories
  (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 current
  ()Ljava/nio/file/Path;
  ()Ljava/nio/file/Path;
@@ -120,16 +120,16 @@ getAclFileAttributeView
  (Ljava/nio/file/Path;[Ljava/nio/file/LinkOption;)Ljava/nio/file/attribute/AclFileAttributeView;
 getBaseName
  (Ljava/nio/file/Path;)Ljava/lang/String;
- (Ljava/nio/file/Path;)Ljava/lang/String;
+ (Ljava/nio/file/Path;)L0java/lang/String;
 getDosFileAttributeView
  (Ljava/nio/file/Path;[Ljava/nio/file/LinkOption;)Ljava/nio/file/attribute/DosFileAttributeView;
  (Ljava/nio/file/Path;[Ljava/nio/file/LinkOption;)Ljava/nio/file/attribute/DosFileAttributeView;
 getExtension
  (Ljava/nio/file/Path;)Ljava/lang/String;
- (Ljava/nio/file/Path;)Ljava/lang/String;
+ (Ljava/nio/file/Path;)L0java/lang/String;
 getFileName
  <R:Ljava/lang/Object;>(Ljava/nio/file/Path;Ljava/util/function/Function<Ljava/nio/file/Path;TR;>;)TR;
- <R:Ljava/lang/Object;>(Ljava/nio/file/Path;Ljava/util/function/Function<Ljava/nio/file/Path;TR;>;)TR;
+ <R:Ljava/lang/Object;>(Ljava/nio/file/Path;Ljava/util/function/Function<Ljava/nio/file/Path;TR;>;)T0R;
 getFileNameString
  (Ljava/nio/file/Path;)Ljava/lang/String;
  (Ljava/nio/file/Path;)Ljava/lang/String;
@@ -210,7 +210,7 @@ noFollowLinkOptionArray
  ()[Ljava/nio/file/LinkOption;
 readAttributes
  <A::Ljava/nio/file/attribute/BasicFileAttributes;>(Ljava/nio/file/Path;Ljava/lang/Class<TA;>;[Ljava/nio/file/LinkOption;)TA;
- <A::Ljava/nio/file/attribute/BasicFileAttributes;>(Ljava/nio/file/Path;Ljava/lang/Class<TA;>;[Ljava/nio/file/LinkOption;)TA;
+ <A::Ljava/nio/file/attribute/BasicFileAttributes;>(Ljava/nio/file/Path;Ljava/lang/Class<TA;>;[Ljava/nio/file/LinkOption;)T0A;
 readBasicFileAttributes
  (Ljava/nio/file/Path;)Ljava/nio/file/attribute/BasicFileAttributes;
  (Ljava/nio/file/Path;)Ljava/nio/file/attribute/BasicFileAttributes;
@@ -231,7 +231,7 @@ readPosixFileAttributes
  (Ljava/nio/file/Path;[Ljava/nio/file/LinkOption;)Ljava/nio/file/attribute/PosixFileAttributes;
 readString
  (Ljava/nio/file/Path;Ljava/nio/charset/Charset;)Ljava/lang/String;
- (Ljava/nio/file/Path;Ljava/nio/charset/Charset;)Ljava/lang/String;
+ (Ljava/nio/file/Path;Ljava/nio/charset/Charset;)L1java/lang/String;
 setLastModifiedTime
  (Ljava/nio/file/Path;Ljava/nio/file/Path;)V
  (Ljava/nio/file/Path;Ljava/nio/file/Path;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/file/attribute/FileTimes.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/file/attribute/FileTimes.eea
index de6490068a..b70cc87e6c 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/file/attribute/FileTimes.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/file/attribute/FileTimes.eea
@@ -24,7 +24,7 @@ now
  ()Ljava/nio/file/attribute/FileTime;
 ntfsTimeToDate
  (J)Ljava/util/Date;
- (J)Ljava/util/Date;
+ (J)L1java/util/Date;
 ntfsTimeToFileTime
  (J)Ljava/nio/file/attribute/FileTime;
  (J)Ljava/nio/file/attribute/FileTime;
@@ -42,10 +42,10 @@ setLastModifiedTime
  (Ljava/nio/file/Path;)V
 toDate
  (Ljava/nio/file/attribute/FileTime;)Ljava/util/Date;
- (Ljava/nio/file/attribute/FileTime;)Ljava/util/Date;
+ (Ljava/nio/file/attribute/FileTime;)L0java/util/Date;
 toFileTime
  (Ljava/util/Date;)Ljava/nio/file/attribute/FileTime;
- (Ljava/util/Date;)Ljava/nio/file/attribute/FileTime;
+ (Ljava/util/Date;)L0java/nio/file/attribute/FileTime;
 toNtfsTime
  (Ljava/nio/file/attribute/FileTime;)J
  (Ljava/nio/file/attribute/FileTime;)J
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/filefilter/FalseFileFilter.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/filefilter/FalseFileFilter.eea
index cb1e3fc7b4..219df5a13b 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/filefilter/FalseFileFilter.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/filefilter/FalseFileFilter.eea
@@ -18,13 +18,13 @@ accept
  (Ljava/nio/file/Path;Ljava/nio/file/attribute/BasicFileAttributes;)Ljava/nio/file/FileVisitResult;
 and
  (Lorg/apache/commons/io/filefilter/IOFileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (Lorg/apache/commons/io/filefilter/IOFileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (Lorg/apache/commons/io/filefilter/IOFileFilter;)L1org/apache/commons/io/filefilter/IOFileFilter; # @Inherited(org.apache.commons.io.filefilter.IOFileFilter)
 negate
  ()Lorg/apache/commons/io/filefilter/IOFileFilter;
- ()Lorg/apache/commons/io/filefilter/IOFileFilter;
+ ()L1org/apache/commons/io/filefilter/IOFileFilter; # @Inherited(org.apache.commons.io.filefilter.IOFileFilter)
 or
  (Lorg/apache/commons/io/filefilter/IOFileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (Lorg/apache/commons/io/filefilter/IOFileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (Lorg/apache/commons/io/filefilter/IOFileFilter;)L1org/apache/commons/io/filefilter/IOFileFilter; # @Inherited(org.apache.commons.io.filefilter.IOFileFilter)
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/filefilter/FileFilterUtils.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/filefilter/FileFilterUtils.eea
index f49ddb621d..5a5c8abed0 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/filefilter/FileFilterUtils.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/filefilter/FileFilterUtils.eea
@@ -2,34 +2,34 @@ class org/apache/commons/io/filefilter/FileFilterUtils
 
 ageFileFilter
  (J)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (J)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (J)L1org/apache/commons/io/filefilter/IOFileFilter;
 ageFileFilter
  (JZ)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (JZ)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (JZ)L1org/apache/commons/io/filefilter/IOFileFilter;
 ageFileFilter
  (Ljava/io/File;)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (Ljava/io/File;)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (Ljava/io/File;)L1org/apache/commons/io/filefilter/IOFileFilter;
 ageFileFilter
  (Ljava/io/File;Z)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (Ljava/io/File;Z)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (Ljava/io/File;Z)L1org/apache/commons/io/filefilter/IOFileFilter;
 ageFileFilter
  (Ljava/util/Date;)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (Ljava/util/Date;)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (Ljava/util/Date;)L1org/apache/commons/io/filefilter/IOFileFilter;
 ageFileFilter
  (Ljava/util/Date;Z)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (Ljava/util/Date;Z)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (Ljava/util/Date;Z)L1org/apache/commons/io/filefilter/IOFileFilter;
 and
  ([Lorg/apache/commons/io/filefilter/IOFileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
- ([Lorg/apache/commons/io/filefilter/IOFileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ ([Lorg/apache/commons/io/filefilter/IOFileFilter;)L1org/apache/commons/io/filefilter/IOFileFilter;
 andFileFilter
  (Lorg/apache/commons/io/filefilter/IOFileFilter;Lorg/apache/commons/io/filefilter/IOFileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (Lorg/apache/commons/io/filefilter/IOFileFilter;Lorg/apache/commons/io/filefilter/IOFileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (Lorg/apache/commons/io/filefilter/IOFileFilter;Lorg/apache/commons/io/filefilter/IOFileFilter;)L1org/apache/commons/io/filefilter/IOFileFilter;
 asFileFilter
  (Ljava/io/FileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (Ljava/io/FileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (Ljava/io/FileFilter;)L1org/apache/commons/io/filefilter/IOFileFilter;
 asFileFilter
  (Ljava/io/FilenameFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (Ljava/io/FilenameFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (Ljava/io/FilenameFilter;)L1org/apache/commons/io/filefilter/IOFileFilter;
 directoryFileFilter
  ()Lorg/apache/commons/io/filefilter/IOFileFilter;
  ()Lorg/apache/commons/io/filefilter/IOFileFilter;
@@ -56,19 +56,19 @@ filterSet
  (Lorg/apache/commons/io/filefilter/IOFileFilter;Ljava/lang/Iterable<Ljava/io/File;>;)Ljava/util/Set<Ljava/io/File;>;
 filterSet
  (Lorg/apache/commons/io/filefilter/IOFileFilter;[Ljava/io/File;)Ljava/util/Set<Ljava/io/File;>;
- (Lorg/apache/commons/io/filefilter/IOFileFilter;[Ljava/io/File;)Ljava/util/Set<Ljava/io/File;>;
+ (Lorg/apache/commons/io/filefilter/IOFileFilter;[Ljava/io/File;)L1java/util/Set<Ljava/io/File;>;
 magicNumberFileFilter
  (Ljava/lang/String;)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (Ljava/lang/String;)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (Ljava/lang/String;)L1org/apache/commons/io/filefilter/IOFileFilter;
 magicNumberFileFilter
  (Ljava/lang/String;J)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (Ljava/lang/String;J)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (Ljava/lang/String;J)L1org/apache/commons/io/filefilter/IOFileFilter;
 magicNumberFileFilter
  ([B)Lorg/apache/commons/io/filefilter/IOFileFilter;
- ([B)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ ([B)L1org/apache/commons/io/filefilter/IOFileFilter;
 magicNumberFileFilter
  ([BJ)Lorg/apache/commons/io/filefilter/IOFileFilter;
- ([BJ)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ ([BJ)L1org/apache/commons/io/filefilter/IOFileFilter;
 makeCVSAware
  (Lorg/apache/commons/io/filefilter/IOFileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
  (Lorg/apache/commons/io/filefilter/IOFileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
@@ -83,40 +83,40 @@ makeSVNAware
  (Lorg/apache/commons/io/filefilter/IOFileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
 nameFileFilter
  (Ljava/lang/String;)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (Ljava/lang/String;)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (Ljava/lang/String;)L1org/apache/commons/io/filefilter/IOFileFilter;
 nameFileFilter
  (Ljava/lang/String;Lorg/apache/commons/io/IOCase;)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (Ljava/lang/String;Lorg/apache/commons/io/IOCase;)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (Ljava/lang/String;Lorg/apache/commons/io/IOCase;)L1org/apache/commons/io/filefilter/IOFileFilter;
 notFileFilter
  (Lorg/apache/commons/io/filefilter/IOFileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
  (Lorg/apache/commons/io/filefilter/IOFileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
 or
  ([Lorg/apache/commons/io/filefilter/IOFileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
- ([Lorg/apache/commons/io/filefilter/IOFileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ ([Lorg/apache/commons/io/filefilter/IOFileFilter;)L1org/apache/commons/io/filefilter/IOFileFilter;
 orFileFilter
  (Lorg/apache/commons/io/filefilter/IOFileFilter;Lorg/apache/commons/io/filefilter/IOFileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (Lorg/apache/commons/io/filefilter/IOFileFilter;Lorg/apache/commons/io/filefilter/IOFileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (Lorg/apache/commons/io/filefilter/IOFileFilter;Lorg/apache/commons/io/filefilter/IOFileFilter;)L1org/apache/commons/io/filefilter/IOFileFilter;
 prefixFileFilter
  (Ljava/lang/String;)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (Ljava/lang/String;)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (Ljava/lang/String;)L1org/apache/commons/io/filefilter/IOFileFilter;
 prefixFileFilter
  (Ljava/lang/String;Lorg/apache/commons/io/IOCase;)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (Ljava/lang/String;Lorg/apache/commons/io/IOCase;)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (Ljava/lang/String;Lorg/apache/commons/io/IOCase;)L1org/apache/commons/io/filefilter/IOFileFilter;
 sizeFileFilter
  (J)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (J)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (J)L1org/apache/commons/io/filefilter/IOFileFilter;
 sizeFileFilter
  (JZ)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (JZ)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (JZ)L1org/apache/commons/io/filefilter/IOFileFilter;
 sizeRangeFileFilter
  (JJ)Lorg/apache/commons/io/filefilter/IOFileFilter;
  (JJ)Lorg/apache/commons/io/filefilter/IOFileFilter;
 suffixFileFilter
  (Ljava/lang/String;)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (Ljava/lang/String;)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (Ljava/lang/String;)L1org/apache/commons/io/filefilter/IOFileFilter;
 suffixFileFilter
  (Ljava/lang/String;Lorg/apache/commons/io/IOCase;)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (Ljava/lang/String;Lorg/apache/commons/io/IOCase;)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (Ljava/lang/String;Lorg/apache/commons/io/IOCase;)L1org/apache/commons/io/filefilter/IOFileFilter;
 toList
  ([Lorg/apache/commons/io/filefilter/IOFileFilter;)Ljava/util/List<Lorg/apache/commons/io/filefilter/IOFileFilter;>;
  ([Lorg/apache/commons/io/filefilter/IOFileFilter;)Ljava/util/List<Lorg/apache/commons/io/filefilter/IOFileFilter;>;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/filefilter/IOFileFilter.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/filefilter/IOFileFilter.eea
index 40cf656546..145d43baa6 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/filefilter/IOFileFilter.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/filefilter/IOFileFilter.eea
@@ -15,13 +15,13 @@ accept
  (Ljava/nio/file/Path;Ljava/nio/file/attribute/BasicFileAttributes;)Ljava/nio/file/FileVisitResult;
 and
  (Lorg/apache/commons/io/filefilter/IOFileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (Lorg/apache/commons/io/filefilter/IOFileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (Lorg/apache/commons/io/filefilter/IOFileFilter;)L1org/apache/commons/io/filefilter/IOFileFilter;
 matches
  (Ljava/nio/file/Path;)Z
  (Ljava/nio/file/Path;)Z
 negate
  ()Lorg/apache/commons/io/filefilter/IOFileFilter;
- ()Lorg/apache/commons/io/filefilter/IOFileFilter;
+ ()L1org/apache/commons/io/filefilter/IOFileFilter;
 or
  (Lorg/apache/commons/io/filefilter/IOFileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (Lorg/apache/commons/io/filefilter/IOFileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (Lorg/apache/commons/io/filefilter/IOFileFilter;)L1org/apache/commons/io/filefilter/IOFileFilter;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/filefilter/TrueFileFilter.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/filefilter/TrueFileFilter.eea
index 885246821a..68a1f736d5 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/filefilter/TrueFileFilter.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/filefilter/TrueFileFilter.eea
@@ -18,13 +18,13 @@ accept
  (Ljava/nio/file/Path;Ljava/nio/file/attribute/BasicFileAttributes;)Ljava/nio/file/FileVisitResult;
 and
  (Lorg/apache/commons/io/filefilter/IOFileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (Lorg/apache/commons/io/filefilter/IOFileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (Lorg/apache/commons/io/filefilter/IOFileFilter;)L1org/apache/commons/io/filefilter/IOFileFilter; # @Inherited(org.apache.commons.io.filefilter.IOFileFilter)
 negate
  ()Lorg/apache/commons/io/filefilter/IOFileFilter;
- ()Lorg/apache/commons/io/filefilter/IOFileFilter;
+ ()L1org/apache/commons/io/filefilter/IOFileFilter; # @Inherited(org.apache.commons.io.filefilter.IOFileFilter)
 or
  (Lorg/apache/commons/io/filefilter/IOFileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
- (Lorg/apache/commons/io/filefilter/IOFileFilter;)Lorg/apache/commons/io/filefilter/IOFileFilter;
+ (Lorg/apache/commons/io/filefilter/IOFileFilter;)L1org/apache/commons/io/filefilter/IOFileFilter; # @Inherited(org.apache.commons.io.filefilter.IOFileFilter)
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/filefilter/WildcardFileFilter.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/filefilter/WildcardFileFilter.eea
index d6a1dd7c45..a761d293a0 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/filefilter/WildcardFileFilter.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/filefilter/WildcardFileFilter.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/filefilter/WildcardFileFilter
 
 builder
  ()Lorg/apache/commons/io/filefilter/WildcardFileFilter$Builder;
- ()Lorg/apache/commons/io/filefilter/WildcardFileFilter$Builder;
+ ()L1org/apache/commons/io/filefilter/WildcardFileFilter$Builder;
 
 <init>
  (Ljava/lang/String;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/function/Erase.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/function/Erase.eea
index b8821a6cbe..3cf378cf05 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/function/Erase.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/function/Erase.eea
@@ -2,4 +2,4 @@ class org/apache/commons/io/function/Erase
 
 rethrow
  <T:Ljava/lang/Throwable;>(Ljava/lang/Throwable;)Ljava/lang/RuntimeException;^TT;
- <T:Ljava/lang/Throwable;>(Ljava/lang/Throwable;)Ljava/lang/RuntimeException;^TT;
+ <T:Ljava/lang/Throwable;>(Ljava/lang/Throwable;)L1java/lang/RuntimeException;^TT;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/AutoCloseInputStream$Builder.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/AutoCloseInputStream$Builder.eea
index 8cd0714140..4dc113826f 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/AutoCloseInputStream$Builder.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/AutoCloseInputStream$Builder.eea
@@ -6,4 +6,4 @@ super org/apache/commons/io/build/AbstractStreamBuilder
 
 get
  ()Lorg/apache/commons/io/input/AutoCloseInputStream;
- ()Lorg/apache/commons/io/input/AutoCloseInputStream;
+ ()L1org/apache/commons/io/input/AutoCloseInputStream;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/AutoCloseInputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/AutoCloseInputStream.eea
index 7f943908a1..115576ab8e 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/AutoCloseInputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/AutoCloseInputStream.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/input/AutoCloseInputStream
 
 builder
  ()Lorg/apache/commons/io/input/AutoCloseInputStream$Builder;
- ()Lorg/apache/commons/io/input/AutoCloseInputStream$Builder;
+ ()L1org/apache/commons/io/input/AutoCloseInputStream$Builder;
 
 <init>
  (Ljava/io/InputStream;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/BOMInputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/BOMInputStream.eea
index 240568bdf7..8d7b0426e2 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/BOMInputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/BOMInputStream.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/input/BOMInputStream
 
 builder
  ()Lorg/apache/commons/io/input/BOMInputStream$Builder;
- ()Lorg/apache/commons/io/input/BOMInputStream$Builder;
+ ()L1org/apache/commons/io/input/BOMInputStream$Builder;
 
 <init>
  (Ljava/io/InputStream;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/BoundedInputStream$Builder.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/BoundedInputStream$Builder.eea
index eb06d58fdb..1469902416 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/BoundedInputStream$Builder.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/BoundedInputStream$Builder.eea
@@ -6,4 +6,4 @@ super org/apache/commons/io/input/BoundedInputStream$AbstractBuilder
 
 get
  ()Lorg/apache/commons/io/input/BoundedInputStream;
- ()Lorg/apache/commons/io/input/BoundedInputStream;
+ ()L1org/apache/commons/io/input/BoundedInputStream;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/BoundedInputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/BoundedInputStream.eea
index cd39f8e063..ecbe33155a 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/BoundedInputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/BoundedInputStream.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/input/BoundedInputStream
 
 builder
  ()Lorg/apache/commons/io/input/BoundedInputStream$Builder;
- ()Lorg/apache/commons/io/input/BoundedInputStream$Builder;
+ ()L1org/apache/commons/io/input/BoundedInputStream$Builder;
 
 <init>
  (Ljava/io/InputStream;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/BufferedFileChannelInputStream$Builder.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/BufferedFileChannelInputStream$Builder.eea
index 1a8f736add..785d1cef90 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/BufferedFileChannelInputStream$Builder.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/BufferedFileChannelInputStream$Builder.eea
@@ -6,4 +6,4 @@ super org/apache/commons/io/build/AbstractStreamBuilder
 
 get
  ()Lorg/apache/commons/io/input/BufferedFileChannelInputStream;
- ()Lorg/apache/commons/io/input/BufferedFileChannelInputStream;
+ ()L1org/apache/commons/io/input/BufferedFileChannelInputStream;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/BufferedFileChannelInputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/BufferedFileChannelInputStream.eea
index e9d1273af2..7b852f54bb 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/BufferedFileChannelInputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/BufferedFileChannelInputStream.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/input/BufferedFileChannelInputStream
 
 builder
  ()Lorg/apache/commons/io/input/BufferedFileChannelInputStream$Builder;
- ()Lorg/apache/commons/io/input/BufferedFileChannelInputStream$Builder;
+ ()L1org/apache/commons/io/input/BufferedFileChannelInputStream$Builder;
 
 <init>
  (Ljava/io/File;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/CharSequenceInputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/CharSequenceInputStream.eea
index ff8862e938..0c3924402f 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/CharSequenceInputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/CharSequenceInputStream.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/input/CharSequenceInputStream
 
 builder
  ()Lorg/apache/commons/io/input/CharSequenceInputStream$Builder;
- ()Lorg/apache/commons/io/input/CharSequenceInputStream$Builder;
+ ()L1org/apache/commons/io/input/CharSequenceInputStream$Builder;
 
 <init>
  (Ljava/lang/CharSequence;Ljava/lang/String;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ChecksumInputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ChecksumInputStream.eea
index 72267b4cbe..10ace6501e 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ChecksumInputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ChecksumInputStream.eea
@@ -2,4 +2,4 @@ class org/apache/commons/io/input/ChecksumInputStream
 
 builder
  ()Lorg/apache/commons/io/input/ChecksumInputStream$Builder;
- ()Lorg/apache/commons/io/input/ChecksumInputStream$Builder;
+ ()L1org/apache/commons/io/input/ChecksumInputStream$Builder;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/CloseShieldInputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/CloseShieldInputStream.eea
index 135bb82bdb..86ff295831 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/CloseShieldInputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/CloseShieldInputStream.eea
@@ -5,7 +5,7 @@ systemIn
  (Ljava/io/InputStream;)Ljava/io/InputStream;
 wrap
  (Ljava/io/InputStream;)Lorg/apache/commons/io/input/CloseShieldInputStream;
- (Ljava/io/InputStream;)Lorg/apache/commons/io/input/CloseShieldInputStream;
+ (Ljava/io/InputStream;)L1org/apache/commons/io/input/CloseShieldInputStream;
 
 <init>
  (Ljava/io/InputStream;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/CloseShieldReader.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/CloseShieldReader.eea
index 0eb54c1f9d..c2ec27294e 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/CloseShieldReader.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/CloseShieldReader.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/input/CloseShieldReader
 
 wrap
  (Ljava/io/Reader;)Lorg/apache/commons/io/input/CloseShieldReader;
- (Ljava/io/Reader;)Lorg/apache/commons/io/input/CloseShieldReader;
+ (Ljava/io/Reader;)L1org/apache/commons/io/input/CloseShieldReader;
 
 <init>
  (Ljava/io/Reader;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/MemoryMappedFileInputStream$Builder.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/MemoryMappedFileInputStream$Builder.eea
index 8ff13e1ce7..bf07b97add 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/MemoryMappedFileInputStream$Builder.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/MemoryMappedFileInputStream$Builder.eea
@@ -6,4 +6,4 @@ super org/apache/commons/io/build/AbstractStreamBuilder
 
 get
  ()Lorg/apache/commons/io/input/MemoryMappedFileInputStream;
- ()Lorg/apache/commons/io/input/MemoryMappedFileInputStream;
+ ()L1org/apache/commons/io/input/MemoryMappedFileInputStream;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/MemoryMappedFileInputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/MemoryMappedFileInputStream.eea
index 87a16c9379..c246f63259 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/MemoryMappedFileInputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/MemoryMappedFileInputStream.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/input/MemoryMappedFileInputStream
 
 builder
  ()Lorg/apache/commons/io/input/MemoryMappedFileInputStream$Builder;
- ()Lorg/apache/commons/io/input/MemoryMappedFileInputStream$Builder;
+ ()L1org/apache/commons/io/input/MemoryMappedFileInputStream$Builder;
 
 read
  ([BII)I
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/MessageDigestCalculatingInputStream$Builder.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/MessageDigestCalculatingInputStream$Builder.eea
index 027c3396c5..71db2a82e4 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/MessageDigestCalculatingInputStream$Builder.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/MessageDigestCalculatingInputStream$Builder.eea
@@ -6,7 +6,7 @@ super org/apache/commons/io/build/AbstractStreamBuilder
 
 get
  ()Lorg/apache/commons/io/input/MessageDigestCalculatingInputStream;
- ()Lorg/apache/commons/io/input/MessageDigestCalculatingInputStream;
+ ()L1org/apache/commons/io/input/MessageDigestCalculatingInputStream;
 setMessageDigest
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/MessageDigestCalculatingInputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/MessageDigestCalculatingInputStream.eea
index 09fd6ec745..76e83c65f3 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/MessageDigestCalculatingInputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/MessageDigestCalculatingInputStream.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/input/MessageDigestCalculatingInputStream
 
 builder
  ()Lorg/apache/commons/io/input/MessageDigestCalculatingInputStream$Builder;
- ()Lorg/apache/commons/io/input/MessageDigestCalculatingInputStream$Builder;
+ ()L1org/apache/commons/io/input/MessageDigestCalculatingInputStream$Builder;
 
 <init>
  (Ljava/io/InputStream;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/MessageDigestInputStream$Builder.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/MessageDigestInputStream$Builder.eea
index 538e934b75..1818313373 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/MessageDigestInputStream$Builder.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/MessageDigestInputStream$Builder.eea
@@ -6,7 +6,7 @@ super org/apache/commons/io/build/AbstractStreamBuilder
 
 get
  ()Lorg/apache/commons/io/input/MessageDigestInputStream;
- ()Lorg/apache/commons/io/input/MessageDigestInputStream;
+ ()L1org/apache/commons/io/input/MessageDigestInputStream;
 setMessageDigest
  (Ljava/lang/String;)Lorg/apache/commons/io/input/MessageDigestInputStream$Builder;
  (Ljava/lang/String;)L1org/apache/commons/io/input/MessageDigestInputStream$Builder;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/MessageDigestInputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/MessageDigestInputStream.eea
index 4c7acdf684..fdd9e8252e 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/MessageDigestInputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/MessageDigestInputStream.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/input/MessageDigestInputStream
 
 builder
  ()Lorg/apache/commons/io/input/MessageDigestInputStream$Builder;
- ()Lorg/apache/commons/io/input/MessageDigestInputStream$Builder;
+ ()L1org/apache/commons/io/input/MessageDigestInputStream$Builder;
 
 getMessageDigest
  ()Ljava/security/MessageDigest;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ObservableInputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ObservableInputStream.eea
index 4a475a5bf6..fee12b975d 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ObservableInputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ObservableInputStream.eea
@@ -11,7 +11,7 @@ add
  (Lorg/apache/commons/io/input/ObservableInputStream$Observer;)V
 getObservers
  ()Ljava/util/List<Lorg/apache/commons/io/input/ObservableInputStream$Observer;>;
- ()Ljava/util/List<Lorg/apache/commons/io/input/ObservableInputStream$Observer;>;
+ ()L1java/util/List<Lorg/apache/commons/io/input/ObservableInputStream$Observer;>;
 noteDataBytes
  ([BII)V
  ([BII)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/QueueInputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/QueueInputStream.eea
index aba8965e01..8d55658cba 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/QueueInputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/QueueInputStream.eea
@@ -2,11 +2,11 @@ class org/apache/commons/io/input/QueueInputStream
 
 builder
  ()Lorg/apache/commons/io/input/QueueInputStream$Builder;
- ()Lorg/apache/commons/io/input/QueueInputStream$Builder;
+ ()L1org/apache/commons/io/input/QueueInputStream$Builder;
 
 <init>
  (Ljava/util/concurrent/BlockingQueue<Ljava/lang/Integer;>;)V
  (Ljava/util/concurrent/BlockingQueue<Ljava/lang/Integer;>;)V
 newQueueOutputStream
  ()Lorg/apache/commons/io/output/QueueOutputStream;
- ()Lorg/apache/commons/io/output/QueueOutputStream;
+ ()L1org/apache/commons/io/output/QueueOutputStream;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/RandomAccessFileInputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/RandomAccessFileInputStream.eea
index f5d0248704..57a66b6b56 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/RandomAccessFileInputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/RandomAccessFileInputStream.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/input/RandomAccessFileInputStream
 
 builder
  ()Lorg/apache/commons/io/input/RandomAccessFileInputStream$Builder;
- ()Lorg/apache/commons/io/input/RandomAccessFileInputStream$Builder;
+ ()L1org/apache/commons/io/input/RandomAccessFileInputStream$Builder;
 
 <init>
  (Ljava/io/RandomAccessFile;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ReadAheadInputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ReadAheadInputStream.eea
index e124f6804f..3e81400aae 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ReadAheadInputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ReadAheadInputStream.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/input/ReadAheadInputStream
 
 builder
  ()Lorg/apache/commons/io/input/ReadAheadInputStream$Builder;
- ()Lorg/apache/commons/io/input/ReadAheadInputStream$Builder;
+ ()L1org/apache/commons/io/input/ReadAheadInputStream$Builder;
 
 <init>
  (Ljava/io/InputStream;I)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ReaderInputStream$Builder.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ReaderInputStream$Builder.eea
index 8ecfbf878d..5c08222985 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ReaderInputStream$Builder.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ReaderInputStream$Builder.eea
@@ -6,7 +6,7 @@ super org/apache/commons/io/build/AbstractStreamBuilder
 
 get
  ()Lorg/apache/commons/io/input/ReaderInputStream;
- ()Lorg/apache/commons/io/input/ReaderInputStream;
+ ()L1org/apache/commons/io/input/ReaderInputStream;
 setCharset
  (Ljava/nio/charset/Charset;)Lorg/apache/commons/io/input/ReaderInputStream$Builder;
  (Ljava/nio/charset/Charset;)L1org/apache/commons/io/input/ReaderInputStream$Builder;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ReaderInputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ReaderInputStream.eea
index b18c5f6677..911212a0c8 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ReaderInputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ReaderInputStream.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/input/ReaderInputStream
 
 builder
  ()Lorg/apache/commons/io/input/ReaderInputStream$Builder;
- ()Lorg/apache/commons/io/input/ReaderInputStream$Builder;
+ ()L1org/apache/commons/io/input/ReaderInputStream$Builder;
 
 <init>
  (Ljava/io/Reader;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ReversedLinesFileReader$Builder.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ReversedLinesFileReader$Builder.eea
index e8aa18b7a3..b1ec671da8 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ReversedLinesFileReader$Builder.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ReversedLinesFileReader$Builder.eea
@@ -6,4 +6,4 @@ super org/apache/commons/io/build/AbstractStreamBuilder
 
 get
  ()Lorg/apache/commons/io/input/ReversedLinesFileReader;
- ()Lorg/apache/commons/io/input/ReversedLinesFileReader;
+ ()L1org/apache/commons/io/input/ReversedLinesFileReader;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ReversedLinesFileReader.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ReversedLinesFileReader.eea
index dfcee6ba32..cec700229a 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ReversedLinesFileReader.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ReversedLinesFileReader.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/input/ReversedLinesFileReader
 
 builder
  ()Lorg/apache/commons/io/input/ReversedLinesFileReader$Builder;
- ()Lorg/apache/commons/io/input/ReversedLinesFileReader$Builder;
+ ()L1org/apache/commons/io/input/ReversedLinesFileReader$Builder;
 
 <init>
  (Ljava/io/File;)V
@@ -30,7 +30,7 @@ readLine
  ()Ljava/lang/String;
 readLines
  (I)Ljava/util/List<Ljava/lang/String;>;
- (I)Ljava/util/List<Ljava/lang/String;>;
+ (I)L1java/util/List<Ljava/lang/String;>;
 toString
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/Tailer.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/Tailer.eea
index acea372525..2002632677 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/Tailer.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/Tailer.eea
@@ -2,28 +2,28 @@ class org/apache/commons/io/input/Tailer
 
 builder
  ()Lorg/apache/commons/io/input/Tailer$Builder;
- ()Lorg/apache/commons/io/input/Tailer$Builder;
+ ()L1org/apache/commons/io/input/Tailer$Builder;
 create
  (Ljava/io/File;Ljava/nio/charset/Charset;Lorg/apache/commons/io/input/TailerListener;JZZI)Lorg/apache/commons/io/input/Tailer;
- (Ljava/io/File;Ljava/nio/charset/Charset;Lorg/apache/commons/io/input/TailerListener;JZZI)Lorg/apache/commons/io/input/Tailer;
+ (Ljava/io/File;Ljava/nio/charset/Charset;Lorg/apache/commons/io/input/TailerListener;JZZI)L1org/apache/commons/io/input/Tailer;
 create
  (Ljava/io/File;Lorg/apache/commons/io/input/TailerListener;)Lorg/apache/commons/io/input/Tailer;
- (Ljava/io/File;Lorg/apache/commons/io/input/TailerListener;)Lorg/apache/commons/io/input/Tailer;
+ (Ljava/io/File;Lorg/apache/commons/io/input/TailerListener;)L1org/apache/commons/io/input/Tailer;
 create
  (Ljava/io/File;Lorg/apache/commons/io/input/TailerListener;J)Lorg/apache/commons/io/input/Tailer;
- (Ljava/io/File;Lorg/apache/commons/io/input/TailerListener;J)Lorg/apache/commons/io/input/Tailer;
+ (Ljava/io/File;Lorg/apache/commons/io/input/TailerListener;J)L1org/apache/commons/io/input/Tailer;
 create
  (Ljava/io/File;Lorg/apache/commons/io/input/TailerListener;JZ)Lorg/apache/commons/io/input/Tailer;
- (Ljava/io/File;Lorg/apache/commons/io/input/TailerListener;JZ)Lorg/apache/commons/io/input/Tailer;
+ (Ljava/io/File;Lorg/apache/commons/io/input/TailerListener;JZ)L1org/apache/commons/io/input/Tailer;
 create
  (Ljava/io/File;Lorg/apache/commons/io/input/TailerListener;JZI)Lorg/apache/commons/io/input/Tailer;
- (Ljava/io/File;Lorg/apache/commons/io/input/TailerListener;JZI)Lorg/apache/commons/io/input/Tailer;
+ (Ljava/io/File;Lorg/apache/commons/io/input/TailerListener;JZI)L1org/apache/commons/io/input/Tailer;
 create
  (Ljava/io/File;Lorg/apache/commons/io/input/TailerListener;JZZ)Lorg/apache/commons/io/input/Tailer;
- (Ljava/io/File;Lorg/apache/commons/io/input/TailerListener;JZZ)Lorg/apache/commons/io/input/Tailer;
+ (Ljava/io/File;Lorg/apache/commons/io/input/TailerListener;JZZ)L1org/apache/commons/io/input/Tailer;
 create
  (Ljava/io/File;Lorg/apache/commons/io/input/TailerListener;JZZI)Lorg/apache/commons/io/input/Tailer;
- (Ljava/io/File;Lorg/apache/commons/io/input/TailerListener;JZZI)Lorg/apache/commons/io/input/Tailer;
+ (Ljava/io/File;Lorg/apache/commons/io/input/TailerListener;JZZI)L1org/apache/commons/io/input/Tailer;
 
 <init>
  (Ljava/io/File;Ljava/nio/charset/Charset;Lorg/apache/commons/io/input/TailerListener;JZZI)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ThrottledInputStream$Builder.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ThrottledInputStream$Builder.eea
index f0f1b67256..249c99ae68 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ThrottledInputStream$Builder.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ThrottledInputStream$Builder.eea
@@ -6,4 +6,4 @@ super org/apache/commons/io/build/AbstractStreamBuilder
 
 get
  ()Lorg/apache/commons/io/input/ThrottledInputStream;
- ()Lorg/apache/commons/io/input/ThrottledInputStream;
+ ()L1org/apache/commons/io/input/ThrottledInputStream;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ThrottledInputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ThrottledInputStream.eea
index 687430e205..e41c3cebe0 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ThrottledInputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/ThrottledInputStream.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/input/ThrottledInputStream
 
 builder
  ()Lorg/apache/commons/io/input/ThrottledInputStream$Builder;
- ()Lorg/apache/commons/io/input/ThrottledInputStream$Builder;
+ ()L1org/apache/commons/io/input/ThrottledInputStream$Builder;
 
 toString
  ()Ljava/lang/String;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UncheckedBufferedReader.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UncheckedBufferedReader.eea
index 338e2d55cd..a63028a65f 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UncheckedBufferedReader.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UncheckedBufferedReader.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/input/UncheckedBufferedReader
 
 builder
  ()Lorg/apache/commons/io/input/UncheckedBufferedReader$Builder;
- ()Lorg/apache/commons/io/input/UncheckedBufferedReader$Builder;
+ ()L1org/apache/commons/io/input/UncheckedBufferedReader$Builder;
 
 read
  (Ljava/nio/CharBuffer;)I
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UncheckedFilterInputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UncheckedFilterInputStream.eea
index 033fcdd120..b956e28082 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UncheckedFilterInputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UncheckedFilterInputStream.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/input/UncheckedFilterInputStream
 
 builder
  ()Lorg/apache/commons/io/input/UncheckedFilterInputStream$Builder;
- ()Lorg/apache/commons/io/input/UncheckedFilterInputStream$Builder;
+ ()L1org/apache/commons/io/input/UncheckedFilterInputStream$Builder;
 
 read
  ([B)I
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UncheckedFilterReader.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UncheckedFilterReader.eea
index 37f3b8d8f9..88b549c248 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UncheckedFilterReader.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UncheckedFilterReader.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/input/UncheckedFilterReader
 
 builder
  ()Lorg/apache/commons/io/input/UncheckedFilterReader$Builder;
- ()Lorg/apache/commons/io/input/UncheckedFilterReader$Builder;
+ ()L1org/apache/commons/io/input/UncheckedFilterReader$Builder;
 
 read
  (Ljava/nio/CharBuffer;)I
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UnsynchronizedBufferedInputStream$Builder.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UnsynchronizedBufferedInputStream$Builder.eea
index fd200fb33c..2158a7754b 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UnsynchronizedBufferedInputStream$Builder.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UnsynchronizedBufferedInputStream$Builder.eea
@@ -6,4 +6,4 @@ super org/apache/commons/io/build/AbstractStreamBuilder
 
 get
  ()Lorg/apache/commons/io/input/UnsynchronizedBufferedInputStream;
- ()Lorg/apache/commons/io/input/UnsynchronizedBufferedInputStream;
+ ()L1org/apache/commons/io/input/UnsynchronizedBufferedInputStream;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UnsynchronizedBufferedReader.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UnsynchronizedBufferedReader.eea
index 9b37d9d163..ba868d52f1 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UnsynchronizedBufferedReader.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UnsynchronizedBufferedReader.eea
@@ -14,4 +14,4 @@ read
  ([1CII)I # @Inherited(java.io.Reader)
 readLine
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UnsynchronizedByteArrayInputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UnsynchronizedByteArrayInputStream.eea
index 36582d028f..9ff2db975b 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UnsynchronizedByteArrayInputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UnsynchronizedByteArrayInputStream.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/input/UnsynchronizedByteArrayInputStream
 
 builder
  ()Lorg/apache/commons/io/input/UnsynchronizedByteArrayInputStream$Builder;
- ()Lorg/apache/commons/io/input/UnsynchronizedByteArrayInputStream$Builder;
+ ()L1org/apache/commons/io/input/UnsynchronizedByteArrayInputStream$Builder;
 
 <init>
  ([B)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UnsynchronizedFilterInputStream$Builder.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UnsynchronizedFilterInputStream$Builder.eea
index 466359923b..e35564db1d 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UnsynchronizedFilterInputStream$Builder.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UnsynchronizedFilterInputStream$Builder.eea
@@ -6,4 +6,4 @@ super org/apache/commons/io/build/AbstractStreamBuilder
 
 get
  ()Lorg/apache/commons/io/input/UnsynchronizedFilterInputStream;
- ()Lorg/apache/commons/io/input/UnsynchronizedFilterInputStream;
+ ()L1org/apache/commons/io/input/UnsynchronizedFilterInputStream;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UnsynchronizedFilterInputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UnsynchronizedFilterInputStream.eea
index 9312cee452..d6f5ff5163 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UnsynchronizedFilterInputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/UnsynchronizedFilterInputStream.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/input/UnsynchronizedFilterInputStream
 
 builder
  ()Lorg/apache/commons/io/input/UnsynchronizedFilterInputStream$Builder;
- ()Lorg/apache/commons/io/input/UnsynchronizedFilterInputStream$Builder;
+ ()L1org/apache/commons/io/input/UnsynchronizedFilterInputStream$Builder;
 
 inputStream
  Ljava/io/InputStream;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/XmlStreamReader.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/XmlStreamReader.eea
index e9f8f98bf1..487772f93e 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/XmlStreamReader.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/input/XmlStreamReader.eea
@@ -6,7 +6,7 @@ ENCODING_PATTERN
 
 builder
  ()Lorg/apache/commons/io/input/XmlStreamReader$Builder;
- ()Lorg/apache/commons/io/input/XmlStreamReader$Builder;
+ ()L1org/apache/commons/io/input/XmlStreamReader$Builder;
 
 <init>
  (Ljava/io/File;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/monitor/FileAlterationMonitor.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/monitor/FileAlterationMonitor.eea
index d6e59d89ed..90138ebd38 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/monitor/FileAlterationMonitor.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/monitor/FileAlterationMonitor.eea
@@ -11,7 +11,7 @@ addObserver
  (Lorg/apache/commons/io/monitor/FileAlterationObserver;)V
 getObservers
  ()Ljava/lang/Iterable<Lorg/apache/commons/io/monitor/FileAlterationObserver;>;
- ()Ljava/lang/Iterable<Lorg/apache/commons/io/monitor/FileAlterationObserver;>;
+ ()L1java/lang/Iterable<Lorg/apache/commons/io/monitor/FileAlterationObserver;>;
 removeObserver
  (Lorg/apache/commons/io/monitor/FileAlterationObserver;)V
  (Lorg/apache/commons/io/monitor/FileAlterationObserver;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/monitor/FileAlterationObserver.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/monitor/FileAlterationObserver.eea
index 5fa4e7baaf..aea1bdc799 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/monitor/FileAlterationObserver.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/monitor/FileAlterationObserver.eea
@@ -32,7 +32,7 @@ getFileFilter
  ()Ljava/io/FileFilter;
 getListeners
  ()Ljava/lang/Iterable<Lorg/apache/commons/io/monitor/FileAlterationListener;>;
- ()Ljava/lang/Iterable<Lorg/apache/commons/io/monitor/FileAlterationListener;>;
+ ()L1java/lang/Iterable<Lorg/apache/commons/io/monitor/FileAlterationListener;>;
 removeListener
  (Lorg/apache/commons/io/monitor/FileAlterationListener;)V
  (L1org/apache/commons/io/monitor/FileAlterationListener;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/monitor/FileEntry.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/monitor/FileEntry.eea
index 1df27272eb..bd3de36dca 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/monitor/FileEntry.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/monitor/FileEntry.eea
@@ -23,7 +23,7 @@ getParent
  ()Lorg/apache/commons/io/monitor/FileEntry;
 newChildInstance
  (Ljava/io/File;)Lorg/apache/commons/io/monitor/FileEntry;
- (Ljava/io/File;)Lorg/apache/commons/io/monitor/FileEntry;
+ (Ljava/io/File;)L1org/apache/commons/io/monitor/FileEntry;
 refresh
  (Ljava/io/File;)Z
  (Ljava/io/File;)Z
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/AbstractByteArrayOutputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/AbstractByteArrayOutputStream.eea
index 1be6d8628b..c4436bdb64 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/AbstractByteArrayOutputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/AbstractByteArrayOutputStream.eea
@@ -17,10 +17,10 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toString
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 toString
  (Ljava/nio/charset/Charset;)Ljava/lang/String;
- (Ljava/nio/charset/Charset;)Ljava/lang/String;
+ (Ljava/nio/charset/Charset;)L1java/lang/String;
 write
  (Ljava/io/InputStream;)I
  (Ljava/io/InputStream;)I
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/ChunkedOutputStream$Builder.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/ChunkedOutputStream$Builder.eea
index 00a350ae2d..84b603f6cb 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/ChunkedOutputStream$Builder.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/ChunkedOutputStream$Builder.eea
@@ -6,4 +6,4 @@ super org/apache/commons/io/build/AbstractStreamBuilder
 
 get
  ()Lorg/apache/commons/io/output/ChunkedOutputStream;
- ()Lorg/apache/commons/io/output/ChunkedOutputStream;
+ ()L1org/apache/commons/io/output/ChunkedOutputStream;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/ChunkedOutputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/ChunkedOutputStream.eea
index 56fe9092a7..06457178ee 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/ChunkedOutputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/ChunkedOutputStream.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/output/ChunkedOutputStream
 
 builder
  ()Lorg/apache/commons/io/output/ChunkedOutputStream$Builder;
- ()Lorg/apache/commons/io/output/ChunkedOutputStream$Builder;
+ ()L1org/apache/commons/io/output/ChunkedOutputStream$Builder;
 
 <init>
  (Ljava/io/OutputStream;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/CloseShieldOutputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/CloseShieldOutputStream.eea
index 00e5fc1e62..8f9702eb8c 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/CloseShieldOutputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/CloseShieldOutputStream.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/output/CloseShieldOutputStream
 
 wrap
  (Ljava/io/OutputStream;)Lorg/apache/commons/io/output/CloseShieldOutputStream;
- (Ljava/io/OutputStream;)Lorg/apache/commons/io/output/CloseShieldOutputStream;
+ (Ljava/io/OutputStream;)L1org/apache/commons/io/output/CloseShieldOutputStream;
 
 <init>
  (Ljava/io/OutputStream;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/CloseShieldWriter.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/CloseShieldWriter.eea
index a1a5a30858..3e5bd9f903 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/CloseShieldWriter.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/CloseShieldWriter.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/output/CloseShieldWriter
 
 wrap
  (Ljava/io/Writer;)Lorg/apache/commons/io/output/CloseShieldWriter;
- (Ljava/io/Writer;)Lorg/apache/commons/io/output/CloseShieldWriter;
+ (Ljava/io/Writer;)L1org/apache/commons/io/output/CloseShieldWriter;
 
 <init>
  (Ljava/io/Writer;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/DeferredFileOutputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/DeferredFileOutputStream.eea
index c89e8a595c..17bef7b1b1 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/DeferredFileOutputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/DeferredFileOutputStream.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/output/DeferredFileOutputStream
 
 builder
  ()Lorg/apache/commons/io/output/DeferredFileOutputStream$Builder;
- ()Lorg/apache/commons/io/output/DeferredFileOutputStream$Builder;
+ ()L1org/apache/commons/io/output/DeferredFileOutputStream$Builder;
 
 <init>
  (IILjava/io/File;)V
@@ -18,10 +18,10 @@ builder
  (ILjava/lang/String;Ljava/lang/String;Ljava/io/File;)V
 getData
  ()[B
- ()[B
+ ()[0B
 getFile
  ()Ljava/io/File;
- ()Ljava/io/File;
+ ()L0java/io/File;
 getPath
  ()Ljava/nio/file/Path;
  ()Ljava/nio/file/Path;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/FileWriterWithEncoding$Builder.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/FileWriterWithEncoding$Builder.eea
index da3b0eb9c4..480326e96a 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/FileWriterWithEncoding$Builder.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/FileWriterWithEncoding$Builder.eea
@@ -6,7 +6,7 @@ super org/apache/commons/io/build/AbstractStreamBuilder
 
 get
  ()Lorg/apache/commons/io/output/FileWriterWithEncoding;
- ()Lorg/apache/commons/io/output/FileWriterWithEncoding;
+ ()L1org/apache/commons/io/output/FileWriterWithEncoding;
 setAppend
  (Z)Lorg/apache/commons/io/output/FileWriterWithEncoding$Builder;
  (Z)L1org/apache/commons/io/output/FileWriterWithEncoding$Builder;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/FileWriterWithEncoding.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/FileWriterWithEncoding.eea
index 771aedcafc..006f4e0712 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/FileWriterWithEncoding.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/FileWriterWithEncoding.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/output/FileWriterWithEncoding
 
 builder
  ()Lorg/apache/commons/io/output/FileWriterWithEncoding$Builder;
- ()Lorg/apache/commons/io/output/FileWriterWithEncoding$Builder;
+ ()L1org/apache/commons/io/output/FileWriterWithEncoding$Builder;
 
 <init>
  (Ljava/io/File;Ljava/lang/String;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/LockableFileWriter.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/LockableFileWriter.eea
index 7205f19a16..2847faf2e5 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/LockableFileWriter.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/LockableFileWriter.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/output/LockableFileWriter
 
 builder
  ()Lorg/apache/commons/io/output/LockableFileWriter$Builder;
- ()Lorg/apache/commons/io/output/LockableFileWriter$Builder;
+ ()L1org/apache/commons/io/output/LockableFileWriter$Builder;
 
 <init>
  (Ljava/io/File;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UncheckedAppendable.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UncheckedAppendable.eea
index c471733735..c4ef336f4b 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UncheckedAppendable.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UncheckedAppendable.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/output/UncheckedAppendable
 
 on
  (Ljava/lang/Appendable;)Lorg/apache/commons/io/output/UncheckedAppendable;
- (Ljava/lang/Appendable;)Lorg/apache/commons/io/output/UncheckedAppendable;
+ (Ljava/lang/Appendable;)L1org/apache/commons/io/output/UncheckedAppendable;
 
 append
  (C)Lorg/apache/commons/io/output/UncheckedAppendable;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UncheckedFilterOutputStream$Builder.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UncheckedFilterOutputStream$Builder.eea
index 2d4dabbe0e..185a3605eb 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UncheckedFilterOutputStream$Builder.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UncheckedFilterOutputStream$Builder.eea
@@ -6,4 +6,4 @@ super org/apache/commons/io/build/AbstractStreamBuilder
 
 get
  ()Lorg/apache/commons/io/output/UncheckedFilterOutputStream;
- ()Lorg/apache/commons/io/output/UncheckedFilterOutputStream;
+ ()L1org/apache/commons/io/output/UncheckedFilterOutputStream;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UncheckedFilterOutputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UncheckedFilterOutputStream.eea
index 436dc3c22f..879ec63dc5 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UncheckedFilterOutputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UncheckedFilterOutputStream.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/output/UncheckedFilterOutputStream
 
 builder
  ()Lorg/apache/commons/io/output/UncheckedFilterOutputStream$Builder;
- ()Lorg/apache/commons/io/output/UncheckedFilterOutputStream$Builder;
+ ()L1org/apache/commons/io/output/UncheckedFilterOutputStream$Builder;
 
 write
  ([B)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UncheckedFilterWriter$Builder.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UncheckedFilterWriter$Builder.eea
index b16baf30aa..33f2f6cb2b 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UncheckedFilterWriter$Builder.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UncheckedFilterWriter$Builder.eea
@@ -6,4 +6,4 @@ super org/apache/commons/io/build/AbstractStreamBuilder
 
 get
  ()Lorg/apache/commons/io/output/UncheckedFilterWriter;
- ()Lorg/apache/commons/io/output/UncheckedFilterWriter;
+ ()L1org/apache/commons/io/output/UncheckedFilterWriter;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UncheckedFilterWriter.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UncheckedFilterWriter.eea
index 5ec6695ac1..9b63dff1bd 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UncheckedFilterWriter.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UncheckedFilterWriter.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/output/UncheckedFilterWriter
 
 builder
  ()Lorg/apache/commons/io/output/UncheckedFilterWriter$Builder;
- ()Lorg/apache/commons/io/output/UncheckedFilterWriter$Builder;
+ ()L1org/apache/commons/io/output/UncheckedFilterWriter$Builder;
 
 append
  (C)Ljava/io/Writer;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UnsynchronizedByteArrayOutputStream$Builder.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UnsynchronizedByteArrayOutputStream$Builder.eea
index f6c7f4bc6b..e72d49a6ba 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UnsynchronizedByteArrayOutputStream$Builder.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UnsynchronizedByteArrayOutputStream$Builder.eea
@@ -6,4 +6,4 @@ super org/apache/commons/io/build/AbstractStreamBuilder
 
 get
  ()Lorg/apache/commons/io/output/UnsynchronizedByteArrayOutputStream;
- ()Lorg/apache/commons/io/output/UnsynchronizedByteArrayOutputStream;
+ ()L1org/apache/commons/io/output/UnsynchronizedByteArrayOutputStream;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UnsynchronizedByteArrayOutputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UnsynchronizedByteArrayOutputStream.eea
index 3110312076..ffd1b2098f 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UnsynchronizedByteArrayOutputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/UnsynchronizedByteArrayOutputStream.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/output/UnsynchronizedByteArrayOutputStream
 
 builder
  ()Lorg/apache/commons/io/output/UnsynchronizedByteArrayOutputStream$Builder;
- ()Lorg/apache/commons/io/output/UnsynchronizedByteArrayOutputStream$Builder;
+ ()L1org/apache/commons/io/output/UnsynchronizedByteArrayOutputStream$Builder;
 toBufferedInputStream
  (Ljava/io/InputStream;)Ljava/io/InputStream;
  (Ljava/io/InputStream;)Ljava/io/InputStream;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/WriterOutputStream.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/WriterOutputStream.eea
index 28cc69d596..24cef36118 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/WriterOutputStream.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/WriterOutputStream.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/output/WriterOutputStream
 
 builder
  ()Lorg/apache/commons/io/output/WriterOutputStream$Builder;
- ()Lorg/apache/commons/io/output/WriterOutputStream$Builder;
+ ()L1org/apache/commons/io/output/WriterOutputStream$Builder;
 
 <init>
  (Ljava/io/Writer;)V
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/XmlStreamWriter$Builder.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/XmlStreamWriter$Builder.eea
index a0c2faabb7..897ce8048e 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/XmlStreamWriter$Builder.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/XmlStreamWriter$Builder.eea
@@ -6,4 +6,4 @@ super org/apache/commons/io/build/AbstractStreamBuilder
 
 get
  ()Lorg/apache/commons/io/output/XmlStreamWriter;
- ()Lorg/apache/commons/io/output/XmlStreamWriter;
+ ()L1org/apache/commons/io/output/XmlStreamWriter;
diff --git a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/XmlStreamWriter.eea b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/XmlStreamWriter.eea
index cb55a70dfc..93eedff61c 100644
--- a/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/XmlStreamWriter.eea
+++ b/libs/eea-commons-io-2/src/main/resources/org/apache/commons/io/output/XmlStreamWriter.eea
@@ -2,7 +2,7 @@ class org/apache/commons/io/output/XmlStreamWriter
 
 builder
  ()Lorg/apache/commons/io/output/XmlStreamWriter$Builder;
- ()Lorg/apache/commons/io/output/XmlStreamWriter$Builder;
+ ()L1org/apache/commons/io/output/XmlStreamWriter$Builder;
 
 <init>
  (Ljava/io/File;)V
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/AppendableJoiner.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/AppendableJoiner.eea
index 3c402d5a6b..90a99f89cc 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/AppendableJoiner.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/AppendableJoiner.eea
@@ -4,7 +4,7 @@ class org/apache/commons/lang3/AppendableJoiner
 
 builder
  <T:Ljava/lang/Object;>()Lorg/apache/commons/lang3/AppendableJoiner$Builder<TT;>;
- <T:Ljava/lang/Object;>()Lorg/apache/commons/lang3/AppendableJoiner$Builder<TT;>;
+ <T:Ljava/lang/Object;>()L1org/apache/commons/lang3/AppendableJoiner$Builder<TT;>;
 
 join
  (Ljava/lang/StringBuilder;Ljava/lang/Iterable<TT;>;)Ljava/lang/StringBuilder;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/ArrayUtils.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/ArrayUtils.eea
index 4bb5585163..ef35851bd6 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/ArrayUtils.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/ArrayUtils.eea
@@ -189,31 +189,31 @@ arraycopy
  <T:Ljava/lang/Object;>(TT;ITT;II)TT;
 clone
  ([B)[B
- ([B)[B
+ ([B)[0B
 clone
  ([C)[C
- ([C)[C
+ ([C)[0C
 clone
  ([D)[D
- ([D)[D
+ ([D)[0D
 clone
  ([F)[F
- ([F)[F
+ ([F)[0F
 clone
  ([I)[I
- ([I)[I
+ ([I)[0I
 clone
  ([J)[J
- ([J)[J
+ ([J)[0J
 clone
  ([S)[S
- ([S)[S
+ ([S)[0S
 clone
  ([Z)[Z
- ([Z)[Z
+ ([Z)[0Z
 clone
  <T:Ljava/lang/Object;>([TT;)[TT;
- <T:Ljava/lang/Object;>([TT;)[TT;
+ <T:Ljava/lang/Object;>([TT;)[0TT;
 contains
  ([BB)Z
  ([BB)Z
@@ -327,13 +327,13 @@ indexesOf
  ([BB)Ljava/util/BitSet;
 indexesOf
  ([BBI)Ljava/util/BitSet;
- ([BBI)Ljava/util/BitSet;
+ ([BBI)L1java/util/BitSet;
 indexesOf
  ([CC)Ljava/util/BitSet;
  ([CC)Ljava/util/BitSet;
 indexesOf
  ([CCI)Ljava/util/BitSet;
- ([CCI)Ljava/util/BitSet;
+ ([CCI)L1java/util/BitSet;
 indexesOf
  ([DD)Ljava/util/BitSet;
  ([DD)Ljava/util/BitSet;
@@ -342,46 +342,46 @@ indexesOf
  ([DDD)Ljava/util/BitSet;
 indexesOf
  ([DDI)Ljava/util/BitSet;
- ([DDI)Ljava/util/BitSet;
+ ([DDI)L1java/util/BitSet;
 indexesOf
  ([DDID)Ljava/util/BitSet;
- ([DDID)Ljava/util/BitSet;
+ ([DDID)L1java/util/BitSet;
 indexesOf
  ([FF)Ljava/util/BitSet;
  ([FF)Ljava/util/BitSet;
 indexesOf
  ([FFI)Ljava/util/BitSet;
- ([FFI)Ljava/util/BitSet;
+ ([FFI)L1java/util/BitSet;
 indexesOf
  ([II)Ljava/util/BitSet;
  ([II)Ljava/util/BitSet;
 indexesOf
  ([III)Ljava/util/BitSet;
- ([III)Ljava/util/BitSet;
+ ([III)L1java/util/BitSet;
 indexesOf
  ([JJ)Ljava/util/BitSet;
  ([JJ)Ljava/util/BitSet;
 indexesOf
  ([JJI)Ljava/util/BitSet;
- ([JJI)Ljava/util/BitSet;
+ ([JJI)L1java/util/BitSet;
 indexesOf
  ([Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/BitSet;
  ([Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/BitSet;
 indexesOf
  ([Ljava/lang/Object;Ljava/lang/Object;I)Ljava/util/BitSet;
- ([Ljava/lang/Object;Ljava/lang/Object;I)Ljava/util/BitSet;
+ ([Ljava/lang/Object;Ljava/lang/Object;I)L1java/util/BitSet;
 indexesOf
  ([SS)Ljava/util/BitSet;
  ([SS)Ljava/util/BitSet;
 indexesOf
  ([SSI)Ljava/util/BitSet;
- ([SSI)Ljava/util/BitSet;
+ ([SSI)L1java/util/BitSet;
 indexesOf
  ([ZZ)Ljava/util/BitSet;
  ([ZZ)Ljava/util/BitSet;
 indexesOf
  ([ZZI)Ljava/util/BitSet;
- ([ZZI)Ljava/util/BitSet;
+ ([ZZI)L1java/util/BitSet;
 insert
  (I[B[B)[B
  (I[B[B)[B
@@ -1161,4 +1161,4 @@ toStringArray
  ([Ljava/lang/Object;)[Ljava/lang/String;
 toStringArray
  ([Ljava/lang/Object;Ljava/lang/String;)[Ljava/lang/String;
- ([Ljava/lang/Object;Ljava/lang/String;)[Ljava/lang/String;
+ ([Ljava/lang/Object;Ljava/lang/String;)[0Ljava/lang/String;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/BooleanUtils.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/BooleanUtils.eea
index 0dd680f389..6e04bc9cf6 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/BooleanUtils.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/BooleanUtils.eea
@@ -81,19 +81,19 @@ toBooleanObject
  (I)Ljava/lang/Boolean;
 toBooleanObject
  (IIII)Ljava/lang/Boolean;
- (IIII)Ljava/lang/Boolean;
+ (IIII)L0java/lang/Boolean;
 toBooleanObject
  (Ljava/lang/Integer;)Ljava/lang/Boolean;
  (Ljava/lang/Integer;)Ljava/lang/Boolean;
 toBooleanObject
  (Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)Ljava/lang/Boolean;
- (Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)Ljava/lang/Boolean;
+ (Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)L0java/lang/Boolean;
 toBooleanObject
  (Ljava/lang/String;)Ljava/lang/Boolean;
- (Ljava/lang/String;)Ljava/lang/Boolean;
+ (Ljava/lang/String;)L0java/lang/Boolean;
 toBooleanObject
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Boolean;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Boolean;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L0java/lang/Boolean;
 toInteger
  (Ljava/lang/Boolean;III)I
  (Ljava/lang/Boolean;III)I
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/CharUtils.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/CharUtils.eea
index 925fa23100..4e8f32d210 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/CharUtils.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/CharUtils.eea
@@ -29,10 +29,10 @@ toString
  (C)Ljava/lang/String;
 toString
  (Ljava/lang/Character;)Ljava/lang/String;
- (Ljava/lang/Character;)Ljava/lang/String;
+ (Ljava/lang/Character;)L0java/lang/String;
 unicodeEscaped
  (C)Ljava/lang/String;
- (C)Ljava/lang/String;
+ (C)L1java/lang/String;
 unicodeEscaped
  (Ljava/lang/Character;)Ljava/lang/String;
- (Ljava/lang/Character;)Ljava/lang/String;
+ (Ljava/lang/Character;)L0java/lang/String;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/ClassLoaderUtils.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/ClassLoaderUtils.eea
index 921500c92a..1f320a3951 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/ClassLoaderUtils.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/ClassLoaderUtils.eea
@@ -11,4 +11,4 @@ toString
  (Ljava/lang/ClassLoader;)Ljava/lang/String;
 toString
  (Ljava/net/URLClassLoader;)Ljava/lang/String;
- (Ljava/net/URLClassLoader;)Ljava/lang/String;
+ (Ljava/net/URLClassLoader;)L1java/lang/String;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/ClassPathUtils.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/ClassPathUtils.eea
index d46bb47f6b..199ac9afbb 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/ClassPathUtils.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/ClassPathUtils.eea
@@ -11,10 +11,10 @@ toFullyQualifiedName
  (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/String;
 toFullyQualifiedName
  (Ljava/lang/Package;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/Package;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/Package;Ljava/lang/String;)L1java/lang/String;
 toFullyQualifiedPath
  (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/String;
 toFullyQualifiedPath
  (Ljava/lang/Package;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/Package;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/Package;Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/ClassUtils.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/ClassUtils.eea
index 5e39749581..54e83e6f85 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/ClassUtils.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/ClassUtils.eea
@@ -12,7 +12,7 @@ comparator
  ()Ljava/util/Comparator<Ljava/lang/Class<*>;>;
 convertClassNamesToClasses
  (Ljava/util/List<Ljava/lang/String;>;)Ljava/util/List<Ljava/lang/Class<*>;>;
- (Ljava/util/List<Ljava/lang/String;>;)Ljava/util/List<Ljava/lang/Class<*>;>;
+ (Ljava/util/List<Ljava/lang/String;>;)Ljava/util/List<Ljava/lang/Class<*>;>; # @PolyNull
 convertClassesToClassNames
  (Ljava/util/List<Ljava/lang/Class<*>;>;)Ljava/util/List<Ljava/lang/String;>;
  (Ljava/util/List<Ljava/lang/Class<*>;>;)Ljava/util/List<Ljava/lang/String;>;
@@ -24,10 +24,10 @@ getAbbreviatedName
  (Ljava/lang/String;I)Ljava/lang/String;
 getAllInterfaces
  (Ljava/lang/Class<*>;)Ljava/util/List<Ljava/lang/Class<*>;>;
- (Ljava/lang/Class<*>;)Ljava/util/List<Ljava/lang/Class<*>;>;
+ (Ljava/lang/Class<*>;)Ljava/util/List<Ljava/lang/Class<*>;>; # @PolyNull
 getAllSuperclasses
  (Ljava/lang/Class<*>;)Ljava/util/List<Ljava/lang/Class<*>;>;
- (Ljava/lang/Class<*>;)Ljava/util/List<Ljava/lang/Class<*>;>;
+ (Ljava/lang/Class<*>;)Ljava/util/List<Ljava/lang/Class<*>;>; # @PolyNull
 getCanonicalName
  (Ljava/lang/Class<*>;)Ljava/lang/String;
  (Ljava/lang/Class<*>;)Ljava/lang/String;
@@ -105,7 +105,7 @@ getShortClassName
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
 getShortClassName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 getSimpleName
  (Ljava/lang/Class<*>;)Ljava/lang/String;
  (Ljava/lang/Class<*>;)Ljava/lang/String;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/DoubleRange.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/DoubleRange.eea
index 4aee1f7006..4857211d08 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/DoubleRange.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/DoubleRange.eea
@@ -9,4 +9,4 @@ of
  (DD)Lorg/apache/commons/lang3/DoubleRange;
 of
  (Ljava/lang/Double;Ljava/lang/Double;)Lorg/apache/commons/lang3/DoubleRange;
- (Ljava/lang/Double;Ljava/lang/Double;)Lorg/apache/commons/lang3/DoubleRange;
+ (Ljava/lang/Double;Ljava/lang/Double;)L1org/apache/commons/lang3/DoubleRange;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/EnumUtils.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/EnumUtils.eea
index 2180ff0544..a596170bbd 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/EnumUtils.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/EnumUtils.eea
@@ -8,10 +8,10 @@ generateBitVector
  <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Class<TE;>;[TE;)J
 generateBitVectors
  <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Class<TE;>;Ljava/lang/Iterable<+TE;>;)[J
- <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Class<TE;>;Ljava/lang/Iterable<+TE;>;)[J
+ <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Class<TE;>;Ljava/lang/Iterable<+TE;>;)[1J
 generateBitVectors
  <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Class<TE;>;[TE;)[J
- <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Class<TE;>;[TE;)[J
+ <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Class<TE;>;[TE;)[1J
 getEnum
  <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Class<TE;>;Ljava/lang/String;)TE;
  <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Class<TE;>;Ljava/lang/String;)TE;
@@ -26,7 +26,7 @@ getEnumIgnoreCase
  <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Class<TE;>;Ljava/lang/String;TE;)TE;
 getEnumList
  <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Class<TE;>;)Ljava/util/List<TE;>;
- <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Class<TE;>;)Ljava/util/List<TE;>;
+ <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Class<TE;>;)L1java/util/List<TE;>;
 getEnumMap
  <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Class<TE;>;)Ljava/util/Map<Ljava/lang/String;TE;>;
  <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Class<TE;>;)Ljava/util/Map<Ljava/lang/String;TE;>;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/Functions.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/Functions.eea
index a4b8522e43..336112ce58 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/Functions.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/Functions.eea
@@ -47,16 +47,16 @@ get
  <O:Ljava/lang/Object;T:Ljava/lang/Throwable;>(Lorg/apache/commons/lang3/Functions$FailableSupplier<TO;TT;>;)TO;
 rethrow
  (Ljava/lang/Throwable;)Ljava/lang/RuntimeException;
- (Ljava/lang/Throwable;)Ljava/lang/RuntimeException;
+ (Ljava/lang/Throwable;)L1java/lang/RuntimeException;
 run
  <T:Ljava/lang/Throwable;>(Lorg/apache/commons/lang3/Functions$FailableRunnable<TT;>;)V
  <T:Ljava/lang/Throwable;>(Lorg/apache/commons/lang3/Functions$FailableRunnable<TT;>;)V
 stream
  <O:Ljava/lang/Object;>(Ljava/util/Collection<TO;>;)Lorg/apache/commons/lang3/Streams$FailableStream<TO;>;
- <O:Ljava/lang/Object;>(Ljava/util/Collection<TO;>;)Lorg/apache/commons/lang3/Streams$FailableStream<TO;>;
+ <O:Ljava/lang/Object;>(Ljava/util/Collection<TO;>;)L1org/apache/commons/lang3/Streams$FailableStream<TO;>;
 stream
  <O:Ljava/lang/Object;>(Ljava/util/stream/Stream<TO;>;)Lorg/apache/commons/lang3/Streams$FailableStream<TO;>;
- <O:Ljava/lang/Object;>(Ljava/util/stream/Stream<TO;>;)Lorg/apache/commons/lang3/Streams$FailableStream<TO;>;
+ <O:Ljava/lang/Object;>(Ljava/util/stream/Stream<TO;>;)L1org/apache/commons/lang3/Streams$FailableStream<TO;>;
 test
  <O1:Ljava/lang/Object;O2:Ljava/lang/Object;T:Ljava/lang/Throwable;>(Lorg/apache/commons/lang3/Functions$FailableBiPredicate<TO1;TO2;TT;>;TO1;TO2;)Z
  <O1:Ljava/lang/Object;O2:Ljava/lang/Object;T:Ljava/lang/Throwable;>(Lorg/apache/commons/lang3/Functions$FailableBiPredicate<TO1;TO2;TT;>;TO1;TO2;)Z
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/IntegerRange.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/IntegerRange.eea
index 6e6ab39b84..7b9b7e8a75 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/IntegerRange.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/IntegerRange.eea
@@ -9,4 +9,4 @@ of
  (II)Lorg/apache/commons/lang3/IntegerRange;
 of
  (Ljava/lang/Integer;Ljava/lang/Integer;)Lorg/apache/commons/lang3/IntegerRange;
- (Ljava/lang/Integer;Ljava/lang/Integer;)Lorg/apache/commons/lang3/IntegerRange;
+ (Ljava/lang/Integer;Ljava/lang/Integer;)L1org/apache/commons/lang3/IntegerRange;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/LongRange.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/LongRange.eea
index dc822a0a17..c21647e9b1 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/LongRange.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/LongRange.eea
@@ -9,4 +9,4 @@ of
  (JJ)Lorg/apache/commons/lang3/LongRange;
 of
  (Ljava/lang/Long;Ljava/lang/Long;)Lorg/apache/commons/lang3/LongRange;
- (Ljava/lang/Long;Ljava/lang/Long;)Lorg/apache/commons/lang3/LongRange;
+ (Ljava/lang/Long;Ljava/lang/Long;)L1org/apache/commons/lang3/LongRange;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/ObjectUtils.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/ObjectUtils.eea
index 6bef0cd6fd..c405f940b0 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/ObjectUtils.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/ObjectUtils.eea
@@ -21,7 +21,7 @@ anyNull
  ([Ljava/lang/Object;)Z
 clone
  <T:Ljava/lang/Object;>(TT;)TT;
- <T:Ljava/lang/Object;>(TT;)TT;
+ <T:Ljava/lang/Object;>(TT;)T0T;
 cloneIfPossible
  <T:Ljava/lang/Object;>(TT;)TT;
  <T:Ljava/lang/Object;>(TT;)TT;
@@ -66,7 +66,7 @@ identityToString
  (Ljava/lang/Appendable;Ljava/lang/Object;)V
 identityToString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)Ljava/lang/String; # @PolyNull
 identityToString
  (Ljava/lang/StringBuffer;Ljava/lang/Object;)V
  (Ljava/lang/StringBuffer;Ljava/lang/Object;)V
@@ -99,7 +99,7 @@ min
  <T::Ljava/lang/Comparable<-TT;>;>([TT;)TT;
 mode
  <T:Ljava/lang/Object;>([TT;)TT;
- <T:Ljava/lang/Object;>([TT;)TT;
+ <T:Ljava/lang/Object;>([TT;)T0T;
 notEqual
  (Ljava/lang/Object;Ljava/lang/Object;)Z
  (Ljava/lang/Object;Ljava/lang/Object;)Z
@@ -120,7 +120,7 @@ toString
  (Ljava/util/function/Supplier<Ljava/lang/Object;>;Ljava/util/function/Supplier<Ljava/lang/String;>;)Ljava/lang/String;
 toString
  <T:Ljava/lang/Object;>(TT;Ljava/util/function/Supplier<Ljava/lang/String;>;)Ljava/lang/String;
- <T:Ljava/lang/Object;>(TT;Ljava/util/function/Supplier<Ljava/lang/String;>;)Ljava/lang/String;
+ <T:Ljava/lang/Object;>(TT;Ljava/util/function/Supplier<Ljava/lang/String;>;)L1java/lang/String;
 wait
  (Ljava/lang/Object;Ljava/time/Duration;)V
  (Ljava/lang/Object;Ljava/time/Duration;)V
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/RandomUtils.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/RandomUtils.eea
index b8e80c17c7..768990e995 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/RandomUtils.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/RandomUtils.eea
@@ -15,7 +15,7 @@ secureStrong
 
 randomBytes
  (I)[B
- (I)[B
+ (I)[1B
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/Range.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/Range.eea
index 93d4886253..537e9931fa 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/Range.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/Range.eea
@@ -7,7 +7,7 @@ between
  <T::Ljava/lang/Comparable<-TT;>;>(TT;TT;)Lorg/apache/commons/lang3/Range<TT;>;
 between
  <T:Ljava/lang/Object;>(TT;TT;Ljava/util/Comparator<TT;>;)Lorg/apache/commons/lang3/Range<TT;>;
- <T:Ljava/lang/Object;>(TT;TT;Ljava/util/Comparator<TT;>;)Lorg/apache/commons/lang3/Range<TT;>;
+ <T:Ljava/lang/Object;>(TT;TT;Ljava/util/Comparator<TT;>;)L1org/apache/commons/lang3/Range<TT;>;
 is
  <T::Ljava/lang/Comparable<-TT;>;>(TT;)Lorg/apache/commons/lang3/Range<TT;>;
  <T::Ljava/lang/Comparable<-TT;>;>(TT;)Lorg/apache/commons/lang3/Range<TT;>;
@@ -19,7 +19,7 @@ of
  <T::Ljava/lang/Comparable<-TT;>;>(TT;TT;)Lorg/apache/commons/lang3/Range<TT;>;
 of
  <T:Ljava/lang/Object;>(TT;TT;Ljava/util/Comparator<TT;>;)Lorg/apache/commons/lang3/Range<TT;>;
- <T:Ljava/lang/Object;>(TT;TT;Ljava/util/Comparator<TT;>;)Lorg/apache/commons/lang3/Range<TT;>;
+ <T:Ljava/lang/Object;>(TT;TT;Ljava/util/Comparator<TT;>;)L1org/apache/commons/lang3/Range<TT;>;
 
 contains
  (TT;)Z
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/Streams$FailableStream.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/Streams$FailableStream.eea
index 1c0dfdfa2f..797fa316f3 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/Streams$FailableStream.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/Streams$FailableStream.eea
@@ -25,7 +25,7 @@ forEach
  (Lorg/apache/commons/lang3/Functions$FailableConsumer<TO;*>;)V
 map
  <R:Ljava/lang/Object;>(Lorg/apache/commons/lang3/Functions$FailableFunction<TO;TR;*>;)Lorg/apache/commons/lang3/Streams$FailableStream<TR;>;
- <R:Ljava/lang/Object;>(Lorg/apache/commons/lang3/Functions$FailableFunction<TO;TR;*>;)Lorg/apache/commons/lang3/Streams$FailableStream<TR;>;
+ <R:Ljava/lang/Object;>(Lorg/apache/commons/lang3/Functions$FailableFunction<TO;TR;*>;)L1org/apache/commons/lang3/Streams$FailableStream<TR;>;
 reduce
  (TO;Ljava/util/function/BinaryOperator<TO;>;)TO;
  (TO;Ljava/util/function/BinaryOperator<TO;>;)TO;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/Streams.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/Streams.eea
index 8e1c769ad7..a07e36f179 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/Streams.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/Streams.eea
@@ -5,7 +5,7 @@ stream
  <O:Ljava/lang/Object;>(Ljava/util/Collection<TO;>;)Lorg/apache/commons/lang3/Streams$FailableStream<TO;>;
 stream
  <O:Ljava/lang/Object;>(Ljava/util/stream/Stream<TO;>;)Lorg/apache/commons/lang3/Streams$FailableStream<TO;>;
- <O:Ljava/lang/Object;>(Ljava/util/stream/Stream<TO;>;)Lorg/apache/commons/lang3/Streams$FailableStream<TO;>;
+ <O:Ljava/lang/Object;>(Ljava/util/stream/Stream<TO;>;)L1org/apache/commons/lang3/Streams$FailableStream<TO;>;
 toArray
  <O:Ljava/lang/Object;>(Ljava/lang/Class<TO;>;)Ljava/util/stream/Collector<TO;*[TO;>;
- <O:Ljava/lang/Object;>(Ljava/lang/Class<TO;>;)Ljava/util/stream/Collector<TO;*[TO;>;
+ <O:Ljava/lang/Object;>(Ljava/lang/Class<TO;>;)L1java/util/stream/Collector<TO;*[TO;>;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/StringUtils.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/StringUtils.eea
index 0699989817..3728919dec 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/StringUtils.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/StringUtils.eea
@@ -150,10 +150,10 @@ equalsIgnoreCase
  (Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Z
 firstNonBlank
  <T::Ljava/lang/CharSequence;>([TT;)TT;
- <T::Ljava/lang/CharSequence;>([TT;)TT;
+ <T::Ljava/lang/CharSequence;>([TT;)T0T;
 firstNonEmpty
  <T::Ljava/lang/CharSequence;>([TT;)TT;
- <T::Ljava/lang/CharSequence;>([TT;)TT;
+ <T::Ljava/lang/CharSequence;>([TT;)T0T;
 getBytes
  (Ljava/lang/String;Ljava/lang/String;)[B
  (Ljava/lang/String;Ljava/lang/String;)[1B
@@ -288,10 +288,10 @@ isWhitespace
  (Ljava/lang/CharSequence;)Z
 join
  (Ljava/lang/Iterable<*>;C)Ljava/lang/String;
- (Ljava/lang/Iterable<*>;C)Ljava/lang/String;
+ (Ljava/lang/Iterable<*>;C)L0java/lang/String;
 join
  (Ljava/lang/Iterable<*>;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/Iterable<*>;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/Iterable<*>;Ljava/lang/String;)L0java/lang/String;
 join
  (Ljava/util/Iterator<*>;C)Ljava/lang/String;
  (Ljava/util/Iterator<*>;C)Ljava/lang/String;
@@ -348,10 +348,10 @@ join
  ([Ljava/lang/Object;CII)Ljava/lang/String;
 join
  ([Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
- ([Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
+ ([Ljava/lang/Object;Ljava/lang/String;)L0java/lang/String;
 join
  ([Ljava/lang/Object;Ljava/lang/String;II)Ljava/lang/String;
- ([Ljava/lang/Object;Ljava/lang/String;II)Ljava/lang/String;
+ ([Ljava/lang/Object;Ljava/lang/String;II)L0java/lang/String;
 join
  ([SC)Ljava/lang/String;
  ([SC)Ljava/lang/String;
@@ -426,7 +426,7 @@ ordinalIndexOf
  (Ljava/lang/CharSequence;Ljava/lang/CharSequence;I)I
 overlay
  (Ljava/lang/String;Ljava/lang/String;II)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;II)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;II)Ljava/lang/String; # @PolyNull
 prependIfMissing
  (Ljava/lang/String;Ljava/lang/CharSequence;[Ljava/lang/CharSequence;)Ljava/lang/String;
  (Ljava/lang/String;Ljava/lang/CharSequence;[Ljava/lang/CharSequence;)Ljava/lang/String;
@@ -516,7 +516,7 @@ replacePattern
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 reverse
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)Ljava/lang/String; # @PolyNull
 reverseDelimited
  (Ljava/lang/String;C)Ljava/lang/String;
  (Ljava/lang/String;C)Ljava/lang/String;
@@ -645,10 +645,10 @@ substringBetween
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 substringBetween
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L0java/lang/String;
 substringsBetween
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)[0Ljava/lang/String;
 swapCase
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
@@ -657,7 +657,7 @@ toCodePoints
  (Ljava/lang/CharSequence;)[I
 toEncodedString
  ([BLjava/nio/charset/Charset;)Ljava/lang/String;
- ([BLjava/nio/charset/Charset;)Ljava/lang/String;
+ ([BLjava/nio/charset/Charset;)L1java/lang/String;
 toRootLowerCase
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
@@ -666,7 +666,7 @@ toRootUpperCase
  (Ljava/lang/String;)Ljava/lang/String;
 toString
  ([BLjava/lang/String;)Ljava/lang/String;
- ([BLjava/lang/String;)Ljava/lang/String;
+ ([BLjava/lang/String;)L1java/lang/String;
 trim
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/SystemUtils.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/SystemUtils.eea
index 96a6911c82..1d7c5a3fcc 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/SystemUtils.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/SystemUtils.eea
@@ -150,16 +150,16 @@ getHostName
  ()Ljava/lang/String;
 getJavaHome
  ()Ljava/io/File;
- ()Ljava/io/File;
+ ()L1java/io/File;
 getJavaIoTmpDir
  ()Ljava/io/File;
- ()Ljava/io/File;
+ ()L1java/io/File;
 getUserDir
  ()Ljava/io/File;
- ()Ljava/io/File;
+ ()L1java/io/File;
 getUserHome
  ()Ljava/io/File;
- ()Ljava/io/File;
+ ()L1java/io/File;
 getUserName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/ThreadUtils.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/ThreadUtils.eea
index 50340b347d..28ae1b3008 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/ThreadUtils.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/ThreadUtils.eea
@@ -9,10 +9,10 @@ findThreadById
  (J)Ljava/lang/Thread;
 findThreadById
  (JLjava/lang/String;)Ljava/lang/Thread;
- (JLjava/lang/String;)Ljava/lang/Thread;
+ (JLjava/lang/String;)L0java/lang/Thread;
 findThreadById
  (JLjava/lang/ThreadGroup;)Ljava/lang/Thread;
- (JLjava/lang/ThreadGroup;)Ljava/lang/Thread;
+ (JLjava/lang/ThreadGroup;)L0java/lang/Thread;
 findThreadGroups
  (Ljava/lang/ThreadGroup;ZLjava/util/function/Predicate<Ljava/lang/ThreadGroup;>;)Ljava/util/Collection<Ljava/lang/ThreadGroup;>;
  (Ljava/lang/ThreadGroup;ZLjava/util/function/Predicate<Ljava/lang/ThreadGroup;>;)Ljava/util/Collection<Ljava/lang/ThreadGroup;>;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/builder/Diff.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/builder/Diff.eea
index eb93e23419..31c5b31685 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/builder/Diff.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/builder/Diff.eea
@@ -17,7 +17,7 @@ getType
  ()Ljava/lang/reflect/Type;
 setValue
  (TT;)TT;
- (TT;)TT;
+ (TT;)T1T;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(org.apache.commons.lang3.tuple.Pair)
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/builder/DiffBuilder.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/builder/DiffBuilder.eea
index 17980bb658..57f6382107 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/builder/DiffBuilder.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/builder/DiffBuilder.eea
@@ -8,7 +8,7 @@ super org/apache/commons/lang3/builder/Builder
 
 builder
  <T:Ljava/lang/Object;>()Lorg/apache/commons/lang3/builder/DiffBuilder$Builder<TT;>;
- <T:Ljava/lang/Object;>()Lorg/apache/commons/lang3/builder/DiffBuilder$Builder<TT;>;
+ <T:Ljava/lang/Object;>()L1org/apache/commons/lang3/builder/DiffBuilder$Builder<TT;>;
 
 <init>
  (TT;TT;Lorg/apache/commons/lang3/builder/ToStringStyle;)V
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/builder/ReflectionDiffBuilder.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/builder/ReflectionDiffBuilder.eea
index e2464ab642..03653ac545 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/builder/ReflectionDiffBuilder.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/builder/ReflectionDiffBuilder.eea
@@ -8,7 +8,7 @@ super org/apache/commons/lang3/builder/Builder
 
 builder
  <T:Ljava/lang/Object;>()Lorg/apache/commons/lang3/builder/ReflectionDiffBuilder$Builder<TT;>;
- <T:Ljava/lang/Object;>()Lorg/apache/commons/lang3/builder/ReflectionDiffBuilder$Builder<TT;>;
+ <T:Ljava/lang/Object;>()L1org/apache/commons/lang3/builder/ReflectionDiffBuilder$Builder<TT;>;
 
 <init>
  (TT;TT;Lorg/apache/commons/lang3/builder/ToStringStyle;)V
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/builder/ReflectionToStringBuilder.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/builder/ReflectionToStringBuilder.eea
index d004bec8c7..f93f9d9c04 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/builder/ReflectionToStringBuilder.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/builder/ReflectionToStringBuilder.eea
@@ -29,7 +29,7 @@ toStringInclude
  (Ljava/lang/Object;Ljava/util/Collection<Ljava/lang/String;>;)Ljava/lang/String;
 toStringInclude
  (Ljava/lang/Object;[Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/Object;[Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/Object;[Ljava/lang/String;)L1java/lang/String;
 
 excludeFieldNames
  [Ljava/lang/String;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/compare/ComparableUtils.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/compare/ComparableUtils.eea
index 3f26c6773b..c8b8e9cd5d 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/compare/ComparableUtils.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/compare/ComparableUtils.eea
@@ -14,7 +14,7 @@ gt
  <A::Ljava/lang/Comparable<TA;>;>(TA;)Ljava/util/function/Predicate<TA;>;
 is
  <A::Ljava/lang/Comparable<TA;>;>(TA;)Lorg/apache/commons/lang3/compare/ComparableUtils$ComparableCheckBuilder<TA;>;
- <A::Ljava/lang/Comparable<TA;>;>(TA;)Lorg/apache/commons/lang3/compare/ComparableUtils$ComparableCheckBuilder<TA;>;
+ <A::Ljava/lang/Comparable<TA;>;>(TA;)L1org/apache/commons/lang3/compare/ComparableUtils$ComparableCheckBuilder<TA;>;
 le
  <A::Ljava/lang/Comparable<TA;>;>(TA;)Ljava/util/function/Predicate<TA;>;
  <A::Ljava/lang/Comparable<TA;>;>(TA;)Ljava/util/function/Predicate<TA;>;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/AtomicInitializer$Builder.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/AtomicInitializer$Builder.eea
index 35d6e13fc1..1d411f73c1 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/AtomicInitializer$Builder.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/AtomicInitializer$Builder.eea
@@ -8,4 +8,4 @@ super org/apache/commons/lang3/concurrent/AbstractConcurrentInitializer$Abstract
 
 get
  ()TI;
- ()TI;
+ ()T1I;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/AtomicInitializer.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/AtomicInitializer.eea
index 589e06de03..d8b296b471 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/AtomicInitializer.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/AtomicInitializer.eea
@@ -8,11 +8,11 @@ super org/apache/commons/lang3/concurrent/AbstractConcurrentInitializer
 
 builder
  <T:Ljava/lang/Object;>()Lorg/apache/commons/lang3/concurrent/AtomicInitializer$Builder<Lorg/apache/commons/lang3/concurrent/AtomicInitializer<TT;>;TT;>;
- <T:Ljava/lang/Object;>()Lorg/apache/commons/lang3/concurrent/AtomicInitializer$Builder<Lorg/apache/commons/lang3/concurrent/AtomicInitializer<TT;>;TT;>;
+ <T:Ljava/lang/Object;>()L1org/apache/commons/lang3/concurrent/AtomicInitializer$Builder<Lorg/apache/commons/lang3/concurrent/AtomicInitializer<TT;>;TT;>;
 
 get
  ()TT;
  ()TT;
 getTypedException
  (Ljava/lang/Exception;)Lorg/apache/commons/lang3/concurrent/ConcurrentException;
- (Ljava/lang/Exception;)Lorg/apache/commons/lang3/concurrent/ConcurrentException;
+ (Ljava/lang/Exception;)L1org/apache/commons/lang3/concurrent/ConcurrentException;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/AtomicSafeInitializer$Builder.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/AtomicSafeInitializer$Builder.eea
index f6d6e670a8..a059aa8cd2 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/AtomicSafeInitializer$Builder.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/AtomicSafeInitializer$Builder.eea
@@ -8,4 +8,4 @@ super org/apache/commons/lang3/concurrent/AbstractConcurrentInitializer$Abstract
 
 get
  ()TI;
- ()TI;
+ ()T1I;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.eea
index bf1d002baa..eb901d4070 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.eea
@@ -8,11 +8,11 @@ super org/apache/commons/lang3/concurrent/AbstractConcurrentInitializer
 
 builder
  <T:Ljava/lang/Object;>()Lorg/apache/commons/lang3/concurrent/AtomicSafeInitializer$Builder<Lorg/apache/commons/lang3/concurrent/AtomicSafeInitializer<TT;>;TT;>;
- <T:Ljava/lang/Object;>()Lorg/apache/commons/lang3/concurrent/AtomicSafeInitializer$Builder<Lorg/apache/commons/lang3/concurrent/AtomicSafeInitializer<TT;>;TT;>;
+ <T:Ljava/lang/Object;>()L1org/apache/commons/lang3/concurrent/AtomicSafeInitializer$Builder<Lorg/apache/commons/lang3/concurrent/AtomicSafeInitializer<TT;>;TT;>;
 
 get
  ()TT;
  ()TT;
 getTypedException
  (Ljava/lang/Exception;)Lorg/apache/commons/lang3/concurrent/ConcurrentException;
- (Ljava/lang/Exception;)Lorg/apache/commons/lang3/concurrent/ConcurrentException;
+ (Ljava/lang/Exception;)L1org/apache/commons/lang3/concurrent/ConcurrentException;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/BackgroundInitializer$Builder.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/BackgroundInitializer$Builder.eea
index 4f6d6244e2..dab8eb11ca 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/BackgroundInitializer$Builder.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/BackgroundInitializer$Builder.eea
@@ -8,7 +8,7 @@ super org/apache/commons/lang3/concurrent/AbstractConcurrentInitializer$Abstract
 
 get
  ()TI;
- ()TI;
+ ()T1I;
 setExternalExecutor
  (Ljava/util/concurrent/ExecutorService;)Lorg/apache/commons/lang3/concurrent/BackgroundInitializer$Builder<TI;TT;>;
  (Ljava/util/concurrent/ExecutorService;)L1org/apache/commons/lang3/concurrent/BackgroundInitializer$Builder<TI;TT;>;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/BackgroundInitializer.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/BackgroundInitializer.eea
index 2622b2c5f0..ef84a700a9 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/BackgroundInitializer.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/BackgroundInitializer.eea
@@ -8,14 +8,14 @@ super org/apache/commons/lang3/concurrent/AbstractConcurrentInitializer
 
 builder
  <T:Ljava/lang/Object;>()Lorg/apache/commons/lang3/concurrent/BackgroundInitializer$Builder<Lorg/apache/commons/lang3/concurrent/BackgroundInitializer<TT;>;TT;>;
- <T:Ljava/lang/Object;>()Lorg/apache/commons/lang3/concurrent/BackgroundInitializer$Builder<Lorg/apache/commons/lang3/concurrent/BackgroundInitializer<TT;>;TT;>;
+ <T:Ljava/lang/Object;>()L1org/apache/commons/lang3/concurrent/BackgroundInitializer$Builder<Lorg/apache/commons/lang3/concurrent/BackgroundInitializer<TT;>;TT;>;
 
 <init>
  (Ljava/util/concurrent/ExecutorService;)V
  (Ljava/util/concurrent/ExecutorService;)V
 get
  ()TT;
- ()TT;
+ ()T0T;
 getActiveExecutor
  ()Ljava/util/concurrent/ExecutorService;
  ()Ljava/util/concurrent/ExecutorService;
@@ -27,7 +27,7 @@ getFuture
  ()Ljava/util/concurrent/Future<TT;>;
 getTypedException
  (Ljava/lang/Exception;)Ljava/lang/Exception;
- (Ljava/lang/Exception;)Ljava/lang/Exception;
+ (Ljava/lang/Exception;)L1java/lang/Exception;
 setExternalExecutor
  (Ljava/util/concurrent/ExecutorService;)V
  (Ljava/util/concurrent/ExecutorService;)V
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/CallableBackgroundInitializer.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/CallableBackgroundInitializer.eea
index 5af98dfd62..dad199230f 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/CallableBackgroundInitializer.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/CallableBackgroundInitializer.eea
@@ -14,7 +14,7 @@ super org/apache/commons/lang3/concurrent/BackgroundInitializer
  (Ljava/util/concurrent/Callable<TT;>;Ljava/util/concurrent/ExecutorService;)V
 getTypedException
  (Ljava/lang/Exception;)Ljava/lang/Exception;
- (Ljava/lang/Exception;)Ljava/lang/Exception;
+ (Ljava/lang/Exception;)L1java/lang/Exception; # @Inherited(org.apache.commons.lang3.concurrent.BackgroundInitializer)
 initialize
  ()TT;
  ()TT;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/ConcurrentUtils.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/ConcurrentUtils.eea
index e5697f5f8e..af3aba56ab 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/ConcurrentUtils.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/ConcurrentUtils.eea
@@ -2,19 +2,19 @@ class org/apache/commons/lang3/concurrent/ConcurrentUtils
 
 constantFuture
  <T:Ljava/lang/Object;>(TT;)Ljava/util/concurrent/Future<TT;>;
- <T:Ljava/lang/Object;>(TT;)Ljava/util/concurrent/Future<TT;>;
+ <T:Ljava/lang/Object;>(TT;)L1java/util/concurrent/Future<TT;>;
 createIfAbsent
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/concurrent/ConcurrentMap<TK;TV;>;TK;Lorg/apache/commons/lang3/concurrent/ConcurrentInitializer<TV;>;)TV;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/concurrent/ConcurrentMap<TK;TV;>;TK;Lorg/apache/commons/lang3/concurrent/ConcurrentInitializer<TV;>;)TV;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/concurrent/ConcurrentMap<TK;TV;>;TK;Lorg/apache/commons/lang3/concurrent/ConcurrentInitializer<TV;>;)T1V;
 createIfAbsentUnchecked
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/concurrent/ConcurrentMap<TK;TV;>;TK;Lorg/apache/commons/lang3/concurrent/ConcurrentInitializer<TV;>;)TV;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/concurrent/ConcurrentMap<TK;TV;>;TK;Lorg/apache/commons/lang3/concurrent/ConcurrentInitializer<TV;>;)TV;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/concurrent/ConcurrentMap<TK;TV;>;TK;Lorg/apache/commons/lang3/concurrent/ConcurrentInitializer<TV;>;)T1V;
 extractCause
  (Ljava/util/concurrent/ExecutionException;)Lorg/apache/commons/lang3/concurrent/ConcurrentException;
- (Ljava/util/concurrent/ExecutionException;)Lorg/apache/commons/lang3/concurrent/ConcurrentException;
+ (Ljava/util/concurrent/ExecutionException;)L0org/apache/commons/lang3/concurrent/ConcurrentException;
 extractCauseUnchecked
  (Ljava/util/concurrent/ExecutionException;)Lorg/apache/commons/lang3/concurrent/ConcurrentRuntimeException;
- (Ljava/util/concurrent/ExecutionException;)Lorg/apache/commons/lang3/concurrent/ConcurrentRuntimeException;
+ (Ljava/util/concurrent/ExecutionException;)L0org/apache/commons/lang3/concurrent/ConcurrentRuntimeException;
 handleCause
  (Ljava/util/concurrent/ExecutionException;)V
  (Ljava/util/concurrent/ExecutionException;)V
@@ -23,7 +23,7 @@ handleCauseUnchecked
  (Ljava/util/concurrent/ExecutionException;)V
 initialize
  <T:Ljava/lang/Object;>(Lorg/apache/commons/lang3/concurrent/ConcurrentInitializer<TT;>;)TT;
- <T:Ljava/lang/Object;>(Lorg/apache/commons/lang3/concurrent/ConcurrentInitializer<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Lorg/apache/commons/lang3/concurrent/ConcurrentInitializer<TT;>;)T0T;
 initializeUnchecked
  <T:Ljava/lang/Object;>(Lorg/apache/commons/lang3/concurrent/ConcurrentInitializer<TT;>;)TT;
  <T:Ljava/lang/Object;>(Lorg/apache/commons/lang3/concurrent/ConcurrentInitializer<TT;>;)TT;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/FutureTasks.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/FutureTasks.eea
index 5bfd733c93..844ebf5410 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/FutureTasks.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/FutureTasks.eea
@@ -2,4 +2,4 @@ class org/apache/commons/lang3/concurrent/FutureTasks
 
 run
  <V:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TV;>;)Ljava/util/concurrent/FutureTask<TV;>;
- <V:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TV;>;)Ljava/util/concurrent/FutureTask<TV;>;
+ <V:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TV;>;)L1java/util/concurrent/FutureTask<TV;>;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/LazyInitializer$Builder.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/LazyInitializer$Builder.eea
index e75df6c69d..f69af0fcd8 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/LazyInitializer$Builder.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/LazyInitializer$Builder.eea
@@ -8,4 +8,4 @@ super org/apache/commons/lang3/concurrent/AbstractConcurrentInitializer$Abstract
 
 get
  ()TI;
- ()TI;
+ ()T1I;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/LazyInitializer.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/LazyInitializer.eea
index c9120a8b03..d1d86d1ab3 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/LazyInitializer.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/LazyInitializer.eea
@@ -8,11 +8,11 @@ super org/apache/commons/lang3/concurrent/AbstractConcurrentInitializer
 
 builder
  <T:Ljava/lang/Object;>()Lorg/apache/commons/lang3/concurrent/LazyInitializer$Builder<Lorg/apache/commons/lang3/concurrent/LazyInitializer<TT;>;TT;>;
- <T:Ljava/lang/Object;>()Lorg/apache/commons/lang3/concurrent/LazyInitializer$Builder<Lorg/apache/commons/lang3/concurrent/LazyInitializer<TT;>;TT;>;
+ <T:Ljava/lang/Object;>()L1org/apache/commons/lang3/concurrent/LazyInitializer$Builder<Lorg/apache/commons/lang3/concurrent/LazyInitializer<TT;>;TT;>;
 
 get
  ()TT;
  ()TT;
 getTypedException
  (Ljava/lang/Exception;)Lorg/apache/commons/lang3/concurrent/ConcurrentException;
- (Ljava/lang/Exception;)Lorg/apache/commons/lang3/concurrent/ConcurrentException;
+ (Ljava/lang/Exception;)L1org/apache/commons/lang3/concurrent/ConcurrentException;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.eea
index edc0e01f03..19ce7b7f2f 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.eea
@@ -12,4 +12,4 @@ addInitializer
  (Ljava/lang/String;Lorg/apache/commons/lang3/concurrent/BackgroundInitializer<*>;)V
 initialize
  ()Lorg/apache/commons/lang3/concurrent/MultiBackgroundInitializer$MultiBackgroundInitializerResults;
- ()Lorg/apache/commons/lang3/concurrent/MultiBackgroundInitializer$MultiBackgroundInitializerResults;
+ ()L1org/apache/commons/lang3/concurrent/MultiBackgroundInitializer$MultiBackgroundInitializerResults;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/UncheckedFuture.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/UncheckedFuture.eea
index ca10878b0f..21d7e807da 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/UncheckedFuture.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/UncheckedFuture.eea
@@ -14,7 +14,7 @@ on
  <T:Ljava/lang/Object;>(Ljava/util/Collection<Ljava/util/concurrent/Future<TT;>;>;)Ljava/util/Collection<Lorg/apache/commons/lang3/concurrent/UncheckedFuture<TT;>;>;
 on
  <T:Ljava/lang/Object;>(Ljava/util/concurrent/Future<TT;>;)Lorg/apache/commons/lang3/concurrent/UncheckedFuture<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/concurrent/Future<TT;>;)Lorg/apache/commons/lang3/concurrent/UncheckedFuture<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/concurrent/Future<TT;>;)L1org/apache/commons/lang3/concurrent/UncheckedFuture<TT;>;
 
 get
  ()TV;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/locks/LockingVisitors.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/locks/LockingVisitors.eea
index 2202c73e2d..5f3c07938e 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/locks/LockingVisitors.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/concurrent/locks/LockingVisitors.eea
@@ -2,10 +2,10 @@ class org/apache/commons/lang3/concurrent/locks/LockingVisitors
 
 create
  <O:Ljava/lang/Object;>(TO;Ljava/util/concurrent/locks/ReadWriteLock;)Lorg/apache/commons/lang3/concurrent/locks/LockingVisitors$ReadWriteLockVisitor<TO;>;
- <O:Ljava/lang/Object;>(TO;Ljava/util/concurrent/locks/ReadWriteLock;)Lorg/apache/commons/lang3/concurrent/locks/LockingVisitors$ReadWriteLockVisitor<TO;>;
+ <O:Ljava/lang/Object;>(TO;Ljava/util/concurrent/locks/ReadWriteLock;)L1org/apache/commons/lang3/concurrent/locks/LockingVisitors$ReadWriteLockVisitor<TO;>;
 reentrantReadWriteLockVisitor
  <O:Ljava/lang/Object;>(TO;)Lorg/apache/commons/lang3/concurrent/locks/LockingVisitors$ReadWriteLockVisitor<TO;>;
  <O:Ljava/lang/Object;>(TO;)Lorg/apache/commons/lang3/concurrent/locks/LockingVisitors$ReadWriteLockVisitor<TO;>;
 stampedLockVisitor
  <O:Ljava/lang/Object;>(TO;)Lorg/apache/commons/lang3/concurrent/locks/LockingVisitors$StampedLockVisitor<TO;>;
- <O:Ljava/lang/Object;>(TO;)Lorg/apache/commons/lang3/concurrent/locks/LockingVisitors$StampedLockVisitor<TO;>;
+ <O:Ljava/lang/Object;>(TO;)L1org/apache/commons/lang3/concurrent/locks/LockingVisitors$StampedLockVisitor<TO;>;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/event/EventListenerSupport.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/event/EventListenerSupport.eea
index 2f479d5b63..09c2aa1fa2 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/event/EventListenerSupport.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/event/EventListenerSupport.eea
@@ -4,7 +4,7 @@ class org/apache/commons/lang3/event/EventListenerSupport
 
 create
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/apache/commons/lang3/event/EventListenerSupport<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/apache/commons/lang3/event/EventListenerSupport<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1org/apache/commons/lang3/event/EventListenerSupport<TT;>;
 
 <init>
  (Ljava/lang/Class<TL;>;)V
@@ -20,7 +20,7 @@ addListener
  (TL;Z)V
 createInvocationHandler
  ()Ljava/lang/reflect/InvocationHandler;
- ()Ljava/lang/reflect/InvocationHandler;
+ ()L1java/lang/reflect/InvocationHandler;
 fire
  ()TL;
  ()TL;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/exception/DefaultExceptionContext.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/exception/DefaultExceptionContext.eea
index ee035438ab..6d7dd275d0 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/exception/DefaultExceptionContext.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/exception/DefaultExceptionContext.eea
@@ -17,7 +17,7 @@ getFirstContextValue
  (Ljava/lang/String;)Ljava/lang/Object;
 getFormattedExceptionMessage
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 setContextValue
  (Ljava/lang/String;Ljava/lang/Object;)Lorg/apache/commons/lang3/exception/DefaultExceptionContext;
  (Ljava/lang/String;Ljava/lang/Object;)Lorg/apache/commons/lang3/exception/DefaultExceptionContext;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/exception/ExceptionUtils.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/exception/ExceptionUtils.eea
index a090c6179d..63c1f151a3 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/exception/ExceptionUtils.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/exception/ExceptionUtils.eea
@@ -17,7 +17,7 @@ getDefaultCauseMethodNames
  ()[Ljava/lang/String;
 getMessage
  (Ljava/lang/Throwable;)Ljava/lang/String;
- (Ljava/lang/Throwable;)Ljava/lang/String;
+ (Ljava/lang/Throwable;)L1java/lang/String;
 getRootCause
  (Ljava/lang/Throwable;)Ljava/lang/Throwable;
  (Ljava/lang/Throwable;)Ljava/lang/Throwable;
@@ -35,13 +35,13 @@ getStackFrames
  (Ljava/lang/Throwable;)[Ljava/lang/String;
 getStackTrace
  (Ljava/lang/Throwable;)Ljava/lang/String;
- (Ljava/lang/Throwable;)Ljava/lang/String;
+ (Ljava/lang/Throwable;)L1java/lang/String;
 getThrowableCount
  (Ljava/lang/Throwable;)I
  (Ljava/lang/Throwable;)I
 getThrowableList
  (Ljava/lang/Throwable;)Ljava/util/List<Ljava/lang/Throwable;>;
- (Ljava/lang/Throwable;)Ljava/util/List<Ljava/lang/Throwable;>;
+ (Ljava/lang/Throwable;)L1java/util/List<Ljava/lang/Throwable;>;
 getThrowables
  (Ljava/lang/Throwable;)[Ljava/lang/Throwable;
  (Ljava/lang/Throwable;)[Ljava/lang/Throwable;
@@ -104,4 +104,4 @@ throwableOfType
  <T:Ljava/lang/Throwable;>(Ljava/lang/Throwable;Ljava/lang/Class<TT;>;I)TT;
 wrapAndThrow
  <R:Ljava/lang/Object;>(Ljava/lang/Throwable;)TR;
- <R:Ljava/lang/Object;>(Ljava/lang/Throwable;)TR;
+ <R:Ljava/lang/Object;>(Ljava/lang/Throwable;)T1R;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/function/Failable.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/function/Failable.eea
index aa25ba52db..459c9229d9 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/function/Failable.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/function/Failable.eea
@@ -74,16 +74,16 @@ getAsShort
  <E:Ljava/lang/Throwable;>(Lorg/apache/commons/lang3/function/FailableShortSupplier<TE;>;)S
 rethrow
  (Ljava/lang/Throwable;)Ljava/lang/RuntimeException;
- (Ljava/lang/Throwable;)Ljava/lang/RuntimeException;
+ (Ljava/lang/Throwable;)L1java/lang/RuntimeException;
 run
  <E:Ljava/lang/Throwable;>(Lorg/apache/commons/lang3/function/FailableRunnable<TE;>;)V
  <E:Ljava/lang/Throwable;>(Lorg/apache/commons/lang3/function/FailableRunnable<TE;>;)V
 stream
  <E:Ljava/lang/Object;>(Ljava/util/Collection<TE;>;)Lorg/apache/commons/lang3/stream/Streams$FailableStream<TE;>;
- <E:Ljava/lang/Object;>(Ljava/util/Collection<TE;>;)Lorg/apache/commons/lang3/stream/Streams$FailableStream<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/util/Collection<TE;>;)L1org/apache/commons/lang3/stream/Streams$FailableStream<TE;>;
 stream
  <T:Ljava/lang/Object;>(Ljava/util/stream/Stream<TT;>;)Lorg/apache/commons/lang3/stream/Streams$FailableStream<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/stream/Stream<TT;>;)Lorg/apache/commons/lang3/stream/Streams$FailableStream<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/stream/Stream<TT;>;)L1org/apache/commons/lang3/stream/Streams$FailableStream<TT;>;
 test
  <T:Ljava/lang/Object;E:Ljava/lang/Throwable;>(Lorg/apache/commons/lang3/function/FailablePredicate<TT;TE;>;TT;)Z
  <T:Ljava/lang/Object;E:Ljava/lang/Throwable;>(Lorg/apache/commons/lang3/function/FailablePredicate<TT;TE;>;TT;)Z
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/function/Functions.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/function/Functions.eea
index 97faf11a58..95e2c97ea4 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/function/Functions.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/function/Functions.eea
@@ -2,7 +2,7 @@ class org/apache/commons/lang3/function/Functions
 
 apply
  <T:Ljava/lang/Object;R:Ljava/lang/Object;>(Ljava/util/function/Function<TT;TR;>;TT;)TR;
- <T:Ljava/lang/Object;R:Ljava/lang/Object;>(Ljava/util/function/Function<TT;TR;>;TT;)TR;
+ <T:Ljava/lang/Object;R:Ljava/lang/Object;>(Ljava/util/function/Function<TT;TR;>;TT;)T0R;
 function
  <T:Ljava/lang/Object;R:Ljava/lang/Object;>(Ljava/util/function/Function<TT;TR;>;)Ljava/util/function/Function<TT;TR;>;
  <T:Ljava/lang/Object;R:Ljava/lang/Object;>(Ljava/util/function/Function<TT;TR;>;)Ljava/util/function/Function<TT;TR;>;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/math/Fraction.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/math/Fraction.eea
index 92d1443b23..a98f77eb09 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/math/Fraction.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/math/Fraction.eea
@@ -46,7 +46,7 @@ getFraction
  (D)Lorg/apache/commons/lang3/math/Fraction;
 getFraction
  (II)Lorg/apache/commons/lang3/math/Fraction;
- (II)Lorg/apache/commons/lang3/math/Fraction;
+ (II)L1org/apache/commons/lang3/math/Fraction;
 getFraction
  (III)Lorg/apache/commons/lang3/math/Fraction;
  (III)Lorg/apache/commons/lang3/math/Fraction;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/math/NumberUtils.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/math/NumberUtils.eea
index efda957c5e..23383667cd 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/math/NumberUtils.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/math/NumberUtils.eea
@@ -66,25 +66,25 @@ SHORT_ZERO
 
 createBigDecimal
  (Ljava/lang/String;)Ljava/math/BigDecimal;
- (Ljava/lang/String;)Ljava/math/BigDecimal;
+ (Ljava/lang/String;)Ljava/math/BigDecimal; # @PolyNull
 createBigInteger
  (Ljava/lang/String;)Ljava/math/BigInteger;
- (Ljava/lang/String;)Ljava/math/BigInteger;
+ (Ljava/lang/String;)Ljava/math/BigInteger; # @PolyNull
 createDouble
  (Ljava/lang/String;)Ljava/lang/Double;
- (Ljava/lang/String;)Ljava/lang/Double;
+ (Ljava/lang/String;)L1java/lang/Double;
 createFloat
  (Ljava/lang/String;)Ljava/lang/Float;
- (Ljava/lang/String;)Ljava/lang/Float;
+ (Ljava/lang/String;)L1java/lang/Float;
 createInteger
  (Ljava/lang/String;)Ljava/lang/Integer;
- (Ljava/lang/String;)Ljava/lang/Integer;
+ (Ljava/lang/String;)L1java/lang/Integer;
 createLong
  (Ljava/lang/String;)Ljava/lang/Long;
- (Ljava/lang/String;)Ljava/lang/Long;
+ (Ljava/lang/String;)L1java/lang/Long;
 createNumber
  (Ljava/lang/String;)Ljava/lang/Number;
- (Ljava/lang/String;)Ljava/lang/Number;
+ (Ljava/lang/String;)L1java/lang/Number;
 isCreatable
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/reflect/ConstructorUtils.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/reflect/ConstructorUtils.eea
index 30294be78b..1aadb9e422 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/reflect/ConstructorUtils.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/reflect/ConstructorUtils.eea
@@ -2,10 +2,10 @@ class org/apache/commons/lang3/reflect/ConstructorUtils
 
 getAccessibleConstructor
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;[Ljava/lang/Class<*>;)Ljava/lang/reflect/Constructor<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;[Ljava/lang/Class<*>;)Ljava/lang/reflect/Constructor<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;[Ljava/lang/Class<*>;)L0java/lang/reflect/Constructor<TT;>;
 getAccessibleConstructor
  <T:Ljava/lang/Object;>(Ljava/lang/reflect/Constructor<TT;>;)Ljava/lang/reflect/Constructor<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/reflect/Constructor<TT;>;)Ljava/lang/reflect/Constructor<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/reflect/Constructor<TT;>;)L0java/lang/reflect/Constructor<TT;>;
 getMatchingAccessibleConstructor
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;[Ljava/lang/Class<*>;)Ljava/lang/reflect/Constructor<TT;>;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;[Ljava/lang/Class<*>;)Ljava/lang/reflect/Constructor<TT;>;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/reflect/FieldUtils.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/reflect/FieldUtils.eea
index be40100212..d5c0e2d653 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/reflect/FieldUtils.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/reflect/FieldUtils.eea
@@ -5,13 +5,13 @@ getAllFields
  (Ljava/lang/Class<*>;)[Ljava/lang/reflect/Field;
 getAllFieldsList
  (Ljava/lang/Class<*>;)Ljava/util/List<Ljava/lang/reflect/Field;>;
- (Ljava/lang/Class<*>;)Ljava/util/List<Ljava/lang/reflect/Field;>;
+ (Ljava/lang/Class<*>;)L1java/util/List<Ljava/lang/reflect/Field;>;
 getDeclaredField
  (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/reflect/Field;
  (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/reflect/Field;
 getDeclaredField
  (Ljava/lang/Class<*>;Ljava/lang/String;Z)Ljava/lang/reflect/Field;
- (Ljava/lang/Class<*>;Ljava/lang/String;Z)Ljava/lang/reflect/Field;
+ (Ljava/lang/Class<*>;Ljava/lang/String;Z)L0java/lang/reflect/Field;
 getField
  (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/reflect/Field;
  (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/reflect/Field;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/reflect/MethodUtils.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/reflect/MethodUtils.eea
index 65cc91f260..e27aec9ef8 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/reflect/MethodUtils.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/reflect/MethodUtils.eea
@@ -5,25 +5,25 @@ getAccessibleMethod
  (Ljava/lang/Class<*>;Ljava/lang/String;[Ljava/lang/Class<*>;)Ljava/lang/reflect/Method;
 getAccessibleMethod
  (Ljava/lang/reflect/Method;)Ljava/lang/reflect/Method;
- (Ljava/lang/reflect/Method;)Ljava/lang/reflect/Method;
+ (Ljava/lang/reflect/Method;)L0java/lang/reflect/Method;
 getAnnotation
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/reflect/Method;Ljava/lang/Class<TA;>;ZZ)TA;
- <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/reflect/Method;Ljava/lang/Class<TA;>;ZZ)TA;
+ <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/reflect/Method;Ljava/lang/Class<TA;>;ZZ)T0A;
 getMatchingAccessibleMethod
  (Ljava/lang/Class<*>;Ljava/lang/String;[Ljava/lang/Class<*>;)Ljava/lang/reflect/Method;
- (Ljava/lang/Class<*>;Ljava/lang/String;[Ljava/lang/Class<*>;)Ljava/lang/reflect/Method;
+ (Ljava/lang/Class<*>;Ljava/lang/String;[Ljava/lang/Class<*>;)L0java/lang/reflect/Method;
 getMatchingMethod
  (Ljava/lang/Class<*>;Ljava/lang/String;[Ljava/lang/Class<*>;)Ljava/lang/reflect/Method;
- (Ljava/lang/Class<*>;Ljava/lang/String;[Ljava/lang/Class<*>;)Ljava/lang/reflect/Method;
+ (Ljava/lang/Class<*>;Ljava/lang/String;[Ljava/lang/Class<*>;)L0java/lang/reflect/Method;
 getMethodObject
  (Ljava/lang/Class<*>;Ljava/lang/String;[Ljava/lang/Class<*>;)Ljava/lang/reflect/Method;
- (Ljava/lang/Class<*>;Ljava/lang/String;[Ljava/lang/Class<*>;)Ljava/lang/reflect/Method;
+ (Ljava/lang/Class<*>;Ljava/lang/String;[Ljava/lang/Class<*>;)L0java/lang/reflect/Method;
 getMethodsListWithAnnotation
  (Ljava/lang/Class<*>;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Ljava/util/List<Ljava/lang/reflect/Method;>;
  (Ljava/lang/Class<*>;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Ljava/util/List<Ljava/lang/reflect/Method;>;
 getMethodsListWithAnnotation
  (Ljava/lang/Class<*>;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;ZZ)Ljava/util/List<Ljava/lang/reflect/Method;>;
- (Ljava/lang/Class<*>;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;ZZ)Ljava/util/List<Ljava/lang/reflect/Method;>;
+ (Ljava/lang/Class<*>;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;ZZ)L1java/util/List<Ljava/lang/reflect/Method;>;
 getMethodsWithAnnotation
  (Ljava/lang/Class<*>;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)[Ljava/lang/reflect/Method;
  (Ljava/lang/Class<*>;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)[Ljava/lang/reflect/Method;
@@ -32,7 +32,7 @@ getMethodsWithAnnotation
  (Ljava/lang/Class<*>;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;ZZ)[Ljava/lang/reflect/Method;
 getOverrideHierarchy
  (Ljava/lang/reflect/Method;Lorg/apache/commons/lang3/ClassUtils$Interfaces;)Ljava/util/Set<Ljava/lang/reflect/Method;>;
- (Ljava/lang/reflect/Method;Lorg/apache/commons/lang3/ClassUtils$Interfaces;)Ljava/util/Set<Ljava/lang/reflect/Method;>;
+ (Ljava/lang/reflect/Method;Lorg/apache/commons/lang3/ClassUtils$Interfaces;)L1java/util/Set<Ljava/lang/reflect/Method;>;
 invokeExactMethod
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/reflect/TypeUtils.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/reflect/TypeUtils.eea
index dcdcddfedc..9f95c9755c 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/reflect/TypeUtils.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/reflect/TypeUtils.eea
@@ -9,16 +9,16 @@ containsTypeVariables
  (Ljava/lang/reflect/Type;)Z
 determineTypeArguments
  (Ljava/lang/Class<*>;Ljava/lang/reflect/ParameterizedType;)Ljava/util/Map<Ljava/lang/reflect/TypeVariable<*>;Ljava/lang/reflect/Type;>;
- (Ljava/lang/Class<*>;Ljava/lang/reflect/ParameterizedType;)Ljava/util/Map<Ljava/lang/reflect/TypeVariable<*>;Ljava/lang/reflect/Type;>;
+ (Ljava/lang/Class<*>;Ljava/lang/reflect/ParameterizedType;)L0java/util/Map<Ljava/lang/reflect/TypeVariable<*>;Ljava/lang/reflect/Type;>;
 equals
  (Ljava/lang/reflect/Type;Ljava/lang/reflect/Type;)Z
  (Ljava/lang/reflect/Type;Ljava/lang/reflect/Type;)Z
 genericArrayType
  (Ljava/lang/reflect/Type;)Ljava/lang/reflect/GenericArrayType;
- (Ljava/lang/reflect/Type;)Ljava/lang/reflect/GenericArrayType;
+ (Ljava/lang/reflect/Type;)L1java/lang/reflect/GenericArrayType;
 getArrayComponentType
  (Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
- (Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
+ (Ljava/lang/reflect/Type;)L0java/lang/reflect/Type;
 getImplicitBounds
  (Ljava/lang/reflect/TypeVariable<*>;)[Ljava/lang/reflect/Type;
  (Ljava/lang/reflect/TypeVariable<*>;)[Ljava/lang/reflect/Type;
@@ -30,7 +30,7 @@ getImplicitUpperBounds
  (Ljava/lang/reflect/WildcardType;)[Ljava/lang/reflect/Type;
 getRawType
  (Ljava/lang/reflect/Type;Ljava/lang/reflect/Type;)Ljava/lang/Class<*>;
- (Ljava/lang/reflect/Type;Ljava/lang/reflect/Type;)Ljava/lang/Class<*>;
+ (Ljava/lang/reflect/Type;Ljava/lang/reflect/Type;)L0java/lang/Class<*>;
 getTypeArguments
  (Ljava/lang/reflect/ParameterizedType;)Ljava/util/Map<Ljava/lang/reflect/TypeVariable<*>;Ljava/lang/reflect/Type;>;
  (Ljava/lang/reflect/ParameterizedType;)Ljava/util/Map<Ljava/lang/reflect/TypeVariable<*>;Ljava/lang/reflect/Type;>;
@@ -60,10 +60,10 @@ parameterizeWithOwner
  (Ljava/lang/reflect/Type;Ljava/lang/Class<*>;Ljava/util/Map<Ljava/lang/reflect/TypeVariable<*>;Ljava/lang/reflect/Type;>;)Ljava/lang/reflect/ParameterizedType;
 parameterizeWithOwner
  (Ljava/lang/reflect/Type;Ljava/lang/Class<*>;[Ljava/lang/reflect/Type;)Ljava/lang/reflect/ParameterizedType;
- (Ljava/lang/reflect/Type;Ljava/lang/Class<*>;[Ljava/lang/reflect/Type;)Ljava/lang/reflect/ParameterizedType;
+ (Ljava/lang/reflect/Type;Ljava/lang/Class<*>;[Ljava/lang/reflect/Type;)L1java/lang/reflect/ParameterizedType;
 toLongString
  (Ljava/lang/reflect/TypeVariable<*>;)Ljava/lang/String;
- (Ljava/lang/reflect/TypeVariable<*>;)Ljava/lang/String;
+ (Ljava/lang/reflect/TypeVariable<*>;)L1java/lang/String;
 toString
  (Ljava/lang/reflect/Type;)Ljava/lang/String;
  (Ljava/lang/reflect/Type;)Ljava/lang/String;
@@ -75,7 +75,7 @@ unrollVariables
  (Ljava/util/Map<Ljava/lang/reflect/TypeVariable<*>;Ljava/lang/reflect/Type;>;Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
 wildcardType
  ()Lorg/apache/commons/lang3/reflect/TypeUtils$WildcardTypeBuilder;
- ()Lorg/apache/commons/lang3/reflect/TypeUtils$WildcardTypeBuilder;
+ ()L1org/apache/commons/lang3/reflect/TypeUtils$WildcardTypeBuilder;
 wrap
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/apache/commons/lang3/reflect/Typed<TT;>;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/apache/commons/lang3/reflect/Typed<TT;>;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/stream/Streams$FailableStream.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/stream/Streams$FailableStream.eea
index fe0c05a49c..2c60142908 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/stream/Streams$FailableStream.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/stream/Streams$FailableStream.eea
@@ -25,7 +25,7 @@ forEach
  (Lorg/apache/commons/lang3/function/FailableConsumer<TT;*>;)V
 map
  <R:Ljava/lang/Object;>(Lorg/apache/commons/lang3/function/FailableFunction<TT;TR;*>;)Lorg/apache/commons/lang3/stream/Streams$FailableStream<TR;>;
- <R:Ljava/lang/Object;>(Lorg/apache/commons/lang3/function/FailableFunction<TT;TR;*>;)Lorg/apache/commons/lang3/stream/Streams$FailableStream<TR;>;
+ <R:Ljava/lang/Object;>(Lorg/apache/commons/lang3/function/FailableFunction<TT;TR;*>;)L1org/apache/commons/lang3/stream/Streams$FailableStream<TR;>;
 reduce
  (TT;Ljava/util/function/BinaryOperator<TT;>;)TT;
  (TT;Ljava/util/function/BinaryOperator<TT;>;)TT;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/stream/Streams.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/stream/Streams.eea
index 5c62c6fe61..764d42ecca 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/stream/Streams.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/stream/Streams.eea
@@ -5,7 +5,7 @@ failableStream
  <T:Ljava/lang/Object;>(Ljava/util/Collection<TT;>;)Lorg/apache/commons/lang3/stream/Streams$FailableStream<TT;>;
 failableStream
  <T:Ljava/lang/Object;>(Ljava/util/stream/Stream<TT;>;)Lorg/apache/commons/lang3/stream/Streams$FailableStream<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/stream/Stream<TT;>;)Lorg/apache/commons/lang3/stream/Streams$FailableStream<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/stream/Stream<TT;>;)L1org/apache/commons/lang3/stream/Streams$FailableStream<TT;>;
 failableStream
  <T:Ljava/lang/Object;>(TT;)Lorg/apache/commons/lang3/stream/Streams$FailableStream<TT;>;
  <T:Ljava/lang/Object;>(TT;)Lorg/apache/commons/lang3/stream/Streams$FailableStream<TT;>;
@@ -50,4 +50,4 @@ stream
  <T:Ljava/lang/Object;>(Ljava/util/stream/Stream<TT;>;)Lorg/apache/commons/lang3/stream/Streams$FailableStream<TT;>;
 toArray
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Ljava/util/stream/Collector<TT;*[TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Ljava/util/stream/Collector<TT;*[TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1java/util/stream/Collector<TT;*[TT;>;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/StrBuilder.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/StrBuilder.eea
index 48f1b66620..4239146421 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/StrBuilder.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/StrBuilder.eea
@@ -193,13 +193,13 @@ appendln
  ([CII)L1org/apache/commons/lang3/text/StrBuilder;
 asReader
  ()Ljava/io/Reader;
- ()Ljava/io/Reader;
+ ()L1java/io/Reader;
 asTokenizer
  ()Lorg/apache/commons/lang3/text/StrTokenizer;
- ()Lorg/apache/commons/lang3/text/StrTokenizer;
+ ()L1org/apache/commons/lang3/text/StrTokenizer;
 asWriter
  ()Ljava/io/Writer;
- ()Ljava/io/Writer;
+ ()L1java/io/Writer;
 build
  ()Ljava/lang/String;
  ()L1java/lang/String;
@@ -397,7 +397,7 @@ toStringBuffer
  ()Ljava/lang/StringBuffer;
 toStringBuilder
  ()Ljava/lang/StringBuilder;
- ()Ljava/lang/StringBuilder;
+ ()L1java/lang/StringBuilder;
 trim
  ()Lorg/apache/commons/lang3/text/StrBuilder;
  ()L1org/apache/commons/lang3/text/StrBuilder;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/StrLookup.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/StrLookup.eea
index 09dd8cf4a3..f2c4dc813e 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/StrLookup.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/StrLookup.eea
@@ -4,7 +4,7 @@ class org/apache/commons/lang3/text/StrLookup
 
 mapLookup
  <V:Ljava/lang/Object;>(Ljava/util/Map<Ljava/lang/String;TV;>;)Lorg/apache/commons/lang3/text/StrLookup<TV;>;
- <V:Ljava/lang/Object;>(Ljava/util/Map<Ljava/lang/String;TV;>;)Lorg/apache/commons/lang3/text/StrLookup<TV;>;
+ <V:Ljava/lang/Object;>(Ljava/util/Map<Ljava/lang/String;TV;>;)L1org/apache/commons/lang3/text/StrLookup<TV;>;
 noneLookup
  ()Lorg/apache/commons/lang3/text/StrLookup<*>;
  ()Lorg/apache/commons/lang3/text/StrLookup<*>;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/StrMatcher.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/StrMatcher.eea
index 70130767ad..ee202f610c 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/StrMatcher.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/StrMatcher.eea
@@ -2,7 +2,7 @@ class org/apache/commons/lang3/text/StrMatcher
 
 charMatcher
  (C)Lorg/apache/commons/lang3/text/StrMatcher;
- (C)Lorg/apache/commons/lang3/text/StrMatcher;
+ (C)L1org/apache/commons/lang3/text/StrMatcher;
 charSetMatcher
  (Ljava/lang/String;)Lorg/apache/commons/lang3/text/StrMatcher;
  (Ljava/lang/String;)Lorg/apache/commons/lang3/text/StrMatcher;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/StrSubstitutor.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/StrSubstitutor.eea
index 7327759a45..a731c1b70c 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/StrSubstitutor.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/StrSubstitutor.eea
@@ -67,10 +67,10 @@ replace
  (Ljava/lang/CharSequence;)Ljava/lang/String;
 replace
  (Ljava/lang/CharSequence;II)Ljava/lang/String;
- (Ljava/lang/CharSequence;II)Ljava/lang/String;
+ (Ljava/lang/CharSequence;II)Ljava/lang/String; # @PolyNull
 replace
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)Ljava/lang/String; # @PolyNull
 replace
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
@@ -79,22 +79,22 @@ replace
  (Ljava/lang/String;II)Ljava/lang/String;
 replace
  (Ljava/lang/StringBuffer;)Ljava/lang/String;
- (Ljava/lang/StringBuffer;)Ljava/lang/String;
+ (Ljava/lang/StringBuffer;)Ljava/lang/String; # @PolyNull
 replace
  (Ljava/lang/StringBuffer;II)Ljava/lang/String;
- (Ljava/lang/StringBuffer;II)Ljava/lang/String;
+ (Ljava/lang/StringBuffer;II)Ljava/lang/String; # @PolyNull
 replace
  (Lorg/apache/commons/lang3/text/StrBuilder;)Ljava/lang/String;
- (Lorg/apache/commons/lang3/text/StrBuilder;)Ljava/lang/String;
+ (Lorg/apache/commons/lang3/text/StrBuilder;)Ljava/lang/String; # @PolyNull
 replace
  (Lorg/apache/commons/lang3/text/StrBuilder;II)Ljava/lang/String;
- (Lorg/apache/commons/lang3/text/StrBuilder;II)Ljava/lang/String;
+ (Lorg/apache/commons/lang3/text/StrBuilder;II)Ljava/lang/String; # @PolyNull
 replace
  ([C)Ljava/lang/String;
- ([C)Ljava/lang/String;
+ ([C)Ljava/lang/String; # @PolyNull
 replace
  ([CII)Ljava/lang/String;
- ([CII)Ljava/lang/String;
+ ([CII)Ljava/lang/String; # @PolyNull
 replaceIn
  (Ljava/lang/StringBuffer;)Z
  (Ljava/lang/StringBuffer;)Z
@@ -115,7 +115,7 @@ replaceIn
  (Lorg/apache/commons/lang3/text/StrBuilder;II)Z
 resolveVariable
  (Ljava/lang/String;Lorg/apache/commons/lang3/text/StrBuilder;II)Ljava/lang/String;
- (Ljava/lang/String;Lorg/apache/commons/lang3/text/StrBuilder;II)Ljava/lang/String;
+ (Ljava/lang/String;Lorg/apache/commons/lang3/text/StrBuilder;II)L0java/lang/String;
 setValueDelimiter
  (C)Lorg/apache/commons/lang3/text/StrSubstitutor;
  (C)Lorg/apache/commons/lang3/text/StrSubstitutor;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/StrTokenizer.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/StrTokenizer.eea
index 95f0ad9b70..0b6ccc8c7e 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/StrTokenizer.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/StrTokenizer.eea
@@ -67,7 +67,7 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 getContent
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getDelimiterMatcher
  ()Lorg/apache/commons/lang3/text/StrMatcher;
  ()Lorg/apache/commons/lang3/text/StrMatcher;
@@ -91,13 +91,13 @@ next
  ()Ljava/lang/String;
 nextToken
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 previous
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 previousToken
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 reset
  ()Lorg/apache/commons/lang3/text/StrTokenizer;
  ()Lorg/apache/commons/lang3/text/StrTokenizer;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/WordUtils.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/WordUtils.eea
index 836d297bf0..31c027622b 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/WordUtils.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/WordUtils.eea
@@ -38,4 +38,4 @@ wrap
  (Ljava/lang/String;ILjava/lang/String;Z)Ljava/lang/String;
 wrap
  (Ljava/lang/String;ILjava/lang/String;ZLjava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;ILjava/lang/String;ZLjava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;ILjava/lang/String;ZLjava/lang/String;)Ljava/lang/String; # @PolyNull
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/translate/CharSequenceTranslator.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/translate/CharSequenceTranslator.eea
index 28cc6cc893..b9b893af2f 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/translate/CharSequenceTranslator.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/translate/CharSequenceTranslator.eea
@@ -6,7 +6,7 @@ hex
 
 translate
  (Ljava/lang/CharSequence;)Ljava/lang/String;
- (Ljava/lang/CharSequence;)Ljava/lang/String;
+ (Ljava/lang/CharSequence;)Ljava/lang/String; # @PolyNull
 translate
  (Ljava/lang/CharSequence;ILjava/io/Writer;)I
  (Ljava/lang/CharSequence;ILjava/io/Writer;)I
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/translate/JavaUnicodeEscaper.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/translate/JavaUnicodeEscaper.eea
index 5c68c63fcd..d1be2d9ca3 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/translate/JavaUnicodeEscaper.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/translate/JavaUnicodeEscaper.eea
@@ -15,4 +15,4 @@ outsideOf
 
 toUtf16Escape
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String; # @Inherited(org.apache.commons.lang3.text.translate.UnicodeEscaper)
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/translate/UnicodeEscaper.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/translate/UnicodeEscaper.eea
index dadddd2b68..127fad262c 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/translate/UnicodeEscaper.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/text/translate/UnicodeEscaper.eea
@@ -15,7 +15,7 @@ outsideOf
 
 toUtf16Escape
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 translate
  (ILjava/io/Writer;)Z
  (ILjava/io/Writer;)Z
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/time/CalendarUtils.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/time/CalendarUtils.eea
index 48d8fe5c1c..b7d3482642 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/time/CalendarUtils.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/time/CalendarUtils.eea
@@ -6,7 +6,7 @@ INSTANCE
 
 getInstance
  ()Lorg/apache/commons/lang3/time/CalendarUtils;
- ()Lorg/apache/commons/lang3/time/CalendarUtils;
+ ()L1org/apache/commons/lang3/time/CalendarUtils;
 toLocalDateTime
  (Ljava/util/Calendar;)Ljava/time/LocalDateTime;
  (Ljava/util/Calendar;)Ljava/time/LocalDateTime;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/time/DateUtils.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/time/DateUtils.eea
index 9e08092ddb..db6d0638b8 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/time/DateUtils.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/time/DateUtils.eea
@@ -83,7 +83,7 @@ iterator
  (Ljava/lang/Object;I)Ljava/util/Iterator<*>;
 iterator
  (Ljava/util/Calendar;I)Ljava/util/Iterator<Ljava/util/Calendar;>;
- (Ljava/util/Calendar;I)Ljava/util/Iterator<Ljava/util/Calendar;>;
+ (Ljava/util/Calendar;I)L1java/util/Iterator<Ljava/util/Calendar;>;
 iterator
  (Ljava/util/Date;I)Ljava/util/Iterator<Ljava/util/Calendar;>;
  (Ljava/util/Date;I)Ljava/util/Iterator<Ljava/util/Calendar;>;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/time/FastDateParser.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/time/FastDateParser.eea
index 4b5740cdb0..86e9de391f 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/time/FastDateParser.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/time/FastDateParser.eea
@@ -23,7 +23,7 @@ parse
  (Ljava/lang/String;)Ljava/util/Date;
 parse
  (Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/util/Date;
- (Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/util/Date;
+ (Ljava/lang/String;Ljava/text/ParsePosition;)L0java/util/Date;
 parse
  (Ljava/lang/String;Ljava/text/ParsePosition;Ljava/util/Calendar;)Z
  (Ljava/lang/String;Ljava/text/ParsePosition;Ljava/util/Calendar;)Z
@@ -38,4 +38,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toStringAll
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/time/FastDatePrinter.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/time/FastDatePrinter.eea
index abaa84d342..780b4b9bb2 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/time/FastDatePrinter.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/time/FastDatePrinter.eea
@@ -20,7 +20,7 @@ format
  (Ljava/lang/Object;Ljava/lang/StringBuffer;Ljava/text/FieldPosition;)Ljava/lang/StringBuffer;
 format
  (Ljava/util/Calendar;)Ljava/lang/String;
- (Ljava/util/Calendar;)Ljava/lang/String;
+ (Ljava/util/Calendar;)L1java/lang/String;
 format
  (Ljava/util/Calendar;Ljava/lang/StringBuffer;)Ljava/lang/StringBuffer;
  (Ljava/util/Calendar;Ljava/lang/StringBuffer;)Ljava/lang/StringBuffer;
@@ -50,13 +50,13 @@ getTimeZone
  ()Ljava/util/TimeZone;
 parsePattern
  ()Ljava/util/List<Lorg/apache/commons/lang3/time/FastDatePrinter$Rule;>;
- ()Ljava/util/List<Lorg/apache/commons/lang3/time/FastDatePrinter$Rule;>;
+ ()L1java/util/List<Lorg/apache/commons/lang3/time/FastDatePrinter$Rule;>;
 parseToken
  (Ljava/lang/String;[I)Ljava/lang/String;
- (Ljava/lang/String;[I)Ljava/lang/String;
+ (Ljava/lang/String;[I)L1java/lang/String;
 selectNumberRule
  (II)Lorg/apache/commons/lang3/time/FastDatePrinter$NumberRule;
- (II)Lorg/apache/commons/lang3/time/FastDatePrinter$NumberRule;
+ (II)L1org/apache/commons/lang3/time/FastDatePrinter$NumberRule;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/time/FastTimeZone.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/time/FastTimeZone.eea
index caede40920..b139eb5a4d 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/time/FastTimeZone.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/time/FastTimeZone.eea
@@ -5,7 +5,7 @@ getGmtTimeZone
  ()Ljava/util/TimeZone;
 getGmtTimeZone
  (Ljava/lang/String;)Ljava/util/TimeZone;
- (Ljava/lang/String;)Ljava/util/TimeZone;
+ (Ljava/lang/String;)L0java/util/TimeZone;
 getTimeZone
  (Ljava/lang/String;)Ljava/util/TimeZone;
  (Ljava/lang/String;)Ljava/util/TimeZone;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/time/StopWatch.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/time/StopWatch.eea
index 5c13fffbc0..8eb5fa1f16 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/time/StopWatch.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/time/StopWatch.eea
@@ -2,10 +2,10 @@ class org/apache/commons/lang3/time/StopWatch
 
 create
  ()Lorg/apache/commons/lang3/time/StopWatch;
- ()Lorg/apache/commons/lang3/time/StopWatch;
+ ()L1org/apache/commons/lang3/time/StopWatch;
 createStarted
  ()Lorg/apache/commons/lang3/time/StopWatch;
- ()Lorg/apache/commons/lang3/time/StopWatch;
+ ()L1org/apache/commons/lang3/time/StopWatch;
 
 <init>
  (Ljava/lang/String;)V
@@ -36,7 +36,7 @@ getTime
  (Ljava/util/concurrent/TimeUnit;)J
 toSplitString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/tuple/ImmutablePair.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/tuple/ImmutablePair.eea
index 50803d780c..91c7dc0c4e 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/tuple/ImmutablePair.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/tuple/ImmutablePair.eea
@@ -50,4 +50,4 @@ getRight
  ()TR;
 setValue
  (TR;)TR;
- (TR;)TR;
+ (TR;)T1R;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/tuple/MutablePair.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/tuple/MutablePair.eea
index b04d499d91..c109f1e92d 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/tuple/MutablePair.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/tuple/MutablePair.eea
@@ -15,10 +15,10 @@ emptyArray
  <L:Ljava/lang/Object;R:Ljava/lang/Object;>()[Lorg/apache/commons/lang3/tuple/MutablePair<TL;TR;>;
 of
  <L:Ljava/lang/Object;R:Ljava/lang/Object;>(Ljava/util/Map$Entry<TL;TR;>;)Lorg/apache/commons/lang3/tuple/MutablePair<TL;TR;>;
- <L:Ljava/lang/Object;R:Ljava/lang/Object;>(Ljava/util/Map$Entry<TL;TR;>;)Lorg/apache/commons/lang3/tuple/MutablePair<TL;TR;>;
+ <L:Ljava/lang/Object;R:Ljava/lang/Object;>(Ljava/util/Map$Entry<TL;TR;>;)L1org/apache/commons/lang3/tuple/MutablePair<TL;TR;>;
 of
  <L:Ljava/lang/Object;R:Ljava/lang/Object;>(TL;TR;)Lorg/apache/commons/lang3/tuple/MutablePair<TL;TR;>;
- <L:Ljava/lang/Object;R:Ljava/lang/Object;>(TL;TR;)Lorg/apache/commons/lang3/tuple/MutablePair<TL;TR;>;
+ <L:Ljava/lang/Object;R:Ljava/lang/Object;>(TL;TR;)L1org/apache/commons/lang3/tuple/MutablePair<TL;TR;>;
 ofNonNull
  <L:Ljava/lang/Object;R:Ljava/lang/Object;>(TL;TR;)Lorg/apache/commons/lang3/tuple/MutablePair<TL;TR;>;
  <L:Ljava/lang/Object;R:Ljava/lang/Object;>(TL;TR;)Lorg/apache/commons/lang3/tuple/MutablePair<TL;TR;>;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/tuple/MutableTriple.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/tuple/MutableTriple.eea
index 22d317eaa4..42a7166645 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/tuple/MutableTriple.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/tuple/MutableTriple.eea
@@ -15,7 +15,7 @@ emptyArray
  <L:Ljava/lang/Object;M:Ljava/lang/Object;R:Ljava/lang/Object;>()[Lorg/apache/commons/lang3/tuple/MutableTriple<TL;TM;TR;>;
 of
  <L:Ljava/lang/Object;M:Ljava/lang/Object;R:Ljava/lang/Object;>(TL;TM;TR;)Lorg/apache/commons/lang3/tuple/MutableTriple<TL;TM;TR;>;
- <L:Ljava/lang/Object;M:Ljava/lang/Object;R:Ljava/lang/Object;>(TL;TM;TR;)Lorg/apache/commons/lang3/tuple/MutableTriple<TL;TM;TR;>;
+ <L:Ljava/lang/Object;M:Ljava/lang/Object;R:Ljava/lang/Object;>(TL;TM;TR;)L1org/apache/commons/lang3/tuple/MutableTriple<TL;TM;TR;>;
 ofNonNull
  <L:Ljava/lang/Object;M:Ljava/lang/Object;R:Ljava/lang/Object;>(TL;TM;TR;)Lorg/apache/commons/lang3/tuple/MutableTriple<TL;TM;TR;>;
  <L:Ljava/lang/Object;M:Ljava/lang/Object;R:Ljava/lang/Object;>(TL;TM;TR;)Lorg/apache/commons/lang3/tuple/MutableTriple<TL;TM;TR;>;
diff --git a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/util/FluentBitSet.eea b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/util/FluentBitSet.eea
index 05df6c6c8e..0e9337972d 100644
--- a/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/util/FluentBitSet.eea
+++ b/libs/eea-commons-lang-3/src/main/resources/org/apache/commons/lang3/util/FluentBitSet.eea
@@ -44,7 +44,7 @@ flip
  (II)Lorg/apache/commons/lang3/util/FluentBitSet;
 get
  (II)Lorg/apache/commons/lang3/util/FluentBitSet;
- (II)Lorg/apache/commons/lang3/util/FluentBitSet;
+ (II)L1org/apache/commons/lang3/util/FluentBitSet;
 intersects
  (Ljava/util/BitSet;)Z
  (Ljava/util/BitSet;)Z
diff --git a/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watcher/DirectoryChangeListener.eea b/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watcher/DirectoryChangeListener.eea
index ba7694b070..6f55922dae 100644
--- a/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watcher/DirectoryChangeListener.eea
+++ b/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watcher/DirectoryChangeListener.eea
@@ -2,7 +2,7 @@ class io/methvin/watcher/DirectoryChangeListener
 
 of
  ([Lio/methvin/watcher/DirectoryChangeListener;)Lio/methvin/watcher/DirectoryChangeListener;
- ([Lio/methvin/watcher/DirectoryChangeListener;)Lio/methvin/watcher/DirectoryChangeListener;
+ ([Lio/methvin/watcher/DirectoryChangeListener;)L1io/methvin/watcher/DirectoryChangeListener;
 
 onEvent
  (Lio/methvin/watcher/DirectoryChangeEvent;)V
diff --git a/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watcher/DirectoryWatcher.eea b/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watcher/DirectoryWatcher.eea
index ac71c82d8f..e0a2a81da9 100644
--- a/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watcher/DirectoryWatcher.eea
+++ b/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watcher/DirectoryWatcher.eea
@@ -2,7 +2,7 @@ class io/methvin/watcher/DirectoryWatcher
 
 builder
  ()Lio/methvin/watcher/DirectoryWatcher$Builder;
- ()Lio/methvin/watcher/DirectoryWatcher$Builder;
+ ()L1io/methvin/watcher/DirectoryWatcher$Builder;
 
 <init>
  (Ljava/util/List<Ljava/nio/file/Path;>;Lio/methvin/watcher/DirectoryChangeListener;Ljava/nio/file/WatchService;Lio/methvin/watcher/hashing/FileHasher;Lio/methvin/watcher/visitor/FileTreeVisitor;Lorg/slf4j/Logger;)V
diff --git a/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watcher/PathUtils.eea b/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watcher/PathUtils.eea
index 59b2ae39c9..9e201c8a3a 100644
--- a/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watcher/PathUtils.eea
+++ b/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watcher/PathUtils.eea
@@ -5,10 +5,10 @@ cast
  <T:Ljava/lang/Object;>(Ljava/nio/file/WatchEvent<*>;)Ljava/nio/file/WatchEvent<TT;>;
 createHashCodeMap
  (Ljava/nio/file/Path;Lio/methvin/watcher/hashing/FileHasher;Lio/methvin/watcher/visitor/FileTreeVisitor;)Ljava/util/SortedMap<Ljava/nio/file/Path;Lio/methvin/watcher/hashing/FileHash;>;
- (Ljava/nio/file/Path;Lio/methvin/watcher/hashing/FileHasher;Lio/methvin/watcher/visitor/FileTreeVisitor;)Ljava/util/SortedMap<Ljava/nio/file/Path;Lio/methvin/watcher/hashing/FileHash;>;
+ (Ljava/nio/file/Path;Lio/methvin/watcher/hashing/FileHasher;Lio/methvin/watcher/visitor/FileTreeVisitor;)L1java/util/SortedMap<Ljava/nio/file/Path;Lio/methvin/watcher/hashing/FileHash;>;
 hash
  (Lio/methvin/watcher/hashing/FileHasher;Ljava/nio/file/Path;)Lio/methvin/watcher/hashing/FileHash;
- (Lio/methvin/watcher/hashing/FileHasher;Ljava/nio/file/Path;)Lio/methvin/watcher/hashing/FileHash;
+ (Lio/methvin/watcher/hashing/FileHasher;Ljava/nio/file/Path;)L0io/methvin/watcher/hashing/FileHash;
 initWatcherState
  (Ljava/util/List<Ljava/nio/file/Path;>;Lio/methvin/watcher/hashing/FileHasher;Lio/methvin/watcher/visitor/FileTreeVisitor;Ljava/util/Map<Ljava/nio/file/Path;Lio/methvin/watcher/hashing/FileHash;>;Ljava/util/Set<Ljava/nio/file/Path;>;)V
  (Ljava/util/List<Ljava/nio/file/Path;>;Lio/methvin/watcher/hashing/FileHasher;Lio/methvin/watcher/visitor/FileTreeVisitor;Ljava/util/Map<Ljava/nio/file/Path;Lio/methvin/watcher/hashing/FileHash;>;Ljava/util/Set<Ljava/nio/file/Path;>;)V
@@ -17,4 +17,4 @@ recursiveListFiles
  (Lio/methvin/watcher/visitor/FileTreeVisitor;Ljava/nio/file/Path;)Ljava/util/Set<Ljava/nio/file/Path;>;
 subtreePaths
  <T:Ljava/lang/Object;>(Ljava/util/SortedMap<Ljava/nio/file/Path;TT;>;Ljava/nio/file/Path;)Ljava/lang/Iterable<Ljava/nio/file/Path;>;
- <T:Ljava/lang/Object;>(Ljava/util/SortedMap<Ljava/nio/file/Path;TT;>;Ljava/nio/file/Path;)Ljava/lang/Iterable<Ljava/nio/file/Path;>;
+ <T:Ljava/lang/Object;>(Ljava/util/SortedMap<Ljava/nio/file/Path;TT;>;Ljava/nio/file/Path;)L1java/lang/Iterable<Ljava/nio/file/Path;>;
diff --git a/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watcher/changeset/ChangeSet.eea b/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watcher/changeset/ChangeSet.eea
index 51f4f45824..1e33bbb2cf 100644
--- a/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watcher/changeset/ChangeSet.eea
+++ b/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watcher/changeset/ChangeSet.eea
@@ -2,7 +2,7 @@ class io/methvin/watcher/changeset/ChangeSet
 
 created
  ()Ljava/util/Set<Lio/methvin/watcher/changeset/ChangeSetEntry;>;
- ()Ljava/util/Set<Lio/methvin/watcher/changeset/ChangeSetEntry;>;
+ ()L1java/util/Set<Lio/methvin/watcher/changeset/ChangeSetEntry;>;
 deleted
  ()Ljava/util/Set<Lio/methvin/watcher/changeset/ChangeSetEntry;>;
  ()Ljava/util/Set<Lio/methvin/watcher/changeset/ChangeSetEntry;>;
diff --git a/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watcher/hashing/FileHash.eea b/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watcher/hashing/FileHash.eea
index 46124d5682..e11fe72d38 100644
--- a/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watcher/hashing/FileHash.eea
+++ b/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watcher/hashing/FileHash.eea
@@ -12,11 +12,11 @@ fromBytes
  ([B)Lio/methvin/watcher/hashing/FileHash;
 fromLong
  (J)Lio/methvin/watcher/hashing/FileHash;
- (J)Lio/methvin/watcher/hashing/FileHash;
+ (J)L1io/methvin/watcher/hashing/FileHash;
 
 asBytes
  ()[B
  ()[B
 asString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watcher/hashing/Murmur3F.eea b/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watcher/hashing/Murmur3F.eea
index e2e954c554..46ce921fc7 100644
--- a/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watcher/hashing/Murmur3F.eea
+++ b/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watcher/hashing/Murmur3F.eea
@@ -5,13 +5,13 @@ getValueBigInteger
  ()Ljava/math/BigInteger;
 getValueBytesBigEndian
  ()[B
- ()[B
+ ()[1B
 getValueBytesLittleEndian
  ()[B
- ()[B
+ ()[1B
 getValueHexString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 update
  ([B)V
  ([1B)V # @Inherited(java.util.zip.Checksum)
diff --git a/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watchservice/MacOSXListeningWatchService.eea b/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watchservice/MacOSXListeningWatchService.eea
index ae3df3fd2c..ccfd192127 100644
--- a/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watchservice/MacOSXListeningWatchService.eea
+++ b/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watchservice/MacOSXListeningWatchService.eea
@@ -8,4 +8,4 @@ close
  (Lio/methvin/watchservice/MacOSXListeningWatchService$CFRunLoopThread;Lio/methvin/watchservice/jna/CarbonAPI$FSEventStreamCallback;Ljava/nio/file/Path;)V
 register
  (Lio/methvin/watchservice/WatchablePath;Ljava/lang/Iterable<+Ljava/nio/file/WatchEvent$Kind<*>;>;)Lio/methvin/watchservice/AbstractWatchKey;
- (Lio/methvin/watchservice/WatchablePath;Ljava/lang/Iterable<+Ljava/nio/file/WatchEvent$Kind<*>;>;)Lio/methvin/watchservice/AbstractWatchKey;
+ (Lio/methvin/watchservice/WatchablePath;Ljava/lang/Iterable<+Ljava/nio/file/WatchEvent$Kind<*>;>;)L1io/methvin/watchservice/AbstractWatchKey;
diff --git a/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watchservice/jna/CFIndex.eea b/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watchservice/jna/CFIndex.eea
index d0a528e7f0..92015ba755 100644
--- a/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watchservice/jna/CFIndex.eea
+++ b/libs/eea-directory-watcher-0/src/main/resources/io/methvin/watchservice/jna/CFIndex.eea
@@ -2,4 +2,4 @@ class io/methvin/watchservice/jna/CFIndex
 
 valueOf
  (I)Lio/methvin/watchservice/jna/CFIndex;
- (I)Lio/methvin/watchservice/jna/CFIndex;
+ (I)L1io/methvin/watchservice/jna/CFIndex;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/Command.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/Command.eea
index 149accda2b..a3ae8ca741 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/Command.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/Command.eea
@@ -42,13 +42,13 @@ getHandler
  ()Lorg/eclipse/core/commands/IHandler;
 getParameter
  (Ljava/lang/String;)Lorg/eclipse/core/commands/IParameter;
- (Ljava/lang/String;)Lorg/eclipse/core/commands/IParameter;
+ (Ljava/lang/String;)L0org/eclipse/core/commands/IParameter;
 getParameterType
  (Ljava/lang/String;)Lorg/eclipse/core/commands/ParameterType;
- (Ljava/lang/String;)Lorg/eclipse/core/commands/ParameterType;
+ (Ljava/lang/String;)L0org/eclipse/core/commands/ParameterType;
 getParameters
  ()[Lorg/eclipse/core/commands/IParameter;
- ()[Lorg/eclipse/core/commands/IParameter;
+ ()[0Lorg/eclipse/core/commands/IParameter;
 getReturnType
  ()Lorg/eclipse/core/commands/ParameterType;
  ()Lorg/eclipse/core/commands/ParameterType;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/CommandManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/CommandManager.eea
index 8c9f9a0ad8..4cb9651118 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/CommandManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/CommandManager.eea
@@ -25,7 +25,7 @@ defineUncategorizedCategory
  (Ljava/lang/String;Ljava/lang/String;)V
 deserialize
  (Ljava/lang/String;)Lorg/eclipse/core/commands/ParameterizedCommand;
- (Ljava/lang/String;)Lorg/eclipse/core/commands/ParameterizedCommand;
+ (Ljava/lang/String;)L1org/eclipse/core/commands/ParameterizedCommand;
 fireNotDefined
  (Ljava/lang/String;Lorg/eclipse/core/commands/common/NotDefinedException;)V
  (Ljava/lang/String;Lorg/eclipse/core/commands/common/NotDefinedException;)V
@@ -49,10 +49,10 @@ getCategory
  (Ljava/lang/String;)Lorg/eclipse/core/commands/Category;
 getCommand
  (Ljava/lang/String;)Lorg/eclipse/core/commands/Command;
- (Ljava/lang/String;)Lorg/eclipse/core/commands/Command;
+ (Ljava/lang/String;)L1org/eclipse/core/commands/Command;
 getDefinedCategories
  ()[Lorg/eclipse/core/commands/Category;
- ()[Lorg/eclipse/core/commands/Category;
+ ()[1Lorg/eclipse/core/commands/Category;
 getDefinedCategoryIds
  ()Ljava/util/Set;
  ()Ljava/util/Set;
@@ -67,13 +67,13 @@ getDefinedParameterTypeIds
  ()Ljava/util/Set;
 getDefinedParameterTypes
  ()[Lorg/eclipse/core/commands/ParameterType;
- ()[Lorg/eclipse/core/commands/ParameterType;
+ ()[1Lorg/eclipse/core/commands/ParameterType;
 getHelpContextId
  (Lorg/eclipse/core/commands/Command;)Ljava/lang/String;
  (Lorg/eclipse/core/commands/Command;)Ljava/lang/String;
 getParameterType
  (Ljava/lang/String;)Lorg/eclipse/core/commands/ParameterType;
- (Ljava/lang/String;)Lorg/eclipse/core/commands/ParameterType;
+ (Ljava/lang/String;)L1org/eclipse/core/commands/ParameterType;
 parameterTypeChanged
  (Lorg/eclipse/core/commands/ParameterTypeEvent;)V
  (L1org/eclipse/core/commands/ParameterTypeEvent;)V # @Inherited(org.eclipse.core.commands.IParameterTypeListener)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/IHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/IHandler.eea
index 124dfbd270..352db74cde 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/IHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/IHandler.eea
@@ -8,7 +8,7 @@ execute
  (L1org/eclipse/core/commands/ExecutionEvent;)L0java/lang/Object;
 getHandlerLabel
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 removeHandlerListener
  (Lorg/eclipse/core/commands/IHandlerListener;)V
  (L1org/eclipse/core/commands/IHandlerListener;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/ParameterizedCommand.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/ParameterizedCommand.eea
index 93656dc12d..36527a1269 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/ParameterizedCommand.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/ParameterizedCommand.eea
@@ -5,7 +5,7 @@ generateCombinations
  (Lorg/eclipse/core/commands/Command;)Ljava/util/Collection;
 generateCommand
  (Lorg/eclipse/core/commands/Command;Ljava/util/Map;)Lorg/eclipse/core/commands/ParameterizedCommand;
- (Lorg/eclipse/core/commands/Command;Ljava/util/Map;)Lorg/eclipse/core/commands/ParameterizedCommand;
+ (Lorg/eclipse/core/commands/Command;Ljava/util/Map;)L0org/eclipse/core/commands/ParameterizedCommand;
 
 <init>
  (Lorg/eclipse/core/commands/Command;[Lorg/eclipse/core/commands/Parameterization;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/common/HandleObjectManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/common/HandleObjectManager.eea
index a61a767678..012b2e0c1b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/common/HandleObjectManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/common/HandleObjectManager.eea
@@ -14,4 +14,4 @@ checkId
  (Ljava/lang/String;)V
 getDefinedHandleObjectIds
  ()Ljava/util/Set;
- ()Ljava/util/Set;
+ ()L1java/util/Set;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/contexts/ContextManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/contexts/ContextManager.eea
index 8f483d9359..ce0461748f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/contexts/ContextManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/contexts/ContextManager.eea
@@ -18,7 +18,7 @@ getActiveContextIds
  ()Ljava/util/Set;
 getContext
  (Ljava/lang/String;)Lorg/eclipse/core/commands/contexts/Context;
- (Ljava/lang/String;)Lorg/eclipse/core/commands/contexts/Context;
+ (Ljava/lang/String;)L1org/eclipse/core/commands/contexts/Context;
 getDefinedContextIds
  ()Ljava/util/Set;
  ()Ljava/util/Set;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/operations/DefaultOperationHistory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/operations/DefaultOperationHistory.eea
index 7972fd1cb1..51c6c10e88 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/operations/DefaultOperationHistory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/operations/DefaultOperationHistory.eea
@@ -29,13 +29,13 @@ getRedoHistory
  (Lorg/eclipse/core/commands/operations/IUndoContext;)[Lorg/eclipse/core/commands/operations/IUndoableOperation;
 getRedoOperation
  (Lorg/eclipse/core/commands/operations/IUndoContext;)Lorg/eclipse/core/commands/operations/IUndoableOperation;
- (Lorg/eclipse/core/commands/operations/IUndoContext;)Lorg/eclipse/core/commands/operations/IUndoableOperation;
+ (Lorg/eclipse/core/commands/operations/IUndoContext;)L0org/eclipse/core/commands/operations/IUndoableOperation;
 getUndoHistory
  (Lorg/eclipse/core/commands/operations/IUndoContext;)[Lorg/eclipse/core/commands/operations/IUndoableOperation;
  (Lorg/eclipse/core/commands/operations/IUndoContext;)[Lorg/eclipse/core/commands/operations/IUndoableOperation;
 getUndoOperation
  (Lorg/eclipse/core/commands/operations/IUndoContext;)Lorg/eclipse/core/commands/operations/IUndoableOperation;
- (Lorg/eclipse/core/commands/operations/IUndoContext;)Lorg/eclipse/core/commands/operations/IUndoableOperation;
+ (Lorg/eclipse/core/commands/operations/IUndoContext;)L0org/eclipse/core/commands/operations/IUndoableOperation;
 openOperation
  (Lorg/eclipse/core/commands/operations/ICompositeOperation;I)V
  (Lorg/eclipse/core/commands/operations/ICompositeOperation;I)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/operations/ObjectUndoContext.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/operations/ObjectUndoContext.eea
index a59dc19f9f..e862cc0248 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/operations/ObjectUndoContext.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/operations/ObjectUndoContext.eea
@@ -11,7 +11,7 @@ addMatch
  (Lorg/eclipse/core/commands/operations/IUndoContext;)V
 getLabel
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.eclipse.core.commands.operations.UndoContext)
 getObject
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/operations/UndoContext.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/operations/UndoContext.eea
index 2c41e6f2bf..3337ad0939 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/operations/UndoContext.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/commands/operations/UndoContext.eea
@@ -2,7 +2,7 @@ class org/eclipse/core/commands/operations/UndoContext
 
 getLabel
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 matches
  (Lorg/eclipse/core/commands/operations/IUndoContext;)Z
  (Lorg/eclipse/core/commands/operations/IUndoContext;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/BindingProperties.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/BindingProperties.eea
index 4b3e56cec3..882767b43d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/BindingProperties.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/BindingProperties.eea
@@ -2,25 +2,25 @@ class org/eclipse/core/databinding/BindingProperties
 
 bindings
  ()Lorg/eclipse/core/databinding/property/list/IListProperty<Lorg/eclipse/core/databinding/DataBindingContext;Lorg/eclipse/core/databinding/Binding;>;
- ()Lorg/eclipse/core/databinding/property/list/IListProperty<Lorg/eclipse/core/databinding/DataBindingContext;Lorg/eclipse/core/databinding/Binding;>;
+ ()L1org/eclipse/core/databinding/property/list/IListProperty<Lorg/eclipse/core/databinding/DataBindingContext;Lorg/eclipse/core/databinding/Binding;>;
 convertedValue
  <S:Ljava/lang/Object;T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/conversion/IConverter<TS;TT;>;)Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;TT;>;
  <S:Ljava/lang/Object;T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/conversion/IConverter<TS;TT;>;)Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;TT;>;
 model
  ()Lorg/eclipse/core/databinding/property/value/IValueProperty<Lorg/eclipse/core/databinding/Binding;Lorg/eclipse/core/databinding/observable/IObservable;>;
- ()Lorg/eclipse/core/databinding/property/value/IValueProperty<Lorg/eclipse/core/databinding/Binding;Lorg/eclipse/core/databinding/observable/IObservable;>;
+ ()L1org/eclipse/core/databinding/property/value/IValueProperty<Lorg/eclipse/core/databinding/Binding;Lorg/eclipse/core/databinding/observable/IObservable;>;
 models
  ()Lorg/eclipse/core/databinding/property/list/IListProperty<Lorg/eclipse/core/databinding/ValidationStatusProvider;Lorg/eclipse/core/databinding/observable/IObservable;>;
- ()Lorg/eclipse/core/databinding/property/list/IListProperty<Lorg/eclipse/core/databinding/ValidationStatusProvider;Lorg/eclipse/core/databinding/observable/IObservable;>;
+ ()L1org/eclipse/core/databinding/property/list/IListProperty<Lorg/eclipse/core/databinding/ValidationStatusProvider;Lorg/eclipse/core/databinding/observable/IObservable;>;
 target
  ()Lorg/eclipse/core/databinding/property/value/IValueProperty<Lorg/eclipse/core/databinding/Binding;Lorg/eclipse/core/databinding/observable/IObservable;>;
- ()Lorg/eclipse/core/databinding/property/value/IValueProperty<Lorg/eclipse/core/databinding/Binding;Lorg/eclipse/core/databinding/observable/IObservable;>;
+ ()L1org/eclipse/core/databinding/property/value/IValueProperty<Lorg/eclipse/core/databinding/Binding;Lorg/eclipse/core/databinding/observable/IObservable;>;
 targets
  ()Lorg/eclipse/core/databinding/property/list/IListProperty<Lorg/eclipse/core/databinding/ValidationStatusProvider;Lorg/eclipse/core/databinding/observable/IObservable;>;
- ()Lorg/eclipse/core/databinding/property/list/IListProperty<Lorg/eclipse/core/databinding/ValidationStatusProvider;Lorg/eclipse/core/databinding/observable/IObservable;>;
+ ()L1org/eclipse/core/databinding/property/list/IListProperty<Lorg/eclipse/core/databinding/ValidationStatusProvider;Lorg/eclipse/core/databinding/observable/IObservable;>;
 validationStatus
  ()Lorg/eclipse/core/databinding/property/value/IValueProperty<Lorg/eclipse/core/databinding/ValidationStatusProvider;Lorg/eclipse/core/runtime/IStatus;>;
  ()Lorg/eclipse/core/databinding/property/value/IValueProperty<Lorg/eclipse/core/databinding/ValidationStatusProvider;Lorg/eclipse/core/runtime/IStatus;>;
 validationStatusProviders
  ()Lorg/eclipse/core/databinding/property/list/IListProperty<Lorg/eclipse/core/databinding/DataBindingContext;Lorg/eclipse/core/databinding/ValidationStatusProvider;>;
- ()Lorg/eclipse/core/databinding/property/list/IListProperty<Lorg/eclipse/core/databinding/DataBindingContext;Lorg/eclipse/core/databinding/ValidationStatusProvider;>;
+ ()L1org/eclipse/core/databinding/property/list/IListProperty<Lorg/eclipse/core/databinding/DataBindingContext;Lorg/eclipse/core/databinding/ValidationStatusProvider;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/DataBindingContext.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/DataBindingContext.eea
index 0ade829947..119eaf6215 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/DataBindingContext.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/DataBindingContext.eea
@@ -14,37 +14,37 @@ bindList
  <T:Ljava/lang/Object;M:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TT;>;Lorg/eclipse/core/databinding/observable/list/IObservableList<TM;>;)Lorg/eclipse/core/databinding/Binding;
 bindList
  <T:Ljava/lang/Object;M:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TT;>;Lorg/eclipse/core/databinding/observable/list/IObservableList<TM;>;Lorg/eclipse/core/databinding/UpdateListStrategy<-TT;+TM;>;Lorg/eclipse/core/databinding/UpdateListStrategy<-TM;+TT;>;)Lorg/eclipse/core/databinding/Binding;
- <T:Ljava/lang/Object;M:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TT;>;Lorg/eclipse/core/databinding/observable/list/IObservableList<TM;>;Lorg/eclipse/core/databinding/UpdateListStrategy<-TT;+TM;>;Lorg/eclipse/core/databinding/UpdateListStrategy<-TM;+TT;>;)Lorg/eclipse/core/databinding/Binding;
+ <T:Ljava/lang/Object;M:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TT;>;Lorg/eclipse/core/databinding/observable/list/IObservableList<TM;>;Lorg/eclipse/core/databinding/UpdateListStrategy<-TT;+TM;>;Lorg/eclipse/core/databinding/UpdateListStrategy<-TM;+TT;>;)L1org/eclipse/core/databinding/Binding;
 bindSet
  <T:Ljava/lang/Object;M:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TT;>;Lorg/eclipse/core/databinding/observable/set/IObservableSet<TM;>;)Lorg/eclipse/core/databinding/Binding;
  <T:Ljava/lang/Object;M:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TT;>;Lorg/eclipse/core/databinding/observable/set/IObservableSet<TM;>;)Lorg/eclipse/core/databinding/Binding;
 bindSet
  <T:Ljava/lang/Object;M:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TT;>;Lorg/eclipse/core/databinding/observable/set/IObservableSet<TM;>;Lorg/eclipse/core/databinding/UpdateSetStrategy<-TT;+TM;>;Lorg/eclipse/core/databinding/UpdateSetStrategy<-TM;+TT;>;)Lorg/eclipse/core/databinding/Binding;
- <T:Ljava/lang/Object;M:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TT;>;Lorg/eclipse/core/databinding/observable/set/IObservableSet<TM;>;Lorg/eclipse/core/databinding/UpdateSetStrategy<-TT;+TM;>;Lorg/eclipse/core/databinding/UpdateSetStrategy<-TM;+TT;>;)Lorg/eclipse/core/databinding/Binding;
+ <T:Ljava/lang/Object;M:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TT;>;Lorg/eclipse/core/databinding/observable/set/IObservableSet<TM;>;Lorg/eclipse/core/databinding/UpdateSetStrategy<-TT;+TM;>;Lorg/eclipse/core/databinding/UpdateSetStrategy<-TM;+TT;>;)L1org/eclipse/core/databinding/Binding;
 bindValue
  <T:Ljava/lang/Object;M:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;)Lorg/eclipse/core/databinding/Binding;
  <T:Ljava/lang/Object;M:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;)Lorg/eclipse/core/databinding/Binding;
 bindValue
  <T:Ljava/lang/Object;M:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;Lorg/eclipse/core/databinding/UpdateValueStrategy<-TT;+TM;>;Lorg/eclipse/core/databinding/UpdateValueStrategy<-TM;+TT;>;)Lorg/eclipse/core/databinding/Binding;
- <T:Ljava/lang/Object;M:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;Lorg/eclipse/core/databinding/UpdateValueStrategy<-TT;+TM;>;Lorg/eclipse/core/databinding/UpdateValueStrategy<-TM;+TT;>;)Lorg/eclipse/core/databinding/Binding;
+ <T:Ljava/lang/Object;M:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;Lorg/eclipse/core/databinding/UpdateValueStrategy<-TT;+TM;>;Lorg/eclipse/core/databinding/UpdateValueStrategy<-TM;+TT;>;)L1org/eclipse/core/databinding/Binding;
 createModelToTargetUpdateListStrategy
  <M:Ljava/lang/Object;T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TM;>;Lorg/eclipse/core/databinding/observable/list/IObservableList<TT;>;)Lorg/eclipse/core/databinding/UpdateListStrategy<TM;TT;>;
- <M:Ljava/lang/Object;T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TM;>;Lorg/eclipse/core/databinding/observable/list/IObservableList<TT;>;)Lorg/eclipse/core/databinding/UpdateListStrategy<TM;TT;>;
+ <M:Ljava/lang/Object;T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TM;>;Lorg/eclipse/core/databinding/observable/list/IObservableList<TT;>;)L1org/eclipse/core/databinding/UpdateListStrategy<TM;TT;>;
 createModelToTargetUpdateSetStrategy
  <M:Ljava/lang/Object;T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TM;>;Lorg/eclipse/core/databinding/observable/set/IObservableSet<TT;>;)Lorg/eclipse/core/databinding/UpdateSetStrategy<TM;TT;>;
- <M:Ljava/lang/Object;T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TM;>;Lorg/eclipse/core/databinding/observable/set/IObservableSet<TT;>;)Lorg/eclipse/core/databinding/UpdateSetStrategy<TM;TT;>;
+ <M:Ljava/lang/Object;T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TM;>;Lorg/eclipse/core/databinding/observable/set/IObservableSet<TT;>;)L1org/eclipse/core/databinding/UpdateSetStrategy<TM;TT;>;
 createModelToTargetUpdateValueStrategy
  <M:Ljava/lang/Object;T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;)Lorg/eclipse/core/databinding/UpdateValueStrategy<TM;TT;>;
- <M:Ljava/lang/Object;T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;)Lorg/eclipse/core/databinding/UpdateValueStrategy<TM;TT;>;
+ <M:Ljava/lang/Object;T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;)L1org/eclipse/core/databinding/UpdateValueStrategy<TM;TT;>;
 createTargetToModelUpdateListStrategy
  <T:Ljava/lang/Object;M:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TT;>;Lorg/eclipse/core/databinding/observable/list/IObservableList<TM;>;)Lorg/eclipse/core/databinding/UpdateListStrategy<TT;TM;>;
- <T:Ljava/lang/Object;M:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TT;>;Lorg/eclipse/core/databinding/observable/list/IObservableList<TM;>;)Lorg/eclipse/core/databinding/UpdateListStrategy<TT;TM;>;
+ <T:Ljava/lang/Object;M:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TT;>;Lorg/eclipse/core/databinding/observable/list/IObservableList<TM;>;)L1org/eclipse/core/databinding/UpdateListStrategy<TT;TM;>;
 createTargetToModelUpdateSetStrategy
  <T:Ljava/lang/Object;M:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TT;>;Lorg/eclipse/core/databinding/observable/set/IObservableSet<TM;>;)Lorg/eclipse/core/databinding/UpdateSetStrategy<TT;TM;>;
- <T:Ljava/lang/Object;M:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TT;>;Lorg/eclipse/core/databinding/observable/set/IObservableSet<TM;>;)Lorg/eclipse/core/databinding/UpdateSetStrategy<TT;TM;>;
+ <T:Ljava/lang/Object;M:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TT;>;Lorg/eclipse/core/databinding/observable/set/IObservableSet<TM;>;)L1org/eclipse/core/databinding/UpdateSetStrategy<TT;TM;>;
 createTargetToModelUpdateValueStrategy
  <T:Ljava/lang/Object;M:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;)Lorg/eclipse/core/databinding/UpdateValueStrategy<TT;TM;>;
- <T:Ljava/lang/Object;M:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;)Lorg/eclipse/core/databinding/UpdateValueStrategy<TT;TM;>;
+ <T:Ljava/lang/Object;M:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;)L1org/eclipse/core/databinding/UpdateValueStrategy<TT;TM;>;
 getBindings
  ()Lorg/eclipse/core/databinding/observable/list/IObservableList<Lorg/eclipse/core/databinding/Binding;>;
  ()Lorg/eclipse/core/databinding/observable/list/IObservableList<Lorg/eclipse/core/databinding/Binding;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/UpdateListStrategy.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/UpdateListStrategy.eea
index b46c011301..647bc760a5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/UpdateListStrategy.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/UpdateListStrategy.eea
@@ -8,7 +8,7 @@ super org/eclipse/core/databinding/UpdateStrategy
 
 create
  <S:Ljava/lang/Object;D:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/conversion/IConverter<TS;TD;>;)Lorg/eclipse/core/databinding/UpdateListStrategy<TS;TD;>;
- <S:Ljava/lang/Object;D:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/conversion/IConverter<TS;TD;>;)Lorg/eclipse/core/databinding/UpdateListStrategy<TS;TD;>;
+ <S:Ljava/lang/Object;D:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/conversion/IConverter<TS;TD;>;)L1org/eclipse/core/databinding/UpdateListStrategy<TS;TD;>;
 never
  <S:Ljava/lang/Object;D:Ljava/lang/Object;>()Lorg/eclipse/core/databinding/UpdateListStrategy<TS;TD;>;
  <S:Ljava/lang/Object;D:Ljava/lang/Object;>()Lorg/eclipse/core/databinding/UpdateListStrategy<TS;TD;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/UpdateSetStrategy.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/UpdateSetStrategy.eea
index 35ee5d4d91..3f3573238d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/UpdateSetStrategy.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/UpdateSetStrategy.eea
@@ -8,7 +8,7 @@ super org/eclipse/core/databinding/UpdateStrategy
 
 create
  <S:Ljava/lang/Object;D:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/conversion/IConverter<TS;TD;>;)Lorg/eclipse/core/databinding/UpdateSetStrategy<TS;TD;>;
- <S:Ljava/lang/Object;D:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/conversion/IConverter<TS;TD;>;)Lorg/eclipse/core/databinding/UpdateSetStrategy<TS;TD;>;
+ <S:Ljava/lang/Object;D:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/conversion/IConverter<TS;TD;>;)L1org/eclipse/core/databinding/UpdateSetStrategy<TS;TD;>;
 never
  <S:Ljava/lang/Object;D:Ljava/lang/Object;>()Lorg/eclipse/core/databinding/UpdateSetStrategy<TS;TD;>;
  <S:Ljava/lang/Object;D:Ljava/lang/Object;>()Lorg/eclipse/core/databinding/UpdateSetStrategy<TS;TD;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/UpdateValueStrategy.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/UpdateValueStrategy.eea
index d42a67e92b..db64dce227 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/UpdateValueStrategy.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/UpdateValueStrategy.eea
@@ -8,7 +8,7 @@ super org/eclipse/core/databinding/UpdateStrategy
 
 create
  <S:Ljava/lang/Object;D:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/conversion/IConverter<TS;TD;>;)Lorg/eclipse/core/databinding/UpdateValueStrategy<TS;TD;>;
- <S:Ljava/lang/Object;D:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/conversion/IConverter<TS;TD;>;)Lorg/eclipse/core/databinding/UpdateValueStrategy<TS;TD;>;
+ <S:Ljava/lang/Object;D:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/conversion/IConverter<TS;TD;>;)L1org/eclipse/core/databinding/UpdateValueStrategy<TS;TD;>;
 never
  <S:Ljava/lang/Object;D:Ljava/lang/Object;>()Lorg/eclipse/core/databinding/UpdateValueStrategy<TS;TD;>;
  <S:Ljava/lang/Object;D:Ljava/lang/Object;>()Lorg/eclipse/core/databinding/UpdateValueStrategy<TS;TD;>;
@@ -25,7 +25,7 @@ beforeSetValidator
 
 createValidator
  (Ljava/lang/Object;Ljava/lang/Object;)Lorg/eclipse/core/databinding/validation/IValidator<TS;>;
- (Ljava/lang/Object;Ljava/lang/Object;)Lorg/eclipse/core/databinding/validation/IValidator<TS;>;
+ (Ljava/lang/Object;Ljava/lang/Object;)L1org/eclipse/core/databinding/validation/IValidator<TS;>;
 doSet
  (Lorg/eclipse/core/databinding/observable/value/IObservableValue<-TD;>;TD;)Lorg/eclipse/core/runtime/IStatus;
  (Lorg/eclipse/core/databinding/observable/value/IObservableValue<-TD;>;TD;)Lorg/eclipse/core/runtime/IStatus;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/conversion/IConverter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/conversion/IConverter.eea
index 56171da44a..106ef260ac 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/conversion/IConverter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/conversion/IConverter.eea
@@ -4,10 +4,10 @@ class org/eclipse/core/databinding/conversion/IConverter
 
 create
  <F:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Object;Ljava/util/function/Function<TF;TT;>;)Lorg/eclipse/core/databinding/conversion/IConverter<TF;TT;>;
- <F:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Object;Ljava/util/function/Function<TF;TT;>;)Lorg/eclipse/core/databinding/conversion/IConverter<TF;TT;>;
+ <F:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Object;Ljava/util/function/Function<TF;TT;>;)L1org/eclipse/core/databinding/conversion/IConverter<TF;TT;>;
 create
  <F:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/util/function/Function<TF;TT;>;)Lorg/eclipse/core/databinding/conversion/IConverter<TF;TT;>;
- <F:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/util/function/Function<TF;TT;>;)Lorg/eclipse/core/databinding/conversion/IConverter<TF;TT;>;
+ <F:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/util/function/Function<TF;TT;>;)L1org/eclipse/core/databinding/conversion/IConverter<TF;TT;>;
 
 convert
  (TF;)TT;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/conversion/text/NumberToStringConverter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/conversion/text/NumberToStringConverter.eea
index 788369d4c9..54f81685c1 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/conversion/text/NumberToStringConverter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/conversion/text/NumberToStringConverter.eea
@@ -5,13 +5,13 @@ fromBigDecimal
  ()Lorg/eclipse/core/databinding/conversion/text/NumberToStringConverter;
 fromBigDecimal
  (Ljava/text/Format;)Lorg/eclipse/core/databinding/conversion/text/NumberToStringConverter;
- (Ljava/text/Format;)Lorg/eclipse/core/databinding/conversion/text/NumberToStringConverter;
+ (Ljava/text/Format;)L1org/eclipse/core/databinding/conversion/text/NumberToStringConverter;
 fromBigInteger
  ()Lorg/eclipse/core/databinding/conversion/text/NumberToStringConverter;
  ()Lorg/eclipse/core/databinding/conversion/text/NumberToStringConverter;
 fromBigInteger
  (Ljava/text/Format;)Lorg/eclipse/core/databinding/conversion/text/NumberToStringConverter;
- (Ljava/text/Format;)Lorg/eclipse/core/databinding/conversion/text/NumberToStringConverter;
+ (Ljava/text/Format;)L1org/eclipse/core/databinding/conversion/text/NumberToStringConverter;
 fromByte
  (Ljava/text/Format;Z)Lorg/eclipse/core/databinding/conversion/text/NumberToStringConverter;
  (Ljava/text/Format;Z)Lorg/eclipse/core/databinding/conversion/text/NumberToStringConverter;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/conversion/text/StringToNumberConverter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/conversion/text/StringToNumberConverter.eea
index 5692c89977..da5e78610d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/conversion/text/StringToNumberConverter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/conversion/text/StringToNumberConverter.eea
@@ -11,13 +11,13 @@ toBigDecimal
  ()Lorg/eclipse/core/databinding/conversion/text/StringToNumberConverter<Ljava/math/BigDecimal;>;
 toBigDecimal
  (Ljava/text/Format;)Lorg/eclipse/core/databinding/conversion/text/StringToNumberConverter<Ljava/math/BigDecimal;>;
- (Ljava/text/Format;)Lorg/eclipse/core/databinding/conversion/text/StringToNumberConverter<Ljava/math/BigDecimal;>;
+ (Ljava/text/Format;)L1org/eclipse/core/databinding/conversion/text/StringToNumberConverter<Ljava/math/BigDecimal;>;
 toBigInteger
  ()Lorg/eclipse/core/databinding/conversion/text/StringToNumberConverter<Ljava/math/BigInteger;>;
  ()Lorg/eclipse/core/databinding/conversion/text/StringToNumberConverter<Ljava/math/BigInteger;>;
 toBigInteger
  (Ljava/text/Format;)Lorg/eclipse/core/databinding/conversion/text/StringToNumberConverter<Ljava/math/BigInteger;>;
- (Ljava/text/Format;)Lorg/eclipse/core/databinding/conversion/text/StringToNumberConverter<Ljava/math/BigInteger;>;
+ (Ljava/text/Format;)L1org/eclipse/core/databinding/conversion/text/StringToNumberConverter<Ljava/math/BigInteger;>;
 toByte
  (Ljava/text/Format;Z)Lorg/eclipse/core/databinding/conversion/text/StringToNumberConverter<Ljava/lang/Byte;>;
  (Ljava/text/Format;Z)Lorg/eclipse/core/databinding/conversion/text/StringToNumberConverter<Ljava/lang/Byte;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/Diffs.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/Diffs.eea
index de1cca0ff6..831a8e8d92 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/Diffs.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/Diffs.eea
@@ -2,58 +2,58 @@ class org/eclipse/core/databinding/observable/Diffs
 
 computeLazyListDiff
  <E:Ljava/lang/Object;>(Ljava/util/List<+TE;>;Ljava/util/List<+TE;>;)Lorg/eclipse/core/databinding/observable/list/ListDiff<TE;>;
- <E:Ljava/lang/Object;>(Ljava/util/List<+TE;>;Ljava/util/List<+TE;>;)Lorg/eclipse/core/databinding/observable/list/ListDiff<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/util/List<+TE;>;Ljava/util/List<+TE;>;)L1org/eclipse/core/databinding/observable/list/ListDiff<TE;>;
 computeLazyMapDiff
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<+TK;+TV;>;Ljava/util/Map<+TK;+TV;>;)Lorg/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<+TK;+TV;>;Ljava/util/Map<+TK;+TV;>;)Lorg/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<+TK;+TV;>;Ljava/util/Map<+TK;+TV;>;)L1org/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;
 computeLazySetDiff
  <E:Ljava/lang/Object;>(Ljava/util/Set<+TE;>;Ljava/util/Set<+TE;>;)Lorg/eclipse/core/databinding/observable/set/SetDiff<TE;>;
- <E:Ljava/lang/Object;>(Ljava/util/Set<+TE;>;Ljava/util/Set<+TE;>;)Lorg/eclipse/core/databinding/observable/set/SetDiff<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/util/Set<+TE;>;Ljava/util/Set<+TE;>;)L1org/eclipse/core/databinding/observable/set/SetDiff<TE;>;
 computeListDiff
  <E:Ljava/lang/Object;>(Ljava/util/List<+TE;>;Ljava/util/List<+TE;>;)Lorg/eclipse/core/databinding/observable/list/ListDiff<TE;>;
  <E:Ljava/lang/Object;>(Ljava/util/List<+TE;>;Ljava/util/List<+TE;>;)Lorg/eclipse/core/databinding/observable/list/ListDiff<TE;>;
 computeMapDiff
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<+TK;+TV;>;Ljava/util/Map<+TK;+TV;>;)Lorg/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<+TK;+TV;>;Ljava/util/Map<+TK;+TV;>;)Lorg/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<+TK;+TV;>;Ljava/util/Map<+TK;+TV;>;)L1org/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;
 computeSetDiff
  <E:Ljava/lang/Object;>(Ljava/util/Set<+TE;>;Ljava/util/Set<+TE;>;)Lorg/eclipse/core/databinding/observable/set/SetDiff<TE;>;
  <E:Ljava/lang/Object;>(Ljava/util/Set<+TE;>;Ljava/util/Set<+TE;>;)Lorg/eclipse/core/databinding/observable/set/SetDiff<TE;>;
 createListDiff
  <E:Ljava/lang/Object;>(Ljava/util/List<Lorg/eclipse/core/databinding/observable/list/ListDiffEntry<TE;>;>;)Lorg/eclipse/core/databinding/observable/list/ListDiff<TE;>;
- <E:Ljava/lang/Object;>(Ljava/util/List<Lorg/eclipse/core/databinding/observable/list/ListDiffEntry<TE;>;>;)Lorg/eclipse/core/databinding/observable/list/ListDiff<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/util/List<Lorg/eclipse/core/databinding/observable/list/ListDiffEntry<TE;>;>;)L1org/eclipse/core/databinding/observable/list/ListDiff<TE;>;
 createListDiff
  <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/ListDiffEntry<TE;>;)Lorg/eclipse/core/databinding/observable/list/ListDiff<TE;>;
- <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/ListDiffEntry<TE;>;)Lorg/eclipse/core/databinding/observable/list/ListDiff<TE;>;
+ <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/ListDiffEntry<TE;>;)L1org/eclipse/core/databinding/observable/list/ListDiff<TE;>;
 createListDiff
  <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/ListDiffEntry<TE;>;Lorg/eclipse/core/databinding/observable/list/ListDiffEntry<TE;>;)Lorg/eclipse/core/databinding/observable/list/ListDiff<TE;>;
- <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/ListDiffEntry<TE;>;Lorg/eclipse/core/databinding/observable/list/ListDiffEntry<TE;>;)Lorg/eclipse/core/databinding/observable/list/ListDiff<TE;>;
+ <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/ListDiffEntry<TE;>;Lorg/eclipse/core/databinding/observable/list/ListDiffEntry<TE;>;)L1org/eclipse/core/databinding/observable/list/ListDiff<TE;>;
 createListDiff
  <E:Ljava/lang/Object;>([Lorg/eclipse/core/databinding/observable/list/ListDiffEntry<TE;>;)Lorg/eclipse/core/databinding/observable/list/ListDiff<TE;>;
- <E:Ljava/lang/Object;>([Lorg/eclipse/core/databinding/observable/list/ListDiffEntry<TE;>;)Lorg/eclipse/core/databinding/observable/list/ListDiff<TE;>;
+ <E:Ljava/lang/Object;>([Lorg/eclipse/core/databinding/observable/list/ListDiffEntry<TE;>;)L1org/eclipse/core/databinding/observable/list/ListDiff<TE;>;
 createListDiffEntry
  <E:Ljava/lang/Object;>(IZTE;)Lorg/eclipse/core/databinding/observable/list/ListDiffEntry<TE;>;
- <E:Ljava/lang/Object;>(IZTE;)Lorg/eclipse/core/databinding/observable/list/ListDiffEntry<TE;>;
+ <E:Ljava/lang/Object;>(IZTE;)L1org/eclipse/core/databinding/observable/list/ListDiffEntry<TE;>;
 createMapDiff
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Set<+TK;>;Ljava/util/Set<+TK;>;Ljava/util/Set<+TK;>;Ljava/util/Map<+TK;+TV;>;Ljava/util/Map<+TK;+TV;>;)Lorg/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Set<+TK;>;Ljava/util/Set<+TK;>;Ljava/util/Set<+TK;>;Ljava/util/Map<+TK;+TV;>;Ljava/util/Map<+TK;+TV;>;)Lorg/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Set<+TK;>;Ljava/util/Set<+TK;>;Ljava/util/Set<+TK;>;Ljava/util/Map<+TK;+TV;>;Ljava/util/Map<+TK;+TV;>;)L1org/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;
 createMapDiffRemoveAll
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;TV;>;)Lorg/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;TV;>;)Lorg/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;TV;>;)L1org/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;
 createMapDiffSingleAdd
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;)Lorg/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;)Lorg/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;)L1org/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;
 createMapDiffSingleChange
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TV;)Lorg/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TV;)Lorg/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TV;)L1org/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;
 createMapDiffSingleRemove
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;)Lorg/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;)Lorg/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;)L1org/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;
 createSetDiff
  <E:Ljava/lang/Object;>(Ljava/util/Set<+TE;>;Ljava/util/Set<+TE;>;)Lorg/eclipse/core/databinding/observable/set/SetDiff<TE;>;
- <E:Ljava/lang/Object;>(Ljava/util/Set<+TE;>;Ljava/util/Set<+TE;>;)Lorg/eclipse/core/databinding/observable/set/SetDiff<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/util/Set<+TE;>;Ljava/util/Set<+TE;>;)L1org/eclipse/core/databinding/observable/set/SetDiff<TE;>;
 createValueDiff
  <T:Ljava/lang/Object;>(TT;TT;)Lorg/eclipse/core/databinding/observable/value/ValueDiff<TT;>;
- <T:Ljava/lang/Object;>(TT;TT;)Lorg/eclipse/core/databinding/observable/value/ValueDiff<TT;>;
+ <T:Ljava/lang/Object;>(TT;TT;)L1org/eclipse/core/databinding/observable/value/ValueDiff<TT;>;
 equals
  (Ljava/lang/Object;Ljava/lang/Object;)Z
  (Ljava/lang/Object;Ljava/lang/Object;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/Observables.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/Observables.eea
index 0859f92e05..d5db462242 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/Observables.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/Observables.eea
@@ -5,7 +5,7 @@ constantObservableValue
  <T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/Realm;TT;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
 constantObservableValue
  <T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/Realm;TT;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
- <T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/Realm;TT;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
+ <T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/Realm;TT;Ljava/lang/Object;)L1org/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
 constantObservableValue
  <T:Ljava/lang/Object;>(TT;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
  <T:Ljava/lang/Object;>(TT;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
@@ -23,7 +23,7 @@ emptyObservableList
  <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/Realm;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;
 emptyObservableList
  <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/Realm;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;
- <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/Realm;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;
+ <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/Realm;Ljava/lang/Object;)L1org/eclipse/core/databinding/observable/list/IObservableList<TE;>;
 emptyObservableSet
  <E:Ljava/lang/Object;>()Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
  <E:Ljava/lang/Object;>()Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
@@ -35,13 +35,13 @@ emptyObservableSet
  <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/Realm;)Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
 emptyObservableSet
  <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/Realm;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
- <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/Realm;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
+ <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/Realm;Ljava/lang/Object;)L1org/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
 mapEntryValueFactory
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<TK;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TV;>;>;
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<TK;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TV;>;>;
 observeDelayedValue
  <T:Ljava/lang/Object;>(ILorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
- <T:Ljava/lang/Object;>(ILorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
+ <T:Ljava/lang/Object;>(ILorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;)L1org/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
 observeDetailMapEntry
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TK;>;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TV;>;
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TK;>;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TV;>;
@@ -50,10 +50,10 @@ observeMapEntry
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;TK;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TV;>;
 observeMapEntry
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;TK;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;TK;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;TK;Ljava/lang/Object;)L1org/eclipse/core/databinding/observable/value/IObservableValue<TV;>;
 observeStale
  (Lorg/eclipse/core/databinding/observable/IObservable;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<Ljava/lang/Boolean;>;
- (Lorg/eclipse/core/databinding/observable/IObservable;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<Ljava/lang/Boolean;>;
+ (Lorg/eclipse/core/databinding/observable/IObservable;)L1org/eclipse/core/databinding/observable/value/IObservableValue<Ljava/lang/Boolean;>;
 pipe
  <T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;Lorg/eclipse/core/databinding/observable/value/IObservableValue<-TT;>;)V
  <T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;Lorg/eclipse/core/databinding/observable/value/IObservableValue<-TT;>;)V
@@ -80,7 +80,7 @@ staticObservableList
  <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/Realm;Ljava/util/List<TE;>;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;
 staticObservableList
  <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/Realm;Ljava/util/List<TE;>;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;
- <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/Realm;Ljava/util/List<TE;>;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;
+ <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/Realm;Ljava/util/List<TE;>;Ljava/lang/Object;)L1org/eclipse/core/databinding/observable/list/IObservableList<TE;>;
 staticObservableSet
  <E:Ljava/lang/Object;>(Ljava/util/Set<TE;>;)Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
  <E:Ljava/lang/Object;>(Ljava/util/Set<TE;>;)Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
@@ -92,16 +92,16 @@ staticObservableSet
  <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/Realm;Ljava/util/Set<TE;>;)Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
 staticObservableSet
  <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/Realm;Ljava/util/Set<TE;>;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
- <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/Realm;Ljava/util/Set<TE;>;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
+ <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/Realm;Ljava/util/Set<TE;>;Ljava/lang/Object;)L1org/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
 unmodifiableObservableList
  <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;
- <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;
+ <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;)L1org/eclipse/core/databinding/observable/list/IObservableList<TE;>;
 unmodifiableObservableMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;)Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;)Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;)L1org/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;
 unmodifiableObservableSet
  <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;)Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
- <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;)Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
+ <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;)L1org/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
 unmodifiableObservableValue
  <T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
- <T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
+ <T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;)L1org/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/list/ComputedList.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/list/ComputedList.eea
index b61c8571b8..daf9c56e32 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/list/ComputedList.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/list/ComputedList.eea
@@ -8,7 +8,7 @@ super org/eclipse/core/databinding/observable/list/AbstractObservableList
 
 create
  <E:Ljava/lang/Object;>(Ljava/util/function/Supplier<Ljava/util/List<TE;>;>;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;
- <E:Ljava/lang/Object;>(Ljava/util/function/Supplier<Ljava/util/List<TE;>;>;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/util/function/Supplier<Ljava/util/List<TE;>;>;)L1org/eclipse/core/databinding/observable/list/IObservableList<TE;>;
 
 <init>
  (Ljava/lang/Object;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/list/MultiList.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/list/MultiList.eea
index 8160571061..edb2c03011 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/list/MultiList.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/list/MultiList.eea
@@ -65,10 +65,10 @@ listIterator
  (I)L1java/util/ListIterator<TE;>; # @Inherited(java.util.AbstractList)
 move
  (II)TE;
- (II)TE;
+ (II)T1E;
 remove
  (I)TE;
- (I)TE;
+ (I)T1E; # @Inherited(java.util.AbstractList)
 remove
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
@@ -80,4 +80,4 @@ retainAll
  (L1java/util/Collection<*>;)Z # @Inherited(org.eclipse.core.databinding.observable.list.AbstractObservableList)
 set
  (ITE;)TE;
- (ITE;)TE;
+ (ITE;)T1E; # @Inherited(java.util.AbstractList)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/list/ObservableList.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/list/ObservableList.eea
index aa4ab55a29..f6b622f950 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/list/ObservableList.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/list/ObservableList.eea
@@ -69,7 +69,7 @@ move
  (II)TE;
 remove
  (I)TE;
- (I)TE;
+ (I)T1E;
 remove
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
@@ -84,7 +84,7 @@ retainAll
  (L1java/util/Collection<*>;)Z # @Inherited(org.eclipse.core.databinding.observable.list.IObservableList)
 set
  (ITE;)TE;
- (ITE;)TE;
+ (ITE;)T1E;
 subList
  (II)Ljava/util/List<TE;>;
  (II)L1java/util/List<TE;>; # @Inherited(org.eclipse.core.databinding.observable.list.IObservableList)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/list/WritableList.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/list/WritableList.eea
index 344ef47f3d..28f4326a88 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/list/WritableList.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/list/WritableList.eea
@@ -8,7 +8,7 @@ super org/eclipse/core/databinding/observable/list/ObservableList
 
 withElementType
  <T:Ljava/lang/Object;>(Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/list/WritableList<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/list/WritableList<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Object;)L1org/eclipse/core/databinding/observable/list/WritableList<TT;>;
 
 <init>
  (Ljava/util/Collection<TE;>;Ljava/lang/Object;)V
@@ -42,7 +42,7 @@ move
  (II)TE;
 remove
  (I)TE;
- (I)TE;
+ (I)T1E; # @Inherited(org.eclipse.core.databinding.observable.list.ObservableList)
 remove
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
@@ -54,4 +54,4 @@ retainAll
  (L1java/util/Collection<*>;)Z # @Inherited(org.eclipse.core.databinding.observable.list.ObservableList)
 set
  (ITE;)TE;
- (ITE;)TE;
+ (ITE;)T1E; # @Inherited(org.eclipse.core.databinding.observable.list.ObservableList)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/map/AbstractObservableMap.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/map/AbstractObservableMap.eea
index 9f64b5ee94..c81712a2f7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/map/AbstractObservableMap.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/map/AbstractObservableMap.eea
@@ -29,13 +29,13 @@ fireMapChange
  (Lorg/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;)V
 getKeyType
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getRealm
  ()Lorg/eclipse/core/databinding/observable/Realm;
  ()Lorg/eclipse/core/databinding/observable/Realm;
 getValueType
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 removeChangeListener
  (Lorg/eclipse/core/databinding/observable/IChangeListener;)V
  (L1org/eclipse/core/databinding/observable/IChangeListener;)V # @Inherited(org.eclipse.core.databinding.observable.IObservable)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/map/CompositeMap.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/map/CompositeMap.eea
index 25a5f47019..bbed34c388 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/map/CompositeMap.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/map/CompositeMap.eea
@@ -11,7 +11,7 @@ super org/eclipse/core/databinding/observable/map/ObservableMap
  (Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TI;>;Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<-Lorg/eclipse/core/databinding/observable/set/IObservableSet<TI;>;+Lorg/eclipse/core/databinding/observable/map/IObservableMap<TI;TV;>;>;)V
 getKeyType
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(org.eclipse.core.databinding.observable.map.ObservableMap)
 getValueType
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(org.eclipse.core.databinding.observable.map.ObservableMap)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/map/ComputedObservableMap.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/map/ComputedObservableMap.eea
index fb8f62ed98..8f887cf666 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/map/ComputedObservableMap.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/map/ComputedObservableMap.eea
@@ -32,10 +32,10 @@ get
  (Ljava/lang/Object;)T0V; # @Inherited(java.util.AbstractMap)
 getKeyType
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(org.eclipse.core.databinding.observable.map.AbstractObservableMap)
 getValueType
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(org.eclipse.core.databinding.observable.map.AbstractObservableMap)
 hookListener
  (TK;)V
  (TK;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/map/MapDiff.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/map/MapDiff.eea
index 0c57c03362..d97038a8c3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/map/MapDiff.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/map/MapDiff.eea
@@ -22,4 +22,4 @@ getRemovedKeys
  ()Ljava/util/Set<TK;>;
 simulateOn
  (Ljava/util/Map<TK;TV;>;)Ljava/util/Map<TK;TV;>;
- (Ljava/util/Map<TK;TV;>;)Ljava/util/Map<TK;TV;>;
+ (Ljava/util/Map<TK;TV;>;)L1java/util/Map<TK;TV;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/map/ObservableMap.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/map/ObservableMap.eea
index 0152324122..b9a62e6142 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/map/ObservableMap.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/map/ObservableMap.eea
@@ -39,10 +39,10 @@ get
  (Ljava/lang/Object;)T0V; # @Inherited(org.eclipse.core.databinding.observable.map.IObservableMap)
 getKeyType
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getValueType
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 keySet
  ()Ljava/util/Set<TK;>;
  ()L1java/util/Set<TK;>; # @Inherited(org.eclipse.core.databinding.observable.map.IObservableMap)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/map/WritableMap.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/map/WritableMap.eea
index 7440242ce1..481fac7de7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/map/WritableMap.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/map/WritableMap.eea
@@ -17,10 +17,10 @@ super org/eclipse/core/databinding/observable/map/ObservableMap
  (Lorg/eclipse/core/databinding/observable/Realm;Ljava/lang/Object;Ljava/lang/Object;)V
 getKeyType
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(org.eclipse.core.databinding.observable.map.ObservableMap)
 getValueType
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(org.eclipse.core.databinding.observable.map.ObservableMap)
 put
  (TK;TV;)TV;
  (TK;TV;)T0V; # @Inherited(org.eclipse.core.databinding.observable.map.ObservableMap)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/masterdetail/IObservableFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/masterdetail/IObservableFactory.eea
index 0c6ae2505b..bf347f9edd 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/masterdetail/IObservableFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/masterdetail/IObservableFactory.eea
@@ -4,4 +4,4 @@ class org/eclipse/core/databinding/observable/masterdetail/IObservableFactory
 
 createObservable
  (TT;)TE;
- (TT;)TE;
+ (TT;)T1E;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/masterdetail/MasterDetailObservables.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/masterdetail/MasterDetailObservables.eea
index 1e0dba08ff..c298940f68 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/masterdetail/MasterDetailObservables.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/masterdetail/MasterDetailObservables.eea
@@ -2,25 +2,25 @@ class org/eclipse/core/databinding/observable/masterdetail/MasterDetailObservabl
 
 detailList
  <M:Ljava/lang/Object;E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<-TM;Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;>;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;
- <M:Ljava/lang/Object;E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<-TM;Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;>;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;
+ <M:Ljava/lang/Object;E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<-TM;Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;>;Ljava/lang/Object;)L1org/eclipse/core/databinding/observable/list/IObservableList<TE;>;
 detailMap
  <M:Ljava/lang/Object;K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<-TM;Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;>;Ljava/lang/Object;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;
- <M:Ljava/lang/Object;K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<-TM;Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;>;Ljava/lang/Object;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;
+ <M:Ljava/lang/Object;K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<-TM;Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;>;Ljava/lang/Object;Ljava/lang/Object;)L1org/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;
 detailMap
  <M:Ljava/lang/Object;K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<TM;Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;>;)Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;
  <M:Ljava/lang/Object;K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<TM;Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;>;)Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;
 detailSet
  <M:Ljava/lang/Object;E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<-TM;+Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;>;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
- <M:Ljava/lang/Object;E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<-TM;+Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;>;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
+ <M:Ljava/lang/Object;E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<-TM;+Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;>;Ljava/lang/Object;)L1org/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
 detailValue
  <M:Ljava/lang/Object;T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<-TM;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;>;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
- <M:Ljava/lang/Object;T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<-TM;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;>;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
+ <M:Ljava/lang/Object;T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<-TM;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;>;Ljava/lang/Object;)L1org/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
 detailValues
  <K:Ljava/lang/Object;M:Ljava/lang/Object;E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TM;>;Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<-TM;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TE;>;>;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TE;>;
- <K:Ljava/lang/Object;M:Ljava/lang/Object;E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TM;>;Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<-TM;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TE;>;>;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TE;>;
+ <K:Ljava/lang/Object;M:Ljava/lang/Object;E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TM;>;Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<-TM;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TE;>;>;Ljava/lang/Object;)L1org/eclipse/core/databinding/observable/map/IObservableMap<TK;TE;>;
 detailValues
  <M:Ljava/lang/Object;E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TM;>;Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<-TM;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TE;>;>;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;
- <M:Ljava/lang/Object;E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TM;>;Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<-TM;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TE;>;>;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;
+ <M:Ljava/lang/Object;E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TM;>;Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<-TM;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TE;>;>;Ljava/lang/Object;)L1org/eclipse/core/databinding/observable/list/IObservableList<TE;>;
 detailValues
  <M:Ljava/lang/Object;E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TM;>;Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<-TM;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TE;>;>;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/map/IObservableMap<TM;TE;>;
- <M:Ljava/lang/Object;E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TM;>;Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<-TM;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TE;>;>;Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/map/IObservableMap<TM;TE;>;
+ <M:Ljava/lang/Object;E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TM;>;Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<-TM;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TE;>;>;Ljava/lang/Object;)L1org/eclipse/core/databinding/observable/map/IObservableMap<TM;TE;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/set/ComputedSet.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/set/ComputedSet.eea
index 115f522e93..80b0ea9932 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/set/ComputedSet.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/set/ComputedSet.eea
@@ -8,7 +8,7 @@ super org/eclipse/core/databinding/observable/set/AbstractObservableSet
 
 create
  <E:Ljava/lang/Object;>(Ljava/util/function/Supplier<Ljava/util/Set<TE;>;>;)Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
- <E:Ljava/lang/Object;>(Ljava/util/function/Supplier<Ljava/util/Set<TE;>;>;)Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/util/function/Supplier<Ljava/util/Set<TE;>;>;)L1org/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
 
 <init>
  (Ljava/lang/Object;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/set/SetDiff.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/set/SetDiff.eea
index 3f695a68ce..0d8045c612 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/set/SetDiff.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/set/SetDiff.eea
@@ -13,7 +13,7 @@ getRemovals
  ()Ljava/util/Set<TE;>;
 simulateOn
  (Ljava/util/Set<TE;>;)Ljava/util/Set<TE;>;
- (Ljava/util/Set<TE;>;)Ljava/util/Set<TE;>;
+ (Ljava/util/Set<TE;>;)L1java/util/Set<TE;>;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/set/WritableSet.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/set/WritableSet.eea
index e5ecdd79ac..3409715f5d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/set/WritableSet.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/set/WritableSet.eea
@@ -8,7 +8,7 @@ super org/eclipse/core/databinding/observable/set/ObservableSet
 
 withElementType
  <E:Ljava/lang/Object;>(Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/set/WritableSet<TE;>;
- <E:Ljava/lang/Object;>(Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/set/WritableSet<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/lang/Object;)L1org/eclipse/core/databinding/observable/set/WritableSet<TE;>;
 
 <init>
  (Ljava/util/Collection<+TE;>;Ljava/lang/Object;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/sideeffect/ISideEffect.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/sideeffect/ISideEffect.eea
index 0a36ff56d0..b8d110bb48 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/sideeffect/ISideEffect.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/sideeffect/ISideEffect.eea
@@ -5,19 +5,19 @@ consumeOnceAsync
  <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;Ljava/util/function/Consumer<TT;>;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;
 create
  (Ljava/lang/Runnable;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;
- (Ljava/lang/Runnable;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;
+ (Ljava/lang/Runnable;)L1org/eclipse/core/databinding/observable/sideeffect/ISideEffect;
 create
  <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;Ljava/util/function/Consumer<TT;>;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;
- <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;Ljava/util/function/Consumer<TT;>;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;
+ <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;Ljava/util/function/Consumer<TT;>;)L1org/eclipse/core/databinding/observable/sideeffect/ISideEffect;
 createPaused
  (Ljava/lang/Runnable;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;
- (Ljava/lang/Runnable;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;
+ (Ljava/lang/Runnable;)L1org/eclipse/core/databinding/observable/sideeffect/ISideEffect;
 createPaused
  (Lorg/eclipse/core/databinding/observable/Realm;Ljava/lang/Runnable;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;
- (Lorg/eclipse/core/databinding/observable/Realm;Ljava/lang/Runnable;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;
+ (Lorg/eclipse/core/databinding/observable/Realm;Ljava/lang/Runnable;)L1org/eclipse/core/databinding/observable/sideeffect/ISideEffect;
 createResumed
  <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;Ljava/util/function/Consumer<TT;>;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;
- <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;Ljava/util/function/Consumer<TT;>;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;
+ <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;Ljava/util/function/Consumer<TT;>;)L1org/eclipse/core/databinding/observable/sideeffect/ISideEffect;
 
 addDisposeListener
  (Ljava/util/function/Consumer<Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;>;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/sideeffect/ISideEffectFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/sideeffect/ISideEffectFactory.eea
index 5ce7de2e9b..125591c7de 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/sideeffect/ISideEffectFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/sideeffect/ISideEffectFactory.eea
@@ -2,23 +2,23 @@ class org/eclipse/core/databinding/observable/sideeffect/ISideEffectFactory
 
 createFactory
  (Ljava/util/function/Consumer<Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;>;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffectFactory;
- (Ljava/util/function/Consumer<Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;>;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffectFactory;
+ (Ljava/util/function/Consumer<Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;>;)L1org/eclipse/core/databinding/observable/sideeffect/ISideEffectFactory;
 
 consumeOnceAsync
  <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;Ljava/util/function/Consumer<TT;>;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;
  <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;Ljava/util/function/Consumer<TT;>;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;
 create
  (Ljava/lang/Runnable;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;
- (Ljava/lang/Runnable;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;
+ (Ljava/lang/Runnable;)L1org/eclipse/core/databinding/observable/sideeffect/ISideEffect;
 create
  <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;Ljava/util/function/Consumer<TT;>;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;
- <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;Ljava/util/function/Consumer<TT;>;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;
+ <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;Ljava/util/function/Consumer<TT;>;)L1org/eclipse/core/databinding/observable/sideeffect/ISideEffect;
 createPaused
  (Ljava/lang/Runnable;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;
- (Ljava/lang/Runnable;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;
+ (Ljava/lang/Runnable;)L1org/eclipse/core/databinding/observable/sideeffect/ISideEffect;
 createPaused
  (Lorg/eclipse/core/databinding/observable/Realm;Ljava/lang/Runnable;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;
- (Lorg/eclipse/core/databinding/observable/Realm;Ljava/lang/Runnable;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;
+ (Lorg/eclipse/core/databinding/observable/Realm;Ljava/lang/Runnable;)L1org/eclipse/core/databinding/observable/sideeffect/ISideEffect;
 createResumed
  <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;Ljava/util/function/Consumer<TT;>;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;
- <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;Ljava/util/function/Consumer<TT;>;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffect;
+ <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;Ljava/util/function/Consumer<TT;>;)L1org/eclipse/core/databinding/observable/sideeffect/ISideEffect;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/value/ComputedValue.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/value/ComputedValue.eea
index c91943be13..1bdd493679 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/value/ComputedValue.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/value/ComputedValue.eea
@@ -8,7 +8,7 @@ super org/eclipse/core/databinding/observable/value/AbstractObservableValue
 
 create
  <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;)L1org/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
 
 <init>
  (Ljava/lang/Object;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/value/DateAndTimeObservableValue.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/value/DateAndTimeObservableValue.eea
index 00b0d8a611..a0c736234b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/value/DateAndTimeObservableValue.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/value/DateAndTimeObservableValue.eea
@@ -9,10 +9,10 @@ super org/eclipse/core/databinding/observable/value/AbstractObservableValue
  (Lorg/eclipse/core/databinding/observable/value/IObservableValue<Ljava/util/Date;>;Lorg/eclipse/core/databinding/observable/value/IObservableValue<Ljava/util/Date;>;)V
 doGetValue
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L0java/util/Date;
 doSetValue
  (Ljava/util/Date;)V
  (Ljava/util/Date;)V
 getValueType
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/value/DuplexingObservableValue.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/value/DuplexingObservableValue.eea
index d05e7de43e..313b287bb0 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/value/DuplexingObservableValue.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/value/DuplexingObservableValue.eea
@@ -8,7 +8,7 @@ super org/eclipse/core/databinding/observable/value/AbstractObservableValue
 
 withDefaults
  <T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TT;>;TT;TT;)Lorg/eclipse/core/databinding/observable/value/DuplexingObservableValue<TT;>;
- <T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TT;>;TT;TT;)Lorg/eclipse/core/databinding/observable/value/DuplexingObservableValue<TT;>;
+ <T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TT;>;TT;TT;)L1org/eclipse/core/databinding/observable/value/DuplexingObservableValue<TT;>;
 
 <init>
  (Lorg/eclipse/core/databinding/observable/list/IObservableList<TT;>;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/value/LocalDateTimeObservableValue.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/value/LocalDateTimeObservableValue.eea
index 55556fcdb8..870c19ea6c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/value/LocalDateTimeObservableValue.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/value/LocalDateTimeObservableValue.eea
@@ -9,10 +9,10 @@ super org/eclipse/core/databinding/observable/value/AbstractObservableValue
  (Lorg/eclipse/core/databinding/observable/value/IObservableValue<Ljava/time/LocalDate;>;Lorg/eclipse/core/databinding/observable/value/IObservableValue<Ljava/time/LocalTime;>;)V
 doGetValue
  ()Ljava/time/LocalDateTime;
- ()Ljava/time/LocalDateTime;
+ ()L0java/time/LocalDateTime;
 doSetValue
  (Ljava/time/LocalDateTime;)V
  (Ljava/time/LocalDateTime;)V
 getValueType
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/value/WritableValue.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/value/WritableValue.eea
index 092ccad18d..b5878c39c7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/value/WritableValue.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/observable/value/WritableValue.eea
@@ -8,7 +8,7 @@ super org/eclipse/core/databinding/observable/value/AbstractObservableValue
 
 withValueType
  <T2:Ljava/lang/Object;>(Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/value/WritableValue<TT2;>;
- <T2:Ljava/lang/Object;>(Ljava/lang/Object;)Lorg/eclipse/core/databinding/observable/value/WritableValue<TT2;>;
+ <T2:Ljava/lang/Object;>(Ljava/lang/Object;)L1org/eclipse/core/databinding/observable/value/WritableValue<TT2;>;
 
 <init>
  (Lorg/eclipse/core/databinding/observable/Realm;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/Properties.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/Properties.eea
index 28abe71e58..044ef6c84e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/Properties.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/Properties.eea
@@ -2,28 +2,28 @@ class org/eclipse/core/databinding/property/Properties
 
 convertedValue
  <S:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/util/function/Function<-TS;+TT;>;)Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;TT;>;
- <S:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/util/function/Function<-TS;+TT;>;)Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;TT;>;
+ <S:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/util/function/Function<-TS;+TT;>;)L1org/eclipse/core/databinding/property/value/IValueProperty<TS;TT;>;
 convertedValue
  <S:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/util/function/Function<-TS;+TT;>;)Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;TT;>;
  <S:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/util/function/Function<-TS;+TT;>;)Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;TT;>;
 observableValue
  <T:Ljava/lang/Object;>(Ljava/lang/Object;)Lorg/eclipse/core/databinding/property/value/IValueProperty<Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Object;)Lorg/eclipse/core/databinding/property/value/IValueProperty<Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Object;)L1org/eclipse/core/databinding/property/value/IValueProperty<Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;TT;>;
 observeEach
  <E:Ljava/lang/Object;P:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;[Lorg/eclipse/core/databinding/property/value/IValueProperty<-TE;+TP;>;)[Lorg/eclipse/core/databinding/observable/map/IObservableMap<TE;+TP;>;
- <E:Ljava/lang/Object;P:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;[Lorg/eclipse/core/databinding/property/value/IValueProperty<-TE;+TP;>;)[Lorg/eclipse/core/databinding/observable/map/IObservableMap<TE;+TP;>;
+ <E:Ljava/lang/Object;P:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;[Lorg/eclipse/core/databinding/property/value/IValueProperty<-TE;+TP;>;)[1Lorg/eclipse/core/databinding/observable/map/IObservableMap<TE;+TP;>;
 observeEach
  <K:Ljava/lang/Object;V:Ljava/lang/Object;P:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;[Lorg/eclipse/core/databinding/property/value/IValueProperty<-TV;+TP;>;)[Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;+TP;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;P:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;[Lorg/eclipse/core/databinding/property/value/IValueProperty<-TV;+TP;>;)[Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;+TP;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;P:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;[Lorg/eclipse/core/databinding/property/value/IValueProperty<-TV;+TP;>;)[1Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;+TP;>;
 selfList
  <E:Ljava/lang/Object;>(Ljava/lang/Object;)Lorg/eclipse/core/databinding/property/list/IListProperty<Ljava/util/List<TE;>;TE;>;
- <E:Ljava/lang/Object;>(Ljava/lang/Object;)Lorg/eclipse/core/databinding/property/list/IListProperty<Ljava/util/List<TE;>;TE;>;
+ <E:Ljava/lang/Object;>(Ljava/lang/Object;)L1org/eclipse/core/databinding/property/list/IListProperty<Ljava/util/List<TE;>;TE;>;
 selfMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Object;)Lorg/eclipse/core/databinding/property/map/IMapProperty<Ljava/util/Map<TK;TV;>;TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Object;)Lorg/eclipse/core/databinding/property/map/IMapProperty<Ljava/util/Map<TK;TV;>;TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Object;)L1org/eclipse/core/databinding/property/map/IMapProperty<Ljava/util/Map<TK;TV;>;TK;TV;>;
 selfSet
  <E:Ljava/lang/Object;>(Ljava/lang/Object;)Lorg/eclipse/core/databinding/property/set/ISetProperty<Ljava/util/Set<TE;>;TE;>;
- <E:Ljava/lang/Object;>(Ljava/lang/Object;)Lorg/eclipse/core/databinding/property/set/ISetProperty<Ljava/util/Set<TE;>;TE;>;
+ <E:Ljava/lang/Object;>(Ljava/lang/Object;)L1org/eclipse/core/databinding/property/set/ISetProperty<Ljava/util/Set<TE;>;TE;>;
 selfValue
  <T:Ljava/lang/Object;>(Ljava/lang/Object;)Lorg/eclipse/core/databinding/property/value/IValueProperty<TT;TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Object;)Lorg/eclipse/core/databinding/property/value/IValueProperty<TT;TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Object;)L1org/eclipse/core/databinding/property/value/IValueProperty<TT;TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/list/DelegatingListProperty.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/list/DelegatingListProperty.eea
index 159328b2b0..d5d1432774 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/list/DelegatingListProperty.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/list/DelegatingListProperty.eea
@@ -14,7 +14,7 @@ doGetDelegate
  (TS;)Lorg/eclipse/core/databinding/property/list/IListProperty<TS;TE;>;
 doGetList
  (TS;)Ljava/util/List<TE;>;
- (TS;)Ljava/util/List<TE;>;
+ (TS;)L1java/util/List<TE;>; # @Inherited(org.eclipse.core.databinding.property.list.ListProperty)
 doSetList
  (TS;Ljava/util/List<TE;>;)V
  (TS;Ljava/util/List<TE;>;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/list/ListProperty.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/list/ListProperty.eea
index 1afe5973e0..bbf184c123 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/list/ListProperty.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/list/ListProperty.eea
@@ -8,7 +8,7 @@ super org/eclipse/core/databinding/property/list/IListProperty
 
 doGetList
  (TS;)Ljava/util/List<TE;>;
- (TS;)Ljava/util/List<TE;>;
+ (TS;)L1java/util/List<TE;>;
 doSetList
  (TS;Ljava/util/List<TE;>;)V
  (TS;Ljava/util/List<TE;>;)V
@@ -38,4 +38,4 @@ updateList
  (TS;Lorg/eclipse/core/databinding/observable/list/ListDiff<TE;>;)V
 values
  <T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/property/value/IValueProperty<-TE;TT;>;)Lorg/eclipse/core/databinding/property/list/IListProperty<TS;TT;>;
- <T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/property/value/IValueProperty<-TE;TT;>;)Lorg/eclipse/core/databinding/property/list/IListProperty<TS;TT;>;
+ <T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/property/value/IValueProperty<-TE;TT;>;)L1org/eclipse/core/databinding/property/list/IListProperty<TS;TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/list/MultiListProperty.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/list/MultiListProperty.eea
index e82964e4b1..0673916a04 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/list/MultiListProperty.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/list/MultiListProperty.eea
@@ -14,7 +14,7 @@ super org/eclipse/core/databinding/property/list/ListProperty
  ([Lorg/eclipse/core/databinding/property/list/IListProperty<TS;TE;>;Ljava/lang/Object;)V
 doGetList
  (TS;)Ljava/util/List<TE;>;
- (TS;)Ljava/util/List<TE;>;
+ (TS;)L1java/util/List<TE;>; # @Inherited(org.eclipse.core.databinding.property.list.ListProperty)
 doUpdateList
  (TS;Lorg/eclipse/core/databinding/observable/list/ListDiff<TE;>;)V
  (TS;Lorg/eclipse/core/databinding/observable/list/ListDiff<TE;>;)V
@@ -23,4 +23,4 @@ getElementType
  ()Ljava/lang/Object;
 observe
  (Lorg/eclipse/core/databinding/observable/Realm;TS;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;
- (Lorg/eclipse/core/databinding/observable/Realm;TS;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;
+ (Lorg/eclipse/core/databinding/observable/Realm;TS;)L1org/eclipse/core/databinding/observable/list/IObservableList<TE;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/list/SimpleListProperty.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/list/SimpleListProperty.eea
index edacccf8d1..6e662f2b0a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/list/SimpleListProperty.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/list/SimpleListProperty.eea
@@ -11,7 +11,7 @@ adaptListener
  (Lorg/eclipse/core/databinding/property/ISimplePropertyListener<TS;Lorg/eclipse/core/databinding/observable/list/ListDiff<TE;>;>;)Lorg/eclipse/core/databinding/property/INativePropertyListener<TS;>;
 doGetList
  (TS;)Ljava/util/List<TE;>;
- (TS;)Ljava/util/List<TE;>;
+ (TS;)L1java/util/List<TE;>; # @Inherited(org.eclipse.core.databinding.property.list.ListProperty)
 doSetList
  (TS;Ljava/util/List<TE;>;)V
  (TS;Ljava/util/List<TE;>;)V
@@ -23,7 +23,7 @@ doUpdateList
  (TS;Lorg/eclipse/core/databinding/observable/list/ListDiff<TE;>;)V
 observe
  (Lorg/eclipse/core/databinding/observable/Realm;TS;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;
- (Lorg/eclipse/core/databinding/observable/Realm;TS;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;
+ (Lorg/eclipse/core/databinding/observable/Realm;TS;)L1org/eclipse/core/databinding/observable/list/IObservableList<TE;>;
 setList
  (TS;Ljava/util/List<TE;>;Lorg/eclipse/core/databinding/observable/list/ListDiff<TE;>;)V
  (TS;Ljava/util/List<TE;>;Lorg/eclipse/core/databinding/observable/list/ListDiff<TE;>;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/map/DelegatingMapProperty.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/map/DelegatingMapProperty.eea
index a5398c6708..890be34f22 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/map/DelegatingMapProperty.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/map/DelegatingMapProperty.eea
@@ -14,7 +14,7 @@ doGetDelegate
  (TS;)Lorg/eclipse/core/databinding/property/map/IMapProperty<TS;TK;TV;>;
 doGetMap
  (TS;)Ljava/util/Map<TK;TV;>;
- (TS;)Ljava/util/Map<TK;TV;>;
+ (TS;)L1java/util/Map<TK;TV;>; # @Inherited(org.eclipse.core.databinding.property.map.MapProperty)
 doSetMap
  (TS;Ljava/util/Map<TK;TV;>;)V
  (TS;Ljava/util/Map<TK;TV;>;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/map/MapProperty.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/map/MapProperty.eea
index 62cd419280..f8009cb975 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/map/MapProperty.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/map/MapProperty.eea
@@ -8,7 +8,7 @@ super org/eclipse/core/databinding/property/map/IMapProperty
 
 doGetMap
  (TS;)Ljava/util/Map<TK;TV;>;
- (TS;)Ljava/util/Map<TK;TV;>;
+ (TS;)L1java/util/Map<TK;TV;>;
 doSetMap
  (TS;Ljava/util/Map<TK;TV;>;)V
  (TS;Ljava/util/Map<TK;TV;>;)V
@@ -38,4 +38,4 @@ updateMap
  (TS;Lorg/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;)V
 values
  <T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/property/value/IValueProperty<-TV;TT;>;)Lorg/eclipse/core/databinding/property/map/IMapProperty<TS;TK;TT;>;
- <T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/property/value/IValueProperty<-TV;TT;>;)Lorg/eclipse/core/databinding/property/map/IMapProperty<TS;TK;TT;>;
+ <T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/property/value/IValueProperty<-TV;TT;>;)L1org/eclipse/core/databinding/property/map/IMapProperty<TS;TK;TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/map/SimpleMapProperty.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/map/SimpleMapProperty.eea
index 1a452f9166..6657f8ae34 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/map/SimpleMapProperty.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/map/SimpleMapProperty.eea
@@ -11,7 +11,7 @@ adaptListener
  (Lorg/eclipse/core/databinding/property/ISimplePropertyListener<TS;Lorg/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;>;)Lorg/eclipse/core/databinding/property/INativePropertyListener<TS;>;
 doGetMap
  (TS;)Ljava/util/Map<TK;TV;>;
- (TS;)Ljava/util/Map<TK;TV;>;
+ (TS;)L1java/util/Map<TK;TV;>; # @Inherited(org.eclipse.core.databinding.property.map.MapProperty)
 doSetMap
  (TS;Ljava/util/Map<TK;TV;>;)V
  (TS;Ljava/util/Map<TK;TV;>;)V
@@ -23,7 +23,7 @@ doUpdateMap
  (TS;Lorg/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;)V
 observe
  (Lorg/eclipse/core/databinding/observable/Realm;TS;)Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;
- (Lorg/eclipse/core/databinding/observable/Realm;TS;)Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;
+ (Lorg/eclipse/core/databinding/observable/Realm;TS;)L1org/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;
 setMap
  (TS;Ljava/util/Map<TK;TV;>;Lorg/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;)V
  (TS;Ljava/util/Map<TK;TV;>;Lorg/eclipse/core/databinding/observable/map/MapDiff<TK;TV;>;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/set/DelegatingSetProperty.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/set/DelegatingSetProperty.eea
index c8a5096011..704aa7903c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/set/DelegatingSetProperty.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/set/DelegatingSetProperty.eea
@@ -14,7 +14,7 @@ doGetDelegate
  (TS;)Lorg/eclipse/core/databinding/property/set/ISetProperty<TS;TE;>;
 doGetSet
  (TS;)Ljava/util/Set<TE;>;
- (TS;)Ljava/util/Set<TE;>;
+ (TS;)L1java/util/Set<TE;>; # @Inherited(org.eclipse.core.databinding.property.set.SetProperty)
 doSetSet
  (TS;Ljava/util/Set<TE;>;)V
  (TS;Ljava/util/Set<TE;>;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/set/SetProperty.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/set/SetProperty.eea
index 809948178d..d276991631 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/set/SetProperty.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/set/SetProperty.eea
@@ -8,7 +8,7 @@ super org/eclipse/core/databinding/property/set/ISetProperty
 
 doGetSet
  (TS;)Ljava/util/Set<TE;>;
- (TS;)Ljava/util/Set<TE;>;
+ (TS;)L1java/util/Set<TE;>;
 doSetSet
  (TS;Ljava/util/Set<TE;>;)V
  (TS;Ljava/util/Set<TE;>;)V
@@ -38,4 +38,4 @@ updateSet
  (TS;Lorg/eclipse/core/databinding/observable/set/SetDiff<TE;>;)V
 values
  <T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/property/value/IValueProperty<-TE;TT;>;)Lorg/eclipse/core/databinding/property/map/IMapProperty<TS;TE;TT;>;
- <T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/property/value/IValueProperty<-TE;TT;>;)Lorg/eclipse/core/databinding/property/map/IMapProperty<TS;TE;TT;>;
+ <T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/property/value/IValueProperty<-TE;TT;>;)L1org/eclipse/core/databinding/property/map/IMapProperty<TS;TE;TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/set/SimpleSetProperty.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/set/SimpleSetProperty.eea
index d4f2399ea4..8c754f667f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/set/SimpleSetProperty.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/set/SimpleSetProperty.eea
@@ -11,7 +11,7 @@ adaptListener
  (Lorg/eclipse/core/databinding/property/ISimplePropertyListener<TS;Lorg/eclipse/core/databinding/observable/set/SetDiff<TE;>;>;)Lorg/eclipse/core/databinding/property/INativePropertyListener<TS;>;
 doGetSet
  (TS;)Ljava/util/Set<TE;>;
- (TS;)Ljava/util/Set<TE;>;
+ (TS;)L1java/util/Set<TE;>; # @Inherited(org.eclipse.core.databinding.property.set.SetProperty)
 doSetSet
  (TS;Ljava/util/Set<TE;>;)V
  (TS;Ljava/util/Set<TE;>;)V
@@ -23,7 +23,7 @@ doUpdateSet
  (TS;Lorg/eclipse/core/databinding/observable/set/SetDiff<TE;>;)V
 observe
  (Lorg/eclipse/core/databinding/observable/Realm;TS;)Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
- (Lorg/eclipse/core/databinding/observable/Realm;TS;)Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
+ (Lorg/eclipse/core/databinding/observable/Realm;TS;)L1org/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
 setSet
  (TS;Ljava/util/Set<TE;>;Lorg/eclipse/core/databinding/observable/set/SetDiff<TE;>;)V
  (TS;Ljava/util/Set<TE;>;Lorg/eclipse/core/databinding/observable/set/SetDiff<TE;>;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/set/UnionSetProperty.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/set/UnionSetProperty.eea
index 10d521fd72..55ae06e9c3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/set/UnionSetProperty.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/set/UnionSetProperty.eea
@@ -14,7 +14,7 @@ super org/eclipse/core/databinding/property/set/SetProperty
  ([Lorg/eclipse/core/databinding/property/set/ISetProperty<TS;TE;>;Ljava/lang/Object;)V
 doGetSet
  (TS;)Ljava/util/Set<TE;>;
- (TS;)Ljava/util/Set<TE;>;
+ (TS;)L1java/util/Set<TE;>; # @Inherited(org.eclipse.core.databinding.property.set.SetProperty)
 doSetSet
  (TS;Ljava/util/Set<TE;>;)V
  (TS;Ljava/util/Set<TE;>;)V
@@ -26,4 +26,4 @@ getElementType
  ()Ljava/lang/Object;
 observe
  (Lorg/eclipse/core/databinding/observable/Realm;TS;)Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
- (Lorg/eclipse/core/databinding/observable/Realm;TS;)Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
+ (Lorg/eclipse/core/databinding/observable/Realm;TS;)L1org/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/value/DelegatingValueProperty.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/value/DelegatingValueProperty.eea
index d2383a0301..5fe0fb7ad9 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/value/DelegatingValueProperty.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/value/DelegatingValueProperty.eea
@@ -32,10 +32,10 @@ observe
  (TS;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
 observeDetail
  <K:Ljava/lang/Object;V:TS;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;)Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TT;>;
- <K:Ljava/lang/Object;V:TS;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;)Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TT;>;
+ <K:Ljava/lang/Object;V:TS;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;)L1org/eclipse/core/databinding/observable/map/IObservableMap<TK;TT;>;
 observeDetail
  <U:TS;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TU;>;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TT;>;
- <U:TS;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TU;>;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TT;>;
+ <U:TS;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TU;>;)L1org/eclipse/core/databinding/observable/list/IObservableList<TT;>;
 observeDetail
  <U:TS;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TU;>;)Lorg/eclipse/core/databinding/observable/map/IObservableMap<TU;TT;>;
- <U:TS;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TU;>;)Lorg/eclipse/core/databinding/observable/map/IObservableMap<TU;TT;>;
+ <U:TS;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TU;>;)L1org/eclipse/core/databinding/observable/map/IObservableMap<TU;TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/value/SimpleValueProperty.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/value/SimpleValueProperty.eea
index ae710ccbce..8b32be1e0b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/value/SimpleValueProperty.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/value/SimpleValueProperty.eea
@@ -17,13 +17,13 @@ doSetValue
  (TS;TT;)V
 observe
  (Lorg/eclipse/core/databinding/observable/Realm;TS;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
- (Lorg/eclipse/core/databinding/observable/Realm;TS;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
+ (Lorg/eclipse/core/databinding/observable/Realm;TS;)L1org/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
 observeDetail
  <K:Ljava/lang/Object;V:TS;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;)Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TT;>;
- <K:Ljava/lang/Object;V:TS;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;)Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TT;>;
+ <K:Ljava/lang/Object;V:TS;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;)L1org/eclipse/core/databinding/observable/map/IObservableMap<TK;TT;>;
 observeDetail
  <U:TS;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TU;>;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TT;>;
- <U:TS;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TU;>;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TT;>;
+ <U:TS;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TU;>;)L1org/eclipse/core/databinding/observable/list/IObservableList<TT;>;
 observeDetail
  <U:TS;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TU;>;)Lorg/eclipse/core/databinding/observable/map/IObservableMap<TU;TT;>;
- <U:TS;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TU;>;)Lorg/eclipse/core/databinding/observable/map/IObservableMap<TU;TT;>;
+ <U:TS;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TU;>;)L1org/eclipse/core/databinding/observable/map/IObservableMap<TU;TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/value/ValueProperty.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/value/ValueProperty.eea
index a3ec8d7dc8..85b47e3b65 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/value/ValueProperty.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/property/value/ValueProperty.eea
@@ -17,10 +17,10 @@ getValue
  (TS;)TT;
 list
  <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/property/list/IListProperty<-TT;TE;>;)Lorg/eclipse/core/databinding/property/list/IListProperty<TS;TE;>;
- <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/property/list/IListProperty<-TT;TE;>;)Lorg/eclipse/core/databinding/property/list/IListProperty<TS;TE;>;
+ <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/property/list/IListProperty<-TT;TE;>;)L1org/eclipse/core/databinding/property/list/IListProperty<TS;TE;>;
 map
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/property/map/IMapProperty<-TT;TK;TV;>;)Lorg/eclipse/core/databinding/property/map/IMapProperty<TS;TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/property/map/IMapProperty<-TT;TK;TV;>;)Lorg/eclipse/core/databinding/property/map/IMapProperty<TS;TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/property/map/IMapProperty<-TT;TK;TV;>;)L1org/eclipse/core/databinding/property/map/IMapProperty<TS;TK;TV;>;
 observe
  (TS;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
  (TS;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
@@ -38,13 +38,13 @@ observeDetail
  <V:TS;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TV;>;)Lorg/eclipse/core/databinding/observable/map/IObservableMap<TV;TT;>;
 set
  <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/property/set/ISetProperty<-TT;TE;>;)Lorg/eclipse/core/databinding/property/set/ISetProperty<TS;TE;>;
- <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/property/set/ISetProperty<-TT;TE;>;)Lorg/eclipse/core/databinding/property/set/ISetProperty<TS;TE;>;
+ <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/property/set/ISetProperty<-TT;TE;>;)L1org/eclipse/core/databinding/property/set/ISetProperty<TS;TE;>;
 setValue
  (TS;TT;)V
  (TS;TT;)V
 value
  <U:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/property/value/IValueProperty<-TT;TU;>;)Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;TU;>;
- <U:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/property/value/IValueProperty<-TT;TU;>;)Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;TU;>;
+ <U:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/property/value/IValueProperty<-TT;TU;>;)L1org/eclipse/core/databinding/property/value/IValueProperty<TS;TU;>;
 valueFactory
  ()Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<TS;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;>;
  ()Lorg/eclipse/core/databinding/observable/masterdetail/IObservableFactory<TS;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/validation/MultiValidator.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/validation/MultiValidator.eea
index 176baebdd3..ea7bbcf3dc 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/validation/MultiValidator.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/databinding/validation/MultiValidator.eea
@@ -14,16 +14,16 @@ getValidationStatus
  ()Lorg/eclipse/core/databinding/observable/value/IObservableValue<Lorg/eclipse/core/runtime/IStatus;>;
 observeValidatedList
  <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;
- <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;
+ <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;)L1org/eclipse/core/databinding/observable/list/IObservableList<TE;>;
 observeValidatedMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;)Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;)Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;)L1org/eclipse/core/databinding/observable/map/IObservableMap<TK;TV;>;
 observeValidatedSet
  <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;)Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
- <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;)Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
+ <E:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;)L1org/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
 observeValidatedValue
  <T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
- <T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
+ <T:Ljava/lang/Object;>(Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;)L1org/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
 validate
  ()Lorg/eclipse/core/runtime/IStatus;
  ()Lorg/eclipse/core/runtime/IStatus;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/expressions/ElementHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/expressions/ElementHandler.eea
index ab4f3f4308..3819ca3c51 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/expressions/ElementHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/expressions/ElementHandler.eea
@@ -6,10 +6,10 @@ getDefault
 
 create
  (Lorg/eclipse/core/expressions/ExpressionConverter;Lorg/eclipse/core/runtime/IConfigurationElement;)Lorg/eclipse/core/expressions/Expression;
- (Lorg/eclipse/core/expressions/ExpressionConverter;Lorg/eclipse/core/runtime/IConfigurationElement;)Lorg/eclipse/core/expressions/Expression;
+ (Lorg/eclipse/core/expressions/ExpressionConverter;Lorg/eclipse/core/runtime/IConfigurationElement;)L1org/eclipse/core/expressions/Expression;
 create
  (Lorg/eclipse/core/expressions/ExpressionConverter;Lorg/w3c/dom/Element;)Lorg/eclipse/core/expressions/Expression;
- (Lorg/eclipse/core/expressions/ExpressionConverter;Lorg/w3c/dom/Element;)Lorg/eclipse/core/expressions/Expression;
+ (Lorg/eclipse/core/expressions/ExpressionConverter;Lorg/w3c/dom/Element;)L1org/eclipse/core/expressions/Expression;
 processChildren
  (Lorg/eclipse/core/expressions/ExpressionConverter;Lorg/eclipse/core/runtime/IConfigurationElement;Lorg/eclipse/core/expressions/CompositeExpression;)V
  (Lorg/eclipse/core/expressions/ExpressionConverter;Lorg/eclipse/core/runtime/IConfigurationElement;Lorg/eclipse/core/expressions/CompositeExpression;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/expressions/EvaluationContext.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/expressions/EvaluationContext.eea
index daab94674f..742727418f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/expressions/EvaluationContext.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/expressions/EvaluationContext.eea
@@ -20,10 +20,10 @@ getRoot
  ()Lorg/eclipse/core/expressions/IEvaluationContext;
 getVariable
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 removeVariable
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 resolveVariable
  (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/String;[Ljava/lang/Object;)L0java/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/expressions/Expression.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/expressions/Expression.eea
index 1027b8bfdd..38fa26b1d3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/expressions/Expression.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/expressions/Expression.eea
@@ -28,7 +28,7 @@ collectExpressionInfo
  (Lorg/eclipse/core/expressions/ExpressionInfo;)V
 computeExpressionInfo
  ()Lorg/eclipse/core/expressions/ExpressionInfo;
- ()Lorg/eclipse/core/expressions/ExpressionInfo;
+ ()L1org/eclipse/core/expressions/ExpressionInfo;
 evaluate
  (Lorg/eclipse/core/expressions/IEvaluationContext;)Lorg/eclipse/core/expressions/EvaluationResult;
  (Lorg/eclipse/core/expressions/IEvaluationContext;)Lorg/eclipse/core/expressions/EvaluationResult;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/expressions/ExpressionConverter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/expressions/ExpressionConverter.eea
index 4e1a470478..8064cc779f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/expressions/ExpressionConverter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/expressions/ExpressionConverter.eea
@@ -9,7 +9,7 @@ getDefault
  ([Lorg/eclipse/core/expressions/ElementHandler;)V
 perform
  (Lorg/eclipse/core/runtime/IConfigurationElement;)Lorg/eclipse/core/expressions/Expression;
- (Lorg/eclipse/core/runtime/IConfigurationElement;)Lorg/eclipse/core/expressions/Expression;
+ (Lorg/eclipse/core/runtime/IConfigurationElement;)L0org/eclipse/core/expressions/Expression;
 perform
  (Lorg/w3c/dom/Element;)Lorg/eclipse/core/expressions/Expression;
- (Lorg/w3c/dom/Element;)Lorg/eclipse/core/expressions/Expression;
+ (Lorg/w3c/dom/Element;)L0org/eclipse/core/expressions/Expression;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/expressions/ExpressionInfo.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/expressions/ExpressionInfo.eea
index 460ba6eeb8..751c139d57 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/expressions/ExpressionInfo.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/expressions/ExpressionInfo.eea
@@ -17,7 +17,7 @@ getAccessedVariableNames
  ()[Ljava/lang/String;
 getMisbehavingExpressionTypes
  ()[Ljava/lang/Class<*>;
- ()[Ljava/lang/Class<*>;
+ ()[0Ljava/lang/Class<*>;
 merge
  (Lorg/eclipse/core/expressions/ExpressionInfo;)V
  (Lorg/eclipse/core/expressions/ExpressionInfo;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/FileBuffers.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/FileBuffers.eea
index cbdbffd4e7..6974c34237 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/FileBuffers.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/FileBuffers.eea
@@ -6,13 +6,13 @@ PLUGIN_ID
 
 createTextFileBufferManager
  ()Lorg/eclipse/core/filebuffers/ITextFileBufferManager;
- ()Lorg/eclipse/core/filebuffers/ITextFileBufferManager;
+ ()L1org/eclipse/core/filebuffers/ITextFileBufferManager;
 getFileStoreAtLocation
  (Lorg/eclipse/core/runtime/IPath;)Lorg/eclipse/core/filesystem/IFileStore;
- (Lorg/eclipse/core/runtime/IPath;)Lorg/eclipse/core/filesystem/IFileStore;
+ (Lorg/eclipse/core/runtime/IPath;)L0org/eclipse/core/filesystem/IFileStore;
 getSystemFileAtLocation
  (Lorg/eclipse/core/runtime/IPath;)Ljava/io/File;
- (Lorg/eclipse/core/runtime/IPath;)Ljava/io/File;
+ (Lorg/eclipse/core/runtime/IPath;)L0java/io/File;
 getTextFileBufferManager
  ()Lorg/eclipse/core/filebuffers/ITextFileBufferManager;
  ()Lorg/eclipse/core/filebuffers/ITextFileBufferManager;
@@ -21,7 +21,7 @@ getWorkspaceFileAtLocation
  (Lorg/eclipse/core/runtime/IPath;)Lorg/eclipse/core/resources/IFile;
 getWorkspaceFileAtLocation
  (Lorg/eclipse/core/runtime/IPath;Z)Lorg/eclipse/core/resources/IFile;
- (Lorg/eclipse/core/runtime/IPath;Z)Lorg/eclipse/core/resources/IFile;
+ (Lorg/eclipse/core/runtime/IPath;Z)L0org/eclipse/core/resources/IFile;
 normalizeLocation
  (Lorg/eclipse/core/runtime/IPath;)Lorg/eclipse/core/runtime/IPath;
  (Lorg/eclipse/core/runtime/IPath;)Lorg/eclipse/core/runtime/IPath;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/IAnnotationModelFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/IAnnotationModelFactory.eea
index 0dc523521a..59ddb543ee 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/IAnnotationModelFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/IAnnotationModelFactory.eea
@@ -2,4 +2,4 @@ class org/eclipse/core/filebuffers/IAnnotationModelFactory
 
 createAnnotationModel
  (Lorg/eclipse/core/runtime/IPath;)Lorg/eclipse/jface/text/source/IAnnotationModel;
- (Lorg/eclipse/core/runtime/IPath;)Lorg/eclipse/jface/text/source/IAnnotationModel;
+ (Lorg/eclipse/core/runtime/IPath;)L1org/eclipse/jface/text/source/IAnnotationModel;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/IDocumentFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/IDocumentFactory.eea
index 83f9271ae2..c651d41f61 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/IDocumentFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/IDocumentFactory.eea
@@ -2,4 +2,4 @@ class org/eclipse/core/filebuffers/IDocumentFactory
 
 createDocument
  ()Lorg/eclipse/jface/text/IDocument;
- ()Lorg/eclipse/jface/text/IDocument;
+ ()L1org/eclipse/jface/text/IDocument;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/ITextFileBufferManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/ITextFileBufferManager.eea
index 83ba36e703..91b07870a5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/ITextFileBufferManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/ITextFileBufferManager.eea
@@ -6,16 +6,16 @@ DEFAULT
 
 createAnnotationModel
  (Lorg/eclipse/core/runtime/IPath;)Lorg/eclipse/jface/text/source/IAnnotationModel;
- (Lorg/eclipse/core/runtime/IPath;)Lorg/eclipse/jface/text/source/IAnnotationModel;
+ (Lorg/eclipse/core/runtime/IPath;)L1org/eclipse/jface/text/source/IAnnotationModel;
 createAnnotationModel
  (Lorg/eclipse/core/runtime/IPath;Lorg/eclipse/core/filebuffers/LocationKind;)Lorg/eclipse/jface/text/source/IAnnotationModel;
- (Lorg/eclipse/core/runtime/IPath;Lorg/eclipse/core/filebuffers/LocationKind;)Lorg/eclipse/jface/text/source/IAnnotationModel;
+ (Lorg/eclipse/core/runtime/IPath;Lorg/eclipse/core/filebuffers/LocationKind;)L1org/eclipse/jface/text/source/IAnnotationModel;
 createEmptyDocument
  (Lorg/eclipse/core/runtime/IPath;)Lorg/eclipse/jface/text/IDocument;
- (Lorg/eclipse/core/runtime/IPath;)Lorg/eclipse/jface/text/IDocument;
+ (Lorg/eclipse/core/runtime/IPath;)L1org/eclipse/jface/text/IDocument;
 createEmptyDocument
  (Lorg/eclipse/core/runtime/IPath;Lorg/eclipse/core/filebuffers/LocationKind;)Lorg/eclipse/jface/text/IDocument;
- (Lorg/eclipse/core/runtime/IPath;Lorg/eclipse/core/filebuffers/LocationKind;)Lorg/eclipse/jface/text/IDocument;
+ (Lorg/eclipse/core/runtime/IPath;Lorg/eclipse/core/filebuffers/LocationKind;)L1org/eclipse/jface/text/IDocument;
 getDefaultEncoding
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/manipulation/ContainerCreator.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/manipulation/ContainerCreator.eea
index b9ca9690de..5addf8fb05 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/manipulation/ContainerCreator.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/manipulation/ContainerCreator.eea
@@ -5,4 +5,4 @@ class org/eclipse/core/filebuffers/manipulation/ContainerCreator
  (Lorg/eclipse/core/resources/IWorkspace;Lorg/eclipse/core/runtime/IPath;)V
 createContainer
  (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/core/resources/IContainer;
- (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/core/resources/IContainer;
+ (Lorg/eclipse/core/runtime/IProgressMonitor;)L1org/eclipse/core/resources/IContainer;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/manipulation/ConvertLineDelimitersOperation.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/manipulation/ConvertLineDelimitersOperation.eea
index a27ebc787b..c6d9a417ac 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/manipulation/ConvertLineDelimitersOperation.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/manipulation/ConvertLineDelimitersOperation.eea
@@ -5,7 +5,7 @@ class org/eclipse/core/filebuffers/manipulation/ConvertLineDelimitersOperation
  (Ljava/lang/String;)V
 computeTextEdit
  (Lorg/eclipse/core/filebuffers/ITextFileBuffer;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/core/filebuffers/manipulation/MultiTextEditWithProgress;
- (Lorg/eclipse/core/filebuffers/ITextFileBuffer;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/core/filebuffers/manipulation/MultiTextEditWithProgress;
+ (Lorg/eclipse/core/filebuffers/ITextFileBuffer;Lorg/eclipse/core/runtime/IProgressMonitor;)L1org/eclipse/core/filebuffers/manipulation/MultiTextEditWithProgress;
 getDocumentRewriteSessionType
  ()Lorg/eclipse/jface/text/DocumentRewriteSessionType;
  ()Lorg/eclipse/jface/text/DocumentRewriteSessionType;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/manipulation/GenericFileBufferOperationRunner.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/manipulation/GenericFileBufferOperationRunner.eea
index 4c702167d3..fcdea40d70 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/manipulation/GenericFileBufferOperationRunner.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/manipulation/GenericFileBufferOperationRunner.eea
@@ -8,7 +8,7 @@ commit
  ([Lorg/eclipse/core/filebuffers/IFileBuffer;Lorg/eclipse/core/runtime/IProgressMonitor;)V
 computeCommitRule
  ([Lorg/eclipse/core/filebuffers/IFileBuffer;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
- ([Lorg/eclipse/core/filebuffers/IFileBuffer;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
+ ([Lorg/eclipse/core/filebuffers/IFileBuffer;)L1org/eclipse/core/runtime/jobs/ISchedulingRule;
 doCommit
  ([Lorg/eclipse/core/filebuffers/IFileBuffer;Lorg/eclipse/core/runtime/IProgressMonitor;)V
  ([Lorg/eclipse/core/filebuffers/IFileBuffer;Lorg/eclipse/core/runtime/IProgressMonitor;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/manipulation/RemoveTrailingWhitespaceOperation.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/manipulation/RemoveTrailingWhitespaceOperation.eea
index ec659e92bd..42df9977ba 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/manipulation/RemoveTrailingWhitespaceOperation.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filebuffers/manipulation/RemoveTrailingWhitespaceOperation.eea
@@ -2,7 +2,7 @@ class org/eclipse/core/filebuffers/manipulation/RemoveTrailingWhitespaceOperatio
 
 computeTextEdit
  (Lorg/eclipse/core/filebuffers/ITextFileBuffer;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/core/filebuffers/manipulation/MultiTextEditWithProgress;
- (Lorg/eclipse/core/filebuffers/ITextFileBuffer;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/core/filebuffers/manipulation/MultiTextEditWithProgress;
+ (Lorg/eclipse/core/filebuffers/ITextFileBuffer;Lorg/eclipse/core/runtime/IProgressMonitor;)L1org/eclipse/core/filebuffers/manipulation/MultiTextEditWithProgress;
 getDocumentRewriteSessionType
  ()Lorg/eclipse/jface/text/DocumentRewriteSessionType;
  ()Lorg/eclipse/jface/text/DocumentRewriteSessionType;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filesystem/EFS.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filesystem/EFS.eea
index 92475cfad1..636b5413d7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filesystem/EFS.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filesystem/EFS.eea
@@ -15,7 +15,7 @@ SCHEME_NULL
 
 createFileInfo
  ()Lorg/eclipse/core/filesystem/IFileInfo;
- ()Lorg/eclipse/core/filesystem/IFileInfo;
+ ()L1org/eclipse/core/filesystem/IFileInfo;
 getFileSystem
  (Ljava/lang/String;)Lorg/eclipse/core/filesystem/IFileSystem;
  (Ljava/lang/String;)Lorg/eclipse/core/filesystem/IFileSystem;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filesystem/URIUtil.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filesystem/URIUtil.eea
index 0863cb81d1..a117ccde65 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filesystem/URIUtil.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filesystem/URIUtil.eea
@@ -8,7 +8,7 @@ toDecodedString
  (Ljava/net/URI;)Ljava/lang/String;
 toPath
  (Ljava/net/URI;)Lorg/eclipse/core/runtime/IPath;
- (Ljava/net/URI;)Lorg/eclipse/core/runtime/IPath;
+ (Ljava/net/URI;)L0org/eclipse/core/runtime/IPath;
 toURI
  (Ljava/lang/String;)Ljava/net/URI;
  (Ljava/lang/String;)Ljava/net/URI;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filesystem/provider/FileInfo.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filesystem/provider/FileInfo.eea
index c45e8e1c1a..89c94556b5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filesystem/provider/FileInfo.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filesystem/provider/FileInfo.eea
@@ -14,7 +14,7 @@ getName
  ()Ljava/lang/String;
 getStringAttribute
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 setName
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filesystem/provider/FileSystem.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filesystem/provider/FileSystem.eea
index 5af1a973fb..f94cd806f3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filesystem/provider/FileSystem.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/filesystem/provider/FileSystem.eea
@@ -2,10 +2,10 @@ class org/eclipse/core/filesystem/provider/FileSystem
 
 fetchFileTree
  (Lorg/eclipse/core/filesystem/IFileStore;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/core/filesystem/IFileTree;
- (Lorg/eclipse/core/filesystem/IFileStore;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/core/filesystem/IFileTree;
+ (Lorg/eclipse/core/filesystem/IFileStore;Lorg/eclipse/core/runtime/IProgressMonitor;)L0org/eclipse/core/filesystem/IFileTree;
 fromLocalFile
  (Ljava/io/File;)Lorg/eclipse/core/filesystem/IFileStore;
- (Ljava/io/File;)Lorg/eclipse/core/filesystem/IFileStore;
+ (Ljava/io/File;)L0org/eclipse/core/filesystem/IFileStore;
 getScheme
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/IContainer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/IContainer.eea
index 0fb51865c4..5aae644b6c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/IContainer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/IContainer.eea
@@ -2,7 +2,7 @@ class org/eclipse/core/resources/IContainer
 
 createFilter
  (ILorg/eclipse/core/resources/FileInfoMatcherDescription;ILorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/core/resources/IResourceFilterDescription;
- (ILorg/eclipse/core/resources/FileInfoMatcherDescription;ILorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/core/resources/IResourceFilterDescription;
+ (ILorg/eclipse/core/resources/FileInfoMatcherDescription;ILorg/eclipse/core/runtime/IProgressMonitor;)L1org/eclipse/core/resources/IResourceFilterDescription;
 exists
  (Lorg/eclipse/core/runtime/IPath;)Z
  (Lorg/eclipse/core/runtime/IPath;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/IResource.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/IResource.eea
index 01a8209509..7c258afd82 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/IResource.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/IResource.eea
@@ -38,7 +38,7 @@ createMarker
  (L1java/lang/String;L0java/util/Map<Ljava/lang/String;+Ljava/lang/Object;>;)Lorg/eclipse/core/resources/IMarker;
 createProxy
  ()Lorg/eclipse/core/resources/IResourceProxy;
- ()Lorg/eclipse/core/resources/IResourceProxy;
+ ()L1org/eclipse/core/resources/IResourceProxy;
 delete
  (ILorg/eclipse/core/runtime/IProgressMonitor;)V
  (IL0org/eclipse/core/runtime/IProgressMonitor;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/IResourceRuleFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/IResourceRuleFactory.eea
index a0083d4d2c..970b30abd9 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/IResourceRuleFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/IResourceRuleFactory.eea
@@ -11,7 +11,7 @@ copyRule
  (Lorg/eclipse/core/resources/IResource;Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
 createRule
  (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
- (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
+ (Lorg/eclipse/core/resources/IResource;)L1org/eclipse/core/runtime/jobs/ISchedulingRule;
 deleteRule
  (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
  (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/mapping/ModelProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/mapping/ModelProvider.eea
index 9e14b30cb3..e427031dd5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/mapping/ModelProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/mapping/ModelProvider.eea
@@ -6,7 +6,7 @@ RESOURCE_MODEL_PROVIDER_ID
 
 getModelProviderDescriptor
  (Ljava/lang/String;)Lorg/eclipse/core/resources/mapping/IModelProviderDescriptor;
- (Ljava/lang/String;)Lorg/eclipse/core/resources/mapping/IModelProviderDescriptor;
+ (Ljava/lang/String;)L0org/eclipse/core/resources/mapping/IModelProviderDescriptor;
 getModelProviderDescriptors
  ()[Lorg/eclipse/core/resources/mapping/IModelProviderDescriptor;
  ()[Lorg/eclipse/core/resources/mapping/IModelProviderDescriptor;
@@ -22,7 +22,7 @@ getId
  ()Ljava/lang/String;
 getMappings
  (Lorg/eclipse/core/resources/IResource;Lorg/eclipse/core/resources/mapping/ResourceMappingContext;Lorg/eclipse/core/runtime/IProgressMonitor;)[Lorg/eclipse/core/resources/mapping/ResourceMapping;
- (Lorg/eclipse/core/resources/IResource;Lorg/eclipse/core/resources/mapping/ResourceMappingContext;Lorg/eclipse/core/runtime/IProgressMonitor;)[Lorg/eclipse/core/resources/mapping/ResourceMapping;
+ (Lorg/eclipse/core/resources/IResource;Lorg/eclipse/core/resources/mapping/ResourceMappingContext;Lorg/eclipse/core/runtime/IProgressMonitor;)[1Lorg/eclipse/core/resources/mapping/ResourceMapping;
 getMappings
  ([Lorg/eclipse/core/resources/IResource;Lorg/eclipse/core/resources/mapping/ResourceMappingContext;Lorg/eclipse/core/runtime/IProgressMonitor;)[Lorg/eclipse/core/resources/mapping/ResourceMapping;
  ([Lorg/eclipse/core/resources/IResource;Lorg/eclipse/core/resources/mapping/ResourceMappingContext;Lorg/eclipse/core/runtime/IProgressMonitor;)[Lorg/eclipse/core/resources/mapping/ResourceMapping;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/mapping/RemoteResourceMappingContext.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/mapping/RemoteResourceMappingContext.eea
index ba55221153..5737ffc67e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/mapping/RemoteResourceMappingContext.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/mapping/RemoteResourceMappingContext.eea
@@ -5,7 +5,7 @@ fetchBaseContents
  (Lorg/eclipse/core/resources/IFile;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/core/resources/IStorage;
 fetchBaseMembers
  (Lorg/eclipse/core/resources/IContainer;Lorg/eclipse/core/runtime/IProgressMonitor;)[Lorg/eclipse/core/resources/IResource;
- (Lorg/eclipse/core/resources/IContainer;Lorg/eclipse/core/runtime/IProgressMonitor;)[Lorg/eclipse/core/resources/IResource;
+ (Lorg/eclipse/core/resources/IContainer;Lorg/eclipse/core/runtime/IProgressMonitor;)[0Lorg/eclipse/core/resources/IResource;
 fetchMembers
  (Lorg/eclipse/core/resources/IContainer;Lorg/eclipse/core/runtime/IProgressMonitor;)[Lorg/eclipse/core/resources/IResource;
  (Lorg/eclipse/core/resources/IContainer;Lorg/eclipse/core/runtime/IProgressMonitor;)[Lorg/eclipse/core/resources/IResource;
@@ -14,7 +14,7 @@ fetchRemoteContents
  (Lorg/eclipse/core/resources/IFile;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/core/resources/IStorage;
 fetchRemoteMembers
  (Lorg/eclipse/core/resources/IContainer;Lorg/eclipse/core/runtime/IProgressMonitor;)[Lorg/eclipse/core/resources/IResource;
- (Lorg/eclipse/core/resources/IContainer;Lorg/eclipse/core/runtime/IProgressMonitor;)[Lorg/eclipse/core/resources/IResource;
+ (Lorg/eclipse/core/resources/IContainer;Lorg/eclipse/core/runtime/IProgressMonitor;)[0Lorg/eclipse/core/resources/IResource;
 getProjects
  ()[Lorg/eclipse/core/resources/IProject;
  ()[Lorg/eclipse/core/resources/IProject;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/mapping/ResourceChangeValidator.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/mapping/ResourceChangeValidator.eea
index f7d05345b4..5471e24694 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/mapping/ResourceChangeValidator.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/mapping/ResourceChangeValidator.eea
@@ -6,7 +6,7 @@ getValidator
 
 createDeltaFactory
  ()Lorg/eclipse/core/resources/mapping/IResourceChangeDescriptionFactory;
- ()Lorg/eclipse/core/resources/mapping/IResourceChangeDescriptionFactory;
+ ()L1org/eclipse/core/resources/mapping/IResourceChangeDescriptionFactory;
 validateChange
  (Lorg/eclipse/core/resources/IResourceDelta;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/core/runtime/IStatus;
  (Lorg/eclipse/core/resources/IResourceDelta;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/core/runtime/IStatus;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/refresh/RefreshProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/refresh/RefreshProvider.eea
index 667529fa2c..05b857b682 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/refresh/RefreshProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/refresh/RefreshProvider.eea
@@ -2,10 +2,10 @@ class org/eclipse/core/resources/refresh/RefreshProvider
 
 createPollingMonitor
  (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/resources/refresh/IRefreshMonitor;
- (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/resources/refresh/IRefreshMonitor;
+ (Lorg/eclipse/core/resources/IResource;)L1org/eclipse/core/resources/refresh/IRefreshMonitor;
 installMonitor
  (Lorg/eclipse/core/resources/IResource;Lorg/eclipse/core/resources/refresh/IRefreshResult;)Lorg/eclipse/core/resources/refresh/IRefreshMonitor;
- (Lorg/eclipse/core/resources/IResource;Lorg/eclipse/core/resources/refresh/IRefreshResult;)Lorg/eclipse/core/resources/refresh/IRefreshMonitor;
+ (Lorg/eclipse/core/resources/IResource;Lorg/eclipse/core/resources/refresh/IRefreshResult;)L0org/eclipse/core/resources/refresh/IRefreshMonitor;
 installMonitor
  (Lorg/eclipse/core/resources/IResource;Lorg/eclipse/core/resources/refresh/IRefreshResult;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/core/resources/refresh/IRefreshMonitor;
  (Lorg/eclipse/core/resources/IResource;Lorg/eclipse/core/resources/refresh/IRefreshResult;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/core/resources/refresh/IRefreshMonitor;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/team/ResourceRuleFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/team/ResourceRuleFactory.eea
index fe1a60a67e..cfa7f5b646 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/team/ResourceRuleFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/team/ResourceRuleFactory.eea
@@ -8,22 +8,22 @@ buildRule
  ()Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
 charsetRule
  (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
- (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
+ (Lorg/eclipse/core/resources/IResource;)L0org/eclipse/core/runtime/jobs/ISchedulingRule;
 copyRule
  (Lorg/eclipse/core/resources/IResource;Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
  (Lorg/eclipse/core/resources/IResource;Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
 createRule
  (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
- (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
+ (Lorg/eclipse/core/resources/IResource;)L1org/eclipse/core/runtime/jobs/ISchedulingRule; # @Inherited(org.eclipse.core.resources.IResourceRuleFactory)
 deleteRule
  (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
  (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
 derivedRule
  (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
- (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
+ (Lorg/eclipse/core/resources/IResource;)L0org/eclipse/core/runtime/jobs/ISchedulingRule;
 markerRule
  (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
- (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
+ (Lorg/eclipse/core/resources/IResource;)L0org/eclipse/core/runtime/jobs/ISchedulingRule;
 modifyRule
  (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
  (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
@@ -38,4 +38,4 @@ refreshRule
  (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
 validateEditRule
  ([Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
- ([Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
+ ([Lorg/eclipse/core/resources/IResource;)L0org/eclipse/core/runtime/jobs/ISchedulingRule;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/undo/snapshot/IMarkerSnapshot.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/undo/snapshot/IMarkerSnapshot.eea
index 141d8d7e5d..e21cb09b6d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/undo/snapshot/IMarkerSnapshot.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/undo/snapshot/IMarkerSnapshot.eea
@@ -2,7 +2,7 @@ class org/eclipse/core/resources/undo/snapshot/IMarkerSnapshot
 
 createMarker
  ()Lorg/eclipse/core/resources/IMarker;
- ()Lorg/eclipse/core/resources/IMarker;
+ ()L1org/eclipse/core/resources/IMarker;
 getResource
  ()Lorg/eclipse/core/resources/IResource;
  ()Lorg/eclipse/core/resources/IResource;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/undo/snapshot/IResourceSnapshot.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/undo/snapshot/IResourceSnapshot.eea
index c52102d841..977de88bdc 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/undo/snapshot/IResourceSnapshot.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/undo/snapshot/IResourceSnapshot.eea
@@ -7,10 +7,10 @@ createExistentResourceFromHandle
  (Lorg/eclipse/core/runtime/IProgressMonitor;)V
 createResource
  (Lorg/eclipse/core/runtime/IProgressMonitor;)TT;
- (Lorg/eclipse/core/runtime/IProgressMonitor;)TT;
+ (Lorg/eclipse/core/runtime/IProgressMonitor;)T1T;
 createResourceHandle
  ()TT;
- ()TT;
+ ()T1T;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/undo/snapshot/ResourceSnapshotFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/undo/snapshot/ResourceSnapshotFactory.eea
index 4cf7ef8957..bedafc3184 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/undo/snapshot/ResourceSnapshotFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/undo/snapshot/ResourceSnapshotFactory.eea
@@ -5,19 +5,19 @@ fromContainer
  (Lorg/eclipse/core/resources/IContainer;)Lorg/eclipse/core/resources/undo/snapshot/IContainerSnapshot<+Lorg/eclipse/core/resources/IContainer;>;
 fromFileDetails
  (Lorg/eclipse/core/resources/IFile;Ljava/net/URI;Ljava/io/InputStream;)Lorg/eclipse/core/resources/undo/snapshot/IResourceSnapshot<Lorg/eclipse/core/resources/IFile;>;
- (Lorg/eclipse/core/resources/IFile;Ljava/net/URI;Ljava/io/InputStream;)Lorg/eclipse/core/resources/undo/snapshot/IResourceSnapshot<Lorg/eclipse/core/resources/IFile;>;
+ (Lorg/eclipse/core/resources/IFile;Ljava/net/URI;Ljava/io/InputStream;)L1org/eclipse/core/resources/undo/snapshot/IResourceSnapshot<Lorg/eclipse/core/resources/IFile;>;
 fromMarker
  (Lorg/eclipse/core/resources/IMarker;)Lorg/eclipse/core/resources/undo/snapshot/IMarkerSnapshot;
- (Lorg/eclipse/core/resources/IMarker;)Lorg/eclipse/core/resources/undo/snapshot/IMarkerSnapshot;
+ (Lorg/eclipse/core/resources/IMarker;)L1org/eclipse/core/resources/undo/snapshot/IMarkerSnapshot;
 fromMarkerDetails
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/resources/undo/snapshot/IMarkerSnapshot;
- (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/resources/undo/snapshot/IMarkerSnapshot;
+ (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Lorg/eclipse/core/resources/IResource;)L1org/eclipse/core/resources/undo/snapshot/IMarkerSnapshot;
 fromProjectDescription
  (Lorg/eclipse/core/resources/IProjectDescription;)Lorg/eclipse/core/resources/undo/snapshot/IContainerSnapshot<Lorg/eclipse/core/resources/IProject;>;
- (Lorg/eclipse/core/resources/IProjectDescription;)Lorg/eclipse/core/resources/undo/snapshot/IContainerSnapshot<Lorg/eclipse/core/resources/IProject;>;
+ (Lorg/eclipse/core/resources/IProjectDescription;)L1org/eclipse/core/resources/undo/snapshot/IContainerSnapshot<Lorg/eclipse/core/resources/IProject;>;
 fromResource
  <T::Lorg/eclipse/core/resources/IResource;>(TT;)Lorg/eclipse/core/resources/undo/snapshot/IResourceSnapshot<TT;>;
- <T::Lorg/eclipse/core/resources/IResource;>(TT;)Lorg/eclipse/core/resources/undo/snapshot/IResourceSnapshot<TT;>;
+ <T::Lorg/eclipse/core/resources/IResource;>(TT;)L1org/eclipse/core/resources/undo/snapshot/IResourceSnapshot<TT;>;
 fromVirtualFolderContainer
  (Lorg/eclipse/core/resources/IContainer;)Lorg/eclipse/core/resources/undo/snapshot/IContainerSnapshot<+Lorg/eclipse/core/resources/IContainer;>;
  (Lorg/eclipse/core/resources/IContainer;)Lorg/eclipse/core/resources/undo/snapshot/IContainerSnapshot<+Lorg/eclipse/core/resources/IContainer;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/variableresolvers/PathVariableResolver.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/variableresolvers/PathVariableResolver.eea
index 4a2bce54db..18c95863de 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/variableresolvers/PathVariableResolver.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/resources/variableresolvers/PathVariableResolver.eea
@@ -5,4 +5,4 @@ getValue
  (Ljava/lang/String;Lorg/eclipse/core/resources/IResource;)Ljava/lang/String;
 getVariableNames
  (Ljava/lang/String;Lorg/eclipse/core/resources/IResource;)[Ljava/lang/String;
- (Ljava/lang/String;Lorg/eclipse/core/resources/IResource;)[Ljava/lang/String;
+ (Ljava/lang/String;Lorg/eclipse/core/resources/IResource;)[0Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/ContributorFactoryOSGi.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/ContributorFactoryOSGi.eea
index 1c10f113ca..024308175b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/ContributorFactoryOSGi.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/ContributorFactoryOSGi.eea
@@ -2,7 +2,7 @@ class org/eclipse/core/runtime/ContributorFactoryOSGi
 
 createContributor
  (Lorg/osgi/framework/Bundle;)Lorg/eclipse/core/runtime/IContributor;
- (Lorg/osgi/framework/Bundle;)Lorg/eclipse/core/runtime/IContributor;
+ (Lorg/osgi/framework/Bundle;)L1org/eclipse/core/runtime/IContributor;
 resolve
  (Lorg/eclipse/core/runtime/IContributor;)Lorg/osgi/framework/Bundle;
- (Lorg/eclipse/core/runtime/IContributor;)Lorg/osgi/framework/Bundle;
+ (Lorg/eclipse/core/runtime/IContributor;)L0org/osgi/framework/Bundle;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/ContributorFactorySimple.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/ContributorFactorySimple.eea
index ad6106eef0..105742cb52 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/ContributorFactorySimple.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/ContributorFactorySimple.eea
@@ -2,4 +2,4 @@ class org/eclipse/core/runtime/ContributorFactorySimple
 
 createContributor
  (Ljava/lang/Object;)Lorg/eclipse/core/runtime/IContributor;
- (Ljava/lang/Object;)Lorg/eclipse/core/runtime/IContributor;
+ (Ljava/lang/Object;)L1org/eclipse/core/runtime/IContributor;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/IExecutableExtensionFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/IExecutableExtensionFactory.eea
index 467f826ebf..f17ceaf304 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/IExecutableExtensionFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/IExecutableExtensionFactory.eea
@@ -2,4 +2,4 @@ class org/eclipse/core/runtime/IExecutableExtensionFactory
 
 create
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/Platform.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/Platform.eea
index 1f3c8811ca..5096b458e2 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/Platform.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/Platform.eea
@@ -189,7 +189,7 @@ getPlatformAdmin
  ()Lorg/eclipse/osgi/service/resolver/PlatformAdmin;
 getPlugin
  (Ljava/lang/String;)Lorg/eclipse/core/runtime/Plugin;
- (Ljava/lang/String;)Lorg/eclipse/core/runtime/Plugin;
+ (Ljava/lang/String;)L0org/eclipse/core/runtime/Plugin;
 getPreferencesService
  ()Lorg/eclipse/core/runtime/preferences/IPreferencesService;
  ()Lorg/eclipse/core/runtime/preferences/IPreferencesService;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/Preferences.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/Preferences.eea
index 5f2def290f..83f638dde5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/Preferences.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/Preferences.eea
@@ -59,7 +59,7 @@ getDefaultLong
  (Ljava/lang/String;)J
 getDefaultString
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 getDouble
  (Ljava/lang/String;)D
  (Ljava/lang/String;)D
@@ -74,7 +74,7 @@ getLong
  (Ljava/lang/String;)J
 getString
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 isDefault
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/RegistryFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/RegistryFactory.eea
index 5848d547a9..f9c3edacc2 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/RegistryFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/RegistryFactory.eea
@@ -2,13 +2,13 @@ class org/eclipse/core/runtime/RegistryFactory
 
 createOSGiStrategy
  ([Ljava/io/File;[ZLjava/lang/Object;)Lorg/eclipse/core/runtime/spi/RegistryStrategy;
- ([Ljava/io/File;[ZLjava/lang/Object;)Lorg/eclipse/core/runtime/spi/RegistryStrategy;
+ ([Ljava/io/File;[ZLjava/lang/Object;)L1org/eclipse/core/runtime/spi/RegistryStrategy;
 createRegistry
  (Lorg/eclipse/core/runtime/spi/RegistryStrategy;Ljava/lang/Object;Ljava/lang/Object;)Lorg/eclipse/core/runtime/IExtensionRegistry;
- (Lorg/eclipse/core/runtime/spi/RegistryStrategy;Ljava/lang/Object;Ljava/lang/Object;)Lorg/eclipse/core/runtime/IExtensionRegistry;
+ (Lorg/eclipse/core/runtime/spi/RegistryStrategy;Ljava/lang/Object;Ljava/lang/Object;)L1org/eclipse/core/runtime/IExtensionRegistry;
 getRegistry
  ()Lorg/eclipse/core/runtime/IExtensionRegistry;
- ()Lorg/eclipse/core/runtime/IExtensionRegistry;
+ ()L0org/eclipse/core/runtime/IExtensionRegistry;
 setDefaultRegistryProvider
  (Lorg/eclipse/core/runtime/spi/IRegistryProvider;)V
  (Lorg/eclipse/core/runtime/spi/IRegistryProvider;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/SafeRunner.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/SafeRunner.eea
index 2c44498555..4224f58c57 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/SafeRunner.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/SafeRunner.eea
@@ -5,4 +5,4 @@ run
  (Lorg/eclipse/core/runtime/ISafeRunnable;)V
 run
  <T:Ljava/lang/Object;>(Lorg/eclipse/core/runtime/ISafeRunnableWithResult<TT;>;)TT;
- <T:Ljava/lang/Object;>(Lorg/eclipse/core/runtime/ISafeRunnableWithResult<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Lorg/eclipse/core/runtime/ISafeRunnableWithResult<TT;>;)T0T;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/URIUtil.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/URIUtil.eea
index d5e3f0a421..4928ac6242 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/URIUtil.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/URIUtil.eea
@@ -32,16 +32,16 @@ toJarURI
  (Ljava/net/URI;Lorg/eclipse/core/runtime/IPath;)Ljava/net/URI;
 toURI
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/net/URI;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/net/URI;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1java/net/URI;
 toURI
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/net/URI;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/net/URI;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1java/net/URI;
 toURI
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/net/URI;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/net/URI;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1java/net/URI;
 toURI
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/net/URI;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/net/URI;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1java/net/URI;
 toURI
  (Ljava/net/URL;)Ljava/net/URI;
  (L1java/net/URL;)L1java/net/URI;
@@ -50,4 +50,4 @@ toURL
  (L1java/net/URI;)L1java/net/URL;
 toUnencodedString
  (Ljava/net/URI;)Ljava/lang/String;
- (Ljava/net/URI;)Ljava/lang/String;
+ (Ljava/net/URI;)L1java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/adaptor/EclipseStarter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/adaptor/EclipseStarter.eea
index 63ece69ab6..87bac6c77d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/adaptor/EclipseStarter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/adaptor/EclipseStarter.eea
@@ -87,7 +87,7 @@ getSysPath
  ()Ljava/lang/String;
 getSystemBundleContext
  ()Lorg/osgi/framework/BundleContext;
- ()Lorg/osgi/framework/BundleContext;
+ ()L0org/osgi/framework/BundleContext;
 main
  ([Ljava/lang/String;)V
  ([Ljava/lang/String;)V
@@ -96,7 +96,7 @@ run
  (Ljava/lang/Object;)Ljava/lang/Object;
 run
  ([Ljava/lang/String;Ljava/lang/Runnable;)Ljava/lang/Object;
- ([Ljava/lang/String;Ljava/lang/Runnable;)Ljava/lang/Object;
+ ([Ljava/lang/String;Ljava/lang/Runnable;)L0java/lang/Object;
 setInitialProperties
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)V
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/content/BinarySignatureDescriber.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/content/BinarySignatureDescriber.eea
index 5200b8d0ff..896889ac81 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/content/BinarySignatureDescriber.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/content/BinarySignatureDescriber.eea
@@ -5,7 +5,7 @@ describe
  (Ljava/io/InputStream;Lorg/eclipse/core/runtime/content/IContentDescription;)I
 getSupportedOptions
  ()[Lorg/eclipse/core/runtime/QualifiedName;
- ()[Lorg/eclipse/core/runtime/QualifiedName;
+ ()[1Lorg/eclipse/core/runtime/QualifiedName;
 setInitializationData
  (Lorg/eclipse/core/runtime/IConfigurationElement;Ljava/lang/String;Ljava/lang/Object;)V
  (Lorg/eclipse/core/runtime/IConfigurationElement;Ljava/lang/String;Ljava/lang/Object;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/dynamichelpers/ExtensionTracker.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/dynamichelpers/ExtensionTracker.eea
index bf4b4215cb..49d323188e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/dynamichelpers/ExtensionTracker.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/dynamichelpers/ExtensionTracker.eea
@@ -2,13 +2,13 @@ class org/eclipse/core/runtime/dynamichelpers/ExtensionTracker
 
 createExtensionPointFilter
  (Lorg/eclipse/core/runtime/IExtensionPoint;)Lorg/eclipse/core/runtime/dynamichelpers/IFilter;
- (Lorg/eclipse/core/runtime/IExtensionPoint;)Lorg/eclipse/core/runtime/dynamichelpers/IFilter;
+ (Lorg/eclipse/core/runtime/IExtensionPoint;)L1org/eclipse/core/runtime/dynamichelpers/IFilter;
 createExtensionPointFilter
  ([Lorg/eclipse/core/runtime/IExtensionPoint;)Lorg/eclipse/core/runtime/dynamichelpers/IFilter;
- ([Lorg/eclipse/core/runtime/IExtensionPoint;)Lorg/eclipse/core/runtime/dynamichelpers/IFilter;
+ ([Lorg/eclipse/core/runtime/IExtensionPoint;)L1org/eclipse/core/runtime/dynamichelpers/IFilter;
 createNamespaceFilter
  (Ljava/lang/String;)Lorg/eclipse/core/runtime/dynamichelpers/IFilter;
- (Ljava/lang/String;)Lorg/eclipse/core/runtime/dynamichelpers/IFilter;
+ (Ljava/lang/String;)L1org/eclipse/core/runtime/dynamichelpers/IFilter;
 
 <init>
  (Lorg/eclipse/core/runtime/IExtensionRegistry;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/jobs/IJobManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/jobs/IJobManager.eea
index 26dbfb482d..ea8e5ed415 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/jobs/IJobManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/jobs/IJobManager.eea
@@ -15,7 +15,7 @@ cancel
  (Ljava/lang/Object;)V
 createProgressGroup
  ()Lorg/eclipse/core/runtime/IProgressMonitor;
- ()Lorg/eclipse/core/runtime/IProgressMonitor;
+ ()L1org/eclipse/core/runtime/IProgressMonitor;
 currentJob
  ()Lorg/eclipse/core/runtime/jobs/Job;
  ()Lorg/eclipse/core/runtime/jobs/Job;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/jobs/ProgressProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/jobs/ProgressProvider.eea
index abc3582eb8..daa1991e39 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/jobs/ProgressProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/jobs/ProgressProvider.eea
@@ -2,16 +2,16 @@ class org/eclipse/core/runtime/jobs/ProgressProvider
 
 createMonitor
  (Lorg/eclipse/core/runtime/jobs/Job;)Lorg/eclipse/core/runtime/IProgressMonitor;
- (Lorg/eclipse/core/runtime/jobs/Job;)Lorg/eclipse/core/runtime/IProgressMonitor;
+ (Lorg/eclipse/core/runtime/jobs/Job;)L1org/eclipse/core/runtime/IProgressMonitor;
 createMonitor
  (Lorg/eclipse/core/runtime/jobs/Job;Lorg/eclipse/core/runtime/IProgressMonitor;I)Lorg/eclipse/core/runtime/IProgressMonitor;
- (Lorg/eclipse/core/runtime/jobs/Job;Lorg/eclipse/core/runtime/IProgressMonitor;I)Lorg/eclipse/core/runtime/IProgressMonitor;
+ (Lorg/eclipse/core/runtime/jobs/Job;Lorg/eclipse/core/runtime/IProgressMonitor;I)L1org/eclipse/core/runtime/IProgressMonitor;
 createProgressGroup
  ()Lorg/eclipse/core/runtime/IProgressMonitor;
- ()Lorg/eclipse/core/runtime/IProgressMonitor;
+ ()L1org/eclipse/core/runtime/IProgressMonitor;
 getDefaultMonitor
  ()Lorg/eclipse/core/runtime/IProgressMonitor;
- ()Lorg/eclipse/core/runtime/IProgressMonitor;
+ ()L1org/eclipse/core/runtime/IProgressMonitor;
 monitorFor
  (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/core/runtime/IProgressMonitor;
  (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/core/runtime/IProgressMonitor;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/preferences/AbstractPreferenceStorage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/preferences/AbstractPreferenceStorage.eea
index efe3a2e78b..de18c51c35 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/preferences/AbstractPreferenceStorage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/preferences/AbstractPreferenceStorage.eea
@@ -8,7 +8,7 @@ load
  (Ljava/lang/String;)Ljava/util/Properties;
 loadProperties
  (Ljava/io/InputStream;)Ljava/util/Properties;
- (Ljava/io/InputStream;)Ljava/util/Properties;
+ (Ljava/io/InputStream;)L1java/util/Properties;
 removed
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/preferences/IScope.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/preferences/IScope.eea
index bdd9bc8038..cc44a26c5d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/preferences/IScope.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/preferences/IScope.eea
@@ -2,4 +2,4 @@ class org/eclipse/core/runtime/preferences/IScope
 
 create
  (Lorg/eclipse/core/runtime/preferences/IEclipsePreferences;Ljava/lang/String;)Lorg/eclipse/core/runtime/preferences/IEclipsePreferences;
- (Lorg/eclipse/core/runtime/preferences/IEclipsePreferences;Ljava/lang/String;)Lorg/eclipse/core/runtime/preferences/IEclipsePreferences;
+ (Lorg/eclipse/core/runtime/preferences/IEclipsePreferences;Ljava/lang/String;)L1org/eclipse/core/runtime/preferences/IEclipsePreferences;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/spi/RegistryStrategy.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/spi/RegistryStrategy.eea
index 98988d6a3e..c8503096f8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/spi/RegistryStrategy.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/runtime/spi/RegistryStrategy.eea
@@ -2,20 +2,20 @@ class org/eclipse/core/runtime/spi/RegistryStrategy
 
 processChangeEvent
  ([Ljava/lang/Object;Ljava/util/Map<Ljava/lang/String;*>;Ljava/lang/Object;)Lorg/eclipse/core/runtime/IStatus;
- ([Ljava/lang/Object;Ljava/util/Map<Ljava/lang/String;*>;Ljava/lang/Object;)Lorg/eclipse/core/runtime/IStatus;
+ ([Ljava/lang/Object;Ljava/util/Map<Ljava/lang/String;*>;Ljava/lang/Object;)L0org/eclipse/core/runtime/IStatus;
 
 <init>
  ([Ljava/io/File;[Z)V
  ([Ljava/io/File;[Z)V
 createExecutableExtension
  (Lorg/eclipse/core/runtime/spi/RegistryContributor;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;
- (Lorg/eclipse/core/runtime/spi/RegistryContributor;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;
+ (Lorg/eclipse/core/runtime/spi/RegistryContributor;Ljava/lang/String;Ljava/lang/String;)L1java/lang/Object;
 getLocale
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStorage
  (I)Ljava/io/File;
- (I)Ljava/io/File;
+ (I)L0java/io/File;
 getXMLParser
  ()Ljavax/xml/parsers/SAXParserFactory;
  ()Ljavax/xml/parsers/SAXParserFactory;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/variables/VariablesPlugin.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/variables/VariablesPlugin.eea
index 99e9f618a3..b143d2c54d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/variables/VariablesPlugin.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/core/variables/VariablesPlugin.eea
@@ -9,7 +9,7 @@ getDefault
  ()Lorg/eclipse/core/variables/VariablesPlugin;
 getUniqueIdentifier
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 log
  (Ljava/lang/Throwable;)V
  (Ljava/lang/Throwable;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/DebugPlugin.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/DebugPlugin.eea
index 0920e42369..2450c655cd 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/DebugPlugin.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/DebugPlugin.eea
@@ -126,7 +126,7 @@ logMessage
  (Ljava/lang/String;Ljava/lang/Throwable;)V
 newDocument
  ()Lorg/w3c/dom/Document;
- ()Lorg/w3c/dom/Document;
+ ()L0org/w3c/dom/Document;
 newProcess
  (Lorg/eclipse/debug/core/ILaunch;Ljava/lang/Process;Ljava/lang/String;)Lorg/eclipse/debug/core/model/IProcess;
  (L1org/eclipse/debug/core/ILaunch;L1java/lang/Process;Ljava/lang/String;)L1org/eclipse/debug/core/model/IProcess;
@@ -144,7 +144,7 @@ renderArguments
  ([1Ljava/lang/String;[I)L1java/lang/String;
 serializeDocument
  (Lorg/w3c/dom/Document;)Ljava/lang/String;
- (Lorg/w3c/dom/Document;)Ljava/lang/String;
+ (Lorg/w3c/dom/Document;)L0java/lang/String;
 setDefaultStructureType
  ([Lorg/eclipse/debug/core/ILogicalStructureType;Lorg/eclipse/debug/core/ILogicalStructureType;)V
  ([Lorg/eclipse/debug/core/ILogicalStructureType;Lorg/eclipse/debug/core/ILogicalStructureType;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/RefreshUtil.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/RefreshUtil.eea
index fc707ca135..2110a31fd2 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/RefreshUtil.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/RefreshUtil.eea
@@ -30,7 +30,7 @@ refreshResources
  ([Lorg/eclipse/core/resources/IResource;ILorg/eclipse/core/runtime/IProgressMonitor;)V
 toMemento
  ([Lorg/eclipse/core/resources/IResource;)Ljava/lang/String;
- ([Lorg/eclipse/core/resources/IResource;)Ljava/lang/String;
+ ([Lorg/eclipse/core/resources/IResource;)L1java/lang/String;
 toResources
  (Ljava/lang/String;)[Lorg/eclipse/core/resources/IResource;
  (Ljava/lang/String;)[Lorg/eclipse/core/resources/IResource;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/commands/AbstractDebugCommand.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/commands/AbstractDebugCommand.eea
index a680d79a2f..27c3087cdb 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/commands/AbstractDebugCommand.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/commands/AbstractDebugCommand.eea
@@ -14,22 +14,22 @@ getAdapter
  (Ljava/lang/Object;Ljava/lang/Class<*>;)Ljava/lang/Object;
 getEnabledStateJobFamily
  (Lorg/eclipse/debug/core/commands/IDebugCommandRequest;)Ljava/lang/Object;
- (Lorg/eclipse/debug/core/commands/IDebugCommandRequest;)Ljava/lang/Object;
+ (Lorg/eclipse/debug/core/commands/IDebugCommandRequest;)L0java/lang/Object;
 getEnabledStateSchedulingRule
  (Lorg/eclipse/debug/core/commands/IDebugCommandRequest;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
  (Lorg/eclipse/debug/core/commands/IDebugCommandRequest;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
 getEnabledStateTaskName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getExecuteJobFamily
  (Lorg/eclipse/debug/core/commands/IDebugCommandRequest;)Ljava/lang/Object;
- (Lorg/eclipse/debug/core/commands/IDebugCommandRequest;)Ljava/lang/Object;
+ (Lorg/eclipse/debug/core/commands/IDebugCommandRequest;)L0java/lang/Object;
 getExecuteSchedulingRule
  (Lorg/eclipse/debug/core/commands/IDebugCommandRequest;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
- (Lorg/eclipse/debug/core/commands/IDebugCommandRequest;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
+ (Lorg/eclipse/debug/core/commands/IDebugCommandRequest;)L0org/eclipse/core/runtime/jobs/ISchedulingRule;
 getExecuteTaskName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getTarget
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/model/LaunchConfigurationDelegate.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/model/LaunchConfigurationDelegate.eea
index c72439382a..d7a09baeca 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/model/LaunchConfigurationDelegate.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/model/LaunchConfigurationDelegate.eea
@@ -39,16 +39,16 @@ finalLaunchCheck
  (Lorg/eclipse/debug/core/ILaunchConfiguration;Ljava/lang/String;Lorg/eclipse/core/runtime/IProgressMonitor;)Z
 getBreakpoints
  (Lorg/eclipse/debug/core/ILaunchConfiguration;)[Lorg/eclipse/debug/core/model/IBreakpoint;
- (Lorg/eclipse/debug/core/ILaunchConfiguration;)[Lorg/eclipse/debug/core/model/IBreakpoint;
+ (Lorg/eclipse/debug/core/ILaunchConfiguration;)[0Lorg/eclipse/debug/core/model/IBreakpoint;
 getBuildOrder
  (Lorg/eclipse/debug/core/ILaunchConfiguration;Ljava/lang/String;)[Lorg/eclipse/core/resources/IProject;
- (Lorg/eclipse/debug/core/ILaunchConfiguration;Ljava/lang/String;)[Lorg/eclipse/core/resources/IProject;
+ (Lorg/eclipse/debug/core/ILaunchConfiguration;Ljava/lang/String;)[0Lorg/eclipse/core/resources/IProject;
 getLaunch
  (Lorg/eclipse/debug/core/ILaunchConfiguration;Ljava/lang/String;)Lorg/eclipse/debug/core/ILaunch;
- (Lorg/eclipse/debug/core/ILaunchConfiguration;Ljava/lang/String;)Lorg/eclipse/debug/core/ILaunch;
+ (Lorg/eclipse/debug/core/ILaunchConfiguration;Ljava/lang/String;)L0org/eclipse/debug/core/ILaunch;
 getProjectsForProblemSearch
  (Lorg/eclipse/debug/core/ILaunchConfiguration;Ljava/lang/String;)[Lorg/eclipse/core/resources/IProject;
- (Lorg/eclipse/debug/core/ILaunchConfiguration;Ljava/lang/String;)[Lorg/eclipse/core/resources/IProject;
+ (Lorg/eclipse/debug/core/ILaunchConfiguration;Ljava/lang/String;)[0Lorg/eclipse/core/resources/IProject;
 isLaunchProblem
  (Lorg/eclipse/core/resources/IMarker;)Z
  (Lorg/eclipse/core/resources/IMarker;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/model/RuntimeProcess.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/model/RuntimeProcess.eea
index 4feaf30a65..27d2a4dfd2 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/model/RuntimeProcess.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/model/RuntimeProcess.eea
@@ -5,7 +5,7 @@ class org/eclipse/debug/core/model/RuntimeProcess
  (Lorg/eclipse/debug/core/ILaunch;Ljava/lang/Process;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)V
 createStreamsProxy
  ()Lorg/eclipse/debug/core/model/IStreamsProxy;
- ()Lorg/eclipse/debug/core/model/IStreamsProxy;
+ ()L1org/eclipse/debug/core/model/IStreamsProxy;
 fireEvent
  (Lorg/eclipse/debug/core/DebugEvent;)V
  (Lorg/eclipse/debug/core/DebugEvent;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupDirector.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupDirector.eea
index 1d80004ee3..f22e99277c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupDirector.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupDirector.eea
@@ -70,7 +70,7 @@ findSourceElements
  (Ljava/lang/Object;)[Ljava/lang/Object;
 getCachedElement
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L0java/lang/Object;
 getCurrentParticipant
  ()Lorg/eclipse/debug/core/sourcelookup/ISourceLookupParticipant;
  ()Lorg/eclipse/debug/core/sourcelookup/ISourceLookupParticipant;
@@ -88,10 +88,10 @@ getParticipants
  ()[Lorg/eclipse/debug/core/sourcelookup/ISourceLookupParticipant;
 getSourceContainers
  ()[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
- ()[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
+ ()[1Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
 getSourceElement
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L0java/lang/Object;
 getSourceElement
  (Lorg/eclipse/debug/core/model/IStackFrame;)Ljava/lang/Object;
  (Lorg/eclipse/debug/core/model/IStackFrame;)Ljava/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/ISourceContainerTypeDelegate.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/ISourceContainerTypeDelegate.eea
index 5841d61a44..d9aa21208c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/ISourceContainerTypeDelegate.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/ISourceContainerTypeDelegate.eea
@@ -2,7 +2,7 @@ class org/eclipse/debug/core/sourcelookup/ISourceContainerTypeDelegate
 
 createSourceContainer
  (Ljava/lang/String;)Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
- (Ljava/lang/String;)Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
+ (Ljava/lang/String;)L1org/eclipse/debug/core/sourcelookup/ISourceContainer;
 getMemento
  (Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;)Ljava/lang/String;
  (Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/AbstractSourceContainer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/AbstractSourceContainer.eea
index 250ec9da78..7b4e3c6dfc 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/AbstractSourceContainer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/AbstractSourceContainer.eea
@@ -15,7 +15,7 @@ getSourceContainerType
  (Ljava/lang/String;)Lorg/eclipse/debug/core/sourcelookup/ISourceContainerType;
 getSourceContainers
  ()[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
- ()[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
+ ()[1Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
 init
  (Lorg/eclipse/debug/core/sourcelookup/ISourceLookupDirector;)V
  (Lorg/eclipse/debug/core/sourcelookup/ISourceLookupDirector;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/CompositeSourceContainer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/CompositeSourceContainer.eea
index 7848984efd..078c80e13e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/CompositeSourceContainer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/CompositeSourceContainer.eea
@@ -2,7 +2,7 @@ class org/eclipse/debug/core/sourcelookup/containers/CompositeSourceContainer
 
 createSourceContainers
  ()[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
- ()[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
+ ()[1Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
 findSourceElements
  (Ljava/lang/String;)[Ljava/lang/Object;
  (L1java/lang/String;)[1Ljava/lang/Object; # @Inherited(org.eclipse.debug.core.sourcelookup.ISourceContainer)
@@ -11,4 +11,4 @@ findSourceElements
  (Ljava/lang/String;[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;)[Ljava/lang/Object;
 getSourceContainers
  ()[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
- ()[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
+ ()[1Lorg/eclipse/debug/core/sourcelookup/ISourceContainer; # @Inherited(org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainer)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/ContainerSourceContainer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/ContainerSourceContainer.eea
index 98eff11fef..2f6da84419 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/ContainerSourceContainer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/ContainerSourceContainer.eea
@@ -5,7 +5,7 @@ class org/eclipse/debug/core/sourcelookup/containers/ContainerSourceContainer
  (Lorg/eclipse/core/resources/IContainer;Z)V
 createSourceContainers
  ()[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
- ()[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
+ ()[1Lorg/eclipse/debug/core/sourcelookup/ISourceContainer; # @Inherited(org.eclipse.debug.core.sourcelookup.containers.CompositeSourceContainer)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/DefaultSourceContainer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/DefaultSourceContainer.eea
index b7490c8d9a..49bc1f3c87 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/DefaultSourceContainer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/DefaultSourceContainer.eea
@@ -6,13 +6,13 @@ TYPE_ID
 
 createSourceContainers
  ()[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
- ()[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
+ ()[1Lorg/eclipse/debug/core/sourcelookup/ISourceContainer; # @Inherited(org.eclipse.debug.core.sourcelookup.containers.CompositeSourceContainer)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getLaunchConfiguration
  ()Lorg/eclipse/debug/core/ILaunchConfiguration;
- ()Lorg/eclipse/debug/core/ILaunchConfiguration;
+ ()L0org/eclipse/debug/core/ILaunchConfiguration;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/DirectorySourceContainer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/DirectorySourceContainer.eea
index c3b87097d2..048e3767c7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/DirectorySourceContainer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/DirectorySourceContainer.eea
@@ -12,7 +12,7 @@ TYPE_ID
  (Lorg/eclipse/core/runtime/IPath;Z)V
 createSourceContainers
  ()[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
- ()[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
+ ()[1Lorg/eclipse/debug/core/sourcelookup/ISourceContainer; # @Inherited(org.eclipse.debug.core.sourcelookup.containers.CompositeSourceContainer)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/LocalFileStorage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/LocalFileStorage.eea
index 11e5f1380d..be6dfd4bce 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/LocalFileStorage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/LocalFileStorage.eea
@@ -8,13 +8,13 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getContents
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
 getFile
  ()Ljava/io/File;
  ()Ljava/io/File;
 getFullPath
  ()Lorg/eclipse/core/runtime/IPath;
- ()Lorg/eclipse/core/runtime/IPath;
+ ()L0org/eclipse/core/runtime/IPath;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/ProjectSourceContainer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/ProjectSourceContainer.eea
index 7473caa63f..83779e06ca 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/ProjectSourceContainer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/ProjectSourceContainer.eea
@@ -9,7 +9,7 @@ TYPE_ID
  (Lorg/eclipse/core/resources/IProject;Z)V
 createSourceContainers
  ()[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
- ()[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
+ ()[1Lorg/eclipse/debug/core/sourcelookup/ISourceContainer; # @Inherited(org.eclipse.debug.core.sourcelookup.containers.ContainerSourceContainer)
 getProject
  ()Lorg/eclipse/core/resources/IProject;
  ()Lorg/eclipse/core/resources/IProject;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/WorkspaceSourceContainer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/WorkspaceSourceContainer.eea
index 58ddf4a610..4a03585e2c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/WorkspaceSourceContainer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/core/sourcelookup/containers/WorkspaceSourceContainer.eea
@@ -6,7 +6,7 @@ TYPE_ID
 
 createSourceContainers
  ()[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
- ()[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
+ ()[1Lorg/eclipse/debug/core/sourcelookup/ISourceContainer; # @Inherited(org.eclipse.debug.core.sourcelookup.containers.CompositeSourceContainer)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/AbstractBreakpointOrganizerDelegate.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/AbstractBreakpointOrganizerDelegate.eea
index af068fe256..f3e1c45f10 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/AbstractBreakpointOrganizerDelegate.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/AbstractBreakpointOrganizerDelegate.eea
@@ -17,7 +17,7 @@ fireCategoryChanged
  (Lorg/eclipse/core/runtime/IAdaptable;)V
 getCategories
  ()[Lorg/eclipse/core/runtime/IAdaptable;
- ()[Lorg/eclipse/core/runtime/IAdaptable;
+ ()[0Lorg/eclipse/core/runtime/IAdaptable;
 removeBreakpoint
  (Lorg/eclipse/debug/core/model/IBreakpoint;Lorg/eclipse/core/runtime/IAdaptable;)V
  (Lorg/eclipse/debug/core/model/IBreakpoint;Lorg/eclipse/core/runtime/IAdaptable;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/AbstractDebugView.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/AbstractDebugView.eea
index 583f104eb4..1326522f36 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/AbstractDebugView.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/AbstractDebugView.eea
@@ -17,16 +17,16 @@ createContextMenu
  (Lorg/eclipse/swt/widgets/Control;)V
 createDefaultPage
  (Lorg/eclipse/ui/part/PageBook;)Lorg/eclipse/ui/part/IPage;
- (Lorg/eclipse/ui/part/PageBook;)Lorg/eclipse/ui/part/IPage;
+ (Lorg/eclipse/ui/part/PageBook;)L1org/eclipse/ui/part/IPage; # @Inherited(org.eclipse.ui.part.PageBookView)
 createPartControl
  (Lorg/eclipse/swt/widgets/Composite;)V
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.ui.part.PageBookView)
 createViewer
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/viewers/Viewer;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/viewers/Viewer;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/jface/viewers/Viewer;
 doCreatePage
  (Lorg/eclipse/ui/IWorkbenchPart;)Lorg/eclipse/ui/part/PageBookView$PageRec;
- (Lorg/eclipse/ui/IWorkbenchPart;)Lorg/eclipse/ui/part/PageBookView$PageRec;
+ (Lorg/eclipse/ui/IWorkbenchPart;)L0org/eclipse/ui/part/PageBookView$PageRec;
 doDestroyPage
  (Lorg/eclipse/ui/IWorkbenchPart;Lorg/eclipse/ui/part/PageBookView$PageRec;)V
  (Lorg/eclipse/ui/IWorkbenchPart;Lorg/eclipse/ui/part/PageBookView$PageRec;)V
@@ -41,7 +41,7 @@ findView
  (Ljava/lang/String;)Lorg/eclipse/ui/IViewPart;
 generatePreferenceKey
  (Lorg/eclipse/jface/action/IAction;)Ljava/lang/String;
- (Lorg/eclipse/jface/action/IAction;)Ljava/lang/String;
+ (Lorg/eclipse/jface/action/IAction;)L1java/lang/String;
 getAction
  (Ljava/lang/String;)Lorg/eclipse/jface/action/IAction;
  (Ljava/lang/String;)Lorg/eclipse/jface/action/IAction;
@@ -50,10 +50,10 @@ getAdapter
  <T:Ljava/lang/Object;>(L1java/lang/Class<TT;>;)T0T; # @Inherited(org.eclipse.ui.part.PageBookView)
 getBootstrapPart
  ()Lorg/eclipse/ui/IWorkbenchPart;
- ()Lorg/eclipse/ui/IWorkbenchPart;
+ ()L0org/eclipse/ui/IWorkbenchPart;
 getContextMenuManager
  ()Lorg/eclipse/jface/action/IMenuManager;
- ()Lorg/eclipse/jface/action/IMenuManager;
+ ()L0org/eclipse/jface/action/IMenuManager;
 getContextMenuManagers
  ()Ljava/util/List<Lorg/eclipse/jface/action/IMenuManager;>;
  ()Ljava/util/List<Lorg/eclipse/jface/action/IMenuManager;>;
@@ -62,7 +62,7 @@ getControl
  ()Lorg/eclipse/swt/widgets/Control;
 getDefaultControl
  ()Lorg/eclipse/swt/widgets/Control;
- ()Lorg/eclipse/swt/widgets/Control;
+ ()L0org/eclipse/swt/widgets/Control;
 getHelpContextId
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -77,16 +77,16 @@ getPreferenceStore
  ()Lorg/eclipse/jface/preference/IPreferenceStore;
 getPresentation
  (Ljava/lang/String;)Lorg/eclipse/debug/ui/IDebugModelPresentation;
- (Ljava/lang/String;)Lorg/eclipse/debug/ui/IDebugModelPresentation;
+ (Ljava/lang/String;)L0org/eclipse/debug/ui/IDebugModelPresentation;
 getPresentationAttributes
  (Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
  (Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 getStructuredViewer
  ()Lorg/eclipse/jface/viewers/StructuredViewer;
- ()Lorg/eclipse/jface/viewers/StructuredViewer;
+ ()L0org/eclipse/jface/viewers/StructuredViewer;
 getTextViewer
  ()Lorg/eclipse/jface/text/TextViewer;
- ()Lorg/eclipse/jface/text/TextViewer;
+ ()L0org/eclipse/jface/text/TextViewer;
 getViewer
  ()Lorg/eclipse/jface/viewers/Viewer;
  ()Lorg/eclipse/jface/viewers/Viewer;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/AbstractLaunchConfigurationTab.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/AbstractLaunchConfigurationTab.eea
index 9ffc162150..4dcf02e491 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/AbstractLaunchConfigurationTab.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/AbstractLaunchConfigurationTab.eea
@@ -5,19 +5,19 @@ activated
  (L1org/eclipse/debug/core/ILaunchConfigurationWorkingCopy;)V # @Inherited(org.eclipse.debug.ui.ILaunchConfigurationTab)
 createCheckButton
  (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)Lorg/eclipse/swt/widgets/Button;
- (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)Lorg/eclipse/swt/widgets/Button;
+ (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)L1org/eclipse/swt/widgets/Button;
 createPushButton
  (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;Lorg/eclipse/swt/graphics/Image;)Lorg/eclipse/swt/widgets/Button;
- (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;Lorg/eclipse/swt/graphics/Image;)Lorg/eclipse/swt/widgets/Button;
+ (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;Lorg/eclipse/swt/graphics/Image;)L1org/eclipse/swt/widgets/Button;
 createRadioButton
  (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)Lorg/eclipse/swt/widgets/Button;
- (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)Lorg/eclipse/swt/widgets/Button;
+ (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)L1org/eclipse/swt/widgets/Button;
 createSeparator
  (Lorg/eclipse/swt/widgets/Composite;I)V
  (Lorg/eclipse/swt/widgets/Composite;I)V
 createUpdateJob
  ()Lorg/eclipse/core/runtime/jobs/Job;
- ()Lorg/eclipse/core/runtime/jobs/Job;
+ ()L1org/eclipse/core/runtime/jobs/Job;
 createVerticalSpacer
  (Lorg/eclipse/swt/widgets/Composite;I)V
  (Lorg/eclipse/swt/widgets/Composite;I)V
@@ -26,7 +26,7 @@ deactivated
  (L1org/eclipse/debug/core/ILaunchConfigurationWorkingCopy;)V # @Inherited(org.eclipse.debug.ui.ILaunchConfigurationTab)
 getAttributeLabel
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getAttributesLabelsForPrototype
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
@@ -41,10 +41,10 @@ getHelpContextId
  ()Ljava/lang/String;
 getId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getImage
  ()Lorg/eclipse/swt/graphics/Image;
- ()Lorg/eclipse/swt/graphics/Image;
+ ()L0org/eclipse/swt/graphics/Image;
 getLaunchConfigurationDialog
  ()Lorg/eclipse/debug/ui/ILaunchConfigurationDialog;
  ()Lorg/eclipse/debug/ui/ILaunchConfigurationDialog;
@@ -56,7 +56,7 @@ getMessage
  ()Ljava/lang/String;
 getShell
  ()Lorg/eclipse/swt/widgets/Shell;
- ()Lorg/eclipse/swt/widgets/Shell;
+ ()L0org/eclipse/swt/widgets/Shell;
 getWarningMessage
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/BreakpointTypeCategory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/BreakpointTypeCategory.eea
index be424d8177..507e042906 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/BreakpointTypeCategory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/BreakpointTypeCategory.eea
@@ -11,7 +11,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getChildren
  (Ljava/lang/Object;)[Ljava/lang/Object;
- (Ljava/lang/Object;)[Ljava/lang/Object;
+ (Ljava/lang/Object;)[0Ljava/lang/Object;
 getImageDescriptor
  (Ljava/lang/Object;)Lorg/eclipse/jface/resource/ImageDescriptor;
  (Ljava/lang/Object;)Lorg/eclipse/jface/resource/ImageDescriptor;
@@ -23,7 +23,7 @@ getName
  ()Ljava/lang/String;
 getParent
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L0java/lang/Object;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/CommonTab.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/CommonTab.eea
index 7dd7321e08..b66536335b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/CommonTab.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/CommonTab.eea
@@ -18,10 +18,10 @@ deactivated
  (L1org/eclipse/debug/core/ILaunchConfigurationWorkingCopy;)V # @Inherited(org.eclipse.debug.ui.AbstractLaunchConfigurationTab)
 getId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(org.eclipse.debug.ui.AbstractLaunchConfigurationTab)
 getImage
  ()Lorg/eclipse/swt/graphics/Image;
- ()Lorg/eclipse/swt/graphics/Image;
+ ()L0org/eclipse/swt/graphics/Image; # @Inherited(org.eclipse.debug.ui.AbstractLaunchConfigurationTab)
 getLaunchConfigurationManager
  ()Lorg/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager;
  ()Lorg/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/DebugPopup.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/DebugPopup.eea
index eca54f68fb..d99cab97b7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/DebugPopup.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/DebugPopup.eea
@@ -8,16 +8,16 @@ createDialogArea
  (L1org/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.jface.dialogs.PopupDialog)
 getActionText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getCommandId
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getDialogSettings
  ()Lorg/eclipse/jface/dialogs/IDialogSettings;
- ()Lorg/eclipse/jface/dialogs/IDialogSettings;
+ ()L0org/eclipse/jface/dialogs/IDialogSettings; # @Inherited(org.eclipse.jface.dialogs.PopupDialog)
 getInfoText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getInitialLocation
  (Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/graphics/Point;
  (L1org/eclipse/swt/graphics/Point;)L1org/eclipse/swt/graphics/Point; # @Inherited(org.eclipse.jface.dialogs.PopupDialog)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/DebugUITools.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/DebugUITools.eea
index 7614f95291..14e6946abe 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/DebugUITools.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/DebugUITools.eea
@@ -17,31 +17,31 @@ getBreakpointsUndoContext
  ()Lorg/eclipse/core/commands/operations/IUndoContext;
 getConsole
  (Lorg/eclipse/debug/core/model/IDebugElement;)Lorg/eclipse/ui/console/IConsole;
- (Lorg/eclipse/debug/core/model/IDebugElement;)Lorg/eclipse/ui/console/IConsole;
+ (Lorg/eclipse/debug/core/model/IDebugElement;)L0org/eclipse/ui/console/IConsole;
 getConsole
  (Lorg/eclipse/debug/core/model/IProcess;)Lorg/eclipse/ui/console/IConsole;
  (Lorg/eclipse/debug/core/model/IProcess;)Lorg/eclipse/ui/console/IConsole;
 getCurrentProcess
  ()Lorg/eclipse/debug/core/model/IProcess;
- ()Lorg/eclipse/debug/core/model/IProcess;
+ ()L0org/eclipse/debug/core/model/IProcess;
 getDebugContext
  ()Lorg/eclipse/core/runtime/IAdaptable;
- ()Lorg/eclipse/core/runtime/IAdaptable;
+ ()L0org/eclipse/core/runtime/IAdaptable;
 getDebugContextForEvent
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/jface/viewers/ISelection;
- (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/jface/viewers/ISelection;
+ (Lorg/eclipse/core/commands/ExecutionEvent;)L0org/eclipse/jface/viewers/ISelection;
 getDebugContextForEventChecked
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/jface/viewers/ISelection;
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/jface/viewers/ISelection;
 getDebugContextForPart
  (Lorg/eclipse/ui/IWorkbenchPart;)Lorg/eclipse/jface/viewers/ISelection;
- (Lorg/eclipse/ui/IWorkbenchPart;)Lorg/eclipse/jface/viewers/ISelection;
+ (Lorg/eclipse/ui/IWorkbenchPart;)L0org/eclipse/jface/viewers/ISelection;
 getDebugContextManager
  ()Lorg/eclipse/debug/ui/contexts/IDebugContextManager;
  ()Lorg/eclipse/debug/ui/contexts/IDebugContextManager;
 getDefaultImageDescriptor
  (Ljava/lang/Object;)Lorg/eclipse/jface/resource/ImageDescriptor;
- (Ljava/lang/Object;)Lorg/eclipse/jface/resource/ImageDescriptor;
+ (Ljava/lang/Object;)L0org/eclipse/jface/resource/ImageDescriptor;
 getImage
  (Ljava/lang/String;)Lorg/eclipse/swt/graphics/Image;
  (Ljava/lang/String;)Lorg/eclipse/swt/graphics/Image;
@@ -53,10 +53,10 @@ getLastLaunch
  (Ljava/lang/String;)Lorg/eclipse/debug/core/ILaunchConfiguration;
 getLaunchConfiguration
  (Lorg/eclipse/debug/ui/ILaunchConfigurationDialog;)Lorg/eclipse/debug/core/ILaunchConfiguration;
- (Lorg/eclipse/debug/ui/ILaunchConfigurationDialog;)Lorg/eclipse/debug/core/ILaunchConfiguration;
+ (Lorg/eclipse/debug/ui/ILaunchConfigurationDialog;)L0org/eclipse/debug/core/ILaunchConfiguration;
 getLaunchGroup
  (Lorg/eclipse/debug/core/ILaunchConfiguration;Ljava/lang/String;)Lorg/eclipse/debug/ui/ILaunchGroup;
- (Lorg/eclipse/debug/core/ILaunchConfiguration;Ljava/lang/String;)Lorg/eclipse/debug/ui/ILaunchGroup;
+ (Lorg/eclipse/debug/core/ILaunchConfiguration;Ljava/lang/String;)L0org/eclipse/debug/ui/ILaunchGroup;
 getLaunchGroups
  ()[Lorg/eclipse/debug/ui/ILaunchGroup;
  ()[Lorg/eclipse/debug/ui/ILaunchGroup;
@@ -104,10 +104,10 @@ lookupSource
  (Ljava/lang/Object;Lorg/eclipse/debug/core/model/ISourceLocator;)Lorg/eclipse/debug/ui/sourcelookup/ISourceLookupResult;
 newDebugModelPresentation
  ()Lorg/eclipse/debug/ui/IDebugModelPresentation;
- ()Lorg/eclipse/debug/ui/IDebugModelPresentation;
+ ()L1org/eclipse/debug/ui/IDebugModelPresentation;
 newDebugModelPresentation
  (Ljava/lang/String;)Lorg/eclipse/debug/ui/IDebugModelPresentation;
- (Ljava/lang/String;)Lorg/eclipse/debug/ui/IDebugModelPresentation;
+ (Ljava/lang/String;)L0org/eclipse/debug/ui/IDebugModelPresentation;
 openLaunchConfigurationDialog
  (Lorg/eclipse/swt/widgets/Shell;Lorg/eclipse/debug/core/ILaunchConfiguration;Ljava/lang/String;Lorg/eclipse/core/runtime/IStatus;)I
  (Lorg/eclipse/swt/widgets/Shell;Lorg/eclipse/debug/core/ILaunchConfiguration;Ljava/lang/String;Lorg/eclipse/core/runtime/IStatus;)I
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/DeferredDebugElementWorkbenchAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/DeferredDebugElementWorkbenchAdapter.eea
index db2f40eee2..11a547e6ae 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/DeferredDebugElementWorkbenchAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/DeferredDebugElementWorkbenchAdapter.eea
@@ -9,4 +9,4 @@ fetchDeferredChildren
  (Ljava/lang/Object;Lorg/eclipse/ui/progress/IElementCollector;Lorg/eclipse/core/runtime/IProgressMonitor;)V
 getRule
  (Ljava/lang/Object;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
- (Ljava/lang/Object;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
+ (Ljava/lang/Object;)L0org/eclipse/core/runtime/jobs/ISchedulingRule;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/EnvironmentTab.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/EnvironmentTab.eea
index 6fa1d511f1..d33f97f07a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/EnvironmentTab.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/EnvironmentTab.eea
@@ -64,10 +64,10 @@ deactivated
  (L1org/eclipse/debug/core/ILaunchConfigurationWorkingCopy;)V # @Inherited(org.eclipse.debug.ui.AbstractLaunchConfigurationTab)
 getId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(org.eclipse.debug.ui.AbstractLaunchConfigurationTab)
 getImage
  ()Lorg/eclipse/swt/graphics/Image;
- ()Lorg/eclipse/swt/graphics/Image;
+ ()L0org/eclipse/swt/graphics/Image; # @Inherited(org.eclipse.debug.ui.AbstractLaunchConfigurationTab)
 getName
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(org.eclipse.debug.ui.ILaunchConfigurationTab)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/IDetailPaneFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/IDetailPaneFactory.eea
index 8401e7a48d..60979837fe 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/IDetailPaneFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/IDetailPaneFactory.eea
@@ -2,7 +2,7 @@ class org/eclipse/debug/ui/IDetailPaneFactory
 
 createDetailPane
  (Ljava/lang/String;)Lorg/eclipse/debug/ui/IDetailPane;
- (Ljava/lang/String;)Lorg/eclipse/debug/ui/IDetailPane;
+ (Ljava/lang/String;)L1org/eclipse/debug/ui/IDetailPane;
 getDefaultDetailPane
  (Lorg/eclipse/jface/viewers/IStructuredSelection;)Ljava/lang/String;
  (Lorg/eclipse/jface/viewers/IStructuredSelection;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/InspectPopupDialog.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/InspectPopupDialog.eea
index 71710f19fc..4aac10fada 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/InspectPopupDialog.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/InspectPopupDialog.eea
@@ -8,7 +8,7 @@ createDialogArea
  (L1org/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.debug.ui.DebugPopup)
 getActionText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(org.eclipse.debug.ui.DebugPopup)
 getBackgroundColorExclusions
  ()Ljava/util/List<Lorg/eclipse/swt/widgets/Control;>;
  ()Ljava/util/List<Lorg/eclipse/swt/widgets/Control;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/PrototypeTab.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/PrototypeTab.eea
index f965dbde81..f860675e82 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/PrototypeTab.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/PrototypeTab.eea
@@ -11,10 +11,10 @@ deactivated
  (L1org/eclipse/debug/core/ILaunchConfigurationWorkingCopy;)V # @Inherited(org.eclipse.debug.ui.AbstractLaunchConfigurationTab)
 getId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(org.eclipse.debug.ui.AbstractLaunchConfigurationTab)
 getImage
  ()Lorg/eclipse/swt/graphics/Image;
- ()Lorg/eclipse/swt/graphics/Image;
+ ()L0org/eclipse/swt/graphics/Image; # @Inherited(org.eclipse.debug.ui.AbstractLaunchConfigurationTab)
 getName
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(org.eclipse.debug.ui.ILaunchConfigurationTab)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/RefreshTab.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/RefreshTab.eea
index c19886d654..e40018526f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/RefreshTab.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/RefreshTab.eea
@@ -18,7 +18,7 @@ getRefreshScope
  (Lorg/eclipse/debug/core/ILaunchConfiguration;)Ljava/lang/String;
 getWorkingSet
  (Ljava/lang/String;)Lorg/eclipse/ui/IWorkingSet;
- (Ljava/lang/String;)Lorg/eclipse/ui/IWorkingSet;
+ (Ljava/lang/String;)L0org/eclipse/ui/IWorkingSet;
 isRefreshRecursive
  (Lorg/eclipse/debug/core/ILaunchConfiguration;)Z
  (Lorg/eclipse/debug/core/ILaunchConfiguration;)Z
@@ -37,10 +37,10 @@ deactivated
  (L1org/eclipse/debug/core/ILaunchConfigurationWorkingCopy;)V # @Inherited(org.eclipse.debug.ui.AbstractLaunchConfigurationTab)
 getId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(org.eclipse.debug.ui.AbstractLaunchConfigurationTab)
 getImage
  ()Lorg/eclipse/swt/graphics/Image;
- ()Lorg/eclipse/swt/graphics/Image;
+ ()L0org/eclipse/swt/graphics/Image; # @Inherited(org.eclipse.debug.ui.AbstractLaunchConfigurationTab)
 getName
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(org.eclipse.debug.ui.ILaunchConfigurationTab)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/StringVariableSelectionDialog.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/StringVariableSelectionDialog.eea
index 14d051830c..bd51606fc6 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/StringVariableSelectionDialog.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/StringVariableSelectionDialog.eea
@@ -17,7 +17,7 @@ getDialogBoundsSettings
  ()L0org/eclipse/jface/dialogs/IDialogSettings; # @Inherited(org.eclipse.ui.dialogs.SelectionDialog)
 getVariableExpression
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 setFilters
  ([Lorg/eclipse/debug/ui/StringVariableSelectionDialog$VariableFilter;)V
  ([Lorg/eclipse/debug/ui/StringVariableSelectionDialog$VariableFilter;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/WorkingDirectoryBlock.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/WorkingDirectoryBlock.eea
index 35f101a482..e96a9fe213 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/WorkingDirectoryBlock.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/WorkingDirectoryBlock.eea
@@ -11,7 +11,7 @@ createControl
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.debug.ui.ILaunchConfigurationTab)
 getContainer
  ()Lorg/eclipse/core/resources/IContainer;
- ()Lorg/eclipse/core/resources/IContainer;
+ ()L0org/eclipse/core/resources/IContainer;
 getLaunchConfiguration
  ()Lorg/eclipse/debug/core/ILaunchConfiguration;
  ()Lorg/eclipse/debug/core/ILaunchConfiguration;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/AbstractLaunchToolbarAction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/AbstractLaunchToolbarAction.eea
index 36df3fcc0a..23ab2ea828 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/AbstractLaunchToolbarAction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/AbstractLaunchToolbarAction.eea
@@ -8,7 +8,7 @@ fillMenu
  (Lorg/eclipse/swt/widgets/Menu;)V
 getOpenDialogAction
  ()Lorg/eclipse/jface/action/IAction;
- ()Lorg/eclipse/jface/action/IAction;
+ ()L1org/eclipse/jface/action/IAction;
 run
  (Lorg/eclipse/jface/action/IAction;)V
  (Lorg/eclipse/jface/action/IAction;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/ContextualLaunchAction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/ContextualLaunchAction.eea
index 1ad7b252bd..938398d397 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/ContextualLaunchAction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/ContextualLaunchAction.eea
@@ -11,10 +11,10 @@ getLaunchManager
  ()Lorg/eclipse/debug/core/ILaunchManager;
 getMenu
  (Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/widgets/Menu;
- (Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/widgets/Menu;
+ (Lorg/eclipse/swt/widgets/Control;)L0org/eclipse/swt/widgets/Menu;
 getMenu
  (Lorg/eclipse/swt/widgets/Menu;)Lorg/eclipse/swt/widgets/Menu;
- (Lorg/eclipse/swt/widgets/Menu;)Lorg/eclipse/swt/widgets/Menu;
+ (Lorg/eclipse/swt/widgets/Menu;)L1org/eclipse/swt/widgets/Menu;
 run
  (Lorg/eclipse/jface/action/IAction;)V
  (Lorg/eclipse/jface/action/IAction;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/DebugAction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/DebugAction.eea
index c513fe0b28..30922dd174 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/DebugAction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/DebugAction.eea
@@ -2,4 +2,4 @@ class org/eclipse/debug/ui/actions/DebugAction
 
 getMode
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/ExportBreakpointsOperation.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/ExportBreakpointsOperation.eea
index 6e8a315a80..3c57de0d45 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/ExportBreakpointsOperation.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/ExportBreakpointsOperation.eea
@@ -8,7 +8,7 @@ class org/eclipse/debug/ui/actions/ExportBreakpointsOperation
  ([Lorg/eclipse/debug/core/model/IBreakpoint;Ljava/lang/String;)V
 getBuffer
  ()Ljava/lang/StringBuffer;
- ()Ljava/lang/StringBuffer;
+ ()L0java/lang/StringBuffer;
 run
  (Lorg/eclipse/core/runtime/IProgressMonitor;)V
  (Lorg/eclipse/core/runtime/IProgressMonitor;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/IWatchExpressionFactoryAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/IWatchExpressionFactoryAdapter.eea
index 73a140480d..030c3f6730 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/IWatchExpressionFactoryAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/IWatchExpressionFactoryAdapter.eea
@@ -2,4 +2,4 @@ class org/eclipse/debug/ui/actions/IWatchExpressionFactoryAdapter
 
 createWatchExpression
  (Lorg/eclipse/debug/core/model/IVariable;)Ljava/lang/String;
- (Lorg/eclipse/debug/core/model/IVariable;)Ljava/lang/String;
+ (Lorg/eclipse/debug/core/model/IVariable;)L1java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/IWatchExpressionFactoryAdapter2.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/IWatchExpressionFactoryAdapter2.eea
index c1a48e5443..1953b059d8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/IWatchExpressionFactoryAdapter2.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/IWatchExpressionFactoryAdapter2.eea
@@ -5,4 +5,4 @@ canCreateWatchExpression
  (Ljava/lang/Object;)Z
 createWatchExpression
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/ImportBreakpointsOperation.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/ImportBreakpointsOperation.eea
index 4df85b7434..d482fa88c9 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/ImportBreakpointsOperation.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/ImportBreakpointsOperation.eea
@@ -14,10 +14,10 @@ class org/eclipse/debug/ui/actions/ImportBreakpointsOperation
  (Ljava/lang/StringBuffer;ZZZ)V
 collectBreakpointProperties
  (Lorg/eclipse/ui/IMemento;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- (Lorg/eclipse/ui/IMemento;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ (Lorg/eclipse/ui/IMemento;)L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 findExistingMarker
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;[Lorg/eclipse/debug/core/model/IBreakpointImportParticipant;)Lorg/eclipse/core/resources/IMarker;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;[Lorg/eclipse/debug/core/model/IBreakpointImportParticipant;)Lorg/eclipse/core/resources/IMarker;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;[Lorg/eclipse/debug/core/model/IBreakpointImportParticipant;)L0org/eclipse/core/resources/IMarker;
 getImportedBreakpoints
  ()[Lorg/eclipse/debug/core/model/IBreakpoint;
  ()[Lorg/eclipse/debug/core/model/IBreakpoint;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/LaunchAsAction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/LaunchAsAction.eea
index 916d4e7478..22b67acb77 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/LaunchAsAction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/LaunchAsAction.eea
@@ -5,7 +5,7 @@ class org/eclipse/debug/ui/actions/LaunchAsAction
  (Ljava/lang/String;)V
 getMenu
  (Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/widgets/Menu;
- (Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/widgets/Menu;
+ (Lorg/eclipse/swt/widgets/Control;)L0org/eclipse/swt/widgets/Menu;
 getMenu
  (Lorg/eclipse/swt/widgets/Menu;)Lorg/eclipse/swt/widgets/Menu;
  (Lorg/eclipse/swt/widgets/Menu;)Lorg/eclipse/swt/widgets/Menu;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/LaunchShortcutsAction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/LaunchShortcutsAction.eea
index db7cad0376..7d8bf282f0 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/LaunchShortcutsAction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/LaunchShortcutsAction.eea
@@ -5,7 +5,7 @@ class org/eclipse/debug/ui/actions/LaunchShortcutsAction
  (Ljava/lang/String;)V
 getMenu
  (Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/widgets/Menu;
- (Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/widgets/Menu;
+ (Lorg/eclipse/swt/widgets/Control;)L0org/eclipse/swt/widgets/Menu;
 getMenu
  (Lorg/eclipse/swt/widgets/Menu;)Lorg/eclipse/swt/widgets/Menu;
  (Lorg/eclipse/swt/widgets/Menu;)Lorg/eclipse/swt/widgets/Menu;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/RulerBreakpointAction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/RulerBreakpointAction.eea
index 4301acbb08..976efb22c0 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/RulerBreakpointAction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/RulerBreakpointAction.eea
@@ -5,7 +5,7 @@ class org/eclipse/debug/ui/actions/RulerBreakpointAction
  (Lorg/eclipse/ui/texteditor/ITextEditor;Lorg/eclipse/jface/text/source/IVerticalRulerInfo;)V
 getBreakpoint
  ()Lorg/eclipse/debug/core/model/IBreakpoint;
- ()Lorg/eclipse/debug/core/model/IBreakpoint;
+ ()L0org/eclipse/debug/core/model/IBreakpoint;
 getEditor
  ()Lorg/eclipse/ui/texteditor/ITextEditor;
  ()Lorg/eclipse/ui/texteditor/ITextEditor;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/RulerEnableDisableBreakpointActionDelegate.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/RulerEnableDisableBreakpointActionDelegate.eea
index 1071a6589e..c4a0818ce0 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/RulerEnableDisableBreakpointActionDelegate.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/RulerEnableDisableBreakpointActionDelegate.eea
@@ -2,4 +2,4 @@ class org/eclipse/debug/ui/actions/RulerEnableDisableBreakpointActionDelegate
 
 createAction
  (Lorg/eclipse/ui/texteditor/ITextEditor;Lorg/eclipse/jface/text/source/IVerticalRulerInfo;)Lorg/eclipse/jface/action/IAction;
- (Lorg/eclipse/ui/texteditor/ITextEditor;Lorg/eclipse/jface/text/source/IVerticalRulerInfo;)Lorg/eclipse/jface/action/IAction;
+ (Lorg/eclipse/ui/texteditor/ITextEditor;Lorg/eclipse/jface/text/source/IVerticalRulerInfo;)L1org/eclipse/jface/action/IAction; # @Inherited(org.eclipse.ui.texteditor.AbstractRulerActionDelegate)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/RulerRunToLineActionDelegate.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/RulerRunToLineActionDelegate.eea
index 3a5d5c26eb..1e508d5c3e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/RulerRunToLineActionDelegate.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/RulerRunToLineActionDelegate.eea
@@ -2,7 +2,7 @@ class org/eclipse/debug/ui/actions/RulerRunToLineActionDelegate
 
 createAction
  (Lorg/eclipse/ui/texteditor/ITextEditor;Lorg/eclipse/jface/text/source/IVerticalRulerInfo;)Lorg/eclipse/jface/action/IAction;
- (Lorg/eclipse/ui/texteditor/ITextEditor;Lorg/eclipse/jface/text/source/IVerticalRulerInfo;)Lorg/eclipse/jface/action/IAction;
+ (Lorg/eclipse/ui/texteditor/ITextEditor;Lorg/eclipse/jface/text/source/IVerticalRulerInfo;)L1org/eclipse/jface/action/IAction; # @Inherited(org.eclipse.ui.texteditor.AbstractRulerActionDelegate)
 init
  (Lorg/eclipse/jface/action/IAction;)V
  (Lorg/eclipse/jface/action/IAction;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/RulerToggleBreakpointActionDelegate.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/RulerToggleBreakpointActionDelegate.eea
index 421dea0284..33ca45c56b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/RulerToggleBreakpointActionDelegate.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/RulerToggleBreakpointActionDelegate.eea
@@ -2,7 +2,7 @@ class org/eclipse/debug/ui/actions/RulerToggleBreakpointActionDelegate
 
 createAction
  (Lorg/eclipse/ui/texteditor/ITextEditor;Lorg/eclipse/jface/text/source/IVerticalRulerInfo;)Lorg/eclipse/jface/action/IAction;
- (Lorg/eclipse/ui/texteditor/ITextEditor;Lorg/eclipse/jface/text/source/IVerticalRulerInfo;)Lorg/eclipse/jface/action/IAction;
+ (Lorg/eclipse/ui/texteditor/ITextEditor;Lorg/eclipse/jface/text/source/IVerticalRulerInfo;)L1org/eclipse/jface/action/IAction; # @Inherited(org.eclipse.ui.texteditor.AbstractRulerActionDelegate)
 init
  (Lorg/eclipse/jface/action/IAction;)V
  (Lorg/eclipse/jface/action/IAction;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/RunAction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/RunAction.eea
index 3a93aeb223..be5e65fdd8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/RunAction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/actions/RunAction.eea
@@ -2,4 +2,4 @@ class org/eclipse/debug/ui/actions/RunAction
 
 getMode
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/console/ConsoleColorProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/console/ConsoleColorProvider.eea
index 10ecaec32c..489dcce354 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/console/ConsoleColorProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/console/ConsoleColorProvider.eea
@@ -5,7 +5,7 @@ connect
  (Lorg/eclipse/debug/core/model/IProcess;Lorg/eclipse/debug/ui/console/IConsole;)V
 getColor
  (Ljava/lang/String;)Lorg/eclipse/swt/graphics/Color;
- (Ljava/lang/String;)Lorg/eclipse/swt/graphics/Color;
+ (Ljava/lang/String;)L0org/eclipse/swt/graphics/Color;
 getConsole
  ()Lorg/eclipse/debug/ui/console/IConsole;
  ()Lorg/eclipse/debug/ui/console/IConsole;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/memory/AbstractTableRendering.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/memory/AbstractTableRendering.eea
index e49bf20542..8fd7efa8ec 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/memory/AbstractTableRendering.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/memory/AbstractTableRendering.eea
@@ -21,7 +21,7 @@ createControl
  (L1org/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.debug.ui.memory.IMemoryRendering)
 createToolTipControl
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control;
 displayError
  (Lorg/eclipse/debug/core/DebugException;)V
  (Lorg/eclipse/debug/core/DebugException;)V
@@ -54,7 +54,7 @@ getSelectedAddress
  ()Ljava/math/BigInteger;
 getSelectedAsBytes
  ()[Lorg/eclipse/debug/core/model/MemoryByte;
- ()[Lorg/eclipse/debug/core/model/MemoryByte;
+ ()[1Lorg/eclipse/debug/core/model/MemoryByte;
 getSelectedAsString
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -69,7 +69,7 @@ getTableViewer
  ()Lorg/eclipse/jface/viewers/TableViewer;
 getToolTipText
  (Ljava/math/BigInteger;[Lorg/eclipse/debug/core/model/MemoryByte;)Ljava/lang/String;
- (Ljava/math/BigInteger;[Lorg/eclipse/debug/core/model/MemoryByte;)Ljava/lang/String;
+ (Ljava/math/BigInteger;[Lorg/eclipse/debug/core/model/MemoryByte;)L1java/lang/String;
 goToAddress
  (Ljava/math/BigInteger;)V
  (Ljava/math/BigInteger;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/memory/AbstractTextRendering.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/memory/AbstractTextRendering.eea
index bfac4f829b..6c796f5289 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/memory/AbstractTextRendering.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/memory/AbstractTextRendering.eea
@@ -14,7 +14,7 @@ getCodePage
  ()Ljava/lang/String;
 getString
  (Ljava/lang/String;Ljava/math/BigInteger;[Lorg/eclipse/debug/core/model/MemoryByte;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/math/BigInteger;[Lorg/eclipse/debug/core/model/MemoryByte;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/math/BigInteger;[Lorg/eclipse/debug/core/model/MemoryByte;)L1java/lang/String;
 setCodePage
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/memory/IMemoryRenderingType.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/memory/IMemoryRenderingType.eea
index 95e66b31bc..ae83c32605 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/memory/IMemoryRenderingType.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/memory/IMemoryRenderingType.eea
@@ -2,7 +2,7 @@ class org/eclipse/debug/ui/memory/IMemoryRenderingType
 
 createRendering
  ()Lorg/eclipse/debug/ui/memory/IMemoryRendering;
- ()Lorg/eclipse/debug/ui/memory/IMemoryRendering;
+ ()L1org/eclipse/debug/ui/memory/IMemoryRendering;
 getId
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/memory/IMemoryRenderingTypeDelegate.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/memory/IMemoryRenderingTypeDelegate.eea
index 9aa6725dbc..5253156e0f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/memory/IMemoryRenderingTypeDelegate.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/memory/IMemoryRenderingTypeDelegate.eea
@@ -2,4 +2,4 @@ class org/eclipse/debug/ui/memory/IMemoryRenderingTypeDelegate
 
 createRendering
  (Ljava/lang/String;)Lorg/eclipse/debug/ui/memory/IMemoryRendering;
- (Ljava/lang/String;)Lorg/eclipse/debug/ui/memory/IMemoryRendering;
+ (Ljava/lang/String;)L1org/eclipse/debug/ui/memory/IMemoryRendering;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/sourcelookup/AbstractSourceContainerBrowser.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/sourcelookup/AbstractSourceContainerBrowser.eea
index bdc994decc..a59f33e785 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/sourcelookup/AbstractSourceContainerBrowser.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/sourcelookup/AbstractSourceContainerBrowser.eea
@@ -2,7 +2,7 @@ class org/eclipse/debug/ui/sourcelookup/AbstractSourceContainerBrowser
 
 addSourceContainers
  (Lorg/eclipse/swt/widgets/Shell;Lorg/eclipse/debug/core/sourcelookup/ISourceLookupDirector;)[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
- (Lorg/eclipse/swt/widgets/Shell;Lorg/eclipse/debug/core/sourcelookup/ISourceLookupDirector;)[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
+ (Lorg/eclipse/swt/widgets/Shell;Lorg/eclipse/debug/core/sourcelookup/ISourceLookupDirector;)[1Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
 canAddSourceContainers
  (Lorg/eclipse/debug/core/sourcelookup/ISourceLookupDirector;)Z
  (Lorg/eclipse/debug/core/sourcelookup/ISourceLookupDirector;)Z
@@ -11,4 +11,4 @@ canEditSourceContainers
  (Lorg/eclipse/debug/core/sourcelookup/ISourceLookupDirector;[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;)Z
 editSourceContainers
  (Lorg/eclipse/swt/widgets/Shell;Lorg/eclipse/debug/core/sourcelookup/ISourceLookupDirector;[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;)[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
- (Lorg/eclipse/swt/widgets/Shell;Lorg/eclipse/debug/core/sourcelookup/ISourceLookupDirector;[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;)[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
+ (Lorg/eclipse/swt/widgets/Shell;Lorg/eclipse/debug/core/sourcelookup/ISourceLookupDirector;[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;)[1Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditor.eea
index 7cca57fd78..a12bf47e29 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditor.eea
@@ -11,10 +11,10 @@ doSave
  (Lorg/eclipse/core/runtime/IProgressMonitor;)V
 getArtifact
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 init
  (Lorg/eclipse/ui/IEditorSite;Lorg/eclipse/ui/IEditorInput;)V
  (Lorg/eclipse/ui/IEditorSite;Lorg/eclipse/ui/IEditorInput;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/sourcelookup/SourceLookupTab.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/sourcelookup/SourceLookupTab.eea
index 37d0ca36b9..2483e15245 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/sourcelookup/SourceLookupTab.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/sourcelookup/SourceLookupTab.eea
@@ -11,10 +11,10 @@ getErrorMessage
  ()Ljava/lang/String;
 getId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(org.eclipse.debug.ui.AbstractLaunchConfigurationTab)
 getImage
  ()Lorg/eclipse/swt/graphics/Image;
- ()Lorg/eclipse/swt/graphics/Image;
+ ()L0org/eclipse/swt/graphics/Image; # @Inherited(org.eclipse.debug.ui.AbstractLaunchConfigurationTab)
 getMessage
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/sourcelookup/WorkingSetSourceContainer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/sourcelookup/WorkingSetSourceContainer.eea
index b17d3563e8..927c916b49 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/sourcelookup/WorkingSetSourceContainer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/debug/ui/sourcelookup/WorkingSetSourceContainer.eea
@@ -9,7 +9,7 @@ TYPE_ID
  (Lorg/eclipse/ui/IWorkingSet;)V
 createSourceContainers
  ()[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
- ()[Lorg/eclipse/debug/core/sourcelookup/ISourceContainer;
+ ()[1Lorg/eclipse/debug/core/sourcelookup/ISourceContainer; # @Inherited(org.eclipse.debug.core.sourcelookup.containers.CompositeSourceContainer)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/commands/ECommandService.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/commands/ECommandService.eea
index 3e0f72c229..48f560cb57 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/commands/ECommandService.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/commands/ECommandService.eea
@@ -2,10 +2,10 @@ class org/eclipse/e4/core/commands/ECommandService
 
 createCommand
  (Ljava/lang/String;)Lorg/eclipse/core/commands/ParameterizedCommand;
- (Ljava/lang/String;)Lorg/eclipse/core/commands/ParameterizedCommand;
+ (Ljava/lang/String;)L1org/eclipse/core/commands/ParameterizedCommand;
 createCommand
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)Lorg/eclipse/core/commands/ParameterizedCommand;
- (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)Lorg/eclipse/core/commands/ParameterizedCommand;
+ (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)L1org/eclipse/core/commands/ParameterizedCommand;
 defineCategory
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/core/commands/Category;
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/core/commands/Category;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/commands/ExpressionContext.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/commands/ExpressionContext.eea
index de9993fa4c..841d663654 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/commands/ExpressionContext.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/commands/ExpressionContext.eea
@@ -22,7 +22,7 @@ getDefaultVariable
  ()Ljava/lang/Object;
 getParent
  ()Lorg/eclipse/core/expressions/IEvaluationContext;
- ()Lorg/eclipse/core/expressions/IEvaluationContext;
+ ()L1org/eclipse/core/expressions/IEvaluationContext;
 getRoot
  ()Lorg/eclipse/core/expressions/IEvaluationContext;
  ()Lorg/eclipse/core/expressions/IEvaluationContext;
@@ -34,4 +34,4 @@ removeVariable
  (Ljava/lang/String;)Ljava/lang/Object;
 resolveVariable
  (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/String;[Ljava/lang/Object;)L0java/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/contexts/ContextFunction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/contexts/ContextFunction.eea
index 8bce55841d..99d0a5921b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/contexts/ContextFunction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/contexts/ContextFunction.eea
@@ -2,7 +2,7 @@ class org/eclipse/e4/core/contexts/ContextFunction
 
 compute
  (Lorg/eclipse/e4/core/contexts/IEclipseContext;)Ljava/lang/Object;
- (Lorg/eclipse/e4/core/contexts/IEclipseContext;)Ljava/lang/Object;
+ (Lorg/eclipse/e4/core/contexts/IEclipseContext;)L0java/lang/Object;
 compute
  (Lorg/eclipse/e4/core/contexts/IEclipseContext;Ljava/lang/String;)Ljava/lang/Object;
  (Lorg/eclipse/e4/core/contexts/IEclipseContext;Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/contexts/EclipseContextFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/contexts/EclipseContextFactory.eea
index a9331c1e2d..e6be637d49 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/contexts/EclipseContextFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/contexts/EclipseContextFactory.eea
@@ -2,13 +2,13 @@ class org/eclipse/e4/core/contexts/EclipseContextFactory
 
 create
  ()Lorg/eclipse/e4/core/contexts/IEclipseContext;
- ()Lorg/eclipse/e4/core/contexts/IEclipseContext;
+ ()L1org/eclipse/e4/core/contexts/IEclipseContext;
 create
  (Ljava/lang/String;)Lorg/eclipse/e4/core/contexts/IEclipseContext;
- (Ljava/lang/String;)Lorg/eclipse/e4/core/contexts/IEclipseContext;
+ (Ljava/lang/String;)L1org/eclipse/e4/core/contexts/IEclipseContext;
 createServiceContext
  (Lorg/osgi/framework/BundleContext;)Lorg/eclipse/e4/core/contexts/IEclipseContext;
- (Lorg/osgi/framework/BundleContext;)Lorg/eclipse/e4/core/contexts/IEclipseContext;
+ (Lorg/osgi/framework/BundleContext;)L1org/eclipse/e4/core/contexts/IEclipseContext;
 getServiceContext
  (Ljava/lang/Class<*>;)Lorg/eclipse/e4/core/contexts/IEclipseContext;
  (Ljava/lang/Class<*>;)Lorg/eclipse/e4/core/contexts/IEclipseContext;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/contexts/IEclipseContext.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/contexts/IEclipseContext.eea
index afce50ba1d..1e8709c35a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/contexts/IEclipseContext.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/contexts/IEclipseContext.eea
@@ -15,10 +15,10 @@ containsKey
  (Ljava/lang/String;)Z
 createChild
  ()Lorg/eclipse/e4/core/contexts/IEclipseContext;
- ()Lorg/eclipse/e4/core/contexts/IEclipseContext;
+ ()L1org/eclipse/e4/core/contexts/IEclipseContext;
 createChild
  (Ljava/lang/String;)Lorg/eclipse/e4/core/contexts/IEclipseContext;
- (Ljava/lang/String;)Lorg/eclipse/e4/core/contexts/IEclipseContext;
+ (Ljava/lang/String;)L1org/eclipse/e4/core/contexts/IEclipseContext;
 declareModifiable
  (Ljava/lang/Class<*>;)V
  (Ljava/lang/Class<*>;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/di/InjectorFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/di/InjectorFactory.eea
index a4e4a3d5df..77bfea509e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/di/InjectorFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/di/InjectorFactory.eea
@@ -5,4 +5,4 @@ getDefault
  ()Lorg/eclipse/e4/core/di/IInjector;
 makeInjector
  ()Lorg/eclipse/e4/core/di/IInjector;
- ()Lorg/eclipse/e4/core/di/IInjector;
+ ()L1org/eclipse/e4/core/di/IInjector;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/di/suppliers/PrimaryObjectSupplier.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/di/suppliers/PrimaryObjectSupplier.eea
index 60b06e5ea3..06678664d9 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/di/suppliers/PrimaryObjectSupplier.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/di/suppliers/PrimaryObjectSupplier.eea
@@ -5,4 +5,4 @@ get
  ([Lorg/eclipse/e4/core/di/suppliers/IObjectDescriptor;[Ljava/lang/Object;Lorg/eclipse/e4/core/di/suppliers/IRequestor;ZZZ)V
 makeReference
  (Ljava/lang/Object;)Ljava/lang/ref/WeakReference<Ljava/lang/Object;>;
- (Ljava/lang/Object;)Ljava/lang/ref/WeakReference<Ljava/lang/Object;>;
+ (Ljava/lang/Object;)L1java/lang/ref/WeakReference<Ljava/lang/Object;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/services/about/AboutSections.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/services/about/AboutSections.eea
index 6f03385f9a..b11610e8d6 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/services/about/AboutSections.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/services/about/AboutSections.eea
@@ -21,4 +21,4 @@ SECTION_USER_PREFERENCES
 
 createSectionFilter
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/services/contributions/IContributionFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/services/contributions/IContributionFactory.eea
index 7315bfeb53..e629f82a8f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/services/contributions/IContributionFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/services/contributions/IContributionFactory.eea
@@ -2,10 +2,10 @@ class org/eclipse/e4/core/services/contributions/IContributionFactory
 
 create
  (Ljava/lang/String;Lorg/eclipse/e4/core/contexts/IEclipseContext;)Ljava/lang/Object;
- (Ljava/lang/String;Lorg/eclipse/e4/core/contexts/IEclipseContext;)Ljava/lang/Object;
+ (Ljava/lang/String;Lorg/eclipse/e4/core/contexts/IEclipseContext;)L1java/lang/Object;
 create
  (Ljava/lang/String;Lorg/eclipse/e4/core/contexts/IEclipseContext;Lorg/eclipse/e4/core/contexts/IEclipseContext;)Ljava/lang/Object;
- (Ljava/lang/String;Lorg/eclipse/e4/core/contexts/IEclipseContext;Lorg/eclipse/e4/core/contexts/IEclipseContext;)Ljava/lang/Object;
+ (Ljava/lang/String;Lorg/eclipse/e4/core/contexts/IEclipseContext;Lorg/eclipse/e4/core/contexts/IEclipseContext;)L1java/lang/Object;
 getBundle
  (Ljava/lang/String;)Lorg/osgi/framework/Bundle;
  (Ljava/lang/String;)Lorg/osgi/framework/Bundle;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/services/contributions/IContributionFactorySpi.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/services/contributions/IContributionFactorySpi.eea
index fdf5e50ecd..770fee0537 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/services/contributions/IContributionFactorySpi.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/services/contributions/IContributionFactorySpi.eea
@@ -5,4 +5,4 @@ call
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/core/contexts/IEclipseContext;Ljava/lang/Object;)Ljava/lang/Object;
 create
  (Lorg/osgi/framework/Bundle;Ljava/lang/String;Lorg/eclipse/e4/core/contexts/IEclipseContext;)Ljava/lang/Object;
- (Lorg/osgi/framework/Bundle;Ljava/lang/String;Lorg/eclipse/e4/core/contexts/IEclipseContext;)Ljava/lang/Object;
+ (Lorg/osgi/framework/Bundle;Ljava/lang/String;Lorg/eclipse/e4/core/contexts/IEclipseContext;)L1java/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/services/nls/BaseMessageRegistry.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/services/nls/BaseMessageRegistry.eea
index 671b2e62ba..7e7cf554e1 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/services/nls/BaseMessageRegistry.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/core/services/nls/BaseMessageRegistry.eea
@@ -4,10 +4,10 @@ class org/eclipse/e4/core/services/nls/BaseMessageRegistry
 
 createConsumer
  (Ljava/lang/Object;Ljava/lang/String;)Lorg/eclipse/e4/core/services/nls/MessageConsumer;
- (Ljava/lang/Object;Ljava/lang/String;)Lorg/eclipse/e4/core/services/nls/MessageConsumer;
+ (Ljava/lang/Object;Ljava/lang/String;)L0org/eclipse/e4/core/services/nls/MessageConsumer;
 createSupplier
  (Ljava/lang/String;)Lorg/eclipse/e4/core/services/nls/MessageSupplier;
- (Ljava/lang/String;)Lorg/eclipse/e4/core/services/nls/MessageSupplier;
+ (Ljava/lang/String;)L0org/eclipse/e4/core/services/nls/MessageSupplier;
 register
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/bindings/EBindingService.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/bindings/EBindingService.eea
index fca7c88fe2..93c89f2567 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/bindings/EBindingService.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/bindings/EBindingService.eea
@@ -33,10 +33,10 @@ activateBinding
  (Lorg/eclipse/jface/bindings/Binding;)V
 createBinding
  (Lorg/eclipse/jface/bindings/TriggerSequence;Lorg/eclipse/core/commands/ParameterizedCommand;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)Lorg/eclipse/jface/bindings/Binding;
- (Lorg/eclipse/jface/bindings/TriggerSequence;Lorg/eclipse/core/commands/ParameterizedCommand;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)Lorg/eclipse/jface/bindings/Binding;
+ (Lorg/eclipse/jface/bindings/TriggerSequence;Lorg/eclipse/core/commands/ParameterizedCommand;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)L1org/eclipse/jface/bindings/Binding;
 createSequence
  (Ljava/lang/String;)Lorg/eclipse/jface/bindings/TriggerSequence;
- (Ljava/lang/String;)Lorg/eclipse/jface/bindings/TriggerSequence;
+ (Ljava/lang/String;)L1org/eclipse/jface/bindings/TriggerSequence;
 deactivateBinding
  (Lorg/eclipse/jface/bindings/Binding;)V
  (Lorg/eclipse/jface/bindings/Binding;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/css2/CSS2ColorHelper.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/css2/CSS2ColorHelper.eea
index e5474f87b7..57769604d2 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/css2/CSS2ColorHelper.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/css2/CSS2ColorHelper.eea
@@ -11,13 +11,13 @@ getHexaColorFromColorName
  (Ljava/lang/String;)Ljava/lang/String;
 getHexaColorStringValue
  (Lorg/w3c/dom/css/RGBColor;)Ljava/lang/String;
- (Lorg/w3c/dom/css/RGBColor;)Ljava/lang/String;
+ (Lorg/w3c/dom/css/RGBColor;)L1java/lang/String;
 getRGBColor
  (Ljava/lang/String;)Lorg/w3c/dom/css/RGBColor;
- (Ljava/lang/String;)Lorg/w3c/dom/css/RGBColor;
+ (Ljava/lang/String;)L0org/w3c/dom/css/RGBColor;
 getRGBColorStringValue
  (Lorg/w3c/dom/css/RGBColor;)Ljava/lang/String;
- (Lorg/w3c/dom/css/RGBColor;)Ljava/lang/String;
+ (Lorg/w3c/dom/css/RGBColor;)L1java/lang/String;
 isColorName
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/css2/CSS2FontHelper.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/css2/CSS2FontHelper.eea
index 53583022de..ffa4e31cf6 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/css2/CSS2FontHelper.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/css2/CSS2FontHelper.eea
@@ -2,16 +2,16 @@ class org/eclipse/e4/ui/css/core/css2/CSS2FontHelper
 
 getCSSFontPropertyName
  (Lorg/w3c/dom/css/CSSPrimitiveValue;)Ljava/lang/String;
- (Lorg/w3c/dom/css/CSSPrimitiveValue;)Ljava/lang/String;
+ (Lorg/w3c/dom/css/CSSPrimitiveValue;)L0java/lang/String;
 getFontFamily
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)Ljava/lang/String; # @PolyNull
 getFontSize
  (I)Ljava/lang/String;
  (I)Ljava/lang/String;
 getFontStyle
  (Z)Ljava/lang/String;
- (Z)Ljava/lang/String;
+ (Z)L1java/lang/String;
 getFontWeight
  (Z)Ljava/lang/String;
- (Z)Ljava/lang/String;
+ (Z)L1java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/css2/CSS2FontPropertiesHelpers.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/css2/CSS2FontPropertiesHelpers.eea
index 83ecd0bfaf..1128514b66 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/css2/CSS2FontPropertiesHelpers.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/css2/CSS2FontPropertiesHelpers.eea
@@ -6,7 +6,7 @@ CSS2FONT_KEY
 
 createCSS2FontProperties
  (Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;)Lorg/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties;
- (Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;)Lorg/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties;
+ (Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;)L1org/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties;
 getCSS2FontProperties
  (Lorg/eclipse/e4/ui/css/core/engine/CSSElementContext;)Lorg/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties;
  (Lorg/eclipse/e4/ui/css/core/engine/CSSElementContext;)Lorg/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/css2/CSS2PrimitiveValueImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/css2/CSS2PrimitiveValueImpl.eea
index d8a47cb2f1..5961f4e05a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/css2/CSS2PrimitiveValueImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/css2/CSS2PrimitiveValueImpl.eea
@@ -5,16 +5,16 @@ class org/eclipse/e4/ui/css/core/css2/CSS2PrimitiveValueImpl
  (Ljava/lang/String;)V
 getCounterValue
  ()Lorg/w3c/dom/css/Counter;
- ()Lorg/w3c/dom/css/Counter;
+ ()L0org/w3c/dom/css/Counter;
 getCssText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getRGBColorValue
  ()Lorg/w3c/dom/css/RGBColor;
- ()Lorg/w3c/dom/css/RGBColor;
+ ()L0org/w3c/dom/css/RGBColor;
 getRectValue
  ()Lorg/w3c/dom/css/Rect;
- ()Lorg/w3c/dom/css/Rect;
+ ()L0org/w3c/dom/css/Rect;
 getStringValue
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/ElementAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/ElementAdapter.eea
index 4c1066e9f3..c4b799cbaa 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/ElementAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/ElementAdapter.eea
@@ -30,13 +30,13 @@ getAttributeNS
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 getAttributeNode
  (Ljava/lang/String;)Lorg/w3c/dom/Attr;
- (Ljava/lang/String;)Lorg/w3c/dom/Attr;
+ (Ljava/lang/String;)L0org/w3c/dom/Attr;
 getAttributeNodeNS
  (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/Attr;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/Attr;
+ (Ljava/lang/String;Ljava/lang/String;)L0org/w3c/dom/Attr;
 getAttributes
  ()Lorg/w3c/dom/NamedNodeMap;
- ()Lorg/w3c/dom/NamedNodeMap;
+ ()L0org/w3c/dom/NamedNodeMap;
 getBaseURI
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(org.w3c.dom.Node)
@@ -75,7 +75,7 @@ getNodeName
  ()L1java/lang/String; # @Inherited(org.w3c.dom.Node)
 getNodeValue
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getOwnerDocument
  ()Lorg/w3c/dom/Document;
  ()L0org/w3c/dom/Document; # @Inherited(org.w3c.dom.Node)
@@ -87,7 +87,7 @@ getPreviousSibling
  ()L0org/w3c/dom/Node; # @Inherited(org.w3c.dom.Node)
 getSchemaTypeInfo
  ()Lorg/w3c/dom/TypeInfo;
- ()Lorg/w3c/dom/TypeInfo;
+ ()L0org/w3c/dom/TypeInfo;
 getStaticPseudoInstances
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
@@ -99,10 +99,10 @@ getTagName
  ()L1java/lang/String; # @Inherited(org.w3c.dom.Element)
 getTextContent
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getUserData
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 hasAttribute
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
@@ -147,7 +147,7 @@ removeAttributeNS
  (Ljava/lang/String;Ljava/lang/String;)V
 removeAttributeNode
  (Lorg/w3c/dom/Attr;)Lorg/w3c/dom/Attr;
- (Lorg/w3c/dom/Attr;)Lorg/w3c/dom/Attr;
+ (Lorg/w3c/dom/Attr;)L0org/w3c/dom/Attr;
 removeChild
  (Lorg/w3c/dom/Node;)Lorg/w3c/dom/Node;
  (L1org/w3c/dom/Node;)L1org/w3c/dom/Node; # @Inherited(org.w3c.dom.Node)
@@ -162,10 +162,10 @@ setAttributeNS
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 setAttributeNode
  (Lorg/w3c/dom/Attr;)Lorg/w3c/dom/Attr;
- (Lorg/w3c/dom/Attr;)Lorg/w3c/dom/Attr;
+ (Lorg/w3c/dom/Attr;)L0org/w3c/dom/Attr;
 setAttributeNodeNS
  (Lorg/w3c/dom/Attr;)Lorg/w3c/dom/Attr;
- (Lorg/w3c/dom/Attr;)Lorg/w3c/dom/Attr;
+ (Lorg/w3c/dom/Attr;)L0org/w3c/dom/Attr;
 setDefaultStyleDeclaration
  (Ljava/lang/String;Lorg/w3c/dom/css/CSSStyleDeclaration;)V
  (Ljava/lang/String;Lorg/w3c/dom/css/CSSStyleDeclaration;)V
@@ -189,4 +189,4 @@ setTextContent
  (Ljava/lang/String;)V
 setUserData
  (Ljava/lang/String;Ljava/lang/Object;Lorg/w3c/dom/UserDataHandler;)Ljava/lang/Object;
- (Ljava/lang/String;Ljava/lang/Object;Lorg/w3c/dom/UserDataHandler;)Ljava/lang/Object;
+ (Ljava/lang/String;Ljava/lang/Object;Lorg/w3c/dom/UserDataHandler;)L0java/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/parsers/CSSParserFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/parsers/CSSParserFactory.eea
index e76fa4b93a..e2a03e9ef7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/parsers/CSSParserFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/parsers/CSSParserFactory.eea
@@ -2,4 +2,4 @@ class org/eclipse/e4/ui/css/core/dom/parsers/CSSParserFactory
 
 newInstance
  ()Lorg/eclipse/e4/ui/css/core/dom/parsers/ICSSParserFactory;
- ()Lorg/eclipse/e4/ui/css/core/dom/parsers/ICSSParserFactory;
+ ()L1org/eclipse/e4/ui/css/core/dom/parsers/ICSSParserFactory;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler.eea
index 6d19c30966..a5f29b7ba7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Z
 retrieveCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/converters/CSSValueBooleanConverterImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/converters/CSSValueBooleanConverterImpl.eea
index 6f77999f0c..8f0b5d8981 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/converters/CSSValueBooleanConverterImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/converters/CSSValueBooleanConverterImpl.eea
@@ -6,7 +6,7 @@ INSTANCE
 
 convert
  (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverterConfig;)Ljava/lang/String;
- (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverterConfig;)Ljava/lang/String;
+ (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverterConfig;)L1java/lang/String;
 convert
  (Lorg/w3c/dom/css/CSSValue;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;)Ljava/lang/Object;
  (Lorg/w3c/dom/css/CSSValue;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBackgroundCompositeHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBackgroundCompositeHandler.eea
index 7b067c1666..0f8d547985 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBackgroundCompositeHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBackgroundCompositeHandler.eea
@@ -5,7 +5,7 @@ applyCSSProperty
  (Ljava/lang/Object;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 getCSSPropertiesNames
  (Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/String;)[0Ljava/lang/String;
 isCSSPropertyComposite
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBackgroundHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBackgroundHandler.eea
index c0509106fa..4a927ed9d3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBackgroundHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBackgroundHandler.eea
@@ -23,4 +23,4 @@ applyCSSPropertyBackgroundRepeat
  (Ljava/lang/Object;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String; # @Inherited(org.eclipse.e4.ui.css.core.dom.properties.ICSSPropertyHandler)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBorderCompositeHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBorderCompositeHandler.eea
index 136dfcc49e..41982bb089 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBorderCompositeHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBorderCompositeHandler.eea
@@ -5,7 +5,7 @@ applyCSSProperty
  (Ljava/lang/Object;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 getCSSPropertiesNames
  (Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/String;)[0Ljava/lang/String;
 isCSSPropertyComposite
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBorderHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBorderHandler.eea
index 6db548bd33..b31c504369 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBorderHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBorderHandler.eea
@@ -74,64 +74,64 @@ applyCSSPropertyBorderWidth
  (Lorg/eclipse/e4/ui/css/core/dom/properties/CSSBorderProperties;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String; # @Inherited(org.eclipse.e4.ui.css.core.dom.properties.ICSSPropertyHandler)
 retrieveCSSPropertyBorder
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyBorderBottom
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyBorderBottomColor
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyBorderBottomStyle
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyBorderBottomWidth
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyBorderColor
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyBorderLeft
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyBorderLeftColor
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyBorderLeftStyle
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyBorderLeftWidth
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyBorderRight
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyBorderRightColor
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyBorderRightStyle
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyBorderRightWidth
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyBorderStyle
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyBorderTop
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyBorderTopColor
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyBorderTopStyle
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyBorderTopWidth
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyBorderWidth
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L1java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyClassificationHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyClassificationHandler.eea
index 3272ed9598..bbf167ff4c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyClassificationHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyClassificationHandler.eea
@@ -23,22 +23,22 @@ applyCSSPropertyVisibility
  (Ljava/lang/Object;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String; # @Inherited(org.eclipse.e4.ui.css.core.dom.properties.ICSSPropertyHandler)
 retrieveCSSPropertyClear
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyCursor
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyDisplay
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyFloat
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyPosition
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyVisibility
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyDimensionHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyDimensionHandler.eea
index a0d44ae34e..74c34cdd19 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyDimensionHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyDimensionHandler.eea
@@ -26,16 +26,16 @@ applyCSSPropertyWidth
  (Ljava/lang/Object;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyHeight
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyMaxHeight
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyMinHeight
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyMinWidth
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyFontCompositeHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyFontCompositeHandler.eea
index 807ebd51b0..f1e652ecb1 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyFontCompositeHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyFontCompositeHandler.eea
@@ -5,7 +5,7 @@ applyCSSProperty
  (Ljava/lang/Object;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 getCSSPropertiesNames
  (Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/String;)[0Ljava/lang/String;
 isCSSPropertyComposite
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyFontHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyFontHandler.eea
index 0c43cc0b7f..d8a202b5a4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyFontHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyFontHandler.eea
@@ -41,4 +41,4 @@ applyCSSPropertyFontWeight
  (Lorg/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String; # @Inherited(org.eclipse.e4.ui.css.core.dom.properties.ICSSPropertyHandler)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyMarginHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyMarginHandler.eea
index a679e4b371..d0b08f1afe 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyMarginHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyMarginHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Z
 retrieveCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String; # @Inherited(org.eclipse.e4.ui.css.core.dom.properties.ICSSPropertyHandler)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyPaddingHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyPaddingHandler.eea
index cfd4473ef2..594c5b4e35 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyPaddingHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyPaddingHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Z
 retrieveCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String; # @Inherited(org.eclipse.e4.ui.css.core.dom.properties.ICSSPropertyHandler)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyTextHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyTextHandler.eea
index d873249013..33c8169349 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyTextHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyTextHandler.eea
@@ -20,10 +20,10 @@ hasTextTransform
  (Lorg/w3c/dom/css/CSSValue;)Z
 retrieveCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String; # @Inherited(org.eclipse.e4.ui.css.core.dom.properties.ICSSPropertyHandler)
 retrieveCSSPropertyColor
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyTextTransform
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontPropertiesImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontPropertiesImpl.eea
index cbe8f1d6a5..7e78191403 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontPropertiesImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontPropertiesImpl.eea
@@ -2,7 +2,7 @@ class org/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontPropertiesImpl
 
 getCssText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getFamily
  ()Lorg/w3c/dom/css/CSSPrimitiveValue;
  ()Lorg/w3c/dom/css/CSSPrimitiveValue;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/CSS2PaddingPropertiesImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/CSS2PaddingPropertiesImpl.eea
index 3901d44f50..a620aa3a7e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/CSS2PaddingPropertiesImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/CSS2PaddingPropertiesImpl.eea
@@ -15,7 +15,7 @@ top
 
 getCssText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 setCssText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyBackgroundHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyBackgroundHandler.eea
index 4710c7ccc9..4bf7f9fdb5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyBackgroundHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyBackgroundHandler.eea
@@ -20,16 +20,16 @@ applyCSSPropertyBackgroundRepeat
  (Ljava/lang/Object;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSPropertyBackgroundAttachment
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyBackgroundColor
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
 retrieveCSSPropertyBackgroundImage
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L1java/lang/String;
 retrieveCSSPropertyBackgroundPosition
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyBackgroundRepeat
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/providers/AbstractCSSPropertyHandlerProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/providers/AbstractCSSPropertyHandlerProvider.eea
index c51b57bcf9..ea3becd2c5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/providers/AbstractCSSPropertyHandlerProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/providers/AbstractCSSPropertyHandlerProvider.eea
@@ -2,10 +2,10 @@ class org/eclipse/e4/ui/css/core/dom/properties/providers/AbstractCSSPropertyHan
 
 getCSSPropertyStyle
  (Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Lorg/eclipse/e4/ui/css/core/dom/CSSStylableElement;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Lorg/eclipse/e4/ui/css/core/dom/CSSStylableElement;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Lorg/eclipse/e4/ui/css/core/dom/CSSStylableElement;Ljava/lang/String;Ljava/lang/String;)L0java/lang/String;
 getDefaultCSSStyleDeclaration
  (Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;Lorg/w3c/dom/css/CSSStyleDeclaration;Ljava/lang/String;)Lorg/w3c/dom/css/CSSStyleDeclaration;
- (Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;Lorg/w3c/dom/css/CSSStyleDeclaration;Ljava/lang/String;)Lorg/w3c/dom/css/CSSStyleDeclaration;
+ (Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;Lorg/w3c/dom/css/CSSStyleDeclaration;Ljava/lang/String;)L0org/w3c/dom/css/CSSStyleDeclaration;
 getDefaultCSSStyleDeclaration
  (Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Lorg/eclipse/e4/ui/css/core/dom/CSSStylableElement;Lorg/w3c/dom/css/CSSStyleDeclaration;Ljava/lang/String;)Lorg/w3c/dom/css/CSSStyleDeclaration;
  (Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Lorg/eclipse/e4/ui/css/core/dom/CSSStylableElement;Lorg/w3c/dom/css/CSSStyleDeclaration;Ljava/lang/String;)Lorg/w3c/dom/css/CSSStyleDeclaration;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/providers/CSSPropertyHandlerLazyProviderImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/providers/CSSPropertyHandlerLazyProviderImpl.eea
index 9cc424c7fd..3a87e8d2c5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/providers/CSSPropertyHandlerLazyProviderImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/providers/CSSPropertyHandlerLazyProviderImpl.eea
@@ -5,7 +5,7 @@ getCSSProperties
  (Ljava/lang/Object;)Ljava/util/Collection<Ljava/lang/String;>;
 getCSSPropertyHandler
  (Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler;
+ (Ljava/lang/String;Ljava/lang/String;)L0org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler;
 getCSSPropertyHandlers
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/util/Collection<Lorg/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler;>;
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/util/Collection<Lorg/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler;>;
@@ -17,7 +17,7 @@ getDefaultCSSStyleDeclaration
  (Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Lorg/eclipse/e4/ui/css/core/dom/CSSStylableElement;Lorg/w3c/dom/css/CSSStyleDeclaration;Ljava/lang/String;)Lorg/w3c/dom/css/CSSStyleDeclaration;
 getHandlerClassName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 getPropertyToHandlersMap
  ()Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lorg/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler;>;>;
  ()Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lorg/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler;>;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/providers/CSSPropertyHandlerSimpleProviderImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/providers/CSSPropertyHandlerSimpleProviderImpl.eea
index 643fb7734e..d1ca8f42b3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/providers/CSSPropertyHandlerSimpleProviderImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/dom/properties/providers/CSSPropertyHandlerSimpleProviderImpl.eea
@@ -21,7 +21,7 @@ getCSSPropertyHandlers
  (Ljava/lang/String;)Ljava/util/Collection<Lorg/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler;>;
 getDefaultCSSStyleDeclaration
  (Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Lorg/eclipse/e4/ui/css/core/dom/CSSStylableElement;Lorg/w3c/dom/css/CSSStyleDeclaration;Ljava/lang/String;)Lorg/w3c/dom/css/CSSStyleDeclaration;
- (Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Lorg/eclipse/e4/ui/css/core/dom/CSSStylableElement;Lorg/w3c/dom/css/CSSStyleDeclaration;Ljava/lang/String;)Lorg/w3c/dom/css/CSSStyleDeclaration;
+ (Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Lorg/eclipse/e4/ui/css/core/dom/CSSStylableElement;Lorg/w3c/dom/css/CSSStyleDeclaration;Ljava/lang/String;)L0org/w3c/dom/css/CSSStyleDeclaration;
 registerCSSProperty
  (Ljava/lang/String;Ljava/lang/Class<+Lorg/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler;>;)V
  (Ljava/lang/String;Ljava/lang/Class<+Lorg/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler;>;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/AbstractCSSNode.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/AbstractCSSNode.eea
index 4e3cc3dead..07b9d26bda 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/AbstractCSSNode.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/AbstractCSSNode.eea
@@ -2,4 +2,4 @@ class org/eclipse/e4/ui/css/core/impl/dom/AbstractCSSNode
 
 getCSSParser
  ()Lorg/eclipse/e4/ui/css/core/dom/parsers/CSSParser;
- ()Lorg/eclipse/e4/ui/css/core/dom/parsers/CSSParser;
+ ()L0org/eclipse/e4/ui/css/core/dom/parsers/CSSParser;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSFontFaceRuleImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSFontFaceRuleImpl.eea
index 9917fc0af8..769698f0e9 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSFontFaceRuleImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSFontFaceRuleImpl.eea
@@ -5,7 +5,7 @@ class org/eclipse/e4/ui/css/core/impl/dom/CSSFontFaceRuleImpl
  (Lorg/w3c/dom/css/CSSStyleSheet;Lorg/w3c/dom/css/CSSRule;)V
 getStyle
  ()Lorg/w3c/dom/css/CSSStyleDeclaration;
- ()Lorg/w3c/dom/css/CSSStyleDeclaration;
+ ()L1org/w3c/dom/css/CSSStyleDeclaration;
 setStyle
  (Lorg/w3c/dom/css/CSSStyleDeclaration;)V
  (Lorg/w3c/dom/css/CSSStyleDeclaration;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSImportRuleImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSImportRuleImpl.eea
index 9f520463f9..5a44c67f6c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSImportRuleImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSImportRuleImpl.eea
@@ -11,4 +11,4 @@ getMedia
  ()Lorg/w3c/dom/stylesheets/MediaList;
 getStyleSheet
  ()Lorg/w3c/dom/css/CSSStyleSheet;
- ()Lorg/w3c/dom/css/CSSStyleSheet;
+ ()L1org/w3c/dom/css/CSSStyleSheet;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSMediaRuleImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSMediaRuleImpl.eea
index bfbc1b16f8..baafd41ffb 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSMediaRuleImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSMediaRuleImpl.eea
@@ -5,10 +5,10 @@ class org/eclipse/e4/ui/css/core/impl/dom/CSSMediaRuleImpl
  (Lorg/w3c/dom/css/CSSStyleSheet;Lorg/w3c/dom/css/CSSRule;Lorg/eclipse/e4/ui/css/core/impl/dom/MediaListImpl;)V
 getCssRules
  ()Lorg/w3c/dom/css/CSSRuleList;
- ()Lorg/w3c/dom/css/CSSRuleList;
+ ()L1org/w3c/dom/css/CSSRuleList;
 getMedia
  ()Lorg/w3c/dom/stylesheets/MediaList;
- ()Lorg/w3c/dom/stylesheets/MediaList;
+ ()L1org/w3c/dom/stylesheets/MediaList;
 insertRule
  (Ljava/lang/String;I)I
  (Ljava/lang/String;I)I
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSPageRuleImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSPageRuleImpl.eea
index 7525100f98..a0a2bfc8d8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSPageRuleImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSPageRuleImpl.eea
@@ -5,10 +5,10 @@ class org/eclipse/e4/ui/css/core/impl/dom/CSSPageRuleImpl
  (Lorg/w3c/dom/css/CSSStyleSheet;Lorg/w3c/dom/css/CSSRule;Ljava/lang/String;Ljava/lang/String;)V
 getSelectorText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStyle
  ()Lorg/w3c/dom/css/CSSStyleDeclaration;
- ()Lorg/w3c/dom/css/CSSStyleDeclaration;
+ ()L1org/w3c/dom/css/CSSStyleDeclaration;
 setSelectorText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSPropertyListImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSPropertyListImpl.eea
index d9bdc64af4..be6ac9abe6 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSPropertyListImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSPropertyListImpl.eea
@@ -8,7 +8,7 @@ insert
  (Lorg/eclipse/e4/ui/css/core/dom/CSSProperty;I)V
 item
  (I)Lorg/eclipse/e4/ui/css/core/dom/CSSProperty;
- (I)Lorg/eclipse/e4/ui/css/core/dom/CSSProperty;
+ (I)L0org/eclipse/e4/ui/css/core/dom/CSSProperty;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSRuleImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSRuleImpl.eea
index 138996d1bc..3560967e2b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSRuleImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSRuleImpl.eea
@@ -5,7 +5,7 @@ class org/eclipse/e4/ui/css/core/impl/dom/CSSRuleImpl
  (Lorg/w3c/dom/css/CSSStyleSheet;Lorg/w3c/dom/css/CSSRule;)V
 getCssText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getParentRule
  ()Lorg/w3c/dom/css/CSSRule;
  ()Lorg/w3c/dom/css/CSSRule;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSStyleDeclarationImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSStyleDeclarationImpl.eea
index fb4e0ff6e6..c90b943c3c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSStyleDeclarationImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSStyleDeclarationImpl.eea
@@ -11,7 +11,7 @@ getCSSPropertyList
  ()Lorg/eclipse/e4/ui/css/core/dom/CSSPropertyList;
 getCssText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getParentRule
  ()Lorg/w3c/dom/css/CSSRule;
  ()Lorg/w3c/dom/css/CSSRule;
@@ -20,16 +20,16 @@ getPropertyCSSValue
  (Ljava/lang/String;)Lorg/w3c/dom/css/CSSValue;
 getPropertyPriority
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 getPropertyValue
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 item
  (I)Ljava/lang/String;
  (I)Ljava/lang/String;
 removeProperty
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 setCssText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSStyleRuleImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSStyleRuleImpl.eea
index efc6964433..c51972592b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSStyleRuleImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSStyleRuleImpl.eea
@@ -5,16 +5,16 @@ class org/eclipse/e4/ui/css/core/impl/dom/CSSStyleRuleImpl
  (Lorg/w3c/dom/css/CSSStyleSheet;Lorg/w3c/dom/css/CSSRule;Lorg/w3c/css/sac/SelectorList;)V
 getCSSPropertyList
  ()Lorg/eclipse/e4/ui/css/core/dom/CSSPropertyList;
- ()Lorg/eclipse/e4/ui/css/core/dom/CSSPropertyList;
+ ()L1org/eclipse/e4/ui/css/core/dom/CSSPropertyList;
 getCssText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.eclipse.e4.ui.css.core.impl.dom.CSSRuleImpl)
 getSelectorList
  ()Lorg/w3c/css/sac/SelectorList;
  ()Lorg/w3c/css/sac/SelectorList;
 getSelectorText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStyle
  ()Lorg/w3c/dom/css/CSSStyleDeclaration;
  ()Lorg/w3c/dom/css/CSSStyleDeclaration;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSStyleSheetImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSStyleSheetImpl.eea
index 2bf52e55c5..ecec04f508 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSStyleSheetImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSStyleSheetImpl.eea
@@ -5,25 +5,25 @@ getCssRules
  ()Lorg/w3c/dom/css/CSSRuleList;
 getHref
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getMedia
  ()Lorg/w3c/dom/stylesheets/MediaList;
- ()Lorg/w3c/dom/stylesheets/MediaList;
+ ()L1org/w3c/dom/stylesheets/MediaList;
 getOwnerNode
  ()Lorg/w3c/dom/Node;
- ()Lorg/w3c/dom/Node;
+ ()L1org/w3c/dom/Node;
 getOwnerRule
  ()Lorg/w3c/dom/css/CSSRule;
- ()Lorg/w3c/dom/css/CSSRule;
+ ()L1org/w3c/dom/css/CSSRule;
 getParentStyleSheet
  ()Lorg/w3c/dom/stylesheets/StyleSheet;
- ()Lorg/w3c/dom/stylesheets/StyleSheet;
+ ()L1org/w3c/dom/stylesheets/StyleSheet;
 getTitle
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 insertRule
  (Ljava/lang/String;I)I
  (Ljava/lang/String;I)I
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSValueFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSValueFactory.eea
index 6f6029baea..9ec82d7680 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSValueFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSValueFactory.eea
@@ -2,7 +2,7 @@ class org/eclipse/e4/ui/css/core/impl/dom/CSSValueFactory
 
 newPrimitiveValue
  (Lorg/w3c/css/sac/LexicalUnit;)Lorg/w3c/dom/css/CSSPrimitiveValue;
- (Lorg/w3c/css/sac/LexicalUnit;)Lorg/w3c/dom/css/CSSPrimitiveValue;
+ (Lorg/w3c/css/sac/LexicalUnit;)L1org/w3c/dom/css/CSSPrimitiveValue;
 newValue
  (Lorg/w3c/css/sac/LexicalUnit;)Lorg/w3c/dom/css/CSSValue;
  (Lorg/w3c/css/sac/LexicalUnit;)Lorg/w3c/dom/css/CSSValue;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSValueImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSValueImpl.eea
index 9b7190c547..0f63455634 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSValueImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CSSValueImpl.eea
@@ -2,19 +2,19 @@ class org/eclipse/e4/ui/css/core/impl/dom/CSSValueImpl
 
 getCounterValue
  ()Lorg/w3c/dom/css/Counter;
- ()Lorg/w3c/dom/css/Counter;
+ ()L1org/w3c/dom/css/Counter;
 getCssText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getRGBColorValue
  ()Lorg/w3c/dom/css/RGBColor;
- ()Lorg/w3c/dom/css/RGBColor;
+ ()L1org/w3c/dom/css/RGBColor;
 getRectValue
  ()Lorg/w3c/dom/css/Rect;
- ()Lorg/w3c/dom/css/Rect;
+ ()L1org/w3c/dom/css/Rect;
 getStringValue
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 setCssText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CounterImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CounterImpl.eea
index 1c0cbe3c1c..ba8134c84c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CounterImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/CounterImpl.eea
@@ -2,10 +2,10 @@ class org/eclipse/e4/ui/css/core/impl/dom/CounterImpl
 
 getIdentifier
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getListStyle
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSeparator
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/DocumentCSSImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/DocumentCSSImpl.eea
index 0dbbd5a9a4..cbde2b0702 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/DocumentCSSImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/DocumentCSSImpl.eea
@@ -14,7 +14,7 @@ getKey
  (II)Ljava/lang/Integer;
 getOverrideStyle
  (Lorg/w3c/dom/Element;Ljava/lang/String;)Lorg/w3c/dom/css/CSSStyleDeclaration;
- (Lorg/w3c/dom/Element;Ljava/lang/String;)Lorg/w3c/dom/css/CSSStyleDeclaration;
+ (Lorg/w3c/dom/Element;Ljava/lang/String;)L0org/w3c/dom/css/CSSStyleDeclaration;
 getStyleDeclarationMap
  ()Ljava/util/Map<Ljava/lang/Integer;Ljava/util/List<*>;>;
  ()Ljava/util/Map<Ljava/lang/Integer;Ljava/util/List<*>;>;
@@ -29,7 +29,7 @@ querySelector
  (II)Ljava/util/List<*>;
 querySelector
  (Lorg/w3c/dom/css/CSSRuleList;II)Ljava/util/List<Lorg/w3c/css/sac/Selector;>;
- (Lorg/w3c/dom/css/CSSRuleList;II)Ljava/util/List<Lorg/w3c/css/sac/Selector;>;
+ (Lorg/w3c/dom/css/CSSRuleList;II)L1java/util/List<Lorg/w3c/css/sac/Selector;>;
 removeStyleSheetChangeListener
  (Lorg/eclipse/e4/ui/css/core/dom/ExtendedDocumentCSS$StyleSheetChangeListener;)V
  (L1org/eclipse/e4/ui/css/core/dom/ExtendedDocumentCSS$StyleSheetChangeListener;)V # @Inherited(org.eclipse.e4.ui.css.core.dom.ExtendedDocumentCSS)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/Measure.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/Measure.eea
index 56f9d7f9c2..2333d38f7a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/Measure.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/Measure.eea
@@ -5,7 +5,7 @@ class org/eclipse/e4/ui/css/core/impl/dom/Measure
  (Lorg/w3c/css/sac/LexicalUnit;)V
 getCssText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.eclipse.e4.ui.css.core.impl.dom.CSSValueImpl)
 getStringValue
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.eclipse.e4.ui.css.core.impl.dom.CSSValueImpl)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/MediaListImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/MediaListImpl.eea
index 0aea598a8a..7c36f50b69 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/MediaListImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/MediaListImpl.eea
@@ -11,10 +11,10 @@ deleteMedium
  (Ljava/lang/String;)V
 getMediaText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 item
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 setMediaText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/RGBColorImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/RGBColorImpl.eea
index b8252a3eb8..7faf1f1eaf 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/RGBColorImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/RGBColorImpl.eea
@@ -8,13 +8,13 @@ getBlue
  ()Lorg/w3c/dom/css/CSSPrimitiveValue;
 getCssText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.eclipse.e4.ui.css.core.impl.dom.CSSValueImpl)
 getGreen
  ()Lorg/w3c/dom/css/CSSPrimitiveValue;
  ()Lorg/w3c/dom/css/CSSPrimitiveValue;
 getRGBColorValue
  ()Lorg/w3c/dom/css/RGBColor;
- ()Lorg/w3c/dom/css/RGBColor;
+ ()L1org/w3c/dom/css/RGBColor; # @Inherited(org.eclipse.e4.ui.css.core.impl.dom.CSSValueImpl)
 getRed
  ()Lorg/w3c/dom/css/CSSPrimitiveValue;
  ()Lorg/w3c/dom/css/CSSPrimitiveValue;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/RectImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/RectImpl.eea
index 824889f1e9..3c248dd3c5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/RectImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/RectImpl.eea
@@ -2,13 +2,13 @@ class org/eclipse/e4/ui/css/core/impl/dom/RectImpl
 
 getBottom
  ()Lorg/w3c/dom/css/CSSPrimitiveValue;
- ()Lorg/w3c/dom/css/CSSPrimitiveValue;
+ ()L1org/w3c/dom/css/CSSPrimitiveValue;
 getLeft
  ()Lorg/w3c/dom/css/CSSPrimitiveValue;
- ()Lorg/w3c/dom/css/CSSPrimitiveValue;
+ ()L1org/w3c/dom/css/CSSPrimitiveValue;
 getRight
  ()Lorg/w3c/dom/css/CSSPrimitiveValue;
- ()Lorg/w3c/dom/css/CSSPrimitiveValue;
+ ()L1org/w3c/dom/css/CSSPrimitiveValue;
 getTop
  ()Lorg/w3c/dom/css/CSSPrimitiveValue;
- ()Lorg/w3c/dom/css/CSSPrimitiveValue;
+ ()L1org/w3c/dom/css/CSSPrimitiveValue;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/StyleSheetListImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/StyleSheetListImpl.eea
index 6622e5263d..ea4c42fdcd 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/StyleSheetListImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/StyleSheetListImpl.eea
@@ -5,4 +5,4 @@ addStyleSheet
  (Lorg/w3c/dom/stylesheets/StyleSheet;)V
 item
  (I)Lorg/w3c/dom/stylesheets/StyleSheet;
- (I)Lorg/w3c/dom/stylesheets/StyleSheet;
+ (I)L0org/w3c/dom/stylesheets/StyleSheet;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/ViewCSSImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/ViewCSSImpl.eea
index 8aef51603d..6fd506cd3f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/ViewCSSImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/ViewCSSImpl.eea
@@ -12,7 +12,7 @@ getComputedStyle
  (Lorg/w3c/dom/Element;Ljava/lang/String;)Lorg/w3c/dom/css/CSSStyleDeclaration;
 getDocument
  ()Lorg/w3c/dom/views/DocumentView;
- ()Lorg/w3c/dom/views/DocumentView;
+ ()L0org/w3c/dom/views/DocumentView;
 styleSheetAdded
  (Lorg/w3c/dom/stylesheets/StyleSheet;)V
  (Lorg/w3c/dom/stylesheets/StyleSheet;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/parsers/AbstractCSSParser.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/parsers/AbstractCSSParser.eea
index 38abecff10..a755a89c75 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/parsers/AbstractCSSParser.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/parsers/AbstractCSSParser.eea
@@ -20,13 +20,13 @@ parsePropertyValue
  (Lorg/w3c/css/sac/InputSource;)Lorg/w3c/dom/css/CSSValue;
 parseRule
  (Lorg/w3c/css/sac/InputSource;)Lorg/w3c/dom/css/CSSRule;
- (Lorg/w3c/css/sac/InputSource;)Lorg/w3c/dom/css/CSSRule;
+ (Lorg/w3c/css/sac/InputSource;)L0org/w3c/dom/css/CSSRule;
 parseSelectors
  (Lorg/w3c/css/sac/InputSource;)Lorg/w3c/css/sac/SelectorList;
  (Lorg/w3c/css/sac/InputSource;)Lorg/w3c/css/sac/SelectorList;
 parseStyleDeclaration
  (Lorg/w3c/css/sac/InputSource;)Lorg/w3c/dom/css/CSSStyleDeclaration;
- (Lorg/w3c/css/sac/InputSource;)Lorg/w3c/dom/css/CSSStyleDeclaration;
+ (Lorg/w3c/css/sac/InputSource;)L1org/w3c/dom/css/CSSStyleDeclaration;
 parseStyleDeclaration
  (Lorg/w3c/dom/css/CSSStyleDeclaration;Lorg/w3c/css/sac/InputSource;)V
  (Lorg/w3c/dom/css/CSSStyleDeclaration;Lorg/w3c/css/sac/InputSource;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/parsers/CSSParserFactoryImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/parsers/CSSParserFactoryImpl.eea
index abcb67ec28..86b9a94d9c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/parsers/CSSParserFactoryImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/dom/parsers/CSSParserFactoryImpl.eea
@@ -2,4 +2,4 @@ class org/eclipse/e4/ui/css/core/impl/dom/parsers/CSSParserFactoryImpl
 
 makeCSSParser
  ()Lorg/eclipse/e4/ui/css/core/dom/parsers/CSSParser;
- ()Lorg/eclipse/e4/ui/css/core/dom/parsers/CSSParser;
+ ()L1org/eclipse/e4/ui/css/core/dom/parsers/CSSParser;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/engine/AbstractCSSEngine.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/engine/AbstractCSSEngine.eea
index c189a2131c..dfa3b51155 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/engine/AbstractCSSEngine.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/engine/AbstractCSSEngine.eea
@@ -9,7 +9,7 @@ propertyHandlerProviders
  (Lorg/eclipse/e4/ui/css/core/dom/ExtendedDocumentCSS;)V
 applyCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;)Lorg/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;)Lorg/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;)L0org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler;
 applyDefaultStyleDeclaration
  (Ljava/lang/Object;Z)V
  (Ljava/lang/Object;Z)V
@@ -30,25 +30,25 @@ applyStyles
  (Ljava/lang/Object;ZZ)V
 convert
  (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)L0java/lang/String;
 convert
  (Lorg/w3c/dom/css/CSSValue;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- (Lorg/w3c/dom/css/CSSValue;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lorg/w3c/dom/css/CSSValue;Ljava/lang/Object;Ljava/lang/Object;)L0java/lang/Object;
 getCSSCompositePropertiesNames
  (Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/String;)[0Ljava/lang/String;
 getCSSElementContext
  (Ljava/lang/Object;)Lorg/eclipse/e4/ui/css/core/engine/CSSElementContext;
  (Ljava/lang/Object;)Lorg/eclipse/e4/ui/css/core/engine/CSSElementContext;
 getCSSProperties
  (Ljava/lang/Object;)Ljava/util/Collection<Ljava/lang/String;>;
- (Ljava/lang/Object;)Ljava/util/Collection<Ljava/lang/String;>;
+ (Ljava/lang/Object;)L1java/util/Collection<Ljava/lang/String;>;
 getCSSPropertyHandlers
  (Ljava/lang/String;)Ljava/util/Collection<Lorg/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler;>;
- (Ljava/lang/String;)Ljava/util/Collection<Lorg/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler;>;
+ (Ljava/lang/String;)L1java/util/Collection<Lorg/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler;>;
 getCSSValueConverter
  (Ljava/lang/Object;)Lorg/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverter;
- (Ljava/lang/Object;)Lorg/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverter;
+ (Ljava/lang/Object;)L0org/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverter;
 getDefaultStyleDeclaration
  (Ljava/lang/Object;Ljava/lang/String;)Lorg/w3c/dom/css/CSSStyleDeclaration;
  (Ljava/lang/Object;Ljava/lang/String;)Lorg/w3c/dom/css/CSSStyleDeclaration;
@@ -60,7 +60,7 @@ getDocumentCSS
  ()Lorg/w3c/dom/css/DocumentCSS;
 getElement
  (Ljava/lang/Object;)Lorg/w3c/dom/Element;
- (Ljava/lang/Object;)Lorg/w3c/dom/Element;
+ (Ljava/lang/Object;)L0org/w3c/dom/Element;
 getElementProvider
  ()Lorg/eclipse/e4/ui/css/core/dom/IElementProvider;
  ()Lorg/eclipse/e4/ui/css/core/dom/IElementProvider;
@@ -81,7 +81,7 @@ getResourcesRegistry
  ()Lorg/eclipse/e4/ui/css/core/resources/IResourcesRegistry;
 getStaticPseudoInstances
  (Lorg/w3c/dom/Element;)[Ljava/lang/String;
- (Lorg/w3c/dom/Element;)[Ljava/lang/String;
+ (Lorg/w3c/dom/Element;)[0Ljava/lang/String;
 getViewCSS
  ()Lorg/w3c/dom/css/ViewCSS;
  ()Lorg/w3c/dom/css/ViewCSS;
@@ -162,7 +162,7 @@ parseStyleSheet
  (Ljava/io/Reader;)Lorg/w3c/dom/stylesheets/StyleSheet;
 parseStyleSheet
  (Lorg/w3c/css/sac/InputSource;)Lorg/w3c/dom/stylesheets/StyleSheet;
- (Lorg/w3c/css/sac/InputSource;)Lorg/w3c/dom/stylesheets/StyleSheet;
+ (Lorg/w3c/css/sac/InputSource;)L1org/w3c/dom/stylesheets/StyleSheet;
 registerCSSPropertyHandlerProvider
  (Lorg/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandlerProvider;)V
  (Lorg/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandlerProvider;)V
@@ -171,7 +171,7 @@ registerCSSValueConverter
  (Lorg/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverter;)V
 retrieveCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;)L0java/lang/String;
 setElementProvider
  (Lorg/eclipse/e4/ui/css/core/dom/IElementProvider;)V
  (Lorg/eclipse/e4/ui/css/core/dom/IElementProvider;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/engine/CSSElementContextImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/engine/CSSElementContextImpl.eea
index bc12aa77c2..feb6383ade 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/engine/CSSElementContextImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/engine/CSSElementContextImpl.eea
@@ -5,7 +5,7 @@ elementMustBeRefreshed
  (Lorg/eclipse/e4/ui/css/core/dom/IElementProvider;)Z
 getData
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L0java/lang/Object;
 getElement
  ()Lorg/w3c/dom/Element;
  ()Lorg/w3c/dom/Element;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/engine/RegistryCSSElementProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/engine/RegistryCSSElementProvider.eea
index b35bfc678e..46b858dbcd 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/engine/RegistryCSSElementProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/engine/RegistryCSSElementProvider.eea
@@ -5,4 +5,4 @@ class org/eclipse/e4/ui/css/core/impl/engine/RegistryCSSElementProvider
  (Lorg/eclipse/core/runtime/IExtensionRegistry;)V
 getElement
  (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Lorg/w3c/dom/Element;
- (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Lorg/w3c/dom/Element;
+ (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0org/w3c/dom/Element;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/engine/RegistryCSSPropertyHandlerProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/engine/RegistryCSSPropertyHandlerProvider.eea
index 5223acf858..f47d0d64a4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/engine/RegistryCSSPropertyHandlerProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/engine/RegistryCSSPropertyHandlerProvider.eea
@@ -8,13 +8,13 @@ configure
  (Ljava/lang/String;)Z
 getCSSProperties
  (Ljava/lang/Object;)Ljava/util/Collection<Ljava/lang/String;>;
- (Ljava/lang/Object;)Ljava/util/Collection<Ljava/lang/String;>;
+ (Ljava/lang/Object;)L1java/util/Collection<Ljava/lang/String;>;
 getCSSPropertyHandlers
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/util/Collection<Lorg/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler;>;
- (Ljava/lang/Object;Ljava/lang/String;)Ljava/util/Collection<Lorg/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler;>;
+ (Ljava/lang/Object;Ljava/lang/String;)L1java/util/Collection<Lorg/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler;>;
 getCSSPropertyHandlers
  (Ljava/lang/String;)Ljava/util/Collection<Lorg/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler;>;
- (Ljava/lang/String;)Ljava/util/Collection<Lorg/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler;>;
+ (Ljava/lang/String;)L1java/util/Collection<Lorg/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler;>;
 getDefaultCSSStyleDeclaration
  (Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Lorg/eclipse/e4/ui/css/core/dom/CSSStylableElement;Lorg/w3c/dom/css/CSSStyleDeclaration;Ljava/lang/String;)Lorg/w3c/dom/css/CSSStyleDeclaration;
  (Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Lorg/eclipse/e4/ui/css/core/dom/CSSStylableElement;Lorg/w3c/dom/css/CSSStyleDeclaration;Ljava/lang/String;)Lorg/w3c/dom/css/CSSStyleDeclaration;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/sac/CSSConditionFactoryImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/sac/CSSConditionFactoryImpl.eea
index 14dd33afb8..64322ccb82 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/sac/CSSConditionFactoryImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/sac/CSSConditionFactoryImpl.eea
@@ -18,43 +18,43 @@ idNamespaceURI
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 createAndCondition
  (Lorg/w3c/css/sac/Condition;Lorg/w3c/css/sac/Condition;)Lorg/w3c/css/sac/CombinatorCondition;
- (Lorg/w3c/css/sac/Condition;Lorg/w3c/css/sac/Condition;)Lorg/w3c/css/sac/CombinatorCondition;
+ (Lorg/w3c/css/sac/Condition;Lorg/w3c/css/sac/Condition;)L1org/w3c/css/sac/CombinatorCondition;
 createAttributeCondition
  (Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;)Lorg/w3c/css/sac/AttributeCondition;
- (Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;)Lorg/w3c/css/sac/AttributeCondition;
+ (Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;)L1org/w3c/css/sac/AttributeCondition;
 createBeginHyphenAttributeCondition
  (Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;)Lorg/w3c/css/sac/AttributeCondition;
- (Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;)Lorg/w3c/css/sac/AttributeCondition;
+ (Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;)L1org/w3c/css/sac/AttributeCondition;
 createClassCondition
  (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/css/sac/AttributeCondition;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/css/sac/AttributeCondition;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/w3c/css/sac/AttributeCondition;
 createContentCondition
  (Ljava/lang/String;)Lorg/w3c/css/sac/ContentCondition;
- (Ljava/lang/String;)Lorg/w3c/css/sac/ContentCondition;
+ (Ljava/lang/String;)L1org/w3c/css/sac/ContentCondition;
 createIdCondition
  (Ljava/lang/String;)Lorg/w3c/css/sac/AttributeCondition;
- (Ljava/lang/String;)Lorg/w3c/css/sac/AttributeCondition;
+ (Ljava/lang/String;)L1org/w3c/css/sac/AttributeCondition;
 createLangCondition
  (Ljava/lang/String;)Lorg/w3c/css/sac/LangCondition;
- (Ljava/lang/String;)Lorg/w3c/css/sac/LangCondition;
+ (Ljava/lang/String;)L1org/w3c/css/sac/LangCondition;
 createNegativeCondition
  (Lorg/w3c/css/sac/Condition;)Lorg/w3c/css/sac/NegativeCondition;
- (Lorg/w3c/css/sac/Condition;)Lorg/w3c/css/sac/NegativeCondition;
+ (Lorg/w3c/css/sac/Condition;)L1org/w3c/css/sac/NegativeCondition;
 createOneOfAttributeCondition
  (Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;)Lorg/w3c/css/sac/AttributeCondition;
- (Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;)Lorg/w3c/css/sac/AttributeCondition;
+ (Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;)L1org/w3c/css/sac/AttributeCondition;
 createOnlyChildCondition
  ()Lorg/w3c/css/sac/Condition;
- ()Lorg/w3c/css/sac/Condition;
+ ()L1org/w3c/css/sac/Condition;
 createOnlyTypeCondition
  ()Lorg/w3c/css/sac/Condition;
- ()Lorg/w3c/css/sac/Condition;
+ ()L1org/w3c/css/sac/Condition;
 createOrCondition
  (Lorg/w3c/css/sac/Condition;Lorg/w3c/css/sac/Condition;)Lorg/w3c/css/sac/CombinatorCondition;
- (Lorg/w3c/css/sac/Condition;Lorg/w3c/css/sac/Condition;)Lorg/w3c/css/sac/CombinatorCondition;
+ (Lorg/w3c/css/sac/Condition;Lorg/w3c/css/sac/Condition;)L1org/w3c/css/sac/CombinatorCondition;
 createPositionalCondition
  (IZZ)Lorg/w3c/css/sac/PositionalCondition;
- (IZZ)Lorg/w3c/css/sac/PositionalCondition;
+ (IZZ)L1org/w3c/css/sac/PositionalCondition;
 createPseudoClassCondition
  (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/css/sac/AttributeCondition;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/css/sac/AttributeCondition;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/w3c/css/sac/AttributeCondition;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/sac/CSSDocumentHandlerImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/sac/CSSDocumentHandlerImpl.eea
index d0a42dcdf4..53956f22d8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/sac/CSSDocumentHandlerImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/sac/CSSDocumentHandlerImpl.eea
@@ -17,7 +17,7 @@ endSelector
  (Lorg/w3c/css/sac/SelectorList;)V
 getCSSProperty
  (Lorg/w3c/dom/css/CSSStyleDeclaration;Ljava/lang/String;Lorg/w3c/css/sac/LexicalUnit;Z)Lorg/eclipse/e4/ui/css/core/dom/CSSProperty;
- (Lorg/w3c/dom/css/CSSStyleDeclaration;Ljava/lang/String;Lorg/w3c/css/sac/LexicalUnit;Z)Lorg/eclipse/e4/ui/css/core/dom/CSSProperty;
+ (Lorg/w3c/dom/css/CSSStyleDeclaration;Ljava/lang/String;Lorg/w3c/css/sac/LexicalUnit;Z)L1org/eclipse/e4/ui/css/core/dom/CSSProperty;
 getNodeRoot
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/sac/CSSPseudoClassConditionImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/sac/CSSPseudoClassConditionImpl.eea
index 13181af29f..1a19d4b694 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/sac/CSSPseudoClassConditionImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/sac/CSSPseudoClassConditionImpl.eea
@@ -15,7 +15,7 @@ fillAttributeSet
  (Ljava/util/Set<Ljava/lang/String;>;)V
 getLocalName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getNamespaceURI
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/sac/CSSSelectorFactoryImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/sac/CSSSelectorFactoryImpl.eea
index 9d62aa3dc1..d8ea9cfabf 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/sac/CSSSelectorFactoryImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/sac/CSSSelectorFactoryImpl.eea
@@ -6,40 +6,40 @@ INSTANCE
 
 createAnyNodeSelector
  ()Lorg/w3c/css/sac/SimpleSelector;
- ()Lorg/w3c/css/sac/SimpleSelector;
+ ()L1org/w3c/css/sac/SimpleSelector;
 createCDataSectionSelector
  (Ljava/lang/String;)Lorg/w3c/css/sac/CharacterDataSelector;
- (Ljava/lang/String;)Lorg/w3c/css/sac/CharacterDataSelector;
+ (Ljava/lang/String;)L1org/w3c/css/sac/CharacterDataSelector;
 createChildSelector
  (Lorg/w3c/css/sac/Selector;Lorg/w3c/css/sac/SimpleSelector;)Lorg/w3c/css/sac/DescendantSelector;
- (Lorg/w3c/css/sac/Selector;Lorg/w3c/css/sac/SimpleSelector;)Lorg/w3c/css/sac/DescendantSelector;
+ (Lorg/w3c/css/sac/Selector;Lorg/w3c/css/sac/SimpleSelector;)L1org/w3c/css/sac/DescendantSelector;
 createCommentSelector
  (Ljava/lang/String;)Lorg/w3c/css/sac/CharacterDataSelector;
- (Ljava/lang/String;)Lorg/w3c/css/sac/CharacterDataSelector;
+ (Ljava/lang/String;)L1org/w3c/css/sac/CharacterDataSelector;
 createConditionalSelector
  (Lorg/w3c/css/sac/SimpleSelector;Lorg/w3c/css/sac/Condition;)Lorg/w3c/css/sac/ConditionalSelector;
- (Lorg/w3c/css/sac/SimpleSelector;Lorg/w3c/css/sac/Condition;)Lorg/w3c/css/sac/ConditionalSelector;
+ (Lorg/w3c/css/sac/SimpleSelector;Lorg/w3c/css/sac/Condition;)L1org/w3c/css/sac/ConditionalSelector;
 createDescendantSelector
  (Lorg/w3c/css/sac/Selector;Lorg/w3c/css/sac/SimpleSelector;)Lorg/w3c/css/sac/DescendantSelector;
- (Lorg/w3c/css/sac/Selector;Lorg/w3c/css/sac/SimpleSelector;)Lorg/w3c/css/sac/DescendantSelector;
+ (Lorg/w3c/css/sac/Selector;Lorg/w3c/css/sac/SimpleSelector;)L1org/w3c/css/sac/DescendantSelector;
 createDirectAdjacentSelector
  (SLorg/w3c/css/sac/Selector;Lorg/w3c/css/sac/SimpleSelector;)Lorg/w3c/css/sac/SiblingSelector;
- (SLorg/w3c/css/sac/Selector;Lorg/w3c/css/sac/SimpleSelector;)Lorg/w3c/css/sac/SiblingSelector;
+ (SLorg/w3c/css/sac/Selector;Lorg/w3c/css/sac/SimpleSelector;)L1org/w3c/css/sac/SiblingSelector;
 createElementSelector
  (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/css/sac/ElementSelector;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/css/sac/ElementSelector;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/w3c/css/sac/ElementSelector;
 createNegativeSelector
  (Lorg/w3c/css/sac/SimpleSelector;)Lorg/w3c/css/sac/NegativeSelector;
- (Lorg/w3c/css/sac/SimpleSelector;)Lorg/w3c/css/sac/NegativeSelector;
+ (Lorg/w3c/css/sac/SimpleSelector;)L1org/w3c/css/sac/NegativeSelector;
 createProcessingInstructionSelector
  (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/css/sac/ProcessingInstructionSelector;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/css/sac/ProcessingInstructionSelector;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/w3c/css/sac/ProcessingInstructionSelector;
 createPseudoElementSelector
  (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/css/sac/ElementSelector;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/css/sac/ElementSelector;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/w3c/css/sac/ElementSelector;
 createRootNodeSelector
  ()Lorg/w3c/css/sac/SimpleSelector;
- ()Lorg/w3c/css/sac/SimpleSelector;
+ ()L1org/w3c/css/sac/SimpleSelector;
 createTextNodeSelector
  (Ljava/lang/String;)Lorg/w3c/css/sac/CharacterDataSelector;
- (Ljava/lang/String;)Lorg/w3c/css/sac/CharacterDataSelector;
+ (Ljava/lang/String;)L1org/w3c/css/sac/CharacterDataSelector;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/sac/DocumentHandlerFactoryImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/sac/DocumentHandlerFactoryImpl.eea
index c5332f01e4..44f8ce0645 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/sac/DocumentHandlerFactoryImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/impl/sac/DocumentHandlerFactoryImpl.eea
@@ -2,4 +2,4 @@ class org/eclipse/e4/ui/css/core/impl/sac/DocumentHandlerFactoryImpl
 
 makeDocumentHandler
  ()Lorg/eclipse/e4/ui/css/core/sac/ExtendedDocumentHandler;
- ()Lorg/eclipse/e4/ui/css/core/sac/ExtendedDocumentHandler;
+ ()L1org/eclipse/e4/ui/css/core/sac/ExtendedDocumentHandler;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/resources/AbstractResourcesRegistry.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/resources/AbstractResourcesRegistry.eea
index e83b5a8776..61c8fab355 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/resources/AbstractResourcesRegistry.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/resources/AbstractResourcesRegistry.eea
@@ -8,7 +8,7 @@ getCacheByType
  (Ljava/lang/Object;)Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
 getResource
  (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;Ljava/lang/Object;)L0java/lang/Object;
 getResourceType
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/resources/CSSResourcesHelpers.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/resources/CSSResourcesHelpers.eea
index 0873c5aa09..2cd21e8847 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/resources/CSSResourcesHelpers.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/resources/CSSResourcesHelpers.eea
@@ -2,19 +2,19 @@ class org/eclipse/e4/ui/css/core/resources/CSSResourcesHelpers
 
 getCSSFontPropertiesKey
  (Lorg/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties;)Ljava/lang/String;
- (Lorg/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties;)Ljava/lang/String;
+ (Lorg/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties;)L1java/lang/String;
 getCSSPrimitiveValueKey
  (Lorg/w3c/dom/css/CSSPrimitiveValue;)Ljava/lang/String;
- (Lorg/w3c/dom/css/CSSPrimitiveValue;)Ljava/lang/String;
+ (Lorg/w3c/dom/css/CSSPrimitiveValue;)L0java/lang/String;
 getCSSRGBColorKey
  (Lorg/w3c/dom/css/RGBColor;)Ljava/lang/String;
- (Lorg/w3c/dom/css/RGBColor;)Ljava/lang/String;
+ (Lorg/w3c/dom/css/RGBColor;)Ljava/lang/String; # @PolyNull
 getCSSValueKey
  (Lorg/w3c/dom/css/CSSValue;)Ljava/lang/String;
- (Lorg/w3c/dom/css/CSSValue;)Ljava/lang/String;
+ (Lorg/w3c/dom/css/CSSValue;)L0java/lang/String;
 getResource
  (Lorg/eclipse/e4/ui/css/core/resources/IResourcesRegistry;Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
- (Lorg/eclipse/e4/ui/css/core/resources/IResourcesRegistry;Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+ (Lorg/eclipse/e4/ui/css/core/resources/IResourcesRegistry;Ljava/lang/Object;Ljava/lang/String;)L0java/lang/Object;
 getResource
  (Lorg/eclipse/e4/ui/css/core/resources/IResourcesRegistry;Ljava/lang/Object;Lorg/w3c/dom/css/CSSPrimitiveValue;)Ljava/lang/Object;
  (Lorg/eclipse/e4/ui/css/core/resources/IResourcesRegistry;Ljava/lang/Object;Lorg/w3c/dom/css/CSSPrimitiveValue;)Ljava/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/resources/ResourceRegistryKeyFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/resources/ResourceRegistryKeyFactory.eea
index 9c4fe67bb3..e6d73e4777 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/resources/ResourceRegistryKeyFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/resources/ResourceRegistryKeyFactory.eea
@@ -2,4 +2,4 @@ class org/eclipse/e4/ui/css/core/resources/ResourceRegistryKeyFactory
 
 createKey
  (Lorg/w3c/dom/css/CSSValue;)Ljava/lang/Object;
- (Lorg/w3c/dom/css/CSSValue;)Ljava/lang/Object;
+ (Lorg/w3c/dom/css/CSSValue;)L1java/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/sac/DocumentHandlerFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/sac/DocumentHandlerFactory.eea
index d5bf232f89..93c8864d18 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/sac/DocumentHandlerFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/sac/DocumentHandlerFactory.eea
@@ -2,4 +2,4 @@ class org/eclipse/e4/ui/css/core/sac/DocumentHandlerFactory
 
 newInstance
  ()Lorg/eclipse/e4/ui/css/core/sac/DocumentHandlerFactory;
- ()Lorg/eclipse/e4/ui/css/core/sac/DocumentHandlerFactory;
+ ()L1org/eclipse/e4/ui/css/core/sac/DocumentHandlerFactory;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/sac/SACParserFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/sac/SACParserFactory.eea
index 732f7394c8..a6c785c7a3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/sac/SACParserFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/sac/SACParserFactory.eea
@@ -2,7 +2,7 @@ class org/eclipse/e4/ui/css/core/sac/SACParserFactory
 
 newInstance
  ()Lorg/eclipse/e4/ui/css/core/sac/ISACParserFactory;
- ()Lorg/eclipse/e4/ui/css/core/sac/ISACParserFactory;
+ ()L1org/eclipse/e4/ui/css/core/sac/ISACParserFactory;
 
 getPreferredParserName
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/util/impl/resources/FileResourcesLocatorImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/util/impl/resources/FileResourcesLocatorImpl.eea
index 0a16a9c33b..5730e501b1 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/util/impl/resources/FileResourcesLocatorImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/util/impl/resources/FileResourcesLocatorImpl.eea
@@ -2,7 +2,7 @@ class org/eclipse/e4/ui/css/core/util/impl/resources/FileResourcesLocatorImpl
 
 getInputStream
  (Ljava/lang/String;)Ljava/io/InputStream;
- (Ljava/lang/String;)Ljava/io/InputStream;
+ (Ljava/lang/String;)L1java/io/InputStream;
 resolve
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/util/impl/resources/HttpResourcesLocatorImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/util/impl/resources/HttpResourcesLocatorImpl.eea
index 9d338211c8..924456bd77 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/util/impl/resources/HttpResourcesLocatorImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/util/impl/resources/HttpResourcesLocatorImpl.eea
@@ -5,4 +5,4 @@ getInputStream
  (Ljava/lang/String;)Ljava/io/InputStream;
 resolve
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/util/impl/resources/OSGiResourceLocator.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/util/impl/resources/OSGiResourceLocator.eea
index b53f39d2c7..6176c2cb8f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/util/impl/resources/OSGiResourceLocator.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/util/impl/resources/OSGiResourceLocator.eea
@@ -8,4 +8,4 @@ getInputStream
  (Ljava/lang/String;)Ljava/io/InputStream;
 resolve
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/util/impl/resources/ResourcesLocatorManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/util/impl/resources/ResourcesLocatorManager.eea
index 382a9ae0bc..e16a3ef3a9 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/util/impl/resources/ResourcesLocatorManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/util/impl/resources/ResourcesLocatorManager.eea
@@ -6,13 +6,13 @@ INSTANCE
 
 getInputStream
  (Ljava/lang/String;)Ljava/io/InputStream;
- (Ljava/lang/String;)Ljava/io/InputStream;
+ (Ljava/lang/String;)L0java/io/InputStream;
 registerResourceLocator
  (Lorg/eclipse/e4/ui/css/core/util/resources/IResourceLocator;)V
  (Lorg/eclipse/e4/ui/css/core/util/resources/IResourceLocator;)V
 resolve
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 unregisterResourceLocator
  (Lorg/eclipse/e4/ui/css/core/util/resources/IResourceLocator;)V
  (Lorg/eclipse/e4/ui/css/core/util/resources/IResourceLocator;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/utils/ClassUtils.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/utils/ClassUtils.eea
index ee23107a3d..c1594f4782 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/utils/ClassUtils.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/core/utils/ClassUtils.eea
@@ -2,7 +2,7 @@ class org/eclipse/e4/ui/css/core/utils/ClassUtils
 
 getPackageName
  (Ljava/lang/Class<*>;)Ljava/lang/String;
- (Ljava/lang/Class<*>;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;)L0java/lang/String;
 getSimpleName
  (Ljava/lang/Class<*>;)Ljava/lang/String;
  (Ljava/lang/Class<*>;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/CTabFolderElement.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/CTabFolderElement.eea
index 26adbdd957..9c1103b7ee 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/CTabFolderElement.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/CTabFolderElement.eea
@@ -9,7 +9,7 @@ setBackgroundOverriddenDuringRenderering
  (Lorg/eclipse/swt/custom/CTabFolder;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 getVisibleChildNodes
  ()Lorg/w3c/dom/NodeList;
- ()Lorg/w3c/dom/NodeList;
+ ()L1org/w3c/dom/NodeList;
 item
  (I)Lorg/w3c/dom/Node;
- (I)Lorg/w3c/dom/Node;
+ (I)L0org/w3c/dom/Node; # @Inherited(org.eclipse.e4.ui.css.swt.dom.CompositeElement)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/CompositeElement.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/CompositeElement.eea
index 1585bdac17..75b875980e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/CompositeElement.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/CompositeElement.eea
@@ -15,7 +15,7 @@ getComposite
  ()Lorg/eclipse/swt/widgets/Composite;
 item
  (I)Lorg/w3c/dom/Node;
- (I)Lorg/w3c/dom/Node;
+ (I)L0org/w3c/dom/Node; # @Inherited(org.eclipse.e4.ui.css.swt.dom.WidgetElement)
 stream
  ()Ljava/util/stream/Stream<Lorg/w3c/dom/Node;>;
  ()Ljava/util/stream/Stream<Lorg/w3c/dom/Node;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/SWTElementProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/SWTElementProvider.eea
index 7eb44049f5..7c8d9a9bfd 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/SWTElementProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/SWTElementProvider.eea
@@ -6,4 +6,4 @@ INSTANCE
 
 getElement
  (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Lorg/w3c/dom/Element;
- (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Lorg/w3c/dom/Element;
+ (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0org/w3c/dom/Element;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/ShellElement.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/ShellElement.eea
index 2bae17a95d..d7d294bfae 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/ShellElement.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/ShellElement.eea
@@ -8,7 +8,7 @@ getParentNode
  ()L0org/w3c/dom/Node; # @Inherited(org.eclipse.e4.ui.css.swt.dom.ControlElement)
 internalGetAttribute
  (Ljava/lang/String;)Ljava/util/function/Supplier<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/function/Supplier<Ljava/lang/String;>;
+ (Ljava/lang/String;)L0java/util/function/Supplier<Ljava/lang/String;>; # @Inherited(org.eclipse.e4.ui.css.swt.dom.WidgetElement)
 isPseudoInstanceOf
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/TableElement.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/TableElement.eea
index 2f2fc87305..5f0f0ebcdf 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/TableElement.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/TableElement.eea
@@ -8,7 +8,7 @@ getTable
  ()Lorg/eclipse/swt/widgets/Table;
 internalGetAttribute
  (Ljava/lang/String;)Ljava/util/function/Supplier<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/function/Supplier<Ljava/lang/String;>;
+ (Ljava/lang/String;)L0java/util/function/Supplier<Ljava/lang/String;>; # @Inherited(org.eclipse.e4.ui.css.swt.dom.WidgetElement)
 setHeaderBackgroundColor
  (Lorg/eclipse/swt/graphics/Color;)V
  (Lorg/eclipse/swt/graphics/Color;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/ToolBarElement.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/ToolBarElement.eea
index 7dd9ae04f3..4b5bbd8423 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/ToolBarElement.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/ToolBarElement.eea
@@ -8,4 +8,4 @@ getToolBar
  ()Lorg/eclipse/swt/widgets/ToolBar;
 item
  (I)Lorg/w3c/dom/Node;
- (I)Lorg/w3c/dom/Node;
+ (I)L0org/w3c/dom/Node; # @Inherited(org.eclipse.e4.ui.css.swt.dom.CompositeElement)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/ToolItemElement.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/ToolItemElement.eea
index 8f139066f9..1db5e88e43 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/ToolItemElement.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/ToolItemElement.eea
@@ -14,4 +14,4 @@ isPseudoInstanceOf
  (Ljava/lang/String;)Z
 item
  (I)Lorg/w3c/dom/Node;
- (I)Lorg/w3c/dom/Node;
+ (I)L0org/w3c/dom/Node; # @Inherited(org.eclipse.e4.ui.css.swt.dom.WidgetElement)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/TreeElement.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/TreeElement.eea
index c31dbb5693..03b7f56de1 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/TreeElement.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/TreeElement.eea
@@ -8,7 +8,7 @@ getTree
  ()Lorg/eclipse/swt/widgets/Tree;
 internalGetAttribute
  (Ljava/lang/String;)Ljava/util/function/Supplier<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/function/Supplier<Ljava/lang/String;>;
+ (Ljava/lang/String;)L0java/util/function/Supplier<Ljava/lang/String;>; # @Inherited(org.eclipse.e4.ui.css.swt.dom.WidgetElement)
 setHeaderBackgroundColor
  (Lorg/eclipse/swt/graphics/Color;)V
  (Lorg/eclipse/swt/graphics/Color;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/WidgetElement.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/WidgetElement.eea
index f5a6b264c2..301135387d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/WidgetElement.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/WidgetElement.eea
@@ -52,13 +52,13 @@ getAttribute
  (Ljava/lang/String;)Ljava/lang/String;
 getCSSClass
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getCSSId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getCSSStyle
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getChildNodes
  ()Lorg/w3c/dom/NodeList;
  ()L1org/w3c/dom/NodeList; # @Inherited(org.w3c.dom.Node)
@@ -79,10 +79,10 @@ hasAttribute
  (Ljava/lang/String;)Z
 internalGetAttribute
  (Ljava/lang/String;)Ljava/util/function/Supplier<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/function/Supplier<Ljava/lang/String;>;
+ (Ljava/lang/String;)L0java/util/function/Supplier<Ljava/lang/String;>;
 item
  (I)Lorg/w3c/dom/Node;
- (I)Lorg/w3c/dom/Node;
+ (I)L0org/w3c/dom/Node;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/definition/ThemeDefinitionElement.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/definition/ThemeDefinitionElement.eea
index b7e43e178b..b7c3e88c66 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/definition/ThemeDefinitionElement.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/definition/ThemeDefinitionElement.eea
@@ -7,16 +7,16 @@ class org/eclipse/e4/ui/css/swt/dom/definition/ThemeDefinitionElement
  (TT;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 getAttribute
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 getCSSClass
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getCSSId
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getCSSStyle
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getChildNodes
  ()Lorg/w3c/dom/NodeList;
  ()L1org/w3c/dom/NodeList; # @Inherited(org.w3c.dom.Node)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/definition/ThemeElementDefinitionProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/definition/ThemeElementDefinitionProvider.eea
index da93f0f341..47a58a9de4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/definition/ThemeElementDefinitionProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/definition/ThemeElementDefinitionProvider.eea
@@ -2,4 +2,4 @@ class org/eclipse/e4/ui/css/swt/dom/definition/ThemeElementDefinitionProvider
 
 getElement
  (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Lorg/w3c/dom/Element;
- (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Lorg/w3c/dom/Element;
+ (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0org/w3c/dom/Element;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/definition/ThemesExtensionElement.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/definition/ThemesExtensionElement.eea
index 6a7709c9ca..b4c076607b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/definition/ThemesExtensionElement.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/definition/ThemesExtensionElement.eea
@@ -5,16 +5,16 @@ class org/eclipse/e4/ui/css/swt/dom/definition/ThemesExtensionElement
  (Lorg/eclipse/e4/ui/internal/css/swt/definition/IThemesExtension;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 getAttribute
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 getCSSClass
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getCSSId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getCSSStyle
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getChildNodes
  ()Lorg/w3c/dom/NodeList;
  ()L1org/w3c/dom/NodeList; # @Inherited(org.w3c.dom.Node)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/html/SWTHTMLElement.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/html/SWTHTMLElement.eea
index 60759fe178..75c69e8011 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/html/SWTHTMLElement.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/html/SWTHTMLElement.eea
@@ -9,10 +9,10 @@ attributeType
  (Lorg/eclipse/swt/widgets/Widget;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 computeAttributeType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 computeLocalName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 internalGetAttribute
  (Ljava/lang/String;)Ljava/util/function/Supplier<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/function/Supplier<Ljava/lang/String;>;
+ (Ljava/lang/String;)L0java/util/function/Supplier<Ljava/lang/String;>; # @Inherited(org.eclipse.e4.ui.css.swt.dom.WidgetElement)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/html/SWTHTMLElementProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/html/SWTHTMLElementProvider.eea
index ee8ed66d1d..b2a11214d4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/html/SWTHTMLElementProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/html/SWTHTMLElementProvider.eea
@@ -6,4 +6,4 @@ INSTANCE
 
 getElement
  (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Lorg/w3c/dom/Element;
- (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Lorg/w3c/dom/Element;
+ (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0org/w3c/dom/Element; # @Inherited(org.eclipse.e4.ui.css.swt.dom.SWTElementProvider)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/preference/EclipsePreferencesElement.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/preference/EclipsePreferencesElement.eea
index 89b49b1bc1..dac578f145 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/preference/EclipsePreferencesElement.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/preference/EclipsePreferencesElement.eea
@@ -5,16 +5,16 @@ class org/eclipse/e4/ui/css/swt/dom/preference/EclipsePreferencesElement
  (Lorg/eclipse/core/runtime/preferences/IEclipsePreferences;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 getAttribute
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 getCSSClass
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getCSSId
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getCSSStyle
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getChildNodes
  ()Lorg/w3c/dom/NodeList;
  ()L1org/w3c/dom/NodeList; # @Inherited(org.w3c.dom.Node)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/preference/EclipsePreferencesProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/preference/EclipsePreferencesProvider.eea
index a2704e2b1c..4ab0c1686f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/preference/EclipsePreferencesProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/dom/preference/EclipsePreferencesProvider.eea
@@ -2,4 +2,4 @@ class org/eclipse/e4/ui/css/swt/dom/preference/EclipsePreferencesProvider
 
 getElement
  (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Lorg/w3c/dom/Element;
- (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Lorg/w3c/dom/Element;
+ (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0org/w3c/dom/Element;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/engine/AbstractCSSSWTEngineImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/engine/AbstractCSSSWTEngineImpl.eea
index 6bca37d559..dc6943a8d4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/engine/AbstractCSSSWTEngineImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/engine/AbstractCSSSWTEngineImpl.eea
@@ -12,7 +12,7 @@ display
  (Lorg/eclipse/swt/widgets/Display;Z)V
 getElement
  (Ljava/lang/Object;)Lorg/w3c/dom/Element;
- (Ljava/lang/Object;)Lorg/w3c/dom/Element;
+ (Ljava/lang/Object;)L0org/w3c/dom/Element; # @Inherited(org.eclipse.e4.ui.css.core.impl.engine.AbstractCSSEngine)
 getResourcesRegistry
  ()Lorg/eclipse/e4/ui/css/core/resources/IResourcesRegistry;
  ()Lorg/eclipse/e4/ui/css/core/resources/IResourcesRegistry;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/CSSSWTColorHelper.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/CSSSWTColorHelper.eea
index c727d3bb6e..0abdfd7861 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/CSSSWTColorHelper.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/CSSSWTColorHelper.eea
@@ -6,7 +6,7 @@ COLOR_DEFINITION_MARKER
 
 getGradient
  (Lorg/w3c/dom/css/CSSValueList;Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/e4/ui/css/core/dom/properties/Gradient;
- (Lorg/w3c/dom/css/CSSValueList;Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/e4/ui/css/core/dom/properties/Gradient;
+ (Lorg/w3c/dom/css/CSSValueList;Lorg/eclipse/swt/widgets/Display;)L1org/eclipse/e4/ui/css/core/dom/properties/Gradient;
 getPercent
  (Lorg/w3c/dom/css/CSSPrimitiveValue;)Ljava/lang/Integer;
  (Lorg/w3c/dom/css/CSSPrimitiveValue;)Ljava/lang/Integer;
@@ -15,31 +15,31 @@ getPercents
  (Lorg/eclipse/e4/ui/css/core/dom/properties/Gradient;)[I
 getRGBA
  (Ljava/lang/String;)Lorg/eclipse/swt/graphics/RGBA;
- (Ljava/lang/String;)Lorg/eclipse/swt/graphics/RGBA;
+ (Ljava/lang/String;)L0org/eclipse/swt/graphics/RGBA;
 getRGBA
  (Lorg/w3c/dom/css/CSSPrimitiveValue;)Lorg/eclipse/swt/graphics/RGBA;
  (Lorg/w3c/dom/css/CSSPrimitiveValue;)Lorg/eclipse/swt/graphics/RGBA;
 getRGBA
  (Lorg/w3c/dom/css/CSSValue;)Lorg/eclipse/swt/graphics/RGBA;
- (Lorg/w3c/dom/css/CSSValue;)Lorg/eclipse/swt/graphics/RGBA;
+ (Lorg/w3c/dom/css/CSSValue;)L0org/eclipse/swt/graphics/RGBA;
 getRGBA
  (Lorg/w3c/dom/css/RGBColor;)Lorg/eclipse/swt/graphics/RGBA;
  (Lorg/w3c/dom/css/RGBColor;)Lorg/eclipse/swt/graphics/RGBA;
 getRGBColor
  (Lorg/eclipse/swt/graphics/Color;)Lorg/w3c/dom/css/RGBColor;
- (Lorg/eclipse/swt/graphics/Color;)Lorg/w3c/dom/css/RGBColor;
+ (Lorg/eclipse/swt/graphics/Color;)L1org/w3c/dom/css/RGBColor;
 getRGBColor
  (Lorg/eclipse/swt/graphics/RGB;)Lorg/w3c/dom/css/RGBColor;
- (Lorg/eclipse/swt/graphics/RGB;)Lorg/w3c/dom/css/RGBColor;
+ (Lorg/eclipse/swt/graphics/RGB;)L1org/w3c/dom/css/RGBColor;
 getSWTColor
  (Lorg/w3c/dom/css/CSSValue;Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/swt/graphics/Color;
- (Lorg/w3c/dom/css/CSSValue;Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/swt/graphics/Color;
+ (Lorg/w3c/dom/css/CSSValue;Lorg/eclipse/swt/widgets/Display;)L0org/eclipse/swt/graphics/Color;
 getSWTColor
  (Lorg/w3c/dom/css/RGBColor;Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/swt/graphics/Color;
- (Lorg/w3c/dom/css/RGBColor;Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/swt/graphics/Color;
+ (Lorg/w3c/dom/css/RGBColor;Lorg/eclipse/swt/widgets/Display;)L1org/eclipse/swt/graphics/Color;
 getSWTColors
  (Lorg/eclipse/e4/ui/css/core/dom/properties/Gradient;Lorg/eclipse/swt/widgets/Display;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)[Lorg/eclipse/swt/graphics/Color;
- (Lorg/eclipse/e4/ui/css/core/dom/properties/Gradient;Lorg/eclipse/swt/widgets/Display;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)[Lorg/eclipse/swt/graphics/Color;
+ (Lorg/eclipse/e4/ui/css/core/dom/properties/Gradient;Lorg/eclipse/swt/widgets/Display;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)[1Lorg/eclipse/swt/graphics/Color;
 hasColorDefinitionAsValue
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/CSSSWTCursorHelper.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/CSSSWTCursorHelper.eea
index 4ffd466a81..0cdd9d039b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/CSSSWTCursorHelper.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/CSSSWTCursorHelper.eea
@@ -2,10 +2,10 @@ class org/eclipse/e4/ui/css/swt/helpers/CSSSWTCursorHelper
 
 getCSSCursor
  (Lorg/eclipse/swt/graphics/Cursor;)Ljava/lang/String;
- (Lorg/eclipse/swt/graphics/Cursor;)Ljava/lang/String;
+ (Lorg/eclipse/swt/graphics/Cursor;)L1java/lang/String;
 getSWTCursor
  (Lorg/w3c/dom/css/CSSValue;Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/swt/graphics/Cursor;
- (Lorg/w3c/dom/css/CSSValue;Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/swt/graphics/Cursor;
+ (Lorg/w3c/dom/css/CSSValue;Lorg/eclipse/swt/widgets/Display;)L0org/eclipse/swt/graphics/Cursor;
 getSWTCursorId
  (Lorg/w3c/dom/css/CSSPrimitiveValue;)I
  (Lorg/w3c/dom/css/CSSPrimitiveValue;)I
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/CSSSWTFontHelper.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/CSSSWTFontHelper.eea
index 7d144f507e..fe55973461 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/CSSSWTFontHelper.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/CSSSWTFontHelper.eea
@@ -9,7 +9,7 @@ equals
  (Lorg/eclipse/swt/graphics/Font;Lorg/eclipse/swt/graphics/Font;)Z
 getCSS2FontProperties
  (Lorg/eclipse/swt/graphics/Font;)Lorg/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties;
- (Lorg/eclipse/swt/graphics/Font;)Lorg/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties;
+ (Lorg/eclipse/swt/graphics/Font;)L1org/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties;
 getCSS2FontProperties
  (Lorg/eclipse/swt/graphics/Font;Lorg/eclipse/e4/ui/css/core/engine/CSSElementContext;)Lorg/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties;
  (Lorg/eclipse/swt/graphics/Font;Lorg/eclipse/e4/ui/css/core/engine/CSSElementContext;)Lorg/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties;
@@ -21,13 +21,13 @@ getCSS2FontProperties
  (Lorg/eclipse/swt/widgets/Widget;Lorg/eclipse/swt/graphics/Font;Lorg/eclipse/e4/ui/css/core/engine/CSSElementContext;)Lorg/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties;
 getFirstFontData
  (Lorg/eclipse/swt/graphics/Font;)Lorg/eclipse/swt/graphics/FontData;
- (Lorg/eclipse/swt/graphics/Font;)Lorg/eclipse/swt/graphics/FontData;
+ (Lorg/eclipse/swt/graphics/Font;)L0org/eclipse/swt/graphics/FontData;
 getFirstFontData
  (Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/graphics/FontData;
- (Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/graphics/FontData;
+ (Lorg/eclipse/swt/widgets/Control;)L0org/eclipse/swt/graphics/FontData;
 getFont
  (Lorg/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties;Lorg/eclipse/swt/graphics/FontData;Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/swt/graphics/Font;
- (Lorg/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties;Lorg/eclipse/swt/graphics/FontData;Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/swt/graphics/Font;
+ (Lorg/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties;Lorg/eclipse/swt/graphics/FontData;Lorg/eclipse/swt/widgets/Display;)L1org/eclipse/swt/graphics/Font;
 getFont
  (Lorg/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties;Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/graphics/Font;
  (Lorg/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties;Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/graphics/Font;
@@ -36,19 +36,19 @@ getFontComposite
  (Lorg/eclipse/swt/graphics/Font;)Ljava/lang/String;
 getFontComposite
  (Lorg/eclipse/swt/graphics/FontData;)Ljava/lang/String;
- (Lorg/eclipse/swt/graphics/FontData;)Ljava/lang/String;
+ (Lorg/eclipse/swt/graphics/FontData;)L0java/lang/String;
 getFontComposite
  (Lorg/eclipse/swt/widgets/Control;)Ljava/lang/String;
  (Lorg/eclipse/swt/widgets/Control;)Ljava/lang/String;
 getFontData
  (Lorg/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties;Lorg/eclipse/swt/graphics/FontData;)Lorg/eclipse/swt/graphics/FontData;
- (Lorg/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties;Lorg/eclipse/swt/graphics/FontData;)Lorg/eclipse/swt/graphics/FontData;
+ (Lorg/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties;Lorg/eclipse/swt/graphics/FontData;)L1org/eclipse/swt/graphics/FontData;
 getFontFamily
  (Lorg/eclipse/swt/graphics/Font;)Ljava/lang/String;
  (Lorg/eclipse/swt/graphics/Font;)Ljava/lang/String;
 getFontFamily
  (Lorg/eclipse/swt/graphics/FontData;)Ljava/lang/String;
- (Lorg/eclipse/swt/graphics/FontData;)Ljava/lang/String;
+ (Lorg/eclipse/swt/graphics/FontData;)L0java/lang/String;
 getFontFamily
  (Lorg/eclipse/swt/widgets/Widget;)Ljava/lang/String;
  (Lorg/eclipse/swt/widgets/Widget;)Ljava/lang/String;
@@ -57,7 +57,7 @@ getFontSize
  (Lorg/eclipse/swt/graphics/Font;)Ljava/lang/String;
 getFontSize
  (Lorg/eclipse/swt/graphics/FontData;)Ljava/lang/String;
- (Lorg/eclipse/swt/graphics/FontData;)Ljava/lang/String;
+ (Lorg/eclipse/swt/graphics/FontData;)L0java/lang/String;
 getFontSize
  (Lorg/eclipse/swt/widgets/Widget;)Ljava/lang/String;
  (Lorg/eclipse/swt/widgets/Widget;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/CSSSWTHelpers.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/CSSSWTHelpers.eea
index 8419d15f07..d7bb4fb4ce 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/CSSSWTHelpers.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/CSSSWTHelpers.eea
@@ -2,7 +2,7 @@ class org/eclipse/e4/ui/css/swt/helpers/CSSSWTHelpers
 
 createBorderPaintListener
  (Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/events/PaintListener;
- (Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/events/PaintListener;
+ (Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Lorg/eclipse/swt/widgets/Control;)L1org/eclipse/swt/events/PaintListener;
 getLineStyle
  (Ljava/lang/String;)I
  (Ljava/lang/String;)I
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/CSSSWTImageHelper.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/CSSSWTImageHelper.eea
index 7a394c99b2..b289096624 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/CSSSWTImageHelper.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/CSSSWTImageHelper.eea
@@ -2,7 +2,7 @@ class org/eclipse/e4/ui/css/swt/helpers/CSSSWTImageHelper
 
 getImage
  (Lorg/w3c/dom/css/CSSValue;Lorg/eclipse/e4/ui/css/core/util/resources/IResourcesLocatorManager;Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/swt/graphics/Image;
- (Lorg/w3c/dom/css/CSSValue;Lorg/eclipse/e4/ui/css/core/util/resources/IResourcesLocatorManager;Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/swt/graphics/Image;
+ (Lorg/w3c/dom/css/CSSValue;Lorg/eclipse/e4/ui/css/core/util/resources/IResourcesLocatorManager;Lorg/eclipse/swt/widgets/Display;)L0org/eclipse/swt/graphics/Image;
 restoreDefaultImage
  (Lorg/eclipse/swt/widgets/Button;)V
  (Lorg/eclipse/swt/widgets/Button;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/SWTElementHelpers.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/SWTElementHelpers.eea
index e6672454bf..fe997cb17d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/SWTElementHelpers.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/SWTElementHelpers.eea
@@ -9,16 +9,16 @@ SWT_NODELIST_KEY
 
 getControl
  (Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Control;
- (Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Control;
+ (Ljava/lang/Object;)L0org/eclipse/swt/widgets/Control;
 getElement
  (Lorg/eclipse/swt/widgets/Widget;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Lorg/w3c/dom/Element;
- (Lorg/eclipse/swt/widgets/Widget;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Lorg/w3c/dom/Element;
+ (Lorg/eclipse/swt/widgets/Widget;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0org/w3c/dom/Element;
 getElement
  (Lorg/eclipse/swt/widgets/Widget;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Class<*>;)Lorg/w3c/dom/Element;
  (Lorg/eclipse/swt/widgets/Widget;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Class<*>;)Lorg/w3c/dom/Element;
 getHTMLElement
  (Lorg/eclipse/swt/widgets/Widget;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Lorg/w3c/dom/Element;
- (Lorg/eclipse/swt/widgets/Widget;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Lorg/w3c/dom/Element;
+ (Lorg/eclipse/swt/widgets/Widget;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0org/w3c/dom/Element;
 getWidget
  (Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Widget;
- (Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Widget;
+ (Ljava/lang/Object;)L0org/eclipse/swt/widgets/Widget;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/SWTStyleHelpers.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/SWTStyleHelpers.eea
index 3832f3f855..98dab23e8c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/SWTStyleHelpers.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/SWTStyleHelpers.eea
@@ -2,7 +2,7 @@ class org/eclipse/e4/ui/css/swt/helpers/SWTStyleHelpers
 
 getSWTWidgetStyleAsString
  (ILjava/lang/String;)Ljava/lang/String;
- (ILjava/lang/String;)Ljava/lang/String;
+ (ILjava/lang/String;)L1java/lang/String;
 getSWTWidgetStyleAsString
  (Lorg/eclipse/swt/widgets/Widget;)Ljava/lang/String;
  (Lorg/eclipse/swt/widgets/Widget;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/URI.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/URI.eea
index 3ef8fd0156..a090919faf 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/URI.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/helpers/URI.eea
@@ -2,43 +2,43 @@ class org/eclipse/e4/ui/css/swt/helpers/URI
 
 createDeviceURI
  (Ljava/lang/String;)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
- (Ljava/lang/String;)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
+ (Ljava/lang/String;)L1org/eclipse/e4/ui/css/swt/helpers/URI;
 createFileURI
  (Ljava/lang/String;)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
- (Ljava/lang/String;)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
+ (Ljava/lang/String;)L1org/eclipse/e4/ui/css/swt/helpers/URI;
 createGenericURI
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1org/eclipse/e4/ui/css/swt/helpers/URI;
 createHierarchicalURI
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1org/eclipse/e4/ui/css/swt/helpers/URI;
 createHierarchicalURI
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1org/eclipse/e4/ui/css/swt/helpers/URI;
 createHierarchicalURI
  ([Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
- ([Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
+ ([Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1org/eclipse/e4/ui/css/swt/helpers/URI;
 createPlatformPluginURI
  (Ljava/lang/String;Z)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
- (Ljava/lang/String;Z)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
+ (Ljava/lang/String;Z)L1org/eclipse/e4/ui/css/swt/helpers/URI;
 createPlatformResourceURI
  (Ljava/lang/String;)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
- (Ljava/lang/String;)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
+ (Ljava/lang/String;)L1org/eclipse/e4/ui/css/swt/helpers/URI;
 createPlatformResourceURI
  (Ljava/lang/String;Z)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
- (Ljava/lang/String;Z)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
+ (Ljava/lang/String;Z)L1org/eclipse/e4/ui/css/swt/helpers/URI;
 createURI
  (Ljava/lang/String;)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
- (Ljava/lang/String;)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
+ (Ljava/lang/String;)L1org/eclipse/e4/ui/css/swt/helpers/URI;
 createURI
  (Ljava/lang/String;Z)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
- (Ljava/lang/String;Z)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
+ (Ljava/lang/String;Z)L1org/eclipse/e4/ui/css/swt/helpers/URI;
 createURI
  (Ljava/lang/String;ZI)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
- (Ljava/lang/String;ZI)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
+ (Ljava/lang/String;ZI)L1org/eclipse/e4/ui/css/swt/helpers/URI;
 createURIWithCache
  (Ljava/lang/String;)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
- (Ljava/lang/String;)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
+ (Ljava/lang/String;)L1org/eclipse/e4/ui/css/swt/helpers/URI;
 decode
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
@@ -108,7 +108,7 @@ appendSegments
  ([Ljava/lang/String;)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
 authority
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 deresolve
  (Lorg/eclipse/e4/ui/css/swt/helpers/URI;)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
  (Lorg/eclipse/e4/ui/css/swt/helpers/URI;)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
@@ -120,37 +120,37 @@ device
  ()Ljava/lang/String;
 devicePath
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 fileExtension
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 fragment
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 host
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 lastSegment
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 opaquePart
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 path
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 port
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 query
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 replacePrefix
  (Lorg/eclipse/e4/ui/css/swt/helpers/URI;Lorg/eclipse/e4/ui/css/swt/helpers/URI;)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
- (Lorg/eclipse/e4/ui/css/swt/helpers/URI;Lorg/eclipse/e4/ui/css/swt/helpers/URI;)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
+ (Lorg/eclipse/e4/ui/css/swt/helpers/URI;Lorg/eclipse/e4/ui/css/swt/helpers/URI;)L0org/eclipse/e4/ui/css/swt/helpers/URI;
 resolve
  (Lorg/eclipse/e4/ui/css/swt/helpers/URI;)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
  (Lorg/eclipse/e4/ui/css/swt/helpers/URI;)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
@@ -171,10 +171,10 @@ segmentsList
  ()Ljava/util/List<Ljava/lang/String;>;
 toFileString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 toPlatformString
  (Z)Ljava/lang/String;
- (Z)Ljava/lang/String;
+ (Z)L0java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
@@ -192,4 +192,4 @@ trimSegments
  (I)Lorg/eclipse/e4/ui/css/swt/helpers/URI;
 userInfo
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/AbstractCSSPropertySWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/AbstractCSSPropertySWTHandler.eea
index a0b71ae220..7447a4ba90 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/AbstractCSSPropertySWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/AbstractCSSPropertySWTHandler.eea
@@ -8,7 +8,7 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String; # @Inherited(org.eclipse.e4.ui.css.core.dom.properties.ICSSPropertyHandler)
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/AbstractConvertedCSSPropertySWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/AbstractConvertedCSSPropertySWTHandler.eea
index 0880c89259..71516ef22a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/AbstractConvertedCSSPropertySWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/AbstractConvertedCSSPropertySWTHandler.eea
@@ -11,4 +11,4 @@ getToType
  (Ljava/lang/Object;)Ljava/lang/Object;
 retrieveCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/converters/CSSValueSWTFontConverterImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/converters/CSSValueSWTFontConverterImpl.eea
index 6c8612a901..0743938632 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/converters/CSSValueSWTFontConverterImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/converters/CSSValueSWTFontConverterImpl.eea
@@ -6,7 +6,7 @@ INSTANCE
 
 convert
  (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverterConfig;)Ljava/lang/String;
- (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverterConfig;)Ljava/lang/String;
+ (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverterConfig;)L0java/lang/String; # @Inherited(org.eclipse.e4.ui.css.swt.properties.converters.CSSValueSWTFontDataConverterImpl)
 convert
  (Lorg/w3c/dom/css/CSSValue;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;)Ljava/lang/Object;
- (Lorg/w3c/dom/css/CSSValue;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lorg/w3c/dom/css/CSSValue;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;)L0java/lang/Object; # @Inherited(org.eclipse.e4.ui.css.swt.properties.converters.CSSValueSWTFontDataConverterImpl)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/converters/CSSValueSWTFontDataConverterImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/converters/CSSValueSWTFontDataConverterImpl.eea
index 8d95263bbe..463ebc1324 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/converters/CSSValueSWTFontDataConverterImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/converters/CSSValueSWTFontDataConverterImpl.eea
@@ -9,10 +9,10 @@ INSTANCE
  (Ljava/lang/Object;)V
 convert
  (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverterConfig;)Ljava/lang/String;
- (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverterConfig;)Ljava/lang/String;
+ (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverterConfig;)L0java/lang/String;
 convert
  (Lorg/w3c/dom/css/CSSValue;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;)Ljava/lang/Object;
- (Lorg/w3c/dom/css/CSSValue;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lorg/w3c/dom/css/CSSValue;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;)L0java/lang/Object;
 getDisplay
  (Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Display;
- (Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Display;
+ (Ljava/lang/Object;)L0org/eclipse/swt/widgets/Display;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/converters/CSSValueSWTGradientConverterImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/converters/CSSValueSWTGradientConverterImpl.eea
index 5be151a02c..b9be70200e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/converters/CSSValueSWTGradientConverterImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/converters/CSSValueSWTGradientConverterImpl.eea
@@ -6,7 +6,7 @@ INSTANCE
 
 convert
  (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverterConfig;)Ljava/lang/String;
- (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverterConfig;)Ljava/lang/String;
+ (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverterConfig;)L0java/lang/String;
 convert
  (Lorg/w3c/dom/css/CSSValue;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;)Ljava/lang/Object;
- (Lorg/w3c/dom/css/CSSValue;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lorg/w3c/dom/css/CSSValue;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;)L0java/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/converters/CSSValueSWTImageConverterImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/converters/CSSValueSWTImageConverterImpl.eea
index b0b85f9c67..c7bef18a37 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/converters/CSSValueSWTImageConverterImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/converters/CSSValueSWTImageConverterImpl.eea
@@ -6,7 +6,7 @@ INSTANCE
 
 convert
  (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverterConfig;)Ljava/lang/String;
- (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverterConfig;)Ljava/lang/String;
+ (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverterConfig;)L0java/lang/String;
 convert
  (Lorg/w3c/dom/css/CSSValue;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;)Ljava/lang/Object;
  (Lorg/w3c/dom/css/CSSValue;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyBackgroundSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyBackgroundSWTHandler.eea
index cc3f65ea13..add2769454 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyBackgroundSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyBackgroundSWTHandler.eea
@@ -11,7 +11,7 @@ applyCSSPropertyBackgroundImage
  (Ljava/lang/Object;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String; # @Inherited(org.eclipse.e4.ui.css.core.dom.properties.css2.AbstractCSSPropertyBackgroundHandler)
 retrieveCSSPropertyBackgroundColor
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyClassificationSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyClassificationSWTHandler.eea
index e657c81ada..56ac7b1392 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyClassificationSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyClassificationSWTHandler.eea
@@ -15,10 +15,10 @@ applyCSSPropertyVisibility
  (Ljava/lang/Object;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String; # @Inherited(org.eclipse.e4.ui.css.core.dom.properties.css2.AbstractCSSPropertyClassificationHandler)
 retrieveCSSPropertyCursor
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String; # @Inherited(org.eclipse.e4.ui.css.core.dom.properties.css2.AbstractCSSPropertyClassificationHandler)
 retrieveCSSPropertyVisibility
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L1java/lang/String; # @Overrides(org.eclipse.e4.ui.css.core.dom.properties.css2.AbstractCSSPropertyClassificationHandler)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyFontSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyFontSWTHandler.eea
index a966201563..68232b7c8b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyFontSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyFontSWTHandler.eea
@@ -24,10 +24,10 @@ onAllCSSPropertiesApplyed
  (Ljava/lang/Object;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String; # @Inherited(org.eclipse.e4.ui.css.core.dom.properties.css2.AbstractCSSPropertyFontHandler)
 retrieveCSSPropertyFontAdjust
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyFontFamily
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
@@ -36,13 +36,13 @@ retrieveCSSPropertyFontSize
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
 retrieveCSSPropertyFontStretch
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyFontStyle
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
 retrieveCSSPropertyFontVariant
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyFontWeight
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyMarginSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyMarginSWTHandler.eea
index 9c03c546b9..e1a931bd8e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyMarginSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyMarginSWTHandler.eea
@@ -24,16 +24,16 @@ applyCSSPropertyMarginTop
  (Ljava/lang/Object;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSPropertyMargin
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyMarginBottom
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyMarginLeft
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyMarginRight
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyMarginTop
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyPaddingSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyPaddingSWTHandler.eea
index ccd95e0fb4..0f62f0963a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyPaddingSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyPaddingSWTHandler.eea
@@ -24,16 +24,16 @@ applyCSSPropertyPaddingTop
  (Ljava/lang/Object;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSPropertyPadding
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyPaddingBottom
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyPaddingLeft
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyPaddingRight
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyPaddingTop
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyTextSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyTextSWTHandler.eea
index 4d169c989f..b81bbcfa28 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyTextSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyTextSWTHandler.eea
@@ -15,10 +15,10 @@ applyCSSPropertyTextTransform
  (Ljava/lang/Object;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String; # @Inherited(org.eclipse.e4.ui.css.core.dom.properties.css2.AbstractCSSPropertyTextHandler)
 retrieveCSSPropertyColor
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String; # @Inherited(org.eclipse.e4.ui.css.core.dom.properties.css2.AbstractCSSPropertyTextHandler)
 retrieveCSSPropertyTextTransform
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L1java/lang/String; # @Overrides(org.eclipse.e4.ui.css.core.dom.properties.css2.AbstractCSSPropertyTextHandler)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSBackgroundModePropertyHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSBackgroundModePropertyHandler.eea
index 8d6edc994d..aba895d556 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSBackgroundModePropertyHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSBackgroundModePropertyHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyAlignmentSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyAlignmentSWTHandler.eea
index ee5e3096ce..5920b2a578 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyAlignmentSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyAlignmentSWTHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyBorderVisibleSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyBorderVisibleSWTHandler.eea
index f94e606d5b..d8f199528f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyBorderVisibleSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyBorderVisibleSWTHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyCornerRadiusSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyCornerRadiusSWTHandler.eea
index e9956ddb9e..1b9bdcc1ea 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyCornerRadiusSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyCornerRadiusSWTHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyCustomTabContentBackgroundSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyCustomTabContentBackgroundSWTHandler.eea
index bf4c20a1ad..836db3e5c9 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyCustomTabContentBackgroundSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyCustomTabContentBackgroundSWTHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyHeaderHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyHeaderHandler.eea
index fe919fd185..f3376928e4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyHeaderHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyHeaderHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Z
 retrieveCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String; # @Inherited(org.eclipse.e4.ui.css.core.dom.properties.ICSSPropertyHandler)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyInnerKeylineSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyInnerKeylineSWTHandler.eea
index fa12c379e1..52fdeb508e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyInnerKeylineSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyInnerKeylineSWTHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyLinesVisibleSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyLinesVisibleSWTHandler.eea
index a77460fa0d..1ec8428eca 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyLinesVisibleSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyLinesVisibleSWTHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyMaximizeVisibleSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyMaximizeVisibleSWTHandler.eea
index 69c2a88fe4..0707dccadb 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyMaximizeVisibleSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyMaximizeVisibleSWTHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyMaximizedSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyMaximizedSWTHandler.eea
index ab4cede850..420015d9d6 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyMaximizedSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyMaximizedSWTHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyMinimizeVisibleSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyMinimizeVisibleSWTHandler.eea
index 6a9845c5e1..cb7439afaf 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyMinimizeVisibleSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyMinimizeVisibleSWTHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyMinimizedSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyMinimizedSWTHandler.eea
index 5202551db6..fc0bbb6e87 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyMinimizedSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyMinimizedSWTHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyOuterKeylineSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyOuterKeylineSWTHandler.eea
index 3f1c0eb5b1..cb4042f936 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyOuterKeylineSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyOuterKeylineSWTHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertySelectedImageVisibleSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertySelectedImageVisibleSWTHandler.eea
index 02727de70b..d5a1514cff 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertySelectedImageVisibleSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertySelectedImageVisibleSWTHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertySelectedTabsSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertySelectedTabsSWTHandler.eea
index 760eaeb4a1..c444988f44 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertySelectedTabsSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertySelectedTabsSWTHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertySimpleSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertySimpleSWTHandler.eea
index 7903ff2a33..d73da91fcc 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertySimpleSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertySimpleSWTHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertySingleSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertySingleSWTHandler.eea
index 4cd3fda47c..e01f00c7ea 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertySingleSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertySingleSWTHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyTabHeightHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyTabHeightHandler.eea
index 4afce8901a..fdba0c21ee 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyTabHeightHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyTabHeightHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyTabPositionSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyTabPositionSWTHandler.eea
index 59d3d0b139..abc94fa4eb 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyTabPositionSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyTabPositionSWTHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyTabRendererSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyTabRendererSWTHandler.eea
index 19d7cf0d6a..4727da4b78 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyTabRendererSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyTabRendererSWTHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyTabTextMinimumCharactersSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyTabTextMinimumCharactersSWTHandler.eea
index ccdc411114..c3097b0919 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyTabTextMinimumCharactersSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyTabTextMinimumCharactersSWTHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyUnselectHotTabsColorBackgroundHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyUnselectHotTabsColorBackgroundHandler.eea
index 44b4c26153..76e616f862 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyUnselectHotTabsColorBackgroundHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyUnselectHotTabsColorBackgroundHandler.eea
@@ -9,4 +9,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyUnselectedCloseVisibleSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyUnselectedCloseVisibleSWTHandler.eea
index b995fce5b0..8923927970 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyUnselectedCloseVisibleSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyUnselectedCloseVisibleSWTHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyUnselectedImageVisibleSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyUnselectedImageVisibleSWTHandler.eea
index 6e4e7bcbae..fa73822cb6 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyUnselectedImageVisibleSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyUnselectedImageVisibleSWTHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyUnselectedTabsSWTHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyUnselectedTabsSWTHandler.eea
index 4f8e8f2a02..2fccd0aa0b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyUnselectedTabsSWTHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyUnselectedTabsSWTHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertye4SelectedTabFillHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertye4SelectedTabFillHandler.eea
index 2f003ef84c..6b423ebca8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertye4SelectedTabFillHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertye4SelectedTabFillHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertye4TabOutline.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertye4TabOutline.eea
index 71a297028a..cb0af44386 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertye4TabOutline.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertye4TabOutline.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)V
 retrieveCSSProperty
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/definition/CSSPropertyFontDefinitionHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/definition/CSSPropertyFontDefinitionHandler.eea
index 05682396ed..79a217cf90 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/definition/CSSPropertyFontDefinitionHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/definition/CSSPropertyFontDefinitionHandler.eea
@@ -5,25 +5,25 @@ applyCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Z
 retrieveCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String; # @Inherited(org.eclipse.e4.ui.css.core.dom.properties.css2.AbstractCSSPropertyFontHandler)
 retrieveCSSPropertyFontAdjust
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyFontFamily
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyFontSize
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyFontStretch
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyFontStyle
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyFontVariant
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
 retrieveCSSPropertyFontWeight
  (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/definition/CSSPropertyThemeElementDefinitionHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/definition/CSSPropertyThemeElementDefinitionHandler.eea
index f1ebbe23d5..fb700b9b9b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/definition/CSSPropertyThemeElementDefinitionHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/definition/CSSPropertyThemeElementDefinitionHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Z
 retrieveCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String; # @Inherited(org.eclipse.e4.ui.css.core.dom.properties.ICSSPropertyHandler)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/definition/CSSPropertyThemesExtensionHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/definition/CSSPropertyThemesExtensionHandler.eea
index cdfa9519d4..f413dba8c4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/definition/CSSPropertyThemesExtensionHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/properties/definition/CSSPropertyThemesExtensionHandler.eea
@@ -5,4 +5,4 @@ applyCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Lorg/w3c/dom/css/CSSValue;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Z
 retrieveCSSProperty
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/e4/ui/css/core/engine/CSSEngine;)L0java/lang/String; # @Inherited(org.eclipse.e4.ui.css.core.dom.properties.ICSSPropertyHandler)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/resources/SWTResourceRegistryKeyFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/resources/SWTResourceRegistryKeyFactory.eea
index e79ad4e3ff..e7231c7911 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/resources/SWTResourceRegistryKeyFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/resources/SWTResourceRegistryKeyFactory.eea
@@ -2,4 +2,4 @@ class org/eclipse/e4/ui/css/swt/resources/SWTResourceRegistryKeyFactory
 
 createKey
  (Lorg/w3c/dom/css/CSSValue;)Ljava/lang/Object;
- (Lorg/w3c/dom/css/CSSValue;)Ljava/lang/Object;
+ (Lorg/w3c/dom/css/CSSValue;)L1java/lang/Object; # @Inherited(org.eclipse.e4.ui.css.core.resources.ResourceRegistryKeyFactory)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/resources/SWTResourcesRegistry.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/resources/SWTResourcesRegistry.eea
index 73d841cb24..0c12593ada 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/resources/SWTResourcesRegistry.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/css/swt/resources/SWTResourcesRegistry.eea
@@ -8,7 +8,7 @@ disposeResource
  (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 getResource
  (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;Ljava/lang/Object;)L0java/lang/Object; # @Inherited(org.eclipse.e4.ui.css.core.resources.AbstractResourcesRegistry)
 isDisposed
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
@@ -17,4 +17,4 @@ registerResource
  (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 removeResourcesByKeyTypeAndType
  (Ljava/lang/Class<*>;[Ljava/lang/Class<*>;)Ljava/util/List<Ljava/lang/Object;>;
- (Ljava/lang/Class<*>;[Ljava/lang/Class<*>;)Ljava/util/List<Ljava/lang/Object;>;
+ (Ljava/lang/Class<*>;[Ljava/lang/Class<*>;)L1java/util/List<Ljava/lang/Object;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/dialogs/filteredtree/FilteredTree.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/dialogs/filteredtree/FilteredTree.eea
index ce2c1a0761..4b4fda9a3a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/dialogs/filteredtree/FilteredTree.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/dialogs/filteredtree/FilteredTree.eea
@@ -2,7 +2,7 @@ class org/eclipse/e4/ui/dialogs/filteredtree/FilteredTree
 
 getBoldFont
  (Ljava/lang/Object;Lorg/eclipse/e4/ui/dialogs/filteredtree/FilteredTree;Lorg/eclipse/e4/ui/dialogs/filteredtree/PatternFilter;)Lorg/eclipse/swt/graphics/Font;
- (Ljava/lang/Object;Lorg/eclipse/e4/ui/dialogs/filteredtree/FilteredTree;Lorg/eclipse/e4/ui/dialogs/filteredtree/PatternFilter;)Lorg/eclipse/swt/graphics/Font;
+ (Ljava/lang/Object;Lorg/eclipse/e4/ui/dialogs/filteredtree/FilteredTree;Lorg/eclipse/e4/ui/dialogs/filteredtree/PatternFilter;)L0org/eclipse/swt/graphics/Font;
 
 <init>
  (Lorg/eclipse/swt/widgets/Composite;)V
@@ -30,16 +30,16 @@ doCreateFilterText
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Text;
 doCreateRefreshJob
  ()Lorg/eclipse/e4/ui/dialogs/filteredtree/BasicUIJob;
- ()Lorg/eclipse/e4/ui/dialogs/filteredtree/BasicUIJob;
+ ()L1org/eclipse/e4/ui/dialogs/filteredtree/BasicUIJob;
 doCreateTreeViewer
  (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/jface/viewers/TreeViewer;
- (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/jface/viewers/TreeViewer;
+ (Lorg/eclipse/swt/widgets/Composite;I)L1org/eclipse/jface/viewers/TreeViewer;
 getFilterControl
  ()Lorg/eclipse/swt/widgets/Text;
  ()Lorg/eclipse/swt/widgets/Text;
 getFilterString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getInitialText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/LocalizationHelper.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/LocalizationHelper.eea
index 8dfee6d942..5e69ac804c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/LocalizationHelper.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/LocalizationHelper.eea
@@ -8,13 +8,13 @@ getLocalized
  (Ljava/lang/String;Lorg/eclipse/e4/ui/model/application/MApplicationElement;Lorg/eclipse/e4/core/contexts/IEclipseContext;)Ljava/lang/String;
 getLocalizedAccessibilityPhrase
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)Ljava/lang/String;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)Ljava/lang/String;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)L0java/lang/String;
 getLocalizedFeature
  (Lorg/eclipse/emf/ecore/EStructuralFeature;Lorg/eclipse/e4/ui/model/application/MApplicationElement;)Ljava/lang/String;
- (Lorg/eclipse/emf/ecore/EStructuralFeature;Lorg/eclipse/e4/ui/model/application/MApplicationElement;)Ljava/lang/String;
+ (Lorg/eclipse/emf/ecore/EStructuralFeature;Lorg/eclipse/e4/ui/model/application/MApplicationElement;)L0java/lang/String;
 getLocalizedLabel
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)Ljava/lang/String;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)Ljava/lang/String;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)L0java/lang/String;
 getLocalizedTooltip
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)Ljava/lang/String;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)Ljava/lang/String;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/MApplicationFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/MApplicationFactory.eea
index bd24c2c937..a8b864dff5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/MApplicationFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/MApplicationFactory.eea
@@ -6,7 +6,7 @@ INSTANCE
 
 createAddon
  ()Lorg/eclipse/e4/ui/model/application/MAddon;
- ()Lorg/eclipse/e4/ui/model/application/MAddon;
+ ()L1org/eclipse/e4/ui/model/application/MAddon;
 createApplication
  ()Lorg/eclipse/e4/ui/model/application/MApplication;
- ()Lorg/eclipse/e4/ui/model/application/MApplication;
+ ()L1org/eclipse/e4/ui/model/application/MApplication;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/commands/MCommandsFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/commands/MCommandsFactory.eea
index 756dfdc816..641939c280 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/commands/MCommandsFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/commands/MCommandsFactory.eea
@@ -6,25 +6,25 @@ INSTANCE
 
 createBindingContext
  ()Lorg/eclipse/e4/ui/model/application/commands/MBindingContext;
- ()Lorg/eclipse/e4/ui/model/application/commands/MBindingContext;
+ ()L1org/eclipse/e4/ui/model/application/commands/MBindingContext;
 createBindingTable
  ()Lorg/eclipse/e4/ui/model/application/commands/MBindingTable;
- ()Lorg/eclipse/e4/ui/model/application/commands/MBindingTable;
+ ()L1org/eclipse/e4/ui/model/application/commands/MBindingTable;
 createCategory
  ()Lorg/eclipse/e4/ui/model/application/commands/MCategory;
- ()Lorg/eclipse/e4/ui/model/application/commands/MCategory;
+ ()L1org/eclipse/e4/ui/model/application/commands/MCategory;
 createCommand
  ()Lorg/eclipse/e4/ui/model/application/commands/MCommand;
- ()Lorg/eclipse/e4/ui/model/application/commands/MCommand;
+ ()L1org/eclipse/e4/ui/model/application/commands/MCommand;
 createCommandParameter
  ()Lorg/eclipse/e4/ui/model/application/commands/MCommandParameter;
- ()Lorg/eclipse/e4/ui/model/application/commands/MCommandParameter;
+ ()L1org/eclipse/e4/ui/model/application/commands/MCommandParameter;
 createHandler
  ()Lorg/eclipse/e4/ui/model/application/commands/MHandler;
- ()Lorg/eclipse/e4/ui/model/application/commands/MHandler;
+ ()L1org/eclipse/e4/ui/model/application/commands/MHandler;
 createKeyBinding
  ()Lorg/eclipse/e4/ui/model/application/commands/MKeyBinding;
- ()Lorg/eclipse/e4/ui/model/application/commands/MKeyBinding;
+ ()L1org/eclipse/e4/ui/model/application/commands/MKeyBinding;
 createParameter
  ()Lorg/eclipse/e4/ui/model/application/commands/MParameter;
- ()Lorg/eclipse/e4/ui/model/application/commands/MParameter;
+ ()L1org/eclipse/e4/ui/model/application/commands/MParameter;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/commands/impl/CategoryImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/commands/impl/CategoryImpl.eea
index 83647d5ae9..ff1cdc42f6 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/commands/impl/CategoryImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/commands/impl/CategoryImpl.eea
@@ -28,7 +28,7 @@ eGet
  (IZZ)Ljava/lang/Object;
 eInvoke
  (ILorg/eclipse/emf/common/util/EList<*>;)Ljava/lang/Object;
- (ILorg/eclipse/emf/common/util/EList<*>;)Ljava/lang/Object;
+ (ILorg/eclipse/emf/common/util/EList<*>;)L0java/lang/Object;
 eSet
  (ILjava/lang/Object;)V
  (ILjava/lang/Object;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/commands/impl/CommandImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/commands/impl/CommandImpl.eea
index 88f830ad98..7e00e6bd06 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/commands/impl/CommandImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/commands/impl/CommandImpl.eea
@@ -46,7 +46,7 @@ eInverseRemove
  (Lorg/eclipse/emf/ecore/InternalEObject;ILorg/eclipse/emf/common/notify/NotificationChain;)Lorg/eclipse/emf/common/notify/NotificationChain;
 eInvoke
  (ILorg/eclipse/emf/common/util/EList<*>;)Ljava/lang/Object;
- (ILorg/eclipse/emf/common/util/EList<*>;)Ljava/lang/Object;
+ (ILorg/eclipse/emf/common/util/EList<*>;)L0java/lang/Object;
 eSet
  (ILjava/lang/Object;)V
  (ILjava/lang/Object;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/commands/impl/CommandsFactoryImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/commands/impl/CommandsFactoryImpl.eea
index c3be801172..85076d8a98 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/commands/impl/CommandsFactoryImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/commands/impl/CommandsFactoryImpl.eea
@@ -10,37 +10,37 @@ init
 
 convertToString
  (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/Object;)Ljava/lang/String;
- (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/Object;)Ljava/lang/String;
+ (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/Object;)L1java/lang/String;
 create
  (Lorg/eclipse/emf/ecore/EClass;)Lorg/eclipse/emf/ecore/EObject;
- (Lorg/eclipse/emf/ecore/EClass;)Lorg/eclipse/emf/ecore/EObject;
+ (Lorg/eclipse/emf/ecore/EClass;)L1org/eclipse/emf/ecore/EObject;
 createBindingContext
  ()Lorg/eclipse/e4/ui/model/application/commands/MBindingContext;
- ()Lorg/eclipse/e4/ui/model/application/commands/MBindingContext;
+ ()L1org/eclipse/e4/ui/model/application/commands/MBindingContext; # @Inherited(org.eclipse.e4.ui.model.application.commands.MCommandsFactory)
 createBindingTable
  ()Lorg/eclipse/e4/ui/model/application/commands/MBindingTable;
- ()Lorg/eclipse/e4/ui/model/application/commands/MBindingTable;
+ ()L1org/eclipse/e4/ui/model/application/commands/MBindingTable; # @Inherited(org.eclipse.e4.ui.model.application.commands.MCommandsFactory)
 createCategory
  ()Lorg/eclipse/e4/ui/model/application/commands/MCategory;
- ()Lorg/eclipse/e4/ui/model/application/commands/MCategory;
+ ()L1org/eclipse/e4/ui/model/application/commands/MCategory; # @Inherited(org.eclipse.e4.ui.model.application.commands.MCommandsFactory)
 createCommand
  ()Lorg/eclipse/e4/ui/model/application/commands/MCommand;
- ()Lorg/eclipse/e4/ui/model/application/commands/MCommand;
+ ()L1org/eclipse/e4/ui/model/application/commands/MCommand; # @Inherited(org.eclipse.e4.ui.model.application.commands.MCommandsFactory)
 createCommandParameter
  ()Lorg/eclipse/e4/ui/model/application/commands/MCommandParameter;
- ()Lorg/eclipse/e4/ui/model/application/commands/MCommandParameter;
+ ()L1org/eclipse/e4/ui/model/application/commands/MCommandParameter; # @Inherited(org.eclipse.e4.ui.model.application.commands.MCommandsFactory)
 createFromString
  (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/String;)Ljava/lang/Object;
- (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/String;)Ljava/lang/Object;
+ (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/String;)L1java/lang/Object;
 createHandler
  ()Lorg/eclipse/e4/ui/model/application/commands/MHandler;
- ()Lorg/eclipse/e4/ui/model/application/commands/MHandler;
+ ()L1org/eclipse/e4/ui/model/application/commands/MHandler; # @Inherited(org.eclipse.e4.ui.model.application.commands.MCommandsFactory)
 createKeyBinding
  ()Lorg/eclipse/e4/ui/model/application/commands/MKeyBinding;
- ()Lorg/eclipse/e4/ui/model/application/commands/MKeyBinding;
+ ()L1org/eclipse/e4/ui/model/application/commands/MKeyBinding; # @Inherited(org.eclipse.e4.ui.model.application.commands.MCommandsFactory)
 createParameter
  ()Lorg/eclipse/e4/ui/model/application/commands/MParameter;
- ()Lorg/eclipse/e4/ui/model/application/commands/MParameter;
+ ()L1org/eclipse/e4/ui/model/application/commands/MParameter; # @Inherited(org.eclipse.e4.ui.model.application.commands.MCommandsFactory)
 getCommandsPackage
  ()Lorg/eclipse/e4/ui/model/application/commands/impl/CommandsPackageImpl;
  ()Lorg/eclipse/e4/ui/model/application/commands/impl/CommandsPackageImpl;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/commands/util/CommandsAdapterFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/commands/util/CommandsAdapterFactory.eea
index 2c26e0f9e2..9df24ae225 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/commands/util/CommandsAdapterFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/commands/util/CommandsAdapterFactory.eea
@@ -10,55 +10,55 @@ modelSwitch
 
 createAdapter
  (Lorg/eclipse/emf/common/notify/Notifier;)Lorg/eclipse/emf/common/notify/Adapter;
- (Lorg/eclipse/emf/common/notify/Notifier;)Lorg/eclipse/emf/common/notify/Adapter;
+ (Lorg/eclipse/emf/common/notify/Notifier;)L1org/eclipse/emf/common/notify/Adapter;
 createApplicationElementAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createBindingContextAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createBindingTableAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createBindingTableContainerAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createBindingsAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createCategoryAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createCommandAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createCommandParameterAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createContributionAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createEObjectAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createHandlerAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createHandlerContainerAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createKeyBindingAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createKeySequenceAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createLocalizableAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createParameterAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 isFactoryForType
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/commands/util/CommandsSwitch.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/commands/util/CommandsSwitch.eea
index ca1c70921c..b8d9b8b1c1 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/commands/util/CommandsSwitch.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/commands/util/CommandsSwitch.eea
@@ -12,52 +12,52 @@ modelPackage
 
 caseApplicationElement
  (Lorg/eclipse/e4/ui/model/application/MApplicationElement;)TT;
- (Lorg/eclipse/e4/ui/model/application/MApplicationElement;)TT;
+ (Lorg/eclipse/e4/ui/model/application/MApplicationElement;)T0T;
 caseBindingContext
  (Lorg/eclipse/e4/ui/model/application/commands/MBindingContext;)TT;
- (Lorg/eclipse/e4/ui/model/application/commands/MBindingContext;)TT;
+ (Lorg/eclipse/e4/ui/model/application/commands/MBindingContext;)T0T;
 caseBindingTable
  (Lorg/eclipse/e4/ui/model/application/commands/MBindingTable;)TT;
- (Lorg/eclipse/e4/ui/model/application/commands/MBindingTable;)TT;
+ (Lorg/eclipse/e4/ui/model/application/commands/MBindingTable;)T0T;
 caseBindingTableContainer
  (Lorg/eclipse/e4/ui/model/application/commands/MBindingTableContainer;)TT;
- (Lorg/eclipse/e4/ui/model/application/commands/MBindingTableContainer;)TT;
+ (Lorg/eclipse/e4/ui/model/application/commands/MBindingTableContainer;)T0T;
 caseBindings
  (Lorg/eclipse/e4/ui/model/application/commands/MBindings;)TT;
- (Lorg/eclipse/e4/ui/model/application/commands/MBindings;)TT;
+ (Lorg/eclipse/e4/ui/model/application/commands/MBindings;)T0T;
 caseCategory
  (Lorg/eclipse/e4/ui/model/application/commands/MCategory;)TT;
- (Lorg/eclipse/e4/ui/model/application/commands/MCategory;)TT;
+ (Lorg/eclipse/e4/ui/model/application/commands/MCategory;)T0T;
 caseCommand
  (Lorg/eclipse/e4/ui/model/application/commands/MCommand;)TT;
- (Lorg/eclipse/e4/ui/model/application/commands/MCommand;)TT;
+ (Lorg/eclipse/e4/ui/model/application/commands/MCommand;)T0T;
 caseCommandParameter
  (Lorg/eclipse/e4/ui/model/application/commands/MCommandParameter;)TT;
- (Lorg/eclipse/e4/ui/model/application/commands/MCommandParameter;)TT;
+ (Lorg/eclipse/e4/ui/model/application/commands/MCommandParameter;)T0T;
 caseContribution
  (Lorg/eclipse/e4/ui/model/application/MContribution;)TT;
- (Lorg/eclipse/e4/ui/model/application/MContribution;)TT;
+ (Lorg/eclipse/e4/ui/model/application/MContribution;)T0T;
 caseHandler
  (Lorg/eclipse/e4/ui/model/application/commands/MHandler;)TT;
- (Lorg/eclipse/e4/ui/model/application/commands/MHandler;)TT;
+ (Lorg/eclipse/e4/ui/model/application/commands/MHandler;)T0T;
 caseHandlerContainer
  (Lorg/eclipse/e4/ui/model/application/commands/MHandlerContainer;)TT;
- (Lorg/eclipse/e4/ui/model/application/commands/MHandlerContainer;)TT;
+ (Lorg/eclipse/e4/ui/model/application/commands/MHandlerContainer;)T0T;
 caseKeyBinding
  (Lorg/eclipse/e4/ui/model/application/commands/MKeyBinding;)TT;
- (Lorg/eclipse/e4/ui/model/application/commands/MKeyBinding;)TT;
+ (Lorg/eclipse/e4/ui/model/application/commands/MKeyBinding;)T0T;
 caseKeySequence
  (Lorg/eclipse/e4/ui/model/application/commands/MKeySequence;)TT;
- (Lorg/eclipse/e4/ui/model/application/commands/MKeySequence;)TT;
+ (Lorg/eclipse/e4/ui/model/application/commands/MKeySequence;)T0T;
 caseLocalizable
  (Lorg/eclipse/e4/ui/model/application/ui/MLocalizable;)TT;
- (Lorg/eclipse/e4/ui/model/application/ui/MLocalizable;)TT;
+ (Lorg/eclipse/e4/ui/model/application/ui/MLocalizable;)T0T;
 caseParameter
  (Lorg/eclipse/e4/ui/model/application/commands/MParameter;)TT;
- (Lorg/eclipse/e4/ui/model/application/commands/MParameter;)TT;
+ (Lorg/eclipse/e4/ui/model/application/commands/MParameter;)T0T;
 defaultCase
  (Lorg/eclipse/emf/ecore/EObject;)TT;
- (Lorg/eclipse/emf/ecore/EObject;)TT;
+ (Lorg/eclipse/emf/ecore/EObject;)T0T;
 doSwitch
  (ILorg/eclipse/emf/ecore/EObject;)TT;
  (ILorg/eclipse/emf/ecore/EObject;)TT;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/descriptor/basic/MBasicFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/descriptor/basic/MBasicFactory.eea
index 265df64fee..fe6a193982 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/descriptor/basic/MBasicFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/descriptor/basic/MBasicFactory.eea
@@ -6,4 +6,4 @@ INSTANCE
 
 createPartDescriptor
  ()Lorg/eclipse/e4/ui/model/application/descriptor/basic/MPartDescriptor;
- ()Lorg/eclipse/e4/ui/model/application/descriptor/basic/MPartDescriptor;
+ ()L1org/eclipse/e4/ui/model/application/descriptor/basic/MPartDescriptor;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/descriptor/basic/impl/BasicFactoryImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/descriptor/basic/impl/BasicFactoryImpl.eea
index d596bd6362..7982cf5e47 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/descriptor/basic/impl/BasicFactoryImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/descriptor/basic/impl/BasicFactoryImpl.eea
@@ -10,10 +10,10 @@ init
 
 create
  (Lorg/eclipse/emf/ecore/EClass;)Lorg/eclipse/emf/ecore/EObject;
- (Lorg/eclipse/emf/ecore/EClass;)Lorg/eclipse/emf/ecore/EObject;
+ (Lorg/eclipse/emf/ecore/EClass;)L1org/eclipse/emf/ecore/EObject;
 createPartDescriptor
  ()Lorg/eclipse/e4/ui/model/application/descriptor/basic/MPartDescriptor;
- ()Lorg/eclipse/e4/ui/model/application/descriptor/basic/MPartDescriptor;
+ ()L1org/eclipse/e4/ui/model/application/descriptor/basic/MPartDescriptor; # @Inherited(org.eclipse.e4.ui.model.application.descriptor.basic.MBasicFactory)
 getBasicPackage
  ()Lorg/eclipse/e4/ui/model/application/descriptor/basic/impl/BasicPackageImpl;
  ()Lorg/eclipse/e4/ui/model/application/descriptor/basic/impl/BasicPackageImpl;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/descriptor/basic/impl/PartDescriptorImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/descriptor/basic/impl/PartDescriptorImpl.eea
index 177126d889..05e6e0addc 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/descriptor/basic/impl/PartDescriptorImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/descriptor/basic/impl/PartDescriptorImpl.eea
@@ -88,7 +88,7 @@ eInverseRemove
  (Lorg/eclipse/emf/ecore/InternalEObject;ILorg/eclipse/emf/common/notify/NotificationChain;)Lorg/eclipse/emf/common/notify/NotificationChain;
 eInvoke
  (ILorg/eclipse/emf/common/util/EList<*>;)Ljava/lang/Object;
- (ILorg/eclipse/emf/common/util/EList<*>;)Ljava/lang/Object;
+ (ILorg/eclipse/emf/common/util/EList<*>;)L0java/lang/Object;
 eSet
  (ILjava/lang/Object;)V
  (ILjava/lang/Object;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/descriptor/basic/util/BasicAdapterFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/descriptor/basic/util/BasicAdapterFactory.eea
index 09b1c9abaa..04ddffdf54 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/descriptor/basic/util/BasicAdapterFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/descriptor/basic/util/BasicAdapterFactory.eea
@@ -10,31 +10,31 @@ modelSwitch
 
 createAdapter
  (Lorg/eclipse/emf/common/notify/Notifier;)Lorg/eclipse/emf/common/notify/Adapter;
- (Lorg/eclipse/emf/common/notify/Notifier;)Lorg/eclipse/emf/common/notify/Adapter;
+ (Lorg/eclipse/emf/common/notify/Notifier;)L1org/eclipse/emf/common/notify/Adapter;
 createApplicationElementAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createBindingsAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createEObjectAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createHandlerContainerAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createLocalizableAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createPartDescriptorAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createPartDescriptorContainerAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createUILabelAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 isFactoryForType
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/descriptor/basic/util/BasicSwitch.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/descriptor/basic/util/BasicSwitch.eea
index ebd70da7ec..3c54b7a46f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/descriptor/basic/util/BasicSwitch.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/descriptor/basic/util/BasicSwitch.eea
@@ -12,28 +12,28 @@ modelPackage
 
 caseApplicationElement
  (Lorg/eclipse/e4/ui/model/application/MApplicationElement;)TT;
- (Lorg/eclipse/e4/ui/model/application/MApplicationElement;)TT;
+ (Lorg/eclipse/e4/ui/model/application/MApplicationElement;)T0T;
 caseBindings
  (Lorg/eclipse/e4/ui/model/application/commands/MBindings;)TT;
- (Lorg/eclipse/e4/ui/model/application/commands/MBindings;)TT;
+ (Lorg/eclipse/e4/ui/model/application/commands/MBindings;)T0T;
 caseHandlerContainer
  (Lorg/eclipse/e4/ui/model/application/commands/MHandlerContainer;)TT;
- (Lorg/eclipse/e4/ui/model/application/commands/MHandlerContainer;)TT;
+ (Lorg/eclipse/e4/ui/model/application/commands/MHandlerContainer;)T0T;
 caseLocalizable
  (Lorg/eclipse/e4/ui/model/application/ui/MLocalizable;)TT;
- (Lorg/eclipse/e4/ui/model/application/ui/MLocalizable;)TT;
+ (Lorg/eclipse/e4/ui/model/application/ui/MLocalizable;)T0T;
 casePartDescriptor
  (Lorg/eclipse/e4/ui/model/application/descriptor/basic/MPartDescriptor;)TT;
- (Lorg/eclipse/e4/ui/model/application/descriptor/basic/MPartDescriptor;)TT;
+ (Lorg/eclipse/e4/ui/model/application/descriptor/basic/MPartDescriptor;)T0T;
 casePartDescriptorContainer
  (Lorg/eclipse/e4/ui/model/application/descriptor/basic/MPartDescriptorContainer;)TT;
- (Lorg/eclipse/e4/ui/model/application/descriptor/basic/MPartDescriptorContainer;)TT;
+ (Lorg/eclipse/e4/ui/model/application/descriptor/basic/MPartDescriptorContainer;)T0T;
 caseUILabel
  (Lorg/eclipse/e4/ui/model/application/ui/MUILabel;)TT;
- (Lorg/eclipse/e4/ui/model/application/ui/MUILabel;)TT;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUILabel;)T0T;
 defaultCase
  (Lorg/eclipse/emf/ecore/EObject;)TT;
- (Lorg/eclipse/emf/ecore/EObject;)TT;
+ (Lorg/eclipse/emf/ecore/EObject;)T0T;
 doSwitch
  (ILorg/eclipse/emf/ecore/EObject;)TT;
  (ILorg/eclipse/emf/ecore/EObject;)TT;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/impl/ApplicationFactoryImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/impl/ApplicationFactoryImpl.eea
index c08f26d2b1..776cbd16f3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/impl/ApplicationFactoryImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/impl/ApplicationFactoryImpl.eea
@@ -10,25 +10,25 @@ init
 
 convertToString
  (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/Object;)Ljava/lang/String;
- (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/Object;)Ljava/lang/String;
+ (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/Object;)L1java/lang/String;
 create
  (Lorg/eclipse/emf/ecore/EClass;)Lorg/eclipse/emf/ecore/EObject;
- (Lorg/eclipse/emf/ecore/EClass;)Lorg/eclipse/emf/ecore/EObject;
+ (Lorg/eclipse/emf/ecore/EClass;)L1org/eclipse/emf/ecore/EObject;
 createAddon
  ()Lorg/eclipse/e4/ui/model/application/MAddon;
- ()Lorg/eclipse/e4/ui/model/application/MAddon;
+ ()L1org/eclipse/e4/ui/model/application/MAddon; # @Inherited(org.eclipse.e4.ui.model.application.MApplicationFactory)
 createApplication
  ()Lorg/eclipse/e4/ui/model/application/MApplication;
- ()Lorg/eclipse/e4/ui/model/application/MApplication;
+ ()L1org/eclipse/e4/ui/model/application/MApplication; # @Inherited(org.eclipse.e4.ui.model.application.MApplicationFactory)
 createFromString
  (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/String;)Ljava/lang/Object;
- (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/String;)Ljava/lang/Object;
+ (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/String;)L1java/lang/Object;
 createStringToObjectMap
  ()Ljava/util/Map$Entry<Ljava/lang/String;Ljava/lang/Object;>;
- ()Ljava/util/Map$Entry<Ljava/lang/String;Ljava/lang/Object;>;
+ ()L1java/util/Map$Entry<Ljava/lang/String;Ljava/lang/Object;>;
 createStringToStringMap
  ()Ljava/util/Map$Entry<Ljava/lang/String;Ljava/lang/String;>;
- ()Ljava/util/Map$Entry<Ljava/lang/String;Ljava/lang/String;>;
+ ()L1java/util/Map$Entry<Ljava/lang/String;Ljava/lang/String;>;
 getApplicationPackage
  ()Lorg/eclipse/e4/ui/model/application/impl/ApplicationPackageImpl;
  ()Lorg/eclipse/e4/ui/model/application/impl/ApplicationPackageImpl;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/impl/ApplicationImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/impl/ApplicationImpl.eea
index 56574d1c9f..8b7d619388 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/impl/ApplicationImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/impl/ApplicationImpl.eea
@@ -71,7 +71,7 @@ eInverseRemove
  (Lorg/eclipse/emf/ecore/InternalEObject;ILorg/eclipse/emf/common/notify/NotificationChain;)Lorg/eclipse/emf/common/notify/NotificationChain;
 eInvoke
  (ILorg/eclipse/emf/common/util/EList<*>;)Ljava/lang/Object;
- (ILorg/eclipse/emf/common/util/EList<*>;)Ljava/lang/Object;
+ (ILorg/eclipse/emf/common/util/EList<*>;)L0java/lang/Object; # @Inherited(org.eclipse.e4.ui.model.application.ui.impl.UIElementImpl)
 eSet
  (ILjava/lang/Object;)V
  (ILjava/lang/Object;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/MUiFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/MUiFactory.eea
index cf20737766..42d6cbfb05 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/MUiFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/MUiFactory.eea
@@ -6,7 +6,7 @@ INSTANCE
 
 createCoreExpression
  ()Lorg/eclipse/e4/ui/model/application/ui/MCoreExpression;
- ()Lorg/eclipse/e4/ui/model/application/ui/MCoreExpression;
+ ()L1org/eclipse/e4/ui/model/application/ui/MCoreExpression;
 createImperativeExpression
  ()Lorg/eclipse/e4/ui/model/application/ui/MImperativeExpression;
- ()Lorg/eclipse/e4/ui/model/application/ui/MImperativeExpression;
+ ()L1org/eclipse/e4/ui/model/application/ui/MImperativeExpression;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/SideValue.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/SideValue.eea
index 574138ad20..4e6c30913e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/SideValue.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/SideValue.eea
@@ -10,13 +10,13 @@ VALUES
 
 get
  (I)Lorg/eclipse/e4/ui/model/application/ui/SideValue;
- (I)Lorg/eclipse/e4/ui/model/application/ui/SideValue;
+ (I)L0org/eclipse/e4/ui/model/application/ui/SideValue;
 get
  (Ljava/lang/String;)Lorg/eclipse/e4/ui/model/application/ui/SideValue;
- (Ljava/lang/String;)Lorg/eclipse/e4/ui/model/application/ui/SideValue;
+ (Ljava/lang/String;)L0org/eclipse/e4/ui/model/application/ui/SideValue;
 getByName
  (Ljava/lang/String;)Lorg/eclipse/e4/ui/model/application/ui/SideValue;
- (Ljava/lang/String;)Lorg/eclipse/e4/ui/model/application/ui/SideValue;
+ (Ljava/lang/String;)L0org/eclipse/e4/ui/model/application/ui/SideValue;
 
 getLiteral
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/advanced/MAdvancedFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/advanced/MAdvancedFactory.eea
index 42f9cda8da..46a2d7da92 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/advanced/MAdvancedFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/advanced/MAdvancedFactory.eea
@@ -6,13 +6,13 @@ INSTANCE
 
 createArea
  ()Lorg/eclipse/e4/ui/model/application/ui/advanced/MArea;
- ()Lorg/eclipse/e4/ui/model/application/ui/advanced/MArea;
+ ()L1org/eclipse/e4/ui/model/application/ui/advanced/MArea;
 createPerspective
  ()Lorg/eclipse/e4/ui/model/application/ui/advanced/MPerspective;
- ()Lorg/eclipse/e4/ui/model/application/ui/advanced/MPerspective;
+ ()L1org/eclipse/e4/ui/model/application/ui/advanced/MPerspective;
 createPerspectiveStack
  ()Lorg/eclipse/e4/ui/model/application/ui/advanced/MPerspectiveStack;
- ()Lorg/eclipse/e4/ui/model/application/ui/advanced/MPerspectiveStack;
+ ()L1org/eclipse/e4/ui/model/application/ui/advanced/MPerspectiveStack;
 createPlaceholder
  ()Lorg/eclipse/e4/ui/model/application/ui/advanced/MPlaceholder;
- ()Lorg/eclipse/e4/ui/model/application/ui/advanced/MPlaceholder;
+ ()L1org/eclipse/e4/ui/model/application/ui/advanced/MPlaceholder;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/advanced/impl/AdvancedFactoryImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/advanced/impl/AdvancedFactoryImpl.eea
index 02cb096b38..ba67dcef38 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/advanced/impl/AdvancedFactoryImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/advanced/impl/AdvancedFactoryImpl.eea
@@ -10,19 +10,19 @@ init
 
 create
  (Lorg/eclipse/emf/ecore/EClass;)Lorg/eclipse/emf/ecore/EObject;
- (Lorg/eclipse/emf/ecore/EClass;)Lorg/eclipse/emf/ecore/EObject;
+ (Lorg/eclipse/emf/ecore/EClass;)L1org/eclipse/emf/ecore/EObject;
 createArea
  ()Lorg/eclipse/e4/ui/model/application/ui/advanced/MArea;
- ()Lorg/eclipse/e4/ui/model/application/ui/advanced/MArea;
+ ()L1org/eclipse/e4/ui/model/application/ui/advanced/MArea; # @Inherited(org.eclipse.e4.ui.model.application.ui.advanced.MAdvancedFactory)
 createPerspective
  ()Lorg/eclipse/e4/ui/model/application/ui/advanced/MPerspective;
- ()Lorg/eclipse/e4/ui/model/application/ui/advanced/MPerspective;
+ ()L1org/eclipse/e4/ui/model/application/ui/advanced/MPerspective; # @Inherited(org.eclipse.e4.ui.model.application.ui.advanced.MAdvancedFactory)
 createPerspectiveStack
  ()Lorg/eclipse/e4/ui/model/application/ui/advanced/MPerspectiveStack;
- ()Lorg/eclipse/e4/ui/model/application/ui/advanced/MPerspectiveStack;
+ ()L1org/eclipse/e4/ui/model/application/ui/advanced/MPerspectiveStack; # @Inherited(org.eclipse.e4.ui.model.application.ui.advanced.MAdvancedFactory)
 createPlaceholder
  ()Lorg/eclipse/e4/ui/model/application/ui/advanced/MPlaceholder;
- ()Lorg/eclipse/e4/ui/model/application/ui/advanced/MPlaceholder;
+ ()L1org/eclipse/e4/ui/model/application/ui/advanced/MPlaceholder; # @Inherited(org.eclipse.e4.ui.model.application.ui.advanced.MAdvancedFactory)
 getAdvancedPackage
  ()Lorg/eclipse/e4/ui/model/application/ui/advanced/impl/AdvancedPackageImpl;
  ()Lorg/eclipse/e4/ui/model/application/ui/advanced/impl/AdvancedPackageImpl;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/advanced/impl/AreaImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/advanced/impl/AreaImpl.eea
index b1a4a72c22..97f2baf8a6 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/advanced/impl/AreaImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/advanced/impl/AreaImpl.eea
@@ -40,7 +40,7 @@ eGet
  (IZZ)Ljava/lang/Object;
 eInvoke
  (ILorg/eclipse/emf/common/util/EList<*>;)Ljava/lang/Object;
- (ILorg/eclipse/emf/common/util/EList<*>;)Ljava/lang/Object;
+ (ILorg/eclipse/emf/common/util/EList<*>;)L0java/lang/Object; # @Inherited(org.eclipse.e4.ui.model.application.ui.impl.UIElementImpl)
 eSet
  (ILjava/lang/Object;)V
  (ILjava/lang/Object;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/advanced/impl/PerspectiveImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/advanced/impl/PerspectiveImpl.eea
index d9f884128e..31df1e7abb 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/advanced/impl/PerspectiveImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/advanced/impl/PerspectiveImpl.eea
@@ -71,7 +71,7 @@ eInverseRemove
  (Lorg/eclipse/emf/ecore/InternalEObject;ILorg/eclipse/emf/common/notify/NotificationChain;)Lorg/eclipse/emf/common/notify/NotificationChain;
 eInvoke
  (ILorg/eclipse/emf/common/util/EList<*>;)Ljava/lang/Object;
- (ILorg/eclipse/emf/common/util/EList<*>;)Ljava/lang/Object;
+ (ILorg/eclipse/emf/common/util/EList<*>;)L0java/lang/Object; # @Inherited(org.eclipse.e4.ui.model.application.ui.impl.UIElementImpl)
 eSet
  (ILjava/lang/Object;)V
  (ILjava/lang/Object;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/advanced/util/AdvancedAdapterFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/advanced/util/AdvancedAdapterFactory.eea
index 17ca98b5ba..0a508c47d8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/advanced/util/AdvancedAdapterFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/advanced/util/AdvancedAdapterFactory.eea
@@ -10,64 +10,64 @@ modelSwitch
 
 createAdapter
  (Lorg/eclipse/emf/common/notify/Notifier;)Lorg/eclipse/emf/common/notify/Adapter;
- (Lorg/eclipse/emf/common/notify/Notifier;)Lorg/eclipse/emf/common/notify/Adapter;
+ (Lorg/eclipse/emf/common/notify/Notifier;)L1org/eclipse/emf/common/notify/Adapter;
 createApplicationElementAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createAreaAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createBindingsAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createContextAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createEObjectAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createElementContainerAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createGenericStackAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createGenericTileAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createHandlerContainerAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createLocalizableAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createPartSashContainerAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createPartSashContainerElementAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createPerspectiveAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createPerspectiveStackAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createPlaceholderAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createStackElementAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createUIElementAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createUILabelAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createWindowElementAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 isFactoryForType
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/advanced/util/AdvancedSwitch.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/advanced/util/AdvancedSwitch.eea
index c0cf1bd4b7..db077ae138 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/advanced/util/AdvancedSwitch.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/advanced/util/AdvancedSwitch.eea
@@ -12,61 +12,61 @@ modelPackage
 
 caseApplicationElement
  (Lorg/eclipse/e4/ui/model/application/MApplicationElement;)TT1;
- (Lorg/eclipse/e4/ui/model/application/MApplicationElement;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/MApplicationElement;)T0T1;
 caseArea
  (Lorg/eclipse/e4/ui/model/application/ui/advanced/MArea;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/advanced/MArea;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/advanced/MArea;)T0T1;
 caseBindings
  (Lorg/eclipse/e4/ui/model/application/commands/MBindings;)TT1;
- (Lorg/eclipse/e4/ui/model/application/commands/MBindings;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/commands/MBindings;)T0T1;
 caseContext
  (Lorg/eclipse/e4/ui/model/application/ui/MContext;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MContext;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MContext;)T0T1;
 caseElementContainer
  <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<TT;>;)TT1;
- <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<TT;>;)TT1;
+ <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<TT;>;)T0T1;
 caseGenericStack
  <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MGenericStack<TT;>;)TT1;
- <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MGenericStack<TT;>;)TT1;
+ <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MGenericStack<TT;>;)T0T1;
 caseGenericTile
  <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MGenericTile<TT;>;)TT1;
- <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MGenericTile<TT;>;)TT1;
+ <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MGenericTile<TT;>;)T0T1;
 caseHandlerContainer
  (Lorg/eclipse/e4/ui/model/application/commands/MHandlerContainer;)TT1;
- (Lorg/eclipse/e4/ui/model/application/commands/MHandlerContainer;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/commands/MHandlerContainer;)T0T1;
 caseLocalizable
  (Lorg/eclipse/e4/ui/model/application/ui/MLocalizable;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MLocalizable;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MLocalizable;)T0T1;
 casePartSashContainer
  (Lorg/eclipse/e4/ui/model/application/ui/basic/MPartSashContainer;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/basic/MPartSashContainer;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/basic/MPartSashContainer;)T0T1;
 casePartSashContainerElement
  (Lorg/eclipse/e4/ui/model/application/ui/basic/MPartSashContainerElement;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/basic/MPartSashContainerElement;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/basic/MPartSashContainerElement;)T0T1;
 casePerspective
  (Lorg/eclipse/e4/ui/model/application/ui/advanced/MPerspective;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/advanced/MPerspective;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/advanced/MPerspective;)T0T1;
 casePerspectiveStack
  (Lorg/eclipse/e4/ui/model/application/ui/advanced/MPerspectiveStack;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/advanced/MPerspectiveStack;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/advanced/MPerspectiveStack;)T0T1;
 casePlaceholder
  (Lorg/eclipse/e4/ui/model/application/ui/advanced/MPlaceholder;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/advanced/MPlaceholder;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/advanced/MPlaceholder;)T0T1;
 caseStackElement
  (Lorg/eclipse/e4/ui/model/application/ui/basic/MStackElement;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/basic/MStackElement;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/basic/MStackElement;)T0T1;
 caseUIElement
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)T0T1;
 caseUILabel
  (Lorg/eclipse/e4/ui/model/application/ui/MUILabel;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MUILabel;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUILabel;)T0T1;
 caseWindowElement
  (Lorg/eclipse/e4/ui/model/application/ui/basic/MWindowElement;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/basic/MWindowElement;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/basic/MWindowElement;)T0T1;
 defaultCase
  (Lorg/eclipse/emf/ecore/EObject;)TT1;
- (Lorg/eclipse/emf/ecore/EObject;)TT1;
+ (Lorg/eclipse/emf/ecore/EObject;)T0T1;
 doSwitch
  (ILorg/eclipse/emf/ecore/EObject;)TT1;
  (ILorg/eclipse/emf/ecore/EObject;)TT1;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/basic/MBasicFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/basic/MBasicFactory.eea
index e605601d5d..165be9d237 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/basic/MBasicFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/basic/MBasicFactory.eea
@@ -6,22 +6,22 @@ INSTANCE
 
 createCompositePart
  ()Lorg/eclipse/e4/ui/model/application/ui/basic/MCompositePart;
- ()Lorg/eclipse/e4/ui/model/application/ui/basic/MCompositePart;
+ ()L1org/eclipse/e4/ui/model/application/ui/basic/MCompositePart;
 createPart
  ()Lorg/eclipse/e4/ui/model/application/ui/basic/MPart;
- ()Lorg/eclipse/e4/ui/model/application/ui/basic/MPart;
+ ()L1org/eclipse/e4/ui/model/application/ui/basic/MPart;
 createPartSashContainer
  ()Lorg/eclipse/e4/ui/model/application/ui/basic/MPartSashContainer;
- ()Lorg/eclipse/e4/ui/model/application/ui/basic/MPartSashContainer;
+ ()L1org/eclipse/e4/ui/model/application/ui/basic/MPartSashContainer;
 createPartStack
  ()Lorg/eclipse/e4/ui/model/application/ui/basic/MPartStack;
- ()Lorg/eclipse/e4/ui/model/application/ui/basic/MPartStack;
+ ()L1org/eclipse/e4/ui/model/application/ui/basic/MPartStack;
 createTrimBar
  ()Lorg/eclipse/e4/ui/model/application/ui/basic/MTrimBar;
- ()Lorg/eclipse/e4/ui/model/application/ui/basic/MTrimBar;
+ ()L1org/eclipse/e4/ui/model/application/ui/basic/MTrimBar;
 createTrimmedWindow
  ()Lorg/eclipse/e4/ui/model/application/ui/basic/MTrimmedWindow;
- ()Lorg/eclipse/e4/ui/model/application/ui/basic/MTrimmedWindow;
+ ()L1org/eclipse/e4/ui/model/application/ui/basic/MTrimmedWindow;
 createWindow
  ()Lorg/eclipse/e4/ui/model/application/ui/basic/MWindow;
- ()Lorg/eclipse/e4/ui/model/application/ui/basic/MWindow;
+ ()L1org/eclipse/e4/ui/model/application/ui/basic/MWindow;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/basic/impl/BasicFactoryImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/basic/impl/BasicFactoryImpl.eea
index 23e4a3c7e6..e9bd239e82 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/basic/impl/BasicFactoryImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/basic/impl/BasicFactoryImpl.eea
@@ -10,28 +10,28 @@ init
 
 create
  (Lorg/eclipse/emf/ecore/EClass;)Lorg/eclipse/emf/ecore/EObject;
- (Lorg/eclipse/emf/ecore/EClass;)Lorg/eclipse/emf/ecore/EObject;
+ (Lorg/eclipse/emf/ecore/EClass;)L1org/eclipse/emf/ecore/EObject;
 createCompositePart
  ()Lorg/eclipse/e4/ui/model/application/ui/basic/MCompositePart;
- ()Lorg/eclipse/e4/ui/model/application/ui/basic/MCompositePart;
+ ()L1org/eclipse/e4/ui/model/application/ui/basic/MCompositePart; # @Inherited(org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory)
 createPart
  ()Lorg/eclipse/e4/ui/model/application/ui/basic/MPart;
- ()Lorg/eclipse/e4/ui/model/application/ui/basic/MPart;
+ ()L1org/eclipse/e4/ui/model/application/ui/basic/MPart; # @Inherited(org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory)
 createPartSashContainer
  ()Lorg/eclipse/e4/ui/model/application/ui/basic/MPartSashContainer;
- ()Lorg/eclipse/e4/ui/model/application/ui/basic/MPartSashContainer;
+ ()L1org/eclipse/e4/ui/model/application/ui/basic/MPartSashContainer; # @Inherited(org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory)
 createPartStack
  ()Lorg/eclipse/e4/ui/model/application/ui/basic/MPartStack;
- ()Lorg/eclipse/e4/ui/model/application/ui/basic/MPartStack;
+ ()L1org/eclipse/e4/ui/model/application/ui/basic/MPartStack; # @Inherited(org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory)
 createTrimBar
  ()Lorg/eclipse/e4/ui/model/application/ui/basic/MTrimBar;
- ()Lorg/eclipse/e4/ui/model/application/ui/basic/MTrimBar;
+ ()L1org/eclipse/e4/ui/model/application/ui/basic/MTrimBar; # @Inherited(org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory)
 createTrimmedWindow
  ()Lorg/eclipse/e4/ui/model/application/ui/basic/MTrimmedWindow;
- ()Lorg/eclipse/e4/ui/model/application/ui/basic/MTrimmedWindow;
+ ()L1org/eclipse/e4/ui/model/application/ui/basic/MTrimmedWindow; # @Inherited(org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory)
 createWindow
  ()Lorg/eclipse/e4/ui/model/application/ui/basic/MWindow;
- ()Lorg/eclipse/e4/ui/model/application/ui/basic/MWindow;
+ ()L1org/eclipse/e4/ui/model/application/ui/basic/MWindow; # @Inherited(org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory)
 getBasicPackage
  ()Lorg/eclipse/e4/ui/model/application/ui/basic/impl/BasicPackageImpl;
  ()Lorg/eclipse/e4/ui/model/application/ui/basic/impl/BasicPackageImpl;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/basic/impl/PartImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/basic/impl/PartImpl.eea
index d2e8d7b306..921271f509 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/basic/impl/PartImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/basic/impl/PartImpl.eea
@@ -94,7 +94,7 @@ eInverseRemove
  (Lorg/eclipse/emf/ecore/InternalEObject;ILorg/eclipse/emf/common/notify/NotificationChain;)Lorg/eclipse/emf/common/notify/NotificationChain;
 eInvoke
  (ILorg/eclipse/emf/common/util/EList<*>;)Ljava/lang/Object;
- (ILorg/eclipse/emf/common/util/EList<*>;)Ljava/lang/Object;
+ (ILorg/eclipse/emf/common/util/EList<*>;)L0java/lang/Object; # @Inherited(org.eclipse.e4.ui.model.application.ui.impl.UIElementImpl)
 eSet
  (ILjava/lang/Object;)V
  (ILjava/lang/Object;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/basic/impl/WindowImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/basic/impl/WindowImpl.eea
index 00cd423702..e0548bf1c2 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/basic/impl/WindowImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/basic/impl/WindowImpl.eea
@@ -80,7 +80,7 @@ eInverseRemove
  (Lorg/eclipse/emf/ecore/InternalEObject;ILorg/eclipse/emf/common/notify/NotificationChain;)Lorg/eclipse/emf/common/notify/NotificationChain;
 eInvoke
  (ILorg/eclipse/emf/common/util/EList<*>;)Ljava/lang/Object;
- (ILorg/eclipse/emf/common/util/EList<*>;)Ljava/lang/Object;
+ (ILorg/eclipse/emf/common/util/EList<*>;)L0java/lang/Object; # @Inherited(org.eclipse.e4.ui.model.application.ui.impl.UIElementImpl)
 eSet
  (ILjava/lang/Object;)V
  (ILjava/lang/Object;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/basic/util/BasicAdapterFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/basic/util/BasicAdapterFactory.eea
index 7d04d5c1d1..f64641b38f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/basic/util/BasicAdapterFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/basic/util/BasicAdapterFactory.eea
@@ -10,85 +10,85 @@ modelSwitch
 
 createAdapter
  (Lorg/eclipse/emf/common/notify/Notifier;)Lorg/eclipse/emf/common/notify/Adapter;
- (Lorg/eclipse/emf/common/notify/Notifier;)Lorg/eclipse/emf/common/notify/Adapter;
+ (Lorg/eclipse/emf/common/notify/Notifier;)L1org/eclipse/emf/common/notify/Adapter;
 createApplicationElementAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createBindingsAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createCompositePartAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createContextAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createContributionAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createDirtyableAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createEObjectAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createElementContainerAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createGenericStackAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createGenericTileAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createGenericTrimContainerAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createHandlerContainerAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createLocalizableAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createPartAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createPartSashContainerAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createPartSashContainerElementAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createPartStackAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createSnippetContainerAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createStackElementAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createTrimBarAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createTrimElementAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createTrimmedWindowAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createUIElementAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createUILabelAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createWindowAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createWindowElementAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 isFactoryForType
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/basic/util/BasicSwitch.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/basic/util/BasicSwitch.eea
index 236f22727f..b94b288e7b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/basic/util/BasicSwitch.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/basic/util/BasicSwitch.eea
@@ -12,82 +12,82 @@ modelPackage
 
 caseApplicationElement
  (Lorg/eclipse/e4/ui/model/application/MApplicationElement;)TT1;
- (Lorg/eclipse/e4/ui/model/application/MApplicationElement;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/MApplicationElement;)T0T1;
 caseBindings
  (Lorg/eclipse/e4/ui/model/application/commands/MBindings;)TT1;
- (Lorg/eclipse/e4/ui/model/application/commands/MBindings;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/commands/MBindings;)T0T1;
 caseCompositePart
  (Lorg/eclipse/e4/ui/model/application/ui/basic/MCompositePart;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/basic/MCompositePart;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/basic/MCompositePart;)T0T1;
 caseContext
  (Lorg/eclipse/e4/ui/model/application/ui/MContext;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MContext;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MContext;)T0T1;
 caseContribution
  (Lorg/eclipse/e4/ui/model/application/MContribution;)TT1;
- (Lorg/eclipse/e4/ui/model/application/MContribution;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/MContribution;)T0T1;
 caseDirtyable
  (Lorg/eclipse/e4/ui/model/application/ui/MDirtyable;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MDirtyable;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MDirtyable;)T0T1;
 caseElementContainer
  <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<TT;>;)TT1;
- <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<TT;>;)TT1;
+ <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<TT;>;)T0T1;
 caseGenericStack
  <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MGenericStack<TT;>;)TT1;
- <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MGenericStack<TT;>;)TT1;
+ <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MGenericStack<TT;>;)T0T1;
 caseGenericTile
  <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MGenericTile<TT;>;)TT1;
- <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MGenericTile<TT;>;)TT1;
+ <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MGenericTile<TT;>;)T0T1;
 caseGenericTrimContainer
  <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MGenericTrimContainer<TT;>;)TT1;
- <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MGenericTrimContainer<TT;>;)TT1;
+ <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MGenericTrimContainer<TT;>;)T0T1;
 caseHandlerContainer
  (Lorg/eclipse/e4/ui/model/application/commands/MHandlerContainer;)TT1;
- (Lorg/eclipse/e4/ui/model/application/commands/MHandlerContainer;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/commands/MHandlerContainer;)T0T1;
 caseLocalizable
  (Lorg/eclipse/e4/ui/model/application/ui/MLocalizable;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MLocalizable;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MLocalizable;)T0T1;
 casePart
  (Lorg/eclipse/e4/ui/model/application/ui/basic/MPart;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/basic/MPart;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/basic/MPart;)T0T1;
 casePartSashContainer
  (Lorg/eclipse/e4/ui/model/application/ui/basic/MPartSashContainer;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/basic/MPartSashContainer;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/basic/MPartSashContainer;)T0T1;
 casePartSashContainerElement
  (Lorg/eclipse/e4/ui/model/application/ui/basic/MPartSashContainerElement;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/basic/MPartSashContainerElement;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/basic/MPartSashContainerElement;)T0T1;
 casePartStack
  (Lorg/eclipse/e4/ui/model/application/ui/basic/MPartStack;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/basic/MPartStack;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/basic/MPartStack;)T0T1;
 caseSnippetContainer
  (Lorg/eclipse/e4/ui/model/application/ui/MSnippetContainer;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MSnippetContainer;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MSnippetContainer;)T0T1;
 caseStackElement
  (Lorg/eclipse/e4/ui/model/application/ui/basic/MStackElement;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/basic/MStackElement;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/basic/MStackElement;)T0T1;
 caseTrimBar
  (Lorg/eclipse/e4/ui/model/application/ui/basic/MTrimBar;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/basic/MTrimBar;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/basic/MTrimBar;)T0T1;
 caseTrimElement
  (Lorg/eclipse/e4/ui/model/application/ui/basic/MTrimElement;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/basic/MTrimElement;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/basic/MTrimElement;)T0T1;
 caseTrimmedWindow
  (Lorg/eclipse/e4/ui/model/application/ui/basic/MTrimmedWindow;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/basic/MTrimmedWindow;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/basic/MTrimmedWindow;)T0T1;
 caseUIElement
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)T0T1;
 caseUILabel
  (Lorg/eclipse/e4/ui/model/application/ui/MUILabel;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MUILabel;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUILabel;)T0T1;
 caseWindow
  (Lorg/eclipse/e4/ui/model/application/ui/basic/MWindow;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/basic/MWindow;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/basic/MWindow;)T0T1;
 caseWindowElement
  (Lorg/eclipse/e4/ui/model/application/ui/basic/MWindowElement;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/basic/MWindowElement;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/basic/MWindowElement;)T0T1;
 defaultCase
  (Lorg/eclipse/emf/ecore/EObject;)TT1;
- (Lorg/eclipse/emf/ecore/EObject;)TT1;
+ (Lorg/eclipse/emf/ecore/EObject;)T0T1;
 doSwitch
  (ILorg/eclipse/emf/ecore/EObject;)TT1;
  (ILorg/eclipse/emf/ecore/EObject;)TT1;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/impl/UIElementImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/impl/UIElementImpl.eea
index a994594a0d..cd11e122ed 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/impl/UIElementImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/impl/UIElementImpl.eea
@@ -61,7 +61,7 @@ eInverseRemove
  (Lorg/eclipse/emf/ecore/InternalEObject;ILorg/eclipse/emf/common/notify/NotificationChain;)Lorg/eclipse/emf/common/notify/NotificationChain;
 eInvoke
  (ILorg/eclipse/emf/common/util/EList<*>;)Ljava/lang/Object;
- (ILorg/eclipse/emf/common/util/EList<*>;)Ljava/lang/Object;
+ (ILorg/eclipse/emf/common/util/EList<*>;)L0java/lang/Object;
 eSet
  (ILjava/lang/Object;)V
  (ILjava/lang/Object;)V
@@ -82,7 +82,7 @@ getLocalizedAccessibilityPhrase
  ()Ljava/lang/String;
 getParent
  ()Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>;
- ()Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>;
+ ()L0org/eclipse/e4/ui/model/application/ui/MElementContainer<Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>;
 getRenderer
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/impl/UiFactoryImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/impl/UiFactoryImpl.eea
index 13a4171dee..93309ebb25 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/impl/UiFactoryImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/impl/UiFactoryImpl.eea
@@ -10,25 +10,25 @@ init
 
 convertSideValueToString
  (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/Object;)Ljava/lang/String;
- (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/Object;)Ljava/lang/String;
+ (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/Object;)L1java/lang/String;
 convertToString
  (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/Object;)Ljava/lang/String;
  (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/Object;)Ljava/lang/String;
 create
  (Lorg/eclipse/emf/ecore/EClass;)Lorg/eclipse/emf/ecore/EObject;
- (Lorg/eclipse/emf/ecore/EClass;)Lorg/eclipse/emf/ecore/EObject;
+ (Lorg/eclipse/emf/ecore/EClass;)L1org/eclipse/emf/ecore/EObject;
 createCoreExpression
  ()Lorg/eclipse/e4/ui/model/application/ui/MCoreExpression;
- ()Lorg/eclipse/e4/ui/model/application/ui/MCoreExpression;
+ ()L1org/eclipse/e4/ui/model/application/ui/MCoreExpression; # @Inherited(org.eclipse.e4.ui.model.application.ui.MUiFactory)
 createFromString
  (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/String;)Ljava/lang/Object;
- (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/String;)Ljava/lang/Object;
+ (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/String;)L1java/lang/Object;
 createImperativeExpression
  ()Lorg/eclipse/e4/ui/model/application/ui/MImperativeExpression;
- ()Lorg/eclipse/e4/ui/model/application/ui/MImperativeExpression;
+ ()L1org/eclipse/e4/ui/model/application/ui/MImperativeExpression; # @Inherited(org.eclipse.e4.ui.model.application.ui.MUiFactory)
 createSideValueFromString
  (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/String;)Lorg/eclipse/e4/ui/model/application/ui/SideValue;
- (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/String;)Lorg/eclipse/e4/ui/model/application/ui/SideValue;
+ (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/String;)L1org/eclipse/e4/ui/model/application/ui/SideValue;
 getUiPackage
  ()Lorg/eclipse/e4/ui/model/application/ui/impl/UiPackageImpl;
  ()Lorg/eclipse/e4/ui/model/application/ui/impl/UiPackageImpl;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/ItemType.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/ItemType.eea
index 64be71a950..ab0dd6b286 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/ItemType.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/ItemType.eea
@@ -10,13 +10,13 @@ VALUES
 
 get
  (I)Lorg/eclipse/e4/ui/model/application/ui/menu/ItemType;
- (I)Lorg/eclipse/e4/ui/model/application/ui/menu/ItemType;
+ (I)L0org/eclipse/e4/ui/model/application/ui/menu/ItemType;
 get
  (Ljava/lang/String;)Lorg/eclipse/e4/ui/model/application/ui/menu/ItemType;
- (Ljava/lang/String;)Lorg/eclipse/e4/ui/model/application/ui/menu/ItemType;
+ (Ljava/lang/String;)L0org/eclipse/e4/ui/model/application/ui/menu/ItemType;
 getByName
  (Ljava/lang/String;)Lorg/eclipse/e4/ui/model/application/ui/menu/ItemType;
- (Ljava/lang/String;)Lorg/eclipse/e4/ui/model/application/ui/menu/ItemType;
+ (Ljava/lang/String;)L0org/eclipse/e4/ui/model/application/ui/menu/ItemType;
 
 getLiteral
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/MMenuFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/MMenuFactory.eea
index 0c242637b6..9cfc34c1b9 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/MMenuFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/MMenuFactory.eea
@@ -6,43 +6,43 @@ INSTANCE
 
 createDirectMenuItem
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MDirectMenuItem;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MDirectMenuItem;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MDirectMenuItem;
 createDirectToolItem
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MDirectToolItem;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MDirectToolItem;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MDirectToolItem;
 createDynamicMenuContribution
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MDynamicMenuContribution;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MDynamicMenuContribution;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MDynamicMenuContribution;
 createHandledMenuItem
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MHandledMenuItem;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MHandledMenuItem;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MHandledMenuItem;
 createHandledToolItem
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MHandledToolItem;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MHandledToolItem;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MHandledToolItem;
 createMenu
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MMenu;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MMenu;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MMenu;
 createMenuContribution
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuContribution;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuContribution;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MMenuContribution;
 createMenuSeparator
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuSeparator;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuSeparator;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MMenuSeparator;
 createPopupMenu
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MPopupMenu;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MPopupMenu;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MPopupMenu;
 createToolBar
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBar;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBar;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MToolBar;
 createToolBarContribution
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarContribution;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarContribution;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MToolBarContribution;
 createToolBarSeparator
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarSeparator;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarSeparator;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MToolBarSeparator;
 createToolControl
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MToolControl;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MToolControl;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MToolControl;
 createTrimContribution
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MTrimContribution;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MTrimContribution;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MTrimContribution;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/impl/ItemImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/impl/ItemImpl.eea
index 1cac53485a..4ca770a3a8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/impl/ItemImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/impl/ItemImpl.eea
@@ -46,7 +46,7 @@ eGet
  (IZZ)Ljava/lang/Object;
 eInvoke
  (ILorg/eclipse/emf/common/util/EList<*>;)Ljava/lang/Object;
- (ILorg/eclipse/emf/common/util/EList<*>;)Ljava/lang/Object;
+ (ILorg/eclipse/emf/common/util/EList<*>;)L0java/lang/Object; # @Inherited(org.eclipse.e4.ui.model.application.ui.impl.UIElementImpl)
 eSet
  (ILjava/lang/Object;)V
  (ILjava/lang/Object;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/impl/MenuElementImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/impl/MenuElementImpl.eea
index ef6e415f8d..3da376f145 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/impl/MenuElementImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/impl/MenuElementImpl.eea
@@ -46,7 +46,7 @@ eGet
  (IZZ)Ljava/lang/Object;
 eInvoke
  (ILorg/eclipse/emf/common/util/EList<*>;)Ljava/lang/Object;
- (ILorg/eclipse/emf/common/util/EList<*>;)Ljava/lang/Object;
+ (ILorg/eclipse/emf/common/util/EList<*>;)L0java/lang/Object; # @Inherited(org.eclipse.e4.ui.model.application.ui.impl.UIElementImpl)
 eSet
  (ILjava/lang/Object;)V
  (ILjava/lang/Object;)V
@@ -64,7 +64,7 @@ getLocalizedLabel
  ()Ljava/lang/String;
 getLocalizedMnemonics
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getLocalizedTooltip
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/impl/MenuFactoryImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/impl/MenuFactoryImpl.eea
index 32bf244555..a62a89cbfc 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/impl/MenuFactoryImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/impl/MenuFactoryImpl.eea
@@ -10,61 +10,61 @@ init
 
 convertItemTypeToString
  (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/Object;)Ljava/lang/String;
- (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/Object;)Ljava/lang/String;
+ (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/Object;)L1java/lang/String;
 convertToString
  (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/Object;)Ljava/lang/String;
  (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/Object;)Ljava/lang/String;
 create
  (Lorg/eclipse/emf/ecore/EClass;)Lorg/eclipse/emf/ecore/EObject;
- (Lorg/eclipse/emf/ecore/EClass;)Lorg/eclipse/emf/ecore/EObject;
+ (Lorg/eclipse/emf/ecore/EClass;)L1org/eclipse/emf/ecore/EObject;
 createDirectMenuItem
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MDirectMenuItem;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MDirectMenuItem;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MDirectMenuItem; # @Inherited(org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory)
 createDirectToolItem
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MDirectToolItem;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MDirectToolItem;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MDirectToolItem; # @Inherited(org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory)
 createDynamicMenuContribution
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MDynamicMenuContribution;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MDynamicMenuContribution;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MDynamicMenuContribution; # @Inherited(org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory)
 createFromString
  (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/String;)Ljava/lang/Object;
- (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/String;)Ljava/lang/Object;
+ (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/String;)L1java/lang/Object;
 createHandledMenuItem
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MHandledMenuItem;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MHandledMenuItem;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MHandledMenuItem; # @Inherited(org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory)
 createHandledToolItem
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MHandledToolItem;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MHandledToolItem;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MHandledToolItem; # @Inherited(org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory)
 createItemTypeFromString
  (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/String;)Lorg/eclipse/e4/ui/model/application/ui/menu/ItemType;
- (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/String;)Lorg/eclipse/e4/ui/model/application/ui/menu/ItemType;
+ (Lorg/eclipse/emf/ecore/EDataType;Ljava/lang/String;)L1org/eclipse/e4/ui/model/application/ui/menu/ItemType;
 createMenu
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MMenu;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MMenu;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MMenu; # @Inherited(org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory)
 createMenuContribution
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuContribution;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuContribution;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MMenuContribution; # @Inherited(org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory)
 createMenuSeparator
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuSeparator;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuSeparator;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MMenuSeparator; # @Inherited(org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory)
 createPopupMenu
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MPopupMenu;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MPopupMenu;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MPopupMenu; # @Inherited(org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory)
 createToolBar
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBar;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBar;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MToolBar; # @Inherited(org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory)
 createToolBarContribution
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarContribution;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarContribution;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MToolBarContribution; # @Inherited(org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory)
 createToolBarSeparator
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarSeparator;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarSeparator;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MToolBarSeparator; # @Inherited(org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory)
 createToolControl
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MToolControl;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MToolControl;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MToolControl; # @Inherited(org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory)
 createTrimContribution
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MTrimContribution;
- ()Lorg/eclipse/e4/ui/model/application/ui/menu/MTrimContribution;
+ ()L1org/eclipse/e4/ui/model/application/ui/menu/MTrimContribution; # @Inherited(org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory)
 getMenuPackage
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/impl/MenuPackageImpl;
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/impl/MenuPackageImpl;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/impl/MenuItemImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/impl/MenuItemImpl.eea
index 33d1c4cb1d..2b8a0a78a9 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/impl/MenuItemImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/impl/MenuItemImpl.eea
@@ -22,7 +22,7 @@ eGet
  (IZZ)Ljava/lang/Object;
 eInvoke
  (ILorg/eclipse/emf/common/util/EList<*>;)Ljava/lang/Object;
- (ILorg/eclipse/emf/common/util/EList<*>;)Ljava/lang/Object;
+ (ILorg/eclipse/emf/common/util/EList<*>;)L0java/lang/Object; # @Inherited(org.eclipse.e4.ui.model.application.ui.menu.impl.ItemImpl)
 eSet
  (ILjava/lang/Object;)V
  (ILjava/lang/Object;)V
@@ -31,7 +31,7 @@ eStaticClass
  ()Lorg/eclipse/emf/ecore/EClass;
 getLocalizedMnemonics
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getMnemonics
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/util/MenuAdapterFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/util/MenuAdapterFactory.eea
index ff2555b004..c6b86db1ae 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/util/MenuAdapterFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/util/MenuAdapterFactory.eea
@@ -10,103 +10,103 @@ modelSwitch
 
 createAdapter
  (Lorg/eclipse/emf/common/notify/Notifier;)Lorg/eclipse/emf/common/notify/Adapter;
- (Lorg/eclipse/emf/common/notify/Notifier;)Lorg/eclipse/emf/common/notify/Adapter;
+ (Lorg/eclipse/emf/common/notify/Notifier;)L1org/eclipse/emf/common/notify/Adapter;
 createApplicationElementAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createContextAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createContributionAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createDirectMenuItemAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createDirectToolItemAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createDynamicMenuContributionAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createEObjectAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createElementContainerAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createHandledItemAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createHandledMenuItemAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createHandledToolItemAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createItemAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createLocalizableAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createMenuAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createMenuContributionAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createMenuContributionsAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createMenuElementAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createMenuItemAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createMenuSeparatorAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createPopupMenuAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createToolBarAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createToolBarContributionAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createToolBarContributionsAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createToolBarElementAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createToolBarSeparatorAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createToolControlAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createToolItemAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createTrimContributionAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createTrimContributionsAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createTrimElementAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createUIElementAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createUILabelAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 isFactoryForType
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/util/MenuSwitch.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/util/MenuSwitch.eea
index 7a57bf6b29..c4ef9b01ac 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/util/MenuSwitch.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/menu/util/MenuSwitch.eea
@@ -12,100 +12,100 @@ modelPackage
 
 caseApplicationElement
  (Lorg/eclipse/e4/ui/model/application/MApplicationElement;)TT1;
- (Lorg/eclipse/e4/ui/model/application/MApplicationElement;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/MApplicationElement;)T0T1;
 caseContext
  (Lorg/eclipse/e4/ui/model/application/ui/MContext;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MContext;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MContext;)T0T1;
 caseContribution
  (Lorg/eclipse/e4/ui/model/application/MContribution;)TT1;
- (Lorg/eclipse/e4/ui/model/application/MContribution;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/MContribution;)T0T1;
 caseDirectMenuItem
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MDirectMenuItem;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MDirectMenuItem;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MDirectMenuItem;)T0T1;
 caseDirectToolItem
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MDirectToolItem;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MDirectToolItem;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MDirectToolItem;)T0T1;
 caseDynamicMenuContribution
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MDynamicMenuContribution;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MDynamicMenuContribution;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MDynamicMenuContribution;)T0T1;
 caseElementContainer
  <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<TT;>;)TT1;
- <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<TT;>;)TT1;
+ <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<TT;>;)T0T1;
 caseHandledItem
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MHandledItem;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MHandledItem;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MHandledItem;)T0T1;
 caseHandledMenuItem
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MHandledMenuItem;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MHandledMenuItem;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MHandledMenuItem;)T0T1;
 caseHandledToolItem
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MHandledToolItem;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MHandledToolItem;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MHandledToolItem;)T0T1;
 caseItem
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MItem;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MItem;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MItem;)T0T1;
 caseLocalizable
  (Lorg/eclipse/e4/ui/model/application/ui/MLocalizable;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MLocalizable;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MLocalizable;)T0T1;
 caseMenu
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MMenu;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MMenu;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MMenu;)T0T1;
 caseMenuContribution
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuContribution;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuContribution;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuContribution;)T0T1;
 caseMenuContributions
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuContributions;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuContributions;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuContributions;)T0T1;
 caseMenuElement
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuElement;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuElement;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuElement;)T0T1;
 caseMenuItem
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuItem;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuItem;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuItem;)T0T1;
 caseMenuSeparator
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuSeparator;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuSeparator;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuSeparator;)T0T1;
 casePopupMenu
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MPopupMenu;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MPopupMenu;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MPopupMenu;)T0T1;
 caseToolBar
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBar;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBar;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBar;)T0T1;
 caseToolBarContribution
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarContribution;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarContribution;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarContribution;)T0T1;
 caseToolBarContributions
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarContributions;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarContributions;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarContributions;)T0T1;
 caseToolBarElement
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarElement;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarElement;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarElement;)T0T1;
 caseToolBarSeparator
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarSeparator;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarSeparator;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarSeparator;)T0T1;
 caseToolControl
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolControl;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolControl;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolControl;)T0T1;
 caseToolItem
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolItem;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolItem;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolItem;)T0T1;
 caseTrimContribution
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MTrimContribution;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MTrimContribution;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MTrimContribution;)T0T1;
 caseTrimContributions
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MTrimContributions;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MTrimContributions;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MTrimContributions;)T0T1;
 caseTrimElement
  (Lorg/eclipse/e4/ui/model/application/ui/basic/MTrimElement;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/basic/MTrimElement;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/basic/MTrimElement;)T0T1;
 caseUIElement
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)T0T1;
 caseUILabel
  (Lorg/eclipse/e4/ui/model/application/ui/MUILabel;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MUILabel;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUILabel;)T0T1;
 defaultCase
  (Lorg/eclipse/emf/ecore/EObject;)TT1;
- (Lorg/eclipse/emf/ecore/EObject;)TT1;
+ (Lorg/eclipse/emf/ecore/EObject;)T0T1;
 doSwitch
  (ILorg/eclipse/emf/ecore/EObject;)TT1;
  (ILorg/eclipse/emf/ecore/EObject;)TT1;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/util/UiAdapterFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/util/UiAdapterFactory.eea
index aa13398afd..1575e657db 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/util/UiAdapterFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/util/UiAdapterFactory.eea
@@ -10,55 +10,55 @@ modelSwitch
 
 createAdapter
  (Lorg/eclipse/emf/common/notify/Notifier;)Lorg/eclipse/emf/common/notify/Adapter;
- (Lorg/eclipse/emf/common/notify/Notifier;)Lorg/eclipse/emf/common/notify/Adapter;
+ (Lorg/eclipse/emf/common/notify/Notifier;)L1org/eclipse/emf/common/notify/Adapter;
 createApplicationElementAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createContextAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createContributionAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createCoreExpressionAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createDirtyableAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createEObjectAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createElementContainerAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createExpressionAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createGenericStackAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createGenericTileAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createGenericTrimContainerAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createImperativeExpressionAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createLocalizableAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createSnippetContainerAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createUIElementAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createUILabelAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 isFactoryForType
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/util/UiSwitch.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/util/UiSwitch.eea
index ec34939301..c7ef555af7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/util/UiSwitch.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/ui/util/UiSwitch.eea
@@ -12,52 +12,52 @@ modelPackage
 
 caseApplicationElement
  (Lorg/eclipse/e4/ui/model/application/MApplicationElement;)TT1;
- (Lorg/eclipse/e4/ui/model/application/MApplicationElement;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/MApplicationElement;)T0T1;
 caseContext
  (Lorg/eclipse/e4/ui/model/application/ui/MContext;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MContext;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MContext;)T0T1;
 caseContribution
  (Lorg/eclipse/e4/ui/model/application/MContribution;)TT1;
- (Lorg/eclipse/e4/ui/model/application/MContribution;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/MContribution;)T0T1;
 caseCoreExpression
  (Lorg/eclipse/e4/ui/model/application/ui/MCoreExpression;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MCoreExpression;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MCoreExpression;)T0T1;
 caseDirtyable
  (Lorg/eclipse/e4/ui/model/application/ui/MDirtyable;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MDirtyable;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MDirtyable;)T0T1;
 caseElementContainer
  <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<TT;>;)TT1;
- <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<TT;>;)TT1;
+ <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<TT;>;)T0T1;
 caseExpression
  (Lorg/eclipse/e4/ui/model/application/ui/MExpression;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MExpression;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MExpression;)T0T1;
 caseGenericStack
  <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MGenericStack<TT;>;)TT1;
- <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MGenericStack<TT;>;)TT1;
+ <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MGenericStack<TT;>;)T0T1;
 caseGenericTile
  <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MGenericTile<TT;>;)TT1;
- <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MGenericTile<TT;>;)TT1;
+ <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MGenericTile<TT;>;)T0T1;
 caseGenericTrimContainer
  <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MGenericTrimContainer<TT;>;)TT1;
- <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MGenericTrimContainer<TT;>;)TT1;
+ <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MGenericTrimContainer<TT;>;)T0T1;
 caseImperativeExpression
  (Lorg/eclipse/e4/ui/model/application/ui/MImperativeExpression;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MImperativeExpression;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MImperativeExpression;)T0T1;
 caseLocalizable
  (Lorg/eclipse/e4/ui/model/application/ui/MLocalizable;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MLocalizable;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MLocalizable;)T0T1;
 caseSnippetContainer
  (Lorg/eclipse/e4/ui/model/application/ui/MSnippetContainer;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MSnippetContainer;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MSnippetContainer;)T0T1;
 caseUIElement
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)T0T1;
 caseUILabel
  (Lorg/eclipse/e4/ui/model/application/ui/MUILabel;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MUILabel;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUILabel;)T0T1;
 defaultCase
  (Lorg/eclipse/emf/ecore/EObject;)TT1;
- (Lorg/eclipse/emf/ecore/EObject;)TT1;
+ (Lorg/eclipse/emf/ecore/EObject;)T0T1;
 doSwitch
  (ILorg/eclipse/emf/ecore/EObject;)TT1;
  (ILorg/eclipse/emf/ecore/EObject;)TT1;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/util/ApplicationAdapterFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/util/ApplicationAdapterFactory.eea
index 19a5b32f4b..b7d71921a8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/util/ApplicationAdapterFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/util/ApplicationAdapterFactory.eea
@@ -10,64 +10,64 @@ modelSwitch
 
 createAdapter
  (Lorg/eclipse/emf/common/notify/Notifier;)Lorg/eclipse/emf/common/notify/Adapter;
- (Lorg/eclipse/emf/common/notify/Notifier;)Lorg/eclipse/emf/common/notify/Adapter;
+ (Lorg/eclipse/emf/common/notify/Notifier;)L1org/eclipse/emf/common/notify/Adapter;
 createAddonAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createApplicationAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createApplicationElementAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createBindingTableContainerAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createBindingsAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createContextAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createContributionAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createEObjectAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createElementContainerAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createHandlerContainerAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createLocalizableAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createMenuContributionsAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createPartDescriptorContainerAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createSnippetContainerAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createStringToObjectMapAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createStringToStringMapAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createToolBarContributionsAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createTrimContributionsAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createUIElementAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 isFactoryForType
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/util/ApplicationSwitch.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/util/ApplicationSwitch.eea
index fa2293af75..d4b31142a9 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/util/ApplicationSwitch.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/application/util/ApplicationSwitch.eea
@@ -12,61 +12,61 @@ modelPackage
 
 caseAddon
  (Lorg/eclipse/e4/ui/model/application/MAddon;)TT1;
- (Lorg/eclipse/e4/ui/model/application/MAddon;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/MAddon;)T0T1;
 caseApplication
  (Lorg/eclipse/e4/ui/model/application/MApplication;)TT1;
- (Lorg/eclipse/e4/ui/model/application/MApplication;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/MApplication;)T0T1;
 caseApplicationElement
  (Lorg/eclipse/e4/ui/model/application/MApplicationElement;)TT1;
- (Lorg/eclipse/e4/ui/model/application/MApplicationElement;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/MApplicationElement;)T0T1;
 caseBindingTableContainer
  (Lorg/eclipse/e4/ui/model/application/commands/MBindingTableContainer;)TT1;
- (Lorg/eclipse/e4/ui/model/application/commands/MBindingTableContainer;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/commands/MBindingTableContainer;)T0T1;
 caseBindings
  (Lorg/eclipse/e4/ui/model/application/commands/MBindings;)TT1;
- (Lorg/eclipse/e4/ui/model/application/commands/MBindings;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/commands/MBindings;)T0T1;
 caseContext
  (Lorg/eclipse/e4/ui/model/application/ui/MContext;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MContext;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MContext;)T0T1;
 caseContribution
  (Lorg/eclipse/e4/ui/model/application/MContribution;)TT1;
- (Lorg/eclipse/e4/ui/model/application/MContribution;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/MContribution;)T0T1;
 caseElementContainer
  <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<TT;>;)TT1;
- <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<TT;>;)TT1;
+ <T::Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>(Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<TT;>;)T0T1;
 caseHandlerContainer
  (Lorg/eclipse/e4/ui/model/application/commands/MHandlerContainer;)TT1;
- (Lorg/eclipse/e4/ui/model/application/commands/MHandlerContainer;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/commands/MHandlerContainer;)T0T1;
 caseLocalizable
  (Lorg/eclipse/e4/ui/model/application/ui/MLocalizable;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MLocalizable;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MLocalizable;)T0T1;
 caseMenuContributions
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuContributions;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuContributions;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MMenuContributions;)T0T1;
 casePartDescriptorContainer
  (Lorg/eclipse/e4/ui/model/application/descriptor/basic/MPartDescriptorContainer;)TT1;
- (Lorg/eclipse/e4/ui/model/application/descriptor/basic/MPartDescriptorContainer;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/descriptor/basic/MPartDescriptorContainer;)T0T1;
 caseSnippetContainer
  (Lorg/eclipse/e4/ui/model/application/ui/MSnippetContainer;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MSnippetContainer;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MSnippetContainer;)T0T1;
 caseStringToObjectMap
  (Ljava/util/Map$Entry<Ljava/lang/String;Ljava/lang/Object;>;)TT1;
- (Ljava/util/Map$Entry<Ljava/lang/String;Ljava/lang/Object;>;)TT1;
+ (Ljava/util/Map$Entry<Ljava/lang/String;Ljava/lang/Object;>;)T0T1;
 caseStringToStringMap
  (Ljava/util/Map$Entry<Ljava/lang/String;Ljava/lang/String;>;)TT1;
- (Ljava/util/Map$Entry<Ljava/lang/String;Ljava/lang/String;>;)TT1;
+ (Ljava/util/Map$Entry<Ljava/lang/String;Ljava/lang/String;>;)T0T1;
 caseToolBarContributions
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarContributions;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarContributions;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarContributions;)T0T1;
 caseTrimContributions
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MTrimContributions;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MTrimContributions;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MTrimContributions;)T0T1;
 caseUIElement
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)TT1;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)TT1;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)T0T1;
 defaultCase
  (Lorg/eclipse/emf/ecore/EObject;)TT1;
- (Lorg/eclipse/emf/ecore/EObject;)TT1;
+ (Lorg/eclipse/emf/ecore/EObject;)T0T1;
 doSwitch
  (ILorg/eclipse/emf/ecore/EObject;)TT1;
  (ILorg/eclipse/emf/ecore/EObject;)TT1;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/fragment/MFragmentFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/fragment/MFragmentFactory.eea
index 7c0240eb2e..956e28894e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/fragment/MFragmentFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/fragment/MFragmentFactory.eea
@@ -6,7 +6,7 @@ INSTANCE
 
 createModelFragments
  ()Lorg/eclipse/e4/ui/model/fragment/MModelFragments;
- ()Lorg/eclipse/e4/ui/model/fragment/MModelFragments;
+ ()L1org/eclipse/e4/ui/model/fragment/MModelFragments;
 createStringModelFragment
  ()Lorg/eclipse/e4/ui/model/fragment/MStringModelFragment;
- ()Lorg/eclipse/e4/ui/model/fragment/MStringModelFragment;
+ ()L1org/eclipse/e4/ui/model/fragment/MStringModelFragment;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/fragment/impl/FragmentFactoryImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/fragment/impl/FragmentFactoryImpl.eea
index 2dacb42255..9967f0348b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/fragment/impl/FragmentFactoryImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/fragment/impl/FragmentFactoryImpl.eea
@@ -10,13 +10,13 @@ init
 
 create
  (Lorg/eclipse/emf/ecore/EClass;)Lorg/eclipse/emf/ecore/EObject;
- (Lorg/eclipse/emf/ecore/EClass;)Lorg/eclipse/emf/ecore/EObject;
+ (Lorg/eclipse/emf/ecore/EClass;)L1org/eclipse/emf/ecore/EObject;
 createModelFragments
  ()Lorg/eclipse/e4/ui/model/fragment/MModelFragments;
- ()Lorg/eclipse/e4/ui/model/fragment/MModelFragments;
+ ()L1org/eclipse/e4/ui/model/fragment/MModelFragments; # @Inherited(org.eclipse.e4.ui.model.fragment.MFragmentFactory)
 createStringModelFragment
  ()Lorg/eclipse/e4/ui/model/fragment/MStringModelFragment;
- ()Lorg/eclipse/e4/ui/model/fragment/MStringModelFragment;
+ ()L1org/eclipse/e4/ui/model/fragment/MStringModelFragment; # @Inherited(org.eclipse.e4.ui.model.fragment.MFragmentFactory)
 getFragmentPackage
  ()Lorg/eclipse/e4/ui/model/fragment/impl/FragmentPackageImpl;
  ()Lorg/eclipse/e4/ui/model/fragment/impl/FragmentPackageImpl;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/fragment/impl/ModelFragmentImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/fragment/impl/ModelFragmentImpl.eea
index 092c64b57b..863bc8862d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/fragment/impl/ModelFragmentImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/fragment/impl/ModelFragmentImpl.eea
@@ -24,4 +24,4 @@ getElements
  ()Ljava/util/List<Lorg/eclipse/e4/ui/model/application/MApplicationElement;>;
 merge
  (Lorg/eclipse/e4/ui/model/application/MApplication;)Ljava/util/List<Lorg/eclipse/e4/ui/model/application/MApplicationElement;>;
- (Lorg/eclipse/e4/ui/model/application/MApplication;)Ljava/util/List<Lorg/eclipse/e4/ui/model/application/MApplicationElement;>;
+ (Lorg/eclipse/e4/ui/model/application/MApplication;)L1java/util/List<Lorg/eclipse/e4/ui/model/application/MApplicationElement;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/fragment/impl/StringModelFragmentImpl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/fragment/impl/StringModelFragmentImpl.eea
index 1026008560..22e8b6a97d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/fragment/impl/StringModelFragmentImpl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/fragment/impl/StringModelFragmentImpl.eea
@@ -40,7 +40,7 @@ getPositionInList
  ()Ljava/lang/String;
 merge
  (Lorg/eclipse/e4/ui/model/application/MApplication;)Ljava/util/List<Lorg/eclipse/e4/ui/model/application/MApplicationElement;>;
- (Lorg/eclipse/e4/ui/model/application/MApplication;)Ljava/util/List<Lorg/eclipse/e4/ui/model/application/MApplicationElement;>;
+ (Lorg/eclipse/e4/ui/model/application/MApplication;)L1java/util/List<Lorg/eclipse/e4/ui/model/application/MApplicationElement;>; # @Inherited(org.eclipse.e4.ui.model.fragment.impl.ModelFragmentImpl)
 setFeaturename
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/fragment/util/FragmentAdapterFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/fragment/util/FragmentAdapterFactory.eea
index 050df9f4a8..fb6b1930d6 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/fragment/util/FragmentAdapterFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/fragment/util/FragmentAdapterFactory.eea
@@ -10,19 +10,19 @@ modelSwitch
 
 createAdapter
  (Lorg/eclipse/emf/common/notify/Notifier;)Lorg/eclipse/emf/common/notify/Adapter;
- (Lorg/eclipse/emf/common/notify/Notifier;)Lorg/eclipse/emf/common/notify/Adapter;
+ (Lorg/eclipse/emf/common/notify/Notifier;)L1org/eclipse/emf/common/notify/Adapter;
 createEObjectAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createModelFragmentAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createModelFragmentsAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 createStringModelFragmentAdapter
  ()Lorg/eclipse/emf/common/notify/Adapter;
- ()Lorg/eclipse/emf/common/notify/Adapter;
+ ()L0org/eclipse/emf/common/notify/Adapter;
 isFactoryForType
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/fragment/util/FragmentSwitch.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/fragment/util/FragmentSwitch.eea
index c850ae8d51..8c57aaad9e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/fragment/util/FragmentSwitch.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/model/fragment/util/FragmentSwitch.eea
@@ -12,16 +12,16 @@ modelPackage
 
 caseModelFragment
  (Lorg/eclipse/e4/ui/model/fragment/MModelFragment;)TT;
- (Lorg/eclipse/e4/ui/model/fragment/MModelFragment;)TT;
+ (Lorg/eclipse/e4/ui/model/fragment/MModelFragment;)T0T;
 caseModelFragments
  (Lorg/eclipse/e4/ui/model/fragment/MModelFragments;)TT;
- (Lorg/eclipse/e4/ui/model/fragment/MModelFragments;)TT;
+ (Lorg/eclipse/e4/ui/model/fragment/MModelFragments;)T0T;
 caseStringModelFragment
  (Lorg/eclipse/e4/ui/model/fragment/MStringModelFragment;)TT;
- (Lorg/eclipse/e4/ui/model/fragment/MStringModelFragment;)TT;
+ (Lorg/eclipse/e4/ui/model/fragment/MStringModelFragment;)T0T;
 defaultCase
  (Lorg/eclipse/emf/ecore/EObject;)TT;
- (Lorg/eclipse/emf/ecore/EObject;)TT;
+ (Lorg/eclipse/emf/ecore/EObject;)T0T;
 doSwitch
  (ILorg/eclipse/emf/ecore/EObject;)TT;
  (ILorg/eclipse/emf/ecore/EObject;)TT;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/IModelResourceHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/IModelResourceHandler.eea
index ba8f2f226a..d399016fdf 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/IModelResourceHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/IModelResourceHandler.eea
@@ -2,7 +2,7 @@ class org/eclipse/e4/ui/workbench/IModelResourceHandler
 
 createResourceWithApp
  (Lorg/eclipse/e4/ui/model/application/MApplication;)Lorg/eclipse/emf/ecore/resource/Resource;
- (Lorg/eclipse/e4/ui/model/application/MApplication;)Lorg/eclipse/emf/ecore/resource/Resource;
+ (Lorg/eclipse/e4/ui/model/application/MApplication;)L1org/eclipse/emf/ecore/resource/Resource;
 loadMostRecentModel
  ()Lorg/eclipse/emf/ecore/resource/Resource;
  ()Lorg/eclipse/emf/ecore/resource/Resource;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/IPresentationEngine.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/IPresentationEngine.eea
index c92f8f6a20..3c5dc45fa7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/IPresentationEngine.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/IPresentationEngine.eea
@@ -93,10 +93,10 @@ WINDOW_TOP_LEVEL
 
 createGui
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)Ljava/lang/Object;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)Ljava/lang/Object;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)L1java/lang/Object;
 createGui
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;Lorg/eclipse/e4/core/contexts/IEclipseContext;)Ljava/lang/Object;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;Lorg/eclipse/e4/core/contexts/IEclipseContext;)Ljava/lang/Object;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;Lorg/eclipse/e4/core/contexts/IEclipseContext;)L1java/lang/Object;
 focusGui
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)V
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/UIEvents.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/UIEvents.eea
index 5e279aadcd..e00eb11ec0 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/UIEvents.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/UIEvents.eea
@@ -27,13 +27,13 @@ asIterable
  (Lorg/osgi/service/event/Event;Ljava/lang/String;)Ljava/lang/Iterable<*>;
 buildTopic
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 buildTopic
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 buildTopic
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 contains
  (Lorg/osgi/service/event/Event;Ljava/lang/String;Ljava/lang/Object;)Z
  (Lorg/osgi/service/event/Event;Ljava/lang/String;Ljava/lang/Object;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/addons/dndaddon/IBFDragAgent.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/addons/dndaddon/IBFDragAgent.eea
index 17e49825e6..54e0491b2d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/addons/dndaddon/IBFDragAgent.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/addons/dndaddon/IBFDragAgent.eea
@@ -11,7 +11,7 @@ dragStart
  (Lorg/eclipse/e4/ui/workbench/addons/dndaddon/DnDInfo;)V
 getElementToDrag
  (Lorg/eclipse/e4/ui/workbench/addons/dndaddon/DnDInfo;)Lorg/eclipse/e4/ui/model/application/ui/MUIElement;
- (Lorg/eclipse/e4/ui/workbench/addons/dndaddon/DnDInfo;)Lorg/eclipse/e4/ui/model/application/ui/MUIElement;
+ (Lorg/eclipse/e4/ui/workbench/addons/dndaddon/DnDInfo;)L0org/eclipse/e4/ui/model/application/ui/MUIElement;
 track
  (Lorg/eclipse/e4/ui/workbench/addons/dndaddon/DnDInfo;)V
  (Lorg/eclipse/e4/ui/workbench/addons/dndaddon/DnDInfo;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/addons/dndaddon/PartDragAgent.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/addons/dndaddon/PartDragAgent.eea
index 2483453ca8..fef8a4a60b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/addons/dndaddon/PartDragAgent.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/addons/dndaddon/PartDragAgent.eea
@@ -11,4 +11,4 @@ dragStart
  (Lorg/eclipse/e4/ui/workbench/addons/dndaddon/DnDInfo;)V
 getElementToDrag
  (Lorg/eclipse/e4/ui/workbench/addons/dndaddon/DnDInfo;)Lorg/eclipse/e4/ui/model/application/ui/MUIElement;
- (Lorg/eclipse/e4/ui/workbench/addons/dndaddon/DnDInfo;)Lorg/eclipse/e4/ui/model/application/ui/MUIElement;
+ (Lorg/eclipse/e4/ui/workbench/addons/dndaddon/DnDInfo;)L0org/eclipse/e4/ui/model/application/ui/MUIElement;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/addons/minmax/MinMaxAddonUtil.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/addons/minmax/MinMaxAddonUtil.eea
index 8987bad738..060ab260ef 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/addons/minmax/MinMaxAddonUtil.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/addons/minmax/MinMaxAddonUtil.eea
@@ -5,7 +5,7 @@ addChildrenOfMinMaxChildrenAreaToRestoreList
  (Lorg/eclipse/e4/ui/workbench/modeling/EModelService;Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Lorg/eclipse/e4/ui/model/application/ui/basic/MWindow;Lorg/eclipse/e4/ui/model/application/ui/advanced/MPerspective;Ljava/util/List<Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>;)V
 getAreaFor
  (Lorg/eclipse/e4/ui/model/application/ui/basic/MPartStack;)Lorg/eclipse/e4/ui/model/application/ui/advanced/MArea;
- (Lorg/eclipse/e4/ui/model/application/ui/basic/MPartStack;)Lorg/eclipse/e4/ui/model/application/ui/advanced/MArea;
+ (Lorg/eclipse/e4/ui/model/application/ui/basic/MPartStack;)L0org/eclipse/e4/ui/model/application/ui/advanced/MArea;
 getWindowFor
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)Lorg/eclipse/e4/ui/model/application/ui/basic/MWindow;
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)Lorg/eclipse/e4/ui/model/application/ui/basic/MWindow;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/addons/minmax/TrimStackIdHelper.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/addons/minmax/TrimStackIdHelper.eea
index c5285c29cf..ca2fa956b8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/addons/minmax/TrimStackIdHelper.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/addons/minmax/TrimStackIdHelper.eea
@@ -2,7 +2,7 @@ class org/eclipse/e4/ui/workbench/addons/minmax/TrimStackIdHelper
 
 createTrimStackId
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Lorg/eclipse/e4/ui/model/application/ui/advanced/MPerspective;Lorg/eclipse/e4/ui/model/application/ui/basic/MWindow;)Ljava/lang/String;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Lorg/eclipse/e4/ui/model/application/ui/advanced/MPerspective;Lorg/eclipse/e4/ui/model/application/ui/basic/MWindow;)Ljava/lang/String;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Lorg/eclipse/e4/ui/model/application/ui/advanced/MPerspective;Lorg/eclipse/e4/ui/model/application/ui/basic/MWindow;)L1java/lang/String;
 parseTrimStackId
  (Ljava/lang/String;)Ljava/util/Map<Lorg/eclipse/e4/ui/workbench/addons/minmax/TrimStackIdHelper$TrimStackIdPart;Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/Map<Lorg/eclipse/e4/ui/workbench/addons/minmax/TrimStackIdHelper$TrimStackIdPart;Ljava/lang/String;>;
+ (Ljava/lang/String;)L1java/util/Map<Lorg/eclipse/e4/ui/workbench/addons/minmax/TrimStackIdHelper$TrimStackIdPart;Ljava/lang/String;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/addons/perspectiveswitcher/PerspectiveSwitcher.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/addons/perspectiveswitcher/PerspectiveSwitcher.eea
index b38e727661..8b7816f6e8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/addons/perspectiveswitcher/PerspectiveSwitcher.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/addons/perspectiveswitcher/PerspectiveSwitcher.eea
@@ -19,4 +19,4 @@ eventBroker
 
 getItemFor
  (Lorg/eclipse/e4/ui/model/application/ui/advanced/MPerspective;)Lorg/eclipse/swt/widgets/ToolItem;
- (Lorg/eclipse/e4/ui/model/application/ui/advanced/MPerspective;)Lorg/eclipse/swt/widgets/ToolItem;
+ (Lorg/eclipse/e4/ui/model/application/ui/advanced/MPerspective;)L0org/eclipse/swt/widgets/ToolItem;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/modeling/EModelService.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/modeling/EModelService.eea
index 6380914d50..ce1264b930 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/modeling/EModelService.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/modeling/EModelService.eea
@@ -18,10 +18,10 @@ countRenderableChildren
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)I
 createModelElement
  <T::Lorg/eclipse/e4/ui/model/application/MApplicationElement;>(Ljava/lang/Class<TT;>;)TT;
- <T::Lorg/eclipse/e4/ui/model/application/MApplicationElement;>(Ljava/lang/Class<TT;>;)TT;
+ <T::Lorg/eclipse/e4/ui/model/application/MApplicationElement;>(Ljava/lang/Class<TT;>;)T1T;
 createPart
  (Lorg/eclipse/e4/ui/model/application/descriptor/basic/MPartDescriptor;)Lorg/eclipse/e4/ui/model/application/ui/basic/MPart;
- (Lorg/eclipse/e4/ui/model/application/descriptor/basic/MPartDescriptor;)Lorg/eclipse/e4/ui/model/application/ui/basic/MPart;
+ (Lorg/eclipse/e4/ui/model/application/descriptor/basic/MPartDescriptor;)L1org/eclipse/e4/ui/model/application/ui/basic/MPart;
 deleteModelElement
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)V
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/modeling/EObjModelHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/modeling/EObjModelHandler.eea
index 56a30ab7bd..fca3c23fa2 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/modeling/EObjModelHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/modeling/EObjModelHandler.eea
@@ -8,13 +8,13 @@ getAdapterList
  ()[1L1java/lang/Class<*>; # @Inherited(org.eclipse.core.runtime.IAdapterFactory)
 getChildren
  (Ljava/lang/Object;Ljava/lang/String;)[Ljava/lang/Object;
- (Ljava/lang/Object;Ljava/lang/String;)[Ljava/lang/Object;
+ (Ljava/lang/Object;Ljava/lang/String;)[1Ljava/lang/Object; # @Inherited(org.eclipse.e4.ui.workbench.modeling.ModelHandlerBase)
 getPropIds
  (Ljava/lang/Object;)[Ljava/lang/String;
- (Ljava/lang/Object;)[Ljava/lang/String;
+ (Ljava/lang/Object;)[1Ljava/lang/String; # @Inherited(org.eclipse.e4.ui.workbench.modeling.ModelHandlerBase)
 getProperty
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/Object;Ljava/lang/String;)L0java/lang/Object; # @Inherited(org.eclipse.e4.ui.workbench.modeling.ModelHandlerBase)
 setProperty
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/modeling/EPartService.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/modeling/EPartService.eea
index ed017b3564..1c6e9c6dc5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/modeling/EPartService.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/modeling/EPartService.eea
@@ -21,13 +21,13 @@ bringToTop
  (Lorg/eclipse/e4/ui/model/application/ui/basic/MPart;)V
 createPart
  (Ljava/lang/String;)Lorg/eclipse/e4/ui/model/application/ui/basic/MPart;
- (Ljava/lang/String;)Lorg/eclipse/e4/ui/model/application/ui/basic/MPart;
+ (Ljava/lang/String;)L1org/eclipse/e4/ui/model/application/ui/basic/MPart;
 createSharedPart
  (Ljava/lang/String;)Lorg/eclipse/e4/ui/model/application/ui/advanced/MPlaceholder;
- (Ljava/lang/String;)Lorg/eclipse/e4/ui/model/application/ui/advanced/MPlaceholder;
+ (Ljava/lang/String;)L1org/eclipse/e4/ui/model/application/ui/advanced/MPlaceholder;
 createSharedPart
  (Ljava/lang/String;Z)Lorg/eclipse/e4/ui/model/application/ui/advanced/MPlaceholder;
- (Ljava/lang/String;Z)Lorg/eclipse/e4/ui/model/application/ui/advanced/MPlaceholder;
+ (Ljava/lang/String;Z)L1org/eclipse/e4/ui/model/application/ui/advanced/MPlaceholder;
 findPart
  (Ljava/lang/String;)Lorg/eclipse/e4/ui/model/application/ui/basic/MPart;
  (Ljava/lang/String;)Lorg/eclipse/e4/ui/model/application/ui/basic/MPart;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/modeling/IModelProcessorContribution.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/modeling/IModelProcessorContribution.eea
index f5905f0c04..7a64c5e628 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/modeling/IModelProcessorContribution.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/modeling/IModelProcessorContribution.eea
@@ -24,4 +24,4 @@ getModelElements
  ()Ljava/util/List<Lorg/eclipse/e4/ui/workbench/modeling/IModelProcessorContribution$ModelElement;>;
 getProcessorClass
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L0java/lang/Class<*>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/modeling/ModelHandlerBase.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/modeling/ModelHandlerBase.eea
index 820ad173c5..1054416138 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/modeling/ModelHandlerBase.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/modeling/ModelHandlerBase.eea
@@ -2,13 +2,13 @@ class org/eclipse/e4/ui/workbench/modeling/ModelHandlerBase
 
 getChildren
  (Ljava/lang/Object;Ljava/lang/String;)[Ljava/lang/Object;
- (Ljava/lang/Object;Ljava/lang/String;)[Ljava/lang/Object;
+ (Ljava/lang/Object;Ljava/lang/String;)[1Ljava/lang/Object;
 getPropIds
  (Ljava/lang/Object;)[Ljava/lang/String;
- (Ljava/lang/Object;)[Ljava/lang/String;
+ (Ljava/lang/Object;)[1Ljava/lang/String;
 getProperty
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/Object;Ljava/lang/String;)L0java/lang/Object;
 setProperty
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/AbstractContributionItem.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/AbstractContributionItem.eea
index f5266ef7b3..f289977ec3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/AbstractContributionItem.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/AbstractContributionItem.eea
@@ -64,13 +64,13 @@ getItemListener
  ()Lorg/eclipse/swt/widgets/Listener;
 getMenu
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MMenu;Lorg/eclipse/swt/widgets/ToolItem;)Lorg/eclipse/swt/widgets/Menu;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MMenu;Lorg/eclipse/swt/widgets/ToolItem;)Lorg/eclipse/swt/widgets/Menu;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MMenu;Lorg/eclipse/swt/widgets/ToolItem;)L0org/eclipse/swt/widgets/Menu;
 getModel
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MItem;
  ()Lorg/eclipse/e4/ui/model/application/ui/menu/MItem;
 getUpdater
  ()Lorg/eclipse/e4/ui/workbench/renderers/swt/ToolItemUpdater;
- ()Lorg/eclipse/e4/ui/workbench/renderers/swt/ToolItemUpdater;
+ ()L0org/eclipse/e4/ui/workbench/renderers/swt/ToolItemUpdater;
 getWidget
  ()Lorg/eclipse/swt/widgets/Widget;
  ()Lorg/eclipse/swt/widgets/Widget;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/AreaRenderer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/AreaRenderer.eea
index 25b50a99bc..14d7be3954 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/AreaRenderer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/AreaRenderer.eea
@@ -2,7 +2,7 @@ class org/eclipse/e4/ui/workbench/renderers/swt/AreaRenderer
 
 createWidget
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Ljava/lang/Object;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)L0java/lang/Object;
 getUIContainer
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)Ljava/lang/Object;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)Ljava/lang/Object;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)L0java/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/CTabRendering.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/CTabRendering.eea
index 3fd3e843f8..49558be895 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/CTabRendering.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/CTabRendering.eea
@@ -15,13 +15,13 @@ USE_ROUND_TABS
  (Lorg/eclipse/swt/custom/CTabFolder;)V
 blur
  (Lorg/eclipse/swt/graphics/Image;II)Lorg/eclipse/swt/graphics/ImageData;
- (Lorg/eclipse/swt/graphics/Image;II)Lorg/eclipse/swt/graphics/ImageData;
+ (Lorg/eclipse/swt/graphics/Image;II)L1org/eclipse/swt/graphics/ImageData;
 computeSize
  (IILorg/eclipse/swt/graphics/GC;II)Lorg/eclipse/swt/graphics/Point;
  (IILorg/eclipse/swt/graphics/GC;II)Lorg/eclipse/swt/graphics/Point;
 computeTrim
  (IIIIII)Lorg/eclipse/swt/graphics/Rectangle;
- (IIIIII)Lorg/eclipse/swt/graphics/Rectangle;
+ (IIIIII)L1org/eclipse/swt/graphics/Rectangle; # @Inherited(org.eclipse.swt.custom.CTabFolderRenderer)
 draw
  (IILorg/eclipse/swt/graphics/Rectangle;Lorg/eclipse/swt/graphics/GC;)V
  (IILorg/eclipse/swt/graphics/Rectangle;Lorg/eclipse/swt/graphics/GC;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/ContributedPartRenderer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/ContributedPartRenderer.eea
index 56ce4b2d87..f8a831f8f8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/ContributedPartRenderer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/ContributedPartRenderer.eea
@@ -6,7 +6,7 @@ setDescription
 
 createWidget
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Ljava/lang/Object;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)L0java/lang/Object;
 disposeWidget
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)V
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/ElementReferenceRenderer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/ElementReferenceRenderer.eea
index 4137b9eb45..1de50d719a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/ElementReferenceRenderer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/ElementReferenceRenderer.eea
@@ -2,7 +2,7 @@ class org/eclipse/e4/ui/workbench/renderers/swt/ElementReferenceRenderer
 
 createWidget
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Ljava/lang/Object;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)L1java/lang/Object;
 disposeWidget
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)V
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/MenuManagerRenderer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/MenuManagerRenderer.eea
index 3d88faeaca..c32ac48a33 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/MenuManagerRenderer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/MenuManagerRenderer.eea
@@ -28,7 +28,7 @@ clearModelToManager
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MMenu;Lorg/eclipse/jface/action/MenuManager;)V
 createWidget
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Ljava/lang/Object;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)L0java/lang/Object;
 getContext
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)Lorg/eclipse/e4/core/contexts/IEclipseContext;
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)Lorg/eclipse/e4/core/contexts/IEclipseContext;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/PerspectiveRenderer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/PerspectiveRenderer.eea
index b641521398..7314830a46 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/PerspectiveRenderer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/PerspectiveRenderer.eea
@@ -2,10 +2,10 @@ class org/eclipse/e4/ui/workbench/renderers/swt/PerspectiveRenderer
 
 createWidget
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Widget;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Widget;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)L0org/eclipse/swt/widgets/Widget;
 getUIContainer
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)Ljava/lang/Object;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)Ljava/lang/Object;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)L0java/lang/Object;
 processContents
  (Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>;)V
  (Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/PerspectiveStackRenderer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/PerspectiveStackRenderer.eea
index 8397a26cc4..1d81cbfc38 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/PerspectiveStackRenderer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/PerspectiveStackRenderer.eea
@@ -2,7 +2,7 @@ class org/eclipse/e4/ui/workbench/renderers/swt/PerspectiveStackRenderer
 
 createWidget
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Ljava/lang/Object;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)L0java/lang/Object;
 postProcess
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)V
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/SWTPartRenderer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/SWTPartRenderer.eea
index 3a8e97554f..8010a391a8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/SWTPartRenderer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/SWTPartRenderer.eea
@@ -30,7 +30,7 @@ getImage
  (Lorg/eclipse/e4/ui/model/application/ui/MUILabel;)Lorg/eclipse/swt/graphics/Image;
 getImageFromURI
  (Ljava/lang/String;)Lorg/eclipse/swt/graphics/Image;
- (Ljava/lang/String;)Lorg/eclipse/swt/graphics/Image;
+ (Ljava/lang/String;)L0org/eclipse/swt/graphics/Image;
 getParentWidget
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)Lorg/eclipse/swt/widgets/Widget;
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)Lorg/eclipse/swt/widgets/Widget;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/SashLayout.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/SashLayout.eea
index ce80c713e5..a4f5819026 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/SashLayout.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/SashLayout.eea
@@ -11,7 +11,7 @@ computeSize
  (L1org/eclipse/swt/widgets/Composite;IIZ)L1org/eclipse/swt/graphics/Point; # @Inherited(org.eclipse.swt.widgets.Layout)
 getSashRects
  (II)Ljava/util/List<Lorg/eclipse/e4/ui/workbench/renderers/swt/SashLayout$SashRect;>;
- (II)Ljava/util/List<Lorg/eclipse/e4/ui/workbench/renderers/swt/SashLayout$SashRect;>;
+ (II)L1java/util/List<Lorg/eclipse/e4/ui/workbench/renderers/swt/SashLayout$SashRect;>;
 layout
  (Lorg/eclipse/swt/widgets/Composite;Z)V
  (L1org/eclipse/swt/widgets/Composite;Z)V # @Inherited(org.eclipse.swt.widgets.Layout)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/SashRenderer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/SashRenderer.eea
index b91b1bda5e..4c74ba3407 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/SashRenderer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/SashRenderer.eea
@@ -5,13 +5,13 @@ childRendered
  (Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>;Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)V
 createWidget
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Ljava/lang/Object;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)L1java/lang/Object;
 forceLayout
  (Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>;)V
  (Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>;)V
 getUIContainer
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)Ljava/lang/Object;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)Ljava/lang/Object;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)L0java/lang/Object;
 hideChild
  (Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>;Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)V
  (Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>;Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/SeparatorRenderer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/SeparatorRenderer.eea
index 26028372e3..1b9c7f8270 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/SeparatorRenderer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/SeparatorRenderer.eea
@@ -2,4 +2,4 @@ class org/eclipse/e4/ui/workbench/renderers/swt/SeparatorRenderer
 
 createWidget
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Ljava/lang/Object;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)L0java/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/StackRenderer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/StackRenderer.eea
index f4b355989a..52abcd64bd 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/StackRenderer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/StackRenderer.eea
@@ -12,7 +12,7 @@ TAG_VIEW_MENU
 
 getViewMenu
  (Lorg/eclipse/e4/ui/model/application/ui/basic/MPart;)Lorg/eclipse/e4/ui/model/application/ui/menu/MMenu;
- (Lorg/eclipse/e4/ui/model/application/ui/basic/MPart;)Lorg/eclipse/e4/ui/model/application/ui/menu/MMenu;
+ (Lorg/eclipse/e4/ui/model/application/ui/basic/MPart;)L0org/eclipse/e4/ui/model/application/ui/menu/MMenu;
 
 adjustTopRight
  (Lorg/eclipse/swt/custom/CTabFolder;)V
@@ -25,10 +25,10 @@ createTab
  (Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>;Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)V
 createWidget
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Ljava/lang/Object;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)L0java/lang/Object;
 findItemForPart
  (Lorg/eclipse/e4/ui/model/application/ui/basic/MPart;)Lorg/eclipse/swt/custom/CTabItem;
- (Lorg/eclipse/e4/ui/model/application/ui/basic/MPart;)Lorg/eclipse/swt/custom/CTabItem;
+ (Lorg/eclipse/e4/ui/model/application/ui/basic/MPart;)L0org/eclipse/swt/custom/CTabItem;
 hideChild
  (Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>;Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)V
  (Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>;Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarManagerRenderer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarManagerRenderer.eea
index f967a094c6..5ba18958b8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarManagerRenderer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarManagerRenderer.eea
@@ -27,7 +27,7 @@ clearModelToManager
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBar;Lorg/eclipse/jface/action/ToolBarManager;)V
 createWidget
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Ljava/lang/Object;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)L0java/lang/Object;
 getContext
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)Lorg/eclipse/e4/core/contexts/IEclipseContext;
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)Lorg/eclipse/e4/core/contexts/IEclipseContext;
@@ -39,7 +39,7 @@ getContributionRecord
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarElement;)Lorg/eclipse/e4/ui/workbench/renderers/swt/ToolBarContributionRecord;
 getList
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarElement;)Ljava/util/ArrayList<Lorg/eclipse/e4/ui/workbench/renderers/swt/ToolBarContributionRecord;>;
- (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarElement;)Ljava/util/ArrayList<Lorg/eclipse/e4/ui/workbench/renderers/swt/ToolBarContributionRecord;>;
+ (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarElement;)L1java/util/ArrayList<Lorg/eclipse/e4/ui/workbench/renderers/swt/ToolBarContributionRecord;>;
 getManager
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBar;)Lorg/eclipse/jface/action/ToolBarManager;
  (Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBar;)Lorg/eclipse/jface/action/ToolBarManager;
@@ -51,7 +51,7 @@ getToolElement
  (Lorg/eclipse/jface/action/IContributionItem;)Lorg/eclipse/e4/ui/model/application/ui/menu/MToolBarElement;
 getUIContainer
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)Ljava/lang/Object;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)Ljava/lang/Object;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)L0java/lang/Object;
 hideChild
  (Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>;Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)V
  (Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>;Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/ToolControlRenderer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/ToolControlRenderer.eea
index f3441c2113..00210b0185 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/ToolControlRenderer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/ToolControlRenderer.eea
@@ -6,4 +6,4 @@ STATE_ID
 
 createWidget
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Ljava/lang/Object;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)L0java/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/TrimBarLayout.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/TrimBarLayout.eea
index bd56b4b6ef..84254ac3f4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/TrimBarLayout.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/TrimBarLayout.eea
@@ -12,7 +12,7 @@ computeSize
  (L1org/eclipse/swt/widgets/Composite;IIZ)L1org/eclipse/swt/graphics/Point; # @Inherited(org.eclipse.swt.widgets.Layout)
 ctrlFromPoint
  (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/widgets/Control;
- (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/widgets/Control;
+ (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/swt/graphics/Point;)L0org/eclipse/swt/widgets/Control;
 layout
  (Lorg/eclipse/swt/widgets/Composite;Z)V
  (L1org/eclipse/swt/widgets/Composite;Z)V # @Inherited(org.eclipse.swt.widgets.Layout)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/TrimBarRenderer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/TrimBarRenderer.eea
index 5c991f9ec8..2c3b5369c7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/TrimBarRenderer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/TrimBarRenderer.eea
@@ -5,7 +5,7 @@ cleanUp
  (Lorg/eclipse/e4/ui/model/application/ui/basic/MTrimBar;)V
 createWidget
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Ljava/lang/Object;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)L0java/lang/Object;
 hideChild
  (Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>;Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)V
  (Lorg/eclipse/e4/ui/model/application/ui/MElementContainer<Lorg/eclipse/e4/ui/model/application/ui/MUIElement;>;Lorg/eclipse/e4/ui/model/application/ui/MUIElement;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/TrimmedPartLayout.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/TrimmedPartLayout.eea
index e26f25a1c1..0224990b91 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/TrimmedPartLayout.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/TrimmedPartLayout.eea
@@ -24,10 +24,10 @@ computeSize
  (L1org/eclipse/swt/widgets/Composite;IIZ)L1org/eclipse/swt/graphics/Point; # @Inherited(org.eclipse.swt.widgets.Layout)
 getTrimComposite
  (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/widgets/Composite;
- (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/widgets/Composite;
+ (Lorg/eclipse/swt/widgets/Composite;I)L0org/eclipse/swt/widgets/Composite;
 getTrimRect
  (I)Lorg/eclipse/swt/graphics/Rectangle;
- (I)Lorg/eclipse/swt/graphics/Rectangle;
+ (I)L0org/eclipse/swt/graphics/Rectangle;
 layout
  (Lorg/eclipse/swt/widgets/Composite;Z)V
  (L1org/eclipse/swt/widgets/Composite;Z)V # @Inherited(org.eclipse.swt.widgets.Layout)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/WBWRenderer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/WBWRenderer.eea
index 675c870e58..163e1e0242 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/WBWRenderer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/WBWRenderer.eea
@@ -2,7 +2,7 @@ class org/eclipse/e4/ui/workbench/renderers/swt/WBWRenderer
 
 createWidget
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Ljava/lang/Object;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)L0java/lang/Object;
 getImage
  (Lorg/eclipse/e4/ui/model/application/ui/MUILabel;)Lorg/eclipse/swt/graphics/Image;
  (Lorg/eclipse/e4/ui/model/application/ui/MUILabel;)Lorg/eclipse/swt/graphics/Image;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/WorkbenchRendererFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/WorkbenchRendererFactory.eea
index cb2e1d8334..f1aa5b012f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/WorkbenchRendererFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/e4/ui/workbench/renderers/swt/WorkbenchRendererFactory.eea
@@ -6,7 +6,7 @@ SHARED_ELEMENTS_STORE
 
 getRenderer
  (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Lorg/eclipse/e4/ui/internal/workbench/swt/AbstractPartRenderer;
- (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)Lorg/eclipse/e4/ui/internal/workbench/swt/AbstractPartRenderer;
+ (Lorg/eclipse/e4/ui/model/application/ui/MUIElement;Ljava/lang/Object;)L0org/eclipse/e4/ui/internal/workbench/swt/AbstractPartRenderer;
 init
  (Lorg/eclipse/e4/core/contexts/IEclipseContext;)V
  (Lorg/eclipse/e4/core/contexts/IEclipseContext;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/bidi/StructuredTextProcessor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/bidi/StructuredTextProcessor.eea
index 268473eff0..82ca5b6152 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/bidi/StructuredTextProcessor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/bidi/StructuredTextProcessor.eea
@@ -8,7 +8,7 @@ deprocessTyped
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 getDefaultSeparators
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 process
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/core/IProvisioningAgentProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/core/IProvisioningAgentProvider.eea
index 76e531e43a..26b810fb77 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/core/IProvisioningAgentProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/core/IProvisioningAgentProvider.eea
@@ -6,4 +6,4 @@ SERVICE_NAME
 
 createAgent
  (Ljava/net/URI;)Lorg/eclipse/equinox/p2/core/IProvisioningAgent;
- (Ljava/net/URI;)Lorg/eclipse/equinox/p2/core/IProvisioningAgent;
+ (Ljava/net/URI;)L1org/eclipse/equinox/p2/core/IProvisioningAgent;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/core/spi/IAgentServiceFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/core/spi/IAgentServiceFactory.eea
index 7263a81abd..94e73027c7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/core/spi/IAgentServiceFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/core/spi/IAgentServiceFactory.eea
@@ -9,4 +9,4 @@ SERVICE_NAME
 
 createService
  (Lorg/eclipse/equinox/p2/core/IProvisioningAgent;)Ljava/lang/Object;
- (Lorg/eclipse/equinox/p2/core/IProvisioningAgent;)Ljava/lang/Object;
+ (Lorg/eclipse/equinox/p2/core/IProvisioningAgent;)L1java/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/engine/IEngine.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/engine/IEngine.eea
index c60c386d3a..5544cb2ca1 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/engine/IEngine.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/engine/IEngine.eea
@@ -6,7 +6,7 @@ SERVICE_NAME
 
 createPlan
  (Lorg/eclipse/equinox/p2/engine/IProfile;Lorg/eclipse/equinox/p2/engine/ProvisioningContext;)Lorg/eclipse/equinox/p2/engine/IProvisioningPlan;
- (Lorg/eclipse/equinox/p2/engine/IProfile;Lorg/eclipse/equinox/p2/engine/ProvisioningContext;)Lorg/eclipse/equinox/p2/engine/IProvisioningPlan;
+ (Lorg/eclipse/equinox/p2/engine/IProfile;Lorg/eclipse/equinox/p2/engine/ProvisioningContext;)L1org/eclipse/equinox/p2/engine/IProvisioningPlan;
 perform
  (Lorg/eclipse/equinox/p2/engine/IProvisioningPlan;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/core/runtime/IStatus;
  (Lorg/eclipse/equinox/p2/engine/IProvisioningPlan;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/core/runtime/IStatus;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/engine/PhaseSetFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/engine/PhaseSetFactory.eea
index 149c680435..fceaa4553a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/engine/PhaseSetFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/engine/PhaseSetFactory.eea
@@ -27,13 +27,13 @@ PHASE_UNINSTALL
 
 createDefaultPhaseSet
  ()Lorg/eclipse/equinox/p2/engine/IPhaseSet;
- ()Lorg/eclipse/equinox/p2/engine/IPhaseSet;
+ ()L1org/eclipse/equinox/p2/engine/IPhaseSet;
 createDefaultPhaseSetExcluding
  ([Ljava/lang/String;)Lorg/eclipse/equinox/p2/engine/IPhaseSet;
- ([Ljava/lang/String;)Lorg/eclipse/equinox/p2/engine/IPhaseSet;
+ ([Ljava/lang/String;)L1org/eclipse/equinox/p2/engine/IPhaseSet;
 createPhaseSetIncluding
  ([Ljava/lang/String;)Lorg/eclipse/equinox/p2/engine/IPhaseSet;
- ([Ljava/lang/String;)Lorg/eclipse/equinox/p2/engine/IPhaseSet;
+ ([Ljava/lang/String;)L1org/eclipse/equinox/p2/engine/IPhaseSet;
 createSizingPhaseSet
  ()Lorg/eclipse/equinox/p2/engine/ISizingPhaseSet;
- ()Lorg/eclipse/equinox/p2/engine/ISizingPhaseSet;
+ ()L1org/eclipse/equinox/p2/engine/ISizingPhaseSet;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/engine/ProvisioningContext.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/engine/ProvisioningContext.eea
index 9cbd867559..6d6e24eaae 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/engine/ProvisioningContext.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/engine/ProvisioningContext.eea
@@ -21,16 +21,16 @@ getArtifactKeys
  (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/equinox/p2/query/IQueryable<Lorg/eclipse/equinox/p2/metadata/IArtifactKey;>;
 getArtifactRepositories
  (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/equinox/p2/query/IQueryable<Lorg/eclipse/equinox/p2/repository/artifact/IArtifactRepository;>;
- (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/equinox/p2/query/IQueryable<Lorg/eclipse/equinox/p2/repository/artifact/IArtifactRepository;>;
+ (Lorg/eclipse/core/runtime/IProgressMonitor;)L1org/eclipse/equinox/p2/query/IQueryable<Lorg/eclipse/equinox/p2/repository/artifact/IArtifactRepository;>;
 getArtifactSources
  (Ljava/util/Collection<+Lorg/eclipse/equinox/p2/metadata/IArtifactKey;>;Lorg/eclipse/core/runtime/IProgressMonitor;)Ljava/util/Map<Ljava/net/URI;Ljava/util/Set<Lorg/eclipse/equinox/p2/metadata/IArtifactKey;>;>;
- (Ljava/util/Collection<+Lorg/eclipse/equinox/p2/metadata/IArtifactKey;>;Lorg/eclipse/core/runtime/IProgressMonitor;)Ljava/util/Map<Ljava/net/URI;Ljava/util/Set<Lorg/eclipse/equinox/p2/metadata/IArtifactKey;>;>;
+ (Ljava/util/Collection<+Lorg/eclipse/equinox/p2/metadata/IArtifactKey;>;Lorg/eclipse/core/runtime/IProgressMonitor;)L1java/util/Map<Ljava/net/URI;Ljava/util/Set<Lorg/eclipse/equinox/p2/metadata/IArtifactKey;>;>;
 getExtraInstallableUnits
  ()Ljava/util/List<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
  ()Ljava/util/List<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
 getInstallableUnitSources
  (Ljava/util/Collection<+Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;Lorg/eclipse/core/runtime/IProgressMonitor;)Ljava/util/Map<Ljava/net/URI;Ljava/util/Set<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;>;
- (Ljava/util/Collection<+Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;Lorg/eclipse/core/runtime/IProgressMonitor;)Ljava/util/Map<Ljava/net/URI;Ljava/util/Set<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;>;
+ (Ljava/util/Collection<+Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;Lorg/eclipse/core/runtime/IProgressMonitor;)L1java/util/Map<Ljava/net/URI;Ljava/util/Set<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;>;
 getMetadata
  (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/equinox/p2/query/IQueryable<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
  (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/equinox/p2/query/IQueryable<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/MetadataFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/MetadataFactory.eea
index ceab352a8f..71bf33c182 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/MetadataFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/MetadataFactory.eea
@@ -2,76 +2,76 @@ class org/eclipse/equinox/p2/metadata/MetadataFactory
 
 createCopyright
  (Ljava/net/URI;Ljava/lang/String;)Lorg/eclipse/equinox/p2/metadata/ICopyright;
- (Ljava/net/URI;Ljava/lang/String;)Lorg/eclipse/equinox/p2/metadata/ICopyright;
+ (Ljava/net/URI;Ljava/lang/String;)L1org/eclipse/equinox/p2/metadata/ICopyright;
 createInstallableUnit
  (Lorg/eclipse/equinox/p2/metadata/MetadataFactory$InstallableUnitDescription;)Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;
- (Lorg/eclipse/equinox/p2/metadata/MetadataFactory$InstallableUnitDescription;)Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;
+ (Lorg/eclipse/equinox/p2/metadata/MetadataFactory$InstallableUnitDescription;)L1org/eclipse/equinox/p2/metadata/IInstallableUnit;
 createInstallableUnitFragment
  (Lorg/eclipse/equinox/p2/metadata/MetadataFactory$InstallableUnitFragmentDescription;)Lorg/eclipse/equinox/p2/metadata/IInstallableUnitFragment;
- (Lorg/eclipse/equinox/p2/metadata/MetadataFactory$InstallableUnitFragmentDescription;)Lorg/eclipse/equinox/p2/metadata/IInstallableUnitFragment;
+ (Lorg/eclipse/equinox/p2/metadata/MetadataFactory$InstallableUnitFragmentDescription;)L1org/eclipse/equinox/p2/metadata/IInstallableUnitFragment;
 createInstallableUnitPatch
  (Lorg/eclipse/equinox/p2/metadata/MetadataFactory$InstallableUnitPatchDescription;)Lorg/eclipse/equinox/p2/metadata/IInstallableUnitPatch;
- (Lorg/eclipse/equinox/p2/metadata/MetadataFactory$InstallableUnitPatchDescription;)Lorg/eclipse/equinox/p2/metadata/IInstallableUnitPatch;
+ (Lorg/eclipse/equinox/p2/metadata/MetadataFactory$InstallableUnitPatchDescription;)L1org/eclipse/equinox/p2/metadata/IInstallableUnitPatch;
 createLicense
  (Ljava/net/URI;Ljava/lang/String;)Lorg/eclipse/equinox/p2/metadata/ILicense;
- (Ljava/net/URI;Ljava/lang/String;)Lorg/eclipse/equinox/p2/metadata/ILicense;
+ (Ljava/net/URI;Ljava/lang/String;)L1org/eclipse/equinox/p2/metadata/ILicense;
 createProvidedCapability
  (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/Version;)Lorg/eclipse/equinox/p2/metadata/IProvidedCapability;
- (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/Version;)Lorg/eclipse/equinox/p2/metadata/IProvidedCapability;
+ (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/Version;)L1org/eclipse/equinox/p2/metadata/IProvidedCapability;
 createProvidedCapability
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/eclipse/equinox/p2/metadata/IProvidedCapability;
- (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/eclipse/equinox/p2/metadata/IProvidedCapability;
+ (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1org/eclipse/equinox/p2/metadata/IProvidedCapability;
 createRequirement
  (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/VersionRange;Ljava/lang/String;ZZZ)Lorg/eclipse/equinox/p2/metadata/IRequirement;
- (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/VersionRange;Ljava/lang/String;ZZZ)Lorg/eclipse/equinox/p2/metadata/IRequirement;
+ (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/VersionRange;Ljava/lang/String;ZZZ)L1org/eclipse/equinox/p2/metadata/IRequirement;
 createRequirement
  (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/VersionRange;Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;IIZ)Lorg/eclipse/equinox/p2/metadata/IRequirement;
- (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/VersionRange;Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;IIZ)Lorg/eclipse/equinox/p2/metadata/IRequirement;
+ (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/VersionRange;Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;IIZ)L1org/eclipse/equinox/p2/metadata/IRequirement;
 createRequirement
  (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/VersionRange;Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;IIZLjava/lang/String;)Lorg/eclipse/equinox/p2/metadata/IRequirement;
- (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/VersionRange;Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;IIZLjava/lang/String;)Lorg/eclipse/equinox/p2/metadata/IRequirement;
+ (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/VersionRange;Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;IIZLjava/lang/String;)L1org/eclipse/equinox/p2/metadata/IRequirement;
 createRequirement
  (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/VersionRange;Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;ZZ)Lorg/eclipse/equinox/p2/metadata/IRequirement;
- (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/VersionRange;Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;ZZ)Lorg/eclipse/equinox/p2/metadata/IRequirement;
+ (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/VersionRange;Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;ZZ)L1org/eclipse/equinox/p2/metadata/IRequirement;
 createRequirement
  (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;IIZ)Lorg/eclipse/equinox/p2/metadata/IRequirement;
- (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;IIZ)Lorg/eclipse/equinox/p2/metadata/IRequirement;
+ (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;IIZ)L1org/eclipse/equinox/p2/metadata/IRequirement;
 createRequirement
  (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;IIZLjava/lang/String;)Lorg/eclipse/equinox/p2/metadata/IRequirement;
- (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;IIZLjava/lang/String;)Lorg/eclipse/equinox/p2/metadata/IRequirement;
+ (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;IIZLjava/lang/String;)L1org/eclipse/equinox/p2/metadata/IRequirement;
 createRequirement
  (Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/expression/IFilterExpression;Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;IIZLjava/lang/String;)Lorg/eclipse/equinox/p2/metadata/IRequirement;
- (Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/expression/IFilterExpression;Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;IIZLjava/lang/String;)Lorg/eclipse/equinox/p2/metadata/IRequirement;
+ (Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/expression/IFilterExpression;Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;IIZLjava/lang/String;)L1org/eclipse/equinox/p2/metadata/IRequirement;
 createRequirement
  (Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;IIZ)Lorg/eclipse/equinox/p2/metadata/IRequirement;
- (Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;IIZ)Lorg/eclipse/equinox/p2/metadata/IRequirement;
+ (Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;IIZ)L1org/eclipse/equinox/p2/metadata/IRequirement;
 createRequirement
  (Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;IIZLjava/lang/String;)Lorg/eclipse/equinox/p2/metadata/IRequirement;
- (Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;IIZLjava/lang/String;)Lorg/eclipse/equinox/p2/metadata/IRequirement;
+ (Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;IIZLjava/lang/String;)L1org/eclipse/equinox/p2/metadata/IRequirement;
 createRequirementChange
  (Lorg/eclipse/equinox/p2/metadata/IRequirement;Lorg/eclipse/equinox/p2/metadata/IRequirement;)Lorg/eclipse/equinox/p2/metadata/IRequirementChange;
- (Lorg/eclipse/equinox/p2/metadata/IRequirement;Lorg/eclipse/equinox/p2/metadata/IRequirement;)Lorg/eclipse/equinox/p2/metadata/IRequirementChange;
+ (Lorg/eclipse/equinox/p2/metadata/IRequirement;Lorg/eclipse/equinox/p2/metadata/IRequirement;)L1org/eclipse/equinox/p2/metadata/IRequirementChange;
 createResolvedInstallableUnit
  (Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;[Lorg/eclipse/equinox/p2/metadata/IInstallableUnitFragment;)Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;
- (Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;[Lorg/eclipse/equinox/p2/metadata/IInstallableUnitFragment;)Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;
+ (Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;[Lorg/eclipse/equinox/p2/metadata/IInstallableUnitFragment;)L1org/eclipse/equinox/p2/metadata/IInstallableUnit;
 createTouchpointData
  (Ljava/util/Map<Ljava/lang/String;+Ljava/lang/Object;>;)Lorg/eclipse/equinox/p2/metadata/ITouchpointData;
- (Ljava/util/Map<Ljava/lang/String;+Ljava/lang/Object;>;)Lorg/eclipse/equinox/p2/metadata/ITouchpointData;
+ (Ljava/util/Map<Ljava/lang/String;+Ljava/lang/Object;>;)L1org/eclipse/equinox/p2/metadata/ITouchpointData;
 createTouchpointInstruction
  (Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/equinox/p2/metadata/ITouchpointInstruction;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/equinox/p2/metadata/ITouchpointInstruction;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/eclipse/equinox/p2/metadata/ITouchpointInstruction;
 createTouchpointType
  (Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/Version;)Lorg/eclipse/equinox/p2/metadata/ITouchpointType;
- (Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/Version;)Lorg/eclipse/equinox/p2/metadata/ITouchpointType;
+ (Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/Version;)L1org/eclipse/equinox/p2/metadata/ITouchpointType;
 createUpdateDescriptor
  (Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/VersionRange;ILjava/lang/String;)Lorg/eclipse/equinox/p2/metadata/IUpdateDescriptor;
- (Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/VersionRange;ILjava/lang/String;)Lorg/eclipse/equinox/p2/metadata/IUpdateDescriptor;
+ (Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/VersionRange;ILjava/lang/String;)L1org/eclipse/equinox/p2/metadata/IUpdateDescriptor;
 createUpdateDescriptor
  (Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/VersionRange;ILjava/lang/String;Ljava/net/URI;)Lorg/eclipse/equinox/p2/metadata/IUpdateDescriptor;
- (Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/VersionRange;ILjava/lang/String;Ljava/net/URI;)Lorg/eclipse/equinox/p2/metadata/IUpdateDescriptor;
+ (Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/VersionRange;ILjava/lang/String;Ljava/net/URI;)L1org/eclipse/equinox/p2/metadata/IUpdateDescriptor;
 createUpdateDescriptor
  (Ljava/util/Collection<Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;>;ILjava/lang/String;Ljava/net/URI;)Lorg/eclipse/equinox/p2/metadata/IUpdateDescriptor;
- (Ljava/util/Collection<Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;>;ILjava/lang/String;Ljava/net/URI;)Lorg/eclipse/equinox/p2/metadata/IUpdateDescriptor;
+ (Ljava/util/Collection<Lorg/eclipse/equinox/p2/metadata/expression/IMatchExpression<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;>;ILjava/lang/String;Ljava/net/URI;)L1org/eclipse/equinox/p2/metadata/IUpdateDescriptor;
 mergeTouchpointData
  (Lorg/eclipse/equinox/p2/metadata/ITouchpointData;Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/ITouchpointInstruction;>;)Lorg/eclipse/equinox/p2/metadata/ITouchpointData;
  (Lorg/eclipse/equinox/p2/metadata/ITouchpointData;Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/ITouchpointInstruction;>;)Lorg/eclipse/equinox/p2/metadata/ITouchpointData;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/Version.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/Version.eea
index 962fde4537..f369a17b33 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/Version.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/Version.eea
@@ -19,13 +19,13 @@ compile
  (Ljava/lang/String;)Lorg/eclipse/equinox/p2/metadata/IVersionFormat;
 create
  (Ljava/lang/String;)Lorg/eclipse/equinox/p2/metadata/Version;
- (Ljava/lang/String;)Lorg/eclipse/equinox/p2/metadata/Version;
+ (Ljava/lang/String;)L1org/eclipse/equinox/p2/metadata/Version;
 createOSGi
  (III)Lorg/eclipse/equinox/p2/metadata/Version;
- (III)Lorg/eclipse/equinox/p2/metadata/Version;
+ (III)L1org/eclipse/equinox/p2/metadata/Version;
 createOSGi
  (IIILjava/lang/String;)Lorg/eclipse/equinox/p2/metadata/Version;
- (IIILjava/lang/String;)Lorg/eclipse/equinox/p2/metadata/Version;
+ (IIILjava/lang/String;)L1org/eclipse/equinox/p2/metadata/Version;
 parseVersion
  (Ljava/lang/String;)Lorg/eclipse/equinox/p2/metadata/Version;
  (Ljava/lang/String;)Lorg/eclipse/equinox/p2/metadata/Version;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/VersionRange.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/VersionRange.eea
index 449de4be22..6b78ffad0f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/VersionRange.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/VersionRange.eea
@@ -6,7 +6,7 @@ emptyRange
 
 create
  (Ljava/lang/String;)Lorg/eclipse/equinox/p2/metadata/VersionRange;
- (Ljava/lang/String;)Lorg/eclipse/equinox/p2/metadata/VersionRange;
+ (Ljava/lang/String;)L1org/eclipse/equinox/p2/metadata/VersionRange;
 
 <init>
  (Ljava/lang/String;)V
@@ -28,7 +28,7 @@ getMinimum
  ()Lorg/eclipse/equinox/p2/metadata/Version;
 intersect
  (Lorg/eclipse/equinox/p2/metadata/VersionRange;)Lorg/eclipse/equinox/p2/metadata/VersionRange;
- (Lorg/eclipse/equinox/p2/metadata/VersionRange;)Lorg/eclipse/equinox/p2/metadata/VersionRange;
+ (Lorg/eclipse/equinox/p2/metadata/VersionRange;)L0org/eclipse/equinox/p2/metadata/VersionRange;
 isIncluded
  (Lorg/eclipse/equinox/p2/metadata/Version;)Z
  (Lorg/eclipse/equinox/p2/metadata/Version;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/expression/ExpressionUtil.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/expression/ExpressionUtil.eea
index c76afe76dd..b5194f1cbf 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/expression/ExpressionUtil.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/expression/ExpressionUtil.eea
@@ -42,4 +42,4 @@ parseQuery
  (Ljava/lang/String;)Lorg/eclipse/equinox/p2/metadata/expression/IExpression;
 trimmedOrNull
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/expression/IContextExpression.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/expression/IContextExpression.eea
index af057bdb1f..1a681005ac 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/expression/IContextExpression.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/expression/IContextExpression.eea
@@ -4,10 +4,10 @@ class org/eclipse/equinox/p2/metadata/expression/IContextExpression
 
 createContext
  (Ljava/lang/Class<+TT;>;Ljava/util/Iterator<TT;>;)Lorg/eclipse/equinox/p2/metadata/expression/IEvaluationContext;
- (Ljava/lang/Class<+TT;>;Ljava/util/Iterator<TT;>;)Lorg/eclipse/equinox/p2/metadata/expression/IEvaluationContext;
+ (Ljava/lang/Class<+TT;>;Ljava/util/Iterator<TT;>;)L1org/eclipse/equinox/p2/metadata/expression/IEvaluationContext;
 createContext
  (Ljava/lang/Class<+TT;>;Lorg/eclipse/equinox/p2/metadata/index/IIndexProvider<TT;>;)Lorg/eclipse/equinox/p2/metadata/expression/IEvaluationContext;
- (Ljava/lang/Class<+TT;>;Lorg/eclipse/equinox/p2/metadata/index/IIndexProvider<TT;>;)Lorg/eclipse/equinox/p2/metadata/expression/IEvaluationContext;
+ (Ljava/lang/Class<+TT;>;Lorg/eclipse/equinox/p2/metadata/index/IIndexProvider<TT;>;)L1org/eclipse/equinox/p2/metadata/expression/IEvaluationContext;
 getParameters
  ()[Ljava/lang/Object;
  ()[Ljava/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/expression/IExpressionFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/expression/IExpressionFactory.eea
index 785341a271..7e07370ae5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/expression/IExpressionFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/expression/IExpressionFactory.eea
@@ -48,10 +48,10 @@ contextExpression
  <T:Ljava/lang/Object;>(Lorg/eclipse/equinox/p2/metadata/expression/IExpression;[Ljava/lang/Object;)Lorg/eclipse/equinox/p2/metadata/expression/IContextExpression<TT;>;
 createContext
  ([Ljava/lang/Object;)Lorg/eclipse/equinox/p2/metadata/expression/IEvaluationContext;
- ([Ljava/lang/Object;)Lorg/eclipse/equinox/p2/metadata/expression/IEvaluationContext;
+ ([Ljava/lang/Object;)L1org/eclipse/equinox/p2/metadata/expression/IEvaluationContext;
 createContext
  ([Lorg/eclipse/equinox/p2/metadata/expression/IExpression;[Ljava/lang/Object;)Lorg/eclipse/equinox/p2/metadata/expression/IEvaluationContext;
- ([Lorg/eclipse/equinox/p2/metadata/expression/IExpression;[Ljava/lang/Object;)Lorg/eclipse/equinox/p2/metadata/expression/IEvaluationContext;
+ ([Lorg/eclipse/equinox/p2/metadata/expression/IExpression;[Ljava/lang/Object;)L1org/eclipse/equinox/p2/metadata/expression/IEvaluationContext;
 equals
  (Lorg/eclipse/equinox/p2/metadata/expression/IExpression;Lorg/eclipse/equinox/p2/metadata/expression/IExpression;)Lorg/eclipse/equinox/p2/metadata/expression/IExpression;
  (Lorg/eclipse/equinox/p2/metadata/expression/IExpression;Lorg/eclipse/equinox/p2/metadata/expression/IExpression;)Lorg/eclipse/equinox/p2/metadata/expression/IExpression;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/expression/IMatchExpression.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/expression/IMatchExpression.eea
index effbbf0ff1..3b574149ef 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/expression/IMatchExpression.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/expression/IMatchExpression.eea
@@ -4,7 +4,7 @@ class org/eclipse/equinox/p2/metadata/expression/IMatchExpression
 
 createContext
  ()Lorg/eclipse/equinox/p2/metadata/expression/IEvaluationContext;
- ()Lorg/eclipse/equinox/p2/metadata/expression/IEvaluationContext;
+ ()L1org/eclipse/equinox/p2/metadata/expression/IEvaluationContext;
 getParameters
  ()[Ljava/lang/Object;
  ()[Ljava/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/expression/SimplePattern.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/expression/SimplePattern.eea
index 8ac483cfaa..3d564a54d5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/expression/SimplePattern.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/metadata/expression/SimplePattern.eea
@@ -6,7 +6,7 @@ super java/lang/Comparable
 
 compile
  (Ljava/lang/String;)Lorg/eclipse/equinox/p2/metadata/expression/SimplePattern;
- (Ljava/lang/String;)Lorg/eclipse/equinox/p2/metadata/expression/SimplePattern;
+ (Ljava/lang/String;)L1org/eclipse/equinox/p2/metadata/expression/SimplePattern;
 
 compareTo
  (Lorg/eclipse/equinox/p2/metadata/expression/SimplePattern;)I
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/CollectionResult.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/CollectionResult.eea
index ff45499f12..4d78050578 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/CollectionResult.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/CollectionResult.eea
@@ -23,7 +23,7 @@ toArray
  (Ljava/lang/Class<TT;>;)[TT;
 toSet
  ()Ljava/util/Set<TT;>;
- ()Ljava/util/Set<TT;>;
+ ()L1java/util/Set<TT;>;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/Collector.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/Collector.eea
index 1c8fc1cb9b..ac27859ffe 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/Collector.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/Collector.eea
@@ -37,7 +37,7 @@ toArray
  (Ljava/lang/Class<TT;>;)[TT;
 toSet
  ()Ljava/util/Set<TT;>;
- ()Ljava/util/Set<TT;>;
+ ()L1java/util/Set<TT;>;
 toUnmodifiableSet
  ()Ljava/util/Set<TT;>;
  ()Ljava/util/Set<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/CompoundQueryable.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/CompoundQueryable.eea
index 79e57ff158..1a48370700 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/CompoundQueryable.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/CompoundQueryable.eea
@@ -20,7 +20,7 @@ everything
  ()Ljava/util/Iterator<TT;>;
 getIndex
  (Ljava/lang/String;)Lorg/eclipse/equinox/p2/metadata/index/IIndex<TT;>;
- (Ljava/lang/String;)Lorg/eclipse/equinox/p2/metadata/index/IIndex<TT;>;
+ (Ljava/lang/String;)L0org/eclipse/equinox/p2/metadata/index/IIndex<TT;>;
 getManagedProperty
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)L0java/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/ExpressionMatchQuery.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/ExpressionMatchQuery.eea
index 3d6565d2ea..ad78637036 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/ExpressionMatchQuery.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/ExpressionMatchQuery.eea
@@ -29,7 +29,7 @@ isMatch
  (TT;)Z
 perform
  (Ljava/util/Iterator<TT;>;)Lorg/eclipse/equinox/p2/query/IQueryResult<TT;>;
- (Ljava/util/Iterator<TT;>;)Lorg/eclipse/equinox/p2/query/IQueryResult<TT;>;
+ (Ljava/util/Iterator<TT;>;)L1org/eclipse/equinox/p2/query/IQueryResult<TT;>;
 perform
  (Lorg/eclipse/equinox/p2/metadata/index/IIndexProvider<TT;>;)Lorg/eclipse/equinox/p2/query/IQueryResult<TT;>;
  (Lorg/eclipse/equinox/p2/metadata/index/IIndexProvider<TT;>;)Lorg/eclipse/equinox/p2/query/IQueryResult<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/ExpressionQuery.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/ExpressionQuery.eea
index 0772c20d2c..f507f8a16b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/ExpressionQuery.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/ExpressionQuery.eea
@@ -8,7 +8,7 @@ super org/eclipse/equinox/p2/metadata/index/IQueryWithIndex
 
 createExpression
  <T:Ljava/lang/Object;>(Lorg/eclipse/equinox/p2/query/IQuery<TT;>;)Lorg/eclipse/equinox/p2/metadata/expression/IContextExpression<TT;>;
- <T:Ljava/lang/Object;>(Lorg/eclipse/equinox/p2/query/IQuery<TT;>;)Lorg/eclipse/equinox/p2/metadata/expression/IContextExpression<TT;>;
+ <T:Ljava/lang/Object;>(Lorg/eclipse/equinox/p2/query/IQuery<TT;>;)L1org/eclipse/equinox/p2/metadata/expression/IContextExpression<TT;>;
 getElementClass
  <T:Ljava/lang/Object;>(Lorg/eclipse/equinox/p2/query/IQuery<TT;>;)Ljava/lang/Class<+TT;>;
  <T:Ljava/lang/Object;>(Lorg/eclipse/equinox/p2/query/IQuery<TT;>;)Ljava/lang/Class<+TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/MatchQuery.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/MatchQuery.eea
index 17621c5732..de81f8af93 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/MatchQuery.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/MatchQuery.eea
@@ -8,10 +8,10 @@ super org/eclipse/equinox/p2/query/IMatchQuery
 
 getExpression
  ()Lorg/eclipse/equinox/p2/metadata/expression/IExpression;
- ()Lorg/eclipse/equinox/p2/metadata/expression/IExpression;
+ ()L0org/eclipse/equinox/p2/metadata/expression/IExpression;
 isMatch
  (TT;)Z
  (TT;)Z
 perform
  (Ljava/util/Iterator<TT;>;)Lorg/eclipse/equinox/p2/query/IQueryResult<TT;>;
- (Ljava/util/Iterator<TT;>;)Lorg/eclipse/equinox/p2/query/IQueryResult<TT;>;
+ (Ljava/util/Iterator<TT;>;)L1org/eclipse/equinox/p2/query/IQueryResult<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/QueryUtil.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/QueryUtil.eea
index 33fe42ca2d..c067f0f484 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/QueryUtil.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/query/QueryUtil.eea
@@ -21,88 +21,88 @@ PROP_TYPE_PATCH
 
 compoundQueryable
  <T:Ljava/lang/Object;>(Ljava/util/Collection<+Lorg/eclipse/equinox/p2/query/IQueryable<TT;>;>;)Lorg/eclipse/equinox/p2/query/IQueryable<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/Collection<+Lorg/eclipse/equinox/p2/query/IQueryable<TT;>;>;)Lorg/eclipse/equinox/p2/query/IQueryable<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/Collection<+Lorg/eclipse/equinox/p2/query/IQueryable<TT;>;>;)L1org/eclipse/equinox/p2/query/IQueryable<TT;>;
 compoundQueryable
  <T:Ljava/lang/Object;>(Lorg/eclipse/equinox/p2/query/IQueryable<TT;>;Lorg/eclipse/equinox/p2/query/IQueryable<TT;>;)Lorg/eclipse/equinox/p2/query/IQueryable<TT;>;
- <T:Ljava/lang/Object;>(Lorg/eclipse/equinox/p2/query/IQueryable<TT;>;Lorg/eclipse/equinox/p2/query/IQueryable<TT;>;)Lorg/eclipse/equinox/p2/query/IQueryable<TT;>;
+ <T:Ljava/lang/Object;>(Lorg/eclipse/equinox/p2/query/IQueryable<TT;>;Lorg/eclipse/equinox/p2/query/IQueryable<TT;>;)L1org/eclipse/equinox/p2/query/IQueryable<TT;>;
 createCompoundQuery
  <T:Ljava/lang/Object;>(Ljava/util/Collection<+Lorg/eclipse/equinox/p2/query/IQuery<+TT;>;>;Z)Lorg/eclipse/equinox/p2/query/IQuery<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/Collection<+Lorg/eclipse/equinox/p2/query/IQuery<+TT;>;>;Z)Lorg/eclipse/equinox/p2/query/IQuery<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/Collection<+Lorg/eclipse/equinox/p2/query/IQuery<+TT;>;>;Z)L1org/eclipse/equinox/p2/query/IQuery<TT;>;
 createCompoundQuery
  <T:Ljava/lang/Object;>(Lorg/eclipse/equinox/p2/query/IQuery<+TT;>;Lorg/eclipse/equinox/p2/query/IQuery<TT;>;Z)Lorg/eclipse/equinox/p2/query/IQuery<TT;>;
- <T:Ljava/lang/Object;>(Lorg/eclipse/equinox/p2/query/IQuery<+TT;>;Lorg/eclipse/equinox/p2/query/IQuery<TT;>;Z)Lorg/eclipse/equinox/p2/query/IQuery<TT;>;
+ <T:Ljava/lang/Object;>(Lorg/eclipse/equinox/p2/query/IQuery<+TT;>;Lorg/eclipse/equinox/p2/query/IQuery<TT;>;Z)L1org/eclipse/equinox/p2/query/IQuery<TT;>;
 createIUAnyQuery
  ()Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
- ()Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
+ ()L1org/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
 createIUCategoryMemberQuery
  (Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;)Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
- (Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;)Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
+ (Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;)L1org/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
 createIUCategoryQuery
  ()Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
- ()Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
+ ()L1org/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
 createIUGroupQuery
  ()Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
- ()Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
+ ()L1org/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
 createIUPatchQuery
  ()Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
- ()Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
+ ()L1org/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
 createIUProductQuery
  ()Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
- ()Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
+ ()L1org/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
 createIUPropertyQuery
  (Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
 createIUQuery
  (Ljava/lang/String;)Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
- (Ljava/lang/String;)Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
+ (Ljava/lang/String;)L1org/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
 createIUQuery
  (Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/Version;)Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
- (Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/Version;)Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
+ (Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/Version;)L1org/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
 createIUQuery
  (Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/VersionRange;)Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
- (Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/VersionRange;)Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
+ (Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/VersionRange;)L1org/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
 createIUQuery
  (Lorg/eclipse/equinox/p2/metadata/IVersionedId;)Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
- (Lorg/eclipse/equinox/p2/metadata/IVersionedId;)Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
+ (Lorg/eclipse/equinox/p2/metadata/IVersionedId;)L1org/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
 createLatestIUQuery
  ()Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
- ()Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
+ ()L1org/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
 createLatestQuery
  <T::Lorg/eclipse/equinox/p2/metadata/IVersionedId;>(Lorg/eclipse/equinox/p2/query/IQuery<TT;>;)Lorg/eclipse/equinox/p2/query/IQuery<TT;>;
- <T::Lorg/eclipse/equinox/p2/metadata/IVersionedId;>(Lorg/eclipse/equinox/p2/query/IQuery<TT;>;)Lorg/eclipse/equinox/p2/query/IQuery<TT;>;
+ <T::Lorg/eclipse/equinox/p2/metadata/IVersionedId;>(Lorg/eclipse/equinox/p2/query/IQuery<TT;>;)L1org/eclipse/equinox/p2/query/IQuery<TT;>;
 createLimitQuery
  <T:Ljava/lang/Object;>(Lorg/eclipse/equinox/p2/query/IQuery<TT;>;I)Lorg/eclipse/equinox/p2/query/IQuery<TT;>;
- <T:Ljava/lang/Object;>(Lorg/eclipse/equinox/p2/query/IQuery<TT;>;I)Lorg/eclipse/equinox/p2/query/IQuery<TT;>;
+ <T:Ljava/lang/Object;>(Lorg/eclipse/equinox/p2/query/IQuery<TT;>;I)L1org/eclipse/equinox/p2/query/IQuery<TT;>;
 createMatchQuery
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
 createMatchQuery
  (Lorg/eclipse/equinox/p2/metadata/expression/IExpression;[Ljava/lang/Object;)Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
- (Lorg/eclipse/equinox/p2/metadata/expression/IExpression;[Ljava/lang/Object;)Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
+ (Lorg/eclipse/equinox/p2/metadata/expression/IExpression;[Ljava/lang/Object;)L1org/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
 createMatchQuery
  <T:Ljava/lang/Object;>(Ljava/lang/Class<+TT;>;Ljava/lang/String;[Ljava/lang/Object;)Lorg/eclipse/equinox/p2/query/IQuery<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<+TT;>;Ljava/lang/String;[Ljava/lang/Object;)Lorg/eclipse/equinox/p2/query/IQuery<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<+TT;>;Ljava/lang/String;[Ljava/lang/Object;)L1org/eclipse/equinox/p2/query/IQuery<TT;>;
 createMatchQuery
  <T:Ljava/lang/Object;>(Ljava/lang/Class<+TT;>;Lorg/eclipse/equinox/p2/metadata/expression/IExpression;[Ljava/lang/Object;)Lorg/eclipse/equinox/p2/query/IQuery<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<+TT;>;Lorg/eclipse/equinox/p2/metadata/expression/IExpression;[Ljava/lang/Object;)Lorg/eclipse/equinox/p2/query/IQuery<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<+TT;>;Lorg/eclipse/equinox/p2/metadata/expression/IExpression;[Ljava/lang/Object;)L1org/eclipse/equinox/p2/query/IQuery<TT;>;
 createPipeQuery
  <T:Ljava/lang/Object;>(Ljava/util/Collection<+Lorg/eclipse/equinox/p2/query/IQuery<+TT;>;>;)Lorg/eclipse/equinox/p2/query/IQuery<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/Collection<+Lorg/eclipse/equinox/p2/query/IQuery<+TT;>;>;)Lorg/eclipse/equinox/p2/query/IQuery<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/Collection<+Lorg/eclipse/equinox/p2/query/IQuery<+TT;>;>;)L1org/eclipse/equinox/p2/query/IQuery<TT;>;
 createPipeQuery
  <T:Ljava/lang/Object;>(Lorg/eclipse/equinox/p2/query/IQuery<+TT;>;Lorg/eclipse/equinox/p2/query/IQuery<+TT;>;)Lorg/eclipse/equinox/p2/query/IQuery<TT;>;
- <T:Ljava/lang/Object;>(Lorg/eclipse/equinox/p2/query/IQuery<+TT;>;Lorg/eclipse/equinox/p2/query/IQuery<+TT;>;)Lorg/eclipse/equinox/p2/query/IQuery<TT;>;
+ <T:Ljava/lang/Object;>(Lorg/eclipse/equinox/p2/query/IQuery<+TT;>;Lorg/eclipse/equinox/p2/query/IQuery<+TT;>;)L1org/eclipse/equinox/p2/query/IQuery<TT;>;
 createQuery
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
 createQuery
  (Lorg/eclipse/equinox/p2/metadata/expression/IExpression;[Ljava/lang/Object;)Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
- (Lorg/eclipse/equinox/p2/metadata/expression/IExpression;[Ljava/lang/Object;)Lorg/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
+ (Lorg/eclipse/equinox/p2/metadata/expression/IExpression;[Ljava/lang/Object;)L1org/eclipse/equinox/p2/query/IQuery<Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;>;
 createQuery
  <T:Ljava/lang/Object;>(Ljava/lang/Class<+TT;>;Ljava/lang/String;[Ljava/lang/Object;)Lorg/eclipse/equinox/p2/query/IQuery<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<+TT;>;Ljava/lang/String;[Ljava/lang/Object;)Lorg/eclipse/equinox/p2/query/IQuery<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<+TT;>;Ljava/lang/String;[Ljava/lang/Object;)L1org/eclipse/equinox/p2/query/IQuery<TT;>;
 createQuery
  <T:Ljava/lang/Object;>(Ljava/lang/Class<+TT;>;Lorg/eclipse/equinox/p2/metadata/expression/IExpression;[Ljava/lang/Object;)Lorg/eclipse/equinox/p2/query/IQuery<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<+TT;>;Lorg/eclipse/equinox/p2/metadata/expression/IExpression;[Ljava/lang/Object;)Lorg/eclipse/equinox/p2/query/IQuery<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<+TT;>;Lorg/eclipse/equinox/p2/metadata/expression/IExpression;[Ljava/lang/Object;)L1org/eclipse/equinox/p2/query/IQuery<TT;>;
 isCategory
  (Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;)Z
  (Lorg/eclipse/equinox/p2/metadata/IInstallableUnit;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/IRepositoryManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/IRepositoryManager.eea
index 7c2ef2103c..72d58810f6 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/IRepositoryManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/IRepositoryManager.eea
@@ -14,7 +14,7 @@ contains
  (Ljava/net/URI;)Z
 createRepository
  (Ljava/net/URI;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)Lorg/eclipse/equinox/p2/repository/IRepository<TT;>;
- (Ljava/net/URI;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)Lorg/eclipse/equinox/p2/repository/IRepository<TT;>;
+ (Ljava/net/URI;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)L1org/eclipse/equinox/p2/repository/IRepository<TT;>;
 getAgent
  ()Lorg/eclipse/equinox/p2/core/IProvisioningAgent;
  ()Lorg/eclipse/equinox/p2/core/IProvisioningAgent;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/artifact/IArtifactRepository.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/artifact/IArtifactRepository.eea
index 71035d54b2..bf1cb7d90a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/artifact/IArtifactRepository.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/artifact/IArtifactRepository.eea
@@ -28,10 +28,10 @@ contains
  (Lorg/eclipse/equinox/p2/repository/artifact/IArtifactDescriptor;)Z
 createArtifactDescriptor
  (Lorg/eclipse/equinox/p2/metadata/IArtifactKey;)Lorg/eclipse/equinox/p2/repository/artifact/IArtifactDescriptor;
- (Lorg/eclipse/equinox/p2/metadata/IArtifactKey;)Lorg/eclipse/equinox/p2/repository/artifact/IArtifactDescriptor;
+ (Lorg/eclipse/equinox/p2/metadata/IArtifactKey;)L1org/eclipse/equinox/p2/repository/artifact/IArtifactDescriptor;
 createArtifactKey
  (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/Version;)Lorg/eclipse/equinox/p2/metadata/IArtifactKey;
- (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/Version;)Lorg/eclipse/equinox/p2/metadata/IArtifactKey;
+ (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/Version;)L1org/eclipse/equinox/p2/metadata/IArtifactKey;
 descriptorQueryable
  ()Lorg/eclipse/equinox/p2/query/IQueryable<Lorg/eclipse/equinox/p2/repository/artifact/IArtifactDescriptor;>;
  ()Lorg/eclipse/equinox/p2/query/IQueryable<Lorg/eclipse/equinox/p2/repository/artifact/IArtifactDescriptor;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/artifact/IArtifactRepositoryManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/artifact/IArtifactRepositoryManager.eea
index 9401bee5e7..d363f909cc 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/artifact/IArtifactRepositoryManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/artifact/IArtifactRepositoryManager.eea
@@ -19,13 +19,13 @@ TYPE_SIMPLE_REPOSITORY
 
 createMirrorRequest
  (Lorg/eclipse/equinox/p2/metadata/IArtifactKey;Lorg/eclipse/equinox/p2/repository/artifact/IArtifactRepository;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)Lorg/eclipse/equinox/p2/repository/artifact/IArtifactRequest;
- (Lorg/eclipse/equinox/p2/metadata/IArtifactKey;Lorg/eclipse/equinox/p2/repository/artifact/IArtifactRepository;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)Lorg/eclipse/equinox/p2/repository/artifact/IArtifactRequest;
+ (Lorg/eclipse/equinox/p2/metadata/IArtifactKey;Lorg/eclipse/equinox/p2/repository/artifact/IArtifactRepository;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)L1org/eclipse/equinox/p2/repository/artifact/IArtifactRequest;
 createMirrorRequest
  (Lorg/eclipse/equinox/p2/metadata/IArtifactKey;Lorg/eclipse/equinox/p2/repository/artifact/IArtifactRepository;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Ljava/lang/String;)Lorg/eclipse/equinox/p2/repository/artifact/IArtifactRequest;
- (Lorg/eclipse/equinox/p2/metadata/IArtifactKey;Lorg/eclipse/equinox/p2/repository/artifact/IArtifactRepository;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Ljava/lang/String;)Lorg/eclipse/equinox/p2/repository/artifact/IArtifactRequest;
+ (Lorg/eclipse/equinox/p2/metadata/IArtifactKey;Lorg/eclipse/equinox/p2/repository/artifact/IArtifactRepository;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Ljava/lang/String;)L1org/eclipse/equinox/p2/repository/artifact/IArtifactRequest;
 createRepository
  (Ljava/net/URI;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)Lorg/eclipse/equinox/p2/repository/artifact/IArtifactRepository;
- (Ljava/net/URI;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)Lorg/eclipse/equinox/p2/repository/artifact/IArtifactRepository;
+ (Ljava/net/URI;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)L1org/eclipse/equinox/p2/repository/artifact/IArtifactRepository;
 loadRepository
  (Ljava/net/URI;ILorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/equinox/p2/repository/artifact/IArtifactRepository;
  (Ljava/net/URI;ILorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/equinox/p2/repository/artifact/IArtifactRepository;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/artifact/spi/AbstractArtifactRepository.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/artifact/spi/AbstractArtifactRepository.eea
index d49db7addb..6ea5b2f0e0 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/artifact/spi/AbstractArtifactRepository.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/artifact/spi/AbstractArtifactRepository.eea
@@ -27,10 +27,10 @@ contains
  (Lorg/eclipse/equinox/p2/repository/artifact/IArtifactDescriptor;)Z
 createArtifactDescriptor
  (Lorg/eclipse/equinox/p2/metadata/IArtifactKey;)Lorg/eclipse/equinox/p2/repository/artifact/IArtifactDescriptor;
- (Lorg/eclipse/equinox/p2/metadata/IArtifactKey;)Lorg/eclipse/equinox/p2/repository/artifact/IArtifactDescriptor;
+ (Lorg/eclipse/equinox/p2/metadata/IArtifactKey;)L1org/eclipse/equinox/p2/repository/artifact/IArtifactDescriptor; # @Inherited(org.eclipse.equinox.p2.repository.artifact.IArtifactRepository)
 createArtifactKey
  (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/Version;)Lorg/eclipse/equinox/p2/metadata/IArtifactKey;
- (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/Version;)Lorg/eclipse/equinox/p2/metadata/IArtifactKey;
+ (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/equinox/p2/metadata/Version;)L1org/eclipse/equinox/p2/metadata/IArtifactKey; # @Inherited(org.eclipse.equinox.p2.repository.artifact.IArtifactRepository)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/artifact/spi/ArtifactRepositoryFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/artifact/spi/ArtifactRepositoryFactory.eea
index 927f8b9358..5c813ceb40 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/artifact/spi/ArtifactRepositoryFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/artifact/spi/ArtifactRepositoryFactory.eea
@@ -2,7 +2,7 @@ class org/eclipse/equinox/p2/repository/artifact/spi/ArtifactRepositoryFactory
 
 create
  (Ljava/net/URI;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)Lorg/eclipse/equinox/p2/repository/artifact/IArtifactRepository;
- (Ljava/net/URI;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)Lorg/eclipse/equinox/p2/repository/artifact/IArtifactRepository;
+ (Ljava/net/URI;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)L1org/eclipse/equinox/p2/repository/artifact/IArtifactRepository;
 getAgent
  ()Lorg/eclipse/equinox/p2/core/IProvisioningAgent;
  ()Lorg/eclipse/equinox/p2/core/IProvisioningAgent;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/metadata/IMetadataRepositoryManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/metadata/IMetadataRepositoryManager.eea
index 577aca419f..4ecd1e3f6a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/metadata/IMetadataRepositoryManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/metadata/IMetadataRepositoryManager.eea
@@ -16,7 +16,7 @@ TYPE_SIMPLE_REPOSITORY
 
 createRepository
  (Ljava/net/URI;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)Lorg/eclipse/equinox/p2/repository/metadata/IMetadataRepository;
- (Ljava/net/URI;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)Lorg/eclipse/equinox/p2/repository/metadata/IMetadataRepository;
+ (Ljava/net/URI;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)L1org/eclipse/equinox/p2/repository/metadata/IMetadataRepository;
 loadRepository
  (Ljava/net/URI;ILorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/equinox/p2/repository/metadata/IMetadataRepository;
  (Ljava/net/URI;ILorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/equinox/p2/repository/metadata/IMetadataRepository;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/metadata/spi/MetadataRepositoryFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/metadata/spi/MetadataRepositoryFactory.eea
index 8ab1fc1921..11bc975ca7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/metadata/spi/MetadataRepositoryFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/p2/repository/metadata/spi/MetadataRepositoryFactory.eea
@@ -2,7 +2,7 @@ class org/eclipse/equinox/p2/repository/metadata/spi/MetadataRepositoryFactory
 
 create
  (Ljava/net/URI;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)Lorg/eclipse/equinox/p2/repository/metadata/IMetadataRepository;
- (Ljava/net/URI;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)Lorg/eclipse/equinox/p2/repository/metadata/IMetadataRepository;
+ (Ljava/net/URI;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)L1org/eclipse/equinox/p2/repository/metadata/IMetadataRepository;
 getAgent
  ()Lorg/eclipse/equinox/p2/core/IProvisioningAgent;
  ()Lorg/eclipse/equinox/p2/core/IProvisioningAgent;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/security/auth/LoginContextFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/security/auth/LoginContextFactory.eea
index 7b7f1b9356..44bc968a13 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/security/auth/LoginContextFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/security/auth/LoginContextFactory.eea
@@ -2,10 +2,10 @@ class org/eclipse/equinox/security/auth/LoginContextFactory
 
 createContext
  (Ljava/lang/String;)Lorg/eclipse/equinox/security/auth/ILoginContext;
- (Ljava/lang/String;)Lorg/eclipse/equinox/security/auth/ILoginContext;
+ (Ljava/lang/String;)L1org/eclipse/equinox/security/auth/ILoginContext;
 createContext
  (Ljava/lang/String;Ljava/net/URL;)Lorg/eclipse/equinox/security/auth/ILoginContext;
- (Ljava/lang/String;Ljava/net/URL;)Lorg/eclipse/equinox/security/auth/ILoginContext;
+ (Ljava/lang/String;Ljava/net/URL;)L1org/eclipse/equinox/security/auth/ILoginContext;
 createContext
  (Ljava/lang/String;Ljava/net/URL;Ljavax/security/auth/callback/CallbackHandler;)Lorg/eclipse/equinox/security/auth/ILoginContext;
- (Ljava/lang/String;Ljava/net/URL;Ljavax/security/auth/callback/CallbackHandler;)Lorg/eclipse/equinox/security/auth/ILoginContext;
+ (Ljava/lang/String;Ljava/net/URL;Ljavax/security/auth/callback/CallbackHandler;)L1org/eclipse/equinox/security/auth/ILoginContext;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/security/auth/credentials/CredentialsFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/security/auth/credentials/CredentialsFactory.eea
index 01635ce9b8..74d6e0a6f4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/security/auth/credentials/CredentialsFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/equinox/security/auth/credentials/CredentialsFactory.eea
@@ -2,10 +2,10 @@ class org/eclipse/equinox/security/auth/credentials/CredentialsFactory
 
 privateCredential
  (Ljavax/crypto/spec/PBEKeySpec;Ljava/lang/String;)Lorg/eclipse/equinox/security/auth/credentials/IPrivateCredential;
- (Ljavax/crypto/spec/PBEKeySpec;Ljava/lang/String;)Lorg/eclipse/equinox/security/auth/credentials/IPrivateCredential;
+ (Ljavax/crypto/spec/PBEKeySpec;Ljava/lang/String;)L1org/eclipse/equinox/security/auth/credentials/IPrivateCredential;
 publicCredential
  (Ljava/lang/String;Ljava/security/Principal;Ljava/lang/String;)Lorg/eclipse/equinox/security/auth/credentials/IPublicCredential;
- (Ljava/lang/String;Ljava/security/Principal;Ljava/lang/String;)Lorg/eclipse/equinox/security/auth/credentials/IPublicCredential;
+ (Ljava/lang/String;Ljava/security/Principal;Ljava/lang/String;)L1org/eclipse/equinox/security/auth/credentials/IPublicCredential;
 publicCredential
  (Ljava/lang/String;[Ljava/security/Principal;Ljava/lang/String;)Lorg/eclipse/equinox/security/auth/credentials/IPublicCredential;
- (Ljava/lang/String;[Ljava/security/Principal;Ljava/lang/String;)Lorg/eclipse/equinox/security/auth/credentials/IPublicCredential;
+ (Ljava/lang/String;[Ljava/security/Principal;Ljava/lang/String;)L1org/eclipse/equinox/security/auth/credentials/IPublicCredential;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/Action.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/Action.eea
index 236373521c..54896e76f1 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/Action.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/Action.eea
@@ -57,7 +57,7 @@ getImageDescriptor
  ()Lorg/eclipse/jface/resource/ImageDescriptor;
 getMenuCreator
  ()Lorg/eclipse/jface/action/IMenuCreator;
- ()Lorg/eclipse/jface/action/IMenuCreator;
+ ()L0org/eclipse/jface/action/IMenuCreator;
 getText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/ContributionManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/ContributionManager.eea
index e0b12db0a5..387c701307 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/ContributionManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/ContributionManager.eea
@@ -17,10 +17,10 @@ appendToGroup
  (Ljava/lang/String;Lorg/eclipse/jface/action/IContributionItem;)V
 find
  (Ljava/lang/String;)Lorg/eclipse/jface/action/IContributionItem;
- (Ljava/lang/String;)Lorg/eclipse/jface/action/IContributionItem;
+ (Ljava/lang/String;)L0org/eclipse/jface/action/IContributionItem;
 getItems
  ()[Lorg/eclipse/jface/action/IContributionItem;
- ()[Lorg/eclipse/jface/action/IContributionItem;
+ ()[1Lorg/eclipse/jface/action/IContributionItem;
 getOverrides
  ()Lorg/eclipse/jface/action/IContributionManagerOverrides;
  ()Lorg/eclipse/jface/action/IContributionManagerOverrides;
@@ -62,10 +62,10 @@ prependToGroup
  (Ljava/lang/String;Lorg/eclipse/jface/action/IContributionItem;)V
 remove
  (Ljava/lang/String;)Lorg/eclipse/jface/action/IContributionItem;
- (Ljava/lang/String;)Lorg/eclipse/jface/action/IContributionItem;
+ (Ljava/lang/String;)L0org/eclipse/jface/action/IContributionItem;
 remove
  (Lorg/eclipse/jface/action/IContributionItem;)Lorg/eclipse/jface/action/IContributionItem;
- (Lorg/eclipse/jface/action/IContributionItem;)Lorg/eclipse/jface/action/IContributionItem;
+ (Lorg/eclipse/jface/action/IContributionItem;)L0org/eclipse/jface/action/IContributionItem;
 replaceItem
  (Ljava/lang/String;Lorg/eclipse/jface/action/IContributionItem;)Z
  (Ljava/lang/String;Lorg/eclipse/jface/action/IContributionItem;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/ExternalActionManager$CommandCallback.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/ExternalActionManager$CommandCallback.eea
index d08e37c583..2d79e3121b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/ExternalActionManager$CommandCallback.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/ExternalActionManager$CommandCallback.eea
@@ -17,10 +17,10 @@ bindingManagerChanged
  (L1org/eclipse/jface/bindings/BindingManagerEvent;)V # @Inherited(org.eclipse.jface.bindings.IBindingManagerListener)
 getAccelerator
  (Ljava/lang/String;)Ljava/lang/Integer;
- (Ljava/lang/String;)Ljava/lang/Integer;
+ (Ljava/lang/String;)L0java/lang/Integer;
 getAcceleratorText
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getActiveBindingsFor
  (Ljava/lang/String;)[Lorg/eclipse/jface/bindings/TriggerSequence;
  (Ljava/lang/String;)[Lorg/eclipse/jface/bindings/TriggerSequence;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/LegacyActionTools.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/LegacyActionTools.eea
index 5df68f1f8a..96098c26d6 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/LegacyActionTools.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/LegacyActionTools.eea
@@ -2,7 +2,7 @@ class org/eclipse/jface/action/LegacyActionTools
 
 convertAccelerator
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 convertAccelerator
  (Ljava/lang/String;)I
  (Ljava/lang/String;)I
@@ -11,7 +11,7 @@ escapeMnemonics
  (Ljava/lang/String;)Ljava/lang/String;
 extractAcceleratorText
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 extractMnemonic
  (Ljava/lang/String;)C
  (Ljava/lang/String;)C
@@ -26,7 +26,7 @@ findModifier
  (Ljava/lang/String;)I
 findModifierString
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 removeAcceleratorText
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/MenuManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/MenuManager.eea
index 30f076dbbe..f176affd0d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/MenuManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/MenuManager.eea
@@ -18,13 +18,13 @@ addMenuListener
  (L1org/eclipse/jface/action/IMenuListener;)V # @Inherited(org.eclipse.jface.action.IMenuManager)
 createContextMenu
  (Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/widgets/Menu;
- (Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/widgets/Menu;
+ (Lorg/eclipse/swt/widgets/Control;)L1org/eclipse/swt/widgets/Menu;
 createMenuBar
  (Lorg/eclipse/swt/widgets/Decorations;)Lorg/eclipse/swt/widgets/Menu;
- (Lorg/eclipse/swt/widgets/Decorations;)Lorg/eclipse/swt/widgets/Menu;
+ (Lorg/eclipse/swt/widgets/Decorations;)L1org/eclipse/swt/widgets/Menu;
 createMenuBar
  (Lorg/eclipse/swt/widgets/Shell;)Lorg/eclipse/swt/widgets/Menu;
- (Lorg/eclipse/swt/widgets/Shell;)Lorg/eclipse/swt/widgets/Menu;
+ (Lorg/eclipse/swt/widgets/Shell;)L1org/eclipse/swt/widgets/Menu;
 doItemFill
  (Lorg/eclipse/jface/action/IContributionItem;I)V
  (Lorg/eclipse/jface/action/IContributionItem;I)V
@@ -42,10 +42,10 @@ fill
  (L1org/eclipse/swt/widgets/ToolBar;I)V # @Inherited(org.eclipse.jface.action.IContributionItem)
 findMenuUsingPath
  (Ljava/lang/String;)Lorg/eclipse/jface/action/IMenuManager;
- (Ljava/lang/String;)Lorg/eclipse/jface/action/IMenuManager;
+ (Ljava/lang/String;)L0org/eclipse/jface/action/IMenuManager;
 findUsingPath
  (Ljava/lang/String;)Lorg/eclipse/jface/action/IContributionItem;
- (Ljava/lang/String;)Lorg/eclipse/jface/action/IContributionItem;
+ (Ljava/lang/String;)L0org/eclipse/jface/action/IContributionItem;
 getId
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(org.eclipse.jface.action.IContributionItem)
@@ -57,10 +57,10 @@ getMenu
  ()Lorg/eclipse/swt/widgets/Menu;
 getMenuItem
  (I)Lorg/eclipse/swt/widgets/Item;
- (I)Lorg/eclipse/swt/widgets/Item;
+ (I)L0org/eclipse/swt/widgets/Item;
 getMenuItems
  ()[Lorg/eclipse/swt/widgets/Item;
- ()[Lorg/eclipse/swt/widgets/Item;
+ ()[0Lorg/eclipse/swt/widgets/Item;
 getMenuText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/StatusLineContributionItem.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/StatusLineContributionItem.eea
index 8ac650e7c0..037d456e8e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/StatusLineContributionItem.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/StatusLineContributionItem.eea
@@ -11,7 +11,7 @@ fill
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.jface.action.ContributionItem)
 getDisplayLocation
  ()Lorg/eclipse/swt/graphics/Point;
- ()Lorg/eclipse/swt/graphics/Point;
+ ()L0org/eclipse/swt/graphics/Point;
 getText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/StatusLineManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/StatusLineManager.eea
index beb235f3a3..8148bb2979 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/StatusLineManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/StatusLineManager.eea
@@ -12,16 +12,16 @@ MIDDLE_GROUP
 
 createControl
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control;
 createControl
  (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/widgets/Control;
- (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/widgets/Control;
+ (Lorg/eclipse/swt/widgets/Composite;I)L1org/eclipse/swt/widgets/Control;
 getControl
  ()Lorg/eclipse/swt/widgets/Control;
  ()Lorg/eclipse/swt/widgets/Control;
 getProgressMonitor
  ()Lorg/eclipse/core/runtime/IProgressMonitor;
- ()Lorg/eclipse/core/runtime/IProgressMonitor;
+ ()L1org/eclipse/core/runtime/IProgressMonitor;
 getProgressMonitorDelegate
  ()Lorg/eclipse/core/runtime/IProgressMonitor;
  ()Lorg/eclipse/core/runtime/IProgressMonitor;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/SubContributionManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/SubContributionManager.eea
index 8090378665..9e84a944c2 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/SubContributionManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/SubContributionManager.eea
@@ -20,7 +20,7 @@ find
  (Ljava/lang/String;)Lorg/eclipse/jface/action/IContributionItem;
 getItems
  ()[Lorg/eclipse/jface/action/IContributionItem;
- ()[Lorg/eclipse/jface/action/IContributionItem;
+ ()[1Lorg/eclipse/jface/action/IContributionItem;
 getOverrides
  ()Lorg/eclipse/jface/action/IContributionManagerOverrides;
  ()Lorg/eclipse/jface/action/IContributionManagerOverrides;
@@ -47,7 +47,7 @@ itemRemoved
  (Lorg/eclipse/jface/action/IContributionItem;)V
 items
  ()Ljava/util/Enumeration<Lorg/eclipse/jface/action/SubContributionItem;>;
- ()Ljava/util/Enumeration<Lorg/eclipse/jface/action/SubContributionItem;>;
+ ()L1java/util/Enumeration<Lorg/eclipse/jface/action/SubContributionItem;>;
 prependToGroup
  (Ljava/lang/String;Lorg/eclipse/jface/action/IAction;)V
  (Ljava/lang/String;Lorg/eclipse/jface/action/IAction;)V
@@ -59,10 +59,10 @@ remove
  (Ljava/lang/String;)Lorg/eclipse/jface/action/IContributionItem;
 remove
  (Lorg/eclipse/jface/action/IContributionItem;)Lorg/eclipse/jface/action/IContributionItem;
- (Lorg/eclipse/jface/action/IContributionItem;)Lorg/eclipse/jface/action/IContributionItem;
+ (Lorg/eclipse/jface/action/IContributionItem;)L0org/eclipse/jface/action/IContributionItem;
 unwrap
  (Lorg/eclipse/jface/action/IContributionItem;)Lorg/eclipse/jface/action/IContributionItem;
  (Lorg/eclipse/jface/action/IContributionItem;)Lorg/eclipse/jface/action/IContributionItem;
 wrap
  (Lorg/eclipse/jface/action/IContributionItem;)Lorg/eclipse/jface/action/SubContributionItem;
- (Lorg/eclipse/jface/action/IContributionItem;)Lorg/eclipse/jface/action/SubContributionItem;
+ (Lorg/eclipse/jface/action/IContributionItem;)L1org/eclipse/jface/action/SubContributionItem;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/SubCoolBarManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/SubCoolBarManager.eea
index a6ecf47bd3..96734e9b1e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/SubCoolBarManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/SubCoolBarManager.eea
@@ -8,7 +8,7 @@ add
  (Lorg/eclipse/jface/action/IToolBarManager;)V
 getContextMenuManager
  ()Lorg/eclipse/jface/action/IMenuManager;
- ()Lorg/eclipse/jface/action/IMenuManager;
+ ()L0org/eclipse/jface/action/IMenuManager;
 getParentCoolBarManager
  ()Lorg/eclipse/jface/action/ICoolBarManager;
  ()Lorg/eclipse/jface/action/ICoolBarManager;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/SubMenuManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/SubMenuManager.eea
index 8f9e351b09..9126a187b3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/SubMenuManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/SubMenuManager.eea
@@ -23,7 +23,7 @@ find
  (Ljava/lang/String;)Lorg/eclipse/jface/action/IContributionItem;
 findMenuUsingPath
  (Ljava/lang/String;)Lorg/eclipse/jface/action/IMenuManager;
- (Ljava/lang/String;)Lorg/eclipse/jface/action/IMenuManager;
+ (Ljava/lang/String;)L0org/eclipse/jface/action/IMenuManager;
 findUsingPath
  (Ljava/lang/String;)Lorg/eclipse/jface/action/IContributionItem;
  (Ljava/lang/String;)Lorg/eclipse/jface/action/IContributionItem;
@@ -47,4 +47,4 @@ update
  (Ljava/lang/String;)V
 wrapMenu
  (Lorg/eclipse/jface/action/IMenuManager;)Lorg/eclipse/jface/action/SubMenuManager;
- (Lorg/eclipse/jface/action/IMenuManager;)Lorg/eclipse/jface/action/SubMenuManager;
+ (Lorg/eclipse/jface/action/IMenuManager;)L1org/eclipse/jface/action/SubMenuManager;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/ToolBarContributionItem.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/ToolBarContributionItem.eea
index 3487c3e270..495a055901 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/ToolBarContributionItem.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/ToolBarContributionItem.eea
@@ -11,7 +11,7 @@ fill
  (L1org/eclipse/swt/widgets/CoolBar;I)V # @Inherited(org.eclipse.jface.action.ContributionItem)
 getToolBarManager
  ()Lorg/eclipse/jface/action/IToolBarManager;
- ()Lorg/eclipse/jface/action/IToolBarManager;
+ ()L0org/eclipse/jface/action/IToolBarManager;
 update
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/ToolBarManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/ToolBarManager.eea
index 916e0fac9c..ef02d93849 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/ToolBarManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/action/ToolBarManager.eea
@@ -5,7 +5,7 @@ class org/eclipse/jface/action/ToolBarManager
  (Lorg/eclipse/swt/widgets/ToolBar;)V
 createControl
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/ToolBar;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/ToolBar;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/ToolBar;
 getContextMenuManager
  ()Lorg/eclipse/jface/action/MenuManager;
  ()Lorg/eclipse/jface/action/MenuManager;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/BindingManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/BindingManager.eea
index ed220e5a09..3b30ff9a31 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/BindingManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/BindingManager.eea
@@ -21,7 +21,7 @@ getActiveBindingsDisregardingContext
  ()Ljava/util/Map;
 getActiveBindingsDisregardingContextFlat
  ()Ljava/util/Collection;
- ()Ljava/util/Collection;
+ ()L1java/util/Collection;
 getActiveBindingsDisregardingContextFor
  (Lorg/eclipse/core/commands/ParameterizedCommand;)[Lorg/eclipse/jface/bindings/TriggerSequence;
  (Lorg/eclipse/core/commands/ParameterizedCommand;)[Lorg/eclipse/jface/bindings/TriggerSequence;
@@ -39,13 +39,13 @@ getBestActiveBindingFor
  (Ljava/lang/String;)Lorg/eclipse/jface/bindings/TriggerSequence;
 getBestActiveBindingFor
  (Lorg/eclipse/core/commands/ParameterizedCommand;)Lorg/eclipse/jface/bindings/TriggerSequence;
- (Lorg/eclipse/core/commands/ParameterizedCommand;)Lorg/eclipse/jface/bindings/TriggerSequence;
+ (Lorg/eclipse/core/commands/ParameterizedCommand;)L0org/eclipse/jface/bindings/TriggerSequence;
 getBestActiveBindingFormattedFor
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getBindings
  ()[Lorg/eclipse/jface/bindings/Binding;
- ()[Lorg/eclipse/jface/bindings/Binding;
+ ()[0Lorg/eclipse/jface/bindings/Binding;
 getConflictsFor
  (Lorg/eclipse/jface/bindings/TriggerSequence;)Ljava/util/Collection;
  (Lorg/eclipse/jface/bindings/TriggerSequence;)Ljava/util/Collection;
@@ -69,7 +69,7 @@ getPlatform
  ()Ljava/lang/String;
 getScheme
  (Ljava/lang/String;)Lorg/eclipse/jface/bindings/Scheme;
- (Ljava/lang/String;)Lorg/eclipse/jface/bindings/Scheme;
+ (Ljava/lang/String;)L1org/eclipse/jface/bindings/Scheme;
 isPartialMatch
  (Lorg/eclipse/jface/bindings/TriggerSequence;)Z
  (Lorg/eclipse/jface/bindings/TriggerSequence;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/TriggerSequence.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/TriggerSequence.eea
index 516e04dc44..d21db341f9 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/TriggerSequence.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/TriggerSequence.eea
@@ -21,7 +21,7 @@ getPrefixes
  ()[Lorg/eclipse/jface/bindings/TriggerSequence;
 getTriggers
  ()[Lorg/eclipse/jface/bindings/Trigger;
- ()[Lorg/eclipse/jface/bindings/Trigger;
+ ()[1Lorg/eclipse/jface/bindings/Trigger;
 startsWith
  (Lorg/eclipse/jface/bindings/TriggerSequence;Z)Z
  (Lorg/eclipse/jface/bindings/TriggerSequence;Z)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/keys/KeySequence.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/keys/KeySequence.eea
index f21ffd6623..caf5de80ce 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/keys/KeySequence.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/keys/KeySequence.eea
@@ -12,19 +12,19 @@ getInstance
  ()Lorg/eclipse/jface/bindings/keys/KeySequence;
 getInstance
  (Ljava/lang/String;)Lorg/eclipse/jface/bindings/keys/KeySequence;
- (Ljava/lang/String;)Lorg/eclipse/jface/bindings/keys/KeySequence;
+ (Ljava/lang/String;)L1org/eclipse/jface/bindings/keys/KeySequence;
 getInstance
  (Ljava/util/List<Lorg/eclipse/jface/bindings/keys/KeyStroke;>;)Lorg/eclipse/jface/bindings/keys/KeySequence;
- (Ljava/util/List<Lorg/eclipse/jface/bindings/keys/KeyStroke;>;)Lorg/eclipse/jface/bindings/keys/KeySequence;
+ (Ljava/util/List<Lorg/eclipse/jface/bindings/keys/KeyStroke;>;)L1org/eclipse/jface/bindings/keys/KeySequence;
 getInstance
  (Lorg/eclipse/jface/bindings/keys/KeySequence;Lorg/eclipse/jface/bindings/keys/KeyStroke;)Lorg/eclipse/jface/bindings/keys/KeySequence;
- (Lorg/eclipse/jface/bindings/keys/KeySequence;Lorg/eclipse/jface/bindings/keys/KeyStroke;)Lorg/eclipse/jface/bindings/keys/KeySequence;
+ (Lorg/eclipse/jface/bindings/keys/KeySequence;Lorg/eclipse/jface/bindings/keys/KeyStroke;)L1org/eclipse/jface/bindings/keys/KeySequence;
 getInstance
  (Lorg/eclipse/jface/bindings/keys/KeyStroke;)Lorg/eclipse/jface/bindings/keys/KeySequence;
  (Lorg/eclipse/jface/bindings/keys/KeyStroke;)Lorg/eclipse/jface/bindings/keys/KeySequence;
 getInstance
  ([Lorg/eclipse/jface/bindings/keys/KeyStroke;)Lorg/eclipse/jface/bindings/keys/KeySequence;
- ([Lorg/eclipse/jface/bindings/keys/KeyStroke;)Lorg/eclipse/jface/bindings/keys/KeySequence;
+ ([Lorg/eclipse/jface/bindings/keys/KeyStroke;)L1org/eclipse/jface/bindings/keys/KeySequence;
 
 <init>
  ([Lorg/eclipse/jface/bindings/keys/KeyStroke;)V
@@ -37,10 +37,10 @@ format
  ()Ljava/lang/String;
 getKeyStrokes
  ()[Lorg/eclipse/jface/bindings/keys/KeyStroke;
- ()[Lorg/eclipse/jface/bindings/keys/KeyStroke;
+ ()[1Lorg/eclipse/jface/bindings/keys/KeyStroke;
 getPrefixes
  ()[Lorg/eclipse/jface/bindings/TriggerSequence;
- ()[Lorg/eclipse/jface/bindings/TriggerSequence;
+ ()[1Lorg/eclipse/jface/bindings/TriggerSequence;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/keys/KeyStroke.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/keys/KeyStroke.eea
index d09e4bce9e..3948bc9175 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/keys/KeyStroke.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/keys/KeyStroke.eea
@@ -12,10 +12,10 @@ getInstance
  (I)Lorg/eclipse/jface/bindings/keys/KeyStroke;
 getInstance
  (II)Lorg/eclipse/jface/bindings/keys/KeyStroke;
- (II)Lorg/eclipse/jface/bindings/keys/KeyStroke;
+ (II)L1org/eclipse/jface/bindings/keys/KeyStroke;
 getInstance
  (Ljava/lang/String;)Lorg/eclipse/jface/bindings/keys/KeyStroke;
- (Ljava/lang/String;)Lorg/eclipse/jface/bindings/keys/KeyStroke;
+ (Ljava/lang/String;)L1org/eclipse/jface/bindings/keys/KeyStroke;
 
 compareTo
  (Ljava/lang/Object;)I
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/keys/formatting/AbstractKeyFormatter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/keys/formatting/AbstractKeyFormatter.eea
index c271526cc0..85b627c44b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/keys/formatting/AbstractKeyFormatter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/keys/formatting/AbstractKeyFormatter.eea
@@ -15,10 +15,10 @@ format
  (I)Ljava/lang/String;
 format
  (Lorg/eclipse/jface/bindings/keys/KeySequence;)Ljava/lang/String;
- (Lorg/eclipse/jface/bindings/keys/KeySequence;)Ljava/lang/String;
+ (Lorg/eclipse/jface/bindings/keys/KeySequence;)L1java/lang/String;
 format
  (Lorg/eclipse/jface/bindings/keys/KeyStroke;)Ljava/lang/String;
- (Lorg/eclipse/jface/bindings/keys/KeyStroke;)Ljava/lang/String;
+ (Lorg/eclipse/jface/bindings/keys/KeyStroke;)L1java/lang/String;
 getKeyDelimiter
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/keys/formatting/EmacsKeyFormatter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/keys/formatting/EmacsKeyFormatter.eea
index eff2c4c6f4..0e2826d4ef 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/keys/formatting/EmacsKeyFormatter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/keys/formatting/EmacsKeyFormatter.eea
@@ -11,4 +11,4 @@ getKeyStrokeDelimiter
  ()Ljava/lang/String;
 sortModifierKeys
  (I)[I
- (I)[I
+ (I)[1I
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/keys/formatting/FormalKeyFormatter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/keys/formatting/FormalKeyFormatter.eea
index 588634ebfe..ae595c4311 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/keys/formatting/FormalKeyFormatter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/keys/formatting/FormalKeyFormatter.eea
@@ -5,10 +5,10 @@ format
  (I)Ljava/lang/String;
 getKeyDelimiter
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getKeyStrokeDelimiter
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 sortModifierKeys
  (I)[I
- (I)[I
+ (I)[1I
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/keys/formatting/NativeKeyFormatter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/keys/formatting/NativeKeyFormatter.eea
index 071e2c60e7..7aeb5e7689 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/keys/formatting/NativeKeyFormatter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/bindings/keys/formatting/NativeKeyFormatter.eea
@@ -11,4 +11,4 @@ getKeyStrokeDelimiter
  ()Ljava/lang/String;
 sortModifierKeys
  (I)[I
- (I)[I
+ (I)[1I
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/commands/ActionHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/commands/ActionHandler.eea
index 5e6b72c722..14e578f085 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/commands/ActionHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/commands/ActionHandler.eea
@@ -14,7 +14,7 @@ getAction
  ()Lorg/eclipse/jface/action/IAction;
 getHandlerLabel
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(org.eclipse.core.commands.IHandler)
 removeHandlerListener
  (Lorg/eclipse/core/commands/IHandlerListener;)V
  (L1org/eclipse/core/commands/IHandlerListener;)V # @Inherited(org.eclipse.core.commands.AbstractHandler)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/contentassist/ComboContentAssistSubjectAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/contentassist/ComboContentAssistSubjectAdapter.eea
index 5b6e3f5b91..7546521873 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/contentassist/ComboContentAssistSubjectAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/contentassist/ComboContentAssistSubjectAdapter.eea
@@ -11,7 +11,7 @@ getControl
  ()Lorg/eclipse/swt/widgets/Control;
 getDocument
  ()Lorg/eclipse/jface/text/IDocument;
- ()Lorg/eclipse/jface/text/IDocument;
+ ()L1org/eclipse/jface/text/IDocument;
 getLocationAtOffset
  (I)Lorg/eclipse/swt/graphics/Point;
  (I)Lorg/eclipse/swt/graphics/Point;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/contentassist/TextContentAssistSubjectAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/contentassist/TextContentAssistSubjectAdapter.eea
index 7822c6d21c..b90e4b044e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/contentassist/TextContentAssistSubjectAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/contentassist/TextContentAssistSubjectAdapter.eea
@@ -11,7 +11,7 @@ getControl
  ()Lorg/eclipse/swt/widgets/Control;
 getDocument
  ()Lorg/eclipse/jface/text/IDocument;
- ()Lorg/eclipse/jface/text/IDocument;
+ ()L1org/eclipse/jface/text/IDocument;
 getLocationAtOffset
  (I)Lorg/eclipse/swt/graphics/Point;
  (I)Lorg/eclipse/swt/graphics/Point;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/dialog/DialogPageSupport.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/dialog/DialogPageSupport.eea
index 6df3d6434e..7fce1e4f50 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/dialog/DialogPageSupport.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/dialog/DialogPageSupport.eea
@@ -2,7 +2,7 @@ class org/eclipse/jface/databinding/dialog/DialogPageSupport
 
 create
  (Lorg/eclipse/jface/dialogs/DialogPage;Lorg/eclipse/core/databinding/DataBindingContext;)Lorg/eclipse/jface/databinding/dialog/DialogPageSupport;
- (Lorg/eclipse/jface/dialogs/DialogPage;Lorg/eclipse/core/databinding/DataBindingContext;)Lorg/eclipse/jface/databinding/dialog/DialogPageSupport;
+ (Lorg/eclipse/jface/dialogs/DialogPage;Lorg/eclipse/core/databinding/DataBindingContext;)L1org/eclipse/jface/databinding/dialog/DialogPageSupport;
 
 currentStatus
  Lorg/eclipse/core/runtime/IStatus;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/dialog/TitleAreaDialogSupport.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/dialog/TitleAreaDialogSupport.eea
index a6b44b2030..2b9fdfa733 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/dialog/TitleAreaDialogSupport.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/dialog/TitleAreaDialogSupport.eea
@@ -2,7 +2,7 @@ class org/eclipse/jface/databinding/dialog/TitleAreaDialogSupport
 
 create
  (Lorg/eclipse/jface/dialogs/TitleAreaDialog;Lorg/eclipse/core/databinding/DataBindingContext;)Lorg/eclipse/jface/databinding/dialog/TitleAreaDialogSupport;
- (Lorg/eclipse/jface/dialogs/TitleAreaDialog;Lorg/eclipse/core/databinding/DataBindingContext;)Lorg/eclipse/jface/databinding/dialog/TitleAreaDialogSupport;
+ (Lorg/eclipse/jface/dialogs/TitleAreaDialog;Lorg/eclipse/core/databinding/DataBindingContext;)L1org/eclipse/jface/databinding/dialog/TitleAreaDialogSupport;
 
 setValidationMessageProvider
  (Lorg/eclipse/jface/databinding/dialog/IValidationMessageProvider;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/dialog/ValidationMessageProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/dialog/ValidationMessageProvider.eea
index 80a6dbf389..0e7b1f3781 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/dialog/ValidationMessageProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/dialog/ValidationMessageProvider.eea
@@ -2,7 +2,7 @@ class org/eclipse/jface/databinding/dialog/ValidationMessageProvider
 
 getMessage
  (Lorg/eclipse/core/databinding/ValidationStatusProvider;)Ljava/lang/String;
- (Lorg/eclipse/core/databinding/ValidationStatusProvider;)Ljava/lang/String;
+ (Lorg/eclipse/core/databinding/ValidationStatusProvider;)L0java/lang/String;
 getMessageType
  (Lorg/eclipse/core/databinding/ValidationStatusProvider;)I
  (Lorg/eclipse/core/databinding/ValidationStatusProvider;)I
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/fieldassist/ControlDecorationSupport.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/fieldassist/ControlDecorationSupport.eea
index eddc848892..5350399e0d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/fieldassist/ControlDecorationSupport.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/fieldassist/ControlDecorationSupport.eea
@@ -2,28 +2,28 @@ class org/eclipse/jface/databinding/fieldassist/ControlDecorationSupport
 
 create
  (Lorg/eclipse/core/databinding/ValidationStatusProvider;I)Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
- (Lorg/eclipse/core/databinding/ValidationStatusProvider;I)Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
+ (Lorg/eclipse/core/databinding/ValidationStatusProvider;I)L1org/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
 create
  (Lorg/eclipse/core/databinding/ValidationStatusProvider;ILorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
- (Lorg/eclipse/core/databinding/ValidationStatusProvider;ILorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
+ (Lorg/eclipse/core/databinding/ValidationStatusProvider;ILorg/eclipse/swt/widgets/Composite;)L1org/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
 create
  (Lorg/eclipse/core/databinding/ValidationStatusProvider;ILorg/eclipse/swt/widgets/Composite;Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationUpdater;)Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
- (Lorg/eclipse/core/databinding/ValidationStatusProvider;ILorg/eclipse/swt/widgets/Composite;Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationUpdater;)Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
+ (Lorg/eclipse/core/databinding/ValidationStatusProvider;ILorg/eclipse/swt/widgets/Composite;Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationUpdater;)L1org/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
 create
  (Lorg/eclipse/core/databinding/observable/value/IObservableValue<Lorg/eclipse/core/runtime/IStatus;>;ILorg/eclipse/core/databinding/observable/list/IObservableList<Lorg/eclipse/core/databinding/observable/IObservable;>;)Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
- (Lorg/eclipse/core/databinding/observable/value/IObservableValue<Lorg/eclipse/core/runtime/IStatus;>;ILorg/eclipse/core/databinding/observable/list/IObservableList<Lorg/eclipse/core/databinding/observable/IObservable;>;)Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
+ (Lorg/eclipse/core/databinding/observable/value/IObservableValue<Lorg/eclipse/core/runtime/IStatus;>;ILorg/eclipse/core/databinding/observable/list/IObservableList<Lorg/eclipse/core/databinding/observable/IObservable;>;)L1org/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
 create
  (Lorg/eclipse/core/databinding/observable/value/IObservableValue<Lorg/eclipse/core/runtime/IStatus;>;ILorg/eclipse/swt/widgets/Composite;Lorg/eclipse/core/databinding/observable/list/IObservableList<Lorg/eclipse/core/databinding/observable/IObservable;>;)Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
- (Lorg/eclipse/core/databinding/observable/value/IObservableValue<Lorg/eclipse/core/runtime/IStatus;>;ILorg/eclipse/swt/widgets/Composite;Lorg/eclipse/core/databinding/observable/list/IObservableList<Lorg/eclipse/core/databinding/observable/IObservable;>;)Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
+ (Lorg/eclipse/core/databinding/observable/value/IObservableValue<Lorg/eclipse/core/runtime/IStatus;>;ILorg/eclipse/swt/widgets/Composite;Lorg/eclipse/core/databinding/observable/list/IObservableList<Lorg/eclipse/core/databinding/observable/IObservable;>;)L1org/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
 create
  (Lorg/eclipse/core/databinding/observable/value/IObservableValue<Lorg/eclipse/core/runtime/IStatus;>;ILorg/eclipse/swt/widgets/Composite;Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationUpdater;Lorg/eclipse/core/databinding/observable/list/IObservableList<Lorg/eclipse/core/databinding/observable/IObservable;>;)Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
- (Lorg/eclipse/core/databinding/observable/value/IObservableValue<Lorg/eclipse/core/runtime/IStatus;>;ILorg/eclipse/swt/widgets/Composite;Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationUpdater;Lorg/eclipse/core/databinding/observable/list/IObservableList<Lorg/eclipse/core/databinding/observable/IObservable;>;)Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
+ (Lorg/eclipse/core/databinding/observable/value/IObservableValue<Lorg/eclipse/core/runtime/IStatus;>;ILorg/eclipse/swt/widgets/Composite;Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationUpdater;Lorg/eclipse/core/databinding/observable/list/IObservableList<Lorg/eclipse/core/databinding/observable/IObservable;>;)L1org/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
 create
  (Lorg/eclipse/core/databinding/observable/value/IObservableValue<Lorg/eclipse/core/runtime/IStatus;>;ILorg/eclipse/swt/widgets/Composite;Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationUpdater;[Lorg/eclipse/core/databinding/observable/IObservable;)Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
- (Lorg/eclipse/core/databinding/observable/value/IObservableValue<Lorg/eclipse/core/runtime/IStatus;>;ILorg/eclipse/swt/widgets/Composite;Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationUpdater;[Lorg/eclipse/core/databinding/observable/IObservable;)Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
+ (Lorg/eclipse/core/databinding/observable/value/IObservableValue<Lorg/eclipse/core/runtime/IStatus;>;ILorg/eclipse/swt/widgets/Composite;Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationUpdater;[Lorg/eclipse/core/databinding/observable/IObservable;)L1org/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
 create
  (Lorg/eclipse/core/databinding/observable/value/IObservableValue<Lorg/eclipse/core/runtime/IStatus;>;ILorg/eclipse/swt/widgets/Composite;[Lorg/eclipse/core/databinding/observable/IObservable;)Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
- (Lorg/eclipse/core/databinding/observable/value/IObservableValue<Lorg/eclipse/core/runtime/IStatus;>;ILorg/eclipse/swt/widgets/Composite;[Lorg/eclipse/core/databinding/observable/IObservable;)Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
+ (Lorg/eclipse/core/databinding/observable/value/IObservableValue<Lorg/eclipse/core/runtime/IStatus;>;ILorg/eclipse/swt/widgets/Composite;[Lorg/eclipse/core/databinding/observable/IObservable;)L1org/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
 create
  (Lorg/eclipse/core/databinding/observable/value/IObservableValue<Lorg/eclipse/core/runtime/IStatus;>;I[Lorg/eclipse/core/databinding/observable/IObservable;)Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
- (Lorg/eclipse/core/databinding/observable/value/IObservableValue<Lorg/eclipse/core/runtime/IStatus;>;I[Lorg/eclipse/core/databinding/observable/IObservable;)Lorg/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
+ (Lorg/eclipse/core/databinding/observable/value/IObservableValue<Lorg/eclipse/core/runtime/IStatus;>;I[Lorg/eclipse/core/databinding/observable/IObservable;)L1org/eclipse/jface/databinding/fieldassist/ControlDecorationSupport;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/preference/PreferencePageSupport.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/preference/PreferencePageSupport.eea
index b470fb8ba0..8c97db4355 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/preference/PreferencePageSupport.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/preference/PreferencePageSupport.eea
@@ -2,4 +2,4 @@ class org/eclipse/jface/databinding/preference/PreferencePageSupport
 
 create
  (Lorg/eclipse/jface/preference/PreferencePage;Lorg/eclipse/core/databinding/DataBindingContext;)Lorg/eclipse/jface/databinding/preference/PreferencePageSupport;
- (Lorg/eclipse/jface/preference/PreferencePage;Lorg/eclipse/core/databinding/DataBindingContext;)Lorg/eclipse/jface/databinding/preference/PreferencePageSupport;
+ (Lorg/eclipse/jface/preference/PreferencePage;Lorg/eclipse/core/databinding/DataBindingContext;)L1org/eclipse/jface/databinding/preference/PreferencePageSupport;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/swt/WidgetListProperty.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/swt/WidgetListProperty.eea
index c26e32bfc5..13331bf170 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/swt/WidgetListProperty.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/swt/WidgetListProperty.eea
@@ -11,7 +11,7 @@ super org/eclipse/jface/databinding/swt/IWidgetListProperty
 
 observe
  (Lorg/eclipse/core/databinding/observable/Realm;TS;)Lorg/eclipse/jface/databinding/swt/ISWTObservableList<TE;>;
- (Lorg/eclipse/core/databinding/observable/Realm;TS;)Lorg/eclipse/jface/databinding/swt/ISWTObservableList<TE;>;
+ (Lorg/eclipse/core/databinding/observable/Realm;TS;)L1org/eclipse/jface/databinding/swt/ISWTObservableList<TE;>;
 observe
  (TS;)Lorg/eclipse/jface/databinding/swt/ISWTObservableList<TE;>;
  (TS;)Lorg/eclipse/jface/databinding/swt/ISWTObservableList<TE;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/swt/WidgetSideEffects.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/swt/WidgetSideEffects.eea
index 5ad3424fc6..9653bd48ea 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/swt/WidgetSideEffects.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/swt/WidgetSideEffects.eea
@@ -2,4 +2,4 @@ class org/eclipse/jface/databinding/swt/WidgetSideEffects
 
 createFactory
  (Lorg/eclipse/swt/widgets/Widget;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffectFactory;
- (Lorg/eclipse/swt/widgets/Widget;)Lorg/eclipse/core/databinding/observable/sideeffect/ISideEffectFactory;
+ (Lorg/eclipse/swt/widgets/Widget;)L1org/eclipse/core/databinding/observable/sideeffect/ISideEffectFactory;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/swt/WidgetValueProperty.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/swt/WidgetValueProperty.eea
index 4b6ec042a5..a8ba884258 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/swt/WidgetValueProperty.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/swt/WidgetValueProperty.eea
@@ -17,7 +17,7 @@ super org/eclipse/jface/databinding/swt/IWidgetValueProperty
  ([I[I)V
 adaptListener
  (Lorg/eclipse/core/databinding/property/ISimplePropertyListener<TS;Lorg/eclipse/core/databinding/observable/value/ValueDiff<+TT;>;>;)Lorg/eclipse/core/databinding/property/INativePropertyListener<TS;>;
- (Lorg/eclipse/core/databinding/property/ISimplePropertyListener<TS;Lorg/eclipse/core/databinding/observable/value/ValueDiff<+TT;>;>;)Lorg/eclipse/core/databinding/property/INativePropertyListener<TS;>;
+ (Lorg/eclipse/core/databinding/property/ISimplePropertyListener<TS;Lorg/eclipse/core/databinding/observable/value/ValueDiff<+TT;>;>;)L0org/eclipse/core/databinding/property/INativePropertyListener<TS;>;
 observe
  (Lorg/eclipse/core/databinding/observable/Realm;TS;)Lorg/eclipse/jface/databinding/swt/ISWTObservableValue<TT;>;
  (Lorg/eclipse/core/databinding/observable/Realm;TS;)Lorg/eclipse/jface/databinding/swt/ISWTObservableValue<TT;>;
@@ -26,7 +26,7 @@ observe
  (TS;)Lorg/eclipse/jface/databinding/swt/ISWTObservableValue<TT;>;
 observeDelayed
  (ITS;)Lorg/eclipse/jface/databinding/swt/ISWTObservableValue<TT;>;
- (ITS;)Lorg/eclipse/jface/databinding/swt/ISWTObservableValue<TT;>;
+ (ITS;)L1org/eclipse/jface/databinding/swt/ISWTObservableValue<TT;>;
 wrapObservable
  (Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;Lorg/eclipse/swt/widgets/Widget;)Lorg/eclipse/jface/databinding/swt/ISWTObservableValue<TT;>;
- (Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;Lorg/eclipse/swt/widgets/Widget;)Lorg/eclipse/jface/databinding/swt/ISWTObservableValue<TT;>;
+ (Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;Lorg/eclipse/swt/widgets/Widget;)L1org/eclipse/jface/databinding/swt/ISWTObservableValue<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/swt/typed/WidgetProperties.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/swt/typed/WidgetProperties.eea
index 5ade63934f..38d88a112e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/swt/typed/WidgetProperties.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/swt/typed/WidgetProperties.eea
@@ -2,97 +2,97 @@ class org/eclipse/jface/databinding/swt/typed/WidgetProperties
 
 background
  <S:Lorg/eclipse/swt/widgets/Control;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Lorg/eclipse/swt/graphics/Color;>;
- <S:Lorg/eclipse/swt/widgets/Control;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Lorg/eclipse/swt/graphics/Color;>;
+ <S:Lorg/eclipse/swt/widgets/Control;>()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Lorg/eclipse/swt/graphics/Color;>;
 bounds
  <S:Lorg/eclipse/swt/widgets/Control;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Lorg/eclipse/swt/graphics/Rectangle;>;
- <S:Lorg/eclipse/swt/widgets/Control;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Lorg/eclipse/swt/graphics/Rectangle;>;
+ <S:Lorg/eclipse/swt/widgets/Control;>()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Lorg/eclipse/swt/graphics/Rectangle;>;
 buttonSelection
  ()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/Button;Ljava/lang/Boolean;>;
- ()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/Button;Ljava/lang/Boolean;>;
+ ()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/Button;Ljava/lang/Boolean;>;
 ccomboSelection
  ()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/custom/CCombo;Ljava/lang/String;>;
- ()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/custom/CCombo;Ljava/lang/String;>;
+ ()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/custom/CCombo;Ljava/lang/String;>;
 comboSelection
  ()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/Combo;Ljava/lang/String;>;
- ()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/Combo;Ljava/lang/String;>;
+ ()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/Combo;Ljava/lang/String;>;
 dateTimeSelection
  ()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/DateTime;Ljava/util/Date;>;
- ()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/DateTime;Ljava/util/Date;>;
+ ()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/DateTime;Ljava/util/Date;>;
 editable
  <S:Lorg/eclipse/swt/widgets/Control;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/Boolean;>;
- <S:Lorg/eclipse/swt/widgets/Control;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/Boolean;>;
+ <S:Lorg/eclipse/swt/widgets/Control;>()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/Boolean;>;
 enabled
  <S:Lorg/eclipse/swt/widgets/Widget;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/Boolean;>;
- <S:Lorg/eclipse/swt/widgets/Widget;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/Boolean;>;
+ <S:Lorg/eclipse/swt/widgets/Widget;>()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/Boolean;>;
 focused
  <S:Lorg/eclipse/swt/widgets/Control;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/Boolean;>;
- <S:Lorg/eclipse/swt/widgets/Control;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/Boolean;>;
+ <S:Lorg/eclipse/swt/widgets/Control;>()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/Boolean;>;
 font
  <S:Lorg/eclipse/swt/widgets/Control;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Lorg/eclipse/swt/graphics/Font;>;
- <S:Lorg/eclipse/swt/widgets/Control;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Lorg/eclipse/swt/graphics/Font;>;
+ <S:Lorg/eclipse/swt/widgets/Control;>()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Lorg/eclipse/swt/graphics/Font;>;
 foreground
  <S:Lorg/eclipse/swt/widgets/Control;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Lorg/eclipse/swt/graphics/Color;>;
- <S:Lorg/eclipse/swt/widgets/Control;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Lorg/eclipse/swt/graphics/Color;>;
+ <S:Lorg/eclipse/swt/widgets/Control;>()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Lorg/eclipse/swt/graphics/Color;>;
 image
  <S:Lorg/eclipse/swt/widgets/Widget;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Lorg/eclipse/swt/graphics/Image;>;
- <S:Lorg/eclipse/swt/widgets/Widget;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Lorg/eclipse/swt/graphics/Image;>;
+ <S:Lorg/eclipse/swt/widgets/Widget;>()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Lorg/eclipse/swt/graphics/Image;>;
 items
  <S:Lorg/eclipse/swt/widgets/Control;>()Lorg/eclipse/jface/databinding/swt/IWidgetListProperty<TS;Ljava/lang/String;>;
- <S:Lorg/eclipse/swt/widgets/Control;>()Lorg/eclipse/jface/databinding/swt/IWidgetListProperty<TS;Ljava/lang/String;>;
+ <S:Lorg/eclipse/swt/widgets/Control;>()L1org/eclipse/jface/databinding/swt/IWidgetListProperty<TS;Ljava/lang/String;>;
 listSelection
  ()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/List;Ljava/lang/String;>;
- ()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/List;Ljava/lang/String;>;
+ ()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/List;Ljava/lang/String;>;
 localDateSelection
  ()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/DateTime;Ljava/time/LocalDate;>;
- ()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/DateTime;Ljava/time/LocalDate;>;
+ ()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/DateTime;Ljava/time/LocalDate;>;
 localTimeSelection
  ()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/DateTime;Ljava/time/LocalTime;>;
- ()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/DateTime;Ljava/time/LocalTime;>;
+ ()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/DateTime;Ljava/time/LocalTime;>;
 location
  <S:Lorg/eclipse/swt/widgets/Control;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Lorg/eclipse/swt/graphics/Point;>;
- <S:Lorg/eclipse/swt/widgets/Control;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Lorg/eclipse/swt/graphics/Point;>;
+ <S:Lorg/eclipse/swt/widgets/Control;>()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Lorg/eclipse/swt/graphics/Point;>;
 maximum
  <S:Lorg/eclipse/swt/widgets/Control;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/Integer;>;
- <S:Lorg/eclipse/swt/widgets/Control;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/Integer;>;
+ <S:Lorg/eclipse/swt/widgets/Control;>()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/Integer;>;
 menuItemSelection
  ()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/MenuItem;Ljava/lang/Boolean;>;
- ()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/MenuItem;Ljava/lang/Boolean;>;
+ ()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/MenuItem;Ljava/lang/Boolean;>;
 message
  <S:Lorg/eclipse/swt/widgets/Widget;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/String;>;
- <S:Lorg/eclipse/swt/widgets/Widget;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/String;>;
+ <S:Lorg/eclipse/swt/widgets/Widget;>()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/String;>;
 minimum
  <S:Lorg/eclipse/swt/widgets/Control;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/Integer;>;
- <S:Lorg/eclipse/swt/widgets/Control;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/Integer;>;
+ <S:Lorg/eclipse/swt/widgets/Control;>()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/Integer;>;
 scaleSelection
  ()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/Scale;Ljava/lang/Integer;>;
- ()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/Scale;Ljava/lang/Integer;>;
+ ()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/Scale;Ljava/lang/Integer;>;
 singleSelectionIndex
  <S:Lorg/eclipse/swt/widgets/Control;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/Integer;>;
- <S:Lorg/eclipse/swt/widgets/Control;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/Integer;>;
+ <S:Lorg/eclipse/swt/widgets/Control;>()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/Integer;>;
 size
  <S:Lorg/eclipse/swt/widgets/Control;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Lorg/eclipse/swt/graphics/Point;>;
- <S:Lorg/eclipse/swt/widgets/Control;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Lorg/eclipse/swt/graphics/Point;>;
+ <S:Lorg/eclipse/swt/widgets/Control;>()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Lorg/eclipse/swt/graphics/Point;>;
 sliderSelection
  ()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/Slider;Ljava/lang/Integer;>;
- ()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/Slider;Ljava/lang/Integer;>;
+ ()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/Slider;Ljava/lang/Integer;>;
 spinnerSelection
  ()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/Spinner;Ljava/lang/Integer;>;
- ()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/Spinner;Ljava/lang/Integer;>;
+ ()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<Lorg/eclipse/swt/widgets/Spinner;Ljava/lang/Integer;>;
 text
  <S:Lorg/eclipse/swt/widgets/Widget;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/String;>;
- <S:Lorg/eclipse/swt/widgets/Widget;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/String;>;
+ <S:Lorg/eclipse/swt/widgets/Widget;>()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/String;>;
 text
  <S:Lorg/eclipse/swt/widgets/Widget;>(I)Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/String;>;
  <S:Lorg/eclipse/swt/widgets/Widget;>(I)Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/String;>;
 text
  <S:Lorg/eclipse/swt/widgets/Widget;>([I)Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/String;>;
- <S:Lorg/eclipse/swt/widgets/Widget;>([I)Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/String;>;
+ <S:Lorg/eclipse/swt/widgets/Widget;>([I)L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/String;>;
 tooltipText
  <S:Lorg/eclipse/swt/widgets/Widget;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/String;>;
- <S:Lorg/eclipse/swt/widgets/Widget;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/String;>;
+ <S:Lorg/eclipse/swt/widgets/Widget;>()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/String;>;
 visible
  <S:Lorg/eclipse/swt/widgets/Widget;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/Boolean;>;
- <S:Lorg/eclipse/swt/widgets/Widget;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/Boolean;>;
+ <S:Lorg/eclipse/swt/widgets/Widget;>()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;Ljava/lang/Boolean;>;
 widgetSelection
  <S:Lorg/eclipse/swt/widgets/Widget;T:Ljava/lang/Object;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;TT;>;
- <S:Lorg/eclipse/swt/widgets/Widget;T:Ljava/lang/Object;>()Lorg/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;TT;>;
+ <S:Lorg/eclipse/swt/widgets/Widget;T:Ljava/lang/Object;>()L1org/eclipse/jface/databinding/swt/IWidgetValueProperty<TS;TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/util/JFaceProperties.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/util/JFaceProperties.eea
index 7dce4bd220..379b07b3fd 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/util/JFaceProperties.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/util/JFaceProperties.eea
@@ -2,4 +2,4 @@ class org/eclipse/jface/databinding/util/JFaceProperties
 
 value
  <S:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;TT;>;
- <S:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;TT;>;
+ <S:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;Ljava/lang/String;Ljava/lang/String;)L1org/eclipse/core/databinding/property/value/IValueProperty<TS;TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/CellEditorProperties.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/CellEditorProperties.eea
index 29f06ed86c..0eda94fb7f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/CellEditorProperties.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/CellEditorProperties.eea
@@ -2,4 +2,4 @@ class org/eclipse/jface/databinding/viewers/CellEditorProperties
 
 control
  ()Lorg/eclipse/core/databinding/property/value/IValueProperty<Lorg/eclipse/jface/viewers/CellEditor;Lorg/eclipse/swt/widgets/Control;>;
- ()Lorg/eclipse/core/databinding/property/value/IValueProperty<Lorg/eclipse/jface/viewers/CellEditor;Lorg/eclipse/swt/widgets/Control;>;
+ ()L1org/eclipse/core/databinding/property/value/IValueProperty<Lorg/eclipse/jface/viewers/CellEditor;Lorg/eclipse/swt/widgets/Control;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/ObservableValueEditingSupport.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/ObservableValueEditingSupport.eea
index 3fcd22e871..8b6ab89194 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/ObservableValueEditingSupport.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/ObservableValueEditingSupport.eea
@@ -4,7 +4,7 @@ class org/eclipse/jface/databinding/viewers/ObservableValueEditingSupport
 
 create
  <E:Ljava/lang/Object;M:Ljava/lang/Object;T:Ljava/lang/Object;>(Lorg/eclipse/jface/viewers/ColumnViewer;Lorg/eclipse/core/databinding/DataBindingContext;Lorg/eclipse/jface/viewers/CellEditor;Lorg/eclipse/core/databinding/property/value/IValueProperty<-Lorg/eclipse/jface/viewers/CellEditor;TT;>;Lorg/eclipse/core/databinding/property/value/IValueProperty<TE;TM;>;)Lorg/eclipse/jface/viewers/EditingSupport;
- <E:Ljava/lang/Object;M:Ljava/lang/Object;T:Ljava/lang/Object;>(Lorg/eclipse/jface/viewers/ColumnViewer;Lorg/eclipse/core/databinding/DataBindingContext;Lorg/eclipse/jface/viewers/CellEditor;Lorg/eclipse/core/databinding/property/value/IValueProperty<-Lorg/eclipse/jface/viewers/CellEditor;TT;>;Lorg/eclipse/core/databinding/property/value/IValueProperty<TE;TM;>;)Lorg/eclipse/jface/viewers/EditingSupport;
+ <E:Ljava/lang/Object;M:Ljava/lang/Object;T:Ljava/lang/Object;>(Lorg/eclipse/jface/viewers/ColumnViewer;Lorg/eclipse/core/databinding/DataBindingContext;Lorg/eclipse/jface/viewers/CellEditor;Lorg/eclipse/core/databinding/property/value/IValueProperty<-Lorg/eclipse/jface/viewers/CellEditor;TT;>;Lorg/eclipse/core/databinding/property/value/IValueProperty<TE;TM;>;)L1org/eclipse/jface/viewers/EditingSupport;
 
 <init>
  (Lorg/eclipse/jface/viewers/ColumnViewer;Lorg/eclipse/core/databinding/DataBindingContext;)V
@@ -14,7 +14,7 @@ canEdit
  (Ljava/lang/Object;)Z
 createBinding
  (Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;)Lorg/eclipse/core/databinding/Binding;
- (Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;)Lorg/eclipse/core/databinding/Binding;
+ (Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;Lorg/eclipse/core/databinding/observable/value/IObservableValue<TM;>;)L1org/eclipse/core/databinding/Binding;
 doCreateCellEditorObservable
  (Lorg/eclipse/jface/viewers/CellEditor;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
  (Lorg/eclipse/jface/viewers/CellEditor;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
@@ -26,7 +26,7 @@ getDataBindingContext
  ()Lorg/eclipse/core/databinding/DataBindingContext;
 getValue
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L0java/lang/Object;
 initializeCellEditorValue
  (Lorg/eclipse/jface/viewers/CellEditor;Lorg/eclipse/jface/viewers/ViewerCell;)V
  (Lorg/eclipse/jface/viewers/CellEditor;Lorg/eclipse/jface/viewers/ViewerCell;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/TreeStructureAdvisor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/TreeStructureAdvisor.eea
index 646b696a09..ed44758406 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/TreeStructureAdvisor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/TreeStructureAdvisor.eea
@@ -4,7 +4,7 @@ class org/eclipse/jface/databinding/viewers/TreeStructureAdvisor
 
 getParent
  (TE;)TE;
- (TE;)TE;
+ (TE;)T0E;
 hasChildren
  (TE;)Ljava/lang/Boolean;
- (TE;)Ljava/lang/Boolean;
+ (TE;)L0java/lang/Boolean;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/ViewerListProperty.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/ViewerListProperty.eea
index 25f998e790..3bfe5709c4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/ViewerListProperty.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/ViewerListProperty.eea
@@ -11,7 +11,7 @@ super org/eclipse/jface/databinding/viewers/IViewerListProperty
 
 observe
  (Lorg/eclipse/core/databinding/observable/Realm;TS;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;
- (Lorg/eclipse/core/databinding/observable/Realm;TS;)Lorg/eclipse/core/databinding/observable/list/IObservableList<TE;>;
+ (Lorg/eclipse/core/databinding/observable/Realm;TS;)L1org/eclipse/core/databinding/observable/list/IObservableList<TE;>; # @Inherited(org.eclipse.core.databinding.property.list.SimpleListProperty)
 observe
  (Lorg/eclipse/jface/viewers/Viewer;)Lorg/eclipse/jface/databinding/viewers/IViewerObservableList<TE;>;
  (Lorg/eclipse/jface/viewers/Viewer;)Lorg/eclipse/jface/databinding/viewers/IViewerObservableList<TE;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/ViewerSetProperty.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/ViewerSetProperty.eea
index 653d6d7d32..477e551bb7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/ViewerSetProperty.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/ViewerSetProperty.eea
@@ -11,7 +11,7 @@ super org/eclipse/jface/databinding/viewers/IViewerSetProperty
 
 observe
  (Lorg/eclipse/core/databinding/observable/Realm;TS;)Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
- (Lorg/eclipse/core/databinding/observable/Realm;TS;)Lorg/eclipse/core/databinding/observable/set/IObservableSet<TE;>;
+ (Lorg/eclipse/core/databinding/observable/Realm;TS;)L1org/eclipse/core/databinding/observable/set/IObservableSet<TE;>; # @Inherited(org.eclipse.core.databinding.property.set.SimpleSetProperty)
 observe
  (Lorg/eclipse/jface/viewers/Viewer;)Lorg/eclipse/jface/databinding/viewers/IViewerObservableSet<TE;>;
  (Lorg/eclipse/jface/viewers/Viewer;)Lorg/eclipse/jface/databinding/viewers/IViewerObservableSet<TE;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/ViewerValueProperty.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/ViewerValueProperty.eea
index 7c84de4427..58aca13b29 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/ViewerValueProperty.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/ViewerValueProperty.eea
@@ -11,7 +11,7 @@ super org/eclipse/jface/databinding/viewers/IViewerValueProperty
 
 observe
  (Lorg/eclipse/core/databinding/observable/Realm;TS;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
- (Lorg/eclipse/core/databinding/observable/Realm;TS;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
+ (Lorg/eclipse/core/databinding/observable/Realm;TS;)L1org/eclipse/core/databinding/observable/value/IObservableValue<TT;>; # @Inherited(org.eclipse.core.databinding.property.value.SimpleValueProperty)
 observe
  (Lorg/eclipse/jface/viewers/Viewer;)Lorg/eclipse/jface/databinding/viewers/IViewerObservableValue<TT;>;
  (Lorg/eclipse/jface/viewers/Viewer;)Lorg/eclipse/jface/databinding/viewers/IViewerObservableValue<TT;>;
@@ -20,4 +20,4 @@ observe
  (TS;)Lorg/eclipse/core/databinding/observable/value/IObservableValue<TT;>;
 observeDelayed
  (ILorg/eclipse/jface/viewers/Viewer;)Lorg/eclipse/jface/databinding/viewers/IViewerObservableValue<TT;>;
- (ILorg/eclipse/jface/viewers/Viewer;)Lorg/eclipse/jface/databinding/viewers/IViewerObservableValue<TT;>;
+ (ILorg/eclipse/jface/viewers/Viewer;)L1org/eclipse/jface/databinding/viewers/IViewerObservableValue<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/typed/ViewerProperties.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/typed/ViewerProperties.eea
index 047ed5399e..4694407a64 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/typed/ViewerProperties.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/viewers/typed/ViewerProperties.eea
@@ -2,19 +2,19 @@ class org/eclipse/jface/databinding/viewers/typed/ViewerProperties
 
 checkedElements
  <S::Lorg/eclipse/jface/viewers/ICheckable;E:Ljava/lang/Object;>(Ljava/lang/Object;)Lorg/eclipse/jface/databinding/viewers/IViewerSetProperty<TS;TE;>;
- <S::Lorg/eclipse/jface/viewers/ICheckable;E:Ljava/lang/Object;>(Ljava/lang/Object;)Lorg/eclipse/jface/databinding/viewers/IViewerSetProperty<TS;TE;>;
+ <S::Lorg/eclipse/jface/viewers/ICheckable;E:Ljava/lang/Object;>(Ljava/lang/Object;)L1org/eclipse/jface/databinding/viewers/IViewerSetProperty<TS;TE;>;
 checkedElements
  <S::Lorg/eclipse/jface/viewers/ICheckable;T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/eclipse/jface/databinding/viewers/IViewerSetProperty<TS;TT;>;
- <S::Lorg/eclipse/jface/viewers/ICheckable;T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/eclipse/jface/databinding/viewers/IViewerSetProperty<TS;TT;>;
+ <S::Lorg/eclipse/jface/viewers/ICheckable;T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1org/eclipse/jface/databinding/viewers/IViewerSetProperty<TS;TT;>;
 filters
  <S:Lorg/eclipse/jface/viewers/StructuredViewer;>()Lorg/eclipse/jface/databinding/viewers/IViewerSetProperty<TS;Lorg/eclipse/jface/viewers/ViewerFilter;>;
- <S:Lorg/eclipse/jface/viewers/StructuredViewer;>()Lorg/eclipse/jface/databinding/viewers/IViewerSetProperty<TS;Lorg/eclipse/jface/viewers/ViewerFilter;>;
+ <S:Lorg/eclipse/jface/viewers/StructuredViewer;>()L1org/eclipse/jface/databinding/viewers/IViewerSetProperty<TS;Lorg/eclipse/jface/viewers/ViewerFilter;>;
 input
  <S:Lorg/eclipse/jface/viewers/Viewer;E:Ljava/lang/Object;>()Lorg/eclipse/jface/databinding/viewers/IViewerValueProperty<TS;TE;>;
- <S:Lorg/eclipse/jface/viewers/Viewer;E:Ljava/lang/Object;>()Lorg/eclipse/jface/databinding/viewers/IViewerValueProperty<TS;TE;>;
+ <S:Lorg/eclipse/jface/viewers/Viewer;E:Ljava/lang/Object;>()L1org/eclipse/jface/databinding/viewers/IViewerValueProperty<TS;TE;>;
 input
  <S:Lorg/eclipse/jface/viewers/Viewer;T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/eclipse/jface/databinding/viewers/IViewerValueProperty<TS;TT;>;
- <S:Lorg/eclipse/jface/viewers/Viewer;T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/eclipse/jface/databinding/viewers/IViewerValueProperty<TS;TT;>;
+ <S:Lorg/eclipse/jface/viewers/Viewer;T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1org/eclipse/jface/databinding/viewers/IViewerValueProperty<TS;TT;>;
 multiplePostSelection
  <S::Lorg/eclipse/jface/viewers/ISelectionProvider;E:Ljava/lang/Object;>()Lorg/eclipse/jface/databinding/viewers/IViewerListProperty<TS;TE;>;
  <S::Lorg/eclipse/jface/viewers/ISelectionProvider;E:Ljava/lang/Object;>()Lorg/eclipse/jface/databinding/viewers/IViewerListProperty<TS;TE;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/wizard/WizardPageSupport.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/wizard/WizardPageSupport.eea
index c48297ea14..6a29439fba 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/wizard/WizardPageSupport.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/databinding/wizard/WizardPageSupport.eea
@@ -2,4 +2,4 @@ class org/eclipse/jface/databinding/wizard/WizardPageSupport
 
 create
  (Lorg/eclipse/jface/wizard/WizardPage;Lorg/eclipse/core/databinding/DataBindingContext;)Lorg/eclipse/jface/databinding/wizard/WizardPageSupport;
- (Lorg/eclipse/jface/wizard/WizardPage;Lorg/eclipse/core/databinding/DataBindingContext;)Lorg/eclipse/jface/databinding/wizard/WizardPageSupport;
+ (Lorg/eclipse/jface/wizard/WizardPage;Lorg/eclipse/core/databinding/DataBindingContext;)L1org/eclipse/jface/databinding/wizard/WizardPageSupport;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/AbstractSelectionDialog.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/AbstractSelectionDialog.eea
index dac0ebe6f8..ac62e2c7ff 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/AbstractSelectionDialog.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/AbstractSelectionDialog.eea
@@ -10,7 +10,7 @@ configureShell
  (L1org/eclipse/swt/widgets/Shell;)V # @Inherited(org.eclipse.jface.window.Window)
 createMessageArea
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Label;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Label;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Label;
 getDialogBoundsSettings
  ()Lorg/eclipse/jface/dialogs/IDialogSettings;
  ()L0org/eclipse/jface/dialogs/IDialogSettings; # @Inherited(org.eclipse.jface.dialogs.Dialog)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/AnimatorFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/AnimatorFactory.eea
index f34e7aaf04..5b4d586c60 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/AnimatorFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/AnimatorFactory.eea
@@ -2,4 +2,4 @@ class org/eclipse/jface/dialogs/AnimatorFactory
 
 createAnimator
  (Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/jface/dialogs/ControlAnimator;
- (Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/jface/dialogs/ControlAnimator;
+ (Lorg/eclipse/swt/widgets/Control;)L1org/eclipse/jface/dialogs/ControlAnimator;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/ControlEnableState.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/ControlEnableState.eea
index 59d7d2cfca..814e99250b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/ControlEnableState.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/ControlEnableState.eea
@@ -2,10 +2,10 @@ class org/eclipse/jface/dialogs/ControlEnableState
 
 disable
  (Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/jface/dialogs/ControlEnableState;
- (Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/jface/dialogs/ControlEnableState;
+ (Lorg/eclipse/swt/widgets/Control;)L1org/eclipse/jface/dialogs/ControlEnableState;
 disable
  (Lorg/eclipse/swt/widgets/Control;Ljava/util/List<Lorg/eclipse/swt/widgets/Control;>;)Lorg/eclipse/jface/dialogs/ControlEnableState;
- (Lorg/eclipse/swt/widgets/Control;Ljava/util/List<Lorg/eclipse/swt/widgets/Control;>;)Lorg/eclipse/jface/dialogs/ControlEnableState;
+ (Lorg/eclipse/swt/widgets/Control;Ljava/util/List<Lorg/eclipse/swt/widgets/Control;>;)L1org/eclipse/jface/dialogs/ControlEnableState;
 
 <init>
  (Lorg/eclipse/swt/widgets/Control;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/DialogPage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/DialogPage.eea
index 83837b05aa..ed6e68cc1f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/DialogPage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/DialogPage.eea
@@ -14,7 +14,7 @@ getDescription
  ()Ljava/lang/String;
 getDialogFontName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getErrorMessage
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -35,7 +35,7 @@ getTitle
  ()Ljava/lang/String;
 getToolTipText
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 initializeDialogUnits
  (Lorg/eclipse/swt/widgets/Control;)V
  (Lorg/eclipse/swt/widgets/Control;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/DialogSettings.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/DialogSettings.eea
index 4cd694bdd9..954098bfb2 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/DialogSettings.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/DialogSettings.eea
@@ -9,7 +9,7 @@ getOrCreateSection
  (Ljava/lang/String;)V
 addNewSection
  (Ljava/lang/String;)Lorg/eclipse/jface/dialogs/IDialogSettings;
- (Ljava/lang/String;)Lorg/eclipse/jface/dialogs/IDialogSettings;
+ (Ljava/lang/String;)L1org/eclipse/jface/dialogs/IDialogSettings;
 addSection
  (Lorg/eclipse/jface/dialogs/IDialogSettings;)V
  (Lorg/eclipse/jface/dialogs/IDialogSettings;)V
@@ -42,7 +42,7 @@ getSection
  (Ljava/lang/String;)Lorg/eclipse/jface/dialogs/IDialogSettings;
 getSections
  ()[Lorg/eclipse/jface/dialogs/IDialogSettings;
- ()[Lorg/eclipse/jface/dialogs/IDialogSettings;
+ ()[1Lorg/eclipse/jface/dialogs/IDialogSettings;
 load
  (Ljava/io/Reader;)V
  (Ljava/io/Reader;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/DialogTray.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/DialogTray.eea
index 24b82af68b..7b0ddbea0b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/DialogTray.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/DialogTray.eea
@@ -2,4 +2,4 @@ class org/eclipse/jface/dialogs/DialogTray
 
 createContents
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/ErrorDialog.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/ErrorDialog.eea
index 3d2d799543..ebaa03af5e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/ErrorDialog.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/ErrorDialog.eea
@@ -30,7 +30,7 @@ createDialogArea
  (L1org/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.jface.dialogs.Dialog)
 createDropDownList
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/List;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/List;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/List;
 getImage
  ()Lorg/eclipse/swt/graphics/Image;
  ()Lorg/eclipse/swt/graphics/Image;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/ErrorSupportProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/ErrorSupportProvider.eea
index c3f55a567b..c037e54163 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/ErrorSupportProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/ErrorSupportProvider.eea
@@ -2,7 +2,7 @@ class org/eclipse/jface/dialogs/ErrorSupportProvider
 
 createSupportArea
  (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/core/runtime/IStatus;)Lorg/eclipse/swt/widgets/Control;
- (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/core/runtime/IStatus;)Lorg/eclipse/swt/widgets/Control;
+ (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/core/runtime/IStatus;)L1org/eclipse/swt/widgets/Control;
 validFor
  (Lorg/eclipse/core/runtime/IStatus;)Z
  (Lorg/eclipse/core/runtime/IStatus;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/IconAndMessageDialog.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/IconAndMessageDialog.eea
index 2b3de98d25..d67fe409f7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/IconAndMessageDialog.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/IconAndMessageDialog.eea
@@ -24,7 +24,7 @@ createDialogAndButtonArea
  (Lorg/eclipse/swt/widgets/Composite;)V
 createMessageArea
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control;
 getErrorImage
  ()Lorg/eclipse/swt/graphics/Image;
  ()Lorg/eclipse/swt/graphics/Image;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/InputDialog.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/InputDialog.eea
index c2228fde68..e70e35412d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/InputDialog.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/InputDialog.eea
@@ -14,7 +14,7 @@ createDialogArea
  (L1org/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.jface.dialogs.Dialog)
 getErrorMessageLabel
  ()Lorg/eclipse/swt/widgets/Label;
- ()Lorg/eclipse/swt/widgets/Label;
+ ()L0org/eclipse/swt/widgets/Label;
 getOkButton
  ()Lorg/eclipse/swt/widgets/Button;
  ()Lorg/eclipse/swt/widgets/Button;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/MessageDialogWithToggle.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/MessageDialogWithToggle.eea
index c76e4dc53a..15e0b82d41 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/MessageDialogWithToggle.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/MessageDialogWithToggle.eea
@@ -49,7 +49,7 @@ createDialogArea
  (L1org/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.jface.dialogs.MessageDialog)
 createToggleButton
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Button;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Button;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Button;
 getPrefKey
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/PlainMessageDialog.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/PlainMessageDialog.eea
index 5bae79afb7..7cf4465dd6 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/PlainMessageDialog.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/PlainMessageDialog.eea
@@ -2,7 +2,7 @@ class org/eclipse/jface/dialogs/PlainMessageDialog
 
 getBuilder
  (Lorg/eclipse/swt/widgets/Shell;Ljava/lang/String;)Lorg/eclipse/jface/dialogs/PlainMessageDialog$Builder;
- (Lorg/eclipse/swt/widgets/Shell;Ljava/lang/String;)Lorg/eclipse/jface/dialogs/PlainMessageDialog$Builder;
+ (Lorg/eclipse/swt/widgets/Shell;Ljava/lang/String;)L1org/eclipse/jface/dialogs/PlainMessageDialog$Builder;
 
 configureShell
  (Lorg/eclipse/swt/widgets/Shell;)V
@@ -15,7 +15,7 @@ createButtonsForButtonBar
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.jface.dialogs.Dialog)
 createCustomArea
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control;
 createDialogArea
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
  (L1org/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.jface.dialogs.Dialog)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/PopupDialog.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/PopupDialog.eea
index 6ad20e352b..a776e31d73 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/PopupDialog.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/PopupDialog.eea
@@ -30,13 +30,13 @@ createDialogArea
  (L1org/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control;
 createInfoTextArea
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control;
 createTitleControl
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control;
 createTitleMenuArea
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control;
 fillDialogMenu
  (Lorg/eclipse/jface/action/IMenuManager;)V
  (Lorg/eclipse/jface/action/IMenuManager;)V
@@ -54,7 +54,7 @@ getDefaultSize
  ()Lorg/eclipse/swt/graphics/Point;
 getDialogSettings
  ()Lorg/eclipse/jface/dialogs/IDialogSettings;
- ()Lorg/eclipse/jface/dialogs/IDialogSettings;
+ ()L0org/eclipse/jface/dialogs/IDialogSettings;
 getFocusControl
  ()Lorg/eclipse/swt/widgets/Control;
  ()Lorg/eclipse/swt/widgets/Control;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/TrayDialog.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/TrayDialog.eea
index 5ee3085630..37ac0265b4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/TrayDialog.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/dialogs/TrayDialog.eea
@@ -11,7 +11,7 @@ createButtonBar
  (L1org/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.jface.dialogs.Dialog)
 createHelpControl
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control;
 getLayout
  ()Lorg/eclipse/swt/widgets/Layout;
  ()L0org/eclipse/swt/widgets/Layout; # @Inherited(org.eclipse.jface.window.Window)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/fieldassist/ContentProposalAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/fieldassist/ContentProposalAdapter.eea
index 53cae29f6a..2ca8b96256 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/fieldassist/ContentProposalAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/fieldassist/ContentProposalAdapter.eea
@@ -14,7 +14,7 @@ addContentProposalListener
  (L1org/eclipse/jface/fieldassist/IContentProposalListener;)V
 getAutoActivationCharacters
  ()[C
- ()[C
+ ()[0C
 getContentProposalProvider
  ()Lorg/eclipse/jface/fieldassist/IContentProposalProvider;
  ()Lorg/eclipse/jface/fieldassist/IContentProposalProvider;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/fieldassist/FieldAssistColors.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/fieldassist/FieldAssistColors.eea
index 6c793128e1..2e50a99e95 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/fieldassist/FieldAssistColors.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/fieldassist/FieldAssistColors.eea
@@ -2,7 +2,7 @@ class org/eclipse/jface/fieldassist/FieldAssistColors
 
 computeErrorFieldBackgroundRGB
  (Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/graphics/RGB;
- (Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/graphics/RGB;
+ (Lorg/eclipse/swt/widgets/Control;)L1org/eclipse/swt/graphics/RGB;
 getRequiredFieldBackgroundColor
  (Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/graphics/Color;
  (Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/graphics/Color;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/fieldassist/FieldDecorationRegistry.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/fieldassist/FieldDecorationRegistry.eea
index df690413f1..67ff0f662a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/fieldassist/FieldDecorationRegistry.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/fieldassist/FieldDecorationRegistry.eea
@@ -28,7 +28,7 @@ setDefault
 
 getFieldDecoration
  (Ljava/lang/String;)Lorg/eclipse/jface/fieldassist/FieldDecoration;
- (Ljava/lang/String;)Lorg/eclipse/jface/fieldassist/FieldDecoration;
+ (Ljava/lang/String;)L0org/eclipse/jface/fieldassist/FieldDecoration;
 registerFieldDecoration
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/notifications/AbstractNotificationPopup.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/notifications/AbstractNotificationPopup.eea
index 461d6c42bf..7a244f8da5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/notifications/AbstractNotificationPopup.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/notifications/AbstractNotificationPopup.eea
@@ -27,10 +27,10 @@ createTitleArea
  (Lorg/eclipse/swt/widgets/Composite;)V
 createWindowActivationHelper
  (Lorg/eclipse/swt/widgets/Shell;)Lorg/eclipse/swt/events/MouseListener;
- (Lorg/eclipse/swt/widgets/Shell;)Lorg/eclipse/swt/events/MouseListener;
+ (Lorg/eclipse/swt/widgets/Shell;)L1org/eclipse/swt/events/MouseListener;
 getPopupShellImage
  (I)Lorg/eclipse/swt/graphics/Image;
- (I)Lorg/eclipse/swt/graphics/Image;
+ (I)L0org/eclipse/swt/graphics/Image;
 getPopupShellTitle
  ()Ljava/lang/String;
  ()L1java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/notifications/NotificationPopup.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/notifications/NotificationPopup.eea
index 3b0a66426f..e276e02e75 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/notifications/NotificationPopup.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/notifications/NotificationPopup.eea
@@ -2,7 +2,7 @@ class org/eclipse/jface/notifications/NotificationPopup
 
 forDisplay
  (Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/jface/notifications/NotificationPopup$Builder;
- (Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/jface/notifications/NotificationPopup$Builder;
+ (Lorg/eclipse/swt/widgets/Display;)L1org/eclipse/jface/notifications/NotificationPopup$Builder;
 forShell
  (Lorg/eclipse/swt/widgets/Shell;)Lorg/eclipse/jface/notifications/NotificationPopup$Builder;
  (Lorg/eclipse/swt/widgets/Shell;)Lorg/eclipse/jface/notifications/NotificationPopup$Builder;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/operation/ProgressMonitorUtil.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/operation/ProgressMonitorUtil.eea
index 325f3209fd..382dd25d61 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/operation/ProgressMonitorUtil.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/operation/ProgressMonitorUtil.eea
@@ -2,7 +2,7 @@ class org/eclipse/jface/operation/ProgressMonitorUtil
 
 createAccumulatingProgressMonitor
  (Lorg/eclipse/core/runtime/IProgressMonitor;Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/core/runtime/IProgressMonitorWithBlocking;
- (Lorg/eclipse/core/runtime/IProgressMonitor;Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/core/runtime/IProgressMonitorWithBlocking;
+ (Lorg/eclipse/core/runtime/IProgressMonitor;Lorg/eclipse/swt/widgets/Display;)L1org/eclipse/core/runtime/IProgressMonitorWithBlocking;
 createUIProgressMonitor
  (Lorg/eclipse/core/runtime/IProgressMonitor;Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/core/runtime/IProgressMonitor;
- (Lorg/eclipse/core/runtime/IProgressMonitor;Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/core/runtime/IProgressMonitor;
+ (Lorg/eclipse/core/runtime/IProgressMonitor;Lorg/eclipse/swt/widgets/Display;)L1org/eclipse/core/runtime/IProgressMonitor;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/DirectoryFieldEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/DirectoryFieldEditor.eea
index 3a029e053f..d21b94733b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/DirectoryFieldEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/DirectoryFieldEditor.eea
@@ -5,7 +5,7 @@ class org/eclipse/jface/preference/DirectoryFieldEditor
  (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/swt/widgets/Composite;)V
 changePressed
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 setFilterPath
  (Ljava/io/File;)V
  (Ljava/io/File;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/FieldEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/FieldEditor.eea
index 11f61a72ad..b6862ec0ae 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/FieldEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/FieldEditor.eea
@@ -54,7 +54,7 @@ getPreferenceName
  ()L1java/lang/String;
 getPreferencePage
  ()Lorg/eclipse/jface/preference/PreferencePage;
- ()Lorg/eclipse/jface/preference/PreferencePage;
+ ()L0org/eclipse/jface/preference/PreferencePage;
 getPreferenceStore
  ()Lorg/eclipse/jface/preference/IPreferenceStore;
  ()Lorg/eclipse/jface/preference/IPreferenceStore;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/FileFieldEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/FileFieldEditor.eea
index 99cb677f83..50d98d4f51 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/FileFieldEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/FileFieldEditor.eea
@@ -11,7 +11,7 @@ class org/eclipse/jface/preference/FileFieldEditor
  (Ljava/lang/String;Ljava/lang/String;ZLorg/eclipse/swt/widgets/Composite;)V
 changePressed
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 setFileExtensions
  ([Ljava/lang/String;)V
  ([Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/FontFieldEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/FontFieldEditor.eea
index e968cce45e..8f4eb4ebb5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/FontFieldEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/FontFieldEditor.eea
@@ -14,7 +14,7 @@ getChangeControl
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Button;
 getPreviewControl
  ()Lorg/eclipse/swt/widgets/Control;
- ()Lorg/eclipse/swt/widgets/Control;
+ ()L0org/eclipse/swt/widgets/Control;
 getValueControl
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Label;
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Label;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/ListEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/ListEditor.eea
index 90cca79921..8db03a0b12 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/ListEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/ListEditor.eea
@@ -5,7 +5,7 @@ class org/eclipse/jface/preference/ListEditor
  (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/swt/widgets/Composite;)V
 createList
  ([Ljava/lang/String;)Ljava/lang/String;
- ([Ljava/lang/String;)Ljava/lang/String;
+ ([Ljava/lang/String;)L1java/lang/String;
 doFillIntoGrid
  (Lorg/eclipse/swt/widgets/Composite;I)V
  (L1org/eclipse/swt/widgets/Composite;I)V # @Inherited(org.eclipse.jface.preference.FieldEditor)
@@ -32,7 +32,7 @@ getRemoveButton
  ()Lorg/eclipse/swt/widgets/Button;
 getShell
  ()Lorg/eclipse/swt/widgets/Shell;
- ()Lorg/eclipse/swt/widgets/Shell;
+ ()L0org/eclipse/swt/widgets/Shell;
 getUpButton
  ()Lorg/eclipse/swt/widgets/Button;
  ()Lorg/eclipse/swt/widgets/Button;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/PathEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/PathEditor.eea
index d29da173a5..b278a1f4fc 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/PathEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/PathEditor.eea
@@ -5,10 +5,10 @@ class org/eclipse/jface/preference/PathEditor
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/swt/widgets/Composite;)V
 createList
  ([Ljava/lang/String;)Ljava/lang/String;
- ([Ljava/lang/String;)Ljava/lang/String;
+ ([Ljava/lang/String;)L1java/lang/String; # @Inherited(org.eclipse.jface.preference.ListEditor)
 getNewInputObject
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 parseString
  (Ljava/lang/String;)[Ljava/lang/String;
  (Ljava/lang/String;)[Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/PreferenceConverter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/PreferenceConverter.eea
index 4c3a055183..7adf443bcc 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/PreferenceConverter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/PreferenceConverter.eea
@@ -54,7 +54,7 @@ getRectangle
  (Lorg/eclipse/jface/preference/IPreferenceStore;Ljava/lang/String;)Lorg/eclipse/swt/graphics/Rectangle;
 getStoredRepresentation
  ([Lorg/eclipse/swt/graphics/FontData;)Ljava/lang/String;
- ([Lorg/eclipse/swt/graphics/FontData;)Ljava/lang/String;
+ ([Lorg/eclipse/swt/graphics/FontData;)L1java/lang/String;
 putValue
  (Lorg/eclipse/jface/preference/IPreferenceStore;Ljava/lang/String;[Lorg/eclipse/swt/graphics/FontData;)V
  (Lorg/eclipse/jface/preference/IPreferenceStore;Ljava/lang/String;[Lorg/eclipse/swt/graphics/FontData;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/PreferenceDialog.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/PreferenceDialog.eea
index 75d9f30377..dc82bb930a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/PreferenceDialog.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/PreferenceDialog.eea
@@ -33,25 +33,25 @@ createPage
  (Lorg/eclipse/jface/preference/IPreferenceNode;)V
 createPageContainer
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Composite;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Composite;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Composite;
 createPageControl
  (Lorg/eclipse/jface/preference/IPreferencePage;Lorg/eclipse/swt/widgets/Composite;)V
  (Lorg/eclipse/jface/preference/IPreferencePage;Lorg/eclipse/swt/widgets/Composite;)V
 createSash
  (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/widgets/Sash;
- (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/widgets/Sash;
+ (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/swt/widgets/Control;)L1org/eclipse/swt/widgets/Sash;
 createTitleArea
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Composite;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Composite;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Composite;
 createTreeAreaContents
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control;
 createTreeViewer
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/viewers/TreeViewer;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/viewers/TreeViewer;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/jface/viewers/TreeViewer;
 findNodeMatching
  (Ljava/lang/String;)Lorg/eclipse/jface/preference/IPreferenceNode;
- (Ljava/lang/String;)Lorg/eclipse/jface/preference/IPreferenceNode;
+ (Ljava/lang/String;)L0org/eclipse/jface/preference/IPreferenceNode;
 firePageChanged
  (Lorg/eclipse/jface/dialogs/PageChangedEvent;)V
  (Lorg/eclipse/jface/dialogs/PageChangedEvent;)V
@@ -66,7 +66,7 @@ getPageContainer
  ()Lorg/eclipse/swt/widgets/Composite;
 getPageLayout
  ()Lorg/eclipse/swt/widgets/Layout;
- ()Lorg/eclipse/swt/widgets/Layout;
+ ()L1org/eclipse/swt/widgets/Layout;
 getPreferenceManager
  ()Lorg/eclipse/jface/preference/PreferenceManager;
  ()Lorg/eclipse/jface/preference/PreferenceManager;
@@ -81,7 +81,7 @@ getSelectedPage
  ()Ljava/lang/Object;
 getSingleSelection
  (Lorg/eclipse/jface/viewers/ISelection;)Lorg/eclipse/jface/preference/IPreferenceNode;
- (Lorg/eclipse/jface/viewers/ISelection;)Lorg/eclipse/jface/preference/IPreferenceNode;
+ (Lorg/eclipse/jface/viewers/ISelection;)L0org/eclipse/jface/preference/IPreferenceNode;
 getTreeViewer
  ()Lorg/eclipse/jface/viewers/TreeViewer;
  ()Lorg/eclipse/jface/viewers/TreeViewer;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/PreferenceManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/PreferenceManager.eea
index 2ed4d735ca..7549d6e9cd 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/PreferenceManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/PreferenceManager.eea
@@ -17,10 +17,10 @@ find
  (Ljava/lang/String;)Lorg/eclipse/jface/preference/IPreferenceNode;
 find
  (Ljava/lang/String;Lorg/eclipse/jface/preference/IPreferenceNode;)Lorg/eclipse/jface/preference/IPreferenceNode;
- (Ljava/lang/String;Lorg/eclipse/jface/preference/IPreferenceNode;)Lorg/eclipse/jface/preference/IPreferenceNode;
+ (Ljava/lang/String;Lorg/eclipse/jface/preference/IPreferenceNode;)L0org/eclipse/jface/preference/IPreferenceNode;
 getElements
  (I)Ljava/util/List<Lorg/eclipse/jface/preference/IPreferenceNode;>;
- (I)Ljava/util/List<Lorg/eclipse/jface/preference/IPreferenceNode;>;
+ (I)L1java/util/List<Lorg/eclipse/jface/preference/IPreferenceNode;>;
 getRoot
  ()Lorg/eclipse/jface/preference/IPreferenceNode;
  ()Lorg/eclipse/jface/preference/IPreferenceNode;
@@ -29,7 +29,7 @@ getRootSubNodes
  ()[Lorg/eclipse/jface/preference/IPreferenceNode;
 remove
  (Ljava/lang/String;)Lorg/eclipse/jface/preference/IPreferenceNode;
- (Ljava/lang/String;)Lorg/eclipse/jface/preference/IPreferenceNode;
+ (Ljava/lang/String;)L0org/eclipse/jface/preference/IPreferenceNode;
 remove
  (Lorg/eclipse/jface/preference/IPreferenceNode;)Z
  (Lorg/eclipse/jface/preference/IPreferenceNode;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/PreferenceNode.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/PreferenceNode.eea
index 9b3d2cbc19..ce1e6bb79f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/PreferenceNode.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/PreferenceNode.eea
@@ -14,7 +14,7 @@ add
  (Lorg/eclipse/jface/preference/IPreferenceNode;)V
 findSubNode
  (Ljava/lang/String;)Lorg/eclipse/jface/preference/IPreferenceNode;
- (Ljava/lang/String;)Lorg/eclipse/jface/preference/IPreferenceNode;
+ (Ljava/lang/String;)L0org/eclipse/jface/preference/IPreferenceNode;
 getId
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/PreferencePage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/PreferencePage.eea
index 03ba0edd75..672b974719 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/PreferencePage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/PreferencePage.eea
@@ -26,10 +26,10 @@ createControl
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.jface.dialogs.IDialogPage)
 createDescriptionLabel
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Label;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Label;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Label;
 createNoteComposite
  (Lorg/eclipse/swt/graphics/Font;Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/swt/widgets/Composite;
- (Lorg/eclipse/swt/graphics/Font;Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/swt/widgets/Composite;
+ (Lorg/eclipse/swt/graphics/Font;Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;Ljava/lang/String;)L1org/eclipse/swt/widgets/Composite;
 doComputeSize
  ()Lorg/eclipse/swt/graphics/Point;
  ()Lorg/eclipse/swt/graphics/Point;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/StringButtonFieldEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/StringButtonFieldEditor.eea
index a7ed0cec5f..d90572e597 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/StringButtonFieldEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/preference/StringButtonFieldEditor.eea
@@ -14,7 +14,7 @@ getChangeControl
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Button;
 getShell
  ()Lorg/eclipse/swt/widgets/Shell;
- ()Lorg/eclipse/swt/widgets/Shell;
+ ()L0org/eclipse/swt/widgets/Shell;
 setChangeButtonText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/ColorDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/ColorDescriptor.eea
index 772d0db170..ca4a5c086a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/ColorDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/ColorDescriptor.eea
@@ -6,20 +6,20 @@ super org/eclipse/jface/resource/DeviceResourceDescriptor
 
 createFrom
  (Lorg/eclipse/swt/graphics/Color;)Lorg/eclipse/jface/resource/ColorDescriptor;
- (Lorg/eclipse/swt/graphics/Color;)Lorg/eclipse/jface/resource/ColorDescriptor;
+ (Lorg/eclipse/swt/graphics/Color;)L1org/eclipse/jface/resource/ColorDescriptor;
 createFrom
  (Lorg/eclipse/swt/graphics/Color;Lorg/eclipse/swt/graphics/Device;)Lorg/eclipse/jface/resource/ColorDescriptor;
- (Lorg/eclipse/swt/graphics/Color;Lorg/eclipse/swt/graphics/Device;)Lorg/eclipse/jface/resource/ColorDescriptor;
+ (Lorg/eclipse/swt/graphics/Color;Lorg/eclipse/swt/graphics/Device;)L1org/eclipse/jface/resource/ColorDescriptor;
 createFrom
  (Lorg/eclipse/swt/graphics/RGB;)Lorg/eclipse/jface/resource/ColorDescriptor;
- (Lorg/eclipse/swt/graphics/RGB;)Lorg/eclipse/jface/resource/ColorDescriptor;
+ (Lorg/eclipse/swt/graphics/RGB;)L1org/eclipse/jface/resource/ColorDescriptor;
 
 createColor
  (Lorg/eclipse/swt/graphics/Device;)Lorg/eclipse/swt/graphics/Color;
- (Lorg/eclipse/swt/graphics/Device;)Lorg/eclipse/swt/graphics/Color;
+ (Lorg/eclipse/swt/graphics/Device;)L1org/eclipse/swt/graphics/Color;
 createResource
  (Lorg/eclipse/swt/graphics/Device;)Ljava/lang/Object;
- (Lorg/eclipse/swt/graphics/Device;)Ljava/lang/Object;
+ (Lorg/eclipse/swt/graphics/Device;)L1java/lang/Object; # @Inherited(org.eclipse.jface.resource.DeviceResourceDescriptor)
 destroyColor
  (Lorg/eclipse/swt/graphics/Color;)V
  (Lorg/eclipse/swt/graphics/Color;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/ColorRegistry.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/ColorRegistry.eea
index d0b01aa3c8..059fe6add1 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/ColorRegistry.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/ColorRegistry.eea
@@ -15,7 +15,7 @@ displayRunnable
  (Lorg/eclipse/swt/widgets/Display;Z)V
 get
  (Ljava/lang/String;)Lorg/eclipse/swt/graphics/Color;
- (Ljava/lang/String;)Lorg/eclipse/swt/graphics/Color;
+ (Ljava/lang/String;)L0org/eclipse/swt/graphics/Color;
 getColorDescriptor
  (Ljava/lang/String;)Lorg/eclipse/jface/resource/ColorDescriptor;
  (Ljava/lang/String;)Lorg/eclipse/jface/resource/ColorDescriptor;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/CompositeImageDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/CompositeImageDescriptor.eea
index 0d6e77caa1..437fba69f3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/CompositeImageDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/CompositeImageDescriptor.eea
@@ -2,10 +2,10 @@ class org/eclipse/jface/resource/CompositeImageDescriptor
 
 createCachedImageDataProvider
  (Lorg/eclipse/jface/resource/ImageDescriptor;)Lorg/eclipse/jface/resource/CompositeImageDescriptor$CachedImageDataProvider;
- (Lorg/eclipse/jface/resource/ImageDescriptor;)Lorg/eclipse/jface/resource/CompositeImageDescriptor$CachedImageDataProvider;
+ (Lorg/eclipse/jface/resource/ImageDescriptor;)L1org/eclipse/jface/resource/CompositeImageDescriptor$CachedImageDataProvider;
 createCachedImageDataProvider
  (Lorg/eclipse/swt/graphics/Image;)Lorg/eclipse/jface/resource/CompositeImageDescriptor$CachedImageDataProvider;
- (Lorg/eclipse/swt/graphics/Image;)Lorg/eclipse/jface/resource/CompositeImageDescriptor$CachedImageDataProvider;
+ (Lorg/eclipse/swt/graphics/Image;)L1org/eclipse/jface/resource/CompositeImageDescriptor$CachedImageDataProvider;
 drawImage
  (Lorg/eclipse/swt/graphics/ImageData;II)V
  (Lorg/eclipse/swt/graphics/ImageData;II)V
@@ -17,7 +17,7 @@ getImageData
  ()Lorg/eclipse/swt/graphics/ImageData;
 getImageData
  (I)Lorg/eclipse/swt/graphics/ImageData;
- (I)Lorg/eclipse/swt/graphics/ImageData;
+ (I)L0org/eclipse/swt/graphics/ImageData; # @Inherited(org.eclipse.jface.resource.ImageDescriptor)
 getSize
  ()Lorg/eclipse/swt/graphics/Point;
  ()Lorg/eclipse/swt/graphics/Point;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/DeviceResourceDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/DeviceResourceDescriptor.eea
index ac514e94c5..5c3b5418c8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/DeviceResourceDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/DeviceResourceDescriptor.eea
@@ -4,7 +4,7 @@ class org/eclipse/jface/resource/DeviceResourceDescriptor
 
 createResource
  (Lorg/eclipse/swt/graphics/Device;)Ljava/lang/Object;
- (Lorg/eclipse/swt/graphics/Device;)Ljava/lang/Object;
+ (Lorg/eclipse/swt/graphics/Device;)L1java/lang/Object;
 destroyResource
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/FontDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/FontDescriptor.eea
index d394849a6f..72df4d8e3c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/FontDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/FontDescriptor.eea
@@ -6,32 +6,32 @@ super org/eclipse/jface/resource/DeviceResourceDescriptor
 
 copy
  (Lorg/eclipse/swt/graphics/FontData;)Lorg/eclipse/swt/graphics/FontData;
- (Lorg/eclipse/swt/graphics/FontData;)Lorg/eclipse/swt/graphics/FontData;
+ (Lorg/eclipse/swt/graphics/FontData;)L1org/eclipse/swt/graphics/FontData;
 copy
  ([Lorg/eclipse/swt/graphics/FontData;)[Lorg/eclipse/swt/graphics/FontData;
- ([Lorg/eclipse/swt/graphics/FontData;)[Lorg/eclipse/swt/graphics/FontData;
+ ([Lorg/eclipse/swt/graphics/FontData;)[1Lorg/eclipse/swt/graphics/FontData;
 createFrom
  (Ljava/lang/String;II)Lorg/eclipse/jface/resource/FontDescriptor;
- (Ljava/lang/String;II)Lorg/eclipse/jface/resource/FontDescriptor;
+ (Ljava/lang/String;II)L1org/eclipse/jface/resource/FontDescriptor;
 createFrom
  (Lorg/eclipse/swt/graphics/Font;)Lorg/eclipse/jface/resource/FontDescriptor;
- (Lorg/eclipse/swt/graphics/Font;)Lorg/eclipse/jface/resource/FontDescriptor;
+ (Lorg/eclipse/swt/graphics/Font;)L1org/eclipse/jface/resource/FontDescriptor;
 createFrom
  (Lorg/eclipse/swt/graphics/Font;Lorg/eclipse/swt/graphics/Device;)Lorg/eclipse/jface/resource/FontDescriptor;
- (Lorg/eclipse/swt/graphics/Font;Lorg/eclipse/swt/graphics/Device;)Lorg/eclipse/jface/resource/FontDescriptor;
+ (Lorg/eclipse/swt/graphics/Font;Lorg/eclipse/swt/graphics/Device;)L1org/eclipse/jface/resource/FontDescriptor;
 createFrom
  (Lorg/eclipse/swt/graphics/FontData;)Lorg/eclipse/jface/resource/FontDescriptor;
- (Lorg/eclipse/swt/graphics/FontData;)Lorg/eclipse/jface/resource/FontDescriptor;
+ (Lorg/eclipse/swt/graphics/FontData;)L1org/eclipse/jface/resource/FontDescriptor;
 createFrom
  ([Lorg/eclipse/swt/graphics/FontData;)Lorg/eclipse/jface/resource/FontDescriptor;
- ([Lorg/eclipse/swt/graphics/FontData;)Lorg/eclipse/jface/resource/FontDescriptor;
+ ([Lorg/eclipse/swt/graphics/FontData;)L1org/eclipse/jface/resource/FontDescriptor;
 
 createFont
  (Lorg/eclipse/swt/graphics/Device;)Lorg/eclipse/swt/graphics/Font;
- (Lorg/eclipse/swt/graphics/Device;)Lorg/eclipse/swt/graphics/Font;
+ (Lorg/eclipse/swt/graphics/Device;)L1org/eclipse/swt/graphics/Font;
 createResource
  (Lorg/eclipse/swt/graphics/Device;)Ljava/lang/Object;
- (Lorg/eclipse/swt/graphics/Device;)Ljava/lang/Object;
+ (Lorg/eclipse/swt/graphics/Device;)L1java/lang/Object; # @Inherited(org.eclipse.jface.resource.DeviceResourceDescriptor)
 destroyFont
  (Lorg/eclipse/swt/graphics/Font;)V
  (Lorg/eclipse/swt/graphics/Font;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/FontRegistry.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/FontRegistry.eea
index 527c8adbbf..e2e671f3f6 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/FontRegistry.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/FontRegistry.eea
@@ -18,10 +18,10 @@ displayRunnable
  (Lorg/eclipse/swt/widgets/Display;Z)V
 bestData
  ([Lorg/eclipse/swt/graphics/FontData;Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/swt/graphics/FontData;
- ([Lorg/eclipse/swt/graphics/FontData;Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/swt/graphics/FontData;
+ ([Lorg/eclipse/swt/graphics/FontData;Lorg/eclipse/swt/widgets/Display;)L0org/eclipse/swt/graphics/FontData;
 bestDataArray
  ([Lorg/eclipse/swt/graphics/FontData;Lorg/eclipse/swt/widgets/Display;)[Lorg/eclipse/swt/graphics/FontData;
- ([Lorg/eclipse/swt/graphics/FontData;Lorg/eclipse/swt/widgets/Display;)[Lorg/eclipse/swt/graphics/FontData;
+ ([Lorg/eclipse/swt/graphics/FontData;Lorg/eclipse/swt/widgets/Display;)[0Lorg/eclipse/swt/graphics/FontData;
 defaultFont
  ()Lorg/eclipse/swt/graphics/Font;
  ()Lorg/eclipse/swt/graphics/Font;
@@ -30,7 +30,7 @@ defaultFontDescriptor
  ()Lorg/eclipse/jface/resource/FontDescriptor;
 filterData
  ([Lorg/eclipse/swt/graphics/FontData;Lorg/eclipse/swt/widgets/Display;)[Lorg/eclipse/swt/graphics/FontData;
- ([Lorg/eclipse/swt/graphics/FontData;Lorg/eclipse/swt/widgets/Display;)[Lorg/eclipse/swt/graphics/FontData;
+ ([Lorg/eclipse/swt/graphics/FontData;Lorg/eclipse/swt/widgets/Display;)[0Lorg/eclipse/swt/graphics/FontData;
 get
  (Ljava/lang/String;)Lorg/eclipse/swt/graphics/Font;
  (L1java/lang/String;)L1org/eclipse/swt/graphics/Font;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/ImageDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/ImageDescriptor.eea
index 9e64bb6254..46cea08cc0 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/ImageDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/ImageDescriptor.eea
@@ -10,47 +10,47 @@ DEFAULT_IMAGE_DATA
 
 createFromFile
  (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/eclipse/jface/resource/ImageDescriptor;
- (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/eclipse/jface/resource/ImageDescriptor;
+ (Ljava/lang/Class<*>;Ljava/lang/String;)L1org/eclipse/jface/resource/ImageDescriptor;
 createFromImage
  (Lorg/eclipse/swt/graphics/Image;)Lorg/eclipse/jface/resource/ImageDescriptor;
- (Lorg/eclipse/swt/graphics/Image;)Lorg/eclipse/jface/resource/ImageDescriptor;
+ (Lorg/eclipse/swt/graphics/Image;)L1org/eclipse/jface/resource/ImageDescriptor;
 createFromImage
  (Lorg/eclipse/swt/graphics/Image;Lorg/eclipse/swt/graphics/Device;)Lorg/eclipse/jface/resource/ImageDescriptor;
- (Lorg/eclipse/swt/graphics/Image;Lorg/eclipse/swt/graphics/Device;)Lorg/eclipse/jface/resource/ImageDescriptor;
+ (Lorg/eclipse/swt/graphics/Image;Lorg/eclipse/swt/graphics/Device;)L1org/eclipse/jface/resource/ImageDescriptor;
 createFromImageData
  (Lorg/eclipse/swt/graphics/ImageData;)Lorg/eclipse/jface/resource/ImageDescriptor;
- (Lorg/eclipse/swt/graphics/ImageData;)Lorg/eclipse/jface/resource/ImageDescriptor;
+ (Lorg/eclipse/swt/graphics/ImageData;)L1org/eclipse/jface/resource/ImageDescriptor;
 createFromImageDataProvider
  (Lorg/eclipse/swt/graphics/ImageDataProvider;)Lorg/eclipse/jface/resource/ImageDescriptor;
- (Lorg/eclipse/swt/graphics/ImageDataProvider;)Lorg/eclipse/jface/resource/ImageDescriptor;
+ (Lorg/eclipse/swt/graphics/ImageDataProvider;)L1org/eclipse/jface/resource/ImageDescriptor;
 createFromURL
  (Ljava/net/URL;)Lorg/eclipse/jface/resource/ImageDescriptor;
- (Ljava/net/URL;)Lorg/eclipse/jface/resource/ImageDescriptor;
+ (Ljava/net/URL;)L1org/eclipse/jface/resource/ImageDescriptor;
 createFromURLSupplier
  (ZLjava/util/function/Supplier<Ljava/net/URL;>;)Lorg/eclipse/jface/resource/ImageDescriptor;
- (ZLjava/util/function/Supplier<Ljava/net/URL;>;)Lorg/eclipse/jface/resource/ImageDescriptor;
+ (ZLjava/util/function/Supplier<Ljava/net/URL;>;)L1org/eclipse/jface/resource/ImageDescriptor;
 createWithFlags
  (Lorg/eclipse/jface/resource/ImageDescriptor;I)Lorg/eclipse/jface/resource/ImageDescriptor;
- (Lorg/eclipse/jface/resource/ImageDescriptor;I)Lorg/eclipse/jface/resource/ImageDescriptor;
+ (Lorg/eclipse/jface/resource/ImageDescriptor;I)L1org/eclipse/jface/resource/ImageDescriptor;
 getMissingImageDescriptor
  ()Lorg/eclipse/jface/resource/ImageDescriptor;
  ()Lorg/eclipse/jface/resource/ImageDescriptor;
 
 createImage
  ()Lorg/eclipse/swt/graphics/Image;
- ()Lorg/eclipse/swt/graphics/Image;
+ ()L1org/eclipse/swt/graphics/Image;
 createImage
  (Lorg/eclipse/swt/graphics/Device;)Lorg/eclipse/swt/graphics/Image;
- (Lorg/eclipse/swt/graphics/Device;)Lorg/eclipse/swt/graphics/Image;
+ (Lorg/eclipse/swt/graphics/Device;)L1org/eclipse/swt/graphics/Image;
 createImage
  (Z)Lorg/eclipse/swt/graphics/Image;
- (Z)Lorg/eclipse/swt/graphics/Image;
+ (Z)L1org/eclipse/swt/graphics/Image;
 createImage
  (ZLorg/eclipse/swt/graphics/Device;)Lorg/eclipse/swt/graphics/Image;
- (ZLorg/eclipse/swt/graphics/Device;)Lorg/eclipse/swt/graphics/Image;
+ (ZLorg/eclipse/swt/graphics/Device;)L0org/eclipse/swt/graphics/Image;
 createResource
  (Lorg/eclipse/swt/graphics/Device;)Ljava/lang/Object;
- (Lorg/eclipse/swt/graphics/Device;)Ljava/lang/Object;
+ (Lorg/eclipse/swt/graphics/Device;)L1java/lang/Object; # @Inherited(org.eclipse.jface.resource.DeviceResourceDescriptor)
 destroyResource
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
@@ -59,7 +59,7 @@ getImageData
  ()Lorg/eclipse/swt/graphics/ImageData;
 getImageData
  (I)Lorg/eclipse/swt/graphics/ImageData;
- (I)Lorg/eclipse/swt/graphics/ImageData;
+ (I)L0org/eclipse/swt/graphics/ImageData;
 imageDescriptorFromURI
  (Ljava/net/URI;)Lorg/eclipse/jface/resource/ImageDescriptor;
  (Ljava/net/URI;)Lorg/eclipse/jface/resource/ImageDescriptor;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/ImageRegistry.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/ImageRegistry.eea
index 6364545f5f..99d1f00fed 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/ImageRegistry.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/ImageRegistry.eea
@@ -8,10 +8,10 @@ class org/eclipse/jface/resource/ImageRegistry
  (Lorg/eclipse/swt/widgets/Display;)V
 get
  (Ljava/lang/String;)Lorg/eclipse/swt/graphics/Image;
- (Ljava/lang/String;)Lorg/eclipse/swt/graphics/Image;
+ (Ljava/lang/String;)L0org/eclipse/swt/graphics/Image;
 getDescriptor
  (Ljava/lang/String;)Lorg/eclipse/jface/resource/ImageDescriptor;
- (Ljava/lang/String;)Lorg/eclipse/jface/resource/ImageDescriptor;
+ (Ljava/lang/String;)L0org/eclipse/jface/resource/ImageDescriptor;
 put
  (Ljava/lang/String;Lorg/eclipse/jface/resource/ImageDescriptor;)V
  (Ljava/lang/String;Lorg/eclipse/jface/resource/ImageDescriptor;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/JFaceResources.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/JFaceResources.eea
index a59495b7ed..bf55e9651b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/JFaceResources.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/JFaceResources.eea
@@ -72,13 +72,13 @@ getResources
  ()Lorg/eclipse/jface/resource/ResourceManager;
 getResources
  (Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/jface/resource/ResourceManager;
- (Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/jface/resource/ResourceManager;
+ (Lorg/eclipse/swt/widgets/Display;)L1org/eclipse/jface/resource/ResourceManager;
 getString
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
 getStrings
  ([Ljava/lang/String;)[Ljava/lang/String;
- ([Ljava/lang/String;)[Ljava/lang/String;
+ ([Ljava/lang/String;)[1Ljava/lang/String;
 getTextFont
  ()Lorg/eclipse/swt/graphics/Font;
  ()Lorg/eclipse/swt/graphics/Font;
@@ -90,7 +90,7 @@ getViewerFont
  ()Lorg/eclipse/swt/graphics/Font;
 managerFor
  (Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/jface/resource/LocalResourceManager;
- (Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/jface/resource/LocalResourceManager;
+ (Lorg/eclipse/swt/widgets/Control;)L1org/eclipse/jface/resource/LocalResourceManager;
 setFontRegistry
  (Lorg/eclipse/jface/resource/FontRegistry;)V
  (Lorg/eclipse/jface/resource/FontRegistry;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/LazyResourceManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/LazyResourceManager.eea
index 9aea6e1753..6386e55a78 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/LazyResourceManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/LazyResourceManager.eea
@@ -5,13 +5,13 @@ class org/eclipse/jface/resource/LazyResourceManager
  (ILorg/eclipse/jface/resource/ResourceManager;)V
 create
  <R:Ljava/lang/Object;>(Lorg/eclipse/jface/resource/DeviceResourceDescriptor<TR;>;)TR;
- <R:Ljava/lang/Object;>(Lorg/eclipse/jface/resource/DeviceResourceDescriptor<TR;>;)TR;
+ <R:Ljava/lang/Object;>(Lorg/eclipse/jface/resource/DeviceResourceDescriptor<TR;>;)T1R; # @Inherited(org.eclipse.jface.resource.ResourceManager)
 destroy
  <R:Ljava/lang/Object;>(Lorg/eclipse/jface/resource/DeviceResourceDescriptor<TR;>;)V
  <R:Ljava/lang/Object;>(Lorg/eclipse/jface/resource/DeviceResourceDescriptor<TR;>;)V
 find
  <R:Ljava/lang/Object;>(Lorg/eclipse/jface/resource/DeviceResourceDescriptor<TR;>;)TR;
- <R:Ljava/lang/Object;>(Lorg/eclipse/jface/resource/DeviceResourceDescriptor<TR;>;)TR;
+ <R:Ljava/lang/Object;>(Lorg/eclipse/jface/resource/DeviceResourceDescriptor<TR;>;)T0R;
 getDefaultImage
  ()Lorg/eclipse/swt/graphics/Image;
  ()Lorg/eclipse/swt/graphics/Image;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/ResourceManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/ResourceManager.eea
index f083cac800..3be9d24bcc 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/ResourceManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/ResourceManager.eea
@@ -5,22 +5,22 @@ cancelDisposeExec
  (Ljava/lang/Runnable;)V
 create
  <R:Ljava/lang/Object;>(Lorg/eclipse/jface/resource/DeviceResourceDescriptor<TR;>;)TR;
- <R:Ljava/lang/Object;>(Lorg/eclipse/jface/resource/DeviceResourceDescriptor<TR;>;)TR;
+ <R:Ljava/lang/Object;>(Lorg/eclipse/jface/resource/DeviceResourceDescriptor<TR;>;)T1R;
 createColor
  (Lorg/eclipse/jface/resource/ColorDescriptor;)Lorg/eclipse/swt/graphics/Color;
- (Lorg/eclipse/jface/resource/ColorDescriptor;)Lorg/eclipse/swt/graphics/Color;
+ (Lorg/eclipse/jface/resource/ColorDescriptor;)L1org/eclipse/swt/graphics/Color;
 createColor
  (Lorg/eclipse/swt/graphics/RGB;)Lorg/eclipse/swt/graphics/Color;
- (Lorg/eclipse/swt/graphics/RGB;)Lorg/eclipse/swt/graphics/Color;
+ (Lorg/eclipse/swt/graphics/RGB;)L1org/eclipse/swt/graphics/Color;
 createFont
  (Lorg/eclipse/jface/resource/FontDescriptor;)Lorg/eclipse/swt/graphics/Font;
- (Lorg/eclipse/jface/resource/FontDescriptor;)Lorg/eclipse/swt/graphics/Font;
+ (Lorg/eclipse/jface/resource/FontDescriptor;)L1org/eclipse/swt/graphics/Font;
 createImage
  (Lorg/eclipse/jface/resource/ImageDescriptor;)Lorg/eclipse/swt/graphics/Image;
- (Lorg/eclipse/jface/resource/ImageDescriptor;)Lorg/eclipse/swt/graphics/Image;
+ (Lorg/eclipse/jface/resource/ImageDescriptor;)L1org/eclipse/swt/graphics/Image;
 createImageWithDefault
  (Lorg/eclipse/jface/resource/ImageDescriptor;)Lorg/eclipse/swt/graphics/Image;
- (Lorg/eclipse/jface/resource/ImageDescriptor;)Lorg/eclipse/swt/graphics/Image;
+ (Lorg/eclipse/jface/resource/ImageDescriptor;)L1org/eclipse/swt/graphics/Image;
 destroy
  <R:Ljava/lang/Object;>(Lorg/eclipse/jface/resource/DeviceResourceDescriptor<TR;>;)V
  <R:Ljava/lang/Object;>(Lorg/eclipse/jface/resource/DeviceResourceDescriptor<TR;>;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/StringConverter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/StringConverter.eea
index 07091691a0..079cffe185 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/StringConverter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/resource/StringConverter.eea
@@ -2,7 +2,7 @@ class org/eclipse/jface/resource/StringConverter
 
 asArray
  (Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/String;)[1Ljava/lang/String;
 asArray
  (Ljava/lang/String;[Ljava/lang/String;)[Ljava/lang/String;
  (Ljava/lang/String;[Ljava/lang/String;)[Ljava/lang/String;
@@ -14,7 +14,7 @@ asBoolean
  (Ljava/lang/String;Z)Z
 asDisplayableString
  (Lorg/eclipse/swt/graphics/FontData;)Ljava/lang/String;
- (Lorg/eclipse/swt/graphics/FontData;)Ljava/lang/String;
+ (Lorg/eclipse/swt/graphics/FontData;)L1java/lang/String;
 asDouble
  (Ljava/lang/String;)D
  (Ljava/lang/String;)D
@@ -29,7 +29,7 @@ asFloat
  (Ljava/lang/String;F)F
 asFontData
  (Ljava/lang/String;)Lorg/eclipse/swt/graphics/FontData;
- (Ljava/lang/String;)Lorg/eclipse/swt/graphics/FontData;
+ (Ljava/lang/String;)L1org/eclipse/swt/graphics/FontData;
 asFontData
  (Ljava/lang/String;Lorg/eclipse/swt/graphics/FontData;)Lorg/eclipse/swt/graphics/FontData;
  (Ljava/lang/String;Lorg/eclipse/swt/graphics/FontData;)Lorg/eclipse/swt/graphics/FontData;
@@ -50,19 +50,19 @@ asLong
  (Ljava/lang/String;J)J
 asPoint
  (Ljava/lang/String;)Lorg/eclipse/swt/graphics/Point;
- (Ljava/lang/String;)Lorg/eclipse/swt/graphics/Point;
+ (Ljava/lang/String;)L1org/eclipse/swt/graphics/Point;
 asPoint
  (Ljava/lang/String;Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/graphics/Point;
  (Ljava/lang/String;Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/graphics/Point;
 asRGB
  (Ljava/lang/String;)Lorg/eclipse/swt/graphics/RGB;
- (Ljava/lang/String;)Lorg/eclipse/swt/graphics/RGB;
+ (Ljava/lang/String;)L1org/eclipse/swt/graphics/RGB;
 asRGB
  (Ljava/lang/String;Lorg/eclipse/swt/graphics/RGB;)Lorg/eclipse/swt/graphics/RGB;
  (Ljava/lang/String;Lorg/eclipse/swt/graphics/RGB;)Lorg/eclipse/swt/graphics/RGB;
 asRectangle
  (Ljava/lang/String;)Lorg/eclipse/swt/graphics/Rectangle;
- (Ljava/lang/String;)Lorg/eclipse/swt/graphics/Rectangle;
+ (Ljava/lang/String;)L1org/eclipse/swt/graphics/Rectangle;
 asRectangle
  (Ljava/lang/String;Lorg/eclipse/swt/graphics/Rectangle;)Lorg/eclipse/swt/graphics/Rectangle;
  (Ljava/lang/String;Lorg/eclipse/swt/graphics/Rectangle;)Lorg/eclipse/swt/graphics/Rectangle;
@@ -95,22 +95,22 @@ asString
  (Ljava/lang/Long;)Ljava/lang/String;
 asString
  (Lorg/eclipse/swt/graphics/FontData;)Ljava/lang/String;
- (Lorg/eclipse/swt/graphics/FontData;)Ljava/lang/String;
+ (Lorg/eclipse/swt/graphics/FontData;)L1java/lang/String;
 asString
  (Lorg/eclipse/swt/graphics/Point;)Ljava/lang/String;
- (Lorg/eclipse/swt/graphics/Point;)Ljava/lang/String;
+ (Lorg/eclipse/swt/graphics/Point;)L1java/lang/String;
 asString
  (Lorg/eclipse/swt/graphics/RGB;)Ljava/lang/String;
- (Lorg/eclipse/swt/graphics/RGB;)Ljava/lang/String;
+ (Lorg/eclipse/swt/graphics/RGB;)L1java/lang/String;
 asString
  (Lorg/eclipse/swt/graphics/Rectangle;)Ljava/lang/String;
- (Lorg/eclipse/swt/graphics/Rectangle;)Ljava/lang/String;
+ (Lorg/eclipse/swt/graphics/Rectangle;)L1java/lang/String;
 asString
  (Z)Ljava/lang/String;
  (Z)Ljava/lang/String;
 asString
  ([Lorg/eclipse/swt/graphics/FontData;)Ljava/lang/String;
- ([Lorg/eclipse/swt/graphics/FontData;)Ljava/lang/String;
+ ([Lorg/eclipse/swt/graphics/FontData;)L1java/lang/String;
 removeWhiteSpaces
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/AbstractDocument.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/AbstractDocument.eea
index 987a03cab9..eee5cb7119 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/AbstractDocument.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/AbstractDocument.eea
@@ -146,7 +146,7 @@ getPositions
  (L1java/lang/String;)[1L1org/eclipse/jface/text/Position; # @Inherited(org.eclipse.jface.text.IDocument)
 getPositions
  (Ljava/lang/String;IIZZ)[Lorg/eclipse/jface/text/Position;
- (Ljava/lang/String;IIZZ)[Lorg/eclipse/jface/text/Position;
+ (Ljava/lang/String;IIZZ)[1Lorg/eclipse/jface/text/Position;
 getStore
  ()Lorg/eclipse/jface/text/ITextStore;
  ()Lorg/eclipse/jface/text/ITextStore;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/AbstractHoverInformationControlManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/AbstractHoverInformationControlManager.eea
index 677ae54949..6c527c37aa 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/AbstractHoverInformationControlManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/AbstractHoverInformationControlManager.eea
@@ -11,7 +11,7 @@ getHoverEventLocation
  ()Lorg/eclipse/swt/graphics/Point;
 getInternalAccessor
  ()Lorg/eclipse/jface/internal/text/InternalAccessor;
- ()Lorg/eclipse/jface/internal/text/InternalAccessor;
+ ()L1org/eclipse/jface/internal/text/InternalAccessor; # @Inherited(org.eclipse.jface.text.AbstractInformationControlManager)
 install
  (Lorg/eclipse/swt/widgets/Control;)V
  (Lorg/eclipse/swt/widgets/Control;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/AbstractInformationControl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/AbstractInformationControl.eea
index e33e5f0e37..2da7159a28 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/AbstractInformationControl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/AbstractInformationControl.eea
@@ -38,13 +38,13 @@ getBounds
  ()Lorg/eclipse/swt/graphics/Rectangle;
 getInformationPresenterControlCreator
  ()Lorg/eclipse/jface/text/IInformationControlCreator;
- ()Lorg/eclipse/jface/text/IInformationControlCreator;
+ ()L0org/eclipse/jface/text/IInformationControlCreator;
 getShell
  ()Lorg/eclipse/swt/widgets/Shell;
  ()Lorg/eclipse/swt/widgets/Shell;
 getSizeConstraints
  ()Lorg/eclipse/swt/graphics/Point;
- ()Lorg/eclipse/swt/graphics/Point;
+ ()L0org/eclipse/swt/graphics/Point;
 getToolBarManager
  ()Lorg/eclipse/jface/action/ToolBarManager;
  ()Lorg/eclipse/jface/action/ToolBarManager;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/AbstractInformationControlManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/AbstractInformationControlManager.eea
index 2c4b074301..a4c74464f2 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/AbstractInformationControlManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/AbstractInformationControlManager.eea
@@ -43,7 +43,7 @@ fInformationControlCreator
  (Lorg/eclipse/jface/text/IInformationControlCreator;)V
 computeAvailableArea
  (Lorg/eclipse/swt/graphics/Rectangle;Lorg/eclipse/swt/graphics/Rectangle;Lorg/eclipse/jface/text/AbstractInformationControlManager$Anchor;)Lorg/eclipse/swt/graphics/Rectangle;
- (Lorg/eclipse/swt/graphics/Rectangle;Lorg/eclipse/swt/graphics/Rectangle;Lorg/eclipse/jface/text/AbstractInformationControlManager$Anchor;)Lorg/eclipse/swt/graphics/Rectangle;
+ (Lorg/eclipse/swt/graphics/Rectangle;Lorg/eclipse/swt/graphics/Rectangle;Lorg/eclipse/jface/text/AbstractInformationControlManager$Anchor;)L0org/eclipse/swt/graphics/Rectangle;
 computeInformationControlLocation
  (Lorg/eclipse/swt/graphics/Rectangle;Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/graphics/Point;
  (Lorg/eclipse/swt/graphics/Rectangle;Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/graphics/Point;
@@ -61,10 +61,10 @@ getInformationControl
  ()Lorg/eclipse/jface/text/IInformationControl;
 getInternalAccessor
  ()Lorg/eclipse/jface/internal/text/InternalAccessor;
- ()Lorg/eclipse/jface/internal/text/InternalAccessor;
+ ()L1org/eclipse/jface/internal/text/InternalAccessor;
 getNextFallbackAnchor
  (Lorg/eclipse/jface/text/AbstractInformationControlManager$Anchor;)Lorg/eclipse/jface/text/AbstractInformationControlManager$Anchor;
- (Lorg/eclipse/jface/text/AbstractInformationControlManager$Anchor;)Lorg/eclipse/jface/text/AbstractInformationControlManager$Anchor;
+ (Lorg/eclipse/jface/text/AbstractInformationControlManager$Anchor;)L0org/eclipse/jface/text/AbstractInformationControlManager$Anchor;
 getSubjectArea
  ()Lorg/eclipse/swt/graphics/Rectangle;
  ()Lorg/eclipse/swt/graphics/Rectangle;
@@ -76,7 +76,7 @@ install
  (Lorg/eclipse/swt/widgets/Control;)V
 restoreInformationControlBounds
  ()Lorg/eclipse/swt/graphics/Rectangle;
- ()Lorg/eclipse/swt/graphics/Rectangle;
+ ()L0org/eclipse/swt/graphics/Rectangle;
 setAnchor
  (Lorg/eclipse/jface/text/AbstractInformationControlManager$Anchor;)V
  (Lorg/eclipse/jface/text/AbstractInformationControlManager$Anchor;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/AbstractReusableInformationControlCreator.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/AbstractReusableInformationControlCreator.eea
index 7fec832548..da8104b51f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/AbstractReusableInformationControlCreator.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/AbstractReusableInformationControlCreator.eea
@@ -8,7 +8,7 @@ canReuse
  (Lorg/eclipse/jface/text/IInformationControl;)Z
 createInformationControl
  (Lorg/eclipse/swt/widgets/Shell;)Lorg/eclipse/jface/text/IInformationControl;
- (Lorg/eclipse/swt/widgets/Shell;)Lorg/eclipse/jface/text/IInformationControl;
+ (Lorg/eclipse/swt/widgets/Shell;)L1org/eclipse/jface/text/IInformationControl; # @Inherited(org.eclipse.jface.text.IInformationControlCreator)
 doCreateInformationControl
  (Lorg/eclipse/swt/widgets/Shell;)Lorg/eclipse/jface/text/IInformationControl;
  (L1org/eclipse/swt/widgets/Shell;)Lorg/eclipse/jface/text/IInformationControl;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/ConfigurableLineTracker.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/ConfigurableLineTracker.eea
index 28e40dad9c..78a3b5c5f4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/ConfigurableLineTracker.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/ConfigurableLineTracker.eea
@@ -8,4 +8,4 @@ getLegalLineDelimiters
  ()[1L1java/lang/String; # @Inherited(org.eclipse.jface.text.ILineTracker)
 nextDelimiterInfo
  (Ljava/lang/String;I)Lorg/eclipse/jface/text/AbstractLineTracker$DelimiterInfo;
- (Ljava/lang/String;I)Lorg/eclipse/jface/text/AbstractLineTracker$DelimiterInfo;
+ (Ljava/lang/String;I)L0org/eclipse/jface/text/AbstractLineTracker$DelimiterInfo;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/DefaultInformationControl.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/DefaultInformationControl.eea
index b08138db43..f3cc157e97 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/DefaultInformationControl.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/DefaultInformationControl.eea
@@ -44,7 +44,7 @@ createContent
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.jface.text.AbstractInformationControl)
 getInformationPresenterControlCreator
  ()Lorg/eclipse/jface/text/IInformationControlCreator;
- ()Lorg/eclipse/jface/text/IInformationControlCreator;
+ ()L0org/eclipse/jface/text/IInformationControlCreator; # @Inherited(org.eclipse.jface.text.AbstractInformationControl)
 setBackgroundColor
  (Lorg/eclipse/swt/graphics/Color;)V
  (Lorg/eclipse/swt/graphics/Color;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/DefaultLineTracker.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/DefaultLineTracker.eea
index 9b3dea205b..a372b885d6 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/DefaultLineTracker.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/DefaultLineTracker.eea
@@ -9,4 +9,4 @@ getLegalLineDelimiters
  ()[1L1java/lang/String; # @Inherited(org.eclipse.jface.text.ILineTracker)
 nextDelimiterInfo
  (Ljava/lang/String;I)Lorg/eclipse/jface/text/AbstractLineTracker$DelimiterInfo;
- (Ljava/lang/String;I)Lorg/eclipse/jface/text/AbstractLineTracker$DelimiterInfo;
+ (Ljava/lang/String;I)L0org/eclipse/jface/text/AbstractLineTracker$DelimiterInfo;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/DefaultTextDoubleClickStrategy.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/DefaultTextDoubleClickStrategy.eea
index 4d00ca5ecd..6932ad060e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/DefaultTextDoubleClickStrategy.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/DefaultTextDoubleClickStrategy.eea
@@ -5,7 +5,7 @@ doubleClicked
  (Lorg/eclipse/jface/text/ITextViewer;)V
 findExtendedDoubleClickSelection
  (Lorg/eclipse/jface/text/IDocument;I)Lorg/eclipse/jface/text/IRegion;
- (Lorg/eclipse/jface/text/IDocument;I)Lorg/eclipse/jface/text/IRegion;
+ (Lorg/eclipse/jface/text/IDocument;I)L0org/eclipse/jface/text/IRegion;
 findWord
  (Lorg/eclipse/jface/text/IDocument;I)Lorg/eclipse/jface/text/IRegion;
  (Lorg/eclipse/jface/text/IDocument;I)Lorg/eclipse/jface/text/IRegion;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/DocumentPartitioningChangedEvent.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/DocumentPartitioningChangedEvent.eea
index 82d656a404..98fdfc435a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/DocumentPartitioningChangedEvent.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/DocumentPartitioningChangedEvent.eea
@@ -5,7 +5,7 @@ class org/eclipse/jface/text/DocumentPartitioningChangedEvent
  (Lorg/eclipse/jface/text/IDocument;)V
 getChangedPartitionings
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 getChangedRegion
  (Ljava/lang/String;)Lorg/eclipse/jface/text/IRegion;
  (Ljava/lang/String;)Lorg/eclipse/jface/text/IRegion;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/GapTextStore.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/GapTextStore.eea
index da8d777fb4..5c65059ac2 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/GapTextStore.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/GapTextStore.eea
@@ -5,7 +5,7 @@ get
  (II)Ljava/lang/String;
 getContentAsString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 replace
  (IILjava/lang/String;)V
  (IILjava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/IInformationControlCreator.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/IInformationControlCreator.eea
index 647f1cba8c..1609264947 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/IInformationControlCreator.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/IInformationControlCreator.eea
@@ -2,4 +2,4 @@ class org/eclipse/jface/text/IInformationControlCreator
 
 createInformationControl
  (Lorg/eclipse/swt/widgets/Shell;)Lorg/eclipse/jface/text/IInformationControl;
- (Lorg/eclipse/swt/widgets/Shell;)Lorg/eclipse/jface/text/IInformationControl;
+ (Lorg/eclipse/swt/widgets/Shell;)L1org/eclipse/jface/text/IInformationControl;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/ISlaveDocumentManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/ISlaveDocumentManager.eea
index 16bb76d04a..2e25a259f1 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/ISlaveDocumentManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/ISlaveDocumentManager.eea
@@ -2,10 +2,10 @@ class org/eclipse/jface/text/ISlaveDocumentManager
 
 createMasterSlaveMapping
  (Lorg/eclipse/jface/text/IDocument;)Lorg/eclipse/jface/text/IDocumentInformationMapping;
- (Lorg/eclipse/jface/text/IDocument;)Lorg/eclipse/jface/text/IDocumentInformationMapping;
+ (Lorg/eclipse/jface/text/IDocument;)L1org/eclipse/jface/text/IDocumentInformationMapping;
 createSlaveDocument
  (Lorg/eclipse/jface/text/IDocument;)Lorg/eclipse/jface/text/IDocument;
- (Lorg/eclipse/jface/text/IDocument;)Lorg/eclipse/jface/text/IDocument;
+ (Lorg/eclipse/jface/text/IDocument;)L1org/eclipse/jface/text/IDocument;
 freeSlaveDocument
  (Lorg/eclipse/jface/text/IDocument;)V
  (Lorg/eclipse/jface/text/IDocument;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/TextPresentation.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/TextPresentation.eea
index 8a4e59d9de..6c71e9990b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/TextPresentation.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/TextPresentation.eea
@@ -15,19 +15,19 @@ getAllStyleRangeIterator
  ()Ljava/util/Iterator<Lorg/eclipse/swt/custom/StyleRange;>;
 getCoverage
  ()Lorg/eclipse/jface/text/IRegion;
- ()Lorg/eclipse/jface/text/IRegion;
+ ()L0org/eclipse/jface/text/IRegion;
 getDefaultStyleRange
  ()Lorg/eclipse/swt/custom/StyleRange;
- ()Lorg/eclipse/swt/custom/StyleRange;
+ ()L0org/eclipse/swt/custom/StyleRange;
 getExtent
  ()Lorg/eclipse/jface/text/IRegion;
  ()Lorg/eclipse/jface/text/IRegion;
 getFirstStyleRange
  ()Lorg/eclipse/swt/custom/StyleRange;
- ()Lorg/eclipse/swt/custom/StyleRange;
+ ()L0org/eclipse/swt/custom/StyleRange;
 getLastStyleRange
  ()Lorg/eclipse/swt/custom/StyleRange;
- ()Lorg/eclipse/swt/custom/StyleRange;
+ ()L0org/eclipse/swt/custom/StyleRange;
 getNonDefaultStyleRangeIterator
  ()Ljava/util/Iterator<Lorg/eclipse/swt/custom/StyleRange;>;
  ()Ljava/util/Iterator<Lorg/eclipse/swt/custom/StyleRange;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/TextUtilities.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/TextUtilities.eea
index 8bbd9d0f2a..00a8369d5b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/TextUtilities.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/TextUtilities.eea
@@ -18,10 +18,10 @@ computePartitioning
  (L1org/eclipse/jface/text/IDocument;L1java/lang/String;IIZ)[1L1org/eclipse/jface/text/ITypedRegion;
 copy
  ([I)[I
- ([I)[I
+ ([I)[0I
 copy
  ([Ljava/lang/String;)[Ljava/lang/String;
- ([Ljava/lang/String;)[Ljava/lang/String;
+ ([Ljava/lang/String;)[0Ljava/lang/String;
 determineLineDelimiter
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/TextViewer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/TextViewer.eea
index ed16ba66b0..ec957927e8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/TextViewer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/TextViewer.eea
@@ -70,7 +70,7 @@ fViewportListeners
  (Lorg/eclipse/swt/widgets/Composite;I)V
 _internalGetVisibleRegion
  ()Lorg/eclipse/jface/text/IRegion;
- ()Lorg/eclipse/jface/text/IRegion;
+ ()L0org/eclipse/jface/text/IRegion;
 addPainter
  (Lorg/eclipse/jface/text/IPainter;)V
  (L1org/eclipse/jface/text/IPainter;)V # @Inherited(org.eclipse.jface.text.ITextViewerExtension2)
@@ -100,16 +100,16 @@ createControl
  (L1org/eclipse/swt/widgets/Composite;I)V
 createDocumentAdapter
  ()Lorg/eclipse/jface/text/IDocumentAdapter;
- ()Lorg/eclipse/jface/text/IDocumentAdapter;
+ ()L1org/eclipse/jface/text/IDocumentAdapter;
 createSlaveDocument
  (Lorg/eclipse/jface/text/IDocument;)Lorg/eclipse/jface/text/IDocument;
- (Lorg/eclipse/jface/text/IDocument;)Lorg/eclipse/jface/text/IDocument;
+ (Lorg/eclipse/jface/text/IDocument;)L1org/eclipse/jface/text/IDocument;
 createSlaveDocumentManager
  ()Lorg/eclipse/jface/text/ISlaveDocumentManager;
- ()Lorg/eclipse/jface/text/ISlaveDocumentManager;
+ ()L1org/eclipse/jface/text/ISlaveDocumentManager;
 createTextWidget
  (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/custom/StyledText;
- (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/custom/StyledText;
+ (Lorg/eclipse/swt/widgets/Composite;I)L1org/eclipse/swt/custom/StyledText;
 customizeDocumentCommand
  (Lorg/eclipse/jface/text/DocumentCommand;)V
  (Lorg/eclipse/jface/text/DocumentCommand;)V
@@ -166,7 +166,7 @@ getLastKnownSelection
  ()L1org/eclipse/jface/text/ITextSelection; # @Inherited(org.eclipse.jface.text.ITextViewerExtension9)
 getModelCoverage
  ()Lorg/eclipse/jface/text/IRegion;
- ()Lorg/eclipse/jface/text/IRegion;
+ ()L0org/eclipse/jface/text/IRegion;
 getPaintManager
  ()Lorg/eclipse/jface/text/PaintManager;
  ()Lorg/eclipse/jface/text/PaintManager;
@@ -193,7 +193,7 @@ getTextHover
  (I)Lorg/eclipse/jface/text/ITextHover;
 getTextHover
  (II)Lorg/eclipse/jface/text/ITextHover;
- (II)Lorg/eclipse/jface/text/ITextHover;
+ (II)L0org/eclipse/jface/text/ITextHover;
 getTextHoveringController
  ()Lorg/eclipse/jface/text/AbstractInformationControlManager;
  ()Lorg/eclipse/jface/text/AbstractInformationControlManager;
@@ -232,19 +232,19 @@ inputChanged
  (L0java/lang/Object;L0java/lang/Object;)V # @Inherited(org.eclipse.jface.viewers.Viewer)
 modelRange2ClosestWidgetRange
  (Lorg/eclipse/jface/text/IRegion;)Lorg/eclipse/jface/text/IRegion;
- (Lorg/eclipse/jface/text/IRegion;)Lorg/eclipse/jface/text/IRegion;
+ (Lorg/eclipse/jface/text/IRegion;)L0org/eclipse/jface/text/IRegion;
 modelRange2WidgetRange
  (Lorg/eclipse/jface/text/IRegion;)Lorg/eclipse/jface/text/IRegion;
- (Lorg/eclipse/jface/text/IRegion;)Lorg/eclipse/jface/text/IRegion;
+ (Lorg/eclipse/jface/text/IRegion;)L0org/eclipse/jface/text/IRegion;
 modelRange2WidgetRange
  (Lorg/eclipse/jface/text/Position;)Lorg/eclipse/jface/text/IRegion;
  (Lorg/eclipse/jface/text/Position;)Lorg/eclipse/jface/text/IRegion;
 modelSelection2WidgetSelection
  (Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/graphics/Point;
- (Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/graphics/Point;
+ (Lorg/eclipse/swt/graphics/Point;)L0org/eclipse/swt/graphics/Point;
 modelStyleRange2WidgetStyleRange
  (Lorg/eclipse/swt/custom/StyleRange;)Lorg/eclipse/swt/custom/StyleRange;
- (Lorg/eclipse/swt/custom/StyleRange;)Lorg/eclipse/swt/custom/StyleRange;
+ (Lorg/eclipse/swt/custom/StyleRange;)L0org/eclipse/swt/custom/StyleRange;
 prependAutoEditStrategy
  (Lorg/eclipse/jface/text/IAutoEditStrategy;Ljava/lang/String;)V
  (L1org/eclipse/jface/text/IAutoEditStrategy;L1java/lang/String;)V # @Inherited(org.eclipse.jface.text.ITextViewerExtension2)
@@ -295,7 +295,7 @@ requestWidgetToken
  (Lorg/eclipse/jface/text/IWidgetTokenKeeper;I)Z
 selectContentTypePlugin
  (ILjava/util/Map<Ljava/lang/String;*>;)Ljava/lang/Object;
- (ILjava/util/Map<Ljava/lang/String;*>;)Ljava/lang/Object;
+ (ILjava/util/Map<Ljava/lang/String;*>;)L0java/lang/Object;
 setAutoEditStrategies
  ([Lorg/eclipse/jface/text/IAutoEditStrategy;Ljava/lang/String;)V
  ([Lorg/eclipse/jface/text/IAutoEditStrategy;Ljava/lang/String;)V
@@ -379,7 +379,7 @@ validateSelectionRange
  ([I)V
 widgetRange2ModelRange
  (Lorg/eclipse/jface/text/IRegion;)Lorg/eclipse/jface/text/IRegion;
- (Lorg/eclipse/jface/text/IRegion;)Lorg/eclipse/jface/text/IRegion;
+ (Lorg/eclipse/jface/text/IRegion;)L0org/eclipse/jface/text/IRegion;
 widgetSelection2ModelSelection
  (Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/graphics/Point;
- (Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/graphics/Point;
+ (Lorg/eclipse/swt/graphics/Point;)L1org/eclipse/swt/graphics/Point;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/TextViewerUndoManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/TextViewerUndoManager.eea
index 968e3bf1a1..bc5b4b9176 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/TextViewerUndoManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/TextViewerUndoManager.eea
@@ -5,4 +5,4 @@ connect
  (Lorg/eclipse/jface/text/ITextViewer;)V
 getUndoContext
  ()Lorg/eclipse/core/commands/operations/IUndoContext;
- ()Lorg/eclipse/core/commands/operations/IUndoContext;
+ ()L0org/eclipse/core/commands/operations/IUndoContext;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/codemining/AbstractCodeMiningProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/codemining/AbstractCodeMiningProvider.eea
index feef607211..7e2f165a22 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/codemining/AbstractCodeMiningProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/codemining/AbstractCodeMiningProvider.eea
@@ -2,7 +2,7 @@ class org/eclipse/jface/text/codemining/AbstractCodeMiningProvider
 
 getAdapter
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)T0T;
 setContext
  (Lorg/eclipse/core/runtime/IAdaptable;)V
  (Lorg/eclipse/core/runtime/IAdaptable;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/contentassist/ContentAssistant.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/contentassist/ContentAssistant.eea
index a59987cddd..c37b462ca0 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/contentassist/ContentAssistant.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/contentassist/ContentAssistant.eea
@@ -27,10 +27,10 @@ addContentAssistProcessor
  (Lorg/eclipse/jface/text/contentassist/IContentAssistProcessor;Ljava/lang/String;)V
 completePrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 createAutoAssistListener
  ()Lorg/eclipse/jface/text/contentassist/ContentAssistant$AutoAssistListener;
- ()Lorg/eclipse/jface/text/contentassist/ContentAssistant$AutoAssistListener;
+ ()L1org/eclipse/jface/text/contentassist/ContentAssistant$AutoAssistListener;
 getContentAssistProcessor
  (Ljava/lang/String;)Lorg/eclipse/jface/text/contentassist/IContentAssistProcessor;
  (L1java/lang/String;)L0org/eclipse/jface/text/contentassist/IContentAssistProcessor; # @Inherited(org.eclipse.jface.text.contentassist.IContentAssistant)
@@ -39,7 +39,7 @@ getDocumentPartitioning
  ()Ljava/lang/String;
 getHandler
  (Ljava/lang/String;)Lorg/eclipse/core/commands/IHandler;
- (Ljava/lang/String;)Lorg/eclipse/core/commands/IHandler;
+ (Ljava/lang/String;)L0org/eclipse/core/commands/IHandler;
 install
  (Lorg/eclipse/jface/contentassist/IContentAssistSubjectControl;)V
  (Lorg/eclipse/jface/contentassist/IContentAssistSubjectControl;)V
@@ -63,10 +63,10 @@ requestWidgetToken
  (Lorg/eclipse/jface/text/IWidgetTokenOwner;I)Z
 restoreCompletionProposalPopupSize
  ()Lorg/eclipse/swt/graphics/Point;
- ()Lorg/eclipse/swt/graphics/Point;
+ ()L0org/eclipse/swt/graphics/Point;
 restoreContextSelectorPopupSize
  ()Lorg/eclipse/swt/graphics/Point;
- ()Lorg/eclipse/swt/graphics/Point;
+ ()L0org/eclipse/swt/graphics/Point;
 setContentAssistProcessor
  (Lorg/eclipse/jface/text/contentassist/IContentAssistProcessor;Ljava/lang/String;)V
  (Lorg/eclipse/jface/text/contentassist/IContentAssistProcessor;Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/formatter/ContentFormatter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/formatter/ContentFormatter.eea
index 5729393159..6fcc2d678a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/formatter/ContentFormatter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/formatter/ContentFormatter.eea
@@ -5,7 +5,7 @@ format
  (Lorg/eclipse/jface/text/IDocument;Lorg/eclipse/jface/text/IRegion;)V
 getFormattingStrategy
  (Ljava/lang/String;)Lorg/eclipse/jface/text/formatter/IFormattingStrategy;
- (Ljava/lang/String;)Lorg/eclipse/jface/text/formatter/IFormattingStrategy;
+ (Ljava/lang/String;)L0org/eclipse/jface/text/formatter/IFormattingStrategy;
 positionAboutToBeAdded
  (Lorg/eclipse/jface/text/IDocument;Ljava/lang/String;Lorg/eclipse/jface/text/Position;)Z
  (Lorg/eclipse/jface/text/IDocument;Ljava/lang/String;Lorg/eclipse/jface/text/Position;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/formatter/ContextBasedFormattingStrategy.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/formatter/ContextBasedFormattingStrategy.eea
index 97991ddeaa..85da13066e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/formatter/ContextBasedFormattingStrategy.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/formatter/ContextBasedFormattingStrategy.eea
@@ -2,7 +2,7 @@ class org/eclipse/jface/text/formatter/ContextBasedFormattingStrategy
 
 format
  (Ljava/lang/String;ZLjava/lang/String;[I)Ljava/lang/String;
- (Ljava/lang/String;ZLjava/lang/String;[I)Ljava/lang/String;
+ (Ljava/lang/String;ZLjava/lang/String;[I)L0java/lang/String;
 formatterStarts
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/formatter/FormattingContext.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/formatter/FormattingContext.eea
index 2ec75ab06a..858ce81b27 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/formatter/FormattingContext.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/formatter/FormattingContext.eea
@@ -2,7 +2,7 @@ class org/eclipse/jface/text/formatter/FormattingContext
 
 getPreferenceKeys
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 getProperty
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/formatter/MultiPassContentFormatter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/formatter/MultiPassContentFormatter.eea
index f38493faae..c3a65a5b26 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/formatter/MultiPassContentFormatter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/formatter/MultiPassContentFormatter.eea
@@ -20,7 +20,7 @@ formatSlaves
  (Lorg/eclipse/jface/text/formatter/IFormattingContext;Lorg/eclipse/jface/text/IDocument;II)V
 getFormattingStrategy
  (Ljava/lang/String;)Lorg/eclipse/jface/text/formatter/IFormattingStrategy;
- (Ljava/lang/String;)Lorg/eclipse/jface/text/formatter/IFormattingStrategy;
+ (Ljava/lang/String;)L0org/eclipse/jface/text/formatter/IFormattingStrategy;
 setMasterStrategy
  (Lorg/eclipse/jface/text/formatter/IFormattingStrategy;)V
  (Lorg/eclipse/jface/text/formatter/IFormattingStrategy;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/hyperlink/AbstractHyperlinkDetector.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/hyperlink/AbstractHyperlinkDetector.eea
index e71bcc5307..0af59dcd34 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/hyperlink/AbstractHyperlinkDetector.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/hyperlink/AbstractHyperlinkDetector.eea
@@ -2,7 +2,7 @@ class org/eclipse/jface/text/hyperlink/AbstractHyperlinkDetector
 
 getAdapter
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)T0T;
 setContext
  (Lorg/eclipse/core/runtime/IAdaptable;)V
  (Lorg/eclipse/core/runtime/IAdaptable;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/hyperlink/HyperlinkManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/hyperlink/HyperlinkManager.eea
index e994cac2d5..73c052425b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/hyperlink/HyperlinkManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/hyperlink/HyperlinkManager.eea
@@ -21,7 +21,7 @@ computeLongestHyperlinkLength
  (Ljava/util/List<+Lorg/eclipse/jface/text/hyperlink/IHyperlink;>;)I
 findHyperlinks
  ()[Lorg/eclipse/jface/text/hyperlink/IHyperlink;
- ()[Lorg/eclipse/jface/text/hyperlink/IHyperlink;
+ ()[0Lorg/eclipse/jface/text/hyperlink/IHyperlink;
 focusGained
  (Lorg/eclipse/swt/events/FocusEvent;)V
  (L1org/eclipse/swt/events/FocusEvent;)V # @Inherited(org.eclipse.swt.events.FocusListener)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/hyperlink/URLHyperlink.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/hyperlink/URLHyperlink.eea
index 098ea2ddaa..cc5ba0e6ac 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/hyperlink/URLHyperlink.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/hyperlink/URLHyperlink.eea
@@ -11,7 +11,7 @@ getHyperlinkText
  ()Ljava/lang/String;
 getTypeLabel
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getURLString
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/information/InformationPresenter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/information/InformationPresenter.eea
index 9b2e9779ac..efe7342c68 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/information/InformationPresenter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/information/InformationPresenter.eea
@@ -8,7 +8,7 @@ getDocumentPartitioning
  ()Ljava/lang/String;
 getInformationProvider
  (Ljava/lang/String;)Lorg/eclipse/jface/text/information/IInformationProvider;
- (Ljava/lang/String;)Lorg/eclipse/jface/text/information/IInformationProvider;
+ (Ljava/lang/String;)L0org/eclipse/jface/text/information/IInformationProvider;
 install
  (Lorg/eclipse/jface/text/ITextViewer;)V
  (L1org/eclipse/jface/text/ITextViewer;)V # @Inherited(org.eclipse.jface.text.information.IInformationPresenter)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/link/LinkedModeModel.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/link/LinkedModeModel.eea
index dde014c442..8ad3d5efa7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/link/LinkedModeModel.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/link/LinkedModeModel.eea
@@ -5,7 +5,7 @@ closeAllModels
  (Lorg/eclipse/jface/text/IDocument;)V
 getModel
  (Lorg/eclipse/jface/text/IDocument;I)Lorg/eclipse/jface/text/link/LinkedModeModel;
- (Lorg/eclipse/jface/text/IDocument;I)Lorg/eclipse/jface/text/link/LinkedModeModel;
+ (Lorg/eclipse/jface/text/IDocument;I)L0org/eclipse/jface/text/link/LinkedModeModel;
 hasInstalledModel
  (Lorg/eclipse/jface/text/IDocument;)Z
  (Lorg/eclipse/jface/text/IDocument;)Z
@@ -24,7 +24,7 @@ findPosition
  (Lorg/eclipse/jface/text/link/LinkedPosition;)Lorg/eclipse/jface/text/link/LinkedPosition;
 getGroupForPosition
  (Lorg/eclipse/jface/text/Position;)Lorg/eclipse/jface/text/link/LinkedPositionGroup;
- (Lorg/eclipse/jface/text/Position;)Lorg/eclipse/jface/text/link/LinkedPositionGroup;
+ (Lorg/eclipse/jface/text/Position;)L0org/eclipse/jface/text/link/LinkedPositionGroup;
 getTabStopSequence
  ()Ljava/util/List<Lorg/eclipse/jface/text/link/LinkedPosition;>;
  ()Ljava/util/List<Lorg/eclipse/jface/text/link/LinkedPosition;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/link/LinkedModeUI$IExitPolicy.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/link/LinkedModeUI$IExitPolicy.eea
index 29945e4886..240e355b4b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/link/LinkedModeUI$IExitPolicy.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/link/LinkedModeUI$IExitPolicy.eea
@@ -2,7 +2,7 @@ class org/eclipse/jface/text/link/LinkedModeUI$IExitPolicy
 
 doExit
  (Lorg/eclipse/jface/text/link/LinkedModeModel;Lorg/eclipse/jface/text/DocumentEvent;)Lorg/eclipse/jface/text/link/LinkedModeUI$ExitFlags;
- (Lorg/eclipse/jface/text/link/LinkedModeModel;Lorg/eclipse/jface/text/DocumentEvent;)Lorg/eclipse/jface/text/link/LinkedModeUI$ExitFlags;
+ (Lorg/eclipse/jface/text/link/LinkedModeModel;Lorg/eclipse/jface/text/DocumentEvent;)L0org/eclipse/jface/text/link/LinkedModeUI$ExitFlags;
 doExit
  (Lorg/eclipse/jface/text/link/LinkedModeModel;Lorg/eclipse/swt/events/VerifyEvent;II)Lorg/eclipse/jface/text/link/LinkedModeUI$ExitFlags;
  (Lorg/eclipse/jface/text/link/LinkedModeModel;Lorg/eclipse/swt/events/VerifyEvent;II)Lorg/eclipse/jface/text/link/LinkedModeUI$ExitFlags;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/link/LinkedModeUI.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/link/LinkedModeUI.eea
index 90e44fa2e6..e9ecec81a4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/link/LinkedModeUI.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/link/LinkedModeUI.eea
@@ -24,7 +24,7 @@ CYCLE_WHEN_NO_PARENT
  (Lorg/eclipse/jface/text/link/LinkedModeModel;[Lorg/eclipse/jface/text/link/LinkedModeUI$LinkedModeUITarget;)V
 getSelectedRegion
  ()Lorg/eclipse/jface/text/IRegion;
- ()Lorg/eclipse/jface/text/IRegion;
+ ()L0org/eclipse/jface/text/IRegion;
 setCyclingMode
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/presentation/PresentationReconciler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/presentation/PresentationReconciler.eea
index ca493cf323..d1c3d2e073 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/presentation/PresentationReconciler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/presentation/PresentationReconciler.eea
@@ -6,16 +6,16 @@ TRACKED_PARTITION
 
 createPresentation
  (Lorg/eclipse/jface/text/IRegion;Lorg/eclipse/jface/text/IDocument;)Lorg/eclipse/jface/text/TextPresentation;
- (Lorg/eclipse/jface/text/IRegion;Lorg/eclipse/jface/text/IDocument;)Lorg/eclipse/jface/text/TextPresentation;
+ (Lorg/eclipse/jface/text/IRegion;Lorg/eclipse/jface/text/IDocument;)L0org/eclipse/jface/text/TextPresentation;
 getDamager
  (Ljava/lang/String;)Lorg/eclipse/jface/text/presentation/IPresentationDamager;
- (Ljava/lang/String;)Lorg/eclipse/jface/text/presentation/IPresentationDamager;
+ (Ljava/lang/String;)L0org/eclipse/jface/text/presentation/IPresentationDamager;
 getDocumentPartitioning
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getRepairer
  (Ljava/lang/String;)Lorg/eclipse/jface/text/presentation/IPresentationRepairer;
- (Ljava/lang/String;)Lorg/eclipse/jface/text/presentation/IPresentationRepairer;
+ (Ljava/lang/String;)L0org/eclipse/jface/text/presentation/IPresentationRepairer;
 install
  (Lorg/eclipse/jface/text/ITextViewer;)V
  (L1org/eclipse/jface/text/ITextViewer;)V # @Inherited(org.eclipse.jface.text.presentation.IPresentationReconciler)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/projection/ChildDocument.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/projection/ChildDocument.eea
index 21227770c2..b8c132cedc 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/projection/ChildDocument.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/projection/ChildDocument.eea
@@ -8,4 +8,4 @@ getParentDocument
  ()Lorg/eclipse/jface/text/IDocument;
 getParentDocumentRange
  ()Lorg/eclipse/jface/text/Position;
- ()Lorg/eclipse/jface/text/Position;
+ ()L1org/eclipse/jface/text/Position;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/projection/ChildDocumentManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/projection/ChildDocumentManager.eea
index 297e3d6087..7edb13cf28 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/projection/ChildDocumentManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/projection/ChildDocumentManager.eea
@@ -2,4 +2,4 @@ class org/eclipse/jface/text/projection/ChildDocumentManager
 
 createProjectionDocument
  (Lorg/eclipse/jface/text/IDocument;)Lorg/eclipse/jface/text/projection/ProjectionDocument;
- (Lorg/eclipse/jface/text/IDocument;)Lorg/eclipse/jface/text/projection/ProjectionDocument;
+ (Lorg/eclipse/jface/text/IDocument;)L1org/eclipse/jface/text/projection/ProjectionDocument; # @Inherited(org.eclipse.jface.text.projection.ProjectionDocumentManager)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/projection/ProjectionDocument.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/projection/ProjectionDocument.eea
index 6dbc3f99c3..065ac572ef 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/projection/ProjectionDocument.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/projection/ProjectionDocument.eea
@@ -8,7 +8,7 @@ adaptProjectionToMasterChange
  (Lorg/eclipse/jface/text/DocumentEvent;)Z
 computeProjectedMasterRegions
  (II)[Lorg/eclipse/jface/text/IRegion;
- (II)[Lorg/eclipse/jface/text/IRegion;
+ (II)[0Lorg/eclipse/jface/text/IRegion;
 computeUnprojectedMasterRegions
  (II)[Lorg/eclipse/jface/text/IRegion;
  (II)[Lorg/eclipse/jface/text/IRegion;
@@ -26,7 +26,7 @@ getDocumentInformationMapping
  ()Lorg/eclipse/jface/text/IDocumentInformationMapping;
 getFragments
  ()[Lorg/eclipse/jface/text/Position;
- ()[Lorg/eclipse/jface/text/Position;
+ ()[0Lorg/eclipse/jface/text/Position;
 getMasterDocument
  ()Lorg/eclipse/jface/text/IDocument;
  ()Lorg/eclipse/jface/text/IDocument;
@@ -35,7 +35,7 @@ getProjectionMapping
  ()Lorg/eclipse/jface/text/projection/ProjectionMapping;
 getSegments
  ()[Lorg/eclipse/jface/text/Position;
- ()[Lorg/eclipse/jface/text/Position;
+ ()[0Lorg/eclipse/jface/text/Position;
 masterDocumentAboutToBeChanged
  (Lorg/eclipse/jface/text/DocumentEvent;)V
  (Lorg/eclipse/jface/text/DocumentEvent;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/projection/ProjectionDocumentManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/projection/ProjectionDocumentManager.eea
index 354aa89cf1..de255341ca 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/projection/ProjectionDocumentManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/projection/ProjectionDocumentManager.eea
@@ -2,13 +2,13 @@ class org/eclipse/jface/text/projection/ProjectionDocumentManager
 
 createMasterSlaveMapping
  (Lorg/eclipse/jface/text/IDocument;)Lorg/eclipse/jface/text/IDocumentInformationMapping;
- (Lorg/eclipse/jface/text/IDocument;)Lorg/eclipse/jface/text/IDocumentInformationMapping;
+ (Lorg/eclipse/jface/text/IDocument;)L0org/eclipse/jface/text/IDocumentInformationMapping; # @Overrides(org.eclipse.jface.text.ISlaveDocumentManager)
 createProjectionDocument
  (Lorg/eclipse/jface/text/IDocument;)Lorg/eclipse/jface/text/projection/ProjectionDocument;
- (Lorg/eclipse/jface/text/IDocument;)Lorg/eclipse/jface/text/projection/ProjectionDocument;
+ (Lorg/eclipse/jface/text/IDocument;)L1org/eclipse/jface/text/projection/ProjectionDocument;
 createSlaveDocument
  (Lorg/eclipse/jface/text/IDocument;)Lorg/eclipse/jface/text/IDocument;
- (Lorg/eclipse/jface/text/IDocument;)Lorg/eclipse/jface/text/IDocument;
+ (Lorg/eclipse/jface/text/IDocument;)L1org/eclipse/jface/text/IDocument; # @Inherited(org.eclipse.jface.text.ISlaveDocumentManager)
 documentAboutToBeChanged
  (Lorg/eclipse/jface/text/DocumentEvent;)V
  (L1org/eclipse/jface/text/DocumentEvent;)V # @Inherited(org.eclipse.jface.text.IDocumentListener)
@@ -23,10 +23,10 @@ freeSlaveDocument
  (Lorg/eclipse/jface/text/IDocument;)V
 getMasterDocument
  (Lorg/eclipse/jface/text/IDocument;)Lorg/eclipse/jface/text/IDocument;
- (Lorg/eclipse/jface/text/IDocument;)Lorg/eclipse/jface/text/IDocument;
+ (Lorg/eclipse/jface/text/IDocument;)L0org/eclipse/jface/text/IDocument;
 getSlaveDocuments
  (Lorg/eclipse/jface/text/IDocument;)[Lorg/eclipse/jface/text/IDocument;
- (Lorg/eclipse/jface/text/IDocument;)[Lorg/eclipse/jface/text/IDocument;
+ (Lorg/eclipse/jface/text/IDocument;)[0Lorg/eclipse/jface/text/IDocument;
 isSlaveDocument
  (Lorg/eclipse/jface/text/IDocument;)Z
  (Lorg/eclipse/jface/text/IDocument;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/projection/ProjectionMapping.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/projection/ProjectionMapping.eea
index b0268d9a4d..c14e8e6c12 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/projection/ProjectionMapping.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/projection/ProjectionMapping.eea
@@ -8,7 +8,7 @@ getCoverage
  ()Lorg/eclipse/jface/text/IRegion;
 getExactCoverage
  (Lorg/eclipse/jface/text/IRegion;)[Lorg/eclipse/jface/text/IRegion;
- (Lorg/eclipse/jface/text/IRegion;)[Lorg/eclipse/jface/text/IRegion;
+ (Lorg/eclipse/jface/text/IRegion;)[0Lorg/eclipse/jface/text/IRegion;
 toClosestImageRegion
  (Lorg/eclipse/jface/text/IRegion;)Lorg/eclipse/jface/text/IRegion;
  (Lorg/eclipse/jface/text/IRegion;)Lorg/eclipse/jface/text/IRegion;
@@ -17,7 +17,7 @@ toExactImageRegion
  (Lorg/eclipse/jface/text/IRegion;)Lorg/eclipse/jface/text/IRegion;
 toExactImageRegions
  (Lorg/eclipse/jface/text/IRegion;)[Lorg/eclipse/jface/text/IRegion;
- (Lorg/eclipse/jface/text/IRegion;)[Lorg/eclipse/jface/text/IRegion;
+ (Lorg/eclipse/jface/text/IRegion;)[0Lorg/eclipse/jface/text/IRegion;
 toExactOriginRegions
  (Lorg/eclipse/jface/text/IRegion;)[Lorg/eclipse/jface/text/IRegion;
  (Lorg/eclipse/jface/text/IRegion;)[Lorg/eclipse/jface/text/IRegion;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/revisions/Revision.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/revisions/Revision.eea
index 1f609fa890..b2ebc4ec3b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/revisions/Revision.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/revisions/Revision.eea
@@ -5,7 +5,7 @@ addRange
  (Lorg/eclipse/jface/text/source/ILineRange;)V
 getAuthor
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getColor
  ()Lorg/eclipse/swt/graphics/RGB;
  ()Lorg/eclipse/swt/graphics/RGB;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/rules/DefaultPartitioner.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/rules/DefaultPartitioner.eea
index 43ddfcbca1..eb62322005 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/rules/DefaultPartitioner.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/rules/DefaultPartitioner.eea
@@ -43,7 +43,7 @@ documentChanged2
  (L1org/eclipse/jface/text/DocumentEvent;)L1org/eclipse/jface/text/IRegion; # @Inherited(org.eclipse.jface.text.IDocumentPartitionerExtension)
 findClosestPosition
  (I)Lorg/eclipse/jface/text/TypedPosition;
- (I)Lorg/eclipse/jface/text/TypedPosition;
+ (I)L0org/eclipse/jface/text/TypedPosition;
 getActiveRewriteSession
  ()Lorg/eclipse/jface/text/DocumentRewriteSession;
  ()L0org/eclipse/jface/text/DocumentRewriteSession; # @Inherited(org.eclipse.jface.text.IDocumentPartitionerExtension3)
@@ -67,7 +67,7 @@ getPartition
  (IZ)L1org/eclipse/jface/text/ITypedRegion; # @Inherited(org.eclipse.jface.text.IDocumentPartitionerExtension2)
 getTokenContentType
  (Lorg/eclipse/jface/text/rules/IToken;)Ljava/lang/String;
- (Lorg/eclipse/jface/text/rules/IToken;)Ljava/lang/String;
+ (Lorg/eclipse/jface/text/rules/IToken;)L0java/lang/String;
 isSupportedContentType
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/rules/FastPartitioner.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/rules/FastPartitioner.eea
index 4183e89282..ccd6f63afa 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/rules/FastPartitioner.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/rules/FastPartitioner.eea
@@ -39,7 +39,7 @@ documentChanged2
  (L1org/eclipse/jface/text/DocumentEvent;)L1org/eclipse/jface/text/IRegion; # @Inherited(org.eclipse.jface.text.IDocumentPartitionerExtension)
 findClosestPosition
  (I)Lorg/eclipse/jface/text/TypedPosition;
- (I)Lorg/eclipse/jface/text/TypedPosition;
+ (I)L0org/eclipse/jface/text/TypedPosition;
 getActiveRewriteSession
  ()Lorg/eclipse/jface/text/DocumentRewriteSession;
  ()L0org/eclipse/jface/text/DocumentRewriteSession; # @Inherited(org.eclipse.jface.text.IDocumentPartitionerExtension3)
@@ -66,7 +66,7 @@ getPositions
  ()[Lorg/eclipse/jface/text/Position;
 getTokenContentType
  (Lorg/eclipse/jface/text/rules/IToken;)Ljava/lang/String;
- (Lorg/eclipse/jface/text/rules/IToken;)Ljava/lang/String;
+ (Lorg/eclipse/jface/text/rules/IToken;)L0java/lang/String;
 isSupportedContentType
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/rules/RuleBasedPartitioner.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/rules/RuleBasedPartitioner.eea
index 40ec29e277..6cc030f02f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/rules/RuleBasedPartitioner.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/rules/RuleBasedPartitioner.eea
@@ -40,7 +40,7 @@ documentChanged2
  (L1org/eclipse/jface/text/DocumentEvent;)L1org/eclipse/jface/text/IRegion; # @Inherited(org.eclipse.jface.text.IDocumentPartitionerExtension)
 findClosestPosition
  (I)Lorg/eclipse/jface/text/TypedPosition;
- (I)Lorg/eclipse/jface/text/TypedPosition;
+ (I)L0org/eclipse/jface/text/TypedPosition;
 getContentType
  (I)Ljava/lang/String;
  (I)L1java/lang/String; # @Inherited(org.eclipse.jface.text.IDocumentPartitioner)
@@ -61,7 +61,7 @@ getPartition
  (IZ)L1org/eclipse/jface/text/ITypedRegion; # @Inherited(org.eclipse.jface.text.IDocumentPartitionerExtension2)
 getTokenContentType
  (Lorg/eclipse/jface/text/rules/IToken;)Ljava/lang/String;
- (Lorg/eclipse/jface/text/rules/IToken;)Ljava/lang/String;
+ (Lorg/eclipse/jface/text/rules/IToken;)L0java/lang/String;
 isSupportedContentType
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/AbstractRulerColumn.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/AbstractRulerColumn.eea
index e7a1f58eb1..6c8d058252 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/AbstractRulerColumn.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/AbstractRulerColumn.eea
@@ -11,7 +11,7 @@ computeForeground
  (I)Lorg/eclipse/swt/graphics/Color;
 computeText
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 createControl
  (Lorg/eclipse/jface/text/source/CompositeRuler;Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
  (L1org/eclipse/jface/text/source/CompositeRuler;L1org/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.jface.text.source.IVerticalRulerColumn)
@@ -20,7 +20,7 @@ getControl
  ()Lorg/eclipse/swt/widgets/Control;
 getDefaultBackground
  ()Lorg/eclipse/swt/graphics/Color;
- ()Lorg/eclipse/swt/graphics/Color;
+ ()L0org/eclipse/swt/graphics/Color;
 getFont
  ()Lorg/eclipse/swt/graphics/Font;
  ()Lorg/eclipse/swt/graphics/Font;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/AnnotationBarHoverManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/AnnotationBarHoverManager.eea
index 8fd8dfe00a..1e607c1ed2 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/AnnotationBarHoverManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/AnnotationBarHoverManager.eea
@@ -23,7 +23,7 @@ getCurrentAnnotationHover
  ()Lorg/eclipse/jface/text/source/IAnnotationHover;
 getInternalAccessor
  ()Lorg/eclipse/jface/internal/text/InternalAccessor;
- ()Lorg/eclipse/jface/internal/text/InternalAccessor;
+ ()L1org/eclipse/jface/internal/text/InternalAccessor; # @Inherited(org.eclipse.jface.text.AbstractHoverInformationControlManager)
 getSourceViewer
  ()Lorg/eclipse/jface/text/source/ISourceViewer;
  ()Lorg/eclipse/jface/text/source/ISourceViewer;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/AnnotationModel.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/AnnotationModel.eea
index fa8be33a95..62d1e1b49f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/AnnotationModel.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/AnnotationModel.eea
@@ -30,7 +30,7 @@ connect
  (Lorg/eclipse/jface/text/IDocument;)V
 createAnnotationModelEvent
  ()Lorg/eclipse/jface/text/source/AnnotationModelEvent;
- ()Lorg/eclipse/jface/text/source/AnnotationModelEvent;
+ ()L1org/eclipse/jface/text/source/AnnotationModelEvent;
 disconnect
  (Lorg/eclipse/jface/text/IDocument;)V
  (Lorg/eclipse/jface/text/IDocument;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/AnnotationModelEvent.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/AnnotationModelEvent.eea
index e96391a46e..88c84d6e49 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/AnnotationModelEvent.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/AnnotationModelEvent.eea
@@ -20,16 +20,16 @@ annotationRemoved
  (Lorg/eclipse/jface/text/source/Annotation;Lorg/eclipse/jface/text/Position;)V
 getAddedAnnotations
  ()[Lorg/eclipse/jface/text/source/Annotation;
- ()[Lorg/eclipse/jface/text/source/Annotation;
+ ()[1Lorg/eclipse/jface/text/source/Annotation;
 getAnnotationModel
  ()Lorg/eclipse/jface/text/source/IAnnotationModel;
  ()Lorg/eclipse/jface/text/source/IAnnotationModel;
 getChangedAnnotations
  ()[Lorg/eclipse/jface/text/source/Annotation;
- ()[Lorg/eclipse/jface/text/source/Annotation;
+ ()[1Lorg/eclipse/jface/text/source/Annotation;
 getPositionOfRemovedAnnotation
  (Lorg/eclipse/jface/text/source/Annotation;)Lorg/eclipse/jface/text/Position;
  (Lorg/eclipse/jface/text/source/Annotation;)Lorg/eclipse/jface/text/Position;
 getRemovedAnnotations
  ()[Lorg/eclipse/jface/text/source/Annotation;
- ()[Lorg/eclipse/jface/text/source/Annotation;
+ ()[1Lorg/eclipse/jface/text/source/Annotation;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/AnnotationPainter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/AnnotationPainter.eea
index c2dd6f4da7..a023168484 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/AnnotationPainter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/AnnotationPainter.eea
@@ -23,7 +23,7 @@ applyTextPresentation
  (L1org/eclipse/jface/text/TextPresentation;)V # @Inherited(org.eclipse.jface.text.ITextPresentationListener)
 findAnnotationModel
  (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/source/IAnnotationModel;
- (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/source/IAnnotationModel;
+ (Lorg/eclipse/jface/text/source/ISourceViewer;)L0org/eclipse/jface/text/source/IAnnotationModel;
 modelChanged
  (Lorg/eclipse/jface/text/source/AnnotationModelEvent;)V
  (Lorg/eclipse/jface/text/source/AnnotationModelEvent;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/ChangeRulerColumn.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/ChangeRulerColumn.eea
index 0ca37ef65e..15f84fa9d7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/ChangeRulerColumn.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/ChangeRulerColumn.eea
@@ -14,7 +14,7 @@ getControl
  ()Lorg/eclipse/swt/widgets/Control;
 getHover
  ()Lorg/eclipse/jface/text/source/IAnnotationHover;
- ()Lorg/eclipse/jface/text/source/IAnnotationHover;
+ ()L0org/eclipse/jface/text/source/IAnnotationHover;
 getModel
  ()Lorg/eclipse/jface/text/source/IAnnotationModel;
  ()Lorg/eclipse/jface/text/source/IAnnotationModel;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/CompositeRuler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/CompositeRuler.eea
index 8506aa66ee..774040021b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/CompositeRuler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/CompositeRuler.eea
@@ -30,7 +30,7 @@ getDecoratorIterator
  ()Ljava/util/Iterator<Lorg/eclipse/jface/text/source/IVerticalRulerColumn;>;
 getHover
  ()Lorg/eclipse/jface/text/source/IAnnotationHover;
- ()Lorg/eclipse/jface/text/source/IAnnotationHover;
+ ()L0org/eclipse/jface/text/source/IAnnotationHover;
 getModel
  ()Lorg/eclipse/jface/text/source/IAnnotationModel;
  ()Lorg/eclipse/jface/text/source/IAnnotationModel;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/DefaultAnnotationHover.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/DefaultAnnotationHover.eea
index db677bf61c..a3d2f34dd1 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/DefaultAnnotationHover.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/DefaultAnnotationHover.eea
@@ -2,13 +2,13 @@ class org/eclipse/jface/text/source/DefaultAnnotationHover
 
 formatMultipleMessages
  (Ljava/util/List<Ljava/lang/String;>;)Ljava/lang/String;
- (Ljava/util/List<Ljava/lang/String;>;)Ljava/lang/String;
+ (Ljava/util/List<Ljava/lang/String;>;)L1java/lang/String;
 formatSingleMessage
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
 getHoverInfo
  (Lorg/eclipse/jface/text/source/ISourceViewer;I)Ljava/lang/String;
- (Lorg/eclipse/jface/text/source/ISourceViewer;I)Ljava/lang/String;
+ (Lorg/eclipse/jface/text/source/ISourceViewer;I)L0java/lang/String;
 isIncluded
  (Lorg/eclipse/jface/text/source/Annotation;)Z
  (Lorg/eclipse/jface/text/source/Annotation;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/LineChangeHover.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/LineChangeHover.eea
index 32cbe18bdf..95d743735e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/LineChangeHover.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/LineChangeHover.eea
@@ -11,19 +11,19 @@ formatSource
  (Ljava/lang/String;)Ljava/lang/String;
 getHoverControlCreator
  ()Lorg/eclipse/jface/text/IInformationControlCreator;
- ()Lorg/eclipse/jface/text/IInformationControlCreator;
+ ()L0org/eclipse/jface/text/IInformationControlCreator;
 getHoverInfo
  (Lorg/eclipse/jface/text/source/ISourceViewer;I)Ljava/lang/String;
- (Lorg/eclipse/jface/text/source/ISourceViewer;I)Ljava/lang/String;
+ (Lorg/eclipse/jface/text/source/ISourceViewer;I)L0java/lang/String;
 getHoverInfo
  (Lorg/eclipse/jface/text/source/ISourceViewer;Lorg/eclipse/jface/text/source/ILineRange;I)Ljava/lang/Object;
  (Lorg/eclipse/jface/text/source/ISourceViewer;Lorg/eclipse/jface/text/source/ILineRange;I)Ljava/lang/Object;
 getHoverLineRange
  (Lorg/eclipse/jface/text/source/ISourceViewer;I)Lorg/eclipse/jface/text/source/ILineRange;
- (Lorg/eclipse/jface/text/source/ISourceViewer;I)Lorg/eclipse/jface/text/source/ILineRange;
+ (Lorg/eclipse/jface/text/source/ISourceViewer;I)L0org/eclipse/jface/text/source/ILineRange;
 getInformationPresenterControlCreator
  ()Lorg/eclipse/jface/text/IInformationControlCreator;
  ()Lorg/eclipse/jface/text/IInformationControlCreator;
 getTabReplacement
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/LineNumberChangeRulerColumn.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/LineNumberChangeRulerColumn.eea
index 7b0f0e5b16..a2186f9736 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/LineNumberChangeRulerColumn.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/LineNumberChangeRulerColumn.eea
@@ -14,10 +14,10 @@ createControl
  (L1org/eclipse/jface/text/source/CompositeRuler;L1org/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.jface.text.source.LineNumberRulerColumn)
 createDisplayString
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String; # @Inherited(org.eclipse.jface.text.source.LineNumberRulerColumn)
 getHover
  ()Lorg/eclipse/jface/text/source/IAnnotationHover;
- ()Lorg/eclipse/jface/text/source/IAnnotationHover;
+ ()L0org/eclipse/jface/text/source/IAnnotationHover;
 getModel
  ()Lorg/eclipse/jface/text/source/IAnnotationModel;
  ()Lorg/eclipse/jface/text/source/IAnnotationModel;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/LineNumberRulerColumn.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/LineNumberRulerColumn.eea
index b4cfd8b8c5..c37f2b3644 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/LineNumberRulerColumn.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/LineNumberRulerColumn.eea
@@ -5,7 +5,7 @@ createControl
  (L1org/eclipse/jface/text/source/CompositeRuler;L1org/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.jface.text.source.IVerticalRulerColumn)
 createDisplayString
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 getBackground
  (Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/swt/graphics/Color;
  (Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/swt/graphics/Color;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/SourceViewer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/SourceViewer.eea
index f8a37fb716..6077cf923b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/SourceViewer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/SourceViewer.eea
@@ -58,19 +58,19 @@ createControl
  (L1org/eclipse/swt/widgets/Composite;I)V # @Inherited(org.eclipse.jface.text.TextViewer)
 createFormattingContext
  ()Lorg/eclipse/jface/text/formatter/IFormattingContext;
- ()Lorg/eclipse/jface/text/formatter/IFormattingContext;
+ ()L1org/eclipse/jface/text/formatter/IFormattingContext;
 createFormattingContext
  (II)Lorg/eclipse/jface/text/formatter/IFormattingContext;
- (II)Lorg/eclipse/jface/text/formatter/IFormattingContext;
+ (II)L1org/eclipse/jface/text/formatter/IFormattingContext;
 createLayout
  ()Lorg/eclipse/swt/widgets/Layout;
- ()Lorg/eclipse/swt/widgets/Layout;
+ ()L1org/eclipse/swt/widgets/Layout;
 createVisualAnnotationModel
  (Lorg/eclipse/jface/text/source/IAnnotationModel;)Lorg/eclipse/jface/text/source/IAnnotationModel;
- (Lorg/eclipse/jface/text/source/IAnnotationModel;)Lorg/eclipse/jface/text/source/IAnnotationModel;
+ (Lorg/eclipse/jface/text/source/IAnnotationModel;)L1org/eclipse/jface/text/source/IAnnotationModel;
 getAnnotationModel
  ()Lorg/eclipse/jface/text/source/IAnnotationModel;
- ()Lorg/eclipse/jface/text/source/IAnnotationModel;
+ ()L0org/eclipse/jface/text/source/IAnnotationModel;
 getContentAssistantFacade
  ()Lorg/eclipse/jface/text/source/ContentAssistantFacade;
  ()Lorg/eclipse/jface/text/source/ContentAssistantFacade;
@@ -79,7 +79,7 @@ getControl
  ()L1org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.jface.text.TextViewer)
 getCurrentAnnotationHover
  ()Lorg/eclipse/jface/text/source/IAnnotationHover;
- ()Lorg/eclipse/jface/text/source/IAnnotationHover;
+ ()L0org/eclipse/jface/text/source/IAnnotationHover;
 getQuickAssistAssistant
  ()Lorg/eclipse/jface/text/quickassist/IQuickAssistAssistant;
  ()Lorg/eclipse/jface/text/quickassist/IQuickAssistAssistant;
@@ -88,7 +88,7 @@ getQuickAssistInvocationContext
  ()Lorg/eclipse/jface/text/quickassist/IQuickAssistInvocationContext;
 getRangeIndication
  ()Lorg/eclipse/jface/text/IRegion;
- ()Lorg/eclipse/jface/text/IRegion;
+ ()L0org/eclipse/jface/text/IRegion;
 getVerticalRuler
  ()Lorg/eclipse/jface/text/source/IVerticalRuler;
  ()Lorg/eclipse/jface/text/source/IVerticalRuler;
@@ -97,7 +97,7 @@ getVisualAnnotationModel
  ()Lorg/eclipse/jface/text/source/IAnnotationModel;
 rememberSelection
  ()Lorg/eclipse/swt/graphics/Point;
- ()Lorg/eclipse/swt/graphics/Point;
+ ()L1org/eclipse/swt/graphics/Point;
 removeVerticalRulerColumn
  (Lorg/eclipse/jface/text/source/IVerticalRulerColumn;)V
  (Lorg/eclipse/jface/text/source/IVerticalRulerColumn;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/SourceViewerConfiguration.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/SourceViewerConfiguration.eea
index 6eb9802616..bca8d1a82a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/SourceViewerConfiguration.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/SourceViewerConfiguration.eea
@@ -2,37 +2,37 @@ class org/eclipse/jface/text/source/SourceViewerConfiguration
 
 getAnnotationHover
  (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/source/IAnnotationHover;
- (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/source/IAnnotationHover;
+ (Lorg/eclipse/jface/text/source/ISourceViewer;)L0org/eclipse/jface/text/source/IAnnotationHover;
 getAutoEditStrategies
  (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)[Lorg/eclipse/jface/text/IAutoEditStrategy;
  (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)[Lorg/eclipse/jface/text/IAutoEditStrategy;
 getAutoIndentStrategy
  (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)Lorg/eclipse/jface/text/IAutoIndentStrategy;
- (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)Lorg/eclipse/jface/text/IAutoIndentStrategy;
+ (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)L1org/eclipse/jface/text/IAutoIndentStrategy;
 getCodeMiningProviders
  (Lorg/eclipse/jface/text/source/ISourceViewer;)[Lorg/eclipse/jface/text/codemining/ICodeMiningProvider;
- (Lorg/eclipse/jface/text/source/ISourceViewer;)[Lorg/eclipse/jface/text/codemining/ICodeMiningProvider;
+ (Lorg/eclipse/jface/text/source/ISourceViewer;)[0Lorg/eclipse/jface/text/codemining/ICodeMiningProvider;
 getConfiguredContentTypes
  (Lorg/eclipse/jface/text/source/ISourceViewer;)[Ljava/lang/String;
  (Lorg/eclipse/jface/text/source/ISourceViewer;)[Ljava/lang/String;
 getConfiguredDocumentPartitioning
  (Lorg/eclipse/jface/text/source/ISourceViewer;)Ljava/lang/String;
- (Lorg/eclipse/jface/text/source/ISourceViewer;)Ljava/lang/String;
+ (Lorg/eclipse/jface/text/source/ISourceViewer;)L1java/lang/String;
 getConfiguredTextHoverStateMasks
  (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)[I
- (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)[I
+ (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)[0I
 getContentAssistant
  (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/contentassist/IContentAssistant;
- (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/contentassist/IContentAssistant;
+ (Lorg/eclipse/jface/text/source/ISourceViewer;)L0org/eclipse/jface/text/contentassist/IContentAssistant;
 getContentFormatter
  (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/formatter/IContentFormatter;
- (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/formatter/IContentFormatter;
+ (Lorg/eclipse/jface/text/source/ISourceViewer;)L0org/eclipse/jface/text/formatter/IContentFormatter;
 getDefaultPrefixes
  (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)[Ljava/lang/String;
- (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)[Ljava/lang/String;
+ (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)[0Ljava/lang/String;
 getDoubleClickStrategy
  (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)Lorg/eclipse/jface/text/ITextDoubleClickStrategy;
- (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)Lorg/eclipse/jface/text/ITextDoubleClickStrategy;
+ (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)L1org/eclipse/jface/text/ITextDoubleClickStrategy;
 getHyperlinkDetectors
  (Lorg/eclipse/jface/text/source/ISourceViewer;)[Lorg/eclipse/jface/text/hyperlink/IHyperlinkDetector;
  (Lorg/eclipse/jface/text/source/ISourceViewer;)[Lorg/eclipse/jface/text/hyperlink/IHyperlinkDetector;
@@ -47,13 +47,13 @@ getIndentPrefixes
  (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)[Ljava/lang/String;
 getIndentPrefixesForTab
  (I)[Ljava/lang/String;
- (I)[Ljava/lang/String;
+ (I)[1Ljava/lang/String;
 getInformationControlCreator
  (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/IInformationControlCreator;
  (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/IInformationControlCreator;
 getInformationPresenter
  (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/information/IInformationPresenter;
- (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/information/IInformationPresenter;
+ (Lorg/eclipse/jface/text/source/ISourceViewer;)L0org/eclipse/jface/text/information/IInformationPresenter;
 getLineSpacing
  (Lorg/eclipse/jface/text/source/ISourceViewer;)I
  (Lorg/eclipse/jface/text/source/ISourceViewer;)I
@@ -62,22 +62,22 @@ getOverviewRulerAnnotationHover
  (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/source/IAnnotationHover;
 getPresentationReconciler
  (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/presentation/IPresentationReconciler;
- (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/presentation/IPresentationReconciler;
+ (Lorg/eclipse/jface/text/source/ISourceViewer;)L1org/eclipse/jface/text/presentation/IPresentationReconciler;
 getQuickAssistAssistant
  (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/quickassist/IQuickAssistAssistant;
- (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/quickassist/IQuickAssistAssistant;
+ (Lorg/eclipse/jface/text/source/ISourceViewer;)L0org/eclipse/jface/text/quickassist/IQuickAssistAssistant;
 getReconciler
  (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/reconciler/IReconciler;
- (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/reconciler/IReconciler;
+ (Lorg/eclipse/jface/text/source/ISourceViewer;)L0org/eclipse/jface/text/reconciler/IReconciler;
 getTabWidth
  (Lorg/eclipse/jface/text/source/ISourceViewer;)I
  (Lorg/eclipse/jface/text/source/ISourceViewer;)I
 getTextHover
  (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)Lorg/eclipse/jface/text/ITextHover;
- (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)Lorg/eclipse/jface/text/ITextHover;
+ (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)L0org/eclipse/jface/text/ITextHover;
 getTextHover
  (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;I)Lorg/eclipse/jface/text/ITextHover;
- (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;I)Lorg/eclipse/jface/text/ITextHover;
+ (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;I)L0org/eclipse/jface/text/ITextHover;
 getUndoManager
  (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/IUndoManager;
  (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/IUndoManager;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/inlined/AbstractInlinedAnnotation.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/inlined/AbstractInlinedAnnotation.eea
index 41bdc41944..a18200daa4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/inlined/AbstractInlinedAnnotation.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/inlined/AbstractInlinedAnnotation.eea
@@ -12,7 +12,7 @@ draw
  (Lorg/eclipse/swt/graphics/GC;Lorg/eclipse/swt/custom/StyledText;IILorg/eclipse/swt/graphics/Color;II)V
 getAction
  (Lorg/eclipse/swt/events/MouseEvent;)Ljava/util/function/Consumer<Lorg/eclipse/swt/events/MouseEvent;>;
- (Lorg/eclipse/swt/events/MouseEvent;)Ljava/util/function/Consumer<Lorg/eclipse/swt/events/MouseEvent;>;
+ (Lorg/eclipse/swt/events/MouseEvent;)L0java/util/function/Consumer<Lorg/eclipse/swt/events/MouseEvent;>;
 getPosition
  ()Lorg/eclipse/jface/text/Position;
  ()Lorg/eclipse/jface/text/Position;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/inlined/InlinedAnnotationSupport.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/inlined/InlinedAnnotationSupport.eea
index c75a1fb849..d57381746e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/inlined/InlinedAnnotationSupport.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/inlined/InlinedAnnotationSupport.eea
@@ -2,7 +2,7 @@ class org/eclipse/jface/text/source/inlined/InlinedAnnotationSupport
 
 findExistingAnnotation
  <T:Lorg/eclipse/jface/text/source/inlined/AbstractInlinedAnnotation;>(Lorg/eclipse/jface/text/Position;)TT;
- <T:Lorg/eclipse/jface/text/source/inlined/AbstractInlinedAnnotation;>(Lorg/eclipse/jface/text/Position;)TT;
+ <T:Lorg/eclipse/jface/text/source/inlined/AbstractInlinedAnnotation;>(Lorg/eclipse/jface/text/Position;)T0T;
 install
  (Lorg/eclipse/jface/text/source/ISourceViewer;Lorg/eclipse/jface/text/source/AnnotationPainter;)V
  (Lorg/eclipse/jface/text/source/ISourceViewer;Lorg/eclipse/jface/text/source/AnnotationPainter;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/projection/AnnotationBag.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/projection/AnnotationBag.eea
index 384a5130fa..1a30b44f2d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/projection/AnnotationBag.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/projection/AnnotationBag.eea
@@ -8,7 +8,7 @@ add
  (Lorg/eclipse/jface/text/source/Annotation;)V
 iterator
  ()Ljava/util/Iterator<Lorg/eclipse/jface/text/source/Annotation;>;
- ()Ljava/util/Iterator<Lorg/eclipse/jface/text/source/Annotation;>;
+ ()L0java/util/Iterator<Lorg/eclipse/jface/text/source/Annotation;>;
 remove
  (Lorg/eclipse/jface/text/source/Annotation;)V
  (Lorg/eclipse/jface/text/source/Annotation;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/projection/ProjectionSupport.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/projection/ProjectionSupport.eea
index 0dddea2e1e..0cbca3a339 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/projection/ProjectionSupport.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/projection/ProjectionSupport.eea
@@ -12,7 +12,7 @@ addSummarizableAnnotationType
  (Ljava/lang/String;)V
 getAdapter
  <T:Ljava/lang/Object;>(Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/Class<TT;>;)TT;
- <T:Ljava/lang/Object;>(Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/Class<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/Class<TT;>;)T0T;
 removeSummarizableAnnotationType
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/projection/ProjectionViewer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/projection/ProjectionViewer.eea
index 465f78248b..82172f0903 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/projection/ProjectionViewer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/source/projection/ProjectionViewer.eea
@@ -8,16 +8,16 @@ addProjectionListener
  (L1org/eclipse/jface/text/source/projection/IProjectionListener;)V
 computeCollapsedRegion
  (Lorg/eclipse/jface/text/Position;)Lorg/eclipse/jface/text/IRegion;
- (Lorg/eclipse/jface/text/Position;)Lorg/eclipse/jface/text/IRegion;
+ (Lorg/eclipse/jface/text/Position;)L0org/eclipse/jface/text/IRegion;
 computeCollapsedRegionAnchor
  (Lorg/eclipse/jface/text/Position;)Lorg/eclipse/jface/text/Position;
- (Lorg/eclipse/jface/text/Position;)Lorg/eclipse/jface/text/Position;
+ (Lorg/eclipse/jface/text/Position;)L0org/eclipse/jface/text/Position;
 createSlaveDocumentManager
  ()Lorg/eclipse/jface/text/ISlaveDocumentManager;
- ()Lorg/eclipse/jface/text/ISlaveDocumentManager;
+ ()L1org/eclipse/jface/text/ISlaveDocumentManager; # @Inherited(org.eclipse.jface.text.TextViewer)
 createVisualAnnotationModel
  (Lorg/eclipse/jface/text/source/IAnnotationModel;)Lorg/eclipse/jface/text/source/IAnnotationModel;
- (Lorg/eclipse/jface/text/source/IAnnotationModel;)Lorg/eclipse/jface/text/source/IAnnotationModel;
+ (Lorg/eclipse/jface/text/source/IAnnotationModel;)L1org/eclipse/jface/text/source/IAnnotationModel; # @Inherited(org.eclipse.jface.text.source.SourceViewer)
 exposeModelRange
  (Lorg/eclipse/jface/text/IRegion;)Z
  (L1org/eclipse/jface/text/IRegion;)Z # @Inherited(org.eclipse.jface.text.ITextViewerExtension5)
@@ -35,7 +35,7 @@ getFindReplaceDocumentAdapter
  ()Lorg/eclipse/jface/text/FindReplaceDocumentAdapter;
 getProjectionAnnotationModel
  ()Lorg/eclipse/jface/text/source/projection/ProjectionAnnotationModel;
- ()Lorg/eclipse/jface/text/source/projection/ProjectionAnnotationModel;
+ ()L0org/eclipse/jface/text/source/projection/ProjectionAnnotationModel;
 getVisibleRegion
  ()Lorg/eclipse/jface/text/IRegion;
  ()L1org/eclipse/jface/text/IRegion; # @Inherited(org.eclipse.jface.text.TextViewer)
@@ -71,4 +71,4 @@ updateSlaveDocument
  (Lorg/eclipse/jface/text/IDocument;II)Z
 widgetSelection2ModelSelection
  (Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/graphics/Point;
- (Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/graphics/Point;
+ (Lorg/eclipse/swt/graphics/Point;)L0org/eclipse/swt/graphics/Point; # @Overrides(org.eclipse.jface.text.TextViewer)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/templates/DocumentTemplateContext.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/templates/DocumentTemplateContext.eea
index 18b29e3193..8fe0ef3440 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/templates/DocumentTemplateContext.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/templates/DocumentTemplateContext.eea
@@ -11,7 +11,7 @@ canEvaluate
  (Lorg/eclipse/jface/text/templates/Template;)Z
 evaluate
  (Lorg/eclipse/jface/text/templates/Template;)Lorg/eclipse/jface/text/templates/TemplateBuffer;
- (Lorg/eclipse/jface/text/templates/Template;)Lorg/eclipse/jface/text/templates/TemplateBuffer;
+ (Lorg/eclipse/jface/text/templates/Template;)L0org/eclipse/jface/text/templates/TemplateBuffer;
 getDocument
  ()Lorg/eclipse/jface/text/IDocument;
  ()Lorg/eclipse/jface/text/IDocument;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/templates/TemplateCompletionProcessor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/templates/TemplateCompletionProcessor.eea
index cb82b1651b..178a63a7bb 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/templates/TemplateCompletionProcessor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/templates/TemplateCompletionProcessor.eea
@@ -8,13 +8,13 @@ computeContextInformation
  (L1org/eclipse/jface/text/ITextViewer;I)[0L1org/eclipse/jface/text/contentassist/IContextInformation; # @Inherited(org.eclipse.jface.text.contentassist.IContentAssistProcessor)
 createContext
  (Lorg/eclipse/jface/text/ITextViewer;Lorg/eclipse/jface/text/IRegion;)Lorg/eclipse/jface/text/templates/TemplateContext;
- (Lorg/eclipse/jface/text/ITextViewer;Lorg/eclipse/jface/text/IRegion;)Lorg/eclipse/jface/text/templates/TemplateContext;
+ (Lorg/eclipse/jface/text/ITextViewer;Lorg/eclipse/jface/text/IRegion;)L0org/eclipse/jface/text/templates/TemplateContext;
 createProposal
  (Lorg/eclipse/jface/text/templates/Template;Lorg/eclipse/jface/text/templates/TemplateContext;Lorg/eclipse/jface/text/IRegion;I)Lorg/eclipse/jface/text/contentassist/ICompletionProposal;
- (Lorg/eclipse/jface/text/templates/Template;Lorg/eclipse/jface/text/templates/TemplateContext;Lorg/eclipse/jface/text/IRegion;I)Lorg/eclipse/jface/text/contentassist/ICompletionProposal;
+ (Lorg/eclipse/jface/text/templates/Template;Lorg/eclipse/jface/text/templates/TemplateContext;Lorg/eclipse/jface/text/IRegion;I)L1org/eclipse/jface/text/contentassist/ICompletionProposal;
 createProposal
  (Lorg/eclipse/jface/text/templates/Template;Lorg/eclipse/jface/text/templates/TemplateContext;Lorg/eclipse/jface/text/Region;I)Lorg/eclipse/jface/text/contentassist/ICompletionProposal;
- (Lorg/eclipse/jface/text/templates/Template;Lorg/eclipse/jface/text/templates/TemplateContext;Lorg/eclipse/jface/text/Region;I)Lorg/eclipse/jface/text/contentassist/ICompletionProposal;
+ (Lorg/eclipse/jface/text/templates/Template;Lorg/eclipse/jface/text/templates/TemplateContext;Lorg/eclipse/jface/text/Region;I)L1org/eclipse/jface/text/contentassist/ICompletionProposal;
 extractPrefix
  (Lorg/eclipse/jface/text/ITextViewer;I)Ljava/lang/String;
  (Lorg/eclipse/jface/text/ITextViewer;I)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/templates/TemplateTranslator.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/templates/TemplateTranslator.eea
index 7cbd33b11a..2c40cb0c06 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/templates/TemplateTranslator.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/templates/TemplateTranslator.eea
@@ -2,10 +2,10 @@ class org/eclipse/jface/text/templates/TemplateTranslator
 
 createVariable
  (Ljava/lang/String;Ljava/lang/String;[I)Lorg/eclipse/jface/text/templates/TemplateVariable;
- (Ljava/lang/String;Ljava/lang/String;[I)Lorg/eclipse/jface/text/templates/TemplateVariable;
+ (Ljava/lang/String;Ljava/lang/String;[I)L1org/eclipse/jface/text/templates/TemplateVariable;
 createVariable
  (Lorg/eclipse/jface/text/templates/TemplateVariableType;Ljava/lang/String;[I)Lorg/eclipse/jface/text/templates/TemplateVariable;
- (Lorg/eclipse/jface/text/templates/TemplateVariableType;Ljava/lang/String;[I)Lorg/eclipse/jface/text/templates/TemplateVariable;
+ (Lorg/eclipse/jface/text/templates/TemplateVariableType;Ljava/lang/String;[I)L1org/eclipse/jface/text/templates/TemplateVariable;
 getErrorMessage
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/templates/persistence/TemplateReaderWriter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/templates/persistence/TemplateReaderWriter.eea
index f83cd6ca84..98a78d73c0 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/templates/persistence/TemplateReaderWriter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/templates/persistence/TemplateReaderWriter.eea
@@ -2,16 +2,16 @@ class org/eclipse/jface/text/templates/persistence/TemplateReaderWriter
 
 read
  (Ljava/io/InputStream;Ljava/util/ResourceBundle;)[Lorg/eclipse/jface/text/templates/persistence/TemplatePersistenceData;
- (Ljava/io/InputStream;Ljava/util/ResourceBundle;)[Lorg/eclipse/jface/text/templates/persistence/TemplatePersistenceData;
+ (Ljava/io/InputStream;Ljava/util/ResourceBundle;)[1Lorg/eclipse/jface/text/templates/persistence/TemplatePersistenceData;
 read
  (Ljava/io/Reader;)[Lorg/eclipse/jface/text/templates/persistence/TemplatePersistenceData;
- (Ljava/io/Reader;)[Lorg/eclipse/jface/text/templates/persistence/TemplatePersistenceData;
+ (Ljava/io/Reader;)[1Lorg/eclipse/jface/text/templates/persistence/TemplatePersistenceData;
 read
  (Ljava/io/Reader;Ljava/util/ResourceBundle;)[Lorg/eclipse/jface/text/templates/persistence/TemplatePersistenceData;
- (Ljava/io/Reader;Ljava/util/ResourceBundle;)[Lorg/eclipse/jface/text/templates/persistence/TemplatePersistenceData;
+ (Ljava/io/Reader;Ljava/util/ResourceBundle;)[1Lorg/eclipse/jface/text/templates/persistence/TemplatePersistenceData;
 readSingle
  (Ljava/io/Reader;Ljava/lang/String;)Lorg/eclipse/jface/text/templates/persistence/TemplatePersistenceData;
- (Ljava/io/Reader;Ljava/lang/String;)Lorg/eclipse/jface/text/templates/persistence/TemplatePersistenceData;
+ (Ljava/io/Reader;Ljava/lang/String;)L1org/eclipse/jface/text/templates/persistence/TemplatePersistenceData;
 save
  ([Lorg/eclipse/jface/text/templates/persistence/TemplatePersistenceData;Ljava/io/OutputStream;)V
  ([Lorg/eclipse/jface/text/templates/persistence/TemplatePersistenceData;Ljava/io/OutputStream;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/templates/persistence/TemplateStore.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/templates/persistence/TemplateStore.eea
index 4f559079b0..2e36b706cf 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/templates/persistence/TemplateStore.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/text/templates/persistence/TemplateStore.eea
@@ -14,13 +14,13 @@ delete
  (Lorg/eclipse/jface/text/templates/persistence/TemplatePersistenceData;)V
 getRegistry
  ()Lorg/eclipse/jface/text/templates/ContextTypeRegistry;
- ()Lorg/eclipse/jface/text/templates/ContextTypeRegistry;
+ ()L0org/eclipse/jface/text/templates/ContextTypeRegistry;
 getTemplateData
  (Ljava/lang/String;)Lorg/eclipse/jface/text/templates/persistence/TemplatePersistenceData;
- (Ljava/lang/String;)Lorg/eclipse/jface/text/templates/persistence/TemplatePersistenceData;
+ (Ljava/lang/String;)L1org/eclipse/jface/text/templates/persistence/TemplatePersistenceData;
 getTemplateData
  (Z)[Lorg/eclipse/jface/text/templates/persistence/TemplatePersistenceData;
- (Z)[Lorg/eclipse/jface/text/templates/persistence/TemplatePersistenceData;
+ (Z)[1Lorg/eclipse/jface/text/templates/persistence/TemplatePersistenceData;
 internalAdd
  (Lorg/eclipse/jface/text/templates/persistence/TemplatePersistenceData;)V
  (Lorg/eclipse/jface/text/templates/persistence/TemplatePersistenceData;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/util/BidiUtils.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/util/BidiUtils.eea
index d834a05d56..95c056927a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/util/BidiUtils.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/util/BidiUtils.eea
@@ -33,7 +33,7 @@ applyTextDirection
  (Lorg/eclipse/swt/widgets/Control;Ljava/lang/String;)V
 getSegmentListener
  (Ljava/lang/String;)Lorg/eclipse/swt/events/SegmentListener;
- (Ljava/lang/String;)Lorg/eclipse/swt/events/SegmentListener;
+ (Ljava/lang/String;)L1org/eclipse/swt/events/SegmentListener;
 getTextDirection
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/util/DelegatingDragAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/util/DelegatingDragAdapter.eea
index bfd70a3b87..37b970d7db 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/util/DelegatingDragAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/util/DelegatingDragAdapter.eea
@@ -14,7 +14,7 @@ dragStart
  (L1org/eclipse/swt/dnd/DragSourceEvent;)V # @Inherited(org.eclipse.swt.dnd.DragSourceListener)
 getTransfers
  ()[Lorg/eclipse/swt/dnd/Transfer;
- ()[Lorg/eclipse/swt/dnd/Transfer;
+ ()[1Lorg/eclipse/swt/dnd/Transfer;
 removeDragSourceListener
  (Lorg/eclipse/jface/util/TransferDragSourceListener;)V
  (L1org/eclipse/jface/util/TransferDragSourceListener;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/util/DelegatingDropAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/util/DelegatingDropAdapter.eea
index 22fbcd4ae5..fbf8d08900 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/util/DelegatingDropAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/util/DelegatingDropAdapter.eea
@@ -23,7 +23,7 @@ dropAccept
  (L1org/eclipse/swt/dnd/DropTargetEvent;)V # @Inherited(org.eclipse.swt.dnd.DropTargetListener)
 getTransfers
  ()[Lorg/eclipse/swt/dnd/Transfer;
- ()[Lorg/eclipse/swt/dnd/Transfer;
+ ()[1Lorg/eclipse/swt/dnd/Transfer;
 removeDropTargetListener
  (Lorg/eclipse/jface/util/TransferDropTargetListener;)V
  (L1org/eclipse/jface/util/TransferDropTargetListener;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/util/Geometry.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/util/Geometry.eea
index 4311ec1276..548da9da01 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/util/Geometry.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/util/Geometry.eea
@@ -17,10 +17,10 @@ copy
  (Lorg/eclipse/swt/graphics/Rectangle;)Lorg/eclipse/swt/graphics/Rectangle;
 createDiffRectangle
  (IIII)Lorg/eclipse/swt/graphics/Rectangle;
- (IIII)Lorg/eclipse/swt/graphics/Rectangle;
+ (IIII)L1org/eclipse/swt/graphics/Rectangle;
 createRectangle
  (Lorg/eclipse/swt/graphics/Point;Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/graphics/Rectangle;
- (Lorg/eclipse/swt/graphics/Point;Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/graphics/Rectangle;
+ (Lorg/eclipse/swt/graphics/Point;Lorg/eclipse/swt/graphics/Point;)L1org/eclipse/swt/graphics/Rectangle;
 distanceSquared
  (Lorg/eclipse/swt/graphics/Point;Lorg/eclipse/swt/graphics/Point;)I
  (Lorg/eclipse/swt/graphics/Point;Lorg/eclipse/swt/graphics/Point;)I
@@ -83,10 +83,10 @@ magnitudeSquared
  (Lorg/eclipse/swt/graphics/Point;)I
 max
  (Lorg/eclipse/swt/graphics/Point;Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/graphics/Point;
- (Lorg/eclipse/swt/graphics/Point;Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/graphics/Point;
+ (Lorg/eclipse/swt/graphics/Point;Lorg/eclipse/swt/graphics/Point;)L1org/eclipse/swt/graphics/Point;
 min
  (Lorg/eclipse/swt/graphics/Point;Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/graphics/Point;
- (Lorg/eclipse/swt/graphics/Point;Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/graphics/Point;
+ (Lorg/eclipse/swt/graphics/Point;Lorg/eclipse/swt/graphics/Point;)L1org/eclipse/swt/graphics/Point;
 moveInside
  (Lorg/eclipse/swt/graphics/Rectangle;Lorg/eclipse/swt/graphics/Rectangle;)V
  (Lorg/eclipse/swt/graphics/Rectangle;Lorg/eclipse/swt/graphics/Rectangle;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/util/LocalSelectionTransfer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/util/LocalSelectionTransfer.eea
index 7697284a2a..7943f94f46 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/util/LocalSelectionTransfer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/util/LocalSelectionTransfer.eea
@@ -18,7 +18,7 @@ javaToNative
  (Ljava/lang/Object;Lorg/eclipse/swt/dnd/TransferData;)V
 nativeToJava
  (Lorg/eclipse/swt/dnd/TransferData;)Ljava/lang/Object;
- (Lorg/eclipse/swt/dnd/TransferData;)Ljava/lang/Object;
+ (Lorg/eclipse/swt/dnd/TransferData;)L0java/lang/Object; # @Inherited(org.eclipse.swt.dnd.ByteArrayTransfer)
 setSelection
  (Lorg/eclipse/jface/viewers/ISelection;)V
  (Lorg/eclipse/jface/viewers/ISelection;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/util/Util.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/util/Util.eea
index 7278eacfe7..5417cf09bc 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/util/Util.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/util/Util.eea
@@ -75,7 +75,7 @@ startsWith
  ([Ljava/lang/Object;[Ljava/lang/Object;Z)Z
 toString
  ([Ljava/lang/Object;)Ljava/lang/String;
- ([Ljava/lang/Object;)Ljava/lang/String;
+ ([Ljava/lang/Object;)L1java/lang/String;
 translateString
  (Ljava/util/ResourceBundle;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
  (Ljava/util/ResourceBundle;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/AbstractListViewer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/AbstractListViewer.eea
index 75aefe48f3..e4cb9e918a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/AbstractListViewer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/AbstractListViewer.eea
@@ -8,16 +8,16 @@ add
  ([Ljava/lang/Object;)V
 doFindInputItem
  (Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Widget;
- (Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Widget;
+ (Ljava/lang/Object;)L0org/eclipse/swt/widgets/Widget;
 doFindItem
  (Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Widget;
- (Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Widget;
+ (Ljava/lang/Object;)L0org/eclipse/swt/widgets/Widget;
 doUpdateItem
  (Lorg/eclipse/swt/widgets/Widget;Ljava/lang/Object;Z)V
  (Lorg/eclipse/swt/widgets/Widget;Ljava/lang/Object;Z)V
 getElementAt
  (I)Ljava/lang/Object;
- (I)Ljava/lang/Object;
+ (I)L0java/lang/Object;
 getLabelProvider
  ()Lorg/eclipse/jface/viewers/IBaseLabelProvider;
  ()Lorg/eclipse/jface/viewers/IBaseLabelProvider;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/AbstractTableViewer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/AbstractTableViewer.eea
index b7f009202e..8fed5f3401 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/AbstractTableViewer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/AbstractTableViewer.eea
@@ -14,10 +14,10 @@ contains
  (Ljava/lang/Object;)Z
 doFindInputItem
  (Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Widget;
- (Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Widget;
+ (Ljava/lang/Object;)L0org/eclipse/swt/widgets/Widget;
 doFindItem
  (Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Widget;
- (Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Widget;
+ (Ljava/lang/Object;)L0org/eclipse/swt/widgets/Widget;
 doGetColumn
  (I)Lorg/eclipse/swt/widgets/Widget;
  (I)Lorg/eclipse/swt/widgets/Widget;
@@ -59,16 +59,16 @@ doUpdateItem
  (Lorg/eclipse/swt/widgets/Widget;Ljava/lang/Object;Z)V
 getColumnViewerOwner
  (I)Lorg/eclipse/swt/widgets/Widget;
- (I)Lorg/eclipse/swt/widgets/Widget;
+ (I)L0org/eclipse/swt/widgets/Widget;
 getElementAt
  (I)Ljava/lang/Object;
- (I)Ljava/lang/Object;
+ (I)L0java/lang/Object;
 getLabelProvider
  ()Lorg/eclipse/jface/viewers/IBaseLabelProvider;
  ()Lorg/eclipse/jface/viewers/IBaseLabelProvider;
 getRawChildren
  (Ljava/lang/Object;)[Ljava/lang/Object;
- (Ljava/lang/Object;)[Ljava/lang/Object;
+ (Ljava/lang/Object;)[1Ljava/lang/Object; # @Inherited(org.eclipse.jface.viewers.ColumnViewer)
 getSelectionFromWidget
  ()Ljava/util/List;
  ()Ljava/util/List;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/AbstractTreeViewer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/AbstractTreeViewer.eea
index 341f2391c9..41d673e44f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/AbstractTreeViewer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/AbstractTreeViewer.eea
@@ -38,16 +38,16 @@ createTreeItem
  (Lorg/eclipse/swt/widgets/Widget;Ljava/lang/Object;I)V
 createViewerEditor
  ()Lorg/eclipse/jface/viewers/ColumnViewerEditor;
- ()Lorg/eclipse/jface/viewers/ColumnViewerEditor;
+ ()L0org/eclipse/jface/viewers/ColumnViewerEditor; # @Overrides(org.eclipse.jface.viewers.ColumnViewer)
 disassociate
  (Lorg/eclipse/swt/widgets/Item;)V
  (Lorg/eclipse/swt/widgets/Item;)V
 doFindInputItem
  (Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Widget;
- (Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Widget;
+ (Ljava/lang/Object;)L0org/eclipse/swt/widgets/Widget;
 doFindItem
  (Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Widget;
- (Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Widget;
+ (Ljava/lang/Object;)L0org/eclipse/swt/widgets/Widget;
 doUpdateItem
  (Lorg/eclipse/swt/widgets/Item;Ljava/lang/Object;)V
  (Lorg/eclipse/swt/widgets/Item;Ljava/lang/Object;)V
@@ -77,7 +77,7 @@ getChildren
  (Lorg/eclipse/swt/widgets/Widget;[Ljava/lang/Object;)[Lorg/eclipse/swt/widgets/Item;
 getColumnViewerOwner
  (I)Lorg/eclipse/swt/widgets/Widget;
- (I)Lorg/eclipse/swt/widgets/Widget;
+ (I)L0org/eclipse/swt/widgets/Widget;
 getExpanded
  (Lorg/eclipse/swt/widgets/Item;)Z
  (Lorg/eclipse/swt/widgets/Item;)Z
@@ -92,7 +92,7 @@ getExpandedTreePaths
  ()[Lorg/eclipse/jface/viewers/TreePath;
 getItemAt
  (Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/widgets/Item;
- (Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/widgets/Item;
+ (Lorg/eclipse/swt/graphics/Point;)L0org/eclipse/swt/widgets/Item;
 getItemCount
  (Lorg/eclipse/swt/widgets/Control;)I
  (Lorg/eclipse/swt/widgets/Control;)I
@@ -104,19 +104,19 @@ getItems
  (Lorg/eclipse/swt/widgets/Item;)[Lorg/eclipse/swt/widgets/Item;
 getNextItem
  (Lorg/eclipse/swt/widgets/Item;Z)Lorg/eclipse/swt/widgets/Item;
- (Lorg/eclipse/swt/widgets/Item;Z)Lorg/eclipse/swt/widgets/Item;
+ (Lorg/eclipse/swt/widgets/Item;Z)L0org/eclipse/swt/widgets/Item;
 getParentElement
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L0java/lang/Object;
 getParentItem
  (Lorg/eclipse/swt/widgets/Item;)Lorg/eclipse/swt/widgets/Item;
  (Lorg/eclipse/swt/widgets/Item;)Lorg/eclipse/swt/widgets/Item;
 getPreviousItem
  (Lorg/eclipse/swt/widgets/Item;)Lorg/eclipse/swt/widgets/Item;
- (Lorg/eclipse/swt/widgets/Item;)Lorg/eclipse/swt/widgets/Item;
+ (Lorg/eclipse/swt/widgets/Item;)L0org/eclipse/swt/widgets/Item;
 getRawChildren
  (Ljava/lang/Object;)[Ljava/lang/Object;
- (Ljava/lang/Object;)[Ljava/lang/Object;
+ (Ljava/lang/Object;)[1Ljava/lang/Object; # @Inherited(org.eclipse.jface.viewers.ColumnViewer)
 getSelection
  ()Lorg/eclipse/jface/viewers/ISelection;
  ()L1org/eclipse/jface/viewers/ISelection; # @Inherited(org.eclipse.jface.viewers.StructuredViewer)
@@ -134,10 +134,10 @@ getStructuredSelection
  ()Lorg/eclipse/jface/viewers/ITreeSelection;
 getTreePathFromItem
  (Lorg/eclipse/swt/widgets/Item;)Lorg/eclipse/jface/viewers/TreePath;
- (Lorg/eclipse/swt/widgets/Item;)Lorg/eclipse/jface/viewers/TreePath;
+ (Lorg/eclipse/swt/widgets/Item;)L1org/eclipse/jface/viewers/TreePath;
 getViewerRowFromItem
  (Lorg/eclipse/swt/widgets/Widget;)Lorg/eclipse/jface/viewers/ViewerRow;
- (Lorg/eclipse/swt/widgets/Widget;)Lorg/eclipse/jface/viewers/ViewerRow;
+ (Lorg/eclipse/swt/widgets/Widget;)L0org/eclipse/jface/viewers/ViewerRow;
 getVisibleExpandedElements
  ()[Ljava/lang/Object;
  ()[Ljava/lang/Object;
@@ -170,7 +170,7 @@ internalCollapseToLevel
  (Lorg/eclipse/swt/widgets/Widget;I)V
 internalExpand
  (Ljava/lang/Object;Z)Lorg/eclipse/swt/widgets/Widget;
- (Ljava/lang/Object;Z)Lorg/eclipse/swt/widgets/Widget;
+ (Ljava/lang/Object;Z)L0org/eclipse/swt/widgets/Widget;
 internalExpandToLevel
  (Lorg/eclipse/swt/widgets/Widget;I)V
  (Lorg/eclipse/swt/widgets/Widget;I)V
@@ -179,7 +179,7 @@ internalFindItems
  (Ljava/lang/Object;)[Lorg/eclipse/swt/widgets/Widget;
 internalGetWidgetToSelect
  (Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Widget;
- (Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Widget;
+ (Ljava/lang/Object;)L0org/eclipse/swt/widgets/Widget;
 internalInitializeTree
  (Lorg/eclipse/swt/widgets/Control;)V
  (Lorg/eclipse/swt/widgets/Control;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/CellEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/CellEditor.eea
index f12a75095c..7986af54de 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/CellEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/CellEditor.eea
@@ -66,13 +66,13 @@ getErrorMessage
  ()Ljava/lang/String;
 getLayoutData
  ()Lorg/eclipse/jface/viewers/CellEditor$LayoutData;
- ()Lorg/eclipse/jface/viewers/CellEditor$LayoutData;
+ ()L1org/eclipse/jface/viewers/CellEditor$LayoutData;
 getValidator
  ()Lorg/eclipse/jface/viewers/ICellEditorValidator;
  ()Lorg/eclipse/jface/viewers/ICellEditorValidator;
 getValue
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 isCorrect
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/CellLabelProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/CellLabelProvider.eea
index 5966bb5a8c..9ed63f2710 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/CellLabelProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/CellLabelProvider.eea
@@ -5,22 +5,22 @@ dispose
  (Lorg/eclipse/jface/viewers/ColumnViewer;Lorg/eclipse/jface/viewers/ViewerColumn;)V
 getToolTipBackgroundColor
  (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Color;
- (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Color;
+ (Ljava/lang/Object;)L0org/eclipse/swt/graphics/Color;
 getToolTipDisplayDelayTime
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
 getToolTipFont
  (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Font;
- (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Font;
+ (Ljava/lang/Object;)L0org/eclipse/swt/graphics/Font;
 getToolTipForegroundColor
  (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Color;
- (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Color;
+ (Ljava/lang/Object;)L0org/eclipse/swt/graphics/Color;
 getToolTipImage
  (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Image;
- (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Image;
+ (Ljava/lang/Object;)L0org/eclipse/swt/graphics/Image;
 getToolTipShift
  (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Point;
- (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Point;
+ (Ljava/lang/Object;)L0org/eclipse/swt/graphics/Point;
 getToolTipStyle
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/CellNavigationStrategy.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/CellNavigationStrategy.eea
index c6f82aad17..b0f42a3cf9 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/CellNavigationStrategy.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/CellNavigationStrategy.eea
@@ -8,7 +8,7 @@ expand
  (Lorg/eclipse/jface/viewers/ColumnViewer;Lorg/eclipse/jface/viewers/ViewerCell;Lorg/eclipse/swt/widgets/Event;)V
 findSelectedCell
  (Lorg/eclipse/jface/viewers/ColumnViewer;Lorg/eclipse/jface/viewers/ViewerCell;Lorg/eclipse/swt/widgets/Event;)Lorg/eclipse/jface/viewers/ViewerCell;
- (Lorg/eclipse/jface/viewers/ColumnViewer;Lorg/eclipse/jface/viewers/ViewerCell;Lorg/eclipse/swt/widgets/Event;)Lorg/eclipse/jface/viewers/ViewerCell;
+ (Lorg/eclipse/jface/viewers/ColumnViewer;Lorg/eclipse/jface/viewers/ViewerCell;Lorg/eclipse/swt/widgets/Event;)L0org/eclipse/jface/viewers/ViewerCell;
 isCollapseEvent
  (Lorg/eclipse/jface/viewers/ColumnViewer;Lorg/eclipse/jface/viewers/ViewerCell;Lorg/eclipse/swt/widgets/Event;)Z
  (Lorg/eclipse/jface/viewers/ColumnViewer;Lorg/eclipse/jface/viewers/ViewerCell;Lorg/eclipse/swt/widgets/Event;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ColorCellEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ColorCellEditor.eea
index 1b21dda0a6..0ee46115cc 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ColorCellEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ColorCellEditor.eea
@@ -8,7 +8,7 @@ class org/eclipse/jface/viewers/ColorCellEditor
  (Lorg/eclipse/swt/widgets/Composite;I)V
 createContents
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.jface.viewers.DialogCellEditor)
 openDialogBox
  (Lorg/eclipse/swt/widgets/Control;)Ljava/lang/Object;
  (Lorg/eclipse/swt/widgets/Control;)Ljava/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ColumnViewer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ColumnViewer.eea
index ef45762b32..10915d6fdb 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ColumnViewer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ColumnViewer.eea
@@ -2,7 +2,7 @@ class org/eclipse/jface/viewers/ColumnViewer
 
 createViewerEditor
  ()Lorg/eclipse/jface/viewers/ColumnViewerEditor;
- ()Lorg/eclipse/jface/viewers/ColumnViewerEditor;
+ ()L1org/eclipse/jface/viewers/ColumnViewerEditor;
 disassociate
  (Lorg/eclipse/swt/widgets/Item;)V
  (Lorg/eclipse/swt/widgets/Item;)V
@@ -14,7 +14,7 @@ firePostSelectionChanged
  (Lorg/eclipse/jface/viewers/SelectionChangedEvent;)V
 getCell
  (Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/jface/viewers/ViewerCell;
- (Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/jface/viewers/ViewerCell;
+ (Lorg/eclipse/swt/graphics/Point;)L0org/eclipse/jface/viewers/ViewerCell;
 getCellEditors
  ()[Lorg/eclipse/jface/viewers/CellEditor;
  ()[Lorg/eclipse/jface/viewers/CellEditor;
@@ -32,22 +32,22 @@ getColumnViewerOwner
  (I)Lorg/eclipse/swt/widgets/Widget;
 getItem
  (II)Lorg/eclipse/swt/widgets/Item;
- (II)Lorg/eclipse/swt/widgets/Item;
+ (II)L0org/eclipse/swt/widgets/Item; # @Inherited(org.eclipse.jface.viewers.StructuredViewer)
 getItemAt
  (Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/widgets/Item;
  (Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/widgets/Item;
 getLabelProvider
  (I)Lorg/eclipse/jface/viewers/CellLabelProvider;
- (I)Lorg/eclipse/jface/viewers/CellLabelProvider;
+ (I)L0org/eclipse/jface/viewers/CellLabelProvider;
 getRawChildren
  (Ljava/lang/Object;)[Ljava/lang/Object;
- (Ljava/lang/Object;)[Ljava/lang/Object;
+ (Ljava/lang/Object;)[1Ljava/lang/Object; # @Inherited(org.eclipse.jface.viewers.StructuredViewer)
 getSortedChildren
  (Ljava/lang/Object;)[Ljava/lang/Object;
  (Ljava/lang/Object;)[Ljava/lang/Object;
 getViewerRow
  (Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/jface/viewers/ViewerRow;
- (Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/jface/viewers/ViewerRow;
+ (Lorg/eclipse/swt/graphics/Point;)L0org/eclipse/jface/viewers/ViewerRow;
 getViewerRowFromItem
  (Lorg/eclipse/swt/widgets/Widget;)Lorg/eclipse/jface/viewers/ViewerRow;
  (Lorg/eclipse/swt/widgets/Widget;)Lorg/eclipse/jface/viewers/ViewerRow;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ColumnViewerEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ColumnViewerEditor.eea
index fd85b84832..ed91951fbe 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ColumnViewerEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ColumnViewerEditor.eea
@@ -8,7 +8,7 @@ addEditorActivationListener
  (L1org/eclipse/jface/viewers/ColumnViewerEditorActivationListener;)V
 getFocusCell
  ()Lorg/eclipse/jface/viewers/ViewerCell;
- ()Lorg/eclipse/jface/viewers/ViewerCell;
+ ()L0org/eclipse/jface/viewers/ViewerCell;
 getViewer
  ()Lorg/eclipse/jface/viewers/ColumnViewer;
  ()Lorg/eclipse/jface/viewers/ColumnViewer;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ColumnViewerToolTipSupport.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ColumnViewerToolTipSupport.eea
index b1ac8a30dd..55ebb20dd9 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ColumnViewerToolTipSupport.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ColumnViewerToolTipSupport.eea
@@ -18,7 +18,7 @@ createToolTipContentArea
  (L1org/eclipse/swt/widgets/Event;L1org/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Composite; # @Inherited(org.eclipse.jface.window.DefaultToolTip)
 createViewerToolTipContentArea
  (Lorg/eclipse/swt/widgets/Event;Lorg/eclipse/jface/viewers/ViewerCell;Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Composite;
- (Lorg/eclipse/swt/widgets/Event;Lorg/eclipse/jface/viewers/ViewerCell;Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Composite;
+ (Lorg/eclipse/swt/widgets/Event;Lorg/eclipse/jface/viewers/ViewerCell;Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Composite;
 getToolTipArea
  (Lorg/eclipse/swt/widgets/Event;)Ljava/lang/Object;
  (L1org/eclipse/swt/widgets/Event;)L0java/lang/Object; # @Inherited(org.eclipse.jface.window.ToolTip)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ComboBoxCellEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ComboBoxCellEditor.eea
index 67e5f80d53..99e00c5619 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ComboBoxCellEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ComboBoxCellEditor.eea
@@ -20,7 +20,7 @@ getItems
  ()[Ljava/lang/String;
 getLayoutData
  ()Lorg/eclipse/jface/viewers/CellEditor$LayoutData;
- ()Lorg/eclipse/jface/viewers/CellEditor$LayoutData;
+ ()L1org/eclipse/jface/viewers/CellEditor$LayoutData; # @Inherited(org.eclipse.jface.viewers.CellEditor)
 keyReleaseOccured
  (Lorg/eclipse/swt/events/KeyEvent;)V
  (Lorg/eclipse/swt/events/KeyEvent;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ComboBoxViewerCellEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ComboBoxViewerCellEditor.eea
index 9c2d44bf97..3004fbbe6b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ComboBoxViewerCellEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ComboBoxViewerCellEditor.eea
@@ -17,7 +17,7 @@ doSetValue
  (Ljava/lang/Object;)V
 getLayoutData
  ()Lorg/eclipse/jface/viewers/CellEditor$LayoutData;
- ()Lorg/eclipse/jface/viewers/CellEditor$LayoutData;
+ ()L1org/eclipse/jface/viewers/CellEditor$LayoutData; # @Inherited(org.eclipse.jface.viewers.CellEditor)
 getViewer
  ()Lorg/eclipse/jface/viewers/ComboViewer;
  ()Lorg/eclipse/jface/viewers/ComboViewer;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/DecoratingStyledCellLabelProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/DecoratingStyledCellLabelProvider.eea
index e3fa7bc1c4..5a943e59ff 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/DecoratingStyledCellLabelProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/DecoratingStyledCellLabelProvider.eea
@@ -8,7 +8,7 @@ addListener
  (L1org/eclipse/jface/viewers/ILabelProviderListener;)V # @Inherited(org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider)
 getBackground
  (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Color;
- (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Color;
+ (Ljava/lang/Object;)L0org/eclipse/swt/graphics/Color; # @Inherited(org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider)
 getDecorationContext
  ()Lorg/eclipse/jface/viewers/IDecorationContext;
  ()Lorg/eclipse/jface/viewers/IDecorationContext;
@@ -17,10 +17,10 @@ getDecorationStyle
  (Ljava/lang/Object;)Lorg/eclipse/jface/viewers/StyledString$Styler;
 getFont
  (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Font;
- (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Font;
+ (Ljava/lang/Object;)L0org/eclipse/swt/graphics/Font; # @Inherited(org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider)
 getForeground
  (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Color;
- (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Color;
+ (Ljava/lang/Object;)L0org/eclipse/swt/graphics/Color; # @Inherited(org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider)
 getImage
  (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Image;
  (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Image;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/DelegatingStyledCellLabelProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/DelegatingStyledCellLabelProvider.eea
index ea2840245a..9f70980af3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/DelegatingStyledCellLabelProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/DelegatingStyledCellLabelProvider.eea
@@ -8,13 +8,13 @@ addListener
  (L1org/eclipse/jface/viewers/ILabelProviderListener;)V # @Inherited(org.eclipse.jface.viewers.BaseLabelProvider)
 getBackground
  (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Color;
- (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Color;
+ (Ljava/lang/Object;)L0org/eclipse/swt/graphics/Color;
 getFont
  (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Font;
- (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Font;
+ (Ljava/lang/Object;)L0org/eclipse/swt/graphics/Font;
 getForeground
  (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Color;
- (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Color;
+ (Ljava/lang/Object;)L0org/eclipse/swt/graphics/Color;
 getImage
  (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Image;
  (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Image;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/DialogCellEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/DialogCellEditor.eea
index def5ddca4e..bec080283e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/DialogCellEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/DialogCellEditor.eea
@@ -12,10 +12,10 @@ CELL_EDITOR_IMG_DOTS_BUTTON
  (Lorg/eclipse/swt/widgets/Composite;I)V
 createButton
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Button;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Button;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Button;
 createContents
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control;
 createControl
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
  (L1org/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.jface.viewers.CellEditor)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/FocusCellOwnerDrawHighlighter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/FocusCellOwnerDrawHighlighter.eea
index 4148838eef..1ab5df2ca1 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/FocusCellOwnerDrawHighlighter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/FocusCellOwnerDrawHighlighter.eea
@@ -14,13 +14,13 @@ getSelectedCellBackgroundColor
  (Lorg/eclipse/jface/viewers/ViewerCell;)Lorg/eclipse/swt/graphics/Color;
 getSelectedCellBackgroundColorNoFocus
  (Lorg/eclipse/jface/viewers/ViewerCell;)Lorg/eclipse/swt/graphics/Color;
- (Lorg/eclipse/jface/viewers/ViewerCell;)Lorg/eclipse/swt/graphics/Color;
+ (Lorg/eclipse/jface/viewers/ViewerCell;)L0org/eclipse/swt/graphics/Color;
 getSelectedCellForegroundColor
  (Lorg/eclipse/jface/viewers/ViewerCell;)Lorg/eclipse/swt/graphics/Color;
- (Lorg/eclipse/jface/viewers/ViewerCell;)Lorg/eclipse/swt/graphics/Color;
+ (Lorg/eclipse/jface/viewers/ViewerCell;)L0org/eclipse/swt/graphics/Color;
 getSelectedCellForegroundColorNoFocus
  (Lorg/eclipse/jface/viewers/ViewerCell;)Lorg/eclipse/swt/graphics/Color;
- (Lorg/eclipse/jface/viewers/ViewerCell;)Lorg/eclipse/swt/graphics/Color;
+ (Lorg/eclipse/jface/viewers/ViewerCell;)L0org/eclipse/swt/graphics/Color;
 onlyTextHighlighting
  (Lorg/eclipse/jface/viewers/ViewerCell;)Z
  (Lorg/eclipse/jface/viewers/ViewerCell;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/LabelProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/LabelProvider.eea
index cc0b41d579..fa7b5f03ec 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/LabelProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/LabelProvider.eea
@@ -2,13 +2,13 @@ class org/eclipse/jface/viewers/LabelProvider
 
 createImageProvider
  (Ljava/util/function/Function<Ljava/lang/Object;Lorg/eclipse/swt/graphics/Image;>;)Lorg/eclipse/jface/viewers/LabelProvider;
- (Ljava/util/function/Function<Ljava/lang/Object;Lorg/eclipse/swt/graphics/Image;>;)Lorg/eclipse/jface/viewers/LabelProvider;
+ (Ljava/util/function/Function<Ljava/lang/Object;Lorg/eclipse/swt/graphics/Image;>;)L1org/eclipse/jface/viewers/LabelProvider;
 createTextImageProvider
  (Ljava/util/function/Function<Ljava/lang/Object;Ljava/lang/String;>;Ljava/util/function/Function<Ljava/lang/Object;Lorg/eclipse/swt/graphics/Image;>;)Lorg/eclipse/jface/viewers/LabelProvider;
- (Ljava/util/function/Function<Ljava/lang/Object;Ljava/lang/String;>;Ljava/util/function/Function<Ljava/lang/Object;Lorg/eclipse/swt/graphics/Image;>;)Lorg/eclipse/jface/viewers/LabelProvider;
+ (Ljava/util/function/Function<Ljava/lang/Object;Ljava/lang/String;>;Ljava/util/function/Function<Ljava/lang/Object;Lorg/eclipse/swt/graphics/Image;>;)L1org/eclipse/jface/viewers/LabelProvider;
 createTextProvider
  (Ljava/util/function/Function<Ljava/lang/Object;Ljava/lang/String;>;)Lorg/eclipse/jface/viewers/LabelProvider;
- (Ljava/util/function/Function<Ljava/lang/Object;Ljava/lang/String;>;)Lorg/eclipse/jface/viewers/LabelProvider;
+ (Ljava/util/function/Function<Ljava/lang/Object;Ljava/lang/String;>;)L1org/eclipse/jface/viewers/LabelProvider;
 
 getImage
  (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/Image;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/LabelProviderChangedEvent.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/LabelProviderChangedEvent.eea
index b0480fab3f..83c519d134 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/LabelProviderChangedEvent.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/LabelProviderChangedEvent.eea
@@ -11,7 +11,7 @@ class org/eclipse/jface/viewers/LabelProviderChangedEvent
  (Lorg/eclipse/jface/viewers/IBaseLabelProvider;[Ljava/lang/Object;)V
 getElement
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getElements
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/StructuredViewer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/StructuredViewer.eea
index 689a0e5682..1063143710 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/StructuredViewer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/StructuredViewer.eea
@@ -77,13 +77,13 @@ getFilteredChildren
  (Ljava/lang/Object;)[Ljava/lang/Object;
 getFilters
  ()[Lorg/eclipse/jface/viewers/ViewerFilter;
- ()[Lorg/eclipse/jface/viewers/ViewerFilter;
+ ()[1Lorg/eclipse/jface/viewers/ViewerFilter;
 getItem
  (II)Lorg/eclipse/swt/widgets/Item;
- (II)Lorg/eclipse/swt/widgets/Item;
+ (II)L0org/eclipse/swt/widgets/Item;
 getRawChildren
  (Ljava/lang/Object;)[Ljava/lang/Object;
- (Ljava/lang/Object;)[Ljava/lang/Object;
+ (Ljava/lang/Object;)[1Ljava/lang/Object;
 getRoot
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
@@ -98,7 +98,7 @@ getSortedChildren
  (Ljava/lang/Object;)[Ljava/lang/Object;
 getSorter
  ()Lorg/eclipse/jface/viewers/ViewerSorter;
- ()Lorg/eclipse/jface/viewers/ViewerSorter;
+ ()L0org/eclipse/jface/viewers/ViewerSorter;
 getStructuredSelection
  ()Lorg/eclipse/jface/viewers/IStructuredSelection;
  ()Lorg/eclipse/jface/viewers/IStructuredSelection;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/StyledString.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/StyledString.eea
index f20d81b246..41d90c4e97 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/StyledString.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/StyledString.eea
@@ -12,7 +12,7 @@ QUALIFIER_STYLER
 
 createColorRegistryStyler
  (Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/jface/viewers/StyledString$Styler;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/jface/viewers/StyledString$Styler;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/eclipse/jface/viewers/StyledString$Styler;
 
 <init>
  (Ljava/lang/String;)V
@@ -43,7 +43,7 @@ append
  ([CLorg/eclipse/jface/viewers/StyledString$Styler;)Lorg/eclipse/jface/viewers/StyledString;
 getString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStyleRanges
  ()[Lorg/eclipse/swt/custom/StyleRange;
  ()[Lorg/eclipse/swt/custom/StyleRange;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TableViewer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TableViewer.eea
index 563bca1b80..ffa1f20ba6 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TableViewer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TableViewer.eea
@@ -11,10 +11,10 @@ class org/eclipse/jface/viewers/TableViewer
  (Lorg/eclipse/swt/widgets/Table;)V
 createViewerEditor
  ()Lorg/eclipse/jface/viewers/ColumnViewerEditor;
- ()Lorg/eclipse/jface/viewers/ColumnViewerEditor;
+ ()L1org/eclipse/jface/viewers/ColumnViewerEditor; # @Inherited(org.eclipse.jface.viewers.ColumnViewer)
 doFindItem
  (Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Widget;
- (Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Widget;
+ (Ljava/lang/Object;)L0org/eclipse/swt/widgets/Widget; # @Inherited(org.eclipse.jface.viewers.AbstractTableViewer)
 doGetColumn
  (I)Lorg/eclipse/swt/widgets/Widget;
  (I)Lorg/eclipse/swt/widgets/Widget;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TableViewerEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TableViewerEditor.eea
index a2609e95d5..83fd1fa0a8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TableViewerEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TableViewerEditor.eea
@@ -9,7 +9,7 @@ create
 
 getFocusCell
  ()Lorg/eclipse/jface/viewers/ViewerCell;
- ()Lorg/eclipse/jface/viewers/ViewerCell;
+ ()L0org/eclipse/jface/viewers/ViewerCell; # @Inherited(org.eclipse.jface.viewers.ColumnViewerEditor)
 setEditor
  (Lorg/eclipse/swt/widgets/Control;Lorg/eclipse/swt/widgets/Item;I)V
  (Lorg/eclipse/swt/widgets/Control;Lorg/eclipse/swt/widgets/Item;I)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TableViewerRow.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TableViewerRow.eea
index ec2aa5b423..2acafd2618 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TableViewerRow.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TableViewerRow.eea
@@ -29,7 +29,7 @@ getImage
  (I)Lorg/eclipse/swt/graphics/Image;
 getImageBounds
  (I)Lorg/eclipse/swt/graphics/Rectangle;
- (I)Lorg/eclipse/swt/graphics/Rectangle;
+ (I)L0org/eclipse/swt/graphics/Rectangle; # @Inherited(org.eclipse.jface.viewers.ViewerRow)
 getItem
  ()Lorg/eclipse/swt/widgets/Widget;
  ()Lorg/eclipse/swt/widgets/Widget;
@@ -41,7 +41,7 @@ getText
  (I)Ljava/lang/String;
 getTextBounds
  (I)Lorg/eclipse/swt/graphics/Rectangle;
- (I)Lorg/eclipse/swt/graphics/Rectangle;
+ (I)L0org/eclipse/swt/graphics/Rectangle; # @Inherited(org.eclipse.jface.viewers.ViewerRow)
 getTreePath
  ()Lorg/eclipse/jface/viewers/TreePath;
  ()Lorg/eclipse/jface/viewers/TreePath;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TextCellEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TextCellEditor.eea
index fdd530640d..e0868f8b8b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TextCellEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TextCellEditor.eea
@@ -24,7 +24,7 @@ editOccured
  (Lorg/eclipse/swt/events/ModifyEvent;)V
 getLayoutData
  ()Lorg/eclipse/jface/viewers/CellEditor$LayoutData;
- ()Lorg/eclipse/jface/viewers/CellEditor$LayoutData;
+ ()L1org/eclipse/jface/viewers/CellEditor$LayoutData; # @Inherited(org.eclipse.jface.viewers.CellEditor)
 handleDefaultSelection
  (Lorg/eclipse/swt/events/SelectionEvent;)V
  (Lorg/eclipse/swt/events/SelectionEvent;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TreeNode.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TreeNode.eea
index 0af2f81557..330ee4d29a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TreeNode.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TreeNode.eea
@@ -12,7 +12,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getChildren
  ()[Lorg/eclipse/jface/viewers/TreeNode;
- ()[Lorg/eclipse/jface/viewers/TreeNode;
+ ()[0Lorg/eclipse/jface/viewers/TreeNode;
 getParent
  ()Lorg/eclipse/jface/viewers/TreeNode;
  ()Lorg/eclipse/jface/viewers/TreeNode;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TreePath.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TreePath.eea
index 3b92ed6c72..4471435a55 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TreePath.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TreePath.eea
@@ -9,7 +9,7 @@ EMPTY
  ([Ljava/lang/Object;)V
 createChildPath
  (Ljava/lang/Object;)Lorg/eclipse/jface/viewers/TreePath;
- (Ljava/lang/Object;)Lorg/eclipse/jface/viewers/TreePath;
+ (Ljava/lang/Object;)L1org/eclipse/jface/viewers/TreePath;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -18,13 +18,13 @@ equals
  (Lorg/eclipse/jface/viewers/TreePath;Lorg/eclipse/jface/viewers/IElementComparer;)Z
 getFirstSegment
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getLastSegment
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getParentPath
  ()Lorg/eclipse/jface/viewers/TreePath;
- ()Lorg/eclipse/jface/viewers/TreePath;
+ ()L0org/eclipse/jface/viewers/TreePath;
 getSegment
  (I)Ljava/lang/Object;
  (I)Ljava/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TreeSelection.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TreeSelection.eea
index 6d8335166a..a9a93745c4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TreeSelection.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TreeSelection.eea
@@ -21,10 +21,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(org.eclipse.jface.viewers.StructuredSelection)
 getElementComparer
  ()Lorg/eclipse/jface/viewers/IElementComparer;
- ()Lorg/eclipse/jface/viewers/IElementComparer;
+ ()L0org/eclipse/jface/viewers/IElementComparer;
 getPaths
  ()[Lorg/eclipse/jface/viewers/TreePath;
  ()[Lorg/eclipse/jface/viewers/TreePath;
 getPathsFor
  (Ljava/lang/Object;)[Lorg/eclipse/jface/viewers/TreePath;
- (Ljava/lang/Object;)[Lorg/eclipse/jface/viewers/TreePath;
+ (Ljava/lang/Object;)[0Lorg/eclipse/jface/viewers/TreePath;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TreeViewer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TreeViewer.eea
index 8678507cbf..8805a9c777 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TreeViewer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TreeViewer.eea
@@ -17,7 +17,7 @@ assertContentProviderType
  (Lorg/eclipse/jface/viewers/IContentProvider;)V
 createViewerEditor
  ()Lorg/eclipse/jface/viewers/ColumnViewerEditor;
- ()Lorg/eclipse/jface/viewers/ColumnViewerEditor;
+ ()L1org/eclipse/jface/viewers/ColumnViewerEditor; # @Overrides(org.eclipse.jface.viewers.AbstractTreeViewer)
 disassociate
  (Lorg/eclipse/swt/widgets/Item;)V
  (Lorg/eclipse/swt/widgets/Item;)V
@@ -26,13 +26,13 @@ editElement
  (Ljava/lang/Object;I)V
 getChild
  (Lorg/eclipse/swt/widgets/Widget;I)Lorg/eclipse/swt/widgets/Item;
- (Lorg/eclipse/swt/widgets/Widget;I)Lorg/eclipse/swt/widgets/Item;
+ (Lorg/eclipse/swt/widgets/Widget;I)L0org/eclipse/swt/widgets/Item;
 getChildren
  (Lorg/eclipse/swt/widgets/Widget;)[Lorg/eclipse/swt/widgets/Item;
- (Lorg/eclipse/swt/widgets/Widget;)[Lorg/eclipse/swt/widgets/Item;
+ (Lorg/eclipse/swt/widgets/Widget;)[0Lorg/eclipse/swt/widgets/Item;
 getColumnViewerOwner
  (I)Lorg/eclipse/swt/widgets/Widget;
- (I)Lorg/eclipse/swt/widgets/Widget;
+ (I)L0org/eclipse/swt/widgets/Widget; # @Inherited(org.eclipse.jface.viewers.AbstractTreeViewer)
 getControl
  ()Lorg/eclipse/swt/widgets/Control;
  ()L1org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.jface.viewers.Viewer)
@@ -41,7 +41,7 @@ getExpanded
  (Lorg/eclipse/swt/widgets/Item;)Z
 getItemAt
  (Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/widgets/Item;
- (Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/widgets/Item;
+ (Lorg/eclipse/swt/graphics/Point;)L0org/eclipse/swt/widgets/Item; # @Inherited(org.eclipse.jface.viewers.AbstractTreeViewer)
 getItemCount
  (Lorg/eclipse/swt/widgets/Control;)I
  (Lorg/eclipse/swt/widgets/Control;)I
@@ -56,13 +56,13 @@ getLabelProvider
  ()Lorg/eclipse/jface/viewers/IBaseLabelProvider;
 getParentElement
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L0java/lang/Object; # @Inherited(org.eclipse.jface.viewers.AbstractTreeViewer)
 getParentItem
  (Lorg/eclipse/swt/widgets/Item;)Lorg/eclipse/swt/widgets/Item;
  (Lorg/eclipse/swt/widgets/Item;)Lorg/eclipse/swt/widgets/Item;
 getRawChildren
  (Ljava/lang/Object;)[Ljava/lang/Object;
- (Ljava/lang/Object;)[Ljava/lang/Object;
+ (Ljava/lang/Object;)[1Ljava/lang/Object; # @Inherited(org.eclipse.jface.viewers.AbstractTreeViewer)
 getSelection
  (Lorg/eclipse/swt/widgets/Control;)[Lorg/eclipse/swt/widgets/Item;
  (Lorg/eclipse/swt/widgets/Control;)[Lorg/eclipse/swt/widgets/Item;
@@ -71,7 +71,7 @@ getTree
  ()Lorg/eclipse/swt/widgets/Tree;
 getViewerRowFromItem
  (Lorg/eclipse/swt/widgets/Widget;)Lorg/eclipse/jface/viewers/ViewerRow;
- (Lorg/eclipse/swt/widgets/Widget;)Lorg/eclipse/jface/viewers/ViewerRow;
+ (Lorg/eclipse/swt/widgets/Widget;)L0org/eclipse/jface/viewers/ViewerRow; # @Inherited(org.eclipse.jface.viewers.AbstractTreeViewer)
 handleTreeCollapse
  (Lorg/eclipse/swt/events/TreeEvent;)V
  (Lorg/eclipse/swt/events/TreeEvent;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TreeViewerEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TreeViewerEditor.eea
index d33015a4f1..b6c2f83968 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TreeViewerEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TreeViewerEditor.eea
@@ -9,7 +9,7 @@ create
 
 getFocusCell
  ()Lorg/eclipse/jface/viewers/ViewerCell;
- ()Lorg/eclipse/jface/viewers/ViewerCell;
+ ()L0org/eclipse/jface/viewers/ViewerCell; # @Inherited(org.eclipse.jface.viewers.ColumnViewerEditor)
 setEditor
  (Lorg/eclipse/swt/widgets/Control;Lorg/eclipse/swt/widgets/Item;I)V
  (Lorg/eclipse/swt/widgets/Control;Lorg/eclipse/swt/widgets/Item;I)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TreeViewerRow.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TreeViewerRow.eea
index 02d4bd065a..b3d31dea0a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TreeViewerRow.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/TreeViewerRow.eea
@@ -29,7 +29,7 @@ getImage
  (I)Lorg/eclipse/swt/graphics/Image;
 getImageBounds
  (I)Lorg/eclipse/swt/graphics/Rectangle;
- (I)Lorg/eclipse/swt/graphics/Rectangle;
+ (I)L0org/eclipse/swt/graphics/Rectangle; # @Inherited(org.eclipse.jface.viewers.ViewerRow)
 getItem
  ()Lorg/eclipse/swt/widgets/Widget;
  ()Lorg/eclipse/swt/widgets/Widget;
@@ -41,10 +41,10 @@ getText
  (I)Ljava/lang/String;
 getTextBounds
  (I)Lorg/eclipse/swt/graphics/Rectangle;
- (I)Lorg/eclipse/swt/graphics/Rectangle;
+ (I)L0org/eclipse/swt/graphics/Rectangle; # @Inherited(org.eclipse.jface.viewers.ViewerRow)
 getTreePath
  ()Lorg/eclipse/jface/viewers/TreePath;
- ()Lorg/eclipse/jface/viewers/TreePath;
+ ()L1org/eclipse/jface/viewers/TreePath;
 setBackground
  (ILorg/eclipse/swt/graphics/Color;)V
  (ILorg/eclipse/swt/graphics/Color;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ViewerCell.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ViewerCell.eea
index bb55bb409c..bfb084b56a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ViewerCell.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ViewerCell.eea
@@ -14,7 +14,7 @@ getControl
  ()Lorg/eclipse/swt/widgets/Control;
 getElement
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getFont
  ()Lorg/eclipse/swt/graphics/Font;
  ()Lorg/eclipse/swt/graphics/Font;
@@ -32,7 +32,7 @@ getItem
  ()Lorg/eclipse/swt/widgets/Widget;
 getNeighbor
  (IZ)Lorg/eclipse/jface/viewers/ViewerCell;
- (IZ)Lorg/eclipse/jface/viewers/ViewerCell;
+ (IZ)L0org/eclipse/jface/viewers/ViewerCell;
 getStyleRanges
  ()[Lorg/eclipse/swt/custom/StyleRange;
  ()[Lorg/eclipse/swt/custom/StyleRange;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ViewerDropAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ViewerDropAdapter.eea
index cbabb35a0d..9c195b3e58 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ViewerDropAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ViewerDropAdapter.eea
@@ -26,7 +26,7 @@ dropAccept
  (L1org/eclipse/swt/dnd/DropTargetEvent;)V # @Inherited(org.eclipse.swt.dnd.DropTargetAdapter)
 getBounds
  (Lorg/eclipse/swt/widgets/Item;)Lorg/eclipse/swt/graphics/Rectangle;
- (Lorg/eclipse/swt/widgets/Item;)Lorg/eclipse/swt/graphics/Rectangle;
+ (Lorg/eclipse/swt/widgets/Item;)L0org/eclipse/swt/graphics/Rectangle;
 getCurrentEvent
  ()Lorg/eclipse/swt/dnd/DropTargetEvent;
  ()Lorg/eclipse/swt/dnd/DropTargetEvent;
@@ -35,7 +35,7 @@ getCurrentTarget
  ()Ljava/lang/Object;
 getSelectedObject
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getViewer
  ()Lorg/eclipse/jface/viewers/Viewer;
  ()Lorg/eclipse/jface/viewers/Viewer;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ViewerRow.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ViewerRow.eea
index bcac14574e..44ddbdac0d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ViewerRow.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/ViewerRow.eea
@@ -17,7 +17,7 @@ getBounds
  (I)Lorg/eclipse/swt/graphics/Rectangle;
 getCell
  (I)Lorg/eclipse/jface/viewers/ViewerCell;
- (I)Lorg/eclipse/jface/viewers/ViewerCell;
+ (I)L0org/eclipse/jface/viewers/ViewerCell;
 getCell
  (Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/jface/viewers/ViewerCell;
  (Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/jface/viewers/ViewerCell;
@@ -41,7 +41,7 @@ getImage
  (I)Lorg/eclipse/swt/graphics/Image;
 getImageBounds
  (I)Lorg/eclipse/swt/graphics/Rectangle;
- (I)Lorg/eclipse/swt/graphics/Rectangle;
+ (I)L0org/eclipse/swt/graphics/Rectangle;
 getItem
  ()Lorg/eclipse/swt/widgets/Widget;
  ()Lorg/eclipse/swt/widgets/Widget;
@@ -56,7 +56,7 @@ getText
  (I)Ljava/lang/String;
 getTextBounds
  (I)Lorg/eclipse/swt/graphics/Rectangle;
- (I)Lorg/eclipse/swt/graphics/Rectangle;
+ (I)L0org/eclipse/swt/graphics/Rectangle;
 getTreePath
  ()Lorg/eclipse/jface/viewers/TreePath;
  ()Lorg/eclipse/jface/viewers/TreePath;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/deferred/AbstractConcurrentModel.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/deferred/AbstractConcurrentModel.eea
index 07b272448b..3ce5cd2a08 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/deferred/AbstractConcurrentModel.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/deferred/AbstractConcurrentModel.eea
@@ -14,7 +14,7 @@ fireUpdate
  ([Ljava/lang/Object;)V
 getListeners
  ()[Lorg/eclipse/jface/viewers/deferred/IConcurrentModelListener;
- ()[Lorg/eclipse/jface/viewers/deferred/IConcurrentModelListener;
+ ()[1Lorg/eclipse/jface/viewers/deferred/IConcurrentModelListener;
 removeListener
  (Lorg/eclipse/jface/viewers/deferred/IConcurrentModelListener;)V
  (L1org/eclipse/jface/viewers/deferred/IConcurrentModelListener;)V # @Inherited(org.eclipse.jface.viewers.deferred.IConcurrentModel)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/deferred/LazySortedCollection.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/deferred/LazySortedCollection.eea
index 1cbd688856..63bc7d8c34 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/deferred/LazySortedCollection.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/viewers/deferred/LazySortedCollection.eea
@@ -26,7 +26,7 @@ getItem
  (I)Ljava/lang/Object;
 getItems
  (Z)[Ljava/lang/Object;
- (Z)[Ljava/lang/Object;
+ (Z)[1Ljava/lang/Object;
 getRange
  ([Ljava/lang/Object;IZ)I
  ([Ljava/lang/Object;IZ)I
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/AbstractWidgetFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/AbstractWidgetFactory.eea
index 9e0f93ddf1..ff78a6dfee 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/AbstractWidgetFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/AbstractWidgetFactory.eea
@@ -10,7 +10,7 @@ cast
  (Lorg/eclipse/jface/widgets/AbstractWidgetFactory<TF;TW;TP;>;)TF;
 create
  (TP;)TW;
- (TP;)TW;
+ (TP;)T1W;
 data
  (Ljava/lang/Object;)TF;
  (Ljava/lang/Object;)TF;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/BrowserFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/BrowserFactory.eea
index ba8dc39618..f0b19ee8ad 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/BrowserFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/BrowserFactory.eea
@@ -6,7 +6,7 @@ super org/eclipse/jface/widgets/AbstractCompositeFactory
 
 newBrowser
  (I)Lorg/eclipse/jface/widgets/BrowserFactory;
- (I)Lorg/eclipse/jface/widgets/BrowserFactory;
+ (I)L1org/eclipse/jface/widgets/BrowserFactory;
 
 disableJS
  ()Lorg/eclipse/jface/widgets/BrowserFactory;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/ButtonFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/ButtonFactory.eea
index 724e5d0b93..3bbfb69fe9 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/ButtonFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/ButtonFactory.eea
@@ -6,7 +6,7 @@ super org/eclipse/jface/widgets/AbstractControlFactory
 
 newButton
  (I)Lorg/eclipse/jface/widgets/ButtonFactory;
- (I)Lorg/eclipse/jface/widgets/ButtonFactory;
+ (I)L1org/eclipse/jface/widgets/ButtonFactory;
 
 image
  (Lorg/eclipse/swt/graphics/Image;)Lorg/eclipse/jface/widgets/ButtonFactory;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/CompositeFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/CompositeFactory.eea
index 8156995ede..98148c6df5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/CompositeFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/CompositeFactory.eea
@@ -6,7 +6,7 @@ super org/eclipse/jface/widgets/AbstractCompositeFactory
 
 newComposite
  (I)Lorg/eclipse/jface/widgets/CompositeFactory;
- (I)Lorg/eclipse/jface/widgets/CompositeFactory;
+ (I)L1org/eclipse/jface/widgets/CompositeFactory;
 
 supplyLayout
  (Ljava/util/function/Supplier<Lorg/eclipse/swt/widgets/Layout;>;)Lorg/eclipse/jface/widgets/CompositeFactory;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/DateTimeFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/DateTimeFactory.eea
index 6a23cf8a38..c2aff9748b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/DateTimeFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/DateTimeFactory.eea
@@ -6,7 +6,7 @@ super org/eclipse/jface/widgets/AbstractControlFactory
 
 newDateTime
  (I)Lorg/eclipse/jface/widgets/DateTimeFactory;
- (I)Lorg/eclipse/jface/widgets/DateTimeFactory;
+ (I)L1org/eclipse/jface/widgets/DateTimeFactory;
 
 onDefaultSelect
  (Ljava/util/function/Consumer<Lorg/eclipse/swt/events/SelectionEvent;>;)Lorg/eclipse/jface/widgets/DateTimeFactory;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/GroupFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/GroupFactory.eea
index cd7f77b93d..3f08a7eea5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/GroupFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/GroupFactory.eea
@@ -6,7 +6,7 @@ super org/eclipse/jface/widgets/AbstractCompositeFactory
 
 newGroup
  (I)Lorg/eclipse/jface/widgets/GroupFactory;
- (I)Lorg/eclipse/jface/widgets/GroupFactory;
+ (I)L1org/eclipse/jface/widgets/GroupFactory;
 
 text
  (Ljava/lang/String;)Lorg/eclipse/jface/widgets/GroupFactory;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/LabelFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/LabelFactory.eea
index 7610219ec3..f8511097c3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/LabelFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/LabelFactory.eea
@@ -6,7 +6,7 @@ super org/eclipse/jface/widgets/AbstractControlFactory
 
 newLabel
  (I)Lorg/eclipse/jface/widgets/LabelFactory;
- (I)Lorg/eclipse/jface/widgets/LabelFactory;
+ (I)L1org/eclipse/jface/widgets/LabelFactory;
 
 align
  (I)Lorg/eclipse/jface/widgets/LabelFactory;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/LinkFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/LinkFactory.eea
index 5a5a1759a0..c7d771e04f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/LinkFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/LinkFactory.eea
@@ -6,7 +6,7 @@ super org/eclipse/jface/widgets/AbstractControlFactory
 
 newLink
  (I)Lorg/eclipse/jface/widgets/LinkFactory;
- (I)Lorg/eclipse/jface/widgets/LinkFactory;
+ (I)L1org/eclipse/jface/widgets/LinkFactory;
 
 onSelect
  (Ljava/util/function/Consumer<Lorg/eclipse/swt/events/SelectionEvent;>;)Lorg/eclipse/jface/widgets/LinkFactory;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/SashFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/SashFactory.eea
index 357e68d072..cf24fd9fe2 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/SashFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/SashFactory.eea
@@ -6,7 +6,7 @@ super org/eclipse/jface/widgets/AbstractControlFactory
 
 newSash
  (I)Lorg/eclipse/jface/widgets/SashFactory;
- (I)Lorg/eclipse/jface/widgets/SashFactory;
+ (I)L1org/eclipse/jface/widgets/SashFactory;
 
 onSelect
  (Ljava/util/function/Consumer<Lorg/eclipse/swt/events/SelectionEvent;>;)Lorg/eclipse/jface/widgets/SashFactory;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/SashFormFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/SashFormFactory.eea
index 7d66a26734..2a4f4d4c78 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/SashFormFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/SashFormFactory.eea
@@ -6,7 +6,7 @@ super org/eclipse/jface/widgets/AbstractControlFactory
 
 newSashForm
  (I)Lorg/eclipse/jface/widgets/SashFormFactory;
- (I)Lorg/eclipse/jface/widgets/SashFormFactory;
+ (I)L1org/eclipse/jface/widgets/SashFormFactory;
 
 sashWidth
  (I)Lorg/eclipse/jface/widgets/SashFormFactory;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/ShellFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/ShellFactory.eea
index 05fee05179..0610e3f128 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/ShellFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/ShellFactory.eea
@@ -6,11 +6,11 @@ super org/eclipse/jface/widgets/AbstractCompositeFactory
 
 newShell
  (I)Lorg/eclipse/jface/widgets/ShellFactory;
- (I)Lorg/eclipse/jface/widgets/ShellFactory;
+ (I)L1org/eclipse/jface/widgets/ShellFactory;
 
 create
  (Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/swt/widgets/Shell;
- (Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/swt/widgets/Shell;
+ (Lorg/eclipse/swt/widgets/Display;)L1org/eclipse/swt/widgets/Shell;
 fullScreen
  (Z)Lorg/eclipse/jface/widgets/ShellFactory;
  (Z)Lorg/eclipse/jface/widgets/ShellFactory;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/SpinnerFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/SpinnerFactory.eea
index 6e828791ee..21bdf28140 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/SpinnerFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/SpinnerFactory.eea
@@ -6,7 +6,7 @@ super org/eclipse/jface/widgets/AbstractControlFactory
 
 newSpinner
  (I)Lorg/eclipse/jface/widgets/SpinnerFactory;
- (I)Lorg/eclipse/jface/widgets/SpinnerFactory;
+ (I)L1org/eclipse/jface/widgets/SpinnerFactory;
 
 bounds
  (II)Lorg/eclipse/jface/widgets/SpinnerFactory;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/TableColumnFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/TableColumnFactory.eea
index 3ee813466b..a3dae4c8a7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/TableColumnFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/TableColumnFactory.eea
@@ -6,7 +6,7 @@ super org/eclipse/jface/widgets/AbstractItemFactory
 
 newTableColumn
  (I)Lorg/eclipse/jface/widgets/TableColumnFactory;
- (I)Lorg/eclipse/jface/widgets/TableColumnFactory;
+ (I)L1org/eclipse/jface/widgets/TableColumnFactory;
 
 align
  (I)Lorg/eclipse/jface/widgets/TableColumnFactory;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/TableFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/TableFactory.eea
index 15f0ab2162..fdb0a098ba 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/TableFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/TableFactory.eea
@@ -6,7 +6,7 @@ super org/eclipse/jface/widgets/AbstractControlFactory
 
 newTable
  (I)Lorg/eclipse/jface/widgets/TableFactory;
- (I)Lorg/eclipse/jface/widgets/TableFactory;
+ (I)L1org/eclipse/jface/widgets/TableFactory;
 
 headerVisible
  (Z)Lorg/eclipse/jface/widgets/TableFactory;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/TextFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/TextFactory.eea
index 687d24756d..7bc29dc414 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/TextFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/TextFactory.eea
@@ -6,7 +6,7 @@ super org/eclipse/jface/widgets/AbstractControlFactory
 
 newText
  (I)Lorg/eclipse/jface/widgets/TextFactory;
- (I)Lorg/eclipse/jface/widgets/TextFactory;
+ (I)L1org/eclipse/jface/widgets/TextFactory;
 
 limitTo
  (I)Lorg/eclipse/jface/widgets/TextFactory;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/TreeColumnFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/TreeColumnFactory.eea
index 75151778f2..f5b391b276 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/TreeColumnFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/TreeColumnFactory.eea
@@ -6,7 +6,7 @@ super org/eclipse/jface/widgets/AbstractItemFactory
 
 newTreeColumn
  (I)Lorg/eclipse/jface/widgets/TreeColumnFactory;
- (I)Lorg/eclipse/jface/widgets/TreeColumnFactory;
+ (I)L1org/eclipse/jface/widgets/TreeColumnFactory;
 
 align
  (I)Lorg/eclipse/jface/widgets/TreeColumnFactory;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/TreeFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/TreeFactory.eea
index 4cf8338f33..61764e5fda 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/TreeFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/TreeFactory.eea
@@ -6,7 +6,7 @@ super org/eclipse/jface/widgets/AbstractControlFactory
 
 newTree
  (I)Lorg/eclipse/jface/widgets/TreeFactory;
- (I)Lorg/eclipse/jface/widgets/TreeFactory;
+ (I)L1org/eclipse/jface/widgets/TreeFactory;
 
 headerVisible
  (Z)Lorg/eclipse/jface/widgets/TreeFactory;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/WidgetSupplier.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/WidgetSupplier.eea
index b13fdc24db..a484bba28c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/WidgetSupplier.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/widgets/WidgetSupplier.eea
@@ -4,4 +4,4 @@ class org/eclipse/jface/widgets/WidgetSupplier
 
 create
  (TP;)TW;
- (TP;)TW;
+ (TP;)T1W;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/wizard/IWizard.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/wizard/IWizard.eea
index c6e25c3989..e74aa9eaea 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/wizard/IWizard.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/wizard/IWizard.eea
@@ -14,7 +14,7 @@ getDialogSettings
  ()Lorg/eclipse/jface/dialogs/IDialogSettings;
 getMinimumWizardSize
  ()Lorg/eclipse/swt/graphics/Point;
- ()Lorg/eclipse/swt/graphics/Point;
+ ()L0org/eclipse/swt/graphics/Point;
 getNextPage
  (Lorg/eclipse/jface/wizard/IWizardPage;)Lorg/eclipse/jface/wizard/IWizardPage;
  (Lorg/eclipse/jface/wizard/IWizardPage;)Lorg/eclipse/jface/wizard/IWizardPage;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/wizard/IWizardPage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/wizard/IWizardPage.eea
index 383bc9a836..3b358bcfcf 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/wizard/IWizardPage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/wizard/IWizardPage.eea
@@ -2,7 +2,7 @@ class org/eclipse/jface/wizard/IWizardPage
 
 getMinimumPageSize
  ()Lorg/eclipse/swt/graphics/Point;
- ()Lorg/eclipse/swt/graphics/Point;
+ ()L0org/eclipse/swt/graphics/Point;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/wizard/Wizard.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/wizard/Wizard.eea
index 98f39d91d8..a54ea57361 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/wizard/Wizard.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/wizard/Wizard.eea
@@ -21,25 +21,25 @@ getDialogSettings
  ()Lorg/eclipse/jface/dialogs/IDialogSettings;
 getMinimumWizardSize
  ()Lorg/eclipse/swt/graphics/Point;
- ()Lorg/eclipse/swt/graphics/Point;
+ ()L0org/eclipse/swt/graphics/Point; # @Inherited(org.eclipse.jface.wizard.IWizard)
 getNextPage
  (Lorg/eclipse/jface/wizard/IWizardPage;)Lorg/eclipse/jface/wizard/IWizardPage;
- (Lorg/eclipse/jface/wizard/IWizardPage;)Lorg/eclipse/jface/wizard/IWizardPage;
+ (Lorg/eclipse/jface/wizard/IWizardPage;)L0org/eclipse/jface/wizard/IWizardPage;
 getPage
  (Ljava/lang/String;)Lorg/eclipse/jface/wizard/IWizardPage;
- (Ljava/lang/String;)Lorg/eclipse/jface/wizard/IWizardPage;
+ (Ljava/lang/String;)L0org/eclipse/jface/wizard/IWizardPage;
 getPages
  ()[Lorg/eclipse/jface/wizard/IWizardPage;
  ()[Lorg/eclipse/jface/wizard/IWizardPage;
 getPreviousPage
  (Lorg/eclipse/jface/wizard/IWizardPage;)Lorg/eclipse/jface/wizard/IWizardPage;
- (Lorg/eclipse/jface/wizard/IWizardPage;)Lorg/eclipse/jface/wizard/IWizardPage;
+ (Lorg/eclipse/jface/wizard/IWizardPage;)L0org/eclipse/jface/wizard/IWizardPage;
 getShell
  ()Lorg/eclipse/swt/widgets/Shell;
  ()Lorg/eclipse/swt/widgets/Shell; # @Keep not annotated on purpose
 getStartingPage
  ()Lorg/eclipse/jface/wizard/IWizardPage;
- ()Lorg/eclipse/jface/wizard/IWizardPage;
+ ()L0org/eclipse/jface/wizard/IWizardPage;
 getTitleBarColor
  ()Lorg/eclipse/swt/graphics/RGB;
  ()Lorg/eclipse/swt/graphics/RGB;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/wizard/WizardDialog.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/wizard/WizardDialog.eea
index 7a4226f5a3..bfbbd5b693 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/wizard/WizardDialog.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/wizard/WizardDialog.eea
@@ -27,7 +27,7 @@ createDialogArea
  (L1org/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.jface.dialogs.TitleAreaDialog)
 createProgressMonitorPart
  (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/swt/layout/GridLayout;)Lorg/eclipse/jface/wizard/ProgressMonitorPart;
- (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/swt/layout/GridLayout;)Lorg/eclipse/jface/wizard/ProgressMonitorPart;
+ (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/swt/layout/GridLayout;)L1org/eclipse/jface/wizard/ProgressMonitorPart;
 firePageChanged
  (Lorg/eclipse/jface/dialogs/PageChangedEvent;)V
  (Lorg/eclipse/jface/dialogs/PageChangedEvent;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/wizard/WizardPage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/wizard/WizardPage.eea
index 284938be14..92135d8b36 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/wizard/WizardPage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/wizard/WizardPage.eea
@@ -8,10 +8,10 @@ class org/eclipse/jface/wizard/WizardPage
  (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/jface/resource/ImageDescriptor;)V
 getContainer
  ()Lorg/eclipse/jface/wizard/IWizardContainer;
- ()Lorg/eclipse/jface/wizard/IWizardContainer;
+ ()L0org/eclipse/jface/wizard/IWizardContainer;
 getDialogSettings
  ()Lorg/eclipse/jface/dialogs/IDialogSettings;
- ()Lorg/eclipse/jface/dialogs/IDialogSettings;
+ ()L0org/eclipse/jface/dialogs/IDialogSettings;
 getImage
  ()Lorg/eclipse/swt/graphics/Image;
  ()Lorg/eclipse/swt/graphics/Image;
@@ -20,10 +20,10 @@ getName
  ()Ljava/lang/String;
 getNextPage
  ()Lorg/eclipse/jface/wizard/IWizardPage;
- ()Lorg/eclipse/jface/wizard/IWizardPage;
+ ()L0org/eclipse/jface/wizard/IWizardPage;
 getPreviousPage
  ()Lorg/eclipse/jface/wizard/IWizardPage;
- ()Lorg/eclipse/jface/wizard/IWizardPage;
+ ()L0org/eclipse/jface/wizard/IWizardPage;
 getShell
  ()Lorg/eclipse/swt/widgets/Shell;
  ()L0org/eclipse/swt/widgets/Shell; # @Overrides(org.eclipse.jface.dialogs.DialogPage)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/wizard/WizardSelectionPage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/wizard/WizardSelectionPage.eea
index 15497c54a8..5b56e25977 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/wizard/WizardSelectionPage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/jface/wizard/WizardSelectionPage.eea
@@ -5,7 +5,7 @@ class org/eclipse/jface/wizard/WizardSelectionPage
  (Ljava/lang/String;)V
 getNextPage
  ()Lorg/eclipse/jface/wizard/IWizardPage;
- ()Lorg/eclipse/jface/wizard/IWizardPage;
+ ()L0org/eclipse/jface/wizard/IWizardPage; # @Inherited(org.eclipse.jface.wizard.WizardPage)
 getSelectedNode
  ()Lorg/eclipse/jface/wizard/IWizardNode;
  ()Lorg/eclipse/jface/wizard/IWizardNode;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/FullDocumentDiagnosticReport.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/FullDocumentDiagnosticReport.eea
index b1fa6e23d6..762fc9baf8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/FullDocumentDiagnosticReport.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/FullDocumentDiagnosticReport.eea
@@ -11,7 +11,7 @@ getItems
  ()Ljava/util/List<Lorg/eclipse/lsp4j/Diagnostic;>;
 getKind
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getResultId
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/UnchangedDocumentDiagnosticReport.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/UnchangedDocumentDiagnosticReport.eea
index 8f91bee5d8..7113deeb38 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/UnchangedDocumentDiagnosticReport.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/UnchangedDocumentDiagnosticReport.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getKind
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getResultId
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/CodeActionResponseAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/CodeActionResponseAdapter.eea
index 68bf01b4b1..9d18915d04 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/CodeActionResponseAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/CodeActionResponseAdapter.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/adapters/CodeActionResponseAdapter
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L1com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/CompletionItemDefaultsEditRangeTypeAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/CompletionItemDefaultsEditRangeTypeAdapter.eea
index 5857fcfd0d..3d3f6017c7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/CompletionItemDefaultsEditRangeTypeAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/CompletionItemDefaultsEditRangeTypeAdapter.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/adapters/CompletionItemDefaultsEditRangeTypeAdapter
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L1com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/CompletionItemTextEditTypeAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/CompletionItemTextEditTypeAdapter.eea
index 64f820772e..446018ce8a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/CompletionItemTextEditTypeAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/CompletionItemTextEditTypeAdapter.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/adapters/CompletionItemTextEditTypeAdapter
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L1com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/DocumentChangeListAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/DocumentChangeListAdapter.eea
index 58c8d2df72..5f55fa9db5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/DocumentChangeListAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/DocumentChangeListAdapter.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/adapters/DocumentChangeListAdapter
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L1com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/DocumentDiagnosticReportTypeAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/DocumentDiagnosticReportTypeAdapter.eea
index d643532978..f05a8783b7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/DocumentDiagnosticReportTypeAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/DocumentDiagnosticReportTypeAdapter.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/adapters/DocumentDiagnosticReportTypeAdapter
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L1com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/DocumentSymbolResponseAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/DocumentSymbolResponseAdapter.eea
index 42fb976462..4af1870dd8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/DocumentSymbolResponseAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/DocumentSymbolResponseAdapter.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/adapters/DocumentSymbolResponseAdapter
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L1com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/HoverTypeAdapter$Factory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/HoverTypeAdapter$Factory.eea
index 2eb242b345..15432dbf9a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/HoverTypeAdapter$Factory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/HoverTypeAdapter$Factory.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/adapters/HoverTypeAdapter$Factory
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L0com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/HoverTypeAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/HoverTypeAdapter.eea
index b532b870b5..dfa329d6c7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/HoverTypeAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/HoverTypeAdapter.eea
@@ -9,7 +9,7 @@ super com/google/gson/TypeAdapter
  (Lcom/google/gson/Gson;)V
 read
  (Lcom/google/gson/stream/JsonReader;)Lorg/eclipse/lsp4j/Hover;
- (Lcom/google/gson/stream/JsonReader;)Lorg/eclipse/lsp4j/Hover;
+ (Lcom/google/gson/stream/JsonReader;)L0org/eclipse/lsp4j/Hover;
 readContents
  (Lcom/google/gson/stream/JsonReader;)Lorg/eclipse/lsp4j/jsonrpc/messages/Either<Ljava/util/List<Lorg/eclipse/lsp4j/jsonrpc/messages/Either<Ljava/lang/String;Lorg/eclipse/lsp4j/MarkedString;>;>;Lorg/eclipse/lsp4j/MarkupContent;>;
  (Lcom/google/gson/stream/JsonReader;)Lorg/eclipse/lsp4j/jsonrpc/messages/Either<Ljava/util/List<Lorg/eclipse/lsp4j/jsonrpc/messages/Either<Ljava/lang/String;Lorg/eclipse/lsp4j/MarkedString;>;>;Lorg/eclipse/lsp4j/MarkupContent;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/InitializeParamsTypeAdapter$Factory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/InitializeParamsTypeAdapter$Factory.eea
index 5d6cac73d8..3103dd54ac 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/InitializeParamsTypeAdapter$Factory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/InitializeParamsTypeAdapter$Factory.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/adapters/InitializeParamsTypeAdapter$Factory
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L0com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/InitializeParamsTypeAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/InitializeParamsTypeAdapter.eea
index 0cbc352f79..589b8904cb 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/InitializeParamsTypeAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/InitializeParamsTypeAdapter.eea
@@ -9,7 +9,7 @@ super com/google/gson/TypeAdapter
  (Lcom/google/gson/Gson;)V
 read
  (Lcom/google/gson/stream/JsonReader;)Lorg/eclipse/lsp4j/InitializeParams;
- (Lcom/google/gson/stream/JsonReader;)Lorg/eclipse/lsp4j/InitializeParams;
+ (Lcom/google/gson/stream/JsonReader;)L0org/eclipse/lsp4j/InitializeParams;
 readCapabilities
  (Lcom/google/gson/stream/JsonReader;)Lorg/eclipse/lsp4j/ClientCapabilities;
  (Lcom/google/gson/stream/JsonReader;)Lorg/eclipse/lsp4j/ClientCapabilities;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/InlineValueResponseAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/InlineValueResponseAdapter.eea
index 264acb62b2..bff136fc3f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/InlineValueResponseAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/InlineValueResponseAdapter.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/adapters/InlineValueResponseAdapter
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L1com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/LocationLinkListAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/LocationLinkListAdapter.eea
index ca58c165db..c9215a3829 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/LocationLinkListAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/LocationLinkListAdapter.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/adapters/LocationLinkListAdapter
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L1com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/PrepareRenameResponseAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/PrepareRenameResponseAdapter.eea
index 691b9b6b38..776f093785 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/PrepareRenameResponseAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/PrepareRenameResponseAdapter.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/adapters/PrepareRenameResponseAdapter
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L1com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/ProgressNotificationAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/ProgressNotificationAdapter.eea
index 7867691f04..f689ef02af 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/ProgressNotificationAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/ProgressNotificationAdapter.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/adapters/ProgressNotificationAdapter
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L1com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/ResourceOperationTypeAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/ResourceOperationTypeAdapter.eea
index 764c491abf..ec4611f1d3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/ResourceOperationTypeAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/ResourceOperationTypeAdapter.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/adapters/ResourceOperationTypeAdapter
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L0com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/SemanticTokensFullDeltaResponseAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/SemanticTokensFullDeltaResponseAdapter.eea
index 64ae083a33..1a1d2a508b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/SemanticTokensFullDeltaResponseAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/SemanticTokensFullDeltaResponseAdapter.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/adapters/SemanticTokensFullDeltaResponseAdapter
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L1com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/SymbolInformationTypeAdapter$Factory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/SymbolInformationTypeAdapter$Factory.eea
index 0e30a93097..a28ca15da4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/SymbolInformationTypeAdapter$Factory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/SymbolInformationTypeAdapter$Factory.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/adapters/SymbolInformationTypeAdapter$Factory
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L0com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/SymbolInformationTypeAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/SymbolInformationTypeAdapter.eea
index 3db3aba7f7..cbdf16d56c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/SymbolInformationTypeAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/SymbolInformationTypeAdapter.eea
@@ -9,7 +9,7 @@ super com/google/gson/TypeAdapter
  (Lcom/google/gson/Gson;)V
 read
  (Lcom/google/gson/stream/JsonReader;)Lorg/eclipse/lsp4j/SymbolInformation;
- (Lcom/google/gson/stream/JsonReader;)Lorg/eclipse/lsp4j/SymbolInformation;
+ (Lcom/google/gson/stream/JsonReader;)L0org/eclipse/lsp4j/SymbolInformation;
 readContainerName
  (Lcom/google/gson/stream/JsonReader;)Ljava/lang/String;
  (Lcom/google/gson/stream/JsonReader;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/VersionedTextDocumentIdentifierTypeAdapter$Factory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/VersionedTextDocumentIdentifierTypeAdapter$Factory.eea
index 429176f409..8a3080879c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/VersionedTextDocumentIdentifierTypeAdapter$Factory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/VersionedTextDocumentIdentifierTypeAdapter$Factory.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/adapters/VersionedTextDocumentIdentifierTypeAdapter$Fact
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L0com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/VersionedTextDocumentIdentifierTypeAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/VersionedTextDocumentIdentifierTypeAdapter.eea
index f370317415..281a64bd0a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/VersionedTextDocumentIdentifierTypeAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/VersionedTextDocumentIdentifierTypeAdapter.eea
@@ -9,7 +9,7 @@ super com/google/gson/TypeAdapter
  (Lcom/google/gson/Gson;)V
 read
  (Lcom/google/gson/stream/JsonReader;)Lorg/eclipse/lsp4j/VersionedTextDocumentIdentifier;
- (Lcom/google/gson/stream/JsonReader;)Lorg/eclipse/lsp4j/VersionedTextDocumentIdentifier;
+ (Lcom/google/gson/stream/JsonReader;)L0org/eclipse/lsp4j/VersionedTextDocumentIdentifier;
 readUri
  (Lcom/google/gson/stream/JsonReader;)Ljava/lang/String;
  (Lcom/google/gson/stream/JsonReader;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/WorkDoneProgressNotificationAdapter$Factory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/WorkDoneProgressNotificationAdapter$Factory.eea
index fba3ad41e7..26d4160415 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/WorkDoneProgressNotificationAdapter$Factory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/WorkDoneProgressNotificationAdapter$Factory.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/adapters/WorkDoneProgressNotificationAdapter$Factory
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L0com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/WorkDoneProgressNotificationAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/WorkDoneProgressNotificationAdapter.eea
index 8cd20af40c..4f0254ce62 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/WorkDoneProgressNotificationAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/WorkDoneProgressNotificationAdapter.eea
@@ -6,7 +6,7 @@ super com/google/gson/TypeAdapter
 
 read
  (Lcom/google/gson/stream/JsonReader;)Lorg/eclipse/lsp4j/WorkDoneProgressNotification;
- (Lcom/google/gson/stream/JsonReader;)Lorg/eclipse/lsp4j/WorkDoneProgressNotification;
+ (Lcom/google/gson/stream/JsonReader;)L0org/eclipse/lsp4j/WorkDoneProgressNotification;
 write
  (Lcom/google/gson/stream/JsonWriter;Lorg/eclipse/lsp4j/WorkDoneProgressNotification;)V
  (Lcom/google/gson/stream/JsonWriter;Lorg/eclipse/lsp4j/WorkDoneProgressNotification;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/WorkspaceDocumentDiagnosticReportListAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/WorkspaceDocumentDiagnosticReportListAdapter.eea
index 9c2342c71d..2d1cc7ccf3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/WorkspaceDocumentDiagnosticReportListAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/WorkspaceDocumentDiagnosticReportListAdapter.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/adapters/WorkspaceDocumentDiagnosticReportListAdapter
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L1com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/WorkspaceSymbolLocationTypeAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/WorkspaceSymbolLocationTypeAdapter.eea
index aa60029895..bd53be31b5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/WorkspaceSymbolLocationTypeAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/WorkspaceSymbolLocationTypeAdapter.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/adapters/WorkspaceSymbolLocationTypeAdapter
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L1com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/WorkspaceSymbolResponseAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/WorkspaceSymbolResponseAdapter.eea
index 425ed93b92..32b87aa77c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/WorkspaceSymbolResponseAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/adapters/WorkspaceSymbolResponseAdapter.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/adapters/WorkspaceSymbolResponseAdapter
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L1com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/debug/adapters/RestartArgumentsArgumentsTypeAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/debug/adapters/RestartArgumentsArgumentsTypeAdapter.eea
index e17bddcd5d..35eb8a23f4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/debug/adapters/RestartArgumentsArgumentsTypeAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/debug/adapters/RestartArgumentsArgumentsTypeAdapter.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/debug/adapters/RestartArgumentsArgumentsTypeAdapter
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L1com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/debug/launch/DSPLauncher.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/debug/launch/DSPLauncher.eea
index b204e0b164..37cb2d3985 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/debug/launch/DSPLauncher.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/debug/launch/DSPLauncher.eea
@@ -2,19 +2,19 @@ class org/eclipse/lsp4j/debug/launch/DSPLauncher
 
 createClientLauncher
  (Lorg/eclipse/lsp4j/debug/services/IDebugProtocolClient;Ljava/io/InputStream;Ljava/io/OutputStream;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/debug/services/IDebugProtocolServer;>;
- (Lorg/eclipse/lsp4j/debug/services/IDebugProtocolClient;Ljava/io/InputStream;Ljava/io/OutputStream;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/debug/services/IDebugProtocolServer;>;
+ (Lorg/eclipse/lsp4j/debug/services/IDebugProtocolClient;Ljava/io/InputStream;Ljava/io/OutputStream;)L1org/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/debug/services/IDebugProtocolServer;>;
 createClientLauncher
  (Lorg/eclipse/lsp4j/debug/services/IDebugProtocolClient;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/debug/services/IDebugProtocolServer;>;
- (Lorg/eclipse/lsp4j/debug/services/IDebugProtocolClient;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/debug/services/IDebugProtocolServer;>;
+ (Lorg/eclipse/lsp4j/debug/services/IDebugProtocolClient;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;)L1org/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/debug/services/IDebugProtocolServer;>;
 createClientLauncher
  (Lorg/eclipse/lsp4j/debug/services/IDebugProtocolClient;Ljava/io/InputStream;Ljava/io/OutputStream;ZLjava/io/PrintWriter;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/debug/services/IDebugProtocolServer;>;
- (Lorg/eclipse/lsp4j/debug/services/IDebugProtocolClient;Ljava/io/InputStream;Ljava/io/OutputStream;ZLjava/io/PrintWriter;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/debug/services/IDebugProtocolServer;>;
+ (Lorg/eclipse/lsp4j/debug/services/IDebugProtocolClient;Ljava/io/InputStream;Ljava/io/OutputStream;ZLjava/io/PrintWriter;)L1org/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/debug/services/IDebugProtocolServer;>;
 createServerLauncher
  (Lorg/eclipse/lsp4j/debug/services/IDebugProtocolServer;Ljava/io/InputStream;Ljava/io/OutputStream;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/debug/services/IDebugProtocolClient;>;
- (Lorg/eclipse/lsp4j/debug/services/IDebugProtocolServer;Ljava/io/InputStream;Ljava/io/OutputStream;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/debug/services/IDebugProtocolClient;>;
+ (Lorg/eclipse/lsp4j/debug/services/IDebugProtocolServer;Ljava/io/InputStream;Ljava/io/OutputStream;)L1org/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/debug/services/IDebugProtocolClient;>;
 createServerLauncher
  (Lorg/eclipse/lsp4j/debug/services/IDebugProtocolServer;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/debug/services/IDebugProtocolClient;>;
- (Lorg/eclipse/lsp4j/debug/services/IDebugProtocolServer;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/debug/services/IDebugProtocolClient;>;
+ (Lorg/eclipse/lsp4j/debug/services/IDebugProtocolServer;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;)L1org/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/debug/services/IDebugProtocolClient;>;
 createServerLauncher
  (Lorg/eclipse/lsp4j/debug/services/IDebugProtocolServer;Ljava/io/InputStream;Ljava/io/OutputStream;ZLjava/io/PrintWriter;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/debug/services/IDebugProtocolClient;>;
- (Lorg/eclipse/lsp4j/debug/services/IDebugProtocolServer;Ljava/io/InputStream;Ljava/io/OutputStream;ZLjava/io/PrintWriter;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/debug/services/IDebugProtocolClient;>;
+ (Lorg/eclipse/lsp4j/debug/services/IDebugProtocolServer;Ljava/io/InputStream;Ljava/io/OutputStream;ZLjava/io/PrintWriter;)L1org/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/debug/services/IDebugProtocolClient;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/debug/services/IDebugProtocolServer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/debug/services/IDebugProtocolServer.eea
index 82557d4cdc..d2c1497fd6 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/debug/services/IDebugProtocolServer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/debug/services/IDebugProtocolServer.eea
@@ -6,127 +6,127 @@ SCHEMA_VERSION
 
 attach
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1java/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
 breakpointLocations
  (Lorg/eclipse/lsp4j/debug/BreakpointLocationsArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/BreakpointLocationsResponse;>;
- (Lorg/eclipse/lsp4j/debug/BreakpointLocationsArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/BreakpointLocationsResponse;>;
+ (Lorg/eclipse/lsp4j/debug/BreakpointLocationsArguments;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/BreakpointLocationsResponse;>;
 cancel
  (Lorg/eclipse/lsp4j/debug/CancelArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
- (Lorg/eclipse/lsp4j/debug/CancelArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
+ (Lorg/eclipse/lsp4j/debug/CancelArguments;)L1java/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
 completions
  (Lorg/eclipse/lsp4j/debug/CompletionsArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/CompletionsResponse;>;
- (Lorg/eclipse/lsp4j/debug/CompletionsArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/CompletionsResponse;>;
+ (Lorg/eclipse/lsp4j/debug/CompletionsArguments;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/CompletionsResponse;>;
 configurationDone
  (Lorg/eclipse/lsp4j/debug/ConfigurationDoneArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
- (Lorg/eclipse/lsp4j/debug/ConfigurationDoneArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
+ (Lorg/eclipse/lsp4j/debug/ConfigurationDoneArguments;)L1java/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
 continue_
  (Lorg/eclipse/lsp4j/debug/ContinueArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/ContinueResponse;>;
- (Lorg/eclipse/lsp4j/debug/ContinueArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/ContinueResponse;>;
+ (Lorg/eclipse/lsp4j/debug/ContinueArguments;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/ContinueResponse;>;
 dataBreakpointInfo
  (Lorg/eclipse/lsp4j/debug/DataBreakpointInfoArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/DataBreakpointInfoResponse;>;
- (Lorg/eclipse/lsp4j/debug/DataBreakpointInfoArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/DataBreakpointInfoResponse;>;
+ (Lorg/eclipse/lsp4j/debug/DataBreakpointInfoArguments;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/DataBreakpointInfoResponse;>;
 disassemble
  (Lorg/eclipse/lsp4j/debug/DisassembleArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/DisassembleResponse;>;
- (Lorg/eclipse/lsp4j/debug/DisassembleArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/DisassembleResponse;>;
+ (Lorg/eclipse/lsp4j/debug/DisassembleArguments;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/DisassembleResponse;>;
 disconnect
  (Lorg/eclipse/lsp4j/debug/DisconnectArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
- (Lorg/eclipse/lsp4j/debug/DisconnectArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
+ (Lorg/eclipse/lsp4j/debug/DisconnectArguments;)L1java/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
 evaluate
  (Lorg/eclipse/lsp4j/debug/EvaluateArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/EvaluateResponse;>;
- (Lorg/eclipse/lsp4j/debug/EvaluateArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/EvaluateResponse;>;
+ (Lorg/eclipse/lsp4j/debug/EvaluateArguments;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/EvaluateResponse;>;
 exceptionInfo
  (Lorg/eclipse/lsp4j/debug/ExceptionInfoArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/ExceptionInfoResponse;>;
- (Lorg/eclipse/lsp4j/debug/ExceptionInfoArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/ExceptionInfoResponse;>;
+ (Lorg/eclipse/lsp4j/debug/ExceptionInfoArguments;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/ExceptionInfoResponse;>;
 gotoTargets
  (Lorg/eclipse/lsp4j/debug/GotoTargetsArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/GotoTargetsResponse;>;
- (Lorg/eclipse/lsp4j/debug/GotoTargetsArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/GotoTargetsResponse;>;
+ (Lorg/eclipse/lsp4j/debug/GotoTargetsArguments;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/GotoTargetsResponse;>;
 goto_
  (Lorg/eclipse/lsp4j/debug/GotoArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
- (Lorg/eclipse/lsp4j/debug/GotoArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
+ (Lorg/eclipse/lsp4j/debug/GotoArguments;)L1java/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
 initialize
  (Lorg/eclipse/lsp4j/debug/InitializeRequestArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/Capabilities;>;
- (Lorg/eclipse/lsp4j/debug/InitializeRequestArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/Capabilities;>;
+ (Lorg/eclipse/lsp4j/debug/InitializeRequestArguments;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/Capabilities;>;
 launch
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1java/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
 loadedSources
  (Lorg/eclipse/lsp4j/debug/LoadedSourcesArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/LoadedSourcesResponse;>;
- (Lorg/eclipse/lsp4j/debug/LoadedSourcesArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/LoadedSourcesResponse;>;
+ (Lorg/eclipse/lsp4j/debug/LoadedSourcesArguments;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/LoadedSourcesResponse;>;
 modules
  (Lorg/eclipse/lsp4j/debug/ModulesArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/ModulesResponse;>;
- (Lorg/eclipse/lsp4j/debug/ModulesArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/ModulesResponse;>;
+ (Lorg/eclipse/lsp4j/debug/ModulesArguments;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/ModulesResponse;>;
 next
  (Lorg/eclipse/lsp4j/debug/NextArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
- (Lorg/eclipse/lsp4j/debug/NextArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
+ (Lorg/eclipse/lsp4j/debug/NextArguments;)L1java/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
 pause
  (Lorg/eclipse/lsp4j/debug/PauseArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
- (Lorg/eclipse/lsp4j/debug/PauseArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
+ (Lorg/eclipse/lsp4j/debug/PauseArguments;)L1java/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
 readMemory
  (Lorg/eclipse/lsp4j/debug/ReadMemoryArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/ReadMemoryResponse;>;
- (Lorg/eclipse/lsp4j/debug/ReadMemoryArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/ReadMemoryResponse;>;
+ (Lorg/eclipse/lsp4j/debug/ReadMemoryArguments;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/ReadMemoryResponse;>;
 restart
  (Lorg/eclipse/lsp4j/debug/RestartArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
- (Lorg/eclipse/lsp4j/debug/RestartArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
+ (Lorg/eclipse/lsp4j/debug/RestartArguments;)L1java/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
 restartFrame
  (Lorg/eclipse/lsp4j/debug/RestartFrameArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
- (Lorg/eclipse/lsp4j/debug/RestartFrameArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
+ (Lorg/eclipse/lsp4j/debug/RestartFrameArguments;)L1java/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
 reverseContinue
  (Lorg/eclipse/lsp4j/debug/ReverseContinueArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
- (Lorg/eclipse/lsp4j/debug/ReverseContinueArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
+ (Lorg/eclipse/lsp4j/debug/ReverseContinueArguments;)L1java/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
 scopes
  (Lorg/eclipse/lsp4j/debug/ScopesArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/ScopesResponse;>;
- (Lorg/eclipse/lsp4j/debug/ScopesArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/ScopesResponse;>;
+ (Lorg/eclipse/lsp4j/debug/ScopesArguments;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/ScopesResponse;>;
 setBreakpoints
  (Lorg/eclipse/lsp4j/debug/SetBreakpointsArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/SetBreakpointsResponse;>;
- (Lorg/eclipse/lsp4j/debug/SetBreakpointsArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/SetBreakpointsResponse;>;
+ (Lorg/eclipse/lsp4j/debug/SetBreakpointsArguments;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/SetBreakpointsResponse;>;
 setDataBreakpoints
  (Lorg/eclipse/lsp4j/debug/SetDataBreakpointsArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/SetDataBreakpointsResponse;>;
- (Lorg/eclipse/lsp4j/debug/SetDataBreakpointsArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/SetDataBreakpointsResponse;>;
+ (Lorg/eclipse/lsp4j/debug/SetDataBreakpointsArguments;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/SetDataBreakpointsResponse;>;
 setExceptionBreakpoints
  (Lorg/eclipse/lsp4j/debug/SetExceptionBreakpointsArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/SetExceptionBreakpointsResponse;>;
- (Lorg/eclipse/lsp4j/debug/SetExceptionBreakpointsArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/SetExceptionBreakpointsResponse;>;
+ (Lorg/eclipse/lsp4j/debug/SetExceptionBreakpointsArguments;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/SetExceptionBreakpointsResponse;>;
 setExpression
  (Lorg/eclipse/lsp4j/debug/SetExpressionArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/SetExpressionResponse;>;
- (Lorg/eclipse/lsp4j/debug/SetExpressionArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/SetExpressionResponse;>;
+ (Lorg/eclipse/lsp4j/debug/SetExpressionArguments;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/SetExpressionResponse;>;
 setFunctionBreakpoints
  (Lorg/eclipse/lsp4j/debug/SetFunctionBreakpointsArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/SetFunctionBreakpointsResponse;>;
- (Lorg/eclipse/lsp4j/debug/SetFunctionBreakpointsArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/SetFunctionBreakpointsResponse;>;
+ (Lorg/eclipse/lsp4j/debug/SetFunctionBreakpointsArguments;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/SetFunctionBreakpointsResponse;>;
 setInstructionBreakpoints
  (Lorg/eclipse/lsp4j/debug/SetInstructionBreakpointsArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/SetInstructionBreakpointsResponse;>;
- (Lorg/eclipse/lsp4j/debug/SetInstructionBreakpointsArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/SetInstructionBreakpointsResponse;>;
+ (Lorg/eclipse/lsp4j/debug/SetInstructionBreakpointsArguments;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/SetInstructionBreakpointsResponse;>;
 setVariable
  (Lorg/eclipse/lsp4j/debug/SetVariableArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/SetVariableResponse;>;
- (Lorg/eclipse/lsp4j/debug/SetVariableArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/SetVariableResponse;>;
+ (Lorg/eclipse/lsp4j/debug/SetVariableArguments;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/SetVariableResponse;>;
 source
  (Lorg/eclipse/lsp4j/debug/SourceArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/SourceResponse;>;
- (Lorg/eclipse/lsp4j/debug/SourceArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/SourceResponse;>;
+ (Lorg/eclipse/lsp4j/debug/SourceArguments;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/SourceResponse;>;
 stackTrace
  (Lorg/eclipse/lsp4j/debug/StackTraceArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/StackTraceResponse;>;
- (Lorg/eclipse/lsp4j/debug/StackTraceArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/StackTraceResponse;>;
+ (Lorg/eclipse/lsp4j/debug/StackTraceArguments;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/StackTraceResponse;>;
 stepBack
  (Lorg/eclipse/lsp4j/debug/StepBackArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
- (Lorg/eclipse/lsp4j/debug/StepBackArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
+ (Lorg/eclipse/lsp4j/debug/StepBackArguments;)L1java/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
 stepIn
  (Lorg/eclipse/lsp4j/debug/StepInArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
- (Lorg/eclipse/lsp4j/debug/StepInArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
+ (Lorg/eclipse/lsp4j/debug/StepInArguments;)L1java/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
 stepInTargets
  (Lorg/eclipse/lsp4j/debug/StepInTargetsArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/StepInTargetsResponse;>;
- (Lorg/eclipse/lsp4j/debug/StepInTargetsArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/StepInTargetsResponse;>;
+ (Lorg/eclipse/lsp4j/debug/StepInTargetsArguments;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/StepInTargetsResponse;>;
 stepOut
  (Lorg/eclipse/lsp4j/debug/StepOutArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
- (Lorg/eclipse/lsp4j/debug/StepOutArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
+ (Lorg/eclipse/lsp4j/debug/StepOutArguments;)L1java/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
 terminate
  (Lorg/eclipse/lsp4j/debug/TerminateArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
- (Lorg/eclipse/lsp4j/debug/TerminateArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
+ (Lorg/eclipse/lsp4j/debug/TerminateArguments;)L1java/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
 terminateThreads
  (Lorg/eclipse/lsp4j/debug/TerminateThreadsArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
- (Lorg/eclipse/lsp4j/debug/TerminateThreadsArguments;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
+ (Lorg/eclipse/lsp4j/debug/TerminateThreadsArguments;)L1java/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
 threads
  ()Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/ThreadsResponse;>;
- ()Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/ThreadsResponse;>;
+ ()L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/ThreadsResponse;>;
 variables
  (Lorg/eclipse/lsp4j/debug/VariablesArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/VariablesResponse;>;
- (Lorg/eclipse/lsp4j/debug/VariablesArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/VariablesResponse;>;
+ (Lorg/eclipse/lsp4j/debug/VariablesArguments;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/VariablesResponse;>;
 writeMemory
  (Lorg/eclipse/lsp4j/debug/WriteMemoryArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/WriteMemoryResponse;>;
- (Lorg/eclipse/lsp4j/debug/WriteMemoryArguments;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/WriteMemoryResponse;>;
+ (Lorg/eclipse/lsp4j/debug/WriteMemoryArguments;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/debug/WriteMemoryResponse;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/Launcher$Builder.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/Launcher$Builder.eea
index 08ef7b531f..b11c19a654 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/Launcher$Builder.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/Launcher$Builder.eea
@@ -38,25 +38,25 @@ configureGson
  (Ljava/util/function/Consumer<Lcom/google/gson/GsonBuilder;>;)L1org/eclipse/lsp4j/jsonrpc/Launcher$Builder<TT;>;
 create
  ()Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
- ()Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
+ ()L1org/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
 createJsonHandler
  ()Lorg/eclipse/lsp4j/jsonrpc/json/MessageJsonHandler;
- ()Lorg/eclipse/lsp4j/jsonrpc/json/MessageJsonHandler;
+ ()L1org/eclipse/lsp4j/jsonrpc/json/MessageJsonHandler;
 createLauncher
  (Ljava/util/concurrent/ExecutorService;TT;Lorg/eclipse/lsp4j/jsonrpc/RemoteEndpoint;Lorg/eclipse/lsp4j/jsonrpc/json/ConcurrentMessageProcessor;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
- (Ljava/util/concurrent/ExecutorService;TT;Lorg/eclipse/lsp4j/jsonrpc/RemoteEndpoint;Lorg/eclipse/lsp4j/jsonrpc/json/ConcurrentMessageProcessor;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
+ (Ljava/util/concurrent/ExecutorService;TT;Lorg/eclipse/lsp4j/jsonrpc/RemoteEndpoint;Lorg/eclipse/lsp4j/jsonrpc/json/ConcurrentMessageProcessor;)L1org/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
 createMessageProcessor
  (Lorg/eclipse/lsp4j/jsonrpc/MessageProducer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;TT;)Lorg/eclipse/lsp4j/jsonrpc/json/ConcurrentMessageProcessor;
- (Lorg/eclipse/lsp4j/jsonrpc/MessageProducer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;TT;)Lorg/eclipse/lsp4j/jsonrpc/json/ConcurrentMessageProcessor;
+ (Lorg/eclipse/lsp4j/jsonrpc/MessageProducer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;TT;)L1org/eclipse/lsp4j/jsonrpc/json/ConcurrentMessageProcessor;
 createProxy
  (Lorg/eclipse/lsp4j/jsonrpc/RemoteEndpoint;)TT;
- (Lorg/eclipse/lsp4j/jsonrpc/RemoteEndpoint;)TT;
+ (Lorg/eclipse/lsp4j/jsonrpc/RemoteEndpoint;)T1T;
 createRemoteEndpoint
  (Lorg/eclipse/lsp4j/jsonrpc/json/MessageJsonHandler;)Lorg/eclipse/lsp4j/jsonrpc/RemoteEndpoint;
- (Lorg/eclipse/lsp4j/jsonrpc/json/MessageJsonHandler;)Lorg/eclipse/lsp4j/jsonrpc/RemoteEndpoint;
+ (Lorg/eclipse/lsp4j/jsonrpc/json/MessageJsonHandler;)L1org/eclipse/lsp4j/jsonrpc/RemoteEndpoint;
 getSupportedMethods
  ()Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/lsp4j/jsonrpc/json/JsonRpcMethod;>;
- ()Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/lsp4j/jsonrpc/json/JsonRpcMethod;>;
+ ()L1java/util/Map<Ljava/lang/String;Lorg/eclipse/lsp4j/jsonrpc/json/JsonRpcMethod;>;
 setClassLoader
  (Ljava/lang/ClassLoader;)Lorg/eclipse/lsp4j/jsonrpc/Launcher$Builder<TT;>;
  (Ljava/lang/ClassLoader;)L1org/eclipse/lsp4j/jsonrpc/Launcher$Builder<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/Launcher.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/Launcher.eea
index c2cc649257..2e8115c560 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/Launcher.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/Launcher.eea
@@ -4,25 +4,25 @@ class org/eclipse/lsp4j/jsonrpc/Launcher
 
 createIoLauncher
  (Ljava/util/Collection<Ljava/lang/Object;>;Ljava/util/Collection<Ljava/lang/Class<*>;>;Ljava/lang/ClassLoader;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;Ljava/util/function/Consumer<Lcom/google/gson/GsonBuilder;>;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Ljava/lang/Object;>;
- (Ljava/util/Collection<Ljava/lang/Object;>;Ljava/util/Collection<Ljava/lang/Class<*>;>;Ljava/lang/ClassLoader;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;Ljava/util/function/Consumer<Lcom/google/gson/GsonBuilder;>;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Ljava/lang/Object;>;
+ (Ljava/util/Collection<Ljava/lang/Object;>;Ljava/util/Collection<Ljava/lang/Class<*>;>;Ljava/lang/ClassLoader;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;Ljava/util/function/Consumer<Lcom/google/gson/GsonBuilder;>;)L1org/eclipse/lsp4j/jsonrpc/Launcher<Ljava/lang/Object;>;
 createIoLauncher
  <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;)L1org/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
 createIoLauncher
  <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;Ljava/util/function/Consumer<Lcom/google/gson/GsonBuilder;>;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;Ljava/util/function/Consumer<Lcom/google/gson/GsonBuilder;>;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;Ljava/util/function/Consumer<Lcom/google/gson/GsonBuilder;>;)L1org/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
 createIoLauncher
  <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;ZLjava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;Ljava/util/function/Consumer<Lcom/google/gson/GsonBuilder;>;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;ZLjava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;Ljava/util/function/Consumer<Lcom/google/gson/GsonBuilder;>;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;ZLjava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;Ljava/util/function/Consumer<Lcom/google/gson/GsonBuilder;>;)L1org/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
 createLauncher
  <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;)L1org/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
 createLauncher
  <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;)L1org/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
 createLauncher
  <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;ZLjava/io/PrintWriter;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;ZLjava/io/PrintWriter;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;ZLjava/io/PrintWriter;)L1org/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
 
 getRemoteEndpoint
  ()Lorg/eclipse/lsp4j/jsonrpc/RemoteEndpoint;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/RemoteEndpoint.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/RemoteEndpoint.eea
index 739792b661..8951260bf9 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/RemoteEndpoint.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/RemoteEndpoint.eea
@@ -15,19 +15,19 @@ consume
  (Lorg/eclipse/lsp4j/jsonrpc/messages/Message;)V
 createErrorResponseMessage
  (Lorg/eclipse/lsp4j/jsonrpc/messages/RequestMessage;Lorg/eclipse/lsp4j/jsonrpc/messages/ResponseError;)Lorg/eclipse/lsp4j/jsonrpc/messages/ResponseMessage;
- (Lorg/eclipse/lsp4j/jsonrpc/messages/RequestMessage;Lorg/eclipse/lsp4j/jsonrpc/messages/ResponseError;)Lorg/eclipse/lsp4j/jsonrpc/messages/ResponseMessage;
+ (Lorg/eclipse/lsp4j/jsonrpc/messages/RequestMessage;Lorg/eclipse/lsp4j/jsonrpc/messages/ResponseError;)L1org/eclipse/lsp4j/jsonrpc/messages/ResponseMessage;
 createNotificationMessage
  (Ljava/lang/String;Ljava/lang/Object;)Lorg/eclipse/lsp4j/jsonrpc/messages/NotificationMessage;
- (Ljava/lang/String;Ljava/lang/Object;)Lorg/eclipse/lsp4j/jsonrpc/messages/NotificationMessage;
+ (Ljava/lang/String;Ljava/lang/Object;)L1org/eclipse/lsp4j/jsonrpc/messages/NotificationMessage;
 createRequestMessage
  (Ljava/lang/String;Ljava/lang/Object;)Lorg/eclipse/lsp4j/jsonrpc/messages/RequestMessage;
- (Ljava/lang/String;Ljava/lang/Object;)Lorg/eclipse/lsp4j/jsonrpc/messages/RequestMessage;
+ (Ljava/lang/String;Ljava/lang/Object;)L1org/eclipse/lsp4j/jsonrpc/messages/RequestMessage;
 createResponseMessage
  (Lorg/eclipse/lsp4j/jsonrpc/messages/RequestMessage;)Lorg/eclipse/lsp4j/jsonrpc/messages/ResponseMessage;
- (Lorg/eclipse/lsp4j/jsonrpc/messages/RequestMessage;)Lorg/eclipse/lsp4j/jsonrpc/messages/ResponseMessage;
+ (Lorg/eclipse/lsp4j/jsonrpc/messages/RequestMessage;)L1org/eclipse/lsp4j/jsonrpc/messages/ResponseMessage;
 createResultResponseMessage
  (Lorg/eclipse/lsp4j/jsonrpc/messages/RequestMessage;Ljava/lang/Object;)Lorg/eclipse/lsp4j/jsonrpc/messages/ResponseMessage;
- (Lorg/eclipse/lsp4j/jsonrpc/messages/RequestMessage;Ljava/lang/Object;)Lorg/eclipse/lsp4j/jsonrpc/messages/ResponseMessage;
+ (Lorg/eclipse/lsp4j/jsonrpc/messages/RequestMessage;Ljava/lang/Object;)L1org/eclipse/lsp4j/jsonrpc/messages/ResponseMessage;
 getJsonHandler
  ()Lorg/eclipse/lsp4j/jsonrpc/json/MessageJsonHandler;
  ()Lorg/eclipse/lsp4j/jsonrpc/json/MessageJsonHandler;
@@ -63,10 +63,10 @@ notify
  (Ljava/lang/String;Ljava/lang/Object;)V
 request
  (Ljava/lang/String;Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Object;>;
- (Ljava/lang/String;Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Object;>;
+ (Ljava/lang/String;Ljava/lang/Object;)L1java/util/concurrent/CompletableFuture<Ljava/lang/Object;>;
 resolveMethod
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 sendCancelNotification
  (Lorg/eclipse/lsp4j/jsonrpc/messages/Either<Ljava/lang/String;Ljava/lang/Number;>;)V
  (Lorg/eclipse/lsp4j/jsonrpc/messages/Either<Ljava/lang/String;Ljava/lang/Number;>;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/DebugLauncher$Builder.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/DebugLauncher$Builder.eea
index 214002d3d5..bacb0deb27 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/DebugLauncher$Builder.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/DebugLauncher$Builder.eea
@@ -8,7 +8,7 @@ super org/eclipse/lsp4j/jsonrpc/Launcher$Builder
 
 createJsonHandler
  ()Lorg/eclipse/lsp4j/jsonrpc/json/MessageJsonHandler;
- ()Lorg/eclipse/lsp4j/jsonrpc/json/MessageJsonHandler;
+ ()L1org/eclipse/lsp4j/jsonrpc/json/MessageJsonHandler; # @Inherited(org.eclipse.lsp4j.jsonrpc.Launcher$Builder)
 createRemoteEndpoint
  (Lorg/eclipse/lsp4j/jsonrpc/json/MessageJsonHandler;)Lorg/eclipse/lsp4j/jsonrpc/RemoteEndpoint;
- (Lorg/eclipse/lsp4j/jsonrpc/json/MessageJsonHandler;)Lorg/eclipse/lsp4j/jsonrpc/RemoteEndpoint;
+ (Lorg/eclipse/lsp4j/jsonrpc/json/MessageJsonHandler;)L1org/eclipse/lsp4j/jsonrpc/RemoteEndpoint; # @Inherited(org.eclipse.lsp4j.jsonrpc.Launcher$Builder)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/DebugLauncher.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/DebugLauncher.eea
index ab04968b5d..18728b81bf 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/DebugLauncher.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/DebugLauncher.eea
@@ -2,16 +2,16 @@ class org/eclipse/lsp4j/jsonrpc/debug/DebugLauncher
 
 createIoLauncher
  <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;)L1org/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
 createIoLauncher
  <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;Ljava/util/function/Consumer<Lcom/google/gson/GsonBuilder;>;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;Ljava/util/function/Consumer<Lcom/google/gson/GsonBuilder;>;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;Ljava/util/function/Consumer<Lcom/google/gson/GsonBuilder;>;)L1org/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
 createLauncher
  <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;)L1org/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
 createLauncher
  <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;)L1org/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
 createLauncher
  <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;ZLjava/io/PrintWriter;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;ZLjava/io/PrintWriter;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Ljava/io/InputStream;Ljava/io/OutputStream;ZLjava/io/PrintWriter;)L1org/eclipse/lsp4j/jsonrpc/Launcher<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/DebugRemoteEndpoint.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/DebugRemoteEndpoint.eea
index 04129bec68..56e54a611c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/DebugRemoteEndpoint.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/DebugRemoteEndpoint.eea
@@ -8,10 +8,10 @@ class org/eclipse/lsp4j/jsonrpc/debug/DebugRemoteEndpoint
  (Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/Endpoint;Ljava/util/function/Function<Ljava/lang/Throwable;Lorg/eclipse/lsp4j/jsonrpc/messages/ResponseError;>;)V
 createNotificationMessage
  (Ljava/lang/String;Ljava/lang/Object;)Lorg/eclipse/lsp4j/jsonrpc/debug/messages/DebugNotificationMessage;
- (Ljava/lang/String;Ljava/lang/Object;)Lorg/eclipse/lsp4j/jsonrpc/debug/messages/DebugNotificationMessage;
+ (Ljava/lang/String;Ljava/lang/Object;)L1org/eclipse/lsp4j/jsonrpc/debug/messages/DebugNotificationMessage;
 createRequestMessage
  (Ljava/lang/String;Ljava/lang/Object;)Lorg/eclipse/lsp4j/jsonrpc/debug/messages/DebugRequestMessage;
- (Ljava/lang/String;Ljava/lang/Object;)Lorg/eclipse/lsp4j/jsonrpc/debug/messages/DebugRequestMessage;
+ (Ljava/lang/String;Ljava/lang/Object;)L1org/eclipse/lsp4j/jsonrpc/debug/messages/DebugRequestMessage;
 createResponseMessage
  (Lorg/eclipse/lsp4j/jsonrpc/messages/RequestMessage;)Lorg/eclipse/lsp4j/jsonrpc/debug/messages/DebugResponseMessage;
- (Lorg/eclipse/lsp4j/jsonrpc/messages/RequestMessage;)Lorg/eclipse/lsp4j/jsonrpc/debug/messages/DebugResponseMessage;
+ (Lorg/eclipse/lsp4j/jsonrpc/messages/RequestMessage;)L1org/eclipse/lsp4j/jsonrpc/debug/messages/DebugResponseMessage;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/adapters/DebugEnumTypeAdapter$Factory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/adapters/DebugEnumTypeAdapter$Factory.eea
index 9593f91dbe..71527ceeb5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/adapters/DebugEnumTypeAdapter$Factory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/adapters/DebugEnumTypeAdapter$Factory.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/jsonrpc/debug/adapters/DebugEnumTypeAdapter$Factory
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L0com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/adapters/DebugEnumTypeAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/adapters/DebugEnumTypeAdapter.eea
index 7fcdacbc3c..ddc0a09d51 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/adapters/DebugEnumTypeAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/adapters/DebugEnumTypeAdapter.eea
@@ -11,7 +11,7 @@ super com/google/gson/TypeAdapter
  (Ljava/lang/Class<TT;>;)V
 read
  (Lcom/google/gson/stream/JsonReader;)TT;
- (Lcom/google/gson/stream/JsonReader;)TT;
+ (Lcom/google/gson/stream/JsonReader;)T0T;
 write
  (Lcom/google/gson/stream/JsonWriter;TT;)V
  (Lcom/google/gson/stream/JsonWriter;TT;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/adapters/DebugMessageTypeAdapter$Factory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/adapters/DebugMessageTypeAdapter$Factory.eea
index c6643f7034..ea4fb42fbb 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/adapters/DebugMessageTypeAdapter$Factory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/adapters/DebugMessageTypeAdapter$Factory.eea
@@ -5,4 +5,4 @@ class org/eclipse/lsp4j/jsonrpc/debug/adapters/DebugMessageTypeAdapter$Factory
  (Lorg/eclipse/lsp4j/jsonrpc/json/MessageJsonHandler;)V
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L0com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/adapters/DebugMessageTypeAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/adapters/DebugMessageTypeAdapter.eea
index f751ca2baf..abfa196b36 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/adapters/DebugMessageTypeAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/adapters/DebugMessageTypeAdapter.eea
@@ -8,10 +8,10 @@ parseBody
  (Lcom/google/gson/stream/JsonReader;Ljava/lang/String;ILjava/lang/String;Ljava/lang/Boolean;)Ljava/lang/Object;
 parseBody
  (Ljava/lang/Object;Ljava/lang/String;ILjava/lang/String;Ljava/lang/Boolean;)Ljava/lang/Object;
- (Ljava/lang/Object;Ljava/lang/String;ILjava/lang/String;Ljava/lang/Boolean;)Ljava/lang/Object;
+ (Ljava/lang/Object;Ljava/lang/String;ILjava/lang/String;Ljava/lang/Boolean;)L0java/lang/Object;
 read
  (Lcom/google/gson/stream/JsonReader;)Lorg/eclipse/lsp4j/jsonrpc/messages/Message;
- (Lcom/google/gson/stream/JsonReader;)Lorg/eclipse/lsp4j/jsonrpc/messages/Message;
+ (Lcom/google/gson/stream/JsonReader;)L0org/eclipse/lsp4j/jsonrpc/messages/Message; # @Inherited(org.eclipse.lsp4j.jsonrpc.json.adapters.MessageTypeAdapter)
 write
  (Lcom/google/gson/stream/JsonWriter;Lorg/eclipse/lsp4j/jsonrpc/messages/Message;)V
  (Lcom/google/gson/stream/JsonWriter;Lorg/eclipse/lsp4j/jsonrpc/messages/Message;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/messages/DebugNotificationMessage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/messages/DebugNotificationMessage.eea
index f7229a45a2..318c77efd9 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/messages/DebugNotificationMessage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/messages/DebugNotificationMessage.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(org.eclipse.lsp4j.jsonrpc.messages.NotificationMessage)
 getId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getRawId
  ()Lorg/eclipse/lsp4j/jsonrpc/messages/Either<Ljava/lang/String;Ljava/lang/Number;>;
  ()Lorg/eclipse/lsp4j/jsonrpc/messages/Either<Ljava/lang/String;Ljava/lang/Number;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/messages/DebugResponseMessage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/messages/DebugResponseMessage.eea
index 4c4ed45391..e7fe06c8a4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/messages/DebugResponseMessage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/debug/messages/DebugResponseMessage.eea
@@ -11,7 +11,7 @@ getRawResponseId
  ()Lorg/eclipse/lsp4j/jsonrpc/messages/Either<Ljava/lang/String;Ljava/lang/Number;>;
 getResponseId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 setMethod
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/ConcurrentMessageProcessor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/ConcurrentMessageProcessor.eea
index f7a222469b..0cc5c39af4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/ConcurrentMessageProcessor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/ConcurrentMessageProcessor.eea
@@ -5,7 +5,7 @@ startProcessing
  (Lorg/eclipse/lsp4j/jsonrpc/MessageProducer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Ljava/util/concurrent/ExecutorService;)Ljava/util/concurrent/Future<Ljava/lang/Void;>;
 wrapFuture
  (Ljava/util/concurrent/Future<*>;Lorg/eclipse/lsp4j/jsonrpc/MessageProducer;)Ljava/util/concurrent/Future<Ljava/lang/Void;>;
- (Ljava/util/concurrent/Future<*>;Lorg/eclipse/lsp4j/jsonrpc/MessageProducer;)Ljava/util/concurrent/Future<Ljava/lang/Void;>;
+ (Ljava/util/concurrent/Future<*>;Lorg/eclipse/lsp4j/jsonrpc/MessageProducer;)L1java/util/concurrent/Future<Ljava/lang/Void;>;
 
 <init>
  (Lorg/eclipse/lsp4j/jsonrpc/MessageProducer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/MessageJsonHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/MessageJsonHandler.eea
index 26c9c0da2d..d594654744 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/MessageJsonHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/MessageJsonHandler.eea
@@ -16,7 +16,7 @@ toString
  (Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/lsp4j/jsonrpc/json/JsonRpcMethod;>;Ljava/util/function/Consumer<Lcom/google/gson/GsonBuilder;>;)V
 format
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
 getDefaultGsonBuilder
  ()Lcom/google/gson/GsonBuilder;
  ()Lcom/google/gson/GsonBuilder;
@@ -25,7 +25,7 @@ getGson
  ()Lcom/google/gson/Gson;
 getJsonRpcMethod
  (Ljava/lang/String;)Lorg/eclipse/lsp4j/jsonrpc/json/JsonRpcMethod;
- (Ljava/lang/String;)Lorg/eclipse/lsp4j/jsonrpc/json/JsonRpcMethod;
+ (Ljava/lang/String;)L0org/eclipse/lsp4j/jsonrpc/json/JsonRpcMethod;
 getMethodProvider
  ()Lorg/eclipse/lsp4j/jsonrpc/json/MethodProvider;
  ()Lorg/eclipse/lsp4j/jsonrpc/json/MethodProvider;
@@ -37,7 +37,7 @@ parseMessage
  (Ljava/lang/CharSequence;)Lorg/eclipse/lsp4j/jsonrpc/messages/Message;
 serialize
  (Lorg/eclipse/lsp4j/jsonrpc/messages/Message;)Ljava/lang/String;
- (Lorg/eclipse/lsp4j/jsonrpc/messages/Message;)Ljava/lang/String;
+ (Lorg/eclipse/lsp4j/jsonrpc/messages/Message;)L1java/lang/String;
 serialize
  (Lorg/eclipse/lsp4j/jsonrpc/messages/Message;Ljava/io/Writer;)V
  (Lorg/eclipse/lsp4j/jsonrpc/messages/Message;Ljava/io/Writer;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/StreamMessageConsumer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/StreamMessageConsumer.eea
index bdde976650..05d165cf60 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/StreamMessageConsumer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/StreamMessageConsumer.eea
@@ -11,13 +11,13 @@ class org/eclipse/lsp4j/jsonrpc/json/StreamMessageConsumer
  (Lorg/eclipse/lsp4j/jsonrpc/json/MessageJsonHandler;)V
 appendHeader
  (Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/StringBuilder;
- (Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/StringBuilder;
+ (Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/Object;)L1java/lang/StringBuilder;
 consume
  (Lorg/eclipse/lsp4j/jsonrpc/messages/Message;)V
  (Lorg/eclipse/lsp4j/jsonrpc/messages/Message;)V
 getHeader
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 getOutput
  ()Ljava/io/OutputStream;
  ()Ljava/io/OutputStream;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/CollectionTypeAdapter$Factory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/CollectionTypeAdapter$Factory.eea
index 080b788b42..6ac91b4ad6 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/CollectionTypeAdapter$Factory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/CollectionTypeAdapter$Factory.eea
@@ -2,10 +2,10 @@ class org/eclipse/lsp4j/jsonrpc/json/adapters/CollectionTypeAdapter$Factory
 
 create
  (Lcom/google/gson/Gson;Ljava/lang/reflect/Type;Lcom/google/gson/TypeAdapter<*>;Ljava/util/function/Supplier<Ljava/util/Collection<Ljava/lang/Object;>;>;)Lcom/google/gson/TypeAdapter<*>;
- (Lcom/google/gson/Gson;Ljava/lang/reflect/Type;Lcom/google/gson/TypeAdapter<*>;Ljava/util/function/Supplier<Ljava/util/Collection<Ljava/lang/Object;>;>;)Lcom/google/gson/TypeAdapter<*>;
+ (Lcom/google/gson/Gson;Ljava/lang/reflect/Type;Lcom/google/gson/TypeAdapter<*>;Ljava/util/function/Supplier<Ljava/util/Collection<Ljava/lang/Object;>;>;)L1com/google/gson/TypeAdapter<*>;
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L0com/google/gson/TypeAdapter<TT;>;
 getConstructor
  <E:Ljava/lang/Object;>(Ljava/lang/Class<+Ljava/util/Collection<TE;>;>;)Ljava/util/function/Supplier<Ljava/util/Collection<TE;>;>;
  <E:Ljava/lang/Object;>(Ljava/lang/Class<+Ljava/util/Collection<TE;>;>;)Ljava/util/function/Supplier<Ljava/util/Collection<TE;>;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/CollectionTypeAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/CollectionTypeAdapter.eea
index 6866691c74..66ae0dd2be 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/CollectionTypeAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/CollectionTypeAdapter.eea
@@ -11,7 +11,7 @@ super com/google/gson/TypeAdapter
  (Lcom/google/gson/Gson;Ljava/lang/reflect/Type;Lcom/google/gson/TypeAdapter<TE;>;Ljava/util/function/Supplier<Ljava/util/Collection<TE;>;>;)V
 read
  (Lcom/google/gson/stream/JsonReader;)Ljava/util/Collection<TE;>;
- (Lcom/google/gson/stream/JsonReader;)Ljava/util/Collection<TE;>;
+ (Lcom/google/gson/stream/JsonReader;)L0java/util/Collection<TE;>;
 write
  (Lcom/google/gson/stream/JsonWriter;Ljava/util/Collection<TE;>;)V
  (Lcom/google/gson/stream/JsonWriter;Ljava/util/Collection<TE;>;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/EitherTypeAdapter$Factory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/EitherTypeAdapter$Factory.eea
index 14a87a14c2..d21821635a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/EitherTypeAdapter$Factory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/EitherTypeAdapter$Factory.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/jsonrpc/json/adapters/EitherTypeAdapter$Factory
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L0com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/EitherTypeAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/EitherTypeAdapter.eea
index e989590acc..b70e722e4e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/EitherTypeAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/EitherTypeAdapter.eea
@@ -33,16 +33,16 @@ typeToken
  (Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<+Lorg/eclipse/lsp4j/jsonrpc/messages/Either<TL;TR;>;>;Ljava/util/function/Predicate<Lcom/google/gson/JsonElement;>;Ljava/util/function/Predicate<Lcom/google/gson/JsonElement;>;Lcom/google/gson/TypeAdapter<TL;>;Lcom/google/gson/TypeAdapter<TR;>;)V
 create
  (Lcom/google/gson/stream/JsonToken;Lcom/google/gson/stream/JsonReader;)Lorg/eclipse/lsp4j/jsonrpc/messages/Either<TL;TR;>;
- (Lcom/google/gson/stream/JsonToken;Lcom/google/gson/stream/JsonReader;)Lorg/eclipse/lsp4j/jsonrpc/messages/Either<TL;TR;>;
+ (Lcom/google/gson/stream/JsonToken;Lcom/google/gson/stream/JsonReader;)L1org/eclipse/lsp4j/jsonrpc/messages/Either<TL;TR;>;
 createLeft
  (TL;)Lorg/eclipse/lsp4j/jsonrpc/messages/Either<TL;TR;>;
- (TL;)Lorg/eclipse/lsp4j/jsonrpc/messages/Either<TL;TR;>;
+ (TL;)L1org/eclipse/lsp4j/jsonrpc/messages/Either<TL;TR;>;
 createRight
  (TR;)Lorg/eclipse/lsp4j/jsonrpc/messages/Either<TL;TR;>;
- (TR;)Lorg/eclipse/lsp4j/jsonrpc/messages/Either<TL;TR;>;
+ (TR;)L1org/eclipse/lsp4j/jsonrpc/messages/Either<TL;TR;>;
 read
  (Lcom/google/gson/stream/JsonReader;)Lorg/eclipse/lsp4j/jsonrpc/messages/Either<TL;TR;>;
- (Lcom/google/gson/stream/JsonReader;)Lorg/eclipse/lsp4j/jsonrpc/messages/Either<TL;TR;>;
+ (Lcom/google/gson/stream/JsonReader;)L0org/eclipse/lsp4j/jsonrpc/messages/Either<TL;TR;>;
 write
  (Lcom/google/gson/stream/JsonWriter;Lorg/eclipse/lsp4j/jsonrpc/messages/Either<TL;TR;>;)V
  (Lcom/google/gson/stream/JsonWriter;Lorg/eclipse/lsp4j/jsonrpc/messages/Either<TL;TR;>;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/EnumTypeAdapter$Factory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/EnumTypeAdapter$Factory.eea
index 01ad98c421..2f47a4440d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/EnumTypeAdapter$Factory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/EnumTypeAdapter$Factory.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/jsonrpc/json/adapters/EnumTypeAdapter$Factory
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L0com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/EnumTypeAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/EnumTypeAdapter.eea
index 3fed152296..2c044a6884 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/EnumTypeAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/EnumTypeAdapter.eea
@@ -8,7 +8,7 @@ super com/google/gson/TypeAdapter
 
 read
  (Lcom/google/gson/stream/JsonReader;)TT;
- (Lcom/google/gson/stream/JsonReader;)TT;
+ (Lcom/google/gson/stream/JsonReader;)T0T;
 write
  (Lcom/google/gson/stream/JsonWriter;TT;)V
  (Lcom/google/gson/stream/JsonWriter;TT;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/JsonElementTypeAdapter$Factory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/JsonElementTypeAdapter$Factory.eea
index 30743ff7d8..e40105b60e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/JsonElementTypeAdapter$Factory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/JsonElementTypeAdapter$Factory.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/jsonrpc/json/adapters/JsonElementTypeAdapter$Factory
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L1com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/MessageTypeAdapter$Factory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/MessageTypeAdapter$Factory.eea
index 17ade4ce0d..8695247068 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/MessageTypeAdapter$Factory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/MessageTypeAdapter$Factory.eea
@@ -5,4 +5,4 @@ class org/eclipse/lsp4j/jsonrpc/json/adapters/MessageTypeAdapter$Factory
  (Lorg/eclipse/lsp4j/jsonrpc/json/MessageJsonHandler;)V
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L0com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/MessageTypeAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/MessageTypeAdapter.eea
index 7940a1f216..a26789a669 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/MessageTypeAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/MessageTypeAdapter.eea
@@ -9,10 +9,10 @@ super com/google/gson/TypeAdapter
  (Lorg/eclipse/lsp4j/jsonrpc/json/MessageJsonHandler;Lcom/google/gson/Gson;)V
 createMessage
  (Ljava/lang/String;Lorg/eclipse/lsp4j/jsonrpc/messages/Either<Ljava/lang/String;Ljava/lang/Number;>;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lorg/eclipse/lsp4j/jsonrpc/messages/ResponseError;)Lorg/eclipse/lsp4j/jsonrpc/messages/Message;
- (Ljava/lang/String;Lorg/eclipse/lsp4j/jsonrpc/messages/Either<Ljava/lang/String;Ljava/lang/Number;>;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lorg/eclipse/lsp4j/jsonrpc/messages/ResponseError;)Lorg/eclipse/lsp4j/jsonrpc/messages/Message;
+ (Ljava/lang/String;Lorg/eclipse/lsp4j/jsonrpc/messages/Either<Ljava/lang/String;Ljava/lang/Number;>;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lorg/eclipse/lsp4j/jsonrpc/messages/ResponseError;)L1org/eclipse/lsp4j/jsonrpc/messages/Message;
 fromJson
  (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;)Ljava/lang/Object;
- (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;)Ljava/lang/Object;
+ (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;)L0java/lang/Object;
 fromJson
  (Lcom/google/gson/stream/JsonReader;Ljava/lang/reflect/Type;)Ljava/lang/Object;
  (Lcom/google/gson/stream/JsonReader;Ljava/lang/reflect/Type;)Ljava/lang/Object;
@@ -30,10 +30,10 @@ isNullOrVoidType
  (Ljava/lang/reflect/Type;)Z
 parseParams
  (Lcom/google/gson/stream/JsonReader;Ljava/lang/String;)Ljava/lang/Object;
- (Lcom/google/gson/stream/JsonReader;Ljava/lang/String;)Ljava/lang/Object;
+ (Lcom/google/gson/stream/JsonReader;Ljava/lang/String;)L0java/lang/Object;
 parseParams
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/Object;Ljava/lang/String;)L0java/lang/Object;
 parseResult
  (Lcom/google/gson/stream/JsonReader;Ljava/lang/String;)Ljava/lang/Object;
  (Lcom/google/gson/stream/JsonReader;Ljava/lang/String;)Ljava/lang/Object;
@@ -42,7 +42,7 @@ parseResult
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 read
  (Lcom/google/gson/stream/JsonReader;)Lorg/eclipse/lsp4j/jsonrpc/messages/Message;
- (Lcom/google/gson/stream/JsonReader;)Lorg/eclipse/lsp4j/jsonrpc/messages/Message;
+ (Lcom/google/gson/stream/JsonReader;)L0org/eclipse/lsp4j/jsonrpc/messages/Message;
 write
  (Lcom/google/gson/stream/JsonWriter;Lorg/eclipse/lsp4j/jsonrpc/messages/Message;)V
  (Lcom/google/gson/stream/JsonWriter;Lorg/eclipse/lsp4j/jsonrpc/messages/Message;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/ThrowableTypeAdapter$Factory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/ThrowableTypeAdapter$Factory.eea
index 50538ecc9a..ca7c14a18c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/ThrowableTypeAdapter$Factory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/ThrowableTypeAdapter$Factory.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/jsonrpc/json/adapters/ThrowableTypeAdapter$Factory
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L0com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/ThrowableTypeAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/ThrowableTypeAdapter.eea
index 29d9b046d4..ad961c06dd 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/ThrowableTypeAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/ThrowableTypeAdapter.eea
@@ -9,7 +9,7 @@ super com/google/gson/TypeAdapter
  (Lcom/google/gson/reflect/TypeToken<Ljava/lang/Throwable;>;)V
 read
  (Lcom/google/gson/stream/JsonReader;)Ljava/lang/Throwable;
- (Lcom/google/gson/stream/JsonReader;)Ljava/lang/Throwable;
+ (Lcom/google/gson/stream/JsonReader;)L0java/lang/Throwable;
 write
  (Lcom/google/gson/stream/JsonWriter;Ljava/lang/Throwable;)V
  (Lcom/google/gson/stream/JsonWriter;Ljava/lang/Throwable;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/TupleTypeAdapters$TwoTypeAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/TupleTypeAdapters$TwoTypeAdapter.eea
index 1fea0bb6f2..4905bfe887 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/TupleTypeAdapters$TwoTypeAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/TupleTypeAdapters$TwoTypeAdapter.eea
@@ -18,7 +18,7 @@ second
  (Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<Lorg/eclipse/lsp4j/jsonrpc/messages/Tuple$Two<TF;TS;>;>;)V
 read
  (Lcom/google/gson/stream/JsonReader;)Lorg/eclipse/lsp4j/jsonrpc/messages/Tuple$Two<TF;TS;>;
- (Lcom/google/gson/stream/JsonReader;)Lorg/eclipse/lsp4j/jsonrpc/messages/Tuple$Two<TF;TS;>;
+ (Lcom/google/gson/stream/JsonReader;)L0org/eclipse/lsp4j/jsonrpc/messages/Tuple$Two<TF;TS;>;
 write
  (Lcom/google/gson/stream/JsonWriter;Lorg/eclipse/lsp4j/jsonrpc/messages/Tuple$Two<TF;TS;>;)V
  (Lcom/google/gson/stream/JsonWriter;Lorg/eclipse/lsp4j/jsonrpc/messages/Tuple$Two<TF;TS;>;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/TupleTypeAdapters$TwoTypeAdapterFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/TupleTypeAdapters$TwoTypeAdapterFactory.eea
index bde8dfe83e..38690257cb 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/TupleTypeAdapters$TwoTypeAdapterFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/TupleTypeAdapters$TwoTypeAdapterFactory.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/jsonrpc/json/adapters/TupleTypeAdapters$TwoTypeAdapterFa
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)Lcom/google/gson/TypeAdapter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken<TT;>;)L0com/google/gson/TypeAdapter<TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/TypeUtils.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/TypeUtils.eea
index c34f10ed96..65e554ba0f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/TypeUtils.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/json/adapters/TypeUtils.eea
@@ -5,7 +5,7 @@ getElementTypes
  (Lcom/google/gson/reflect/TypeToken<*>;Ljava/lang/Class<*>;)[Ljava/lang/reflect/Type;
 getExpectedTypes
  (Ljava/lang/reflect/Type;)Ljava/util/Collection<Ljava/lang/reflect/Type;>;
- (Ljava/lang/reflect/Type;)Ljava/util/Collection<Ljava/lang/reflect/Type;>;
+ (Ljava/lang/reflect/Type;)L1java/util/Collection<Ljava/lang/reflect/Type;>;
 isEither
  (Ljava/lang/reflect/Type;)Z
  (Ljava/lang/reflect/Type;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/CancelParams.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/CancelParams.eea
index 62a43b11fd..5c2b8b7d28 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/CancelParams.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/CancelParams.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getRawId
  ()Lorg/eclipse/lsp4j/jsonrpc/messages/Either<Ljava/lang/String;Ljava/lang/Number;>;
  ()Lorg/eclipse/lsp4j/jsonrpc/messages/Either<Ljava/lang/String;Ljava/lang/Number;>;
@@ -20,4 +20,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toStringFallback
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/Either.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/Either.eea
index 1c3087ec62..5b89571d11 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/Either.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/Either.eea
@@ -13,19 +13,19 @@ collectDisjoinTypes
  (Ljava/lang/reflect/Type;Ljava/util/Collection<Ljava/lang/reflect/Type;>;)Ljava/util/Collection<Ljava/lang/reflect/Type;>;
 forLeft
  <L:Ljava/lang/Object;R:Ljava/lang/Object;>(TL;)Lorg/eclipse/lsp4j/jsonrpc/messages/Either<TL;TR;>;
- <L:Ljava/lang/Object;R:Ljava/lang/Object;>(TL;)Lorg/eclipse/lsp4j/jsonrpc/messages/Either<TL;TR;>;
+ <L:Ljava/lang/Object;R:Ljava/lang/Object;>(TL;)L1org/eclipse/lsp4j/jsonrpc/messages/Either<TL;TR;>;
 forRight
  <L:Ljava/lang/Object;R:Ljava/lang/Object;>(TR;)Lorg/eclipse/lsp4j/jsonrpc/messages/Either<TL;TR;>;
- <L:Ljava/lang/Object;R:Ljava/lang/Object;>(TR;)Lorg/eclipse/lsp4j/jsonrpc/messages/Either<TL;TR;>;
+ <L:Ljava/lang/Object;R:Ljava/lang/Object;>(TR;)L1org/eclipse/lsp4j/jsonrpc/messages/Either<TL;TR;>;
 getAllDisjoinTypes
  (Ljava/lang/reflect/Type;)Ljava/util/Collection<Ljava/lang/reflect/Type;>;
  (Ljava/lang/reflect/Type;)Ljava/util/Collection<Ljava/lang/reflect/Type;>;
 getLeftDisjointType
  (Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
- (Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
+ (Ljava/lang/reflect/Type;)L0java/lang/reflect/Type;
 getRightDisjointType
  (Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
- (Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
+ (Ljava/lang/reflect/Type;)L0java/lang/reflect/Type;
 isEither
  (Ljava/lang/Class<*>;)Z
  (Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/Either3.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/Either3.eea
index 7be8a7244f..fb00302b2d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/Either3.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/Either3.eea
@@ -8,19 +8,19 @@ super org/eclipse/lsp4j/jsonrpc/messages/Either
 
 forFirst
  <T1:Ljava/lang/Object;T2:Ljava/lang/Object;T3:Ljava/lang/Object;>(TT1;)Lorg/eclipse/lsp4j/jsonrpc/messages/Either3<TT1;TT2;TT3;>;
- <T1:Ljava/lang/Object;T2:Ljava/lang/Object;T3:Ljava/lang/Object;>(TT1;)Lorg/eclipse/lsp4j/jsonrpc/messages/Either3<TT1;TT2;TT3;>;
+ <T1:Ljava/lang/Object;T2:Ljava/lang/Object;T3:Ljava/lang/Object;>(TT1;)L1org/eclipse/lsp4j/jsonrpc/messages/Either3<TT1;TT2;TT3;>;
 forLeft3
  <T1:Ljava/lang/Object;T2:Ljava/lang/Object;T3:Ljava/lang/Object;>(TT1;)Lorg/eclipse/lsp4j/jsonrpc/messages/Either3<TT1;TT2;TT3;>;
- <T1:Ljava/lang/Object;T2:Ljava/lang/Object;T3:Ljava/lang/Object;>(TT1;)Lorg/eclipse/lsp4j/jsonrpc/messages/Either3<TT1;TT2;TT3;>;
+ <T1:Ljava/lang/Object;T2:Ljava/lang/Object;T3:Ljava/lang/Object;>(TT1;)L1org/eclipse/lsp4j/jsonrpc/messages/Either3<TT1;TT2;TT3;>;
 forRight3
  <T1:Ljava/lang/Object;T2:Ljava/lang/Object;T3:Ljava/lang/Object;>(Lorg/eclipse/lsp4j/jsonrpc/messages/Either<TT2;TT3;>;)Lorg/eclipse/lsp4j/jsonrpc/messages/Either3<TT1;TT2;TT3;>;
- <T1:Ljava/lang/Object;T2:Ljava/lang/Object;T3:Ljava/lang/Object;>(Lorg/eclipse/lsp4j/jsonrpc/messages/Either<TT2;TT3;>;)Lorg/eclipse/lsp4j/jsonrpc/messages/Either3<TT1;TT2;TT3;>;
+ <T1:Ljava/lang/Object;T2:Ljava/lang/Object;T3:Ljava/lang/Object;>(Lorg/eclipse/lsp4j/jsonrpc/messages/Either<TT2;TT3;>;)L1org/eclipse/lsp4j/jsonrpc/messages/Either3<TT1;TT2;TT3;>;
 forSecond
  <T1:Ljava/lang/Object;T2:Ljava/lang/Object;T3:Ljava/lang/Object;>(TT2;)Lorg/eclipse/lsp4j/jsonrpc/messages/Either3<TT1;TT2;TT3;>;
- <T1:Ljava/lang/Object;T2:Ljava/lang/Object;T3:Ljava/lang/Object;>(TT2;)Lorg/eclipse/lsp4j/jsonrpc/messages/Either3<TT1;TT2;TT3;>;
+ <T1:Ljava/lang/Object;T2:Ljava/lang/Object;T3:Ljava/lang/Object;>(TT2;)L1org/eclipse/lsp4j/jsonrpc/messages/Either3<TT1;TT2;TT3;>;
 forThird
  <T1:Ljava/lang/Object;T2:Ljava/lang/Object;T3:Ljava/lang/Object;>(TT3;)Lorg/eclipse/lsp4j/jsonrpc/messages/Either3<TT1;TT2;TT3;>;
- <T1:Ljava/lang/Object;T2:Ljava/lang/Object;T3:Ljava/lang/Object;>(TT3;)Lorg/eclipse/lsp4j/jsonrpc/messages/Either3<TT1;TT2;TT3;>;
+ <T1:Ljava/lang/Object;T2:Ljava/lang/Object;T3:Ljava/lang/Object;>(TT3;)L1org/eclipse/lsp4j/jsonrpc/messages/Either3<TT1;TT2;TT3;>;
 
 <init>
  (TT1;Lorg/eclipse/lsp4j/jsonrpc/messages/Either<TT2;TT3;>;)V
@@ -33,13 +33,13 @@ getFirst
  ()TT1;
 getSecond
  ()TT2;
- ()TT2;
+ ()T0T2;
 getThird
  ()TT3;
- ()TT3;
+ ()T0T3;
 map
  <T:Ljava/lang/Object;>(Ljava/util/function/Function<-TT1;+TT;>;Ljava/util/function/Function<-TT2;+TT;>;Ljava/util/function/Function<-TT3;+TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/util/function/Function<-TT1;+TT;>;Ljava/util/function/Function<-TT2;+TT;>;Ljava/util/function/Function<-TT3;+TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/util/function/Function<-TT1;+TT;>;Ljava/util/function/Function<-TT2;+TT;>;Ljava/util/function/Function<-TT3;+TT;>;)T0T;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(org.eclipse.lsp4j.jsonrpc.messages.Either)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/IdentifiableMessage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/IdentifiableMessage.eea
index 11febdafbf..4597008169 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/IdentifiableMessage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/IdentifiableMessage.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(org.eclipse.lsp4j.jsonrpc.messages.Message)
 getId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getRawId
  ()Lorg/eclipse/lsp4j/jsonrpc/messages/Either<Ljava/lang/String;Ljava/lang/Number;>;
  ()Lorg/eclipse/lsp4j/jsonrpc/messages/Either<Ljava/lang/String;Ljava/lang/Number;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/Message.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/Message.eea
index 8ea24c14fe..e057bef6b2 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/Message.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/Message.eea
@@ -20,4 +20,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toStringFallback
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/ResponseError.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/ResponseError.eea
index 7db90c3ca9..eb547afe21 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/ResponseError.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/ResponseError.eea
@@ -29,4 +29,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toStringFallback
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/Tuple.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/Tuple.eea
index 5f403bf714..dceeaa5042 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/Tuple.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/messages/Tuple.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/jsonrpc/messages/Tuple
 
 two
  <F:Ljava/lang/Object;S:Ljava/lang/Object;>(TF;TS;)Lorg/eclipse/lsp4j/jsonrpc/messages/Tuple$Two<TF;TS;>;
- <F:Ljava/lang/Object;S:Ljava/lang/Object;>(TF;TS;)Lorg/eclipse/lsp4j/jsonrpc/messages/Tuple$Two<TF;TS;>;
+ <F:Ljava/lang/Object;S:Ljava/lang/Object;>(TF;TS;)L1org/eclipse/lsp4j/jsonrpc/messages/Tuple$Two<TF;TS;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/services/AnnotationUtil.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/services/AnnotationUtil.eea
index dfe7225229..150195f671 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/services/AnnotationUtil.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/services/AnnotationUtil.eea
@@ -2,16 +2,16 @@ class org/eclipse/lsp4j/jsonrpc/services/AnnotationUtil
 
 createMethodInfo
  (Ljava/lang/reflect/Method;Ljava/lang/String;)Lorg/eclipse/lsp4j/jsonrpc/services/AnnotationUtil$MethodInfo;
- (Ljava/lang/reflect/Method;Ljava/lang/String;)Lorg/eclipse/lsp4j/jsonrpc/services/AnnotationUtil$MethodInfo;
+ (Ljava/lang/reflect/Method;Ljava/lang/String;)L0org/eclipse/lsp4j/jsonrpc/services/AnnotationUtil$MethodInfo;
 createMethodInfo
  (Ljava/lang/reflect/Method;ZLjava/lang/String;Ljava/lang/String;)Lorg/eclipse/lsp4j/jsonrpc/services/AnnotationUtil$MethodInfo;
- (Ljava/lang/reflect/Method;ZLjava/lang/String;Ljava/lang/String;)Lorg/eclipse/lsp4j/jsonrpc/services/AnnotationUtil$MethodInfo;
+ (Ljava/lang/reflect/Method;ZLjava/lang/String;Ljava/lang/String;)L1org/eclipse/lsp4j/jsonrpc/services/AnnotationUtil$MethodInfo;
 createNotificationInfo
  (Ljava/lang/reflect/Method;Ljava/lang/String;Lorg/eclipse/lsp4j/jsonrpc/services/JsonNotification;)Lorg/eclipse/lsp4j/jsonrpc/services/AnnotationUtil$MethodInfo;
- (Ljava/lang/reflect/Method;Ljava/lang/String;Lorg/eclipse/lsp4j/jsonrpc/services/JsonNotification;)Lorg/eclipse/lsp4j/jsonrpc/services/AnnotationUtil$MethodInfo;
+ (Ljava/lang/reflect/Method;Ljava/lang/String;Lorg/eclipse/lsp4j/jsonrpc/services/JsonNotification;)L1org/eclipse/lsp4j/jsonrpc/services/AnnotationUtil$MethodInfo;
 createRequestInfo
  (Ljava/lang/reflect/Method;Ljava/lang/String;Lorg/eclipse/lsp4j/jsonrpc/services/JsonRequest;)Lorg/eclipse/lsp4j/jsonrpc/services/AnnotationUtil$MethodInfo;
- (Ljava/lang/reflect/Method;Ljava/lang/String;Lorg/eclipse/lsp4j/jsonrpc/services/JsonRequest;)Lorg/eclipse/lsp4j/jsonrpc/services/AnnotationUtil$MethodInfo;
+ (Ljava/lang/reflect/Method;Ljava/lang/String;Lorg/eclipse/lsp4j/jsonrpc/services/JsonRequest;)L1org/eclipse/lsp4j/jsonrpc/services/AnnotationUtil$MethodInfo;
 findDelegateSegments
  (Ljava/lang/Class<*>;Ljava/util/Set<Ljava/lang/Class<*>;>;Ljava/util/function/Consumer<Ljava/lang/reflect/Method;>;)V
  (Ljava/lang/Class<*>;Ljava/util/Set<Ljava/lang/Class<*>;>;Ljava/util/function/Consumer<Ljava/lang/reflect/Method;>;)V
@@ -26,7 +26,7 @@ getParameterTypes
  (Ljava/lang/reflect/Method;)[Ljava/lang/reflect/Type;
 getSegment
  (Ljava/lang/Class<*>;)Ljava/lang/String;
- (Ljava/lang/Class<*>;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;)L1java/lang/String;
 isDelegateMethod
  (Ljava/lang/reflect/Method;)Z
  (Ljava/lang/reflect/Method;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/services/EndpointProxy.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/services/EndpointProxy.eea
index cb0444cd18..589209d4f3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/services/EndpointProxy.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/services/EndpointProxy.eea
@@ -8,7 +8,7 @@ class org/eclipse/lsp4j/jsonrpc/services/EndpointProxy
  (Lorg/eclipse/lsp4j/jsonrpc/Endpoint;Ljava/util/Collection<Ljava/lang/Class<*>;>;)V
 getParams
  ([Ljava/lang/Object;Lorg/eclipse/lsp4j/jsonrpc/services/AnnotationUtil$MethodInfo;)Ljava/lang/Object;
- ([Ljava/lang/Object;Lorg/eclipse/lsp4j/jsonrpc/services/AnnotationUtil$MethodInfo;)Ljava/lang/Object;
+ ([Ljava/lang/Object;Lorg/eclipse/lsp4j/jsonrpc/services/AnnotationUtil$MethodInfo;)L0java/lang/Object;
 invoke
  (Ljava/lang/Object;Ljava/lang/reflect/Method;[Ljava/lang/Object;)Ljava/lang/Object;
  (L1java/lang/Object;L1java/lang/reflect/Method;[0L0java/lang/Object;)L0java/lang/Object; # @Inherited(java.lang.reflect.InvocationHandler)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/services/ServiceEndpoints.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/services/ServiceEndpoints.eea
index b68d4eef03..5ef702d237 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/services/ServiceEndpoints.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/services/ServiceEndpoints.eea
@@ -5,10 +5,10 @@ getSupportedMethods
  (Ljava/lang/Class<*>;)Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/lsp4j/jsonrpc/json/JsonRpcMethod;>;
 toEndpoint
  (Ljava/lang/Object;)Lorg/eclipse/lsp4j/jsonrpc/Endpoint;
- (Ljava/lang/Object;)Lorg/eclipse/lsp4j/jsonrpc/Endpoint;
+ (Ljava/lang/Object;)L1org/eclipse/lsp4j/jsonrpc/Endpoint;
 toEndpoint
  (Ljava/util/Collection<Ljava/lang/Object;>;)Lorg/eclipse/lsp4j/jsonrpc/Endpoint;
- (Ljava/util/Collection<Ljava/lang/Object;>;)Lorg/eclipse/lsp4j/jsonrpc/Endpoint;
+ (Ljava/util/Collection<Ljava/lang/Object;>;)L1org/eclipse/lsp4j/jsonrpc/Endpoint;
 toServiceObject
  (Lorg/eclipse/lsp4j/jsonrpc/Endpoint;Ljava/util/Collection<Ljava/lang/Class<*>;>;Ljava/lang/ClassLoader;)Ljava/lang/Object;
  (Lorg/eclipse/lsp4j/jsonrpc/Endpoint;Ljava/util/Collection<Ljava/lang/Class<*>;>;Ljava/lang/ClassLoader;)Ljava/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/validation/ReflectiveMessageValidator.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/validation/ReflectiveMessageValidator.eea
index 092e99cdbb..c110e3835c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/validation/ReflectiveMessageValidator.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/jsonrpc/validation/ReflectiveMessageValidator.eea
@@ -8,7 +8,7 @@ consume
  (Lorg/eclipse/lsp4j/jsonrpc/messages/Message;)V
 createPathString
  (Ljava/util/Deque<Ljava/lang/Object;>;)Ljava/lang/String;
- (Ljava/util/Deque<Ljava/lang/Object;>;)Ljava/lang/String;
+ (Ljava/util/Deque<Ljava/lang/Object;>;)L1java/lang/String;
 getPropertyName
  (Ljava/lang/reflect/Method;)Ljava/lang/String;
  (Ljava/lang/reflect/Method;)Ljava/lang/String;
@@ -20,7 +20,7 @@ isValid
  (Ljava/lang/Object;)Z
 validate
  (Ljava/lang/Object;)Ljava/util/List<Lorg/eclipse/lsp4j/jsonrpc/messages/MessageIssue;>;
- (Ljava/lang/Object;)Ljava/util/List<Lorg/eclipse/lsp4j/jsonrpc/messages/MessageIssue;>;
+ (Ljava/lang/Object;)L1java/util/List<Lorg/eclipse/lsp4j/jsonrpc/messages/MessageIssue;>;
 validate
  (Ljava/lang/Object;Ljava/util/List<Lorg/eclipse/lsp4j/jsonrpc/messages/MessageIssue;>;Ljava/util/Deque<Ljava/lang/Object;>;Ljava/util/Deque<Ljava/lang/Object;>;)V
  (Ljava/lang/Object;Ljava/util/List<Lorg/eclipse/lsp4j/jsonrpc/messages/MessageIssue;>;Ljava/util/Deque<Ljava/lang/Object;>;Ljava/util/Deque<Ljava/lang/Object;>;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/launch/LSPLauncher.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/launch/LSPLauncher.eea
index 94e9b476e3..b614e6fdbb 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/launch/LSPLauncher.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/launch/LSPLauncher.eea
@@ -2,19 +2,19 @@ class org/eclipse/lsp4j/launch/LSPLauncher
 
 createClientLauncher
  (Lorg/eclipse/lsp4j/services/LanguageClient;Ljava/io/InputStream;Ljava/io/OutputStream;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/services/LanguageServer;>;
- (Lorg/eclipse/lsp4j/services/LanguageClient;Ljava/io/InputStream;Ljava/io/OutputStream;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/services/LanguageServer;>;
+ (Lorg/eclipse/lsp4j/services/LanguageClient;Ljava/io/InputStream;Ljava/io/OutputStream;)L1org/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/services/LanguageServer;>;
 createClientLauncher
  (Lorg/eclipse/lsp4j/services/LanguageClient;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/services/LanguageServer;>;
- (Lorg/eclipse/lsp4j/services/LanguageClient;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/services/LanguageServer;>;
+ (Lorg/eclipse/lsp4j/services/LanguageClient;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;)L1org/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/services/LanguageServer;>;
 createClientLauncher
  (Lorg/eclipse/lsp4j/services/LanguageClient;Ljava/io/InputStream;Ljava/io/OutputStream;ZLjava/io/PrintWriter;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/services/LanguageServer;>;
- (Lorg/eclipse/lsp4j/services/LanguageClient;Ljava/io/InputStream;Ljava/io/OutputStream;ZLjava/io/PrintWriter;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/services/LanguageServer;>;
+ (Lorg/eclipse/lsp4j/services/LanguageClient;Ljava/io/InputStream;Ljava/io/OutputStream;ZLjava/io/PrintWriter;)L1org/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/services/LanguageServer;>;
 createServerLauncher
  (Lorg/eclipse/lsp4j/services/LanguageServer;Ljava/io/InputStream;Ljava/io/OutputStream;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/services/LanguageClient;>;
- (Lorg/eclipse/lsp4j/services/LanguageServer;Ljava/io/InputStream;Ljava/io/OutputStream;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/services/LanguageClient;>;
+ (Lorg/eclipse/lsp4j/services/LanguageServer;Ljava/io/InputStream;Ljava/io/OutputStream;)L1org/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/services/LanguageClient;>;
 createServerLauncher
  (Lorg/eclipse/lsp4j/services/LanguageServer;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/services/LanguageClient;>;
- (Lorg/eclipse/lsp4j/services/LanguageServer;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/services/LanguageClient;>;
+ (Lorg/eclipse/lsp4j/services/LanguageServer;Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/util/concurrent/ExecutorService;Ljava/util/function/Function<Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;Lorg/eclipse/lsp4j/jsonrpc/MessageConsumer;>;)L1org/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/services/LanguageClient;>;
 createServerLauncher
  (Lorg/eclipse/lsp4j/services/LanguageServer;Ljava/io/InputStream;Ljava/io/OutputStream;ZLjava/io/PrintWriter;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/services/LanguageClient;>;
- (Lorg/eclipse/lsp4j/services/LanguageServer;Ljava/io/InputStream;Ljava/io/OutputStream;ZLjava/io/PrintWriter;)Lorg/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/services/LanguageClient;>;
+ (Lorg/eclipse/lsp4j/services/LanguageServer;Ljava/io/InputStream;Ljava/io/OutputStream;ZLjava/io/PrintWriter;)L1org/eclipse/lsp4j/jsonrpc/Launcher<Lorg/eclipse/lsp4j/services/LanguageClient;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/services/LanguageServer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/services/LanguageServer.eea
index f04a0a9a9c..2f77cceb3d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/services/LanguageServer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/services/LanguageServer.eea
@@ -5,7 +5,7 @@ cancelProgress
  (Lorg/eclipse/lsp4j/WorkDoneProgressCancelParams;)V
 getNotebookDocumentService
  ()Lorg/eclipse/lsp4j/services/NotebookDocumentService;
- ()Lorg/eclipse/lsp4j/services/NotebookDocumentService;
+ ()L0org/eclipse/lsp4j/services/NotebookDocumentService;
 getTextDocumentService
  ()Lorg/eclipse/lsp4j/services/TextDocumentService;
  ()Lorg/eclipse/lsp4j/services/TextDocumentService;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/services/WorkspaceService.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/services/WorkspaceService.eea
index ac0cfef806..779a33d7b4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/services/WorkspaceService.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/services/WorkspaceService.eea
@@ -2,7 +2,7 @@ class org/eclipse/lsp4j/services/WorkspaceService
 
 diagnostic
  (Lorg/eclipse/lsp4j/WorkspaceDiagnosticParams;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/WorkspaceDiagnosticReport;>;
- (Lorg/eclipse/lsp4j/WorkspaceDiagnosticParams;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/WorkspaceDiagnosticReport;>;
+ (Lorg/eclipse/lsp4j/WorkspaceDiagnosticParams;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/WorkspaceDiagnosticReport;>;
 didChangeConfiguration
  (Lorg/eclipse/lsp4j/DidChangeConfigurationParams;)V
  (Lorg/eclipse/lsp4j/DidChangeConfigurationParams;)V
@@ -23,19 +23,19 @@ didRenameFiles
  (Lorg/eclipse/lsp4j/RenameFilesParams;)V
 executeCommand
  (Lorg/eclipse/lsp4j/ExecuteCommandParams;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Object;>;
- (Lorg/eclipse/lsp4j/ExecuteCommandParams;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Object;>;
+ (Lorg/eclipse/lsp4j/ExecuteCommandParams;)L1java/util/concurrent/CompletableFuture<Ljava/lang/Object;>;
 resolveWorkspaceSymbol
  (Lorg/eclipse/lsp4j/WorkspaceSymbol;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/WorkspaceSymbol;>;
- (Lorg/eclipse/lsp4j/WorkspaceSymbol;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/WorkspaceSymbol;>;
+ (Lorg/eclipse/lsp4j/WorkspaceSymbol;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/WorkspaceSymbol;>;
 symbol
  (Lorg/eclipse/lsp4j/WorkspaceSymbolParams;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/jsonrpc/messages/Either<Ljava/util/List<+Lorg/eclipse/lsp4j/SymbolInformation;>;Ljava/util/List<+Lorg/eclipse/lsp4j/WorkspaceSymbol;>;>;>;
- (Lorg/eclipse/lsp4j/WorkspaceSymbolParams;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/jsonrpc/messages/Either<Ljava/util/List<+Lorg/eclipse/lsp4j/SymbolInformation;>;Ljava/util/List<+Lorg/eclipse/lsp4j/WorkspaceSymbol;>;>;>;
+ (Lorg/eclipse/lsp4j/WorkspaceSymbolParams;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/jsonrpc/messages/Either<Ljava/util/List<+Lorg/eclipse/lsp4j/SymbolInformation;>;Ljava/util/List<+Lorg/eclipse/lsp4j/WorkspaceSymbol;>;>;>;
 willCreateFiles
  (Lorg/eclipse/lsp4j/CreateFilesParams;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/WorkspaceEdit;>;
- (Lorg/eclipse/lsp4j/CreateFilesParams;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/WorkspaceEdit;>;
+ (Lorg/eclipse/lsp4j/CreateFilesParams;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/WorkspaceEdit;>;
 willDeleteFiles
  (Lorg/eclipse/lsp4j/DeleteFilesParams;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/WorkspaceEdit;>;
- (Lorg/eclipse/lsp4j/DeleteFilesParams;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/WorkspaceEdit;>;
+ (Lorg/eclipse/lsp4j/DeleteFilesParams;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/WorkspaceEdit;>;
 willRenameFiles
  (Lorg/eclipse/lsp4j/RenameFilesParams;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/WorkspaceEdit;>;
- (Lorg/eclipse/lsp4j/RenameFilesParams;)Ljava/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/WorkspaceEdit;>;
+ (Lorg/eclipse/lsp4j/RenameFilesParams;)L1java/util/concurrent/CompletableFuture<Lorg/eclipse/lsp4j/WorkspaceEdit;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/util/DocumentSymbols.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/util/DocumentSymbols.eea
index 08bfdfd144..08fc767b61 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/util/DocumentSymbols.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/lsp4j/util/DocumentSymbols.eea
@@ -2,4 +2,4 @@ class org/eclipse/lsp4j/util/DocumentSymbols
 
 asIterator
  (Lorg/eclipse/lsp4j/DocumentSymbol;)Ljava/util/Iterator<Lorg/eclipse/lsp4j/DocumentSymbol;>;
- (Lorg/eclipse/lsp4j/DocumentSymbol;)Ljava/util/Iterator<Lorg/eclipse/lsp4j/DocumentSymbol;>;
+ (Lorg/eclipse/lsp4j/DocumentSymbol;)L1java/util/Iterator<Lorg/eclipse/lsp4j/DocumentSymbol;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/CompositeChange.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/CompositeChange.eea
index b02a304b2b..e2c9f670bc 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/CompositeChange.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/CompositeChange.eea
@@ -17,7 +17,7 @@ clear
  ()[Lorg/eclipse/ltk/core/refactoring/Change;
 createUndoChange
  ([Lorg/eclipse/ltk/core/refactoring/Change;)Lorg/eclipse/ltk/core/refactoring/Change;
- ([Lorg/eclipse/ltk/core/refactoring/Change;)Lorg/eclipse/ltk/core/refactoring/Change;
+ ([Lorg/eclipse/ltk/core/refactoring/Change;)L1org/eclipse/ltk/core/refactoring/Change;
 getAffectedObjects
  ()[Ljava/lang/Object;
  ()[0L1java/lang/Object; # @Inherited(org.eclipse.ltk.core.refactoring.Change)
@@ -29,7 +29,7 @@ getDescriptor
  ()L0org/eclipse/ltk/core/refactoring/ChangeDescriptor; # @Inherited(org.eclipse.ltk.core.refactoring.Change)
 getModifiedElement
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getName
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(org.eclipse.ltk.core.refactoring.Change)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/CreateChangeOperation.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/CreateChangeOperation.eea
index 7e0bb4b127..4102fc4c47 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/CreateChangeOperation.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/CreateChangeOperation.eea
@@ -11,7 +11,7 @@ getChange
  ()Lorg/eclipse/ltk/core/refactoring/Change;
 getConditionCheckingStatus
  ()Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
- ()Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
+ ()L0org/eclipse/ltk/core/refactoring/RefactoringStatus;
 run
  (Lorg/eclipse/core/runtime/IProgressMonitor;)V
  (L0org/eclipse/core/runtime/IProgressMonitor;)V # @Inherited(org.eclipse.core.resources.IWorkspaceRunnable)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/IValidationCheckResultQueryFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/IValidationCheckResultQueryFactory.eea
index de0f493d3b..92de38719e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/IValidationCheckResultQueryFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/IValidationCheckResultQueryFactory.eea
@@ -2,4 +2,4 @@ class org/eclipse/ltk/core/refactoring/IValidationCheckResultQueryFactory
 
 create
  (Lorg/eclipse/core/runtime/IAdaptable;)Lorg/eclipse/ltk/core/refactoring/IValidationCheckResultQuery;
- (Lorg/eclipse/core/runtime/IAdaptable;)Lorg/eclipse/ltk/core/refactoring/IValidationCheckResultQuery;
+ (Lorg/eclipse/core/runtime/IAdaptable;)L1org/eclipse/ltk/core/refactoring/IValidationCheckResultQuery;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/MultiStateTextFileChange.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/MultiStateTextFileChange.eea
index fe1fde7b9d..537f7643be 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/MultiStateTextFileChange.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/MultiStateTextFileChange.eea
@@ -14,7 +14,7 @@ getCurrentContent
  (Lorg/eclipse/jface/text/IRegion;ZILorg/eclipse/core/runtime/IProgressMonitor;)Ljava/lang/String;
 getCurrentDocument
  (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/jface/text/IDocument;
- (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/jface/text/IDocument;
+ (Lorg/eclipse/core/runtime/IProgressMonitor;)L1org/eclipse/jface/text/IDocument;
 getModifiedElement
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
@@ -26,7 +26,7 @@ getPreviewContent
  ([Lorg/eclipse/ltk/core/refactoring/TextEditBasedChangeGroup;Lorg/eclipse/jface/text/IRegion;ZILorg/eclipse/core/runtime/IProgressMonitor;)Ljava/lang/String;
 getPreviewDocument
  (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/jface/text/IDocument;
- (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/jface/text/IDocument;
+ (Lorg/eclipse/core/runtime/IProgressMonitor;)L1org/eclipse/jface/text/IDocument;
 initializeValidationData
  (Lorg/eclipse/core/runtime/IProgressMonitor;)V
  (L1org/eclipse/core/runtime/IProgressMonitor;)V # @Inherited(org.eclipse.ltk.core.refactoring.Change)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/NullChange.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/NullChange.eea
index 83932c66c4..801b7a14e6 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/NullChange.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/NullChange.eea
@@ -5,7 +5,7 @@ class org/eclipse/ltk/core/refactoring/NullChange
  (Ljava/lang/String;)V
 getModifiedElement
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getName
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(org.eclipse.ltk.core.refactoring.Change)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/PerformChangeOperation.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/PerformChangeOperation.eea
index 27658cc102..dd866fcc90 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/PerformChangeOperation.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/PerformChangeOperation.eea
@@ -14,7 +14,7 @@ getChange
  ()Lorg/eclipse/ltk/core/refactoring/Change;
 getConditionCheckingStatus
  ()Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
- ()Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
+ ()L0org/eclipse/ltk/core/refactoring/RefactoringStatus;
 getUndoChange
  ()Lorg/eclipse/ltk/core/refactoring/Change;
  ()Lorg/eclipse/ltk/core/refactoring/Change;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/PerformRefactoringHistoryOperation.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/PerformRefactoringHistoryOperation.eea
index 240ae6e134..970418b9fd 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/PerformRefactoringHistoryOperation.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/PerformRefactoringHistoryOperation.eea
@@ -5,16 +5,16 @@ class org/eclipse/ltk/core/refactoring/PerformRefactoringHistoryOperation
  (Lorg/eclipse/ltk/core/refactoring/history/RefactoringHistory;)V
 aboutToPerformRefactoring
  (Lorg/eclipse/ltk/core/refactoring/Refactoring;Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
- (Lorg/eclipse/ltk/core/refactoring/Refactoring;Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
+ (Lorg/eclipse/ltk/core/refactoring/Refactoring;Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;Lorg/eclipse/core/runtime/IProgressMonitor;)L1org/eclipse/ltk/core/refactoring/RefactoringStatus;
 createRefactoring
  (Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)Lorg/eclipse/ltk/core/refactoring/Refactoring;
- (Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)Lorg/eclipse/ltk/core/refactoring/Refactoring;
+ (Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)L1org/eclipse/ltk/core/refactoring/Refactoring;
 createRefactoring
  (Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/Refactoring;
- (Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/Refactoring;
+ (Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/core/runtime/IProgressMonitor;)L1org/eclipse/ltk/core/refactoring/Refactoring;
 createRefactoringContext
  (Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/RefactoringContext;
- (Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/RefactoringContext;
+ (Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/core/runtime/IProgressMonitor;)L1org/eclipse/ltk/core/refactoring/RefactoringContext;
 getExecutionStatus
  ()Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
  ()Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/RefactoringContribution.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/RefactoringContribution.eea
index 0675ca7523..69335f8aed 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/RefactoringContribution.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/RefactoringContribution.eea
@@ -2,10 +2,10 @@ class org/eclipse/ltk/core/refactoring/RefactoringContribution
 
 createDescriptor
  ()Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;
- ()Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;
+ ()L0org/eclipse/ltk/core/refactoring/RefactoringDescriptor;
 createDescriptor
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;I)Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;I)Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;I)L1org/eclipse/ltk/core/refactoring/RefactoringDescriptor;
 getId
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/RefactoringDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/RefactoringDescriptor.eea
index 7fbcd97911..d35c95fe09 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/RefactoringDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/RefactoringDescriptor.eea
@@ -16,16 +16,16 @@ compareTo
  (L1org/eclipse/ltk/core/refactoring/RefactoringDescriptor;)I
 createRefactoring
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)Lorg/eclipse/ltk/core/refactoring/Refactoring;
- (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)Lorg/eclipse/ltk/core/refactoring/Refactoring;
+ (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)L1org/eclipse/ltk/core/refactoring/Refactoring;
 createRefactoringContext
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)Lorg/eclipse/ltk/core/refactoring/RefactoringContext;
- (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)Lorg/eclipse/ltk/core/refactoring/RefactoringContext;
+ (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)L0org/eclipse/ltk/core/refactoring/RefactoringContext;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getComment
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/RefactoringSessionDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/RefactoringSessionDescriptor.eea
index a4836a9500..a59dc78800 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/RefactoringSessionDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/RefactoringSessionDescriptor.eea
@@ -9,10 +9,10 @@ VERSION_1_0
  ([Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;Ljava/lang/String;Ljava/lang/String;)V
 getComment
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getRefactorings
  ()[Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;
- ()[Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;
+ ()[1Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;
 getVersion
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/RefactoringStatus.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/RefactoringStatus.eea
index e181c0e51e..71be91effd 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/RefactoringStatus.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/RefactoringStatus.eea
@@ -2,34 +2,34 @@ class org/eclipse/ltk/core/refactoring/RefactoringStatus
 
 create
  (Lorg/eclipse/core/runtime/IStatus;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
- (Lorg/eclipse/core/runtime/IStatus;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
+ (Lorg/eclipse/core/runtime/IStatus;)L1org/eclipse/ltk/core/refactoring/RefactoringStatus;
 createErrorStatus
  (Ljava/lang/String;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
- (Ljava/lang/String;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
+ (Ljava/lang/String;)L1org/eclipse/ltk/core/refactoring/RefactoringStatus;
 createErrorStatus
  (Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/RefactoringStatusContext;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
- (Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/RefactoringStatusContext;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
+ (Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/RefactoringStatusContext;)L1org/eclipse/ltk/core/refactoring/RefactoringStatus;
 createFatalErrorStatus
  (Ljava/lang/String;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
- (Ljava/lang/String;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
+ (Ljava/lang/String;)L1org/eclipse/ltk/core/refactoring/RefactoringStatus;
 createFatalErrorStatus
  (Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/RefactoringStatusContext;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
- (Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/RefactoringStatusContext;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
+ (Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/RefactoringStatusContext;)L1org/eclipse/ltk/core/refactoring/RefactoringStatus;
 createInfoStatus
  (Ljava/lang/String;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
- (Ljava/lang/String;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
+ (Ljava/lang/String;)L1org/eclipse/ltk/core/refactoring/RefactoringStatus;
 createInfoStatus
  (Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/RefactoringStatusContext;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
- (Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/RefactoringStatusContext;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
+ (Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/RefactoringStatusContext;)L1org/eclipse/ltk/core/refactoring/RefactoringStatus;
 createStatus
  (ILjava/lang/String;Lorg/eclipse/ltk/core/refactoring/RefactoringStatusContext;Ljava/lang/String;ILjava/lang/Object;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
- (ILjava/lang/String;Lorg/eclipse/ltk/core/refactoring/RefactoringStatusContext;Ljava/lang/String;ILjava/lang/Object;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
+ (ILjava/lang/String;Lorg/eclipse/ltk/core/refactoring/RefactoringStatusContext;Ljava/lang/String;ILjava/lang/Object;)L1org/eclipse/ltk/core/refactoring/RefactoringStatus;
 createWarningStatus
  (Ljava/lang/String;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
- (Ljava/lang/String;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
+ (Ljava/lang/String;)L1org/eclipse/ltk/core/refactoring/RefactoringStatus;
 createWarningStatus
  (Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/RefactoringStatusContext;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
- (Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/RefactoringStatusContext;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
+ (Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/RefactoringStatusContext;)L1org/eclipse/ltk/core/refactoring/RefactoringStatus;
 
 addEntry
  (ILjava/lang/String;Lorg/eclipse/ltk/core/refactoring/RefactoringStatusContext;Ljava/lang/String;I)V
@@ -75,16 +75,16 @@ getEntryAt
  (I)Lorg/eclipse/ltk/core/refactoring/RefactoringStatusEntry;
 getEntryMatchingCode
  (Ljava/lang/String;I)Lorg/eclipse/ltk/core/refactoring/RefactoringStatusEntry;
- (Ljava/lang/String;I)Lorg/eclipse/ltk/core/refactoring/RefactoringStatusEntry;
+ (Ljava/lang/String;I)L0org/eclipse/ltk/core/refactoring/RefactoringStatusEntry;
 getEntryMatchingSeverity
  (I)Lorg/eclipse/ltk/core/refactoring/RefactoringStatusEntry;
- (I)Lorg/eclipse/ltk/core/refactoring/RefactoringStatusEntry;
+ (I)L0org/eclipse/ltk/core/refactoring/RefactoringStatusEntry;
 getEntryWithHighestSeverity
  ()Lorg/eclipse/ltk/core/refactoring/RefactoringStatusEntry;
- ()Lorg/eclipse/ltk/core/refactoring/RefactoringStatusEntry;
+ ()L0org/eclipse/ltk/core/refactoring/RefactoringStatusEntry;
 getMessageMatchingSeverity
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 merge
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)V
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/RefactoringStatusEntry.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/RefactoringStatusEntry.eea
index 68d332507f..2a09011443 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/RefactoringStatusEntry.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/RefactoringStatusEntry.eea
@@ -26,7 +26,7 @@ getPluginId
  ()Ljava/lang/String;
 toStatus
  ()Lorg/eclipse/core/runtime/IStatus;
- ()Lorg/eclipse/core/runtime/IStatus;
+ ()L1org/eclipse/core/runtime/IStatus;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/TextChange.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/TextChange.eea
index 32c0416c1a..e1f64ab610 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/TextChange.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/TextChange.eea
@@ -53,7 +53,7 @@ getPreviewEdits
  ([Lorg/eclipse/text/edits/TextEdit;)[Lorg/eclipse/text/edits/TextEdit;
 getTextEditChangeGroups
  ()[Lorg/eclipse/ltk/core/refactoring/TextEditChangeGroup;
- ()[Lorg/eclipse/ltk/core/refactoring/TextEditChangeGroup;
+ ()[1Lorg/eclipse/ltk/core/refactoring/TextEditChangeGroup;
 perform
  (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/Change;
  (L1org/eclipse/core/runtime/IProgressMonitor;)L0org/eclipse/ltk/core/refactoring/Change; # @Inherited(org.eclipse.ltk.core.refactoring.Change)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/TextFileChange.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/TextFileChange.eea
index 7a9f1b6d1e..7ba663fcf5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/TextFileChange.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/TextFileChange.eea
@@ -14,7 +14,7 @@ createUndoChange
  (L1org/eclipse/text/edits/UndoEdit;)L0org/eclipse/ltk/core/refactoring/Change; # @Inherited(org.eclipse.ltk.core.refactoring.TextChange)
 createUndoChange
  (Lorg/eclipse/text/edits/UndoEdit;Lorg/eclipse/ltk/core/refactoring/ContentStamp;)Lorg/eclipse/ltk/core/refactoring/Change;
- (Lorg/eclipse/text/edits/UndoEdit;Lorg/eclipse/ltk/core/refactoring/ContentStamp;)Lorg/eclipse/ltk/core/refactoring/Change;
+ (Lorg/eclipse/text/edits/UndoEdit;Lorg/eclipse/ltk/core/refactoring/ContentStamp;)L1org/eclipse/ltk/core/refactoring/Change;
 getAffectedObjects
  ()[Ljava/lang/Object;
  ()[0L1java/lang/Object; # @Inherited(org.eclipse.ltk.core.refactoring.Change)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/UndoTextFileChange.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/UndoTextFileChange.eea
index e979929036..a42c03f8fa 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/UndoTextFileChange.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/UndoTextFileChange.eea
@@ -5,7 +5,7 @@ class org/eclipse/ltk/core/refactoring/UndoTextFileChange
  (Ljava/lang/String;Lorg/eclipse/core/resources/IFile;Lorg/eclipse/text/edits/UndoEdit;Lorg/eclipse/ltk/core/refactoring/ContentStamp;I)V
 createUndoChange
  (Lorg/eclipse/text/edits/UndoEdit;Lorg/eclipse/ltk/core/refactoring/ContentStamp;)Lorg/eclipse/ltk/core/refactoring/Change;
- (Lorg/eclipse/text/edits/UndoEdit;Lorg/eclipse/ltk/core/refactoring/ContentStamp;)Lorg/eclipse/ltk/core/refactoring/Change;
+ (Lorg/eclipse/text/edits/UndoEdit;Lorg/eclipse/ltk/core/refactoring/ContentStamp;)L1org/eclipse/ltk/core/refactoring/Change;
 getAffectedObjects
  ()[Ljava/lang/Object;
  ()[0L1java/lang/Object; # @Inherited(org.eclipse.ltk.core.refactoring.Change)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/model/AbstractRefactoringDescriptorResourceMapping.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/model/AbstractRefactoringDescriptorResourceMapping.eea
index 34a3fa41a9..81d39ad6e3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/model/AbstractRefactoringDescriptorResourceMapping.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/model/AbstractRefactoringDescriptorResourceMapping.eea
@@ -14,7 +14,7 @@ getProjects
  ()[Lorg/eclipse/core/resources/IProject;
 getResource
  ()Lorg/eclipse/core/resources/IResource;
- ()Lorg/eclipse/core/resources/IResource;
+ ()L0org/eclipse/core/resources/IResource;
 getTraversals
  (Lorg/eclipse/core/resources/mapping/ResourceMappingContext;Lorg/eclipse/core/runtime/IProgressMonitor;)[Lorg/eclipse/core/resources/mapping/ResourceTraversal;
- (Lorg/eclipse/core/resources/mapping/ResourceMappingContext;Lorg/eclipse/core/runtime/IProgressMonitor;)[Lorg/eclipse/core/resources/mapping/ResourceTraversal;
+ (Lorg/eclipse/core/resources/mapping/ResourceMappingContext;Lorg/eclipse/core/runtime/IProgressMonitor;)[1Lorg/eclipse/core/resources/mapping/ResourceTraversal;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/model/AbstractRefactoringHistoryResourceMapping.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/model/AbstractRefactoringHistoryResourceMapping.eea
index 20d3e43fbe..a3c881c4c1 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/model/AbstractRefactoringHistoryResourceMapping.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/model/AbstractRefactoringHistoryResourceMapping.eea
@@ -14,7 +14,7 @@ getProjects
  ()[Lorg/eclipse/core/resources/IProject;
 getResource
  ()Lorg/eclipse/core/resources/IResource;
- ()Lorg/eclipse/core/resources/IResource;
+ ()L0org/eclipse/core/resources/IResource;
 getTraversals
  (Lorg/eclipse/core/resources/mapping/ResourceMappingContext;Lorg/eclipse/core/runtime/IProgressMonitor;)[Lorg/eclipse/core/resources/mapping/ResourceTraversal;
- (Lorg/eclipse/core/resources/mapping/ResourceMappingContext;Lorg/eclipse/core/runtime/IProgressMonitor;)[Lorg/eclipse/core/resources/mapping/ResourceTraversal;
+ (Lorg/eclipse/core/resources/mapping/ResourceMappingContext;Lorg/eclipse/core/runtime/IProgressMonitor;)[1Lorg/eclipse/core/resources/mapping/ResourceTraversal;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/participants/CheckConditionsContext.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/participants/CheckConditionsContext.eea
index 06834759af..3a036d5f55 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/participants/CheckConditionsContext.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/participants/CheckConditionsContext.eea
@@ -5,7 +5,7 @@ add
  (Lorg/eclipse/ltk/core/refactoring/participants/IConditionChecker;)V
 check
  (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
- (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
+ (Lorg/eclipse/core/runtime/IProgressMonitor;)L1org/eclipse/ltk/core/refactoring/RefactoringStatus;
 getChecker
  <T::Lorg/eclipse/ltk/core/refactoring/participants/IConditionChecker;>(Ljava/lang/Class<TT;>;)TT;
  <T::Lorg/eclipse/ltk/core/refactoring/participants/IConditionChecker;>(Ljava/lang/Class<TT;>;)TT;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/participants/ParticipantManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/participants/ParticipantManager.eea
index ffa56ffb7c..c001911120 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/participants/ParticipantManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/participants/ParticipantManager.eea
@@ -2,31 +2,31 @@ class org/eclipse/ltk/core/refactoring/participants/ParticipantManager
 
 loadCopyParticipants
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;Ljava/lang/Object;Lorg/eclipse/ltk/core/refactoring/participants/CopyArguments;Lorg/eclipse/ltk/core/refactoring/participants/IParticipantDescriptorFilter;[Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[Lorg/eclipse/ltk/core/refactoring/participants/CopyParticipant;
- (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;Ljava/lang/Object;Lorg/eclipse/ltk/core/refactoring/participants/CopyArguments;Lorg/eclipse/ltk/core/refactoring/participants/IParticipantDescriptorFilter;[Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[Lorg/eclipse/ltk/core/refactoring/participants/CopyParticipant;
+ (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;Ljava/lang/Object;Lorg/eclipse/ltk/core/refactoring/participants/CopyArguments;Lorg/eclipse/ltk/core/refactoring/participants/IParticipantDescriptorFilter;[Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[1Lorg/eclipse/ltk/core/refactoring/participants/CopyParticipant;
 loadCopyParticipants
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;Ljava/lang/Object;Lorg/eclipse/ltk/core/refactoring/participants/CopyArguments;[Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[Lorg/eclipse/ltk/core/refactoring/participants/CopyParticipant;
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;Ljava/lang/Object;Lorg/eclipse/ltk/core/refactoring/participants/CopyArguments;[Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[Lorg/eclipse/ltk/core/refactoring/participants/CopyParticipant;
 loadCreateParticipants
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;Ljava/lang/Object;Lorg/eclipse/ltk/core/refactoring/participants/CreateArguments;Lorg/eclipse/ltk/core/refactoring/participants/IParticipantDescriptorFilter;[Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[Lorg/eclipse/ltk/core/refactoring/participants/CreateParticipant;
- (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;Ljava/lang/Object;Lorg/eclipse/ltk/core/refactoring/participants/CreateArguments;Lorg/eclipse/ltk/core/refactoring/participants/IParticipantDescriptorFilter;[Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[Lorg/eclipse/ltk/core/refactoring/participants/CreateParticipant;
+ (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;Ljava/lang/Object;Lorg/eclipse/ltk/core/refactoring/participants/CreateArguments;Lorg/eclipse/ltk/core/refactoring/participants/IParticipantDescriptorFilter;[Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[1Lorg/eclipse/ltk/core/refactoring/participants/CreateParticipant;
 loadCreateParticipants
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;Ljava/lang/Object;Lorg/eclipse/ltk/core/refactoring/participants/CreateArguments;[Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[Lorg/eclipse/ltk/core/refactoring/participants/CreateParticipant;
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;Ljava/lang/Object;Lorg/eclipse/ltk/core/refactoring/participants/CreateArguments;[Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[Lorg/eclipse/ltk/core/refactoring/participants/CreateParticipant;
 loadDeleteParticipants
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;Ljava/lang/Object;Lorg/eclipse/ltk/core/refactoring/participants/DeleteArguments;Lorg/eclipse/ltk/core/refactoring/participants/IParticipantDescriptorFilter;[Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[Lorg/eclipse/ltk/core/refactoring/participants/DeleteParticipant;
- (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;Ljava/lang/Object;Lorg/eclipse/ltk/core/refactoring/participants/DeleteArguments;Lorg/eclipse/ltk/core/refactoring/participants/IParticipantDescriptorFilter;[Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[Lorg/eclipse/ltk/core/refactoring/participants/DeleteParticipant;
+ (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;Ljava/lang/Object;Lorg/eclipse/ltk/core/refactoring/participants/DeleteArguments;Lorg/eclipse/ltk/core/refactoring/participants/IParticipantDescriptorFilter;[Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[1Lorg/eclipse/ltk/core/refactoring/participants/DeleteParticipant;
 loadDeleteParticipants
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;Ljava/lang/Object;Lorg/eclipse/ltk/core/refactoring/participants/DeleteArguments;[Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[Lorg/eclipse/ltk/core/refactoring/participants/DeleteParticipant;
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;Ljava/lang/Object;Lorg/eclipse/ltk/core/refactoring/participants/DeleteArguments;[Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[Lorg/eclipse/ltk/core/refactoring/participants/DeleteParticipant;
 loadMoveParticipants
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;Ljava/lang/Object;Lorg/eclipse/ltk/core/refactoring/participants/MoveArguments;Lorg/eclipse/ltk/core/refactoring/participants/IParticipantDescriptorFilter;[Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[Lorg/eclipse/ltk/core/refactoring/participants/MoveParticipant;
- (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;Ljava/lang/Object;Lorg/eclipse/ltk/core/refactoring/participants/MoveArguments;Lorg/eclipse/ltk/core/refactoring/participants/IParticipantDescriptorFilter;[Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[Lorg/eclipse/ltk/core/refactoring/participants/MoveParticipant;
+ (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;Ljava/lang/Object;Lorg/eclipse/ltk/core/refactoring/participants/MoveArguments;Lorg/eclipse/ltk/core/refactoring/participants/IParticipantDescriptorFilter;[Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[1Lorg/eclipse/ltk/core/refactoring/participants/MoveParticipant;
 loadMoveParticipants
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;Ljava/lang/Object;Lorg/eclipse/ltk/core/refactoring/participants/MoveArguments;[Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[Lorg/eclipse/ltk/core/refactoring/participants/MoveParticipant;
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;Ljava/lang/Object;Lorg/eclipse/ltk/core/refactoring/participants/MoveArguments;[Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[Lorg/eclipse/ltk/core/refactoring/participants/MoveParticipant;
 loadRenameParticipants
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;Ljava/lang/Object;Lorg/eclipse/ltk/core/refactoring/participants/RenameArguments;Lorg/eclipse/ltk/core/refactoring/participants/IParticipantDescriptorFilter;[Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[Lorg/eclipse/ltk/core/refactoring/participants/RenameParticipant;
- (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;Ljava/lang/Object;Lorg/eclipse/ltk/core/refactoring/participants/RenameArguments;Lorg/eclipse/ltk/core/refactoring/participants/IParticipantDescriptorFilter;[Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[Lorg/eclipse/ltk/core/refactoring/participants/RenameParticipant;
+ (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;Ljava/lang/Object;Lorg/eclipse/ltk/core/refactoring/participants/RenameArguments;Lorg/eclipse/ltk/core/refactoring/participants/IParticipantDescriptorFilter;[Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[1Lorg/eclipse/ltk/core/refactoring/participants/RenameParticipant;
 loadRenameParticipants
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;Ljava/lang/Object;Lorg/eclipse/ltk/core/refactoring/participants/RenameArguments;[Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[Lorg/eclipse/ltk/core/refactoring/participants/RenameParticipant;
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;Ljava/lang/Object;Lorg/eclipse/ltk/core/refactoring/participants/RenameArguments;[Ljava/lang/String;Lorg/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[Lorg/eclipse/ltk/core/refactoring/participants/RenameParticipant;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/participants/ProcessorBasedRefactoring.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/participants/ProcessorBasedRefactoring.eea
index c2963ecfa9..4d2cbd1989 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/participants/ProcessorBasedRefactoring.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/participants/ProcessorBasedRefactoring.eea
@@ -23,7 +23,7 @@ getProcessor
  ()Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;
 getTextChange
  (Ljava/lang/Object;)Lorg/eclipse/ltk/core/refactoring/TextChange;
- (Ljava/lang/Object;)Lorg/eclipse/ltk/core/refactoring/TextChange;
+ (Ljava/lang/Object;)L0org/eclipse/ltk/core/refactoring/TextChange;
 setProcessor
  (Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;)V
  (Lorg/eclipse/ltk/core/refactoring/participants/RefactoringProcessor;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/participants/RefactoringParticipant.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/participants/RefactoringParticipant.eea
index 9b86b00fd8..8a787edb52 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/participants/RefactoringParticipant.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/participants/RefactoringParticipant.eea
@@ -5,10 +5,10 @@ checkConditions
  (Lorg/eclipse/core/runtime/IProgressMonitor;Lorg/eclipse/ltk/core/refactoring/participants/CheckConditionsContext;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
 createChange
  (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/Change;
- (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/Change;
+ (Lorg/eclipse/core/runtime/IProgressMonitor;)L1org/eclipse/ltk/core/refactoring/Change;
 createPreChange
  (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/Change;
- (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/Change;
+ (Lorg/eclipse/core/runtime/IProgressMonitor;)L0org/eclipse/ltk/core/refactoring/Change;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/participants/RefactoringProcessor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/participants/RefactoringProcessor.eea
index 7a62ad5219..0b90f2177a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/participants/RefactoringProcessor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/participants/RefactoringProcessor.eea
@@ -26,4 +26,4 @@ loadParticipants
  (L1org/eclipse/ltk/core/refactoring/RefactoringStatus;L1org/eclipse/ltk/core/refactoring/participants/SharableParticipants;)[0L1org/eclipse/ltk/core/refactoring/participants/RefactoringParticipant;
 postCreateChange
  ([Lorg/eclipse/ltk/core/refactoring/Change;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/Change;
- ([Lorg/eclipse/ltk/core/refactoring/Change;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/Change;
+ ([Lorg/eclipse/ltk/core/refactoring/Change;Lorg/eclipse/core/runtime/IProgressMonitor;)L0org/eclipse/ltk/core/refactoring/Change;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/participants/ValidateEditChecker.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/participants/ValidateEditChecker.eea
index e3f258bdc6..7ae3e6947c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/participants/ValidateEditChecker.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/participants/ValidateEditChecker.eea
@@ -11,4 +11,4 @@ addFiles
  ([Lorg/eclipse/core/resources/IFile;)V
 check
  (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
- (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
+ (Lorg/eclipse/core/runtime/IProgressMonitor;)L1org/eclipse/ltk/core/refactoring/RefactoringStatus;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/resource/DeleteResourcesDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/resource/DeleteResourcesDescriptor.eea
index 2778a25c72..1e62cf7932 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/resource/DeleteResourcesDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/resource/DeleteResourcesDescriptor.eea
@@ -6,7 +6,7 @@ ID
 
 createRefactoring
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)Lorg/eclipse/ltk/core/refactoring/Refactoring;
- (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)Lorg/eclipse/ltk/core/refactoring/Refactoring;
+ (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)L0org/eclipse/ltk/core/refactoring/Refactoring; # @Overrides(org.eclipse.ltk.core.refactoring.RefactoringDescriptor)
 getResourcePaths
  ()[Lorg/eclipse/core/runtime/IPath;
  ()[Lorg/eclipse/core/runtime/IPath;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/resource/MoveRenameResourceDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/resource/MoveRenameResourceDescriptor.eea
index 0514416be8..bd1f2c4307 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/resource/MoveRenameResourceDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/resource/MoveRenameResourceDescriptor.eea
@@ -6,7 +6,7 @@ ID
 
 createRefactoring
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)Lorg/eclipse/ltk/core/refactoring/Refactoring;
- (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)Lorg/eclipse/ltk/core/refactoring/Refactoring;
+ (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)L0org/eclipse/ltk/core/refactoring/Refactoring; # @Overrides(org.eclipse.ltk.core.refactoring.RefactoringDescriptor)
 getDestinationPath
  ()Lorg/eclipse/core/runtime/IPath;
  ()Lorg/eclipse/core/runtime/IPath;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/resource/MoveResourcesDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/resource/MoveResourcesDescriptor.eea
index cce21d779c..a4298fdd8b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/resource/MoveResourcesDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/resource/MoveResourcesDescriptor.eea
@@ -6,7 +6,7 @@ ID
 
 createRefactoring
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)Lorg/eclipse/ltk/core/refactoring/Refactoring;
- (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)Lorg/eclipse/ltk/core/refactoring/Refactoring;
+ (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)L0org/eclipse/ltk/core/refactoring/Refactoring; # @Overrides(org.eclipse.ltk.core.refactoring.RefactoringDescriptor)
 getDestinationPath
  ()Lorg/eclipse/core/runtime/IPath;
  ()Lorg/eclipse/core/runtime/IPath;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/resource/RenameResourceDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/resource/RenameResourceDescriptor.eea
index 854ed07960..eef7c8b20e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/resource/RenameResourceDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/core/refactoring/resource/RenameResourceDescriptor.eea
@@ -6,7 +6,7 @@ ID
 
 createRefactoring
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)Lorg/eclipse/ltk/core/refactoring/Refactoring;
- (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)Lorg/eclipse/ltk/core/refactoring/Refactoring;
+ (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)L0org/eclipse/ltk/core/refactoring/Refactoring; # @Overrides(org.eclipse.ltk.core.refactoring.RefactoringDescriptor)
 getNewName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/RedoRefactoringAction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/RedoRefactoringAction.eea
index 1ebf86bd30..5f1350616d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/RedoRefactoringAction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/RedoRefactoringAction.eea
@@ -2,10 +2,10 @@ class org/eclipse/ltk/ui/refactoring/RedoRefactoringAction
 
 createOperation
  (Lorg/eclipse/swt/widgets/Shell;)Lorg/eclipse/jface/operation/IRunnableWithProgress;
- (Lorg/eclipse/swt/widgets/Shell;)Lorg/eclipse/jface/operation/IRunnableWithProgress;
+ (Lorg/eclipse/swt/widgets/Shell;)L1org/eclipse/jface/operation/IRunnableWithProgress;
 createUndoManagerListener
  ()Lorg/eclipse/ltk/core/refactoring/UndoManagerAdapter;
- ()Lorg/eclipse/ltk/core/refactoring/UndoManagerAdapter;
+ ()L1org/eclipse/ltk/core/refactoring/UndoManagerAdapter;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/RefactoringUI.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/RefactoringUI.eea
index 6b7bb37151..60bc5b01bd 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/RefactoringUI.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/RefactoringUI.eea
@@ -2,16 +2,16 @@ class org/eclipse/ltk/ui/refactoring/RefactoringUI
 
 createLightWeightStatusDialog
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/swt/widgets/Shell;Ljava/lang/String;)Lorg/eclipse/jface/dialogs/Dialog;
- (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/swt/widgets/Shell;Ljava/lang/String;)Lorg/eclipse/jface/dialogs/Dialog;
+ (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/swt/widgets/Shell;Ljava/lang/String;)L1org/eclipse/jface/dialogs/Dialog;
 createRefactoringHistoryControl
  (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/ltk/ui/refactoring/history/RefactoringHistoryControlConfiguration;)Lorg/eclipse/swt/widgets/Composite;
- (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/ltk/ui/refactoring/history/RefactoringHistoryControlConfiguration;)Lorg/eclipse/swt/widgets/Composite;
+ (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/ltk/ui/refactoring/history/RefactoringHistoryControlConfiguration;)L1org/eclipse/swt/widgets/Composite;
 createRefactoringStatusDialog
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/swt/widgets/Shell;Ljava/lang/String;Z)Lorg/eclipse/jface/dialogs/Dialog;
- (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/swt/widgets/Shell;Ljava/lang/String;Z)Lorg/eclipse/jface/dialogs/Dialog;
+ (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/swt/widgets/Shell;Ljava/lang/String;Z)L1org/eclipse/jface/dialogs/Dialog;
 createSortableRefactoringHistoryControl
  (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/ltk/ui/refactoring/history/RefactoringHistoryControlConfiguration;)Lorg/eclipse/swt/widgets/Composite;
- (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/ltk/ui/refactoring/history/RefactoringHistoryControlConfiguration;)Lorg/eclipse/swt/widgets/Composite;
+ (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/ltk/ui/refactoring/history/RefactoringHistoryControlConfiguration;)L1org/eclipse/swt/widgets/Composite;
 createUIAwareChangeOperation
  (Lorg/eclipse/ltk/core/refactoring/Change;)Lorg/eclipse/ltk/core/refactoring/PerformChangeOperation;
- (Lorg/eclipse/ltk/core/refactoring/Change;)Lorg/eclipse/ltk/core/refactoring/PerformChangeOperation;
+ (Lorg/eclipse/ltk/core/refactoring/Change;)L1org/eclipse/ltk/core/refactoring/PerformChangeOperation;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/RefactoringWizard.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/RefactoringWizard.eea
index 06b17e89bb..d9e3670dc2 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/RefactoringWizard.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/RefactoringWizard.eea
@@ -17,7 +17,7 @@ getDefaultPageTitle
  ()Ljava/lang/String;
 getPreviousPage
  (Lorg/eclipse/jface/wizard/IWizardPage;)Lorg/eclipse/jface/wizard/IWizardPage;
- (Lorg/eclipse/jface/wizard/IWizardPage;)Lorg/eclipse/jface/wizard/IWizardPage;
+ (Lorg/eclipse/jface/wizard/IWizardPage;)L0org/eclipse/jface/wizard/IWizardPage; # @Inherited(org.eclipse.jface.wizard.Wizard)
 getRefactoring
  ()Lorg/eclipse/ltk/core/refactoring/Refactoring;
  ()Lorg/eclipse/ltk/core/refactoring/Refactoring;
@@ -26,7 +26,7 @@ getRefactoringContext
  ()Lorg/eclipse/ltk/core/refactoring/RefactoringContext;
 getStartingPage
  ()Lorg/eclipse/jface/wizard/IWizardPage;
- ()Lorg/eclipse/jface/wizard/IWizardPage;
+ ()L0org/eclipse/jface/wizard/IWizardPage; # @Inherited(org.eclipse.jface.wizard.Wizard)
 internalCreateChange
  (Lorg/eclipse/ltk/internal/ui/refactoring/InternalAPI;Lorg/eclipse/ltk/core/refactoring/CreateChangeOperation;Z)Lorg/eclipse/ltk/core/refactoring/Change;
  (Lorg/eclipse/ltk/internal/ui/refactoring/InternalAPI;Lorg/eclipse/ltk/core/refactoring/CreateChangeOperation;Z)Lorg/eclipse/ltk/core/refactoring/Change;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/RefactoringWizardPage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/RefactoringWizardPage.eea
index c1fc332442..44532aca62 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/RefactoringWizardPage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/RefactoringWizardPage.eea
@@ -12,13 +12,13 @@ REFACTORING_SETTINGS
  (Ljava/lang/String;Z)V
 getRefactoring
  ()Lorg/eclipse/ltk/core/refactoring/Refactoring;
- ()Lorg/eclipse/ltk/core/refactoring/Refactoring;
+ ()L0org/eclipse/ltk/core/refactoring/Refactoring;
 getRefactoringSettings
  ()Lorg/eclipse/jface/dialogs/IDialogSettings;
- ()Lorg/eclipse/jface/dialogs/IDialogSettings;
+ ()L0org/eclipse/jface/dialogs/IDialogSettings;
 getRefactoringWizard
  ()Lorg/eclipse/ltk/ui/refactoring/RefactoringWizard;
- ()Lorg/eclipse/ltk/ui/refactoring/RefactoringWizard;
+ ()L0org/eclipse/ltk/ui/refactoring/RefactoringWizard;
 setWizard
  (Lorg/eclipse/jface/wizard/IWizard;)V
  (Lorg/eclipse/jface/wizard/IWizard;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/TextEditChangeNode.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/TextEditChangeNode.eea
index fba9c796b3..0ca6480fa3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/TextEditChangeNode.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/TextEditChangeNode.eea
@@ -2,17 +2,17 @@ class org/eclipse/ltk/ui/refactoring/TextEditChangeNode
 
 createTextEditGroupNode
  (Lorg/eclipse/ltk/ui/refactoring/TextEditChangeNode$ChildNode;Lorg/eclipse/ltk/core/refactoring/TextEditBasedChangeGroup;)Lorg/eclipse/ltk/ui/refactoring/TextEditChangeNode$ChildNode;
- (Lorg/eclipse/ltk/ui/refactoring/TextEditChangeNode$ChildNode;Lorg/eclipse/ltk/core/refactoring/TextEditBasedChangeGroup;)Lorg/eclipse/ltk/ui/refactoring/TextEditChangeNode$ChildNode;
+ (Lorg/eclipse/ltk/ui/refactoring/TextEditChangeNode$ChildNode;Lorg/eclipse/ltk/core/refactoring/TextEditBasedChangeGroup;)L1org/eclipse/ltk/ui/refactoring/TextEditChangeNode$ChildNode;
 createTextEditGroupNode
  (Lorg/eclipse/ltk/ui/refactoring/TextEditChangeNode;Lorg/eclipse/ltk/core/refactoring/TextEditBasedChangeGroup;)Lorg/eclipse/ltk/ui/refactoring/TextEditChangeNode$ChildNode;
- (Lorg/eclipse/ltk/ui/refactoring/TextEditChangeNode;Lorg/eclipse/ltk/core/refactoring/TextEditBasedChangeGroup;)Lorg/eclipse/ltk/ui/refactoring/TextEditChangeNode$ChildNode;
+ (Lorg/eclipse/ltk/ui/refactoring/TextEditChangeNode;Lorg/eclipse/ltk/core/refactoring/TextEditBasedChangeGroup;)L1org/eclipse/ltk/ui/refactoring/TextEditChangeNode$ChildNode;
 
 <init>
  (Lorg/eclipse/ltk/core/refactoring/TextEditBasedChange;)V
  (Lorg/eclipse/ltk/core/refactoring/TextEditBasedChange;)V
 createChildNodes
  ()[Lorg/eclipse/ltk/ui/refactoring/TextEditChangeNode$ChildNode;
- ()[Lorg/eclipse/ltk/ui/refactoring/TextEditChangeNode$ChildNode;
+ ()[1Lorg/eclipse/ltk/ui/refactoring/TextEditChangeNode$ChildNode;
 getImageDescriptor
  ()Lorg/eclipse/jface/resource/ImageDescriptor;
  ()Lorg/eclipse/jface/resource/ImageDescriptor;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/TextStatusContextViewer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/TextStatusContextViewer.eea
index 23ea0ab3f8..47d8ca0170 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/TextStatusContextViewer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/TextStatusContextViewer.eea
@@ -5,7 +5,7 @@ createControl
  (Lorg/eclipse/swt/widgets/Composite;)V
 createSourceViewer
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/text/source/SourceViewer;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/text/source/SourceViewer;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/jface/text/source/SourceViewer;
 getControl
  ()Lorg/eclipse/swt/widgets/Control;
  ()Lorg/eclipse/swt/widgets/Control;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/UndoRefactoringAction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/UndoRefactoringAction.eea
index 458e7180f7..f8586ea30e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/UndoRefactoringAction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/UndoRefactoringAction.eea
@@ -2,10 +2,10 @@ class org/eclipse/ltk/ui/refactoring/UndoRefactoringAction
 
 createOperation
  (Lorg/eclipse/swt/widgets/Shell;)Lorg/eclipse/jface/operation/IRunnableWithProgress;
- (Lorg/eclipse/swt/widgets/Shell;)Lorg/eclipse/jface/operation/IRunnableWithProgress;
+ (Lorg/eclipse/swt/widgets/Shell;)L1org/eclipse/jface/operation/IRunnableWithProgress;
 createUndoManagerListener
  ()Lorg/eclipse/ltk/core/refactoring/UndoManagerAdapter;
- ()Lorg/eclipse/ltk/core/refactoring/UndoManagerAdapter;
+ ()L1org/eclipse/ltk/core/refactoring/UndoManagerAdapter;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/UserInputWizardPage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/UserInputWizardPage.eea
index 1646adea1f..7a07c46d12 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/UserInputWizardPage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/UserInputWizardPage.eea
@@ -8,7 +8,7 @@ computeSuccessorPage
  ()Lorg/eclipse/jface/wizard/IWizardPage;
 getNextPage
  ()Lorg/eclipse/jface/wizard/IWizardPage;
- ()Lorg/eclipse/jface/wizard/IWizardPage;
+ ()L0org/eclipse/jface/wizard/IWizardPage; # @Inherited(org.eclipse.jface.wizard.WizardPage)
 setPageComplete
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)V
  (Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/history/RefactoringHistoryControlConfiguration.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/history/RefactoringHistoryControlConfiguration.eea
index a5e4ccd6f0..19e94f77e4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/history/RefactoringHistoryControlConfiguration.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/history/RefactoringHistoryControlConfiguration.eea
@@ -15,13 +15,13 @@ getCommentCaption
  ()Ljava/lang/String;
 getContentProvider
  ()Lorg/eclipse/ltk/ui/refactoring/history/RefactoringHistoryContentProvider;
- ()Lorg/eclipse/ltk/ui/refactoring/history/RefactoringHistoryContentProvider;
+ ()L1org/eclipse/ltk/ui/refactoring/history/RefactoringHistoryContentProvider;
 getDayPattern
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getLabelProvider
  ()Lorg/eclipse/ltk/ui/refactoring/history/RefactoringHistoryLabelProvider;
- ()Lorg/eclipse/ltk/ui/refactoring/history/RefactoringHistoryLabelProvider;
+ ()L1org/eclipse/ltk/ui/refactoring/history/RefactoringHistoryLabelProvider;
 getLastMonthPattern
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/history/RefactoringHistoryWizard.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/history/RefactoringHistoryWizard.eea
index 831c4d4bfb..391566f2ad 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/history/RefactoringHistoryWizard.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/history/RefactoringHistoryWizard.eea
@@ -8,43 +8,43 @@ class org/eclipse/ltk/ui/refactoring/history/RefactoringHistoryWizard
  (ZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 aboutToPerformHistory
  (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
- (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
+ (Lorg/eclipse/core/runtime/IProgressMonitor;)L1org/eclipse/ltk/core/refactoring/RefactoringStatus;
 aboutToPerformRefactoring
  (Lorg/eclipse/ltk/core/refactoring/Refactoring;Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
- (Lorg/eclipse/ltk/core/refactoring/Refactoring;Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
+ (Lorg/eclipse/ltk/core/refactoring/Refactoring;Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;Lorg/eclipse/core/runtime/IProgressMonitor;)L1org/eclipse/ltk/core/refactoring/RefactoringStatus;
 addPage
  (Lorg/eclipse/jface/wizard/IWizardPage;)V
  (Lorg/eclipse/jface/wizard/IWizardPage;)V
 createRefactoring
  (Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)Lorg/eclipse/ltk/core/refactoring/Refactoring;
- (Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)Lorg/eclipse/ltk/core/refactoring/Refactoring;
+ (Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;)L1org/eclipse/ltk/core/refactoring/Refactoring;
 createRefactoring
  (Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/Refactoring;
- (Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/Refactoring;
+ (Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/core/runtime/IProgressMonitor;)L0org/eclipse/ltk/core/refactoring/Refactoring;
 createRefactoringContext
  (Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/RefactoringContext;
- (Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/RefactoringContext;
+ (Lorg/eclipse/ltk/core/refactoring/RefactoringDescriptor;Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;Lorg/eclipse/core/runtime/IProgressMonitor;)L0org/eclipse/ltk/core/refactoring/RefactoringContext;
 getErrorPage
  ()Lorg/eclipse/ltk/internal/ui/refactoring/IErrorWizardPage;
  ()Lorg/eclipse/ltk/internal/ui/refactoring/IErrorWizardPage;
 getNextPage
  (Lorg/eclipse/jface/wizard/IWizardPage;)Lorg/eclipse/jface/wizard/IWizardPage;
- (Lorg/eclipse/jface/wizard/IWizardPage;)Lorg/eclipse/jface/wizard/IWizardPage;
+ (Lorg/eclipse/jface/wizard/IWizardPage;)L0org/eclipse/jface/wizard/IWizardPage; # @Inherited(org.eclipse.jface.wizard.Wizard)
 getPreviewPage
  ()Lorg/eclipse/ltk/internal/ui/refactoring/IPreviewWizardPage;
  ()Lorg/eclipse/ltk/internal/ui/refactoring/IPreviewWizardPage;
 getPreviousPage
  (Lorg/eclipse/jface/wizard/IWizardPage;)Lorg/eclipse/jface/wizard/IWizardPage;
- (Lorg/eclipse/jface/wizard/IWizardPage;)Lorg/eclipse/jface/wizard/IWizardPage;
+ (Lorg/eclipse/jface/wizard/IWizardPage;)L0org/eclipse/jface/wizard/IWizardPage; # @Inherited(org.eclipse.jface.wizard.Wizard)
 historyPerformed
  (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
- (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
+ (Lorg/eclipse/core/runtime/IProgressMonitor;)L1org/eclipse/ltk/core/refactoring/RefactoringStatus;
 performPreviewChange
  (Lorg/eclipse/ltk/core/refactoring/Change;Lorg/eclipse/ltk/core/refactoring/Refactoring;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
  (Lorg/eclipse/ltk/core/refactoring/Change;Lorg/eclipse/ltk/core/refactoring/Refactoring;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
 refactoringPerformed
  (Lorg/eclipse/ltk/core/refactoring/Refactoring;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
- (Lorg/eclipse/ltk/core/refactoring/Refactoring;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/RefactoringStatus;
+ (Lorg/eclipse/ltk/core/refactoring/Refactoring;Lorg/eclipse/core/runtime/IProgressMonitor;)L1org/eclipse/ltk/core/refactoring/RefactoringStatus;
 selectPreviewChange
  (Lorg/eclipse/ltk/core/refactoring/Change;)Z
  (Lorg/eclipse/ltk/core/refactoring/Change;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/model/AbstractSynchronizationContentProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/model/AbstractSynchronizationContentProvider.eea
index ebe9fe3583..1aeddae7cb 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/model/AbstractSynchronizationContentProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/model/AbstractSynchronizationContentProvider.eea
@@ -2,4 +2,4 @@ class org/eclipse/ltk/ui/refactoring/model/AbstractSynchronizationContentProvide
 
 getRefactorings
  (Lorg/eclipse/team/core/mapping/ISynchronizationContext;Lorg/eclipse/core/resources/IProject;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/history/RefactoringHistory;
- (Lorg/eclipse/team/core/mapping/ISynchronizationContext;Lorg/eclipse/core/resources/IProject;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/ltk/core/refactoring/history/RefactoringHistory;
+ (Lorg/eclipse/team/core/mapping/ISynchronizationContext;Lorg/eclipse/core/resources/IProject;Lorg/eclipse/core/runtime/IProgressMonitor;)L1org/eclipse/ltk/core/refactoring/history/RefactoringHistory;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/resource/RenameResourceWizard$RenameResourceRefactoringConfigurationPage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/resource/RenameResourceWizard$RenameResourceRefactoringConfigurationPage.eea
index 10c5249474..ee474cbcf0 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/resource/RenameResourceWizard$RenameResourceRefactoringConfigurationPage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ltk/ui/refactoring/resource/RenameResourceWizard$RenameResourceRefactoringConfigurationPage.eea
@@ -11,7 +11,7 @@ createControl
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.jface.dialogs.IDialogPage)
 getNextPage
  ()Lorg/eclipse/jface/wizard/IWizardPage;
- ()Lorg/eclipse/jface/wizard/IWizardPage;
+ ()L0org/eclipse/jface/wizard/IWizardPage; # @Inherited(org.eclipse.ltk.ui.refactoring.UserInputWizardPage)
 getProcessor
  ()Lorg/eclipse/ltk/core/refactoring/participants/IRenameResourceProcessor;
  ()Lorg/eclipse/ltk/core/refactoring/participants/IRenameResourceProcessor;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/container/ModuleContainer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/container/ModuleContainer.eea
index 8ce254d85f..06c61f3930 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/container/ModuleContainer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/container/ModuleContainer.eea
@@ -2,13 +2,13 @@ class org/eclipse/osgi/container/ModuleContainer
 
 createRequirement
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Ljava/util/Map<Ljava/lang/String;*>;)Lorg/osgi/resource/Requirement;
- (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Ljava/util/Map<Ljava/lang/String;*>;)Lorg/osgi/resource/Requirement;
+ (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Ljava/util/Map<Ljava/lang/String;*>;)L1org/osgi/resource/Requirement;
 toString
  (Lorg/osgi/resource/Capability;)Ljava/lang/String;
- (Lorg/osgi/resource/Capability;)Ljava/lang/String;
+ (Lorg/osgi/resource/Capability;)L1java/lang/String;
 toString
  (Lorg/osgi/resource/Requirement;)Ljava/lang/String;
- (Lorg/osgi/resource/Requirement;)Ljava/lang/String;
+ (Lorg/osgi/resource/Requirement;)L1java/lang/String;
 
 <init>
  (Lorg/eclipse/osgi/container/ModuleContainerAdaptor;Lorg/eclipse/osgi/container/ModuleDatabase;)V
@@ -51,7 +51,7 @@ resolve
  (Ljava/util/Collection<Lorg/eclipse/osgi/container/Module;>;Z)Lorg/eclipse/osgi/report/resolution/ResolutionReport;
 resolveDynamic
  (Ljava/lang/String;Lorg/eclipse/osgi/container/ModuleRevision;)Lorg/eclipse/osgi/container/ModuleWire;
- (Ljava/lang/String;Lorg/eclipse/osgi/container/ModuleRevision;)Lorg/eclipse/osgi/container/ModuleWire;
+ (Ljava/lang/String;Lorg/eclipse/osgi/container/ModuleRevision;)L0org/eclipse/osgi/container/ModuleWire;
 store
  (Ljava/io/DataOutputStream;Z)V
  (Ljava/io/DataOutputStream;Z)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/container/ModuleContainerAdaptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/container/ModuleContainerAdaptor.eea
index f6126ee90c..94fb38f229 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/container/ModuleContainerAdaptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/container/ModuleContainerAdaptor.eea
@@ -2,28 +2,28 @@ class org/eclipse/osgi/container/ModuleContainerAdaptor
 
 adaptModuleRevisionBuilder
  (Lorg/eclipse/osgi/container/ModuleContainerAdaptor$ModuleEvent;Lorg/eclipse/osgi/container/Module;Lorg/eclipse/osgi/container/ModuleRevisionBuilder;Ljava/lang/Object;)Lorg/eclipse/osgi/container/ModuleRevisionBuilder;
- (Lorg/eclipse/osgi/container/ModuleContainerAdaptor$ModuleEvent;Lorg/eclipse/osgi/container/Module;Lorg/eclipse/osgi/container/ModuleRevisionBuilder;Ljava/lang/Object;)Lorg/eclipse/osgi/container/ModuleRevisionBuilder;
+ (Lorg/eclipse/osgi/container/ModuleContainerAdaptor$ModuleEvent;Lorg/eclipse/osgi/container/Module;Lorg/eclipse/osgi/container/ModuleRevisionBuilder;Ljava/lang/Object;)L0org/eclipse/osgi/container/ModuleRevisionBuilder;
 associateRevision
  (Lorg/eclipse/osgi/container/ModuleRevision;Ljava/lang/Object;)V
  (Lorg/eclipse/osgi/container/ModuleRevision;Ljava/lang/Object;)V
 createModule
  (Ljava/lang/String;JLjava/util/EnumSet<Lorg/eclipse/osgi/container/Module$Settings;>;I)Lorg/eclipse/osgi/container/Module;
- (Ljava/lang/String;JLjava/util/EnumSet<Lorg/eclipse/osgi/container/Module$Settings;>;I)Lorg/eclipse/osgi/container/Module;
+ (Ljava/lang/String;JLjava/util/EnumSet<Lorg/eclipse/osgi/container/Module$Settings;>;I)L1org/eclipse/osgi/container/Module;
 createModuleLoader
  (Lorg/eclipse/osgi/container/ModuleWiring;)Lorg/eclipse/osgi/container/ModuleLoader;
- (Lorg/eclipse/osgi/container/ModuleWiring;)Lorg/eclipse/osgi/container/ModuleLoader;
+ (Lorg/eclipse/osgi/container/ModuleWiring;)L1org/eclipse/osgi/container/ModuleLoader;
 createSystemModule
  ()Lorg/eclipse/osgi/container/SystemModule;
- ()Lorg/eclipse/osgi/container/SystemModule;
+ ()L1org/eclipse/osgi/container/SystemModule;
 getDebugOptions
  ()Lorg/eclipse/osgi/service/debug/DebugOptions;
- ()Lorg/eclipse/osgi/service/debug/DebugOptions;
+ ()L0org/eclipse/osgi/service/debug/DebugOptions;
 getModuleCollisionHook
  ()Lorg/eclipse/osgi/container/ModuleCollisionHook;
  ()Lorg/eclipse/osgi/container/ModuleCollisionHook;
 getProperty
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getResolverExecutor
  ()Ljava/util/concurrent/Executor;
  ()Ljava/util/concurrent/Executor;
@@ -32,10 +32,10 @@ getResolverHookFactory
  ()Lorg/osgi/framework/hooks/resolver/ResolverHookFactory;
 getRevisionInfo
  (Ljava/lang/String;J)Ljava/lang/Object;
- (Ljava/lang/String;J)Ljava/lang/Object;
+ (Ljava/lang/String;J)L0java/lang/Object;
 getScheduledExecutor
  ()Ljava/util/concurrent/ScheduledExecutorService;
- ()Ljava/util/concurrent/ScheduledExecutorService;
+ ()L0java/util/concurrent/ScheduledExecutorService;
 getStartLevelExecutor
  ()Ljava/util/concurrent/Executor;
  ()Ljava/util/concurrent/Executor;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/container/ModuleWire.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/container/ModuleWire.eea
index 7431a9d162..2726d81080 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/container/ModuleWire.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/container/ModuleWire.eea
@@ -8,7 +8,7 @@ getProvider
  ()Lorg/eclipse/osgi/container/ModuleRevision;
 getProviderWiring
  ()Lorg/eclipse/osgi/container/ModuleWiring;
- ()Lorg/eclipse/osgi/container/ModuleWiring;
+ ()L0org/eclipse/osgi/container/ModuleWiring;
 getRequirement
  ()Lorg/eclipse/osgi/container/ModuleRequirement;
  ()Lorg/eclipse/osgi/container/ModuleRequirement;
@@ -17,7 +17,7 @@ getRequirer
  ()Lorg/eclipse/osgi/container/ModuleRevision;
 getRequirerWiring
  ()Lorg/eclipse/osgi/container/ModuleWiring;
- ()Lorg/eclipse/osgi/container/ModuleWiring;
+ ()L0org/eclipse/osgi/container/ModuleWiring;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/container/ModuleWiring.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/container/ModuleWiring.eea
index e63325d04d..0036ccda93 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/container/ModuleWiring.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/container/ModuleWiring.eea
@@ -5,7 +5,7 @@ addDynamicImports
  (Lorg/eclipse/osgi/container/ModuleRevisionBuilder;)V
 findEntries
  (Ljava/lang/String;Ljava/lang/String;I)Ljava/util/List<Ljava/net/URL;>;
- (Ljava/lang/String;Ljava/lang/String;I)Ljava/util/List<Ljava/net/URL;>;
+ (Ljava/lang/String;Ljava/lang/String;I)L0java/util/List<Ljava/net/URL;>;
 getBundle
  ()Lorg/osgi/framework/Bundle;
  ()Lorg/osgi/framework/Bundle;
@@ -14,16 +14,16 @@ getCapabilities
  (Ljava/lang/String;)Ljava/util/List<Lorg/osgi/framework/wiring/BundleCapability;>;
 getClassLoader
  ()Ljava/lang/ClassLoader;
- ()Ljava/lang/ClassLoader;
+ ()L0java/lang/ClassLoader;
 getModuleCapabilities
  (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/container/ModuleCapability;>;
- (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/container/ModuleCapability;>;
+ (Ljava/lang/String;)L0java/util/List<Lorg/eclipse/osgi/container/ModuleCapability;>;
 getModuleLoader
  ()Lorg/eclipse/osgi/container/ModuleLoader;
  ()Lorg/eclipse/osgi/container/ModuleLoader;
 getModuleRequirements
  (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/container/ModuleRequirement;>;
- (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/container/ModuleRequirement;>;
+ (Ljava/lang/String;)L0java/util/List<Lorg/eclipse/osgi/container/ModuleRequirement;>;
 getProvidedModuleWires
  (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/container/ModuleWire;>;
  (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/container/ModuleWire;>;
@@ -65,7 +65,7 @@ isSubstitutedPackage
  (Ljava/lang/String;)Z
 listResources
  (Ljava/lang/String;Ljava/lang/String;I)Ljava/util/Collection<Ljava/lang/String;>;
- (Ljava/lang/String;Ljava/lang/String;I)Ljava/util/Collection<Ljava/lang/String;>;
+ (Ljava/lang/String;Ljava/lang/String;I)L0java/util/Collection<Ljava/lang/String;>;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.eea
index 59cd2f226a..36831d3d89 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.eea
@@ -2,7 +2,7 @@ class org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory
 
 createBuilder
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)Lorg/eclipse/osgi/container/ModuleRevisionBuilder;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)Lorg/eclipse/osgi/container/ModuleRevisionBuilder;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)L1org/eclipse/osgi/container/ModuleRevisionBuilder;
 createBuilder
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/osgi/container/ModuleRevisionBuilder;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/osgi/container/ModuleRevisionBuilder;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1org/eclipse/osgi/container/ModuleRevisionBuilder;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/framework/util/ArrayMap.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/framework/util/ArrayMap.eea
index 396e2db975..ce4fa0431a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/framework/util/ArrayMap.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/framework/util/ArrayMap.eea
@@ -23,22 +23,22 @@ containsAll
  (L1java/util/Collection<*>;)Z # @Inherited(java.util.Collection)
 get
  (TK;)TV;
- (TK;)TV;
+ (TK;)T0V;
 getKey
  (I)TK;
  (I)TK;
 getKeys
  ()Ljava/util/List<TK;>;
- ()Ljava/util/List<TK;>;
+ ()L1java/util/List<TK;>;
 getValue
  (I)TV;
  (I)TV;
 getValues
  ()Ljava/util/List<TV;>;
- ()Ljava/util/List<TV;>;
+ ()L1java/util/List<TV;>;
 iterator
  ()Ljava/util/Iterator<TK;>;
- ()Ljava/util/Iterator<TK;>;
+ ()L1java/util/Iterator<TK;>;
 put
  (TK;TV;)V
  (TK;TV;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/framework/util/CaseInsensitiveDictionaryMap.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/framework/util/CaseInsensitiveDictionaryMap.eea
index fa80bac4d6..0837d1e38f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/framework/util/CaseInsensitiveDictionaryMap.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/framework/util/CaseInsensitiveDictionaryMap.eea
@@ -11,10 +11,10 @@ super java/util/Map
 
 findCommonKeyIndex
  (Ljava/lang/String;)Lorg/eclipse/osgi/framework/util/CaseInsensitiveDictionaryMap$CaseInsensitiveKey;
- (Ljava/lang/String;)Lorg/eclipse/osgi/framework/util/CaseInsensitiveDictionaryMap$CaseInsensitiveKey;
+ (Ljava/lang/String;)L0org/eclipse/osgi/framework/util/CaseInsensitiveDictionaryMap$CaseInsensitiveKey;
 unmodifiableDictionary
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Dictionary<+TK;+TV;>;)Ljava/util/Dictionary<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Dictionary<+TK;+TV;>;)Ljava/util/Dictionary<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Dictionary<+TK;+TV;>;)L1java/util/Dictionary<TK;TV;>;
 
 <init>
  (Ljava/util/Dictionary<+TK;+TV;>;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/framework/util/FilePath.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/framework/util/FilePath.eea
index a0d9a2d3ad..89fa39c55d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/framework/util/FilePath.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/framework/util/FilePath.eea
@@ -14,7 +14,7 @@ getSegments
  ()[Ljava/lang/String;
 makeRelative
  (Lorg/eclipse/osgi/framework/util/FilePath;)Ljava/lang/String;
- (Lorg/eclipse/osgi/framework/util/FilePath;)Ljava/lang/String;
+ (Lorg/eclipse/osgi/framework/util/FilePath;)L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/framework/util/Headers.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/framework/util/Headers.eea
index 69a1248f75..4c3a60b895 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/framework/util/Headers.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/framework/util/Headers.eea
@@ -51,7 +51,7 @@ set
  (TK;TV;)TV;
 set
  (TK;TV;Z)TV;
- (TK;TV;Z)TV;
+ (TK;TV;Z)T0V;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/framework/util/SecureAction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/framework/util/SecureAction.eea
index e80de3bbf7..7be6765cb0 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/framework/util/SecureAction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/framework/util/SecureAction.eea
@@ -2,11 +2,11 @@ class org/eclipse/osgi/framework/util/SecureAction
 
 createSecureAction
  ()Ljava/security/PrivilegedAction<Lorg/eclipse/osgi/framework/util/SecureAction;>;
- ()Ljava/security/PrivilegedAction<Lorg/eclipse/osgi/framework/util/SecureAction;>;
+ ()L1java/security/PrivilegedAction<Lorg/eclipse/osgi/framework/util/SecureAction;>;
 
 createThread
  (Ljava/lang/Runnable;Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/Thread;
- (Ljava/lang/Runnable;Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/Thread;
+ (Ljava/lang/Runnable;Ljava/lang/String;Ljava/lang/ClassLoader;)L1java/lang/Thread;
 exists
  (Ljava/io/File;)Z
  (Ljava/io/File;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/framework/util/ThreadInfoReport.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/framework/util/ThreadInfoReport.eea
index 56a9520082..158bce1502 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/framework/util/ThreadInfoReport.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/framework/util/ThreadInfoReport.eea
@@ -2,7 +2,7 @@ class org/eclipse/osgi/framework/util/ThreadInfoReport
 
 getThreadDump
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 
 <init>
  (Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/launch/EquinoxFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/launch/EquinoxFactory.eea
index 0f6d5dd442..974bd6f440 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/launch/EquinoxFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/launch/EquinoxFactory.eea
@@ -5,4 +5,4 @@ newFramework
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)Lorg/osgi/framework/launch/Framework;
 newFramework
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Lorg/osgi/framework/connect/ModuleConnector;)Lorg/osgi/framework/launch/Framework;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Lorg/osgi/framework/connect/ModuleConnector;)Lorg/osgi/framework/launch/Framework;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Lorg/osgi/framework/connect/ModuleConnector;)L1org/osgi/framework/launch/Framework;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/service/datalocation/Location.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/service/datalocation/Location.eea
index f429dde588..b26b7023b8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/service/datalocation/Location.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/service/datalocation/Location.eea
@@ -42,7 +42,7 @@ USER_FILTER
 
 createLocation
  (Lorg/eclipse/osgi/service/datalocation/Location;Ljava/net/URL;Z)Lorg/eclipse/osgi/service/datalocation/Location;
- (Lorg/eclipse/osgi/service/datalocation/Location;Ljava/net/URL;Z)Lorg/eclipse/osgi/service/datalocation/Location;
+ (Lorg/eclipse/osgi/service/datalocation/Location;Ljava/net/URL;Z)L1org/eclipse/osgi/service/datalocation/Location;
 getDataArea
  (Ljava/lang/String;)Ljava/net/URL;
  (Ljava/lang/String;)Ljava/net/URL;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/service/resolver/PlatformAdmin.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/service/resolver/PlatformAdmin.eea
index 6804418b8f..d4f9dd1826 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/service/resolver/PlatformAdmin.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/service/resolver/PlatformAdmin.eea
@@ -8,7 +8,7 @@ commit
  (Lorg/eclipse/osgi/service/resolver/State;)V
 createResolver
  ()Lorg/eclipse/osgi/service/resolver/Resolver;
- ()Lorg/eclipse/osgi/service/resolver/Resolver;
+ ()L1org/eclipse/osgi/service/resolver/Resolver;
 getFactory
  ()Lorg/eclipse/osgi/service/resolver/StateObjectFactory;
  ()Lorg/eclipse/osgi/service/resolver/StateObjectFactory;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/service/resolver/StateObjectFactory$StateObjectFactoryProxy.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/service/resolver/StateObjectFactory$StateObjectFactoryProxy.eea
index db38b2bec5..05173fb287 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/service/resolver/StateObjectFactory$StateObjectFactoryProxy.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/service/resolver/StateObjectFactory$StateObjectFactoryProxy.eea
@@ -2,94 +2,94 @@ class org/eclipse/osgi/service/resolver/StateObjectFactory$StateObjectFactoryPro
 
 createBundleDescription
  (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;Ljava/lang/String;[Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/GenericSpecification;[Lorg/eclipse/osgi/service/resolver/GenericDescription;Lorg/eclipse/osgi/service/resolver/NativeCodeSpecification;)Lorg/eclipse/osgi/service/resolver/BundleDescription;
- (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;Ljava/lang/String;[Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/GenericSpecification;[Lorg/eclipse/osgi/service/resolver/GenericDescription;Lorg/eclipse/osgi/service/resolver/NativeCodeSpecification;)Lorg/eclipse/osgi/service/resolver/BundleDescription;
+ (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;Ljava/lang/String;[Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/GenericSpecification;[Lorg/eclipse/osgi/service/resolver/GenericDescription;Lorg/eclipse/osgi/service/resolver/NativeCodeSpecification;)L1org/eclipse/osgi/service/resolver/BundleDescription; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createBundleDescription
  (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;ZZZLjava/lang/String;[Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/GenericSpecification;[Lorg/eclipse/osgi/service/resolver/GenericDescription;)Lorg/eclipse/osgi/service/resolver/BundleDescription;
- (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;ZZZLjava/lang/String;[Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/GenericSpecification;[Lorg/eclipse/osgi/service/resolver/GenericDescription;)Lorg/eclipse/osgi/service/resolver/BundleDescription;
+ (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;ZZZLjava/lang/String;[Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/GenericSpecification;[Lorg/eclipse/osgi/service/resolver/GenericDescription;)L1org/eclipse/osgi/service/resolver/BundleDescription; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createBundleDescription
  (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;ZZZLjava/lang/String;[Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/GenericSpecification;[Lorg/eclipse/osgi/service/resolver/GenericDescription;Lorg/eclipse/osgi/service/resolver/NativeCodeSpecification;)Lorg/eclipse/osgi/service/resolver/BundleDescription;
- (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;ZZZLjava/lang/String;[Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/GenericSpecification;[Lorg/eclipse/osgi/service/resolver/GenericDescription;Lorg/eclipse/osgi/service/resolver/NativeCodeSpecification;)Lorg/eclipse/osgi/service/resolver/BundleDescription;
+ (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;ZZZLjava/lang/String;[Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/GenericSpecification;[Lorg/eclipse/osgi/service/resolver/GenericDescription;Lorg/eclipse/osgi/service/resolver/NativeCodeSpecification;)L1org/eclipse/osgi/service/resolver/BundleDescription; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createBundleDescription
  (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;[Ljava/lang/String;Z)Lorg/eclipse/osgi/service/resolver/BundleDescription;
- (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;[Ljava/lang/String;Z)Lorg/eclipse/osgi/service/resolver/BundleDescription;
+ (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;[Ljava/lang/String;Z)L1org/eclipse/osgi/service/resolver/BundleDescription; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createBundleDescription
  (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;[Ljava/lang/String;ZZZLjava/lang/String;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/GenericSpecification;[Lorg/eclipse/osgi/service/resolver/GenericDescription;)Lorg/eclipse/osgi/service/resolver/BundleDescription;
- (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;[Ljava/lang/String;ZZZLjava/lang/String;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/GenericSpecification;[Lorg/eclipse/osgi/service/resolver/GenericDescription;)Lorg/eclipse/osgi/service/resolver/BundleDescription;
+ (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;[Ljava/lang/String;ZZZLjava/lang/String;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/GenericSpecification;[Lorg/eclipse/osgi/service/resolver/GenericDescription;)L1org/eclipse/osgi/service/resolver/BundleDescription; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createBundleDescription
  (Ljava/util/Dictionary<Ljava/lang/String;Ljava/lang/String;>;Ljava/lang/String;J)Lorg/eclipse/osgi/service/resolver/BundleDescription;
- (Ljava/util/Dictionary<Ljava/lang/String;Ljava/lang/String;>;Ljava/lang/String;J)Lorg/eclipse/osgi/service/resolver/BundleDescription;
+ (Ljava/util/Dictionary<Ljava/lang/String;Ljava/lang/String;>;Ljava/lang/String;J)L1org/eclipse/osgi/service/resolver/BundleDescription; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createBundleDescription
  (Lorg/eclipse/osgi/service/resolver/BundleDescription;)Lorg/eclipse/osgi/service/resolver/BundleDescription;
- (Lorg/eclipse/osgi/service/resolver/BundleDescription;)Lorg/eclipse/osgi/service/resolver/BundleDescription;
+ (Lorg/eclipse/osgi/service/resolver/BundleDescription;)L1org/eclipse/osgi/service/resolver/BundleDescription; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createBundleDescription
  (Lorg/eclipse/osgi/service/resolver/State;Ljava/util/Dictionary<Ljava/lang/String;Ljava/lang/String;>;Ljava/lang/String;J)Lorg/eclipse/osgi/service/resolver/BundleDescription;
- (Lorg/eclipse/osgi/service/resolver/State;Ljava/util/Dictionary<Ljava/lang/String;Ljava/lang/String;>;Ljava/lang/String;J)Lorg/eclipse/osgi/service/resolver/BundleDescription;
+ (Lorg/eclipse/osgi/service/resolver/State;Ljava/util/Dictionary<Ljava/lang/String;Ljava/lang/String;>;Ljava/lang/String;J)L1org/eclipse/osgi/service/resolver/BundleDescription; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createBundleSpecification
  (Ljava/lang/String;Lorg/eclipse/osgi/service/resolver/VersionRange;ZZ)Lorg/eclipse/osgi/service/resolver/BundleSpecification;
- (Ljava/lang/String;Lorg/eclipse/osgi/service/resolver/VersionRange;ZZ)Lorg/eclipse/osgi/service/resolver/BundleSpecification;
+ (Ljava/lang/String;Lorg/eclipse/osgi/service/resolver/VersionRange;ZZ)L1org/eclipse/osgi/service/resolver/BundleSpecification; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createBundleSpecification
  (Lorg/eclipse/osgi/service/resolver/BundleSpecification;)Lorg/eclipse/osgi/service/resolver/BundleSpecification;
- (Lorg/eclipse/osgi/service/resolver/BundleSpecification;)Lorg/eclipse/osgi/service/resolver/BundleSpecification;
+ (Lorg/eclipse/osgi/service/resolver/BundleSpecification;)L1org/eclipse/osgi/service/resolver/BundleSpecification; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createBundleSpecifications
  (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/service/resolver/BundleSpecification;>;
- (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/service/resolver/BundleSpecification;>;
+ (Ljava/lang/String;)L1java/util/List<Lorg/eclipse/osgi/service/resolver/BundleSpecification;>; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createExportPackageDescription
  (Ljava/lang/String;Lorg/osgi/framework/Version;Ljava/util/Map<Ljava/lang/String;*>;Ljava/util/Map<Ljava/lang/String;*>;ZLorg/eclipse/osgi/service/resolver/BundleDescription;)Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;
- (Ljava/lang/String;Lorg/osgi/framework/Version;Ljava/util/Map<Ljava/lang/String;*>;Ljava/util/Map<Ljava/lang/String;*>;ZLorg/eclipse/osgi/service/resolver/BundleDescription;)Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;
+ (Ljava/lang/String;Lorg/osgi/framework/Version;Ljava/util/Map<Ljava/lang/String;*>;Ljava/util/Map<Ljava/lang/String;*>;ZLorg/eclipse/osgi/service/resolver/BundleDescription;)L1org/eclipse/osgi/service/resolver/ExportPackageDescription; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createExportPackageDescription
  (Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;)Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;
- (Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;)Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;
+ (Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;)L1org/eclipse/osgi/service/resolver/ExportPackageDescription; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createExportPackageDescriptions
  (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;>;
- (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;>;
+ (Ljava/lang/String;)L1java/util/List<Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;>; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createGenericDescription
  (Ljava/lang/String;Ljava/lang/String;Lorg/osgi/framework/Version;Ljava/util/Map<Ljava/lang/String;*>;)Lorg/eclipse/osgi/service/resolver/GenericDescription;
- (Ljava/lang/String;Ljava/lang/String;Lorg/osgi/framework/Version;Ljava/util/Map<Ljava/lang/String;*>;)Lorg/eclipse/osgi/service/resolver/GenericDescription;
+ (Ljava/lang/String;Ljava/lang/String;Lorg/osgi/framework/Version;Ljava/util/Map<Ljava/lang/String;*>;)L1org/eclipse/osgi/service/resolver/GenericDescription; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createGenericDescription
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Lorg/eclipse/osgi/service/resolver/BundleDescription;)Lorg/eclipse/osgi/service/resolver/GenericDescription;
- (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Lorg/eclipse/osgi/service/resolver/BundleDescription;)Lorg/eclipse/osgi/service/resolver/GenericDescription;
+ (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Lorg/eclipse/osgi/service/resolver/BundleDescription;)L1org/eclipse/osgi/service/resolver/GenericDescription; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createGenericDescriptions
  (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/service/resolver/GenericDescription;>;
- (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/service/resolver/GenericDescription;>;
+ (Ljava/lang/String;)L1java/util/List<Lorg/eclipse/osgi/service/resolver/GenericDescription;>; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createGenericSpecification
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZ)Lorg/eclipse/osgi/service/resolver/GenericSpecification;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZ)Lorg/eclipse/osgi/service/resolver/GenericSpecification;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZ)L1org/eclipse/osgi/service/resolver/GenericSpecification; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createGenericSpecifications
  (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/service/resolver/GenericSpecification;>;
- (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/service/resolver/GenericSpecification;>;
+ (Ljava/lang/String;)L1java/util/List<Lorg/eclipse/osgi/service/resolver/GenericSpecification;>; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createHostSpecification
  (Ljava/lang/String;Lorg/eclipse/osgi/service/resolver/VersionRange;)Lorg/eclipse/osgi/service/resolver/HostSpecification;
- (Ljava/lang/String;Lorg/eclipse/osgi/service/resolver/VersionRange;)Lorg/eclipse/osgi/service/resolver/HostSpecification;
+ (Ljava/lang/String;Lorg/eclipse/osgi/service/resolver/VersionRange;)L1org/eclipse/osgi/service/resolver/HostSpecification; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createHostSpecification
  (Lorg/eclipse/osgi/service/resolver/HostSpecification;)Lorg/eclipse/osgi/service/resolver/HostSpecification;
- (Lorg/eclipse/osgi/service/resolver/HostSpecification;)Lorg/eclipse/osgi/service/resolver/HostSpecification;
+ (Lorg/eclipse/osgi/service/resolver/HostSpecification;)L1org/eclipse/osgi/service/resolver/HostSpecification; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createHostSpecifications
  (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/service/resolver/HostSpecification;>;
- (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/service/resolver/HostSpecification;>;
+ (Ljava/lang/String;)L1java/util/List<Lorg/eclipse/osgi/service/resolver/HostSpecification;>; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createImportPackageSpecification
  (Ljava/lang/String;Lorg/eclipse/osgi/service/resolver/VersionRange;Ljava/lang/String;Lorg/eclipse/osgi/service/resolver/VersionRange;Ljava/util/Map<Ljava/lang/String;*>;Ljava/util/Map<Ljava/lang/String;*>;Lorg/eclipse/osgi/service/resolver/BundleDescription;)Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;
- (Ljava/lang/String;Lorg/eclipse/osgi/service/resolver/VersionRange;Ljava/lang/String;Lorg/eclipse/osgi/service/resolver/VersionRange;Ljava/util/Map<Ljava/lang/String;*>;Ljava/util/Map<Ljava/lang/String;*>;Lorg/eclipse/osgi/service/resolver/BundleDescription;)Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;
+ (Ljava/lang/String;Lorg/eclipse/osgi/service/resolver/VersionRange;Ljava/lang/String;Lorg/eclipse/osgi/service/resolver/VersionRange;Ljava/util/Map<Ljava/lang/String;*>;Ljava/util/Map<Ljava/lang/String;*>;Lorg/eclipse/osgi/service/resolver/BundleDescription;)L1org/eclipse/osgi/service/resolver/ImportPackageSpecification; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createImportPackageSpecification
  (Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;)Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;
- (Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;)Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;
+ (Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;)L1org/eclipse/osgi/service/resolver/ImportPackageSpecification; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createImportPackageSpecifications
  (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;>;
- (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;>;
+ (Ljava/lang/String;)L1java/util/List<Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;>; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createNativeCodeDescription
  ([Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/VersionRange;[Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/osgi/service/resolver/NativeCodeDescription;
- ([Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/VersionRange;[Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/osgi/service/resolver/NativeCodeDescription;
+ ([Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/VersionRange;[Ljava/lang/String;Ljava/lang/String;)L1org/eclipse/osgi/service/resolver/NativeCodeDescription; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createNativeCodeSpecification
  ([Lorg/eclipse/osgi/service/resolver/NativeCodeDescription;Z)Lorg/eclipse/osgi/service/resolver/NativeCodeSpecification;
- ([Lorg/eclipse/osgi/service/resolver/NativeCodeDescription;Z)Lorg/eclipse/osgi/service/resolver/NativeCodeSpecification;
+ ([Lorg/eclipse/osgi/service/resolver/NativeCodeDescription;Z)L1org/eclipse/osgi/service/resolver/NativeCodeSpecification; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createState
  ()Lorg/eclipse/osgi/service/resolver/State;
- ()Lorg/eclipse/osgi/service/resolver/State;
+ ()L1org/eclipse/osgi/service/resolver/State; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createState
  (Lorg/eclipse/osgi/service/resolver/State;)Lorg/eclipse/osgi/service/resolver/State;
- (Lorg/eclipse/osgi/service/resolver/State;)Lorg/eclipse/osgi/service/resolver/State;
+ (Lorg/eclipse/osgi/service/resolver/State;)L1org/eclipse/osgi/service/resolver/State; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 createState
  (Z)Lorg/eclipse/osgi/service/resolver/State;
- (Z)Lorg/eclipse/osgi/service/resolver/State;
+ (Z)L1org/eclipse/osgi/service/resolver/State; # @Inherited(org.eclipse.osgi.service.resolver.StateObjectFactory)
 readState
  (Ljava/io/DataInputStream;)Lorg/eclipse/osgi/service/resolver/State;
  (Ljava/io/DataInputStream;)Lorg/eclipse/osgi/service/resolver/State;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/service/resolver/StateObjectFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/service/resolver/StateObjectFactory.eea
index 612289fc49..0680caacc6 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/service/resolver/StateObjectFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/service/resolver/StateObjectFactory.eea
@@ -6,94 +6,94 @@ defaultFactory
 
 createBundleDescription
  (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;Ljava/lang/String;[Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/GenericSpecification;[Lorg/eclipse/osgi/service/resolver/GenericDescription;Lorg/eclipse/osgi/service/resolver/NativeCodeSpecification;)Lorg/eclipse/osgi/service/resolver/BundleDescription;
- (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;Ljava/lang/String;[Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/GenericSpecification;[Lorg/eclipse/osgi/service/resolver/GenericDescription;Lorg/eclipse/osgi/service/resolver/NativeCodeSpecification;)Lorg/eclipse/osgi/service/resolver/BundleDescription;
+ (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;Ljava/lang/String;[Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/GenericSpecification;[Lorg/eclipse/osgi/service/resolver/GenericDescription;Lorg/eclipse/osgi/service/resolver/NativeCodeSpecification;)L1org/eclipse/osgi/service/resolver/BundleDescription;
 createBundleDescription
  (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;ZZZLjava/lang/String;[Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/GenericSpecification;[Lorg/eclipse/osgi/service/resolver/GenericDescription;)Lorg/eclipse/osgi/service/resolver/BundleDescription;
- (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;ZZZLjava/lang/String;[Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/GenericSpecification;[Lorg/eclipse/osgi/service/resolver/GenericDescription;)Lorg/eclipse/osgi/service/resolver/BundleDescription;
+ (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;ZZZLjava/lang/String;[Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/GenericSpecification;[Lorg/eclipse/osgi/service/resolver/GenericDescription;)L1org/eclipse/osgi/service/resolver/BundleDescription;
 createBundleDescription
  (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;ZZZLjava/lang/String;[Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/GenericSpecification;[Lorg/eclipse/osgi/service/resolver/GenericDescription;Lorg/eclipse/osgi/service/resolver/NativeCodeSpecification;)Lorg/eclipse/osgi/service/resolver/BundleDescription;
- (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;ZZZLjava/lang/String;[Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/GenericSpecification;[Lorg/eclipse/osgi/service/resolver/GenericDescription;Lorg/eclipse/osgi/service/resolver/NativeCodeSpecification;)Lorg/eclipse/osgi/service/resolver/BundleDescription;
+ (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;ZZZLjava/lang/String;[Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/GenericSpecification;[Lorg/eclipse/osgi/service/resolver/GenericDescription;Lorg/eclipse/osgi/service/resolver/NativeCodeSpecification;)L1org/eclipse/osgi/service/resolver/BundleDescription;
 createBundleDescription
  (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;[Ljava/lang/String;Z)Lorg/eclipse/osgi/service/resolver/BundleDescription;
- (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;[Ljava/lang/String;Z)Lorg/eclipse/osgi/service/resolver/BundleDescription;
+ (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;[Ljava/lang/String;Z)L1org/eclipse/osgi/service/resolver/BundleDescription;
 createBundleDescription
  (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;[Ljava/lang/String;ZZZLjava/lang/String;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/GenericSpecification;[Lorg/eclipse/osgi/service/resolver/GenericDescription;)Lorg/eclipse/osgi/service/resolver/BundleDescription;
- (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;[Ljava/lang/String;ZZZLjava/lang/String;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/GenericSpecification;[Lorg/eclipse/osgi/service/resolver/GenericDescription;)Lorg/eclipse/osgi/service/resolver/BundleDescription;
+ (JLjava/lang/String;Lorg/osgi/framework/Version;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/BundleSpecification;Lorg/eclipse/osgi/service/resolver/HostSpecification;[Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;[Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;[Ljava/lang/String;ZZZLjava/lang/String;Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/GenericSpecification;[Lorg/eclipse/osgi/service/resolver/GenericDescription;)L1org/eclipse/osgi/service/resolver/BundleDescription;
 createBundleDescription
  (Ljava/util/Dictionary<Ljava/lang/String;Ljava/lang/String;>;Ljava/lang/String;J)Lorg/eclipse/osgi/service/resolver/BundleDescription;
- (Ljava/util/Dictionary<Ljava/lang/String;Ljava/lang/String;>;Ljava/lang/String;J)Lorg/eclipse/osgi/service/resolver/BundleDescription;
+ (Ljava/util/Dictionary<Ljava/lang/String;Ljava/lang/String;>;Ljava/lang/String;J)L1org/eclipse/osgi/service/resolver/BundleDescription;
 createBundleDescription
  (Lorg/eclipse/osgi/service/resolver/BundleDescription;)Lorg/eclipse/osgi/service/resolver/BundleDescription;
- (Lorg/eclipse/osgi/service/resolver/BundleDescription;)Lorg/eclipse/osgi/service/resolver/BundleDescription;
+ (Lorg/eclipse/osgi/service/resolver/BundleDescription;)L1org/eclipse/osgi/service/resolver/BundleDescription;
 createBundleDescription
  (Lorg/eclipse/osgi/service/resolver/State;Ljava/util/Dictionary<Ljava/lang/String;Ljava/lang/String;>;Ljava/lang/String;J)Lorg/eclipse/osgi/service/resolver/BundleDescription;
- (Lorg/eclipse/osgi/service/resolver/State;Ljava/util/Dictionary<Ljava/lang/String;Ljava/lang/String;>;Ljava/lang/String;J)Lorg/eclipse/osgi/service/resolver/BundleDescription;
+ (Lorg/eclipse/osgi/service/resolver/State;Ljava/util/Dictionary<Ljava/lang/String;Ljava/lang/String;>;Ljava/lang/String;J)L1org/eclipse/osgi/service/resolver/BundleDescription;
 createBundleSpecification
  (Ljava/lang/String;Lorg/eclipse/osgi/service/resolver/VersionRange;ZZ)Lorg/eclipse/osgi/service/resolver/BundleSpecification;
- (Ljava/lang/String;Lorg/eclipse/osgi/service/resolver/VersionRange;ZZ)Lorg/eclipse/osgi/service/resolver/BundleSpecification;
+ (Ljava/lang/String;Lorg/eclipse/osgi/service/resolver/VersionRange;ZZ)L1org/eclipse/osgi/service/resolver/BundleSpecification;
 createBundleSpecification
  (Lorg/eclipse/osgi/service/resolver/BundleSpecification;)Lorg/eclipse/osgi/service/resolver/BundleSpecification;
- (Lorg/eclipse/osgi/service/resolver/BundleSpecification;)Lorg/eclipse/osgi/service/resolver/BundleSpecification;
+ (Lorg/eclipse/osgi/service/resolver/BundleSpecification;)L1org/eclipse/osgi/service/resolver/BundleSpecification;
 createBundleSpecifications
  (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/service/resolver/BundleSpecification;>;
- (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/service/resolver/BundleSpecification;>;
+ (Ljava/lang/String;)L1java/util/List<Lorg/eclipse/osgi/service/resolver/BundleSpecification;>;
 createExportPackageDescription
  (Ljava/lang/String;Lorg/osgi/framework/Version;Ljava/util/Map<Ljava/lang/String;*>;Ljava/util/Map<Ljava/lang/String;*>;ZLorg/eclipse/osgi/service/resolver/BundleDescription;)Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;
- (Ljava/lang/String;Lorg/osgi/framework/Version;Ljava/util/Map<Ljava/lang/String;*>;Ljava/util/Map<Ljava/lang/String;*>;ZLorg/eclipse/osgi/service/resolver/BundleDescription;)Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;
+ (Ljava/lang/String;Lorg/osgi/framework/Version;Ljava/util/Map<Ljava/lang/String;*>;Ljava/util/Map<Ljava/lang/String;*>;ZLorg/eclipse/osgi/service/resolver/BundleDescription;)L1org/eclipse/osgi/service/resolver/ExportPackageDescription;
 createExportPackageDescription
  (Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;)Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;
- (Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;)Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;
+ (Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;)L1org/eclipse/osgi/service/resolver/ExportPackageDescription;
 createExportPackageDescriptions
  (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;>;
- (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;>;
+ (Ljava/lang/String;)L1java/util/List<Lorg/eclipse/osgi/service/resolver/ExportPackageDescription;>;
 createGenericDescription
  (Ljava/lang/String;Ljava/lang/String;Lorg/osgi/framework/Version;Ljava/util/Map<Ljava/lang/String;*>;)Lorg/eclipse/osgi/service/resolver/GenericDescription;
- (Ljava/lang/String;Ljava/lang/String;Lorg/osgi/framework/Version;Ljava/util/Map<Ljava/lang/String;*>;)Lorg/eclipse/osgi/service/resolver/GenericDescription;
+ (Ljava/lang/String;Ljava/lang/String;Lorg/osgi/framework/Version;Ljava/util/Map<Ljava/lang/String;*>;)L1org/eclipse/osgi/service/resolver/GenericDescription;
 createGenericDescription
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Lorg/eclipse/osgi/service/resolver/BundleDescription;)Lorg/eclipse/osgi/service/resolver/GenericDescription;
- (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Lorg/eclipse/osgi/service/resolver/BundleDescription;)Lorg/eclipse/osgi/service/resolver/GenericDescription;
+ (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Lorg/eclipse/osgi/service/resolver/BundleDescription;)L1org/eclipse/osgi/service/resolver/GenericDescription;
 createGenericDescriptions
  (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/service/resolver/GenericDescription;>;
- (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/service/resolver/GenericDescription;>;
+ (Ljava/lang/String;)L1java/util/List<Lorg/eclipse/osgi/service/resolver/GenericDescription;>;
 createGenericSpecification
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZ)Lorg/eclipse/osgi/service/resolver/GenericSpecification;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZ)Lorg/eclipse/osgi/service/resolver/GenericSpecification;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZ)L1org/eclipse/osgi/service/resolver/GenericSpecification;
 createGenericSpecifications
  (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/service/resolver/GenericSpecification;>;
- (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/service/resolver/GenericSpecification;>;
+ (Ljava/lang/String;)L1java/util/List<Lorg/eclipse/osgi/service/resolver/GenericSpecification;>;
 createHostSpecification
  (Ljava/lang/String;Lorg/eclipse/osgi/service/resolver/VersionRange;)Lorg/eclipse/osgi/service/resolver/HostSpecification;
- (Ljava/lang/String;Lorg/eclipse/osgi/service/resolver/VersionRange;)Lorg/eclipse/osgi/service/resolver/HostSpecification;
+ (Ljava/lang/String;Lorg/eclipse/osgi/service/resolver/VersionRange;)L1org/eclipse/osgi/service/resolver/HostSpecification;
 createHostSpecification
  (Lorg/eclipse/osgi/service/resolver/HostSpecification;)Lorg/eclipse/osgi/service/resolver/HostSpecification;
- (Lorg/eclipse/osgi/service/resolver/HostSpecification;)Lorg/eclipse/osgi/service/resolver/HostSpecification;
+ (Lorg/eclipse/osgi/service/resolver/HostSpecification;)L1org/eclipse/osgi/service/resolver/HostSpecification;
 createHostSpecifications
  (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/service/resolver/HostSpecification;>;
- (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/service/resolver/HostSpecification;>;
+ (Ljava/lang/String;)L1java/util/List<Lorg/eclipse/osgi/service/resolver/HostSpecification;>;
 createImportPackageSpecification
  (Ljava/lang/String;Lorg/eclipse/osgi/service/resolver/VersionRange;Ljava/lang/String;Lorg/eclipse/osgi/service/resolver/VersionRange;Ljava/util/Map<Ljava/lang/String;*>;Ljava/util/Map<Ljava/lang/String;*>;Lorg/eclipse/osgi/service/resolver/BundleDescription;)Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;
- (Ljava/lang/String;Lorg/eclipse/osgi/service/resolver/VersionRange;Ljava/lang/String;Lorg/eclipse/osgi/service/resolver/VersionRange;Ljava/util/Map<Ljava/lang/String;*>;Ljava/util/Map<Ljava/lang/String;*>;Lorg/eclipse/osgi/service/resolver/BundleDescription;)Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;
+ (Ljava/lang/String;Lorg/eclipse/osgi/service/resolver/VersionRange;Ljava/lang/String;Lorg/eclipse/osgi/service/resolver/VersionRange;Ljava/util/Map<Ljava/lang/String;*>;Ljava/util/Map<Ljava/lang/String;*>;Lorg/eclipse/osgi/service/resolver/BundleDescription;)L1org/eclipse/osgi/service/resolver/ImportPackageSpecification;
 createImportPackageSpecification
  (Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;)Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;
- (Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;)Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;
+ (Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;)L1org/eclipse/osgi/service/resolver/ImportPackageSpecification;
 createImportPackageSpecifications
  (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;>;
- (Ljava/lang/String;)Ljava/util/List<Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;>;
+ (Ljava/lang/String;)L1java/util/List<Lorg/eclipse/osgi/service/resolver/ImportPackageSpecification;>;
 createNativeCodeDescription
  ([Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/VersionRange;[Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/osgi/service/resolver/NativeCodeDescription;
- ([Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/VersionRange;[Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/osgi/service/resolver/NativeCodeDescription;
+ ([Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;[Lorg/eclipse/osgi/service/resolver/VersionRange;[Ljava/lang/String;Ljava/lang/String;)L1org/eclipse/osgi/service/resolver/NativeCodeDescription;
 createNativeCodeSpecification
  ([Lorg/eclipse/osgi/service/resolver/NativeCodeDescription;Z)Lorg/eclipse/osgi/service/resolver/NativeCodeSpecification;
- ([Lorg/eclipse/osgi/service/resolver/NativeCodeDescription;Z)Lorg/eclipse/osgi/service/resolver/NativeCodeSpecification;
+ ([Lorg/eclipse/osgi/service/resolver/NativeCodeDescription;Z)L1org/eclipse/osgi/service/resolver/NativeCodeSpecification;
 createState
  ()Lorg/eclipse/osgi/service/resolver/State;
- ()Lorg/eclipse/osgi/service/resolver/State;
+ ()L1org/eclipse/osgi/service/resolver/State;
 createState
  (Lorg/eclipse/osgi/service/resolver/State;)Lorg/eclipse/osgi/service/resolver/State;
- (Lorg/eclipse/osgi/service/resolver/State;)Lorg/eclipse/osgi/service/resolver/State;
+ (Lorg/eclipse/osgi/service/resolver/State;)L1org/eclipse/osgi/service/resolver/State;
 createState
  (Z)Lorg/eclipse/osgi/service/resolver/State;
- (Z)Lorg/eclipse/osgi/service/resolver/State;
+ (Z)L1org/eclipse/osgi/service/resolver/State;
 readState
  (Ljava/io/DataInputStream;)Lorg/eclipse/osgi/service/resolver/State;
  (Ljava/io/DataInputStream;)Lorg/eclipse/osgi/service/resolver/State;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/BundleInfo$Generation.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/BundleInfo$Generation.eea
index f0e2eb232e..4393ad7453 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/BundleInfo$Generation.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/BundleInfo$Generation.eea
@@ -23,10 +23,10 @@ getDomain
  ()Ljava/security/ProtectionDomain;
 getDomain
  (Z)Ljava/security/ProtectionDomain;
- (Z)Ljava/security/ProtectionDomain;
+ (Z)L0java/security/ProtectionDomain;
 getEntry
  (Ljava/lang/String;)Ljava/net/URL;
- (Ljava/lang/String;)Ljava/net/URL;
+ (Ljava/lang/String;)L0java/net/URL;
 getExtractFile
  (Ljava/lang/String;)Ljava/io/File;
  (Ljava/lang/String;)Ljava/io/File;
@@ -47,7 +47,7 @@ getRevision
  ()Lorg/eclipse/osgi/container/ModuleRevision;
 getStorageHook
  <S:Ljava/lang/Object;L:Ljava/lang/Object;H:Lorg/eclipse/osgi/internal/hookregistry/StorageHookFactory$StorageHook<TS;TL;>;>(Ljava/lang/Class<+Lorg/eclipse/osgi/internal/hookregistry/StorageHookFactory<TS;TL;TH;>;>;)TH;
- <S:Ljava/lang/Object;L:Ljava/lang/Object;H:Lorg/eclipse/osgi/internal/hookregistry/StorageHookFactory$StorageHook<TS;TL;>;>(Ljava/lang/Class<+Lorg/eclipse/osgi/internal/hookregistry/StorageHookFactory<TS;TL;TH;>;>;)TH;
+ <S:Ljava/lang/Object;L:Ljava/lang/Object;H:Lorg/eclipse/osgi/internal/hookregistry/StorageHookFactory$StorageHook<TS;TL;>;>(Ljava/lang/Class<+Lorg/eclipse/osgi/internal/hookregistry/StorageHookFactory<TS;TL;TH;>;>;)T0H;
 setRevision
  (Lorg/eclipse/osgi/container/ModuleRevision;)V
  (Lorg/eclipse/osgi/container/ModuleRevision;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/BundleInfo.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/BundleInfo.eea
index 17f1eba58d..22eecf48c0 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/BundleInfo.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/BundleInfo.eea
@@ -18,7 +18,7 @@ OSGI_BUNDLE_MANIFEST
  (Lorg/eclipse/osgi/storage/Storage;JLjava/lang/String;J)V
 getDataFile
  (Ljava/lang/String;)Ljava/io/File;
- (Ljava/lang/String;)Ljava/io/File;
+ (Ljava/lang/String;)L0java/io/File;
 getLocation
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/PermissionData.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/PermissionData.eea
index 0f3bd84dc0..36c35fb8f2 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/PermissionData.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/PermissionData.eea
@@ -8,7 +8,7 @@ getLocations
  ()[Ljava/lang/String;
 getPermissionData
  (Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/String;)[0Ljava/lang/String;
 saveConditionalPermissionInfos
  ([Ljava/lang/String;)V
  ([Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/Storage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/Storage.eea
index 1929b89f3b..723bdd3b8f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/Storage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/Storage.eea
@@ -21,29 +21,29 @@ LIB_TEMP
 
 createStorage
  (Lorg/eclipse/osgi/internal/framework/EquinoxContainer;)Lorg/eclipse/osgi/storage/Storage;
- (Lorg/eclipse/osgi/internal/framework/EquinoxContainer;)Lorg/eclipse/osgi/storage/Storage;
+ (Lorg/eclipse/osgi/internal/framework/EquinoxContainer;)L1org/eclipse/osgi/storage/Storage;
 findEntries
  (Ljava/util/List<Lorg/eclipse/osgi/storage/BundleInfo$Generation;>;Ljava/lang/String;Ljava/lang/String;I)Ljava/util/Enumeration<Ljava/net/URL;>;
- (Ljava/util/List<Lorg/eclipse/osgi/storage/BundleInfo$Generation;>;Ljava/lang/String;Ljava/lang/String;I)Ljava/util/Enumeration<Ljava/net/URL;>;
+ (Ljava/util/List<Lorg/eclipse/osgi/storage/BundleInfo$Generation;>;Ljava/lang/String;Ljava/lang/String;I)L0java/util/Enumeration<Ljava/net/URL;>;
 listEntryPaths
  (Ljava/util/List<Lorg/eclipse/osgi/storage/bundlefile/BundleFile;>;Ljava/lang/String;Ljava/lang/String;I)Ljava/util/List<Ljava/lang/String;>;
- (Ljava/util/List<Lorg/eclipse/osgi/storage/bundlefile/BundleFile;>;Ljava/lang/String;Ljava/lang/String;I)Ljava/util/List<Ljava/lang/String;>;
+ (Ljava/util/List<Lorg/eclipse/osgi/storage/bundlefile/BundleFile;>;Ljava/lang/String;Ljava/lang/String;I)L1java/util/List<Ljava/lang/String;>;
 sanitizeFilterInput
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 
 copyToTempLibrary
  (Lorg/eclipse/osgi/storage/BundleInfo$Generation;Ljava/lang/String;)Ljava/lang/String;
- (Lorg/eclipse/osgi/storage/BundleInfo$Generation;Ljava/lang/String;)Ljava/lang/String;
+ (Lorg/eclipse/osgi/storage/BundleInfo$Generation;Ljava/lang/String;)L0java/lang/String;
 createBundleFile
  (Ljava/io/File;Lorg/eclipse/osgi/storage/BundleInfo$Generation;ZZ)Lorg/eclipse/osgi/storage/bundlefile/BundleFile;
- (Ljava/io/File;Lorg/eclipse/osgi/storage/BundleInfo$Generation;ZZ)Lorg/eclipse/osgi/storage/bundlefile/BundleFile;
+ (Ljava/io/File;Lorg/eclipse/osgi/storage/BundleInfo$Generation;ZZ)L1org/eclipse/osgi/storage/bundlefile/BundleFile;
 createNestedBundleFile
  (Ljava/lang/String;Lorg/eclipse/osgi/storage/bundlefile/BundleFile;Lorg/eclipse/osgi/storage/BundleInfo$Generation;)Lorg/eclipse/osgi/storage/bundlefile/BundleFile;
- (Ljava/lang/String;Lorg/eclipse/osgi/storage/bundlefile/BundleFile;Lorg/eclipse/osgi/storage/BundleInfo$Generation;)Lorg/eclipse/osgi/storage/bundlefile/BundleFile;
+ (Ljava/lang/String;Lorg/eclipse/osgi/storage/bundlefile/BundleFile;Lorg/eclipse/osgi/storage/BundleInfo$Generation;)L1org/eclipse/osgi/storage/bundlefile/BundleFile;
 createNestedBundleFile
  (Ljava/lang/String;Lorg/eclipse/osgi/storage/bundlefile/BundleFile;Lorg/eclipse/osgi/storage/BundleInfo$Generation;Ljava/util/Collection<Ljava/lang/String;>;)Lorg/eclipse/osgi/storage/bundlefile/BundleFile;
- (Ljava/lang/String;Lorg/eclipse/osgi/storage/bundlefile/BundleFile;Lorg/eclipse/osgi/storage/BundleInfo$Generation;Ljava/util/Collection<Ljava/lang/String;>;)Lorg/eclipse/osgi/storage/bundlefile/BundleFile;
+ (Ljava/lang/String;Lorg/eclipse/osgi/storage/bundlefile/BundleFile;Lorg/eclipse/osgi/storage/BundleInfo$Generation;Ljava/util/Collection<Ljava/lang/String;>;)L1org/eclipse/osgi/storage/bundlefile/BundleFile;
 getAdaptor
  ()Lorg/eclipse/osgi/container/ModuleContainerAdaptor;
  ()Lorg/eclipse/osgi/container/ModuleContainerAdaptor;
@@ -100,4 +100,4 @@ update
  (Lorg/eclipse/osgi/container/Module;Ljava/io/InputStream;)Lorg/eclipse/osgi/storage/BundleInfo$Generation;
 wrapBundleFile
  (Lorg/eclipse/osgi/storage/bundlefile/BundleFile;Lorg/eclipse/osgi/storage/BundleInfo$Generation;Z)Lorg/eclipse/osgi/storage/bundlefile/BundleFile;
- (Lorg/eclipse/osgi/storage/bundlefile/BundleFile;Lorg/eclipse/osgi/storage/BundleInfo$Generation;Z)Lorg/eclipse/osgi/storage/bundlefile/BundleFile;
+ (Lorg/eclipse/osgi/storage/bundlefile/BundleFile;Lorg/eclipse/osgi/storage/BundleInfo$Generation;Z)L1org/eclipse/osgi/storage/bundlefile/BundleFile;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/StorageUtil.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/StorageUtil.eea
index 574a247c42..52d9d8c653 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/StorageUtil.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/StorageUtil.eea
@@ -11,7 +11,7 @@ encodeFileURL
  (Ljava/io/File;)Ljava/net/URL;
 getBytes
  (Ljava/io/InputStream;II)[B
- (Ljava/io/InputStream;II)[B
+ (Ljava/io/InputStream;II)[1B
 isReservedFileName
  (Ljava/io/File;)Z
  (Ljava/io/File;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/SystemBundleFile.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/SystemBundleFile.eea
index ade73d9e4c..7e18b2794b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/SystemBundleFile.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/SystemBundleFile.eea
@@ -5,10 +5,10 @@ containsDir
  (Ljava/lang/String;)Z
 getEntry
  (Ljava/lang/String;)Lorg/eclipse/osgi/storage/bundlefile/BundleEntry;
- (Ljava/lang/String;)Lorg/eclipse/osgi/storage/bundlefile/BundleEntry;
+ (Ljava/lang/String;)L0org/eclipse/osgi/storage/bundlefile/BundleEntry;
 getEntryPaths
  (Ljava/lang/String;Z)Ljava/util/Enumeration<Ljava/lang/String;>;
- (Ljava/lang/String;Z)Ljava/util/Enumeration<Ljava/lang/String;>;
+ (Ljava/lang/String;Z)L0java/util/Enumeration<Ljava/lang/String;>;
 getFile
  (Ljava/lang/String;Z)Ljava/io/File;
- (Ljava/lang/String;Z)Ljava/io/File;
+ (Ljava/lang/String;Z)L0java/io/File;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/BundleFile.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/BundleFile.eea
index a2372f383f..2578032204 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/BundleFile.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/BundleFile.eea
@@ -2,7 +2,7 @@ class org/eclipse/osgi/storage/bundlefile/BundleFile
 
 createURL
  (Ljava/lang/String;JLorg/eclipse/osgi/container/ModuleContainer;Lorg/eclipse/osgi/storage/bundlefile/BundleEntry;ILjava/lang/String;Ljava/net/URLStreamHandler;)Ljava/net/URL;
- (Ljava/lang/String;JLorg/eclipse/osgi/container/ModuleContainer;Lorg/eclipse/osgi/storage/bundlefile/BundleEntry;ILjava/lang/String;Ljava/net/URLStreamHandler;)Ljava/net/URL;
+ (Ljava/lang/String;JLorg/eclipse/osgi/container/ModuleContainer;Lorg/eclipse/osgi/storage/bundlefile/BundleEntry;ILjava/lang/String;Ljava/net/URLStreamHandler;)L0java/net/URL;
 fixTrailingSlash
  (Ljava/lang/String;Lorg/eclipse/osgi/storage/bundlefile/BundleEntry;)Ljava/lang/String;
  (Ljava/lang/String;Lorg/eclipse/osgi/storage/bundlefile/BundleEntry;)Ljava/lang/String;
@@ -19,7 +19,7 @@ containsDir
  (Ljava/lang/String;)Z
 createResourceURL
  (Lorg/eclipse/osgi/storage/bundlefile/BundleEntry;Lorg/eclipse/osgi/container/Module;ILjava/lang/String;)Ljava/net/URL;
- (Lorg/eclipse/osgi/storage/bundlefile/BundleEntry;Lorg/eclipse/osgi/container/Module;ILjava/lang/String;)Ljava/net/URL;
+ (Lorg/eclipse/osgi/storage/bundlefile/BundleEntry;Lorg/eclipse/osgi/container/Module;ILjava/lang/String;)L1java/net/URL;
 getBaseFile
  ()Ljava/io/File;
  ()Ljava/io/File;
@@ -37,7 +37,7 @@ getFile
  (Ljava/lang/String;Z)Ljava/io/File;
 getResourceURL
  (Ljava/lang/String;Lorg/eclipse/osgi/container/Module;I)Ljava/net/URL;
- (Ljava/lang/String;Lorg/eclipse/osgi/container/Module;I)Ljava/net/URL;
+ (Ljava/lang/String;Lorg/eclipse/osgi/container/Module;I)L0java/net/URL;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/BundleFileWrapper.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/BundleFileWrapper.eea
index 028898aff9..2158f6102a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/BundleFileWrapper.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/BundleFileWrapper.eea
@@ -8,7 +8,7 @@ containsDir
  (Ljava/lang/String;)Z
 createResourceURL
  (Lorg/eclipse/osgi/storage/bundlefile/BundleEntry;Lorg/eclipse/osgi/container/Module;ILjava/lang/String;)Ljava/net/URL;
- (Lorg/eclipse/osgi/storage/bundlefile/BundleEntry;Lorg/eclipse/osgi/container/Module;ILjava/lang/String;)Ljava/net/URL;
+ (Lorg/eclipse/osgi/storage/bundlefile/BundleEntry;Lorg/eclipse/osgi/container/Module;ILjava/lang/String;)L1java/net/URL; # @Inherited(org.eclipse.osgi.storage.bundlefile.BundleFile)
 getBundleFile
  ()Lorg/eclipse/osgi/storage/bundlefile/BundleFile;
  ()Lorg/eclipse/osgi/storage/bundlefile/BundleFile;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/BundleFileWrapperChain.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/BundleFileWrapperChain.eea
index 1772766664..c7b3c538b3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/BundleFileWrapperChain.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/BundleFileWrapperChain.eea
@@ -11,7 +11,7 @@ getWrapped
  ()Lorg/eclipse/osgi/storage/bundlefile/BundleFile;
 getWrappedType
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)T0T;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(org.eclipse.osgi.storage.bundlefile.BundleFile)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/CloseableBundleFile.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/CloseableBundleFile.eea
index a95e7b11d2..ee69e6b3fb 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/CloseableBundleFile.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/CloseableBundleFile.eea
@@ -23,16 +23,16 @@ findEntry
  (Ljava/lang/String;)Lorg/eclipse/osgi/storage/bundlefile/BundleEntry;
 getEntry
  (Ljava/lang/String;)Lorg/eclipse/osgi/storage/bundlefile/BundleEntry;
- (Ljava/lang/String;)Lorg/eclipse/osgi/storage/bundlefile/BundleEntry;
+ (Ljava/lang/String;)L0org/eclipse/osgi/storage/bundlefile/BundleEntry;
 getEntryPaths
  (Ljava/lang/String;Z)Ljava/util/Enumeration<Ljava/lang/String;>;
- (Ljava/lang/String;Z)Ljava/util/Enumeration<Ljava/lang/String;>;
+ (Ljava/lang/String;Z)L0java/util/Enumeration<Ljava/lang/String;>;
 getFile
  (Ljava/lang/String;Z)Ljava/io/File;
- (Ljava/lang/String;Z)Ljava/io/File;
+ (Ljava/lang/String;Z)L0java/io/File;
 getInputStream
  (TE;)Ljava/io/InputStream;
- (TE;)Ljava/io/InputStream;
+ (TE;)L1java/io/InputStream;
 getPaths
  ()Ljava/lang/Iterable<Ljava/lang/String;>;
  ()Ljava/lang/Iterable<Ljava/lang/String;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/DirBundleFile.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/DirBundleFile.eea
index c30e3d9bbd..d85d6f9cb0 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/DirBundleFile.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/DirBundleFile.eea
@@ -8,10 +8,10 @@ containsDir
  (Ljava/lang/String;)Z
 getEntry
  (Ljava/lang/String;)Lorg/eclipse/osgi/storage/bundlefile/BundleEntry;
- (Ljava/lang/String;)Lorg/eclipse/osgi/storage/bundlefile/BundleEntry;
+ (Ljava/lang/String;)L0org/eclipse/osgi/storage/bundlefile/BundleEntry;
 getEntryPaths
  (Ljava/lang/String;Z)Ljava/util/Enumeration<Ljava/lang/String;>;
- (Ljava/lang/String;Z)Ljava/util/Enumeration<Ljava/lang/String;>;
+ (Ljava/lang/String;Z)L0java/util/Enumeration<Ljava/lang/String;>;
 getFile
  (Ljava/lang/String;Z)Ljava/io/File;
- (Ljava/lang/String;Z)Ljava/io/File;
+ (Ljava/lang/String;Z)L0java/io/File;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/DirZipBundleEntry.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/DirZipBundleEntry.eea
index 833d1fdf52..fd38f4e707 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/DirZipBundleEntry.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/DirZipBundleEntry.eea
@@ -5,13 +5,13 @@ class org/eclipse/osgi/storage/bundlefile/DirZipBundleEntry
  (Lorg/eclipse/osgi/storage/bundlefile/ZipBundleFile;Ljava/lang/String;)V
 getFileURL
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L0java/net/URL;
 getInputStream
  ()Ljava/io/InputStream;
  ()Ljava/io/InputStream;
 getLocalURL
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L0java/net/URL;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/FileBundleEntry.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/FileBundleEntry.eea
index 94330dcde2..572a8a6693 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/FileBundleEntry.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/FileBundleEntry.eea
@@ -5,7 +5,7 @@ class org/eclipse/osgi/storage/bundlefile/FileBundleEntry
  (Ljava/io/File;Ljava/lang/String;)V
 getFileURL
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L0java/net/URL;
 getInputStream
  ()Ljava/io/InputStream;
  ()Ljava/io/InputStream;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/NestedDirBundleFile.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/NestedDirBundleFile.eea
index 4ed164cc96..dd8dc205f7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/NestedDirBundleFile.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/NestedDirBundleFile.eea
@@ -11,13 +11,13 @@ containsDir
  (Ljava/lang/String;)Z
 getEntry
  (Ljava/lang/String;)Lorg/eclipse/osgi/storage/bundlefile/BundleEntry;
- (Ljava/lang/String;)Lorg/eclipse/osgi/storage/bundlefile/BundleEntry;
+ (Ljava/lang/String;)L0org/eclipse/osgi/storage/bundlefile/BundleEntry;
 getEntryPaths
  (Ljava/lang/String;Z)Ljava/util/Enumeration<Ljava/lang/String;>;
- (Ljava/lang/String;Z)Ljava/util/Enumeration<Ljava/lang/String;>;
+ (Ljava/lang/String;Z)L0java/util/Enumeration<Ljava/lang/String;>;
 getFile
  (Ljava/lang/String;Z)Ljava/io/File;
- (Ljava/lang/String;Z)Ljava/io/File;
+ (Ljava/lang/String;Z)L0java/io/File;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(org.eclipse.osgi.storage.bundlefile.BundleFile)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/ZipBundleEntry.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/ZipBundleEntry.eea
index 5fdfebfb32..03e30f1420 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/ZipBundleEntry.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/ZipBundleEntry.eea
@@ -9,13 +9,13 @@ zipEntry
 
 getFileURL
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L0java/net/URL;
 getInputStream
  ()Ljava/io/InputStream;
  ()Ljava/io/InputStream;
 getLocalURL
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L0java/net/URL;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/ZipBundleFile.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/ZipBundleFile.eea
index 84d77b07f0..373232d34d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/ZipBundleFile.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/bundlefile/ZipBundleFile.eea
@@ -12,7 +12,7 @@ doGetInputStream
  (Ljava/util/zip/ZipEntry;)Ljava/io/InputStream;
 findEntry
  (Ljava/lang/String;)Lorg/eclipse/osgi/storage/bundlefile/BundleEntry;
- (Ljava/lang/String;)Lorg/eclipse/osgi/storage/bundlefile/BundleEntry;
+ (Ljava/lang/String;)L0org/eclipse/osgi/storage/bundlefile/BundleEntry;
 getPaths
  ()Ljava/lang/Iterable<Ljava/lang/String;>;
  ()Ljava/lang/Iterable<Ljava/lang/String;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/url/BundleResourceHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/url/BundleResourceHandler.eea
index a9728c17cf..ef7bf74a44 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/url/BundleResourceHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/url/BundleResourceHandler.eea
@@ -18,7 +18,7 @@ SECURITY_UNCHECKED
 
 createURLHostForBundleID
  (Lorg/eclipse/osgi/container/ModuleContainer;J)Ljava/lang/String;
- (Lorg/eclipse/osgi/container/ModuleContainer;J)Ljava/lang/String;
+ (Lorg/eclipse/osgi/container/ModuleContainer;J)L1java/lang/String;
 
 bundleEntry
  Lorg/eclipse/osgi/storage/bundlefile/BundleEntry;
@@ -41,7 +41,7 @@ findBundleEntry
  (Ljava/net/URL;Lorg/eclipse/osgi/container/Module;)Lorg/eclipse/osgi/storage/bundlefile/BundleEntry;
 getHostAddress
  (Ljava/net/URL;)Ljava/net/InetAddress;
- (Ljava/net/URL;)Ljava/net/InetAddress;
+ (Ljava/net/URL;)L0java/net/InetAddress;
 hashCode
  (Ljava/net/URL;)I
  (Ljava/net/URL;)I
@@ -59,4 +59,4 @@ sameFile
  (Ljava/net/URL;Ljava/net/URL;)Z
 toExternalForm
  (Ljava/net/URL;)Ljava/lang/String;
- (Ljava/net/URL;)Ljava/lang/String;
+ (Ljava/net/URL;)L1java/lang/String; # @Inherited(java.net.URLStreamHandler)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/url/BundleURLConnection.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/url/BundleURLConnection.eea
index 3a706ad9dd..e1507a97b1 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/url/BundleURLConnection.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/url/BundleURLConnection.eea
@@ -15,7 +15,7 @@ in
  (Ljava/net/URL;Lorg/eclipse/osgi/container/ModuleContainer;Lorg/eclipse/osgi/storage/bundlefile/BundleEntry;)V
 getBundle
  ()Lorg/osgi/framework/Bundle;
- ()Lorg/osgi/framework/Bundle;
+ ()L0org/osgi/framework/Bundle;
 getContentType
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(java.net.URLConnection)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/url/reference/Handler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/url/reference/Handler.eea
index 6368cb4daa..f665ee964c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/url/reference/Handler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storage/url/reference/Handler.eea
@@ -5,7 +5,7 @@ class org/eclipse/osgi/storage/url/reference/Handler
  (Ljava/lang/String;)V
 openConnection
  (Ljava/net/URL;)Ljava/net/URLConnection;
- (Ljava/net/URL;)Ljava/net/URLConnection;
+ (Ljava/net/URL;)L1java/net/URLConnection;
 parseURL
  (Ljava/net/URL;Ljava/lang/String;II)V
  (Ljava/net/URL;Ljava/lang/String;II)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storagemanager/StorageManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storagemanager/StorageManager.eea
index b32e359825..0f53802a6b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storagemanager/StorageManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/storagemanager/StorageManager.eea
@@ -11,7 +11,7 @@ add
  (Ljava/lang/String;)V
 createTempFile
  (Ljava/lang/String;)Ljava/io/File;
- (Ljava/lang/String;)Ljava/io/File;
+ (Ljava/lang/String;)L1java/io/File;
 getBase
  ()Ljava/io/File;
  ()Ljava/io/File;
@@ -23,19 +23,19 @@ getInputStream
  (Ljava/lang/String;)Ljava/io/InputStream;
 getInputStreamSet
  ([Ljava/lang/String;)[Ljava/io/InputStream;
- ([Ljava/lang/String;)[Ljava/io/InputStream;
+ ([Ljava/lang/String;)[1Ljava/io/InputStream;
 getManagedFiles
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String;
 getOutputStream
  (Ljava/lang/String;)Lorg/eclipse/osgi/storagemanager/ManagedOutputStream;
- (Ljava/lang/String;)Lorg/eclipse/osgi/storagemanager/ManagedOutputStream;
+ (Ljava/lang/String;)L1org/eclipse/osgi/storagemanager/ManagedOutputStream;
 getOutputStreamSet
  ([Ljava/lang/String;)[Lorg/eclipse/osgi/storagemanager/ManagedOutputStream;
- ([Ljava/lang/String;)[Lorg/eclipse/osgi/storagemanager/ManagedOutputStream;
+ ([Ljava/lang/String;)[1Lorg/eclipse/osgi/storagemanager/ManagedOutputStream;
 lookup
  (Ljava/lang/String;Z)Ljava/io/File;
- (Ljava/lang/String;Z)Ljava/io/File;
+ (Ljava/lang/String;Z)L0java/io/File;
 remove
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/util/ManifestElement.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/util/ManifestElement.eea
index 91596dd244..cb4683afb7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/util/ManifestElement.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/util/ManifestElement.eea
@@ -8,10 +8,10 @@ getArrayFromList
  (Ljava/lang/String;Ljava/lang/String;)[Ljava/lang/String;
 parseBundleManifest
  (Ljava/io/InputStream;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
- (Ljava/io/InputStream;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
+ (Ljava/io/InputStream;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)L1java/util/Map<Ljava/lang/String;Ljava/lang/String;>;
 parseHeader
  (Ljava/lang/String;Ljava/lang/String;)[Lorg/eclipse/osgi/util/ManifestElement;
- (Ljava/lang/String;Ljava/lang/String;)[Lorg/eclipse/osgi/util/ManifestElement;
+ (Ljava/lang/String;Ljava/lang/String;)[0Lorg/eclipse/osgi/util/ManifestElement;
 
 getAttribute
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/util/TextProcessor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/util/TextProcessor.eea
index 0fc8b839a2..3edc372d27 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/util/TextProcessor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/osgi/util/TextProcessor.eea
@@ -5,7 +5,7 @@ deprocess
  (Ljava/lang/String;)Ljava/lang/String;
 getDefaultDelimiters
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 process
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/search/core/text/TextSearchEngine.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/search/core/text/TextSearchEngine.eea
index 52bf397c38..a6e478fc73 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/search/core/text/TextSearchEngine.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/search/core/text/TextSearchEngine.eea
@@ -2,13 +2,13 @@ class org/eclipse/search/core/text/TextSearchEngine
 
 create
  ()Lorg/eclipse/search/core/text/TextSearchEngine;
- ()Lorg/eclipse/search/core/text/TextSearchEngine;
+ ()L1org/eclipse/search/core/text/TextSearchEngine;
 createDefault
  ()Lorg/eclipse/search/core/text/TextSearchEngine;
- ()Lorg/eclipse/search/core/text/TextSearchEngine;
+ ()L1org/eclipse/search/core/text/TextSearchEngine;
 createPattern
  (Ljava/lang/String;ZZ)Ljava/util/regex/Pattern;
- (Ljava/lang/String;ZZ)Ljava/util/regex/Pattern;
+ (Ljava/lang/String;ZZ)L1java/util/regex/Pattern;
 
 search
  (Lorg/eclipse/search/core/text/TextSearchScope;Lorg/eclipse/search/core/text/TextSearchRequestor;Ljava/util/regex/Pattern;Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/core/runtime/IStatus;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/search/ui/text/AbstractTextSearchViewPage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/search/ui/text/AbstractTextSearchViewPage.eea
index 5605c9f8dc..6b5d47ff86 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/search/ui/text/AbstractTextSearchViewPage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/search/ui/text/AbstractTextSearchViewPage.eea
@@ -18,10 +18,10 @@ createControl
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.ui.part.Page)
 createTableViewer
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/viewers/TableViewer;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/viewers/TableViewer;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/jface/viewers/TableViewer;
 createTreeViewer
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/viewers/TreeViewer;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/viewers/TreeViewer;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/jface/viewers/TreeViewer;
 elementsChanged
  ([Ljava/lang/Object;)V
  ([1Ljava/lang/Object;)V
@@ -39,10 +39,10 @@ getControl
  ()L0org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.ui.part.Page)
 getCurrentMatch
  ()Lorg/eclipse/search/ui/text/Match;
- ()Lorg/eclipse/search/ui/text/Match;
+ ()L0org/eclipse/search/ui/text/Match;
 getCurrentMatchLocation
  (Lorg/eclipse/search/ui/text/Match;)Lorg/eclipse/jface/text/IRegion;
- (Lorg/eclipse/search/ui/text/Match;)Lorg/eclipse/jface/text/IRegion;
+ (Lorg/eclipse/search/ui/text/Match;)L1org/eclipse/jface/text/IRegion;
 getDisplayedMatchCount
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/search/ui/text/FileTextSearchScope.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/search/ui/text/FileTextSearchScope.eea
index d9d9ccbfe7..f37eb18479 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/search/ui/text/FileTextSearchScope.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/search/ui/text/FileTextSearchScope.eea
@@ -2,10 +2,10 @@ class org/eclipse/search/ui/text/FileTextSearchScope
 
 newSearchScope
  ([Lorg/eclipse/core/resources/IResource;[Ljava/lang/String;Z)Lorg/eclipse/search/ui/text/FileTextSearchScope;
- ([Lorg/eclipse/core/resources/IResource;[Ljava/lang/String;Z)Lorg/eclipse/search/ui/text/FileTextSearchScope;
+ ([Lorg/eclipse/core/resources/IResource;[Ljava/lang/String;Z)L1org/eclipse/search/ui/text/FileTextSearchScope;
 newSearchScope
  ([Lorg/eclipse/ui/IWorkingSet;[Ljava/lang/String;Z)Lorg/eclipse/search/ui/text/FileTextSearchScope;
- ([Lorg/eclipse/ui/IWorkingSet;[Ljava/lang/String;Z)Lorg/eclipse/search/ui/text/FileTextSearchScope;
+ ([Lorg/eclipse/ui/IWorkingSet;[Ljava/lang/String;Z)L1org/eclipse/search/ui/text/FileTextSearchScope;
 newWorkspaceScope
  ([Ljava/lang/String;Z)Lorg/eclipse/search/ui/text/FileTextSearchScope;
  ([Ljava/lang/String;Z)Lorg/eclipse/search/ui/text/FileTextSearchScope;
@@ -15,7 +15,7 @@ contains
  (Lorg/eclipse/core/resources/IResourceProxy;)Z
 getContentTypes
  ()[Lorg/eclipse/core/runtime/content/IContentType;
- ()[Lorg/eclipse/core/runtime/content/IContentType;
+ ()[0Lorg/eclipse/core/runtime/content/IContentType;
 getDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/search/ui/text/TextSearchQueryProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/search/ui/text/TextSearchQueryProvider.eea
index 39b9dbc174..8855bb408c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/search/ui/text/TextSearchQueryProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/search/ui/text/TextSearchQueryProvider.eea
@@ -6,13 +6,13 @@ getPreferred
 
 createQuery
  (Ljava/lang/String;)Lorg/eclipse/search/ui/ISearchQuery;
- (Ljava/lang/String;)Lorg/eclipse/search/ui/ISearchQuery;
+ (Ljava/lang/String;)L1org/eclipse/search/ui/ISearchQuery;
 createQuery
  (Ljava/lang/String;[Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/search/ui/ISearchQuery;
- (Ljava/lang/String;[Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/search/ui/ISearchQuery;
+ (Ljava/lang/String;[Lorg/eclipse/core/resources/IResource;)L1org/eclipse/search/ui/ISearchQuery;
 createQuery
  (Ljava/lang/String;[Lorg/eclipse/ui/IWorkingSet;)Lorg/eclipse/search/ui/ISearchQuery;
- (Ljava/lang/String;[Lorg/eclipse/ui/IWorkingSet;)Lorg/eclipse/search/ui/ISearchQuery;
+ (Ljava/lang/String;[Lorg/eclipse/ui/IWorkingSet;)L1org/eclipse/search/ui/ISearchQuery;
 createQuery
  (Lorg/eclipse/search/ui/text/TextSearchQueryProvider$TextSearchInput;)Lorg/eclipse/search/ui/ISearchQuery;
- (Lorg/eclipse/search/ui/text/TextSearchQueryProvider$TextSearchInput;)Lorg/eclipse/search/ui/ISearchQuery;
+ (Lorg/eclipse/search/ui/text/TextSearchQueryProvider$TextSearchInput;)L1org/eclipse/search/ui/ISearchQuery;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/accessibility/Accessible.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/accessibility/Accessible.eea
index 083617643f..9c67bbcd4d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/accessibility/Accessible.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/accessibility/Accessible.eea
@@ -2,7 +2,7 @@ class org/eclipse/swt/accessibility/Accessible
 
 internal_new_Accessible
  (Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/accessibility/Accessible;
- (Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/accessibility/Accessible;
+ (Lorg/eclipse/swt/widgets/Control;)L1org/eclipse/swt/accessibility/Accessible;
 
 <init>
  (Lorg/eclipse/swt/accessibility/Accessible;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/accessibility/AccessibleListener.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/accessibility/AccessibleListener.eea
index c9fa5e6674..72a373d5a5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/accessibility/AccessibleListener.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/accessibility/AccessibleListener.eea
@@ -2,16 +2,16 @@ class org/eclipse/swt/accessibility/AccessibleListener
 
 getDescriptionAdapter
  (Ljava/util/function/Consumer<Lorg/eclipse/swt/accessibility/AccessibleEvent;>;)Lorg/eclipse/swt/accessibility/AccessibleListener;
- (Ljava/util/function/Consumer<Lorg/eclipse/swt/accessibility/AccessibleEvent;>;)Lorg/eclipse/swt/accessibility/AccessibleListener;
+ (Ljava/util/function/Consumer<Lorg/eclipse/swt/accessibility/AccessibleEvent;>;)L1org/eclipse/swt/accessibility/AccessibleListener;
 getHelpAdapter
  (Ljava/util/function/Consumer<Lorg/eclipse/swt/accessibility/AccessibleEvent;>;)Lorg/eclipse/swt/accessibility/AccessibleListener;
- (Ljava/util/function/Consumer<Lorg/eclipse/swt/accessibility/AccessibleEvent;>;)Lorg/eclipse/swt/accessibility/AccessibleListener;
+ (Ljava/util/function/Consumer<Lorg/eclipse/swt/accessibility/AccessibleEvent;>;)L1org/eclipse/swt/accessibility/AccessibleListener;
 getKeyboardShortcutAdapter
  (Ljava/util/function/Consumer<Lorg/eclipse/swt/accessibility/AccessibleEvent;>;)Lorg/eclipse/swt/accessibility/AccessibleListener;
- (Ljava/util/function/Consumer<Lorg/eclipse/swt/accessibility/AccessibleEvent;>;)Lorg/eclipse/swt/accessibility/AccessibleListener;
+ (Ljava/util/function/Consumer<Lorg/eclipse/swt/accessibility/AccessibleEvent;>;)L1org/eclipse/swt/accessibility/AccessibleListener;
 getNameAdapter
  (Ljava/util/function/Consumer<Lorg/eclipse/swt/accessibility/AccessibleEvent;>;)Lorg/eclipse/swt/accessibility/AccessibleListener;
- (Ljava/util/function/Consumer<Lorg/eclipse/swt/accessibility/AccessibleEvent;>;)Lorg/eclipse/swt/accessibility/AccessibleListener;
+ (Ljava/util/function/Consumer<Lorg/eclipse/swt/accessibility/AccessibleEvent;>;)L1org/eclipse/swt/accessibility/AccessibleListener;
 
 getDescription
  (Lorg/eclipse/swt/accessibility/AccessibleEvent;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/awt/SWT_AWT.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/awt/SWT_AWT.eea
index 12cea1e098..036197d2bb 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/awt/SWT_AWT.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/awt/SWT_AWT.eea
@@ -6,7 +6,7 @@ embeddedFrameClass
 
 getFrame
  (Lorg/eclipse/swt/widgets/Composite;)Ljava/awt/Frame;
- (Lorg/eclipse/swt/widgets/Composite;)Ljava/awt/Frame;
+ (Lorg/eclipse/swt/widgets/Composite;)L0java/awt/Frame;
 new_Frame
  (Lorg/eclipse/swt/widgets/Composite;)Ljava/awt/Frame;
  (Lorg/eclipse/swt/widgets/Composite;)Ljava/awt/Frame;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/browser/BrowserFunction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/browser/BrowserFunction.eea
index 2f9a5c46ec..0c08c03bc6 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/browser/BrowserFunction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/browser/BrowserFunction.eea
@@ -8,7 +8,7 @@ class org/eclipse/swt/browser/BrowserFunction
  (Lorg/eclipse/swt/browser/Browser;Ljava/lang/String;Z[Ljava/lang/String;)V
 function
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L0java/lang/Object;
 getBrowser
  ()Lorg/eclipse/swt/browser/Browser;
  ()Lorg/eclipse/swt/browser/Browser;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/browser/LocationListener.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/browser/LocationListener.eea
index 2214b438a7..4a364071ff 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/browser/LocationListener.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/browser/LocationListener.eea
@@ -2,10 +2,10 @@ class org/eclipse/swt/browser/LocationListener
 
 changedAdapter
  (Ljava/util/function/Consumer<Lorg/eclipse/swt/browser/LocationEvent;>;)Lorg/eclipse/swt/browser/LocationListener;
- (Ljava/util/function/Consumer<Lorg/eclipse/swt/browser/LocationEvent;>;)Lorg/eclipse/swt/browser/LocationListener;
+ (Ljava/util/function/Consumer<Lorg/eclipse/swt/browser/LocationEvent;>;)L1org/eclipse/swt/browser/LocationListener;
 changingAdapter
  (Ljava/util/function/Consumer<Lorg/eclipse/swt/browser/LocationEvent;>;)Lorg/eclipse/swt/browser/LocationListener;
- (Ljava/util/function/Consumer<Lorg/eclipse/swt/browser/LocationEvent;>;)Lorg/eclipse/swt/browser/LocationListener;
+ (Ljava/util/function/Consumer<Lorg/eclipse/swt/browser/LocationEvent;>;)L1org/eclipse/swt/browser/LocationListener;
 
 changed
  (Lorg/eclipse/swt/browser/LocationEvent;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/browser/ProgressListener.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/browser/ProgressListener.eea
index abbf3d58fa..088da33ad3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/browser/ProgressListener.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/browser/ProgressListener.eea
@@ -2,10 +2,10 @@ class org/eclipse/swt/browser/ProgressListener
 
 changedAdapter
  (Ljava/util/function/Consumer<Lorg/eclipse/swt/browser/ProgressEvent;>;)Lorg/eclipse/swt/browser/ProgressListener;
- (Ljava/util/function/Consumer<Lorg/eclipse/swt/browser/ProgressEvent;>;)Lorg/eclipse/swt/browser/ProgressListener;
+ (Ljava/util/function/Consumer<Lorg/eclipse/swt/browser/ProgressEvent;>;)L1org/eclipse/swt/browser/ProgressListener;
 completedAdapter
  (Ljava/util/function/Consumer<Lorg/eclipse/swt/browser/ProgressEvent;>;)Lorg/eclipse/swt/browser/ProgressListener;
- (Ljava/util/function/Consumer<Lorg/eclipse/swt/browser/ProgressEvent;>;)Lorg/eclipse/swt/browser/ProgressListener;
+ (Ljava/util/function/Consumer<Lorg/eclipse/swt/browser/ProgressEvent;>;)L1org/eclipse/swt/browser/ProgressListener;
 
 changed
  (Lorg/eclipse/swt/browser/ProgressEvent;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/browser/VisibilityWindowListener.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/browser/VisibilityWindowListener.eea
index 8c9df17852..4cf8bbd3c8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/browser/VisibilityWindowListener.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/browser/VisibilityWindowListener.eea
@@ -2,10 +2,10 @@ class org/eclipse/swt/browser/VisibilityWindowListener
 
 hideAdapter
  (Ljava/util/function/Consumer<Lorg/eclipse/swt/browser/WindowEvent;>;)Lorg/eclipse/swt/browser/VisibilityWindowListener;
- (Ljava/util/function/Consumer<Lorg/eclipse/swt/browser/WindowEvent;>;)Lorg/eclipse/swt/browser/VisibilityWindowListener;
+ (Ljava/util/function/Consumer<Lorg/eclipse/swt/browser/WindowEvent;>;)L1org/eclipse/swt/browser/VisibilityWindowListener;
 showAdapter
  (Ljava/util/function/Consumer<Lorg/eclipse/swt/browser/WindowEvent;>;)Lorg/eclipse/swt/browser/VisibilityWindowListener;
- (Ljava/util/function/Consumer<Lorg/eclipse/swt/browser/WindowEvent;>;)Lorg/eclipse/swt/browser/VisibilityWindowListener;
+ (Ljava/util/function/Consumer<Lorg/eclipse/swt/browser/WindowEvent;>;)L1org/eclipse/swt/browser/VisibilityWindowListener;
 
 hide
  (Lorg/eclipse/swt/browser/WindowEvent;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/browser/WebBrowser$EvaluateFunction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/browser/WebBrowser$EvaluateFunction.eea
index 0f1c7c9343..d40d63477a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/browser/WebBrowser$EvaluateFunction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/browser/WebBrowser$EvaluateFunction.eea
@@ -5,4 +5,4 @@ class org/eclipse/swt/browser/WebBrowser$EvaluateFunction
  (Lorg/eclipse/swt/browser/WebBrowser;Lorg/eclipse/swt/browser/Browser;Ljava/lang/String;)V
 function
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L0java/lang/Object; # @Inherited(org.eclipse.swt.browser.BrowserFunction)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/custom/CTabFolder.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/custom/CTabFolder.eea
index 295663802e..bfb0754632 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/custom/CTabFolder.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/custom/CTabFolder.eea
@@ -33,16 +33,16 @@ getItem
  (I)Lorg/eclipse/swt/custom/CTabItem;
 getItem
  (Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/custom/CTabItem;
- (Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/custom/CTabItem;
+ (Lorg/eclipse/swt/graphics/Point;)L0org/eclipse/swt/custom/CTabItem;
 getItems
  ()[Lorg/eclipse/swt/custom/CTabItem;
- ()[Lorg/eclipse/swt/custom/CTabItem;
+ ()[1Lorg/eclipse/swt/custom/CTabItem;
 getRenderer
  ()Lorg/eclipse/swt/custom/CTabFolderRenderer;
  ()Lorg/eclipse/swt/custom/CTabFolderRenderer;
 getSelection
  ()Lorg/eclipse/swt/custom/CTabItem;
- ()Lorg/eclipse/swt/custom/CTabItem;
+ ()L0org/eclipse/swt/custom/CTabItem;
 getSelectionBackground
  ()Lorg/eclipse/swt/graphics/Color;
  ()Lorg/eclipse/swt/graphics/Color;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/custom/CTabFolder2Listener.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/custom/CTabFolder2Listener.eea
index 83c6b892a0..585356cae5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/custom/CTabFolder2Listener.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/custom/CTabFolder2Listener.eea
@@ -2,22 +2,22 @@ class org/eclipse/swt/custom/CTabFolder2Listener
 
 closeAdapter
  (Ljava/util/function/Consumer<Lorg/eclipse/swt/custom/CTabFolderEvent;>;)Lorg/eclipse/swt/custom/CTabFolder2Listener;
- (Ljava/util/function/Consumer<Lorg/eclipse/swt/custom/CTabFolderEvent;>;)Lorg/eclipse/swt/custom/CTabFolder2Listener;
+ (Ljava/util/function/Consumer<Lorg/eclipse/swt/custom/CTabFolderEvent;>;)L1org/eclipse/swt/custom/CTabFolder2Listener;
 itemsCountAdapter
  (Ljava/util/function/Consumer<Lorg/eclipse/swt/custom/CTabFolderEvent;>;)Lorg/eclipse/swt/custom/CTabFolder2Listener;
- (Ljava/util/function/Consumer<Lorg/eclipse/swt/custom/CTabFolderEvent;>;)Lorg/eclipse/swt/custom/CTabFolder2Listener;
+ (Ljava/util/function/Consumer<Lorg/eclipse/swt/custom/CTabFolderEvent;>;)L1org/eclipse/swt/custom/CTabFolder2Listener;
 maximizeAdapter
  (Ljava/util/function/Consumer<Lorg/eclipse/swt/custom/CTabFolderEvent;>;)Lorg/eclipse/swt/custom/CTabFolder2Listener;
- (Ljava/util/function/Consumer<Lorg/eclipse/swt/custom/CTabFolderEvent;>;)Lorg/eclipse/swt/custom/CTabFolder2Listener;
+ (Ljava/util/function/Consumer<Lorg/eclipse/swt/custom/CTabFolderEvent;>;)L1org/eclipse/swt/custom/CTabFolder2Listener;
 minimizeAdapter
  (Ljava/util/function/Consumer<Lorg/eclipse/swt/custom/CTabFolderEvent;>;)Lorg/eclipse/swt/custom/CTabFolder2Listener;
- (Ljava/util/function/Consumer<Lorg/eclipse/swt/custom/CTabFolderEvent;>;)Lorg/eclipse/swt/custom/CTabFolder2Listener;
+ (Ljava/util/function/Consumer<Lorg/eclipse/swt/custom/CTabFolderEvent;>;)L1org/eclipse/swt/custom/CTabFolder2Listener;
 restoreAdapter
  (Ljava/util/function/Consumer<Lorg/eclipse/swt/custom/CTabFolderEvent;>;)Lorg/eclipse/swt/custom/CTabFolder2Listener;
- (Ljava/util/function/Consumer<Lorg/eclipse/swt/custom/CTabFolderEvent;>;)Lorg/eclipse/swt/custom/CTabFolder2Listener;
+ (Ljava/util/function/Consumer<Lorg/eclipse/swt/custom/CTabFolderEvent;>;)L1org/eclipse/swt/custom/CTabFolder2Listener;
 showListAdapter
  (Ljava/util/function/Consumer<Lorg/eclipse/swt/custom/CTabFolderEvent;>;)Lorg/eclipse/swt/custom/CTabFolder2Listener;
- (Ljava/util/function/Consumer<Lorg/eclipse/swt/custom/CTabFolderEvent;>;)Lorg/eclipse/swt/custom/CTabFolder2Listener;
+ (Ljava/util/function/Consumer<Lorg/eclipse/swt/custom/CTabFolderEvent;>;)L1org/eclipse/swt/custom/CTabFolder2Listener;
 
 close
  (Lorg/eclipse/swt/custom/CTabFolderEvent;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/custom/CTabFolderRenderer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/custom/CTabFolderRenderer.eea
index bdebd7c1b6..939f485228 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/custom/CTabFolderRenderer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/custom/CTabFolderRenderer.eea
@@ -12,7 +12,7 @@ computeSize
  (IILorg/eclipse/swt/graphics/GC;II)Lorg/eclipse/swt/graphics/Point;
 computeTrim
  (IIIIII)Lorg/eclipse/swt/graphics/Rectangle;
- (IIIIII)Lorg/eclipse/swt/graphics/Rectangle;
+ (IIIIII)L1org/eclipse/swt/graphics/Rectangle;
 draw
  (IILorg/eclipse/swt/graphics/Rectangle;Lorg/eclipse/swt/graphics/GC;)V
  (IILorg/eclipse/swt/graphics/Rectangle;Lorg/eclipse/swt/graphics/GC;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/custom/SashForm.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/custom/SashForm.eea
index e877625901..6ebdf1cb9b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/custom/SashForm.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/custom/SashForm.eea
@@ -8,7 +8,7 @@ getMaximizedControl
  ()Lorg/eclipse/swt/widgets/Control;
 getWeights
  ()[I
- ()[I
+ ()[1I
 setBackground
  (Lorg/eclipse/swt/graphics/Color;)V
  (L0org/eclipse/swt/graphics/Color;)V # @Inherited(org.eclipse.swt.widgets.Control)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/custom/StyledText.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/custom/StyledText.eea
index 471969252e..1938407273 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/custom/StyledText.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/custom/StyledText.eea
@@ -72,7 +72,7 @@ getLineDelimiter
  ()Ljava/lang/String;
 getLineTabStops
  (I)[I
- (I)[I
+ (I)[0I
 getLocationAtOffset
  (I)Lorg/eclipse/swt/graphics/Point;
  (I)Lorg/eclipse/swt/graphics/Point;
@@ -105,13 +105,13 @@ getSelectionRange
  ()Lorg/eclipse/swt/graphics/Point;
 getSelectionRanges
  ()[I
- ()[I
+ ()[1I
 getSelectionText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getStyleRangeAtOffset
  (I)Lorg/eclipse/swt/custom/StyleRange;
- (I)Lorg/eclipse/swt/custom/StyleRange;
+ (I)L0org/eclipse/swt/custom/StyleRange;
 getStyleRanges
  ()[Lorg/eclipse/swt/custom/StyleRange;
  ()[Lorg/eclipse/swt/custom/StyleRange;
@@ -147,7 +147,7 @@ print
  (Lorg/eclipse/swt/printing/Printer;)Ljava/lang/Runnable;
 print
  (Lorg/eclipse/swt/printing/Printer;Lorg/eclipse/swt/custom/StyledTextPrintOptions;)Ljava/lang/Runnable;
- (Lorg/eclipse/swt/printing/Printer;Lorg/eclipse/swt/custom/StyledTextPrintOptions;)Ljava/lang/Runnable;
+ (Lorg/eclipse/swt/printing/Printer;Lorg/eclipse/swt/custom/StyledTextPrintOptions;)L1java/lang/Runnable;
 removeBidiSegmentListener
  (Lorg/eclipse/swt/custom/BidiSegmentListener;)V
  (L1org/eclipse/swt/custom/BidiSegmentListener;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/ByteArrayTransfer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/ByteArrayTransfer.eea
index 79abfa56be..726caa73ed 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/ByteArrayTransfer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/ByteArrayTransfer.eea
@@ -2,7 +2,7 @@ class org/eclipse/swt/dnd/ByteArrayTransfer
 
 getSupportedTypes
  ()[Lorg/eclipse/swt/dnd/TransferData;
- ()[Lorg/eclipse/swt/dnd/TransferData;
+ ()[1Lorg/eclipse/swt/dnd/TransferData;
 isSupportedType
  (Lorg/eclipse/swt/dnd/TransferData;)Z
  (Lorg/eclipse/swt/dnd/TransferData;)Z
@@ -11,4 +11,4 @@ javaToNative
  (Ljava/lang/Object;Lorg/eclipse/swt/dnd/TransferData;)V
 nativeToJava
  (Lorg/eclipse/swt/dnd/TransferData;)Ljava/lang/Object;
- (Lorg/eclipse/swt/dnd/TransferData;)Ljava/lang/Object;
+ (Lorg/eclipse/swt/dnd/TransferData;)L0java/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/Clipboard.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/Clipboard.eea
index 59174ca9e7..c7f1e99fec 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/Clipboard.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/Clipboard.eea
@@ -5,19 +5,19 @@ class org/eclipse/swt/dnd/Clipboard
  (Lorg/eclipse/swt/widgets/Display;)V
 getAvailableTypeNames
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 getAvailableTypes
  ()[Lorg/eclipse/swt/dnd/TransferData;
  ()[Lorg/eclipse/swt/dnd/TransferData;
 getAvailableTypes
  (I)[Lorg/eclipse/swt/dnd/TransferData;
- (I)[Lorg/eclipse/swt/dnd/TransferData;
+ (I)[1Lorg/eclipse/swt/dnd/TransferData;
 getContents
  (Lorg/eclipse/swt/dnd/Transfer;)Ljava/lang/Object;
  (Lorg/eclipse/swt/dnd/Transfer;)Ljava/lang/Object;
 getContents
  (Lorg/eclipse/swt/dnd/Transfer;I)Ljava/lang/Object;
- (Lorg/eclipse/swt/dnd/Transfer;I)Ljava/lang/Object;
+ (Lorg/eclipse/swt/dnd/Transfer;I)L0java/lang/Object;
 setContents
  ([Ljava/lang/Object;[Lorg/eclipse/swt/dnd/Transfer;)V
  ([Ljava/lang/Object;[Lorg/eclipse/swt/dnd/Transfer;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/DropTargetEffect.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/DropTargetEffect.eea
index 37b0fef888..bcfe49880c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/DropTargetEffect.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/DropTargetEffect.eea
@@ -8,4 +8,4 @@ getControl
  ()Lorg/eclipse/swt/widgets/Control;
 getItem
  (II)Lorg/eclipse/swt/widgets/Widget;
- (II)Lorg/eclipse/swt/widgets/Widget;
+ (II)L0org/eclipse/swt/widgets/Widget;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/FileTransfer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/FileTransfer.eea
index 7e559c5e39..eb44e9fddc 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/FileTransfer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/FileTransfer.eea
@@ -18,7 +18,7 @@ javaToNative
  (Ljava/lang/Object;Lorg/eclipse/swt/dnd/TransferData;)V
 nativeToJava
  (Lorg/eclipse/swt/dnd/TransferData;)Ljava/lang/Object;
- (Lorg/eclipse/swt/dnd/TransferData;)Ljava/lang/Object;
+ (Lorg/eclipse/swt/dnd/TransferData;)L0java/lang/Object; # @Inherited(org.eclipse.swt.dnd.ByteArrayTransfer)
 validate
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/HTMLTransfer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/HTMLTransfer.eea
index 794b944ead..1b42127e3a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/HTMLTransfer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/HTMLTransfer.eea
@@ -15,7 +15,7 @@ javaToNative
  (Ljava/lang/Object;Lorg/eclipse/swt/dnd/TransferData;)V
 nativeToJava
  (Lorg/eclipse/swt/dnd/TransferData;)Ljava/lang/Object;
- (Lorg/eclipse/swt/dnd/TransferData;)Ljava/lang/Object;
+ (Lorg/eclipse/swt/dnd/TransferData;)L0java/lang/Object; # @Inherited(org.eclipse.swt.dnd.ByteArrayTransfer)
 validate
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/ImageTransfer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/ImageTransfer.eea
index fd520bf160..55dff95d35 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/ImageTransfer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/ImageTransfer.eea
@@ -15,7 +15,7 @@ javaToNative
  (Ljava/lang/Object;Lorg/eclipse/swt/dnd/TransferData;)V
 nativeToJava
  (Lorg/eclipse/swt/dnd/TransferData;)Ljava/lang/Object;
- (Lorg/eclipse/swt/dnd/TransferData;)Ljava/lang/Object;
+ (Lorg/eclipse/swt/dnd/TransferData;)L0java/lang/Object; # @Inherited(org.eclipse.swt.dnd.ByteArrayTransfer)
 validate
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/RTFTransfer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/RTFTransfer.eea
index 6bce41f885..c02a655a09 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/RTFTransfer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/RTFTransfer.eea
@@ -15,7 +15,7 @@ javaToNative
  (Ljava/lang/Object;Lorg/eclipse/swt/dnd/TransferData;)V
 nativeToJava
  (Lorg/eclipse/swt/dnd/TransferData;)Ljava/lang/Object;
- (Lorg/eclipse/swt/dnd/TransferData;)Ljava/lang/Object;
+ (Lorg/eclipse/swt/dnd/TransferData;)L0java/lang/Object; # @Inherited(org.eclipse.swt.dnd.ByteArrayTransfer)
 validate
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/TextTransfer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/TextTransfer.eea
index 52bc5d1453..f8a043595b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/TextTransfer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/TextTransfer.eea
@@ -15,7 +15,7 @@ javaToNative
  (Ljava/lang/Object;Lorg/eclipse/swt/dnd/TransferData;)V
 nativeToJava
  (Lorg/eclipse/swt/dnd/TransferData;)Ljava/lang/Object;
- (Lorg/eclipse/swt/dnd/TransferData;)Ljava/lang/Object;
+ (Lorg/eclipse/swt/dnd/TransferData;)L0java/lang/Object; # @Inherited(org.eclipse.swt.dnd.ByteArrayTransfer)
 validate
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/URLTransfer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/URLTransfer.eea
index c44653ff90..1437801573 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/URLTransfer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/dnd/URLTransfer.eea
@@ -15,7 +15,7 @@ javaToNative
  (Ljava/lang/Object;Lorg/eclipse/swt/dnd/TransferData;)V
 nativeToJava
  (Lorg/eclipse/swt/dnd/TransferData;)Ljava/lang/Object;
- (Lorg/eclipse/swt/dnd/TransferData;)Ljava/lang/Object;
+ (Lorg/eclipse/swt/dnd/TransferData;)L0java/lang/Object; # @Inherited(org.eclipse.swt.dnd.ByteArrayTransfer)
 validate
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/Cursor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/Cursor.eea
index 936807aebc..230416f855 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/Cursor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/Cursor.eea
@@ -2,7 +2,7 @@ class org/eclipse/swt/graphics/Cursor
 
 win32_new
  (Lorg/eclipse/swt/graphics/Device;I)Lorg/eclipse/swt/graphics/Cursor;
- (Lorg/eclipse/swt/graphics/Device;I)Lorg/eclipse/swt/graphics/Cursor;
+ (Lorg/eclipse/swt/graphics/Device;I)L1org/eclipse/swt/graphics/Cursor;
 
 <init>
  (Lorg/eclipse/swt/graphics/Device;I)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/Font.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/Font.eea
index b67aaac619..89c1f99d64 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/Font.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/Font.eea
@@ -2,13 +2,13 @@ class org/eclipse/swt/graphics/Font
 
 win32_new
  (Lorg/eclipse/swt/graphics/Device;J)Lorg/eclipse/swt/graphics/Font;
- (Lorg/eclipse/swt/graphics/Device;J)Lorg/eclipse/swt/graphics/Font;
+ (Lorg/eclipse/swt/graphics/Device;J)L1org/eclipse/swt/graphics/Font;
 win32_new
  (Lorg/eclipse/swt/graphics/Device;JI)Lorg/eclipse/swt/graphics/Font;
  (Lorg/eclipse/swt/graphics/Device;JI)Lorg/eclipse/swt/graphics/Font;
 win32_new
  (Lorg/eclipse/swt/graphics/Device;Lorg/eclipse/swt/graphics/FontData;I)Lorg/eclipse/swt/graphics/Font;
- (Lorg/eclipse/swt/graphics/Device;Lorg/eclipse/swt/graphics/FontData;I)Lorg/eclipse/swt/graphics/Font;
+ (Lorg/eclipse/swt/graphics/Device;Lorg/eclipse/swt/graphics/FontData;I)L1org/eclipse/swt/graphics/Font;
 win32_new
  (Lorg/eclipse/swt/graphics/Font;I)Lorg/eclipse/swt/graphics/Font;
  (Lorg/eclipse/swt/graphics/Font;I)Lorg/eclipse/swt/graphics/Font;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/FontData.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/FontData.eea
index 2f1559f841..fee0e81b2f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/FontData.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/FontData.eea
@@ -2,7 +2,7 @@ class org/eclipse/swt/graphics/FontData
 
 win32_new
  (Lorg/eclipse/swt/internal/win32/LOGFONT;F)Lorg/eclipse/swt/graphics/FontData;
- (Lorg/eclipse/swt/internal/win32/LOGFONT;F)Lorg/eclipse/swt/graphics/FontData;
+ (Lorg/eclipse/swt/internal/win32/LOGFONT;F)L1org/eclipse/swt/graphics/FontData;
 
 data
  Lorg/eclipse/swt/internal/win32/LOGFONT;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/FontMetrics.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/FontMetrics.eea
index 313b95d4d2..d44e52c288 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/FontMetrics.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/FontMetrics.eea
@@ -2,7 +2,7 @@ class org/eclipse/swt/graphics/FontMetrics
 
 win32_new
  (Lorg/eclipse/swt/internal/win32/TEXTMETRIC;I)Lorg/eclipse/swt/graphics/FontMetrics;
- (Lorg/eclipse/swt/internal/win32/TEXTMETRIC;I)Lorg/eclipse/swt/graphics/FontMetrics;
+ (Lorg/eclipse/swt/internal/win32/TEXTMETRIC;I)L1org/eclipse/swt/graphics/FontMetrics;
 
 handle
  Lorg/eclipse/swt/internal/win32/TEXTMETRIC;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/Image.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/Image.eea
index b8bbd82eaf..497da1aeda 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/Image.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/Image.eea
@@ -5,7 +5,7 @@ win32_getHandle
  (Lorg/eclipse/swt/graphics/Image;I)Ljava/lang/Long;
 win32_new
  (Lorg/eclipse/swt/graphics/Device;IJ)Lorg/eclipse/swt/graphics/Image;
- (Lorg/eclipse/swt/graphics/Device;IJ)Lorg/eclipse/swt/graphics/Image;
+ (Lorg/eclipse/swt/graphics/Device;IJ)L1org/eclipse/swt/graphics/Image;
 
 <init>
  (Lorg/eclipse/swt/graphics/Device;II)V
@@ -39,7 +39,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getBackground
  ()Lorg/eclipse/swt/graphics/Color;
- ()Lorg/eclipse/swt/graphics/Color;
+ ()L0org/eclipse/swt/graphics/Color;
 getBounds
  ()Lorg/eclipse/swt/graphics/Rectangle;
  ()Lorg/eclipse/swt/graphics/Rectangle;
@@ -54,7 +54,7 @@ getImageData
  (I)Lorg/eclipse/swt/graphics/ImageData;
 getImageDataAtCurrentZoom
  ()Lorg/eclipse/swt/graphics/ImageData;
- ()Lorg/eclipse/swt/graphics/ImageData;
+ ()L0org/eclipse/swt/graphics/ImageData;
 internal_dispose_GC
  (JLorg/eclipse/swt/graphics/GCData;)V
  (JLorg/eclipse/swt/graphics/GCData;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/ImageData.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/ImageData.eea
index 598b2aae71..a91d594d17 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/ImageData.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/ImageData.eea
@@ -2,7 +2,7 @@ class org/eclipse/swt/graphics/ImageData
 
 internal_new
  (IIILorg/eclipse/swt/graphics/PaletteData;I[BI[B[BIIIIIII)Lorg/eclipse/swt/graphics/ImageData;
- (IIILorg/eclipse/swt/graphics/PaletteData;I[BI[B[BIIIIIII)Lorg/eclipse/swt/graphics/ImageData;
+ (IIILorg/eclipse/swt/graphics/PaletteData;I[BI[B[BIIIIIII)L1org/eclipse/swt/graphics/ImageData;
 
 alphaData
  [B
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/ImageLoader.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/ImageLoader.eea
index f4422adca4..5a4df30303 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/ImageLoader.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/ImageLoader.eea
@@ -12,7 +12,7 @@ load
  (Ljava/io/InputStream;)[Lorg/eclipse/swt/graphics/ImageData;
 load
  (Ljava/lang/String;)[Lorg/eclipse/swt/graphics/ImageData;
- (Ljava/lang/String;)[Lorg/eclipse/swt/graphics/ImageData;
+ (Ljava/lang/String;)[0Lorg/eclipse/swt/graphics/ImageData;
 notifyListeners
  (Lorg/eclipse/swt/graphics/ImageLoaderEvent;)V
  (Lorg/eclipse/swt/graphics/ImageLoaderEvent;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/TextLayout.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/TextLayout.eea
index 8350f8128c..2befd6e318 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/TextLayout.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/graphics/TextLayout.eea
@@ -29,7 +29,7 @@ getLineMetrics
  (I)Lorg/eclipse/swt/graphics/FontMetrics;
 getLineOffsets
  ()[I
- ()[I
+ ()[1I
 getLocation
  (IZ)Lorg/eclipse/swt/graphics/Point;
  (IZ)Lorg/eclipse/swt/graphics/Point;
@@ -41,7 +41,7 @@ getOffset
  (Lorg/eclipse/swt/graphics/Point;[I)I
 getRanges
  ()[I
- ()[I
+ ()[1I
 getSegments
  ()[I
  ()[I
@@ -50,10 +50,10 @@ getSegmentsChars
  ()[C
 getStyle
  (I)Lorg/eclipse/swt/graphics/TextStyle;
- (I)Lorg/eclipse/swt/graphics/TextStyle;
+ (I)L0org/eclipse/swt/graphics/TextStyle;
 getStyles
  ()[Lorg/eclipse/swt/graphics/TextStyle;
- ()[Lorg/eclipse/swt/graphics/TextStyle;
+ ()[1Lorg/eclipse/swt/graphics/TextStyle;
 getTabs
  ()[I
  ()[I
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/ole/win32/OleAutomation.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/ole/win32/OleAutomation.eea
index 680a6887bb..d296c48d1c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/ole/win32/OleAutomation.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/ole/win32/OleAutomation.eea
@@ -11,49 +11,49 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getDocumentation
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getFunctionDescription
  (I)Lorg/eclipse/swt/ole/win32/OleFunctionDescription;
- (I)Lorg/eclipse/swt/ole/win32/OleFunctionDescription;
+ (I)L0org/eclipse/swt/ole/win32/OleFunctionDescription;
 getHelpFile
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getIDsOfNames
  ([Ljava/lang/String;)[I
- ([Ljava/lang/String;)[I
+ ([Ljava/lang/String;)[0I
 getLastError
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getName
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getNames
  (II)[Ljava/lang/String;
- (II)[Ljava/lang/String;
+ (II)[1Ljava/lang/String;
 getProperty
  (I)Lorg/eclipse/swt/ole/win32/Variant;
- (I)Lorg/eclipse/swt/ole/win32/Variant;
+ (I)L0org/eclipse/swt/ole/win32/Variant;
 getProperty
  (I[Lorg/eclipse/swt/ole/win32/Variant;)Lorg/eclipse/swt/ole/win32/Variant;
- (I[Lorg/eclipse/swt/ole/win32/Variant;)Lorg/eclipse/swt/ole/win32/Variant;
+ (I[Lorg/eclipse/swt/ole/win32/Variant;)L0org/eclipse/swt/ole/win32/Variant;
 getProperty
  (I[Lorg/eclipse/swt/ole/win32/Variant;[I)Lorg/eclipse/swt/ole/win32/Variant;
- (I[Lorg/eclipse/swt/ole/win32/Variant;[I)Lorg/eclipse/swt/ole/win32/Variant;
+ (I[Lorg/eclipse/swt/ole/win32/Variant;[I)L0org/eclipse/swt/ole/win32/Variant;
 getPropertyDescription
  (I)Lorg/eclipse/swt/ole/win32/OlePropertyDescription;
- (I)Lorg/eclipse/swt/ole/win32/OlePropertyDescription;
+ (I)L0org/eclipse/swt/ole/win32/OlePropertyDescription;
 getTypeInfoAttributes
  ()Lorg/eclipse/swt/internal/ole/win32/TYPEATTR;
- ()Lorg/eclipse/swt/internal/ole/win32/TYPEATTR;
+ ()L0org/eclipse/swt/internal/ole/win32/TYPEATTR;
 invoke
  (I)Lorg/eclipse/swt/ole/win32/Variant;
- (I)Lorg/eclipse/swt/ole/win32/Variant;
+ (I)L0org/eclipse/swt/ole/win32/Variant;
 invoke
  (I[Lorg/eclipse/swt/ole/win32/Variant;)Lorg/eclipse/swt/ole/win32/Variant;
- (I[Lorg/eclipse/swt/ole/win32/Variant;)Lorg/eclipse/swt/ole/win32/Variant;
+ (I[Lorg/eclipse/swt/ole/win32/Variant;)L0org/eclipse/swt/ole/win32/Variant;
 invoke
  (I[Lorg/eclipse/swt/ole/win32/Variant;[I)Lorg/eclipse/swt/ole/win32/Variant;
- (I[Lorg/eclipse/swt/ole/win32/Variant;[I)Lorg/eclipse/swt/ole/win32/Variant;
+ (I[Lorg/eclipse/swt/ole/win32/Variant;[I)L0org/eclipse/swt/ole/win32/Variant;
 invokeNoReply
  (I[Lorg/eclipse/swt/ole/win32/Variant;)V
  (I[Lorg/eclipse/swt/ole/win32/Variant;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/ole/win32/OleClientSite.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/ole/win32/OleClientSite.eea
index 69c076c889..a1edf71f19 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/ole/win32/OleClientSite.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/ole/win32/OleClientSite.eea
@@ -42,13 +42,13 @@ tempStorage
  (Lorg/eclipse/swt/widgets/Composite;ILjava/lang/String;Ljava/io/File;)V
 createTempStorage
  ()Lorg/eclipse/swt/internal/ole/win32/IStorage;
- ()Lorg/eclipse/swt/internal/ole/win32/IStorage;
+ ()L1org/eclipse/swt/internal/ole/win32/IStorage;
 exec
  (IILorg/eclipse/swt/ole/win32/Variant;Lorg/eclipse/swt/ole/win32/Variant;)I
  (IILorg/eclipse/swt/ole/win32/Variant;Lorg/eclipse/swt/ole/win32/Variant;)I
 getClassID
  (Ljava/lang/String;)Lorg/eclipse/swt/internal/ole/win32/GUID;
- (Ljava/lang/String;)Lorg/eclipse/swt/internal/ole/win32/GUID;
+ (Ljava/lang/String;)L0org/eclipse/swt/internal/ole/win32/GUID;
 getIndent
  ()Lorg/eclipse/swt/graphics/Rectangle;
  ()Lorg/eclipse/swt/graphics/Rectangle;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/ole/win32/OleControlSite.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/ole/win32/OleControlSite.eea
index 9ec0a36625..8a17e33139 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/ole/win32/OleControlSite.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/ole/win32/OleControlSite.eea
@@ -35,7 +35,7 @@ getLicenseInfo
  (Lorg/eclipse/swt/internal/ole/win32/GUID;)J
 getSiteProperty
  (I)Lorg/eclipse/swt/ole/win32/Variant;
- (I)Lorg/eclipse/swt/ole/win32/Variant;
+ (I)L0org/eclipse/swt/ole/win32/Variant;
 removeEventListener
  (ILorg/eclipse/swt/ole/win32/OleListener;)V
  (ILorg/eclipse/swt/ole/win32/OleListener;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/ole/win32/Variant.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/ole/win32/Variant.eea
index af1285d46f..7fbe544749 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/ole/win32/Variant.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/ole/win32/Variant.eea
@@ -9,7 +9,7 @@ win32_copy
  (JLorg/eclipse/swt/ole/win32/Variant;)V
 win32_new
  (J)Lorg/eclipse/swt/ole/win32/Variant;
- (J)Lorg/eclipse/swt/ole/win32/Variant;
+ (J)L1org/eclipse/swt/ole/win32/Variant;
 
 <init>
  (Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/opengl/GLCanvas.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/opengl/GLCanvas.eea
index 4f5c82ad1e..6d74baf17d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/opengl/GLCanvas.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/opengl/GLCanvas.eea
@@ -5,4 +5,4 @@ class org/eclipse/swt/opengl/GLCanvas
  (Lorg/eclipse/swt/widgets/Composite;ILorg/eclipse/swt/opengl/GLData;)V
 getGLData
  ()Lorg/eclipse/swt/opengl/GLData;
- ()Lorg/eclipse/swt/opengl/GLData;
+ ()L1org/eclipse/swt/opengl/GLData;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/printing/PrintDialog.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/printing/PrintDialog.eea
index 635c2efc5b..6ee3267377 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/printing/PrintDialog.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/printing/PrintDialog.eea
@@ -11,7 +11,7 @@ getPrinterData
  ()Lorg/eclipse/swt/printing/PrinterData;
 open
  ()Lorg/eclipse/swt/printing/PrinterData;
- ()Lorg/eclipse/swt/printing/PrinterData;
+ ()L1org/eclipse/swt/printing/PrinterData;
 setPrinterData
  (Lorg/eclipse/swt/printing/PrinterData;)V
  (Lorg/eclipse/swt/printing/PrinterData;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/printing/Printer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/printing/Printer.eea
index 0118532297..71ccd16d54 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/printing/Printer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/printing/Printer.eea
@@ -2,10 +2,10 @@ class org/eclipse/swt/printing/Printer
 
 getDefaultPrinterData
  ()Lorg/eclipse/swt/printing/PrinterData;
- ()Lorg/eclipse/swt/printing/PrinterData;
+ ()L0org/eclipse/swt/printing/PrinterData;
 getPrinterList
  ()[Lorg/eclipse/swt/printing/PrinterData;
- ()[Lorg/eclipse/swt/printing/PrinterData;
+ ()[1Lorg/eclipse/swt/printing/PrinterData;
 
 <init>
  (Lorg/eclipse/swt/printing/PrinterData;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/CoolBar.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/CoolBar.eea
index d5ebf10eb0..294a8e19c3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/CoolBar.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/CoolBar.eea
@@ -8,16 +8,16 @@ getItem
  (I)Lorg/eclipse/swt/widgets/CoolItem;
 getItemOrder
  ()[I
- ()[I
+ ()[1I
 getItemSizes
  ()[Lorg/eclipse/swt/graphics/Point;
  ()[Lorg/eclipse/swt/graphics/Point;
 getItems
  ()[Lorg/eclipse/swt/widgets/CoolItem;
- ()[Lorg/eclipse/swt/widgets/CoolItem;
+ ()[1Lorg/eclipse/swt/widgets/CoolItem;
 getWrapIndices
  ()[I
- ()[I
+ ()[1I
 indexOf
  (Lorg/eclipse/swt/widgets/CoolItem;)I
  (Lorg/eclipse/swt/widgets/CoolItem;)I
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Decorations.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Decorations.eea
index f071e7bdde..06c376c5f0 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Decorations.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Decorations.eea
@@ -5,13 +5,13 @@ class org/eclipse/swt/widgets/Decorations
  (Lorg/eclipse/swt/widgets/Composite;I)V
 getDefaultButton
  ()Lorg/eclipse/swt/widgets/Button;
- ()Lorg/eclipse/swt/widgets/Button;
+ ()L0org/eclipse/swt/widgets/Button;
 getImage
  ()Lorg/eclipse/swt/graphics/Image;
  ()Lorg/eclipse/swt/graphics/Image;
 getImages
  ()[Lorg/eclipse/swt/graphics/Image;
- ()[Lorg/eclipse/swt/graphics/Image;
+ ()[1Lorg/eclipse/swt/graphics/Image;
 getMenuBar
  ()Lorg/eclipse/swt/widgets/Menu;
  ()Lorg/eclipse/swt/widgets/Menu;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/DirectoryDialog.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/DirectoryDialog.eea
index 6aafe6e974..59759b5258 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/DirectoryDialog.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/DirectoryDialog.eea
@@ -14,7 +14,7 @@ getMessage
  ()Ljava/lang/String;
 open
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 openDialog
  ()Ljava/util/Optional<Ljava/lang/String;>;
  ()Ljava/util/Optional<Ljava/lang/String;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Display.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Display.eea
index ff5560f102..8553e49cbe 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Display.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Display.eea
@@ -115,13 +115,13 @@ getSystemColor
  (I)L1org/eclipse/swt/graphics/Color; # @Inherited(org.eclipse.swt.graphics.Device)
 getSystemCursor
  (I)Lorg/eclipse/swt/graphics/Cursor;
- (I)Lorg/eclipse/swt/graphics/Cursor;
+ (I)L0org/eclipse/swt/graphics/Cursor;
 getSystemFont
  ()Lorg/eclipse/swt/graphics/Font;
  ()L1org/eclipse/swt/graphics/Font; # @Inherited(org.eclipse.swt.graphics.Device)
 getSystemImage
  (I)Lorg/eclipse/swt/graphics/Image;
- (I)Lorg/eclipse/swt/graphics/Image;
+ (I)L0org/eclipse/swt/graphics/Image;
 getSystemMenu
  ()Lorg/eclipse/swt/widgets/Menu;
  ()L0org/eclipse/swt/widgets/Menu;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/ExpandBar.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/ExpandBar.eea
index c642e5c006..9d73acbe1e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/ExpandBar.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/ExpandBar.eea
@@ -11,7 +11,7 @@ getItem
  (I)Lorg/eclipse/swt/widgets/ExpandItem;
 getItems
  ()[Lorg/eclipse/swt/widgets/ExpandItem;
- ()[Lorg/eclipse/swt/widgets/ExpandItem;
+ ()[1Lorg/eclipse/swt/widgets/ExpandItem;
 indexOf
  (Lorg/eclipse/swt/widgets/ExpandItem;)I
  (Lorg/eclipse/swt/widgets/ExpandItem;)I
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/FileDialog.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/FileDialog.eea
index 7d6f158d16..df30ada20d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/FileDialog.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/FileDialog.eea
@@ -23,7 +23,7 @@ getFilterPath
  ()Ljava/lang/String;
 open
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 openDialog
  ()Ljava/util/Optional<Ljava/lang/String;>;
  ()Ljava/util/Optional<Ljava/lang/String;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/FontDialog.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/FontDialog.eea
index 3a017d7ab6..3f0278089c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/FontDialog.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/FontDialog.eea
@@ -11,13 +11,13 @@ getFontData
  ()Lorg/eclipse/swt/graphics/FontData;
 getFontList
  ()[Lorg/eclipse/swt/graphics/FontData;
- ()[Lorg/eclipse/swt/graphics/FontData;
+ ()[0Lorg/eclipse/swt/graphics/FontData;
 getRGB
  ()Lorg/eclipse/swt/graphics/RGB;
  ()Lorg/eclipse/swt/graphics/RGB;
 open
  ()Lorg/eclipse/swt/graphics/FontData;
- ()Lorg/eclipse/swt/graphics/FontData;
+ ()L0org/eclipse/swt/graphics/FontData;
 setFontData
  (Lorg/eclipse/swt/graphics/FontData;)V
  (Lorg/eclipse/swt/graphics/FontData;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/IME.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/IME.eea
index 36224b3d0c..0006522934 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/IME.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/IME.eea
@@ -5,10 +5,10 @@ class org/eclipse/swt/widgets/IME
  (Lorg/eclipse/swt/widgets/Canvas;I)V
 getRanges
  ()[I
- ()[I
+ ()[1I
 getStyles
  ()[Lorg/eclipse/swt/graphics/TextStyle;
- ()[Lorg/eclipse/swt/graphics/TextStyle;
+ ()[1Lorg/eclipse/swt/graphics/TextStyle;
 getText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/List.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/List.eea
index 05e3758e10..838e9e5a32 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/List.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/List.eea
@@ -23,7 +23,7 @@ getItems
  ()[1L1java/lang/String;
 getSelection
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 getSelectionIndices
  ()[I
  ()[I
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Menu.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Menu.eea
index 80ba78685c..0f8fcd2508 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Menu.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Menu.eea
@@ -20,13 +20,13 @@ addMenuListener
  (L1org/eclipse/swt/events/MenuListener;)V
 getDefaultItem
  ()Lorg/eclipse/swt/widgets/MenuItem;
- ()Lorg/eclipse/swt/widgets/MenuItem;
+ ()L0org/eclipse/swt/widgets/MenuItem;
 getItem
  (I)Lorg/eclipse/swt/widgets/MenuItem;
  (I)Lorg/eclipse/swt/widgets/MenuItem;
 getItems
  ()[Lorg/eclipse/swt/widgets/MenuItem;
- ()[Lorg/eclipse/swt/widgets/MenuItem;
+ ()[1Lorg/eclipse/swt/widgets/MenuItem;
 getParent
  ()Lorg/eclipse/swt/widgets/Decorations;
  ()Lorg/eclipse/swt/widgets/Decorations;
@@ -35,7 +35,7 @@ getParentItem
  ()Lorg/eclipse/swt/widgets/MenuItem;
 getParentMenu
  ()Lorg/eclipse/swt/widgets/Menu;
- ()Lorg/eclipse/swt/widgets/Menu;
+ ()L0org/eclipse/swt/widgets/Menu;
 getShell
  ()Lorg/eclipse/swt/widgets/Shell;
  ()Lorg/eclipse/swt/widgets/Shell;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Shell.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Shell.eea
index 7a816bb438..4a4bc2b612 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Shell.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Shell.eea
@@ -36,10 +36,10 @@ getShell
  ()L1org/eclipse/swt/widgets/Shell; # @Inherited(org.eclipse.swt.widgets.Control)
 getShells
  ()[Lorg/eclipse/swt/widgets/Shell;
- ()[Lorg/eclipse/swt/widgets/Shell;
+ ()[1Lorg/eclipse/swt/widgets/Shell;
 getToolBar
  ()Lorg/eclipse/swt/widgets/ToolBar;
- ()Lorg/eclipse/swt/widgets/ToolBar;
+ ()L0org/eclipse/swt/widgets/ToolBar;
 print
  (Lorg/eclipse/swt/graphics/GC;)Z
  (L1org/eclipse/swt/graphics/GC;)Z # @Inherited(org.eclipse.swt.widgets.Control)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/TabFolder.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/TabFolder.eea
index cbbb1a64b4..52282fc7c9 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/TabFolder.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/TabFolder.eea
@@ -11,10 +11,10 @@ getItem
  (I)Lorg/eclipse/swt/widgets/TabItem;
 getItem
  (Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/widgets/TabItem;
- (Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/widgets/TabItem;
+ (Lorg/eclipse/swt/graphics/Point;)L0org/eclipse/swt/widgets/TabItem;
 getItems
  ()[Lorg/eclipse/swt/widgets/TabItem;
- ()[Lorg/eclipse/swt/widgets/TabItem;
+ ()[1Lorg/eclipse/swt/widgets/TabItem;
 getSelection
  ()[Lorg/eclipse/swt/widgets/TabItem;
  ()[Lorg/eclipse/swt/widgets/TabItem;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Table.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Table.eea
index 6d9ff11bbd..6bba530b3e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Table.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Table.eea
@@ -17,10 +17,10 @@ getColumn
  (I)Lorg/eclipse/swt/widgets/TableColumn;
 getColumnOrder
  ()[I
- ()[I
+ ()[1I
 getColumns
  ()[Lorg/eclipse/swt/widgets/TableColumn;
- ()[Lorg/eclipse/swt/widgets/TableColumn;
+ ()[1Lorg/eclipse/swt/widgets/TableColumn;
 getHeaderBackground
  ()Lorg/eclipse/swt/graphics/Color;
  ()Lorg/eclipse/swt/graphics/Color;
@@ -35,13 +35,13 @@ getItem
  (Lorg/eclipse/swt/graphics/Point;)Lorg/eclipse/swt/widgets/TableItem;
 getItems
  ()[Lorg/eclipse/swt/widgets/TableItem;
- ()[Lorg/eclipse/swt/widgets/TableItem;
+ ()[1Lorg/eclipse/swt/widgets/TableItem;
 getSelection
  ()[Lorg/eclipse/swt/widgets/TableItem;
- ()[Lorg/eclipse/swt/widgets/TableItem;
+ ()[1Lorg/eclipse/swt/widgets/TableItem;
 getSelectionIndices
  ()[I
- ()[I
+ ()[1I
 getSortColumn
  ()Lorg/eclipse/swt/widgets/TableColumn;
  ()Lorg/eclipse/swt/widgets/TableColumn;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/TableItem.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/TableItem.eea
index e74e6e8b2e..ed68384ee3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/TableItem.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/TableItem.eea
@@ -35,7 +35,7 @@ getImage
  ()L0org/eclipse/swt/graphics/Image; # @Inherited(org.eclipse.swt.widgets.Item)
 getImage
  (I)Lorg/eclipse/swt/graphics/Image;
- (I)Lorg/eclipse/swt/graphics/Image;
+ (I)L0org/eclipse/swt/graphics/Image;
 getImageBounds
  (I)Lorg/eclipse/swt/graphics/Rectangle;
  (I)Lorg/eclipse/swt/graphics/Rectangle;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/TaskBar.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/TaskBar.eea
index a0b55227e2..aa1c79a0b5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/TaskBar.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/TaskBar.eea
@@ -8,4 +8,4 @@ getItem
  (Lorg/eclipse/swt/widgets/Shell;)Lorg/eclipse/swt/widgets/TaskItem;
 getItems
  ()[Lorg/eclipse/swt/widgets/TaskItem;
- ()[Lorg/eclipse/swt/widgets/TaskItem;
+ ()[1Lorg/eclipse/swt/widgets/TaskItem;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Text.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Text.eea
index 7f2f4694d6..935b7a7f79 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Text.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Text.eea
@@ -45,7 +45,7 @@ getText
  (II)Ljava/lang/String;
 getTextChars
  ()[C
- ()[C
+ ()[1C
 insert
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Tray.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Tray.eea
index c6a8d197d4..87a2beaf84 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Tray.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Tray.eea
@@ -5,4 +5,4 @@ getItem
  (I)Lorg/eclipse/swt/widgets/TrayItem;
 getItems
  ()[Lorg/eclipse/swt/widgets/TrayItem;
- ()[Lorg/eclipse/swt/widgets/TrayItem;
+ ()[1Lorg/eclipse/swt/widgets/TrayItem;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Tree.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Tree.eea
index e507218d76..85af6e731a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Tree.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/Tree.eea
@@ -20,7 +20,7 @@ getColumnOrder
  ()[I
 getColumns
  ()[Lorg/eclipse/swt/widgets/TreeColumn;
- ()[Lorg/eclipse/swt/widgets/TreeColumn;
+ ()[1Lorg/eclipse/swt/widgets/TreeColumn;
 getHeaderBackground
  ()Lorg/eclipse/swt/graphics/Color;
  ()Lorg/eclipse/swt/graphics/Color;
@@ -38,7 +38,7 @@ getItems
  ()[Lorg/eclipse/swt/widgets/TreeItem;
 getParentItem
  ()Lorg/eclipse/swt/widgets/TreeItem;
- ()Lorg/eclipse/swt/widgets/TreeItem;
+ ()L0org/eclipse/swt/widgets/TreeItem;
 getSelection
  ()[Lorg/eclipse/swt/widgets/TreeItem;
  ()[Lorg/eclipse/swt/widgets/TreeItem;
@@ -47,7 +47,7 @@ getSortColumn
  ()Lorg/eclipse/swt/widgets/TreeColumn;
 getTopItem
  ()Lorg/eclipse/swt/widgets/TreeItem;
- ()Lorg/eclipse/swt/widgets/TreeItem;
+ ()L0org/eclipse/swt/widgets/TreeItem;
 indexOf
  (Lorg/eclipse/swt/widgets/TreeColumn;)I
  (Lorg/eclipse/swt/widgets/TreeColumn;)I
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/TreeItem.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/TreeItem.eea
index b1b54546f5..afad625213 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/TreeItem.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/swt/widgets/TreeItem.eea
@@ -41,7 +41,7 @@ getImage
  ()L0org/eclipse/swt/graphics/Image; # @Inherited(org.eclipse.swt.widgets.Item)
 getImage
  (I)Lorg/eclipse/swt/graphics/Image;
- (I)Lorg/eclipse/swt/graphics/Image;
+ (I)L0org/eclipse/swt/graphics/Image;
 getImageBounds
  (I)Lorg/eclipse/swt/graphics/Rectangle;
  (I)Lorg/eclipse/swt/graphics/Rectangle;
@@ -56,7 +56,7 @@ getParent
  ()Lorg/eclipse/swt/widgets/Tree;
 getParentItem
  ()Lorg/eclipse/swt/widgets/TreeItem;
- ()Lorg/eclipse/swt/widgets/TreeItem;
+ ()L0org/eclipse/swt/widgets/TreeItem;
 getText
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(org.eclipse.swt.widgets.Item)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ExtensionFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ExtensionFactory.eea
index 9eab42b48e..52fab0de68 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ExtensionFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ExtensionFactory.eea
@@ -45,7 +45,7 @@ WORKBENCH_PREFERENCE_PAGE
 
 create
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object; # @Inherited(org.eclipse.core.runtime.IExecutableExtensionFactory)
 setInitializationData
  (Lorg/eclipse/core/runtime/IConfigurationElement;Ljava/lang/String;Ljava/lang/Object;)V
  (Lorg/eclipse/core/runtime/IConfigurationElement;Ljava/lang/String;Ljava/lang/Object;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/IElementFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/IElementFactory.eea
index 40b469e5cb..17c276ff57 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/IElementFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/IElementFactory.eea
@@ -2,4 +2,4 @@ class org/eclipse/ui/IElementFactory
 
 createElement
  (Lorg/eclipse/ui/IMemento;)Lorg/eclipse/core/runtime/IAdaptable;
- (Lorg/eclipse/ui/IMemento;)Lorg/eclipse/core/runtime/IAdaptable;
+ (Lorg/eclipse/ui/IMemento;)L1org/eclipse/core/runtime/IAdaptable;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/IMemento.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/IMemento.eea
index 28e0180e32..aa48e6fefb 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/IMemento.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/IMemento.eea
@@ -6,10 +6,10 @@ TAG_ID
 
 createChild
  (Ljava/lang/String;)Lorg/eclipse/ui/IMemento;
- (Ljava/lang/String;)Lorg/eclipse/ui/IMemento;
+ (Ljava/lang/String;)L1org/eclipse/ui/IMemento;
 createChild
  (Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/ui/IMemento;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/ui/IMemento;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/eclipse/ui/IMemento;
 getAttributeKeys
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/INavigationLocationProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/INavigationLocationProvider.eea
index 78ca6140ef..9362fe8e1a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/INavigationLocationProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/INavigationLocationProvider.eea
@@ -2,7 +2,7 @@ class org/eclipse/ui/INavigationLocationProvider
 
 createEmptyNavigationLocation
  ()Lorg/eclipse/ui/INavigationLocation;
- ()Lorg/eclipse/ui/INavigationLocation;
+ ()L1org/eclipse/ui/INavigationLocation;
 createNavigationLocation
  ()Lorg/eclipse/ui/INavigationLocation;
- ()Lorg/eclipse/ui/INavigationLocation;
+ ()L1org/eclipse/ui/INavigationLocation;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/IPageLayout.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/IPageLayout.eea
index a45e02d8f8..dd41b5df10 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/IPageLayout.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/IPageLayout.eea
@@ -69,10 +69,10 @@ addView
  (Ljava/lang/String;IFLjava/lang/String;)V
 createFolder
  (Ljava/lang/String;IFLjava/lang/String;)Lorg/eclipse/ui/IFolderLayout;
- (Ljava/lang/String;IFLjava/lang/String;)Lorg/eclipse/ui/IFolderLayout;
+ (Ljava/lang/String;IFLjava/lang/String;)L1org/eclipse/ui/IFolderLayout;
 createPlaceholderFolder
  (Ljava/lang/String;IFLjava/lang/String;)Lorg/eclipse/ui/IPlaceholderFolderLayout;
- (Ljava/lang/String;IFLjava/lang/String;)Lorg/eclipse/ui/IPlaceholderFolderLayout;
+ (Ljava/lang/String;IFLjava/lang/String;)L1org/eclipse/ui/IPlaceholderFolderLayout;
 getDescriptor
  ()Lorg/eclipse/ui/IPerspectiveDescriptor;
  ()Lorg/eclipse/ui/IPerspectiveDescriptor;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/IWorkbench.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/IWorkbench.eea
index 77e8f1dd9d..95cd11a88b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/IWorkbench.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/IWorkbench.eea
@@ -8,7 +8,7 @@ addWorkbenchListener
  (L1org/eclipse/ui/IWorkbenchListener;)V
 createLocalWorkingSetManager
  ()Lorg/eclipse/ui/ILocalWorkingSetManager;
- ()Lorg/eclipse/ui/ILocalWorkingSetManager;
+ ()L1org/eclipse/ui/ILocalWorkingSetManager;
 getActiveWorkbenchWindow
  ()Lorg/eclipse/ui/IWorkbenchWindow;
  ()Lorg/eclipse/ui/IWorkbenchWindow;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/IWorkingSetManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/IWorkingSetManager.eea
index 6fc8c15255..8c5e81c9e3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/IWorkingSetManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/IWorkingSetManager.eea
@@ -36,28 +36,28 @@ addWorkingSet
  (Lorg/eclipse/ui/IWorkingSet;)V
 createAggregateWorkingSet
  (Ljava/lang/String;Ljava/lang/String;[Lorg/eclipse/ui/IWorkingSet;)Lorg/eclipse/ui/IWorkingSet;
- (Ljava/lang/String;Ljava/lang/String;[Lorg/eclipse/ui/IWorkingSet;)Lorg/eclipse/ui/IWorkingSet;
+ (Ljava/lang/String;Ljava/lang/String;[Lorg/eclipse/ui/IWorkingSet;)L1org/eclipse/ui/IWorkingSet;
 createWorkingSet
  (Ljava/lang/String;[Lorg/eclipse/core/runtime/IAdaptable;)Lorg/eclipse/ui/IWorkingSet;
- (Ljava/lang/String;[Lorg/eclipse/core/runtime/IAdaptable;)Lorg/eclipse/ui/IWorkingSet;
+ (Ljava/lang/String;[Lorg/eclipse/core/runtime/IAdaptable;)L1org/eclipse/ui/IWorkingSet;
 createWorkingSet
  (Lorg/eclipse/ui/IMemento;)Lorg/eclipse/ui/IWorkingSet;
- (Lorg/eclipse/ui/IMemento;)Lorg/eclipse/ui/IWorkingSet;
+ (Lorg/eclipse/ui/IMemento;)L1org/eclipse/ui/IWorkingSet;
 createWorkingSetEditWizard
  (Lorg/eclipse/ui/IWorkingSet;)Lorg/eclipse/ui/dialogs/IWorkingSetEditWizard;
- (Lorg/eclipse/ui/IWorkingSet;)Lorg/eclipse/ui/dialogs/IWorkingSetEditWizard;
+ (Lorg/eclipse/ui/IWorkingSet;)L1org/eclipse/ui/dialogs/IWorkingSetEditWizard;
 createWorkingSetNewWizard
  ([Ljava/lang/String;)Lorg/eclipse/ui/dialogs/IWorkingSetNewWizard;
- ([Ljava/lang/String;)Lorg/eclipse/ui/dialogs/IWorkingSetNewWizard;
+ ([Ljava/lang/String;)L1org/eclipse/ui/dialogs/IWorkingSetNewWizard;
 createWorkingSetSelectionDialog
  (Lorg/eclipse/swt/widgets/Shell;)Lorg/eclipse/ui/dialogs/IWorkingSetSelectionDialog;
- (Lorg/eclipse/swt/widgets/Shell;)Lorg/eclipse/ui/dialogs/IWorkingSetSelectionDialog;
+ (Lorg/eclipse/swt/widgets/Shell;)L1org/eclipse/ui/dialogs/IWorkingSetSelectionDialog;
 createWorkingSetSelectionDialog
  (Lorg/eclipse/swt/widgets/Shell;Z)Lorg/eclipse/ui/dialogs/IWorkingSetSelectionDialog;
- (Lorg/eclipse/swt/widgets/Shell;Z)Lorg/eclipse/ui/dialogs/IWorkingSetSelectionDialog;
+ (Lorg/eclipse/swt/widgets/Shell;Z)L1org/eclipse/ui/dialogs/IWorkingSetSelectionDialog;
 createWorkingSetSelectionDialog
  (Lorg/eclipse/swt/widgets/Shell;Z[Ljava/lang/String;)Lorg/eclipse/ui/dialogs/IWorkingSetSelectionDialog;
- (Lorg/eclipse/swt/widgets/Shell;Z[Ljava/lang/String;)Lorg/eclipse/ui/dialogs/IWorkingSetSelectionDialog;
+ (Lorg/eclipse/swt/widgets/Shell;Z[Ljava/lang/String;)L1org/eclipse/ui/dialogs/IWorkingSetSelectionDialog;
 getAllWorkingSets
  ()[Lorg/eclipse/ui/IWorkingSet;
  ()[Lorg/eclipse/ui/IWorkingSet;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/NavigationLocation.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/NavigationLocation.eea
index c3de69224a..32a058a8b8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/NavigationLocation.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/NavigationLocation.eea
@@ -5,7 +5,7 @@ class org/eclipse/ui/NavigationLocation
  (Lorg/eclipse/ui/IEditorPart;)V
 getEditorPart
  ()Lorg/eclipse/ui/IEditorPart;
- ()Lorg/eclipse/ui/IEditorPart;
+ ()L0org/eclipse/ui/IEditorPart;
 getId
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/PlatformUI.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/PlatformUI.eea
index b02bd65198..44f104c0c8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/PlatformUI.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/PlatformUI.eea
@@ -15,7 +15,7 @@ createDisplay
  ()L1org/eclipse/swt/widgets/Display;
 createPreferenceStore
  (Ljava/lang/Class<*>;)Lorg/eclipse/jface/preference/IPreferenceStore;
- (Ljava/lang/Class<*>;)Lorg/eclipse/jface/preference/IPreferenceStore;
+ (Ljava/lang/Class<*>;)L1org/eclipse/jface/preference/IPreferenceStore;
 getApplication
  ()Ljava/util/Optional<Lorg/eclipse/e4/ui/model/application/MApplication;>;
  ()Ljava/util/Optional<Lorg/eclipse/e4/ui/model/application/MApplication;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/Saveable.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/Saveable.eea
index 374f6ed523..4934e5e259 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/Saveable.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/Saveable.eea
@@ -8,7 +8,7 @@ doSave
  (Lorg/eclipse/core/runtime/IProgressMonitor;)V
 doSave
  (Lorg/eclipse/core/runtime/IProgressMonitor;Lorg/eclipse/jface/window/IShellProvider;)Lorg/eclipse/ui/progress/IJobRunnable;
- (Lorg/eclipse/core/runtime/IProgressMonitor;Lorg/eclipse/jface/window/IShellProvider;)Lorg/eclipse/ui/progress/IJobRunnable;
+ (Lorg/eclipse/core/runtime/IProgressMonitor;Lorg/eclipse/jface/window/IShellProvider;)L0org/eclipse/ui/progress/IJobRunnable;
 enableUI
  ([Lorg/eclipse/ui/IWorkbenchPart;)V
  ([Lorg/eclipse/ui/IWorkbenchPart;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/SelectionListenerFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/SelectionListenerFactory.eea
index 6c037425c4..34c3c269be 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/SelectionListenerFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/SelectionListenerFactory.eea
@@ -2,22 +2,22 @@ class org/eclipse/ui/SelectionListenerFactory
 
 createListener
  (Lorg/eclipse/ui/IWorkbenchPart;Ljava/util/function/Predicate<Lorg/eclipse/ui/SelectionListenerFactory$ISelectionModel;>;)Lorg/eclipse/ui/ISelectionListener;
- (Lorg/eclipse/ui/IWorkbenchPart;Ljava/util/function/Predicate<Lorg/eclipse/ui/SelectionListenerFactory$ISelectionModel;>;)Lorg/eclipse/ui/ISelectionListener;
+ (Lorg/eclipse/ui/IWorkbenchPart;Ljava/util/function/Predicate<Lorg/eclipse/ui/SelectionListenerFactory$ISelectionModel;>;)L1org/eclipse/ui/ISelectionListener;
 createListener
  (Lorg/eclipse/ui/IWorkbenchPart;Lorg/eclipse/ui/ISelectionListener;Ljava/util/function/Predicate<Lorg/eclipse/ui/SelectionListenerFactory$ISelectionModel;>;)Lorg/eclipse/ui/ISelectionListener;
- (Lorg/eclipse/ui/IWorkbenchPart;Lorg/eclipse/ui/ISelectionListener;Ljava/util/function/Predicate<Lorg/eclipse/ui/SelectionListenerFactory$ISelectionModel;>;)Lorg/eclipse/ui/ISelectionListener;
+ (Lorg/eclipse/ui/IWorkbenchPart;Lorg/eclipse/ui/ISelectionListener;Ljava/util/function/Predicate<Lorg/eclipse/ui/SelectionListenerFactory$ISelectionModel;>;)L1org/eclipse/ui/ISelectionListener;
 createVisibleListener
  (Lorg/eclipse/ui/IWorkbenchPart;Lorg/eclipse/ui/ISelectionListener;)Lorg/eclipse/ui/ISelectionListener;
- (Lorg/eclipse/ui/IWorkbenchPart;Lorg/eclipse/ui/ISelectionListener;)Lorg/eclipse/ui/ISelectionListener;
+ (Lorg/eclipse/ui/IWorkbenchPart;Lorg/eclipse/ui/ISelectionListener;)L1org/eclipse/ui/ISelectionListener;
 createVisibleListener
  (Lorg/eclipse/ui/IWorkbenchPart;Lorg/eclipse/ui/ISelectionListener;Ljava/util/function/Predicate<Lorg/eclipse/ui/SelectionListenerFactory$ISelectionModel;>;)Lorg/eclipse/ui/ISelectionListener;
- (Lorg/eclipse/ui/IWorkbenchPart;Lorg/eclipse/ui/ISelectionListener;Ljava/util/function/Predicate<Lorg/eclipse/ui/SelectionListenerFactory$ISelectionModel;>;)Lorg/eclipse/ui/ISelectionListener;
+ (Lorg/eclipse/ui/IWorkbenchPart;Lorg/eclipse/ui/ISelectionListener;Ljava/util/function/Predicate<Lorg/eclipse/ui/SelectionListenerFactory$ISelectionModel;>;)L1org/eclipse/ui/ISelectionListener;
 createVisibleSelfMutedListener
  (Lorg/eclipse/ui/IWorkbenchPart;Lorg/eclipse/ui/ISelectionListener;)Lorg/eclipse/ui/ISelectionListener;
- (Lorg/eclipse/ui/IWorkbenchPart;Lorg/eclipse/ui/ISelectionListener;)Lorg/eclipse/ui/ISelectionListener;
+ (Lorg/eclipse/ui/IWorkbenchPart;Lorg/eclipse/ui/ISelectionListener;)L1org/eclipse/ui/ISelectionListener;
 createVisibleSelfMutedListener
  (Lorg/eclipse/ui/IWorkbenchPart;Lorg/eclipse/ui/ISelectionListener;Ljava/util/function/Predicate<Lorg/eclipse/ui/SelectionListenerFactory$ISelectionModel;>;)Lorg/eclipse/ui/ISelectionListener;
- (Lorg/eclipse/ui/IWorkbenchPart;Lorg/eclipse/ui/ISelectionListener;Ljava/util/function/Predicate<Lorg/eclipse/ui/SelectionListenerFactory$ISelectionModel;>;)Lorg/eclipse/ui/ISelectionListener;
+ (Lorg/eclipse/ui/IWorkbenchPart;Lorg/eclipse/ui/ISelectionListener;Ljava/util/function/Predicate<Lorg/eclipse/ui/SelectionListenerFactory$ISelectionModel;>;)L1org/eclipse/ui/ISelectionListener;
 decorate
  (Lorg/eclipse/ui/ISelectionListener;Ljava/util/function/Predicate<Lorg/eclipse/ui/SelectionListenerFactory$ISelectionModel;>;)Lorg/eclipse/ui/ISelectionListener;
  (Lorg/eclipse/ui/ISelectionListener;Ljava/util/function/Predicate<Lorg/eclipse/ui/SelectionListenerFactory$ISelectionModel;>;)Lorg/eclipse/ui/ISelectionListener;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/SubActionBars.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/SubActionBars.eea
index 9e6b7f1cc1..3ddb29d2be 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/SubActionBars.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/SubActionBars.eea
@@ -15,16 +15,16 @@ addPropertyChangeListener
  (L1org/eclipse/jface/util/IPropertyChangeListener;)V
 createSubMenuManager
  (Lorg/eclipse/jface/action/IMenuManager;)Lorg/eclipse/jface/action/SubMenuManager;
- (Lorg/eclipse/jface/action/IMenuManager;)Lorg/eclipse/jface/action/SubMenuManager;
+ (Lorg/eclipse/jface/action/IMenuManager;)L1org/eclipse/jface/action/SubMenuManager;
 createSubToolBarManager
  (Lorg/eclipse/jface/action/IToolBarManager;)Lorg/eclipse/jface/action/SubToolBarManager;
- (Lorg/eclipse/jface/action/IToolBarManager;)Lorg/eclipse/jface/action/SubToolBarManager;
+ (Lorg/eclipse/jface/action/IToolBarManager;)L1org/eclipse/jface/action/SubToolBarManager;
 firePropertyChange
  (Lorg/eclipse/jface/util/PropertyChangeEvent;)V
  (Lorg/eclipse/jface/util/PropertyChangeEvent;)V
 getGlobalActionHandler
  (Ljava/lang/String;)Lorg/eclipse/jface/action/IAction;
- (Ljava/lang/String;)Lorg/eclipse/jface/action/IAction;
+ (Ljava/lang/String;)L0org/eclipse/jface/action/IAction;
 getGlobalActionHandlers
  ()Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/jface/action/IAction;>;
  ()Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/jface/action/IAction;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/SubActionBars2.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/SubActionBars2.eea
index 3eb48c2387..7fbfc5bc36 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/SubActionBars2.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/SubActionBars2.eea
@@ -8,7 +8,7 @@ class org/eclipse/ui/SubActionBars2
  (Lorg/eclipse/ui/IActionBars2;Lorg/eclipse/ui/services/IServiceLocator;)V
 createSubCoolBarManager
  (Lorg/eclipse/jface/action/ICoolBarManager;)Lorg/eclipse/jface/action/SubCoolBarManager;
- (Lorg/eclipse/jface/action/ICoolBarManager;)Lorg/eclipse/jface/action/SubCoolBarManager;
+ (Lorg/eclipse/jface/action/ICoolBarManager;)L1org/eclipse/jface/action/SubCoolBarManager;
 getCastedParent
  ()Lorg/eclipse/ui/IActionBars2;
  ()Lorg/eclipse/ui/IActionBars2;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/XMLMemento.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/XMLMemento.eea
index 36de8dfb53..5fced2ee1e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/XMLMemento.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/XMLMemento.eea
@@ -2,56 +2,56 @@ class org/eclipse/ui/XMLMemento
 
 createReadRoot
  (Ljava/io/Reader;)Lorg/eclipse/ui/XMLMemento;
- (Ljava/io/Reader;)Lorg/eclipse/ui/XMLMemento;
+ (Ljava/io/Reader;)L1org/eclipse/ui/XMLMemento;
 createReadRoot
  (Ljava/io/Reader;Ljava/lang/String;)Lorg/eclipse/ui/XMLMemento;
- (Ljava/io/Reader;Ljava/lang/String;)Lorg/eclipse/ui/XMLMemento;
+ (Ljava/io/Reader;Ljava/lang/String;)L1org/eclipse/ui/XMLMemento;
 createWriteRoot
  (Ljava/lang/String;)Lorg/eclipse/ui/XMLMemento;
- (Ljava/lang/String;)Lorg/eclipse/ui/XMLMemento;
+ (Ljava/lang/String;)L1org/eclipse/ui/XMLMemento;
 
 <init>
  (Lorg/w3c/dom/Document;Lorg/w3c/dom/Element;)V
  (Lorg/w3c/dom/Document;Lorg/w3c/dom/Element;)V
 copyChild
  (Lorg/eclipse/ui/IMemento;)Lorg/eclipse/ui/IMemento;
- (Lorg/eclipse/ui/IMemento;)Lorg/eclipse/ui/IMemento;
+ (Lorg/eclipse/ui/IMemento;)L1org/eclipse/ui/IMemento;
 createChild
  (Ljava/lang/String;)Lorg/eclipse/ui/IMemento;
- (Ljava/lang/String;)Lorg/eclipse/ui/IMemento;
+ (Ljava/lang/String;)L1org/eclipse/ui/IMemento; # @Inherited(org.eclipse.ui.IMemento)
 createChild
  (Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/ui/IMemento;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/ui/IMemento;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/eclipse/ui/IMemento; # @Inherited(org.eclipse.ui.IMemento)
 getAttributeKeys
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 getBoolean
  (Ljava/lang/String;)Ljava/lang/Boolean;
- (Ljava/lang/String;)Ljava/lang/Boolean;
+ (Ljava/lang/String;)L0java/lang/Boolean;
 getChild
  (Ljava/lang/String;)Lorg/eclipse/ui/IMemento;
- (Ljava/lang/String;)Lorg/eclipse/ui/IMemento;
+ (Ljava/lang/String;)L0org/eclipse/ui/IMemento;
 getChildren
  ()[Lorg/eclipse/ui/IMemento;
- ()[Lorg/eclipse/ui/IMemento;
+ ()[1Lorg/eclipse/ui/IMemento;
 getChildren
  (Ljava/lang/String;)[Lorg/eclipse/ui/IMemento;
- (Ljava/lang/String;)[Lorg/eclipse/ui/IMemento;
+ (Ljava/lang/String;)[1Lorg/eclipse/ui/IMemento;
 getFloat
  (Ljava/lang/String;)Ljava/lang/Float;
- (Ljava/lang/String;)Ljava/lang/Float;
+ (Ljava/lang/String;)L0java/lang/Float;
 getID
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getInteger
  (Ljava/lang/String;)Ljava/lang/Integer;
- (Ljava/lang/String;)Ljava/lang/Integer;
+ (Ljava/lang/String;)L0java/lang/Integer;
 getString
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getTextData
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getType
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/about/InstallationPage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/about/InstallationPage.eea
index 8664efc8d2..d6ce6b5271 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/about/InstallationPage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/about/InstallationPage.eea
@@ -2,7 +2,7 @@ class org/eclipse/ui/about/InstallationPage
 
 createButton
  (Lorg/eclipse/swt/widgets/Composite;ILjava/lang/String;)Lorg/eclipse/swt/widgets/Button;
- (Lorg/eclipse/swt/widgets/Composite;ILjava/lang/String;)Lorg/eclipse/swt/widgets/Button;
+ (Lorg/eclipse/swt/widgets/Composite;ILjava/lang/String;)L1org/eclipse/swt/widgets/Button;
 createPageButtons
  (Lorg/eclipse/swt/widgets/Composite;)V
  (Lorg/eclipse/swt/widgets/Composite;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/ActionFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/ActionFactory.eea
index 92f004975f..d58e05103c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/ActionFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/ActionFactory.eea
@@ -208,7 +208,7 @@ linkCycleActionPair
  (Ljava/lang/String;Ljava/lang/String;)V
 create
  (Lorg/eclipse/ui/IWorkbenchWindow;)Lorg/eclipse/ui/actions/ActionFactory$IWorkbenchAction;
- (Lorg/eclipse/ui/IWorkbenchWindow;)Lorg/eclipse/ui/actions/ActionFactory$IWorkbenchAction;
+ (Lorg/eclipse/ui/IWorkbenchWindow;)L1org/eclipse/ui/actions/ActionFactory$IWorkbenchAction;
 getCommandId
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/ContributionItemFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/ContributionItemFactory.eea
index 5fe0cea780..5d2d30bfab 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/ContributionItemFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/ContributionItemFactory.eea
@@ -30,7 +30,7 @@ VIEWS_SHOW_IN
  (Ljava/lang/String;)V
 create
  (Lorg/eclipse/ui/IWorkbenchWindow;)Lorg/eclipse/jface/action/IContributionItem;
- (Lorg/eclipse/ui/IWorkbenchWindow;)Lorg/eclipse/jface/action/IContributionItem;
+ (Lorg/eclipse/ui/IWorkbenchWindow;)L1org/eclipse/jface/action/IContributionItem;
 getId
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/CopyFilesAndFoldersOperation.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/CopyFilesAndFoldersOperation.eea
index 21a71e62df..ecbccb2d81 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/CopyFilesAndFoldersOperation.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/CopyFilesAndFoldersOperation.eea
@@ -38,7 +38,7 @@ getFile
  (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/resources/IFile;
 getFiles
  ([Ljava/lang/String;)[Ljava/io/File;
- ([Ljava/lang/String;)[Ljava/io/File;
+ ([Ljava/lang/String;)[1Ljava/io/File;
 getFolder
  (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/resources/IFolder;
  (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/resources/IFolder;
@@ -56,7 +56,7 @@ getProblemsTitle
  ()Ljava/lang/String;
 getUndoableCopyOrMoveOperation
  ([Lorg/eclipse/core/resources/IResource;Lorg/eclipse/core/runtime/IPath;)Lorg/eclipse/ui/ide/undo/AbstractWorkspaceOperation;
- ([Lorg/eclipse/core/resources/IResource;Lorg/eclipse/core/runtime/IPath;)Lorg/eclipse/ui/ide/undo/AbstractWorkspaceOperation;
+ ([Lorg/eclipse/core/resources/IResource;Lorg/eclipse/core/runtime/IPath;)L1org/eclipse/ui/ide/undo/AbstractWorkspaceOperation;
 homogenousResources
  (Lorg/eclipse/core/resources/IResource;Lorg/eclipse/core/resources/IResource;)Z
  (Lorg/eclipse/core/resources/IResource;Lorg/eclipse/core/resources/IResource;)Z
@@ -71,7 +71,7 @@ setRelativeVariable
  (Ljava/lang/String;)V
 validateDestination
  (Lorg/eclipse/core/resources/IContainer;[Lorg/eclipse/core/resources/IResource;)Ljava/lang/String;
- (Lorg/eclipse/core/resources/IContainer;[Lorg/eclipse/core/resources/IResource;)Ljava/lang/String;
+ (Lorg/eclipse/core/resources/IContainer;[Lorg/eclipse/core/resources/IResource;)L0java/lang/String;
 validateImportDestination
  (Lorg/eclipse/core/resources/IContainer;[Ljava/lang/String;)Ljava/lang/String;
  (Lorg/eclipse/core/resources/IContainer;[Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/CopyProjectAction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/CopyProjectAction.eea
index 744fd187b0..3dd699c032 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/CopyProjectAction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/CopyProjectAction.eea
@@ -22,7 +22,7 @@ shellProvider
  (Lorg/eclipse/swt/widgets/Shell;)V
 createDescription
  (Lorg/eclipse/core/resources/IProject;Ljava/lang/String;Lorg/eclipse/core/runtime/IPath;)Lorg/eclipse/core/resources/IProjectDescription;
- (Lorg/eclipse/core/resources/IProject;Ljava/lang/String;Lorg/eclipse/core/runtime/IPath;)Lorg/eclipse/core/resources/IProjectDescription;
+ (Lorg/eclipse/core/resources/IProject;Ljava/lang/String;Lorg/eclipse/core/runtime/IPath;)L1org/eclipse/core/resources/IProjectDescription;
 getErrorsTitle
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/CopyResourceAction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/CopyResourceAction.eea
index 0361af6055..c3f8aff9fb 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/CopyResourceAction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/CopyResourceAction.eea
@@ -23,7 +23,7 @@ shellProvider
  (Lorg/eclipse/swt/widgets/Shell;)V
 createOperation
  ()Lorg/eclipse/ui/actions/CopyFilesAndFoldersOperation;
- ()Lorg/eclipse/ui/actions/CopyFilesAndFoldersOperation;
+ ()L1org/eclipse/ui/actions/CopyFilesAndFoldersOperation;
 getModelProviderIds
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
@@ -32,7 +32,7 @@ getResources
  (Ljava/util/List<+Lorg/eclipse/core/resources/IResource;>;)[Lorg/eclipse/core/resources/IResource;
 isValid
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L0java/lang/String;
 runOperation
  ([Lorg/eclipse/core/resources/IResource;Lorg/eclipse/core/resources/IContainer;)V
  ([Lorg/eclipse/core/resources/IResource;Lorg/eclipse/core/resources/IContainer;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/MoveFilesAndFoldersOperation.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/MoveFilesAndFoldersOperation.eea
index 316a5405ac..878c285df3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/MoveFilesAndFoldersOperation.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/MoveFilesAndFoldersOperation.eea
@@ -20,7 +20,7 @@ getProblemsTitle
  ()Ljava/lang/String;
 getUndoableCopyOrMoveOperation
  ([Lorg/eclipse/core/resources/IResource;Lorg/eclipse/core/runtime/IPath;)Lorg/eclipse/ui/ide/undo/AbstractWorkspaceOperation;
- ([Lorg/eclipse/core/resources/IResource;Lorg/eclipse/core/runtime/IPath;)Lorg/eclipse/ui/ide/undo/AbstractWorkspaceOperation;
+ ([Lorg/eclipse/core/resources/IResource;Lorg/eclipse/core/runtime/IPath;)L1org/eclipse/ui/ide/undo/AbstractWorkspaceOperation; # @Inherited(org.eclipse.ui.actions.CopyFilesAndFoldersOperation)
 validateDestination
  (Lorg/eclipse/core/resources/IContainer;[Lorg/eclipse/core/resources/IResource;)Ljava/lang/String;
- (Lorg/eclipse/core/resources/IContainer;[Lorg/eclipse/core/resources/IResource;)Ljava/lang/String;
+ (Lorg/eclipse/core/resources/IContainer;[Lorg/eclipse/core/resources/IResource;)L0java/lang/String; # @Inherited(org.eclipse.ui.actions.CopyFilesAndFoldersOperation)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/MoveResourceAction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/MoveResourceAction.eea
index 137e8449c5..776037a357 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/MoveResourceAction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/MoveResourceAction.eea
@@ -16,7 +16,7 @@ destinations
  (Lorg/eclipse/swt/widgets/Shell;)V
 createOperation
  ()Lorg/eclipse/ui/actions/CopyFilesAndFoldersOperation;
- ()Lorg/eclipse/ui/actions/CopyFilesAndFoldersOperation;
+ ()L1org/eclipse/ui/actions/CopyFilesAndFoldersOperation; # @Inherited(org.eclipse.ui.actions.CopyResourceAction)
 getDestinations
  ()Ljava/util/List;
  ()Ljava/util/List;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/OpenPerspectiveAction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/OpenPerspectiveAction.eea
index f7c2df16b2..ec1fcdafac 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/OpenPerspectiveAction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/OpenPerspectiveAction.eea
@@ -8,7 +8,7 @@ getLocalId
  ()Ljava/lang/String;
 getPluginId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 runWithEvent
  (Lorg/eclipse/swt/widgets/Event;)V
  (Lorg/eclipse/swt/widgets/Event;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/PerspectiveMenu.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/PerspectiveMenu.eea
index b934c0bd70..32f6c6dd90 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/PerspectiveMenu.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/PerspectiveMenu.eea
@@ -12,7 +12,7 @@ fill
  (L1org/eclipse/swt/widgets/Menu;I)V # @Inherited(org.eclipse.jface.action.ContributionItem)
 getPerspectiveItems
  ()Ljava/util/ArrayList<Lorg/eclipse/ui/IPerspectiveDescriptor;>;
- ()Ljava/util/ArrayList<Lorg/eclipse/ui/IPerspectiveDescriptor;>;
+ ()L1java/util/ArrayList<Lorg/eclipse/ui/IPerspectiveDescriptor;>;
 getWindow
  ()Lorg/eclipse/ui/IWorkbenchWindow;
  ()Lorg/eclipse/ui/IWorkbenchWindow;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/QuickMenuCreator.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/QuickMenuCreator.eea
index 944e3dd203..cc7369b4c4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/QuickMenuCreator.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/QuickMenuCreator.eea
@@ -2,16 +2,16 @@ class org/eclipse/ui/actions/QuickMenuCreator
 
 computeMenuLocation
  (Lorg/eclipse/swt/custom/StyledText;)Lorg/eclipse/swt/graphics/Point;
- (Lorg/eclipse/swt/custom/StyledText;)Lorg/eclipse/swt/graphics/Point;
+ (Lorg/eclipse/swt/custom/StyledText;)L0org/eclipse/swt/graphics/Point;
 computeMenuLocation
  (Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/graphics/Point;
  (Lorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/graphics/Point;
 computeMenuLocation
  (Lorg/eclipse/swt/widgets/Table;)Lorg/eclipse/swt/graphics/Point;
- (Lorg/eclipse/swt/widgets/Table;)Lorg/eclipse/swt/graphics/Point;
+ (Lorg/eclipse/swt/widgets/Table;)L0org/eclipse/swt/graphics/Point;
 computeMenuLocation
  (Lorg/eclipse/swt/widgets/Tree;)Lorg/eclipse/swt/graphics/Point;
- (Lorg/eclipse/swt/widgets/Tree;)Lorg/eclipse/swt/graphics/Point;
+ (Lorg/eclipse/swt/widgets/Tree;)L0org/eclipse/swt/graphics/Point;
 fillMenu
  (Lorg/eclipse/jface/action/IMenuManager;)V
  (Lorg/eclipse/jface/action/IMenuManager;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/RefreshAction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/RefreshAction.eea
index f9c3ad08ee..aaa02dadc5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/RefreshAction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/RefreshAction.eea
@@ -12,7 +12,7 @@ ID
  (Lorg/eclipse/swt/widgets/Shell;)V
 createOperation
  ([Lorg/eclipse/core/runtime/IStatus;)Lorg/eclipse/jface/operation/IRunnableWithProgress;
- ([Lorg/eclipse/core/runtime/IStatus;)Lorg/eclipse/jface/operation/IRunnableWithProgress;
+ ([Lorg/eclipse/core/runtime/IStatus;)L1org/eclipse/jface/operation/IRunnableWithProgress; # @Inherited(org.eclipse.ui.actions.WorkspaceAction)
 getOperationMessage
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/RenameResourceAction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/RenameResourceAction.eea
index 6e0676e761..d50f522103 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/RenameResourceAction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/RenameResourceAction.eea
@@ -18,7 +18,7 @@ ID
  (Lorg/eclipse/swt/widgets/Shell;Lorg/eclipse/swt/widgets/Tree;)V
 createOperation
  ([Lorg/eclipse/core/runtime/IStatus;)Lorg/eclipse/jface/operation/IRunnableWithProgress;
- ([Lorg/eclipse/core/runtime/IStatus;)Lorg/eclipse/jface/operation/IRunnableWithProgress;
+ ([Lorg/eclipse/core/runtime/IStatus;)L1org/eclipse/jface/operation/IRunnableWithProgress; # @Inherited(org.eclipse.ui.actions.WorkspaceAction)
 getActionResources
  ()Ljava/util/List<+Lorg/eclipse/core/resources/IResource;>;
  ()Ljava/util/List<+Lorg/eclipse/core/resources/IResource;>;
@@ -36,7 +36,7 @@ getProblemsTitle
  ()Ljava/lang/String;
 queryNewResourceName
  (Lorg/eclipse/core/resources/IResource;)Ljava/lang/String;
- (Lorg/eclipse/core/resources/IResource;)Ljava/lang/String;
+ (Lorg/eclipse/core/resources/IResource;)L0java/lang/String;
 runWithNewPath
  (Lorg/eclipse/core/runtime/IPath;Lorg/eclipse/core/resources/IResource;)V
  (Lorg/eclipse/core/runtime/IPath;Lorg/eclipse/core/resources/IResource;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/WorkspaceAction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/WorkspaceAction.eea
index a7e68f2456..53a0f8b102 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/WorkspaceAction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/actions/WorkspaceAction.eea
@@ -8,7 +8,7 @@ class org/eclipse/ui/actions/WorkspaceAction
  (Lorg/eclipse/swt/widgets/Shell;Ljava/lang/String;)V
 createOperation
  ([Lorg/eclipse/core/runtime/IStatus;)Lorg/eclipse/jface/operation/IRunnableWithProgress;
- ([Lorg/eclipse/core/runtime/IStatus;)Lorg/eclipse/jface/operation/IRunnableWithProgress;
+ ([Lorg/eclipse/core/runtime/IStatus;)L1org/eclipse/jface/operation/IRunnableWithProgress;
 getActionResources
  ()Ljava/util/List<+Lorg/eclipse/core/resources/IResource;>;
  ()Ljava/util/List<+Lorg/eclipse/core/resources/IResource;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/activities/IWorkbenchActivitySupport.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/activities/IWorkbenchActivitySupport.eea
index dad03f325d..f8283224d3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/activities/IWorkbenchActivitySupport.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/activities/IWorkbenchActivitySupport.eea
@@ -2,7 +2,7 @@ class org/eclipse/ui/activities/IWorkbenchActivitySupport
 
 createWorkingCopy
  ()Lorg/eclipse/ui/activities/IMutableActivityManager;
- ()Lorg/eclipse/ui/activities/IMutableActivityManager;
+ ()L1org/eclipse/ui/activities/IMutableActivityManager;
 getActivityManager
  ()Lorg/eclipse/ui/activities/IActivityManager;
  ()Lorg/eclipse/ui/activities/IActivityManager;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/activities/WorkbenchActivityHelper.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/activities/WorkbenchActivityHelper.eea
index a777725266..8d00518bd3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/activities/WorkbenchActivityHelper.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/activities/WorkbenchActivityHelper.eea
@@ -12,10 +12,10 @@ allowUseOf
  (Lorg/eclipse/ui/activities/ITriggerPoint;Ljava/lang/Object;)Z
 createUnifiedId
  (Lorg/eclipse/ui/IPluginContribution;)Ljava/lang/String;
- (Lorg/eclipse/ui/IPluginContribution;)Ljava/lang/String;
+ (Lorg/eclipse/ui/IPluginContribution;)L1java/lang/String;
 expandActivityDependencies
  (Ljava/util/Set<Ljava/lang/String;>;)Ljava/util/Set<Ljava/lang/String;>;
- (Ljava/util/Set<Ljava/lang/String;>;)Ljava/util/Set<Ljava/lang/String;>;
+ (Ljava/util/Set<Ljava/lang/String;>;)L1java/util/Set<Ljava/lang/String;>;
 filterArray
  ([Ljava/lang/Object;)[Ljava/lang/Object;
  ([Ljava/lang/Object;)[Ljava/lang/Object;
@@ -27,7 +27,7 @@ filterItem
  (Ljava/lang/Object;)Z
 getActivityIdsForCategory
  (Lorg/eclipse/ui/activities/ICategory;)Ljava/util/Set<Ljava/lang/String;>;
- (Lorg/eclipse/ui/activities/ICategory;)Ljava/util/Set<Ljava/lang/String;>;
+ (Lorg/eclipse/ui/activities/ICategory;)L1java/util/Set<Ljava/lang/String;>;
 getContainedCategories
  (Lorg/eclipse/ui/activities/IActivityManager;Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
  (Lorg/eclipse/ui/activities/IActivityManager;Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
@@ -36,19 +36,19 @@ getDisabledCategories
  (Lorg/eclipse/ui/activities/IActivityManager;Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
 getEnabledCategories
  (Lorg/eclipse/ui/activities/IActivityManager;)Ljava/util/Set<Ljava/lang/String;>;
- (Lorg/eclipse/ui/activities/IActivityManager;)Ljava/util/Set<Ljava/lang/String;>;
+ (Lorg/eclipse/ui/activities/IActivityManager;)L1java/util/Set<Ljava/lang/String;>;
 getEnabledCategories
  (Lorg/eclipse/ui/activities/IActivityManager;Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
  (Lorg/eclipse/ui/activities/IActivityManager;Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
 getEnabledCategoriesForActivity
  (Lorg/eclipse/ui/activities/IActivityManager;Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
- (Lorg/eclipse/ui/activities/IActivityManager;Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
+ (Lorg/eclipse/ui/activities/IActivityManager;Ljava/lang/String;)L1java/util/Set<Ljava/lang/String;>;
 getIdentifier
  (Lorg/eclipse/ui/IPluginContribution;)Lorg/eclipse/ui/activities/IIdentifier;
  (Lorg/eclipse/ui/IPluginContribution;)Lorg/eclipse/ui/activities/IIdentifier;
 getPartiallyEnabledCategories
  (Lorg/eclipse/ui/activities/IActivityManager;)Ljava/util/Set<Ljava/lang/String;>;
- (Lorg/eclipse/ui/activities/IActivityManager;)Ljava/util/Set<Ljava/lang/String;>;
+ (Lorg/eclipse/ui/activities/IActivityManager;)L1java/util/Set<Ljava/lang/String;>;
 getRequiredActivityIds
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
@@ -60,7 +60,7 @@ isPartiallyEnabled
  (Lorg/eclipse/ui/activities/IActivityManager;Ljava/lang/String;)Z
 resolveCategories
  (Lorg/eclipse/ui/activities/IMutableActivityManager;Ljava/util/Set<Ljava/lang/String;>;)[Lorg/eclipse/ui/activities/ICategory;
- (Lorg/eclipse/ui/activities/IMutableActivityManager;Ljava/util/Set<Ljava/lang/String;>;)[Lorg/eclipse/ui/activities/ICategory;
+ (Lorg/eclipse/ui/activities/IMutableActivityManager;Ljava/util/Set<Ljava/lang/String;>;)[1Lorg/eclipse/ui/activities/ICategory;
 restrictArray
  ([Ljava/lang/Object;)[Ljava/lang/Object;
  ([Ljava/lang/Object;)[Ljava/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/activities/WorkbenchTriggerPointAdvisor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/activities/WorkbenchTriggerPointAdvisor.eea
index 196c25efe8..931d5b8a6d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/activities/WorkbenchTriggerPointAdvisor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/activities/WorkbenchTriggerPointAdvisor.eea
@@ -15,7 +15,7 @@ PROCEED_SINGLE
 
 allow
  (Lorg/eclipse/ui/activities/ITriggerPoint;Lorg/eclipse/ui/activities/IIdentifier;)Ljava/util/Set<Ljava/lang/String;>;
- (Lorg/eclipse/ui/activities/ITriggerPoint;Lorg/eclipse/ui/activities/IIdentifier;)Ljava/util/Set<Ljava/lang/String;>;
+ (Lorg/eclipse/ui/activities/ITriggerPoint;Lorg/eclipse/ui/activities/IIdentifier;)L0java/util/Set<Ljava/lang/String;>;
 computeEnablement
  (Lorg/eclipse/ui/activities/IActivityManager;Lorg/eclipse/ui/activities/IIdentifier;)Z
  (Lorg/eclipse/ui/activities/IActivityManager;Lorg/eclipse/ui/activities/IIdentifier;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/application/WorkbenchWindowAdvisor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/application/WorkbenchWindowAdvisor.eea
index 8441c8d3bd..ebe091edeb 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/application/WorkbenchWindowAdvisor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/application/WorkbenchWindowAdvisor.eea
@@ -5,10 +5,10 @@ class org/eclipse/ui/application/WorkbenchWindowAdvisor
  (Lorg/eclipse/ui/application/IWorkbenchWindowConfigurer;)V
 createActionBarAdvisor
  (Lorg/eclipse/ui/application/IActionBarConfigurer;)Lorg/eclipse/ui/application/ActionBarAdvisor;
- (Lorg/eclipse/ui/application/IActionBarConfigurer;)Lorg/eclipse/ui/application/ActionBarAdvisor;
+ (Lorg/eclipse/ui/application/IActionBarConfigurer;)L1org/eclipse/ui/application/ActionBarAdvisor;
 createEmptyWindowContents
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
+ (Lorg/eclipse/swt/widgets/Composite;)L0org/eclipse/swt/widgets/Control;
 createWindowContents
  (Lorg/eclipse/swt/widgets/Shell;)V
  (Lorg/eclipse/swt/widgets/Shell;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/browser/BrowserFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/browser/BrowserFactory.eea
index 45e6a71a49..ac7940aedb 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/browser/BrowserFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/browser/BrowserFactory.eea
@@ -2,4 +2,4 @@ class org/eclipse/ui/browser/BrowserFactory
 
 createBrowser
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/ui/browser/IWebBrowser;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/ui/browser/IWebBrowser;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1org/eclipse/ui/browser/IWebBrowser;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/browser/IWorkbenchBrowserSupport.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/browser/IWorkbenchBrowserSupport.eea
index 225e2413d7..eccfde16a5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/browser/IWorkbenchBrowserSupport.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/browser/IWorkbenchBrowserSupport.eea
@@ -2,10 +2,10 @@ class org/eclipse/ui/browser/IWorkbenchBrowserSupport
 
 createBrowser
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/ui/browser/IWebBrowser;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/ui/browser/IWebBrowser;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1org/eclipse/ui/browser/IWebBrowser;
 createBrowser
  (Ljava/lang/String;)Lorg/eclipse/ui/browser/IWebBrowser;
- (Ljava/lang/String;)Lorg/eclipse/ui/browser/IWebBrowser;
+ (Ljava/lang/String;)L1org/eclipse/ui/browser/IWebBrowser;
 getExternalBrowser
  ()Lorg/eclipse/ui/browser/IWebBrowser;
  ()Lorg/eclipse/ui/browser/IWebBrowser;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/cheatsheets/CheatSheetExtensionFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/cheatsheets/CheatSheetExtensionFactory.eea
index 69c436346e..8ed1f45278 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/cheatsheets/CheatSheetExtensionFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/cheatsheets/CheatSheetExtensionFactory.eea
@@ -6,7 +6,7 @@ HELP_MENU_ACTION
 
 create
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object; # @Inherited(org.eclipse.core.runtime.IExecutableExtensionFactory)
 setInitializationData
  (Lorg/eclipse/core/runtime/IConfigurationElement;Ljava/lang/String;Ljava/lang/Object;)V
  (Lorg/eclipse/core/runtime/IConfigurationElement;Ljava/lang/String;Ljava/lang/Object;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/cheatsheets/CheatSheetViewerFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/cheatsheets/CheatSheetViewerFactory.eea
index 996fda9f6f..ed7ba0b946 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/cheatsheets/CheatSheetViewerFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/cheatsheets/CheatSheetViewerFactory.eea
@@ -2,4 +2,4 @@ class org/eclipse/ui/cheatsheets/CheatSheetViewerFactory
 
 createCheatSheetView
  ()Lorg/eclipse/ui/cheatsheets/ICheatSheetViewer;
- ()Lorg/eclipse/ui/cheatsheets/ICheatSheetViewer;
+ ()L1org/eclipse/ui/cheatsheets/ICheatSheetViewer;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/AbstractConsole.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/AbstractConsole.eea
index 5b11779d10..5f73ad78a4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/AbstractConsole.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/AbstractConsole.eea
@@ -17,7 +17,7 @@ firePropertyChange
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 getHelpContextId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getImageDescriptor
  ()Lorg/eclipse/jface/resource/ImageDescriptor;
  ()L0org/eclipse/jface/resource/ImageDescriptor; # @Inherited(org.eclipse.ui.console.IConsole)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/IConsole.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/IConsole.eea
index b1e32c0993..f209e6764f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/IConsole.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/IConsole.eea
@@ -5,7 +5,7 @@ addPropertyChangeListener
  (L1org/eclipse/jface/util/IPropertyChangeListener;)V
 createPage
  (Lorg/eclipse/ui/console/IConsoleView;)Lorg/eclipse/ui/part/IPageBookViewPage;
- (Lorg/eclipse/ui/console/IConsoleView;)Lorg/eclipse/ui/part/IPageBookViewPage;
+ (Lorg/eclipse/ui/console/IConsoleView;)L1org/eclipse/ui/part/IPageBookViewPage;
 getImageDescriptor
  ()Lorg/eclipse/jface/resource/ImageDescriptor;
  ()L0org/eclipse/jface/resource/ImageDescriptor;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/IOConsole.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/IOConsole.eea
index b0907b7e94..77f48efe36 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/IOConsole.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/IOConsole.eea
@@ -17,7 +17,7 @@ class org/eclipse/ui/console/IOConsole
  (Ljava/lang/String;Lorg/eclipse/jface/resource/ImageDescriptor;)V
 createPage
  (Lorg/eclipse/ui/console/IConsoleView;)Lorg/eclipse/ui/part/IPageBookViewPage;
- (Lorg/eclipse/ui/console/IConsoleView;)Lorg/eclipse/ui/part/IPageBookViewPage;
+ (Lorg/eclipse/ui/console/IConsoleView;)L1org/eclipse/ui/part/IPageBookViewPage; # @Inherited(org.eclipse.ui.console.TextConsole)
 getCharset
  ()Ljava/nio/charset/Charset;
  ()Ljava/nio/charset/Charset;
@@ -26,13 +26,13 @@ getEncoding
  ()Ljava/lang/String;
 getInputStream
  ()Lorg/eclipse/ui/console/IOConsoleInputStream;
- ()Lorg/eclipse/ui/console/IOConsoleInputStream;
+ ()L0org/eclipse/ui/console/IOConsoleInputStream;
 getPartitioner
  ()Lorg/eclipse/ui/console/IConsoleDocumentPartitioner;
  ()Lorg/eclipse/ui/console/IConsoleDocumentPartitioner;
 newOutputStream
  ()Lorg/eclipse/ui/console/IOConsoleOutputStream;
- ()Lorg/eclipse/ui/console/IOConsoleOutputStream;
+ ()L1org/eclipse/ui/console/IOConsoleOutputStream;
 setInputStream
  (Ljava/io/InputStream;)V
  (Ljava/io/InputStream;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/MessageConsole.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/MessageConsole.eea
index 8164861eb5..c4057154df 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/MessageConsole.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/MessageConsole.eea
@@ -27,10 +27,10 @@ appendToDocument
  (Ljava/lang/String;Lorg/eclipse/ui/console/MessageConsoleStream;)V
 createPage
  (Lorg/eclipse/ui/console/IConsoleView;)Lorg/eclipse/ui/part/IPageBookViewPage;
- (Lorg/eclipse/ui/console/IConsoleView;)Lorg/eclipse/ui/part/IPageBookViewPage;
+ (Lorg/eclipse/ui/console/IConsoleView;)L1org/eclipse/ui/part/IPageBookViewPage; # @Inherited(org.eclipse.ui.console.IOConsole)
 getInputStream
  ()Lorg/eclipse/ui/console/IOConsoleInputStream;
- ()Lorg/eclipse/ui/console/IOConsoleInputStream;
+ ()L1org/eclipse/ui/console/IOConsoleInputStream; # @Overrides(org.eclipse.ui.console.IOConsole)
 newMessageStream
  ()Lorg/eclipse/ui/console/MessageConsoleStream;
  ()L1org/eclipse/ui/console/MessageConsoleStream;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/TextConsole.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/TextConsole.eea
index e612c5c319..5216b2d192 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/TextConsole.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/TextConsole.eea
@@ -11,7 +11,7 @@ addPatternMatchListener
  (L1org/eclipse/ui/console/IPatternMatchListener;)V
 createPage
  (Lorg/eclipse/ui/console/IConsoleView;)Lorg/eclipse/ui/part/IPageBookViewPage;
- (Lorg/eclipse/ui/console/IConsoleView;)Lorg/eclipse/ui/part/IPageBookViewPage;
+ (Lorg/eclipse/ui/console/IConsoleView;)L1org/eclipse/ui/part/IPageBookViewPage; # @Inherited(org.eclipse.ui.console.IConsole)
 getAttribute
  (Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;)Ljava/lang/Object;
@@ -26,19 +26,19 @@ getFont
  ()Lorg/eclipse/swt/graphics/Font;
 getHyperlink
  (I)Lorg/eclipse/ui/console/IHyperlink;
- (I)Lorg/eclipse/ui/console/IHyperlink;
+ (I)L0org/eclipse/ui/console/IHyperlink;
 getHyperlinks
  ()[Lorg/eclipse/ui/console/IHyperlink;
- ()[Lorg/eclipse/ui/console/IHyperlink;
+ ()[1Lorg/eclipse/ui/console/IHyperlink;
 getPartitioner
  ()Lorg/eclipse/ui/console/IConsoleDocumentPartitioner;
  ()Lorg/eclipse/ui/console/IConsoleDocumentPartitioner;
 getRegion
  (Lorg/eclipse/ui/console/IHyperlink;)Lorg/eclipse/jface/text/IRegion;
- (Lorg/eclipse/ui/console/IHyperlink;)Lorg/eclipse/jface/text/IRegion;
+ (Lorg/eclipse/ui/console/IHyperlink;)L0org/eclipse/jface/text/IRegion;
 getSchedulingRule
  ()Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
- ()Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
+ ()L1org/eclipse/core/runtime/jobs/ISchedulingRule;
 removePatternMatchListener
  (Lorg/eclipse/ui/console/IPatternMatchListener;)V
  (L1org/eclipse/ui/console/IPatternMatchListener;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/TextConsolePage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/TextConsolePage.eea
index f2610ec3b8..473536a735 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/TextConsolePage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/TextConsolePage.eea
@@ -24,7 +24,7 @@ createControl
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.ui.part.IPage)
 createViewer
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/ui/console/TextConsoleViewer;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/ui/console/TextConsoleViewer;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/ui/console/TextConsoleViewer;
 getAdapter
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
  <T:Ljava/lang/Object;>(L1java/lang/Class<TT;>;)T0T; # @Inherited(org.eclipse.core.runtime.IAdaptable)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/TextConsoleViewer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/TextConsoleViewer.eea
index 13c8e5f7f8..b81bbf9e38 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/TextConsoleViewer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/console/TextConsoleViewer.eea
@@ -8,7 +8,7 @@ class org/eclipse/ui/console/TextConsoleViewer
  (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/ui/console/TextConsole;Lorg/eclipse/ui/console/IScrollLockStateProvider;)V
 createDocumentAdapter
  ()Lorg/eclipse/jface/text/IDocumentAdapter;
- ()Lorg/eclipse/jface/text/IDocumentAdapter;
+ ()L1org/eclipse/jface/text/IDocumentAdapter; # @Inherited(org.eclipse.jface.text.TextViewer)
 getHandCursor
  ()Lorg/eclipse/swt/graphics/Cursor;
  ()Lorg/eclipse/swt/graphics/Cursor;
@@ -17,7 +17,7 @@ getHyperlink
  ()Lorg/eclipse/ui/console/IHyperlink;
 getHyperlink
  (I)Lorg/eclipse/ui/console/IHyperlink;
- (I)Lorg/eclipse/ui/console/IHyperlink;
+ (I)L0org/eclipse/ui/console/IHyperlink;
 getTextCursor
  ()Lorg/eclipse/swt/graphics/Cursor;
  ()Lorg/eclipse/swt/graphics/Cursor;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/contentassist/ContentAssistHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/contentassist/ContentAssistHandler.eea
index d59062bc8f..d7e1ab9a2e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/contentassist/ContentAssistHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/contentassist/ContentAssistHandler.eea
@@ -2,7 +2,7 @@ class org/eclipse/ui/contentassist/ContentAssistHandler
 
 createHandlerForCombo
  (Lorg/eclipse/swt/widgets/Combo;Lorg/eclipse/jface/contentassist/SubjectControlContentAssistant;)Lorg/eclipse/ui/contentassist/ContentAssistHandler;
- (Lorg/eclipse/swt/widgets/Combo;Lorg/eclipse/jface/contentassist/SubjectControlContentAssistant;)Lorg/eclipse/ui/contentassist/ContentAssistHandler;
+ (Lorg/eclipse/swt/widgets/Combo;Lorg/eclipse/jface/contentassist/SubjectControlContentAssistant;)L1org/eclipse/ui/contentassist/ContentAssistHandler;
 createHandlerForText
  (Lorg/eclipse/swt/widgets/Text;Lorg/eclipse/jface/contentassist/SubjectControlContentAssistant;)Lorg/eclipse/ui/contentassist/ContentAssistHandler;
- (Lorg/eclipse/swt/widgets/Text;Lorg/eclipse/jface/contentassist/SubjectControlContentAssistant;)Lorg/eclipse/ui/contentassist/ContentAssistHandler;
+ (Lorg/eclipse/swt/widgets/Text;Lorg/eclipse/jface/contentassist/SubjectControlContentAssistant;)L1org/eclipse/ui/contentassist/ContentAssistHandler;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/databinding/typed/WorkbenchProperties.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/databinding/typed/WorkbenchProperties.eea
index 4b8d01092c..39b7c2a7c7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/databinding/typed/WorkbenchProperties.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/databinding/typed/WorkbenchProperties.eea
@@ -2,25 +2,25 @@ class org/eclipse/ui/databinding/typed/WorkbenchProperties
 
 activePage
  <S::Lorg/eclipse/ui/IPageService;>()Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;Lorg/eclipse/ui/IWorkbenchPage;>;
- <S::Lorg/eclipse/ui/IPageService;>()Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;Lorg/eclipse/ui/IWorkbenchPage;>;
+ <S::Lorg/eclipse/ui/IPageService;>()L1org/eclipse/core/databinding/property/value/IValueProperty<TS;Lorg/eclipse/ui/IWorkbenchPage;>;
 activePartAsEditorReference
  <S::Lorg/eclipse/ui/IPartService;>()Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;Lorg/eclipse/ui/IEditorReference;>;
  <S::Lorg/eclipse/ui/IPartService;>()Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;Lorg/eclipse/ui/IEditorReference;>;
 activePartReference
  <S::Lorg/eclipse/ui/IPartService;>()Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;Lorg/eclipse/ui/IWorkbenchPartReference;>;
- <S::Lorg/eclipse/ui/IPartService;>()Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;Lorg/eclipse/ui/IWorkbenchPartReference;>;
+ <S::Lorg/eclipse/ui/IPartService;>()L1org/eclipse/core/databinding/property/value/IValueProperty<TS;Lorg/eclipse/ui/IWorkbenchPartReference;>;
 activeWindow
  <S::Lorg/eclipse/ui/IWorkbench;>()Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;Lorg/eclipse/ui/IWorkbenchWindow;>;
- <S::Lorg/eclipse/ui/IWorkbench;>()Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;Lorg/eclipse/ui/IWorkbenchWindow;>;
+ <S::Lorg/eclipse/ui/IWorkbench;>()L1org/eclipse/core/databinding/property/value/IValueProperty<TS;Lorg/eclipse/ui/IWorkbenchWindow;>;
 adaptedValue
  <S:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;TT;>;
  <S:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;TT;>;
 adaptedValue
  <S:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Lorg/eclipse/core/runtime/IAdapterManager;)Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;TT;>;
- <S:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Lorg/eclipse/core/runtime/IAdapterManager;)Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;TT;>;
+ <S:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Lorg/eclipse/core/runtime/IAdapterManager;)L1org/eclipse/core/databinding/property/value/IValueProperty<TS;TT;>;
 editorInput
  <S::Lorg/eclipse/ui/IEditorPart;>()Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;Lorg/eclipse/ui/IEditorInput;>;
- <S::Lorg/eclipse/ui/IEditorPart;>()Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;Lorg/eclipse/ui/IEditorInput;>;
+ <S::Lorg/eclipse/ui/IEditorPart;>()L1org/eclipse/core/databinding/property/value/IValueProperty<TS;Lorg/eclipse/ui/IEditorInput;>;
 multipleSelection
  <S::Lorg/eclipse/ui/ISelectionService;E:Ljava/lang/Object;>()Lorg/eclipse/core/databinding/property/list/IListProperty<TS;TE;>;
  <S::Lorg/eclipse/ui/ISelectionService;E:Ljava/lang/Object;>()Lorg/eclipse/core/databinding/property/list/IListProperty<TS;TE;>;
@@ -32,7 +32,7 @@ multipleSelection
  <S::Lorg/eclipse/ui/ISelectionService;E:Ljava/lang/Object;>(Ljava/lang/String;Z)Lorg/eclipse/core/databinding/property/list/IListProperty<TS;TE;>;
 multipleSelection
  <S::Lorg/eclipse/ui/ISelectionService;E:Ljava/lang/Object;>(Ljava/lang/String;ZLjava/lang/Class<TE;>;)Lorg/eclipse/core/databinding/property/list/IListProperty<TS;TE;>;
- <S::Lorg/eclipse/ui/ISelectionService;E:Ljava/lang/Object;>(Ljava/lang/String;ZLjava/lang/Class<TE;>;)Lorg/eclipse/core/databinding/property/list/IListProperty<TS;TE;>;
+ <S::Lorg/eclipse/ui/ISelectionService;E:Ljava/lang/Object;>(Ljava/lang/String;ZLjava/lang/Class<TE;>;)L1org/eclipse/core/databinding/property/list/IListProperty<TS;TE;>;
 singleSelection
  <S::Lorg/eclipse/ui/ISelectionService;T:Ljava/lang/Object;>()Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;TT;>;
  <S::Lorg/eclipse/ui/ISelectionService;T:Ljava/lang/Object;>()Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;TT;>;
@@ -41,4 +41,4 @@ singleSelection
  <S::Lorg/eclipse/ui/ISelectionService;T:Ljava/lang/Object;>(Ljava/lang/String;Z)Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;TT;>;
 singleSelection
  <S::Lorg/eclipse/ui/ISelectionService;T:Ljava/lang/Object;>(Ljava/lang/String;ZLjava/lang/Class<TT;>;)Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;TT;>;
- <S::Lorg/eclipse/ui/ISelectionService;T:Ljava/lang/Object;>(Ljava/lang/String;ZLjava/lang/Class<TT;>;)Lorg/eclipse/core/databinding/property/value/IValueProperty<TS;TT;>;
+ <S::Lorg/eclipse/ui/ISelectionService;T:Ljava/lang/Object;>(Ljava/lang/String;ZLjava/lang/Class<TT;>;)L1org/eclipse/core/databinding/property/value/IValueProperty<TS;TT;>;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/AbstractElementListSelectionDialog.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/AbstractElementListSelectionDialog.eea
index 656bec1300..6c47c06244 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/AbstractElementListSelectionDialog.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/AbstractElementListSelectionDialog.eea
@@ -9,13 +9,13 @@ fFilteredList
  (Lorg/eclipse/swt/widgets/Shell;Lorg/eclipse/jface/viewers/ILabelProvider;)V
 createFilterText
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Text;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Text;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Text;
 createFilteredList
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/ui/dialogs/FilteredList;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/ui/dialogs/FilteredList;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/ui/dialogs/FilteredList;
 createMessageArea
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Label;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Label;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Label; # @Inherited(org.eclipse.ui.dialogs.SelectionDialog)
 getFilter
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/CheckedTreeSelectionDialog.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/CheckedTreeSelectionDialog.eea
index 91ffd3e025..12ee817b27 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/CheckedTreeSelectionDialog.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/CheckedTreeSelectionDialog.eea
@@ -20,10 +20,10 @@ createDialogArea
  (L1org/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.jface.dialogs.Dialog)
 createSelectionButtons
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Composite;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Composite;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Composite;
 createTreeViewer
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/viewers/CheckboxTreeViewer;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/viewers/CheckboxTreeViewer;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/jface/viewers/CheckboxTreeViewer;
 getTreeViewer
  ()Lorg/eclipse/jface/viewers/CheckboxTreeViewer;
  ()Lorg/eclipse/jface/viewers/CheckboxTreeViewer;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/ElementTreeSelectionDialog.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/ElementTreeSelectionDialog.eea
index f22f8907a5..0c279b2814 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/ElementTreeSelectionDialog.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/ElementTreeSelectionDialog.eea
@@ -17,10 +17,10 @@ createDialogArea
  (L1org/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.jface.dialogs.Dialog)
 createTreeViewer
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/viewers/TreeViewer;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/viewers/TreeViewer;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/jface/viewers/TreeViewer;
 doCreateTreeViewer
  (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/jface/viewers/TreeViewer;
- (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/jface/viewers/TreeViewer;
+ (Lorg/eclipse/swt/widgets/Composite;I)L1org/eclipse/jface/viewers/TreeViewer;
 getTreeViewer
  ()Lorg/eclipse/jface/viewers/TreeViewer;
  ()Lorg/eclipse/jface/viewers/TreeViewer;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.eea
index 3694b52fce..444972860b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.eea
@@ -20,7 +20,7 @@ createExtendedContentArea
  (L1org/eclipse/swt/widgets/Composite;)L0org/eclipse/swt/widgets/Control;
 createFilter
  ()Lorg/eclipse/ui/dialogs/FilteredItemsSelectionDialog$ItemsFilter;
- ()Lorg/eclipse/ui/dialogs/FilteredItemsSelectionDialog$ItemsFilter;
+ ()L1org/eclipse/ui/dialogs/FilteredItemsSelectionDialog$ItemsFilter;
 fillContentProvider
  (Lorg/eclipse/ui/dialogs/FilteredItemsSelectionDialog$AbstractContentProvider;Lorg/eclipse/ui/dialogs/FilteredItemsSelectionDialog$ItemsFilter;Lorg/eclipse/core/runtime/IProgressMonitor;)V
  (L1org/eclipse/ui/dialogs/FilteredItemsSelectionDialog$AbstractContentProvider;L1org/eclipse/ui/dialogs/FilteredItemsSelectionDialog$ItemsFilter;L1org/eclipse/core/runtime/IProgressMonitor;)V
@@ -50,7 +50,7 @@ getPatternControl
  ()Lorg/eclipse/swt/widgets/Control;
 getSelectedItems
  ()Lorg/eclipse/jface/viewers/StructuredSelection;
- ()Lorg/eclipse/jface/viewers/StructuredSelection;
+ ()L1org/eclipse/jface/viewers/StructuredSelection;
 getSelectionHistory
  ()Lorg/eclipse/ui/dialogs/FilteredItemsSelectionDialog$SelectionHistory;
  ()Lorg/eclipse/ui/dialogs/FilteredItemsSelectionDialog$SelectionHistory;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/FilteredList.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/FilteredList.eea
index 378164d08f..e72b2017b5 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/FilteredList.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/FilteredList.eea
@@ -14,13 +14,13 @@ getFilter
  ()Ljava/lang/String;
 getFoldedElements
  (I)[Ljava/lang/Object;
- (I)[Ljava/lang/Object;
+ (I)[0Ljava/lang/Object;
 getLabelProvider
  ()Lorg/eclipse/jface/viewers/ILabelProvider;
  ()Lorg/eclipse/jface/viewers/ILabelProvider;
 getSelection
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[1Ljava/lang/Object;
 getSelectionIndices
  ()[I
  ()[I
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/FilteredResourcesSelectionDialog.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/FilteredResourcesSelectionDialog.eea
index 61a897ca33..0fb3f3805d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/FilteredResourcesSelectionDialog.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/FilteredResourcesSelectionDialog.eea
@@ -11,7 +11,7 @@ createExtendedContentArea
  (L1org/eclipse/swt/widgets/Composite;)L0org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.ui.dialogs.FilteredItemsSelectionDialog)
 createFilter
  ()Lorg/eclipse/ui/dialogs/FilteredItemsSelectionDialog$ItemsFilter;
- ()Lorg/eclipse/ui/dialogs/FilteredItemsSelectionDialog$ItemsFilter;
+ ()L1org/eclipse/ui/dialogs/FilteredItemsSelectionDialog$ItemsFilter; # @Inherited(org.eclipse.ui.dialogs.FilteredItemsSelectionDialog)
 fillContentProvider
  (Lorg/eclipse/ui/dialogs/FilteredItemsSelectionDialog$AbstractContentProvider;Lorg/eclipse/ui/dialogs/FilteredItemsSelectionDialog$ItemsFilter;Lorg/eclipse/core/runtime/IProgressMonitor;)V
  (L1org/eclipse/ui/dialogs/FilteredItemsSelectionDialog$AbstractContentProvider;L1org/eclipse/ui/dialogs/FilteredItemsSelectionDialog$ItemsFilter;L1org/eclipse/core/runtime/IProgressMonitor;)V # @Inherited(org.eclipse.ui.dialogs.FilteredItemsSelectionDialog)
@@ -29,7 +29,7 @@ getItemsComparator
  ()Ljava/util/Comparator<Lorg/eclipse/core/resources/IResource;>;
 getResult
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 restoreDialog
  (Lorg/eclipse/jface/dialogs/IDialogSettings;)V
  (Lorg/eclipse/jface/dialogs/IDialogSettings;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/FilteredTree.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/FilteredTree.eea
index 5894ec4194..86f46f7bb9 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/FilteredTree.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/FilteredTree.eea
@@ -2,7 +2,7 @@ class org/eclipse/ui/dialogs/FilteredTree
 
 getBoldFont
  (Ljava/lang/Object;Lorg/eclipse/ui/dialogs/FilteredTree;Lorg/eclipse/ui/dialogs/PatternFilter;)Lorg/eclipse/swt/graphics/Font;
- (Ljava/lang/Object;Lorg/eclipse/ui/dialogs/FilteredTree;Lorg/eclipse/ui/dialogs/PatternFilter;)Lorg/eclipse/swt/graphics/Font;
+ (Ljava/lang/Object;Lorg/eclipse/ui/dialogs/FilteredTree;Lorg/eclipse/ui/dialogs/PatternFilter;)L0org/eclipse/swt/graphics/Font;
 
 clearButtonControl
  Lorg/eclipse/swt/widgets/Control;
@@ -67,16 +67,16 @@ doCreateFilterText
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Text;
 doCreateRefreshJob
  ()Lorg/eclipse/ui/progress/WorkbenchJob;
- ()Lorg/eclipse/ui/progress/WorkbenchJob;
+ ()L1org/eclipse/ui/progress/WorkbenchJob;
 doCreateTreeViewer
  (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/jface/viewers/TreeViewer;
- (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/jface/viewers/TreeViewer;
+ (Lorg/eclipse/swt/widgets/Composite;I)L1org/eclipse/jface/viewers/TreeViewer;
 getFilterControl
  ()Lorg/eclipse/swt/widgets/Text;
  ()Lorg/eclipse/swt/widgets/Text;
 getFilterString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getInitialText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/ListSelectionDialog$Builder.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/ListSelectionDialog$Builder.eea
index 66d5a1baa3..9c6193a546 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/ListSelectionDialog$Builder.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/ListSelectionDialog$Builder.eea
@@ -17,7 +17,7 @@ contentProvider
  (Lorg/eclipse/jface/viewers/IStructuredContentProvider;)L1org/eclipse/ui/dialogs/ListSelectionDialog$Builder;
 create
  (Lorg/eclipse/swt/widgets/Shell;)Lorg/eclipse/ui/dialogs/ListSelectionDialog;
- (Lorg/eclipse/swt/widgets/Shell;)Lorg/eclipse/ui/dialogs/ListSelectionDialog;
+ (Lorg/eclipse/swt/widgets/Shell;)L1org/eclipse/ui/dialogs/ListSelectionDialog;
 labelProvider
  (Lorg/eclipse/jface/viewers/ILabelProvider;)Lorg/eclipse/ui/dialogs/ListSelectionDialog$Builder;
  (Lorg/eclipse/jface/viewers/ILabelProvider;)L1org/eclipse/ui/dialogs/ListSelectionDialog$Builder;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/ListSelectionDialog.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/ListSelectionDialog.eea
index 670313f0d5..03badf59ee 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/ListSelectionDialog.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/ListSelectionDialog.eea
@@ -2,7 +2,7 @@ class org/eclipse/ui/dialogs/ListSelectionDialog
 
 of
  (Ljava/lang/Object;)Lorg/eclipse/ui/dialogs/ListSelectionDialog$Builder;
- (Ljava/lang/Object;)Lorg/eclipse/ui/dialogs/ListSelectionDialog$Builder;
+ (Ljava/lang/Object;)L1org/eclipse/ui/dialogs/ListSelectionDialog$Builder;
 
 <init>
  (Lorg/eclipse/swt/widgets/Shell;Ljava/lang/Object;Lorg/eclipse/jface/viewers/IStructuredContentProvider;Lorg/eclipse/jface/viewers/ILabelProvider;Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/PreferencesUtil.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/PreferencesUtil.eea
index 6501b7cbdb..5df02ffd61 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/PreferencesUtil.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/PreferencesUtil.eea
@@ -2,19 +2,19 @@ class org/eclipse/ui/dialogs/PreferencesUtil
 
 createPreferenceDialogOn
  (Lorg/eclipse/swt/widgets/Shell;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/Object;)Lorg/eclipse/jface/preference/PreferenceDialog;
- (Lorg/eclipse/swt/widgets/Shell;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/Object;)Lorg/eclipse/jface/preference/PreferenceDialog;
+ (Lorg/eclipse/swt/widgets/Shell;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/Object;)L1org/eclipse/jface/preference/PreferenceDialog;
 createPreferenceDialogOn
  (Lorg/eclipse/swt/widgets/Shell;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/Object;I)Lorg/eclipse/jface/preference/PreferenceDialog;
- (Lorg/eclipse/swt/widgets/Shell;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/Object;I)Lorg/eclipse/jface/preference/PreferenceDialog;
+ (Lorg/eclipse/swt/widgets/Shell;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/Object;I)L1org/eclipse/jface/preference/PreferenceDialog;
 createPropertyDialogOn
  (Lorg/eclipse/swt/widgets/Shell;Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/Object;I)Lorg/eclipse/jface/preference/PreferenceDialog;
- (Lorg/eclipse/swt/widgets/Shell;Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/Object;I)Lorg/eclipse/jface/preference/PreferenceDialog;
+ (Lorg/eclipse/swt/widgets/Shell;Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/Object;I)L0org/eclipse/jface/preference/PreferenceDialog;
 createPropertyDialogOn
  (Lorg/eclipse/swt/widgets/Shell;Lorg/eclipse/core/runtime/IAdaptable;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/Object;)Lorg/eclipse/jface/preference/PreferenceDialog;
- (Lorg/eclipse/swt/widgets/Shell;Lorg/eclipse/core/runtime/IAdaptable;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/Object;)Lorg/eclipse/jface/preference/PreferenceDialog;
+ (Lorg/eclipse/swt/widgets/Shell;Lorg/eclipse/core/runtime/IAdaptable;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/Object;)L1org/eclipse/jface/preference/PreferenceDialog;
 createPropertyDialogOn
  (Lorg/eclipse/swt/widgets/Shell;Lorg/eclipse/core/runtime/IAdaptable;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/Object;I)Lorg/eclipse/jface/preference/PreferenceDialog;
- (Lorg/eclipse/swt/widgets/Shell;Lorg/eclipse/core/runtime/IAdaptable;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/Object;I)Lorg/eclipse/jface/preference/PreferenceDialog;
+ (Lorg/eclipse/swt/widgets/Shell;Lorg/eclipse/core/runtime/IAdaptable;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/Object;I)L0org/eclipse/jface/preference/PreferenceDialog;
 hasPropertiesContributors
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/PropertyDialogAction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/PropertyDialogAction.eea
index 61b10af999..4b70691407 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/PropertyDialogAction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/PropertyDialogAction.eea
@@ -8,7 +8,7 @@ class org/eclipse/ui/dialogs/PropertyDialogAction
  (Lorg/eclipse/swt/widgets/Shell;Lorg/eclipse/jface/viewers/ISelectionProvider;)V
 createDialog
  ()Lorg/eclipse/jface/preference/PreferenceDialog;
- ()Lorg/eclipse/jface/preference/PreferenceDialog;
+ ()L0org/eclipse/jface/preference/PreferenceDialog;
 isApplicableForSelection
  (Lorg/eclipse/jface/viewers/IStructuredSelection;)Z
  (Lorg/eclipse/jface/viewers/IStructuredSelection;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/SelectionDialog.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/SelectionDialog.eea
index 70dfbfcd64..b2b0fa229a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/SelectionDialog.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/SelectionDialog.eea
@@ -11,7 +11,7 @@ createButtonsForButtonBar
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.jface.dialogs.Dialog)
 createMessageArea
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Label;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Label;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Label;
 getDialogBoundsSettings
  ()Lorg/eclipse/jface/dialogs/IDialogSettings;
  ()L0org/eclipse/jface/dialogs/IDialogSettings; # @Inherited(org.eclipse.jface.dialogs.Dialog)
@@ -20,7 +20,7 @@ getInitialElementSelections
  ()Ljava/util/List;
 getInitialSelections
  ()Ljava/util/List;
- ()Ljava/util/List;
+ ()L0java/util/List;
 getMessage
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/SelectionStatusDialog.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/SelectionStatusDialog.eea
index e0b768c2cb..2f4c0131da 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/SelectionStatusDialog.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/SelectionStatusDialog.eea
@@ -11,7 +11,7 @@ createButtonBar
  (L1org/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.jface.dialogs.TrayDialog)
 getFirstResult
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 setImage
  (Lorg/eclipse/swt/graphics/Image;)V
  (Lorg/eclipse/swt/graphics/Image;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/StyledStringHighlighter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/StyledStringHighlighter.eea
index 3f20ff0674..c17bd6120b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/StyledStringHighlighter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/StyledStringHighlighter.eea
@@ -2,4 +2,4 @@ class org/eclipse/ui/dialogs/StyledStringHighlighter
 
 highlight
  (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/jface/viewers/StyledString$Styler;)Lorg/eclipse/jface/viewers/StyledString;
- (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/jface/viewers/StyledString$Styler;)Lorg/eclipse/jface/viewers/StyledString;
+ (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/jface/viewers/StyledString$Styler;)L1org/eclipse/jface/viewers/StyledString;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/TwoPaneElementSelector.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/TwoPaneElementSelector.eea
index 2a5ecaed98..035baea4a2 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/TwoPaneElementSelector.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/TwoPaneElementSelector.eea
@@ -8,13 +8,13 @@ createDialogArea
  (L1org/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.jface.dialogs.Dialog)
 createLabel
  (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)Lorg/eclipse/swt/widgets/Label;
- (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)Lorg/eclipse/swt/widgets/Label;
+ (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)L1org/eclipse/swt/widgets/Label;
 createLowerList
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Table;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Table;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Table;
 getLowerSelectedElement
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 setElements
  ([Ljava/lang/Object;)V
  ([Ljava/lang/Object;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardDataTransferPage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardDataTransferPage.eea
index 7d08f00535..51d27c1dc0 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardDataTransferPage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardDataTransferPage.eea
@@ -8,10 +8,10 @@ addToHistory
  (Ljava/util/List;Ljava/lang/String;)V
 addToHistory
  ([Ljava/lang/String;Ljava/lang/String;)[Ljava/lang/String;
- ([Ljava/lang/String;Ljava/lang/String;)[Ljava/lang/String;
+ ([Ljava/lang/String;Ljava/lang/String;)[1Ljava/lang/String;
 createBoldLabel
  (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)Lorg/eclipse/swt/widgets/Label;
- (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)Lorg/eclipse/swt/widgets/Label;
+ (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)L1org/eclipse/swt/widgets/Label;
 createOptionsGroup
  (Lorg/eclipse/swt/widgets/Composite;)V
  (Lorg/eclipse/swt/widgets/Composite;)V
@@ -20,7 +20,7 @@ createOptionsGroupButtons
  (Lorg/eclipse/swt/widgets/Group;)V
 createPlainLabel
  (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)Lorg/eclipse/swt/widgets/Label;
- (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)Lorg/eclipse/swt/widgets/Label;
+ (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)L1org/eclipse/swt/widgets/Label;
 createSpacer
  (Lorg/eclipse/swt/widgets/Composite;)V
  (Lorg/eclipse/swt/widgets/Composite;)V
@@ -41,7 +41,7 @@ queryForContainer
  (Lorg/eclipse/core/resources/IContainer;Ljava/lang/String;)Lorg/eclipse/core/runtime/IPath;
 queryForContainer
  (Lorg/eclipse/core/resources/IContainer;Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/core/runtime/IPath;
- (Lorg/eclipse/core/resources/IContainer;Ljava/lang/String;Ljava/lang/String;)Lorg/eclipse/core/runtime/IPath;
+ (Lorg/eclipse/core/resources/IContainer;Ljava/lang/String;Ljava/lang/String;)L0org/eclipse/core/runtime/IPath;
 queryOverwrite
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardExportResourcesPage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardExportResourcesPage.eea
index 4ee34cc089..2d6a6c4192 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardExportResourcesPage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardExportResourcesPage.eea
@@ -5,7 +5,7 @@ class org/eclipse/ui/dialogs/WizardExportResourcesPage
  (Ljava/lang/String;Lorg/eclipse/jface/viewers/IStructuredSelection;)V
 createButton
  (Lorg/eclipse/swt/widgets/Composite;ILjava/lang/String;Z)Lorg/eclipse/swt/widgets/Button;
- (Lorg/eclipse/swt/widgets/Composite;ILjava/lang/String;Z)Lorg/eclipse/swt/widgets/Button;
+ (Lorg/eclipse/swt/widgets/Composite;ILjava/lang/String;Z)L1org/eclipse/swt/widgets/Button;
 createButtonsGroup
  (Lorg/eclipse/swt/widgets/Composite;)V
  (Lorg/eclipse/swt/widgets/Composite;)V
@@ -23,13 +23,13 @@ ensureResourcesLocal
  (Ljava/util/List;)Z
 extractNonLocalResources
  (Ljava/util/List;)Ljava/util/List;
- (Ljava/util/List;)Ljava/util/List;
+ (Ljava/util/List;)L1java/util/List;
 getErrorDialogTitle
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getSelectedResources
  ()Ljava/util/List;
- ()Ljava/util/List;
+ ()L1java/util/List;
 getSelectedResourcesIterator
  ()Ljava/util/Iterator;
  ()Ljava/util/Iterator;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardNewFileCreationPage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardNewFileCreationPage.eea
index b4fc4cae36..7e62c6e2e4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardNewFileCreationPage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardNewFileCreationPage.eea
@@ -14,13 +14,13 @@ createFile
  (Lorg/eclipse/core/resources/IFile;Ljava/io/InputStream;Lorg/eclipse/core/runtime/IProgressMonitor;)V
 createFileHandle
  (Lorg/eclipse/core/runtime/IPath;)Lorg/eclipse/core/resources/IFile;
- (Lorg/eclipse/core/runtime/IPath;)Lorg/eclipse/core/resources/IFile;
+ (Lorg/eclipse/core/runtime/IPath;)L1org/eclipse/core/resources/IFile;
 createNewFile
  ()Lorg/eclipse/core/resources/IFile;
- ()Lorg/eclipse/core/resources/IFile;
+ ()L0org/eclipse/core/resources/IFile;
 createRule
  (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
- (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
+ (Lorg/eclipse/core/resources/IResource;)L1org/eclipse/core/runtime/jobs/ISchedulingRule;
 getContainerFullPath
  ()Lorg/eclipse/core/runtime/IPath;
  ()Lorg/eclipse/core/runtime/IPath;
@@ -32,7 +32,7 @@ getFileName
  ()Ljava/lang/String;
 getInitialContents
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L0java/io/InputStream;
 getNewFileLabel
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardNewFolderMainPage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardNewFolderMainPage.eea
index 2b71df1c4e..5be58383a0 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardNewFolderMainPage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardNewFolderMainPage.eea
@@ -8,7 +8,7 @@ createAdvancedControls
  (Lorg/eclipse/swt/widgets/Composite;)V
 createContainerHandle
  (Lorg/eclipse/core/runtime/IPath;)Lorg/eclipse/core/resources/IContainer;
- (Lorg/eclipse/core/runtime/IPath;)Lorg/eclipse/core/resources/IContainer;
+ (Lorg/eclipse/core/runtime/IPath;)L1org/eclipse/core/resources/IContainer;
 createControl
  (Lorg/eclipse/swt/widgets/Composite;)V
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.jface.dialogs.IDialogPage)
@@ -17,10 +17,10 @@ createFolder
  (Lorg/eclipse/core/resources/IFolder;Lorg/eclipse/core/runtime/IProgressMonitor;)V
 createFolderHandle
  (Lorg/eclipse/core/runtime/IPath;)Lorg/eclipse/core/resources/IFolder;
- (Lorg/eclipse/core/runtime/IPath;)Lorg/eclipse/core/resources/IFolder;
+ (Lorg/eclipse/core/runtime/IPath;)L1org/eclipse/core/resources/IFolder;
 createNewFolder
  ()Lorg/eclipse/core/resources/IFolder;
- ()Lorg/eclipse/core/resources/IFolder;
+ ()L0org/eclipse/core/resources/IFolder;
 handleEvent
  (Lorg/eclipse/swt/widgets/Event;)V
  (L1org/eclipse/swt/widgets/Event;)V # @Inherited(org.eclipse.swt.widgets.Listener)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardNewLinkPage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardNewLinkPage.eea
index b9d9e2dfdf..383e92e88c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardNewLinkPage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardNewLinkPage.eea
@@ -8,7 +8,7 @@ createControl
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.jface.dialogs.IDialogPage)
 getLinkTarget
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 setContainer
  (Lorg/eclipse/core/resources/IContainer;)V
  (Lorg/eclipse/core/resources/IContainer;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardNewProjectCreationPage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardNewProjectCreationPage.eea
index 86920ed00f..bb128b376d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardNewProjectCreationPage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardNewProjectCreationPage.eea
@@ -11,7 +11,7 @@ createControl
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.jface.dialogs.IDialogPage)
 createWorkingSetGroup
  (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/jface/viewers/IStructuredSelection;[Ljava/lang/String;)Lorg/eclipse/ui/dialogs/WorkingSetGroup;
- (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/jface/viewers/IStructuredSelection;[Ljava/lang/String;)Lorg/eclipse/ui/dialogs/WorkingSetGroup;
+ (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/jface/viewers/IStructuredSelection;[Ljava/lang/String;)L1org/eclipse/ui/dialogs/WorkingSetGroup;
 getLocationPath
  ()Lorg/eclipse/core/runtime/IPath;
  ()Lorg/eclipse/core/runtime/IPath;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardNewProjectReferencePage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardNewProjectReferencePage.eea
index 3f3ec0b0e2..1225437541 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardNewProjectReferencePage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardNewProjectReferencePage.eea
@@ -8,7 +8,7 @@ createControl
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.jface.dialogs.IDialogPage)
 getContentProvider
  ()Lorg/eclipse/jface/viewers/IStructuredContentProvider;
- ()Lorg/eclipse/jface/viewers/IStructuredContentProvider;
+ ()L1org/eclipse/jface/viewers/IStructuredContentProvider;
 getReferencedProjects
  ()[Lorg/eclipse/core/resources/IProject;
- ()[Lorg/eclipse/core/resources/IProject;
+ ()[1Lorg/eclipse/core/resources/IProject;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardResourceImportPage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardResourceImportPage.eea
index c18ee1df23..1d9b84c8b2 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardResourceImportPage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/dialogs/WizardResourceImportPage.eea
@@ -24,7 +24,7 @@ createSourceGroup
  (Lorg/eclipse/swt/widgets/Composite;)V
 getContainerFullPath
  ()Lorg/eclipse/core/runtime/IPath;
- ()Lorg/eclipse/core/runtime/IPath;
+ ()L0org/eclipse/core/runtime/IPath;
 getErrorDialogTitle
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -51,7 +51,7 @@ getSourceConflictMessage
  ()Ljava/lang/String;
 getSpecifiedContainer
  ()Lorg/eclipse/core/resources/IContainer;
- ()Lorg/eclipse/core/resources/IContainer;
+ ()L0org/eclipse/core/resources/IContainer;
 getTypesToImport
  ()Ljava/util/List;
  ()Ljava/util/List;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/DefaultEncodingSupport.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/DefaultEncodingSupport.eea
index 274ece633f..6229c1f255 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/DefaultEncodingSupport.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/DefaultEncodingSupport.eea
@@ -5,19 +5,19 @@ createStatusEncodingChangeControl
  (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/core/runtime/IStatus;)V
 getDefaultEncoding
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getEncoding
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getStatusBanner
  (Lorg/eclipse/core/runtime/IStatus;)Ljava/lang/String;
- (Lorg/eclipse/core/runtime/IStatus;)Ljava/lang/String;
+ (Lorg/eclipse/core/runtime/IStatus;)L0java/lang/String;
 getStatusHeader
  (Lorg/eclipse/core/runtime/IStatus;)Ljava/lang/String;
- (Lorg/eclipse/core/runtime/IStatus;)Ljava/lang/String;
+ (Lorg/eclipse/core/runtime/IStatus;)L0java/lang/String;
 getStatusMessage
  (Lorg/eclipse/core/runtime/IStatus;)Ljava/lang/String;
- (Lorg/eclipse/core/runtime/IStatus;)Ljava/lang/String;
+ (Lorg/eclipse/core/runtime/IStatus;)L0java/lang/String;
 initialize
  (Lorg/eclipse/ui/texteditor/StatusTextEditor;)V
  (Lorg/eclipse/ui/texteditor/StatusTextEditor;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/FileBufferOperationHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/FileBufferOperationHandler.eea
index 71ea71fbd3..3350b5abe9 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/FileBufferOperationHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/FileBufferOperationHandler.eea
@@ -17,7 +17,7 @@ generateLocations
  ([Lorg/eclipse/core/resources/IFile;Lorg/eclipse/core/runtime/IProgressMonitor;)[Lorg/eclipse/core/runtime/IPath;
 getSelection
  ()Lorg/eclipse/jface/viewers/ISelection;
- ()Lorg/eclipse/jface/viewers/ISelection;
+ ()L0org/eclipse/jface/viewers/ISelection;
 getShell
  ()Lorg/eclipse/swt/widgets/Shell;
  ()Lorg/eclipse/swt/widgets/Shell;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/FileDocumentProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/FileDocumentProvider.eea
index 228415b2a0..c940dc1d47 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/FileDocumentProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/FileDocumentProvider.eea
@@ -11,10 +11,10 @@ computeModificationStamp
  (Lorg/eclipse/core/resources/IResource;)J
 createAnnotationModel
  (Ljava/lang/Object;)Lorg/eclipse/jface/text/source/IAnnotationModel;
- (Ljava/lang/Object;)Lorg/eclipse/jface/text/source/IAnnotationModel;
+ (Ljava/lang/Object;)L1org/eclipse/jface/text/source/IAnnotationModel; # @Overrides(org.eclipse.ui.editors.text.StorageDocumentProvider)
 createElementInfo
  (Ljava/lang/Object;)Lorg/eclipse/ui/texteditor/AbstractDocumentProvider$ElementInfo;
- (Ljava/lang/Object;)Lorg/eclipse/ui/texteditor/AbstractDocumentProvider$ElementInfo;
+ (Ljava/lang/Object;)L1org/eclipse/ui/texteditor/AbstractDocumentProvider$ElementInfo; # @Inherited(org.eclipse.ui.editors.text.StorageDocumentProvider)
 disposeElementInfo
  (Ljava/lang/Object;Lorg/eclipse/ui/texteditor/AbstractDocumentProvider$ElementInfo;)V
  (Ljava/lang/Object;Lorg/eclipse/ui/texteditor/AbstractDocumentProvider$ElementInfo;)V
@@ -32,7 +32,7 @@ doValidateState
  (Ljava/lang/Object;Ljava/lang/Object;)V
 getContentType
  (Ljava/lang/Object;)Lorg/eclipse/core/runtime/content/IContentType;
- (Ljava/lang/Object;)Lorg/eclipse/core/runtime/content/IContentType;
+ (Ljava/lang/Object;)L0org/eclipse/core/runtime/content/IContentType; # @Inherited(org.eclipse.ui.editors.text.StorageDocumentProvider)
 getElementInfo
  (Ljava/lang/Object;)Lorg/eclipse/ui/texteditor/AbstractDocumentProvider$ElementInfo;
  (Ljava/lang/Object;)Lorg/eclipse/ui/texteditor/AbstractDocumentProvider$ElementInfo;
@@ -41,28 +41,28 @@ getModificationStamp
  (Ljava/lang/Object;)J
 getOperationRunner
  (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/jface/operation/IRunnableContext;
- (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/jface/operation/IRunnableContext;
+ (Lorg/eclipse/core/runtime/IProgressMonitor;)L0org/eclipse/jface/operation/IRunnableContext; # @Inherited(org.eclipse.ui.editors.text.StorageDocumentProvider)
 getPersistedEncoding
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L0java/lang/String; # @Inherited(org.eclipse.ui.editors.text.StorageDocumentProvider)
 getRefreshRule
  (Ljava/lang/Object;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
- (Ljava/lang/Object;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
+ (Ljava/lang/Object;)L0org/eclipse/core/runtime/jobs/ISchedulingRule;
 getResetRule
  (Ljava/lang/Object;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
- (Ljava/lang/Object;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
+ (Ljava/lang/Object;)L0org/eclipse/core/runtime/jobs/ISchedulingRule; # @Inherited(org.eclipse.ui.texteditor.AbstractDocumentProvider)
 getSaveRule
  (Ljava/lang/Object;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
- (Ljava/lang/Object;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
+ (Ljava/lang/Object;)L0org/eclipse/core/runtime/jobs/ISchedulingRule; # @Inherited(org.eclipse.ui.texteditor.AbstractDocumentProvider)
 getSynchronizationStamp
  (Ljava/lang/Object;)J
  (Ljava/lang/Object;)J
 getSynchronizeRule
  (Ljava/lang/Object;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
- (Ljava/lang/Object;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
+ (Ljava/lang/Object;)L0org/eclipse/core/runtime/jobs/ISchedulingRule; # @Inherited(org.eclipse.ui.texteditor.AbstractDocumentProvider)
 getValidateStateRule
  (Ljava/lang/Object;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
- (Ljava/lang/Object;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
+ (Ljava/lang/Object;)L0org/eclipse/core/runtime/jobs/ISchedulingRule; # @Inherited(org.eclipse.ui.texteditor.AbstractDocumentProvider)
 handleElementContentChanged
  (Lorg/eclipse/ui/IFileEditorInput;)V
  (Lorg/eclipse/ui/IFileEditorInput;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/ForwardingDocumentProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/ForwardingDocumentProvider.eea
index 0e3ae28b14..d484f31e9c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/ForwardingDocumentProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/ForwardingDocumentProvider.eea
@@ -29,25 +29,25 @@ getAnnotationModel
  (Ljava/lang/Object;)Lorg/eclipse/jface/text/source/IAnnotationModel;
 getContentType
  (Ljava/lang/Object;)Lorg/eclipse/core/runtime/content/IContentType;
- (Ljava/lang/Object;)Lorg/eclipse/core/runtime/content/IContentType;
+ (Ljava/lang/Object;)L0org/eclipse/core/runtime/content/IContentType;
 getDefaultEncoding
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getDocument
  (Ljava/lang/Object;)Lorg/eclipse/jface/text/IDocument;
  (Ljava/lang/Object;)Lorg/eclipse/jface/text/IDocument;
 getEncoding
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L0java/lang/String;
 getModificationStamp
  (Ljava/lang/Object;)J
  (Ljava/lang/Object;)J
 getProgressMonitor
  ()Lorg/eclipse/core/runtime/IProgressMonitor;
- ()Lorg/eclipse/core/runtime/IProgressMonitor;
+ ()L0org/eclipse/core/runtime/IProgressMonitor;
 getStatus
  (Ljava/lang/Object;)Lorg/eclipse/core/runtime/IStatus;
- (Ljava/lang/Object;)Lorg/eclipse/core/runtime/IStatus;
+ (Ljava/lang/Object;)L0org/eclipse/core/runtime/IStatus;
 getSynchronizationStamp
  (Ljava/lang/Object;)J
  (Ljava/lang/Object;)J
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/StorageDocumentProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/StorageDocumentProvider.eea
index 7571127d00..ca37b07255 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/StorageDocumentProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/StorageDocumentProvider.eea
@@ -2,16 +2,16 @@ class org/eclipse/ui/editors/text/StorageDocumentProvider
 
 createAnnotationModel
  (Ljava/lang/Object;)Lorg/eclipse/jface/text/source/IAnnotationModel;
- (Ljava/lang/Object;)Lorg/eclipse/jface/text/source/IAnnotationModel;
+ (Ljava/lang/Object;)L0org/eclipse/jface/text/source/IAnnotationModel; # @Overrides(org.eclipse.ui.texteditor.AbstractDocumentProvider)
 createDocument
  (Ljava/lang/Object;)Lorg/eclipse/jface/text/IDocument;
- (Ljava/lang/Object;)Lorg/eclipse/jface/text/IDocument;
+ (Ljava/lang/Object;)L0org/eclipse/jface/text/IDocument; # @Overrides(org.eclipse.ui.texteditor.AbstractDocumentProvider)
 createElementInfo
  (Ljava/lang/Object;)Lorg/eclipse/ui/texteditor/AbstractDocumentProvider$ElementInfo;
- (Ljava/lang/Object;)Lorg/eclipse/ui/texteditor/AbstractDocumentProvider$ElementInfo;
+ (Ljava/lang/Object;)L1org/eclipse/ui/texteditor/AbstractDocumentProvider$ElementInfo; # @Inherited(org.eclipse.ui.texteditor.AbstractDocumentProvider)
 createEmptyDocument
  ()Lorg/eclipse/jface/text/IDocument;
- ()Lorg/eclipse/jface/text/IDocument;
+ ()L1org/eclipse/jface/text/IDocument;
 doSaveDocument
  (Lorg/eclipse/core/runtime/IProgressMonitor;Ljava/lang/Object;Lorg/eclipse/jface/text/IDocument;Z)V
  (Lorg/eclipse/core/runtime/IProgressMonitor;Ljava/lang/Object;Lorg/eclipse/jface/text/IDocument;Z)V
@@ -20,19 +20,19 @@ doUpdateStateCache
  (Ljava/lang/Object;)V
 getContentType
  (Ljava/lang/Object;)Lorg/eclipse/core/runtime/content/IContentType;
- (Ljava/lang/Object;)Lorg/eclipse/core/runtime/content/IContentType;
+ (Ljava/lang/Object;)L0org/eclipse/core/runtime/content/IContentType; # @Inherited(org.eclipse.ui.texteditor.AbstractDocumentProvider)
 getDefaultEncoding
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getEncoding
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L0java/lang/String;
 getOperationRunner
  (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/jface/operation/IRunnableContext;
- (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/jface/operation/IRunnableContext;
+ (Lorg/eclipse/core/runtime/IProgressMonitor;)L0org/eclipse/jface/operation/IRunnableContext;
 getPersistedEncoding
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L0java/lang/String;
 handleCoreException
  (Lorg/eclipse/core/runtime/CoreException;Ljava/lang/String;)V
  (Lorg/eclipse/core/runtime/CoreException;Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/TextEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/TextEditor.eea
index d9aa23064a..0cd8004370 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/TextEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/TextEditor.eea
@@ -15,10 +15,10 @@ getAdapter
  <T:Ljava/lang/Object;>(L1java/lang/Class<TT;>;)T0T; # @Inherited(org.eclipse.ui.texteditor.AbstractDecoratedTextEditor)
 getStatusBanner
  (Lorg/eclipse/core/runtime/IStatus;)Ljava/lang/String;
- (Lorg/eclipse/core/runtime/IStatus;)Ljava/lang/String;
+ (Lorg/eclipse/core/runtime/IStatus;)L1java/lang/String; # @Inherited(org.eclipse.ui.texteditor.StatusTextEditor)
 getStatusHeader
  (Lorg/eclipse/core/runtime/IStatus;)Ljava/lang/String;
- (Lorg/eclipse/core/runtime/IStatus;)Ljava/lang/String;
+ (Lorg/eclipse/core/runtime/IStatus;)L1java/lang/String; # @Inherited(org.eclipse.ui.texteditor.StatusTextEditor)
 getStatusMessage
  (Lorg/eclipse/core/runtime/IStatus;)Ljava/lang/String;
  (Lorg/eclipse/core/runtime/IStatus;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/TextFileDocumentProvider$NullProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/TextFileDocumentProvider$NullProvider.eea
index 77ab385627..2c40736dc4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/TextFileDocumentProvider$NullProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/TextFileDocumentProvider$NullProvider.eea
@@ -20,25 +20,25 @@ disconnect
  (Ljava/lang/Object;)V
 getAnnotationModel
  (Ljava/lang/Object;)Lorg/eclipse/jface/text/source/IAnnotationModel;
- (Ljava/lang/Object;)Lorg/eclipse/jface/text/source/IAnnotationModel;
+ (Ljava/lang/Object;)L0org/eclipse/jface/text/source/IAnnotationModel;
 getContentType
  (Ljava/lang/Object;)Lorg/eclipse/core/runtime/content/IContentType;
- (Ljava/lang/Object;)Lorg/eclipse/core/runtime/content/IContentType;
+ (Ljava/lang/Object;)L0org/eclipse/core/runtime/content/IContentType;
 getDefaultEncoding
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getDocument
  (Ljava/lang/Object;)Lorg/eclipse/jface/text/IDocument;
- (Ljava/lang/Object;)Lorg/eclipse/jface/text/IDocument;
+ (Ljava/lang/Object;)L0org/eclipse/jface/text/IDocument;
 getEncoding
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L0java/lang/String;
 getModificationStamp
  (Ljava/lang/Object;)J
  (Ljava/lang/Object;)J
 getProgressMonitor
  ()Lorg/eclipse/core/runtime/IProgressMonitor;
- ()Lorg/eclipse/core/runtime/IProgressMonitor;
+ ()L1org/eclipse/core/runtime/IProgressMonitor;
 getStatus
  (Ljava/lang/Object;)Lorg/eclipse/core/runtime/IStatus;
  (Ljava/lang/Object;)Lorg/eclipse/core/runtime/IStatus;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/TextFileDocumentProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/TextFileDocumentProvider.eea
index aabab3b3c6..0ae6b304bc 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/TextFileDocumentProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/TextFileDocumentProvider.eea
@@ -26,19 +26,19 @@ connect
  (Ljava/lang/Object;)V
 createAnnotationModel
  (Lorg/eclipse/core/resources/IFile;)Lorg/eclipse/jface/text/source/IAnnotationModel;
- (Lorg/eclipse/core/resources/IFile;)Lorg/eclipse/jface/text/source/IAnnotationModel;
+ (Lorg/eclipse/core/resources/IFile;)L0org/eclipse/jface/text/source/IAnnotationModel;
 createEmptyFileInfo
  ()Lorg/eclipse/ui/editors/text/TextFileDocumentProvider$FileInfo;
- ()Lorg/eclipse/ui/editors/text/TextFileDocumentProvider$FileInfo;
+ ()L1org/eclipse/ui/editors/text/TextFileDocumentProvider$FileInfo;
 createFileFromDocument
  (Lorg/eclipse/core/runtime/IProgressMonitor;Lorg/eclipse/core/resources/IFile;Lorg/eclipse/jface/text/IDocument;)V
  (Lorg/eclipse/core/runtime/IProgressMonitor;Lorg/eclipse/core/resources/IFile;Lorg/eclipse/jface/text/IDocument;)V
 createFileInfo
  (Ljava/lang/Object;)Lorg/eclipse/ui/editors/text/TextFileDocumentProvider$FileInfo;
- (Ljava/lang/Object;)Lorg/eclipse/ui/editors/text/TextFileDocumentProvider$FileInfo;
+ (Ljava/lang/Object;)L0org/eclipse/ui/editors/text/TextFileDocumentProvider$FileInfo;
 createSaveOperation
  (Ljava/lang/Object;Lorg/eclipse/jface/text/IDocument;Z)Lorg/eclipse/ui/editors/text/TextFileDocumentProvider$DocumentProviderOperation;
- (Ljava/lang/Object;Lorg/eclipse/jface/text/IDocument;Z)Lorg/eclipse/ui/editors/text/TextFileDocumentProvider$DocumentProviderOperation;
+ (Ljava/lang/Object;Lorg/eclipse/jface/text/IDocument;Z)L0org/eclipse/ui/editors/text/TextFileDocumentProvider$DocumentProviderOperation;
 disconnect
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
@@ -62,7 +62,7 @@ getConnectedElementsIterator
  ()Ljava/util/Iterator<Ljava/lang/Object;>;
 getContentType
  (Ljava/lang/Object;)Lorg/eclipse/core/runtime/content/IContentType;
- (Ljava/lang/Object;)Lorg/eclipse/core/runtime/content/IContentType;
+ (Ljava/lang/Object;)L0org/eclipse/core/runtime/content/IContentType;
 getDefaultEncoding
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/TextSourceViewerConfiguration.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/TextSourceViewerConfiguration.eea
index 212086fc7f..df21f2e052 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/TextSourceViewerConfiguration.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/TextSourceViewerConfiguration.eea
@@ -16,16 +16,16 @@ fPreferenceStore
  (Lorg/eclipse/jface/preference/IPreferenceStore;)V
 getAnnotationHover
  (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/source/IAnnotationHover;
- (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/source/IAnnotationHover;
+ (Lorg/eclipse/jface/text/source/ISourceViewer;)L1org/eclipse/jface/text/source/IAnnotationHover; # @Overrides(org.eclipse.jface.text.source.SourceViewerConfiguration)
 getConfiguredTextHoverStateMasks
  (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)[I
- (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)[I
+ (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)[0I # @Inherited(org.eclipse.jface.text.source.SourceViewerConfiguration)
 getHyperlinkDetectorTargets
  (Lorg/eclipse/jface/text/source/ISourceViewer;)Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/core/runtime/IAdaptable;>;
- (Lorg/eclipse/jface/text/source/ISourceViewer;)Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/core/runtime/IAdaptable;>;
+ (Lorg/eclipse/jface/text/source/ISourceViewer;)L1java/util/Map<Ljava/lang/String;Lorg/eclipse/core/runtime/IAdaptable;>;
 getHyperlinkDetectors
  (Lorg/eclipse/jface/text/source/ISourceViewer;)[Lorg/eclipse/jface/text/hyperlink/IHyperlinkDetector;
- (Lorg/eclipse/jface/text/source/ISourceViewer;)[Lorg/eclipse/jface/text/hyperlink/IHyperlinkDetector;
+ (Lorg/eclipse/jface/text/source/ISourceViewer;)[0Lorg/eclipse/jface/text/hyperlink/IHyperlinkDetector;
 getHyperlinkPresenter
  (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/hyperlink/IHyperlinkPresenter;
  (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/hyperlink/IHyperlinkPresenter;
@@ -34,7 +34,7 @@ getHyperlinkStateMask
  (Lorg/eclipse/jface/text/source/ISourceViewer;)I
 getIndentPrefixes
  (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)[Ljava/lang/String;
- (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)[Ljava/lang/String;
+ (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)[0Ljava/lang/String;
 getLineSpacing
  (Lorg/eclipse/jface/text/source/ISourceViewer;)I
  (Lorg/eclipse/jface/text/source/ISourceViewer;)I
@@ -43,10 +43,10 @@ getOverviewRulerAnnotationHover
  (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/source/IAnnotationHover;
 getQuickAssistAssistant
  (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/quickassist/IQuickAssistAssistant;
- (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/quickassist/IQuickAssistAssistant;
+ (Lorg/eclipse/jface/text/source/ISourceViewer;)L0org/eclipse/jface/text/quickassist/IQuickAssistAssistant; # @Inherited(org.eclipse.jface.text.source.SourceViewerConfiguration)
 getReconciler
  (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/reconciler/IReconciler;
- (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/reconciler/IReconciler;
+ (Lorg/eclipse/jface/text/source/ISourceViewer;)L0org/eclipse/jface/text/reconciler/IReconciler; # @Inherited(org.eclipse.jface.text.source.SourceViewerConfiguration)
 getRegisteredHyperlinkDetectors
  (Lorg/eclipse/jface/text/source/ISourceViewer;)[Lorg/eclipse/jface/text/hyperlink/IHyperlinkDetector;
  (Lorg/eclipse/jface/text/source/ISourceViewer;)[Lorg/eclipse/jface/text/hyperlink/IHyperlinkDetector;
@@ -55,7 +55,7 @@ getTabWidth
  (Lorg/eclipse/jface/text/source/ISourceViewer;)I
 getTextHover
  (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)Lorg/eclipse/jface/text/ITextHover;
- (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)Lorg/eclipse/jface/text/ITextHover;
+ (Lorg/eclipse/jface/text/source/ISourceViewer;Ljava/lang/String;)L1org/eclipse/jface/text/ITextHover; # @Overrides(org.eclipse.jface.text.source.SourceViewerConfiguration)
 getUndoManager
  (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/IUndoManager;
  (Lorg/eclipse/jface/text/source/ISourceViewer;)Lorg/eclipse/jface/text/IUndoManager;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/templates/ContributionContextTypeRegistry.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/templates/ContributionContextTypeRegistry.eea
index 07e7ea9f82..876b939ea2 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/templates/ContributionContextTypeRegistry.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/editors/text/templates/ContributionContextTypeRegistry.eea
@@ -2,7 +2,7 @@ class org/eclipse/ui/editors/text/templates/ContributionContextTypeRegistry
 
 createContextType
  (Ljava/lang/String;)Lorg/eclipse/jface/text/templates/TemplateContextType;
- (Ljava/lang/String;)Lorg/eclipse/jface/text/templates/TemplateContextType;
+ (Ljava/lang/String;)L0org/eclipse/jface/text/templates/TemplateContextType;
 
 <init>
  (Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/DetailsPart.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/DetailsPart.eea
index ac4f38a093..0f639b4965 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/DetailsPart.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/DetailsPart.eea
@@ -8,7 +8,7 @@ class org/eclipse/ui/forms/DetailsPart
  (Lorg/eclipse/ui/forms/IManagedForm;Lorg/eclipse/ui/forms/widgets/ScrolledPageBook;)V
 getCurrentPage
  ()Lorg/eclipse/ui/forms/IDetailsPage;
- ()Lorg/eclipse/ui/forms/IDetailsPage;
+ ()L0org/eclipse/ui/forms/IDetailsPage;
 initialize
  (Lorg/eclipse/ui/forms/IManagedForm;)V
  (Lorg/eclipse/ui/forms/IManagedForm;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/FormColors.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/FormColors.eea
index 12a006efd1..fbd8f2beae 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/FormColors.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/FormColors.eea
@@ -30,7 +30,7 @@ TITLE
 
 blend
  (Lorg/eclipse/swt/graphics/RGB;Lorg/eclipse/swt/graphics/RGB;I)Lorg/eclipse/swt/graphics/RGB;
- (Lorg/eclipse/swt/graphics/RGB;Lorg/eclipse/swt/graphics/RGB;I)Lorg/eclipse/swt/graphics/RGB;
+ (Lorg/eclipse/swt/graphics/RGB;Lorg/eclipse/swt/graphics/RGB;I)L1org/eclipse/swt/graphics/RGB;
 testAnyPrimaryColor
  (Lorg/eclipse/swt/graphics/RGB;II)Z
  (Lorg/eclipse/swt/graphics/RGB;II)Z
@@ -59,10 +59,10 @@ foreground
  (Lorg/eclipse/swt/widgets/Display;)V
 createColor
  (Ljava/lang/String;III)Lorg/eclipse/swt/graphics/Color;
- (Ljava/lang/String;III)Lorg/eclipse/swt/graphics/Color;
+ (Ljava/lang/String;III)L1org/eclipse/swt/graphics/Color;
 createColor
  (Ljava/lang/String;Lorg/eclipse/swt/graphics/RGB;)Lorg/eclipse/swt/graphics/Color;
- (Ljava/lang/String;Lorg/eclipse/swt/graphics/RGB;)Lorg/eclipse/swt/graphics/Color;
+ (Ljava/lang/String;Lorg/eclipse/swt/graphics/RGB;)L1org/eclipse/swt/graphics/Color;
 getBackground
  ()Lorg/eclipse/swt/graphics/Color;
  ()Lorg/eclipse/swt/graphics/Color;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/IMessageManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/IMessageManager.eea
index 860c00cca3..f941353b93 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/IMessageManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/IMessageManager.eea
@@ -8,7 +8,7 @@ addMessage
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;ILorg/eclipse/swt/widgets/Control;)V
 createSummary
  ([Lorg/eclipse/ui/forms/IMessage;)Ljava/lang/String;
- ([Lorg/eclipse/ui/forms/IMessage;)Ljava/lang/String;
+ ([Lorg/eclipse/ui/forms/IMessage;)L1java/lang/String;
 getMessagePrefixProvider
  ()Lorg/eclipse/ui/forms/IMessagePrefixProvider;
  ()Lorg/eclipse/ui/forms/IMessagePrefixProvider;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/editor/FormEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/editor/FormEditor.eea
index 67046a8ac8..9540bdddcd 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/editor/FormEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/editor/FormEditor.eea
@@ -27,22 +27,22 @@ configurePage
  (ILorg/eclipse/ui/forms/editor/IFormPage;)V
 createPageContainer
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Composite;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Composite;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Composite; # @Inherited(org.eclipse.ui.part.MultiPageEditorPart)
 createToolkit
  (Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/ui/forms/widgets/FormToolkit;
- (Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/ui/forms/widgets/FormToolkit;
+ (Lorg/eclipse/swt/widgets/Display;)L1org/eclipse/ui/forms/widgets/FormToolkit;
 findPage
  (Ljava/lang/String;)Lorg/eclipse/ui/forms/editor/IFormPage;
- (Ljava/lang/String;)Lorg/eclipse/ui/forms/editor/IFormPage;
+ (Ljava/lang/String;)L0org/eclipse/ui/forms/editor/IFormPage;
 getActiveEditor
  ()Lorg/eclipse/ui/IEditorPart;
- ()Lorg/eclipse/ui/IEditorPart;
+ ()L0org/eclipse/ui/IEditorPart; # @Inherited(org.eclipse.ui.part.MultiPageEditorPart)
 getActivePageInstance
  ()Lorg/eclipse/ui/forms/editor/IFormPage;
- ()Lorg/eclipse/ui/forms/editor/IFormPage;
+ ()L0org/eclipse/ui/forms/editor/IFormPage;
 getSelectedPage
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(org.eclipse.ui.part.MultiPageEditorPart)
 getToolkit
  ()Lorg/eclipse/ui/forms/widgets/FormToolkit;
  ()Lorg/eclipse/ui/forms/widgets/FormToolkit;
@@ -51,10 +51,10 @@ init
  (Lorg/eclipse/ui/IEditorSite;Lorg/eclipse/ui/IEditorInput;)V
 selectReveal
  (Ljava/lang/Object;)Lorg/eclipse/ui/forms/editor/IFormPage;
- (Ljava/lang/Object;)Lorg/eclipse/ui/forms/editor/IFormPage;
+ (Ljava/lang/Object;)L0org/eclipse/ui/forms/editor/IFormPage;
 setActivePage
  (Ljava/lang/String;)Lorg/eclipse/ui/forms/editor/IFormPage;
- (Ljava/lang/String;)Lorg/eclipse/ui/forms/editor/IFormPage;
+ (Ljava/lang/String;)L0org/eclipse/ui/forms/editor/IFormPage;
 setActivePage
  (Ljava/lang/String;Ljava/lang/Object;)Lorg/eclipse/ui/forms/editor/IFormPage;
  (Ljava/lang/String;Ljava/lang/Object;)Lorg/eclipse/ui/forms/editor/IFormPage;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/editor/FormPage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/editor/FormPage.eea
index fb42e4e76a..5e0dd25dca 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/editor/FormPage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/editor/FormPage.eea
@@ -26,10 +26,10 @@ getManagedForm
  ()Lorg/eclipse/ui/forms/IManagedForm;
 getPartControl
  ()Lorg/eclipse/swt/widgets/Control;
- ()Lorg/eclipse/swt/widgets/Control;
+ ()L0org/eclipse/swt/widgets/Control;
 getTitleImage
  ()Lorg/eclipse/swt/graphics/Image;
- ()Lorg/eclipse/swt/graphics/Image;
+ ()L0org/eclipse/swt/graphics/Image;
 init
  (Lorg/eclipse/ui/IEditorSite;Lorg/eclipse/ui/IEditorInput;)V
  (Lorg/eclipse/ui/IEditorSite;Lorg/eclipse/ui/IEditorInput;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/editor/SharedHeaderFormEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/editor/SharedHeaderFormEditor.eea
index d909b4cbcd..0c0bb984fc 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/editor/SharedHeaderFormEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/editor/SharedHeaderFormEditor.eea
@@ -5,7 +5,7 @@ createHeaderContents
  (Lorg/eclipse/ui/forms/IManagedForm;)V
 createPageContainer
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Composite;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Composite;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Composite; # @Inherited(org.eclipse.ui.forms.editor.FormEditor)
 getHeaderForm
  ()Lorg/eclipse/ui/forms/IManagedForm;
  ()Lorg/eclipse/ui/forms/IManagedForm;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/ExpandableComposite.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/ExpandableComposite.eea
index 48f6a43289..403cae9813 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/ExpandableComposite.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/ExpandableComposite.eea
@@ -24,10 +24,10 @@ getClient
  ()Lorg/eclipse/swt/widgets/Control;
 getDescriptionControl
  ()Lorg/eclipse/swt/widgets/Control;
- ()Lorg/eclipse/swt/widgets/Control;
+ ()L0org/eclipse/swt/widgets/Control;
 getSeparatorControl
  ()Lorg/eclipse/swt/widgets/Control;
- ()Lorg/eclipse/swt/widgets/Control;
+ ()L0org/eclipse/swt/widgets/Control;
 getText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/FormText.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/FormText.eea
index 2a066108a6..30b12fd320 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/FormText.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/FormText.eea
@@ -21,13 +21,13 @@ getHyperlinkSettings
  ()Lorg/eclipse/ui/forms/HyperlinkSettings;
 getLoadingText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getSelectedLinkHref
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getSelectedLinkText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getSelectionText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/FormToolkit.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/FormToolkit.eea
index d689f6deae..eab04a4ca8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/FormToolkit.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/FormToolkit.eea
@@ -31,61 +31,61 @@ adapt
  (Lorg/eclipse/swt/widgets/Control;ZZ)V
 createButton
  (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;I)Lorg/eclipse/swt/widgets/Button;
- (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;I)Lorg/eclipse/swt/widgets/Button;
+ (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;I)L1org/eclipse/swt/widgets/Button;
 createComposite
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Composite;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Composite;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Composite;
 createComposite
  (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/widgets/Composite;
- (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/widgets/Composite;
+ (Lorg/eclipse/swt/widgets/Composite;I)L1org/eclipse/swt/widgets/Composite;
 createCompositeSeparator
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Composite;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Composite;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Composite;
 createExpandableComposite
  (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/ui/forms/widgets/ExpandableComposite;
- (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/ui/forms/widgets/ExpandableComposite;
+ (Lorg/eclipse/swt/widgets/Composite;I)L1org/eclipse/ui/forms/widgets/ExpandableComposite;
 createForm
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/ui/forms/widgets/Form;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/ui/forms/widgets/Form;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/ui/forms/widgets/Form;
 createFormText
  (Lorg/eclipse/swt/widgets/Composite;Z)Lorg/eclipse/ui/forms/widgets/FormText;
- (Lorg/eclipse/swt/widgets/Composite;Z)Lorg/eclipse/ui/forms/widgets/FormText;
+ (Lorg/eclipse/swt/widgets/Composite;Z)L1org/eclipse/ui/forms/widgets/FormText;
 createHyperlink
  (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;I)Lorg/eclipse/ui/forms/widgets/Hyperlink;
- (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;I)Lorg/eclipse/ui/forms/widgets/Hyperlink;
+ (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;I)L1org/eclipse/ui/forms/widgets/Hyperlink;
 createImageHyperlink
  (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/ui/forms/widgets/ImageHyperlink;
- (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/ui/forms/widgets/ImageHyperlink;
+ (Lorg/eclipse/swt/widgets/Composite;I)L1org/eclipse/ui/forms/widgets/ImageHyperlink;
 createLabel
  (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)Lorg/eclipse/swt/widgets/Label;
- (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)Lorg/eclipse/swt/widgets/Label;
+ (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)L1org/eclipse/swt/widgets/Label;
 createLabel
  (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;I)Lorg/eclipse/swt/widgets/Label;
- (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;I)Lorg/eclipse/swt/widgets/Label;
+ (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;I)L1org/eclipse/swt/widgets/Label;
 createPageBook
  (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/ui/forms/widgets/ScrolledPageBook;
- (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/ui/forms/widgets/ScrolledPageBook;
+ (Lorg/eclipse/swt/widgets/Composite;I)L1org/eclipse/ui/forms/widgets/ScrolledPageBook;
 createScrolledForm
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/ui/forms/widgets/ScrolledForm;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/ui/forms/widgets/ScrolledForm;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/ui/forms/widgets/ScrolledForm;
 createSection
  (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/ui/forms/widgets/Section;
- (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/ui/forms/widgets/Section;
+ (Lorg/eclipse/swt/widgets/Composite;I)L1org/eclipse/ui/forms/widgets/Section;
 createSeparator
  (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/widgets/Label;
- (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/widgets/Label;
+ (Lorg/eclipse/swt/widgets/Composite;I)L1org/eclipse/swt/widgets/Label;
 createTable
  (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/widgets/Table;
- (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/widgets/Table;
+ (Lorg/eclipse/swt/widgets/Composite;I)L1org/eclipse/swt/widgets/Table;
 createText
  (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)Lorg/eclipse/swt/widgets/Text;
- (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)Lorg/eclipse/swt/widgets/Text;
+ (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)L1org/eclipse/swt/widgets/Text;
 createText
  (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;I)Lorg/eclipse/swt/widgets/Text;
- (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;I)Lorg/eclipse/swt/widgets/Text;
+ (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;I)L1org/eclipse/swt/widgets/Text;
 createTree
  (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/widgets/Tree;
- (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/widgets/Tree;
+ (Lorg/eclipse/swt/widgets/Composite;I)L1org/eclipse/swt/widgets/Tree;
 decorateFormHeading
  (Lorg/eclipse/ui/forms/widgets/Form;)V
  (Lorg/eclipse/ui/forms/widgets/Form;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/ScrolledPageBook.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/ScrolledPageBook.eea
index d84c748eba..1ec9c65304 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/ScrolledPageBook.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/ScrolledPageBook.eea
@@ -11,7 +11,7 @@ computeSize
  (IIZ)L1org/eclipse/swt/graphics/Point; # @Inherited(org.eclipse.swt.widgets.Control)
 createPage
  (Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Composite;
- (Ljava/lang/Object;)Lorg/eclipse/swt/widgets/Composite;
+ (Ljava/lang/Object;)L1org/eclipse/swt/widgets/Composite;
 getContainer
  ()Lorg/eclipse/swt/widgets/Composite;
  ()Lorg/eclipse/swt/widgets/Composite;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/Section.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/Section.eea
index 1571b215e9..0a2a21eb5a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/Section.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/Section.eea
@@ -5,22 +5,22 @@ class org/eclipse/ui/forms/widgets/Section
  (Lorg/eclipse/swt/widgets/Composite;I)V
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getDescriptionControl
  ()Lorg/eclipse/swt/widgets/Control;
- ()Lorg/eclipse/swt/widgets/Control;
+ ()L0org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.ui.forms.widgets.ExpandableComposite)
 getSeparatorControl
  ()Lorg/eclipse/swt/widgets/Control;
- ()Lorg/eclipse/swt/widgets/Control;
+ ()L0org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.ui.forms.widgets.ExpandableComposite)
 getTitleBarBackground
  ()Lorg/eclipse/swt/graphics/Color;
- ()Lorg/eclipse/swt/graphics/Color;
+ ()L0org/eclipse/swt/graphics/Color;
 getTitleBarBorderColor
  ()Lorg/eclipse/swt/graphics/Color;
- ()Lorg/eclipse/swt/graphics/Color;
+ ()L0org/eclipse/swt/graphics/Color;
 getTitleBarGradientBackground
  ()Lorg/eclipse/swt/graphics/Color;
- ()Lorg/eclipse/swt/graphics/Color;
+ ()L0org/eclipse/swt/graphics/Color;
 onPaint
  (Lorg/eclipse/swt/events/PaintEvent;)V
  (Lorg/eclipse/swt/events/PaintEvent;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/SectionFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/SectionFactory.eea
index a283ef3da2..c24cadc997 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/SectionFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/SectionFactory.eea
@@ -6,7 +6,7 @@ super org/eclipse/jface/widgets/AbstractCompositeFactory
 
 newSection
  (I)Lorg/eclipse/ui/forms/widgets/SectionFactory;
- (I)Lorg/eclipse/ui/forms/widgets/SectionFactory;
+ (I)L1org/eclipse/ui/forms/widgets/SectionFactory;
 
 description
  (Ljava/lang/String;)Lorg/eclipse/ui/forms/widgets/SectionFactory;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/SizeCache.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/SizeCache.eea
index 0dc24184e2..0f044093b6 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/SizeCache.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/forms/widgets/SizeCache.eea
@@ -8,7 +8,7 @@ computeAdjustedSize
  (II)Lorg/eclipse/swt/graphics/Point;
 computeMinimumSize
  ()Lorg/eclipse/swt/graphics/Point;
- ()Lorg/eclipse/swt/graphics/Point;
+ ()L1org/eclipse/swt/graphics/Point;
 computeSize
  (II)Lorg/eclipse/swt/graphics/Point;
  (II)Lorg/eclipse/swt/graphics/Point;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/handlers/HandlerUtil.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/handlers/HandlerUtil.eea
index 284db132f3..ab2320c243 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/handlers/HandlerUtil.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/handlers/HandlerUtil.eea
@@ -2,79 +2,79 @@ class org/eclipse/ui/handlers/HandlerUtil
 
 getActiveContexts
  (Lorg/eclipse/core/commands/ExecutionEvent;)Ljava/util/Collection;
- (Lorg/eclipse/core/commands/ExecutionEvent;)Ljava/util/Collection;
+ (Lorg/eclipse/core/commands/ExecutionEvent;)L0java/util/Collection;
 getActiveContextsChecked
  (Lorg/eclipse/core/commands/ExecutionEvent;)Ljava/util/Collection;
  (Lorg/eclipse/core/commands/ExecutionEvent;)Ljava/util/Collection;
 getActiveEditor
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/ui/IEditorPart;
- (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/ui/IEditorPart;
+ (Lorg/eclipse/core/commands/ExecutionEvent;)L0org/eclipse/ui/IEditorPart;
 getActiveEditorChecked
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/ui/IEditorPart;
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/ui/IEditorPart;
 getActiveEditorId
  (Lorg/eclipse/core/commands/ExecutionEvent;)Ljava/lang/String;
- (Lorg/eclipse/core/commands/ExecutionEvent;)Ljava/lang/String;
+ (Lorg/eclipse/core/commands/ExecutionEvent;)L0java/lang/String;
 getActiveEditorIdChecked
  (Lorg/eclipse/core/commands/ExecutionEvent;)Ljava/lang/String;
  (Lorg/eclipse/core/commands/ExecutionEvent;)Ljava/lang/String;
 getActiveEditorInput
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/ui/IEditorInput;
- (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/ui/IEditorInput;
+ (Lorg/eclipse/core/commands/ExecutionEvent;)L0org/eclipse/ui/IEditorInput;
 getActiveEditorInputChecked
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/ui/IEditorInput;
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/ui/IEditorInput;
 getActiveMenuEditorInput
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/jface/viewers/ISelection;
- (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/jface/viewers/ISelection;
+ (Lorg/eclipse/core/commands/ExecutionEvent;)L0org/eclipse/jface/viewers/ISelection;
 getActiveMenuEditorInputChecked
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/jface/viewers/ISelection;
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/jface/viewers/ISelection;
 getActiveMenuSelection
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/jface/viewers/ISelection;
- (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/jface/viewers/ISelection;
+ (Lorg/eclipse/core/commands/ExecutionEvent;)L0org/eclipse/jface/viewers/ISelection;
 getActiveMenuSelectionChecked
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/jface/viewers/ISelection;
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/jface/viewers/ISelection;
 getActiveMenus
  (Lorg/eclipse/core/commands/ExecutionEvent;)Ljava/util/Collection;
- (Lorg/eclipse/core/commands/ExecutionEvent;)Ljava/util/Collection;
+ (Lorg/eclipse/core/commands/ExecutionEvent;)L0java/util/Collection;
 getActiveMenusChecked
  (Lorg/eclipse/core/commands/ExecutionEvent;)Ljava/util/Collection;
  (Lorg/eclipse/core/commands/ExecutionEvent;)Ljava/util/Collection;
 getActivePart
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/ui/IWorkbenchPart;
- (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/ui/IWorkbenchPart;
+ (Lorg/eclipse/core/commands/ExecutionEvent;)L0org/eclipse/ui/IWorkbenchPart;
 getActivePartChecked
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/ui/IWorkbenchPart;
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/ui/IWorkbenchPart;
 getActivePartId
  (Lorg/eclipse/core/commands/ExecutionEvent;)Ljava/lang/String;
- (Lorg/eclipse/core/commands/ExecutionEvent;)Ljava/lang/String;
+ (Lorg/eclipse/core/commands/ExecutionEvent;)L0java/lang/String;
 getActivePartIdChecked
  (Lorg/eclipse/core/commands/ExecutionEvent;)Ljava/lang/String;
  (Lorg/eclipse/core/commands/ExecutionEvent;)Ljava/lang/String;
 getActiveShell
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/swt/widgets/Shell;
- (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/swt/widgets/Shell;
+ (Lorg/eclipse/core/commands/ExecutionEvent;)L0org/eclipse/swt/widgets/Shell;
 getActiveShellChecked
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/swt/widgets/Shell;
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/swt/widgets/Shell;
 getActiveSite
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/ui/IWorkbenchSite;
- (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/ui/IWorkbenchSite;
+ (Lorg/eclipse/core/commands/ExecutionEvent;)L0org/eclipse/ui/IWorkbenchSite;
 getActiveSiteChecked
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/ui/IWorkbenchSite;
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/ui/IWorkbenchSite;
 getActiveWorkbenchWindow
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/ui/IWorkbenchWindow;
- (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/ui/IWorkbenchWindow;
+ (Lorg/eclipse/core/commands/ExecutionEvent;)L0org/eclipse/ui/IWorkbenchWindow;
 getActiveWorkbenchWindowChecked
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/ui/IWorkbenchWindow;
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/ui/IWorkbenchWindow;
 getCurrentSelection
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/jface/viewers/ISelection;
- (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/jface/viewers/ISelection;
+ (Lorg/eclipse/core/commands/ExecutionEvent;)L0org/eclipse/jface/viewers/ISelection;
 getCurrentSelectionChecked
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/jface/viewers/ISelection;
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/jface/viewers/ISelection;
@@ -89,16 +89,16 @@ getShowInInputChecked
  (Lorg/eclipse/core/commands/ExecutionEvent;)Ljava/lang/Object;
 getShowInSelection
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/jface/viewers/ISelection;
- (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/jface/viewers/ISelection;
+ (Lorg/eclipse/core/commands/ExecutionEvent;)L0org/eclipse/jface/viewers/ISelection;
 getShowInSelectionChecked
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/jface/viewers/ISelection;
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/jface/viewers/ISelection;
 getVariable
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/Object;Ljava/lang/String;)L0java/lang/Object;
 getVariable
  (Lorg/eclipse/core/commands/ExecutionEvent;Ljava/lang/String;)Ljava/lang/Object;
- (Lorg/eclipse/core/commands/ExecutionEvent;Ljava/lang/String;)Ljava/lang/Object;
+ (Lorg/eclipse/core/commands/ExecutionEvent;Ljava/lang/String;)L0java/lang/Object;
 getVariableChecked
  (Lorg/eclipse/core/commands/ExecutionEvent;Ljava/lang/String;)Ljava/lang/Object;
  (Lorg/eclipse/core/commands/ExecutionEvent;Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/handlers/IHandlerService.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/handlers/IHandlerService.eea
index 0cabce6aca..d9f816536f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/handlers/IHandlerService.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/handlers/IHandlerService.eea
@@ -17,13 +17,13 @@ activateHandler
  (Lorg/eclipse/ui/handlers/IHandlerActivation;)Lorg/eclipse/ui/handlers/IHandlerActivation;
 createContextSnapshot
  (Z)Lorg/eclipse/core/expressions/IEvaluationContext;
- (Z)Lorg/eclipse/core/expressions/IEvaluationContext;
+ (Z)L1org/eclipse/core/expressions/IEvaluationContext;
 createExecutionEvent
  (Lorg/eclipse/core/commands/Command;Lorg/eclipse/swt/widgets/Event;)Lorg/eclipse/core/commands/ExecutionEvent;
- (Lorg/eclipse/core/commands/Command;Lorg/eclipse/swt/widgets/Event;)Lorg/eclipse/core/commands/ExecutionEvent;
+ (Lorg/eclipse/core/commands/Command;Lorg/eclipse/swt/widgets/Event;)L1org/eclipse/core/commands/ExecutionEvent;
 createExecutionEvent
  (Lorg/eclipse/core/commands/ParameterizedCommand;Lorg/eclipse/swt/widgets/Event;)Lorg/eclipse/core/commands/ExecutionEvent;
- (Lorg/eclipse/core/commands/ParameterizedCommand;Lorg/eclipse/swt/widgets/Event;)Lorg/eclipse/core/commands/ExecutionEvent;
+ (Lorg/eclipse/core/commands/ParameterizedCommand;Lorg/eclipse/swt/widgets/Event;)L1org/eclipse/core/commands/ExecutionEvent;
 deactivateHandler
  (Lorg/eclipse/ui/handlers/IHandlerActivation;)V
  (Lorg/eclipse/ui/handlers/IHandlerActivation;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/help/AbstractHelpUI.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/help/AbstractHelpUI.eea
index 7f0068c27e..ce6c4988d3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/help/AbstractHelpUI.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/help/AbstractHelpUI.eea
@@ -8,7 +8,7 @@ displayHelpResource
  (Ljava/lang/String;)V
 resolve
  (Ljava/lang/String;Z)Ljava/net/URL;
- (Ljava/lang/String;Z)Ljava/net/URL;
+ (Ljava/lang/String;Z)L0java/net/URL;
 search
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/FileStoreEditorInput.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/FileStoreEditorInput.eea
index 26b78fe360..2b78888d03 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/FileStoreEditorInput.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/FileStoreEditorInput.eea
@@ -11,7 +11,7 @@ getAdapter
  <T:Ljava/lang/Object;>(L1java/lang/Class<TT;>;)T0T; # @Inherited(org.eclipse.core.runtime.IAdaptable)
 getFactoryId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getImageDescriptor
  ()Lorg/eclipse/jface/resource/ImageDescriptor;
  ()L0org/eclipse/jface/resource/ImageDescriptor; # @Inherited(org.eclipse.ui.IEditorInput)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/FileStoreEditorInputFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/FileStoreEditorInputFactory.eea
index 7373399a51..6e5be94246 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/FileStoreEditorInputFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/FileStoreEditorInputFactory.eea
@@ -2,4 +2,4 @@ class org/eclipse/ui/ide/FileStoreEditorInputFactory
 
 createElement
  (Lorg/eclipse/ui/IMemento;)Lorg/eclipse/core/runtime/IAdaptable;
- (Lorg/eclipse/ui/IMemento;)Lorg/eclipse/core/runtime/IAdaptable;
+ (Lorg/eclipse/ui/IMemento;)L0org/eclipse/core/runtime/IAdaptable; # @Overrides(org.eclipse.ui.IElementFactory)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/IDE.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/IDE.eea
index fad7ed98a3..c273a05e76 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/IDE.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/IDE.eea
@@ -18,13 +18,13 @@ computeSelectedResources
  (Lorg/eclipse/jface/viewers/IStructuredSelection;)Ljava/util/List<Lorg/eclipse/core/resources/IResource;>;
 getContentType
  (Lorg/eclipse/core/resources/IFile;)Lorg/eclipse/core/runtime/content/IContentType;
- (Lorg/eclipse/core/resources/IFile;)Lorg/eclipse/core/runtime/content/IContentType;
+ (Lorg/eclipse/core/resources/IFile;)L0org/eclipse/core/runtime/content/IContentType;
 getDefaultEditor
  (Lorg/eclipse/core/resources/IFile;)Lorg/eclipse/ui/IEditorDescriptor;
  (Lorg/eclipse/core/resources/IFile;)Lorg/eclipse/ui/IEditorDescriptor;
 getDefaultEditor
  (Lorg/eclipse/core/resources/IFile;Z)Lorg/eclipse/ui/IEditorDescriptor;
- (Lorg/eclipse/core/resources/IFile;Z)Lorg/eclipse/ui/IEditorDescriptor;
+ (Lorg/eclipse/core/resources/IFile;Z)L0org/eclipse/ui/IEditorDescriptor;
 getEditorDescriptor
  (Ljava/lang/String;)Lorg/eclipse/ui/IEditorDescriptor;
  (Ljava/lang/String;)Lorg/eclipse/ui/IEditorDescriptor;
@@ -54,13 +54,13 @@ gotoMarker
  (Lorg/eclipse/ui/IEditorPart;Lorg/eclipse/core/resources/IMarker;)V
 guessContentType
  (Lorg/eclipse/core/resources/IFile;)Lorg/eclipse/core/runtime/content/IContentType;
- (Lorg/eclipse/core/resources/IFile;)Lorg/eclipse/core/runtime/content/IContentType;
+ (Lorg/eclipse/core/resources/IFile;)L0org/eclipse/core/runtime/content/IContentType;
 openEditor
  (Lorg/eclipse/ui/IWorkbenchPage;Ljava/net/URI;Ljava/lang/String;Z)Lorg/eclipse/ui/IEditorPart;
  (Lorg/eclipse/ui/IWorkbenchPage;Ljava/net/URI;Ljava/lang/String;Z)Lorg/eclipse/ui/IEditorPart;
 openEditor
  (Lorg/eclipse/ui/IWorkbenchPage;Lorg/eclipse/core/resources/IFile;)Lorg/eclipse/ui/IEditorPart;
- (Lorg/eclipse/ui/IWorkbenchPage;Lorg/eclipse/core/resources/IFile;)Lorg/eclipse/ui/IEditorPart;
+ (Lorg/eclipse/ui/IWorkbenchPage;Lorg/eclipse/core/resources/IFile;)L0org/eclipse/ui/IEditorPart;
 openEditor
  (Lorg/eclipse/ui/IWorkbenchPage;Lorg/eclipse/core/resources/IFile;Ljava/lang/String;)Lorg/eclipse/ui/IEditorPart;
  (Lorg/eclipse/ui/IWorkbenchPage;Lorg/eclipse/core/resources/IFile;Ljava/lang/String;)Lorg/eclipse/ui/IEditorPart;
@@ -72,13 +72,13 @@ openEditor
  (Lorg/eclipse/ui/IWorkbenchPage;Lorg/eclipse/core/resources/IFile;Z)Lorg/eclipse/ui/IEditorPart;
 openEditor
  (Lorg/eclipse/ui/IWorkbenchPage;Lorg/eclipse/core/resources/IFile;ZZ)Lorg/eclipse/ui/IEditorPart;
- (Lorg/eclipse/ui/IWorkbenchPage;Lorg/eclipse/core/resources/IFile;ZZ)Lorg/eclipse/ui/IEditorPart;
+ (Lorg/eclipse/ui/IWorkbenchPage;Lorg/eclipse/core/resources/IFile;ZZ)L0org/eclipse/ui/IEditorPart;
 openEditor
  (Lorg/eclipse/ui/IWorkbenchPage;Lorg/eclipse/core/resources/IMarker;)Lorg/eclipse/ui/IEditorPart;
  (Lorg/eclipse/ui/IWorkbenchPage;Lorg/eclipse/core/resources/IMarker;)Lorg/eclipse/ui/IEditorPart;
 openEditor
  (Lorg/eclipse/ui/IWorkbenchPage;Lorg/eclipse/core/resources/IMarker;Z)Lorg/eclipse/ui/IEditorPart;
- (Lorg/eclipse/ui/IWorkbenchPage;Lorg/eclipse/core/resources/IMarker;Z)Lorg/eclipse/ui/IEditorPart;
+ (Lorg/eclipse/ui/IWorkbenchPage;Lorg/eclipse/core/resources/IMarker;Z)L0org/eclipse/ui/IEditorPart;
 openEditor
  (Lorg/eclipse/ui/IWorkbenchPage;Lorg/eclipse/ui/IEditorInput;Ljava/lang/String;)Lorg/eclipse/ui/IEditorPart;
  (Lorg/eclipse/ui/IWorkbenchPage;Lorg/eclipse/ui/IEditorInput;Ljava/lang/String;)Lorg/eclipse/ui/IEditorPart;
@@ -87,7 +87,7 @@ openEditor
  (Lorg/eclipse/ui/IWorkbenchPage;Lorg/eclipse/ui/IEditorInput;Ljava/lang/String;Z)Lorg/eclipse/ui/IEditorPart;
 openEditorOnFileStore
  (Lorg/eclipse/ui/IWorkbenchPage;Lorg/eclipse/core/filesystem/IFileStore;)Lorg/eclipse/ui/IEditorPart;
- (Lorg/eclipse/ui/IWorkbenchPage;Lorg/eclipse/core/filesystem/IFileStore;)Lorg/eclipse/ui/IEditorPart;
+ (Lorg/eclipse/ui/IWorkbenchPage;Lorg/eclipse/core/filesystem/IFileStore;)L0org/eclipse/ui/IEditorPart;
 openEditors
  (Lorg/eclipse/ui/IWorkbenchPage;[Lorg/eclipse/core/resources/IFile;)[Lorg/eclipse/ui/IEditorReference;
  (Lorg/eclipse/ui/IWorkbenchPage;[Lorg/eclipse/core/resources/IFile;)[Lorg/eclipse/ui/IEditorReference;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/IDEEncoding.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/IDEEncoding.eea
index 67aa340f1d..0cd404f654 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/IDEEncoding.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/IDEEncoding.eea
@@ -15,10 +15,10 @@ addIDEEncoding
  (Ljava/lang/String;)V
 getByteOrderMarkLabel
  (Lorg/eclipse/core/runtime/content/IContentDescription;)Ljava/lang/String;
- (Lorg/eclipse/core/runtime/content/IContentDescription;)Ljava/lang/String;
+ (Lorg/eclipse/core/runtime/content/IContentDescription;)L0java/lang/String;
 getIDEEncodings
  ()Ljava/util/List<Ljava/lang/String;>;
  ()Ljava/util/List<Ljava/lang/String;>;
 getResourceEncoding
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/ResourceSelectionUtil.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/ResourceSelectionUtil.eea
index 6bb614e5e9..3130b7fe32 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/ResourceSelectionUtil.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/ResourceSelectionUtil.eea
@@ -2,7 +2,7 @@ class org/eclipse/ui/ide/ResourceSelectionUtil
 
 allResources
  (Lorg/eclipse/jface/viewers/IStructuredSelection;I)Lorg/eclipse/jface/viewers/IStructuredSelection;
- (Lorg/eclipse/jface/viewers/IStructuredSelection;I)Lorg/eclipse/jface/viewers/IStructuredSelection;
+ (Lorg/eclipse/jface/viewers/IStructuredSelection;I)L0org/eclipse/jface/viewers/IStructuredSelection;
 allResourcesAreOfType
  (Lorg/eclipse/jface/viewers/IStructuredSelection;I)Z
  (Lorg/eclipse/jface/viewers/IStructuredSelection;I)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/ResourceUtil.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/ResourceUtil.eea
index 670488a51f..a14bab8b78 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/ResourceUtil.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/ResourceUtil.eea
@@ -2,13 +2,13 @@ class org/eclipse/ui/ide/ResourceUtil
 
 findEditor
  (Lorg/eclipse/ui/IWorkbenchPage;Lorg/eclipse/core/resources/IFile;)Lorg/eclipse/ui/IEditorPart;
- (Lorg/eclipse/ui/IWorkbenchPage;Lorg/eclipse/core/resources/IFile;)Lorg/eclipse/ui/IEditorPart;
+ (Lorg/eclipse/ui/IWorkbenchPage;Lorg/eclipse/core/resources/IFile;)L0org/eclipse/ui/IEditorPart;
 getAdapter
  <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Z)TT;
  <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Z)TT;
 getFile
  (Ljava/lang/Object;)Lorg/eclipse/core/resources/IFile;
- (Ljava/lang/Object;)Lorg/eclipse/core/resources/IFile;
+ (Ljava/lang/Object;)L0org/eclipse/core/resources/IFile;
 getFile
  (Lorg/eclipse/ui/IEditorInput;)Lorg/eclipse/core/resources/IFile;
  (Lorg/eclipse/ui/IEditorInput;)Lorg/eclipse/core/resources/IFile;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/dialogs/AbstractEncodingFieldEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/dialogs/AbstractEncodingFieldEditor.eea
index bf153249d6..feef6632df 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/dialogs/AbstractEncodingFieldEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/dialogs/AbstractEncodingFieldEditor.eea
@@ -8,7 +8,7 @@ class org/eclipse/ui/ide/dialogs/AbstractEncodingFieldEditor
  (Ljava/lang/String;Ljava/lang/String;Lorg/eclipse/swt/widgets/Composite;)V
 createEncodingGroup
  (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/widgets/Composite;
- (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/widgets/Composite;
+ (Lorg/eclipse/swt/widgets/Composite;I)L1org/eclipse/swt/widgets/Composite;
 defaultButtonText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/dialogs/ImportTypeDialog.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/dialogs/ImportTypeDialog.eea
index 4cecada310..48debe6aa8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/dialogs/ImportTypeDialog.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/dialogs/ImportTypeDialog.eea
@@ -14,7 +14,7 @@ createDialogArea
  (L1org/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.jface.dialogs.Dialog)
 createMessageArea
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Control;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control;
 getVariable
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/dialogs/ResourceEncodingFieldEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/dialogs/ResourceEncodingFieldEditor.eea
index b31ea1ea3f..11b53fec8b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/dialogs/ResourceEncodingFieldEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/dialogs/ResourceEncodingFieldEditor.eea
@@ -8,7 +8,7 @@ class org/eclipse/ui/ide/dialogs/ResourceEncodingFieldEditor
  (Ljava/lang/String;Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/core/resources/IResource;Ljava/lang/String;)V
 createEncodingGroup
  (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/widgets/Composite;
- (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/widgets/Composite;
+ (Lorg/eclipse/swt/widgets/Composite;I)L1org/eclipse/swt/widgets/Composite; # @Inherited(org.eclipse.ui.ide.dialogs.AbstractEncodingFieldEditor)
 defaultButtonText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/dialogs/ResourceTreeAndListGroup.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/dialogs/ResourceTreeAndListGroup.eea
index f656c6db26..8f8332c6a7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/dialogs/ResourceTreeAndListGroup.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/dialogs/ResourceTreeAndListGroup.eea
@@ -17,7 +17,7 @@ getAllListItems
  ()Ljava/util/List<*>;
 getAllWhiteCheckedItems
  ()Ljava/util/List<*>;
- ()Ljava/util/List<*>;
+ ()L1java/util/List<*>;
 initialCheckListItem
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/dialogs/UIResourceFilterDescription.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/dialogs/UIResourceFilterDescription.eea
index e69ea2efa2..3a9cd545a7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/dialogs/UIResourceFilterDescription.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/dialogs/UIResourceFilterDescription.eea
@@ -2,7 +2,7 @@ class org/eclipse/ui/ide/dialogs/UIResourceFilterDescription
 
 wrap
  (Lorg/eclipse/core/resources/IResourceFilterDescription;)Lorg/eclipse/ui/ide/dialogs/UIResourceFilterDescription;
- (Lorg/eclipse/core/resources/IResourceFilterDescription;)Lorg/eclipse/ui/ide/dialogs/UIResourceFilterDescription;
+ (Lorg/eclipse/core/resources/IResourceFilterDescription;)L1org/eclipse/ui/ide/dialogs/UIResourceFilterDescription;
 
 getFileInfoMatcherDescription
  ()Lorg/eclipse/core/resources/FileInfoMatcherDescription;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/undo/ResourceDescription.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/undo/ResourceDescription.eea
index e37a96f78e..4321511574 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/undo/ResourceDescription.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/undo/ResourceDescription.eea
@@ -2,17 +2,17 @@ class org/eclipse/ui/ide/undo/ResourceDescription
 
 fromResource
  (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/ui/ide/undo/ResourceDescription;
- (Lorg/eclipse/core/resources/IResource;)Lorg/eclipse/ui/ide/undo/ResourceDescription;
+ (Lorg/eclipse/core/resources/IResource;)L1org/eclipse/ui/ide/undo/ResourceDescription;
 
 createExistentResourceFromHandle
  (Lorg/eclipse/core/resources/IResource;Lorg/eclipse/core/runtime/IProgressMonitor;)V
  (Lorg/eclipse/core/resources/IResource;Lorg/eclipse/core/runtime/IProgressMonitor;)V
 createResource
  (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/core/resources/IResource;
- (Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/core/resources/IResource;
+ (Lorg/eclipse/core/runtime/IProgressMonitor;)L1org/eclipse/core/resources/IResource;
 createResourceHandle
  ()Lorg/eclipse/core/resources/IResource;
- ()Lorg/eclipse/core/resources/IResource;
+ ()L1org/eclipse/core/resources/IResource;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/undo/WorkspaceUndoUtil.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/undo/WorkspaceUndoUtil.eea
index 7bd1e6fc0b..7d43c2700f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/undo/WorkspaceUndoUtil.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/ide/undo/WorkspaceUndoUtil.eea
@@ -17,7 +17,7 @@ getTasksUndoContext
  ()Lorg/eclipse/core/commands/operations/IUndoContext;
 getUIInfoAdapter
  (Lorg/eclipse/swt/widgets/Shell;)Lorg/eclipse/core/runtime/IAdaptable;
- (Lorg/eclipse/swt/widgets/Shell;)Lorg/eclipse/core/runtime/IAdaptable;
+ (Lorg/eclipse/swt/widgets/Shell;)L1org/eclipse/core/runtime/IAdaptable;
 getWorkspaceUndoContext
  ()Lorg/eclipse/core/commands/operations/IUndoContext;
  ()Lorg/eclipse/core/commands/operations/IUndoContext;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/intro/config/IntroConfigurer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/intro/config/IntroConfigurer.eea
index 2216610fda..761cf14883 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/intro/config/IntroConfigurer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/intro/config/IntroConfigurer.eea
@@ -19,13 +19,13 @@ getGroupChildren
  (Ljava/lang/String;Ljava/lang/String;)[Lorg/eclipse/ui/intro/config/IntroElement;
 getLaunchBarShortcuts
  ()[Lorg/eclipse/ui/intro/config/IntroElement;
- ()[Lorg/eclipse/ui/intro/config/IntroElement;
+ ()[1Lorg/eclipse/ui/intro/config/IntroElement;
 getMixinStyle
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L0java/lang/String;
 getThemeProperty
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getVariable
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/intro/config/IntroURLFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/intro/config/IntroURLFactory.eea
index 0df971aa16..dcf10f8f10 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/intro/config/IntroURLFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/intro/config/IntroURLFactory.eea
@@ -2,4 +2,4 @@ class org/eclipse/ui/intro/config/IntroURLFactory
 
 createIntroURL
  (Ljava/lang/String;)Lorg/eclipse/ui/intro/config/IIntroURL;
- (Ljava/lang/String;)Lorg/eclipse/ui/intro/config/IIntroURL;
+ (Ljava/lang/String;)L0org/eclipse/ui/intro/config/IIntroURL;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/keys/CharacterKey.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/keys/CharacterKey.eea
index 88bdbfbe9a..530d10cab0 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/keys/CharacterKey.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/keys/CharacterKey.eea
@@ -33,4 +33,4 @@ VT
 
 getInstance
  (C)Lorg/eclipse/ui/keys/CharacterKey;
- (C)Lorg/eclipse/ui/keys/CharacterKey;
+ (C)L1org/eclipse/ui/keys/CharacterKey;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/keys/KeySequence.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/keys/KeySequence.eea
index 53591c356b..7a42a286d7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/keys/KeySequence.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/keys/KeySequence.eea
@@ -12,22 +12,22 @@ getInstance
  ()Lorg/eclipse/ui/keys/KeySequence;
 getInstance
  (Ljava/lang/String;)Lorg/eclipse/ui/keys/KeySequence;
- (Ljava/lang/String;)Lorg/eclipse/ui/keys/KeySequence;
+ (Ljava/lang/String;)L1org/eclipse/ui/keys/KeySequence;
 getInstance
  (Ljava/util/List;)Lorg/eclipse/ui/keys/KeySequence;
- (Ljava/util/List;)Lorg/eclipse/ui/keys/KeySequence;
+ (Ljava/util/List;)L1org/eclipse/ui/keys/KeySequence;
 getInstance
  (Lorg/eclipse/jface/bindings/keys/KeySequence;)Lorg/eclipse/ui/keys/KeySequence;
- (Lorg/eclipse/jface/bindings/keys/KeySequence;)Lorg/eclipse/ui/keys/KeySequence;
+ (Lorg/eclipse/jface/bindings/keys/KeySequence;)L1org/eclipse/ui/keys/KeySequence;
 getInstance
  (Lorg/eclipse/ui/keys/KeySequence;Lorg/eclipse/ui/keys/KeyStroke;)Lorg/eclipse/ui/keys/KeySequence;
- (Lorg/eclipse/ui/keys/KeySequence;Lorg/eclipse/ui/keys/KeyStroke;)Lorg/eclipse/ui/keys/KeySequence;
+ (Lorg/eclipse/ui/keys/KeySequence;Lorg/eclipse/ui/keys/KeyStroke;)L1org/eclipse/ui/keys/KeySequence;
 getInstance
  (Lorg/eclipse/ui/keys/KeyStroke;)Lorg/eclipse/ui/keys/KeySequence;
- (Lorg/eclipse/ui/keys/KeyStroke;)Lorg/eclipse/ui/keys/KeySequence;
+ (Lorg/eclipse/ui/keys/KeyStroke;)L1org/eclipse/ui/keys/KeySequence;
 getInstance
  ([Lorg/eclipse/ui/keys/KeyStroke;)Lorg/eclipse/ui/keys/KeySequence;
- ([Lorg/eclipse/ui/keys/KeyStroke;)Lorg/eclipse/ui/keys/KeySequence;
+ ([Lorg/eclipse/ui/keys/KeyStroke;)L1org/eclipse/ui/keys/KeySequence;
 
 compareTo
  (Ljava/lang/Object;)I
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/keys/KeyStroke.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/keys/KeyStroke.eea
index 0555cd5efd..fda83bd095 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/keys/KeyStroke.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/keys/KeyStroke.eea
@@ -9,19 +9,19 @@ KEY_DELIMITERS
 
 getInstance
  (Ljava/lang/String;)Lorg/eclipse/ui/keys/KeyStroke;
- (Ljava/lang/String;)Lorg/eclipse/ui/keys/KeyStroke;
+ (Ljava/lang/String;)L1org/eclipse/ui/keys/KeyStroke;
 getInstance
  (Ljava/util/SortedSet;Lorg/eclipse/ui/keys/NaturalKey;)Lorg/eclipse/ui/keys/KeyStroke;
- (Ljava/util/SortedSet;Lorg/eclipse/ui/keys/NaturalKey;)Lorg/eclipse/ui/keys/KeyStroke;
+ (Ljava/util/SortedSet;Lorg/eclipse/ui/keys/NaturalKey;)L1org/eclipse/ui/keys/KeyStroke;
 getInstance
  (Lorg/eclipse/ui/keys/ModifierKey;Lorg/eclipse/ui/keys/NaturalKey;)Lorg/eclipse/ui/keys/KeyStroke;
- (Lorg/eclipse/ui/keys/ModifierKey;Lorg/eclipse/ui/keys/NaturalKey;)Lorg/eclipse/ui/keys/KeyStroke;
+ (Lorg/eclipse/ui/keys/ModifierKey;Lorg/eclipse/ui/keys/NaturalKey;)L1org/eclipse/ui/keys/KeyStroke;
 getInstance
  (Lorg/eclipse/ui/keys/NaturalKey;)Lorg/eclipse/ui/keys/KeyStroke;
- (Lorg/eclipse/ui/keys/NaturalKey;)Lorg/eclipse/ui/keys/KeyStroke;
+ (Lorg/eclipse/ui/keys/NaturalKey;)L1org/eclipse/ui/keys/KeyStroke;
 getInstance
  ([Lorg/eclipse/ui/keys/ModifierKey;Lorg/eclipse/ui/keys/NaturalKey;)Lorg/eclipse/ui/keys/KeyStroke;
- ([Lorg/eclipse/ui/keys/ModifierKey;Lorg/eclipse/ui/keys/NaturalKey;)Lorg/eclipse/ui/keys/KeyStroke;
+ ([Lorg/eclipse/ui/keys/ModifierKey;Lorg/eclipse/ui/keys/NaturalKey;)L1org/eclipse/ui/keys/KeyStroke;
 
 compareTo
  (Ljava/lang/Object;)I
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/menus/AbstractWorkbenchTrimWidget.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/menus/AbstractWorkbenchTrimWidget.eea
index 04f6ac8715..2d8a6f9166 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/menus/AbstractWorkbenchTrimWidget.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/menus/AbstractWorkbenchTrimWidget.eea
@@ -2,7 +2,7 @@ class org/eclipse/ui/menus/AbstractWorkbenchTrimWidget
 
 getPreferredSize
  ()Lorg/eclipse/swt/graphics/Point;
- ()Lorg/eclipse/swt/graphics/Point;
+ ()L0org/eclipse/swt/graphics/Point;
 getWorkbenchWindow
  ()Lorg/eclipse/ui/IWorkbenchWindow;
  ()Lorg/eclipse/ui/IWorkbenchWindow;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/menus/MenuUtil.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/menus/MenuUtil.eea
index 41cd035194..924d35abdd 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/menus/MenuUtil.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/menus/MenuUtil.eea
@@ -45,16 +45,16 @@ menuAddition
  (Ljava/lang/String;)Ljava/lang/String;
 menuAddition
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 menuUri
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 toolbarAddition
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
 toolbarAddition
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 toolbarUri
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/model/WorkbenchAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/model/WorkbenchAdapter.eea
index cca74ad737..3583dc05ee 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/model/WorkbenchAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/model/WorkbenchAdapter.eea
@@ -6,25 +6,25 @@ NO_CHILDREN
 
 getBackground
  (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/RGB;
- (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/RGB;
+ (Ljava/lang/Object;)L0org/eclipse/swt/graphics/RGB;
 getChildren
  (Ljava/lang/Object;)[Ljava/lang/Object;
  (Ljava/lang/Object;)[Ljava/lang/Object;
 getFont
  (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/FontData;
- (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/FontData;
+ (Ljava/lang/Object;)L0org/eclipse/swt/graphics/FontData;
 getForeground
  (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/RGB;
- (Ljava/lang/Object;)Lorg/eclipse/swt/graphics/RGB;
+ (Ljava/lang/Object;)L0org/eclipse/swt/graphics/RGB;
 getImageDescriptor
  (Ljava/lang/Object;)Lorg/eclipse/jface/resource/ImageDescriptor;
- (Ljava/lang/Object;)Lorg/eclipse/jface/resource/ImageDescriptor;
+ (Ljava/lang/Object;)L0org/eclipse/jface/resource/ImageDescriptor;
 getLabel
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
 getParent
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L0java/lang/Object;
 getStyledText
  (Ljava/lang/Object;)Lorg/eclipse/jface/viewers/StyledString;
- (Ljava/lang/Object;)Lorg/eclipse/jface/viewers/StyledString;
+ (Ljava/lang/Object;)L1org/eclipse/jface/viewers/StyledString;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/model/WorkbenchLabelProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/model/WorkbenchLabelProvider.eea
index 1061189ac2..f0bc1769b7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/model/WorkbenchLabelProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/model/WorkbenchLabelProvider.eea
@@ -2,7 +2,7 @@ class org/eclipse/ui/model/WorkbenchLabelProvider
 
 getDecoratingWorkbenchLabelProvider
  ()Lorg/eclipse/jface/viewers/ILabelProvider;
- ()Lorg/eclipse/jface/viewers/ILabelProvider;
+ ()L1org/eclipse/jface/viewers/ILabelProvider;
 
 decorateImage
  (Lorg/eclipse/jface/resource/ImageDescriptor;Ljava/lang/Object;)Lorg/eclipse/jface/resource/ImageDescriptor;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/CommonDropAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/CommonDropAdapter.eea
index 824f34efee..6aa0f4dcb0 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/CommonDropAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/CommonDropAdapter.eea
@@ -11,7 +11,7 @@ dragLeave
  (L1org/eclipse/swt/dnd/DropTargetEvent;)V # @Inherited(org.eclipse.swt.dnd.DropTargetAdapter)
 getBounds
  (Lorg/eclipse/swt/widgets/Item;)Lorg/eclipse/swt/graphics/Rectangle;
- (Lorg/eclipse/swt/widgets/Item;)Lorg/eclipse/swt/graphics/Rectangle;
+ (Lorg/eclipse/swt/widgets/Item;)L0org/eclipse/swt/graphics/Rectangle; # @Inherited(org.eclipse.jface.viewers.ViewerDropAdapter)
 getCurrentTarget
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/CommonNavigator.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/CommonNavigator.eea
index 35d7345957..e4a3b6c90b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/CommonNavigator.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/CommonNavigator.eea
@@ -6,16 +6,16 @@ memento
 
 createCommonActionGroup
  ()Lorg/eclipse/ui/actions/ActionGroup;
- ()Lorg/eclipse/ui/actions/ActionGroup;
+ ()L1org/eclipse/ui/actions/ActionGroup;
 createCommonManager
  ()Lorg/eclipse/ui/navigator/CommonNavigatorManager;
- ()Lorg/eclipse/ui/navigator/CommonNavigatorManager;
+ ()L1org/eclipse/ui/navigator/CommonNavigatorManager;
 createCommonViewer
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/ui/navigator/CommonViewer;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/ui/navigator/CommonViewer;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/ui/navigator/CommonViewer;
 createCommonViewerObject
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/ui/navigator/CommonViewer;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/ui/navigator/CommonViewer;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/ui/navigator/CommonViewer;
 createPartControl
  (Lorg/eclipse/swt/widgets/Composite;)V
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.ui.part.WorkbenchPart)
@@ -24,7 +24,7 @@ doSave
  (Lorg/eclipse/core/runtime/IProgressMonitor;)V
 getActiveSaveables
  ()[Lorg/eclipse/ui/Saveable;
- ()[Lorg/eclipse/ui/Saveable;
+ ()[1Lorg/eclipse/ui/Saveable;
 getAdapter
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
  <T:Ljava/lang/Object;>(L1java/lang/Class<TT;>;)T0T; # @Inherited(org.eclipse.ui.part.WorkbenchPart)
@@ -51,10 +51,10 @@ getNavigatorContentService
  ()Lorg/eclipse/ui/navigator/INavigatorContentService;
 getSaveables
  ()[Lorg/eclipse/ui/Saveable;
- ()[Lorg/eclipse/ui/Saveable;
+ ()[1Lorg/eclipse/ui/Saveable;
 getWorkingSetLabel
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 handleDoubleClick
  (Lorg/eclipse/jface/viewers/DoubleClickEvent;)V
  (Lorg/eclipse/jface/viewers/DoubleClickEvent;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/CommonViewer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/CommonViewer.eea
index 6d0a3714b5..6823c58732 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/CommonViewer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/CommonViewer.eea
@@ -8,10 +8,10 @@ add
  (Ljava/lang/Object;[Ljava/lang/Object;)V
 createDragAdapter
  ()Lorg/eclipse/ui/navigator/CommonDragAdapter;
- ()Lorg/eclipse/ui/navigator/CommonDragAdapter;
+ ()L1org/eclipse/ui/navigator/CommonDragAdapter;
 createDropAdapter
  ()Lorg/eclipse/ui/navigator/CommonDropAdapter;
- ()Lorg/eclipse/ui/navigator/CommonDropAdapter;
+ ()L1org/eclipse/ui/navigator/CommonDropAdapter;
 doUpdateItem
  (Lorg/eclipse/swt/widgets/Widget;)V
  (Lorg/eclipse/swt/widgets/Widget;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/CommonViewerSiteFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/CommonViewerSiteFactory.eea
index a52208dc1b..f8b71eb00a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/CommonViewerSiteFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/CommonViewerSiteFactory.eea
@@ -2,13 +2,13 @@ class org/eclipse/ui/navigator/CommonViewerSiteFactory
 
 createCommonViewerSite
  (Ljava/lang/String;Lorg/eclipse/jface/viewers/ISelectionProvider;Lorg/eclipse/swt/widgets/Shell;)Lorg/eclipse/ui/navigator/ICommonViewerSite;
- (Ljava/lang/String;Lorg/eclipse/jface/viewers/ISelectionProvider;Lorg/eclipse/swt/widgets/Shell;)Lorg/eclipse/ui/navigator/ICommonViewerSite;
+ (Ljava/lang/String;Lorg/eclipse/jface/viewers/ISelectionProvider;Lorg/eclipse/swt/widgets/Shell;)L1org/eclipse/ui/navigator/ICommonViewerSite;
 createCommonViewerSite
  (Ljava/lang/String;Lorg/eclipse/ui/part/IPageSite;)Lorg/eclipse/ui/navigator/ICommonViewerSite;
- (Ljava/lang/String;Lorg/eclipse/ui/part/IPageSite;)Lorg/eclipse/ui/navigator/ICommonViewerSite;
+ (Ljava/lang/String;Lorg/eclipse/ui/part/IPageSite;)L1org/eclipse/ui/navigator/ICommonViewerSite;
 createCommonViewerSite
  (Lorg/eclipse/ui/IEditorSite;)Lorg/eclipse/ui/navigator/ICommonViewerWorkbenchSite;
- (Lorg/eclipse/ui/IEditorSite;)Lorg/eclipse/ui/navigator/ICommonViewerWorkbenchSite;
+ (Lorg/eclipse/ui/IEditorSite;)L1org/eclipse/ui/navigator/ICommonViewerWorkbenchSite;
 createCommonViewerSite
  (Lorg/eclipse/ui/IViewSite;)Lorg/eclipse/ui/navigator/ICommonViewerWorkbenchSite;
- (Lorg/eclipse/ui/IViewSite;)Lorg/eclipse/ui/navigator/ICommonViewerWorkbenchSite;
+ (Lorg/eclipse/ui/IViewSite;)L1org/eclipse/ui/navigator/ICommonViewerWorkbenchSite;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/INavigatorContentService.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/INavigatorContentService.eea
index 1aa62d6cc3..c14b21c7d4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/INavigatorContentService.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/INavigatorContentService.eea
@@ -8,13 +8,13 @@ bindExtensions
  ([Ljava/lang/String;Z)[Lorg/eclipse/ui/navigator/INavigatorContentDescriptor;
 createCommonContentProvider
  ()Lorg/eclipse/jface/viewers/ITreeContentProvider;
- ()Lorg/eclipse/jface/viewers/ITreeContentProvider;
+ ()L1org/eclipse/jface/viewers/ITreeContentProvider;
 createCommonDescriptionProvider
  ()Lorg/eclipse/ui/navigator/IDescriptionProvider;
- ()Lorg/eclipse/ui/navigator/IDescriptionProvider;
+ ()L1org/eclipse/ui/navigator/IDescriptionProvider;
 createCommonLabelProvider
  ()Lorg/eclipse/jface/viewers/ILabelProvider;
- ()Lorg/eclipse/jface/viewers/ILabelProvider;
+ ()L1org/eclipse/jface/viewers/ILabelProvider;
 findContentExtensionsByTriggerPoint
  (Ljava/lang/Object;)Ljava/util/Set;
  (Ljava/lang/Object;)Ljava/util/Set;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/NavigatorContentServiceFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/NavigatorContentServiceFactory.eea
index e6c420fa25..6d11a06185 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/NavigatorContentServiceFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/NavigatorContentServiceFactory.eea
@@ -6,7 +6,7 @@ INSTANCE
 
 createContentService
  (Ljava/lang/String;)Lorg/eclipse/ui/navigator/INavigatorContentService;
- (Ljava/lang/String;)Lorg/eclipse/ui/navigator/INavigatorContentService;
+ (Ljava/lang/String;)L1org/eclipse/ui/navigator/INavigatorContentService;
 createContentService
  (Ljava/lang/String;Lorg/eclipse/jface/viewers/StructuredViewer;)Lorg/eclipse/ui/navigator/INavigatorContentService;
- (Ljava/lang/String;Lorg/eclipse/jface/viewers/StructuredViewer;)Lorg/eclipse/ui/navigator/INavigatorContentService;
+ (Ljava/lang/String;Lorg/eclipse/jface/viewers/StructuredViewer;)L1org/eclipse/ui/navigator/INavigatorContentService;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/WizardActionGroup.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/WizardActionGroup.eea
index 8cd85441ea..0dd41e6fa0 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/WizardActionGroup.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/WizardActionGroup.eea
@@ -24,13 +24,13 @@ fillContextMenu
  (Lorg/eclipse/jface/action/IMenuManager;)V
 getAction
  (Ljava/lang/String;)Lorg/eclipse/jface/action/IAction;
- (Ljava/lang/String;)Lorg/eclipse/jface/action/IAction;
+ (Ljava/lang/String;)L0org/eclipse/jface/action/IAction;
 getActions
  ()Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/jface/action/IAction;>;
  ()Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/jface/action/IAction;>;
 getDescriptor
  (Ljava/lang/String;)Lorg/eclipse/ui/wizards/IWizardDescriptor;
- (Ljava/lang/String;)Lorg/eclipse/ui/wizards/IWizardDescriptor;
+ (Ljava/lang/String;)L0org/eclipse/ui/wizards/IWizardDescriptor;
 getWizardActionIds
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/resources/ProjectExplorer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/resources/ProjectExplorer.eea
index d4d1a7da8e..5952b810dc 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/resources/ProjectExplorer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/navigator/resources/ProjectExplorer.eea
@@ -6,25 +6,25 @@ VIEW_ID
 
 createCommonActionGroup
  ()Lorg/eclipse/ui/actions/ActionGroup;
- ()Lorg/eclipse/ui/actions/ActionGroup;
+ ()L1org/eclipse/ui/actions/ActionGroup; # @Inherited(org.eclipse.ui.navigator.CommonNavigator)
 createCommonViewer
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/ui/navigator/CommonViewer;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/ui/navigator/CommonViewer;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/ui/navigator/CommonViewer; # @Inherited(org.eclipse.ui.navigator.CommonNavigator)
 createPartControl
  (Lorg/eclipse/swt/widgets/Composite;)V
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.ui.navigator.CommonNavigator)
 getActiveSaveables
  ()[Lorg/eclipse/ui/Saveable;
- ()[Lorg/eclipse/ui/Saveable;
+ ()[1Lorg/eclipse/ui/Saveable; # @Inherited(org.eclipse.ui.navigator.CommonNavigator)
 getFrameToolTipText
  (Ljava/lang/Object;)Ljava/lang/String;
  (Ljava/lang/Object;)Ljava/lang/String;
 getSaveables
  ()[Lorg/eclipse/ui/Saveable;
- ()[Lorg/eclipse/ui/Saveable;
+ ()[1Lorg/eclipse/ui/Saveable; # @Inherited(org.eclipse.ui.navigator.CommonNavigator)
 getWorkingSetLabel
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(org.eclipse.ui.navigator.CommonNavigator)
 handleDoubleClick
  (Lorg/eclipse/jface/viewers/DoubleClickEvent;)V
  (Lorg/eclipse/jface/viewers/DoubleClickEvent;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/EditorInputTransfer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/EditorInputTransfer.eea
index e028b422f1..c0f49cb221 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/EditorInputTransfer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/EditorInputTransfer.eea
@@ -2,7 +2,7 @@ class org/eclipse/ui/part/EditorInputTransfer
 
 createEditorInputData
  (Ljava/lang/String;Lorg/eclipse/ui/IEditorInput;)Lorg/eclipse/ui/part/EditorInputTransfer$EditorInputData;
- (Ljava/lang/String;Lorg/eclipse/ui/IEditorInput;)Lorg/eclipse/ui/part/EditorInputTransfer$EditorInputData;
+ (Ljava/lang/String;Lorg/eclipse/ui/IEditorInput;)L1org/eclipse/ui/part/EditorInputTransfer$EditorInputData;
 getInstance
  ()Lorg/eclipse/ui/part/EditorInputTransfer;
  ()Lorg/eclipse/ui/part/EditorInputTransfer;
@@ -18,4 +18,4 @@ javaToNative
  (Ljava/lang/Object;Lorg/eclipse/swt/dnd/TransferData;)V
 nativeToJava
  (Lorg/eclipse/swt/dnd/TransferData;)Ljava/lang/Object;
- (Lorg/eclipse/swt/dnd/TransferData;)Ljava/lang/Object;
+ (Lorg/eclipse/swt/dnd/TransferData;)L0java/lang/Object; # @Inherited(org.eclipse.swt.dnd.ByteArrayTransfer)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/FileEditorInputFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/FileEditorInputFactory.eea
index 396de7e753..1cccea263d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/FileEditorInputFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/FileEditorInputFactory.eea
@@ -2,11 +2,11 @@ class org/eclipse/ui/part/FileEditorInputFactory
 
 getFactoryId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 saveState
  (Lorg/eclipse/ui/IMemento;Lorg/eclipse/ui/part/FileEditorInput;)V
  (Lorg/eclipse/ui/IMemento;Lorg/eclipse/ui/part/FileEditorInput;)V
 
 createElement
  (Lorg/eclipse/ui/IMemento;)Lorg/eclipse/core/runtime/IAdaptable;
- (Lorg/eclipse/ui/IMemento;)Lorg/eclipse/core/runtime/IAdaptable;
+ (Lorg/eclipse/ui/IMemento;)L0org/eclipse/core/runtime/IAdaptable; # @Overrides(org.eclipse.ui.IElementFactory)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/MarkerTransfer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/MarkerTransfer.eea
index 489eb34c50..43ba1d4fe6 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/MarkerTransfer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/MarkerTransfer.eea
@@ -15,4 +15,4 @@ javaToNative
  (Ljava/lang/Object;Lorg/eclipse/swt/dnd/TransferData;)V
 nativeToJava
  (Lorg/eclipse/swt/dnd/TransferData;)Ljava/lang/Object;
- (Lorg/eclipse/swt/dnd/TransferData;)Ljava/lang/Object;
+ (Lorg/eclipse/swt/dnd/TransferData;)L0java/lang/Object; # @Inherited(org.eclipse.swt.dnd.ByteArrayTransfer)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/MultiEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/MultiEditor.eea
index 1f28f961dd..67ecf7766c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/MultiEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/MultiEditor.eea
@@ -5,13 +5,13 @@ activateEditor
  (Lorg/eclipse/ui/IEditorPart;)V
 createInnerPartControl
  (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/ui/IEditorPart;)Lorg/eclipse/swt/widgets/Composite;
- (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/ui/IEditorPart;)Lorg/eclipse/swt/widgets/Composite;
+ (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/ui/IEditorPart;)L1org/eclipse/swt/widgets/Composite;
 drawGradient
  (Lorg/eclipse/ui/IEditorPart;Lorg/eclipse/ui/part/MultiEditor$Gradient;)V
  (Lorg/eclipse/ui/IEditorPart;Lorg/eclipse/ui/part/MultiEditor$Gradient;)V
 getInnerEditorContainer
  (Lorg/eclipse/ui/IEditorReference;)Lorg/eclipse/swt/widgets/Composite;
- (Lorg/eclipse/ui/IEditorReference;)Lorg/eclipse/swt/widgets/Composite;
+ (Lorg/eclipse/ui/IEditorReference;)L0org/eclipse/swt/widgets/Composite;
 updateGradient
  (Lorg/eclipse/ui/IEditorPart;)V
  (Lorg/eclipse/ui/IEditorPart;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/MultiPageEditorPart.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/MultiPageEditorPart.eea
index 07be55a5b1..68e34c7d29 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/MultiPageEditorPart.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/MultiPageEditorPart.eea
@@ -17,25 +17,25 @@ addPageChangedListener
  (L1org/eclipse/jface/dialogs/IPageChangedListener;)V # @Inherited(org.eclipse.jface.dialogs.IPageChangeProvider)
 createContainer
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/custom/CTabFolder;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/custom/CTabFolder;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/custom/CTabFolder;
 createItem
  (ILorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/custom/CTabItem;
- (ILorg/eclipse/swt/widgets/Control;)Lorg/eclipse/swt/custom/CTabItem;
+ (ILorg/eclipse/swt/widgets/Control;)L1org/eclipse/swt/custom/CTabItem;
 createPageContainer
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Composite;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Composite;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Composite;
 createPartControl
  (Lorg/eclipse/swt/widgets/Composite;)V
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.ui.part.WorkbenchPart)
 createSite
  (Lorg/eclipse/ui/IEditorPart;)Lorg/eclipse/ui/IEditorSite;
- (Lorg/eclipse/ui/IEditorPart;)Lorg/eclipse/ui/IEditorSite;
+ (Lorg/eclipse/ui/IEditorPart;)L1org/eclipse/ui/IEditorSite;
 findEditors
  (Lorg/eclipse/ui/IEditorInput;)[Lorg/eclipse/ui/IEditorPart;
  (Lorg/eclipse/ui/IEditorInput;)[Lorg/eclipse/ui/IEditorPart;
 getActiveEditor
  ()Lorg/eclipse/ui/IEditorPart;
- ()Lorg/eclipse/ui/IEditorPart;
+ ()L0org/eclipse/ui/IEditorPart;
 getAdapter
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
  <T:Ljava/lang/Object;>(L1java/lang/Class<TT;>;)T0T; # @Inherited(org.eclipse.ui.part.WorkbenchPart)
@@ -47,19 +47,19 @@ getControl
  (I)Lorg/eclipse/swt/widgets/Control;
 getEditor
  (I)Lorg/eclipse/ui/IEditorPart;
- (I)Lorg/eclipse/ui/IEditorPart;
+ (I)L0org/eclipse/ui/IEditorPart;
 getPageImage
  (I)Lorg/eclipse/swt/graphics/Image;
  (I)Lorg/eclipse/swt/graphics/Image;
 getPageSite
  (I)Lorg/eclipse/ui/services/IServiceLocator;
- (I)Lorg/eclipse/ui/services/IServiceLocator;
+ (I)L0org/eclipse/ui/services/IServiceLocator;
 getPageText
  (I)Ljava/lang/String;
  (I)Ljava/lang/String;
 getSelectedPage
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 init
  (Lorg/eclipse/ui/IEditorSite;Lorg/eclipse/ui/IEditorInput;)V
  (Lorg/eclipse/ui/IEditorSite;Lorg/eclipse/ui/IEditorInput;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/MultiPageEditorSite.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/MultiPageEditorSite.eea
index 0d7f052525..4ff5207132 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/MultiPageEditorSite.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/MultiPageEditorSite.eea
@@ -5,7 +5,7 @@ class org/eclipse/ui/part/MultiPageEditorSite
  (Lorg/eclipse/ui/part/MultiPageEditorPart;Lorg/eclipse/ui/IEditorPart;)V
 getActionBarContributor
  ()Lorg/eclipse/ui/IEditorActionBarContributor;
- ()Lorg/eclipse/ui/IEditorActionBarContributor;
+ ()L0org/eclipse/ui/IEditorActionBarContributor;
 getActionBars
  ()Lorg/eclipse/ui/IActionBars;
  ()Lorg/eclipse/ui/IActionBars;
@@ -20,7 +20,7 @@ getEditor
  ()Lorg/eclipse/ui/IEditorPart;
 getId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getKeyBindingService
  ()Lorg/eclipse/ui/IKeyBindingService;
  ()Lorg/eclipse/ui/IKeyBindingService;
@@ -38,10 +38,10 @@ getPart
  ()Lorg/eclipse/ui/IWorkbenchPart;
 getPluginId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getRegisteredName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSelectionProvider
  ()Lorg/eclipse/jface/viewers/ISelectionProvider;
  ()L0org/eclipse/jface/viewers/ISelectionProvider; # @Inherited(org.eclipse.ui.IWorkbenchSite)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/PageBookView.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/PageBookView.eea
index 6d7817c58e..cb7ca6f2e1 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/PageBookView.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/PageBookView.eea
@@ -2,7 +2,7 @@ class org/eclipse/ui/part/PageBookView
 
 createDefaultPage
  (Lorg/eclipse/ui/part/PageBook;)Lorg/eclipse/ui/part/IPage;
- (Lorg/eclipse/ui/part/PageBook;)Lorg/eclipse/ui/part/IPage;
+ (Lorg/eclipse/ui/part/PageBook;)L1org/eclipse/ui/part/IPage;
 createPartControl
  (Lorg/eclipse/swt/widgets/Composite;)V
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.ui.part.WorkbenchPart)
@@ -23,10 +23,10 @@ getBootstrapPart
  ()Lorg/eclipse/ui/IWorkbenchPart;
 getCurrentContributingPart
  ()Lorg/eclipse/ui/IWorkbenchPart;
- ()Lorg/eclipse/ui/IWorkbenchPart;
+ ()L0org/eclipse/ui/IWorkbenchPart;
 getCurrentPage
  ()Lorg/eclipse/ui/part/IPage;
- ()Lorg/eclipse/ui/part/IPage;
+ ()L0org/eclipse/ui/part/IPage;
 getDefaultPage
  ()Lorg/eclipse/ui/part/IPage;
  ()Lorg/eclipse/ui/part/IPage;
@@ -38,7 +38,7 @@ getPageRec
  (Lorg/eclipse/ui/IWorkbenchPart;)Lorg/eclipse/ui/part/PageBookView$PageRec;
 getPageRec
  (Lorg/eclipse/ui/part/IPage;)Lorg/eclipse/ui/part/PageBookView$PageRec;
- (Lorg/eclipse/ui/part/IPage;)Lorg/eclipse/ui/part/PageBookView$PageRec;
+ (Lorg/eclipse/ui/part/IPage;)L0org/eclipse/ui/part/PageBookView$PageRec;
 getPageSite
  (Lorg/eclipse/ui/part/IPage;)Lorg/eclipse/ui/part/PageSite;
  (Lorg/eclipse/ui/part/IPage;)Lorg/eclipse/ui/part/PageSite;
@@ -47,7 +47,7 @@ getSelectionProvider
  ()Lorg/eclipse/ui/part/PageBookView$SelectionProvider;
 getViewAdapter
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)T0T;
 init
  (Lorg/eclipse/ui/IViewSite;)V
  (Lorg/eclipse/ui/IViewSite;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/PluginDropAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/PluginDropAdapter.eea
index 512f5775fa..4fd7670049 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/PluginDropAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/PluginDropAdapter.eea
@@ -6,7 +6,7 @@ ATT_CLASS
 
 getPluginAdapter
  (Lorg/eclipse/ui/part/PluginTransferData;)Lorg/eclipse/ui/part/IDropActionDelegate;
- (Lorg/eclipse/ui/part/PluginTransferData;)Lorg/eclipse/ui/part/IDropActionDelegate;
+ (Lorg/eclipse/ui/part/PluginTransferData;)L0org/eclipse/ui/part/IDropActionDelegate;
 
 <init>
  (Lorg/eclipse/jface/viewers/StructuredViewer;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/PluginTransfer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/PluginTransfer.eea
index cab89b16e0..1171bf6ec7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/PluginTransfer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/PluginTransfer.eea
@@ -15,4 +15,4 @@ javaToNative
  (Ljava/lang/Object;Lorg/eclipse/swt/dnd/TransferData;)V
 nativeToJava
  (Lorg/eclipse/swt/dnd/TransferData;)Ljava/lang/Object;
- (Lorg/eclipse/swt/dnd/TransferData;)Ljava/lang/Object;
+ (Lorg/eclipse/swt/dnd/TransferData;)L0java/lang/Object; # @Inherited(org.eclipse.swt.dnd.ByteArrayTransfer)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/ResourceTransfer.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/ResourceTransfer.eea
index 22cc0e15a6..2c706e1033 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/ResourceTransfer.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/part/ResourceTransfer.eea
@@ -15,4 +15,4 @@ javaToNative
  (Ljava/lang/Object;Lorg/eclipse/swt/dnd/TransferData;)V
 nativeToJava
  (Lorg/eclipse/swt/dnd/TransferData;)Ljava/lang/Object;
- (Lorg/eclipse/swt/dnd/TransferData;)Ljava/lang/Object;
+ (Lorg/eclipse/swt/dnd/TransferData;)L0java/lang/Object; # @Inherited(org.eclipse.swt.dnd.ByteArrayTransfer)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/preferences/WizardPropertyPage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/preferences/WizardPropertyPage.eea
index b9da348b5f..29615a056a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/preferences/WizardPropertyPage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/preferences/WizardPropertyPage.eea
@@ -5,7 +5,7 @@ createContents
  (L1org/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.jface.preference.PreferencePage)
 createWizard
  ()Lorg/eclipse/jface/wizard/IWizard;
- ()Lorg/eclipse/jface/wizard/IWizard;
+ ()L1org/eclipse/jface/wizard/IWizard;
 getWizard
  ()Lorg/eclipse/jface/wizard/IWizard;
  ()Lorg/eclipse/jface/wizard/IWizard;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/preferences/WorkingCopyManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/preferences/WorkingCopyManager.eea
index 0f32ec83ab..3588733871 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/preferences/WorkingCopyManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/preferences/WorkingCopyManager.eea
@@ -2,4 +2,4 @@ class org/eclipse/ui/preferences/WorkingCopyManager
 
 getWorkingCopy
  (Lorg/eclipse/core/runtime/preferences/IEclipsePreferences;)Lorg/eclipse/core/runtime/preferences/IEclipsePreferences;
- (Lorg/eclipse/core/runtime/preferences/IEclipsePreferences;)Lorg/eclipse/core/runtime/preferences/IEclipsePreferences;
+ (Lorg/eclipse/core/runtime/preferences/IEclipsePreferences;)L1org/eclipse/core/runtime/preferences/IEclipsePreferences;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/progress/DeferredTreeContentManager.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/progress/DeferredTreeContentManager.eea
index d9b170e1bc..959343289a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/progress/DeferredTreeContentManager.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/progress/DeferredTreeContentManager.eea
@@ -23,16 +23,16 @@ cancel
  (Ljava/lang/Object;)V
 createElementCollector
  (Ljava/lang/Object;Lorg/eclipse/ui/progress/PendingUpdateAdapter;)Lorg/eclipse/ui/progress/IElementCollector;
- (Ljava/lang/Object;Lorg/eclipse/ui/progress/PendingUpdateAdapter;)Lorg/eclipse/ui/progress/IElementCollector;
+ (Ljava/lang/Object;Lorg/eclipse/ui/progress/PendingUpdateAdapter;)L1org/eclipse/ui/progress/IElementCollector;
 createPendingUpdateAdapter
  ()Lorg/eclipse/ui/progress/PendingUpdateAdapter;
- ()Lorg/eclipse/ui/progress/PendingUpdateAdapter;
+ ()L1org/eclipse/ui/progress/PendingUpdateAdapter;
 getAdapter
  (Ljava/lang/Object;)Lorg/eclipse/ui/progress/IDeferredWorkbenchAdapter;
  (Ljava/lang/Object;)Lorg/eclipse/ui/progress/IDeferredWorkbenchAdapter;
 getChildren
  (Ljava/lang/Object;)[Ljava/lang/Object;
- (Ljava/lang/Object;)[Ljava/lang/Object;
+ (Ljava/lang/Object;)[0Ljava/lang/Object;
 getFetchJobName
  (Ljava/lang/Object;Lorg/eclipse/ui/progress/IDeferredWorkbenchAdapter;)Ljava/lang/String;
  (Ljava/lang/Object;Lorg/eclipse/ui/progress/IDeferredWorkbenchAdapter;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/progress/PendingUpdateAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/progress/PendingUpdateAdapter.eea
index dc7c235e10..f7563b522c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/progress/PendingUpdateAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/progress/PendingUpdateAdapter.eea
@@ -5,16 +5,16 @@ getAdapter
  <T:Ljava/lang/Object;>(L1java/lang/Class<TT;>;)T0T; # @Inherited(org.eclipse.core.runtime.IAdaptable)
 getChildren
  (Ljava/lang/Object;)[Ljava/lang/Object;
- (Ljava/lang/Object;)[Ljava/lang/Object;
+ (Ljava/lang/Object;)[1Ljava/lang/Object;
 getImageDescriptor
  (Ljava/lang/Object;)Lorg/eclipse/jface/resource/ImageDescriptor;
- (Ljava/lang/Object;)Lorg/eclipse/jface/resource/ImageDescriptor;
+ (Ljava/lang/Object;)L0org/eclipse/jface/resource/ImageDescriptor;
 getLabel
  (Ljava/lang/Object;)Ljava/lang/String;
  (Ljava/lang/Object;)Ljava/lang/String;
 getParent
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L0java/lang/Object;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/services/AbstractServiceFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/services/AbstractServiceFactory.eea
index b9fabbe87a..36e437e6db 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/services/AbstractServiceFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/services/AbstractServiceFactory.eea
@@ -2,4 +2,4 @@ class org/eclipse/ui/services/AbstractServiceFactory
 
 create
  (Ljava/lang/Class;Lorg/eclipse/ui/services/IServiceLocator;Lorg/eclipse/ui/services/IServiceLocator;)Ljava/lang/Object;
- (Ljava/lang/Class;Lorg/eclipse/ui/services/IServiceLocator;Lorg/eclipse/ui/services/IServiceLocator;)Ljava/lang/Object;
+ (Ljava/lang/Class;Lorg/eclipse/ui/services/IServiceLocator;Lorg/eclipse/ui/services/IServiceLocator;)L1java/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/splash/AbstractSplashHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/splash/AbstractSplashHandler.eea
index 400cad92d0..de3ac5f985 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/splash/AbstractSplashHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/splash/AbstractSplashHandler.eea
@@ -2,7 +2,7 @@ class org/eclipse/ui/splash/AbstractSplashHandler
 
 getBundleProgressMonitor
  ()Lorg/eclipse/core/runtime/IProgressMonitor;
- ()Lorg/eclipse/core/runtime/IProgressMonitor;
+ ()L1org/eclipse/core/runtime/IProgressMonitor;
 getSplash
  ()Lorg/eclipse/swt/widgets/Shell;
  ()Lorg/eclipse/swt/widgets/Shell;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/splash/BasicSplashHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/splash/BasicSplashHandler.eea
index ca04b047d8..f6390014ab 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/splash/BasicSplashHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/splash/BasicSplashHandler.eea
@@ -2,7 +2,7 @@ class org/eclipse/ui/splash/BasicSplashHandler
 
 getBundleProgressMonitor
  ()Lorg/eclipse/core/runtime/IProgressMonitor;
- ()Lorg/eclipse/core/runtime/IProgressMonitor;
+ ()L1org/eclipse/core/runtime/IProgressMonitor; # @Inherited(org.eclipse.ui.splash.AbstractSplashHandler)
 getContent
  ()Lorg/eclipse/swt/widgets/Composite;
  ()Lorg/eclipse/swt/widgets/Composite;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/statushandlers/AbstractStatusAreaProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/statushandlers/AbstractStatusAreaProvider.eea
index d71a4cdb1a..cbcba05501 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/statushandlers/AbstractStatusAreaProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/statushandlers/AbstractStatusAreaProvider.eea
@@ -2,10 +2,10 @@ class org/eclipse/ui/statushandlers/AbstractStatusAreaProvider
 
 createSupportArea
  (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/core/runtime/IStatus;)Lorg/eclipse/swt/widgets/Control;
- (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/core/runtime/IStatus;)Lorg/eclipse/swt/widgets/Control;
+ (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/core/runtime/IStatus;)L1org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.jface.dialogs.ErrorSupportProvider)
 createSupportArea
  (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/ui/statushandlers/StatusAdapter;)Lorg/eclipse/swt/widgets/Control;
- (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/ui/statushandlers/StatusAdapter;)Lorg/eclipse/swt/widgets/Control;
+ (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/ui/statushandlers/StatusAdapter;)L1org/eclipse/swt/widgets/Control;
 validFor
  (Lorg/eclipse/ui/statushandlers/StatusAdapter;)Z
  (Lorg/eclipse/ui/statushandlers/StatusAdapter;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/statushandlers/AbstractStatusHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/statushandlers/AbstractStatusHandler.eea
index aea6602a25..7df0496950 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/statushandlers/AbstractStatusHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/statushandlers/AbstractStatusHandler.eea
@@ -5,7 +5,7 @@ getId
  ()Ljava/lang/String;
 getParam
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L0java/lang/Object;
 getParams
  ()Ljava/util/Map;
  ()Ljava/util/Map;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/statushandlers/StatusAdapter.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/statushandlers/StatusAdapter.eea
index 3f259f6e9d..229b61234a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/statushandlers/StatusAdapter.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/statushandlers/StatusAdapter.eea
@@ -18,7 +18,7 @@ getAdapter
  <T:Ljava/lang/Object;>(L1java/lang/Class<TT;>;)T0T; # @Inherited(org.eclipse.core.runtime.IAdaptable)
 getProperty
  (Lorg/eclipse/core/runtime/QualifiedName;)Ljava/lang/Object;
- (Lorg/eclipse/core/runtime/QualifiedName;)Ljava/lang/Object;
+ (Lorg/eclipse/core/runtime/QualifiedName;)L0java/lang/Object;
 getStatus
  ()Lorg/eclipse/core/runtime/IStatus;
  ()Lorg/eclipse/core/runtime/IStatus;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.eea
index 65aca3134b..dbae78aef2 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.eea
@@ -31,46 +31,46 @@ configureSourceViewerDecorationSupport
  (Lorg/eclipse/ui/texteditor/SourceViewerDecorationSupport;)V
 createAnnotationAccess
  ()Lorg/eclipse/jface/text/source/IAnnotationAccess;
- ()Lorg/eclipse/jface/text/source/IAnnotationAccess;
+ ()L1org/eclipse/jface/text/source/IAnnotationAccess;
 createAnnotationRulerColumn
  (Lorg/eclipse/jface/text/source/CompositeRuler;)Lorg/eclipse/jface/text/source/IVerticalRulerColumn;
  (L1org/eclipse/jface/text/source/CompositeRuler;)Lorg/eclipse/jface/text/source/IVerticalRulerColumn;
 createChangeHover
  ()Lorg/eclipse/jface/text/source/LineChangeHover;
- ()Lorg/eclipse/jface/text/source/LineChangeHover;
+ ()L1org/eclipse/jface/text/source/LineChangeHover;
 createChangeRulerColumn
  ()Lorg/eclipse/jface/text/source/IChangeRulerColumn;
- ()Lorg/eclipse/jface/text/source/IChangeRulerColumn;
+ ()L1org/eclipse/jface/text/source/IChangeRulerColumn;
 createColumnSupport
  ()Lorg/eclipse/ui/texteditor/rulers/IColumnSupport;
- ()Lorg/eclipse/ui/texteditor/rulers/IColumnSupport;
+ ()L1org/eclipse/ui/texteditor/rulers/IColumnSupport; # @Overrides(org.eclipse.ui.texteditor.AbstractTextEditor)
 createCompositeRuler
  ()Lorg/eclipse/jface/text/source/CompositeRuler;
- ()Lorg/eclipse/jface/text/source/CompositeRuler;
+ ()L1org/eclipse/jface/text/source/CompositeRuler;
 createContextMenuListener
  ()Lorg/eclipse/jface/action/IMenuListener;
- ()Lorg/eclipse/jface/action/IMenuListener;
+ ()L1org/eclipse/jface/action/IMenuListener; # @Inherited(org.eclipse.ui.texteditor.AbstractTextEditor)
 createLineNumberRulerColumn
  ()Lorg/eclipse/jface/text/source/IVerticalRulerColumn;
- ()Lorg/eclipse/jface/text/source/IVerticalRulerColumn;
+ ()L1org/eclipse/jface/text/source/IVerticalRulerColumn;
 createOverviewRuler
  (Lorg/eclipse/jface/text/source/ISharedTextColors;)Lorg/eclipse/jface/text/source/IOverviewRuler;
- (Lorg/eclipse/jface/text/source/ISharedTextColors;)Lorg/eclipse/jface/text/source/IOverviewRuler;
+ (Lorg/eclipse/jface/text/source/ISharedTextColors;)L1org/eclipse/jface/text/source/IOverviewRuler;
 createPartControl
  (Lorg/eclipse/swt/widgets/Composite;)V
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.ui.texteditor.StatusTextEditor)
 createShowInTargetList
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 createSourceViewer
  (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/jface/text/source/IVerticalRuler;I)Lorg/eclipse/jface/text/source/ISourceViewer;
- (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/jface/text/source/IVerticalRuler;I)Lorg/eclipse/jface/text/source/ISourceViewer;
+ (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/jface/text/source/IVerticalRuler;I)L1org/eclipse/jface/text/source/ISourceViewer; # @Inherited(org.eclipse.ui.texteditor.AbstractTextEditor)
 createStatusControl
  (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/core/runtime/IStatus;)Lorg/eclipse/swt/widgets/Control;
- (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/core/runtime/IStatus;)Lorg/eclipse/swt/widgets/Control;
+ (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/core/runtime/IStatus;)L1org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.ui.texteditor.StatusTextEditor)
 createVerticalRuler
  ()Lorg/eclipse/jface/text/source/IVerticalRuler;
- ()Lorg/eclipse/jface/text/source/IVerticalRuler;
+ ()L1org/eclipse/jface/text/source/IVerticalRuler; # @Inherited(org.eclipse.ui.texteditor.AbstractTextEditor)
 doSetInput
  (Lorg/eclipse/ui/IEditorInput;)V
  (Lorg/eclipse/ui/IEditorInput;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AbstractDocumentProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AbstractDocumentProvider.eea
index 7c4f919574..b6e5230d83 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AbstractDocumentProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AbstractDocumentProvider.eea
@@ -27,13 +27,13 @@ connect
  (Ljava/lang/Object;)V
 createAnnotationModel
  (Ljava/lang/Object;)Lorg/eclipse/jface/text/source/IAnnotationModel;
- (Ljava/lang/Object;)Lorg/eclipse/jface/text/source/IAnnotationModel;
+ (Ljava/lang/Object;)L1org/eclipse/jface/text/source/IAnnotationModel;
 createDocument
  (Ljava/lang/Object;)Lorg/eclipse/jface/text/IDocument;
- (Ljava/lang/Object;)Lorg/eclipse/jface/text/IDocument;
+ (Ljava/lang/Object;)L1org/eclipse/jface/text/IDocument;
 createElementInfo
  (Ljava/lang/Object;)Lorg/eclipse/ui/texteditor/AbstractDocumentProvider$ElementInfo;
- (Ljava/lang/Object;)Lorg/eclipse/ui/texteditor/AbstractDocumentProvider$ElementInfo;
+ (Ljava/lang/Object;)L1org/eclipse/ui/texteditor/AbstractDocumentProvider$ElementInfo;
 disconnect
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
@@ -84,16 +84,16 @@ fireElementStateValidationChanged
  (Ljava/lang/Object;Z)V
 getAnnotationModel
  (Ljava/lang/Object;)Lorg/eclipse/jface/text/source/IAnnotationModel;
- (Ljava/lang/Object;)Lorg/eclipse/jface/text/source/IAnnotationModel;
+ (Ljava/lang/Object;)L0org/eclipse/jface/text/source/IAnnotationModel;
 getConnectedElements
  ()Ljava/util/Iterator<Ljava/lang/Object;>;
  ()Ljava/util/Iterator<Ljava/lang/Object;>;
 getContentType
  (Ljava/lang/Object;)Lorg/eclipse/core/runtime/content/IContentType;
- (Ljava/lang/Object;)Lorg/eclipse/core/runtime/content/IContentType;
+ (Ljava/lang/Object;)L0org/eclipse/core/runtime/content/IContentType;
 getDocument
  (Ljava/lang/Object;)Lorg/eclipse/jface/text/IDocument;
- (Ljava/lang/Object;)Lorg/eclipse/jface/text/IDocument;
+ (Ljava/lang/Object;)L0org/eclipse/jface/text/IDocument;
 getElementInfo
  (Ljava/lang/Object;)Lorg/eclipse/ui/texteditor/AbstractDocumentProvider$ElementInfo;
  (Ljava/lang/Object;)Lorg/eclipse/ui/texteditor/AbstractDocumentProvider$ElementInfo;
@@ -108,10 +108,10 @@ getProgressMonitor
  ()Lorg/eclipse/core/runtime/IProgressMonitor;
 getResetRule
  (Ljava/lang/Object;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
- (Ljava/lang/Object;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
+ (Ljava/lang/Object;)L0org/eclipse/core/runtime/jobs/ISchedulingRule;
 getSaveRule
  (Ljava/lang/Object;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
- (Ljava/lang/Object;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
+ (Ljava/lang/Object;)L0org/eclipse/core/runtime/jobs/ISchedulingRule;
 getStatus
  (Ljava/lang/Object;)Lorg/eclipse/core/runtime/IStatus;
  (Ljava/lang/Object;)Lorg/eclipse/core/runtime/IStatus;
@@ -120,10 +120,10 @@ getSynchronizationStamp
  (Ljava/lang/Object;)J
 getSynchronizeRule
  (Ljava/lang/Object;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
- (Ljava/lang/Object;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
+ (Ljava/lang/Object;)L0org/eclipse/core/runtime/jobs/ISchedulingRule;
 getValidateStateRule
  (Ljava/lang/Object;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
- (Ljava/lang/Object;)Lorg/eclipse/core/runtime/jobs/ISchedulingRule;
+ (Ljava/lang/Object;)L0org/eclipse/core/runtime/jobs/ISchedulingRule;
 invalidatesState
  (Ljava/lang/Object;Z)Z
  (Ljava/lang/Object;Z)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AbstractMarkerAnnotationModel.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AbstractMarkerAnnotationModel.eea
index a4d972a240..a01a689f8b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AbstractMarkerAnnotationModel.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AbstractMarkerAnnotationModel.eea
@@ -11,19 +11,19 @@ commit
  (Lorg/eclipse/jface/text/IDocument;)V
 createMarkerAnnotation
  (Lorg/eclipse/core/resources/IMarker;)Lorg/eclipse/ui/texteditor/MarkerAnnotation;
- (Lorg/eclipse/core/resources/IMarker;)Lorg/eclipse/ui/texteditor/MarkerAnnotation;
+ (Lorg/eclipse/core/resources/IMarker;)L1org/eclipse/ui/texteditor/MarkerAnnotation;
 createPositionFromMarker
  (Lorg/eclipse/core/resources/IMarker;)Lorg/eclipse/jface/text/Position;
- (Lorg/eclipse/core/resources/IMarker;)Lorg/eclipse/jface/text/Position;
+ (Lorg/eclipse/core/resources/IMarker;)L0org/eclipse/jface/text/Position;
 deleteMarkers
  ([Lorg/eclipse/core/resources/IMarker;)V
  ([Lorg/eclipse/core/resources/IMarker;)V
 getMarkerAnnotation
  (Lorg/eclipse/core/resources/IMarker;)Lorg/eclipse/ui/texteditor/MarkerAnnotation;
- (Lorg/eclipse/core/resources/IMarker;)Lorg/eclipse/ui/texteditor/MarkerAnnotation;
+ (Lorg/eclipse/core/resources/IMarker;)L0org/eclipse/ui/texteditor/MarkerAnnotation;
 getMarkerPosition
  (Lorg/eclipse/core/resources/IMarker;)Lorg/eclipse/jface/text/Position;
- (Lorg/eclipse/core/resources/IMarker;)Lorg/eclipse/jface/text/Position;
+ (Lorg/eclipse/core/resources/IMarker;)L0org/eclipse/jface/text/Position;
 handleCoreException
  (Lorg/eclipse/core/runtime/CoreException;Ljava/lang/String;)V
  (Lorg/eclipse/core/runtime/CoreException;Ljava/lang/String;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AbstractRulerActionDelegate.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AbstractRulerActionDelegate.eea
index 644cc28e43..d71fab6572 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AbstractRulerActionDelegate.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AbstractRulerActionDelegate.eea
@@ -2,7 +2,7 @@ class org/eclipse/ui/texteditor/AbstractRulerActionDelegate
 
 createAction
  (Lorg/eclipse/ui/texteditor/ITextEditor;Lorg/eclipse/jface/text/source/IVerticalRulerInfo;)Lorg/eclipse/jface/action/IAction;
- (Lorg/eclipse/ui/texteditor/ITextEditor;Lorg/eclipse/jface/text/source/IVerticalRulerInfo;)Lorg/eclipse/jface/action/IAction;
+ (Lorg/eclipse/ui/texteditor/ITextEditor;Lorg/eclipse/jface/text/source/IVerticalRulerInfo;)L1org/eclipse/jface/action/IAction;
 menuAboutToShow
  (Lorg/eclipse/jface/action/IMenuManager;)V
  (L1org/eclipse/jface/action/IMenuManager;)V # @Inherited(org.eclipse.jface.action.IMenuListener)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AbstractTextEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AbstractTextEditor.eea
index 1ddaf8452c..cf8b00d3ca 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AbstractTextEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AbstractTextEditor.eea
@@ -176,25 +176,25 @@ containsSavedState
  (Lorg/eclipse/ui/IMemento;)Z
 createColumnSupport
  ()Lorg/eclipse/ui/texteditor/rulers/IColumnSupport;
- ()Lorg/eclipse/ui/texteditor/rulers/IColumnSupport;
+ ()L0org/eclipse/ui/texteditor/rulers/IColumnSupport;
 createContextMenuListener
  ()Lorg/eclipse/jface/action/IMenuListener;
- ()Lorg/eclipse/jface/action/IMenuListener;
+ ()L1org/eclipse/jface/action/IMenuListener;
 createEmptyNavigationLocation
  ()Lorg/eclipse/ui/INavigationLocation;
- ()Lorg/eclipse/ui/INavigationLocation;
+ ()L1org/eclipse/ui/INavigationLocation; # @Inherited(org.eclipse.ui.INavigationLocationProvider)
 createNavigationLocation
  ()Lorg/eclipse/ui/INavigationLocation;
- ()Lorg/eclipse/ui/INavigationLocation;
+ ()L1org/eclipse/ui/INavigationLocation; # @Inherited(org.eclipse.ui.INavigationLocationProvider)
 createPartControl
  (Lorg/eclipse/swt/widgets/Composite;)V
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.ui.part.WorkbenchPart)
 createSourceViewer
  (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/jface/text/source/IVerticalRuler;I)Lorg/eclipse/jface/text/source/ISourceViewer;
- (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/jface/text/source/IVerticalRuler;I)Lorg/eclipse/jface/text/source/ISourceViewer;
+ (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/jface/text/source/IVerticalRuler;I)L1org/eclipse/jface/text/source/ISourceViewer;
 createVerticalRuler
  ()Lorg/eclipse/jface/text/source/IVerticalRuler;
- ()Lorg/eclipse/jface/text/source/IVerticalRuler;
+ ()L1org/eclipse/jface/text/source/IVerticalRuler;
 doGetSelection
  ()Lorg/eclipse/jface/viewers/ISelection;
  ()Lorg/eclipse/jface/viewers/ISelection;
@@ -248,7 +248,7 @@ getHelpContextId
  ()Ljava/lang/String;
 getHighlightRange
  ()Lorg/eclipse/jface/text/IRegion;
- ()Lorg/eclipse/jface/text/IRegion;
+ ()L0org/eclipse/jface/text/IRegion;
 getInsertMode
  ()Lorg/eclipse/ui/texteditor/ITextEditorExtension3$InsertMode;
  ()Lorg/eclipse/ui/texteditor/ITextEditorExtension3$InsertMode;
@@ -260,7 +260,7 @@ getPreferenceStore
  ()Lorg/eclipse/jface/preference/IPreferenceStore;
 getProgressMonitor
  ()Lorg/eclipse/core/runtime/IProgressMonitor;
- ()Lorg/eclipse/core/runtime/IProgressMonitor;
+ ()L1org/eclipse/core/runtime/IProgressMonitor;
 getRangeIndicator
  ()Lorg/eclipse/jface/text/source/Annotation;
  ()Lorg/eclipse/jface/text/source/Annotation;
@@ -287,7 +287,7 @@ getSourceViewerConfiguration
  ()Lorg/eclipse/jface/text/source/SourceViewerConfiguration;
 getStatusField
  (Ljava/lang/String;)Lorg/eclipse/ui/texteditor/IStatusField;
- (Ljava/lang/String;)Lorg/eclipse/ui/texteditor/IStatusField;
+ (Ljava/lang/String;)L0org/eclipse/ui/texteditor/IStatusField;
 getStatusLineManager
  ()Lorg/eclipse/jface/action/IStatusLineManager;
  ()Lorg/eclipse/jface/action/IStatusLineManager;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AddMarkerAction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AddMarkerAction.eea
index 12ab841d97..774f1b7574 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AddMarkerAction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AddMarkerAction.eea
@@ -11,10 +11,10 @@ getInitialAttributes
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 getLabelProposal
  (Lorg/eclipse/jface/text/IDocument;II)Ljava/lang/String;
- (Lorg/eclipse/jface/text/IDocument;II)Ljava/lang/String;
+ (Lorg/eclipse/jface/text/IDocument;II)L0java/lang/String;
 getResource
  ()Lorg/eclipse/core/resources/IResource;
- ()Lorg/eclipse/core/resources/IResource;
+ ()L0org/eclipse/core/resources/IResource;
 getResourceBundle
  ()Ljava/util/ResourceBundle;
  ()Ljava/util/ResourceBundle;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AnnotationPreference.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AnnotationPreference.eea
index a4e3d54285..d1e38e34f0 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AnnotationPreference.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AnnotationPreference.eea
@@ -163,7 +163,7 @@ getShowInNextPrevDropdownToolbarActionKey
  ()Ljava/lang/String;
 getStringValue
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L0java/lang/String;
 getSymbolicImageName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AnnotationPreferenceLookup.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AnnotationPreferenceLookup.eea
index 390809e776..7d4e092df3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AnnotationPreferenceLookup.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AnnotationPreferenceLookup.eea
@@ -2,7 +2,7 @@ class org/eclipse/ui/texteditor/AnnotationPreferenceLookup
 
 getAnnotationPreference
  (Ljava/lang/String;)Lorg/eclipse/ui/texteditor/AnnotationPreference;
- (Ljava/lang/String;)Lorg/eclipse/ui/texteditor/AnnotationPreference;
+ (Ljava/lang/String;)L0org/eclipse/ui/texteditor/AnnotationPreference;
 getAnnotationPreference
  (Lorg/eclipse/jface/text/source/Annotation;)Lorg/eclipse/ui/texteditor/AnnotationPreference;
  (Lorg/eclipse/jface/text/source/Annotation;)Lorg/eclipse/ui/texteditor/AnnotationPreference;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AnnotationTypeLookup.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AnnotationTypeLookup.eea
index 8d18b60177..983ebbec57 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AnnotationTypeLookup.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/AnnotationTypeLookup.eea
@@ -2,7 +2,7 @@ class org/eclipse/ui/texteditor/AnnotationTypeLookup
 
 getAnnotationType
  (Ljava/lang/String;I)Ljava/lang/String;
- (Ljava/lang/String;I)Ljava/lang/String;
+ (Ljava/lang/String;I)L0java/lang/String;
 getAnnotationType
  (Lorg/eclipse/core/resources/IMarker;)Ljava/lang/String;
- (Lorg/eclipse/core/resources/IMarker;)Ljava/lang/String;
+ (Lorg/eclipse/core/resources/IMarker;)L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/BasicMarkerUpdater.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/BasicMarkerUpdater.eea
index f1f0968a6a..a2872e5d47 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/BasicMarkerUpdater.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/BasicMarkerUpdater.eea
@@ -5,7 +5,7 @@ getAttribute
  ()[Ljava/lang/String;
 getMarkerType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 updateMarker
  (Lorg/eclipse/core/resources/IMarker;Lorg/eclipse/jface/text/IDocument;Lorg/eclipse/jface/text/Position;)Z
  (Lorg/eclipse/core/resources/IMarker;Lorg/eclipse/jface/text/IDocument;Lorg/eclipse/jface/text/Position;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/BookmarkRulerAction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/BookmarkRulerAction.eea
index f15c3c3744..4efb91ce43 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/BookmarkRulerAction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/BookmarkRulerAction.eea
@@ -2,4 +2,4 @@ class org/eclipse/ui/texteditor/BookmarkRulerAction
 
 createAction
  (Lorg/eclipse/ui/texteditor/ITextEditor;Lorg/eclipse/jface/text/source/IVerticalRulerInfo;)Lorg/eclipse/jface/action/IAction;
- (Lorg/eclipse/ui/texteditor/ITextEditor;Lorg/eclipse/jface/text/source/IVerticalRulerInfo;)Lorg/eclipse/jface/action/IAction;
+ (Lorg/eclipse/ui/texteditor/ITextEditor;Lorg/eclipse/jface/text/source/IVerticalRulerInfo;)L1org/eclipse/jface/action/IAction; # @Inherited(org.eclipse.ui.texteditor.AbstractRulerActionDelegate)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/DefaultMarkerAnnotationAccess.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/DefaultMarkerAnnotationAccess.eea
index b6600175de..dfcd30fd24 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/DefaultMarkerAnnotationAccess.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/DefaultMarkerAnnotationAccess.eea
@@ -47,7 +47,7 @@ getType
  (Lorg/eclipse/jface/text/source/Annotation;)Ljava/lang/Object;
 getTypeLabel
  (Lorg/eclipse/jface/text/source/Annotation;)Ljava/lang/String;
- (Lorg/eclipse/jface/text/source/Annotation;)Ljava/lang/String;
+ (Lorg/eclipse/jface/text/source/Annotation;)L0java/lang/String;
 hasQuickFix
  (Lorg/eclipse/jface/text/source/Annotation;)Z
  (Lorg/eclipse/jface/text/source/Annotation;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/DocumentProviderRegistry.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/DocumentProviderRegistry.eea
index 852438a12f..dc37d997d0 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/DocumentProviderRegistry.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/DocumentProviderRegistry.eea
@@ -6,7 +6,7 @@ getDefault
 
 getDocumentProvider
  (Ljava/lang/String;)Lorg/eclipse/ui/texteditor/IDocumentProvider;
- (Ljava/lang/String;)Lorg/eclipse/ui/texteditor/IDocumentProvider;
+ (Ljava/lang/String;)L0org/eclipse/ui/texteditor/IDocumentProvider;
 getDocumentProvider
  (Lorg/eclipse/ui/IEditorInput;)Lorg/eclipse/ui/texteditor/IDocumentProvider;
  (Lorg/eclipse/ui/IEditorInput;)Lorg/eclipse/ui/texteditor/IDocumentProvider;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/HyperlinkDetectorDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/HyperlinkDetectorDescriptor.eea
index 48264fd42d..1f8b652efc 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/HyperlinkDetectorDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/HyperlinkDetectorDescriptor.eea
@@ -10,10 +10,10 @@ getContributedHyperlinkDetectors
 
 createHyperlinkDetector
  ()Lorg/eclipse/jface/text/hyperlink/AbstractHyperlinkDetector;
- ()Lorg/eclipse/jface/text/hyperlink/AbstractHyperlinkDetector;
+ ()L1org/eclipse/jface/text/hyperlink/AbstractHyperlinkDetector;
 createHyperlinkDetectorImplementation
  ()Lorg/eclipse/jface/text/hyperlink/IHyperlinkDetector;
- ()Lorg/eclipse/jface/text/hyperlink/IHyperlinkDetector;
+ ()L1org/eclipse/jface/text/hyperlink/IHyperlinkDetector;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/HyperlinkDetectorRegistry.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/HyperlinkDetectorRegistry.eea
index eba87821da..08e76640ea 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/HyperlinkDetectorRegistry.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/HyperlinkDetectorRegistry.eea
@@ -5,7 +5,7 @@ class org/eclipse/ui/texteditor/HyperlinkDetectorRegistry
  (Lorg/eclipse/jface/preference/IPreferenceStore;)V
 createHyperlinkDetectors
  (Ljava/lang/String;Lorg/eclipse/core/runtime/IAdaptable;)[Lorg/eclipse/jface/text/hyperlink/IHyperlinkDetector;
- (Ljava/lang/String;Lorg/eclipse/core/runtime/IAdaptable;)[Lorg/eclipse/jface/text/hyperlink/IHyperlinkDetector;
+ (Ljava/lang/String;Lorg/eclipse/core/runtime/IAdaptable;)[1Lorg/eclipse/jface/text/hyperlink/IHyperlinkDetector;
 getHyperlinkDetectorDescriptors
  ()[Lorg/eclipse/ui/texteditor/HyperlinkDetectorDescriptor;
- ()[Lorg/eclipse/ui/texteditor/HyperlinkDetectorDescriptor;
+ ()[1Lorg/eclipse/ui/texteditor/HyperlinkDetectorDescriptor;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/HyperlinkDetectorTargetDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/HyperlinkDetectorTargetDescriptor.eea
index 6cc6ec622e..b9a672a203 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/HyperlinkDetectorTargetDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/HyperlinkDetectorTargetDescriptor.eea
@@ -18,4 +18,4 @@ getName
  ()Ljava/lang/String;
 getTypes
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/MarkerAnnotation.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/MarkerAnnotation.eea
index 6c3167093e..3242def21f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/MarkerAnnotation.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/MarkerAnnotation.eea
@@ -15,13 +15,13 @@ getImageRegistry
  (Lorg/eclipse/core/resources/IMarker;)V
 getImage
  (Ljava/lang/String;)Lorg/eclipse/swt/graphics/Image;
- (Ljava/lang/String;)Lorg/eclipse/swt/graphics/Image;
+ (Ljava/lang/String;)L0org/eclipse/swt/graphics/Image;
 getImage
  (Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/swt/graphics/Image;
  (Lorg/eclipse/swt/widgets/Display;)Lorg/eclipse/swt/graphics/Image;
 getUnknownImageName
  (Lorg/eclipse/core/resources/IMarker;)Ljava/lang/String;
- (Lorg/eclipse/core/resources/IMarker;)Ljava/lang/String;
+ (Lorg/eclipse/core/resources/IMarker;)L0java/lang/String;
 paint
  (Lorg/eclipse/swt/graphics/GC;Lorg/eclipse/swt/widgets/Canvas;Lorg/eclipse/swt/graphics/Rectangle;)V
  (Lorg/eclipse/swt/graphics/GC;Lorg/eclipse/swt/widgets/Canvas;Lorg/eclipse/swt/graphics/Rectangle;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/MarkerRulerAction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/MarkerRulerAction.eea
index f44d76f599..c6086411af 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/MarkerRulerAction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/MarkerRulerAction.eea
@@ -11,7 +11,7 @@ askForLabel
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Z
 getAnnotationModel
  ()Lorg/eclipse/ui/texteditor/AbstractMarkerAnnotationModel;
- ()Lorg/eclipse/ui/texteditor/AbstractMarkerAnnotationModel;
+ ()L0org/eclipse/ui/texteditor/AbstractMarkerAnnotationModel;
 getDocument
  ()Lorg/eclipse/jface/text/IDocument;
  ()Lorg/eclipse/jface/text/IDocument;
@@ -20,10 +20,10 @@ getInitialAttributes
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 getLabelProposal
  (Lorg/eclipse/jface/text/IDocument;II)Ljava/lang/String;
- (Lorg/eclipse/jface/text/IDocument;II)Ljava/lang/String;
+ (Lorg/eclipse/jface/text/IDocument;II)L0java/lang/String;
 getMarkers
  ()Ljava/util/List<Lorg/eclipse/core/resources/IMarker;>;
- ()Ljava/util/List<Lorg/eclipse/core/resources/IMarker;>;
+ ()L1java/util/List<Lorg/eclipse/core/resources/IMarker;>;
 getResource
  ()Lorg/eclipse/core/resources/IResource;
  ()Lorg/eclipse/core/resources/IResource;
@@ -38,7 +38,7 @@ getTextEditor
  ()Lorg/eclipse/ui/texteditor/ITextEditor;
 getVerticalRuler
  ()Lorg/eclipse/jface/text/source/IVerticalRuler;
- ()Lorg/eclipse/jface/text/source/IVerticalRuler;
+ ()L0org/eclipse/jface/text/source/IVerticalRuler;
 getVerticalRulerInfo
  ()Lorg/eclipse/jface/text/source/IVerticalRulerInfo;
  ()Lorg/eclipse/jface/text/source/IVerticalRulerInfo;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/MarkerUtilities.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/MarkerUtilities.eea
index 34c5413dec..4ae06b7138 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/MarkerUtilities.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/MarkerUtilities.eea
@@ -17,7 +17,7 @@ getLineNumber
  (Lorg/eclipse/core/resources/IMarker;)I
 getMarkerType
  (Lorg/eclipse/core/resources/IMarker;)Ljava/lang/String;
- (Lorg/eclipse/core/resources/IMarker;)Ljava/lang/String;
+ (Lorg/eclipse/core/resources/IMarker;)L0java/lang/String;
 getMessage
  (Lorg/eclipse/core/resources/IMarker;)Ljava/lang/String;
  (Lorg/eclipse/core/resources/IMarker;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/ResourceMarkerAnnotationModelFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/ResourceMarkerAnnotationModelFactory.eea
index 6878462ccd..c70fb95b4e 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/ResourceMarkerAnnotationModelFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/ResourceMarkerAnnotationModelFactory.eea
@@ -2,4 +2,4 @@ class org/eclipse/ui/texteditor/ResourceMarkerAnnotationModelFactory
 
 createAnnotationModel
  (Lorg/eclipse/core/runtime/IPath;)Lorg/eclipse/jface/text/source/IAnnotationModel;
- (Lorg/eclipse/core/runtime/IPath;)Lorg/eclipse/jface/text/source/IAnnotationModel;
+ (Lorg/eclipse/core/runtime/IPath;)L1org/eclipse/jface/text/source/IAnnotationModel; # @Inherited(org.eclipse.core.filebuffers.IAnnotationModelFactory)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/SelectMarkerRulerAction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/SelectMarkerRulerAction.eea
index 7c2445922c..192cd25ba3 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/SelectMarkerRulerAction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/SelectMarkerRulerAction.eea
@@ -11,10 +11,10 @@ chooseMarker
  (Ljava/util/List<+Lorg/eclipse/core/resources/IMarker;>;)Lorg/eclipse/core/resources/IMarker;
 getAnnotationAccessExtension
  ()Lorg/eclipse/jface/text/source/IAnnotationAccessExtension;
- ()Lorg/eclipse/jface/text/source/IAnnotationAccessExtension;
+ ()L0org/eclipse/jface/text/source/IAnnotationAccessExtension;
 getAnnotationModel
  ()Lorg/eclipse/ui/texteditor/AbstractMarkerAnnotationModel;
- ()Lorg/eclipse/ui/texteditor/AbstractMarkerAnnotationModel;
+ ()L0org/eclipse/ui/texteditor/AbstractMarkerAnnotationModel;
 getDocument
  ()Lorg/eclipse/jface/text/IDocument;
  ()Lorg/eclipse/jface/text/IDocument;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/SelectRulerAction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/SelectRulerAction.eea
index 7b419a9591..8f50b55590 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/SelectRulerAction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/SelectRulerAction.eea
@@ -2,4 +2,4 @@ class org/eclipse/ui/texteditor/SelectRulerAction
 
 createAction
  (Lorg/eclipse/ui/texteditor/ITextEditor;Lorg/eclipse/jface/text/source/IVerticalRulerInfo;)Lorg/eclipse/jface/action/IAction;
- (Lorg/eclipse/ui/texteditor/ITextEditor;Lorg/eclipse/jface/text/source/IVerticalRulerInfo;)Lorg/eclipse/jface/action/IAction;
+ (Lorg/eclipse/ui/texteditor/ITextEditor;Lorg/eclipse/jface/text/source/IVerticalRulerInfo;)L1org/eclipse/jface/action/IAction; # @Inherited(org.eclipse.ui.texteditor.AbstractRulerActionDelegate)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/SourceViewerDecorationSupport.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/SourceViewerDecorationSupport.eea
index e5a2c8ba9f..88fc396a90 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/SourceViewerDecorationSupport.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/SourceViewerDecorationSupport.eea
@@ -5,7 +5,7 @@ class org/eclipse/ui/texteditor/SourceViewerDecorationSupport
  (Lorg/eclipse/jface/text/source/ISourceViewer;Lorg/eclipse/jface/text/source/IOverviewRuler;Lorg/eclipse/jface/text/source/IAnnotationAccess;Lorg/eclipse/jface/text/source/ISharedTextColors;)V
 createAnnotationPainter
  ()Lorg/eclipse/jface/text/source/AnnotationPainter;
- ()Lorg/eclipse/jface/text/source/AnnotationPainter;
+ ()L1org/eclipse/jface/text/source/AnnotationPainter;
 handlePreferenceStoreChanged
  (Lorg/eclipse/jface/util/PropertyChangeEvent;)V
  (Lorg/eclipse/jface/util/PropertyChangeEvent;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/StatusTextEditor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/StatusTextEditor.eea
index 64caa2e38e..22f275df65 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/StatusTextEditor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/StatusTextEditor.eea
@@ -5,16 +5,16 @@ createPartControl
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.ui.texteditor.AbstractTextEditor)
 createStatusControl
  (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/core/runtime/IStatus;)Lorg/eclipse/swt/widgets/Control;
- (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/core/runtime/IStatus;)Lorg/eclipse/swt/widgets/Control;
+ (Lorg/eclipse/swt/widgets/Composite;Lorg/eclipse/core/runtime/IStatus;)L1org/eclipse/swt/widgets/Control;
 doSetInput
  (Lorg/eclipse/ui/IEditorInput;)V
  (Lorg/eclipse/ui/IEditorInput;)V
 getStatusBanner
  (Lorg/eclipse/core/runtime/IStatus;)Ljava/lang/String;
- (Lorg/eclipse/core/runtime/IStatus;)Ljava/lang/String;
+ (Lorg/eclipse/core/runtime/IStatus;)L1java/lang/String;
 getStatusHeader
  (Lorg/eclipse/core/runtime/IStatus;)Ljava/lang/String;
- (Lorg/eclipse/core/runtime/IStatus;)Ljava/lang/String;
+ (Lorg/eclipse/core/runtime/IStatus;)L1java/lang/String;
 getStatusMessage
  (Lorg/eclipse/core/runtime/IStatus;)Ljava/lang/String;
  (Lorg/eclipse/core/runtime/IStatus;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/TaskRulerAction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/TaskRulerAction.eea
index 55c0dea217..b0c1635263 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/TaskRulerAction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/TaskRulerAction.eea
@@ -2,4 +2,4 @@ class org/eclipse/ui/texteditor/TaskRulerAction
 
 createAction
  (Lorg/eclipse/ui/texteditor/ITextEditor;Lorg/eclipse/jface/text/source/IVerticalRulerInfo;)Lorg/eclipse/jface/action/IAction;
- (Lorg/eclipse/ui/texteditor/ITextEditor;Lorg/eclipse/jface/text/source/IVerticalRulerInfo;)Lorg/eclipse/jface/action/IAction;
+ (Lorg/eclipse/ui/texteditor/ITextEditor;Lorg/eclipse/jface/text/source/IVerticalRulerInfo;)L1org/eclipse/jface/action/IAction; # @Inherited(org.eclipse.ui.texteditor.AbstractRulerActionDelegate)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/TextNavigationAction.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/TextNavigationAction.eea
index 67803903b9..6b39982e4c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/TextNavigationAction.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/TextNavigationAction.eea
@@ -11,31 +11,31 @@ fireSelectionChanged
  (Lorg/eclipse/swt/graphics/Point;)V
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getDisabledImageDescriptor
  ()Lorg/eclipse/jface/resource/ImageDescriptor;
- ()Lorg/eclipse/jface/resource/ImageDescriptor;
+ ()L0org/eclipse/jface/resource/ImageDescriptor;
 getHelpListener
  ()Lorg/eclipse/swt/events/HelpListener;
- ()Lorg/eclipse/swt/events/HelpListener;
+ ()L0org/eclipse/swt/events/HelpListener;
 getHoverImageDescriptor
  ()Lorg/eclipse/jface/resource/ImageDescriptor;
- ()Lorg/eclipse/jface/resource/ImageDescriptor;
+ ()L0org/eclipse/jface/resource/ImageDescriptor;
 getImageDescriptor
  ()Lorg/eclipse/jface/resource/ImageDescriptor;
- ()Lorg/eclipse/jface/resource/ImageDescriptor;
+ ()L0org/eclipse/jface/resource/ImageDescriptor;
 getMenuCreator
  ()Lorg/eclipse/jface/action/IMenuCreator;
- ()Lorg/eclipse/jface/action/IMenuCreator;
+ ()L0org/eclipse/jface/action/IMenuCreator; # @Inherited(org.eclipse.jface.action.Action)
 getText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getTextWidget
  ()Lorg/eclipse/swt/custom/StyledText;
  ()Lorg/eclipse/swt/custom/StyledText;
 getToolTipText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 removePropertyChangeListener
  (Lorg/eclipse/jface/util/IPropertyChangeListener;)V
  (L1org/eclipse/jface/util/IPropertyChangeListener;)V # @Inherited(org.eclipse.jface.action.AbstractAction)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/quickdiff/QuickDiff.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/quickdiff/QuickDiff.eea
index 71491bc669..8ba5b311df 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/quickdiff/QuickDiff.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/quickdiff/QuickDiff.eea
@@ -2,16 +2,16 @@ class org/eclipse/ui/texteditor/quickdiff/QuickDiff
 
 createQuickDiffAnnotationModel
  (Lorg/eclipse/ui/texteditor/ITextEditor;Ljava/lang/String;)Lorg/eclipse/jface/text/source/IAnnotationModel;
- (Lorg/eclipse/ui/texteditor/ITextEditor;Ljava/lang/String;)Lorg/eclipse/jface/text/source/IAnnotationModel;
+ (Lorg/eclipse/ui/texteditor/ITextEditor;Ljava/lang/String;)L0org/eclipse/jface/text/source/IAnnotationModel;
 getConfiguredQuickDiffProvider
  (Lorg/eclipse/jface/text/source/IAnnotationModel;)Ljava/lang/Object;
  (Lorg/eclipse/jface/text/source/IAnnotationModel;)Ljava/lang/Object;
 getDefaultProvider
  ()Lorg/eclipse/ui/texteditor/quickdiff/ReferenceProviderDescriptor;
- ()Lorg/eclipse/ui/texteditor/quickdiff/ReferenceProviderDescriptor;
+ ()L0org/eclipse/ui/texteditor/quickdiff/ReferenceProviderDescriptor;
 getReferenceProviderDescriptors
  ()Ljava/util/List<Lorg/eclipse/ui/texteditor/quickdiff/ReferenceProviderDescriptor;>;
  ()Ljava/util/List<Lorg/eclipse/ui/texteditor/quickdiff/ReferenceProviderDescriptor;>;
 getReferenceProviderOrDefault
  (Lorg/eclipse/ui/texteditor/ITextEditor;Ljava/lang/String;)Lorg/eclipse/ui/texteditor/quickdiff/IQuickDiffReferenceProvider;
- (Lorg/eclipse/ui/texteditor/ITextEditor;Ljava/lang/String;)Lorg/eclipse/ui/texteditor/quickdiff/IQuickDiffReferenceProvider;
+ (Lorg/eclipse/ui/texteditor/ITextEditor;Ljava/lang/String;)L0org/eclipse/ui/texteditor/quickdiff/IQuickDiffReferenceProvider;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/quickdiff/ReferenceProviderDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/quickdiff/ReferenceProviderDescriptor.eea
index 580245d142..d941322d80 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/quickdiff/ReferenceProviderDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/quickdiff/ReferenceProviderDescriptor.eea
@@ -5,7 +5,7 @@ class org/eclipse/ui/texteditor/quickdiff/ReferenceProviderDescriptor
  (Lorg/eclipse/core/runtime/IConfigurationElement;)V
 createProvider
  ()Lorg/eclipse/ui/texteditor/quickdiff/IQuickDiffReferenceProvider;
- ()Lorg/eclipse/ui/texteditor/quickdiff/IQuickDiffReferenceProvider;
+ ()L0org/eclipse/ui/texteditor/quickdiff/IQuickDiffReferenceProvider;
 getId
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/rulers/RulerColumnDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/rulers/RulerColumnDescriptor.eea
index 3281f40a17..1bb84a7e2c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/rulers/RulerColumnDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/rulers/RulerColumnDescriptor.eea
@@ -2,7 +2,7 @@ class org/eclipse/ui/texteditor/rulers/RulerColumnDescriptor
 
 createColumn
  (Lorg/eclipse/ui/texteditor/ITextEditor;)Lorg/eclipse/ui/texteditor/rulers/IContributedRulerColumn;
- (Lorg/eclipse/ui/texteditor/ITextEditor;)Lorg/eclipse/ui/texteditor/rulers/IContributedRulerColumn;
+ (Lorg/eclipse/ui/texteditor/ITextEditor;)L1org/eclipse/ui/texteditor/rulers/IContributedRulerColumn;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/spelling/SpellingCorrectionProcessor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/spelling/SpellingCorrectionProcessor.eea
index b4af8b4d22..6a2da81867 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/spelling/SpellingCorrectionProcessor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/spelling/SpellingCorrectionProcessor.eea
@@ -11,4 +11,4 @@ computeQuickAssistProposals
  (L1org/eclipse/jface/text/quickassist/IQuickAssistInvocationContext;)[0L1org/eclipse/jface/text/contentassist/ICompletionProposal; # @Inherited(org.eclipse.jface.text.quickassist.IQuickAssistProcessor)
 getErrorMessage
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/spelling/SpellingEngineDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/spelling/SpellingEngineDescriptor.eea
index be841eedc3..4afa719a79 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/spelling/SpellingEngineDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/spelling/SpellingEngineDescriptor.eea
@@ -5,10 +5,10 @@ class org/eclipse/ui/texteditor/spelling/SpellingEngineDescriptor
  (Lorg/eclipse/core/runtime/IConfigurationElement;)V
 createEngine
  ()Lorg/eclipse/ui/texteditor/spelling/ISpellingEngine;
- ()Lorg/eclipse/ui/texteditor/spelling/ISpellingEngine;
+ ()L1org/eclipse/ui/texteditor/spelling/ISpellingEngine;
 createPreferences
  ()Lorg/eclipse/ui/texteditor/spelling/ISpellingPreferenceBlock;
- ()Lorg/eclipse/ui/texteditor/spelling/ISpellingPreferenceBlock;
+ ()L1org/eclipse/ui/texteditor/spelling/ISpellingPreferenceBlock;
 getId
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/spelling/SpellingReconcileStrategy.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/spelling/SpellingReconcileStrategy.eea
index 2b2803c629..26fafb1112 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/spelling/SpellingReconcileStrategy.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/spelling/SpellingReconcileStrategy.eea
@@ -5,7 +5,7 @@ class org/eclipse/ui/texteditor/spelling/SpellingReconcileStrategy
  (Lorg/eclipse/jface/text/source/ISourceViewer;Lorg/eclipse/ui/texteditor/spelling/SpellingService;)V
 createSpellingProblemCollector
  ()Lorg/eclipse/ui/texteditor/spelling/ISpellingProblemCollector;
- ()Lorg/eclipse/ui/texteditor/spelling/ISpellingProblemCollector;
+ ()L0org/eclipse/ui/texteditor/spelling/ISpellingProblemCollector;
 getAnnotationModel
  ()Lorg/eclipse/jface/text/source/IAnnotationModel;
  ()Lorg/eclipse/jface/text/source/IAnnotationModel;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/spelling/SpellingService.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/spelling/SpellingService.eea
index 269596ade6..def95223d6 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/spelling/SpellingService.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/spelling/SpellingService.eea
@@ -18,10 +18,10 @@ check
  (Lorg/eclipse/jface/text/IDocument;[Lorg/eclipse/jface/text/IRegion;Lorg/eclipse/ui/texteditor/spelling/SpellingContext;Lorg/eclipse/ui/texteditor/spelling/ISpellingProblemCollector;Lorg/eclipse/core/runtime/IProgressMonitor;)V
 getActiveSpellingEngineDescriptor
  (Lorg/eclipse/jface/preference/IPreferenceStore;)Lorg/eclipse/ui/texteditor/spelling/SpellingEngineDescriptor;
- (Lorg/eclipse/jface/preference/IPreferenceStore;)Lorg/eclipse/ui/texteditor/spelling/SpellingEngineDescriptor;
+ (Lorg/eclipse/jface/preference/IPreferenceStore;)L0org/eclipse/ui/texteditor/spelling/SpellingEngineDescriptor;
 getDefaultSpellingEngineDescriptor
  ()Lorg/eclipse/ui/texteditor/spelling/SpellingEngineDescriptor;
- ()Lorg/eclipse/ui/texteditor/spelling/SpellingEngineDescriptor;
+ ()L0org/eclipse/ui/texteditor/spelling/SpellingEngineDescriptor;
 getSpellingEngineDescriptors
  ()[Lorg/eclipse/ui/texteditor/spelling/SpellingEngineDescriptor;
  ()[Lorg/eclipse/ui/texteditor/spelling/SpellingEngineDescriptor;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.eea
index 483744e4f2..cd3bebbb94 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.eea
@@ -8,10 +8,10 @@ createControl
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.ui.part.Page)
 createPatternViewer
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/text/source/SourceViewer;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/text/source/SourceViewer;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/jface/text/source/SourceViewer;
 editTemplate
  (Lorg/eclipse/jface/text/templates/Template;ZZ)Lorg/eclipse/jface/text/templates/Template;
- (Lorg/eclipse/jface/text/templates/Template;ZZ)Lorg/eclipse/jface/text/templates/Template;
+ (Lorg/eclipse/jface/text/templates/Template;ZZ)L0org/eclipse/jface/text/templates/Template;
 getContextTypeIds
  (Lorg/eclipse/jface/text/IDocument;I)[Ljava/lang/String;
  (Lorg/eclipse/jface/text/IDocument;I)[Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/templates/TemplatePreferencePage$EditTemplateDialog.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/templates/TemplatePreferencePage$EditTemplateDialog.eea
index 084e3df0dd..17a3aa89e7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/templates/TemplatePreferencePage$EditTemplateDialog.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/templates/TemplatePreferencePage$EditTemplateDialog.eea
@@ -8,7 +8,7 @@ createDialogArea
  (L1org/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.jface.dialogs.Dialog)
 createViewer
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/text/source/SourceViewer;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/text/source/SourceViewer;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/jface/text/source/SourceViewer;
 getDialogBoundsSettings
  ()Lorg/eclipse/jface/dialogs/IDialogSettings;
  ()L0org/eclipse/jface/dialogs/IDialogSettings; # @Inherited(org.eclipse.jface.dialogs.Dialog)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.eea
index c3a27d17c5..ae8aa3fb83 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.eea
@@ -5,19 +5,19 @@ createContents
  (L1org/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.jface.preference.PreferencePage)
 createTemplateEditDialog
  (Lorg/eclipse/jface/text/templates/Template;ZZ)Lorg/eclipse/jface/dialogs/Dialog;
- (Lorg/eclipse/jface/text/templates/Template;ZZ)Lorg/eclipse/jface/dialogs/Dialog;
+ (Lorg/eclipse/jface/text/templates/Template;ZZ)L1org/eclipse/jface/dialogs/Dialog;
 createViewer
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/text/source/SourceViewer;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/text/source/SourceViewer;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/jface/text/source/SourceViewer;
 editTemplate
  (Lorg/eclipse/jface/text/templates/Template;ZZ)Lorg/eclipse/jface/text/templates/Template;
- (Lorg/eclipse/jface/text/templates/Template;ZZ)Lorg/eclipse/jface/text/templates/Template;
+ (Lorg/eclipse/jface/text/templates/Template;ZZ)L0org/eclipse/jface/text/templates/Template;
 getContextTypeRegistry
  ()Lorg/eclipse/jface/text/templates/ContextTypeRegistry;
  ()Lorg/eclipse/jface/text/templates/ContextTypeRegistry;
 getFormatterPreferenceKey
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getTableViewer
  ()Lorg/eclipse/jface/viewers/TableViewer;
  ()Lorg/eclipse/jface/viewers/TableViewer;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/templates/TemplatesView.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/templates/TemplatesView.eea
index 70582fb3c7..a3f0411176 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/templates/TemplatesView.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/texteditor/templates/TemplatesView.eea
@@ -6,13 +6,13 @@ ID
 
 createDefaultPage
  (Lorg/eclipse/ui/part/PageBook;)Lorg/eclipse/ui/part/IPage;
- (Lorg/eclipse/ui/part/PageBook;)Lorg/eclipse/ui/part/IPage;
+ (Lorg/eclipse/ui/part/PageBook;)L1org/eclipse/ui/part/IPage; # @Inherited(org.eclipse.ui.part.PageBookView)
 createPartControl
  (Lorg/eclipse/swt/widgets/Composite;)V
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.ui.part.PageBookView)
 doCreatePage
  (Lorg/eclipse/ui/IWorkbenchPart;)Lorg/eclipse/ui/part/PageBookView$PageRec;
- (Lorg/eclipse/ui/IWorkbenchPart;)Lorg/eclipse/ui/part/PageBookView$PageRec;
+ (Lorg/eclipse/ui/IWorkbenchPart;)L0org/eclipse/ui/part/PageBookView$PageRec;
 doDestroyPage
  (Lorg/eclipse/ui/IWorkbenchPart;Lorg/eclipse/ui/part/PageBookView$PageRec;)V
  (Lorg/eclipse/ui/IWorkbenchPart;Lorg/eclipse/ui/part/PageBookView$PageRec;)V
@@ -21,13 +21,13 @@ getAdapter
  <T:Ljava/lang/Object;>(L1java/lang/Class<TT;>;)T0T; # @Inherited(org.eclipse.ui.part.PageBookView)
 getBootstrapPart
  ()Lorg/eclipse/ui/IWorkbenchPart;
- ()Lorg/eclipse/ui/IWorkbenchPart;
+ ()L0org/eclipse/ui/IWorkbenchPart;
 getSelectedTemplates
  ()[Lorg/eclipse/jface/text/templates/persistence/TemplatePersistenceData;
- ()[Lorg/eclipse/jface/text/templates/persistence/TemplatePersistenceData;
+ ()[0Lorg/eclipse/jface/text/templates/persistence/TemplatePersistenceData;
 getTemplateStore
  ()Lorg/eclipse/jface/text/templates/persistence/TemplateStore;
- ()Lorg/eclipse/jface/text/templates/persistence/TemplateStore;
+ ()L0org/eclipse/jface/text/templates/persistence/TemplateStore;
 isImportant
  (Lorg/eclipse/ui/IWorkbenchPart;)Z
  (Lorg/eclipse/ui/IWorkbenchPart;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/themes/ColorUtil.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/themes/ColorUtil.eea
index e3cbe0dc26..b887020b74 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/themes/ColorUtil.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/themes/ColorUtil.eea
@@ -2,13 +2,13 @@ class org/eclipse/ui/themes/ColorUtil
 
 blend
  (Lorg/eclipse/swt/graphics/RGB;Lorg/eclipse/swt/graphics/RGB;)Lorg/eclipse/swt/graphics/RGB;
- (Lorg/eclipse/swt/graphics/RGB;Lorg/eclipse/swt/graphics/RGB;)Lorg/eclipse/swt/graphics/RGB;
+ (Lorg/eclipse/swt/graphics/RGB;Lorg/eclipse/swt/graphics/RGB;)L1org/eclipse/swt/graphics/RGB;
 blend
  (Lorg/eclipse/swt/graphics/RGB;Lorg/eclipse/swt/graphics/RGB;I)Lorg/eclipse/swt/graphics/RGB;
- (Lorg/eclipse/swt/graphics/RGB;Lorg/eclipse/swt/graphics/RGB;I)Lorg/eclipse/swt/graphics/RGB;
+ (Lorg/eclipse/swt/graphics/RGB;Lorg/eclipse/swt/graphics/RGB;I)L1org/eclipse/swt/graphics/RGB;
 getColorValue
  (Ljava/lang/String;)Lorg/eclipse/swt/graphics/RGB;
  (Ljava/lang/String;)Lorg/eclipse/swt/graphics/RGB;
 getColorValues
  ([Ljava/lang/String;)[Lorg/eclipse/swt/graphics/RGB;
- ([Ljava/lang/String;)[Lorg/eclipse/swt/graphics/RGB;
+ ([Ljava/lang/String;)[1Lorg/eclipse/swt/graphics/RGB;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/themes/IColorFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/themes/IColorFactory.eea
index 4edb1b0113..fa59edcfd0 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/themes/IColorFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/themes/IColorFactory.eea
@@ -2,4 +2,4 @@ class org/eclipse/ui/themes/IColorFactory
 
 createColor
  ()Lorg/eclipse/swt/graphics/RGB;
- ()Lorg/eclipse/swt/graphics/RGB;
+ ()L1org/eclipse/swt/graphics/RGB;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/themes/RGBBlendColorFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/themes/RGBBlendColorFactory.eea
index a4244b04a2..c8d52b759a 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/themes/RGBBlendColorFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/themes/RGBBlendColorFactory.eea
@@ -2,7 +2,7 @@ class org/eclipse/ui/themes/RGBBlendColorFactory
 
 createColor
  ()Lorg/eclipse/swt/graphics/RGB;
- ()Lorg/eclipse/swt/graphics/RGB;
+ ()L1org/eclipse/swt/graphics/RGB; # @Inherited(org.eclipse.ui.themes.IColorFactory)
 setInitializationData
  (Lorg/eclipse/core/runtime/IConfigurationElement;Ljava/lang/String;Ljava/lang/Object;)V
  (Lorg/eclipse/core/runtime/IConfigurationElement;Ljava/lang/String;Ljava/lang/Object;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/IViewDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/IViewDescriptor.eea
index 47ba3f9a06..3cb71b8e97 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/IViewDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/IViewDescriptor.eea
@@ -2,7 +2,7 @@ class org/eclipse/ui/views/IViewDescriptor
 
 createView
  ()Lorg/eclipse/ui/IViewPart;
- ()Lorg/eclipse/ui/IViewPart;
+ ()L1org/eclipse/ui/IViewPart;
 getCategoryPath
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/contentoutline/ContentOutline.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/contentoutline/ContentOutline.eea
index aacae3e64a..62fd8a69cb 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/contentoutline/ContentOutline.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/contentoutline/ContentOutline.eea
@@ -12,13 +12,13 @@ addSelectionChangedListener
  (L1org/eclipse/jface/viewers/ISelectionChangedListener;)V # @Inherited(org.eclipse.jface.viewers.ISelectionProvider)
 createDefaultPage
  (Lorg/eclipse/ui/part/PageBook;)Lorg/eclipse/ui/part/IPage;
- (Lorg/eclipse/ui/part/PageBook;)Lorg/eclipse/ui/part/IPage;
+ (Lorg/eclipse/ui/part/PageBook;)L1org/eclipse/ui/part/IPage; # @Inherited(org.eclipse.ui.part.PageBookView)
 createPartControl
  (Lorg/eclipse/swt/widgets/Composite;)V
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.ui.part.PageBookView)
 doCreatePage
  (Lorg/eclipse/ui/IWorkbenchPart;)Lorg/eclipse/ui/part/PageBookView$PageRec;
- (Lorg/eclipse/ui/IWorkbenchPart;)Lorg/eclipse/ui/part/PageBookView$PageRec;
+ (Lorg/eclipse/ui/IWorkbenchPart;)L0org/eclipse/ui/part/PageBookView$PageRec;
 doDestroyPage
  (Lorg/eclipse/ui/IWorkbenchPart;Lorg/eclipse/ui/part/PageBookView$PageRec;)V
  (Lorg/eclipse/ui/IWorkbenchPart;Lorg/eclipse/ui/part/PageBookView$PageRec;)V
@@ -27,7 +27,7 @@ getAdapter
  <T:Ljava/lang/Object;>(L1java/lang/Class<TT;>;)T0T; # @Inherited(org.eclipse.ui.part.PageBookView)
 getBootstrapPart
  ()Lorg/eclipse/ui/IWorkbenchPart;
- ()Lorg/eclipse/ui/IWorkbenchPart;
+ ()L0org/eclipse/ui/IWorkbenchPart;
 getSelection
  ()Lorg/eclipse/jface/viewers/ISelection;
  ()L1org/eclipse/jface/viewers/ISelection; # @Inherited(org.eclipse.jface.viewers.ISelectionProvider)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/framelist/FrameList.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/framelist/FrameList.eea
index 9a49da5f20..2d9a67ddf7 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/framelist/FrameList.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/framelist/FrameList.eea
@@ -18,7 +18,7 @@ getCurrentFrame
  ()Lorg/eclipse/ui/views/framelist/Frame;
 getFrame
  (I)Lorg/eclipse/ui/views/framelist/Frame;
- (I)Lorg/eclipse/ui/views/framelist/Frame;
+ (I)L0org/eclipse/ui/views/framelist/Frame;
 getSource
  ()Lorg/eclipse/ui/views/framelist/IFrameSource;
  ()Lorg/eclipse/ui/views/framelist/IFrameSource;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/framelist/TreeViewerFrameSource.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/framelist/TreeViewerFrameSource.eea
index 1abd593e23..0445264b89 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/framelist/TreeViewerFrameSource.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/framelist/TreeViewerFrameSource.eea
@@ -8,7 +8,7 @@ connectTo
  (Lorg/eclipse/ui/views/framelist/FrameList;)V
 createFrame
  (Ljava/lang/Object;)Lorg/eclipse/ui/views/framelist/TreeFrame;
- (Ljava/lang/Object;)Lorg/eclipse/ui/views/framelist/TreeFrame;
+ (Ljava/lang/Object;)L1org/eclipse/ui/views/framelist/TreeFrame;
 frameChanged
  (Lorg/eclipse/ui/views/framelist/TreeFrame;)V
  (Lorg/eclipse/ui/views/framelist/TreeFrame;)V
@@ -17,13 +17,13 @@ getCurrentFrame
  (I)Lorg/eclipse/ui/views/framelist/Frame;
 getFrame
  (II)Lorg/eclipse/ui/views/framelist/Frame;
- (II)Lorg/eclipse/ui/views/framelist/Frame;
+ (II)L0org/eclipse/ui/views/framelist/Frame;
 getParentFrame
  (I)Lorg/eclipse/ui/views/framelist/Frame;
- (I)Lorg/eclipse/ui/views/framelist/Frame;
+ (I)L0org/eclipse/ui/views/framelist/Frame;
 getSelectionFrame
  (I)Lorg/eclipse/ui/views/framelist/Frame;
- (I)Lorg/eclipse/ui/views/framelist/Frame;
+ (I)L0org/eclipse/ui/views/framelist/Frame;
 getViewer
  ()Lorg/eclipse/jface/viewers/AbstractTreeViewer;
  ()Lorg/eclipse/jface/viewers/AbstractTreeViewer;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/markers/MarkerField.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/markers/MarkerField.eea
index 92bea27694..9952fc9ef8 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/markers/MarkerField.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/markers/MarkerField.eea
@@ -8,7 +8,7 @@ compare
  (Lorg/eclipse/ui/views/markers/MarkerItem;Lorg/eclipse/ui/views/markers/MarkerItem;)I
 getColumnHeaderImage
  ()Lorg/eclipse/swt/graphics/Image;
- ()Lorg/eclipse/swt/graphics/Image;
+ ()L0org/eclipse/swt/graphics/Image;
 getColumnHeaderText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -23,7 +23,7 @@ getDefaultColumnWidth
  (Lorg/eclipse/swt/widgets/Control;)I
 getEditingSupport
  (Lorg/eclipse/jface/viewers/ColumnViewer;)Lorg/eclipse/jface/viewers/EditingSupport;
- (Lorg/eclipse/jface/viewers/ColumnViewer;)Lorg/eclipse/jface/viewers/EditingSupport;
+ (Lorg/eclipse/jface/viewers/ColumnViewer;)L0org/eclipse/jface/viewers/EditingSupport;
 getImageManager
  ()Lorg/eclipse/jface/resource/ResourceManager;
  ()Lorg/eclipse/jface/resource/ResourceManager;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/markers/MarkerItem.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/markers/MarkerItem.eea
index f9aa4e4dd4..9d7fa10059 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/markers/MarkerItem.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/markers/MarkerItem.eea
@@ -11,10 +11,10 @@ getAttributeValue
  (Ljava/lang/String;Z)Z
 getLocation
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getMarker
  ()Lorg/eclipse/core/resources/IMarker;
- ()Lorg/eclipse/core/resources/IMarker;
+ ()L0org/eclipse/core/resources/IMarker;
 getPath
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/markers/MarkerViewHandler.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/markers/MarkerViewHandler.eea
index 0329f3e0cb..0e457a393c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/markers/MarkerViewHandler.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/markers/MarkerViewHandler.eea
@@ -8,4 +8,4 @@ getSelectedMarkers
  (Lorg/eclipse/core/commands/ExecutionEvent;)[Lorg/eclipse/core/resources/IMarker;
 getView
  (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/ui/views/markers/MarkerSupportView;
- (Lorg/eclipse/core/commands/ExecutionEvent;)Lorg/eclipse/ui/views/markers/MarkerSupportView;
+ (Lorg/eclipse/core/commands/ExecutionEvent;)L0org/eclipse/ui/views/markers/MarkerSupportView;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/markers/MarkerViewUtil.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/markers/MarkerViewUtil.eea
index 7299382a62..69b7432e7d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/markers/MarkerViewUtil.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/markers/MarkerViewUtil.eea
@@ -9,7 +9,7 @@ PATH_ATTRIBUTE
 
 getViewId
  (Lorg/eclipse/core/resources/IMarker;)Ljava/lang/String;
- (Lorg/eclipse/core/resources/IMarker;)Ljava/lang/String;
+ (Lorg/eclipse/core/resources/IMarker;)L0java/lang/String;
 showMarker
  (Lorg/eclipse/ui/IWorkbenchPage;Lorg/eclipse/core/resources/IMarker;Z)Z
  (Lorg/eclipse/ui/IWorkbenchPage;Lorg/eclipse/core/resources/IMarker;Z)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/ColorPropertyDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/ColorPropertyDescriptor.eea
index b73388aeb2..e30350be8b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/ColorPropertyDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/ColorPropertyDescriptor.eea
@@ -5,4 +5,4 @@ class org/eclipse/ui/views/properties/ColorPropertyDescriptor
  (Ljava/lang/Object;Ljava/lang/String;)V
 createPropertyEditor
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/viewers/CellEditor;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/viewers/CellEditor;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/jface/viewers/CellEditor; # @Overrides(org.eclipse.ui.views.properties.PropertyDescriptor)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/ComboBoxPropertyDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/ComboBoxPropertyDescriptor.eea
index 88c3d3b40c..045c13d73f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/ComboBoxPropertyDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/ComboBoxPropertyDescriptor.eea
@@ -5,7 +5,7 @@ class org/eclipse/ui/views/properties/ComboBoxPropertyDescriptor
  (Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/String;)V
 createPropertyEditor
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/viewers/CellEditor;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/viewers/CellEditor;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/jface/viewers/CellEditor; # @Overrides(org.eclipse.ui.views.properties.PropertyDescriptor)
 getLabelProvider
  ()Lorg/eclipse/jface/viewers/ILabelProvider;
  ()Lorg/eclipse/jface/viewers/ILabelProvider;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/FilePropertySource.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/FilePropertySource.eea
index dd1ed77760..95a344b55b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/FilePropertySource.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/FilePropertySource.eea
@@ -5,7 +5,7 @@ class org/eclipse/ui/views/properties/FilePropertySource
  (Lorg/eclipse/core/resources/IFile;)V
 getPropertyDescriptors
  ()[Lorg/eclipse/ui/views/properties/IPropertyDescriptor;
- ()[Lorg/eclipse/ui/views/properties/IPropertyDescriptor;
+ ()[1Lorg/eclipse/ui/views/properties/IPropertyDescriptor;
 getPropertyValue
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L0java/lang/Object; # @Inherited(org.eclipse.ui.views.properties.ResourcePropertySource)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/IPropertyDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/IPropertyDescriptor.eea
index 576a639ac0..e5145fddcb 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/IPropertyDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/IPropertyDescriptor.eea
@@ -2,7 +2,7 @@ class org/eclipse/ui/views/properties/IPropertyDescriptor
 
 createPropertyEditor
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/viewers/CellEditor;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/viewers/CellEditor;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/jface/viewers/CellEditor;
 getCategory
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/PropertyDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/PropertyDescriptor.eea
index fb89cf3711..a2cfa2a72b 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/PropertyDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/PropertyDescriptor.eea
@@ -5,7 +5,7 @@ class org/eclipse/ui/views/properties/PropertyDescriptor
  (Ljava/lang/Object;Ljava/lang/String;)V
 createPropertyEditor
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/viewers/CellEditor;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/viewers/CellEditor;
+ (Lorg/eclipse/swt/widgets/Composite;)L0org/eclipse/jface/viewers/CellEditor; # @Overrides(org.eclipse.ui.views.properties.IPropertyDescriptor)
 getCategory
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/PropertyEditingSupport.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/PropertyEditingSupport.eea
index 4c1ceb58db..9a738b8e80 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/PropertyEditingSupport.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/PropertyEditingSupport.eea
@@ -15,7 +15,7 @@ canEdit
  (Ljava/lang/Object;)Z
 getCellEditor
  (Ljava/lang/Object;)Lorg/eclipse/jface/viewers/CellEditor;
- (Ljava/lang/Object;)Lorg/eclipse/jface/viewers/CellEditor;
+ (Ljava/lang/Object;)L0org/eclipse/jface/viewers/CellEditor;
 getValue
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/PropertySheet.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/PropertySheet.eea
index f87721baa2..f8b9712ed6 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/PropertySheet.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/PropertySheet.eea
@@ -12,31 +12,31 @@ added
  ([1L1org/eclipse/core/runtime/IExtensionPoint;)V # @Inherited(org.eclipse.core.runtime.IRegistryEventListener)
 createDefaultPage
  (Lorg/eclipse/ui/part/PageBook;)Lorg/eclipse/ui/part/IPage;
- (Lorg/eclipse/ui/part/PageBook;)Lorg/eclipse/ui/part/IPage;
+ (Lorg/eclipse/ui/part/PageBook;)L1org/eclipse/ui/part/IPage; # @Inherited(org.eclipse.ui.part.PageBookView)
 createPartControl
  (Lorg/eclipse/swt/widgets/Composite;)V
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.ui.part.PageBookView)
 createPropertySheetPage
  (Lorg/eclipse/ui/part/PageBook;)Lorg/eclipse/ui/part/IPage;
- (Lorg/eclipse/ui/part/PageBook;)Lorg/eclipse/ui/part/IPage;
+ (Lorg/eclipse/ui/part/PageBook;)L1org/eclipse/ui/part/IPage;
 doCreatePage
  (Lorg/eclipse/ui/IWorkbenchPart;)Lorg/eclipse/ui/part/PageBookView$PageRec;
- (Lorg/eclipse/ui/IWorkbenchPart;)Lorg/eclipse/ui/part/PageBookView$PageRec;
+ (Lorg/eclipse/ui/IWorkbenchPart;)L0org/eclipse/ui/part/PageBookView$PageRec;
 doDestroyPage
  (Lorg/eclipse/ui/IWorkbenchPart;Lorg/eclipse/ui/part/PageBookView$PageRec;)V
  (Lorg/eclipse/ui/IWorkbenchPart;Lorg/eclipse/ui/part/PageBookView$PageRec;)V
 getBootstrapPart
  ()Lorg/eclipse/ui/IWorkbenchPart;
- ()Lorg/eclipse/ui/IWorkbenchPart;
+ ()L0org/eclipse/ui/IWorkbenchPart;
 getSaveablePart
  ()Lorg/eclipse/ui/ISaveablePart;
- ()Lorg/eclipse/ui/ISaveablePart;
+ ()L0org/eclipse/ui/ISaveablePart;
 getShowInContext
  ()Lorg/eclipse/ui/part/ShowInContext;
  ()Lorg/eclipse/ui/part/ShowInContext;
 getViewAdapter
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)T0T; # @Inherited(org.eclipse.ui.part.PageBookView)
 init
  (Lorg/eclipse/ui/IViewSite;)V
  (Lorg/eclipse/ui/IViewSite;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/PropertySheetEntry.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/PropertySheetEntry.eea
index 7a54c02124..b98d3ea293 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/PropertySheetEntry.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/PropertySheetEntry.eea
@@ -5,10 +5,10 @@ addPropertySheetEntryListener
  (L1org/eclipse/ui/views/properties/IPropertySheetEntryListener;)V # @Inherited(org.eclipse.ui.views.properties.IPropertySheetEntry)
 createChildEntry
  ()Lorg/eclipse/ui/views/properties/PropertySheetEntry;
- ()Lorg/eclipse/ui/views/properties/PropertySheetEntry;
+ ()L1org/eclipse/ui/views/properties/PropertySheetEntry;
 getBackground
  ()Lorg/eclipse/swt/graphics/Color;
- ()Lorg/eclipse/swt/graphics/Color;
+ ()L0org/eclipse/swt/graphics/Color;
 getCategory
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -38,16 +38,16 @@ getFilters
  ()[Ljava/lang/String;
 getFont
  ()Lorg/eclipse/swt/graphics/Font;
- ()Lorg/eclipse/swt/graphics/Font;
+ ()L0org/eclipse/swt/graphics/Font;
 getForeground
  ()Lorg/eclipse/swt/graphics/Color;
- ()Lorg/eclipse/swt/graphics/Color;
+ ()L0org/eclipse/swt/graphics/Color;
 getHelpContextIds
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
 getImage
  ()Lorg/eclipse/swt/graphics/Image;
- ()Lorg/eclipse/swt/graphics/Image;
+ ()L0org/eclipse/swt/graphics/Image;
 getParent
  ()Lorg/eclipse/ui/views/properties/PropertySheetEntry;
  ()Lorg/eclipse/ui/views/properties/PropertySheetEntry;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/PropertySheetPage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/PropertySheetPage.eea
index fe73e52ea4..d1f93bc55c 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/PropertySheetPage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/PropertySheetPage.eea
@@ -15,7 +15,7 @@ getControl
  ()L0org/eclipse/swt/widgets/Control; # @Inherited(org.eclipse.ui.part.Page)
 getSaveablePart
  ()Lorg/eclipse/ui/ISaveablePart;
- ()Lorg/eclipse/ui/ISaveablePart;
+ ()L0org/eclipse/ui/ISaveablePart;
 handleEntrySelection
  (Lorg/eclipse/jface/viewers/ISelection;)V
  (Lorg/eclipse/jface/viewers/ISelection;)V
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/ResourcePropertySource.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/ResourcePropertySource.eea
index 7d339fa0be..27bb9c9d7d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/ResourcePropertySource.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/ResourcePropertySource.eea
@@ -34,13 +34,13 @@ getEditableValue
  ()Ljava/lang/Object;
 getFile
  (Lorg/eclipse/core/resources/IResource;)Ljava/io/File;
- (Lorg/eclipse/core/resources/IResource;)Ljava/io/File;
+ (Lorg/eclipse/core/resources/IResource;)L0java/io/File;
 getPropertyDescriptors
  ()[Lorg/eclipse/ui/views/properties/IPropertyDescriptor;
  ()[Lorg/eclipse/ui/views/properties/IPropertyDescriptor;
 getPropertyValue
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L0java/lang/Object;
 isPropertySet
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/TextPropertyDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/TextPropertyDescriptor.eea
index f3deeb815b..966307bb28 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/TextPropertyDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/TextPropertyDescriptor.eea
@@ -5,4 +5,4 @@ class org/eclipse/ui/views/properties/TextPropertyDescriptor
  (Ljava/lang/Object;Ljava/lang/String;)V
 createPropertyEditor
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/viewers/CellEditor;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/jface/viewers/CellEditor;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/jface/viewers/CellEditor; # @Overrides(org.eclipse.ui.views.properties.PropertyDescriptor)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/AbstractOverridableTabListPropertySection.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/AbstractOverridableTabListPropertySection.eea
index 7f58bb6ad4..a340f91571 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/AbstractOverridableTabListPropertySection.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/AbstractOverridableTabListPropertySection.eea
@@ -2,4 +2,4 @@ class org/eclipse/ui/views/properties/tabbed/AbstractOverridableTabListPropertyS
 
 getTabs
  ()[Lorg/eclipse/ui/views/properties/tabbed/ITabItem;
- ()[Lorg/eclipse/ui/views/properties/tabbed/ITabItem;
+ ()[1Lorg/eclipse/ui/views/properties/tabbed/ITabItem;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/AbstractSectionDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/AbstractSectionDescriptor.eea
index bde85bd090..7cbd466404 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/AbstractSectionDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/AbstractSectionDescriptor.eea
@@ -8,10 +8,10 @@ appliesTo
  (Lorg/eclipse/ui/IWorkbenchPart;Lorg/eclipse/jface/viewers/ISelection;)Z
 getAfterSection
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getFilter
  ()Lorg/eclipse/jface/viewers/IFilter;
- ()Lorg/eclipse/jface/viewers/IFilter;
+ ()L0org/eclipse/jface/viewers/IFilter;
 getInputTypes
  ()Ljava/util/List;
- ()Ljava/util/List;
+ ()L1java/util/List;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/AbstractTabDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/AbstractTabDescriptor.eea
index 90934bbc1f..a61ce878c9 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/AbstractTabDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/AbstractTabDescriptor.eea
@@ -5,16 +5,16 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 createTab
  ()Lorg/eclipse/ui/views/properties/tabbed/TabContents;
- ()Lorg/eclipse/ui/views/properties/tabbed/TabContents;
+ ()L1org/eclipse/ui/views/properties/tabbed/TabContents; # @Inherited(org.eclipse.ui.views.properties.tabbed.ITabDescriptor)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getAfterTab
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getImage
  ()Lorg/eclipse/swt/graphics/Image;
- ()Lorg/eclipse/swt/graphics/Image;
+ ()L0org/eclipse/swt/graphics/Image;
 getSectionDescriptors
  ()Ljava/util/List;
  ()Ljava/util/List;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/ITabDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/ITabDescriptor.eea
index 6166f29503..780e7a6734 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/ITabDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/ITabDescriptor.eea
@@ -6,7 +6,7 @@ TOP
 
 createTab
  ()Lorg/eclipse/ui/views/properties/tabbed/TabContents;
- ()Lorg/eclipse/ui/views/properties/tabbed/TabContents;
+ ()L1org/eclipse/ui/views/properties/tabbed/TabContents;
 getAfterTab
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/TabContents.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/TabContents.eea
index e5588a1da2..05056421c4 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/TabContents.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/TabContents.eea
@@ -5,7 +5,7 @@ createControls
  (L1org/eclipse/swt/widgets/Composite;L1org/eclipse/ui/views/properties/tabbed/TabbedPropertySheetPage;)V
 getSectionAtIndex
  (I)Lorg/eclipse/ui/views/properties/tabbed/ISection;
- (I)Lorg/eclipse/ui/views/properties/tabbed/ISection;
+ (I)L0org/eclipse/ui/views/properties/tabbed/ISection;
 getSectionIndex
  (Lorg/eclipse/ui/views/properties/tabbed/ISection;)I
  (Lorg/eclipse/ui/views/properties/tabbed/ISection;)I
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/TabbedPropertySheetPage.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/TabbedPropertySheetPage.eea
index 66a7378d34..1f58169f60 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/TabbedPropertySheetPage.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/TabbedPropertySheetPage.eea
@@ -18,7 +18,7 @@ createControl
  (L1org/eclipse/swt/widgets/Composite;)V # @Inherited(org.eclipse.ui.part.Page)
 createTab
  (Lorg/eclipse/ui/views/properties/tabbed/ITabDescriptor;)Lorg/eclipse/ui/views/properties/tabbed/TabContents;
- (Lorg/eclipse/ui/views/properties/tabbed/ITabDescriptor;)Lorg/eclipse/ui/views/properties/tabbed/TabContents;
+ (Lorg/eclipse/ui/views/properties/tabbed/ITabDescriptor;)L1org/eclipse/ui/views/properties/tabbed/TabContents;
 disposeTabs
  (Ljava/util/Collection;)V
  (Ljava/util/Collection;)V
@@ -39,7 +39,7 @@ getCurrentTab
  ()Lorg/eclipse/ui/views/properties/tabbed/TabContents;
 getSelectedTab
  ()Lorg/eclipse/ui/views/properties/tabbed/ITabDescriptor;
- ()Lorg/eclipse/ui/views/properties/tabbed/ITabDescriptor;
+ ()L0org/eclipse/ui/views/properties/tabbed/ITabDescriptor;
 getSelectionContributor
  ()Lorg/eclipse/ui/views/properties/tabbed/ITabbedPropertySheetPageContributor;
  ()Lorg/eclipse/ui/views/properties/tabbed/ITabbedPropertySheetPageContributor;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/TabbedPropertySheetWidgetFactory.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/TabbedPropertySheetWidgetFactory.eea
index 4563732a7e..78275cb148 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/TabbedPropertySheetWidgetFactory.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/views/properties/tabbed/TabbedPropertySheetWidgetFactory.eea
@@ -2,40 +2,40 @@ class org/eclipse/ui/views/properties/tabbed/TabbedPropertySheetWidgetFactory
 
 createCCombo
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/custom/CCombo;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/custom/CCombo;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/custom/CCombo;
 createCCombo
  (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/custom/CCombo;
- (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/custom/CCombo;
+ (Lorg/eclipse/swt/widgets/Composite;I)L1org/eclipse/swt/custom/CCombo;
 createCLabel
  (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)Lorg/eclipse/swt/custom/CLabel;
- (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)Lorg/eclipse/swt/custom/CLabel;
+ (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)L1org/eclipse/swt/custom/CLabel;
 createCLabel
  (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;I)Lorg/eclipse/swt/custom/CLabel;
- (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;I)Lorg/eclipse/swt/custom/CLabel;
+ (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;I)L1org/eclipse/swt/custom/CLabel;
 createComposite
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Composite;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Composite;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Composite; # @Inherited(org.eclipse.ui.forms.widgets.FormToolkit)
 createComposite
  (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/widgets/Composite;
- (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/widgets/Composite;
+ (Lorg/eclipse/swt/widgets/Composite;I)L1org/eclipse/swt/widgets/Composite; # @Inherited(org.eclipse.ui.forms.widgets.FormToolkit)
 createFlatFormComposite
  (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Composite;
- (Lorg/eclipse/swt/widgets/Composite;)Lorg/eclipse/swt/widgets/Composite;
+ (Lorg/eclipse/swt/widgets/Composite;)L1org/eclipse/swt/widgets/Composite;
 createGroup
  (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)Lorg/eclipse/swt/widgets/Group;
- (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)Lorg/eclipse/swt/widgets/Group;
+ (Lorg/eclipse/swt/widgets/Composite;Ljava/lang/String;)L1org/eclipse/swt/widgets/Group;
 createList
  (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/widgets/List;
- (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/widgets/List;
+ (Lorg/eclipse/swt/widgets/Composite;I)L1org/eclipse/swt/widgets/List;
 createPlainComposite
  (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/widgets/Composite;
- (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/widgets/Composite;
+ (Lorg/eclipse/swt/widgets/Composite;I)L1org/eclipse/swt/widgets/Composite;
 createScrolledComposite
  (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/custom/ScrolledComposite;
- (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/custom/ScrolledComposite;
+ (Lorg/eclipse/swt/widgets/Composite;I)L1org/eclipse/swt/custom/ScrolledComposite;
 createTabFolder
  (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/custom/CTabFolder;
- (Lorg/eclipse/swt/widgets/Composite;I)Lorg/eclipse/swt/custom/CTabFolder;
+ (Lorg/eclipse/swt/widgets/Composite;I)L1org/eclipse/swt/custom/CTabFolder;
 createTabItem
  (Lorg/eclipse/swt/custom/CTabFolder;I)Lorg/eclipse/swt/custom/CTabItem;
- (Lorg/eclipse/swt/custom/CTabFolder;I)Lorg/eclipse/swt/custom/CTabItem;
+ (Lorg/eclipse/swt/custom/CTabFolder;I)L1org/eclipse/swt/custom/CTabItem;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/IWizardDescriptor.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/IWizardDescriptor.eea
index e087be0f3c..c0d50a645d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/IWizardDescriptor.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/IWizardDescriptor.eea
@@ -5,7 +5,7 @@ adaptedSelection
  (Lorg/eclipse/jface/viewers/IStructuredSelection;)Lorg/eclipse/jface/viewers/IStructuredSelection;
 createWizard
  ()Lorg/eclipse/ui/IWorkbenchWizard;
- ()Lorg/eclipse/ui/IWorkbenchWizard;
+ ()L1org/eclipse/ui/IWorkbenchWizard;
 getCategory
  ()Lorg/eclipse/ui/wizards/IWizardCategory;
  ()Lorg/eclipse/ui/wizards/IWizardCategory;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/datatransfer/FileStoreStructureProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/datatransfer/FileStoreStructureProvider.eea
index ac54c797f7..91667f3257 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/datatransfer/FileStoreStructureProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/datatransfer/FileStoreStructureProvider.eea
@@ -9,7 +9,7 @@ getChildren
  (Ljava/lang/Object;)Ljava/util/List;
 getContents
  (Ljava/lang/Object;)Ljava/io/InputStream;
- (Ljava/lang/Object;)Ljava/io/InputStream;
+ (Ljava/lang/Object;)L0java/io/InputStream;
 getFullPath
  (Ljava/lang/Object;)Ljava/lang/String;
  (Ljava/lang/Object;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/datatransfer/FileSystemStructureProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/datatransfer/FileSystemStructureProvider.eea
index 1db362d14c..dd4f8641bb 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/datatransfer/FileSystemStructureProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/datatransfer/FileSystemStructureProvider.eea
@@ -6,10 +6,10 @@ INSTANCE
 
 getChildren
  (Ljava/lang/Object;)Ljava/util/List;
- (Ljava/lang/Object;)Ljava/util/List;
+ (Ljava/lang/Object;)L1java/util/List;
 getContents
  (Ljava/lang/Object;)Ljava/io/InputStream;
- (Ljava/lang/Object;)Ljava/io/InputStream;
+ (Ljava/lang/Object;)L0java/io/InputStream;
 getFullPath
  (Ljava/lang/Object;)Ljava/lang/String;
  (Ljava/lang/Object;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/datatransfer/PopulateRootOperation.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/datatransfer/PopulateRootOperation.eea
index 6ab6e30ac3..d119552384 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/datatransfer/PopulateRootOperation.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/datatransfer/PopulateRootOperation.eea
@@ -5,7 +5,7 @@ class org/eclipse/ui/wizards/datatransfer/PopulateRootOperation
  (Ljava/lang/Object;Lorg/eclipse/ui/wizards/datatransfer/IImportStructureProvider;)V
 createElement
  (Lorg/eclipse/ui/dialogs/FileSystemElement;Ljava/lang/Object;)Lorg/eclipse/ui/dialogs/FileSystemElement;
- (Lorg/eclipse/ui/dialogs/FileSystemElement;Ljava/lang/Object;)Lorg/eclipse/ui/dialogs/FileSystemElement;
+ (Lorg/eclipse/ui/dialogs/FileSystemElement;Ljava/lang/Object;)L1org/eclipse/ui/dialogs/FileSystemElement; # @Overrides(org.eclipse.ui.wizards.datatransfer.SelectFilesOperation)
 createElement
  (Lorg/eclipse/ui/dialogs/FileSystemElement;Ljava/lang/Object;I)Lorg/eclipse/ui/dialogs/FileSystemElement;
- (Lorg/eclipse/ui/dialogs/FileSystemElement;Ljava/lang/Object;I)Lorg/eclipse/ui/dialogs/FileSystemElement;
+ (Lorg/eclipse/ui/dialogs/FileSystemElement;Ljava/lang/Object;I)L1org/eclipse/ui/dialogs/FileSystemElement;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/datatransfer/SelectFilesOperation.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/datatransfer/SelectFilesOperation.eea
index 815b5eba55..3b64d70365 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/datatransfer/SelectFilesOperation.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/datatransfer/SelectFilesOperation.eea
@@ -5,7 +5,7 @@ class org/eclipse/ui/wizards/datatransfer/SelectFilesOperation
  (Ljava/lang/Object;Lorg/eclipse/ui/wizards/datatransfer/IImportStructureProvider;)V
 createElement
  (Lorg/eclipse/ui/dialogs/FileSystemElement;Ljava/lang/Object;)Lorg/eclipse/ui/dialogs/FileSystemElement;
- (Lorg/eclipse/ui/dialogs/FileSystemElement;Ljava/lang/Object;)Lorg/eclipse/ui/dialogs/FileSystemElement;
+ (Lorg/eclipse/ui/dialogs/FileSystemElement;Ljava/lang/Object;)L0org/eclipse/ui/dialogs/FileSystemElement;
 getExtensionFor
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/datatransfer/ZipFileImportWizard.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/datatransfer/ZipFileImportWizard.eea
index 3c56242211..6a346a8c1f 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/datatransfer/ZipFileImportWizard.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/datatransfer/ZipFileImportWizard.eea
@@ -2,7 +2,7 @@ class org/eclipse/ui/wizards/datatransfer/ZipFileImportWizard
 
 getFileImportMask
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String;
 init
  (Lorg/eclipse/ui/IWorkbench;Lorg/eclipse/jface/viewers/IStructuredSelection;)V
  (L1org/eclipse/ui/IWorkbench;L1org/eclipse/jface/viewers/IStructuredSelection;)V # @Inherited(org.eclipse.ui.IWorkbenchWizard)
diff --git a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/datatransfer/ZipFileStructureProvider.eea b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/datatransfer/ZipFileStructureProvider.eea
index 1dc0842f69..03f2e2c59d 100644
--- a/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/datatransfer/ZipFileStructureProvider.eea
+++ b/libs/eea-eclipse-platform/src/main/resources/org/eclipse/ui/wizards/datatransfer/ZipFileStructureProvider.eea
@@ -17,7 +17,7 @@ getChildren
  (Ljava/lang/Object;)Ljava/util/List<*>;
 getContents
  (Ljava/lang/Object;)Ljava/io/InputStream;
- (Ljava/lang/Object;)Ljava/io/InputStream;
+ (Ljava/lang/Object;)L0java/io/InputStream;
 getFullPath
  (Ljava/lang/Object;)Ljava/lang/String;
  (Ljava/lang/Object;)Ljava/lang/String;
diff --git a/libs/eea-gson-2/src/main/resources/com/google/gson/Gson.eea b/libs/eea-gson-2/src/main/resources/com/google/gson/Gson.eea
index dc43fdcadc..e12c9caf4b 100644
--- a/libs/eea-gson-2/src/main/resources/com/google/gson/Gson.eea
+++ b/libs/eea-gson-2/src/main/resources/com/google/gson/Gson.eea
@@ -17,7 +17,7 @@ fromJson
  <T:Ljava/lang/Object;>(L0com/google/gson/JsonElement;L1java/lang/reflect/Type;)T0T;
 fromJson
  <T:Ljava/lang/Object;>(Lcom/google/gson/stream/JsonReader;Lcom/google/gson/reflect/TypeToken<TT;>;)TT;
- <T:Ljava/lang/Object;>(Lcom/google/gson/stream/JsonReader;Lcom/google/gson/reflect/TypeToken<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Lcom/google/gson/stream/JsonReader;Lcom/google/gson/reflect/TypeToken<TT;>;)T0T;
 fromJson
  <T:Ljava/lang/Object;>(Lcom/google/gson/stream/JsonReader;Ljava/lang/reflect/Type;)TT;
  <T:Ljava/lang/Object;>(L1com/google/gson/stream/JsonReader;L1java/lang/reflect/Type;)T0T;
diff --git a/libs/eea-gson-2/src/main/resources/com/google/gson/InstanceCreator.eea b/libs/eea-gson-2/src/main/resources/com/google/gson/InstanceCreator.eea
index 0d6fbb9a1d..6941ba103f 100644
--- a/libs/eea-gson-2/src/main/resources/com/google/gson/InstanceCreator.eea
+++ b/libs/eea-gson-2/src/main/resources/com/google/gson/InstanceCreator.eea
@@ -4,4 +4,4 @@ class com/google/gson/InstanceCreator
 
 createInstance
  (Ljava/lang/reflect/Type;)TT;
- (Ljava/lang/reflect/Type;)TT;
+ (Ljava/lang/reflect/Type;)T1T;
diff --git a/libs/eea-gson-2/src/main/resources/com/google/gson/JsonArray.eea b/libs/eea-gson-2/src/main/resources/com/google/gson/JsonArray.eea
index c0ab155022..c793e4b64a 100644
--- a/libs/eea-gson-2/src/main/resources/com/google/gson/JsonArray.eea
+++ b/libs/eea-gson-2/src/main/resources/com/google/gson/JsonArray.eea
@@ -24,13 +24,13 @@ addAll
  (Lcom/google/gson/JsonArray;)V
 asList
  ()Ljava/util/List<Lcom/google/gson/JsonElement;>;
- ()Ljava/util/List<Lcom/google/gson/JsonElement;>;
+ ()L1java/util/List<Lcom/google/gson/JsonElement;>;
 contains
  (Lcom/google/gson/JsonElement;)Z
  (Lcom/google/gson/JsonElement;)Z
 deepCopy
  ()Lcom/google/gson/JsonArray;
- ()Lcom/google/gson/JsonArray;
+ ()L1com/google/gson/JsonArray;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-gson-2/src/main/resources/com/google/gson/JsonObject.eea b/libs/eea-gson-2/src/main/resources/com/google/gson/JsonObject.eea
index 39824d9c8b..3e63c6fc01 100644
--- a/libs/eea-gson-2/src/main/resources/com/google/gson/JsonObject.eea
+++ b/libs/eea-gson-2/src/main/resources/com/google/gson/JsonObject.eea
@@ -20,7 +20,7 @@ asMap
  ()Ljava/util/Map<Ljava/lang/String;Lcom/google/gson/JsonElement;>;
 deepCopy
  ()Lcom/google/gson/JsonObject;
- ()Lcom/google/gson/JsonObject;
+ ()L1com/google/gson/JsonObject;
 entrySet
  ()Ljava/util/Set<Ljava/util/Map$Entry<Ljava/lang/String;Lcom/google/gson/JsonElement;>;>;
  ()Ljava/util/Set<Ljava/util/Map$Entry<Ljava/lang/String;Lcom/google/gson/JsonElement;>;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/base/Ascii.eea b/libs/eea-guava/src/main/resources/com/google/common/base/Ascii.eea
index 89df04d532..2cd957686e 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/base/Ascii.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/base/Ascii.eea
@@ -17,4 +17,4 @@ toUpperCase
  (Ljava/lang/String;)Ljava/lang/String;
 truncate
  (Ljava/lang/CharSequence;ILjava/lang/String;)Ljava/lang/String;
- (Ljava/lang/CharSequence;ILjava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/CharSequence;ILjava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/base/CaseFormat.eea b/libs/eea-guava/src/main/resources/com/google/common/base/CaseFormat.eea
index e8a98dd09f..4d50fb338b 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/base/CaseFormat.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/base/CaseFormat.eea
@@ -6,7 +6,7 @@ super java/lang/Enum
 
 converterTo
  (Lcom/google/common/base/CaseFormat;)Lcom/google/common/base/Converter<Ljava/lang/String;Ljava/lang/String;>;
- (Lcom/google/common/base/CaseFormat;)Lcom/google/common/base/Converter<Ljava/lang/String;Ljava/lang/String;>;
+ (Lcom/google/common/base/CaseFormat;)L1com/google/common/base/Converter<Ljava/lang/String;Ljava/lang/String;>;
 to
  (Lcom/google/common/base/CaseFormat;Ljava/lang/String;)Ljava/lang/String;
  (Lcom/google/common/base/CaseFormat;Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/base/CharMatcher.eea b/libs/eea-guava/src/main/resources/com/google/common/base/CharMatcher.eea
index f1a71a5012..85467b9eac 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/base/CharMatcher.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/base/CharMatcher.eea
@@ -21,19 +21,19 @@ digit
  ()Lcom/google/common/base/CharMatcher;
 forPredicate
  (Lcom/google/common/base/Predicate<-Ljava/lang/Character;>;)Lcom/google/common/base/CharMatcher;
- (Lcom/google/common/base/Predicate<-Ljava/lang/Character;>;)Lcom/google/common/base/CharMatcher;
+ (Lcom/google/common/base/Predicate<-Ljava/lang/Character;>;)L1com/google/common/base/CharMatcher;
 inRange
  (CC)Lcom/google/common/base/CharMatcher;
- (CC)Lcom/google/common/base/CharMatcher;
+ (CC)L1com/google/common/base/CharMatcher;
 invisible
  ()Lcom/google/common/base/CharMatcher;
  ()Lcom/google/common/base/CharMatcher;
 is
  (C)Lcom/google/common/base/CharMatcher;
- (C)Lcom/google/common/base/CharMatcher;
+ (C)L1com/google/common/base/CharMatcher;
 isNot
  (C)Lcom/google/common/base/CharMatcher;
- (C)Lcom/google/common/base/CharMatcher;
+ (C)L1com/google/common/base/CharMatcher;
 javaDigit
  ()Lcom/google/common/base/CharMatcher;
  ()Lcom/google/common/base/CharMatcher;
@@ -67,7 +67,7 @@ whitespace
 
 and
  (Lcom/google/common/base/CharMatcher;)Lcom/google/common/base/CharMatcher;
- (Lcom/google/common/base/CharMatcher;)Lcom/google/common/base/CharMatcher;
+ (Lcom/google/common/base/CharMatcher;)L1com/google/common/base/CharMatcher;
 apply
  (Ljava/lang/Character;)Z
  (Ljava/lang/Character;)Z
@@ -97,10 +97,10 @@ matchesNoneOf
  (Ljava/lang/CharSequence;)Z
 negate
  ()Lcom/google/common/base/CharMatcher;
- ()Lcom/google/common/base/CharMatcher;
+ ()L1com/google/common/base/CharMatcher;
 or
  (Lcom/google/common/base/CharMatcher;)Lcom/google/common/base/CharMatcher;
- (Lcom/google/common/base/CharMatcher;)Lcom/google/common/base/CharMatcher;
+ (Lcom/google/common/base/CharMatcher;)L1com/google/common/base/CharMatcher;
 precomputed
  ()Lcom/google/common/base/CharMatcher;
  ()Lcom/google/common/base/CharMatcher;
@@ -109,7 +109,7 @@ removeFrom
  (Ljava/lang/CharSequence;)Ljava/lang/String;
 replaceFrom
  (Ljava/lang/CharSequence;C)Ljava/lang/String;
- (Ljava/lang/CharSequence;C)Ljava/lang/String;
+ (Ljava/lang/CharSequence;C)L1java/lang/String;
 replaceFrom
  (Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Ljava/lang/String;
  (Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Ljava/lang/String;
@@ -124,10 +124,10 @@ trimAndCollapseFrom
  (Ljava/lang/CharSequence;C)Ljava/lang/String;
 trimFrom
  (Ljava/lang/CharSequence;)Ljava/lang/String;
- (Ljava/lang/CharSequence;)Ljava/lang/String;
+ (Ljava/lang/CharSequence;)L1java/lang/String;
 trimLeadingFrom
  (Ljava/lang/CharSequence;)Ljava/lang/String;
- (Ljava/lang/CharSequence;)Ljava/lang/String;
+ (Ljava/lang/CharSequence;)L1java/lang/String;
 trimTrailingFrom
  (Ljava/lang/CharSequence;)Ljava/lang/String;
- (Ljava/lang/CharSequence;)Ljava/lang/String;
+ (Ljava/lang/CharSequence;)L1java/lang/String;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/base/Converter.eea b/libs/eea-guava/src/main/resources/com/google/common/base/Converter.eea
index e0d722c33d..20d3aab84a 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/base/Converter.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/base/Converter.eea
@@ -8,7 +8,7 @@ super com/google/common/base/Function
 
 from
  <A:Ljava/lang/Object;B:Ljava/lang/Object;>(Lcom/google/common/base/Function<-TA;+TB;>;Lcom/google/common/base/Function<-TB;+TA;>;)Lcom/google/common/base/Converter<TA;TB;>;
- <A:Ljava/lang/Object;B:Ljava/lang/Object;>(Lcom/google/common/base/Function<-TA;+TB;>;Lcom/google/common/base/Function<-TB;+TA;>;)Lcom/google/common/base/Converter<TA;TB;>;
+ <A:Ljava/lang/Object;B:Ljava/lang/Object;>(Lcom/google/common/base/Function<-TA;+TB;>;Lcom/google/common/base/Function<-TB;+TA;>;)L1com/google/common/base/Converter<TA;TB;>;
 identity
  <T:Ljava/lang/Object;>()Lcom/google/common/base/Converter<TT;TT;>;
  <T:Ljava/lang/Object;>()Lcom/google/common/base/Converter<TT;TT;>;
@@ -24,7 +24,7 @@ convert
  (TA;)T0B;
 convertAll
  (Ljava/lang/Iterable<+TA;>;)Ljava/lang/Iterable<TB;>;
- (Ljava/lang/Iterable<+TA;>;)Ljava/lang/Iterable<TB;>;
+ (Ljava/lang/Iterable<+TA;>;)L1java/lang/Iterable<TB;>;
 doBackward
  (TB;)TA;
  (TB;)TA;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/base/Enums.eea b/libs/eea-guava/src/main/resources/com/google/common/base/Enums.eea
index fe691856f6..0953101b03 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/base/Enums.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/base/Enums.eea
@@ -8,4 +8,4 @@ getIfPresent
  <T:Ljava/lang/Enum<TT;>;>(Ljava/lang/Class<TT;>;Ljava/lang/String;)Lcom/google/common/base/Optional<TT;>;
 stringConverter
  <T:Ljava/lang/Enum<TT;>;>(Ljava/lang/Class<TT;>;)Lcom/google/common/base/Converter<Ljava/lang/String;TT;>;
- <T:Ljava/lang/Enum<TT;>;>(Ljava/lang/Class<TT;>;)Lcom/google/common/base/Converter<Ljava/lang/String;TT;>;
+ <T:Ljava/lang/Enum<TT;>;>(Ljava/lang/Class<TT;>;)L1com/google/common/base/Converter<Ljava/lang/String;TT;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/base/Equivalence.eea b/libs/eea-guava/src/main/resources/com/google/common/base/Equivalence.eea
index c454aea425..338c543ef9 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/base/Equivalence.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/base/Equivalence.eea
@@ -24,19 +24,19 @@ equivalent
  (TT;TT;)Z
 equivalentTo
  (TT;)Lcom/google/common/base/Predicate<TT;>;
- (TT;)Lcom/google/common/base/Predicate<TT;>;
+ (TT;)L1com/google/common/base/Predicate<TT;>;
 hash
  (TT;)I
  (TT;)I
 onResultOf
  <F:Ljava/lang/Object;>(Lcom/google/common/base/Function<-TF;+TT;>;)Lcom/google/common/base/Equivalence<TF;>;
- <F:Ljava/lang/Object;>(Lcom/google/common/base/Function<-TF;+TT;>;)Lcom/google/common/base/Equivalence<TF;>;
+ <F:Ljava/lang/Object;>(Lcom/google/common/base/Function<-TF;+TT;>;)L1com/google/common/base/Equivalence<TF;>;
 pairwise
  <S:TT;>()Lcom/google/common/base/Equivalence<Ljava/lang/Iterable<TS;>;>;
- <S:TT;>()Lcom/google/common/base/Equivalence<Ljava/lang/Iterable<TS;>;>;
+ <S:TT;>()L1com/google/common/base/Equivalence<Ljava/lang/Iterable<TS;>;>;
 test
  (TT;TT;)Z
  (TT;TT;)Z
 wrap
  <S:TT;>(TS;)Lcom/google/common/base/Equivalence$Wrapper<TS;>;
- <S:TT;>(TS;)Lcom/google/common/base/Equivalence$Wrapper<TS;>;
+ <S:TT;>(TS;)L1com/google/common/base/Equivalence$Wrapper<TS;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/base/Functions.eea b/libs/eea-guava/src/main/resources/com/google/common/base/Functions.eea
index c0fe230b56..7685cc4ebf 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/base/Functions.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/base/Functions.eea
@@ -2,22 +2,22 @@ class com/google/common/base/Functions
 
 compose
  <A:Ljava/lang/Object;B:Ljava/lang/Object;C:Ljava/lang/Object;>(Lcom/google/common/base/Function<TB;TC;>;Lcom/google/common/base/Function<TA;+TB;>;)Lcom/google/common/base/Function<TA;TC;>;
- <A:Ljava/lang/Object;B:Ljava/lang/Object;C:Ljava/lang/Object;>(Lcom/google/common/base/Function<TB;TC;>;Lcom/google/common/base/Function<TA;+TB;>;)Lcom/google/common/base/Function<TA;TC;>;
+ <A:Ljava/lang/Object;B:Ljava/lang/Object;C:Ljava/lang/Object;>(Lcom/google/common/base/Function<TB;TC;>;Lcom/google/common/base/Function<TA;+TB;>;)L1com/google/common/base/Function<TA;TC;>;
 constant
  <E:Ljava/lang/Object;>(TE;)Lcom/google/common/base/Function<Ljava/lang/Object;TE;>;
- <E:Ljava/lang/Object;>(TE;)Lcom/google/common/base/Function<Ljava/lang/Object;TE;>;
+ <E:Ljava/lang/Object;>(TE;)L1com/google/common/base/Function<Ljava/lang/Object;TE;>;
 forMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;+TV;>;TV;)Lcom/google/common/base/Function<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;+TV;>;TV;)Lcom/google/common/base/Function<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;+TV;>;TV;)L1com/google/common/base/Function<TK;TV;>;
 forMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;TV;>;)Lcom/google/common/base/Function<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;TV;>;)Lcom/google/common/base/Function<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;TV;>;)L1com/google/common/base/Function<TK;TV;>;
 forPredicate
  <T:Ljava/lang/Object;>(Lcom/google/common/base/Predicate<TT;>;)Lcom/google/common/base/Function<TT;Ljava/lang/Boolean;>;
- <T:Ljava/lang/Object;>(Lcom/google/common/base/Predicate<TT;>;)Lcom/google/common/base/Function<TT;Ljava/lang/Boolean;>;
+ <T:Ljava/lang/Object;>(Lcom/google/common/base/Predicate<TT;>;)L1com/google/common/base/Function<TT;Ljava/lang/Boolean;>;
 forSupplier
  <F:Ljava/lang/Object;T:Ljava/lang/Object;>(Lcom/google/common/base/Supplier<TT;>;)Lcom/google/common/base/Function<TF;TT;>;
- <F:Ljava/lang/Object;T:Ljava/lang/Object;>(Lcom/google/common/base/Supplier<TT;>;)Lcom/google/common/base/Function<TF;TT;>;
+ <F:Ljava/lang/Object;T:Ljava/lang/Object;>(Lcom/google/common/base/Supplier<TT;>;)L1com/google/common/base/Function<TF;TT;>;
 identity
  <E:Ljava/lang/Object;>()Lcom/google/common/base/Function<TE;TE;>;
  <E:Ljava/lang/Object;>()Lcom/google/common/base/Function<TE;TE;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/base/Joiner$MapJoiner.eea b/libs/eea-guava/src/main/resources/com/google/common/base/Joiner$MapJoiner.eea
index 060028ef81..738c22359b 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/base/Joiner$MapJoiner.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/base/Joiner$MapJoiner.eea
@@ -23,7 +23,7 @@ join
  (Ljava/lang/Iterable<+Ljava/util/Map$Entry<**>;>;)Ljava/lang/String;
 join
  (Ljava/util/Iterator<+Ljava/util/Map$Entry<**>;>;)Ljava/lang/String;
- (Ljava/util/Iterator<+Ljava/util/Map$Entry<**>;>;)Ljava/lang/String;
+ (Ljava/util/Iterator<+Ljava/util/Map$Entry<**>;>;)L1java/lang/String;
 join
  (Ljava/util/Map<**>;)Ljava/lang/String;
  (Ljava/util/Map<**>;)Ljava/lang/String;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/base/Joiner.eea b/libs/eea-guava/src/main/resources/com/google/common/base/Joiner.eea
index 1608c75155..3c75217c65 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/base/Joiner.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/base/Joiner.eea
@@ -2,10 +2,10 @@ class com/google/common/base/Joiner
 
 on
  (C)Lcom/google/common/base/Joiner;
- (C)Lcom/google/common/base/Joiner;
+ (C)L1com/google/common/base/Joiner;
 on
  (Ljava/lang/String;)Lcom/google/common/base/Joiner;
- (Ljava/lang/String;)Lcom/google/common/base/Joiner;
+ (Ljava/lang/String;)L1com/google/common/base/Joiner;
 
 appendTo
  (Ljava/lang/StringBuilder;Ljava/lang/Iterable<+Ljava/lang/Object;>;)Ljava/lang/StringBuilder;
@@ -39,19 +39,19 @@ join
  (Ljava/lang/Object;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/String;
 join
  (Ljava/util/Iterator<+Ljava/lang/Object;>;)Ljava/lang/String;
- (Ljava/util/Iterator<+Ljava/lang/Object;>;)Ljava/lang/String;
+ (Ljava/util/Iterator<+Ljava/lang/Object;>;)L1java/lang/String;
 join
  ([Ljava/lang/Object;)Ljava/lang/String;
  ([Ljava/lang/Object;)Ljava/lang/String;
 skipNulls
  ()Lcom/google/common/base/Joiner;
- ()Lcom/google/common/base/Joiner;
+ ()L1com/google/common/base/Joiner;
 useForNull
  (Ljava/lang/String;)Lcom/google/common/base/Joiner;
- (Ljava/lang/String;)Lcom/google/common/base/Joiner;
+ (Ljava/lang/String;)L1com/google/common/base/Joiner;
 withKeyValueSeparator
  (C)Lcom/google/common/base/Joiner$MapJoiner;
  (C)Lcom/google/common/base/Joiner$MapJoiner;
 withKeyValueSeparator
  (Ljava/lang/String;)Lcom/google/common/base/Joiner$MapJoiner;
- (Ljava/lang/String;)Lcom/google/common/base/Joiner$MapJoiner;
+ (Ljava/lang/String;)L1com/google/common/base/Joiner$MapJoiner;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/base/Predicates.eea b/libs/eea-guava/src/main/resources/com/google/common/base/Predicates.eea
index 1bddcb0881..875ad683e2 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/base/Predicates.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/base/Predicates.eea
@@ -8,49 +8,49 @@ alwaysTrue
  <T:Ljava/lang/Object;>()Lcom/google/common/base/Predicate<TT;>;
 and
  <T:Ljava/lang/Object;>(Lcom/google/common/base/Predicate<-TT;>;Lcom/google/common/base/Predicate<-TT;>;)Lcom/google/common/base/Predicate<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/common/base/Predicate<-TT;>;Lcom/google/common/base/Predicate<-TT;>;)Lcom/google/common/base/Predicate<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/common/base/Predicate<-TT;>;Lcom/google/common/base/Predicate<-TT;>;)L1com/google/common/base/Predicate<TT;>;
 and
  <T:Ljava/lang/Object;>(Ljava/lang/Iterable<+Lcom/google/common/base/Predicate<-TT;>;>;)Lcom/google/common/base/Predicate<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Iterable<+Lcom/google/common/base/Predicate<-TT;>;>;)Lcom/google/common/base/Predicate<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Iterable<+Lcom/google/common/base/Predicate<-TT;>;>;)L1com/google/common/base/Predicate<TT;>;
 and
  <T:Ljava/lang/Object;>([Lcom/google/common/base/Predicate<-TT;>;)Lcom/google/common/base/Predicate<TT;>;
- <T:Ljava/lang/Object;>([Lcom/google/common/base/Predicate<-TT;>;)Lcom/google/common/base/Predicate<TT;>;
+ <T:Ljava/lang/Object;>([Lcom/google/common/base/Predicate<-TT;>;)L1com/google/common/base/Predicate<TT;>;
 compose
  <A:Ljava/lang/Object;B:Ljava/lang/Object;>(Lcom/google/common/base/Predicate<TB;>;Lcom/google/common/base/Function<TA;+TB;>;)Lcom/google/common/base/Predicate<TA;>;
- <A:Ljava/lang/Object;B:Ljava/lang/Object;>(Lcom/google/common/base/Predicate<TB;>;Lcom/google/common/base/Function<TA;+TB;>;)Lcom/google/common/base/Predicate<TA;>;
+ <A:Ljava/lang/Object;B:Ljava/lang/Object;>(Lcom/google/common/base/Predicate<TB;>;Lcom/google/common/base/Function<TA;+TB;>;)L1com/google/common/base/Predicate<TA;>;
 contains
  (Ljava/util/regex/Pattern;)Lcom/google/common/base/Predicate<Ljava/lang/CharSequence;>;
- (Ljava/util/regex/Pattern;)Lcom/google/common/base/Predicate<Ljava/lang/CharSequence;>;
+ (Ljava/util/regex/Pattern;)L1com/google/common/base/Predicate<Ljava/lang/CharSequence;>;
 containsPattern
  (Ljava/lang/String;)Lcom/google/common/base/Predicate<Ljava/lang/CharSequence;>;
- (Ljava/lang/String;)Lcom/google/common/base/Predicate<Ljava/lang/CharSequence;>;
+ (Ljava/lang/String;)L1com/google/common/base/Predicate<Ljava/lang/CharSequence;>;
 equalTo
  <T:Ljava/lang/Object;>(TT;)Lcom/google/common/base/Predicate<TT;>;
  <T:Ljava/lang/Object;>(TT;)Lcom/google/common/base/Predicate<TT;>;
 in
  <T:Ljava/lang/Object;>(Ljava/util/Collection<+TT;>;)Lcom/google/common/base/Predicate<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/Collection<+TT;>;)Lcom/google/common/base/Predicate<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/Collection<+TT;>;)L1com/google/common/base/Predicate<TT;>;
 instanceOf
  <T:Ljava/lang/Object;>(Ljava/lang/Class<*>;)Lcom/google/common/base/Predicate<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<*>;)Lcom/google/common/base/Predicate<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<*>;)L1com/google/common/base/Predicate<TT;>;
 isNull
  <T:Ljava/lang/Object;>()Lcom/google/common/base/Predicate<TT;>;
  <T:Ljava/lang/Object;>()Lcom/google/common/base/Predicate<TT;>;
 not
  <T:Ljava/lang/Object;>(Lcom/google/common/base/Predicate<TT;>;)Lcom/google/common/base/Predicate<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/common/base/Predicate<TT;>;)Lcom/google/common/base/Predicate<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/common/base/Predicate<TT;>;)L1com/google/common/base/Predicate<TT;>;
 notNull
  <T:Ljava/lang/Object;>()Lcom/google/common/base/Predicate<TT;>;
  <T:Ljava/lang/Object;>()Lcom/google/common/base/Predicate<TT;>;
 or
  <T:Ljava/lang/Object;>(Lcom/google/common/base/Predicate<-TT;>;Lcom/google/common/base/Predicate<-TT;>;)Lcom/google/common/base/Predicate<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/common/base/Predicate<-TT;>;Lcom/google/common/base/Predicate<-TT;>;)Lcom/google/common/base/Predicate<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/common/base/Predicate<-TT;>;Lcom/google/common/base/Predicate<-TT;>;)L1com/google/common/base/Predicate<TT;>;
 or
  <T:Ljava/lang/Object;>(Ljava/lang/Iterable<+Lcom/google/common/base/Predicate<-TT;>;>;)Lcom/google/common/base/Predicate<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Iterable<+Lcom/google/common/base/Predicate<-TT;>;>;)Lcom/google/common/base/Predicate<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Iterable<+Lcom/google/common/base/Predicate<-TT;>;>;)L1com/google/common/base/Predicate<TT;>;
 or
  <T:Ljava/lang/Object;>([Lcom/google/common/base/Predicate<-TT;>;)Lcom/google/common/base/Predicate<TT;>;
- <T:Ljava/lang/Object;>([Lcom/google/common/base/Predicate<-TT;>;)Lcom/google/common/base/Predicate<TT;>;
+ <T:Ljava/lang/Object;>([Lcom/google/common/base/Predicate<-TT;>;)L1com/google/common/base/Predicate<TT;>;
 subtypeOf
  (Ljava/lang/Class<*>;)Lcom/google/common/base/Predicate<Ljava/lang/Class<*>;>;
- (Ljava/lang/Class<*>;)Lcom/google/common/base/Predicate<Ljava/lang/Class<*>;>;
+ (Ljava/lang/Class<*>;)L1com/google/common/base/Predicate<Ljava/lang/Class<*>;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/base/Splitter.eea b/libs/eea-guava/src/main/resources/com/google/common/base/Splitter.eea
index 6f3b7e40be..49b372eacf 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/base/Splitter.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/base/Splitter.eea
@@ -2,13 +2,13 @@ class com/google/common/base/Splitter
 
 fixedLength
  (I)Lcom/google/common/base/Splitter;
- (I)Lcom/google/common/base/Splitter;
+ (I)L1com/google/common/base/Splitter;
 on
  (C)Lcom/google/common/base/Splitter;
  (C)Lcom/google/common/base/Splitter;
 on
  (Lcom/google/common/base/CharMatcher;)Lcom/google/common/base/Splitter;
- (Lcom/google/common/base/CharMatcher;)Lcom/google/common/base/Splitter;
+ (Lcom/google/common/base/CharMatcher;)L1com/google/common/base/Splitter;
 on
  (Ljava/lang/String;)Lcom/google/common/base/Splitter;
  (Ljava/lang/String;)Lcom/google/common/base/Splitter;
@@ -27,7 +27,7 @@ omitEmptyStrings
  ()Lcom/google/common/base/Splitter;
 split
  (Ljava/lang/CharSequence;)Ljava/lang/Iterable<Ljava/lang/String;>;
- (Ljava/lang/CharSequence;)Ljava/lang/Iterable<Ljava/lang/String;>;
+ (Ljava/lang/CharSequence;)L1java/lang/Iterable<Ljava/lang/String;>;
 splitToList
  (Ljava/lang/CharSequence;)Ljava/util/List<Ljava/lang/String;>;
  (Ljava/lang/CharSequence;)Ljava/util/List<Ljava/lang/String;>;
@@ -45,7 +45,7 @@ withKeyValueSeparator
  (C)Lcom/google/common/base/Splitter$MapSplitter;
 withKeyValueSeparator
  (Lcom/google/common/base/Splitter;)Lcom/google/common/base/Splitter$MapSplitter;
- (Lcom/google/common/base/Splitter;)Lcom/google/common/base/Splitter$MapSplitter;
+ (Lcom/google/common/base/Splitter;)L1com/google/common/base/Splitter$MapSplitter;
 withKeyValueSeparator
  (Ljava/lang/String;)Lcom/google/common/base/Splitter$MapSplitter;
  (Ljava/lang/String;)Lcom/google/common/base/Splitter$MapSplitter;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/base/Stopwatch.eea b/libs/eea-guava/src/main/resources/com/google/common/base/Stopwatch.eea
index 4ae2ef0c5a..5deb0f4ac4 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/base/Stopwatch.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/base/Stopwatch.eea
@@ -2,16 +2,16 @@ class com/google/common/base/Stopwatch
 
 createStarted
  ()Lcom/google/common/base/Stopwatch;
- ()Lcom/google/common/base/Stopwatch;
+ ()L1com/google/common/base/Stopwatch;
 createStarted
  (Lcom/google/common/base/Ticker;)Lcom/google/common/base/Stopwatch;
- (Lcom/google/common/base/Ticker;)Lcom/google/common/base/Stopwatch;
+ (Lcom/google/common/base/Ticker;)L1com/google/common/base/Stopwatch;
 createUnstarted
  ()Lcom/google/common/base/Stopwatch;
- ()Lcom/google/common/base/Stopwatch;
+ ()L1com/google/common/base/Stopwatch;
 createUnstarted
  (Lcom/google/common/base/Ticker;)Lcom/google/common/base/Stopwatch;
- (Lcom/google/common/base/Ticker;)Lcom/google/common/base/Stopwatch;
+ (Lcom/google/common/base/Ticker;)L1com/google/common/base/Stopwatch;
 
 elapsed
  ()Ljava/time/Duration;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/base/Suppliers.eea b/libs/eea-guava/src/main/resources/com/google/common/base/Suppliers.eea
index 01e3c97edf..8c0e55f9ed 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/base/Suppliers.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/base/Suppliers.eea
@@ -2,22 +2,22 @@ class com/google/common/base/Suppliers
 
 compose
  <F:Ljava/lang/Object;T:Ljava/lang/Object;>(Lcom/google/common/base/Function<-TF;TT;>;Lcom/google/common/base/Supplier<TF;>;)Lcom/google/common/base/Supplier<TT;>;
- <F:Ljava/lang/Object;T:Ljava/lang/Object;>(Lcom/google/common/base/Function<-TF;TT;>;Lcom/google/common/base/Supplier<TF;>;)Lcom/google/common/base/Supplier<TT;>;
+ <F:Ljava/lang/Object;T:Ljava/lang/Object;>(Lcom/google/common/base/Function<-TF;TT;>;Lcom/google/common/base/Supplier<TF;>;)L1com/google/common/base/Supplier<TT;>;
 memoize
  <T:Ljava/lang/Object;>(Lcom/google/common/base/Supplier<TT;>;)Lcom/google/common/base/Supplier<TT;>;
  <T:Ljava/lang/Object;>(Lcom/google/common/base/Supplier<TT;>;)Lcom/google/common/base/Supplier<TT;>;
 memoizeWithExpiration
  <T:Ljava/lang/Object;>(Lcom/google/common/base/Supplier<TT;>;JLjava/util/concurrent/TimeUnit;)Lcom/google/common/base/Supplier<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/common/base/Supplier<TT;>;JLjava/util/concurrent/TimeUnit;)Lcom/google/common/base/Supplier<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/common/base/Supplier<TT;>;JLjava/util/concurrent/TimeUnit;)L1com/google/common/base/Supplier<TT;>;
 memoizeWithExpiration
  <T:Ljava/lang/Object;>(Lcom/google/common/base/Supplier<TT;>;Ljava/time/Duration;)Lcom/google/common/base/Supplier<TT;>;
  <T:Ljava/lang/Object;>(Lcom/google/common/base/Supplier<TT;>;Ljava/time/Duration;)L1com/google/common/base/Supplier<TT;>;
 ofInstance
  <T:Ljava/lang/Object;>(TT;)Lcom/google/common/base/Supplier<TT;>;
- <T:Ljava/lang/Object;>(TT;)Lcom/google/common/base/Supplier<TT;>;
+ <T:Ljava/lang/Object;>(TT;)L1com/google/common/base/Supplier<TT;>;
 supplierFunction
  <T:Ljava/lang/Object;>()Lcom/google/common/base/Function<Lcom/google/common/base/Supplier<TT;>;TT;>;
  <T:Ljava/lang/Object;>()Lcom/google/common/base/Function<Lcom/google/common/base/Supplier<TT;>;TT;>;
 synchronizedSupplier
  <T:Ljava/lang/Object;>(Lcom/google/common/base/Supplier<TT;>;)Lcom/google/common/base/Supplier<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/common/base/Supplier<TT;>;)Lcom/google/common/base/Supplier<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/common/base/Supplier<TT;>;)L1com/google/common/base/Supplier<TT;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/base/Throwables.eea b/libs/eea-guava/src/main/resources/com/google/common/base/Throwables.eea
index 22df072724..de1a1253ed 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/base/Throwables.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/base/Throwables.eea
@@ -11,13 +11,13 @@ getRootCause
  (Ljava/lang/Throwable;)Ljava/lang/Throwable;
 getStackTraceAsString
  (Ljava/lang/Throwable;)Ljava/lang/String;
- (Ljava/lang/Throwable;)Ljava/lang/String;
+ (Ljava/lang/Throwable;)L1java/lang/String;
 lazyStackTrace
  (Ljava/lang/Throwable;)Ljava/util/List<Ljava/lang/StackTraceElement;>;
  (Ljava/lang/Throwable;)Ljava/util/List<Ljava/lang/StackTraceElement;>;
 propagate
  (Ljava/lang/Throwable;)Ljava/lang/RuntimeException;
- (Ljava/lang/Throwable;)Ljava/lang/RuntimeException;
+ (Ljava/lang/Throwable;)L1java/lang/RuntimeException;
 propagateIfInstanceOf
  <X:Ljava/lang/Throwable;>(Ljava/lang/Throwable;Ljava/lang/Class<TX;>;)V^TX;
  <X:Ljava/lang/Throwable;>(Ljava/lang/Throwable;Ljava/lang/Class<TX;>;)V^TX;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/cache/AbstractCache.eea b/libs/eea-guava/src/main/resources/com/google/common/cache/AbstractCache.eea
index 855e3e793f..e4f4d07b37 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/cache/AbstractCache.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/cache/AbstractCache.eea
@@ -29,4 +29,4 @@ putAll
  (L1java/util/Map<+TK;+TV;>;)V # @Inherited(com.google.common.cache.Cache)
 stats
  ()Lcom/google/common/cache/CacheStats;
- ()Lcom/google/common/cache/CacheStats;
+ ()L1com/google/common/cache/CacheStats;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/cache/CacheBuilder.eea b/libs/eea-guava/src/main/resources/com/google/common/cache/CacheBuilder.eea
index 149d852673..3027669f01 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/cache/CacheBuilder.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/cache/CacheBuilder.eea
@@ -10,14 +10,14 @@ from
  (Ljava/lang/String;)Lcom/google/common/cache/CacheBuilder<Ljava/lang/Object;Ljava/lang/Object;>;
 newBuilder
  ()Lcom/google/common/cache/CacheBuilder<Ljava/lang/Object;Ljava/lang/Object;>;
- ()Lcom/google/common/cache/CacheBuilder<Ljava/lang/Object;Ljava/lang/Object;>;
+ ()L1com/google/common/cache/CacheBuilder<Ljava/lang/Object;Ljava/lang/Object;>;
 
 build
  <K1:TK;V1:TV;>()Lcom/google/common/cache/Cache<TK1;TV1;>;
  <K1:TK;V1:TV;>()L1com/google/common/cache/Cache<TK1;TV1;>;
 build
  <K1:TK;V1:TV;>(Lcom/google/common/cache/CacheLoader<-TK1;TV1;>;)Lcom/google/common/cache/LoadingCache<TK1;TV1;>;
- <K1:TK;V1:TV;>(Lcom/google/common/cache/CacheLoader<-TK1;TV1;>;)Lcom/google/common/cache/LoadingCache<TK1;TV1;>;
+ <K1:TK;V1:TV;>(Lcom/google/common/cache/CacheLoader<-TK1;TV1;>;)L1com/google/common/cache/LoadingCache<TK1;TV1;>;
 concurrencyLevel
  (I)Lcom/google/common/cache/CacheBuilder<TK;TV;>;
  (I)L1com/google/common/cache/CacheBuilder<TK;TV;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/cache/CacheBuilderSpec.eea b/libs/eea-guava/src/main/resources/com/google/common/cache/CacheBuilderSpec.eea
index eb8ced317f..5f5ba5d60f 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/cache/CacheBuilderSpec.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/cache/CacheBuilderSpec.eea
@@ -5,7 +5,7 @@ disableCaching
  ()Lcom/google/common/cache/CacheBuilderSpec;
 parse
  (Ljava/lang/String;)Lcom/google/common/cache/CacheBuilderSpec;
- (Ljava/lang/String;)Lcom/google/common/cache/CacheBuilderSpec;
+ (Ljava/lang/String;)L1com/google/common/cache/CacheBuilderSpec;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-guava/src/main/resources/com/google/common/cache/CacheLoader.eea b/libs/eea-guava/src/main/resources/com/google/common/cache/CacheLoader.eea
index d1164bcdc7..3ed5295136 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/cache/CacheLoader.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/cache/CacheLoader.eea
@@ -4,20 +4,20 @@ class com/google/common/cache/CacheLoader
 
 asyncReloading
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/cache/CacheLoader<TK;TV;>;Ljava/util/concurrent/Executor;)Lcom/google/common/cache/CacheLoader<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/cache/CacheLoader<TK;TV;>;Ljava/util/concurrent/Executor;)Lcom/google/common/cache/CacheLoader<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/cache/CacheLoader<TK;TV;>;Ljava/util/concurrent/Executor;)L1com/google/common/cache/CacheLoader<TK;TV;>;
 from
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/base/Function<TK;TV;>;)Lcom/google/common/cache/CacheLoader<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/base/Function<TK;TV;>;)Lcom/google/common/cache/CacheLoader<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/base/Function<TK;TV;>;)L1com/google/common/cache/CacheLoader<TK;TV;>;
 from
  <V:Ljava/lang/Object;>(Lcom/google/common/base/Supplier<TV;>;)Lcom/google/common/cache/CacheLoader<Ljava/lang/Object;TV;>;
- <V:Ljava/lang/Object;>(Lcom/google/common/base/Supplier<TV;>;)Lcom/google/common/cache/CacheLoader<Ljava/lang/Object;TV;>;
+ <V:Ljava/lang/Object;>(Lcom/google/common/base/Supplier<TV;>;)L1com/google/common/cache/CacheLoader<Ljava/lang/Object;TV;>;
 
 load
  (TK;)TV;
  (TK;)TV;
 loadAll
  (Ljava/lang/Iterable<+TK;>;)Ljava/util/Map<TK;TV;>;
- (Ljava/lang/Iterable<+TK;>;)Ljava/util/Map<TK;TV;>;
+ (Ljava/lang/Iterable<+TK;>;)L1java/util/Map<TK;TV;>;
 reload
  (TK;TV;)Lcom/google/common/util/concurrent/ListenableFuture<TV;>;
  (TK;TV;)Lcom/google/common/util/concurrent/ListenableFuture<TV;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/cache/RemovalNotification.eea b/libs/eea-guava/src/main/resources/com/google/common/cache/RemovalNotification.eea
index fdad0601f2..e25a6507a4 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/cache/RemovalNotification.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/cache/RemovalNotification.eea
@@ -8,7 +8,7 @@ super java/util/AbstractMap$SimpleImmutableEntry
 
 create
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;Lcom/google/common/cache/RemovalCause;)Lcom/google/common/cache/RemovalNotification<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;Lcom/google/common/cache/RemovalCause;)Lcom/google/common/cache/RemovalNotification<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;Lcom/google/common/cache/RemovalCause;)L1com/google/common/cache/RemovalNotification<TK;TV;>;
 
 getCause
  ()Lcom/google/common/cache/RemovalCause;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/ArrayListMultimap.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/ArrayListMultimap.eea
index 5342ab3c6a..78c0ca9e4c 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/ArrayListMultimap.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/ArrayListMultimap.eea
@@ -8,10 +8,10 @@ super com/google/common/collect/ArrayListMultimapGwtSerializationDependencies
 
 create
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Lcom/google/common/collect/ArrayListMultimap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Lcom/google/common/collect/ArrayListMultimap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>()L1com/google/common/collect/ArrayListMultimap<TK;TV;>;
 create
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(II)Lcom/google/common/collect/ArrayListMultimap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(II)Lcom/google/common/collect/ArrayListMultimap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(II)L1com/google/common/collect/ArrayListMultimap<TK;TV;>;
 create
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Multimap<+TK;+TV;>;)Lcom/google/common/collect/ArrayListMultimap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Multimap<+TK;+TV;>;)Lcom/google/common/collect/ArrayListMultimap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Multimap<+TK;+TV;>;)L1com/google/common/collect/ArrayListMultimap<TK;TV;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/ArrayTable.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/ArrayTable.eea
index 61a465a859..e7606c3354 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/ArrayTable.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/ArrayTable.eea
@@ -8,10 +8,10 @@ super com/google/common/collect/AbstractTable
 
 create
  <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Table<TR;TC;+TV;>;)Lcom/google/common/collect/ArrayTable<TR;TC;TV;>;
- <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Table<TR;TC;+TV;>;)Lcom/google/common/collect/ArrayTable<TR;TC;TV;>;
+ <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Table<TR;TC;+TV;>;)L1com/google/common/collect/ArrayTable<TR;TC;TV;>;
 create
  <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Iterable<+TR;>;Ljava/lang/Iterable<+TC;>;)Lcom/google/common/collect/ArrayTable<TR;TC;TV;>;
- <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Iterable<+TR;>;Ljava/lang/Iterable<+TC;>;)Lcom/google/common/collect/ArrayTable<TR;TC;TV;>;
+ <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Iterable<+TR;>;Ljava/lang/Iterable<+TC;>;)L1com/google/common/collect/ArrayTable<TR;TC;TV;>;
 
 at
  (II)TV;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/Collections2.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/Collections2.eea
index d08675bbde..e7581a870a 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/Collections2.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/Collections2.eea
@@ -8,10 +8,10 @@ orderedPermutations
  <E::Ljava/lang/Comparable<-TE;>;>(Ljava/lang/Iterable<TE;>;)Ljava/util/Collection<Ljava/util/List<TE;>;>;
 orderedPermutations
  <E:Ljava/lang/Object;>(Ljava/lang/Iterable<TE;>;Ljava/util/Comparator<-TE;>;)Ljava/util/Collection<Ljava/util/List<TE;>;>;
- <E:Ljava/lang/Object;>(Ljava/lang/Iterable<TE;>;Ljava/util/Comparator<-TE;>;)Ljava/util/Collection<Ljava/util/List<TE;>;>;
+ <E:Ljava/lang/Object;>(Ljava/lang/Iterable<TE;>;Ljava/util/Comparator<-TE;>;)L1java/util/Collection<Ljava/util/List<TE;>;>;
 permutations
  <E:Ljava/lang/Object;>(Ljava/util/Collection<TE;>;)Ljava/util/Collection<Ljava/util/List<TE;>;>;
- <E:Ljava/lang/Object;>(Ljava/util/Collection<TE;>;)Ljava/util/Collection<Ljava/util/List<TE;>;>;
+ <E:Ljava/lang/Object;>(Ljava/util/Collection<TE;>;)L1java/util/Collection<Ljava/util/List<TE;>;>;
 transform
  <F:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/util/Collection<TF;>;Lcom/google/common/base/Function<-TF;TT;>;)Ljava/util/Collection<TT;>;
- <F:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/util/Collection<TF;>;Lcom/google/common/base/Function<-TF;TT;>;)Ljava/util/Collection<TT;>;
+ <F:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/util/Collection<TF;>;Lcom/google/common/base/Function<-TF;TT;>;)L1java/util/Collection<TT;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/Comparators.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/Comparators.eea
index 345de5a809..b81cb34afb 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/Comparators.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/Comparators.eea
@@ -20,7 +20,7 @@ least
  <T:Ljava/lang/Object;>(ILjava/util/Comparator<-TT;>;)Ljava/util/stream/Collector<TT;*Ljava/util/List<TT;>;>;
 lexicographical
  <T:Ljava/lang/Object;S:TT;>(Ljava/util/Comparator<TT;>;)Ljava/util/Comparator<Ljava/lang/Iterable<TS;>;>;
- <T:Ljava/lang/Object;S:TT;>(Ljava/util/Comparator<TT;>;)Ljava/util/Comparator<Ljava/lang/Iterable<TS;>;>;
+ <T:Ljava/lang/Object;S:TT;>(Ljava/util/Comparator<TT;>;)L1java/util/Comparator<Ljava/lang/Iterable<TS;>;>;
 max
  <T::Ljava/lang/Comparable<-TT;>;>(TT;TT;)TT;
  <T::Ljava/lang/Comparable<-TT;>;>(TT;TT;)TT;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/ConcurrentHashMultiset.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/ConcurrentHashMultiset.eea
index 6f09e1d3ef..c817b9cd53 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/ConcurrentHashMultiset.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/ConcurrentHashMultiset.eea
@@ -8,13 +8,13 @@ super com/google/common/collect/AbstractMultiset
 
 create
  <E:Ljava/lang/Object;>()Lcom/google/common/collect/ConcurrentHashMultiset<TE;>;
- <E:Ljava/lang/Object;>()Lcom/google/common/collect/ConcurrentHashMultiset<TE;>;
+ <E:Ljava/lang/Object;>()L1com/google/common/collect/ConcurrentHashMultiset<TE;>;
 create
  <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Lcom/google/common/collect/ConcurrentHashMultiset<TE;>;
- <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Lcom/google/common/collect/ConcurrentHashMultiset<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)L1com/google/common/collect/ConcurrentHashMultiset<TE;>;
 create
  <E:Ljava/lang/Object;>(Ljava/util/concurrent/ConcurrentMap<TE;Ljava/util/concurrent/atomic/AtomicInteger;>;)Lcom/google/common/collect/ConcurrentHashMultiset<TE;>;
- <E:Ljava/lang/Object;>(Ljava/util/concurrent/ConcurrentMap<TE;Ljava/util/concurrent/atomic/AtomicInteger;>;)Lcom/google/common/collect/ConcurrentHashMultiset<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/util/concurrent/ConcurrentMap<TE;Ljava/util/concurrent/atomic/AtomicInteger;>;)L1com/google/common/collect/ConcurrentHashMultiset<TE;>;
 
 add
  (TE;I)I
@@ -24,7 +24,7 @@ count
  (Ljava/lang/Object;)I
 createEntrySet
  ()Ljava/util/Set<Lcom/google/common/collect/Multiset$Entry<TE;>;>;
- ()Ljava/util/Set<Lcom/google/common/collect/Multiset$Entry<TE;>;>;
+ ()L1java/util/Set<Lcom/google/common/collect/Multiset$Entry<TE;>;>;
 iterator
  ()Ljava/util/Iterator<TE;>;
  ()L1java/util/Iterator<TE;>; # @Inherited(java.util.AbstractCollection)
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/ContiguousSet.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/ContiguousSet.eea
index e76d9f1fc5..c1f05d40ad 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/ContiguousSet.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/ContiguousSet.eea
@@ -8,7 +8,7 @@ super com/google/common/collect/ImmutableSortedSet
 
 builder
  <E:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableSortedSet$Builder<TE;>;
- <E:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableSortedSet$Builder<TE;>;
+ <E:Ljava/lang/Object;>()L1com/google/common/collect/ImmutableSortedSet$Builder<TE;>;
 closed
  (II)Lcom/google/common/collect/ContiguousSet<Ljava/lang/Integer;>;
  (II)Lcom/google/common/collect/ContiguousSet<Ljava/lang/Integer;>;
@@ -23,7 +23,7 @@ closedOpen
  (JJ)Lcom/google/common/collect/ContiguousSet<Ljava/lang/Long;>;
 create
  <C::Ljava/lang/Comparable;>(Lcom/google/common/collect/Range<TC;>;Lcom/google/common/collect/DiscreteDomain<TC;>;)Lcom/google/common/collect/ContiguousSet<TC;>;
- <C::Ljava/lang/Comparable;>(Lcom/google/common/collect/Range<TC;>;Lcom/google/common/collect/DiscreteDomain<TC;>;)Lcom/google/common/collect/ContiguousSet<TC;>;
+ <C::Ljava/lang/Comparable;>(Lcom/google/common/collect/Range<TC;>;Lcom/google/common/collect/DiscreteDomain<TC;>;)L1com/google/common/collect/ContiguousSet<TC;>;
 
 headSet
  (TC;)Lcom/google/common/collect/ContiguousSet<TC;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/DiscreteDomain.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/DiscreteDomain.eea
index 7bdada78ef..17f9aa922e 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/DiscreteDomain.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/DiscreteDomain.eea
@@ -17,10 +17,10 @@ distance
  (TC;TC;)J
 maxValue
  ()TC;
- ()TC;
+ ()T1C;
 minValue
  ()TC;
- ()TC;
+ ()T1C;
 next
  (TC;)TC;
  (TC;)T0C;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/EnumBiMap.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/EnumBiMap.eea
index 413332e927..4cac5dc304 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/EnumBiMap.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/EnumBiMap.eea
@@ -8,10 +8,10 @@ super com/google/common/collect/AbstractBiMap
 
 create
  <K:Ljava/lang/Enum<TK;>;V:Ljava/lang/Enum<TV;>;>(Ljava/lang/Class<TK;>;Ljava/lang/Class<TV;>;)Lcom/google/common/collect/EnumBiMap<TK;TV;>;
- <K:Ljava/lang/Enum<TK;>;V:Ljava/lang/Enum<TV;>;>(Ljava/lang/Class<TK;>;Ljava/lang/Class<TV;>;)Lcom/google/common/collect/EnumBiMap<TK;TV;>;
+ <K:Ljava/lang/Enum<TK;>;V:Ljava/lang/Enum<TV;>;>(Ljava/lang/Class<TK;>;Ljava/lang/Class<TV;>;)L1com/google/common/collect/EnumBiMap<TK;TV;>;
 create
  <K:Ljava/lang/Enum<TK;>;V:Ljava/lang/Enum<TV;>;>(Ljava/util/Map<TK;TV;>;)Lcom/google/common/collect/EnumBiMap<TK;TV;>;
- <K:Ljava/lang/Enum<TK;>;V:Ljava/lang/Enum<TV;>;>(Ljava/util/Map<TK;TV;>;)Lcom/google/common/collect/EnumBiMap<TK;TV;>;
+ <K:Ljava/lang/Enum<TK;>;V:Ljava/lang/Enum<TV;>;>(Ljava/util/Map<TK;TV;>;)L1com/google/common/collect/EnumBiMap<TK;TV;>;
 
 keyType
  ()Ljava/lang/Class<TK;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/EnumHashBiMap.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/EnumHashBiMap.eea
index 145e0ea6dc..64bf8399cd 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/EnumHashBiMap.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/EnumHashBiMap.eea
@@ -8,10 +8,10 @@ super com/google/common/collect/AbstractBiMap
 
 create
  <K:Ljava/lang/Enum<TK;>;V:Ljava/lang/Object;>(Ljava/lang/Class<TK;>;)Lcom/google/common/collect/EnumHashBiMap<TK;TV;>;
- <K:Ljava/lang/Enum<TK;>;V:Ljava/lang/Object;>(Ljava/lang/Class<TK;>;)Lcom/google/common/collect/EnumHashBiMap<TK;TV;>;
+ <K:Ljava/lang/Enum<TK;>;V:Ljava/lang/Object;>(Ljava/lang/Class<TK;>;)L1com/google/common/collect/EnumHashBiMap<TK;TV;>;
 create
  <K:Ljava/lang/Enum<TK;>;V:Ljava/lang/Object;>(Ljava/util/Map<TK;+TV;>;)Lcom/google/common/collect/EnumHashBiMap<TK;TV;>;
- <K:Ljava/lang/Enum<TK;>;V:Ljava/lang/Object;>(Ljava/util/Map<TK;+TV;>;)Lcom/google/common/collect/EnumHashBiMap<TK;TV;>;
+ <K:Ljava/lang/Enum<TK;>;V:Ljava/lang/Object;>(Ljava/util/Map<TK;+TV;>;)L1com/google/common/collect/EnumHashBiMap<TK;TV;>;
 
 forcePut
  (TK;TV;)TV;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/EnumMultiset.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/EnumMultiset.eea
index feae7a825c..b4a6da178f 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/EnumMultiset.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/EnumMultiset.eea
@@ -8,13 +8,13 @@ super com/google/common/collect/AbstractMultiset
 
 create
  <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Class<TE;>;)Lcom/google/common/collect/EnumMultiset<TE;>;
- <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Class<TE;>;)Lcom/google/common/collect/EnumMultiset<TE;>;
+ <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Class<TE;>;)L1com/google/common/collect/EnumMultiset<TE;>;
 create
  <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Iterable<TE;>;)Lcom/google/common/collect/EnumMultiset<TE;>;
- <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Iterable<TE;>;)Lcom/google/common/collect/EnumMultiset<TE;>;
+ <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Iterable<TE;>;)L1com/google/common/collect/EnumMultiset<TE;>;
 create
  <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Iterable<TE;>;Ljava/lang/Class<TE;>;)Lcom/google/common/collect/EnumMultiset<TE;>;
- <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Iterable<TE;>;Ljava/lang/Class<TE;>;)Lcom/google/common/collect/EnumMultiset<TE;>;
+ <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Iterable<TE;>;Ljava/lang/Class<TE;>;)L1com/google/common/collect/EnumMultiset<TE;>;
 
 add
  (TE;I)I
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/EvictingQueue.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/EvictingQueue.eea
index 1887810a8a..bbd3166730 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/EvictingQueue.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/EvictingQueue.eea
@@ -8,7 +8,7 @@ super com/google/common/collect/ForwardingQueue
 
 create
  <E:Ljava/lang/Object;>(I)Lcom/google/common/collect/EvictingQueue<TE;>;
- <E:Ljava/lang/Object;>(I)Lcom/google/common/collect/EvictingQueue<TE;>;
+ <E:Ljava/lang/Object;>(I)L1com/google/common/collect/EvictingQueue<TE;>;
 
 add
  (TE;)Z
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/FluentIterable.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/FluentIterable.eea
index a5e07a6c1e..a54eff7da8 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/FluentIterable.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/FluentIterable.eea
@@ -8,7 +8,7 @@ super java/lang/Iterable
 
 concat
  <T:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljava/lang/Iterable<+TT;>;>;)Lcom/google/common/collect/FluentIterable<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljava/lang/Iterable<+TT;>;>;)Lcom/google/common/collect/FluentIterable<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljava/lang/Iterable<+TT;>;>;)L1com/google/common/collect/FluentIterable<TT;>;
 concat
  <T:Ljava/lang/Object;>(Ljava/lang/Iterable<+TT;>;Ljava/lang/Iterable<+TT;>;)Lcom/google/common/collect/FluentIterable<TT;>;
  <T:Ljava/lang/Object;>(Ljava/lang/Iterable<+TT;>;Ljava/lang/Iterable<+TT;>;)Lcom/google/common/collect/FluentIterable<TT;>;
@@ -26,7 +26,7 @@ from
  <E:Ljava/lang/Object;>(Lcom/google/common/collect/FluentIterable<TE;>;)Lcom/google/common/collect/FluentIterable<TE;>;
 from
  <E:Ljava/lang/Object;>(Ljava/lang/Iterable<TE;>;)Lcom/google/common/collect/FluentIterable<TE;>;
- <E:Ljava/lang/Object;>(Ljava/lang/Iterable<TE;>;)Lcom/google/common/collect/FluentIterable<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/lang/Iterable<TE;>;)L1com/google/common/collect/FluentIterable<TE;>;
 from
  <E:Ljava/lang/Object;>([TE;)Lcom/google/common/collect/FluentIterable<TE;>;
  <E:Ljava/lang/Object;>([TE;)Lcom/google/common/collect/FluentIterable<TE;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/ForwardingMapEntry.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/ForwardingMapEntry.eea
index ccfb747fc3..3ad2eb814e 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/ForwardingMapEntry.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/ForwardingMapEntry.eea
@@ -26,4 +26,4 @@ standardEquals
  (Ljava/lang/Object;)Z
 standardToString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/ForwardingMultiset.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/ForwardingMultiset.eea
index 48b4121ca1..0d84c70f64 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/ForwardingMultiset.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/ForwardingMultiset.eea
@@ -71,4 +71,4 @@ standardSetCount
  (TE;II)Z
 standardToString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/ForwardingNavigableMap$StandardDescendingMap.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/ForwardingNavigableMap$StandardDescendingMap.eea
index 7a78bf4aed..60a667fb2c 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/ForwardingNavigableMap$StandardDescendingMap.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/ForwardingNavigableMap$StandardDescendingMap.eea
@@ -9,7 +9,7 @@ super com/google/common/collect/Maps$DescendingMap
  (Lcom/google/common/collect/ForwardingNavigableMap;)V
 entryIterator
  ()Ljava/util/Iterator<Ljava/util/Map$Entry<TK;TV;>;>;
- ()Ljava/util/Iterator<Ljava/util/Map$Entry<TK;TV;>;>;
+ ()L1java/util/Iterator<Ljava/util/Map$Entry<TK;TV;>;>;
 replaceAll
  (Ljava/util/function/BiFunction<-TK;-TV;+TV;>;)V
  (L1java/util/function/BiFunction<-TK;-TV;+TV;>;)V # @Inherited(java.util.Map)
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/HashMultiset.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/HashMultiset.eea
index a272279955..ee081d819d 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/HashMultiset.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/HashMultiset.eea
@@ -8,10 +8,10 @@ super com/google/common/collect/AbstractMapBasedMultiset
 
 create
  <E:Ljava/lang/Object;>()Lcom/google/common/collect/HashMultiset<TE;>;
- <E:Ljava/lang/Object;>()Lcom/google/common/collect/HashMultiset<TE;>;
+ <E:Ljava/lang/Object;>()L1com/google/common/collect/HashMultiset<TE;>;
 create
  <E:Ljava/lang/Object;>(I)Lcom/google/common/collect/HashMultiset<TE;>;
- <E:Ljava/lang/Object;>(I)Lcom/google/common/collect/HashMultiset<TE;>;
+ <E:Ljava/lang/Object;>(I)L1com/google/common/collect/HashMultiset<TE;>;
 create
  <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Lcom/google/common/collect/HashMultiset<TE;>;
- <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Lcom/google/common/collect/HashMultiset<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)L1com/google/common/collect/HashMultiset<TE;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableBiMap$Builder.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableBiMap$Builder.eea
index 54cf7bf55a..786a07b28e 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableBiMap$Builder.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableBiMap$Builder.eea
@@ -11,7 +11,7 @@ build
  ()L1com/google/common/collect/ImmutableBiMap<TK;TV;>;
 buildKeepingLast
  ()Lcom/google/common/collect/ImmutableBiMap<TK;TV;>;
- ()Lcom/google/common/collect/ImmutableBiMap<TK;TV;>;
+ ()L1com/google/common/collect/ImmutableBiMap<TK;TV;>;
 buildOrThrow
  ()Lcom/google/common/collect/ImmutableBiMap<TK;TV;>;
  ()Lcom/google/common/collect/ImmutableBiMap<TK;TV;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableBiMap.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableBiMap.eea
index 4d183c7b4e..dc5c8b0908 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableBiMap.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableBiMap.eea
@@ -14,7 +14,7 @@ builder
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>()L1com/google/common/collect/ImmutableBiMap$Builder<TK;TV;>;
 builderWithExpectedSize
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Lcom/google/common/collect/ImmutableBiMap$Builder<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Lcom/google/common/collect/ImmutableBiMap$Builder<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)L1com/google/common/collect/ImmutableBiMap$Builder<TK;TV;>;
 copyOf
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljava/util/Map$Entry<+TK;+TV;>;>;)Lcom/google/common/collect/ImmutableBiMap<TK;TV;>;
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljava/util/Map$Entry<+TK;+TV;>;>;)Lcom/google/common/collect/ImmutableBiMap<TK;TV;>;
@@ -62,10 +62,10 @@ toImmutableBiMap
  <T:Ljava/lang/Object;K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/function/Function<-TT;+TK;>;Ljava/util/function/Function<-TT;+TV;>;)Ljava/util/stream/Collector<TT;*Lcom/google/common/collect/ImmutableBiMap<TK;TV;>;>;
 toImmutableMap
  <T:Ljava/lang/Object;K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/function/Function<-TT;+TK;>;Ljava/util/function/Function<-TT;+TV;>;)Ljava/util/stream/Collector<TT;*Lcom/google/common/collect/ImmutableMap<TK;TV;>;>;
- <T:Ljava/lang/Object;K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/function/Function<-TT;+TK;>;Ljava/util/function/Function<-TT;+TV;>;)Ljava/util/stream/Collector<TT;*Lcom/google/common/collect/ImmutableMap<TK;TV;>;>;
+ <T:Ljava/lang/Object;K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/function/Function<-TT;+TK;>;Ljava/util/function/Function<-TT;+TV;>;)L1java/util/stream/Collector<TT;*Lcom/google/common/collect/ImmutableMap<TK;TV;>;>;
 toImmutableMap
  <T:Ljava/lang/Object;K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/function/Function<-TT;+TK;>;Ljava/util/function/Function<-TT;+TV;>;Ljava/util/function/BinaryOperator<TV;>;)Ljava/util/stream/Collector<TT;*Lcom/google/common/collect/ImmutableMap<TK;TV;>;>;
- <T:Ljava/lang/Object;K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/function/Function<-TT;+TK;>;Ljava/util/function/Function<-TT;+TV;>;Ljava/util/function/BinaryOperator<TV;>;)Ljava/util/stream/Collector<TT;*Lcom/google/common/collect/ImmutableMap<TK;TV;>;>;
+ <T:Ljava/lang/Object;K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/function/Function<-TT;+TK;>;Ljava/util/function/Function<-TT;+TV;>;Ljava/util/function/BinaryOperator<TV;>;)L1java/util/stream/Collector<TT;*Lcom/google/common/collect/ImmutableMap<TK;TV;>;>;
 
 forcePut
  (TK;TV;)TV;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableClassToInstanceMap.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableClassToInstanceMap.eea
index 556c5a534d..18c78c982b 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableClassToInstanceMap.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableClassToInstanceMap.eea
@@ -11,7 +11,7 @@ super com/google/common/collect/ClassToInstanceMap
 
 builder
  <B:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableClassToInstanceMap$Builder<TB;>;
- <B:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableClassToInstanceMap$Builder<TB;>;
+ <B:Ljava/lang/Object;>()L1com/google/common/collect/ImmutableClassToInstanceMap$Builder<TB;>;
 copyOf
  <B:Ljava/lang/Object;S:TB;>(Ljava/util/Map<+Ljava/lang/Class<+TS;>;+TS;>;)Lcom/google/common/collect/ImmutableClassToInstanceMap<TB;>;
  <B:Ljava/lang/Object;S:TB;>(Ljava/util/Map<+Ljava/lang/Class<+TS;>;+TS;>;)Lcom/google/common/collect/ImmutableClassToInstanceMap<TB;>;
@@ -20,7 +20,7 @@ of
  <B:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableClassToInstanceMap<TB;>;
 of
  <B:Ljava/lang/Object;T:TB;>(Ljava/lang/Class<TT;>;TT;)Lcom/google/common/collect/ImmutableClassToInstanceMap<TB;>;
- <B:Ljava/lang/Object;T:TB;>(Ljava/lang/Class<TT;>;TT;)Lcom/google/common/collect/ImmutableClassToInstanceMap<TB;>;
+ <B:Ljava/lang/Object;T:TB;>(Ljava/lang/Class<TT;>;TT;)L1com/google/common/collect/ImmutableClassToInstanceMap<TB;>;
 
 delegate
  ()Ljava/util/Map<Ljava/lang/Class<+TB;>;TB;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableList.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableList.eea
index b6122ea89f..2799cca119 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableList.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableList.eea
@@ -14,7 +14,7 @@ builder
  <E:Ljava/lang/Object;>()L1com/google/common/collect/ImmutableList$Builder<TE;>;
 builderWithExpectedSize
  <E:Ljava/lang/Object;>(I)Lcom/google/common/collect/ImmutableList$Builder<TE;>;
- <E:Ljava/lang/Object;>(I)Lcom/google/common/collect/ImmutableList$Builder<TE;>;
+ <E:Ljava/lang/Object;>(I)L1com/google/common/collect/ImmutableList$Builder<TE;>;
 copyOf
  <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Lcom/google/common/collect/ImmutableList<TE;>;
  <E:Ljava/lang/Object;>(L1java/lang/Iterable<+TE;>;)L1com/google/common/collect/ImmutableList<TE;>;
@@ -108,19 +108,19 @@ listIterator
  ()Lcom/google/common/collect/UnmodifiableListIterator<TE;>;
 listIterator
  (I)Lcom/google/common/collect/UnmodifiableListIterator<TE;>;
- (I)Lcom/google/common/collect/UnmodifiableListIterator<TE;>;
+ (I)L1com/google/common/collect/UnmodifiableListIterator<TE;>;
 remove
  (I)TE;
- (I)TE;
+ (I)T1E;
 replaceAll
  (Ljava/util/function/UnaryOperator<TE;>;)V
  (L1java/util/function/UnaryOperator<TE;>;)V # @Inherited(java.util.List)
 reverse
  ()Lcom/google/common/collect/ImmutableList<TE;>;
- ()Lcom/google/common/collect/ImmutableList<TE;>;
+ ()L1com/google/common/collect/ImmutableList<TE;>;
 set
  (ITE;)TE;
- (ITE;)TE;
+ (ITE;)T1E;
 sort
  (Ljava/util/Comparator<-TE;>;)V
  (L1java/util/Comparator<-TE;>;)V # @Inherited(java.util.List)
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableListMultimap.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableListMultimap.eea
index 47147ab0b4..9b8a6b8abe 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableListMultimap.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableListMultimap.eea
@@ -11,10 +11,10 @@ super com/google/common/collect/ListMultimap
 
 builder
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableListMultimap$Builder<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableListMultimap$Builder<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>()L1com/google/common/collect/ImmutableListMultimap$Builder<TK;TV;>;
 builderWithExpectedKeys
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Lcom/google/common/collect/ImmutableListMultimap$Builder<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Lcom/google/common/collect/ImmutableListMultimap$Builder<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)L1com/google/common/collect/ImmutableListMultimap$Builder<TK;TV;>;
 copyOf
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Multimap<+TK;+TV;>;)Lcom/google/common/collect/ImmutableListMultimap<TK;TV;>;
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Multimap<+TK;+TV;>;)Lcom/google/common/collect/ImmutableListMultimap<TK;TV;>;
@@ -54,7 +54,7 @@ inverse
  ()Lcom/google/common/collect/ImmutableListMultimap<TV;TK;>;
 removeAll
  (Ljava/lang/Object;)Lcom/google/common/collect/ImmutableList<TV;>;
- (Ljava/lang/Object;)Lcom/google/common/collect/ImmutableList<TV;>;
+ (Ljava/lang/Object;)L1com/google/common/collect/ImmutableList<TV;>;
 replaceValues
  (TK;Ljava/lang/Iterable<+TV;>;)Lcom/google/common/collect/ImmutableList<TV;>;
- (TK;Ljava/lang/Iterable<+TV;>;)Lcom/google/common/collect/ImmutableList<TV;>;
+ (TK;Ljava/lang/Iterable<+TV;>;)L1com/google/common/collect/ImmutableList<TV;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableMap.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableMap.eea
index e0e318f76d..856fb6d815 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableMap.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableMap.eea
@@ -11,7 +11,7 @@ builder
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>()L1com/google/common/collect/ImmutableMap$Builder<TK;TV;>;
 builderWithExpectedSize
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Lcom/google/common/collect/ImmutableMap$Builder<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Lcom/google/common/collect/ImmutableMap$Builder<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)L1com/google/common/collect/ImmutableMap$Builder<TK;TV;>;
 copyOf
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljava/util/Map$Entry<+TK;+TV;>;>;)Lcom/google/common/collect/ImmutableMap<TK;TV;>;
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljava/util/Map$Entry<+TK;+TV;>;>;)Lcom/google/common/collect/ImmutableMap<TK;TV;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableMultimap.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableMultimap.eea
index f5c9c1bbf5..cd7bc54a30 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableMultimap.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableMultimap.eea
@@ -8,10 +8,10 @@ super com/google/common/collect/BaseImmutableMultimap
 
 builder
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableMultimap$Builder<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableMultimap$Builder<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>()L1com/google/common/collect/ImmutableMultimap$Builder<TK;TV;>;
 builderWithExpectedKeys
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Lcom/google/common/collect/ImmutableMultimap$Builder<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Lcom/google/common/collect/ImmutableMultimap$Builder<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)L1com/google/common/collect/ImmutableMultimap$Builder<TK;TV;>;
 copyOf
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Multimap<+TK;+TV;>;)Lcom/google/common/collect/ImmutableMultimap<TK;TV;>;
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Multimap<+TK;+TV;>;)Lcom/google/common/collect/ImmutableMultimap<TK;TV;>;
@@ -78,10 +78,10 @@ remove
  (Ljava/lang/Object;Ljava/lang/Object;)Z
 removeAll
  (Ljava/lang/Object;)Lcom/google/common/collect/ImmutableCollection<TV;>;
- (Ljava/lang/Object;)Lcom/google/common/collect/ImmutableCollection<TV;>;
+ (Ljava/lang/Object;)L1com/google/common/collect/ImmutableCollection<TV;>;
 replaceValues
  (TK;Ljava/lang/Iterable<+TV;>;)Lcom/google/common/collect/ImmutableCollection<TV;>;
- (TK;Ljava/lang/Iterable<+TV;>;)Lcom/google/common/collect/ImmutableCollection<TV;>;
+ (TK;Ljava/lang/Iterable<+TV;>;)L1com/google/common/collect/ImmutableCollection<TV;>;
 values
  ()Lcom/google/common/collect/ImmutableCollection<TV;>;
  ()Lcom/google/common/collect/ImmutableCollection<TV;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableMultiset.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableMultiset.eea
index 30f7aa3717..ae5c161bbc 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableMultiset.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableMultiset.eea
@@ -11,7 +11,7 @@ super com/google/common/collect/Multiset
 
 builder
  <E:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableMultiset$Builder<TE;>;
- <E:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableMultiset$Builder<TE;>;
+ <E:Ljava/lang/Object;>()L1com/google/common/collect/ImmutableMultiset$Builder<TE;>;
 copyOf
  <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Lcom/google/common/collect/ImmutableMultiset<TE;>;
  <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Lcom/google/common/collect/ImmutableMultiset<TE;>;
@@ -69,7 +69,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 iterator
  ()Lcom/google/common/collect/UnmodifiableIterator<TE;>;
- ()Lcom/google/common/collect/UnmodifiableIterator<TE;>;
+ ()L1com/google/common/collect/UnmodifiableIterator<TE;>;
 remove
  (Ljava/lang/Object;I)I
  (Ljava/lang/Object;I)I
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableRangeMap.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableRangeMap.eea
index 9fa916e9b8..7ca8cedd6a 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableRangeMap.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableRangeMap.eea
@@ -8,7 +8,7 @@ super com/google/common/collect/RangeMap
 
 builder
  <K::Ljava/lang/Comparable<*>;V:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableRangeMap$Builder<TK;TV;>;
- <K::Ljava/lang/Comparable<*>;V:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableRangeMap$Builder<TK;TV;>;
+ <K::Ljava/lang/Comparable<*>;V:Ljava/lang/Object;>()L1com/google/common/collect/ImmutableRangeMap$Builder<TK;TV;>;
 copyOf
  <K::Ljava/lang/Comparable<*>;V:Ljava/lang/Object;>(Lcom/google/common/collect/RangeMap<TK;+TV;>;)Lcom/google/common/collect/ImmutableRangeMap<TK;TV;>;
  <K::Ljava/lang/Comparable<*>;V:Ljava/lang/Object;>(Lcom/google/common/collect/RangeMap<TK;+TV;>;)Lcom/google/common/collect/ImmutableRangeMap<TK;TV;>;
@@ -17,7 +17,7 @@ of
  <K::Ljava/lang/Comparable<*>;V:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableRangeMap<TK;TV;>;
 of
  <K::Ljava/lang/Comparable<*>;V:Ljava/lang/Object;>(Lcom/google/common/collect/Range<TK;>;TV;)Lcom/google/common/collect/ImmutableRangeMap<TK;TV;>;
- <K::Ljava/lang/Comparable<*>;V:Ljava/lang/Object;>(Lcom/google/common/collect/Range<TK;>;TV;)Lcom/google/common/collect/ImmutableRangeMap<TK;TV;>;
+ <K::Ljava/lang/Comparable<*>;V:Ljava/lang/Object;>(Lcom/google/common/collect/Range<TK;>;TV;)L1com/google/common/collect/ImmutableRangeMap<TK;TV;>;
 toImmutableRangeMap
  <T:Ljava/lang/Object;K::Ljava/lang/Comparable<-TK;>;V:Ljava/lang/Object;>(Ljava/util/function/Function<-TT;Lcom/google/common/collect/Range<TK;>;>;Ljava/util/function/Function<-TT;+TV;>;)Ljava/util/stream/Collector<TT;*Lcom/google/common/collect/ImmutableRangeMap<TK;TV;>;>;
  <T:Ljava/lang/Object;K::Ljava/lang/Comparable<-TK;>;V:Ljava/lang/Object;>(Ljava/util/function/Function<-TT;Lcom/google/common/collect/Range<TK;>;>;Ljava/util/function/Function<-TT;+TV;>;)Ljava/util/stream/Collector<TT;*Lcom/google/common/collect/ImmutableRangeMap<TK;TV;>;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableRangeSet.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableRangeSet.eea
index 1191d2f09f..814bb56d5e 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableRangeSet.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableRangeSet.eea
@@ -8,7 +8,7 @@ super com/google/common/collect/AbstractRangeSet
 
 builder
  <C::Ljava/lang/Comparable<*>;>()Lcom/google/common/collect/ImmutableRangeSet$Builder<TC;>;
- <C::Ljava/lang/Comparable<*>;>()Lcom/google/common/collect/ImmutableRangeSet$Builder<TC;>;
+ <C::Ljava/lang/Comparable<*>;>()L1com/google/common/collect/ImmutableRangeSet$Builder<TC;>;
 copyOf
  <C::Ljava/lang/Comparable;>(Lcom/google/common/collect/RangeSet<TC;>;)Lcom/google/common/collect/ImmutableRangeSet<TC;>;
  <C::Ljava/lang/Comparable;>(Lcom/google/common/collect/RangeSet<TC;>;)Lcom/google/common/collect/ImmutableRangeSet<TC;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableSet.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableSet.eea
index aa57e2e838..e425bea000 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableSet.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableSet.eea
@@ -14,7 +14,7 @@ builder
  <E:Ljava/lang/Object;>()L1com/google/common/collect/ImmutableSet$Builder<TE;>;
 builderWithExpectedSize
  <E:Ljava/lang/Object;>(I)Lcom/google/common/collect/ImmutableSet$Builder<TE;>;
- <E:Ljava/lang/Object;>(I)Lcom/google/common/collect/ImmutableSet$Builder<TE;>;
+ <E:Ljava/lang/Object;>(I)L1com/google/common/collect/ImmutableSet$Builder<TE;>;
 copyOf
  <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Lcom/google/common/collect/ImmutableSet<TE;>;
  <E:Ljava/lang/Object;>(L1java/lang/Iterable<+TE;>;)L1com/google/common/collect/ImmutableSet<TE;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableSetMultimap.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableSetMultimap.eea
index 7671da901c..193679e0a9 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableSetMultimap.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableSetMultimap.eea
@@ -11,10 +11,10 @@ super com/google/common/collect/SetMultimap
 
 builder
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableSetMultimap$Builder<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableSetMultimap$Builder<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>()L1com/google/common/collect/ImmutableSetMultimap$Builder<TK;TV;>;
 builderWithExpectedKeys
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Lcom/google/common/collect/ImmutableSetMultimap$Builder<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Lcom/google/common/collect/ImmutableSetMultimap$Builder<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)L1com/google/common/collect/ImmutableSetMultimap$Builder<TK;TV;>;
 copyOf
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Multimap<+TK;+TV;>;)Lcom/google/common/collect/ImmutableSetMultimap<TK;TV;>;
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Multimap<+TK;+TV;>;)Lcom/google/common/collect/ImmutableSetMultimap<TK;TV;>;
@@ -57,7 +57,7 @@ inverse
  ()Lcom/google/common/collect/ImmutableSetMultimap<TV;TK;>;
 removeAll
  (Ljava/lang/Object;)Lcom/google/common/collect/ImmutableSet<TV;>;
- (Ljava/lang/Object;)Lcom/google/common/collect/ImmutableSet<TV;>;
+ (Ljava/lang/Object;)L1com/google/common/collect/ImmutableSet<TV;>;
 replaceValues
  (TK;Ljava/lang/Iterable<+TV;>;)Lcom/google/common/collect/ImmutableSet<TV;>;
- (TK;Ljava/lang/Iterable<+TV;>;)Lcom/google/common/collect/ImmutableSet<TV;>;
+ (TK;Ljava/lang/Iterable<+TV;>;)L1com/google/common/collect/ImmutableSet<TV;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableSortedMap$Builder.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableSortedMap$Builder.eea
index 725b822a88..f3f68dac68 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableSortedMap$Builder.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableSortedMap$Builder.eea
@@ -14,7 +14,7 @@ build
  ()L1com/google/common/collect/ImmutableSortedMap<TK;TV;>;
 buildKeepingLast
  ()Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
- ()Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
+ ()L1com/google/common/collect/ImmutableSortedMap<TK;TV;>;
 buildOrThrow
  ()Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
  ()Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableSortedMap.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableSortedMap.eea
index 7194dd2658..141d79b62c 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableSortedMap.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableSortedMap.eea
@@ -11,10 +11,10 @@ super java/util/NavigableMap
 
 builder
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableSortedMap$Builder<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableSortedMap$Builder<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>()L1com/google/common/collect/ImmutableSortedMap$Builder<TK;TV;>;
 builderWithExpectedSize
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Lcom/google/common/collect/ImmutableSortedMap$Builder<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Lcom/google/common/collect/ImmutableSortedMap$Builder<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)L1com/google/common/collect/ImmutableSortedMap$Builder<TK;TV;>;
 copyOf
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljava/util/Map$Entry<+TK;+TV;>;>;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljava/util/Map$Entry<+TK;+TV;>;>;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
@@ -32,7 +32,7 @@ copyOfSorted
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/SortedMap<TK;+TV;>;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
 naturalOrder
  <K::Ljava/lang/Comparable<*>;V:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableSortedMap$Builder<TK;TV;>;
- <K::Ljava/lang/Comparable<*>;V:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableSortedMap$Builder<TK;TV;>;
+ <K::Ljava/lang/Comparable<*>;V:Ljava/lang/Object;>()L1com/google/common/collect/ImmutableSortedMap$Builder<TK;TV;>;
 of
  <K::Ljava/lang/Comparable<-TK;>;V:Ljava/lang/Object;>(TK;TV;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
  <K::Ljava/lang/Comparable<-TK;>;V:Ljava/lang/Object;>(TK;TV;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
@@ -68,49 +68,49 @@ of
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
 of
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;)L1com/google/common/collect/ImmutableSortedMap<TK;TV;>;
 of
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;)L1com/google/common/collect/ImmutableSortedMap<TK;TV;>;
 of
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;TK;TV;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;TK;TV;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;TK;TV;)L1com/google/common/collect/ImmutableSortedMap<TK;TV;>;
 of
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;TK;TV;TK;TV;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;TK;TV;TK;TV;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;TK;TV;TK;TV;)L1com/google/common/collect/ImmutableSortedMap<TK;TV;>;
 of
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;)L1com/google/common/collect/ImmutableSortedMap<TK;TV;>;
 of
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;)L1com/google/common/collect/ImmutableSortedMap<TK;TV;>;
 of
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;)L1com/google/common/collect/ImmutableSortedMap<TK;TV;>;
 of
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;)L1com/google/common/collect/ImmutableSortedMap<TK;TV;>;
 of
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;)L1com/google/common/collect/ImmutableSortedMap<TK;TV;>;
 of
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;TK;TV;)L1com/google/common/collect/ImmutableSortedMap<TK;TV;>;
 ofEntries
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>([Ljava/util/Map$Entry<+TK;+TV;>;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>([Ljava/util/Map$Entry<+TK;+TV;>;)Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>([Ljava/util/Map$Entry<+TK;+TV;>;)L1com/google/common/collect/ImmutableSortedMap<TK;TV;>;
 orderedBy
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Comparator<TK;>;)Lcom/google/common/collect/ImmutableSortedMap$Builder<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Comparator<TK;>;)Lcom/google/common/collect/ImmutableSortedMap$Builder<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Comparator<TK;>;)L1com/google/common/collect/ImmutableSortedMap$Builder<TK;TV;>;
 reverseOrder
  <K::Ljava/lang/Comparable<*>;V:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableSortedMap$Builder<TK;TV;>;
- <K::Ljava/lang/Comparable<*>;V:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableSortedMap$Builder<TK;TV;>;
+ <K::Ljava/lang/Comparable<*>;V:Ljava/lang/Object;>()L1com/google/common/collect/ImmutableSortedMap$Builder<TK;TV;>;
 toImmutableMap
  <T:Ljava/lang/Object;K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/function/Function<-TT;+TK;>;Ljava/util/function/Function<-TT;+TV;>;)Ljava/util/stream/Collector<TT;*Lcom/google/common/collect/ImmutableMap<TK;TV;>;>;
- <T:Ljava/lang/Object;K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/function/Function<-TT;+TK;>;Ljava/util/function/Function<-TT;+TV;>;)Ljava/util/stream/Collector<TT;*Lcom/google/common/collect/ImmutableMap<TK;TV;>;>;
+ <T:Ljava/lang/Object;K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/function/Function<-TT;+TK;>;Ljava/util/function/Function<-TT;+TV;>;)L1java/util/stream/Collector<TT;*Lcom/google/common/collect/ImmutableMap<TK;TV;>;>;
 toImmutableMap
  <T:Ljava/lang/Object;K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/function/Function<-TT;+TK;>;Ljava/util/function/Function<-TT;+TV;>;Ljava/util/function/BinaryOperator<TV;>;)Ljava/util/stream/Collector<TT;*Lcom/google/common/collect/ImmutableMap<TK;TV;>;>;
- <T:Ljava/lang/Object;K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/function/Function<-TT;+TK;>;Ljava/util/function/Function<-TT;+TV;>;Ljava/util/function/BinaryOperator<TV;>;)Ljava/util/stream/Collector<TT;*Lcom/google/common/collect/ImmutableMap<TK;TV;>;>;
+ <T:Ljava/lang/Object;K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/function/Function<-TT;+TK;>;Ljava/util/function/Function<-TT;+TV;>;Ljava/util/function/BinaryOperator<TV;>;)L1java/util/stream/Collector<TT;*Lcom/google/common/collect/ImmutableMap<TK;TV;>;>;
 toImmutableSortedMap
  <T:Ljava/lang/Object;K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Comparator<-TK;>;Ljava/util/function/Function<-TT;+TK;>;Ljava/util/function/Function<-TT;+TV;>;)Ljava/util/stream/Collector<TT;*Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;>;
  <T:Ljava/lang/Object;K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Comparator<-TK;>;Ljava/util/function/Function<-TT;+TK;>;Ljava/util/function/Function<-TT;+TV;>;)Ljava/util/stream/Collector<TT;*Lcom/google/common/collect/ImmutableSortedMap<TK;TV;>;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableSortedMultiset.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableSortedMultiset.eea
index e9eef723fa..fb69884950 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableSortedMultiset.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableSortedMultiset.eea
@@ -11,7 +11,7 @@ super com/google/common/collect/SortedMultiset
 
 builder
  <E:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableSortedMultiset$Builder<TE;>;
- <E:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableSortedMultiset$Builder<TE;>;
+ <E:Ljava/lang/Object;>()L1com/google/common/collect/ImmutableSortedMultiset$Builder<TE;>;
 copyOf
  <E::Ljava/lang/Comparable<-TE;>;>([TE;)Lcom/google/common/collect/ImmutableSortedMultiset<TE;>;
  <E::Ljava/lang/Comparable<-TE;>;>([TE;)Lcom/google/common/collect/ImmutableSortedMultiset<TE;>;
@@ -29,13 +29,13 @@ copyOf
  <E:Ljava/lang/Object;>(Ljava/util/Iterator<+TE;>;)Lcom/google/common/collect/ImmutableSortedMultiset<TE;>;
 copyOf
  <Z:Ljava/lang/Object;>([TZ;)Lcom/google/common/collect/ImmutableSortedMultiset<TZ;>;
- <Z:Ljava/lang/Object;>([TZ;)Lcom/google/common/collect/ImmutableSortedMultiset<TZ;>;
+ <Z:Ljava/lang/Object;>([TZ;)L1com/google/common/collect/ImmutableSortedMultiset<TZ;>;
 copyOfSorted
  <E:Ljava/lang/Object;>(Lcom/google/common/collect/SortedMultiset<TE;>;)Lcom/google/common/collect/ImmutableSortedMultiset<TE;>;
  <E:Ljava/lang/Object;>(Lcom/google/common/collect/SortedMultiset<TE;>;)Lcom/google/common/collect/ImmutableSortedMultiset<TE;>;
 naturalOrder
  <E::Ljava/lang/Comparable<*>;>()Lcom/google/common/collect/ImmutableSortedMultiset$Builder<TE;>;
- <E::Ljava/lang/Comparable<*>;>()Lcom/google/common/collect/ImmutableSortedMultiset$Builder<TE;>;
+ <E::Ljava/lang/Comparable<*>;>()L1com/google/common/collect/ImmutableSortedMultiset$Builder<TE;>;
 of
  <E::Ljava/lang/Comparable<-TE;>;>(TE;)Lcom/google/common/collect/ImmutableSortedMultiset<TE;>;
  <E::Ljava/lang/Comparable<-TE;>;>(TE;)Lcom/google/common/collect/ImmutableSortedMultiset<TE;>;
@@ -59,34 +59,34 @@ of
  <E:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableSortedMultiset<TE;>;
 of
  <E:Ljava/lang/Object;>(TE;)Lcom/google/common/collect/ImmutableSortedMultiset<TE;>;
- <E:Ljava/lang/Object;>(TE;)Lcom/google/common/collect/ImmutableSortedMultiset<TE;>;
+ <E:Ljava/lang/Object;>(TE;)L1com/google/common/collect/ImmutableSortedMultiset<TE;>;
 of
  <E:Ljava/lang/Object;>(TE;TE;)Lcom/google/common/collect/ImmutableSortedMultiset<TE;>;
- <E:Ljava/lang/Object;>(TE;TE;)Lcom/google/common/collect/ImmutableSortedMultiset<TE;>;
+ <E:Ljava/lang/Object;>(TE;TE;)L1com/google/common/collect/ImmutableSortedMultiset<TE;>;
 of
  <E:Ljava/lang/Object;>(TE;TE;TE;)Lcom/google/common/collect/ImmutableSortedMultiset<TE;>;
- <E:Ljava/lang/Object;>(TE;TE;TE;)Lcom/google/common/collect/ImmutableSortedMultiset<TE;>;
+ <E:Ljava/lang/Object;>(TE;TE;TE;)L1com/google/common/collect/ImmutableSortedMultiset<TE;>;
 of
  <E:Ljava/lang/Object;>(TE;TE;TE;TE;)Lcom/google/common/collect/ImmutableSortedMultiset<TE;>;
- <E:Ljava/lang/Object;>(TE;TE;TE;TE;)Lcom/google/common/collect/ImmutableSortedMultiset<TE;>;
+ <E:Ljava/lang/Object;>(TE;TE;TE;TE;)L1com/google/common/collect/ImmutableSortedMultiset<TE;>;
 of
  <E:Ljava/lang/Object;>(TE;TE;TE;TE;TE;)Lcom/google/common/collect/ImmutableSortedMultiset<TE;>;
- <E:Ljava/lang/Object;>(TE;TE;TE;TE;TE;)Lcom/google/common/collect/ImmutableSortedMultiset<TE;>;
+ <E:Ljava/lang/Object;>(TE;TE;TE;TE;TE;)L1com/google/common/collect/ImmutableSortedMultiset<TE;>;
 of
  <E:Ljava/lang/Object;>(TE;TE;TE;TE;TE;TE;[TE;)Lcom/google/common/collect/ImmutableSortedMultiset<TE;>;
- <E:Ljava/lang/Object;>(TE;TE;TE;TE;TE;TE;[TE;)Lcom/google/common/collect/ImmutableSortedMultiset<TE;>;
+ <E:Ljava/lang/Object;>(TE;TE;TE;TE;TE;TE;[TE;)L1com/google/common/collect/ImmutableSortedMultiset<TE;>;
 orderedBy
  <E:Ljava/lang/Object;>(Ljava/util/Comparator<TE;>;)Lcom/google/common/collect/ImmutableSortedMultiset$Builder<TE;>;
- <E:Ljava/lang/Object;>(Ljava/util/Comparator<TE;>;)Lcom/google/common/collect/ImmutableSortedMultiset$Builder<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/util/Comparator<TE;>;)L1com/google/common/collect/ImmutableSortedMultiset$Builder<TE;>;
 reverseOrder
  <E::Ljava/lang/Comparable<*>;>()Lcom/google/common/collect/ImmutableSortedMultiset$Builder<TE;>;
- <E::Ljava/lang/Comparable<*>;>()Lcom/google/common/collect/ImmutableSortedMultiset$Builder<TE;>;
+ <E::Ljava/lang/Comparable<*>;>()L1com/google/common/collect/ImmutableSortedMultiset$Builder<TE;>;
 toImmutableMultiset
  <E:Ljava/lang/Object;>()Ljava/util/stream/Collector<TE;*Lcom/google/common/collect/ImmutableMultiset<TE;>;>;
- <E:Ljava/lang/Object;>()Ljava/util/stream/Collector<TE;*Lcom/google/common/collect/ImmutableMultiset<TE;>;>;
+ <E:Ljava/lang/Object;>()L1java/util/stream/Collector<TE;*Lcom/google/common/collect/ImmutableMultiset<TE;>;>;
 toImmutableMultiset
  <T:Ljava/lang/Object;E:Ljava/lang/Object;>(Ljava/util/function/Function<-TT;+TE;>;Ljava/util/function/ToIntFunction<-TT;>;)Ljava/util/stream/Collector<TT;*Lcom/google/common/collect/ImmutableMultiset<TE;>;>;
- <T:Ljava/lang/Object;E:Ljava/lang/Object;>(Ljava/util/function/Function<-TT;+TE;>;Ljava/util/function/ToIntFunction<-TT;>;)Ljava/util/stream/Collector<TT;*Lcom/google/common/collect/ImmutableMultiset<TE;>;>;
+ <T:Ljava/lang/Object;E:Ljava/lang/Object;>(Ljava/util/function/Function<-TT;+TE;>;Ljava/util/function/ToIntFunction<-TT;>;)L1java/util/stream/Collector<TT;*Lcom/google/common/collect/ImmutableMultiset<TE;>;>;
 toImmutableSortedMultiset
  <E:Ljava/lang/Object;>(Ljava/util/Comparator<-TE;>;)Ljava/util/stream/Collector<TE;*Lcom/google/common/collect/ImmutableSortedMultiset<TE;>;>;
  <E:Ljava/lang/Object;>(Ljava/util/Comparator<-TE;>;)Ljava/util/stream/Collector<TE;*Lcom/google/common/collect/ImmutableSortedMultiset<TE;>;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableSortedSet.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableSortedSet.eea
index 379ffa6c49..276bdc37d0 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableSortedSet.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableSortedSet.eea
@@ -14,10 +14,10 @@ super com/google/common/collect/SortedIterable
 
 builder
  <E:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableSortedSet$Builder<TE;>;
- <E:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableSortedSet$Builder<TE;>;
+ <E:Ljava/lang/Object;>()L1com/google/common/collect/ImmutableSortedSet$Builder<TE;>;
 builderWithExpectedSize
  <E:Ljava/lang/Object;>(I)Lcom/google/common/collect/ImmutableSortedSet$Builder<TE;>;
- <E:Ljava/lang/Object;>(I)Lcom/google/common/collect/ImmutableSortedSet$Builder<TE;>;
+ <E:Ljava/lang/Object;>(I)L1com/google/common/collect/ImmutableSortedSet$Builder<TE;>;
 copyOf
  <E::Ljava/lang/Comparable<-TE;>;>([TE;)Lcom/google/common/collect/ImmutableSortedSet<TE;>;
  <E::Ljava/lang/Comparable<-TE;>;>([TE;)Lcom/google/common/collect/ImmutableSortedSet<TE;>;
@@ -41,16 +41,16 @@ copyOf
  <E:Ljava/lang/Object;>(Ljava/util/Iterator<+TE;>;)Lcom/google/common/collect/ImmutableSortedSet<TE;>;
 copyOf
  <Z:Ljava/lang/Object;>([TZ;)Lcom/google/common/collect/ImmutableSortedSet<TZ;>;
- <Z:Ljava/lang/Object;>([TZ;)Lcom/google/common/collect/ImmutableSortedSet<TZ;>;
+ <Z:Ljava/lang/Object;>([TZ;)L1com/google/common/collect/ImmutableSortedSet<TZ;>;
 copyOfSorted
  <E:Ljava/lang/Object;>(Ljava/util/SortedSet<TE;>;)Lcom/google/common/collect/ImmutableSortedSet<TE;>;
  <E:Ljava/lang/Object;>(Ljava/util/SortedSet<TE;>;)Lcom/google/common/collect/ImmutableSortedSet<TE;>;
 naturalOrder
  <E::Ljava/lang/Comparable<*>;>()Lcom/google/common/collect/ImmutableSortedSet$Builder<TE;>;
- <E::Ljava/lang/Comparable<*>;>()Lcom/google/common/collect/ImmutableSortedSet$Builder<TE;>;
+ <E::Ljava/lang/Comparable<*>;>()L1com/google/common/collect/ImmutableSortedSet$Builder<TE;>;
 of
  <E::Ljava/lang/Comparable<-TE;>;>(TE;)Lcom/google/common/collect/ImmutableSortedSet<TE;>;
- <E::Ljava/lang/Comparable<-TE;>;>(TE;)Lcom/google/common/collect/ImmutableSortedSet<TE;>;
+ <E::Ljava/lang/Comparable<-TE;>;>(TE;)L1com/google/common/collect/ImmutableSortedSet<TE;>;
 of
  <E::Ljava/lang/Comparable<-TE;>;>(TE;TE;)Lcom/google/common/collect/ImmutableSortedSet<TE;>;
  <E::Ljava/lang/Comparable<-TE;>;>(TE;TE;)Lcom/google/common/collect/ImmutableSortedSet<TE;>;
@@ -71,31 +71,31 @@ of
  <E:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableSortedSet<TE;>;
 of
  <E:Ljava/lang/Object;>(TE;)Lcom/google/common/collect/ImmutableSortedSet<TE;>;
- <E:Ljava/lang/Object;>(TE;)Lcom/google/common/collect/ImmutableSortedSet<TE;>;
+ <E:Ljava/lang/Object;>(TE;)L1com/google/common/collect/ImmutableSortedSet<TE;>;
 of
  <E:Ljava/lang/Object;>(TE;TE;)Lcom/google/common/collect/ImmutableSortedSet<TE;>;
- <E:Ljava/lang/Object;>(TE;TE;)Lcom/google/common/collect/ImmutableSortedSet<TE;>;
+ <E:Ljava/lang/Object;>(TE;TE;)L1com/google/common/collect/ImmutableSortedSet<TE;>;
 of
  <E:Ljava/lang/Object;>(TE;TE;TE;)Lcom/google/common/collect/ImmutableSortedSet<TE;>;
- <E:Ljava/lang/Object;>(TE;TE;TE;)Lcom/google/common/collect/ImmutableSortedSet<TE;>;
+ <E:Ljava/lang/Object;>(TE;TE;TE;)L1com/google/common/collect/ImmutableSortedSet<TE;>;
 of
  <E:Ljava/lang/Object;>(TE;TE;TE;TE;)Lcom/google/common/collect/ImmutableSortedSet<TE;>;
- <E:Ljava/lang/Object;>(TE;TE;TE;TE;)Lcom/google/common/collect/ImmutableSortedSet<TE;>;
+ <E:Ljava/lang/Object;>(TE;TE;TE;TE;)L1com/google/common/collect/ImmutableSortedSet<TE;>;
 of
  <E:Ljava/lang/Object;>(TE;TE;TE;TE;TE;)Lcom/google/common/collect/ImmutableSortedSet<TE;>;
- <E:Ljava/lang/Object;>(TE;TE;TE;TE;TE;)Lcom/google/common/collect/ImmutableSortedSet<TE;>;
+ <E:Ljava/lang/Object;>(TE;TE;TE;TE;TE;)L1com/google/common/collect/ImmutableSortedSet<TE;>;
 of
  <E:Ljava/lang/Object;>(TE;TE;TE;TE;TE;TE;[TE;)Lcom/google/common/collect/ImmutableSortedSet<TE;>;
- <E:Ljava/lang/Object;>(TE;TE;TE;TE;TE;TE;[TE;)Lcom/google/common/collect/ImmutableSortedSet<TE;>;
+ <E:Ljava/lang/Object;>(TE;TE;TE;TE;TE;TE;[TE;)L1com/google/common/collect/ImmutableSortedSet<TE;>;
 orderedBy
  <E:Ljava/lang/Object;>(Ljava/util/Comparator<TE;>;)Lcom/google/common/collect/ImmutableSortedSet$Builder<TE;>;
- <E:Ljava/lang/Object;>(Ljava/util/Comparator<TE;>;)Lcom/google/common/collect/ImmutableSortedSet$Builder<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/util/Comparator<TE;>;)L1com/google/common/collect/ImmutableSortedSet$Builder<TE;>;
 reverseOrder
  <E::Ljava/lang/Comparable<*>;>()Lcom/google/common/collect/ImmutableSortedSet$Builder<TE;>;
- <E::Ljava/lang/Comparable<*>;>()Lcom/google/common/collect/ImmutableSortedSet$Builder<TE;>;
+ <E::Ljava/lang/Comparable<*>;>()L1com/google/common/collect/ImmutableSortedSet$Builder<TE;>;
 toImmutableSet
  <E:Ljava/lang/Object;>()Ljava/util/stream/Collector<TE;*Lcom/google/common/collect/ImmutableSet<TE;>;>;
- <E:Ljava/lang/Object;>()Ljava/util/stream/Collector<TE;*Lcom/google/common/collect/ImmutableSet<TE;>;>;
+ <E:Ljava/lang/Object;>()L1java/util/stream/Collector<TE;*Lcom/google/common/collect/ImmutableSet<TE;>;>;
 toImmutableSortedSet
  <E:Ljava/lang/Object;>(Ljava/util/Comparator<-TE;>;)Ljava/util/stream/Collector<TE;*Lcom/google/common/collect/ImmutableSortedSet<TE;>;>;
  <E:Ljava/lang/Object;>(Ljava/util/Comparator<-TE;>;)Ljava/util/stream/Collector<TE;*Lcom/google/common/collect/ImmutableSortedSet<TE;>;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableTable.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableTable.eea
index ce2f64d691..3a0ed64d59 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableTable.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/ImmutableTable.eea
@@ -8,7 +8,7 @@ super com/google/common/collect/AbstractTable
 
 builder
  <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableTable$Builder<TR;TC;TV;>;
- <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableTable$Builder<TR;TC;TV;>;
+ <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>()L1com/google/common/collect/ImmutableTable$Builder<TR;TC;TV;>;
 copyOf
  <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Table<+TR;+TC;+TV;>;)Lcom/google/common/collect/ImmutableTable<TR;TC;TV;>;
  <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Table<+TR;+TC;+TV;>;)Lcom/google/common/collect/ImmutableTable<TR;TC;TV;>;
@@ -17,7 +17,7 @@ of
  <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>()Lcom/google/common/collect/ImmutableTable<TR;TC;TV;>;
 of
  <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(TR;TC;TV;)Lcom/google/common/collect/ImmutableTable<TR;TC;TV;>;
- <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(TR;TC;TV;)Lcom/google/common/collect/ImmutableTable<TR;TC;TV;>;
+ <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(TR;TC;TV;)L1com/google/common/collect/ImmutableTable<TR;TC;TV;>;
 toImmutableTable
  <T:Ljava/lang/Object;R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/function/Function<-TT;+TR;>;Ljava/util/function/Function<-TT;+TC;>;Ljava/util/function/Function<-TT;+TV;>;)Ljava/util/stream/Collector<TT;*Lcom/google/common/collect/ImmutableTable<TR;TC;TV;>;>;
  <T:Ljava/lang/Object;R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/function/Function<-TT;+TR;>;Ljava/util/function/Function<-TT;+TC;>;Ljava/util/function/Function<-TT;+TV;>;)Ljava/util/stream/Collector<TT;*Lcom/google/common/collect/ImmutableTable<TR;TC;TV;>;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/Interners.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/Interners.eea
index 33ccc9559f..4c68fcf800 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/Interners.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/Interners.eea
@@ -2,10 +2,10 @@ class com/google/common/collect/Interners
 
 asFunction
  <E:Ljava/lang/Object;>(Lcom/google/common/collect/Interner<TE;>;)Lcom/google/common/base/Function<TE;TE;>;
- <E:Ljava/lang/Object;>(Lcom/google/common/collect/Interner<TE;>;)Lcom/google/common/base/Function<TE;TE;>;
+ <E:Ljava/lang/Object;>(Lcom/google/common/collect/Interner<TE;>;)L1com/google/common/base/Function<TE;TE;>;
 newBuilder
  ()Lcom/google/common/collect/Interners$InternerBuilder;
- ()Lcom/google/common/collect/Interners$InternerBuilder;
+ ()L1com/google/common/collect/Interners$InternerBuilder;
 newStrongInterner
  <E:Ljava/lang/Object;>()Lcom/google/common/collect/Interner<TE;>;
  <E:Ljava/lang/Object;>()Lcom/google/common/collect/Interner<TE;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/Iterables.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/Iterables.eea
index 0d18cadd60..a4e954eaca 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/Iterables.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/Iterables.eea
@@ -26,13 +26,13 @@ concat
  <T:Ljava/lang/Object;>([Ljava/lang/Iterable<+TT;>;)Ljava/lang/Iterable<TT;>;
 consumingIterable
  <T:Ljava/lang/Object;>(Ljava/lang/Iterable<TT;>;)Ljava/lang/Iterable<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Iterable<TT;>;)Ljava/lang/Iterable<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Iterable<TT;>;)L1java/lang/Iterable<TT;>;
 contains
  (Ljava/lang/Iterable<+Ljava/lang/Object;>;Ljava/lang/Object;)Z
  (Ljava/lang/Iterable<+Ljava/lang/Object;>;Ljava/lang/Object;)Z
 cycle
  <T:Ljava/lang/Object;>(Ljava/lang/Iterable<TT;>;)Ljava/lang/Iterable<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Iterable<TT;>;)Ljava/lang/Iterable<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Iterable<TT;>;)L1java/lang/Iterable<TT;>;
 cycle
  <T:Ljava/lang/Object;>([TT;)Ljava/lang/Iterable<TT;>;
  <T:Ljava/lang/Object;>([TT;)Ljava/lang/Iterable<TT;>;
@@ -44,7 +44,7 @@ filter
  <T:Ljava/lang/Object;>(Ljava/lang/Iterable<*>;Ljava/lang/Class<TT;>;)Ljava/lang/Iterable<TT;>;
 filter
  <T:Ljava/lang/Object;>(Ljava/lang/Iterable<TT;>;Lcom/google/common/base/Predicate<-TT;>;)Ljava/lang/Iterable<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Iterable<TT;>;Lcom/google/common/base/Predicate<-TT;>;)Ljava/lang/Iterable<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Iterable<TT;>;Lcom/google/common/base/Predicate<-TT;>;)L1java/lang/Iterable<TT;>;
 find
  <T:Ljava/lang/Object;>(Ljava/lang/Iterable<+TT;>;Lcom/google/common/base/Predicate<-TT;>;TT;)TT;
  <T:Ljava/lang/Object;>(Ljava/lang/Iterable<+TT;>;Lcom/google/common/base/Predicate<-TT;>;TT;)T0T;
@@ -83,16 +83,16 @@ isEmpty
  (Ljava/lang/Iterable<*>;)Z
 limit
  <T:Ljava/lang/Object;>(Ljava/lang/Iterable<TT;>;I)Ljava/lang/Iterable<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Iterable<TT;>;I)Ljava/lang/Iterable<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Iterable<TT;>;I)L1java/lang/Iterable<TT;>;
 mergeSorted
  <T:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljava/lang/Iterable<+TT;>;>;Ljava/util/Comparator<-TT;>;)Ljava/lang/Iterable<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljava/lang/Iterable<+TT;>;>;Ljava/util/Comparator<-TT;>;)Ljava/lang/Iterable<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljava/lang/Iterable<+TT;>;>;Ljava/util/Comparator<-TT;>;)L1java/lang/Iterable<TT;>;
 paddedPartition
  <T:Ljava/lang/Object;>(Ljava/lang/Iterable<TT;>;I)Ljava/lang/Iterable<Ljava/util/List<TT;>;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Iterable<TT;>;I)Ljava/lang/Iterable<Ljava/util/List<TT;>;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Iterable<TT;>;I)L1java/lang/Iterable<Ljava/util/List<TT;>;>;
 partition
  <T:Ljava/lang/Object;>(Ljava/lang/Iterable<TT;>;I)Ljava/lang/Iterable<Ljava/util/List<TT;>;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Iterable<TT;>;I)Ljava/lang/Iterable<Ljava/util/List<TT;>;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Iterable<TT;>;I)L1java/lang/Iterable<Ljava/util/List<TT;>;>;
 removeAll
  (Ljava/lang/Iterable<*>;Ljava/util/Collection<*>;)Z
  (Ljava/lang/Iterable<*>;Ljava/util/Collection<*>;)Z
@@ -107,7 +107,7 @@ size
  (Ljava/lang/Iterable<*>;)I
 skip
  <T:Ljava/lang/Object;>(Ljava/lang/Iterable<TT;>;I)Ljava/lang/Iterable<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Iterable<TT;>;I)Ljava/lang/Iterable<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Iterable<TT;>;I)L1java/lang/Iterable<TT;>;
 toArray
  <T:Ljava/lang/Object;>(Ljava/lang/Iterable<+TT;>;Ljava/lang/Class<TT;>;)[TT;
  <T:Ljava/lang/Object;>(Ljava/lang/Iterable<+TT;>;Ljava/lang/Class<TT;>;)[TT;
@@ -116,7 +116,7 @@ toString
  (Ljava/lang/Iterable<*>;)Ljava/lang/String;
 transform
  <F:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/lang/Iterable<TF;>;Lcom/google/common/base/Function<-TF;+TT;>;)Ljava/lang/Iterable<TT;>;
- <F:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/lang/Iterable<TF;>;Lcom/google/common/base/Function<-TF;+TT;>;)Ljava/lang/Iterable<TT;>;
+ <F:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/lang/Iterable<TF;>;Lcom/google/common/base/Function<-TF;+TT;>;)L1java/lang/Iterable<TT;>;
 tryFind
  <T:Ljava/lang/Object;>(Ljava/lang/Iterable<TT;>;Lcom/google/common/base/Predicate<-TT;>;)Lcom/google/common/base/Optional<TT;>;
  <T:Ljava/lang/Object;>(Ljava/lang/Iterable<TT;>;Lcom/google/common/base/Predicate<-TT;>;)Lcom/google/common/base/Optional<TT;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/Iterators.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/Iterators.eea
index d205dc8bda..e3279526df 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/Iterators.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/Iterators.eea
@@ -14,7 +14,7 @@ any
  <T:Ljava/lang/Object;>(Ljava/util/Iterator<TT;>;Lcom/google/common/base/Predicate<-TT;>;)Z
 asEnumeration
  <T:Ljava/lang/Object;>(Ljava/util/Iterator<TT;>;)Ljava/util/Enumeration<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/Iterator<TT;>;)Ljava/util/Enumeration<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/Iterator<TT;>;)L1java/util/Enumeration<TT;>;
 concat
  <T:Ljava/lang/Object;>(Ljava/util/Iterator<+Ljava/util/Iterator<+TT;>;>;)Ljava/util/Iterator<TT;>;
  <T:Ljava/lang/Object;>(Ljava/util/Iterator<+Ljava/util/Iterator<+TT;>;>;)L1java/util/Iterator<TT;>;
@@ -32,7 +32,7 @@ concat
  <T:Ljava/lang/Object;>([Ljava/util/Iterator<+TT;>;)L1java/util/Iterator<TT;>;
 consumingIterator
  <T:Ljava/lang/Object;>(Ljava/util/Iterator<TT;>;)Ljava/util/Iterator<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/Iterator<TT;>;)Ljava/util/Iterator<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/Iterator<TT;>;)L1java/util/Iterator<TT;>;
 contains
  (Ljava/util/Iterator<*>;Ljava/lang/Object;)Z
  (Ljava/util/Iterator<*>;Ljava/lang/Object;)Z
@@ -50,7 +50,7 @@ filter
  <T:Ljava/lang/Object;>(Ljava/util/Iterator<*>;Ljava/lang/Class<TT;>;)Lcom/google/common/collect/UnmodifiableIterator<TT;>;
 filter
  <T:Ljava/lang/Object;>(Ljava/util/Iterator<TT;>;Lcom/google/common/base/Predicate<-TT;>;)Lcom/google/common/collect/UnmodifiableIterator<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/Iterator<TT;>;Lcom/google/common/base/Predicate<-TT;>;)Lcom/google/common/collect/UnmodifiableIterator<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/Iterator<TT;>;Lcom/google/common/base/Predicate<-TT;>;)L1com/google/common/collect/UnmodifiableIterator<TT;>;
 find
  <T:Ljava/lang/Object;>(Ljava/util/Iterator<+TT;>;Lcom/google/common/base/Predicate<-TT;>;TT;)TT;
  <T:Ljava/lang/Object;>(Ljava/util/Iterator<+TT;>;Lcom/google/common/base/Predicate<-TT;>;TT;)T0T;
@@ -62,7 +62,7 @@ forArray
  <T:Ljava/lang/Object;>([TT;)Lcom/google/common/collect/UnmodifiableIterator<TT;>;
 forEnumeration
  <T:Ljava/lang/Object;>(Ljava/util/Enumeration<TT;>;)Lcom/google/common/collect/UnmodifiableIterator<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/Enumeration<TT;>;)Lcom/google/common/collect/UnmodifiableIterator<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/Enumeration<TT;>;)L1com/google/common/collect/UnmodifiableIterator<TT;>;
 frequency
  (Ljava/util/Iterator<*>;Ljava/lang/Object;)I
  (Ljava/util/Iterator<*>;Ljava/lang/Object;)I
@@ -92,10 +92,10 @@ indexOf
  <T:Ljava/lang/Object;>(Ljava/util/Iterator<TT;>;Lcom/google/common/base/Predicate<-TT;>;)I
 limit
  <T:Ljava/lang/Object;>(Ljava/util/Iterator<TT;>;I)Ljava/util/Iterator<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/Iterator<TT;>;I)Ljava/util/Iterator<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/Iterator<TT;>;I)L1java/util/Iterator<TT;>;
 mergeSorted
  <T:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljava/util/Iterator<+TT;>;>;Ljava/util/Comparator<-TT;>;)Lcom/google/common/collect/UnmodifiableIterator<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljava/util/Iterator<+TT;>;>;Ljava/util/Comparator<-TT;>;)Lcom/google/common/collect/UnmodifiableIterator<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljava/util/Iterator<+TT;>;>;Ljava/util/Comparator<-TT;>;)L1com/google/common/collect/UnmodifiableIterator<TT;>;
 paddedPartition
  <T:Ljava/lang/Object;>(Ljava/util/Iterator<TT;>;I)Lcom/google/common/collect/UnmodifiableIterator<Ljava/util/List<TT;>;>;
  <T:Ljava/lang/Object;>(Ljava/util/Iterator<TT;>;I)Lcom/google/common/collect/UnmodifiableIterator<Ljava/util/List<TT;>;>;
@@ -119,7 +119,7 @@ retainAll
  (Ljava/util/Iterator<*>;Ljava/util/Collection<*>;)Z
 singletonIterator
  <T:Ljava/lang/Object;>(TT;)Lcom/google/common/collect/UnmodifiableIterator<TT;>;
- <T:Ljava/lang/Object;>(TT;)Lcom/google/common/collect/UnmodifiableIterator<TT;>;
+ <T:Ljava/lang/Object;>(TT;)L1com/google/common/collect/UnmodifiableIterator<TT;>;
 size
  (Ljava/util/Iterator<*>;)I
  (Ljava/util/Iterator<*>;)I
@@ -128,10 +128,10 @@ toArray
  <T:Ljava/lang/Object;>(Ljava/util/Iterator<+TT;>;Ljava/lang/Class<TT;>;)[TT;
 toString
  (Ljava/util/Iterator<*>;)Ljava/lang/String;
- (Ljava/util/Iterator<*>;)Ljava/lang/String;
+ (Ljava/util/Iterator<*>;)L1java/lang/String;
 transform
  <F:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/util/Iterator<TF;>;Lcom/google/common/base/Function<-TF;+TT;>;)Ljava/util/Iterator<TT;>;
- <F:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/util/Iterator<TF;>;Lcom/google/common/base/Function<-TF;+TT;>;)Ljava/util/Iterator<TT;>;
+ <F:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/util/Iterator<TF;>;Lcom/google/common/base/Function<-TF;+TT;>;)L1java/util/Iterator<TT;>;
 tryFind
  <T:Ljava/lang/Object;>(Ljava/util/Iterator<TT;>;Lcom/google/common/base/Predicate<-TT;>;)Lcom/google/common/base/Optional<TT;>;
  <T:Ljava/lang/Object;>(Ljava/util/Iterator<TT;>;Lcom/google/common/base/Predicate<-TT;>;)Lcom/google/common/base/Optional<TT;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/LinkedHashMultimap.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/LinkedHashMultimap.eea
index 9cccb56cde..0290db80da 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/LinkedHashMultimap.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/LinkedHashMultimap.eea
@@ -8,13 +8,13 @@ super com/google/common/collect/LinkedHashMultimapGwtSerializationDependencies
 
 create
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Lcom/google/common/collect/LinkedHashMultimap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Lcom/google/common/collect/LinkedHashMultimap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>()L1com/google/common/collect/LinkedHashMultimap<TK;TV;>;
 create
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(II)Lcom/google/common/collect/LinkedHashMultimap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(II)Lcom/google/common/collect/LinkedHashMultimap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(II)L1com/google/common/collect/LinkedHashMultimap<TK;TV;>;
 create
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Multimap<+TK;+TV;>;)Lcom/google/common/collect/LinkedHashMultimap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Multimap<+TK;+TV;>;)Lcom/google/common/collect/LinkedHashMultimap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Multimap<+TK;+TV;>;)L1com/google/common/collect/LinkedHashMultimap<TK;TV;>;
 
 entries
  ()Ljava/util/Set<Ljava/util/Map$Entry<TK;TV;>;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/LinkedHashMultiset.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/LinkedHashMultiset.eea
index 0786ef2cd9..d07c921653 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/LinkedHashMultiset.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/LinkedHashMultiset.eea
@@ -8,10 +8,10 @@ super com/google/common/collect/AbstractMapBasedMultiset
 
 create
  <E:Ljava/lang/Object;>()Lcom/google/common/collect/LinkedHashMultiset<TE;>;
- <E:Ljava/lang/Object;>()Lcom/google/common/collect/LinkedHashMultiset<TE;>;
+ <E:Ljava/lang/Object;>()L1com/google/common/collect/LinkedHashMultiset<TE;>;
 create
  <E:Ljava/lang/Object;>(I)Lcom/google/common/collect/LinkedHashMultiset<TE;>;
- <E:Ljava/lang/Object;>(I)Lcom/google/common/collect/LinkedHashMultiset<TE;>;
+ <E:Ljava/lang/Object;>(I)L1com/google/common/collect/LinkedHashMultiset<TE;>;
 create
  <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Lcom/google/common/collect/LinkedHashMultiset<TE;>;
- <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Lcom/google/common/collect/LinkedHashMultiset<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)L1com/google/common/collect/LinkedHashMultiset<TE;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/LinkedListMultimap.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/LinkedListMultimap.eea
index 9e3e87f7ca..6273d6e021 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/LinkedListMultimap.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/LinkedListMultimap.eea
@@ -11,13 +11,13 @@ super com/google/common/collect/ListMultimap
 
 create
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Lcom/google/common/collect/LinkedListMultimap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Lcom/google/common/collect/LinkedListMultimap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>()L1com/google/common/collect/LinkedListMultimap<TK;TV;>;
 create
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Lcom/google/common/collect/LinkedListMultimap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Lcom/google/common/collect/LinkedListMultimap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)L1com/google/common/collect/LinkedListMultimap<TK;TV;>;
 create
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Multimap<+TK;+TV;>;)Lcom/google/common/collect/LinkedListMultimap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Multimap<+TK;+TV;>;)Lcom/google/common/collect/LinkedListMultimap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Multimap<+TK;+TV;>;)L1com/google/common/collect/LinkedListMultimap<TK;TV;>;
 
 containsKey
  (Ljava/lang/Object;)Z
@@ -30,7 +30,7 @@ entries
  ()Ljava/util/List<Ljava/util/Map$Entry<TK;TV;>;>;
 get
  (TK;)Ljava/util/List<TV;>;
- (TK;)Ljava/util/List<TV;>;
+ (TK;)L1java/util/List<TV;>;
 put
  (TK;TV;)Z
  (TK;TV;)Z
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/Lists.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/Lists.eea
index b99c1594ec..763cb10765 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/Lists.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/Lists.eea
@@ -2,10 +2,10 @@ class com/google/common/collect/Lists
 
 asList
  <E:Ljava/lang/Object;>(TE;TE;[TE;)Ljava/util/List<TE;>;
- <E:Ljava/lang/Object;>(TE;TE;[TE;)Ljava/util/List<TE;>;
+ <E:Ljava/lang/Object;>(TE;TE;[TE;)L1java/util/List<TE;>;
 asList
  <E:Ljava/lang/Object;>(TE;[TE;)Ljava/util/List<TE;>;
- <E:Ljava/lang/Object;>(TE;[TE;)Ljava/util/List<TE;>;
+ <E:Ljava/lang/Object;>(TE;[TE;)L1java/util/List<TE;>;
 cartesianProduct
  <B:Ljava/lang/Object;>(Ljava/util/List<+Ljava/util/List<+TB;>;>;)Ljava/util/List<Ljava/util/List<TB;>;>;
  <B:Ljava/lang/Object;>(Ljava/util/List<+Ljava/util/List<+TB;>;>;)Ljava/util/List<Ljava/util/List<TB;>;>;
@@ -14,13 +14,13 @@ cartesianProduct
  <B:Ljava/lang/Object;>([Ljava/util/List<+TB;>;)Ljava/util/List<Ljava/util/List<TB;>;>;
 charactersOf
  (Ljava/lang/CharSequence;)Ljava/util/List<Ljava/lang/Character;>;
- (Ljava/lang/CharSequence;)Ljava/util/List<Ljava/lang/Character;>;
+ (Ljava/lang/CharSequence;)L1java/util/List<Ljava/lang/Character;>;
 charactersOf
  (Ljava/lang/String;)Lcom/google/common/collect/ImmutableList<Ljava/lang/Character;>;
- (Ljava/lang/String;)Lcom/google/common/collect/ImmutableList<Ljava/lang/Character;>;
+ (Ljava/lang/String;)L1com/google/common/collect/ImmutableList<Ljava/lang/Character;>;
 newArrayList
  <E:Ljava/lang/Object;>()Ljava/util/ArrayList<TE;>;
- <E:Ljava/lang/Object;>()Ljava/util/ArrayList<TE;>;
+ <E:Ljava/lang/Object;>()L1java/util/ArrayList<TE;>;
 newArrayList
  <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/ArrayList<TE;>;
  <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/ArrayList<TE;>;
@@ -29,31 +29,31 @@ newArrayList
  <E:Ljava/lang/Object;>(Ljava/util/Iterator<+TE;>;)Ljava/util/ArrayList<TE;>;
 newArrayList
  <E:Ljava/lang/Object;>([TE;)Ljava/util/ArrayList<TE;>;
- <E:Ljava/lang/Object;>([TE;)Ljava/util/ArrayList<TE;>;
+ <E:Ljava/lang/Object;>([TE;)L1java/util/ArrayList<TE;>;
 newArrayListWithCapacity
  <E:Ljava/lang/Object;>(I)Ljava/util/ArrayList<TE;>;
- <E:Ljava/lang/Object;>(I)Ljava/util/ArrayList<TE;>;
+ <E:Ljava/lang/Object;>(I)L1java/util/ArrayList<TE;>;
 newArrayListWithExpectedSize
  <E:Ljava/lang/Object;>(I)Ljava/util/ArrayList<TE;>;
- <E:Ljava/lang/Object;>(I)Ljava/util/ArrayList<TE;>;
+ <E:Ljava/lang/Object;>(I)L1java/util/ArrayList<TE;>;
 newCopyOnWriteArrayList
  <E:Ljava/lang/Object;>()Ljava/util/concurrent/CopyOnWriteArrayList<TE;>;
- <E:Ljava/lang/Object;>()Ljava/util/concurrent/CopyOnWriteArrayList<TE;>;
+ <E:Ljava/lang/Object;>()L1java/util/concurrent/CopyOnWriteArrayList<TE;>;
 newCopyOnWriteArrayList
  <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/concurrent/CopyOnWriteArrayList<TE;>;
- <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/concurrent/CopyOnWriteArrayList<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)L1java/util/concurrent/CopyOnWriteArrayList<TE;>;
 newLinkedList
  <E:Ljava/lang/Object;>()Ljava/util/LinkedList<TE;>;
- <E:Ljava/lang/Object;>()Ljava/util/LinkedList<TE;>;
+ <E:Ljava/lang/Object;>()L1java/util/LinkedList<TE;>;
 newLinkedList
  <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/LinkedList<TE;>;
  <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/LinkedList<TE;>;
 partition
  <T:Ljava/lang/Object;>(Ljava/util/List<TT;>;I)Ljava/util/List<Ljava/util/List<TT;>;>;
- <T:Ljava/lang/Object;>(Ljava/util/List<TT;>;I)Ljava/util/List<Ljava/util/List<TT;>;>;
+ <T:Ljava/lang/Object;>(Ljava/util/List<TT;>;I)L1java/util/List<Ljava/util/List<TT;>;>;
 reverse
  <T:Ljava/lang/Object;>(Ljava/util/List<TT;>;)Ljava/util/List<TT;>;
  <T:Ljava/lang/Object;>(Ljava/util/List<TT;>;)Ljava/util/List<TT;>;
 transform
  <F:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/util/List<TF;>;Lcom/google/common/base/Function<-TF;+TT;>;)Ljava/util/List<TT;>;
- <F:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/util/List<TF;>;Lcom/google/common/base/Function<-TF;+TT;>;)Ljava/util/List<TT;>;
+ <F:Ljava/lang/Object;T:Ljava/lang/Object;>(Ljava/util/List<TF;>;Lcom/google/common/base/Function<-TF;+TT;>;)L1java/util/List<TT;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/Maps.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/Maps.eea
index cfd35a5a25..7ef028cdcf 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/Maps.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/Maps.eea
@@ -2,43 +2,43 @@ class com/google/common/collect/Maps
 
 asConverter
  <A:Ljava/lang/Object;B:Ljava/lang/Object;>(Lcom/google/common/collect/BiMap<TA;TB;>;)Lcom/google/common/base/Converter<TA;TB;>;
- <A:Ljava/lang/Object;B:Ljava/lang/Object;>(Lcom/google/common/collect/BiMap<TA;TB;>;)Lcom/google/common/base/Converter<TA;TB;>;
+ <A:Ljava/lang/Object;B:Ljava/lang/Object;>(Lcom/google/common/collect/BiMap<TA;TB;>;)L1com/google/common/base/Converter<TA;TB;>;
 asMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/NavigableSet<TK;>;Lcom/google/common/base/Function<-TK;TV;>;)Ljava/util/NavigableMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/NavigableSet<TK;>;Lcom/google/common/base/Function<-TK;TV;>;)Ljava/util/NavigableMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/NavigableSet<TK;>;Lcom/google/common/base/Function<-TK;TV;>;)L1java/util/NavigableMap<TK;TV;>;
 asMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Set<TK;>;Lcom/google/common/base/Function<-TK;TV;>;)Ljava/util/Map<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Set<TK;>;Lcom/google/common/base/Function<-TK;TV;>;)Ljava/util/Map<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Set<TK;>;Lcom/google/common/base/Function<-TK;TV;>;)L1java/util/Map<TK;TV;>;
 asMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/SortedSet<TK;>;Lcom/google/common/base/Function<-TK;TV;>;)Ljava/util/SortedMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/SortedSet<TK;>;Lcom/google/common/base/Function<-TK;TV;>;)Ljava/util/SortedMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/SortedSet<TK;>;Lcom/google/common/base/Function<-TK;TV;>;)L1java/util/SortedMap<TK;TV;>;
 difference
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<+TK;+TV;>;Ljava/util/Map<+TK;+TV;>;)Lcom/google/common/collect/MapDifference<TK;TV;>;
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<+TK;+TV;>;Ljava/util/Map<+TK;+TV;>;)Lcom/google/common/collect/MapDifference<TK;TV;>;
 difference
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<+TK;+TV;>;Ljava/util/Map<+TK;+TV;>;Lcom/google/common/base/Equivalence<-TV;>;)Lcom/google/common/collect/MapDifference<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<+TK;+TV;>;Ljava/util/Map<+TK;+TV;>;Lcom/google/common/base/Equivalence<-TV;>;)Lcom/google/common/collect/MapDifference<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<+TK;+TV;>;Ljava/util/Map<+TK;+TV;>;Lcom/google/common/base/Equivalence<-TV;>;)L1com/google/common/collect/MapDifference<TK;TV;>;
 difference
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/SortedMap<TK;+TV;>;Ljava/util/Map<+TK;+TV;>;)Lcom/google/common/collect/SortedMapDifference<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/SortedMap<TK;+TV;>;Ljava/util/Map<+TK;+TV;>;)Lcom/google/common/collect/SortedMapDifference<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/SortedMap<TK;+TV;>;Ljava/util/Map<+TK;+TV;>;)L1com/google/common/collect/SortedMapDifference<TK;TV;>;
 filterEntries
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/BiMap<TK;TV;>;Lcom/google/common/base/Predicate<-Ljava/util/Map$Entry<TK;TV;>;>;)Lcom/google/common/collect/BiMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/BiMap<TK;TV;>;Lcom/google/common/base/Predicate<-Ljava/util/Map$Entry<TK;TV;>;>;)Lcom/google/common/collect/BiMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/BiMap<TK;TV;>;Lcom/google/common/base/Predicate<-Ljava/util/Map$Entry<TK;TV;>;>;)L1com/google/common/collect/BiMap<TK;TV;>;
 filterEntries
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;TV;>;Lcom/google/common/base/Predicate<-Ljava/util/Map$Entry<TK;TV;>;>;)Ljava/util/Map<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;TV;>;Lcom/google/common/base/Predicate<-Ljava/util/Map$Entry<TK;TV;>;>;)Ljava/util/Map<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;TV;>;Lcom/google/common/base/Predicate<-Ljava/util/Map$Entry<TK;TV;>;>;)L1java/util/Map<TK;TV;>;
 filterEntries
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/NavigableMap<TK;TV;>;Lcom/google/common/base/Predicate<-Ljava/util/Map$Entry<TK;TV;>;>;)Ljava/util/NavigableMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/NavigableMap<TK;TV;>;Lcom/google/common/base/Predicate<-Ljava/util/Map$Entry<TK;TV;>;>;)Ljava/util/NavigableMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/NavigableMap<TK;TV;>;Lcom/google/common/base/Predicate<-Ljava/util/Map$Entry<TK;TV;>;>;)L1java/util/NavigableMap<TK;TV;>;
 filterEntries
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/SortedMap<TK;TV;>;Lcom/google/common/base/Predicate<-Ljava/util/Map$Entry<TK;TV;>;>;)Ljava/util/SortedMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/SortedMap<TK;TV;>;Lcom/google/common/base/Predicate<-Ljava/util/Map$Entry<TK;TV;>;>;)Ljava/util/SortedMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/SortedMap<TK;TV;>;Lcom/google/common/base/Predicate<-Ljava/util/Map$Entry<TK;TV;>;>;)L1java/util/SortedMap<TK;TV;>;
 filterKeys
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/BiMap<TK;TV;>;Lcom/google/common/base/Predicate<-TK;>;)Lcom/google/common/collect/BiMap<TK;TV;>;
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/BiMap<TK;TV;>;Lcom/google/common/base/Predicate<-TK;>;)Lcom/google/common/collect/BiMap<TK;TV;>;
 filterKeys
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;TV;>;Lcom/google/common/base/Predicate<-TK;>;)Ljava/util/Map<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;TV;>;Lcom/google/common/base/Predicate<-TK;>;)Ljava/util/Map<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;TV;>;Lcom/google/common/base/Predicate<-TK;>;)L1java/util/Map<TK;TV;>;
 filterKeys
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/NavigableMap<TK;TV;>;Lcom/google/common/base/Predicate<-TK;>;)Ljava/util/NavigableMap<TK;TV;>;
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/NavigableMap<TK;TV;>;Lcom/google/common/base/Predicate<-TK;>;)Ljava/util/NavigableMap<TK;TV;>;
@@ -62,49 +62,49 @@ fromProperties
  (Ljava/util/Properties;)Lcom/google/common/collect/ImmutableMap<Ljava/lang/String;Ljava/lang/String;>;
 immutableEntry
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;)Ljava/util/Map$Entry<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;)Ljava/util/Map$Entry<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(TK;TV;)L1java/util/Map$Entry<TK;TV;>;
 immutableEnumMap
  <K:Ljava/lang/Enum<TK;>;V:Ljava/lang/Object;>(Ljava/util/Map<TK;+TV;>;)Lcom/google/common/collect/ImmutableMap<TK;TV;>;
  <K:Ljava/lang/Enum<TK;>;V:Ljava/lang/Object;>(Ljava/util/Map<TK;+TV;>;)Lcom/google/common/collect/ImmutableMap<TK;TV;>;
 newConcurrentMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Ljava/util/concurrent/ConcurrentMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Ljava/util/concurrent/ConcurrentMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>()L1java/util/concurrent/ConcurrentMap<TK;TV;>;
 newEnumMap
  <K:Ljava/lang/Enum<TK;>;V:Ljava/lang/Object;>(Ljava/lang/Class<TK;>;)Ljava/util/EnumMap<TK;TV;>;
- <K:Ljava/lang/Enum<TK;>;V:Ljava/lang/Object;>(Ljava/lang/Class<TK;>;)Ljava/util/EnumMap<TK;TV;>;
+ <K:Ljava/lang/Enum<TK;>;V:Ljava/lang/Object;>(Ljava/lang/Class<TK;>;)L1java/util/EnumMap<TK;TV;>;
 newEnumMap
  <K:Ljava/lang/Enum<TK;>;V:Ljava/lang/Object;>(Ljava/util/Map<TK;+TV;>;)Ljava/util/EnumMap<TK;TV;>;
- <K:Ljava/lang/Enum<TK;>;V:Ljava/lang/Object;>(Ljava/util/Map<TK;+TV;>;)Ljava/util/EnumMap<TK;TV;>;
+ <K:Ljava/lang/Enum<TK;>;V:Ljava/lang/Object;>(Ljava/util/Map<TK;+TV;>;)L1java/util/EnumMap<TK;TV;>;
 newHashMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Ljava/util/HashMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Ljava/util/HashMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>()L1java/util/HashMap<TK;TV;>;
 newHashMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<+TK;+TV;>;)Ljava/util/HashMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<+TK;+TV;>;)Ljava/util/HashMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<+TK;+TV;>;)L1java/util/HashMap<TK;TV;>;
 newHashMapWithExpectedSize
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Ljava/util/HashMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Ljava/util/HashMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)L1java/util/HashMap<TK;TV;>;
 newIdentityHashMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Ljava/util/IdentityHashMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Ljava/util/IdentityHashMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>()L1java/util/IdentityHashMap<TK;TV;>;
 newLinkedHashMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Ljava/util/LinkedHashMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Ljava/util/LinkedHashMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>()L1java/util/LinkedHashMap<TK;TV;>;
 newLinkedHashMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<+TK;+TV;>;)Ljava/util/LinkedHashMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<+TK;+TV;>;)Ljava/util/LinkedHashMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<+TK;+TV;>;)L1java/util/LinkedHashMap<TK;TV;>;
 newLinkedHashMapWithExpectedSize
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Ljava/util/LinkedHashMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Ljava/util/LinkedHashMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)L1java/util/LinkedHashMap<TK;TV;>;
 newTreeMap
  <C:Ljava/lang/Object;K:TC;V:Ljava/lang/Object;>(Ljava/util/Comparator<TC;>;)Ljava/util/TreeMap<TK;TV;>;
- <C:Ljava/lang/Object;K:TC;V:Ljava/lang/Object;>(Ljava/util/Comparator<TC;>;)Ljava/util/TreeMap<TK;TV;>;
+ <C:Ljava/lang/Object;K:TC;V:Ljava/lang/Object;>(Ljava/util/Comparator<TC;>;)L1java/util/TreeMap<TK;TV;>;
 newTreeMap
  <K::Ljava/lang/Comparable;V:Ljava/lang/Object;>()Ljava/util/TreeMap<TK;TV;>;
- <K::Ljava/lang/Comparable;V:Ljava/lang/Object;>()Ljava/util/TreeMap<TK;TV;>;
+ <K::Ljava/lang/Comparable;V:Ljava/lang/Object;>()L1java/util/TreeMap<TK;TV;>;
 newTreeMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/SortedMap<TK;+TV;>;)Ljava/util/TreeMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/SortedMap<TK;+TV;>;)Ljava/util/TreeMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/SortedMap<TK;+TV;>;)L1java/util/TreeMap<TK;TV;>;
 subMap
  <K::Ljava/lang/Comparable<-TK;>;V:Ljava/lang/Object;>(Ljava/util/NavigableMap<TK;TV;>;Lcom/google/common/collect/Range<TK;>;)Ljava/util/NavigableMap<TK;TV;>;
  <K::Ljava/lang/Comparable<-TK;>;V:Ljava/lang/Object;>(Ljava/util/NavigableMap<TK;TV;>;Lcom/google/common/collect/Range<TK;>;)Ljava/util/NavigableMap<TK;TV;>;
@@ -128,13 +128,13 @@ toMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Iterator<TK;>;Lcom/google/common/base/Function<-TK;TV;>;)Lcom/google/common/collect/ImmutableMap<TK;TV;>;
 transformEntries
  <K:Ljava/lang/Object;V1:Ljava/lang/Object;V2:Ljava/lang/Object;>(Ljava/util/Map<TK;TV1;>;Lcom/google/common/collect/Maps$EntryTransformer<-TK;-TV1;TV2;>;)Ljava/util/Map<TK;TV2;>;
- <K:Ljava/lang/Object;V1:Ljava/lang/Object;V2:Ljava/lang/Object;>(Ljava/util/Map<TK;TV1;>;Lcom/google/common/collect/Maps$EntryTransformer<-TK;-TV1;TV2;>;)Ljava/util/Map<TK;TV2;>;
+ <K:Ljava/lang/Object;V1:Ljava/lang/Object;V2:Ljava/lang/Object;>(Ljava/util/Map<TK;TV1;>;Lcom/google/common/collect/Maps$EntryTransformer<-TK;-TV1;TV2;>;)L1java/util/Map<TK;TV2;>;
 transformEntries
  <K:Ljava/lang/Object;V1:Ljava/lang/Object;V2:Ljava/lang/Object;>(Ljava/util/NavigableMap<TK;TV1;>;Lcom/google/common/collect/Maps$EntryTransformer<-TK;-TV1;TV2;>;)Ljava/util/NavigableMap<TK;TV2;>;
- <K:Ljava/lang/Object;V1:Ljava/lang/Object;V2:Ljava/lang/Object;>(Ljava/util/NavigableMap<TK;TV1;>;Lcom/google/common/collect/Maps$EntryTransformer<-TK;-TV1;TV2;>;)Ljava/util/NavigableMap<TK;TV2;>;
+ <K:Ljava/lang/Object;V1:Ljava/lang/Object;V2:Ljava/lang/Object;>(Ljava/util/NavigableMap<TK;TV1;>;Lcom/google/common/collect/Maps$EntryTransformer<-TK;-TV1;TV2;>;)L1java/util/NavigableMap<TK;TV2;>;
 transformEntries
  <K:Ljava/lang/Object;V1:Ljava/lang/Object;V2:Ljava/lang/Object;>(Ljava/util/SortedMap<TK;TV1;>;Lcom/google/common/collect/Maps$EntryTransformer<-TK;-TV1;TV2;>;)Ljava/util/SortedMap<TK;TV2;>;
- <K:Ljava/lang/Object;V1:Ljava/lang/Object;V2:Ljava/lang/Object;>(Ljava/util/SortedMap<TK;TV1;>;Lcom/google/common/collect/Maps$EntryTransformer<-TK;-TV1;TV2;>;)Ljava/util/SortedMap<TK;TV2;>;
+ <K:Ljava/lang/Object;V1:Ljava/lang/Object;V2:Ljava/lang/Object;>(Ljava/util/SortedMap<TK;TV1;>;Lcom/google/common/collect/Maps$EntryTransformer<-TK;-TV1;TV2;>;)L1java/util/SortedMap<TK;TV2;>;
 transformValues
  <K:Ljava/lang/Object;V1:Ljava/lang/Object;V2:Ljava/lang/Object;>(Ljava/util/Map<TK;TV1;>;Lcom/google/common/base/Function<-TV1;TV2;>;)Ljava/util/Map<TK;TV2;>;
  <K:Ljava/lang/Object;V1:Ljava/lang/Object;V2:Ljava/lang/Object;>(Ljava/util/Map<TK;TV1;>;Lcom/google/common/base/Function<-TV1;TV2;>;)Ljava/util/Map<TK;TV2;>;
@@ -152,7 +152,7 @@ uniqueIndex
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Iterator<TV;>;Lcom/google/common/base/Function<-TV;TK;>;)Lcom/google/common/collect/ImmutableMap<TK;TV;>;
 unmodifiableBiMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/BiMap<+TK;+TV;>;)Lcom/google/common/collect/BiMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/BiMap<+TK;+TV;>;)Lcom/google/common/collect/BiMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/BiMap<+TK;+TV;>;)L1com/google/common/collect/BiMap<TK;TV;>;
 unmodifiableNavigableMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/NavigableMap<TK;+TV;>;)Ljava/util/NavigableMap<TK;TV;>;
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/NavigableMap<TK;+TV;>;)Ljava/util/NavigableMap<TK;TV;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/MinMaxPriorityQueue$Builder.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/MinMaxPriorityQueue$Builder.eea
index c3e37cdec6..e1e5835462 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/MinMaxPriorityQueue$Builder.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/MinMaxPriorityQueue$Builder.eea
@@ -4,10 +4,10 @@ class com/google/common/collect/MinMaxPriorityQueue$Builder
 
 create
  <T:TB;>()Lcom/google/common/collect/MinMaxPriorityQueue<TT;>;
- <T:TB;>()Lcom/google/common/collect/MinMaxPriorityQueue<TT;>;
+ <T:TB;>()L1com/google/common/collect/MinMaxPriorityQueue<TT;>;
 create
  <T:TB;>(Ljava/lang/Iterable<+TT;>;)Lcom/google/common/collect/MinMaxPriorityQueue<TT;>;
- <T:TB;>(Ljava/lang/Iterable<+TT;>;)Lcom/google/common/collect/MinMaxPriorityQueue<TT;>;
+ <T:TB;>(Ljava/lang/Iterable<+TT;>;)L1com/google/common/collect/MinMaxPriorityQueue<TT;>;
 expectedSize
  (I)Lcom/google/common/collect/MinMaxPriorityQueue$Builder<TB;>;
  (I)L1com/google/common/collect/MinMaxPriorityQueue$Builder<TB;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/MinMaxPriorityQueue.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/MinMaxPriorityQueue.eea
index fc637db8e5..a465bffd04 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/MinMaxPriorityQueue.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/MinMaxPriorityQueue.eea
@@ -8,10 +8,10 @@ super java/util/AbstractQueue
 
 create
  <E::Ljava/lang/Comparable<TE;>;>()Lcom/google/common/collect/MinMaxPriorityQueue<TE;>;
- <E::Ljava/lang/Comparable<TE;>;>()Lcom/google/common/collect/MinMaxPriorityQueue<TE;>;
+ <E::Ljava/lang/Comparable<TE;>;>()L1com/google/common/collect/MinMaxPriorityQueue<TE;>;
 create
  <E::Ljava/lang/Comparable<TE;>;>(Ljava/lang/Iterable<+TE;>;)Lcom/google/common/collect/MinMaxPriorityQueue<TE;>;
- <E::Ljava/lang/Comparable<TE;>;>(Ljava/lang/Iterable<+TE;>;)Lcom/google/common/collect/MinMaxPriorityQueue<TE;>;
+ <E::Ljava/lang/Comparable<TE;>;>(Ljava/lang/Iterable<+TE;>;)L1com/google/common/collect/MinMaxPriorityQueue<TE;>;
 expectedSize
  (I)Lcom/google/common/collect/MinMaxPriorityQueue$Builder<Ljava/lang/Comparable;>;
  (I)Lcom/google/common/collect/MinMaxPriorityQueue$Builder<Ljava/lang/Comparable;>;
@@ -20,7 +20,7 @@ maximumSize
  (I)Lcom/google/common/collect/MinMaxPriorityQueue$Builder<Ljava/lang/Comparable;>;
 orderedBy
  <B:Ljava/lang/Object;>(Ljava/util/Comparator<TB;>;)Lcom/google/common/collect/MinMaxPriorityQueue$Builder<TB;>;
- <B:Ljava/lang/Object;>(Ljava/util/Comparator<TB;>;)Lcom/google/common/collect/MinMaxPriorityQueue$Builder<TB;>;
+ <B:Ljava/lang/Object;>(Ljava/util/Comparator<TB;>;)L1com/google/common/collect/MinMaxPriorityQueue$Builder<TB;>;
 
 add
  (TE;)Z
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/MultimapBuilder$MultimapBuilderWithKeys.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/MultimapBuilder$MultimapBuilderWithKeys.eea
index 00a97bb017..46108fd622 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/MultimapBuilder$MultimapBuilderWithKeys.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/MultimapBuilder$MultimapBuilderWithKeys.eea
@@ -7,28 +7,28 @@ arrayListValues
  ()Lcom/google/common/collect/MultimapBuilder$ListMultimapBuilder<TK0;Ljava/lang/Object;>;
 arrayListValues
  (I)Lcom/google/common/collect/MultimapBuilder$ListMultimapBuilder<TK0;Ljava/lang/Object;>;
- (I)Lcom/google/common/collect/MultimapBuilder$ListMultimapBuilder<TK0;Ljava/lang/Object;>;
+ (I)L1com/google/common/collect/MultimapBuilder$ListMultimapBuilder<TK0;Ljava/lang/Object;>;
 enumSetValues
  <V0:Ljava/lang/Enum<TV0;>;>(Ljava/lang/Class<TV0;>;)Lcom/google/common/collect/MultimapBuilder$SetMultimapBuilder<TK0;TV0;>;
- <V0:Ljava/lang/Enum<TV0;>;>(Ljava/lang/Class<TV0;>;)Lcom/google/common/collect/MultimapBuilder$SetMultimapBuilder<TK0;TV0;>;
+ <V0:Ljava/lang/Enum<TV0;>;>(Ljava/lang/Class<TV0;>;)L1com/google/common/collect/MultimapBuilder$SetMultimapBuilder<TK0;TV0;>;
 hashSetValues
  ()Lcom/google/common/collect/MultimapBuilder$SetMultimapBuilder<TK0;Ljava/lang/Object;>;
  ()Lcom/google/common/collect/MultimapBuilder$SetMultimapBuilder<TK0;Ljava/lang/Object;>;
 hashSetValues
  (I)Lcom/google/common/collect/MultimapBuilder$SetMultimapBuilder<TK0;Ljava/lang/Object;>;
- (I)Lcom/google/common/collect/MultimapBuilder$SetMultimapBuilder<TK0;Ljava/lang/Object;>;
+ (I)L1com/google/common/collect/MultimapBuilder$SetMultimapBuilder<TK0;Ljava/lang/Object;>;
 linkedHashSetValues
  ()Lcom/google/common/collect/MultimapBuilder$SetMultimapBuilder<TK0;Ljava/lang/Object;>;
  ()Lcom/google/common/collect/MultimapBuilder$SetMultimapBuilder<TK0;Ljava/lang/Object;>;
 linkedHashSetValues
  (I)Lcom/google/common/collect/MultimapBuilder$SetMultimapBuilder<TK0;Ljava/lang/Object;>;
- (I)Lcom/google/common/collect/MultimapBuilder$SetMultimapBuilder<TK0;Ljava/lang/Object;>;
+ (I)L1com/google/common/collect/MultimapBuilder$SetMultimapBuilder<TK0;Ljava/lang/Object;>;
 linkedListValues
  ()Lcom/google/common/collect/MultimapBuilder$ListMultimapBuilder<TK0;Ljava/lang/Object;>;
- ()Lcom/google/common/collect/MultimapBuilder$ListMultimapBuilder<TK0;Ljava/lang/Object;>;
+ ()L1com/google/common/collect/MultimapBuilder$ListMultimapBuilder<TK0;Ljava/lang/Object;>;
 treeSetValues
  ()Lcom/google/common/collect/MultimapBuilder$SortedSetMultimapBuilder<TK0;Ljava/lang/Comparable;>;
  ()Lcom/google/common/collect/MultimapBuilder$SortedSetMultimapBuilder<TK0;Ljava/lang/Comparable;>;
 treeSetValues
  <V0:Ljava/lang/Object;>(Ljava/util/Comparator<TV0;>;)Lcom/google/common/collect/MultimapBuilder$SortedSetMultimapBuilder<TK0;TV0;>;
- <V0:Ljava/lang/Object;>(Ljava/util/Comparator<TV0;>;)Lcom/google/common/collect/MultimapBuilder$SortedSetMultimapBuilder<TK0;TV0;>;
+ <V0:Ljava/lang/Object;>(Ljava/util/Comparator<TV0;>;)L1com/google/common/collect/MultimapBuilder$SortedSetMultimapBuilder<TK0;TV0;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/MultimapBuilder.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/MultimapBuilder.eea
index c8369622b4..f7da15b9f3 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/MultimapBuilder.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/MultimapBuilder.eea
@@ -4,25 +4,25 @@ class com/google/common/collect/MultimapBuilder
 
 enumKeys
  <K0:Ljava/lang/Enum<TK0;>;>(Ljava/lang/Class<TK0;>;)Lcom/google/common/collect/MultimapBuilder$MultimapBuilderWithKeys<TK0;>;
- <K0:Ljava/lang/Enum<TK0;>;>(Ljava/lang/Class<TK0;>;)Lcom/google/common/collect/MultimapBuilder$MultimapBuilderWithKeys<TK0;>;
+ <K0:Ljava/lang/Enum<TK0;>;>(Ljava/lang/Class<TK0;>;)L1com/google/common/collect/MultimapBuilder$MultimapBuilderWithKeys<TK0;>;
 hashKeys
  ()Lcom/google/common/collect/MultimapBuilder$MultimapBuilderWithKeys<Ljava/lang/Object;>;
  ()Lcom/google/common/collect/MultimapBuilder$MultimapBuilderWithKeys<Ljava/lang/Object;>;
 hashKeys
  (I)Lcom/google/common/collect/MultimapBuilder$MultimapBuilderWithKeys<Ljava/lang/Object;>;
- (I)Lcom/google/common/collect/MultimapBuilder$MultimapBuilderWithKeys<Ljava/lang/Object;>;
+ (I)L1com/google/common/collect/MultimapBuilder$MultimapBuilderWithKeys<Ljava/lang/Object;>;
 linkedHashKeys
  ()Lcom/google/common/collect/MultimapBuilder$MultimapBuilderWithKeys<Ljava/lang/Object;>;
  ()Lcom/google/common/collect/MultimapBuilder$MultimapBuilderWithKeys<Ljava/lang/Object;>;
 linkedHashKeys
  (I)Lcom/google/common/collect/MultimapBuilder$MultimapBuilderWithKeys<Ljava/lang/Object;>;
- (I)Lcom/google/common/collect/MultimapBuilder$MultimapBuilderWithKeys<Ljava/lang/Object;>;
+ (I)L1com/google/common/collect/MultimapBuilder$MultimapBuilderWithKeys<Ljava/lang/Object;>;
 treeKeys
  ()Lcom/google/common/collect/MultimapBuilder$MultimapBuilderWithKeys<Ljava/lang/Comparable;>;
  ()Lcom/google/common/collect/MultimapBuilder$MultimapBuilderWithKeys<Ljava/lang/Comparable;>;
 treeKeys
  <K0:Ljava/lang/Object;>(Ljava/util/Comparator<TK0;>;)Lcom/google/common/collect/MultimapBuilder$MultimapBuilderWithKeys<TK0;>;
- <K0:Ljava/lang/Object;>(Ljava/util/Comparator<TK0;>;)Lcom/google/common/collect/MultimapBuilder$MultimapBuilderWithKeys<TK0;>;
+ <K0:Ljava/lang/Object;>(Ljava/util/Comparator<TK0;>;)L1com/google/common/collect/MultimapBuilder$MultimapBuilderWithKeys<TK0;>;
 
 build
  <K:TK0;V:TV0;>()Lcom/google/common/collect/Multimap<TK;TV;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/Multimaps.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/Multimaps.eea
index 68eecbc191..6d7f0ccb6f 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/Multimaps.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/Multimaps.eea
@@ -17,10 +17,10 @@ filterEntries
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Multimap<TK;TV;>;Lcom/google/common/base/Predicate<-Ljava/util/Map$Entry<TK;TV;>;>;)Lcom/google/common/collect/Multimap<TK;TV;>;
 filterEntries
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/SetMultimap<TK;TV;>;Lcom/google/common/base/Predicate<-Ljava/util/Map$Entry<TK;TV;>;>;)Lcom/google/common/collect/SetMultimap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/SetMultimap<TK;TV;>;Lcom/google/common/base/Predicate<-Ljava/util/Map$Entry<TK;TV;>;>;)Lcom/google/common/collect/SetMultimap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/SetMultimap<TK;TV;>;Lcom/google/common/base/Predicate<-Ljava/util/Map$Entry<TK;TV;>;>;)L1com/google/common/collect/SetMultimap<TK;TV;>;
 filterKeys
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/ListMultimap<TK;TV;>;Lcom/google/common/base/Predicate<-TK;>;)Lcom/google/common/collect/ListMultimap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/ListMultimap<TK;TV;>;Lcom/google/common/base/Predicate<-TK;>;)Lcom/google/common/collect/ListMultimap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/ListMultimap<TK;TV;>;Lcom/google/common/base/Predicate<-TK;>;)L1com/google/common/collect/ListMultimap<TK;TV;>;
 filterKeys
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Multimap<TK;TV;>;Lcom/google/common/base/Predicate<-TK;>;)Lcom/google/common/collect/Multimap<TK;TV;>;
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Multimap<TK;TV;>;Lcom/google/common/base/Predicate<-TK;>;)Lcom/google/common/collect/Multimap<TK;TV;>;
@@ -38,7 +38,7 @@ flatteningToMultimap
  <T:Ljava/lang/Object;K:Ljava/lang/Object;V:Ljava/lang/Object;M::Lcom/google/common/collect/Multimap<TK;TV;>;>(Ljava/util/function/Function<-TT;+TK;>;Ljava/util/function/Function<-TT;+Ljava/util/stream/Stream<+TV;>;>;Ljava/util/function/Supplier<TM;>;)Ljava/util/stream/Collector<TT;*TM;>;
 forMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;TV;>;)Lcom/google/common/collect/SetMultimap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;TV;>;)Lcom/google/common/collect/SetMultimap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;TV;>;)L1com/google/common/collect/SetMultimap<TK;TV;>;
 index
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Iterable<TV;>;Lcom/google/common/base/Function<-TV;TK;>;)Lcom/google/common/collect/ImmutableListMultimap<TK;TV;>;
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Iterable<TV;>;Lcom/google/common/base/Function<-TV;TK;>;)Lcom/google/common/collect/ImmutableListMultimap<TK;TV;>;
@@ -50,16 +50,16 @@ invertFrom
  <K:Ljava/lang/Object;V:Ljava/lang/Object;M::Lcom/google/common/collect/Multimap<TK;TV;>;>(Lcom/google/common/collect/Multimap<+TV;+TK;>;TM;)TM;
 newListMultimap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;Ljava/util/Collection<TV;>;>;Lcom/google/common/base/Supplier<+Ljava/util/List<TV;>;>;)Lcom/google/common/collect/ListMultimap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;Ljava/util/Collection<TV;>;>;Lcom/google/common/base/Supplier<+Ljava/util/List<TV;>;>;)Lcom/google/common/collect/ListMultimap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;Ljava/util/Collection<TV;>;>;Lcom/google/common/base/Supplier<+Ljava/util/List<TV;>;>;)L1com/google/common/collect/ListMultimap<TK;TV;>;
 newMultimap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;Ljava/util/Collection<TV;>;>;Lcom/google/common/base/Supplier<+Ljava/util/Collection<TV;>;>;)Lcom/google/common/collect/Multimap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;Ljava/util/Collection<TV;>;>;Lcom/google/common/base/Supplier<+Ljava/util/Collection<TV;>;>;)Lcom/google/common/collect/Multimap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;Ljava/util/Collection<TV;>;>;Lcom/google/common/base/Supplier<+Ljava/util/Collection<TV;>;>;)L1com/google/common/collect/Multimap<TK;TV;>;
 newSetMultimap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;Ljava/util/Collection<TV;>;>;Lcom/google/common/base/Supplier<+Ljava/util/Set<TV;>;>;)Lcom/google/common/collect/SetMultimap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;Ljava/util/Collection<TV;>;>;Lcom/google/common/base/Supplier<+Ljava/util/Set<TV;>;>;)Lcom/google/common/collect/SetMultimap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;Ljava/util/Collection<TV;>;>;Lcom/google/common/base/Supplier<+Ljava/util/Set<TV;>;>;)L1com/google/common/collect/SetMultimap<TK;TV;>;
 newSortedSetMultimap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;Ljava/util/Collection<TV;>;>;Lcom/google/common/base/Supplier<+Ljava/util/SortedSet<TV;>;>;)Lcom/google/common/collect/SortedSetMultimap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;Ljava/util/Collection<TV;>;>;Lcom/google/common/base/Supplier<+Ljava/util/SortedSet<TV;>;>;)Lcom/google/common/collect/SortedSetMultimap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;Ljava/util/Collection<TV;>;>;Lcom/google/common/base/Supplier<+Ljava/util/SortedSet<TV;>;>;)L1com/google/common/collect/SortedSetMultimap<TK;TV;>;
 synchronizedListMultimap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/ListMultimap<TK;TV;>;)Lcom/google/common/collect/ListMultimap<TK;TV;>;
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/ListMultimap<TK;TV;>;)Lcom/google/common/collect/ListMultimap<TK;TV;>;
@@ -77,10 +77,10 @@ toMultimap
  <T:Ljava/lang/Object;K:Ljava/lang/Object;V:Ljava/lang/Object;M::Lcom/google/common/collect/Multimap<TK;TV;>;>(Ljava/util/function/Function<-TT;+TK;>;Ljava/util/function/Function<-TT;+TV;>;Ljava/util/function/Supplier<TM;>;)Ljava/util/stream/Collector<TT;*TM;>;
 transformEntries
  <K:Ljava/lang/Object;V1:Ljava/lang/Object;V2:Ljava/lang/Object;>(Lcom/google/common/collect/ListMultimap<TK;TV1;>;Lcom/google/common/collect/Maps$EntryTransformer<-TK;-TV1;TV2;>;)Lcom/google/common/collect/ListMultimap<TK;TV2;>;
- <K:Ljava/lang/Object;V1:Ljava/lang/Object;V2:Ljava/lang/Object;>(Lcom/google/common/collect/ListMultimap<TK;TV1;>;Lcom/google/common/collect/Maps$EntryTransformer<-TK;-TV1;TV2;>;)Lcom/google/common/collect/ListMultimap<TK;TV2;>;
+ <K:Ljava/lang/Object;V1:Ljava/lang/Object;V2:Ljava/lang/Object;>(Lcom/google/common/collect/ListMultimap<TK;TV1;>;Lcom/google/common/collect/Maps$EntryTransformer<-TK;-TV1;TV2;>;)L1com/google/common/collect/ListMultimap<TK;TV2;>;
 transformEntries
  <K:Ljava/lang/Object;V1:Ljava/lang/Object;V2:Ljava/lang/Object;>(Lcom/google/common/collect/Multimap<TK;TV1;>;Lcom/google/common/collect/Maps$EntryTransformer<-TK;-TV1;TV2;>;)Lcom/google/common/collect/Multimap<TK;TV2;>;
- <K:Ljava/lang/Object;V1:Ljava/lang/Object;V2:Ljava/lang/Object;>(Lcom/google/common/collect/Multimap<TK;TV1;>;Lcom/google/common/collect/Maps$EntryTransformer<-TK;-TV1;TV2;>;)Lcom/google/common/collect/Multimap<TK;TV2;>;
+ <K:Ljava/lang/Object;V1:Ljava/lang/Object;V2:Ljava/lang/Object;>(Lcom/google/common/collect/Multimap<TK;TV1;>;Lcom/google/common/collect/Maps$EntryTransformer<-TK;-TV1;TV2;>;)L1com/google/common/collect/Multimap<TK;TV2;>;
 transformValues
  <K:Ljava/lang/Object;V1:Ljava/lang/Object;V2:Ljava/lang/Object;>(Lcom/google/common/collect/ListMultimap<TK;TV1;>;Lcom/google/common/base/Function<-TV1;TV2;>;)Lcom/google/common/collect/ListMultimap<TK;TV2;>;
  <K:Ljava/lang/Object;V1:Ljava/lang/Object;V2:Ljava/lang/Object;>(Lcom/google/common/collect/ListMultimap<TK;TV1;>;Lcom/google/common/base/Function<-TV1;TV2;>;)Lcom/google/common/collect/ListMultimap<TK;TV2;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/Multisets.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/Multisets.eea
index 71e29b5e3b..b3b137e210 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/Multisets.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/Multisets.eea
@@ -8,16 +8,16 @@ copyHighestCountFirst
  <E:Ljava/lang/Object;>(Lcom/google/common/collect/Multiset<TE;>;)Lcom/google/common/collect/ImmutableMultiset<TE;>;
 difference
  <E:Ljava/lang/Object;>(Lcom/google/common/collect/Multiset<TE;>;Lcom/google/common/collect/Multiset<*>;)Lcom/google/common/collect/Multiset<TE;>;
- <E:Ljava/lang/Object;>(Lcom/google/common/collect/Multiset<TE;>;Lcom/google/common/collect/Multiset<*>;)Lcom/google/common/collect/Multiset<TE;>;
+ <E:Ljava/lang/Object;>(Lcom/google/common/collect/Multiset<TE;>;Lcom/google/common/collect/Multiset<*>;)L1com/google/common/collect/Multiset<TE;>;
 filter
  <E:Ljava/lang/Object;>(Lcom/google/common/collect/Multiset<TE;>;Lcom/google/common/base/Predicate<-TE;>;)Lcom/google/common/collect/Multiset<TE;>;
- <E:Ljava/lang/Object;>(Lcom/google/common/collect/Multiset<TE;>;Lcom/google/common/base/Predicate<-TE;>;)Lcom/google/common/collect/Multiset<TE;>;
+ <E:Ljava/lang/Object;>(Lcom/google/common/collect/Multiset<TE;>;Lcom/google/common/base/Predicate<-TE;>;)L1com/google/common/collect/Multiset<TE;>;
 immutableEntry
  <E:Ljava/lang/Object;>(TE;I)Lcom/google/common/collect/Multiset$Entry<TE;>;
- <E:Ljava/lang/Object;>(TE;I)Lcom/google/common/collect/Multiset$Entry<TE;>;
+ <E:Ljava/lang/Object;>(TE;I)L1com/google/common/collect/Multiset$Entry<TE;>;
 intersection
  <E:Ljava/lang/Object;>(Lcom/google/common/collect/Multiset<TE;>;Lcom/google/common/collect/Multiset<*>;)Lcom/google/common/collect/Multiset<TE;>;
- <E:Ljava/lang/Object;>(Lcom/google/common/collect/Multiset<TE;>;Lcom/google/common/collect/Multiset<*>;)Lcom/google/common/collect/Multiset<TE;>;
+ <E:Ljava/lang/Object;>(Lcom/google/common/collect/Multiset<TE;>;Lcom/google/common/collect/Multiset<*>;)L1com/google/common/collect/Multiset<TE;>;
 removeOccurrences
  (Lcom/google/common/collect/Multiset<*>;Lcom/google/common/collect/Multiset<*>;)Z
  (Lcom/google/common/collect/Multiset<*>;Lcom/google/common/collect/Multiset<*>;)Z
@@ -29,13 +29,13 @@ retainOccurrences
  (Lcom/google/common/collect/Multiset<*>;Lcom/google/common/collect/Multiset<*>;)Z
 sum
  <E:Ljava/lang/Object;>(Lcom/google/common/collect/Multiset<+TE;>;Lcom/google/common/collect/Multiset<+TE;>;)Lcom/google/common/collect/Multiset<TE;>;
- <E:Ljava/lang/Object;>(Lcom/google/common/collect/Multiset<+TE;>;Lcom/google/common/collect/Multiset<+TE;>;)Lcom/google/common/collect/Multiset<TE;>;
+ <E:Ljava/lang/Object;>(Lcom/google/common/collect/Multiset<+TE;>;Lcom/google/common/collect/Multiset<+TE;>;)L1com/google/common/collect/Multiset<TE;>;
 toMultiset
  <T:Ljava/lang/Object;E:Ljava/lang/Object;M::Lcom/google/common/collect/Multiset<TE;>;>(Ljava/util/function/Function<-TT;TE;>;Ljava/util/function/ToIntFunction<-TT;>;Ljava/util/function/Supplier<TM;>;)Ljava/util/stream/Collector<TT;*TM;>;
  <T:Ljava/lang/Object;E:Ljava/lang/Object;M::Lcom/google/common/collect/Multiset<TE;>;>(Ljava/util/function/Function<-TT;TE;>;Ljava/util/function/ToIntFunction<-TT;>;Ljava/util/function/Supplier<TM;>;)Ljava/util/stream/Collector<TT;*TM;>;
 union
  <E:Ljava/lang/Object;>(Lcom/google/common/collect/Multiset<+TE;>;Lcom/google/common/collect/Multiset<+TE;>;)Lcom/google/common/collect/Multiset<TE;>;
- <E:Ljava/lang/Object;>(Lcom/google/common/collect/Multiset<+TE;>;Lcom/google/common/collect/Multiset<+TE;>;)Lcom/google/common/collect/Multiset<TE;>;
+ <E:Ljava/lang/Object;>(Lcom/google/common/collect/Multiset<+TE;>;Lcom/google/common/collect/Multiset<+TE;>;)L1com/google/common/collect/Multiset<TE;>;
 unmodifiableMultiset
  <E:Ljava/lang/Object;>(Lcom/google/common/collect/ImmutableMultiset<TE;>;)Lcom/google/common/collect/Multiset<TE;>;
  <E:Ljava/lang/Object;>(Lcom/google/common/collect/ImmutableMultiset<TE;>;)Lcom/google/common/collect/Multiset<TE;>;
@@ -44,4 +44,4 @@ unmodifiableMultiset
  <E:Ljava/lang/Object;>(Lcom/google/common/collect/Multiset<+TE;>;)Lcom/google/common/collect/Multiset<TE;>;
 unmodifiableSortedMultiset
  <E:Ljava/lang/Object;>(Lcom/google/common/collect/SortedMultiset<TE;>;)Lcom/google/common/collect/SortedMultiset<TE;>;
- <E:Ljava/lang/Object;>(Lcom/google/common/collect/SortedMultiset<TE;>;)Lcom/google/common/collect/SortedMultiset<TE;>;
+ <E:Ljava/lang/Object;>(Lcom/google/common/collect/SortedMultiset<TE;>;)L1com/google/common/collect/SortedMultiset<TE;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/MutableClassToInstanceMap.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/MutableClassToInstanceMap.eea
index 34146ad303..40b5319468 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/MutableClassToInstanceMap.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/MutableClassToInstanceMap.eea
@@ -11,17 +11,17 @@ super com/google/common/collect/ClassToInstanceMap
 
 create
  <B:Ljava/lang/Object;>()Lcom/google/common/collect/MutableClassToInstanceMap<TB;>;
- <B:Ljava/lang/Object;>()Lcom/google/common/collect/MutableClassToInstanceMap<TB;>;
+ <B:Ljava/lang/Object;>()L1com/google/common/collect/MutableClassToInstanceMap<TB;>;
 create
  <B:Ljava/lang/Object;>(Ljava/util/Map<Ljava/lang/Class<+TB;>;TB;>;)Lcom/google/common/collect/MutableClassToInstanceMap<TB;>;
- <B:Ljava/lang/Object;>(Ljava/util/Map<Ljava/lang/Class<+TB;>;TB;>;)Lcom/google/common/collect/MutableClassToInstanceMap<TB;>;
+ <B:Ljava/lang/Object;>(Ljava/util/Map<Ljava/lang/Class<+TB;>;TB;>;)L1com/google/common/collect/MutableClassToInstanceMap<TB;>;
 
 delegate
  ()Ljava/util/Map<Ljava/lang/Class<+TB;>;TB;>;
  ()Ljava/util/Map<Ljava/lang/Class<+TB;>;TB;>;
 entrySet
  ()Ljava/util/Set<Ljava/util/Map$Entry<Ljava/lang/Class<+TB;>;TB;>;>;
- ()Ljava/util/Set<Ljava/util/Map$Entry<Ljava/lang/Class<+TB;>;TB;>;>;
+ ()L1java/util/Set<Ljava/util/Map$Entry<Ljava/lang/Class<+TB;>;TB;>;>;
 getInstance
  <T:TB;>(Ljava/lang/Class<TT;>;)TT;
  <T:TB;>(Ljava/lang/Class<TT;>;)T0T; # @Inherited(com.google.common.collect.ClassToInstanceMap)
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/Ordering.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/Ordering.eea
index 044818d9f6..fb274cc42a 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/Ordering.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/Ordering.eea
@@ -17,7 +17,7 @@ compound
  <T:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljava/util/Comparator<-TT;>;>;)L1com/google/common/collect/Ordering<TT;>;
 explicit
  <T:Ljava/lang/Object;>(Ljava/util/List<TT;>;)Lcom/google/common/collect/Ordering<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/List<TT;>;)Lcom/google/common/collect/Ordering<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/List<TT;>;)L1com/google/common/collect/Ordering<TT;>;
 explicit
  <T:Ljava/lang/Object;>(TT;[TT;)Lcom/google/common/collect/Ordering<TT;>;
  <T:Ljava/lang/Object;>(TT;[TT;)Lcom/google/common/collect/Ordering<TT;>;
@@ -26,7 +26,7 @@ from
  <T:Ljava/lang/Object;>(Lcom/google/common/collect/Ordering<TT;>;)Lcom/google/common/collect/Ordering<TT;>;
 from
  <T:Ljava/lang/Object;>(Ljava/util/Comparator<TT;>;)Lcom/google/common/collect/Ordering<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/Comparator<TT;>;)Lcom/google/common/collect/Ordering<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/Comparator<TT;>;)L1com/google/common/collect/Ordering<TT;>;
 natural
  <C::Ljava/lang/Comparable;>()Lcom/google/common/collect/Ordering<TC;>;
  <C::Ljava/lang/Comparable;>()Lcom/google/common/collect/Ordering<TC;>;
@@ -66,7 +66,7 @@ leastOf
  <E:TT;>(Ljava/util/Iterator<TE;>;I)Ljava/util/List<TE;>;
 lexicographical
  <S:TT;>()Lcom/google/common/collect/Ordering<Ljava/lang/Iterable<TS;>;>;
- <S:TT;>()Lcom/google/common/collect/Ordering<Ljava/lang/Iterable<TS;>;>;
+ <S:TT;>()L1com/google/common/collect/Ordering<Ljava/lang/Iterable<TS;>;>;
 max
  <E:TT;>(Ljava/lang/Iterable<TE;>;)TE;
  <E:TT;>(Ljava/lang/Iterable<TE;>;)T1E;
@@ -93,16 +93,16 @@ min
  <E:TT;>(TE;TE;TE;[TE;)T1E;
 nullsFirst
  <S:TT;>()Lcom/google/common/collect/Ordering<TS;>;
- <S:TT;>()Lcom/google/common/collect/Ordering<TS;>;
+ <S:TT;>()L1com/google/common/collect/Ordering<TS;>;
 nullsLast
  <S:TT;>()Lcom/google/common/collect/Ordering<TS;>;
- <S:TT;>()Lcom/google/common/collect/Ordering<TS;>;
+ <S:TT;>()L1com/google/common/collect/Ordering<TS;>;
 onResultOf
  <F:Ljava/lang/Object;>(Lcom/google/common/base/Function<TF;+TT;>;)Lcom/google/common/collect/Ordering<TF;>;
- <F:Ljava/lang/Object;>(Lcom/google/common/base/Function<TF;+TT;>;)Lcom/google/common/collect/Ordering<TF;>;
+ <F:Ljava/lang/Object;>(Lcom/google/common/base/Function<TF;+TT;>;)L1com/google/common/collect/Ordering<TF;>;
 reverse
  <S:TT;>()Lcom/google/common/collect/Ordering<TS;>;
- <S:TT;>()Lcom/google/common/collect/Ordering<TS;>;
+ <S:TT;>()L1com/google/common/collect/Ordering<TS;>;
 sortedCopy
  <E:TT;>(Ljava/lang/Iterable<TE;>;)Ljava/util/List<TE;>;
  <E:TT;>(Ljava/lang/Iterable<TE;>;)Ljava/util/List<TE;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/Queues.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/Queues.eea
index 0f2f4d0cc2..228777034e 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/Queues.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/Queues.eea
@@ -14,52 +14,52 @@ drainUninterruptibly
  <E:Ljava/lang/Object;>(Ljava/util/concurrent/BlockingQueue<TE;>;Ljava/util/Collection<-TE;>;ILjava/time/Duration;)I
 newArrayBlockingQueue
  <E:Ljava/lang/Object;>(I)Ljava/util/concurrent/ArrayBlockingQueue<TE;>;
- <E:Ljava/lang/Object;>(I)Ljava/util/concurrent/ArrayBlockingQueue<TE;>;
+ <E:Ljava/lang/Object;>(I)L1java/util/concurrent/ArrayBlockingQueue<TE;>;
 newArrayDeque
  <E:Ljava/lang/Object;>()Ljava/util/ArrayDeque<TE;>;
- <E:Ljava/lang/Object;>()Ljava/util/ArrayDeque<TE;>;
+ <E:Ljava/lang/Object;>()L1java/util/ArrayDeque<TE;>;
 newArrayDeque
  <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/ArrayDeque<TE;>;
- <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/ArrayDeque<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)L1java/util/ArrayDeque<TE;>;
 newConcurrentLinkedQueue
  <E:Ljava/lang/Object;>()Ljava/util/concurrent/ConcurrentLinkedQueue<TE;>;
- <E:Ljava/lang/Object;>()Ljava/util/concurrent/ConcurrentLinkedQueue<TE;>;
+ <E:Ljava/lang/Object;>()L1java/util/concurrent/ConcurrentLinkedQueue<TE;>;
 newConcurrentLinkedQueue
  <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/concurrent/ConcurrentLinkedQueue<TE;>;
- <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/concurrent/ConcurrentLinkedQueue<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)L1java/util/concurrent/ConcurrentLinkedQueue<TE;>;
 newLinkedBlockingDeque
  <E:Ljava/lang/Object;>()Ljava/util/concurrent/LinkedBlockingDeque<TE;>;
- <E:Ljava/lang/Object;>()Ljava/util/concurrent/LinkedBlockingDeque<TE;>;
+ <E:Ljava/lang/Object;>()L1java/util/concurrent/LinkedBlockingDeque<TE;>;
 newLinkedBlockingDeque
  <E:Ljava/lang/Object;>(I)Ljava/util/concurrent/LinkedBlockingDeque<TE;>;
- <E:Ljava/lang/Object;>(I)Ljava/util/concurrent/LinkedBlockingDeque<TE;>;
+ <E:Ljava/lang/Object;>(I)L1java/util/concurrent/LinkedBlockingDeque<TE;>;
 newLinkedBlockingDeque
  <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/concurrent/LinkedBlockingDeque<TE;>;
- <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/concurrent/LinkedBlockingDeque<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)L1java/util/concurrent/LinkedBlockingDeque<TE;>;
 newLinkedBlockingQueue
  <E:Ljava/lang/Object;>()Ljava/util/concurrent/LinkedBlockingQueue<TE;>;
- <E:Ljava/lang/Object;>()Ljava/util/concurrent/LinkedBlockingQueue<TE;>;
+ <E:Ljava/lang/Object;>()L1java/util/concurrent/LinkedBlockingQueue<TE;>;
 newLinkedBlockingQueue
  <E:Ljava/lang/Object;>(I)Ljava/util/concurrent/LinkedBlockingQueue<TE;>;
- <E:Ljava/lang/Object;>(I)Ljava/util/concurrent/LinkedBlockingQueue<TE;>;
+ <E:Ljava/lang/Object;>(I)L1java/util/concurrent/LinkedBlockingQueue<TE;>;
 newLinkedBlockingQueue
  <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/concurrent/LinkedBlockingQueue<TE;>;
- <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/concurrent/LinkedBlockingQueue<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)L1java/util/concurrent/LinkedBlockingQueue<TE;>;
 newPriorityBlockingQueue
  <E::Ljava/lang/Comparable;>()Ljava/util/concurrent/PriorityBlockingQueue<TE;>;
- <E::Ljava/lang/Comparable;>()Ljava/util/concurrent/PriorityBlockingQueue<TE;>;
+ <E::Ljava/lang/Comparable;>()L1java/util/concurrent/PriorityBlockingQueue<TE;>;
 newPriorityBlockingQueue
  <E::Ljava/lang/Comparable;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/concurrent/PriorityBlockingQueue<TE;>;
- <E::Ljava/lang/Comparable;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/concurrent/PriorityBlockingQueue<TE;>;
+ <E::Ljava/lang/Comparable;>(Ljava/lang/Iterable<+TE;>;)L1java/util/concurrent/PriorityBlockingQueue<TE;>;
 newPriorityQueue
  <E::Ljava/lang/Comparable;>()Ljava/util/PriorityQueue<TE;>;
- <E::Ljava/lang/Comparable;>()Ljava/util/PriorityQueue<TE;>;
+ <E::Ljava/lang/Comparable;>()L1java/util/PriorityQueue<TE;>;
 newPriorityQueue
  <E::Ljava/lang/Comparable;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/PriorityQueue<TE;>;
- <E::Ljava/lang/Comparable;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/PriorityQueue<TE;>;
+ <E::Ljava/lang/Comparable;>(Ljava/lang/Iterable<+TE;>;)L1java/util/PriorityQueue<TE;>;
 newSynchronousQueue
  <E:Ljava/lang/Object;>()Ljava/util/concurrent/SynchronousQueue<TE;>;
- <E:Ljava/lang/Object;>()Ljava/util/concurrent/SynchronousQueue<TE;>;
+ <E:Ljava/lang/Object;>()L1java/util/concurrent/SynchronousQueue<TE;>;
 synchronizedDeque
  <E:Ljava/lang/Object;>(Ljava/util/Deque<TE;>;)Ljava/util/Deque<TE;>;
  <E:Ljava/lang/Object;>(Ljava/util/Deque<TE;>;)Ljava/util/Deque<TE;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/Sets.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/Sets.eea
index 2af4146263..078e9fd56e 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/Sets.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/Sets.eea
@@ -17,16 +17,16 @@ complementOf
  <E:Ljava/lang/Enum<TE;>;>(Ljava/util/Collection<TE;>;Ljava/lang/Class<TE;>;)Ljava/util/EnumSet<TE;>;
 difference
  <E:Ljava/lang/Object;>(Ljava/util/Set<TE;>;Ljava/util/Set<*>;)Lcom/google/common/collect/Sets$SetView<TE;>;
- <E:Ljava/lang/Object;>(Ljava/util/Set<TE;>;Ljava/util/Set<*>;)Lcom/google/common/collect/Sets$SetView<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/util/Set<TE;>;Ljava/util/Set<*>;)L1com/google/common/collect/Sets$SetView<TE;>;
 filter
  <E:Ljava/lang/Object;>(Ljava/util/NavigableSet<TE;>;Lcom/google/common/base/Predicate<-TE;>;)Ljava/util/NavigableSet<TE;>;
- <E:Ljava/lang/Object;>(Ljava/util/NavigableSet<TE;>;Lcom/google/common/base/Predicate<-TE;>;)Ljava/util/NavigableSet<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/util/NavigableSet<TE;>;Lcom/google/common/base/Predicate<-TE;>;)L1java/util/NavigableSet<TE;>;
 filter
  <E:Ljava/lang/Object;>(Ljava/util/Set<TE;>;Lcom/google/common/base/Predicate<-TE;>;)Ljava/util/Set<TE;>;
  <E:Ljava/lang/Object;>(Ljava/util/Set<TE;>;Lcom/google/common/base/Predicate<-TE;>;)Ljava/util/Set<TE;>;
 filter
  <E:Ljava/lang/Object;>(Ljava/util/SortedSet<TE;>;Lcom/google/common/base/Predicate<-TE;>;)Ljava/util/SortedSet<TE;>;
- <E:Ljava/lang/Object;>(Ljava/util/SortedSet<TE;>;Lcom/google/common/base/Predicate<-TE;>;)Ljava/util/SortedSet<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/util/SortedSet<TE;>;Lcom/google/common/base/Predicate<-TE;>;)L1java/util/SortedSet<TE;>;
 immutableEnumSet
  <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Iterable<TE;>;)Lcom/google/common/collect/ImmutableSet<TE;>;
  <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Iterable<TE;>;)Lcom/google/common/collect/ImmutableSet<TE;>;
@@ -35,7 +35,7 @@ immutableEnumSet
  <E:Ljava/lang/Enum<TE;>;>(TE;[TE;)Lcom/google/common/collect/ImmutableSet<TE;>;
 intersection
  <E:Ljava/lang/Object;>(Ljava/util/Set<TE;>;Ljava/util/Set<*>;)Lcom/google/common/collect/Sets$SetView<TE;>;
- <E:Ljava/lang/Object;>(Ljava/util/Set<TE;>;Ljava/util/Set<*>;)Lcom/google/common/collect/Sets$SetView<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/util/Set<TE;>;Ljava/util/Set<*>;)L1com/google/common/collect/Sets$SetView<TE;>;
 newConcurrentHashSet
  <E:Ljava/lang/Object;>()Ljava/util/Set<TE;>;
  <E:Ljava/lang/Object;>()Ljava/util/Set<TE;>;
@@ -44,16 +44,16 @@ newConcurrentHashSet
  <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/Set<TE;>;
 newCopyOnWriteArraySet
  <E:Ljava/lang/Object;>()Ljava/util/concurrent/CopyOnWriteArraySet<TE;>;
- <E:Ljava/lang/Object;>()Ljava/util/concurrent/CopyOnWriteArraySet<TE;>;
+ <E:Ljava/lang/Object;>()L1java/util/concurrent/CopyOnWriteArraySet<TE;>;
 newCopyOnWriteArraySet
  <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/concurrent/CopyOnWriteArraySet<TE;>;
- <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/concurrent/CopyOnWriteArraySet<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)L1java/util/concurrent/CopyOnWriteArraySet<TE;>;
 newEnumSet
  <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Iterable<TE;>;Ljava/lang/Class<TE;>;)Ljava/util/EnumSet<TE;>;
  <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Iterable<TE;>;Ljava/lang/Class<TE;>;)Ljava/util/EnumSet<TE;>;
 newHashSet
  <E:Ljava/lang/Object;>()Ljava/util/HashSet<TE;>;
- <E:Ljava/lang/Object;>()Ljava/util/HashSet<TE;>;
+ <E:Ljava/lang/Object;>()L1java/util/HashSet<TE;>;
 newHashSet
  <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/HashSet<TE;>;
  <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/HashSet<TE;>;
@@ -65,40 +65,40 @@ newHashSet
  <E:Ljava/lang/Object;>([TE;)Ljava/util/HashSet<TE;>;
 newHashSetWithExpectedSize
  <E:Ljava/lang/Object;>(I)Ljava/util/HashSet<TE;>;
- <E:Ljava/lang/Object;>(I)Ljava/util/HashSet<TE;>;
+ <E:Ljava/lang/Object;>(I)L1java/util/HashSet<TE;>;
 newIdentityHashSet
  <E:Ljava/lang/Object;>()Ljava/util/Set<TE;>;
  <E:Ljava/lang/Object;>()Ljava/util/Set<TE;>;
 newLinkedHashSet
  <E:Ljava/lang/Object;>()Ljava/util/LinkedHashSet<TE;>;
- <E:Ljava/lang/Object;>()Ljava/util/LinkedHashSet<TE;>;
+ <E:Ljava/lang/Object;>()L1java/util/LinkedHashSet<TE;>;
 newLinkedHashSet
  <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/LinkedHashSet<TE;>;
  <E:Ljava/lang/Object;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/LinkedHashSet<TE;>;
 newLinkedHashSetWithExpectedSize
  <E:Ljava/lang/Object;>(I)Ljava/util/LinkedHashSet<TE;>;
- <E:Ljava/lang/Object;>(I)Ljava/util/LinkedHashSet<TE;>;
+ <E:Ljava/lang/Object;>(I)L1java/util/LinkedHashSet<TE;>;
 newSetFromMap
  <E:Ljava/lang/Object;>(Ljava/util/Map<TE;Ljava/lang/Boolean;>;)Ljava/util/Set<TE;>;
  <E:Ljava/lang/Object;>(Ljava/util/Map<TE;Ljava/lang/Boolean;>;)Ljava/util/Set<TE;>;
 newTreeSet
  <E::Ljava/lang/Comparable;>()Ljava/util/TreeSet<TE;>;
- <E::Ljava/lang/Comparable;>()Ljava/util/TreeSet<TE;>;
+ <E::Ljava/lang/Comparable;>()L1java/util/TreeSet<TE;>;
 newTreeSet
  <E::Ljava/lang/Comparable;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/TreeSet<TE;>;
  <E::Ljava/lang/Comparable;>(Ljava/lang/Iterable<+TE;>;)Ljava/util/TreeSet<TE;>;
 newTreeSet
  <E:Ljava/lang/Object;>(Ljava/util/Comparator<-TE;>;)Ljava/util/TreeSet<TE;>;
- <E:Ljava/lang/Object;>(Ljava/util/Comparator<-TE;>;)Ljava/util/TreeSet<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/util/Comparator<-TE;>;)L1java/util/TreeSet<TE;>;
 powerSet
  <E:Ljava/lang/Object;>(Ljava/util/Set<TE;>;)Ljava/util/Set<Ljava/util/Set<TE;>;>;
- <E:Ljava/lang/Object;>(Ljava/util/Set<TE;>;)Ljava/util/Set<Ljava/util/Set<TE;>;>;
+ <E:Ljava/lang/Object;>(Ljava/util/Set<TE;>;)L1java/util/Set<Ljava/util/Set<TE;>;>;
 subSet
  <K::Ljava/lang/Comparable<-TK;>;>(Ljava/util/NavigableSet<TK;>;Lcom/google/common/collect/Range<TK;>;)Ljava/util/NavigableSet<TK;>;
  <K::Ljava/lang/Comparable<-TK;>;>(Ljava/util/NavigableSet<TK;>;Lcom/google/common/collect/Range<TK;>;)Ljava/util/NavigableSet<TK;>;
 symmetricDifference
  <E:Ljava/lang/Object;>(Ljava/util/Set<+TE;>;Ljava/util/Set<+TE;>;)Lcom/google/common/collect/Sets$SetView<TE;>;
- <E:Ljava/lang/Object;>(Ljava/util/Set<+TE;>;Ljava/util/Set<+TE;>;)Lcom/google/common/collect/Sets$SetView<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/util/Set<+TE;>;Ljava/util/Set<+TE;>;)L1com/google/common/collect/Sets$SetView<TE;>;
 synchronizedNavigableSet
  <E:Ljava/lang/Object;>(Ljava/util/NavigableSet<TE;>;)Ljava/util/NavigableSet<TE;>;
  <E:Ljava/lang/Object;>(Ljava/util/NavigableSet<TE;>;)Ljava/util/NavigableSet<TE;>;
@@ -107,7 +107,7 @@ toImmutableEnumSet
  <E:Ljava/lang/Enum<TE;>;>()Ljava/util/stream/Collector<TE;*Lcom/google/common/collect/ImmutableSet<TE;>;>;
 union
  <E:Ljava/lang/Object;>(Ljava/util/Set<+TE;>;Ljava/util/Set<+TE;>;)Lcom/google/common/collect/Sets$SetView<TE;>;
- <E:Ljava/lang/Object;>(Ljava/util/Set<+TE;>;Ljava/util/Set<+TE;>;)Lcom/google/common/collect/Sets$SetView<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/util/Set<+TE;>;Ljava/util/Set<+TE;>;)L1com/google/common/collect/Sets$SetView<TE;>;
 unmodifiableNavigableSet
  <E:Ljava/lang/Object;>(Ljava/util/NavigableSet<TE;>;)Ljava/util/NavigableSet<TE;>;
  <E:Ljava/lang/Object;>(Ljava/util/NavigableSet<TE;>;)Ljava/util/NavigableSet<TE;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/Tables.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/Tables.eea
index d33473d13c..9625a0cc85 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/Tables.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/Tables.eea
@@ -2,10 +2,10 @@ class com/google/common/collect/Tables
 
 immutableCell
  <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(TR;TC;TV;)Lcom/google/common/collect/Table$Cell<TR;TC;TV;>;
- <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(TR;TC;TV;)Lcom/google/common/collect/Table$Cell<TR;TC;TV;>;
+ <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(TR;TC;TV;)L1com/google/common/collect/Table$Cell<TR;TC;TV;>;
 newCustomTable
  <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TR;Ljava/util/Map<TC;TV;>;>;Lcom/google/common/base/Supplier<+Ljava/util/Map<TC;TV;>;>;)Lcom/google/common/collect/Table<TR;TC;TV;>;
- <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TR;Ljava/util/Map<TC;TV;>;>;Lcom/google/common/base/Supplier<+Ljava/util/Map<TC;TV;>;>;)Lcom/google/common/collect/Table<TR;TC;TV;>;
+ <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TR;Ljava/util/Map<TC;TV;>;>;Lcom/google/common/base/Supplier<+Ljava/util/Map<TC;TV;>;>;)L1com/google/common/collect/Table<TR;TC;TV;>;
 synchronizedTable
  <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Table<TR;TC;TV;>;)Lcom/google/common/collect/Table<TR;TC;TV;>;
  <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Table<TR;TC;TV;>;)Lcom/google/common/collect/Table<TR;TC;TV;>;
@@ -17,13 +17,13 @@ toTable
  <T:Ljava/lang/Object;R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;I::Lcom/google/common/collect/Table<TR;TC;TV;>;>(Ljava/util/function/Function<-TT;+TR;>;Ljava/util/function/Function<-TT;+TC;>;Ljava/util/function/Function<-TT;+TV;>;Ljava/util/function/Supplier<TI;>;)Ljava/util/stream/Collector<TT;*TI;>;
 transformValues
  <R:Ljava/lang/Object;C:Ljava/lang/Object;V1:Ljava/lang/Object;V2:Ljava/lang/Object;>(Lcom/google/common/collect/Table<TR;TC;TV1;>;Lcom/google/common/base/Function<-TV1;TV2;>;)Lcom/google/common/collect/Table<TR;TC;TV2;>;
- <R:Ljava/lang/Object;C:Ljava/lang/Object;V1:Ljava/lang/Object;V2:Ljava/lang/Object;>(Lcom/google/common/collect/Table<TR;TC;TV1;>;Lcom/google/common/base/Function<-TV1;TV2;>;)Lcom/google/common/collect/Table<TR;TC;TV2;>;
+ <R:Ljava/lang/Object;C:Ljava/lang/Object;V1:Ljava/lang/Object;V2:Ljava/lang/Object;>(Lcom/google/common/collect/Table<TR;TC;TV1;>;Lcom/google/common/base/Function<-TV1;TV2;>;)L1com/google/common/collect/Table<TR;TC;TV2;>;
 transpose
  <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Table<TR;TC;TV;>;)Lcom/google/common/collect/Table<TC;TR;TV;>;
- <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Table<TR;TC;TV;>;)Lcom/google/common/collect/Table<TC;TR;TV;>;
+ <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Table<TR;TC;TV;>;)L1com/google/common/collect/Table<TC;TR;TV;>;
 unmodifiableRowSortedTable
  <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/RowSortedTable<TR;+TC;+TV;>;)Lcom/google/common/collect/RowSortedTable<TR;TC;TV;>;
- <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/RowSortedTable<TR;+TC;+TV;>;)Lcom/google/common/collect/RowSortedTable<TR;TC;TV;>;
+ <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/RowSortedTable<TR;+TC;+TV;>;)L1com/google/common/collect/RowSortedTable<TR;TC;TV;>;
 unmodifiableTable
  <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Table<+TR;+TC;+TV;>;)Lcom/google/common/collect/Table<TR;TC;TV;>;
- <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Table<+TR;+TC;+TV;>;)Lcom/google/common/collect/Table<TR;TC;TV;>;
+ <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Table<+TR;+TC;+TV;>;)L1com/google/common/collect/Table<TR;TC;TV;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/TreeBasedTable.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/TreeBasedTable.eea
index 56a8d6a385..09d1c44ef9 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/TreeBasedTable.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/TreeBasedTable.eea
@@ -8,20 +8,20 @@ super com/google/common/collect/StandardRowSortedTable
 
 create
  <R::Ljava/lang/Comparable;C::Ljava/lang/Comparable;V:Ljava/lang/Object;>()Lcom/google/common/collect/TreeBasedTable<TR;TC;TV;>;
- <R::Ljava/lang/Comparable;C::Ljava/lang/Comparable;V:Ljava/lang/Object;>()Lcom/google/common/collect/TreeBasedTable<TR;TC;TV;>;
+ <R::Ljava/lang/Comparable;C::Ljava/lang/Comparable;V:Ljava/lang/Object;>()L1com/google/common/collect/TreeBasedTable<TR;TC;TV;>;
 create
  <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/TreeBasedTable<TR;TC;+TV;>;)Lcom/google/common/collect/TreeBasedTable<TR;TC;TV;>;
- <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/TreeBasedTable<TR;TC;+TV;>;)Lcom/google/common/collect/TreeBasedTable<TR;TC;TV;>;
+ <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/TreeBasedTable<TR;TC;+TV;>;)L1com/google/common/collect/TreeBasedTable<TR;TC;TV;>;
 create
  <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Comparator<-TR;>;Ljava/util/Comparator<-TC;>;)Lcom/google/common/collect/TreeBasedTable<TR;TC;TV;>;
- <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Comparator<-TR;>;Ljava/util/Comparator<-TC;>;)Lcom/google/common/collect/TreeBasedTable<TR;TC;TV;>;
+ <R:Ljava/lang/Object;C:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Comparator<-TR;>;Ljava/util/Comparator<-TC;>;)L1com/google/common/collect/TreeBasedTable<TR;TC;TV;>;
 
 columnComparator
  ()Ljava/util/Comparator<-TC;>;
  ()Ljava/util/Comparator<-TC;>;
 row
  (TR;)Ljava/util/SortedMap<TC;TV;>;
- (TR;)Ljava/util/SortedMap<TC;TV;>;
+ (TR;)L1java/util/SortedMap<TC;TV;>;
 rowComparator
  ()Ljava/util/Comparator<-TR;>;
  ()Ljava/util/Comparator<-TR;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/TreeMultiset.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/TreeMultiset.eea
index 61caa5642e..65473e63f9 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/TreeMultiset.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/TreeMultiset.eea
@@ -8,13 +8,13 @@ super com/google/common/collect/AbstractSortedMultiset
 
 create
  <E::Ljava/lang/Comparable;>()Lcom/google/common/collect/TreeMultiset<TE;>;
- <E::Ljava/lang/Comparable;>()Lcom/google/common/collect/TreeMultiset<TE;>;
+ <E::Ljava/lang/Comparable;>()L1com/google/common/collect/TreeMultiset<TE;>;
 create
  <E::Ljava/lang/Comparable;>(Ljava/lang/Iterable<+TE;>;)Lcom/google/common/collect/TreeMultiset<TE;>;
- <E::Ljava/lang/Comparable;>(Ljava/lang/Iterable<+TE;>;)Lcom/google/common/collect/TreeMultiset<TE;>;
+ <E::Ljava/lang/Comparable;>(Ljava/lang/Iterable<+TE;>;)L1com/google/common/collect/TreeMultiset<TE;>;
 create
  <E:Ljava/lang/Object;>(Ljava/util/Comparator<-TE;>;)Lcom/google/common/collect/TreeMultiset<TE;>;
- <E:Ljava/lang/Object;>(Ljava/util/Comparator<-TE;>;)Lcom/google/common/collect/TreeMultiset<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/util/Comparator<-TE;>;)L1com/google/common/collect/TreeMultiset<TE;>;
 
 add
  (TE;I)I
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/TreeRangeMap.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/TreeRangeMap.eea
index 67d6ffc239..38c6c7bf93 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/TreeRangeMap.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/TreeRangeMap.eea
@@ -8,14 +8,14 @@ super com/google/common/collect/RangeMap
 
 create
  <K::Ljava/lang/Comparable;V:Ljava/lang/Object;>()Lcom/google/common/collect/TreeRangeMap<TK;TV;>;
- <K::Ljava/lang/Comparable;V:Ljava/lang/Object;>()Lcom/google/common/collect/TreeRangeMap<TK;TV;>;
+ <K::Ljava/lang/Comparable;V:Ljava/lang/Object;>()L1com/google/common/collect/TreeRangeMap<TK;TV;>;
 
 asDescendingMapOfRanges
  ()Ljava/util/Map<Lcom/google/common/collect/Range<TK;>;TV;>;
- ()Ljava/util/Map<Lcom/google/common/collect/Range<TK;>;TV;>;
+ ()L1java/util/Map<Lcom/google/common/collect/Range<TK;>;TV;>;
 asMapOfRanges
  ()Ljava/util/Map<Lcom/google/common/collect/Range<TK;>;TV;>;
- ()Ljava/util/Map<Lcom/google/common/collect/Range<TK;>;TV;>;
+ ()L1java/util/Map<Lcom/google/common/collect/Range<TK;>;TV;>;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/TreeRangeSet.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/TreeRangeSet.eea
index 699f14ae77..2e55d72c84 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/TreeRangeSet.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/TreeRangeSet.eea
@@ -8,13 +8,13 @@ super com/google/common/collect/AbstractRangeSet
 
 create
  <C::Ljava/lang/Comparable<*>;>()Lcom/google/common/collect/TreeRangeSet<TC;>;
- <C::Ljava/lang/Comparable<*>;>()Lcom/google/common/collect/TreeRangeSet<TC;>;
+ <C::Ljava/lang/Comparable<*>;>()L1com/google/common/collect/TreeRangeSet<TC;>;
 create
  <C::Ljava/lang/Comparable<*>;>(Lcom/google/common/collect/RangeSet<TC;>;)Lcom/google/common/collect/TreeRangeSet<TC;>;
- <C::Ljava/lang/Comparable<*>;>(Lcom/google/common/collect/RangeSet<TC;>;)Lcom/google/common/collect/TreeRangeSet<TC;>;
+ <C::Ljava/lang/Comparable<*>;>(Lcom/google/common/collect/RangeSet<TC;>;)L1com/google/common/collect/TreeRangeSet<TC;>;
 create
  <C::Ljava/lang/Comparable<*>;>(Ljava/lang/Iterable<Lcom/google/common/collect/Range<TC;>;>;)Lcom/google/common/collect/TreeRangeSet<TC;>;
- <C::Ljava/lang/Comparable<*>;>(Ljava/lang/Iterable<Lcom/google/common/collect/Range<TC;>;>;)Lcom/google/common/collect/TreeRangeSet<TC;>;
+ <C::Ljava/lang/Comparable<*>;>(Ljava/lang/Iterable<Lcom/google/common/collect/Range<TC;>;>;)L1com/google/common/collect/TreeRangeSet<TC;>;
 
 add
  (Lcom/google/common/collect/Range<TC;>;)V
@@ -45,4 +45,4 @@ span
  ()Lcom/google/common/collect/Range<TC;>;
 subRangeSet
  (Lcom/google/common/collect/Range<TC;>;)Lcom/google/common/collect/RangeSet<TC;>;
- (Lcom/google/common/collect/Range<TC;>;)Lcom/google/common/collect/RangeSet<TC;>;
+ (Lcom/google/common/collect/Range<TC;>;)L1com/google/common/collect/RangeSet<TC;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/collect/TreeTraverser.eea b/libs/eea-guava/src/main/resources/com/google/common/collect/TreeTraverser.eea
index 3d372e00cc..9bbece9fb8 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/collect/TreeTraverser.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/collect/TreeTraverser.eea
@@ -4,17 +4,17 @@ class com/google/common/collect/TreeTraverser
 
 using
  <T:Ljava/lang/Object;>(Lcom/google/common/base/Function<TT;+Ljava/lang/Iterable<TT;>;>;)Lcom/google/common/collect/TreeTraverser<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/common/base/Function<TT;+Ljava/lang/Iterable<TT;>;>;)Lcom/google/common/collect/TreeTraverser<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/common/base/Function<TT;+Ljava/lang/Iterable<TT;>;>;)L1com/google/common/collect/TreeTraverser<TT;>;
 
 breadthFirstTraversal
  (TT;)Lcom/google/common/collect/FluentIterable<TT;>;
- (TT;)Lcom/google/common/collect/FluentIterable<TT;>;
+ (TT;)L1com/google/common/collect/FluentIterable<TT;>;
 children
  (TT;)Ljava/lang/Iterable<TT;>;
  (TT;)Ljava/lang/Iterable<TT;>;
 postOrderTraversal
  (TT;)Lcom/google/common/collect/FluentIterable<TT;>;
- (TT;)Lcom/google/common/collect/FluentIterable<TT;>;
+ (TT;)L1com/google/common/collect/FluentIterable<TT;>;
 preOrderTraversal
  (TT;)Lcom/google/common/collect/FluentIterable<TT;>;
- (TT;)Lcom/google/common/collect/FluentIterable<TT;>;
+ (TT;)L1com/google/common/collect/FluentIterable<TT;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/escape/ArrayBasedEscaperMap.eea b/libs/eea-guava/src/main/resources/com/google/common/escape/ArrayBasedEscaperMap.eea
index 59bbb2b9e8..b95a29c1e3 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/escape/ArrayBasedEscaperMap.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/escape/ArrayBasedEscaperMap.eea
@@ -2,4 +2,4 @@ class com/google/common/escape/ArrayBasedEscaperMap
 
 create
  (Ljava/util/Map<Ljava/lang/Character;Ljava/lang/String;>;)Lcom/google/common/escape/ArrayBasedEscaperMap;
- (Ljava/util/Map<Ljava/lang/Character;Ljava/lang/String;>;)Lcom/google/common/escape/ArrayBasedEscaperMap;
+ (Ljava/util/Map<Ljava/lang/Character;Ljava/lang/String;>;)L1com/google/common/escape/ArrayBasedEscaperMap;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/escape/CharEscaperBuilder.eea b/libs/eea-guava/src/main/resources/com/google/common/escape/CharEscaperBuilder.eea
index 335a45826e..56e4d057cf 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/escape/CharEscaperBuilder.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/escape/CharEscaperBuilder.eea
@@ -8,7 +8,7 @@ addEscapes
  ([CLjava/lang/String;)L1com/google/common/escape/CharEscaperBuilder;
 toArray
  ()[[C
- ()[[C
+ ()[1[C
 toEscaper
  ()Lcom/google/common/escape/Escaper;
- ()Lcom/google/common/escape/Escaper;
+ ()L1com/google/common/escape/Escaper;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/escape/Escapers.eea b/libs/eea-guava/src/main/resources/com/google/common/escape/Escapers.eea
index 44c1256843..52dee46f07 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/escape/Escapers.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/escape/Escapers.eea
@@ -2,7 +2,7 @@ class com/google/common/escape/Escapers
 
 builder
  ()Lcom/google/common/escape/Escapers$Builder;
- ()Lcom/google/common/escape/Escapers$Builder;
+ ()L1com/google/common/escape/Escapers$Builder;
 computeReplacement
  (Lcom/google/common/escape/CharEscaper;C)Ljava/lang/String;
  (Lcom/google/common/escape/CharEscaper;C)L0java/lang/String;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/graph/AbstractNetwork.eea b/libs/eea-guava/src/main/resources/com/google/common/graph/AbstractNetwork.eea
index a51fb465e3..63e0f486fe 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/graph/AbstractNetwork.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/graph/AbstractNetwork.eea
@@ -11,7 +11,7 @@ adjacentEdges
  (TE;)Ljava/util/Set<TE;>;
 asGraph
  ()Lcom/google/common/graph/Graph<TN;>;
- ()Lcom/google/common/graph/Graph<TN;>;
+ ()L1com/google/common/graph/Graph<TN;>;
 degree
  (TN;)I
  (TN;)I
diff --git a/libs/eea-guava/src/main/resources/com/google/common/graph/AbstractValueGraph.eea b/libs/eea-guava/src/main/resources/com/google/common/graph/AbstractValueGraph.eea
index 25eb016cc5..49b23f0a0b 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/graph/AbstractValueGraph.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/graph/AbstractValueGraph.eea
@@ -11,7 +11,7 @@ super com/google/common/graph/ValueGraph
 
 asGraph
  ()Lcom/google/common/graph/Graph<TN;>;
- ()Lcom/google/common/graph/Graph<TN;>;
+ ()L1com/google/common/graph/Graph<TN;>;
 edgeValue
  (Lcom/google/common/graph/EndpointPair<TN;>;)Ljava/util/Optional<TV;>;
  (Lcom/google/common/graph/EndpointPair<TN;>;)Ljava/util/Optional<TV;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/graph/ElementOrder.eea b/libs/eea-guava/src/main/resources/com/google/common/graph/ElementOrder.eea
index f0c8062b4a..da3f120783 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/graph/ElementOrder.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/graph/ElementOrder.eea
@@ -4,19 +4,19 @@ class com/google/common/graph/ElementOrder
 
 insertion
  <S:Ljava/lang/Object;>()Lcom/google/common/graph/ElementOrder<TS;>;
- <S:Ljava/lang/Object;>()Lcom/google/common/graph/ElementOrder<TS;>;
+ <S:Ljava/lang/Object;>()L1com/google/common/graph/ElementOrder<TS;>;
 natural
  <S::Ljava/lang/Comparable<-TS;>;>()Lcom/google/common/graph/ElementOrder<TS;>;
- <S::Ljava/lang/Comparable<-TS;>;>()Lcom/google/common/graph/ElementOrder<TS;>;
+ <S::Ljava/lang/Comparable<-TS;>;>()L1com/google/common/graph/ElementOrder<TS;>;
 sorted
  <S:Ljava/lang/Object;>(Ljava/util/Comparator<TS;>;)Lcom/google/common/graph/ElementOrder<TS;>;
- <S:Ljava/lang/Object;>(Ljava/util/Comparator<TS;>;)Lcom/google/common/graph/ElementOrder<TS;>;
+ <S:Ljava/lang/Object;>(Ljava/util/Comparator<TS;>;)L1com/google/common/graph/ElementOrder<TS;>;
 stable
  <S:Ljava/lang/Object;>()Lcom/google/common/graph/ElementOrder<TS;>;
- <S:Ljava/lang/Object;>()Lcom/google/common/graph/ElementOrder<TS;>;
+ <S:Ljava/lang/Object;>()L1com/google/common/graph/ElementOrder<TS;>;
 unordered
  <S:Ljava/lang/Object;>()Lcom/google/common/graph/ElementOrder<TS;>;
- <S:Ljava/lang/Object;>()Lcom/google/common/graph/ElementOrder<TS;>;
+ <S:Ljava/lang/Object;>()L1com/google/common/graph/ElementOrder<TS;>;
 
 comparator
  ()Ljava/util/Comparator<TT;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/graph/EndpointPair.eea b/libs/eea-guava/src/main/resources/com/google/common/graph/EndpointPair.eea
index aa642708a4..7a14e01d73 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/graph/EndpointPair.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/graph/EndpointPair.eea
@@ -8,10 +8,10 @@ super java/lang/Iterable
 
 ordered
  <N:Ljava/lang/Object;>(TN;TN;)Lcom/google/common/graph/EndpointPair<TN;>;
- <N:Ljava/lang/Object;>(TN;TN;)Lcom/google/common/graph/EndpointPair<TN;>;
+ <N:Ljava/lang/Object;>(TN;TN;)L1com/google/common/graph/EndpointPair<TN;>;
 unordered
  <N:Ljava/lang/Object;>(TN;TN;)Lcom/google/common/graph/EndpointPair<TN;>;
- <N:Ljava/lang/Object;>(TN;TN;)Lcom/google/common/graph/EndpointPair<TN;>;
+ <N:Ljava/lang/Object;>(TN;TN;)L1com/google/common/graph/EndpointPair<TN;>;
 
 adjacentNode
  (TN;)TN;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/graph/GraphBuilder.eea b/libs/eea-guava/src/main/resources/com/google/common/graph/GraphBuilder.eea
index 6c111a69a1..7420766720 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/graph/GraphBuilder.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/graph/GraphBuilder.eea
@@ -27,7 +27,7 @@ expectedNodeCount
  (I)L1com/google/common/graph/GraphBuilder<TN;>;
 immutable
  <N1:TN;>()Lcom/google/common/graph/ImmutableGraph$Builder<TN1;>;
- <N1:TN;>()Lcom/google/common/graph/ImmutableGraph$Builder<TN1;>;
+ <N1:TN;>()L1com/google/common/graph/ImmutableGraph$Builder<TN1;>;
 incidentEdgeOrder
  <N1:TN;>(Lcom/google/common/graph/ElementOrder<TN1;>;)Lcom/google/common/graph/GraphBuilder<TN1;>;
  <N1:TN;>(Lcom/google/common/graph/ElementOrder<TN1;>;)L1com/google/common/graph/GraphBuilder<TN1;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/graph/ImmutableNetwork.eea b/libs/eea-guava/src/main/resources/com/google/common/graph/ImmutableNetwork.eea
index adba0885f3..29b7b05ac0 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/graph/ImmutableNetwork.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/graph/ImmutableNetwork.eea
@@ -11,8 +11,8 @@ copyOf
  <N:Ljava/lang/Object;E:Ljava/lang/Object;>(Lcom/google/common/graph/ImmutableNetwork<TN;TE;>;)Lcom/google/common/graph/ImmutableNetwork<TN;TE;>;
 copyOf
  <N:Ljava/lang/Object;E:Ljava/lang/Object;>(Lcom/google/common/graph/Network<TN;TE;>;)Lcom/google/common/graph/ImmutableNetwork<TN;TE;>;
- <N:Ljava/lang/Object;E:Ljava/lang/Object;>(Lcom/google/common/graph/Network<TN;TE;>;)Lcom/google/common/graph/ImmutableNetwork<TN;TE;>;
+ <N:Ljava/lang/Object;E:Ljava/lang/Object;>(Lcom/google/common/graph/Network<TN;TE;>;)L1com/google/common/graph/ImmutableNetwork<TN;TE;>;
 
 asGraph
  ()Lcom/google/common/graph/ImmutableGraph<TN;>;
- ()Lcom/google/common/graph/ImmutableGraph<TN;>;
+ ()L1com/google/common/graph/ImmutableGraph<TN;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/graph/ImmutableValueGraph.eea b/libs/eea-guava/src/main/resources/com/google/common/graph/ImmutableValueGraph.eea
index 27f4a1a5f4..4e09ae0ba4 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/graph/ImmutableValueGraph.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/graph/ImmutableValueGraph.eea
@@ -11,11 +11,11 @@ copyOf
  <N:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/graph/ImmutableValueGraph<TN;TV;>;)Lcom/google/common/graph/ImmutableValueGraph<TN;TV;>;
 copyOf
  <N:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/graph/ValueGraph<TN;TV;>;)Lcom/google/common/graph/ImmutableValueGraph<TN;TV;>;
- <N:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/graph/ValueGraph<TN;TV;>;)Lcom/google/common/graph/ImmutableValueGraph<TN;TV;>;
+ <N:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/graph/ValueGraph<TN;TV;>;)L1com/google/common/graph/ImmutableValueGraph<TN;TV;>;
 
 asGraph
  ()Lcom/google/common/graph/ImmutableGraph<TN;>;
- ()Lcom/google/common/graph/ImmutableGraph<TN;>;
+ ()L1com/google/common/graph/ImmutableGraph<TN;>;
 incidentEdgeOrder
  ()Lcom/google/common/graph/ElementOrder<TN;>;
  ()Lcom/google/common/graph/ElementOrder<TN;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/graph/NetworkBuilder.eea b/libs/eea-guava/src/main/resources/com/google/common/graph/NetworkBuilder.eea
index cf33cab924..ed164a882c 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/graph/NetworkBuilder.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/graph/NetworkBuilder.eea
@@ -36,7 +36,7 @@ expectedNodeCount
  (I)L1com/google/common/graph/NetworkBuilder<TN;TE;>;
 immutable
  <N1:TN;E1:TE;>()Lcom/google/common/graph/ImmutableNetwork$Builder<TN1;TE1;>;
- <N1:TN;E1:TE;>()Lcom/google/common/graph/ImmutableNetwork$Builder<TN1;TE1;>;
+ <N1:TN;E1:TE;>()L1com/google/common/graph/ImmutableNetwork$Builder<TN1;TE1;>;
 nodeOrder
  <N1:TN;>(Lcom/google/common/graph/ElementOrder<TN1;>;)Lcom/google/common/graph/NetworkBuilder<TN1;TE;>;
  <N1:TN;>(Lcom/google/common/graph/ElementOrder<TN1;>;)L1com/google/common/graph/NetworkBuilder<TN1;TE;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/graph/Traverser.eea b/libs/eea-guava/src/main/resources/com/google/common/graph/Traverser.eea
index d146f0a3a6..7cef00cc23 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/graph/Traverser.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/graph/Traverser.eea
@@ -4,26 +4,26 @@ class com/google/common/graph/Traverser
 
 forGraph
  <N:Ljava/lang/Object;>(Lcom/google/common/graph/SuccessorsFunction<TN;>;)Lcom/google/common/graph/Traverser<TN;>;
- <N:Ljava/lang/Object;>(Lcom/google/common/graph/SuccessorsFunction<TN;>;)Lcom/google/common/graph/Traverser<TN;>;
+ <N:Ljava/lang/Object;>(Lcom/google/common/graph/SuccessorsFunction<TN;>;)L1com/google/common/graph/Traverser<TN;>;
 forTree
  <N:Ljava/lang/Object;>(Lcom/google/common/graph/SuccessorsFunction<TN;>;)Lcom/google/common/graph/Traverser<TN;>;
- <N:Ljava/lang/Object;>(Lcom/google/common/graph/SuccessorsFunction<TN;>;)Lcom/google/common/graph/Traverser<TN;>;
+ <N:Ljava/lang/Object;>(Lcom/google/common/graph/SuccessorsFunction<TN;>;)L1com/google/common/graph/Traverser<TN;>;
 
 breadthFirst
  (Ljava/lang/Iterable<+TN;>;)Ljava/lang/Iterable<TN;>;
- (Ljava/lang/Iterable<+TN;>;)Ljava/lang/Iterable<TN;>;
+ (Ljava/lang/Iterable<+TN;>;)L1java/lang/Iterable<TN;>;
 breadthFirst
  (TN;)Ljava/lang/Iterable<TN;>;
  (TN;)Ljava/lang/Iterable<TN;>;
 depthFirstPostOrder
  (Ljava/lang/Iterable<+TN;>;)Ljava/lang/Iterable<TN;>;
- (Ljava/lang/Iterable<+TN;>;)Ljava/lang/Iterable<TN;>;
+ (Ljava/lang/Iterable<+TN;>;)L1java/lang/Iterable<TN;>;
 depthFirstPostOrder
  (TN;)Ljava/lang/Iterable<TN;>;
  (TN;)Ljava/lang/Iterable<TN;>;
 depthFirstPreOrder
  (Ljava/lang/Iterable<+TN;>;)Ljava/lang/Iterable<TN;>;
- (Ljava/lang/Iterable<+TN;>;)Ljava/lang/Iterable<TN;>;
+ (Ljava/lang/Iterable<+TN;>;)L1java/lang/Iterable<TN;>;
 depthFirstPreOrder
  (TN;)Ljava/lang/Iterable<TN;>;
  (TN;)Ljava/lang/Iterable<TN;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/graph/ValueGraphBuilder.eea b/libs/eea-guava/src/main/resources/com/google/common/graph/ValueGraphBuilder.eea
index 9639aa9793..d5a3ddac08 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/graph/ValueGraphBuilder.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/graph/ValueGraphBuilder.eea
@@ -27,7 +27,7 @@ expectedNodeCount
  (I)L1com/google/common/graph/ValueGraphBuilder<TN;TV;>;
 immutable
  <N1:TN;V1:TV;>()Lcom/google/common/graph/ImmutableValueGraph$Builder<TN1;TV1;>;
- <N1:TN;V1:TV;>()Lcom/google/common/graph/ImmutableValueGraph$Builder<TN1;TV1;>;
+ <N1:TN;V1:TV;>()L1com/google/common/graph/ImmutableValueGraph$Builder<TN1;TV1;>;
 incidentEdgeOrder
  <N1:TN;>(Lcom/google/common/graph/ElementOrder<TN1;>;)Lcom/google/common/graph/ValueGraphBuilder<TN1;TV;>;
  <N1:TN;>(Lcom/google/common/graph/ElementOrder<TN1;>;)L1com/google/common/graph/ValueGraphBuilder<TN1;TV;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/hash/BloomFilter.eea b/libs/eea-guava/src/main/resources/com/google/common/hash/BloomFilter.eea
index 0084c7d833..99b9aeacb9 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/hash/BloomFilter.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/hash/BloomFilter.eea
@@ -8,19 +8,19 @@ super com/google/common/base/Predicate
 
 create
  <T:Ljava/lang/Object;>(Lcom/google/common/hash/Funnel<-TT;>;I)Lcom/google/common/hash/BloomFilter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/common/hash/Funnel<-TT;>;I)Lcom/google/common/hash/BloomFilter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/common/hash/Funnel<-TT;>;I)L1com/google/common/hash/BloomFilter<TT;>;
 create
  <T:Ljava/lang/Object;>(Lcom/google/common/hash/Funnel<-TT;>;ID)Lcom/google/common/hash/BloomFilter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/common/hash/Funnel<-TT;>;ID)Lcom/google/common/hash/BloomFilter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/common/hash/Funnel<-TT;>;ID)L1com/google/common/hash/BloomFilter<TT;>;
 create
  <T:Ljava/lang/Object;>(Lcom/google/common/hash/Funnel<-TT;>;J)Lcom/google/common/hash/BloomFilter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/common/hash/Funnel<-TT;>;J)Lcom/google/common/hash/BloomFilter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/common/hash/Funnel<-TT;>;J)L1com/google/common/hash/BloomFilter<TT;>;
 create
  <T:Ljava/lang/Object;>(Lcom/google/common/hash/Funnel<-TT;>;JD)Lcom/google/common/hash/BloomFilter<TT;>;
- <T:Ljava/lang/Object;>(Lcom/google/common/hash/Funnel<-TT;>;JD)Lcom/google/common/hash/BloomFilter<TT;>;
+ <T:Ljava/lang/Object;>(Lcom/google/common/hash/Funnel<-TT;>;JD)L1com/google/common/hash/BloomFilter<TT;>;
 readFrom
  <T:Ljava/lang/Object;>(Ljava/io/InputStream;Lcom/google/common/hash/Funnel<-TT;>;)Lcom/google/common/hash/BloomFilter<TT;>;
- <T:Ljava/lang/Object;>(Ljava/io/InputStream;Lcom/google/common/hash/Funnel<-TT;>;)Lcom/google/common/hash/BloomFilter<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/io/InputStream;Lcom/google/common/hash/Funnel<-TT;>;)L1com/google/common/hash/BloomFilter<TT;>;
 toBloomFilter
  <T:Ljava/lang/Object;>(Lcom/google/common/hash/Funnel<-TT;>;J)Ljava/util/stream/Collector<TT;*Lcom/google/common/hash/BloomFilter<TT;>;>;
  <T:Ljava/lang/Object;>(Lcom/google/common/hash/Funnel<-TT;>;J)Ljava/util/stream/Collector<TT;*Lcom/google/common/hash/BloomFilter<TT;>;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/hash/Funnels.eea b/libs/eea-guava/src/main/resources/com/google/common/hash/Funnels.eea
index 49563d358d..73485a6c8f 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/hash/Funnels.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/hash/Funnels.eea
@@ -2,7 +2,7 @@ class com/google/common/hash/Funnels
 
 asOutputStream
  (Lcom/google/common/hash/PrimitiveSink;)Ljava/io/OutputStream;
- (Lcom/google/common/hash/PrimitiveSink;)Ljava/io/OutputStream;
+ (Lcom/google/common/hash/PrimitiveSink;)L1java/io/OutputStream;
 byteArrayFunnel
  ()Lcom/google/common/hash/Funnel<[B>;
  ()Lcom/google/common/hash/Funnel<[B>;
@@ -14,10 +14,10 @@ longFunnel
  ()Lcom/google/common/hash/Funnel<Ljava/lang/Long;>;
 sequentialFunnel
  <E:Ljava/lang/Object;>(Lcom/google/common/hash/Funnel<TE;>;)Lcom/google/common/hash/Funnel<Ljava/lang/Iterable<+TE;>;>;
- <E:Ljava/lang/Object;>(Lcom/google/common/hash/Funnel<TE;>;)Lcom/google/common/hash/Funnel<Ljava/lang/Iterable<+TE;>;>;
+ <E:Ljava/lang/Object;>(Lcom/google/common/hash/Funnel<TE;>;)L1com/google/common/hash/Funnel<Ljava/lang/Iterable<+TE;>;>;
 stringFunnel
  (Ljava/nio/charset/Charset;)Lcom/google/common/hash/Funnel<Ljava/lang/CharSequence;>;
- (Ljava/nio/charset/Charset;)Lcom/google/common/hash/Funnel<Ljava/lang/CharSequence;>;
+ (Ljava/nio/charset/Charset;)L1com/google/common/hash/Funnel<Ljava/lang/CharSequence;>;
 unencodedCharsFunnel
  ()Lcom/google/common/hash/Funnel<Ljava/lang/CharSequence;>;
  ()Lcom/google/common/hash/Funnel<Ljava/lang/CharSequence;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/hash/HashCode.eea b/libs/eea-guava/src/main/resources/com/google/common/hash/HashCode.eea
index a0989ca618..d323e37568 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/hash/HashCode.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/hash/HashCode.eea
@@ -5,10 +5,10 @@ fromBytes
  ([B)Lcom/google/common/hash/HashCode;
 fromInt
  (I)Lcom/google/common/hash/HashCode;
- (I)Lcom/google/common/hash/HashCode;
+ (I)L1com/google/common/hash/HashCode;
 fromLong
  (J)Lcom/google/common/hash/HashCode;
- (J)Lcom/google/common/hash/HashCode;
+ (J)L1com/google/common/hash/HashCode;
 fromString
  (Ljava/lang/String;)Lcom/google/common/hash/HashCode;
  (Ljava/lang/String;)Lcom/google/common/hash/HashCode;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/hash/Hashing.eea b/libs/eea-guava/src/main/resources/com/google/common/hash/Hashing.eea
index d8a279c564..0627112091 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/hash/Hashing.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/hash/Hashing.eea
@@ -35,25 +35,25 @@ goodFastHash
  (I)Lcom/google/common/hash/HashFunction;
 hmacMd5
  (Ljava/security/Key;)Lcom/google/common/hash/HashFunction;
- (Ljava/security/Key;)Lcom/google/common/hash/HashFunction;
+ (Ljava/security/Key;)L1com/google/common/hash/HashFunction;
 hmacMd5
  ([B)Lcom/google/common/hash/HashFunction;
  ([B)Lcom/google/common/hash/HashFunction;
 hmacSha1
  (Ljava/security/Key;)Lcom/google/common/hash/HashFunction;
- (Ljava/security/Key;)Lcom/google/common/hash/HashFunction;
+ (Ljava/security/Key;)L1com/google/common/hash/HashFunction;
 hmacSha1
  ([B)Lcom/google/common/hash/HashFunction;
  ([B)Lcom/google/common/hash/HashFunction;
 hmacSha256
  (Ljava/security/Key;)Lcom/google/common/hash/HashFunction;
- (Ljava/security/Key;)Lcom/google/common/hash/HashFunction;
+ (Ljava/security/Key;)L1com/google/common/hash/HashFunction;
 hmacSha256
  ([B)Lcom/google/common/hash/HashFunction;
  ([B)Lcom/google/common/hash/HashFunction;
 hmacSha512
  (Ljava/security/Key;)Lcom/google/common/hash/HashFunction;
- (Ljava/security/Key;)Lcom/google/common/hash/HashFunction;
+ (Ljava/security/Key;)L1com/google/common/hash/HashFunction;
 hmacSha512
  ([B)Lcom/google/common/hash/HashFunction;
  ([B)Lcom/google/common/hash/HashFunction;
@@ -65,7 +65,7 @@ murmur3_128
  ()Lcom/google/common/hash/HashFunction;
 murmur3_128
  (I)Lcom/google/common/hash/HashFunction;
- (I)Lcom/google/common/hash/HashFunction;
+ (I)L1com/google/common/hash/HashFunction;
 murmur3_32
  ()Lcom/google/common/hash/HashFunction;
  ()Lcom/google/common/hash/HashFunction;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/io/BaseEncoding.eea b/libs/eea-guava/src/main/resources/com/google/common/io/BaseEncoding.eea
index cb199a08e1..45a0f9db2a 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/io/BaseEncoding.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/io/BaseEncoding.eea
@@ -24,7 +24,7 @@ decode
  (Ljava/lang/CharSequence;)[B
 decodingSource
  (Lcom/google/common/io/CharSource;)Lcom/google/common/io/ByteSource;
- (Lcom/google/common/io/CharSource;)Lcom/google/common/io/ByteSource;
+ (Lcom/google/common/io/CharSource;)L1com/google/common/io/ByteSource;
 decodingStream
  (Ljava/io/Reader;)Ljava/io/InputStream;
  (Ljava/io/Reader;)Ljava/io/InputStream;
@@ -33,10 +33,10 @@ encode
  ([B)Ljava/lang/String;
 encode
  ([BII)Ljava/lang/String;
- ([BII)Ljava/lang/String;
+ ([BII)L1java/lang/String;
 encodingSink
  (Lcom/google/common/io/CharSink;)Lcom/google/common/io/ByteSink;
- (Lcom/google/common/io/CharSink;)Lcom/google/common/io/ByteSink;
+ (Lcom/google/common/io/CharSink;)L1com/google/common/io/ByteSink;
 encodingStream
  (Ljava/io/Writer;)Ljava/io/OutputStream;
  (Ljava/io/Writer;)Ljava/io/OutputStream;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/io/ByteSink.eea b/libs/eea-guava/src/main/resources/com/google/common/io/ByteSink.eea
index 67434ac45a..c6db064154 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/io/ByteSink.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/io/ByteSink.eea
@@ -2,10 +2,10 @@ class com/google/common/io/ByteSink
 
 asCharSink
  (Ljava/nio/charset/Charset;)Lcom/google/common/io/CharSink;
- (Ljava/nio/charset/Charset;)Lcom/google/common/io/CharSink;
+ (Ljava/nio/charset/Charset;)L1com/google/common/io/CharSink;
 openBufferedStream
  ()Ljava/io/OutputStream;
- ()Ljava/io/OutputStream;
+ ()L1java/io/OutputStream;
 openStream
  ()Ljava/io/OutputStream;
  ()Ljava/io/OutputStream;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/io/ByteSource.eea b/libs/eea-guava/src/main/resources/com/google/common/io/ByteSource.eea
index d2f00b1c1f..c392b9b43d 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/io/ByteSource.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/io/ByteSource.eea
@@ -2,7 +2,7 @@ class com/google/common/io/ByteSource
 
 concat
  (Ljava/lang/Iterable<+Lcom/google/common/io/ByteSource;>;)Lcom/google/common/io/ByteSource;
- (Ljava/lang/Iterable<+Lcom/google/common/io/ByteSource;>;)Lcom/google/common/io/ByteSource;
+ (Ljava/lang/Iterable<+Lcom/google/common/io/ByteSource;>;)L1com/google/common/io/ByteSource;
 concat
  (Ljava/util/Iterator<+Lcom/google/common/io/ByteSource;>;)Lcom/google/common/io/ByteSource;
  (Ljava/util/Iterator<+Lcom/google/common/io/ByteSource;>;)Lcom/google/common/io/ByteSource;
@@ -14,11 +14,11 @@ empty
  ()Lcom/google/common/io/ByteSource;
 wrap
  ([B)Lcom/google/common/io/ByteSource;
- ([B)Lcom/google/common/io/ByteSource;
+ ([B)L1com/google/common/io/ByteSource;
 
 asCharSource
  (Ljava/nio/charset/Charset;)Lcom/google/common/io/CharSource;
- (Ljava/nio/charset/Charset;)Lcom/google/common/io/CharSource;
+ (Ljava/nio/charset/Charset;)L1com/google/common/io/CharSource;
 contentEquals
  (Lcom/google/common/io/ByteSource;)Z
  (Lcom/google/common/io/ByteSource;)Z
@@ -33,7 +33,7 @@ hash
  (Lcom/google/common/hash/HashFunction;)Lcom/google/common/hash/HashCode;
 openBufferedStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
 openStream
  ()Ljava/io/InputStream;
  ()Ljava/io/InputStream;
@@ -48,4 +48,4 @@ sizeIfKnown
  ()Lcom/google/common/base/Optional<Ljava/lang/Long;>;
 slice
  (JJ)Lcom/google/common/io/ByteSource;
- (JJ)Lcom/google/common/io/ByteSource;
+ (JJ)L1com/google/common/io/ByteSource;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/io/ByteStreams.eea b/libs/eea-guava/src/main/resources/com/google/common/io/ByteStreams.eea
index 3fa663aece..1497f0bb2f 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/io/ByteStreams.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/io/ByteStreams.eea
@@ -11,10 +11,10 @@ exhaust
  (Ljava/io/InputStream;)J
 limit
  (Ljava/io/InputStream;J)Ljava/io/InputStream;
- (Ljava/io/InputStream;J)Ljava/io/InputStream;
+ (Ljava/io/InputStream;J)L1java/io/InputStream;
 newDataInput
  (Ljava/io/ByteArrayInputStream;)Lcom/google/common/io/ByteArrayDataInput;
- (Ljava/io/ByteArrayInputStream;)Lcom/google/common/io/ByteArrayDataInput;
+ (Ljava/io/ByteArrayInputStream;)L1com/google/common/io/ByteArrayDataInput;
 newDataInput
  ([B)Lcom/google/common/io/ByteArrayDataInput;
  ([B)Lcom/google/common/io/ByteArrayDataInput;
@@ -29,7 +29,7 @@ newDataOutput
  (I)Lcom/google/common/io/ByteArrayDataOutput;
 newDataOutput
  (Ljava/io/ByteArrayOutputStream;)Lcom/google/common/io/ByteArrayDataOutput;
- (Ljava/io/ByteArrayOutputStream;)Lcom/google/common/io/ByteArrayDataOutput;
+ (Ljava/io/ByteArrayOutputStream;)L1com/google/common/io/ByteArrayDataOutput;
 nullOutputStream
  ()Ljava/io/OutputStream;
  ()Ljava/io/OutputStream;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/io/CharSink.eea b/libs/eea-guava/src/main/resources/com/google/common/io/CharSink.eea
index c1a1ec30b9..e5784be22a 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/io/CharSink.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/io/CharSink.eea
@@ -2,7 +2,7 @@ class com/google/common/io/CharSink
 
 openBufferedStream
  ()Ljava/io/Writer;
- ()Ljava/io/Writer;
+ ()L1java/io/Writer;
 openStream
  ()Ljava/io/Writer;
  ()Ljava/io/Writer;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/io/CharSource.eea b/libs/eea-guava/src/main/resources/com/google/common/io/CharSource.eea
index 0ea6531aec..5cf3fdc63a 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/io/CharSource.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/io/CharSource.eea
@@ -2,7 +2,7 @@ class com/google/common/io/CharSource
 
 concat
  (Ljava/lang/Iterable<+Lcom/google/common/io/CharSource;>;)Lcom/google/common/io/CharSource;
- (Ljava/lang/Iterable<+Lcom/google/common/io/CharSource;>;)Lcom/google/common/io/CharSource;
+ (Ljava/lang/Iterable<+Lcom/google/common/io/CharSource;>;)L1com/google/common/io/CharSource;
 concat
  (Ljava/util/Iterator<+Lcom/google/common/io/CharSource;>;)Lcom/google/common/io/CharSource;
  (Ljava/util/Iterator<+Lcom/google/common/io/CharSource;>;)Lcom/google/common/io/CharSource;
@@ -14,11 +14,11 @@ empty
  ()Lcom/google/common/io/CharSource;
 wrap
  (Ljava/lang/CharSequence;)Lcom/google/common/io/CharSource;
- (Ljava/lang/CharSequence;)Lcom/google/common/io/CharSource;
+ (Ljava/lang/CharSequence;)L1com/google/common/io/CharSource;
 
 asByteSource
  (Ljava/nio/charset/Charset;)Lcom/google/common/io/ByteSource;
- (Ljava/nio/charset/Charset;)Lcom/google/common/io/ByteSource;
+ (Ljava/nio/charset/Charset;)L1com/google/common/io/ByteSource;
 copyTo
  (Lcom/google/common/io/CharSink;)J
  (Lcom/google/common/io/CharSink;)J
@@ -36,7 +36,7 @@ lines
  ()Ljava/util/stream/Stream<Ljava/lang/String;>;
 openBufferedStream
  ()Ljava/io/BufferedReader;
- ()Ljava/io/BufferedReader;
+ ()L1java/io/BufferedReader;
 openStream
  ()Ljava/io/Reader;
  ()Ljava/io/Reader;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/io/CharStreams.eea b/libs/eea-guava/src/main/resources/com/google/common/io/CharStreams.eea
index 3e69c8467a..bd58b63c34 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/io/CharStreams.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/io/CharStreams.eea
@@ -14,7 +14,7 @@ nullWriter
  ()Ljava/io/Writer;
 readLines
  (Ljava/lang/Readable;)Ljava/util/List<Ljava/lang/String;>;
- (Ljava/lang/Readable;)Ljava/util/List<Ljava/lang/String;>;
+ (Ljava/lang/Readable;)L1java/util/List<Ljava/lang/String;>;
 readLines
  <T:Ljava/lang/Object;>(Ljava/lang/Readable;Lcom/google/common/io/LineProcessor<TT;>;)TT;
  <T:Ljava/lang/Object;>(Ljava/lang/Readable;Lcom/google/common/io/LineProcessor<TT;>;)T1T;
@@ -23,4 +23,4 @@ skipFully
  (Ljava/io/Reader;J)V
 toString
  (Ljava/lang/Readable;)Ljava/lang/String;
- (Ljava/lang/Readable;)Ljava/lang/String;
+ (Ljava/lang/Readable;)L1java/lang/String;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/io/Closer.eea b/libs/eea-guava/src/main/resources/com/google/common/io/Closer.eea
index c3001a282f..9857ea4c4a 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/io/Closer.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/io/Closer.eea
@@ -2,17 +2,17 @@ class com/google/common/io/Closer
 
 create
  ()Lcom/google/common/io/Closer;
- ()Lcom/google/common/io/Closer;
+ ()L1com/google/common/io/Closer;
 
 register
  <C::Ljava/io/Closeable;>(TC;)TC;
  <C::Ljava/io/Closeable;>(TC;)T1C;
 rethrow
  (Ljava/lang/Throwable;)Ljava/lang/RuntimeException;
- (Ljava/lang/Throwable;)Ljava/lang/RuntimeException;
+ (Ljava/lang/Throwable;)L1java/lang/RuntimeException;
 rethrow
  <X1:Ljava/lang/Exception;X2:Ljava/lang/Exception;>(Ljava/lang/Throwable;Ljava/lang/Class<TX1;>;Ljava/lang/Class<TX2;>;)Ljava/lang/RuntimeException;^Ljava/io/IOException;^TX1;^TX2;
- <X1:Ljava/lang/Exception;X2:Ljava/lang/Exception;>(Ljava/lang/Throwable;Ljava/lang/Class<TX1;>;Ljava/lang/Class<TX2;>;)Ljava/lang/RuntimeException;^Ljava/io/IOException;^TX1;^TX2;
+ <X1:Ljava/lang/Exception;X2:Ljava/lang/Exception;>(Ljava/lang/Throwable;Ljava/lang/Class<TX1;>;Ljava/lang/Class<TX2;>;)L1java/lang/RuntimeException;^Ljava/io/IOException;^TX1;^TX2;
 rethrow
  <X:Ljava/lang/Exception;>(Ljava/lang/Throwable;Ljava/lang/Class<TX;>;)Ljava/lang/RuntimeException;^Ljava/io/IOException;^TX;
- <X:Ljava/lang/Exception;>(Ljava/lang/Throwable;Ljava/lang/Class<TX;>;)Ljava/lang/RuntimeException;^Ljava/io/IOException;^TX;
+ <X:Ljava/lang/Exception;>(Ljava/lang/Throwable;Ljava/lang/Class<TX;>;)L1java/lang/RuntimeException;^Ljava/io/IOException;^TX;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/io/Files.eea b/libs/eea-guava/src/main/resources/com/google/common/io/Files.eea
index 853da1f349..1880c8a806 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/io/Files.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/io/Files.eea
@@ -5,10 +5,10 @@ append
  (Ljava/lang/CharSequence;Ljava/io/File;Ljava/nio/charset/Charset;)V
 asByteSink
  (Ljava/io/File;[Lcom/google/common/io/FileWriteMode;)Lcom/google/common/io/ByteSink;
- (Ljava/io/File;[Lcom/google/common/io/FileWriteMode;)Lcom/google/common/io/ByteSink;
+ (Ljava/io/File;[Lcom/google/common/io/FileWriteMode;)L1com/google/common/io/ByteSink;
 asByteSource
  (Ljava/io/File;)Lcom/google/common/io/ByteSource;
- (Ljava/io/File;)Lcom/google/common/io/ByteSource;
+ (Ljava/io/File;)L1com/google/common/io/ByteSource;
 asCharSink
  (Ljava/io/File;Ljava/nio/charset/Charset;[Lcom/google/common/io/FileWriteMode;)Lcom/google/common/io/CharSink;
  (Ljava/io/File;Ljava/nio/charset/Charset;[Lcom/google/common/io/FileWriteMode;)Lcom/google/common/io/CharSink;
@@ -29,7 +29,7 @@ createParentDirs
  (Ljava/io/File;)V
 createTempDir
  ()Ljava/io/File;
- ()Ljava/io/File;
+ ()L1java/io/File;
 equal
  (Ljava/io/File;Ljava/io/File;)Z
  (Ljava/io/File;Ljava/io/File;)Z
@@ -65,10 +65,10 @@ move
  (Ljava/io/File;Ljava/io/File;)V
 newReader
  (Ljava/io/File;Ljava/nio/charset/Charset;)Ljava/io/BufferedReader;
- (Ljava/io/File;Ljava/nio/charset/Charset;)Ljava/io/BufferedReader;
+ (Ljava/io/File;Ljava/nio/charset/Charset;)L1java/io/BufferedReader;
 newWriter
  (Ljava/io/File;Ljava/nio/charset/Charset;)Ljava/io/BufferedWriter;
- (Ljava/io/File;Ljava/nio/charset/Charset;)Ljava/io/BufferedWriter;
+ (Ljava/io/File;Ljava/nio/charset/Charset;)L1java/io/BufferedWriter;
 readBytes
  <T:Ljava/lang/Object;>(Ljava/io/File;Lcom/google/common/io/ByteProcessor<TT;>;)TT;
  <T:Ljava/lang/Object;>(Ljava/io/File;Lcom/google/common/io/ByteProcessor<TT;>;)T1T;
@@ -83,7 +83,7 @@ readLines
  <T:Ljava/lang/Object;>(Ljava/io/File;Ljava/nio/charset/Charset;Lcom/google/common/io/LineProcessor<TT;>;)T1T;
 simplifyPath
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 toByteArray
  (Ljava/io/File;)[B
  (Ljava/io/File;)[B
diff --git a/libs/eea-guava/src/main/resources/com/google/common/io/MoreFiles.eea b/libs/eea-guava/src/main/resources/com/google/common/io/MoreFiles.eea
index fcfc86387d..95702f6b84 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/io/MoreFiles.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/io/MoreFiles.eea
@@ -2,10 +2,10 @@ class com/google/common/io/MoreFiles
 
 asByteSink
  (Ljava/nio/file/Path;[Ljava/nio/file/OpenOption;)Lcom/google/common/io/ByteSink;
- (Ljava/nio/file/Path;[Ljava/nio/file/OpenOption;)Lcom/google/common/io/ByteSink;
+ (Ljava/nio/file/Path;[Ljava/nio/file/OpenOption;)L1com/google/common/io/ByteSink;
 asByteSource
  (Ljava/nio/file/Path;[Ljava/nio/file/OpenOption;)Lcom/google/common/io/ByteSource;
- (Ljava/nio/file/Path;[Ljava/nio/file/OpenOption;)Lcom/google/common/io/ByteSource;
+ (Ljava/nio/file/Path;[Ljava/nio/file/OpenOption;)L1com/google/common/io/ByteSource;
 asCharSink
  (Ljava/nio/file/Path;Ljava/nio/charset/Charset;[Ljava/nio/file/OpenOption;)Lcom/google/common/io/CharSink;
  (Ljava/nio/file/Path;Ljava/nio/charset/Charset;[Ljava/nio/file/OpenOption;)Lcom/google/common/io/CharSink;
@@ -35,10 +35,10 @@ getNameWithoutExtension
  (Ljava/nio/file/Path;)Ljava/lang/String;
 isDirectory
  ([Ljava/nio/file/LinkOption;)Lcom/google/common/base/Predicate<Ljava/nio/file/Path;>;
- ([Ljava/nio/file/LinkOption;)Lcom/google/common/base/Predicate<Ljava/nio/file/Path;>;
+ ([Ljava/nio/file/LinkOption;)L1com/google/common/base/Predicate<Ljava/nio/file/Path;>;
 isRegularFile
  ([Ljava/nio/file/LinkOption;)Lcom/google/common/base/Predicate<Ljava/nio/file/Path;>;
- ([Ljava/nio/file/LinkOption;)Lcom/google/common/base/Predicate<Ljava/nio/file/Path;>;
+ ([Ljava/nio/file/LinkOption;)L1com/google/common/base/Predicate<Ljava/nio/file/Path;>;
 listFiles
  (Ljava/nio/file/Path;)Lcom/google/common/collect/ImmutableList<Ljava/nio/file/Path;>;
  (Ljava/nio/file/Path;)Lcom/google/common/collect/ImmutableList<Ljava/nio/file/Path;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/io/Resources.eea b/libs/eea-guava/src/main/resources/com/google/common/io/Resources.eea
index 864a245d66..8d5b8a843f 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/io/Resources.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/io/Resources.eea
@@ -2,7 +2,7 @@ class com/google/common/io/Resources
 
 asByteSource
  (Ljava/net/URL;)Lcom/google/common/io/ByteSource;
- (Ljava/net/URL;)Lcom/google/common/io/ByteSource;
+ (Ljava/net/URL;)L1com/google/common/io/ByteSource;
 asCharSource
  (Ljava/net/URL;Ljava/nio/charset/Charset;)Lcom/google/common/io/CharSource;
  (Ljava/net/URL;Ljava/nio/charset/Charset;)Lcom/google/common/io/CharSource;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/math/LinearTransformation$LinearTransformationBuilder.eea b/libs/eea-guava/src/main/resources/com/google/common/math/LinearTransformation$LinearTransformationBuilder.eea
index 6057c9b1dc..57a7be07a1 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/math/LinearTransformation$LinearTransformationBuilder.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/math/LinearTransformation$LinearTransformationBuilder.eea
@@ -5,4 +5,4 @@ and
  (DD)Lcom/google/common/math/LinearTransformation;
 withSlope
  (D)Lcom/google/common/math/LinearTransformation;
- (D)Lcom/google/common/math/LinearTransformation;
+ (D)L1com/google/common/math/LinearTransformation;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/math/LinearTransformation.eea b/libs/eea-guava/src/main/resources/com/google/common/math/LinearTransformation.eea
index 90a17a7242..496c6815f9 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/math/LinearTransformation.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/math/LinearTransformation.eea
@@ -5,13 +5,13 @@ forNaN
  ()Lcom/google/common/math/LinearTransformation;
 horizontal
  (D)Lcom/google/common/math/LinearTransformation;
- (D)Lcom/google/common/math/LinearTransformation;
+ (D)L1com/google/common/math/LinearTransformation;
 mapping
  (DD)Lcom/google/common/math/LinearTransformation$LinearTransformationBuilder;
- (DD)Lcom/google/common/math/LinearTransformation$LinearTransformationBuilder;
+ (DD)L1com/google/common/math/LinearTransformation$LinearTransformationBuilder;
 vertical
  (D)Lcom/google/common/math/LinearTransformation;
- (D)Lcom/google/common/math/LinearTransformation;
+ (D)L1com/google/common/math/LinearTransformation;
 
 inverse
  ()Lcom/google/common/math/LinearTransformation;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/math/PairedStats.eea b/libs/eea-guava/src/main/resources/com/google/common/math/PairedStats.eea
index 4f91728576..078f2aabb6 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/math/PairedStats.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/math/PairedStats.eea
@@ -2,7 +2,7 @@ class com/google/common/math/PairedStats
 
 fromByteArray
  ([B)Lcom/google/common/math/PairedStats;
- ([B)Lcom/google/common/math/PairedStats;
+ ([B)L1com/google/common/math/PairedStats;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-guava/src/main/resources/com/google/common/math/Quantiles$Scale.eea b/libs/eea-guava/src/main/resources/com/google/common/math/Quantiles$Scale.eea
index 5660853ee6..d1eeee98ee 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/math/Quantiles$Scale.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/math/Quantiles$Scale.eea
@@ -2,10 +2,10 @@ class com/google/common/math/Quantiles$Scale
 
 index
  (I)Lcom/google/common/math/Quantiles$ScaleAndIndex;
- (I)Lcom/google/common/math/Quantiles$ScaleAndIndex;
+ (I)L1com/google/common/math/Quantiles$ScaleAndIndex;
 indexes
  (Ljava/util/Collection<Ljava/lang/Integer;>;)Lcom/google/common/math/Quantiles$ScaleAndIndexes;
- (Ljava/util/Collection<Ljava/lang/Integer;>;)Lcom/google/common/math/Quantiles$ScaleAndIndexes;
+ (Ljava/util/Collection<Ljava/lang/Integer;>;)L1com/google/common/math/Quantiles$ScaleAndIndexes;
 indexes
  ([I)Lcom/google/common/math/Quantiles$ScaleAndIndexes;
- ([I)Lcom/google/common/math/Quantiles$ScaleAndIndexes;
+ ([I)L1com/google/common/math/Quantiles$ScaleAndIndexes;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/math/Quantiles.eea b/libs/eea-guava/src/main/resources/com/google/common/math/Quantiles.eea
index 85a02f0117..75dd854fa2 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/math/Quantiles.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/math/Quantiles.eea
@@ -11,4 +11,4 @@ quartiles
  ()Lcom/google/common/math/Quantiles$Scale;
 scale
  (I)Lcom/google/common/math/Quantiles$Scale;
- (I)Lcom/google/common/math/Quantiles$Scale;
+ (I)L1com/google/common/math/Quantiles$Scale;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/net/HostAndPort.eea b/libs/eea-guava/src/main/resources/com/google/common/net/HostAndPort.eea
index a663252f14..1beb0289e0 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/net/HostAndPort.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/net/HostAndPort.eea
@@ -8,7 +8,7 @@ fromParts
  (Ljava/lang/String;I)Lcom/google/common/net/HostAndPort;
 fromString
  (Ljava/lang/String;)Lcom/google/common/net/HostAndPort;
- (Ljava/lang/String;)Lcom/google/common/net/HostAndPort;
+ (Ljava/lang/String;)L1com/google/common/net/HostAndPort;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-guava/src/main/resources/com/google/common/net/HostSpecifier.eea b/libs/eea-guava/src/main/resources/com/google/common/net/HostSpecifier.eea
index dfcbbb6136..330ff43012 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/net/HostSpecifier.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/net/HostSpecifier.eea
@@ -5,7 +5,7 @@ from
  (Ljava/lang/String;)Lcom/google/common/net/HostSpecifier;
 fromValid
  (Ljava/lang/String;)Lcom/google/common/net/HostSpecifier;
- (Ljava/lang/String;)Lcom/google/common/net/HostSpecifier;
+ (Ljava/lang/String;)L1com/google/common/net/HostSpecifier;
 isValid
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-guava/src/main/resources/com/google/common/net/InetAddresses.eea b/libs/eea-guava/src/main/resources/com/google/common/net/InetAddresses.eea
index 7d022a36b4..cade719ba7 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/net/InetAddresses.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/net/InetAddresses.eea
@@ -41,7 +41,7 @@ getIsatapIPv4Address
  (Ljava/net/Inet6Address;)Ljava/net/Inet4Address;
 getTeredoInfo
  (Ljava/net/Inet6Address;)Lcom/google/common/net/InetAddresses$TeredoInfo;
- (Ljava/net/Inet6Address;)Lcom/google/common/net/InetAddresses$TeredoInfo;
+ (Ljava/net/Inet6Address;)L1com/google/common/net/InetAddresses$TeredoInfo;
 hasEmbeddedIPv4ClientAddress
  (Ljava/net/Inet6Address;)Z
  (Ljava/net/Inet6Address;)Z
diff --git a/libs/eea-guava/src/main/resources/com/google/common/net/InternetDomainName.eea b/libs/eea-guava/src/main/resources/com/google/common/net/InternetDomainName.eea
index 0f473ebf60..5478431094 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/net/InternetDomainName.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/net/InternetDomainName.eea
@@ -2,7 +2,7 @@ class com/google/common/net/InternetDomainName
 
 from
  (Ljava/lang/String;)Lcom/google/common/net/InternetDomainName;
- (Ljava/lang/String;)Lcom/google/common/net/InternetDomainName;
+ (Ljava/lang/String;)L1com/google/common/net/InternetDomainName;
 isValid
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-guava/src/main/resources/com/google/common/net/MediaType.eea b/libs/eea-guava/src/main/resources/com/google/common/net/MediaType.eea
index 2fba458303..d4926f5029 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/net/MediaType.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/net/MediaType.eea
@@ -351,7 +351,7 @@ ZIP
 
 create
  (Ljava/lang/String;Ljava/lang/String;)Lcom/google/common/net/MediaType;
- (Ljava/lang/String;Ljava/lang/String;)Lcom/google/common/net/MediaType;
+ (Ljava/lang/String;Ljava/lang/String;)L1com/google/common/net/MediaType;
 parse
  (Ljava/lang/String;)Lcom/google/common/net/MediaType;
  (Ljava/lang/String;)Lcom/google/common/net/MediaType;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/primitives/Booleans.eea b/libs/eea-guava/src/main/resources/com/google/common/primitives/Booleans.eea
index f390908db8..e05eb0225c 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/primitives/Booleans.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/primitives/Booleans.eea
@@ -5,7 +5,7 @@ asList
  ([Z)Ljava/util/List<Ljava/lang/Boolean;>;
 concat
  ([[Z)[Z
- ([[Z)[Z
+ ([[Z)[1Z
 contains
  ([ZZ)Z
  ([ZZ)Z
@@ -26,7 +26,7 @@ indexOf
  ([Z[Z)I
 join
  (Ljava/lang/String;[Z)Ljava/lang/String;
- (Ljava/lang/String;[Z)Ljava/lang/String;
+ (Ljava/lang/String;[Z)L1java/lang/String;
 lastIndexOf
  ([ZZ)I
  ([ZZ)I
diff --git a/libs/eea-guava/src/main/resources/com/google/common/primitives/Bytes.eea b/libs/eea-guava/src/main/resources/com/google/common/primitives/Bytes.eea
index 6a1cd50edc..5fd8b4c772 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/primitives/Bytes.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/primitives/Bytes.eea
@@ -5,7 +5,7 @@ asList
  ([B)Ljava/util/List<Ljava/lang/Byte;>;
 concat
  ([[B)[B
- ([[B)[B
+ ([[B)[1B
 contains
  ([BB)Z
  ([BB)Z
diff --git a/libs/eea-guava/src/main/resources/com/google/common/primitives/Chars.eea b/libs/eea-guava/src/main/resources/com/google/common/primitives/Chars.eea
index b81658b5b6..6378a828e5 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/primitives/Chars.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/primitives/Chars.eea
@@ -5,7 +5,7 @@ asList
  ([C)Ljava/util/List<Ljava/lang/Character;>;
 concat
  ([[C)[C
- ([[C)[C
+ ([[C)[1C
 contains
  ([CC)Z
  ([CC)Z
@@ -23,7 +23,7 @@ indexOf
  ([C[C)I
 join
  (Ljava/lang/String;[C)Ljava/lang/String;
- (Ljava/lang/String;[C)Ljava/lang/String;
+ (Ljava/lang/String;[C)L1java/lang/String;
 lastIndexOf
  ([CC)I
  ([CC)I
diff --git a/libs/eea-guava/src/main/resources/com/google/common/primitives/Doubles.eea b/libs/eea-guava/src/main/resources/com/google/common/primitives/Doubles.eea
index 4ead4c4c03..1f30758571 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/primitives/Doubles.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/primitives/Doubles.eea
@@ -5,7 +5,7 @@ asList
  ([D)Ljava/util/List<Ljava/lang/Double;>;
 concat
  ([[D)[D
- ([[D)[D
+ ([[D)[1D
 contains
  ([DD)Z
  ([DD)Z
@@ -20,7 +20,7 @@ indexOf
  ([D[D)I
 join
  (Ljava/lang/String;[D)Ljava/lang/String;
- (Ljava/lang/String;[D)Ljava/lang/String;
+ (Ljava/lang/String;[D)L1java/lang/String;
 lastIndexOf
  ([DD)I
  ([DD)I
diff --git a/libs/eea-guava/src/main/resources/com/google/common/primitives/Floats.eea b/libs/eea-guava/src/main/resources/com/google/common/primitives/Floats.eea
index 7668978114..a88529a864 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/primitives/Floats.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/primitives/Floats.eea
@@ -5,7 +5,7 @@ asList
  ([F)Ljava/util/List<Ljava/lang/Float;>;
 concat
  ([[F)[F
- ([[F)[F
+ ([[F)[1F
 contains
  ([FF)Z
  ([FF)Z
@@ -20,7 +20,7 @@ indexOf
  ([F[F)I
 join
  (Ljava/lang/String;[F)Ljava/lang/String;
- (Ljava/lang/String;[F)Ljava/lang/String;
+ (Ljava/lang/String;[F)L1java/lang/String;
 lastIndexOf
  ([FF)I
  ([FF)I
diff --git a/libs/eea-guava/src/main/resources/com/google/common/primitives/ImmutableDoubleArray.eea b/libs/eea-guava/src/main/resources/com/google/common/primitives/ImmutableDoubleArray.eea
index 7dd45225c9..adbc988a6a 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/primitives/ImmutableDoubleArray.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/primitives/ImmutableDoubleArray.eea
@@ -5,16 +5,16 @@ builder
  ()Lcom/google/common/primitives/ImmutableDoubleArray$Builder;
 builder
  (I)Lcom/google/common/primitives/ImmutableDoubleArray$Builder;
- (I)Lcom/google/common/primitives/ImmutableDoubleArray$Builder;
+ (I)L1com/google/common/primitives/ImmutableDoubleArray$Builder;
 copyOf
  (Ljava/lang/Iterable<Ljava/lang/Double;>;)Lcom/google/common/primitives/ImmutableDoubleArray;
  (Ljava/lang/Iterable<Ljava/lang/Double;>;)Lcom/google/common/primitives/ImmutableDoubleArray;
 copyOf
  (Ljava/util/Collection<Ljava/lang/Double;>;)Lcom/google/common/primitives/ImmutableDoubleArray;
- (Ljava/util/Collection<Ljava/lang/Double;>;)Lcom/google/common/primitives/ImmutableDoubleArray;
+ (Ljava/util/Collection<Ljava/lang/Double;>;)L1com/google/common/primitives/ImmutableDoubleArray;
 copyOf
  (Ljava/util/stream/DoubleStream;)Lcom/google/common/primitives/ImmutableDoubleArray;
- (Ljava/util/stream/DoubleStream;)Lcom/google/common/primitives/ImmutableDoubleArray;
+ (Ljava/util/stream/DoubleStream;)L1com/google/common/primitives/ImmutableDoubleArray;
 copyOf
  ([D)Lcom/google/common/primitives/ImmutableDoubleArray;
  ([D)Lcom/google/common/primitives/ImmutableDoubleArray;
@@ -41,11 +41,11 @@ of
  (DDDDDD)Lcom/google/common/primitives/ImmutableDoubleArray;
 of
  (D[D)Lcom/google/common/primitives/ImmutableDoubleArray;
- (D[D)Lcom/google/common/primitives/ImmutableDoubleArray;
+ (D[D)L1com/google/common/primitives/ImmutableDoubleArray;
 
 asList
  ()Ljava/util/List<Ljava/lang/Double;>;
- ()Ljava/util/List<Ljava/lang/Double;>;
+ ()L1java/util/List<Ljava/lang/Double;>;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-guava/src/main/resources/com/google/common/primitives/ImmutableIntArray.eea b/libs/eea-guava/src/main/resources/com/google/common/primitives/ImmutableIntArray.eea
index 2b96feb3d5..8d96499b0d 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/primitives/ImmutableIntArray.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/primitives/ImmutableIntArray.eea
@@ -5,16 +5,16 @@ builder
  ()Lcom/google/common/primitives/ImmutableIntArray$Builder;
 builder
  (I)Lcom/google/common/primitives/ImmutableIntArray$Builder;
- (I)Lcom/google/common/primitives/ImmutableIntArray$Builder;
+ (I)L1com/google/common/primitives/ImmutableIntArray$Builder;
 copyOf
  (Ljava/lang/Iterable<Ljava/lang/Integer;>;)Lcom/google/common/primitives/ImmutableIntArray;
  (Ljava/lang/Iterable<Ljava/lang/Integer;>;)Lcom/google/common/primitives/ImmutableIntArray;
 copyOf
  (Ljava/util/Collection<Ljava/lang/Integer;>;)Lcom/google/common/primitives/ImmutableIntArray;
- (Ljava/util/Collection<Ljava/lang/Integer;>;)Lcom/google/common/primitives/ImmutableIntArray;
+ (Ljava/util/Collection<Ljava/lang/Integer;>;)L1com/google/common/primitives/ImmutableIntArray;
 copyOf
  (Ljava/util/stream/IntStream;)Lcom/google/common/primitives/ImmutableIntArray;
- (Ljava/util/stream/IntStream;)Lcom/google/common/primitives/ImmutableIntArray;
+ (Ljava/util/stream/IntStream;)L1com/google/common/primitives/ImmutableIntArray;
 copyOf
  ([I)Lcom/google/common/primitives/ImmutableIntArray;
  ([I)Lcom/google/common/primitives/ImmutableIntArray;
@@ -41,11 +41,11 @@ of
  (IIIIII)Lcom/google/common/primitives/ImmutableIntArray;
 of
  (I[I)Lcom/google/common/primitives/ImmutableIntArray;
- (I[I)Lcom/google/common/primitives/ImmutableIntArray;
+ (I[I)L1com/google/common/primitives/ImmutableIntArray;
 
 asList
  ()Ljava/util/List<Ljava/lang/Integer;>;
- ()Ljava/util/List<Ljava/lang/Integer;>;
+ ()L1java/util/List<Ljava/lang/Integer;>;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-guava/src/main/resources/com/google/common/primitives/ImmutableLongArray.eea b/libs/eea-guava/src/main/resources/com/google/common/primitives/ImmutableLongArray.eea
index f43cb2987e..8600b6241b 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/primitives/ImmutableLongArray.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/primitives/ImmutableLongArray.eea
@@ -5,16 +5,16 @@ builder
  ()Lcom/google/common/primitives/ImmutableLongArray$Builder;
 builder
  (I)Lcom/google/common/primitives/ImmutableLongArray$Builder;
- (I)Lcom/google/common/primitives/ImmutableLongArray$Builder;
+ (I)L1com/google/common/primitives/ImmutableLongArray$Builder;
 copyOf
  (Ljava/lang/Iterable<Ljava/lang/Long;>;)Lcom/google/common/primitives/ImmutableLongArray;
  (Ljava/lang/Iterable<Ljava/lang/Long;>;)Lcom/google/common/primitives/ImmutableLongArray;
 copyOf
  (Ljava/util/Collection<Ljava/lang/Long;>;)Lcom/google/common/primitives/ImmutableLongArray;
- (Ljava/util/Collection<Ljava/lang/Long;>;)Lcom/google/common/primitives/ImmutableLongArray;
+ (Ljava/util/Collection<Ljava/lang/Long;>;)L1com/google/common/primitives/ImmutableLongArray;
 copyOf
  (Ljava/util/stream/LongStream;)Lcom/google/common/primitives/ImmutableLongArray;
- (Ljava/util/stream/LongStream;)Lcom/google/common/primitives/ImmutableLongArray;
+ (Ljava/util/stream/LongStream;)L1com/google/common/primitives/ImmutableLongArray;
 copyOf
  ([J)Lcom/google/common/primitives/ImmutableLongArray;
  ([J)Lcom/google/common/primitives/ImmutableLongArray;
@@ -41,11 +41,11 @@ of
  (JJJJJJ)Lcom/google/common/primitives/ImmutableLongArray;
 of
  (J[J)Lcom/google/common/primitives/ImmutableLongArray;
- (J[J)Lcom/google/common/primitives/ImmutableLongArray;
+ (J[J)L1com/google/common/primitives/ImmutableLongArray;
 
 asList
  ()Ljava/util/List<Ljava/lang/Long;>;
- ()Ljava/util/List<Ljava/lang/Long;>;
+ ()L1java/util/List<Ljava/lang/Long;>;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-guava/src/main/resources/com/google/common/primitives/Ints.eea b/libs/eea-guava/src/main/resources/com/google/common/primitives/Ints.eea
index 860969febe..d29319441a 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/primitives/Ints.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/primitives/Ints.eea
@@ -5,7 +5,7 @@ asList
  ([I)Ljava/util/List<Ljava/lang/Integer;>;
 concat
  ([[I)[I
- ([[I)[I
+ ([[I)[1I
 contains
  ([II)Z
  ([II)Z
@@ -23,7 +23,7 @@ indexOf
  ([I[I)I
 join
  (Ljava/lang/String;[I)Ljava/lang/String;
- (Ljava/lang/String;[I)Ljava/lang/String;
+ (Ljava/lang/String;[I)L1java/lang/String;
 lastIndexOf
  ([II)I
  ([II)I
diff --git a/libs/eea-guava/src/main/resources/com/google/common/primitives/Longs.eea b/libs/eea-guava/src/main/resources/com/google/common/primitives/Longs.eea
index f26b5ad7cb..1bf35233e1 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/primitives/Longs.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/primitives/Longs.eea
@@ -5,7 +5,7 @@ asList
  ([J)Ljava/util/List<Ljava/lang/Long;>;
 concat
  ([[J)[J
- ([[J)[J
+ ([[J)[1J
 contains
  ([JJ)Z
  ([JJ)Z
@@ -23,7 +23,7 @@ indexOf
  ([J[J)I
 join
  (Ljava/lang/String;[J)Ljava/lang/String;
- (Ljava/lang/String;[J)Ljava/lang/String;
+ (Ljava/lang/String;[J)L1java/lang/String;
 lastIndexOf
  ([JJ)I
  ([JJ)I
@@ -62,7 +62,7 @@ toArray
  (Ljava/util/Collection<+Ljava/lang/Number;>;)[J
 toByteArray
  (J)[B
- (J)[B
+ (J)[1B
 tryParse
  (Ljava/lang/String;)Ljava/lang/Long;
  (Ljava/lang/String;)L0java/lang/Long;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/primitives/Shorts.eea b/libs/eea-guava/src/main/resources/com/google/common/primitives/Shorts.eea
index d66dea80f9..d0ce7e4a6e 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/primitives/Shorts.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/primitives/Shorts.eea
@@ -5,7 +5,7 @@ asList
  ([S)Ljava/util/List<Ljava/lang/Short;>;
 concat
  ([[S)[S
- ([[S)[S
+ ([[S)[1S
 contains
  ([SS)Z
  ([SS)Z
@@ -23,7 +23,7 @@ indexOf
  ([S[S)I
 join
  (Ljava/lang/String;[S)Ljava/lang/String;
- (Ljava/lang/String;[S)Ljava/lang/String;
+ (Ljava/lang/String;[S)L1java/lang/String;
 lastIndexOf
  ([SS)I
  ([SS)I
diff --git a/libs/eea-guava/src/main/resources/com/google/common/primitives/SignedBytes.eea b/libs/eea-guava/src/main/resources/com/google/common/primitives/SignedBytes.eea
index a860c41e98..b9f5fae22b 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/primitives/SignedBytes.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/primitives/SignedBytes.eea
@@ -2,7 +2,7 @@ class com/google/common/primitives/SignedBytes
 
 join
  (Ljava/lang/String;[B)Ljava/lang/String;
- (Ljava/lang/String;[B)Ljava/lang/String;
+ (Ljava/lang/String;[B)L1java/lang/String;
 lexicographicalComparator
  ()Ljava/util/Comparator<[B>;
  ()Ljava/util/Comparator<[B>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/primitives/UnsignedBytes.eea b/libs/eea-guava/src/main/resources/com/google/common/primitives/UnsignedBytes.eea
index 5717638f9e..fabab3feb6 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/primitives/UnsignedBytes.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/primitives/UnsignedBytes.eea
@@ -2,7 +2,7 @@ class com/google/common/primitives/UnsignedBytes
 
 join
  (Ljava/lang/String;[B)Ljava/lang/String;
- (Ljava/lang/String;[B)Ljava/lang/String;
+ (Ljava/lang/String;[B)L1java/lang/String;
 lexicographicalComparator
  ()Ljava/util/Comparator<[B>;
  ()Ljava/util/Comparator<[B>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/primitives/UnsignedInteger.eea b/libs/eea-guava/src/main/resources/com/google/common/primitives/UnsignedInteger.eea
index f58ccefbea..4e6f662a38 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/primitives/UnsignedInteger.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/primitives/UnsignedInteger.eea
@@ -16,7 +16,7 @@ ZERO
 
 fromIntBits
  (I)Lcom/google/common/primitives/UnsignedInteger;
- (I)Lcom/google/common/primitives/UnsignedInteger;
+ (I)L1com/google/common/primitives/UnsignedInteger;
 valueOf
  (J)Lcom/google/common/primitives/UnsignedInteger;
  (J)Lcom/google/common/primitives/UnsignedInteger;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/primitives/UnsignedInts.eea b/libs/eea-guava/src/main/resources/com/google/common/primitives/UnsignedInts.eea
index 7bfe3017c7..0a8b094272 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/primitives/UnsignedInts.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/primitives/UnsignedInts.eea
@@ -5,7 +5,7 @@ decode
  (Ljava/lang/String;)I
 join
  (Ljava/lang/String;[I)Ljava/lang/String;
- (Ljava/lang/String;[I)Ljava/lang/String;
+ (Ljava/lang/String;[I)L1java/lang/String;
 lexicographicalComparator
  ()Ljava/util/Comparator<[I>;
  ()Ljava/util/Comparator<[I>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/primitives/UnsignedLong.eea b/libs/eea-guava/src/main/resources/com/google/common/primitives/UnsignedLong.eea
index aae0f966e6..1b690274d0 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/primitives/UnsignedLong.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/primitives/UnsignedLong.eea
@@ -16,7 +16,7 @@ ZERO
 
 fromLongBits
  (J)Lcom/google/common/primitives/UnsignedLong;
- (J)Lcom/google/common/primitives/UnsignedLong;
+ (J)L1com/google/common/primitives/UnsignedLong;
 valueOf
  (J)Lcom/google/common/primitives/UnsignedLong;
  (J)Lcom/google/common/primitives/UnsignedLong;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/primitives/UnsignedLongs.eea b/libs/eea-guava/src/main/resources/com/google/common/primitives/UnsignedLongs.eea
index b4748c5410..f72f5eb746 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/primitives/UnsignedLongs.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/primitives/UnsignedLongs.eea
@@ -5,7 +5,7 @@ decode
  (Ljava/lang/String;)J
 join
  (Ljava/lang/String;[J)Ljava/lang/String;
- (Ljava/lang/String;[J)Ljava/lang/String;
+ (Ljava/lang/String;[J)L1java/lang/String;
 lexicographicalComparator
  ()Ljava/util/Comparator<[J>;
  ()Ljava/util/Comparator<[J>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/reflect/ClassPath.eea b/libs/eea-guava/src/main/resources/com/google/common/reflect/ClassPath.eea
index 52645acd73..04f8d6c394 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/reflect/ClassPath.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/reflect/ClassPath.eea
@@ -2,7 +2,7 @@ class com/google/common/reflect/ClassPath
 
 from
  (Ljava/lang/ClassLoader;)Lcom/google/common/reflect/ClassPath;
- (Ljava/lang/ClassLoader;)Lcom/google/common/reflect/ClassPath;
+ (Ljava/lang/ClassLoader;)L1com/google/common/reflect/ClassPath;
 
 getAllClasses
  ()Lcom/google/common/collect/ImmutableSet<Lcom/google/common/reflect/ClassPath$ClassInfo;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/reflect/ImmutableTypeToInstanceMap.eea b/libs/eea-guava/src/main/resources/com/google/common/reflect/ImmutableTypeToInstanceMap.eea
index 5f13904be7..996420a0b6 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/reflect/ImmutableTypeToInstanceMap.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/reflect/ImmutableTypeToInstanceMap.eea
@@ -11,10 +11,10 @@ super com/google/common/reflect/TypeToInstanceMap
 
 builder
  <B:Ljava/lang/Object;>()Lcom/google/common/reflect/ImmutableTypeToInstanceMap$Builder<TB;>;
- <B:Ljava/lang/Object;>()Lcom/google/common/reflect/ImmutableTypeToInstanceMap$Builder<TB;>;
+ <B:Ljava/lang/Object;>()L1com/google/common/reflect/ImmutableTypeToInstanceMap$Builder<TB;>;
 of
  <B:Ljava/lang/Object;>()Lcom/google/common/reflect/ImmutableTypeToInstanceMap<TB;>;
- <B:Ljava/lang/Object;>()Lcom/google/common/reflect/ImmutableTypeToInstanceMap<TB;>;
+ <B:Ljava/lang/Object;>()L1com/google/common/reflect/ImmutableTypeToInstanceMap<TB;>;
 
 delegate
  ()Ljava/util/Map<Lcom/google/common/reflect/TypeToken<+TB;>;TB;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/reflect/Invokable.eea b/libs/eea-guava/src/main/resources/com/google/common/reflect/Invokable.eea
index 4b4d5ebef1..3126cc31ef 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/reflect/Invokable.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/reflect/Invokable.eea
@@ -4,10 +4,10 @@ class com/google/common/reflect/Invokable
 
 from
  (Ljava/lang/reflect/Method;)Lcom/google/common/reflect/Invokable<*Ljava/lang/Object;>;
- (Ljava/lang/reflect/Method;)Lcom/google/common/reflect/Invokable<*Ljava/lang/Object;>;
+ (Ljava/lang/reflect/Method;)L1com/google/common/reflect/Invokable<*Ljava/lang/Object;>;
 from
  <T:Ljava/lang/Object;>(Ljava/lang/reflect/Constructor<TT;>;)Lcom/google/common/reflect/Invokable<TT;TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/reflect/Constructor<TT;>;)Lcom/google/common/reflect/Invokable<TT;TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/reflect/Constructor<TT;>;)L1com/google/common/reflect/Invokable<TT;TT;>;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-guava/src/main/resources/com/google/common/reflect/TypeToken$TypeSet.eea b/libs/eea-guava/src/main/resources/com/google/common/reflect/TypeToken$TypeSet.eea
index bddae04797..3a85e849d7 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/reflect/TypeToken$TypeSet.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/reflect/TypeToken$TypeSet.eea
@@ -6,13 +6,13 @@ super com/google/common/collect/ForwardingSet
 
 classes
  ()Lcom/google/common/reflect/TypeToken<TT;>.TypeSet;
- ()Lcom/google/common/reflect/TypeToken<TT;>.TypeSet;
+ ()L1com/google/common/reflect/TypeToken<TT;>.TypeSet;
 delegate
  ()Ljava/util/Set<Lcom/google/common/reflect/TypeToken<-TT;>;>;
  ()Ljava/util/Set<Lcom/google/common/reflect/TypeToken<-TT;>;>;
 interfaces
  ()Lcom/google/common/reflect/TypeToken<TT;>.TypeSet;
- ()Lcom/google/common/reflect/TypeToken<TT;>.TypeSet;
+ ()L1com/google/common/reflect/TypeToken<TT;>.TypeSet;
 rawTypes
  ()Ljava/util/Set<Ljava/lang/Class<-TT;>;>;
  ()Ljava/util/Set<Ljava/lang/Class<-TT;>;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/reflect/TypeToken.eea b/libs/eea-guava/src/main/resources/com/google/common/reflect/TypeToken.eea
index 60cfce9438..833ed80ec4 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/reflect/TypeToken.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/reflect/TypeToken.eea
@@ -8,17 +8,17 @@ super com/google/common/reflect/TypeCapture
 
 of
  (Ljava/lang/reflect/Type;)Lcom/google/common/reflect/TypeToken<*>;
- (Ljava/lang/reflect/Type;)Lcom/google/common/reflect/TypeToken<*>;
+ (Ljava/lang/reflect/Type;)L1com/google/common/reflect/TypeToken<*>;
 of
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lcom/google/common/reflect/TypeToken<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lcom/google/common/reflect/TypeToken<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1com/google/common/reflect/TypeToken<TT;>;
 
 <init>
  (Ljava/lang/Class<*>;)V
  (Ljava/lang/Class<*>;)V
 constructor
  (Ljava/lang/reflect/Constructor<*>;)Lcom/google/common/reflect/Invokable<TT;TT;>;
- (Ljava/lang/reflect/Constructor<*>;)Lcom/google/common/reflect/Invokable<TT;TT;>;
+ (Ljava/lang/reflect/Constructor<*>;)L1com/google/common/reflect/Invokable<TT;TT;>;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -39,7 +39,7 @@ getType
  ()Ljava/lang/reflect/Type;
 getTypes
  ()Lcom/google/common/reflect/TypeToken<TT;>.TypeSet;
- ()Lcom/google/common/reflect/TypeToken<TT;>.TypeSet;
+ ()L1com/google/common/reflect/TypeToken<TT;>.TypeSet;
 isSubtypeOf
  (Lcom/google/common/reflect/TypeToken<*>;)Z
  (Lcom/google/common/reflect/TypeToken<*>;)Z
@@ -54,7 +54,7 @@ isSupertypeOf
  (Ljava/lang/reflect/Type;)Z
 method
  (Ljava/lang/reflect/Method;)Lcom/google/common/reflect/Invokable<TT;Ljava/lang/Object;>;
- (Ljava/lang/reflect/Method;)Lcom/google/common/reflect/Invokable<TT;Ljava/lang/Object;>;
+ (Ljava/lang/reflect/Method;)L1com/google/common/reflect/Invokable<TT;Ljava/lang/Object;>;
 resolveType
  (Ljava/lang/reflect/Type;)Lcom/google/common/reflect/TypeToken<*>;
  (Ljava/lang/reflect/Type;)Lcom/google/common/reflect/TypeToken<*>;
@@ -66,7 +66,7 @@ unwrap
  ()Lcom/google/common/reflect/TypeToken<TT;>;
 where
  <X:Ljava/lang/Object;>(Lcom/google/common/reflect/TypeParameter<TX;>;Lcom/google/common/reflect/TypeToken<TX;>;)Lcom/google/common/reflect/TypeToken<TT;>;
- <X:Ljava/lang/Object;>(Lcom/google/common/reflect/TypeParameter<TX;>;Lcom/google/common/reflect/TypeToken<TX;>;)Lcom/google/common/reflect/TypeToken<TT;>;
+ <X:Ljava/lang/Object;>(Lcom/google/common/reflect/TypeParameter<TX;>;Lcom/google/common/reflect/TypeToken<TX;>;)L1com/google/common/reflect/TypeToken<TT;>;
 where
  <X:Ljava/lang/Object;>(Lcom/google/common/reflect/TypeParameter<TX;>;Ljava/lang/Class<TX;>;)Lcom/google/common/reflect/TypeToken<TT;>;
  <X:Ljava/lang/Object;>(Lcom/google/common/reflect/TypeParameter<TX;>;Ljava/lang/Class<TX;>;)Lcom/google/common/reflect/TypeToken<TT;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/AbstractScheduledService$Scheduler.eea b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/AbstractScheduledService$Scheduler.eea
index 0316a26a85..ae070ea438 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/AbstractScheduledService$Scheduler.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/AbstractScheduledService$Scheduler.eea
@@ -2,13 +2,13 @@ class com/google/common/util/concurrent/AbstractScheduledService$Scheduler
 
 newFixedDelaySchedule
  (JJLjava/util/concurrent/TimeUnit;)Lcom/google/common/util/concurrent/AbstractScheduledService$Scheduler;
- (JJLjava/util/concurrent/TimeUnit;)Lcom/google/common/util/concurrent/AbstractScheduledService$Scheduler;
+ (JJLjava/util/concurrent/TimeUnit;)L1com/google/common/util/concurrent/AbstractScheduledService$Scheduler;
 newFixedDelaySchedule
  (Ljava/time/Duration;Ljava/time/Duration;)Lcom/google/common/util/concurrent/AbstractScheduledService$Scheduler;
  (Ljava/time/Duration;Ljava/time/Duration;)Lcom/google/common/util/concurrent/AbstractScheduledService$Scheduler;
 newFixedRateSchedule
  (JJLjava/util/concurrent/TimeUnit;)Lcom/google/common/util/concurrent/AbstractScheduledService$Scheduler;
- (JJLjava/util/concurrent/TimeUnit;)Lcom/google/common/util/concurrent/AbstractScheduledService$Scheduler;
+ (JJLjava/util/concurrent/TimeUnit;)L1com/google/common/util/concurrent/AbstractScheduledService$Scheduler;
 newFixedRateSchedule
  (Ljava/time/Duration;Ljava/time/Duration;)Lcom/google/common/util/concurrent/AbstractScheduledService$Scheduler;
  (Ljava/time/Duration;Ljava/time/Duration;)Lcom/google/common/util/concurrent/AbstractScheduledService$Scheduler;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/AtomicLongMap.eea b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/AtomicLongMap.eea
index e7dec465e0..1d27ab083e 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/AtomicLongMap.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/AtomicLongMap.eea
@@ -4,10 +4,10 @@ class com/google/common/util/concurrent/AtomicLongMap
 
 create
  <K:Ljava/lang/Object;>()Lcom/google/common/util/concurrent/AtomicLongMap<TK;>;
- <K:Ljava/lang/Object;>()Lcom/google/common/util/concurrent/AtomicLongMap<TK;>;
+ <K:Ljava/lang/Object;>()L1com/google/common/util/concurrent/AtomicLongMap<TK;>;
 create
  <K:Ljava/lang/Object;>(Ljava/util/Map<+TK;+Ljava/lang/Long;>;)Lcom/google/common/util/concurrent/AtomicLongMap<TK;>;
- <K:Ljava/lang/Object;>(Ljava/util/Map<+TK;+Ljava/lang/Long;>;)Lcom/google/common/util/concurrent/AtomicLongMap<TK;>;
+ <K:Ljava/lang/Object;>(Ljava/util/Map<+TK;+Ljava/lang/Long;>;)L1com/google/common/util/concurrent/AtomicLongMap<TK;>;
 
 accumulateAndGet
  (TK;JLjava/util/function/LongBinaryOperator;)J
diff --git a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/Atomics.eea b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/Atomics.eea
index ed74c235c4..37c5261f5a 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/Atomics.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/Atomics.eea
@@ -2,13 +2,13 @@ class com/google/common/util/concurrent/Atomics
 
 newReference
  <V:Ljava/lang/Object;>()Ljava/util/concurrent/atomic/AtomicReference<TV;>;
- <V:Ljava/lang/Object;>()Ljava/util/concurrent/atomic/AtomicReference<TV;>;
+ <V:Ljava/lang/Object;>()L1java/util/concurrent/atomic/AtomicReference<TV;>;
 newReference
  <V:Ljava/lang/Object;>(TV;)Ljava/util/concurrent/atomic/AtomicReference<TV;>;
- <V:Ljava/lang/Object;>(TV;)Ljava/util/concurrent/atomic/AtomicReference<TV;>;
+ <V:Ljava/lang/Object;>(TV;)L1java/util/concurrent/atomic/AtomicReference<TV;>;
 newReferenceArray
  <E:Ljava/lang/Object;>(I)Ljava/util/concurrent/atomic/AtomicReferenceArray<TE;>;
- <E:Ljava/lang/Object;>(I)Ljava/util/concurrent/atomic/AtomicReferenceArray<TE;>;
+ <E:Ljava/lang/Object;>(I)L1java/util/concurrent/atomic/AtomicReferenceArray<TE;>;
 newReferenceArray
  <E:Ljava/lang/Object;>([TE;)Ljava/util/concurrent/atomic/AtomicReferenceArray<TE;>;
- <E:Ljava/lang/Object;>([TE;)Ljava/util/concurrent/atomic/AtomicReferenceArray<TE;>;
+ <E:Ljava/lang/Object;>([TE;)L1java/util/concurrent/atomic/AtomicReferenceArray<TE;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/ClosingFuture$Combiner.eea b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/ClosingFuture$Combiner.eea
index ec12efe6d6..1e45d15e2e 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/ClosingFuture$Combiner.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/ClosingFuture$Combiner.eea
@@ -6,7 +6,7 @@ inputs
 
 call
  <V:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ClosingFuture$Combiner$CombiningCallable<TV;>;Ljava/util/concurrent/Executor;)Lcom/google/common/util/concurrent/ClosingFuture<TV;>;
- <V:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ClosingFuture$Combiner$CombiningCallable<TV;>;Ljava/util/concurrent/Executor;)Lcom/google/common/util/concurrent/ClosingFuture<TV;>;
+ <V:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ClosingFuture$Combiner$CombiningCallable<TV;>;Ljava/util/concurrent/Executor;)L1com/google/common/util/concurrent/ClosingFuture<TV;>;
 callAsync
  <V:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ClosingFuture$Combiner$AsyncCombiningCallable<TV;>;Ljava/util/concurrent/Executor;)Lcom/google/common/util/concurrent/ClosingFuture<TV;>;
- <V:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ClosingFuture$Combiner$AsyncCombiningCallable<TV;>;Ljava/util/concurrent/Executor;)Lcom/google/common/util/concurrent/ClosingFuture<TV;>;
+ <V:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ClosingFuture$Combiner$AsyncCombiningCallable<TV;>;Ljava/util/concurrent/Executor;)L1com/google/common/util/concurrent/ClosingFuture<TV;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/ClosingFuture.eea b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/ClosingFuture.eea
index 314aa4f0de..34a082cd09 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/ClosingFuture.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/ClosingFuture.eea
@@ -4,16 +4,16 @@ class com/google/common/util/concurrent/ClosingFuture
 
 eventuallyClosing
  <C:Ljava/lang/Object;:Ljava/lang/AutoCloseable;>(Lcom/google/common/util/concurrent/ListenableFuture<TC;>;Ljava/util/concurrent/Executor;)Lcom/google/common/util/concurrent/ClosingFuture<TC;>;
- <C:Ljava/lang/Object;:Ljava/lang/AutoCloseable;>(Lcom/google/common/util/concurrent/ListenableFuture<TC;>;Ljava/util/concurrent/Executor;)Lcom/google/common/util/concurrent/ClosingFuture<TC;>;
+ <C:Ljava/lang/Object;:Ljava/lang/AutoCloseable;>(Lcom/google/common/util/concurrent/ListenableFuture<TC;>;Ljava/util/concurrent/Executor;)L1com/google/common/util/concurrent/ClosingFuture<TC;>;
 from
  <V:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ListenableFuture<TV;>;)Lcom/google/common/util/concurrent/ClosingFuture<TV;>;
- <V:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ListenableFuture<TV;>;)Lcom/google/common/util/concurrent/ClosingFuture<TV;>;
+ <V:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ListenableFuture<TV;>;)L1com/google/common/util/concurrent/ClosingFuture<TV;>;
 submit
  <V:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ClosingFuture$ClosingCallable<TV;>;Ljava/util/concurrent/Executor;)Lcom/google/common/util/concurrent/ClosingFuture<TV;>;
- <V:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ClosingFuture$ClosingCallable<TV;>;Ljava/util/concurrent/Executor;)Lcom/google/common/util/concurrent/ClosingFuture<TV;>;
+ <V:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ClosingFuture$ClosingCallable<TV;>;Ljava/util/concurrent/Executor;)L1com/google/common/util/concurrent/ClosingFuture<TV;>;
 submitAsync
  <V:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ClosingFuture$AsyncClosingCallable<TV;>;Ljava/util/concurrent/Executor;)Lcom/google/common/util/concurrent/ClosingFuture<TV;>;
- <V:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ClosingFuture$AsyncClosingCallable<TV;>;Ljava/util/concurrent/Executor;)Lcom/google/common/util/concurrent/ClosingFuture<TV;>;
+ <V:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ClosingFuture$AsyncClosingCallable<TV;>;Ljava/util/concurrent/Executor;)L1com/google/common/util/concurrent/ClosingFuture<TV;>;
 whenAllComplete
  (Lcom/google/common/util/concurrent/ClosingFuture<*>;[Lcom/google/common/util/concurrent/ClosingFuture<*>;)Lcom/google/common/util/concurrent/ClosingFuture$Combiner;
  (Lcom/google/common/util/concurrent/ClosingFuture<*>;[Lcom/google/common/util/concurrent/ClosingFuture<*>;)Lcom/google/common/util/concurrent/ClosingFuture$Combiner;
@@ -28,19 +28,19 @@ whenAllSucceed
  (Ljava/lang/Iterable<+Lcom/google/common/util/concurrent/ClosingFuture<*>;>;)Lcom/google/common/util/concurrent/ClosingFuture$Combiner;
 whenAllSucceed
  <V1:Ljava/lang/Object;V2:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ClosingFuture<TV1;>;Lcom/google/common/util/concurrent/ClosingFuture<TV2;>;)Lcom/google/common/util/concurrent/ClosingFuture$Combiner2<TV1;TV2;>;
- <V1:Ljava/lang/Object;V2:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ClosingFuture<TV1;>;Lcom/google/common/util/concurrent/ClosingFuture<TV2;>;)Lcom/google/common/util/concurrent/ClosingFuture$Combiner2<TV1;TV2;>;
+ <V1:Ljava/lang/Object;V2:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ClosingFuture<TV1;>;Lcom/google/common/util/concurrent/ClosingFuture<TV2;>;)L1com/google/common/util/concurrent/ClosingFuture$Combiner2<TV1;TV2;>;
 whenAllSucceed
  <V1:Ljava/lang/Object;V2:Ljava/lang/Object;V3:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ClosingFuture<TV1;>;Lcom/google/common/util/concurrent/ClosingFuture<TV2;>;Lcom/google/common/util/concurrent/ClosingFuture<TV3;>;)Lcom/google/common/util/concurrent/ClosingFuture$Combiner3<TV1;TV2;TV3;>;
- <V1:Ljava/lang/Object;V2:Ljava/lang/Object;V3:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ClosingFuture<TV1;>;Lcom/google/common/util/concurrent/ClosingFuture<TV2;>;Lcom/google/common/util/concurrent/ClosingFuture<TV3;>;)Lcom/google/common/util/concurrent/ClosingFuture$Combiner3<TV1;TV2;TV3;>;
+ <V1:Ljava/lang/Object;V2:Ljava/lang/Object;V3:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ClosingFuture<TV1;>;Lcom/google/common/util/concurrent/ClosingFuture<TV2;>;Lcom/google/common/util/concurrent/ClosingFuture<TV3;>;)L1com/google/common/util/concurrent/ClosingFuture$Combiner3<TV1;TV2;TV3;>;
 whenAllSucceed
  <V1:Ljava/lang/Object;V2:Ljava/lang/Object;V3:Ljava/lang/Object;V4:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ClosingFuture<TV1;>;Lcom/google/common/util/concurrent/ClosingFuture<TV2;>;Lcom/google/common/util/concurrent/ClosingFuture<TV3;>;Lcom/google/common/util/concurrent/ClosingFuture<TV4;>;)Lcom/google/common/util/concurrent/ClosingFuture$Combiner4<TV1;TV2;TV3;TV4;>;
- <V1:Ljava/lang/Object;V2:Ljava/lang/Object;V3:Ljava/lang/Object;V4:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ClosingFuture<TV1;>;Lcom/google/common/util/concurrent/ClosingFuture<TV2;>;Lcom/google/common/util/concurrent/ClosingFuture<TV3;>;Lcom/google/common/util/concurrent/ClosingFuture<TV4;>;)Lcom/google/common/util/concurrent/ClosingFuture$Combiner4<TV1;TV2;TV3;TV4;>;
+ <V1:Ljava/lang/Object;V2:Ljava/lang/Object;V3:Ljava/lang/Object;V4:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ClosingFuture<TV1;>;Lcom/google/common/util/concurrent/ClosingFuture<TV2;>;Lcom/google/common/util/concurrent/ClosingFuture<TV3;>;Lcom/google/common/util/concurrent/ClosingFuture<TV4;>;)L1com/google/common/util/concurrent/ClosingFuture$Combiner4<TV1;TV2;TV3;TV4;>;
 whenAllSucceed
  <V1:Ljava/lang/Object;V2:Ljava/lang/Object;V3:Ljava/lang/Object;V4:Ljava/lang/Object;V5:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ClosingFuture<TV1;>;Lcom/google/common/util/concurrent/ClosingFuture<TV2;>;Lcom/google/common/util/concurrent/ClosingFuture<TV3;>;Lcom/google/common/util/concurrent/ClosingFuture<TV4;>;Lcom/google/common/util/concurrent/ClosingFuture<TV5;>;)Lcom/google/common/util/concurrent/ClosingFuture$Combiner5<TV1;TV2;TV3;TV4;TV5;>;
- <V1:Ljava/lang/Object;V2:Ljava/lang/Object;V3:Ljava/lang/Object;V4:Ljava/lang/Object;V5:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ClosingFuture<TV1;>;Lcom/google/common/util/concurrent/ClosingFuture<TV2;>;Lcom/google/common/util/concurrent/ClosingFuture<TV3;>;Lcom/google/common/util/concurrent/ClosingFuture<TV4;>;Lcom/google/common/util/concurrent/ClosingFuture<TV5;>;)Lcom/google/common/util/concurrent/ClosingFuture$Combiner5<TV1;TV2;TV3;TV4;TV5;>;
+ <V1:Ljava/lang/Object;V2:Ljava/lang/Object;V3:Ljava/lang/Object;V4:Ljava/lang/Object;V5:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ClosingFuture<TV1;>;Lcom/google/common/util/concurrent/ClosingFuture<TV2;>;Lcom/google/common/util/concurrent/ClosingFuture<TV3;>;Lcom/google/common/util/concurrent/ClosingFuture<TV4;>;Lcom/google/common/util/concurrent/ClosingFuture<TV5;>;)L1com/google/common/util/concurrent/ClosingFuture$Combiner5<TV1;TV2;TV3;TV4;TV5;>;
 withoutCloser
  <V:Ljava/lang/Object;U:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/AsyncFunction<TV;TU;>;)Lcom/google/common/util/concurrent/ClosingFuture$AsyncClosingFunction<TV;TU;>;
- <V:Ljava/lang/Object;U:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/AsyncFunction<TV;TU;>;)Lcom/google/common/util/concurrent/ClosingFuture$AsyncClosingFunction<TV;TU;>;
+ <V:Ljava/lang/Object;U:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/AsyncFunction<TV;TU;>;)L1com/google/common/util/concurrent/ClosingFuture$AsyncClosingFunction<TV;TU;>;
 
 catching
  <X:Ljava/lang/Throwable;>(Ljava/lang/Class<TX;>;Lcom/google/common/util/concurrent/ClosingFuture$ClosingFunction<-TX;+TV;>;Ljava/util/concurrent/Executor;)Lcom/google/common/util/concurrent/ClosingFuture<TV;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/CycleDetectingLockFactory$WithExplicitOrdering.eea b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/CycleDetectingLockFactory$WithExplicitOrdering.eea
index 730f7f293a..494e0bfe8a 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/CycleDetectingLockFactory$WithExplicitOrdering.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/CycleDetectingLockFactory$WithExplicitOrdering.eea
@@ -7,10 +7,10 @@ newReentrantLock
  (TE;)Ljava/util/concurrent/locks/ReentrantLock;
 newReentrantLock
  (TE;Z)Ljava/util/concurrent/locks/ReentrantLock;
- (TE;Z)Ljava/util/concurrent/locks/ReentrantLock;
+ (TE;Z)L1java/util/concurrent/locks/ReentrantLock;
 newReentrantReadWriteLock
  (TE;)Ljava/util/concurrent/locks/ReentrantReadWriteLock;
  (TE;)Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 newReentrantReadWriteLock
  (TE;Z)Ljava/util/concurrent/locks/ReentrantReadWriteLock;
- (TE;Z)Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+ (TE;Z)L1java/util/concurrent/locks/ReentrantReadWriteLock;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/CycleDetectingLockFactory.eea b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/CycleDetectingLockFactory.eea
index 5681990df0..27f6565069 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/CycleDetectingLockFactory.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/CycleDetectingLockFactory.eea
@@ -2,20 +2,20 @@ class com/google/common/util/concurrent/CycleDetectingLockFactory
 
 newInstance
  (Lcom/google/common/util/concurrent/CycleDetectingLockFactory$Policy;)Lcom/google/common/util/concurrent/CycleDetectingLockFactory;
- (Lcom/google/common/util/concurrent/CycleDetectingLockFactory$Policy;)Lcom/google/common/util/concurrent/CycleDetectingLockFactory;
+ (Lcom/google/common/util/concurrent/CycleDetectingLockFactory$Policy;)L1com/google/common/util/concurrent/CycleDetectingLockFactory;
 newInstanceWithExplicitOrdering
  <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Class<TE;>;Lcom/google/common/util/concurrent/CycleDetectingLockFactory$Policy;)Lcom/google/common/util/concurrent/CycleDetectingLockFactory$WithExplicitOrdering<TE;>;
- <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Class<TE;>;Lcom/google/common/util/concurrent/CycleDetectingLockFactory$Policy;)Lcom/google/common/util/concurrent/CycleDetectingLockFactory$WithExplicitOrdering<TE;>;
+ <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/Class<TE;>;Lcom/google/common/util/concurrent/CycleDetectingLockFactory$Policy;)L1com/google/common/util/concurrent/CycleDetectingLockFactory$WithExplicitOrdering<TE;>;
 
 newReentrantLock
  (Ljava/lang/String;)Ljava/util/concurrent/locks/ReentrantLock;
  (Ljava/lang/String;)Ljava/util/concurrent/locks/ReentrantLock;
 newReentrantLock
  (Ljava/lang/String;Z)Ljava/util/concurrent/locks/ReentrantLock;
- (Ljava/lang/String;Z)Ljava/util/concurrent/locks/ReentrantLock;
+ (Ljava/lang/String;Z)L1java/util/concurrent/locks/ReentrantLock;
 newReentrantReadWriteLock
  (Ljava/lang/String;)Ljava/util/concurrent/locks/ReentrantReadWriteLock;
  (Ljava/lang/String;)Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 newReentrantReadWriteLock
  (Ljava/lang/String;Z)Ljava/util/concurrent/locks/ReentrantReadWriteLock;
- (Ljava/lang/String;Z)Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+ (Ljava/lang/String;Z)L1java/util/concurrent/locks/ReentrantReadWriteLock;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/ExecutionSequencer.eea b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/ExecutionSequencer.eea
index e04e193507..d8785a6572 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/ExecutionSequencer.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/ExecutionSequencer.eea
@@ -2,7 +2,7 @@ class com/google/common/util/concurrent/ExecutionSequencer
 
 create
  ()Lcom/google/common/util/concurrent/ExecutionSequencer;
- ()Lcom/google/common/util/concurrent/ExecutionSequencer;
+ ()L1com/google/common/util/concurrent/ExecutionSequencer;
 
 submit
  <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;Ljava/util/concurrent/Executor;)Lcom/google/common/util/concurrent/ListenableFuture<TT;>;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/FluentFuture.eea b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/FluentFuture.eea
index c4ec314c18..f7de1a9f72 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/FluentFuture.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/FluentFuture.eea
@@ -11,7 +11,7 @@ from
  <V:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/FluentFuture<TV;>;)Lcom/google/common/util/concurrent/FluentFuture<TV;>;
 from
  <V:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ListenableFuture<TV;>;)Lcom/google/common/util/concurrent/FluentFuture<TV;>;
- <V:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ListenableFuture<TV;>;)Lcom/google/common/util/concurrent/FluentFuture<TV;>;
+ <V:Ljava/lang/Object;>(Lcom/google/common/util/concurrent/ListenableFuture<TV;>;)L1com/google/common/util/concurrent/FluentFuture<TV;>;
 
 addCallback
  (Lcom/google/common/util/concurrent/FutureCallback<-TV;>;Ljava/util/concurrent/Executor;)V
diff --git a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/ListenableFutureTask.eea b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/ListenableFutureTask.eea
index c66402ab67..94b19e2be0 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/ListenableFutureTask.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/ListenableFutureTask.eea
@@ -11,10 +11,10 @@ super com/google/common/util/concurrent/ListenableFuture
 
 create
  <V:Ljava/lang/Object;>(Ljava/lang/Runnable;TV;)Lcom/google/common/util/concurrent/ListenableFutureTask<TV;>;
- <V:Ljava/lang/Object;>(Ljava/lang/Runnable;TV;)Lcom/google/common/util/concurrent/ListenableFutureTask<TV;>;
+ <V:Ljava/lang/Object;>(Ljava/lang/Runnable;TV;)L1com/google/common/util/concurrent/ListenableFutureTask<TV;>;
 create
  <V:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TV;>;)Lcom/google/common/util/concurrent/ListenableFutureTask<TV;>;
- <V:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TV;>;)Lcom/google/common/util/concurrent/ListenableFutureTask<TV;>;
+ <V:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TV;>;)L1com/google/common/util/concurrent/ListenableFutureTask<TV;>;
 
 addListener
  (Ljava/lang/Runnable;Ljava/util/concurrent/Executor;)V
diff --git a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/Monitor.eea b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/Monitor.eea
index c47baa193e..ddf13d62ed 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/Monitor.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/Monitor.eea
@@ -59,7 +59,7 @@ hasWaiters
  (Lcom/google/common/util/concurrent/Monitor$Guard;)Z
 newGuard
  (Ljava/util/function/BooleanSupplier;)Lcom/google/common/util/concurrent/Monitor$Guard;
- (Ljava/util/function/BooleanSupplier;)Lcom/google/common/util/concurrent/Monitor$Guard;
+ (Ljava/util/function/BooleanSupplier;)L1com/google/common/util/concurrent/Monitor$Guard;
 tryEnterIf
  (Lcom/google/common/util/concurrent/Monitor$Guard;)Z
  (Lcom/google/common/util/concurrent/Monitor$Guard;)Z
diff --git a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/MoreExecutors.eea b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/MoreExecutors.eea
index 796a90c62b..5048ddf7f8 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/MoreExecutors.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/MoreExecutors.eea
@@ -29,16 +29,16 @@ getExitingScheduledExecutorService
  (Ljava/util/concurrent/ScheduledThreadPoolExecutor;Ljava/time/Duration;)Ljava/util/concurrent/ScheduledExecutorService;
 listeningDecorator
  (Ljava/util/concurrent/ExecutorService;)Lcom/google/common/util/concurrent/ListeningExecutorService;
- (Ljava/util/concurrent/ExecutorService;)Lcom/google/common/util/concurrent/ListeningExecutorService;
+ (Ljava/util/concurrent/ExecutorService;)L1com/google/common/util/concurrent/ListeningExecutorService;
 listeningDecorator
  (Ljava/util/concurrent/ScheduledExecutorService;)Lcom/google/common/util/concurrent/ListeningScheduledExecutorService;
- (Ljava/util/concurrent/ScheduledExecutorService;)Lcom/google/common/util/concurrent/ListeningScheduledExecutorService;
+ (Ljava/util/concurrent/ScheduledExecutorService;)L1com/google/common/util/concurrent/ListeningScheduledExecutorService;
 newDirectExecutorService
  ()Lcom/google/common/util/concurrent/ListeningExecutorService;
- ()Lcom/google/common/util/concurrent/ListeningExecutorService;
+ ()L1com/google/common/util/concurrent/ListeningExecutorService;
 newSequentialExecutor
  (Ljava/util/concurrent/Executor;)Ljava/util/concurrent/Executor;
- (Ljava/util/concurrent/Executor;)Ljava/util/concurrent/Executor;
+ (Ljava/util/concurrent/Executor;)L1java/util/concurrent/Executor;
 platformThreadFactory
  ()Ljava/util/concurrent/ThreadFactory;
  ()Ljava/util/concurrent/ThreadFactory;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/RateLimiter.eea b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/RateLimiter.eea
index e37040b400..2c6158a6fe 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/RateLimiter.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/RateLimiter.eea
@@ -2,13 +2,13 @@ class com/google/common/util/concurrent/RateLimiter
 
 create
  (D)Lcom/google/common/util/concurrent/RateLimiter;
- (D)Lcom/google/common/util/concurrent/RateLimiter;
+ (D)L1com/google/common/util/concurrent/RateLimiter;
 create
  (DJLjava/util/concurrent/TimeUnit;)Lcom/google/common/util/concurrent/RateLimiter;
- (DJLjava/util/concurrent/TimeUnit;)Lcom/google/common/util/concurrent/RateLimiter;
+ (DJLjava/util/concurrent/TimeUnit;)L1com/google/common/util/concurrent/RateLimiter;
 create
  (DLjava/time/Duration;)Lcom/google/common/util/concurrent/RateLimiter;
- (DLjava/time/Duration;)Lcom/google/common/util/concurrent/RateLimiter;
+ (DLjava/time/Duration;)L1com/google/common/util/concurrent/RateLimiter;
 
 toString
  ()Ljava/lang/String;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/SimpleTimeLimiter.eea b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/SimpleTimeLimiter.eea
index fe57d0b868..32285312d5 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/SimpleTimeLimiter.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/SimpleTimeLimiter.eea
@@ -2,7 +2,7 @@ class com/google/common/util/concurrent/SimpleTimeLimiter
 
 create
  (Ljava/util/concurrent/ExecutorService;)Lcom/google/common/util/concurrent/SimpleTimeLimiter;
- (Ljava/util/concurrent/ExecutorService;)Lcom/google/common/util/concurrent/SimpleTimeLimiter;
+ (Ljava/util/concurrent/ExecutorService;)L1com/google/common/util/concurrent/SimpleTimeLimiter;
 
 callUninterruptiblyWithTimeout
  <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;JLjava/util/concurrent/TimeUnit;)TT;
diff --git a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/UncaughtExceptionHandlers.eea b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/UncaughtExceptionHandlers.eea
index a00010fd7a..67aa487409 100644
--- a/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/UncaughtExceptionHandlers.eea
+++ b/libs/eea-guava/src/main/resources/com/google/common/util/concurrent/UncaughtExceptionHandlers.eea
@@ -2,4 +2,4 @@ class com/google/common/util/concurrent/UncaughtExceptionHandlers
 
 systemExit
  ()Ljava/lang/Thread$UncaughtExceptionHandler;
- ()Ljava/lang/Thread$UncaughtExceptionHandler;
+ ()L1java/lang/Thread$UncaughtExceptionHandler;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JacksonInject$Value.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JacksonInject$Value.eea
index 652ff24825..041c6d49d8 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JacksonInject$Value.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JacksonInject$Value.eea
@@ -45,7 +45,7 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 valueFor
  ()Ljava/lang/Class<Lcom/fasterxml/jackson/annotation/JacksonInject;>;
- ()Ljava/lang/Class<Lcom/fasterxml/jackson/annotation/JacksonInject;>;
+ ()L1java/lang/Class<Lcom/fasterxml/jackson/annotation/JacksonInject;>;
 withId
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/JacksonInject$Value;
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/JacksonInject$Value;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonAutoDetect$Value.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonAutoDetect$Value.eea
index f3279a5429..9a221f1657 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonAutoDetect$Value.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonAutoDetect$Value.eea
@@ -13,7 +13,7 @@ NO_OVERRIDES
 
 construct
  (Lcom/fasterxml/jackson/annotation/JsonAutoDetect$Visibility;Lcom/fasterxml/jackson/annotation/JsonAutoDetect$Visibility;Lcom/fasterxml/jackson/annotation/JsonAutoDetect$Visibility;Lcom/fasterxml/jackson/annotation/JsonAutoDetect$Visibility;Lcom/fasterxml/jackson/annotation/JsonAutoDetect$Visibility;)Lcom/fasterxml/jackson/annotation/JsonAutoDetect$Value;
- (Lcom/fasterxml/jackson/annotation/JsonAutoDetect$Visibility;Lcom/fasterxml/jackson/annotation/JsonAutoDetect$Visibility;Lcom/fasterxml/jackson/annotation/JsonAutoDetect$Visibility;Lcom/fasterxml/jackson/annotation/JsonAutoDetect$Visibility;Lcom/fasterxml/jackson/annotation/JsonAutoDetect$Visibility;)Lcom/fasterxml/jackson/annotation/JsonAutoDetect$Value;
+ (Lcom/fasterxml/jackson/annotation/JsonAutoDetect$Visibility;Lcom/fasterxml/jackson/annotation/JsonAutoDetect$Visibility;Lcom/fasterxml/jackson/annotation/JsonAutoDetect$Visibility;Lcom/fasterxml/jackson/annotation/JsonAutoDetect$Visibility;Lcom/fasterxml/jackson/annotation/JsonAutoDetect$Visibility;)L1com/fasterxml/jackson/annotation/JsonAutoDetect$Value;
 construct
  (Lcom/fasterxml/jackson/annotation/PropertyAccessor;Lcom/fasterxml/jackson/annotation/JsonAutoDetect$Visibility;)Lcom/fasterxml/jackson/annotation/JsonAutoDetect$Value;
  (Lcom/fasterxml/jackson/annotation/PropertyAccessor;Lcom/fasterxml/jackson/annotation/JsonAutoDetect$Visibility;)Lcom/fasterxml/jackson/annotation/JsonAutoDetect$Value;
@@ -72,7 +72,7 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 valueFor
  ()Ljava/lang/Class<Lcom/fasterxml/jackson/annotation/JsonAutoDetect;>;
- ()Ljava/lang/Class<Lcom/fasterxml/jackson/annotation/JsonAutoDetect;>;
+ ()L1java/lang/Class<Lcom/fasterxml/jackson/annotation/JsonAutoDetect;>;
 withCreatorVisibility
  (Lcom/fasterxml/jackson/annotation/JsonAutoDetect$Visibility;)Lcom/fasterxml/jackson/annotation/JsonAutoDetect$Value;
  (Lcom/fasterxml/jackson/annotation/JsonAutoDetect$Visibility;)Lcom/fasterxml/jackson/annotation/JsonAutoDetect$Value;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonFormat$Features.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonFormat$Features.eea
index 1677bf076e..5f698dfb8d 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonFormat$Features.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonFormat$Features.eea
@@ -5,7 +5,7 @@ construct
  (Lcom/fasterxml/jackson/annotation/JsonFormat;)Lcom/fasterxml/jackson/annotation/JsonFormat$Features;
 construct
  ([Lcom/fasterxml/jackson/annotation/JsonFormat$Feature;[Lcom/fasterxml/jackson/annotation/JsonFormat$Feature;)Lcom/fasterxml/jackson/annotation/JsonFormat$Features;
- ([Lcom/fasterxml/jackson/annotation/JsonFormat$Feature;[Lcom/fasterxml/jackson/annotation/JsonFormat$Feature;)Lcom/fasterxml/jackson/annotation/JsonFormat$Features;
+ ([Lcom/fasterxml/jackson/annotation/JsonFormat$Feature;[Lcom/fasterxml/jackson/annotation/JsonFormat$Feature;)L1com/fasterxml/jackson/annotation/JsonFormat$Features;
 empty
  ()Lcom/fasterxml/jackson/annotation/JsonFormat$Features;
  ()Lcom/fasterxml/jackson/annotation/JsonFormat$Features;
@@ -15,16 +15,16 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 get
  (Lcom/fasterxml/jackson/annotation/JsonFormat$Feature;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/annotation/JsonFormat$Feature;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/annotation/JsonFormat$Feature;)L0java/lang/Boolean;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 with
  ([Lcom/fasterxml/jackson/annotation/JsonFormat$Feature;)Lcom/fasterxml/jackson/annotation/JsonFormat$Features;
- ([Lcom/fasterxml/jackson/annotation/JsonFormat$Feature;)Lcom/fasterxml/jackson/annotation/JsonFormat$Features;
+ ([Lcom/fasterxml/jackson/annotation/JsonFormat$Feature;)L1com/fasterxml/jackson/annotation/JsonFormat$Features;
 withOverrides
  (Lcom/fasterxml/jackson/annotation/JsonFormat$Features;)Lcom/fasterxml/jackson/annotation/JsonFormat$Features;
  (Lcom/fasterxml/jackson/annotation/JsonFormat$Features;)Lcom/fasterxml/jackson/annotation/JsonFormat$Features;
 without
  ([Lcom/fasterxml/jackson/annotation/JsonFormat$Feature;)Lcom/fasterxml/jackson/annotation/JsonFormat$Features;
- ([Lcom/fasterxml/jackson/annotation/JsonFormat$Feature;)Lcom/fasterxml/jackson/annotation/JsonFormat$Features;
+ ([Lcom/fasterxml/jackson/annotation/JsonFormat$Feature;)L1com/fasterxml/jackson/annotation/JsonFormat$Features;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonFormat$Value.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonFormat$Value.eea
index a7d2c4126b..71172b3068 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonFormat$Value.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonFormat$Value.eea
@@ -9,16 +9,16 @@ empty
  ()Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
 forLeniency
  (Z)Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
- (Z)Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
+ (Z)L1com/fasterxml/jackson/annotation/JsonFormat$Value;
 forPattern
  (Ljava/lang/String;)Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
- (Ljava/lang/String;)Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
+ (Ljava/lang/String;)L1com/fasterxml/jackson/annotation/JsonFormat$Value;
 forShape
  (Lcom/fasterxml/jackson/annotation/JsonFormat$Shape;)Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
- (Lcom/fasterxml/jackson/annotation/JsonFormat$Shape;)Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
+ (Lcom/fasterxml/jackson/annotation/JsonFormat$Shape;)L1com/fasterxml/jackson/annotation/JsonFormat$Value;
 from
  (Lcom/fasterxml/jackson/annotation/JsonFormat;)Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
- (Lcom/fasterxml/jackson/annotation/JsonFormat;)Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
+ (Lcom/fasterxml/jackson/annotation/JsonFormat;)L1com/fasterxml/jackson/annotation/JsonFormat$Value;
 merge
  (Lcom/fasterxml/jackson/annotation/JsonFormat$Value;Lcom/fasterxml/jackson/annotation/JsonFormat$Value;)Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
  (Lcom/fasterxml/jackson/annotation/JsonFormat$Value;Lcom/fasterxml/jackson/annotation/JsonFormat$Value;)Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
@@ -70,7 +70,7 @@ getShape
  ()Lcom/fasterxml/jackson/annotation/JsonFormat$Shape;
 getTimeZone
  ()Ljava/util/TimeZone;
- ()Ljava/util/TimeZone;
+ ()L0java/util/TimeZone;
 timeZoneAsString
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -79,7 +79,7 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 valueFor
  ()Ljava/lang/Class<Lcom/fasterxml/jackson/annotation/JsonFormat;>;
- ()Ljava/lang/Class<Lcom/fasterxml/jackson/annotation/JsonFormat;>;
+ ()L1java/lang/Class<Lcom/fasterxml/jackson/annotation/JsonFormat;>;
 withFeature
  (Lcom/fasterxml/jackson/annotation/JsonFormat$Feature;)Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
  (Lcom/fasterxml/jackson/annotation/JsonFormat$Feature;)Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonIgnoreProperties$Value.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonIgnoreProperties$Value.eea
index 649cdd7f90..5b18b9103e 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonIgnoreProperties$Value.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonIgnoreProperties$Value.eea
@@ -60,7 +60,7 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 valueFor
  ()Ljava/lang/Class<Lcom/fasterxml/jackson/annotation/JsonIgnoreProperties;>;
- ()Ljava/lang/Class<Lcom/fasterxml/jackson/annotation/JsonIgnoreProperties;>;
+ ()L1java/lang/Class<Lcom/fasterxml/jackson/annotation/JsonIgnoreProperties;>;
 withAllowGetters
  ()Lcom/fasterxml/jackson/annotation/JsonIgnoreProperties$Value;
  ()Lcom/fasterxml/jackson/annotation/JsonIgnoreProperties$Value;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonInclude$Value.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonInclude$Value.eea
index bb1fb67b85..9364ed6627 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonInclude$Value.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonInclude$Value.eea
@@ -69,7 +69,7 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 valueFor
  ()Ljava/lang/Class<Lcom/fasterxml/jackson/annotation/JsonInclude;>;
- ()Ljava/lang/Class<Lcom/fasterxml/jackson/annotation/JsonInclude;>;
+ ()L1java/lang/Class<Lcom/fasterxml/jackson/annotation/JsonInclude;>;
 withContentFilter
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/JsonInclude$Value;
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/JsonInclude$Value;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonIncludeProperties$Value.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonIncludeProperties$Value.eea
index 00044bf07b..3cf4c74c23 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonIncludeProperties$Value.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonIncludeProperties$Value.eea
@@ -33,7 +33,7 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 valueFor
  ()Ljava/lang/Class<Lcom/fasterxml/jackson/annotation/JsonIncludeProperties;>;
- ()Ljava/lang/Class<Lcom/fasterxml/jackson/annotation/JsonIncludeProperties;>;
+ ()L1java/lang/Class<Lcom/fasterxml/jackson/annotation/JsonIncludeProperties;>;
 withOverrides
  (Lcom/fasterxml/jackson/annotation/JsonIncludeProperties$Value;)Lcom/fasterxml/jackson/annotation/JsonIncludeProperties$Value;
  (Lcom/fasterxml/jackson/annotation/JsonIncludeProperties$Value;)Lcom/fasterxml/jackson/annotation/JsonIncludeProperties$Value;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonSetter$Value.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonSetter$Value.eea
index d9b93faf25..4c703f5780 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonSetter$Value.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonSetter$Value.eea
@@ -56,7 +56,7 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 valueFor
  ()Ljava/lang/Class<Lcom/fasterxml/jackson/annotation/JsonSetter;>;
- ()Ljava/lang/Class<Lcom/fasterxml/jackson/annotation/JsonSetter;>;
+ ()L1java/lang/Class<Lcom/fasterxml/jackson/annotation/JsonSetter;>;
 withContentNulls
  (Lcom/fasterxml/jackson/annotation/Nulls;)Lcom/fasterxml/jackson/annotation/JsonSetter$Value;
  (Lcom/fasterxml/jackson/annotation/Nulls;)Lcom/fasterxml/jackson/annotation/JsonSetter$Value;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonTypeInfo$Value.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonTypeInfo$Value.eea
index f220c638ae..fcd2ed31b4 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonTypeInfo$Value.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/JsonTypeInfo$Value.eea
@@ -10,7 +10,7 @@ EMPTY
 
 construct
  (Lcom/fasterxml/jackson/annotation/JsonTypeInfo$Id;Lcom/fasterxml/jackson/annotation/JsonTypeInfo$As;Ljava/lang/String;Ljava/lang/Class<*>;ZLjava/lang/Boolean;)Lcom/fasterxml/jackson/annotation/JsonTypeInfo$Value;
- (Lcom/fasterxml/jackson/annotation/JsonTypeInfo$Id;Lcom/fasterxml/jackson/annotation/JsonTypeInfo$As;Ljava/lang/String;Ljava/lang/Class<*>;ZLjava/lang/Boolean;)Lcom/fasterxml/jackson/annotation/JsonTypeInfo$Value;
+ (Lcom/fasterxml/jackson/annotation/JsonTypeInfo$Id;Lcom/fasterxml/jackson/annotation/JsonTypeInfo$As;Ljava/lang/String;Ljava/lang/Class<*>;ZLjava/lang/Boolean;)L1com/fasterxml/jackson/annotation/JsonTypeInfo$Value;
 from
  (Lcom/fasterxml/jackson/annotation/JsonTypeInfo;)Lcom/fasterxml/jackson/annotation/JsonTypeInfo$Value;
  (Lcom/fasterxml/jackson/annotation/JsonTypeInfo;)Lcom/fasterxml/jackson/annotation/JsonTypeInfo$Value;
@@ -60,7 +60,7 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 valueFor
  ()Ljava/lang/Class<Lcom/fasterxml/jackson/annotation/JsonTypeInfo;>;
- ()Ljava/lang/Class<Lcom/fasterxml/jackson/annotation/JsonTypeInfo;>;
+ ()L1java/lang/Class<Lcom/fasterxml/jackson/annotation/JsonTypeInfo;>;
 withDefaultImpl
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/JsonTypeInfo$Value;
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/JsonTypeInfo$Value;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/ObjectIdGenerators$IntSequenceGenerator.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/ObjectIdGenerators$IntSequenceGenerator.eea
index 2bd1166489..3d838fdc2d 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/ObjectIdGenerators$IntSequenceGenerator.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/ObjectIdGenerators$IntSequenceGenerator.eea
@@ -9,13 +9,13 @@ super com/fasterxml/jackson/annotation/ObjectIdGenerators$Base
  (Ljava/lang/Class<*>;I)V
 forScope
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<Ljava/lang/Integer;>;
- (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<Ljava/lang/Integer;>;
+ (Ljava/lang/Class<*>;)L1com/fasterxml/jackson/annotation/ObjectIdGenerator<Ljava/lang/Integer;>;
 generateId
  (Ljava/lang/Object;)Ljava/lang/Integer;
  (Ljava/lang/Object;)Ljava/lang/Integer;
 key
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator$IdKey;
- (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator$IdKey;
+ (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator$IdKey; # @PolyNull
 newForSerialization
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<Ljava/lang/Integer;>;
- (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<Ljava/lang/Integer;>;
+ (Ljava/lang/Object;)L1com/fasterxml/jackson/annotation/ObjectIdGenerator<Ljava/lang/Integer;>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/ObjectIdGenerators$StringIdGenerator.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/ObjectIdGenerators$StringIdGenerator.eea
index 3312cda347..15cbe0d5fa 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/ObjectIdGenerators$StringIdGenerator.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/ObjectIdGenerators$StringIdGenerator.eea
@@ -12,10 +12,10 @@ forScope
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<Ljava/lang/String;>;
 generateId
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
 key
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator$IdKey;
- (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator$IdKey;
+ (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator$IdKey; # @PolyNull
 newForSerialization
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<Ljava/lang/String;>;
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<Ljava/lang/String;>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/ObjectIdGenerators$UUIDGenerator.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/ObjectIdGenerators$UUIDGenerator.eea
index efbb14e6ed..218aa10e8b 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/ObjectIdGenerators$UUIDGenerator.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/ObjectIdGenerators$UUIDGenerator.eea
@@ -15,7 +15,7 @@ generateId
  (Ljava/lang/Object;)Ljava/util/UUID;
 key
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator$IdKey;
- (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator$IdKey;
+ (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator$IdKey; # @PolyNull
 newForSerialization
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<Ljava/util/UUID;>;
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<Ljava/util/UUID;>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/OptBoolean.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/OptBoolean.eea
index 7a1690b136..0c17713f1c 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/OptBoolean.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/OptBoolean.eea
@@ -13,4 +13,4 @@ fromBoolean
 
 asBoolean
  ()Ljava/lang/Boolean;
- ()Ljava/lang/Boolean;
+ ()L0java/lang/Boolean;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/SimpleObjectIdResolver.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/SimpleObjectIdResolver.eea
index de90beba9b..c9e4a7f232 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/SimpleObjectIdResolver.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/annotation/SimpleObjectIdResolver.eea
@@ -12,7 +12,7 @@ canUseFor
  (Lcom/fasterxml/jackson/annotation/ObjectIdResolver;)Z
 newForDeserialization
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdResolver;
- (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdResolver;
+ (Ljava/lang/Object;)L1com/fasterxml/jackson/annotation/ObjectIdResolver;
 resolveId
  (Lcom/fasterxml/jackson/annotation/ObjectIdGenerator$IdKey;)Ljava/lang/Object;
  (Lcom/fasterxml/jackson/annotation/ObjectIdGenerator$IdKey;)Ljava/lang/Object;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/Base64Variant.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/Base64Variant.eea
index 9d741f259d..9af3c69dc5 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/Base64Variant.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/Base64Variant.eea
@@ -23,10 +23,10 @@ encode
  ([B)Ljava/lang/String;
 encode
  ([BZ)Ljava/lang/String;
- ([BZ)Ljava/lang/String;
+ ([BZ)L1java/lang/String;
 encode
  ([BZLjava/lang/String;)Ljava/lang/String;
- ([BZLjava/lang/String;)Ljava/lang/String;
+ ([BZLjava/lang/String;)L1java/lang/String;
 encodeBase64Chunk
  (I[BI)I
  (I[BI)I
@@ -77,7 +77,7 @@ withPaddingRequired
  ()Lcom/fasterxml/jackson/core/Base64Variant;
 withReadPadding
  (Lcom/fasterxml/jackson/core/Base64Variant$PaddingReadBehaviour;)Lcom/fasterxml/jackson/core/Base64Variant;
- (Lcom/fasterxml/jackson/core/Base64Variant$PaddingReadBehaviour;)Lcom/fasterxml/jackson/core/Base64Variant;
+ (Lcom/fasterxml/jackson/core/Base64Variant$PaddingReadBehaviour;)L1com/fasterxml/jackson/core/Base64Variant;
 withWritePadding
  (Z)Lcom/fasterxml/jackson/core/Base64Variant;
  (Z)Lcom/fasterxml/jackson/core/Base64Variant;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/ErrorReportConfiguration.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/ErrorReportConfiguration.eea
index 60b285c510..71fa3434b6 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/ErrorReportConfiguration.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/ErrorReportConfiguration.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/core/ErrorReportConfiguration
 
 builder
  ()Lcom/fasterxml/jackson/core/ErrorReportConfiguration$Builder;
- ()Lcom/fasterxml/jackson/core/ErrorReportConfiguration$Builder;
+ ()L1com/fasterxml/jackson/core/ErrorReportConfiguration$Builder;
 defaults
  ()Lcom/fasterxml/jackson/core/ErrorReportConfiguration;
  ()Lcom/fasterxml/jackson/core/ErrorReportConfiguration;
@@ -12,4 +12,4 @@ overrideDefaultErrorReportConfiguration
 
 rebuild
  ()Lcom/fasterxml/jackson/core/ErrorReportConfiguration$Builder;
- ()Lcom/fasterxml/jackson/core/ErrorReportConfiguration$Builder;
+ ()L1com/fasterxml/jackson/core/ErrorReportConfiguration$Builder;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonFactory.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonFactory.eea
index ced690ed95..5c95ca1b22 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonFactory.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonFactory.eea
@@ -9,7 +9,7 @@ FORMAT_NAME_JSON
 
 _copy
  <T:Ljava/lang/Object;>(Ljava/util/List<TT;>;)Ljava/util/List<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/List<TT;>;)Ljava/util/List<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/List<TT;>;)Ljava/util/List<TT;>; # @PolyNull
 builder
  ()Lcom/fasterxml/jackson/core/TSFBuilder<**>;
  ()L1com/fasterxml/jackson/core/TSFBuilder<**>;
@@ -104,7 +104,7 @@ _createUTF8Generator
  (Ljava/io/OutputStream;Lcom/fasterxml/jackson/core/io/IOContext;)Lcom/fasterxml/jackson/core/JsonGenerator;
 _createWriter
  (Ljava/io/OutputStream;Lcom/fasterxml/jackson/core/JsonEncoding;Lcom/fasterxml/jackson/core/io/IOContext;)Ljava/io/Writer;
- (Ljava/io/OutputStream;Lcom/fasterxml/jackson/core/JsonEncoding;Lcom/fasterxml/jackson/core/io/IOContext;)Ljava/io/Writer;
+ (Ljava/io/OutputStream;Lcom/fasterxml/jackson/core/JsonEncoding;Lcom/fasterxml/jackson/core/io/IOContext;)L1java/io/Writer;
 _decorate
  (Lcom/fasterxml/jackson/core/JsonGenerator;)Lcom/fasterxml/jackson/core/JsonGenerator;
  (Lcom/fasterxml/jackson/core/JsonGenerator;)Lcom/fasterxml/jackson/core/JsonGenerator;
@@ -146,22 +146,22 @@ copy
  ()L1com/fasterxml/jackson/core/JsonFactory;
 createGenerator
  (Ljava/io/DataOutput;)Lcom/fasterxml/jackson/core/JsonGenerator;
- (L1java/io/DataOutput;)L1com/fasterxml/jackson/core/JsonGenerator;
+ (L1java/io/DataOutput;)L1com/fasterxml/jackson/core/JsonGenerator; # @Overrides(com.fasterxml.jackson.core.TokenStreamFactory)
 createGenerator
  (Ljava/io/DataOutput;Lcom/fasterxml/jackson/core/JsonEncoding;)Lcom/fasterxml/jackson/core/JsonGenerator;
- (L1java/io/DataOutput;L1com/fasterxml/jackson/core/JsonEncoding;)L1com/fasterxml/jackson/core/JsonGenerator;
+ (L1java/io/DataOutput;L1com/fasterxml/jackson/core/JsonEncoding;)L1com/fasterxml/jackson/core/JsonGenerator; # @Overrides(com.fasterxml.jackson.core.TokenStreamFactory)
 createGenerator
  (Ljava/io/File;Lcom/fasterxml/jackson/core/JsonEncoding;)Lcom/fasterxml/jackson/core/JsonGenerator;
- (L1java/io/File;L1com/fasterxml/jackson/core/JsonEncoding;)L1com/fasterxml/jackson/core/JsonGenerator;
+ (L1java/io/File;L1com/fasterxml/jackson/core/JsonEncoding;)L1com/fasterxml/jackson/core/JsonGenerator; # @Overrides(com.fasterxml.jackson.core.TokenStreamFactory)
 createGenerator
  (Ljava/io/OutputStream;)Lcom/fasterxml/jackson/core/JsonGenerator;
- (L1java/io/OutputStream;)L1com/fasterxml/jackson/core/JsonGenerator;
+ (L1java/io/OutputStream;)L1com/fasterxml/jackson/core/JsonGenerator; # @Overrides(com.fasterxml.jackson.core.TokenStreamFactory)
 createGenerator
  (Ljava/io/OutputStream;Lcom/fasterxml/jackson/core/JsonEncoding;)Lcom/fasterxml/jackson/core/JsonGenerator;
- (L1java/io/OutputStream;L1com/fasterxml/jackson/core/JsonEncoding;)L1com/fasterxml/jackson/core/JsonGenerator;
+ (L1java/io/OutputStream;L1com/fasterxml/jackson/core/JsonEncoding;)L1com/fasterxml/jackson/core/JsonGenerator; # @Overrides(com.fasterxml.jackson.core.TokenStreamFactory)
 createGenerator
  (Ljava/io/Writer;)Lcom/fasterxml/jackson/core/JsonGenerator;
- (L1java/io/Writer;)L1com/fasterxml/jackson/core/JsonGenerator;
+ (L1java/io/Writer;)L1com/fasterxml/jackson/core/JsonGenerator; # @Overrides(com.fasterxml.jackson.core.TokenStreamFactory)
 createJsonGenerator
  (Ljava/io/OutputStream;)Lcom/fasterxml/jackson/core/JsonGenerator;
  (L1java/io/OutputStream;)L1com/fasterxml/jackson/core/JsonGenerator;
@@ -194,40 +194,40 @@ createJsonParser
  ([1BII)L1com/fasterxml/jackson/core/JsonParser;
 createNonBlockingByteArrayParser
  ()Lcom/fasterxml/jackson/core/JsonParser;
- ()L1com/fasterxml/jackson/core/JsonParser;
+ ()L1com/fasterxml/jackson/core/JsonParser; # @Inherited(com.fasterxml.jackson.core.TokenStreamFactory)
 createNonBlockingByteBufferParser
  ()Lcom/fasterxml/jackson/core/JsonParser;
- ()L1com/fasterxml/jackson/core/JsonParser;
+ ()L1com/fasterxml/jackson/core/JsonParser; # @Inherited(com.fasterxml.jackson.core.TokenStreamFactory)
 createParser
  (Ljava/io/DataInput;)Lcom/fasterxml/jackson/core/JsonParser;
- (L1java/io/DataInput;)L1com/fasterxml/jackson/core/JsonParser;
+ (L1java/io/DataInput;)L1com/fasterxml/jackson/core/JsonParser; # @Overrides(com.fasterxml.jackson.core.TokenStreamFactory)
 createParser
  (Ljava/io/File;)Lcom/fasterxml/jackson/core/JsonParser;
- (L1java/io/File;)L1com/fasterxml/jackson/core/JsonParser;
+ (L1java/io/File;)L1com/fasterxml/jackson/core/JsonParser; # @Overrides(com.fasterxml.jackson.core.TokenStreamFactory)
 createParser
  (Ljava/io/InputStream;)Lcom/fasterxml/jackson/core/JsonParser;
- (L1java/io/InputStream;)L1com/fasterxml/jackson/core/JsonParser;
+ (L1java/io/InputStream;)L1com/fasterxml/jackson/core/JsonParser; # @Overrides(com.fasterxml.jackson.core.TokenStreamFactory)
 createParser
  (Ljava/io/Reader;)Lcom/fasterxml/jackson/core/JsonParser;
- (L1java/io/Reader;)L1com/fasterxml/jackson/core/JsonParser;
+ (L1java/io/Reader;)L1com/fasterxml/jackson/core/JsonParser; # @Overrides(com.fasterxml.jackson.core.TokenStreamFactory)
 createParser
  (Ljava/lang/String;)Lcom/fasterxml/jackson/core/JsonParser;
- (L1java/lang/String;)L1com/fasterxml/jackson/core/JsonParser;
+ (L1java/lang/String;)L1com/fasterxml/jackson/core/JsonParser; # @Overrides(com.fasterxml.jackson.core.TokenStreamFactory)
 createParser
  (Ljava/net/URL;)Lcom/fasterxml/jackson/core/JsonParser;
- (L1java/net/URL;)L1com/fasterxml/jackson/core/JsonParser;
+ (L1java/net/URL;)L1com/fasterxml/jackson/core/JsonParser; # @Overrides(com.fasterxml.jackson.core.TokenStreamFactory)
 createParser
  ([B)Lcom/fasterxml/jackson/core/JsonParser;
- ([1B)L1com/fasterxml/jackson/core/JsonParser;
+ ([1B)L1com/fasterxml/jackson/core/JsonParser; # @Overrides(com.fasterxml.jackson.core.TokenStreamFactory)
 createParser
  ([BII)Lcom/fasterxml/jackson/core/JsonParser;
- ([1BII)L1com/fasterxml/jackson/core/JsonParser;
+ ([1BII)L1com/fasterxml/jackson/core/JsonParser; # @Overrides(com.fasterxml.jackson.core.TokenStreamFactory)
 createParser
  ([C)Lcom/fasterxml/jackson/core/JsonParser;
- ([1C)L1com/fasterxml/jackson/core/JsonParser;
+ ([1C)L1com/fasterxml/jackson/core/JsonParser; # @Overrides(com.fasterxml.jackson.core.TokenStreamFactory)
 createParser
  ([CII)Lcom/fasterxml/jackson/core/JsonParser;
- ([1CII)L1com/fasterxml/jackson/core/JsonParser;
+ ([1CII)L1com/fasterxml/jackson/core/JsonParser; # @Overrides(com.fasterxml.jackson.core.TokenStreamFactory)
 disable
  (Lcom/fasterxml/jackson/core/JsonFactory$Feature;)Lcom/fasterxml/jackson/core/JsonFactory;
  (L1com/fasterxml/jackson/core/JsonFactory$Feature;)L1com/fasterxml/jackson/core/JsonFactory;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonGenerator.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonGenerator.eea
index 55ea0cdef2..a1ae718fbe 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonGenerator.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonGenerator.eea
@@ -16,7 +16,7 @@ _cfgPrettyPrinter
 
 _constructWriteException
  (Ljava/lang/String;)Lcom/fasterxml/jackson/core/exc/StreamWriteException;
- (Ljava/lang/String;)Lcom/fasterxml/jackson/core/exc/StreamWriteException;
+ (Ljava/lang/String;)L1com/fasterxml/jackson/core/exc/StreamWriteException;
 _constructWriteException
  (Ljava/lang/String;Ljava/lang/Object;)Lcom/fasterxml/jackson/core/exc/StreamWriteException;
  (Ljava/lang/String;Ljava/lang/Object;)Lcom/fasterxml/jackson/core/exc/StreamWriteException;
@@ -25,7 +25,7 @@ _constructWriteException
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)Lcom/fasterxml/jackson/core/exc/StreamWriteException;
 _constructWriteException
  (Ljava/lang/String;Ljava/lang/Throwable;)Lcom/fasterxml/jackson/core/exc/StreamWriteException;
- (Ljava/lang/String;Ljava/lang/Throwable;)Lcom/fasterxml/jackson/core/exc/StreamWriteException;
+ (Ljava/lang/String;Ljava/lang/Throwable;)L1com/fasterxml/jackson/core/exc/StreamWriteException;
 _copyCurrentContents
  (Lcom/fasterxml/jackson/core/JsonParser;)V
  (Lcom/fasterxml/jackson/core/JsonParser;)V
@@ -79,7 +79,7 @@ enable
  (Lcom/fasterxml/jackson/core/JsonGenerator$Feature;)Lcom/fasterxml/jackson/core/JsonGenerator;
 getCharacterEscapes
  ()Lcom/fasterxml/jackson/core/io/CharacterEscapes;
- ()Lcom/fasterxml/jackson/core/io/CharacterEscapes;
+ ()L0com/fasterxml/jackson/core/io/CharacterEscapes;
 getCodec
  ()Lcom/fasterxml/jackson/core/ObjectCodec;
  ()Lcom/fasterxml/jackson/core/ObjectCodec;
@@ -91,13 +91,13 @@ getOutputContext
  ()Lcom/fasterxml/jackson/core/JsonStreamContext;
 getOutputTarget
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getPrettyPrinter
  ()Lcom/fasterxml/jackson/core/PrettyPrinter;
  ()Lcom/fasterxml/jackson/core/PrettyPrinter;
 getSchema
  ()Lcom/fasterxml/jackson/core/FormatSchema;
- ()Lcom/fasterxml/jackson/core/FormatSchema;
+ ()L0com/fasterxml/jackson/core/FormatSchema;
 getWriteCapabilities
  ()Lcom/fasterxml/jackson/core/util/JacksonFeatureSet<Lcom/fasterxml/jackson/core/StreamWriteCapability;>;
  ()Lcom/fasterxml/jackson/core/util/JacksonFeatureSet<Lcom/fasterxml/jackson/core/StreamWriteCapability;>;
@@ -133,7 +133,7 @@ setPrettyPrinter
  (Lcom/fasterxml/jackson/core/PrettyPrinter;)Lcom/fasterxml/jackson/core/JsonGenerator;
 setRootValueSeparator
  (Lcom/fasterxml/jackson/core/SerializableString;)Lcom/fasterxml/jackson/core/JsonGenerator;
- (Lcom/fasterxml/jackson/core/SerializableString;)Lcom/fasterxml/jackson/core/JsonGenerator;
+ (Lcom/fasterxml/jackson/core/SerializableString;)L1com/fasterxml/jackson/core/JsonGenerator;
 setSchema
  (Lcom/fasterxml/jackson/core/FormatSchema;)V
  (Lcom/fasterxml/jackson/core/FormatSchema;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonLocation.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonLocation.eea
index 47f313bf12..7d873f109c 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonLocation.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonLocation.eea
@@ -41,7 +41,7 @@ getSourceRef
  ()Ljava/lang/Object;
 offsetDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 sourceDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonParseException.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonParseException.eea
index 0dd17f78cd..6c57fe5a0d 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonParseException.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonParseException.eea
@@ -32,7 +32,7 @@ getRequestPayload
  ()Lcom/fasterxml/jackson/core/util/RequestPayload;
 getRequestPayloadAsString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(com.fasterxml.jackson.core.exc.StreamReadException)
 withParser
  (Lcom/fasterxml/jackson/core/JsonParser;)Lcom/fasterxml/jackson/core/JsonParseException;
  (Lcom/fasterxml/jackson/core/JsonParser;)Lcom/fasterxml/jackson/core/JsonParseException;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonParser.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonParser.eea
index 1e883009f0..05256e8eb5 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonParser.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonParser.eea
@@ -91,16 +91,16 @@ getDecimalValue
  ()Ljava/math/BigDecimal;
 getEmbeddedObject
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getInputSource
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getLastClearedToken
  ()Lcom/fasterxml/jackson/core/JsonToken;
  ()Lcom/fasterxml/jackson/core/JsonToken;
 getNonBlockingInputFeeder
  ()Lcom/fasterxml/jackson/core/async/NonBlockingInputFeeder;
- ()Lcom/fasterxml/jackson/core/async/NonBlockingInputFeeder;
+ ()L0com/fasterxml/jackson/core/async/NonBlockingInputFeeder;
 getNumberType
  ()Lcom/fasterxml/jackson/core/JsonParser$NumberType;
  ()Lcom/fasterxml/jackson/core/JsonParser$NumberType;
@@ -118,7 +118,7 @@ getNumberValueExact
  ()Ljava/lang/Number;
 getObjectId
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getParsingContext
  ()Lcom/fasterxml/jackson/core/JsonStreamContext;
  ()Lcom/fasterxml/jackson/core/JsonStreamContext;
@@ -127,7 +127,7 @@ getReadCapabilities
  ()Lcom/fasterxml/jackson/core/util/JacksonFeatureSet<Lcom/fasterxml/jackson/core/StreamReadCapability;>;
 getSchema
  ()Lcom/fasterxml/jackson/core/FormatSchema;
- ()Lcom/fasterxml/jackson/core/FormatSchema;
+ ()L0com/fasterxml/jackson/core/FormatSchema;
 getText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -142,7 +142,7 @@ getTokenLocation
  ()Lcom/fasterxml/jackson/core/JsonLocation;
 getTypeId
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getValueAsString
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -160,16 +160,16 @@ isEnabled
  (Lcom/fasterxml/jackson/core/StreamReadFeature;)Z
 nextBooleanValue
  ()Ljava/lang/Boolean;
- ()Ljava/lang/Boolean;
+ ()L0java/lang/Boolean;
 nextFieldName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 nextFieldName
  (Lcom/fasterxml/jackson/core/SerializableString;)Z
  (Lcom/fasterxml/jackson/core/SerializableString;)Z
 nextTextValue
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 nextToken
  ()Lcom/fasterxml/jackson/core/JsonToken;
  ()Lcom/fasterxml/jackson/core/JsonToken;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonPointer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonPointer.eea
index 24051564cb..b2223cf759 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonPointer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonPointer.eea
@@ -74,13 +74,13 @@ head
  ()Lcom/fasterxml/jackson/core/JsonPointer;
 last
  ()Lcom/fasterxml/jackson/core/JsonPointer;
- ()Lcom/fasterxml/jackson/core/JsonPointer;
+ ()L0com/fasterxml/jackson/core/JsonPointer;
 matchElement
  (I)Lcom/fasterxml/jackson/core/JsonPointer;
- (I)Lcom/fasterxml/jackson/core/JsonPointer;
+ (I)L0com/fasterxml/jackson/core/JsonPointer;
 matchProperty
  (Ljava/lang/String;)Lcom/fasterxml/jackson/core/JsonPointer;
- (Ljava/lang/String;)Lcom/fasterxml/jackson/core/JsonPointer;
+ (Ljava/lang/String;)L0com/fasterxml/jackson/core/JsonPointer;
 matchesProperty
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonProcessingException.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonProcessingException.eea
index 91715c5ab0..c849350e84 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonProcessingException.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonProcessingException.eea
@@ -27,13 +27,13 @@ getMessage
  ()L1java/lang/String; # @Overrides(java.lang.Throwable)
 getMessageSuffix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getOriginalMessage
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getProcessor
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Throwable)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonStreamContext.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonStreamContext.eea
index e70f9401de..00b9aa03a3 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonStreamContext.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonStreamContext.eea
@@ -8,7 +8,7 @@ getCurrentName
  ()Ljava/lang/String;
 getCurrentValue
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getParent
  ()Lcom/fasterxml/jackson/core/JsonStreamContext;
  ()Lcom/fasterxml/jackson/core/JsonStreamContext;
@@ -17,7 +17,7 @@ getStartLocation
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/core/JsonLocation;
 getTypeDesc
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 pathAsPointer
  ()Lcom/fasterxml/jackson/core/JsonPointer;
  ()Lcom/fasterxml/jackson/core/JsonPointer;
@@ -35,4 +35,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 typeDesc
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonToken.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonToken.eea
index f0945a16dd..988540d16b 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonToken.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonToken.eea
@@ -6,7 +6,7 @@ super java/lang/Enum
 
 valueDescFor
  (Lcom/fasterxml/jackson/core/JsonToken;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/core/JsonToken;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/core/JsonToken;)L1java/lang/String;
 
 asByteArray
  ()[B
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonpCharacterEscapes.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonpCharacterEscapes.eea
index b3338d476f..3ec3dc4bad 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonpCharacterEscapes.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/JsonpCharacterEscapes.eea
@@ -9,4 +9,4 @@ getEscapeCodesForAscii
  ()[I
 getEscapeSequence
  (I)Lcom/fasterxml/jackson/core/SerializableString;
- (I)Lcom/fasterxml/jackson/core/SerializableString;
+ (I)L0com/fasterxml/jackson/core/SerializableString;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/ObjectCodec.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/ObjectCodec.eea
index 374b782a0b..92cc1171c7 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/ObjectCodec.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/ObjectCodec.eea
@@ -2,10 +2,10 @@ class com/fasterxml/jackson/core/ObjectCodec
 
 createArrayNode
  ()Lcom/fasterxml/jackson/core/TreeNode;
- ()Lcom/fasterxml/jackson/core/TreeNode;
+ ()L1com/fasterxml/jackson/core/TreeNode; # @Inherited(com.fasterxml.jackson.core.TreeCodec)
 createObjectNode
  ()Lcom/fasterxml/jackson/core/TreeNode;
- ()Lcom/fasterxml/jackson/core/TreeNode;
+ ()L1com/fasterxml/jackson/core/TreeNode; # @Inherited(com.fasterxml.jackson.core.TreeCodec)
 getFactory
  ()Lcom/fasterxml/jackson/core/JsonFactory;
  ()Lcom/fasterxml/jackson/core/JsonFactory;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/StreamReadConstraints.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/StreamReadConstraints.eea
index a55b3a3df5..1065f85108 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/StreamReadConstraints.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/StreamReadConstraints.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/core/StreamReadConstraints
 
 builder
  ()Lcom/fasterxml/jackson/core/StreamReadConstraints$Builder;
- ()Lcom/fasterxml/jackson/core/StreamReadConstraints$Builder;
+ ()L1com/fasterxml/jackson/core/StreamReadConstraints$Builder;
 defaults
  ()Lcom/fasterxml/jackson/core/StreamReadConstraints;
  ()Lcom/fasterxml/jackson/core/StreamReadConstraints;
@@ -12,10 +12,10 @@ overrideDefaultStreamReadConstraints
 
 _constrainRef
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 _constructException
  (Ljava/lang/String;[Ljava/lang/Object;)Lcom/fasterxml/jackson/core/exc/StreamConstraintsException;
- (Ljava/lang/String;[Ljava/lang/Object;)Lcom/fasterxml/jackson/core/exc/StreamConstraintsException;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1com/fasterxml/jackson/core/exc/StreamConstraintsException;
 rebuild
  ()Lcom/fasterxml/jackson/core/StreamReadConstraints$Builder;
- ()Lcom/fasterxml/jackson/core/StreamReadConstraints$Builder;
+ ()L1com/fasterxml/jackson/core/StreamReadConstraints$Builder;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/StreamWriteConstraints.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/StreamWriteConstraints.eea
index 32869e60b0..2dbf04bcd4 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/StreamWriteConstraints.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/StreamWriteConstraints.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/core/StreamWriteConstraints
 
 builder
  ()Lcom/fasterxml/jackson/core/StreamWriteConstraints$Builder;
- ()Lcom/fasterxml/jackson/core/StreamWriteConstraints$Builder;
+ ()L1com/fasterxml/jackson/core/StreamWriteConstraints$Builder;
 defaults
  ()Lcom/fasterxml/jackson/core/StreamWriteConstraints;
  ()Lcom/fasterxml/jackson/core/StreamWriteConstraints;
@@ -12,10 +12,10 @@ overrideDefaultStreamWriteConstraints
 
 _constrainRef
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 _constructException
  (Ljava/lang/String;[Ljava/lang/Object;)Lcom/fasterxml/jackson/core/exc/StreamConstraintsException;
- (Ljava/lang/String;[Ljava/lang/Object;)Lcom/fasterxml/jackson/core/exc/StreamConstraintsException;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1com/fasterxml/jackson/core/exc/StreamConstraintsException;
 rebuild
  ()Lcom/fasterxml/jackson/core/StreamWriteConstraints$Builder;
- ()Lcom/fasterxml/jackson/core/StreamWriteConstraints$Builder;
+ ()L1com/fasterxml/jackson/core/StreamWriteConstraints$Builder;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/TSFBuilder.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/TSFBuilder.eea
index b19894a2f9..1f7a143019 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/TSFBuilder.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/TSFBuilder.eea
@@ -4,7 +4,7 @@ class com/fasterxml/jackson/core/TSFBuilder
 
 _copy
  <T:Ljava/lang/Object;>(Ljava/util/List<TT;>;)Ljava/util/List<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/List<TT;>;)Ljava/util/List<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/List<TT;>;)Ljava/util/List<TT;>; # @PolyNull
 
 _errorReportConfiguration
  Lcom/fasterxml/jackson/core/ErrorReportConfiguration;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/TokenStreamFactory.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/TokenStreamFactory.eea
index 1db89dde31..ce14f22981 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/TokenStreamFactory.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/TokenStreamFactory.eea
@@ -8,76 +8,76 @@ _checkRangeBoundsForCharArray
  ([CII)V
 _createDataOutputWrapper
  (Ljava/io/DataOutput;)Ljava/io/OutputStream;
- (Ljava/io/DataOutput;)Ljava/io/OutputStream;
+ (Ljava/io/DataOutput;)L1java/io/OutputStream;
 _fileInputStream
  (Ljava/io/File;)Ljava/io/InputStream;
- (Ljava/io/File;)Ljava/io/InputStream;
+ (Ljava/io/File;)L1java/io/InputStream;
 _fileOutputStream
  (Ljava/io/File;)Ljava/io/OutputStream;
- (Ljava/io/File;)Ljava/io/OutputStream;
+ (Ljava/io/File;)L1java/io/OutputStream;
 _optimizedStreamFromURL
  (Ljava/net/URL;)Ljava/io/InputStream;
  (Ljava/net/URL;)Ljava/io/InputStream;
 _reportRangeError
  <T:Ljava/lang/Object;>(Ljava/lang/String;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/String;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/String;)T1T;
 canUseSchema
  (Lcom/fasterxml/jackson/core/FormatSchema;)Z
  (Lcom/fasterxml/jackson/core/FormatSchema;)Z
 createGenerator
  (Ljava/io/DataOutput;)Lcom/fasterxml/jackson/core/JsonGenerator;
- (Ljava/io/DataOutput;)Lcom/fasterxml/jackson/core/JsonGenerator;
+ (Ljava/io/DataOutput;)L1com/fasterxml/jackson/core/JsonGenerator;
 createGenerator
  (Ljava/io/DataOutput;Lcom/fasterxml/jackson/core/JsonEncoding;)Lcom/fasterxml/jackson/core/JsonGenerator;
- (Ljava/io/DataOutput;Lcom/fasterxml/jackson/core/JsonEncoding;)Lcom/fasterxml/jackson/core/JsonGenerator;
+ (Ljava/io/DataOutput;Lcom/fasterxml/jackson/core/JsonEncoding;)L1com/fasterxml/jackson/core/JsonGenerator;
 createGenerator
  (Ljava/io/File;Lcom/fasterxml/jackson/core/JsonEncoding;)Lcom/fasterxml/jackson/core/JsonGenerator;
- (Ljava/io/File;Lcom/fasterxml/jackson/core/JsonEncoding;)Lcom/fasterxml/jackson/core/JsonGenerator;
+ (Ljava/io/File;Lcom/fasterxml/jackson/core/JsonEncoding;)L1com/fasterxml/jackson/core/JsonGenerator;
 createGenerator
  (Ljava/io/OutputStream;)Lcom/fasterxml/jackson/core/JsonGenerator;
- (Ljava/io/OutputStream;)Lcom/fasterxml/jackson/core/JsonGenerator;
+ (Ljava/io/OutputStream;)L1com/fasterxml/jackson/core/JsonGenerator;
 createGenerator
  (Ljava/io/OutputStream;Lcom/fasterxml/jackson/core/JsonEncoding;)Lcom/fasterxml/jackson/core/JsonGenerator;
- (Ljava/io/OutputStream;Lcom/fasterxml/jackson/core/JsonEncoding;)Lcom/fasterxml/jackson/core/JsonGenerator;
+ (Ljava/io/OutputStream;Lcom/fasterxml/jackson/core/JsonEncoding;)L1com/fasterxml/jackson/core/JsonGenerator;
 createGenerator
  (Ljava/io/Writer;)Lcom/fasterxml/jackson/core/JsonGenerator;
- (Ljava/io/Writer;)Lcom/fasterxml/jackson/core/JsonGenerator;
+ (Ljava/io/Writer;)L1com/fasterxml/jackson/core/JsonGenerator;
 createNonBlockingByteArrayParser
  ()Lcom/fasterxml/jackson/core/JsonParser;
- ()Lcom/fasterxml/jackson/core/JsonParser;
+ ()L1com/fasterxml/jackson/core/JsonParser;
 createNonBlockingByteBufferParser
  ()Lcom/fasterxml/jackson/core/JsonParser;
- ()Lcom/fasterxml/jackson/core/JsonParser;
+ ()L1com/fasterxml/jackson/core/JsonParser;
 createParser
  (Ljava/io/DataInput;)Lcom/fasterxml/jackson/core/JsonParser;
- (Ljava/io/DataInput;)Lcom/fasterxml/jackson/core/JsonParser;
+ (Ljava/io/DataInput;)L1com/fasterxml/jackson/core/JsonParser;
 createParser
  (Ljava/io/File;)Lcom/fasterxml/jackson/core/JsonParser;
- (Ljava/io/File;)Lcom/fasterxml/jackson/core/JsonParser;
+ (Ljava/io/File;)L1com/fasterxml/jackson/core/JsonParser;
 createParser
  (Ljava/io/InputStream;)Lcom/fasterxml/jackson/core/JsonParser;
- (Ljava/io/InputStream;)Lcom/fasterxml/jackson/core/JsonParser;
+ (Ljava/io/InputStream;)L1com/fasterxml/jackson/core/JsonParser;
 createParser
  (Ljava/io/Reader;)Lcom/fasterxml/jackson/core/JsonParser;
- (Ljava/io/Reader;)Lcom/fasterxml/jackson/core/JsonParser;
+ (Ljava/io/Reader;)L1com/fasterxml/jackson/core/JsonParser;
 createParser
  (Ljava/lang/String;)Lcom/fasterxml/jackson/core/JsonParser;
- (Ljava/lang/String;)Lcom/fasterxml/jackson/core/JsonParser;
+ (Ljava/lang/String;)L1com/fasterxml/jackson/core/JsonParser;
 createParser
  (Ljava/net/URL;)Lcom/fasterxml/jackson/core/JsonParser;
- (Ljava/net/URL;)Lcom/fasterxml/jackson/core/JsonParser;
+ (Ljava/net/URL;)L1com/fasterxml/jackson/core/JsonParser;
 createParser
  ([B)Lcom/fasterxml/jackson/core/JsonParser;
- ([B)Lcom/fasterxml/jackson/core/JsonParser;
+ ([B)L1com/fasterxml/jackson/core/JsonParser;
 createParser
  ([BII)Lcom/fasterxml/jackson/core/JsonParser;
- ([BII)Lcom/fasterxml/jackson/core/JsonParser;
+ ([BII)L1com/fasterxml/jackson/core/JsonParser;
 createParser
  ([C)Lcom/fasterxml/jackson/core/JsonParser;
- ([C)Lcom/fasterxml/jackson/core/JsonParser;
+ ([C)L1com/fasterxml/jackson/core/JsonParser;
 createParser
  ([CII)Lcom/fasterxml/jackson/core/JsonParser;
- ([CII)Lcom/fasterxml/jackson/core/JsonParser;
+ ([CII)L1com/fasterxml/jackson/core/JsonParser;
 getFormatName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/TreeCodec.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/TreeCodec.eea
index eeccb2957b..ffa31c7c2c 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/TreeCodec.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/TreeCodec.eea
@@ -2,16 +2,16 @@ class com/fasterxml/jackson/core/TreeCodec
 
 createArrayNode
  ()Lcom/fasterxml/jackson/core/TreeNode;
- ()Lcom/fasterxml/jackson/core/TreeNode;
+ ()L1com/fasterxml/jackson/core/TreeNode;
 createObjectNode
  ()Lcom/fasterxml/jackson/core/TreeNode;
- ()Lcom/fasterxml/jackson/core/TreeNode;
+ ()L1com/fasterxml/jackson/core/TreeNode;
 missingNode
  ()Lcom/fasterxml/jackson/core/TreeNode;
- ()Lcom/fasterxml/jackson/core/TreeNode;
+ ()L0com/fasterxml/jackson/core/TreeNode;
 nullNode
  ()Lcom/fasterxml/jackson/core/TreeNode;
- ()Lcom/fasterxml/jackson/core/TreeNode;
+ ()L0com/fasterxml/jackson/core/TreeNode;
 readTree
  <T::Lcom/fasterxml/jackson/core/TreeNode;>(Lcom/fasterxml/jackson/core/JsonParser;)TT;
  <T::Lcom/fasterxml/jackson/core/TreeNode;>(Lcom/fasterxml/jackson/core/JsonParser;)TT;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/Version.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/Version.eea
index 9a66cd36ed..bec4d99cb3 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/Version.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/Version.eea
@@ -38,7 +38,7 @@ getGroupId
  ()Ljava/lang/String;
 toFullString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/base/GeneratorBase.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/base/GeneratorBase.eea
index be40b43cbd..211da3d077 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/base/GeneratorBase.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/base/GeneratorBase.eea
@@ -55,7 +55,7 @@ _checkRangeBoundsForString
  (Ljava/lang/String;II)V
 _constructDefaultPrettyPrinter
  ()Lcom/fasterxml/jackson/core/PrettyPrinter;
- ()Lcom/fasterxml/jackson/core/PrettyPrinter;
+ ()L1com/fasterxml/jackson/core/PrettyPrinter;
 _verifyValueWrite
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/base/ParserBase.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/base/ParserBase.eea
index 2cb5bb7bd4..8443ab8dcc 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/base/ParserBase.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/base/ParserBase.eea
@@ -71,7 +71,7 @@ _getByteArrayBuilder
  ()Lcom/fasterxml/jackson/core/util/ByteArrayBuilder;
 _getSourceReference
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 _growNameDecodeBuffer
  ([II)[I
  ([II)[I
@@ -89,7 +89,7 @@ _validJsonTokenList
  ()Ljava/lang/String;
 _validJsonValueList
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 assignCurrentValue
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
@@ -134,7 +134,7 @@ getParsingContext
  ()Lcom/fasterxml/jackson/core/json/JsonReadContext;
 getTokenLocation
  ()Lcom/fasterxml/jackson/core/JsonLocation;
- ()Lcom/fasterxml/jackson/core/JsonLocation;
+ ()L1com/fasterxml/jackson/core/JsonLocation;
 overrideCurrentName
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
@@ -146,7 +146,7 @@ reportInvalidBase64Char
  (Lcom/fasterxml/jackson/core/Base64Variant;II)Ljava/lang/IllegalArgumentException;
 reportInvalidBase64Char
  (Lcom/fasterxml/jackson/core/Base64Variant;IILjava/lang/String;)Ljava/lang/IllegalArgumentException;
- (Lcom/fasterxml/jackson/core/Base64Variant;IILjava/lang/String;)Ljava/lang/IllegalArgumentException;
+ (Lcom/fasterxml/jackson/core/Base64Variant;IILjava/lang/String;)L1java/lang/IllegalArgumentException;
 reset
  (ZIII)Lcom/fasterxml/jackson/core/JsonToken;
  (ZIII)Lcom/fasterxml/jackson/core/JsonToken;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/base/ParserMinimalBase.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/base/ParserMinimalBase.eea
index 4a17258918..fbdd0a5592 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/base/ParserMinimalBase.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/base/ParserMinimalBase.eea
@@ -33,13 +33,13 @@ NO_INTS
 
 _ascii
  ([B)Ljava/lang/String;
- ([B)Ljava/lang/String;
+ ([B)L1java/lang/String;
 _asciiBytes
  (Ljava/lang/String;)[B
- (Ljava/lang/String;)[B
+ (Ljava/lang/String;)[1B
 _getCharDesc
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 
 _currToken
  Lcom/fasterxml/jackson/core/JsonToken;
@@ -89,7 +89,7 @@ _reportUnexpectedChar
  (ILjava/lang/String;)V
 _reportUnexpectedNumberChar
  <T:Ljava/lang/Object;>(ILjava/lang/String;)TT;
- <T:Ljava/lang/Object;>(ILjava/lang/String;)TT;
+ <T:Ljava/lang/Object;>(ILjava/lang/String;)T1T;
 _throwInternalReturnAny
  <T:Ljava/lang/Object;>()TT;
  <T:Ljava/lang/Object;>()TT;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/exc/StreamReadException.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/exc/StreamReadException.eea
index c55b9ff265..bd0c485216 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/exc/StreamReadException.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/exc/StreamReadException.eea
@@ -40,7 +40,7 @@ getRequestPayload
  ()Lcom/fasterxml/jackson/core/util/RequestPayload;
 getRequestPayloadAsString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 withParser
  (Lcom/fasterxml/jackson/core/JsonParser;)Lcom/fasterxml/jackson/core/exc/StreamReadException;
  (Lcom/fasterxml/jackson/core/JsonParser;)Lcom/fasterxml/jackson/core/exc/StreamReadException;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/filter/FilteringParserDelegate.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/filter/FilteringParserDelegate.eea
index 9deb67e14b..c38e5c59c3 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/filter/FilteringParserDelegate.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/filter/FilteringParserDelegate.eea
@@ -36,7 +36,7 @@ _nextToken2
  ()Lcom/fasterxml/jackson/core/JsonToken;
 _nextTokenWithBuffering
  (Lcom/fasterxml/jackson/core/filter/TokenFilterContext;)Lcom/fasterxml/jackson/core/JsonToken;
- (Lcom/fasterxml/jackson/core/filter/TokenFilterContext;)Lcom/fasterxml/jackson/core/JsonToken;
+ (Lcom/fasterxml/jackson/core/filter/TokenFilterContext;)L0com/fasterxml/jackson/core/JsonToken;
 currentLocation
  ()Lcom/fasterxml/jackson/core/JsonLocation;
  ()Lcom/fasterxml/jackson/core/JsonLocation;
@@ -69,7 +69,7 @@ getDecimalValue
  ()Ljava/math/BigDecimal;
 getEmbeddedObject
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.core.util.JsonParserDelegate)
 getFilter
  ()Lcom/fasterxml/jackson/core/filter/TokenFilter;
  ()Lcom/fasterxml/jackson/core/filter/TokenFilter;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/filter/JsonPointerBasedFilter.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/filter/JsonPointerBasedFilter.eea
index c4936fb87b..f0842bd927 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/filter/JsonPointerBasedFilter.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/filter/JsonPointerBasedFilter.eea
@@ -15,7 +15,7 @@ _pathToMatch
  (Ljava/lang/String;)V
 construct
  (Lcom/fasterxml/jackson/core/JsonPointer;Z)Lcom/fasterxml/jackson/core/filter/JsonPointerBasedFilter;
- (Lcom/fasterxml/jackson/core/JsonPointer;Z)Lcom/fasterxml/jackson/core/filter/JsonPointerBasedFilter;
+ (Lcom/fasterxml/jackson/core/JsonPointer;Z)L1com/fasterxml/jackson/core/filter/JsonPointerBasedFilter;
 filterStartArray
  ()Lcom/fasterxml/jackson/core/filter/TokenFilter;
  ()Lcom/fasterxml/jackson/core/filter/TokenFilter;
@@ -24,10 +24,10 @@ filterStartObject
  ()Lcom/fasterxml/jackson/core/filter/TokenFilter;
 includeElement
  (I)Lcom/fasterxml/jackson/core/filter/TokenFilter;
- (I)Lcom/fasterxml/jackson/core/filter/TokenFilter;
+ (I)L0com/fasterxml/jackson/core/filter/TokenFilter;
 includeProperty
  (Ljava/lang/String;)Lcom/fasterxml/jackson/core/filter/TokenFilter;
- (Ljava/lang/String;)Lcom/fasterxml/jackson/core/filter/TokenFilter;
+ (Ljava/lang/String;)L0com/fasterxml/jackson/core/filter/TokenFilter;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(com.fasterxml.jackson.core.filter.TokenFilter)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/filter/TokenFilterContext.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/filter/TokenFilterContext.eea
index 9cef6c2390..549eb65b10 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/filter/TokenFilterContext.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/filter/TokenFilterContext.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/core/filter/TokenFilterContext
 
 createRootContext
  (Lcom/fasterxml/jackson/core/filter/TokenFilter;)Lcom/fasterxml/jackson/core/filter/TokenFilterContext;
- (Lcom/fasterxml/jackson/core/filter/TokenFilter;)Lcom/fasterxml/jackson/core/filter/TokenFilterContext;
+ (Lcom/fasterxml/jackson/core/filter/TokenFilter;)L1com/fasterxml/jackson/core/filter/TokenFilterContext;
 
 _child
  Lcom/fasterxml/jackson/core/filter/TokenFilterContext;
@@ -34,22 +34,22 @@ closeObject
  (Lcom/fasterxml/jackson/core/JsonGenerator;)Lcom/fasterxml/jackson/core/filter/TokenFilterContext;
 createChildArrayContext
  (Lcom/fasterxml/jackson/core/filter/TokenFilter;Z)Lcom/fasterxml/jackson/core/filter/TokenFilterContext;
- (Lcom/fasterxml/jackson/core/filter/TokenFilter;Z)Lcom/fasterxml/jackson/core/filter/TokenFilterContext;
+ (Lcom/fasterxml/jackson/core/filter/TokenFilter;Z)L1com/fasterxml/jackson/core/filter/TokenFilterContext;
 createChildObjectContext
  (Lcom/fasterxml/jackson/core/filter/TokenFilter;Z)Lcom/fasterxml/jackson/core/filter/TokenFilterContext;
- (Lcom/fasterxml/jackson/core/filter/TokenFilter;Z)Lcom/fasterxml/jackson/core/filter/TokenFilterContext;
+ (Lcom/fasterxml/jackson/core/filter/TokenFilter;Z)L1com/fasterxml/jackson/core/filter/TokenFilterContext;
 ensureFieldNameWritten
  (Lcom/fasterxml/jackson/core/JsonGenerator;)V
  (Lcom/fasterxml/jackson/core/JsonGenerator;)V
 findChildOf
  (Lcom/fasterxml/jackson/core/filter/TokenFilterContext;)Lcom/fasterxml/jackson/core/filter/TokenFilterContext;
- (Lcom/fasterxml/jackson/core/filter/TokenFilterContext;)Lcom/fasterxml/jackson/core/filter/TokenFilterContext;
+ (Lcom/fasterxml/jackson/core/filter/TokenFilterContext;)L0com/fasterxml/jackson/core/filter/TokenFilterContext;
 getCurrentName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getCurrentValue
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.core.JsonStreamContext)
 getFilter
  ()Lcom/fasterxml/jackson/core/filter/TokenFilter;
  ()Lcom/fasterxml/jackson/core/filter/TokenFilter;
@@ -58,7 +58,7 @@ getParent
  ()Lcom/fasterxml/jackson/core/filter/TokenFilterContext;
 nextTokenToRead
  ()Lcom/fasterxml/jackson/core/JsonToken;
- ()Lcom/fasterxml/jackson/core/JsonToken;
+ ()L0com/fasterxml/jackson/core/JsonToken;
 reset
  (ILcom/fasterxml/jackson/core/filter/TokenFilter;Z)Lcom/fasterxml/jackson/core/filter/TokenFilterContext;
  (ILcom/fasterxml/jackson/core/filter/TokenFilter;Z)Lcom/fasterxml/jackson/core/filter/TokenFilterContext;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/format/DataFormatMatcher.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/format/DataFormatMatcher.eea
index b87edcab0e..83a76ff9eb 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/format/DataFormatMatcher.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/format/DataFormatMatcher.eea
@@ -18,7 +18,7 @@ _originalStream
  (Ljava/io/InputStream;[BIILcom/fasterxml/jackson/core/JsonFactory;Lcom/fasterxml/jackson/core/format/MatchStrength;)V
 createParserWithMatch
  ()Lcom/fasterxml/jackson/core/JsonParser;
- ()Lcom/fasterxml/jackson/core/JsonParser;
+ ()L0com/fasterxml/jackson/core/JsonParser;
 getDataStream
  ()Ljava/io/InputStream;
  ()Ljava/io/InputStream;
@@ -30,4 +30,4 @@ getMatchStrength
  ()Lcom/fasterxml/jackson/core/format/MatchStrength;
 getMatchedFormatName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/format/InputAccessor$Std.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/format/InputAccessor$Std.eea
index 2d37964d66..1756543a4c 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/format/InputAccessor$Std.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/format/InputAccessor$Std.eea
@@ -18,4 +18,4 @@ _in
  ([BII)V
 createMatcher
  (Lcom/fasterxml/jackson/core/JsonFactory;Lcom/fasterxml/jackson/core/format/MatchStrength;)Lcom/fasterxml/jackson/core/format/DataFormatMatcher;
- (Lcom/fasterxml/jackson/core/JsonFactory;Lcom/fasterxml/jackson/core/format/MatchStrength;)Lcom/fasterxml/jackson/core/format/DataFormatMatcher;
+ (Lcom/fasterxml/jackson/core/JsonFactory;Lcom/fasterxml/jackson/core/format/MatchStrength;)L1com/fasterxml/jackson/core/format/DataFormatMatcher;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/io/ContentReference.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/io/ContentReference.eea
index 57dcdbe4dd..731c9354e6 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/io/ContentReference.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/io/ContentReference.eea
@@ -9,16 +9,16 @@ UNKNOWN_CONTENT
 
 construct
  (ZLjava/lang/Object;)Lcom/fasterxml/jackson/core/io/ContentReference;
- (ZLjava/lang/Object;)Lcom/fasterxml/jackson/core/io/ContentReference;
+ (ZLjava/lang/Object;)L1com/fasterxml/jackson/core/io/ContentReference;
 construct
  (ZLjava/lang/Object;II)Lcom/fasterxml/jackson/core/io/ContentReference;
- (ZLjava/lang/Object;II)Lcom/fasterxml/jackson/core/io/ContentReference;
+ (ZLjava/lang/Object;II)L1com/fasterxml/jackson/core/io/ContentReference;
 construct
  (ZLjava/lang/Object;IILcom/fasterxml/jackson/core/ErrorReportConfiguration;)Lcom/fasterxml/jackson/core/io/ContentReference;
- (ZLjava/lang/Object;IILcom/fasterxml/jackson/core/ErrorReportConfiguration;)Lcom/fasterxml/jackson/core/io/ContentReference;
+ (ZLjava/lang/Object;IILcom/fasterxml/jackson/core/ErrorReportConfiguration;)L1com/fasterxml/jackson/core/io/ContentReference;
 construct
  (ZLjava/lang/Object;Lcom/fasterxml/jackson/core/ErrorReportConfiguration;)Lcom/fasterxml/jackson/core/io/ContentReference;
- (ZLjava/lang/Object;Lcom/fasterxml/jackson/core/ErrorReportConfiguration;)Lcom/fasterxml/jackson/core/io/ContentReference;
+ (ZLjava/lang/Object;Lcom/fasterxml/jackson/core/ErrorReportConfiguration;)L1com/fasterxml/jackson/core/io/ContentReference;
 rawReference
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/core/io/ContentReference;
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/core/io/ContentReference;
@@ -56,13 +56,13 @@ _appendEscaped
  (Ljava/lang/StringBuilder;I)Z
 _truncate
  (Ljava/lang/CharSequence;[II)Ljava/lang/String;
- (Ljava/lang/CharSequence;[II)Ljava/lang/String;
+ (Ljava/lang/CharSequence;[II)L1java/lang/String;
 _truncate
  ([B[II)Ljava/lang/String;
- ([B[II)Ljava/lang/String;
+ ([B[II)L1java/lang/String;
 _truncate
  ([C[II)Ljava/lang/String;
- ([C[II)Ljava/lang/String;
+ ([C[II)L1java/lang/String;
 _truncateOffsets
  ([II)V
  ([II)V
@@ -71,7 +71,7 @@ appendSourceDescription
  (Ljava/lang/StringBuilder;)Ljava/lang/StringBuilder;
 buildSourceDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/io/IOContext.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/io/IOContext.eea
index e413e9829d..e583fd5467 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/io/IOContext.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/io/IOContext.eea
@@ -99,7 +99,7 @@ constructReadConstrainedTextBuffer
  ()Lcom/fasterxml/jackson/core/util/TextBuffer;
 constructTextBuffer
  ()Lcom/fasterxml/jackson/core/util/TextBuffer;
- ()Lcom/fasterxml/jackson/core/util/TextBuffer;
+ ()L1com/fasterxml/jackson/core/util/TextBuffer;
 contentReference
  ()Lcom/fasterxml/jackson/core/io/ContentReference;
  ()Lcom/fasterxml/jackson/core/io/ContentReference;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/io/InputDecorator.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/io/InputDecorator.eea
index 8171709837..533861f127 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/io/InputDecorator.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/io/InputDecorator.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/core/io/InputDecorator
 
 decorate
  (Lcom/fasterxml/jackson/core/io/IOContext;Ljava/io/DataInput;)Ljava/io/DataInput;
- (Lcom/fasterxml/jackson/core/io/IOContext;Ljava/io/DataInput;)Ljava/io/DataInput;
+ (Lcom/fasterxml/jackson/core/io/IOContext;Ljava/io/DataInput;)L1java/io/DataInput;
 decorate
  (Lcom/fasterxml/jackson/core/io/IOContext;Ljava/io/InputStream;)Ljava/io/InputStream;
  (Lcom/fasterxml/jackson/core/io/IOContext;Ljava/io/InputStream;)Ljava/io/InputStream;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/io/UTF8Writer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/io/UTF8Writer.eea
index f85e1fa4dc..805876d22a 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/io/UTF8Writer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/io/UTF8Writer.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/core/io/UTF8Writer
 
 illegalSurrogateDesc
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 
 <init>
  (Lcom/fasterxml/jackson/core/io/IOContext;Ljava/io/OutputStream;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/DupDetector.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/DupDetector.eea
index dcf9a169d9..a4af6333bf 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/DupDetector.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/DupDetector.eea
@@ -2,10 +2,10 @@ class com/fasterxml/jackson/core/json/DupDetector
 
 rootDetector
  (Lcom/fasterxml/jackson/core/JsonGenerator;)Lcom/fasterxml/jackson/core/json/DupDetector;
- (Lcom/fasterxml/jackson/core/JsonGenerator;)Lcom/fasterxml/jackson/core/json/DupDetector;
+ (Lcom/fasterxml/jackson/core/JsonGenerator;)L1com/fasterxml/jackson/core/json/DupDetector;
 rootDetector
  (Lcom/fasterxml/jackson/core/JsonParser;)Lcom/fasterxml/jackson/core/json/DupDetector;
- (Lcom/fasterxml/jackson/core/JsonParser;)Lcom/fasterxml/jackson/core/json/DupDetector;
+ (Lcom/fasterxml/jackson/core/JsonParser;)L1com/fasterxml/jackson/core/json/DupDetector;
 
 _firstName
  Ljava/lang/String;
@@ -22,10 +22,10 @@ _source
 
 child
  ()Lcom/fasterxml/jackson/core/json/DupDetector;
- ()Lcom/fasterxml/jackson/core/json/DupDetector;
+ ()L1com/fasterxml/jackson/core/json/DupDetector;
 findLocation
  ()Lcom/fasterxml/jackson/core/JsonLocation;
- ()Lcom/fasterxml/jackson/core/JsonLocation;
+ ()L0com/fasterxml/jackson/core/JsonLocation;
 getSource
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/JsonGeneratorImpl.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/JsonGeneratorImpl.eea
index 4f59ced70c..6ed6f6151d 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/JsonGeneratorImpl.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/JsonGeneratorImpl.eea
@@ -37,7 +37,7 @@ enable
  (Lcom/fasterxml/jackson/core/JsonGenerator$Feature;)Lcom/fasterxml/jackson/core/JsonGenerator;
 getCharacterEscapes
  ()Lcom/fasterxml/jackson/core/io/CharacterEscapes;
- ()Lcom/fasterxml/jackson/core/io/CharacterEscapes;
+ ()L0com/fasterxml/jackson/core/io/CharacterEscapes; # @Inherited(com.fasterxml.jackson.core.JsonGenerator)
 getWriteCapabilities
  ()Lcom/fasterxml/jackson/core/util/JacksonFeatureSet<Lcom/fasterxml/jackson/core/StreamWriteCapability;>;
  ()Lcom/fasterxml/jackson/core/util/JacksonFeatureSet<Lcom/fasterxml/jackson/core/StreamWriteCapability;>;
@@ -49,7 +49,7 @@ setHighestNonEscapedChar
  (I)Lcom/fasterxml/jackson/core/JsonGenerator;
 setRootValueSeparator
  (Lcom/fasterxml/jackson/core/SerializableString;)Lcom/fasterxml/jackson/core/JsonGenerator;
- (Lcom/fasterxml/jackson/core/SerializableString;)Lcom/fasterxml/jackson/core/JsonGenerator;
+ (Lcom/fasterxml/jackson/core/SerializableString;)L1com/fasterxml/jackson/core/JsonGenerator; # @Inherited(com.fasterxml.jackson.core.JsonGenerator)
 streamWriteConstraints
  ()Lcom/fasterxml/jackson/core/StreamWriteConstraints;
  ()Lcom/fasterxml/jackson/core/StreamWriteConstraints;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/JsonParserBase.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/JsonParserBase.eea
index f4bc5f17d6..2de777b7e4 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/JsonParserBase.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/JsonParserBase.eea
@@ -37,7 +37,7 @@ getReadCapabilities
  ()Lcom/fasterxml/jackson/core/util/JacksonFeatureSet<Lcom/fasterxml/jackson/core/StreamReadCapability;>;
 getTokenLocation
  ()Lcom/fasterxml/jackson/core/JsonLocation;
- ()Lcom/fasterxml/jackson/core/JsonLocation;
+ ()L1com/fasterxml/jackson/core/JsonLocation; # @Inherited(com.fasterxml.jackson.core.base.ParserBase)
 setCodec
  (Lcom/fasterxml/jackson/core/ObjectCodec;)V
  (Lcom/fasterxml/jackson/core/ObjectCodec;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/JsonReadContext.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/JsonReadContext.eea
index 81d3222936..925844806e 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/JsonReadContext.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/JsonReadContext.eea
@@ -2,10 +2,10 @@ class com/fasterxml/jackson/core/json/JsonReadContext
 
 createRootContext
  (IILcom/fasterxml/jackson/core/json/DupDetector;)Lcom/fasterxml/jackson/core/json/JsonReadContext;
- (IILcom/fasterxml/jackson/core/json/DupDetector;)Lcom/fasterxml/jackson/core/json/JsonReadContext;
+ (IILcom/fasterxml/jackson/core/json/DupDetector;)L1com/fasterxml/jackson/core/json/JsonReadContext;
 createRootContext
  (Lcom/fasterxml/jackson/core/json/DupDetector;)Lcom/fasterxml/jackson/core/json/JsonReadContext;
- (Lcom/fasterxml/jackson/core/json/DupDetector;)Lcom/fasterxml/jackson/core/json/JsonReadContext;
+ (Lcom/fasterxml/jackson/core/json/DupDetector;)L1com/fasterxml/jackson/core/json/JsonReadContext;
 
 _child
  Lcom/fasterxml/jackson/core/json/JsonReadContext;
@@ -34,16 +34,16 @@ clearAndGetParent
  ()Lcom/fasterxml/jackson/core/json/JsonReadContext;
 createChildArrayContext
  (II)Lcom/fasterxml/jackson/core/json/JsonReadContext;
- (II)Lcom/fasterxml/jackson/core/json/JsonReadContext;
+ (II)L1com/fasterxml/jackson/core/json/JsonReadContext;
 createChildObjectContext
  (II)Lcom/fasterxml/jackson/core/json/JsonReadContext;
- (II)Lcom/fasterxml/jackson/core/json/JsonReadContext;
+ (II)L1com/fasterxml/jackson/core/json/JsonReadContext;
 getCurrentName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getCurrentValue
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.core.JsonStreamContext)
 getDupDetector
  ()Lcom/fasterxml/jackson/core/json/DupDetector;
  ()Lcom/fasterxml/jackson/core/json/DupDetector;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/JsonWriteContext.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/JsonWriteContext.eea
index 0a5fe67c59..e9fac2aea3 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/JsonWriteContext.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/JsonWriteContext.eea
@@ -2,10 +2,10 @@ class com/fasterxml/jackson/core/json/JsonWriteContext
 
 createRootContext
  ()Lcom/fasterxml/jackson/core/json/JsonWriteContext;
- ()Lcom/fasterxml/jackson/core/json/JsonWriteContext;
+ ()L1com/fasterxml/jackson/core/json/JsonWriteContext;
 createRootContext
  (Lcom/fasterxml/jackson/core/json/DupDetector;)Lcom/fasterxml/jackson/core/json/JsonWriteContext;
- (Lcom/fasterxml/jackson/core/json/DupDetector;)Lcom/fasterxml/jackson/core/json/JsonWriteContext;
+ (Lcom/fasterxml/jackson/core/json/DupDetector;)L1com/fasterxml/jackson/core/json/JsonWriteContext;
 
 _child
  Lcom/fasterxml/jackson/core/json/JsonWriteContext;
@@ -34,22 +34,22 @@ clearAndGetParent
  ()Lcom/fasterxml/jackson/core/json/JsonWriteContext;
 createChildArrayContext
  ()Lcom/fasterxml/jackson/core/json/JsonWriteContext;
- ()Lcom/fasterxml/jackson/core/json/JsonWriteContext;
+ ()L1com/fasterxml/jackson/core/json/JsonWriteContext;
 createChildArrayContext
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/core/json/JsonWriteContext;
- (Ljava/lang/Object;)Lcom/fasterxml/jackson/core/json/JsonWriteContext;
+ (Ljava/lang/Object;)L1com/fasterxml/jackson/core/json/JsonWriteContext;
 createChildObjectContext
  ()Lcom/fasterxml/jackson/core/json/JsonWriteContext;
- ()Lcom/fasterxml/jackson/core/json/JsonWriteContext;
+ ()L1com/fasterxml/jackson/core/json/JsonWriteContext;
 createChildObjectContext
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/core/json/JsonWriteContext;
- (Ljava/lang/Object;)Lcom/fasterxml/jackson/core/json/JsonWriteContext;
+ (Ljava/lang/Object;)L1com/fasterxml/jackson/core/json/JsonWriteContext;
 getCurrentName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getCurrentValue
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.core.JsonStreamContext)
 getDupDetector
  ()Lcom/fasterxml/jackson/core/json/DupDetector;
  ()Lcom/fasterxml/jackson/core/json/DupDetector;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/ReaderBasedJsonParser.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/ReaderBasedJsonParser.eea
index 57f0a9c35c..dc1097be36 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/ReaderBasedJsonParser.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/ReaderBasedJsonParser.eea
@@ -36,13 +36,13 @@ _handleInvalidNumberStart
  (IZ)Lcom/fasterxml/jackson/core/JsonToken;
 _handleInvalidNumberStart
  (IZZ)Lcom/fasterxml/jackson/core/JsonToken;
- (IZZ)Lcom/fasterxml/jackson/core/JsonToken;
+ (IZZ)L0com/fasterxml/jackson/core/JsonToken;
 _handleOddName
  (I)Ljava/lang/String;
  (I)Ljava/lang/String;
 _handleOddValue
  (I)Lcom/fasterxml/jackson/core/JsonToken;
- (I)Lcom/fasterxml/jackson/core/JsonToken;
+ (I)L0com/fasterxml/jackson/core/JsonToken;
 _isNextTokenNameMaybe
  (ILjava/lang/String;)Z
  (ILjava/lang/String;)Z
@@ -84,7 +84,7 @@ getBinaryValue
  (Lcom/fasterxml/jackson/core/Base64Variant;)[B
 getInputSource
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 getNextChar
  (Ljava/lang/String;)C
  (Ljava/lang/String;)C
@@ -99,7 +99,7 @@ getText
  (Ljava/io/Writer;)I
 getTextCharacters
  ()[C
- ()[C
+ ()[0C
 getValueAsString
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -108,16 +108,16 @@ getValueAsString
  (Ljava/lang/String;)Ljava/lang/String;
 nextBooleanValue
  ()Ljava/lang/Boolean;
- ()Ljava/lang/Boolean;
+ ()L0java/lang/Boolean; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 nextFieldName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 nextFieldName
  (Lcom/fasterxml/jackson/core/SerializableString;)Z
  (Lcom/fasterxml/jackson/core/SerializableString;)Z
 nextTextValue
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 nextToken
  ()Lcom/fasterxml/jackson/core/JsonToken;
  ()Lcom/fasterxml/jackson/core/JsonToken;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/UTF8DataInputJsonParser.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/UTF8DataInputJsonParser.eea
index 0a40bf8c36..86d22b4d27 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/UTF8DataInputJsonParser.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/UTF8DataInputJsonParser.eea
@@ -30,13 +30,13 @@ _handleInvalidNumberStart
  (IZ)Lcom/fasterxml/jackson/core/JsonToken;
 _handleInvalidNumberStart
  (IZZ)Lcom/fasterxml/jackson/core/JsonToken;
- (IZZ)Lcom/fasterxml/jackson/core/JsonToken;
+ (IZZ)L0com/fasterxml/jackson/core/JsonToken;
 _handleOddName
  (I)Ljava/lang/String;
  (I)Ljava/lang/String;
 _handleUnexpectedValue
  (I)Lcom/fasterxml/jackson/core/JsonToken;
- (I)Lcom/fasterxml/jackson/core/JsonToken;
+ (I)L0com/fasterxml/jackson/core/JsonToken;
 _matchToken
  (Ljava/lang/String;I)V
  (Ljava/lang/String;I)V
@@ -81,7 +81,7 @@ getBinaryValue
  (Lcom/fasterxml/jackson/core/Base64Variant;)[B
 getInputSource
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 getText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -90,7 +90,7 @@ getText
  (Ljava/io/Writer;)I
 getTextCharacters
  ()[C
- ()[C
+ ()[0C
 getValueAsString
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -99,16 +99,16 @@ getValueAsString
  (Ljava/lang/String;)Ljava/lang/String;
 nextBooleanValue
  ()Ljava/lang/Boolean;
- ()Ljava/lang/Boolean;
+ ()L0java/lang/Boolean; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 nextFieldName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 nextTextValue
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 nextToken
  ()Lcom/fasterxml/jackson/core/JsonToken;
- ()Lcom/fasterxml/jackson/core/JsonToken;
+ ()L0com/fasterxml/jackson/core/JsonToken;
 parseEscapedName
  ([IIIII)Ljava/lang/String;
  ([IIIII)Ljava/lang/String;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/UTF8JsonGenerator.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/UTF8JsonGenerator.eea
index 32133e0122..e91721195f 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/UTF8JsonGenerator.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/UTF8JsonGenerator.eea
@@ -45,7 +45,7 @@ _writePPFieldName
  (Ljava/lang/String;)V
 getOutputTarget
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.core.JsonGenerator)
 writeBinary
  (Lcom/fasterxml/jackson/core/Base64Variant;Ljava/io/InputStream;I)I
  (Lcom/fasterxml/jackson/core/Base64Variant;Ljava/io/InputStream;I)I
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/UTF8StreamJsonParser.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/UTF8StreamJsonParser.eea
index 3eb531eb66..95e70449b2 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/UTF8StreamJsonParser.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/UTF8StreamJsonParser.eea
@@ -39,13 +39,13 @@ _handleInvalidNumberStart
  (IZ)Lcom/fasterxml/jackson/core/JsonToken;
 _handleInvalidNumberStart
  (IZZ)Lcom/fasterxml/jackson/core/JsonToken;
- (IZZ)Lcom/fasterxml/jackson/core/JsonToken;
+ (IZZ)L0com/fasterxml/jackson/core/JsonToken;
 _handleOddName
  (I)Ljava/lang/String;
  (I)Ljava/lang/String;
 _handleUnexpectedValue
  (I)Lcom/fasterxml/jackson/core/JsonToken;
- (I)Lcom/fasterxml/jackson/core/JsonToken;
+ (I)L0com/fasterxml/jackson/core/JsonToken;
 _matchToken
  (Ljava/lang/String;I)V
  (Ljava/lang/String;I)V
@@ -87,7 +87,7 @@ getBinaryValue
  (Lcom/fasterxml/jackson/core/Base64Variant;)[B
 getInputSource
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 getText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -96,7 +96,7 @@ getText
  (Ljava/io/Writer;)I
 getTextCharacters
  ()[C
- ()[C
+ ()[0C
 getValueAsString
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -105,16 +105,16 @@ getValueAsString
  (Ljava/lang/String;)Ljava/lang/String;
 nextBooleanValue
  ()Ljava/lang/Boolean;
- ()Ljava/lang/Boolean;
+ ()L0java/lang/Boolean; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 nextFieldName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 nextFieldName
  (Lcom/fasterxml/jackson/core/SerializableString;)Z
  (Lcom/fasterxml/jackson/core/SerializableString;)Z
 nextTextValue
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 nextToken
  ()Lcom/fasterxml/jackson/core/JsonToken;
  ()Lcom/fasterxml/jackson/core/JsonToken;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/WriterBasedJsonGenerator.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/WriterBasedJsonGenerator.eea
index 446d960bdc..5ed550c0a2 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/WriterBasedJsonGenerator.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/WriterBasedJsonGenerator.eea
@@ -55,7 +55,7 @@ _writePPFieldName
  (Ljava/lang/String;Z)V
 getOutputTarget
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.core.JsonGenerator)
 writeBinary
  (Lcom/fasterxml/jackson/core/Base64Variant;Ljava/io/InputStream;I)I
  (Lcom/fasterxml/jackson/core/Base64Variant;Ljava/io/InputStream;I)I
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/async/NonBlockingByteBufferJsonParser.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/async/NonBlockingByteBufferJsonParser.eea
index 21e6da2683..8e01359583 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/async/NonBlockingByteBufferJsonParser.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/async/NonBlockingByteBufferJsonParser.eea
@@ -8,7 +8,7 @@ feedInput
  (Ljava/nio/ByteBuffer;)V
 getNonBlockingInputFeeder
  ()Lcom/fasterxml/jackson/core/async/NonBlockingInputFeeder;
- ()Lcom/fasterxml/jackson/core/async/NonBlockingInputFeeder;
+ ()L0com/fasterxml/jackson/core/async/NonBlockingInputFeeder; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 releaseBuffered
  (Ljava/io/OutputStream;)I
  (Ljava/io/OutputStream;)I
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/async/NonBlockingJsonParserBase.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/async/NonBlockingJsonParserBase.eea
index 45ddb64002..607864dca4 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/async/NonBlockingJsonParserBase.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/async/NonBlockingJsonParserBase.eea
@@ -46,7 +46,7 @@ _findName
  (IIII)Ljava/lang/String;
 _getText2
  (Lcom/fasterxml/jackson/core/JsonToken;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/core/JsonToken;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/core/JsonToken;)L0java/lang/String;
 _nonStdToken
  (I)Ljava/lang/String;
  (I)Ljava/lang/String;
@@ -76,10 +76,10 @@ getBinaryValue
  (Lcom/fasterxml/jackson/core/Base64Variant;)[B
 getEmbeddedObject
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 getInputSource
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 getText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -88,7 +88,7 @@ getText
  (Ljava/io/Writer;)I
 getTextCharacters
  ()[C
- ()[C
+ ()[0C
 getValueAsString
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/async/NonBlockingUtf8JsonParserBase.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/async/NonBlockingUtf8JsonParserBase.eea
index cd78149ef8..4900ede64c 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/async/NonBlockingUtf8JsonParserBase.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/json/async/NonBlockingUtf8JsonParserBase.eea
@@ -60,7 +60,7 @@ _finishNumberPlusMinus
  (IZ)Lcom/fasterxml/jackson/core/JsonToken;
 _finishToken
  ()Lcom/fasterxml/jackson/core/JsonToken;
- ()Lcom/fasterxml/jackson/core/JsonToken;
+ ()L0com/fasterxml/jackson/core/JsonToken;
 _finishTokenWithEOF
  ()Lcom/fasterxml/jackson/core/JsonToken;
  ()Lcom/fasterxml/jackson/core/JsonToken;
@@ -102,7 +102,7 @@ _startTrueToken
  ()Lcom/fasterxml/jackson/core/JsonToken;
 _startUnexpectedValue
  (ZI)Lcom/fasterxml/jackson/core/JsonToken;
- (ZI)Lcom/fasterxml/jackson/core/JsonToken;
+ (ZI)L0com/fasterxml/jackson/core/JsonToken;
 nextToken
  ()Lcom/fasterxml/jackson/core/JsonToken;
- ()Lcom/fasterxml/jackson/core/JsonToken;
+ ()L0com/fasterxml/jackson/core/JsonToken;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer.eea
index 5707342dfa..6ba68eaa8e 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer.eea
@@ -2,10 +2,10 @@ class com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer
 
 createRoot
  ()Lcom/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer;
- ()Lcom/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer;
+ ()L1com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer;
 createRoot
  (I)Lcom/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer;
- (I)Lcom/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer;
+ (I)L1com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer;
 
 _hashArea
  [I
@@ -40,16 +40,16 @@ calcHash
  ([II)I
 findName
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 findName
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 findName
  (III)Ljava/lang/String;
- (III)Ljava/lang/String;
+ (III)L0java/lang/String;
 findName
  ([II)Ljava/lang/String;
- ([II)Ljava/lang/String;
+ ([II)L0java/lang/String;
 makeChild
  (I)Lcom/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer;
  (I)Lcom/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/sym/CharsToNameCanonicalizer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/sym/CharsToNameCanonicalizer.eea
index e766364dbc..9183dc2d99 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/sym/CharsToNameCanonicalizer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/sym/CharsToNameCanonicalizer.eea
@@ -2,16 +2,16 @@ class com/fasterxml/jackson/core/sym/CharsToNameCanonicalizer
 
 createRoot
  ()Lcom/fasterxml/jackson/core/sym/CharsToNameCanonicalizer;
- ()Lcom/fasterxml/jackson/core/sym/CharsToNameCanonicalizer;
+ ()L1com/fasterxml/jackson/core/sym/CharsToNameCanonicalizer;
 createRoot
  (I)Lcom/fasterxml/jackson/core/sym/CharsToNameCanonicalizer;
- (I)Lcom/fasterxml/jackson/core/sym/CharsToNameCanonicalizer;
+ (I)L1com/fasterxml/jackson/core/sym/CharsToNameCanonicalizer;
 createRoot
  (Lcom/fasterxml/jackson/core/TokenStreamFactory;)Lcom/fasterxml/jackson/core/sym/CharsToNameCanonicalizer;
- (Lcom/fasterxml/jackson/core/TokenStreamFactory;)Lcom/fasterxml/jackson/core/sym/CharsToNameCanonicalizer;
+ (Lcom/fasterxml/jackson/core/TokenStreamFactory;)L1com/fasterxml/jackson/core/sym/CharsToNameCanonicalizer;
 createRoot
  (Lcom/fasterxml/jackson/core/TokenStreamFactory;I)Lcom/fasterxml/jackson/core/sym/CharsToNameCanonicalizer;
- (Lcom/fasterxml/jackson/core/TokenStreamFactory;I)Lcom/fasterxml/jackson/core/sym/CharsToNameCanonicalizer;
+ (Lcom/fasterxml/jackson/core/TokenStreamFactory;I)L1com/fasterxml/jackson/core/sym/CharsToNameCanonicalizer;
 
 _buckets
  [Lcom/fasterxml/jackson/core/sym/CharsToNameCanonicalizer$Bucket;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/sym/NameN.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/sym/NameN.eea
index b7f1af8dd6..daeecfcc63 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/sym/NameN.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/sym/NameN.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/core/sym/NameN
 
 construct
  (Ljava/lang/String;I[II)Lcom/fasterxml/jackson/core/sym/NameN;
- (Ljava/lang/String;I[II)Lcom/fasterxml/jackson/core/sym/NameN;
+ (Ljava/lang/String;I[II)L1com/fasterxml/jackson/core/sym/NameN;
 
 equals
  ([II)Z
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/BufferRecycler.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/BufferRecycler.eea
index c74ba622e7..9d8dc24d37 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/BufferRecycler.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/BufferRecycler.eea
@@ -25,10 +25,10 @@ allocCharBuffer
  (II)[C
 balloc
  (I)[B
- (I)[B
+ (I)[1B
 calloc
  (I)[C
- (I)[C
+ (I)[1C
 releaseByteBuffer
  (I[B)V
  (I[B)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/BufferRecyclers.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/BufferRecyclers.eea
index eae6a77f83..bfcd59f0f9 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/BufferRecyclers.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/BufferRecyclers.eea
@@ -12,7 +12,7 @@ encodeAsUTF8
  (Ljava/lang/String;)[B
 getBufferRecycler
  ()Lcom/fasterxml/jackson/core/util/BufferRecycler;
- ()Lcom/fasterxml/jackson/core/util/BufferRecycler;
+ ()L1com/fasterxml/jackson/core/util/BufferRecycler;
 getJsonStringEncoder
  ()Lcom/fasterxml/jackson/core/io/JsonStringEncoder;
  ()Lcom/fasterxml/jackson/core/io/JsonStringEncoder;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/ByteArrayBuilder.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/ByteArrayBuilder.eea
index 837f870f26..80d6c73c36 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/ByteArrayBuilder.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/ByteArrayBuilder.eea
@@ -6,7 +6,7 @@ NO_BYTES
 
 fromInitial
  ([BI)Lcom/fasterxml/jackson/core/util/ByteArrayBuilder;
- ([BI)Lcom/fasterxml/jackson/core/util/ByteArrayBuilder;
+ ([BI)L1com/fasterxml/jackson/core/util/ByteArrayBuilder;
 
 <init>
  (Lcom/fasterxml/jackson/core/util/BufferRecycler;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/DefaultPrettyPrinter.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/DefaultPrettyPrinter.eea
index b6be5d1167..cd7bedef41 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/DefaultPrettyPrinter.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/DefaultPrettyPrinter.eea
@@ -62,7 +62,7 @@ beforeObjectEntries
  (Lcom/fasterxml/jackson/core/JsonGenerator;)V
 createInstance
  ()Lcom/fasterxml/jackson/core/util/DefaultPrettyPrinter;
- ()Lcom/fasterxml/jackson/core/util/DefaultPrettyPrinter;
+ ()L1com/fasterxml/jackson/core/util/DefaultPrettyPrinter;
 indentArraysWith
  (Lcom/fasterxml/jackson/core/util/DefaultPrettyPrinter$Indenter;)V
  (Lcom/fasterxml/jackson/core/util/DefaultPrettyPrinter$Indenter;)V
@@ -83,7 +83,7 @@ withRootSeparator
  (Ljava/lang/String;)Lcom/fasterxml/jackson/core/util/DefaultPrettyPrinter;
 withSeparators
  (Lcom/fasterxml/jackson/core/util/Separators;)Lcom/fasterxml/jackson/core/util/DefaultPrettyPrinter;
- (Lcom/fasterxml/jackson/core/util/Separators;)Lcom/fasterxml/jackson/core/util/DefaultPrettyPrinter;
+ (Lcom/fasterxml/jackson/core/util/Separators;)L1com/fasterxml/jackson/core/util/DefaultPrettyPrinter;
 withSpacesInObjectEntries
  ()Lcom/fasterxml/jackson/core/util/DefaultPrettyPrinter;
  ()Lcom/fasterxml/jackson/core/util/DefaultPrettyPrinter;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/Instantiatable.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/Instantiatable.eea
index f7ee60fc87..a5ac4988e9 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/Instantiatable.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/Instantiatable.eea
@@ -4,4 +4,4 @@ class com/fasterxml/jackson/core/util/Instantiatable
 
 createInstance
  ()TT;
- ()TT;
+ ()T1T;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JacksonFeatureSet.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JacksonFeatureSet.eea
index 7abe56a9e1..8d4da6ee52 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JacksonFeatureSet.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JacksonFeatureSet.eea
@@ -4,17 +4,17 @@ class com/fasterxml/jackson/core/util/JacksonFeatureSet
 
 fromBitmask
  <F::Lcom/fasterxml/jackson/core/util/JacksonFeature;>(I)Lcom/fasterxml/jackson/core/util/JacksonFeatureSet<TF;>;
- <F::Lcom/fasterxml/jackson/core/util/JacksonFeature;>(I)Lcom/fasterxml/jackson/core/util/JacksonFeatureSet<TF;>;
+ <F::Lcom/fasterxml/jackson/core/util/JacksonFeature;>(I)L1com/fasterxml/jackson/core/util/JacksonFeatureSet<TF;>;
 fromDefaults
  <F::Lcom/fasterxml/jackson/core/util/JacksonFeature;>([TF;)Lcom/fasterxml/jackson/core/util/JacksonFeatureSet<TF;>;
- <F::Lcom/fasterxml/jackson/core/util/JacksonFeature;>([TF;)Lcom/fasterxml/jackson/core/util/JacksonFeatureSet<TF;>;
+ <F::Lcom/fasterxml/jackson/core/util/JacksonFeature;>([TF;)L1com/fasterxml/jackson/core/util/JacksonFeatureSet<TF;>;
 
 isEnabled
  (TF;)Z
  (TF;)Z
 with
  (TF;)Lcom/fasterxml/jackson/core/util/JacksonFeatureSet<TF;>;
- (TF;)Lcom/fasterxml/jackson/core/util/JacksonFeatureSet<TF;>;
+ (TF;)L1com/fasterxml/jackson/core/util/JacksonFeatureSet<TF;>;
 without
  (TF;)Lcom/fasterxml/jackson/core/util/JacksonFeatureSet<TF;>;
- (TF;)Lcom/fasterxml/jackson/core/util/JacksonFeatureSet<TF;>;
+ (TF;)L1com/fasterxml/jackson/core/util/JacksonFeatureSet<TF;>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonGeneratorDelegate.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonGeneratorDelegate.eea
index bf203f43dc..88c3c94589 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonGeneratorDelegate.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonGeneratorDelegate.eea
@@ -36,7 +36,7 @@ enable
  (Lcom/fasterxml/jackson/core/JsonGenerator$Feature;)Lcom/fasterxml/jackson/core/JsonGenerator;
 getCharacterEscapes
  ()Lcom/fasterxml/jackson/core/io/CharacterEscapes;
- ()Lcom/fasterxml/jackson/core/io/CharacterEscapes;
+ ()L0com/fasterxml/jackson/core/io/CharacterEscapes; # @Inherited(com.fasterxml.jackson.core.JsonGenerator)
 getCodec
  ()Lcom/fasterxml/jackson/core/ObjectCodec;
  ()Lcom/fasterxml/jackson/core/ObjectCodec;
@@ -51,13 +51,13 @@ getOutputContext
  ()Lcom/fasterxml/jackson/core/JsonStreamContext;
 getOutputTarget
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.core.JsonGenerator)
 getPrettyPrinter
  ()Lcom/fasterxml/jackson/core/PrettyPrinter;
  ()Lcom/fasterxml/jackson/core/PrettyPrinter;
 getSchema
  ()Lcom/fasterxml/jackson/core/FormatSchema;
- ()Lcom/fasterxml/jackson/core/FormatSchema;
+ ()L0com/fasterxml/jackson/core/FormatSchema; # @Inherited(com.fasterxml.jackson.core.JsonGenerator)
 getWriteCapabilities
  ()Lcom/fasterxml/jackson/core/util/JacksonFeatureSet<Lcom/fasterxml/jackson/core/StreamWriteCapability;>;
  ()Lcom/fasterxml/jackson/core/util/JacksonFeatureSet<Lcom/fasterxml/jackson/core/StreamWriteCapability;>;
@@ -90,7 +90,7 @@ setPrettyPrinter
  (Lcom/fasterxml/jackson/core/PrettyPrinter;)Lcom/fasterxml/jackson/core/JsonGenerator;
 setRootValueSeparator
  (Lcom/fasterxml/jackson/core/SerializableString;)Lcom/fasterxml/jackson/core/JsonGenerator;
- (Lcom/fasterxml/jackson/core/SerializableString;)Lcom/fasterxml/jackson/core/JsonGenerator;
+ (Lcom/fasterxml/jackson/core/SerializableString;)L1com/fasterxml/jackson/core/JsonGenerator; # @Inherited(com.fasterxml.jackson.core.JsonGenerator)
 setSchema
  (Lcom/fasterxml/jackson/core/FormatSchema;)V
  (Lcom/fasterxml/jackson/core/FormatSchema;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonParserDelegate.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonParserDelegate.eea
index 9a830e9fd2..99f13d97e4 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonParserDelegate.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonParserDelegate.eea
@@ -63,16 +63,16 @@ getDecimalValue
  ()Ljava/math/BigDecimal;
 getEmbeddedObject
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 getInputSource
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 getLastClearedToken
  ()Lcom/fasterxml/jackson/core/JsonToken;
  ()Lcom/fasterxml/jackson/core/JsonToken;
 getNonBlockingInputFeeder
  ()Lcom/fasterxml/jackson/core/async/NonBlockingInputFeeder;
- ()Lcom/fasterxml/jackson/core/async/NonBlockingInputFeeder;
+ ()L0com/fasterxml/jackson/core/async/NonBlockingInputFeeder; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 getNumberType
  ()Lcom/fasterxml/jackson/core/JsonParser$NumberType;
  ()Lcom/fasterxml/jackson/core/JsonParser$NumberType;
@@ -90,7 +90,7 @@ getNumberValueExact
  ()Ljava/lang/Number;
 getObjectId
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 getParsingContext
  ()Lcom/fasterxml/jackson/core/JsonStreamContext;
  ()Lcom/fasterxml/jackson/core/JsonStreamContext;
@@ -99,7 +99,7 @@ getReadCapabilities
  ()Lcom/fasterxml/jackson/core/util/JacksonFeatureSet<Lcom/fasterxml/jackson/core/StreamReadCapability;>;
 getSchema
  ()Lcom/fasterxml/jackson/core/FormatSchema;
- ()Lcom/fasterxml/jackson/core/FormatSchema;
+ ()L0com/fasterxml/jackson/core/FormatSchema; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 getText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -114,7 +114,7 @@ getTokenLocation
  ()Lcom/fasterxml/jackson/core/JsonLocation;
 getTypeId
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 getValueAsString
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonParserSequence.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonParserSequence.eea
index 014b3dc283..621127f269 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonParserSequence.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonParserSequence.eea
@@ -2,10 +2,10 @@ class com/fasterxml/jackson/core/util/JsonParserSequence
 
 createFlattened
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/core/JsonParser;)Lcom/fasterxml/jackson/core/util/JsonParserSequence;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/core/JsonParser;)Lcom/fasterxml/jackson/core/util/JsonParserSequence;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/core/JsonParser;)L1com/fasterxml/jackson/core/util/JsonParserSequence;
 createFlattened
  (ZLcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/core/JsonParser;)Lcom/fasterxml/jackson/core/util/JsonParserSequence;
- (ZLcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/core/JsonParser;)Lcom/fasterxml/jackson/core/util/JsonParserSequence;
+ (ZLcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/core/JsonParser;)L1com/fasterxml/jackson/core/util/JsonParserSequence;
 
 _parsers
  [Lcom/fasterxml/jackson/core/JsonParser;
@@ -22,10 +22,10 @@ addFlattenedActiveParsers
  (Ljava/util/List<Lcom/fasterxml/jackson/core/JsonParser;>;)V
 nextToken
  ()Lcom/fasterxml/jackson/core/JsonToken;
- ()Lcom/fasterxml/jackson/core/JsonToken;
+ ()L0com/fasterxml/jackson/core/JsonToken;
 skipChildren
  ()Lcom/fasterxml/jackson/core/JsonParser;
  ()Lcom/fasterxml/jackson/core/JsonParser;
 switchAndReturnNext
  ()Lcom/fasterxml/jackson/core/JsonToken;
- ()Lcom/fasterxml/jackson/core/JsonToken;
+ ()L0com/fasterxml/jackson/core/JsonToken;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonRecyclerPools$BoundedPool.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonRecyclerPools$BoundedPool.eea
index 5aa397a6c9..5d34ee0646 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonRecyclerPools$BoundedPool.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonRecyclerPools$BoundedPool.eea
@@ -10,11 +10,11 @@ GLOBAL
 
 construct
  (I)Lcom/fasterxml/jackson/core/util/JsonRecyclerPools$BoundedPool;
- (I)Lcom/fasterxml/jackson/core/util/JsonRecyclerPools$BoundedPool;
+ (I)L1com/fasterxml/jackson/core/util/JsonRecyclerPools$BoundedPool;
 
 createPooled
  ()Lcom/fasterxml/jackson/core/util/BufferRecycler;
- ()Lcom/fasterxml/jackson/core/util/BufferRecycler;
+ ()L1com/fasterxml/jackson/core/util/BufferRecycler;
 readResolve
  ()Ljava/lang/Object;
  ()L1java/lang/Object;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonRecyclerPools$ConcurrentDequePool.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonRecyclerPools$ConcurrentDequePool.eea
index 4f338f6bd4..c50178acec 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonRecyclerPools$ConcurrentDequePool.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonRecyclerPools$ConcurrentDequePool.eea
@@ -14,7 +14,7 @@ construct
 
 createPooled
  ()Lcom/fasterxml/jackson/core/util/BufferRecycler;
- ()Lcom/fasterxml/jackson/core/util/BufferRecycler;
+ ()L1com/fasterxml/jackson/core/util/BufferRecycler;
 readResolve
  ()Ljava/lang/Object;
  ()L1java/lang/Object;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonRecyclerPools$LockFreePool.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonRecyclerPools$LockFreePool.eea
index 1e00c1259b..e14baa3e8e 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonRecyclerPools$LockFreePool.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonRecyclerPools$LockFreePool.eea
@@ -14,7 +14,7 @@ construct
 
 createPooled
  ()Lcom/fasterxml/jackson/core/util/BufferRecycler;
- ()Lcom/fasterxml/jackson/core/util/BufferRecycler;
+ ()L1com/fasterxml/jackson/core/util/BufferRecycler;
 readResolve
  ()Ljava/lang/Object;
  ()L1java/lang/Object;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonRecyclerPools$NonRecyclingPool.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonRecyclerPools$NonRecyclingPool.eea
index 5a48168aae..476cc6454c 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonRecyclerPools$NonRecyclingPool.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/JsonRecyclerPools$NonRecyclingPool.eea
@@ -10,7 +10,7 @@ GLOBAL
 
 acquirePooled
  ()Lcom/fasterxml/jackson/core/util/BufferRecycler;
- ()Lcom/fasterxml/jackson/core/util/BufferRecycler;
+ ()L1com/fasterxml/jackson/core/util/BufferRecycler;
 readResolve
  ()Ljava/lang/Object;
  ()L1java/lang/Object;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/RecyclerPool$StatefulImplBase.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/RecyclerPool$StatefulImplBase.eea
index 46f0815f9d..fa6bc87db7 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/RecyclerPool$StatefulImplBase.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/RecyclerPool$StatefulImplBase.eea
@@ -11,4 +11,4 @@ _resolveToShared
  (Lcom/fasterxml/jackson/core/util/RecyclerPool$StatefulImplBase<TP;>;)Ljava/util/Optional<Lcom/fasterxml/jackson/core/util/RecyclerPool$StatefulImplBase<TP;>;>;
 createPooled
  ()TP;
- ()TP;
+ ()T1P;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/Separators$Spacing.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/Separators$Spacing.eea
index b5f26a8879..5a8afdca56 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/Separators$Spacing.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/Separators$Spacing.eea
@@ -6,7 +6,7 @@ super java/lang/Enum
 
 apply
  (C)Ljava/lang/String;
- (C)Ljava/lang/String;
+ (C)L1java/lang/String;
 spacesAfter
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/Separators.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/Separators.eea
index 2165cc8146..c2eb2b08a4 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/Separators.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/Separators.eea
@@ -12,7 +12,7 @@ DEFAULT_ROOT_VALUE_SEPARATOR
 
 createDefaultInstance
  ()Lcom/fasterxml/jackson/core/util/Separators;
- ()Lcom/fasterxml/jackson/core/util/Separators;
+ ()L1com/fasterxml/jackson/core/util/Separators;
 
 <init>
  (Ljava/lang/String;CLcom/fasterxml/jackson/core/util/Separators$Spacing;CLcom/fasterxml/jackson/core/util/Separators$Spacing;CLcom/fasterxml/jackson/core/util/Separators$Spacing;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/TextBuffer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/TextBuffer.eea
index 266dc445f3..805d658252 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/TextBuffer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/TextBuffer.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/core/util/TextBuffer
 
 fromInitial
  ([C)Lcom/fasterxml/jackson/core/util/TextBuffer;
- ([C)Lcom/fasterxml/jackson/core/util/TextBuffer;
+ ([C)L1com/fasterxml/jackson/core/util/TextBuffer;
 
 <init>
  (Lcom/fasterxml/jackson/core/util/BufferRecycler;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/VersionUtil.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/VersionUtil.eea
index a42d60881d..345a8b7f76 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/VersionUtil.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/core/util/VersionUtil.eea
@@ -14,7 +14,7 @@ parseVersionPart
  (Ljava/lang/String;)I
 throwInternalReturnAny
  <T:Ljava/lang/Object;>()TT;
- <T:Ljava/lang/Object;>()TT;
+ <T:Ljava/lang/Object;>()T1T;
 versionFor
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/core/Version;
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/core/Version;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/AbstractTypeResolver.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/AbstractTypeResolver.eea
index bf36667372..7cc77c0469 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/AbstractTypeResolver.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/AbstractTypeResolver.eea
@@ -2,10 +2,10 @@ class com/fasterxml/jackson/databind/AbstractTypeResolver
 
 findTypeMapping
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/JavaType;
 resolveAbstractType
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)L0com/fasterxml/jackson/databind/JavaType;
 resolveAbstractType
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/JavaType;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty.eea
index a006a00790..5034421280 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty.eea
@@ -2,10 +2,10 @@ class com/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty
 
 back
  (Ljava/lang/String;)Lcom/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty;
- (Ljava/lang/String;)Lcom/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty;
+ (Ljava/lang/String;)L1com/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty;
 managed
  (Ljava/lang/String;)Lcom/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty;
- (Ljava/lang/String;)Lcom/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty;
+ (Ljava/lang/String;)L1com/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty;
 
 <init>
  (Lcom/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty$Type;Ljava/lang/String;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/AnnotationIntrospector.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/AnnotationIntrospector.eea
index eb349a6d20..2b333647b0 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/AnnotationIntrospector.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/AnnotationIntrospector.eea
@@ -5,7 +5,7 @@ nopInstance
  ()Lcom/fasterxml/jackson/databind/AnnotationIntrospector;
 pair
  (Lcom/fasterxml/jackson/databind/AnnotationIntrospector;Lcom/fasterxml/jackson/databind/AnnotationIntrospector;)Lcom/fasterxml/jackson/databind/AnnotationIntrospector;
- (Lcom/fasterxml/jackson/databind/AnnotationIntrospector;Lcom/fasterxml/jackson/databind/AnnotationIntrospector;)Lcom/fasterxml/jackson/databind/AnnotationIntrospector;
+ (Lcom/fasterxml/jackson/databind/AnnotationIntrospector;Lcom/fasterxml/jackson/databind/AnnotationIntrospector;)L1com/fasterxml/jackson/databind/AnnotationIntrospector;
 
 _findAnnotation
  <A::Ljava/lang/annotation/Annotation;>(Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Class<TA;>;)TA;
@@ -30,34 +30,34 @@ findAutoDetectVisibility
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/introspect/VisibilityChecker<*>;)Lcom/fasterxml/jackson/databind/introspect/VisibilityChecker<*>;
 findClassDescription
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0java/lang/String;
 findContentDeserializer
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object;
 findContentSerializer
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object;
 findCreatorAnnotation
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonCreator$Mode;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonCreator$Mode;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/annotation/JsonCreator$Mode;
 findCreatorBinding
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonCreator$Mode;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonCreator$Mode;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/annotation/JsonCreator$Mode;
 findDefaultEnumValue
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;[Ljava/lang/Enum<*>;)Ljava/lang/Enum<*>;
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;[Ljava/lang/Enum<*>;)Ljava/lang/Enum<*>;
 findDefaultEnumValue
  (Ljava/lang/Class<Ljava/lang/Enum<*>;>;)Ljava/lang/Enum<*>;
- (Ljava/lang/Class<Ljava/lang/Enum<*>;>;)Ljava/lang/Enum<*>;
+ (Ljava/lang/Class<Ljava/lang/Enum<*>;>;)L0java/lang/Enum<*>;
 findDeserializationContentConverter
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0java/lang/Object;
 findDeserializationConverter
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object;
 findDeserializer
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object;
 findEnumAliases
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;[Ljava/lang/Enum<*>;[[Ljava/lang/String;)V
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;[Ljava/lang/Enum<*>;[[Ljava/lang/String;)V
@@ -66,7 +66,7 @@ findEnumAliases
  (Ljava/lang/Class<*>;[Ljava/lang/Enum<*>;[[Ljava/lang/String;)V
 findEnumNamingStrategy
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0java/lang/Object;
 findEnumValue
  (Ljava/lang/Enum<*>;)Ljava/lang/String;
  (Ljava/lang/Enum<*>;)Ljava/lang/String;
@@ -78,70 +78,70 @@ findEnumValues
  (Ljava/lang/Class<*>;[Ljava/lang/Enum<*>;[Ljava/lang/String;)[Ljava/lang/String;
 findFilterId
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object;
 findFormat
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
 findImplicitPropertyName
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0java/lang/String;
 findInjectableValue
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/annotation/JacksonInject$Value;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/annotation/JacksonInject$Value;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0com/fasterxml/jackson/annotation/JacksonInject$Value;
 findInjectableValueId
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0java/lang/Object;
 findKeyDeserializer
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object;
 findKeySerializer
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object;
 findMergeInfo
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Boolean;
 findNameForDeserialization
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/PropertyName;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/PropertyName;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/databind/PropertyName;
 findNameForSerialization
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/PropertyName;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/PropertyName;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/databind/PropertyName;
 findNamingStrategy
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0java/lang/Object;
 findNullSerializer
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object;
 findObjectIdInfo
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/introspect/ObjectIdInfo;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/introspect/ObjectIdInfo;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/databind/introspect/ObjectIdInfo;
 findObjectReferenceInfo
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;Lcom/fasterxml/jackson/databind/introspect/ObjectIdInfo;)Lcom/fasterxml/jackson/databind/introspect/ObjectIdInfo;
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;Lcom/fasterxml/jackson/databind/introspect/ObjectIdInfo;)Lcom/fasterxml/jackson/databind/introspect/ObjectIdInfo;
 findPOJOBuilder
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Class<*>;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Class<*>;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0java/lang/Class<*>;
 findPOJOBuilderConfig
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/databind/annotation/JsonPOJOBuilder$Value;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/databind/annotation/JsonPOJOBuilder$Value;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0com/fasterxml/jackson/databind/annotation/JsonPOJOBuilder$Value;
 findPolymorphicTypeInfo
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonTypeInfo$Value;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonTypeInfo$Value;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/annotation/JsonTypeInfo$Value;
 findPropertyAccess
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonProperty$Access;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonProperty$Access;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/annotation/JsonProperty$Access;
 findPropertyAliases
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/util/List<Lcom/fasterxml/jackson/databind/PropertyName;>;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/util/List<Lcom/fasterxml/jackson/databind/PropertyName;>;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/util/List<Lcom/fasterxml/jackson/databind/PropertyName;>;
 findPropertyContentTypeResolver
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
 findPropertyDefaultValue
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/String;
 findPropertyDescription
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/String;
 findPropertyIgnoralByName
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonIgnoreProperties$Value;
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonIgnoreProperties$Value;
@@ -156,79 +156,79 @@ findPropertyInclusionByName
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonIncludeProperties$Value;
 findPropertyIndex
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Integer;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Integer;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Integer;
 findPropertyTypeResolver
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
 findReferenceType
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0com/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty;
 findRenameByField
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedField;Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/PropertyName;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedField;Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/PropertyName;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedField;Lcom/fasterxml/jackson/databind/PropertyName;)L0com/fasterxml/jackson/databind/PropertyName;
 findRootName
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/databind/PropertyName;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/databind/PropertyName;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0com/fasterxml/jackson/databind/PropertyName;
 findSerializationContentConverter
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0java/lang/Object;
 findSerializationConverter
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object;
 findSerializationPropertyOrder
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)[Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)[Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)[0Ljava/lang/String;
 findSerializationSortAlphabetically
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Boolean;
 findSerializationTyping
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/annotation/JsonSerialize$Typing;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/annotation/JsonSerialize$Typing;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/databind/annotation/JsonSerialize$Typing;
 findSerializer
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object;
 findSetterInfo
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonSetter$Value;
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonSetter$Value;
 findSubtypes
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/util/List<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/util/List<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/util/List<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;
 findTypeName
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0java/lang/String;
 findTypeResolver
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
 findUnwrappingNameTransformer
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/util/NameTransformer;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/util/NameTransformer;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0com/fasterxml/jackson/databind/util/NameTransformer;
 findValueInstantiator
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0java/lang/Object;
 findViews
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)[Ljava/lang/Class<*>;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)[Ljava/lang/Class<*>;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)[0Ljava/lang/Class<*>;
 findWrapperName
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/PropertyName;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/PropertyName;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/databind/PropertyName;
 hasAnyGetter
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Boolean;
 hasAnyGetterAnnotation
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Z
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Z
 hasAnySetter
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Boolean;
 hasAnySetterAnnotation
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Z
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Z
 hasAsKey
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Boolean;
 hasAsValue
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Boolean;
 hasAsValueAnnotation
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Z
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Z
@@ -240,16 +240,16 @@ hasIgnoreMarker
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Z
 hasRequiredMarker
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0java/lang/Boolean;
 isAnnotationBundle
  (Ljava/lang/annotation/Annotation;)Z
  (Ljava/lang/annotation/Annotation;)Z
 isIgnorableType
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0java/lang/Boolean;
 isTypeId
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0java/lang/Boolean;
 refineDeserializationType
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
@@ -258,7 +258,7 @@ refineSerializationType
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
 resolveSetterConflict
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)L0com/fasterxml/jackson/databind/introspect/AnnotatedMethod;
 version
  ()Lcom/fasterxml/jackson/core/Version;
  ()Lcom/fasterxml/jackson/core/Version;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/BeanDescription.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/BeanDescription.eea
index 100162d71b..770bcd5e44 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/BeanDescription.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/BeanDescription.eea
@@ -15,13 +15,13 @@ findAnyGetter
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
 findAnySetter
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedMethod;
 findAnySetterAccessor
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
 findAnySetterField
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedMember;
 findBackReferenceProperties
  ()Ljava/util/Map<Ljava/lang/String;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;>;
  ()Ljava/util/Map<Ljava/lang/String;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;>;
@@ -30,7 +30,7 @@ findBackReferences
  ()Ljava/util/List<Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;>;
 findClassDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 findDefaultConstructor
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedConstructor;
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedConstructor;
@@ -54,7 +54,7 @@ findInjectables
  ()Ljava/util/Map<Ljava/lang/Object;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;>;
 findJsonKeyAccessor
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedMember;
 findJsonValueAccessor
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/BeanProperty$Bogus.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/BeanProperty$Bogus.eea
index 328d469e50..6cb3e8788d 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/BeanProperty$Bogus.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/BeanProperty$Bogus.eea
@@ -14,28 +14,28 @@ findPropertyFormat
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
 findPropertyInclusion
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/JsonInclude$Value;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/JsonInclude$Value;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Ljava/lang/Class<*>;)L0com/fasterxml/jackson/annotation/JsonInclude$Value;
 getAnnotation
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
- <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
+ <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)T0A;
 getContextAnnotation
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
- <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
+ <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)T0A;
 getFullName
  ()Lcom/fasterxml/jackson/databind/PropertyName;
  ()Lcom/fasterxml/jackson/databind/PropertyName;
 getMember
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedMember;
 getMetadata
  ()Lcom/fasterxml/jackson/databind/PropertyMetadata;
  ()Lcom/fasterxml/jackson/databind/PropertyMetadata;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getType
  ()Lcom/fasterxml/jackson/databind/JavaType;
  ()Lcom/fasterxml/jackson/databind/JavaType;
 getWrapperName
  ()Lcom/fasterxml/jackson/databind/PropertyName;
- ()Lcom/fasterxml/jackson/databind/PropertyName;
+ ()L0com/fasterxml/jackson/databind/PropertyName;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/BeanProperty$Std.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/BeanProperty$Std.eea
index 27e4ec7947..4d90c89244 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/BeanProperty$Std.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/BeanProperty$Std.eea
@@ -45,7 +45,7 @@ getAnnotation
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
 getContextAnnotation
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
- <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
+ <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)T0A;
 getFullName
  ()Lcom/fasterxml/jackson/databind/PropertyName;
  ()Lcom/fasterxml/jackson/databind/PropertyName;
@@ -66,4 +66,4 @@ getWrapperName
  ()Lcom/fasterxml/jackson/databind/PropertyName;
 withType
  (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/BeanProperty$Std;
- (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/BeanProperty$Std;
+ (Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/BeanProperty$Std;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/DatabindContext.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/DatabindContext.eea
index f444440a14..e5e833a476 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/DatabindContext.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/DatabindContext.eea
@@ -14,13 +14,13 @@ _quotedString
  (Ljava/lang/String;)Ljava/lang/String;
 _throwNotASubtype
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;)TT;
- <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;)TT;
+ <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;)T1T;
 _throwSubtypeClassNotAllowed
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;)TT;
- <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;)TT;
+ <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;)T1T;
 _throwSubtypeNameNotAllowed
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;)TT;
- <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;)TT;
+ <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;)T1T;
 _truncate
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
@@ -32,7 +32,7 @@ constructType
  (Ljava/lang/reflect/Type;)Lcom/fasterxml/jackson/databind/JavaType;
 converterInstance
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Object;)L0com/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;Ljava/lang/Object;>;
 getActiveView
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
@@ -83,10 +83,10 @@ reportBadDefinition
  <T:Ljava/lang/Object;>(Ljava/lang/Class<*>;Ljava/lang/String;)TT;
 resolveAndValidateSubType
  (Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;)L0com/fasterxml/jackson/databind/JavaType;
 resolveSubType
  (Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;)L0com/fasterxml/jackson/databind/JavaType;
 setAttribute
  (Ljava/lang/Object;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/DatabindContext;
  (Ljava/lang/Object;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/DatabindContext;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/DeserializationConfig.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/DeserializationConfig.eea
index fb9207b231..bfbbb370f8 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/DeserializationConfig.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/DeserializationConfig.eea
@@ -34,10 +34,10 @@ _problemHandlers
  (Lcom/fasterxml/jackson/databind/cfg/BaseSettings;Lcom/fasterxml/jackson/databind/jsontype/SubtypeResolver;Lcom/fasterxml/jackson/databind/introspect/SimpleMixInResolver;Lcom/fasterxml/jackson/databind/util/RootNameLookup;Lcom/fasterxml/jackson/databind/cfg/ConfigOverrides;Lcom/fasterxml/jackson/databind/cfg/CoercionConfigs;Lcom/fasterxml/jackson/databind/cfg/DatatypeFeatures;)V
 _with
  (Lcom/fasterxml/jackson/databind/cfg/DatatypeFeatures;)Lcom/fasterxml/jackson/databind/DeserializationConfig;
- (Lcom/fasterxml/jackson/databind/cfg/DatatypeFeatures;)Lcom/fasterxml/jackson/databind/DeserializationConfig;
+ (Lcom/fasterxml/jackson/databind/cfg/DatatypeFeatures;)L1com/fasterxml/jackson/databind/DeserializationConfig;
 _withBase
  (Lcom/fasterxml/jackson/databind/cfg/BaseSettings;)Lcom/fasterxml/jackson/databind/DeserializationConfig;
- (Lcom/fasterxml/jackson/databind/cfg/BaseSettings;)Lcom/fasterxml/jackson/databind/DeserializationConfig;
+ (Lcom/fasterxml/jackson/databind/cfg/BaseSettings;)L1com/fasterxml/jackson/databind/DeserializationConfig;
 _withMapperFeatures
  (J)Lcom/fasterxml/jackson/databind/DeserializationConfig;
  (J)Lcom/fasterxml/jackson/databind/DeserializationConfig;
@@ -49,7 +49,7 @@ findCoercionFromBlankString
  (Lcom/fasterxml/jackson/databind/type/LogicalType;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/cfg/CoercionAction;)Lcom/fasterxml/jackson/databind/cfg/CoercionAction;
 findTypeDeserializer
  (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;
- (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;
+ (Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/jsontype/TypeDeserializer;
 getBaseSettings
  ()Lcom/fasterxml/jackson/databind/cfg/BaseSettings;
  ()Lcom/fasterxml/jackson/databind/cfg/BaseSettings;
@@ -106,10 +106,10 @@ with
  (Lcom/fasterxml/jackson/databind/cfg/ConstructorDetector;)Lcom/fasterxml/jackson/databind/DeserializationConfig;
 with
  (Lcom/fasterxml/jackson/databind/cfg/ContextAttributes;)Lcom/fasterxml/jackson/databind/DeserializationConfig;
- (Lcom/fasterxml/jackson/databind/cfg/ContextAttributes;)Lcom/fasterxml/jackson/databind/DeserializationConfig;
+ (Lcom/fasterxml/jackson/databind/cfg/ContextAttributes;)L1com/fasterxml/jackson/databind/DeserializationConfig;
 with
  (Lcom/fasterxml/jackson/databind/jsontype/SubtypeResolver;)Lcom/fasterxml/jackson/databind/DeserializationConfig;
- (Lcom/fasterxml/jackson/databind/jsontype/SubtypeResolver;)Lcom/fasterxml/jackson/databind/DeserializationConfig;
+ (Lcom/fasterxml/jackson/databind/jsontype/SubtypeResolver;)L1com/fasterxml/jackson/databind/DeserializationConfig;
 with
  (Lcom/fasterxml/jackson/databind/node/JsonNodeFactory;)Lcom/fasterxml/jackson/databind/DeserializationConfig;
  (Lcom/fasterxml/jackson/databind/node/JsonNodeFactory;)Lcom/fasterxml/jackson/databind/DeserializationConfig;
@@ -133,7 +133,7 @@ withRootName
  (Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/DeserializationConfig;
 withView
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/DeserializationConfig;
- (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/DeserializationConfig;
+ (Ljava/lang/Class<*>;)L1com/fasterxml/jackson/databind/DeserializationConfig;
 without
  (Lcom/fasterxml/jackson/core/FormatFeature;)Lcom/fasterxml/jackson/databind/DeserializationConfig;
  (Lcom/fasterxml/jackson/core/FormatFeature;)Lcom/fasterxml/jackson/databind/DeserializationConfig;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/DeserializationContext.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/DeserializationContext.eea
index 55a0c11d9c..decd9d5a74 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/DeserializationContext.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/DeserializationContext.eea
@@ -72,7 +72,7 @@ bufferForInputBuffering
  ()Lcom/fasterxml/jackson/databind/util/TokenBuffer;
 bufferForInputBuffering
  (Lcom/fasterxml/jackson/core/JsonParser;)Lcom/fasterxml/jackson/databind/util/TokenBuffer;
- (Lcom/fasterxml/jackson/core/JsonParser;)Lcom/fasterxml/jackson/databind/util/TokenBuffer;
+ (Lcom/fasterxml/jackson/core/JsonParser;)L1com/fasterxml/jackson/databind/util/TokenBuffer;
 constructCalendar
  (Ljava/util/Date;)Ljava/util/Calendar;
  (Ljava/util/Date;)Ljava/util/Calendar;
@@ -114,7 +114,7 @@ findObjectId
  (Ljava/lang/Object;Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<*>;Lcom/fasterxml/jackson/annotation/ObjectIdResolver;)Lcom/fasterxml/jackson/databind/deser/impl/ReadableObjectId;
 findRootValueDeserializer
  (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
 getActiveView
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
@@ -171,7 +171,7 @@ handleMissingInstantiator
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/deser/ValueInstantiator;Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/Object;
 handleMissingTypeId
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/jsontype/TypeIdResolver;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/jsontype/TypeIdResolver;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/jsontype/TypeIdResolver;Ljava/lang/String;)L0com/fasterxml/jackson/databind/JavaType;
 handlePrimaryContextualization
  (Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
  (Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
@@ -183,7 +183,7 @@ handleUnexpectedToken
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/core/JsonParser;)Ljava/lang/Object;
 handleUnexpectedToken
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/core/JsonToken;Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/core/JsonToken;Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/core/JsonToken;Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;[Ljava/lang/Object;)L0java/lang/Object;
 handleUnexpectedToken
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/core/JsonParser;)Ljava/lang/Object;
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/core/JsonParser;)Ljava/lang/Object;
@@ -195,7 +195,7 @@ handleUnknownProperty
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;Ljava/lang/Object;Ljava/lang/String;)Z
 handleUnknownTypeId
  (Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;Lcom/fasterxml/jackson/databind/jsontype/TypeIdResolver;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;Lcom/fasterxml/jackson/databind/jsontype/TypeIdResolver;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;Lcom/fasterxml/jackson/databind/jsontype/TypeIdResolver;Ljava/lang/String;)L0com/fasterxml/jackson/databind/JavaType;
 handleWeirdKey
  (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/Object;
@@ -237,7 +237,7 @@ keyDeserializerInstance
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
 leaseObjectBuffer
  ()Lcom/fasterxml/jackson/databind/util/ObjectBuffer;
- ()Lcom/fasterxml/jackson/databind/util/ObjectBuffer;
+ ()L1com/fasterxml/jackson/databind/util/ObjectBuffer;
 missingTypeIdException
  (Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JsonMappingException;
  (Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JsonMappingException;
@@ -267,37 +267,37 @@ readValue
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/Class<TT;>;)TT;
 reportBadCoercion
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;Ljava/lang/Class<*>;Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;)TT;
- <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;Ljava/lang/Class<*>;Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;)TT;
+ <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;Ljava/lang/Class<*>;Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;)T1T;
 reportBadDefinition
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;)TT;
- <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;)TT;
+ <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;)T1T;
 reportBadPropertyDefinition
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Ljava/lang/String;[Ljava/lang/Object;)TT;
- <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Ljava/lang/String;[Ljava/lang/Object;)TT;
+ <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Ljava/lang/String;[Ljava/lang/Object;)T1T;
 reportBadTypeDefinition
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/BeanDescription;Ljava/lang/String;[Ljava/lang/Object;)TT;
- <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/BeanDescription;Ljava/lang/String;[Ljava/lang/Object;)TT;
+ <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/BeanDescription;Ljava/lang/String;[Ljava/lang/Object;)T1T;
 reportInputMismatch
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/String;[Ljava/lang/Object;)TT;
- <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/String;[Ljava/lang/Object;)TT;
+ <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/String;[Ljava/lang/Object;)T1T;
 reportInputMismatch
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;[Ljava/lang/Object;)TT;
- <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;[Ljava/lang/Object;)TT;
+ <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;[Ljava/lang/Object;)T1T;
 reportInputMismatch
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;Ljava/lang/String;[Ljava/lang/Object;)TT;
- <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;Ljava/lang/String;[Ljava/lang/Object;)TT;
+ <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;Ljava/lang/String;[Ljava/lang/Object;)T1T;
 reportInputMismatch
  <T:Ljava/lang/Object;>(Ljava/lang/Class<*>;Ljava/lang/String;[Ljava/lang/Object;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<*>;Ljava/lang/String;[Ljava/lang/Object;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<*>;Ljava/lang/String;[Ljava/lang/Object;)T1T;
 reportPropertyInputMismatch
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)TT;
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)TT;
 reportPropertyInputMismatch
  <T:Ljava/lang/Object;>(Ljava/lang/Class<*>;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<*>;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<*>;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)T1T;
 reportTrailingTokens
  <T:Ljava/lang/Object;>(Ljava/lang/Class<*>;Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/core/JsonToken;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<*>;Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/core/JsonToken;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<*>;Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/core/JsonToken;)T1T;
 reportUnresolvedObjectId
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/deser/impl/ObjectIdReader;Ljava/lang/Object;)TT;
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/deser/impl/ObjectIdReader;Ljava/lang/Object;)TT;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/JavaType.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/JavaType.eea
index 71d2134cef..c8c9199cb4 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/JavaType.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/JavaType.eea
@@ -45,13 +45,13 @@ getBindings
  ()Lcom/fasterxml/jackson/databind/type/TypeBindings;
 getContentType
  ()Lcom/fasterxml/jackson/databind/JavaType;
- ()Lcom/fasterxml/jackson/databind/JavaType;
+ ()L0com/fasterxml/jackson/databind/JavaType;
 getContentTypeHandler
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getContentValueHandler
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getErasedSignature
  ()Ljava/lang/String;
  ()L1java/lang/String;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/JsonMappingException.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/JsonMappingException.eea
index eb2a12e6e7..5b690ac3cd 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/JsonMappingException.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/JsonMappingException.eea
@@ -2,34 +2,34 @@ class com/fasterxml/jackson/databind/JsonMappingException
 
 from
  (Lcom/fasterxml/jackson/core/JsonGenerator;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JsonMappingException;
- (Lcom/fasterxml/jackson/core/JsonGenerator;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JsonMappingException;
+ (Lcom/fasterxml/jackson/core/JsonGenerator;Ljava/lang/String;)L1com/fasterxml/jackson/databind/JsonMappingException;
 from
  (Lcom/fasterxml/jackson/core/JsonGenerator;Ljava/lang/String;Ljava/lang/Throwable;)Lcom/fasterxml/jackson/databind/JsonMappingException;
- (Lcom/fasterxml/jackson/core/JsonGenerator;Ljava/lang/String;Ljava/lang/Throwable;)Lcom/fasterxml/jackson/databind/JsonMappingException;
+ (Lcom/fasterxml/jackson/core/JsonGenerator;Ljava/lang/String;Ljava/lang/Throwable;)L1com/fasterxml/jackson/databind/JsonMappingException;
 from
  (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JsonMappingException;
- (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JsonMappingException;
+ (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;)L1com/fasterxml/jackson/databind/JsonMappingException;
 from
  (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;Ljava/lang/Throwable;)Lcom/fasterxml/jackson/databind/JsonMappingException;
- (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;Ljava/lang/Throwable;)Lcom/fasterxml/jackson/databind/JsonMappingException;
+ (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;Ljava/lang/Throwable;)L1com/fasterxml/jackson/databind/JsonMappingException;
 from
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JsonMappingException;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JsonMappingException;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;)L1com/fasterxml/jackson/databind/JsonMappingException;
 from
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;Ljava/lang/Throwable;)Lcom/fasterxml/jackson/databind/JsonMappingException;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;Ljava/lang/Throwable;)Lcom/fasterxml/jackson/databind/JsonMappingException;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;Ljava/lang/Throwable;)L1com/fasterxml/jackson/databind/JsonMappingException;
 from
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JsonMappingException;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JsonMappingException;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/String;)L1com/fasterxml/jackson/databind/JsonMappingException;
 from
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/String;Ljava/lang/Throwable;)Lcom/fasterxml/jackson/databind/JsonMappingException;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/String;Ljava/lang/Throwable;)Lcom/fasterxml/jackson/databind/JsonMappingException;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/String;Ljava/lang/Throwable;)L1com/fasterxml/jackson/databind/JsonMappingException;
 fromUnexpectedIOE
  (Ljava/io/IOException;)Lcom/fasterxml/jackson/databind/JsonMappingException;
  (Ljava/io/IOException;)Lcom/fasterxml/jackson/databind/JsonMappingException;
 wrapWithPath
  (Ljava/lang/Throwable;Lcom/fasterxml/jackson/databind/JsonMappingException$Reference;)Lcom/fasterxml/jackson/databind/JsonMappingException;
- (Ljava/lang/Throwable;Lcom/fasterxml/jackson/databind/JsonMappingException$Reference;)Lcom/fasterxml/jackson/databind/JsonMappingException;
+ (Ljava/lang/Throwable;Lcom/fasterxml/jackson/databind/JsonMappingException$Reference;)L1com/fasterxml/jackson/databind/JsonMappingException;
 wrapWithPath
  (Ljava/lang/Throwable;Ljava/lang/Object;I)Lcom/fasterxml/jackson/databind/JsonMappingException;
  (Ljava/lang/Throwable;Ljava/lang/Object;I)Lcom/fasterxml/jackson/databind/JsonMappingException;
@@ -82,13 +82,13 @@ getPath
  ()Ljava/util/List<Lcom/fasterxml/jackson/databind/JsonMappingException$Reference;>;
 getPathReference
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getPathReference
  (Ljava/lang/StringBuilder;)Ljava/lang/StringBuilder;
  (Ljava/lang/StringBuilder;)Ljava/lang/StringBuilder;
 getProcessor
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.core.JsonProcessingException)
 prependPath
  (Lcom/fasterxml/jackson/databind/JsonMappingException$Reference;)V
  (Lcom/fasterxml/jackson/databind/JsonMappingException$Reference;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/JsonNode.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/JsonNode.eea
index 65d21b9e1b..4355b77802 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/JsonNode.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/JsonNode.eea
@@ -9,7 +9,7 @@ _at
  (Lcom/fasterxml/jackson/core/JsonPointer;)Lcom/fasterxml/jackson/databind/JsonNode;
 _reportRequiredViolation
  <T:Ljava/lang/Object;>(Ljava/lang/String;[Ljava/lang/Object;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/String;[Ljava/lang/Object;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/String;[Ljava/lang/Object;)T1T;
 _this
  <T:Lcom/fasterxml/jackson/databind/JsonNode;>()TT;
  <T:Lcom/fasterxml/jackson/databind/JsonNode;>()TT;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/JsonSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/JsonSerializer.eea
index 8e0ba1fa42..7113dbb228 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/JsonSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/JsonSerializer.eea
@@ -7,10 +7,10 @@ acceptJsonFormatVisitor
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;Lcom/fasterxml/jackson/databind/JavaType;)V
 getDelegatee
  ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ ()L0com/fasterxml/jackson/databind/JsonSerializer<*>;
 handledType
  ()Ljava/lang/Class<TT;>;
- ()Ljava/lang/Class<TT;>;
+ ()L0java/lang/Class<TT;>;
 isEmpty
  (Lcom/fasterxml/jackson/databind/SerializerProvider;TT;)Z
  (Lcom/fasterxml/jackson/databind/SerializerProvider;TT;)Z
@@ -22,7 +22,7 @@ properties
  ()Ljava/util/Iterator<Lcom/fasterxml/jackson/databind/ser/PropertyWriter;>;
 replaceDelegatee
  (Lcom/fasterxml/jackson/databind/JsonSerializer<*>;)Lcom/fasterxml/jackson/databind/JsonSerializer<TT;>;
- (Lcom/fasterxml/jackson/databind/JsonSerializer<*>;)Lcom/fasterxml/jackson/databind/JsonSerializer<TT;>;
+ (Lcom/fasterxml/jackson/databind/JsonSerializer<*>;)L1com/fasterxml/jackson/databind/JsonSerializer<TT;>;
 serialize
  (TT;Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/databind/SerializerProvider;)V
  (TT;Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/databind/SerializerProvider;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/MappingIterator.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/MappingIterator.eea
index 0cf06762be..ba673f5ac5 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/MappingIterator.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/MappingIterator.eea
@@ -38,13 +38,13 @@ _updatedValue
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;ZLjava/lang/Object;)V
 _handleIOException
  <R:Ljava/lang/Object;>(Ljava/io/IOException;)TR;
- <R:Ljava/lang/Object;>(Ljava/io/IOException;)TR;
+ <R:Ljava/lang/Object;>(Ljava/io/IOException;)T1R;
 _handleMappingException
  <R:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JsonMappingException;)TR;
- <R:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JsonMappingException;)TR;
+ <R:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JsonMappingException;)T1R;
 _throwNoSuchElement
  <R:Ljava/lang/Object;>()TR;
- <R:Ljava/lang/Object;>()TR;
+ <R:Ljava/lang/Object;>()T1R;
 getCurrentLocation
  ()Lcom/fasterxml/jackson/core/JsonLocation;
  ()Lcom/fasterxml/jackson/core/JsonLocation;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ObjectMapper$DefaultTypeResolverBuilder.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ObjectMapper$DefaultTypeResolverBuilder.eea
index c129873c49..6aee6deec8 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ObjectMapper$DefaultTypeResolverBuilder.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ObjectMapper$DefaultTypeResolverBuilder.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/ObjectMapper$DefaultTypeResolverBuilder
 
 construct
  (Lcom/fasterxml/jackson/databind/ObjectMapper$DefaultTyping;Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;)Lcom/fasterxml/jackson/databind/ObjectMapper$DefaultTypeResolverBuilder;
- (Lcom/fasterxml/jackson/databind/ObjectMapper$DefaultTyping;Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;)Lcom/fasterxml/jackson/databind/ObjectMapper$DefaultTypeResolverBuilder;
+ (Lcom/fasterxml/jackson/databind/ObjectMapper$DefaultTyping;Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;)L1com/fasterxml/jackson/databind/ObjectMapper$DefaultTypeResolverBuilder;
 
 _appliesFor
  Lcom/fasterxml/jackson/databind/ObjectMapper$DefaultTyping;
@@ -22,10 +22,10 @@ _subtypeValidator
  (Lcom/fasterxml/jackson/databind/ObjectMapper$DefaultTyping;Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;)V
 buildTypeDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;)Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;)Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;)L0com/fasterxml/jackson/databind/jsontype/TypeDeserializer; # @Inherited(com.fasterxml.jackson.databind.jsontype.impl.StdTypeResolverBuilder)
 buildTypeSerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;)Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;)Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;)L0com/fasterxml/jackson/databind/jsontype/TypeSerializer; # @Inherited(com.fasterxml.jackson.databind.jsontype.impl.StdTypeResolverBuilder)
 subTypeValidator
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;)Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;)Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ObjectMapper.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ObjectMapper.eea
index 1b1ca88f8d..61fe6fbfdf 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ObjectMapper.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ObjectMapper.eea
@@ -92,19 +92,19 @@ _initForReading
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/core/JsonToken;
 _newReader
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/ObjectReader;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/ObjectReader;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;)L1com/fasterxml/jackson/databind/ObjectReader;
 _newReader
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/Object;Lcom/fasterxml/jackson/core/FormatSchema;Lcom/fasterxml/jackson/databind/InjectableValues;)Lcom/fasterxml/jackson/databind/ObjectReader;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/Object;Lcom/fasterxml/jackson/core/FormatSchema;Lcom/fasterxml/jackson/databind/InjectableValues;)Lcom/fasterxml/jackson/databind/ObjectReader;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/Object;Lcom/fasterxml/jackson/core/FormatSchema;Lcom/fasterxml/jackson/databind/InjectableValues;)L1com/fasterxml/jackson/databind/ObjectReader;
 _newWriter
  (Lcom/fasterxml/jackson/databind/SerializationConfig;)Lcom/fasterxml/jackson/databind/ObjectWriter;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;)Lcom/fasterxml/jackson/databind/ObjectWriter;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;)L1com/fasterxml/jackson/databind/ObjectWriter;
 _newWriter
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/core/FormatSchema;)Lcom/fasterxml/jackson/databind/ObjectWriter;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/core/FormatSchema;)Lcom/fasterxml/jackson/databind/ObjectWriter;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/core/FormatSchema;)L1com/fasterxml/jackson/databind/ObjectWriter;
 _newWriter
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/core/PrettyPrinter;)Lcom/fasterxml/jackson/databind/ObjectWriter;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/core/PrettyPrinter;)Lcom/fasterxml/jackson/databind/ObjectWriter;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/core/PrettyPrinter;)L1com/fasterxml/jackson/databind/ObjectWriter;
 _readMapAndClose
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/JavaType;)Ljava/lang/Object;
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/JavaType;)Ljava/lang/Object;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ObjectReader.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ObjectReader.eea
index b88a1d0e35..a8072329b7 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ObjectReader.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ObjectReader.eea
@@ -72,10 +72,10 @@ _bindAsTree
  (Lcom/fasterxml/jackson/core/JsonParser;)Lcom/fasterxml/jackson/databind/JsonNode;
 _bindAsTreeOrNull
  (Lcom/fasterxml/jackson/core/JsonParser;)Lcom/fasterxml/jackson/databind/JsonNode;
- (Lcom/fasterxml/jackson/core/JsonParser;)Lcom/fasterxml/jackson/databind/JsonNode;
+ (Lcom/fasterxml/jackson/core/JsonParser;)L0com/fasterxml/jackson/databind/JsonNode;
 _considerFilter
  (Lcom/fasterxml/jackson/core/JsonParser;Z)Lcom/fasterxml/jackson/core/JsonParser;
- (Lcom/fasterxml/jackson/core/JsonParser;Z)Lcom/fasterxml/jackson/core/JsonParser;
+ (Lcom/fasterxml/jackson/core/JsonParser;Z)L1com/fasterxml/jackson/core/JsonParser;
 _detectBindAndClose
  (Lcom/fasterxml/jackson/databind/deser/DataFormatReaders$Match;Z)Ljava/lang/Object;
  (Lcom/fasterxml/jackson/databind/deser/DataFormatReaders$Match;Z)Ljava/lang/Object;
@@ -102,7 +102,7 @@ _initForReading
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/core/JsonParser;)Lcom/fasterxml/jackson/core/JsonToken;
 _inputStream
  (Ljava/io/File;)Ljava/io/InputStream;
- (Ljava/io/File;)Ljava/io/InputStream;
+ (Ljava/io/File;)L1java/io/InputStream;
 _inputStream
  (Ljava/net/URL;)Ljava/io/InputStream;
  (Ljava/net/URL;)Ljava/io/InputStream;
@@ -111,19 +111,19 @@ _jsonNodeType
  ()Lcom/fasterxml/jackson/databind/JavaType;
 _new
  (Lcom/fasterxml/jackson/databind/ObjectReader;Lcom/fasterxml/jackson/core/JsonFactory;)Lcom/fasterxml/jackson/databind/ObjectReader;
- (Lcom/fasterxml/jackson/databind/ObjectReader;Lcom/fasterxml/jackson/core/JsonFactory;)Lcom/fasterxml/jackson/databind/ObjectReader;
+ (Lcom/fasterxml/jackson/databind/ObjectReader;Lcom/fasterxml/jackson/core/JsonFactory;)L1com/fasterxml/jackson/databind/ObjectReader;
 _new
  (Lcom/fasterxml/jackson/databind/ObjectReader;Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/ObjectReader;
- (Lcom/fasterxml/jackson/databind/ObjectReader;Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/ObjectReader;
+ (Lcom/fasterxml/jackson/databind/ObjectReader;Lcom/fasterxml/jackson/databind/DeserializationConfig;)L1com/fasterxml/jackson/databind/ObjectReader;
 _new
  (Lcom/fasterxml/jackson/databind/ObjectReader;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;Ljava/lang/Object;Lcom/fasterxml/jackson/core/FormatSchema;Lcom/fasterxml/jackson/databind/InjectableValues;Lcom/fasterxml/jackson/databind/deser/DataFormatReaders;)Lcom/fasterxml/jackson/databind/ObjectReader;
- (Lcom/fasterxml/jackson/databind/ObjectReader;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;Ljava/lang/Object;Lcom/fasterxml/jackson/core/FormatSchema;Lcom/fasterxml/jackson/databind/InjectableValues;Lcom/fasterxml/jackson/databind/deser/DataFormatReaders;)Lcom/fasterxml/jackson/databind/ObjectReader;
+ (Lcom/fasterxml/jackson/databind/ObjectReader;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;Ljava/lang/Object;Lcom/fasterxml/jackson/core/FormatSchema;Lcom/fasterxml/jackson/databind/InjectableValues;Lcom/fasterxml/jackson/databind/deser/DataFormatReaders;)L1com/fasterxml/jackson/databind/ObjectReader;
 _newIterator
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;Z)Lcom/fasterxml/jackson/databind/MappingIterator<TT;>;
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;Z)Lcom/fasterxml/jackson/databind/MappingIterator<TT;>;
 _prefetchRootDeserializer
  (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
 _reportUndetectableSource
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
@@ -141,55 +141,55 @@ _with
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/ObjectReader;
 at
  (Lcom/fasterxml/jackson/core/JsonPointer;)Lcom/fasterxml/jackson/databind/ObjectReader;
- (Lcom/fasterxml/jackson/core/JsonPointer;)Lcom/fasterxml/jackson/databind/ObjectReader;
+ (Lcom/fasterxml/jackson/core/JsonPointer;)L1com/fasterxml/jackson/databind/ObjectReader;
 at
  (Ljava/lang/String;)Lcom/fasterxml/jackson/databind/ObjectReader;
- (Ljava/lang/String;)Lcom/fasterxml/jackson/databind/ObjectReader;
+ (Ljava/lang/String;)L1com/fasterxml/jackson/databind/ObjectReader;
 createArrayNode
  ()Lcom/fasterxml/jackson/databind/JsonNode;
- ()Lcom/fasterxml/jackson/databind/JsonNode;
+ ()L1com/fasterxml/jackson/databind/JsonNode;
 createDeserializationContext
  (Lcom/fasterxml/jackson/core/JsonParser;)Lcom/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
- (Lcom/fasterxml/jackson/core/JsonParser;)Lcom/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
+ (Lcom/fasterxml/jackson/core/JsonParser;)L1com/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
 createDummyDeserializationContext
  ()Lcom/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
- ()Lcom/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
+ ()L1com/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
 createNonBlockingByteArrayParser
  ()Lcom/fasterxml/jackson/core/JsonParser;
- ()Lcom/fasterxml/jackson/core/JsonParser;
+ ()L1com/fasterxml/jackson/core/JsonParser;
 createObjectNode
  ()Lcom/fasterxml/jackson/databind/JsonNode;
- ()Lcom/fasterxml/jackson/databind/JsonNode;
+ ()L1com/fasterxml/jackson/databind/JsonNode;
 createParser
  (Ljava/io/DataInput;)Lcom/fasterxml/jackson/core/JsonParser;
- (Ljava/io/DataInput;)Lcom/fasterxml/jackson/core/JsonParser;
+ (Ljava/io/DataInput;)L1com/fasterxml/jackson/core/JsonParser;
 createParser
  (Ljava/io/File;)Lcom/fasterxml/jackson/core/JsonParser;
- (Ljava/io/File;)Lcom/fasterxml/jackson/core/JsonParser;
+ (Ljava/io/File;)L1com/fasterxml/jackson/core/JsonParser;
 createParser
  (Ljava/io/InputStream;)Lcom/fasterxml/jackson/core/JsonParser;
- (Ljava/io/InputStream;)Lcom/fasterxml/jackson/core/JsonParser;
+ (Ljava/io/InputStream;)L1com/fasterxml/jackson/core/JsonParser;
 createParser
  (Ljava/io/Reader;)Lcom/fasterxml/jackson/core/JsonParser;
- (Ljava/io/Reader;)Lcom/fasterxml/jackson/core/JsonParser;
+ (Ljava/io/Reader;)L1com/fasterxml/jackson/core/JsonParser;
 createParser
  (Ljava/lang/String;)Lcom/fasterxml/jackson/core/JsonParser;
- (Ljava/lang/String;)Lcom/fasterxml/jackson/core/JsonParser;
+ (Ljava/lang/String;)L1com/fasterxml/jackson/core/JsonParser;
 createParser
  (Ljava/net/URL;)Lcom/fasterxml/jackson/core/JsonParser;
- (Ljava/net/URL;)Lcom/fasterxml/jackson/core/JsonParser;
+ (Ljava/net/URL;)L1com/fasterxml/jackson/core/JsonParser;
 createParser
  ([B)Lcom/fasterxml/jackson/core/JsonParser;
- ([B)Lcom/fasterxml/jackson/core/JsonParser;
+ ([B)L1com/fasterxml/jackson/core/JsonParser;
 createParser
  ([BII)Lcom/fasterxml/jackson/core/JsonParser;
- ([BII)Lcom/fasterxml/jackson/core/JsonParser;
+ ([BII)L1com/fasterxml/jackson/core/JsonParser;
 createParser
  ([C)Lcom/fasterxml/jackson/core/JsonParser;
- ([C)Lcom/fasterxml/jackson/core/JsonParser;
+ ([C)L1com/fasterxml/jackson/core/JsonParser;
 createParser
  ([CII)Lcom/fasterxml/jackson/core/JsonParser;
- ([CII)Lcom/fasterxml/jackson/core/JsonParser;
+ ([CII)L1com/fasterxml/jackson/core/JsonParser;
 forType
  (Lcom/fasterxml/jackson/core/type/TypeReference<*>;)Lcom/fasterxml/jackson/databind/ObjectReader;
  (Lcom/fasterxml/jackson/core/type/TypeReference<*>;)Lcom/fasterxml/jackson/databind/ObjectReader;
@@ -372,7 +372,7 @@ readValues
  <T:Ljava/lang/Object;>([BII)Lcom/fasterxml/jackson/databind/MappingIterator<TT;>;
 treeAsTokens
  (Lcom/fasterxml/jackson/core/TreeNode;)Lcom/fasterxml/jackson/core/JsonParser;
- (Lcom/fasterxml/jackson/core/TreeNode;)Lcom/fasterxml/jackson/core/JsonParser;
+ (Lcom/fasterxml/jackson/core/TreeNode;)L1com/fasterxml/jackson/core/JsonParser;
 treeToValue
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/core/TreeNode;Lcom/fasterxml/jackson/databind/JavaType;)TT;
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/core/TreeNode;Lcom/fasterxml/jackson/databind/JavaType;)TT;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ObjectWriter.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ObjectWriter.eea
index 4525149ffa..804a158401 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ObjectWriter.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ObjectWriter.eea
@@ -52,7 +52,7 @@ _new
  (Lcom/fasterxml/jackson/databind/ObjectWriter$GeneratorSettings;Lcom/fasterxml/jackson/databind/ObjectWriter$Prefetch;)Lcom/fasterxml/jackson/databind/ObjectWriter;
 _new
  (Lcom/fasterxml/jackson/databind/ObjectWriter;Lcom/fasterxml/jackson/core/JsonFactory;)Lcom/fasterxml/jackson/databind/ObjectWriter;
- (Lcom/fasterxml/jackson/databind/ObjectWriter;Lcom/fasterxml/jackson/core/JsonFactory;)Lcom/fasterxml/jackson/databind/ObjectWriter;
+ (Lcom/fasterxml/jackson/databind/ObjectWriter;Lcom/fasterxml/jackson/core/JsonFactory;)L1com/fasterxml/jackson/databind/ObjectWriter;
 _new
  (Lcom/fasterxml/jackson/databind/ObjectWriter;Lcom/fasterxml/jackson/databind/SerializationConfig;)Lcom/fasterxml/jackson/databind/ObjectWriter;
  (Lcom/fasterxml/jackson/databind/ObjectWriter;Lcom/fasterxml/jackson/databind/SerializationConfig;)Lcom/fasterxml/jackson/databind/ObjectWriter;
@@ -82,19 +82,19 @@ canSerialize
  (Ljava/lang/Class<*>;Ljava/util/concurrent/atomic/AtomicReference<Ljava/lang/Throwable;>;)Z
 createGenerator
  (Ljava/io/DataOutput;)Lcom/fasterxml/jackson/core/JsonGenerator;
- (Ljava/io/DataOutput;)Lcom/fasterxml/jackson/core/JsonGenerator;
+ (Ljava/io/DataOutput;)L1com/fasterxml/jackson/core/JsonGenerator;
 createGenerator
  (Ljava/io/File;Lcom/fasterxml/jackson/core/JsonEncoding;)Lcom/fasterxml/jackson/core/JsonGenerator;
- (Ljava/io/File;Lcom/fasterxml/jackson/core/JsonEncoding;)Lcom/fasterxml/jackson/core/JsonGenerator;
+ (Ljava/io/File;Lcom/fasterxml/jackson/core/JsonEncoding;)L1com/fasterxml/jackson/core/JsonGenerator;
 createGenerator
  (Ljava/io/OutputStream;)Lcom/fasterxml/jackson/core/JsonGenerator;
- (Ljava/io/OutputStream;)Lcom/fasterxml/jackson/core/JsonGenerator;
+ (Ljava/io/OutputStream;)L1com/fasterxml/jackson/core/JsonGenerator;
 createGenerator
  (Ljava/io/OutputStream;Lcom/fasterxml/jackson/core/JsonEncoding;)Lcom/fasterxml/jackson/core/JsonGenerator;
- (Ljava/io/OutputStream;Lcom/fasterxml/jackson/core/JsonEncoding;)Lcom/fasterxml/jackson/core/JsonGenerator;
+ (Ljava/io/OutputStream;Lcom/fasterxml/jackson/core/JsonEncoding;)L1com/fasterxml/jackson/core/JsonGenerator;
 createGenerator
  (Ljava/io/Writer;)Lcom/fasterxml/jackson/core/JsonGenerator;
- (Ljava/io/Writer;)Lcom/fasterxml/jackson/core/JsonGenerator;
+ (Ljava/io/Writer;)L1com/fasterxml/jackson/core/JsonGenerator;
 forType
  (Lcom/fasterxml/jackson/core/type/TypeReference<*>;)Lcom/fasterxml/jackson/databind/ObjectWriter;
  (Lcom/fasterxml/jackson/core/type/TypeReference<*>;)Lcom/fasterxml/jackson/databind/ObjectWriter;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/PropertyMetadata$MergeInfo.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/PropertyMetadata$MergeInfo.eea
index 9cfa607077..b79d417199 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/PropertyMetadata$MergeInfo.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/PropertyMetadata$MergeInfo.eea
@@ -2,13 +2,13 @@ class com/fasterxml/jackson/databind/PropertyMetadata$MergeInfo
 
 createForDefaults
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/PropertyMetadata$MergeInfo;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/PropertyMetadata$MergeInfo;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L1com/fasterxml/jackson/databind/PropertyMetadata$MergeInfo;
 createForPropertyOverride
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/PropertyMetadata$MergeInfo;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/PropertyMetadata$MergeInfo;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L1com/fasterxml/jackson/databind/PropertyMetadata$MergeInfo;
 createForTypeOverride
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/PropertyMetadata$MergeInfo;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/PropertyMetadata$MergeInfo;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L1com/fasterxml/jackson/databind/PropertyMetadata$MergeInfo;
 
 getter
  Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/PropertyNamingStrategies$UpperSnakeCaseStrategy.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/PropertyNamingStrategies$UpperSnakeCaseStrategy.eea
index bccfad0434..c9ef04f277 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/PropertyNamingStrategies$UpperSnakeCaseStrategy.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/PropertyNamingStrategies$UpperSnakeCaseStrategy.eea
@@ -6,4 +6,4 @@ INSTANCE
 
 translate
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/SerializationConfig.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/SerializationConfig.eea
index 336cc7ff07..9d5fd161ce 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/SerializationConfig.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/SerializationConfig.eea
@@ -38,10 +38,10 @@ _filterProvider
  (Lcom/fasterxml/jackson/databind/cfg/BaseSettings;Lcom/fasterxml/jackson/databind/jsontype/SubtypeResolver;Lcom/fasterxml/jackson/databind/introspect/SimpleMixInResolver;Lcom/fasterxml/jackson/databind/util/RootNameLookup;Lcom/fasterxml/jackson/databind/cfg/ConfigOverrides;Lcom/fasterxml/jackson/databind/cfg/DatatypeFeatures;)V
 _with
  (Lcom/fasterxml/jackson/databind/cfg/DatatypeFeatures;)Lcom/fasterxml/jackson/databind/SerializationConfig;
- (Lcom/fasterxml/jackson/databind/cfg/DatatypeFeatures;)Lcom/fasterxml/jackson/databind/SerializationConfig;
+ (Lcom/fasterxml/jackson/databind/cfg/DatatypeFeatures;)L1com/fasterxml/jackson/databind/SerializationConfig;
 _withBase
  (Lcom/fasterxml/jackson/databind/cfg/BaseSettings;)Lcom/fasterxml/jackson/databind/SerializationConfig;
- (Lcom/fasterxml/jackson/databind/cfg/BaseSettings;)Lcom/fasterxml/jackson/databind/SerializationConfig;
+ (Lcom/fasterxml/jackson/databind/cfg/BaseSettings;)L1com/fasterxml/jackson/databind/SerializationConfig;
 _withMapperFeatures
  (J)Lcom/fasterxml/jackson/databind/SerializationConfig;
  (J)Lcom/fasterxml/jackson/databind/SerializationConfig;
@@ -86,16 +86,16 @@ with
  (Lcom/fasterxml/jackson/databind/SerializationFeature;[Lcom/fasterxml/jackson/databind/SerializationFeature;)Lcom/fasterxml/jackson/databind/SerializationConfig;
 with
  (Lcom/fasterxml/jackson/databind/cfg/ContextAttributes;)Lcom/fasterxml/jackson/databind/SerializationConfig;
- (Lcom/fasterxml/jackson/databind/cfg/ContextAttributes;)Lcom/fasterxml/jackson/databind/SerializationConfig;
+ (Lcom/fasterxml/jackson/databind/cfg/ContextAttributes;)L1com/fasterxml/jackson/databind/SerializationConfig;
 with
  (Lcom/fasterxml/jackson/databind/jsontype/SubtypeResolver;)Lcom/fasterxml/jackson/databind/SerializationConfig;
- (Lcom/fasterxml/jackson/databind/jsontype/SubtypeResolver;)Lcom/fasterxml/jackson/databind/SerializationConfig;
+ (Lcom/fasterxml/jackson/databind/jsontype/SubtypeResolver;)L1com/fasterxml/jackson/databind/SerializationConfig;
 with
  (Ljava/text/DateFormat;)Lcom/fasterxml/jackson/databind/SerializationConfig;
  (Ljava/text/DateFormat;)Lcom/fasterxml/jackson/databind/SerializationConfig;
 withDefaultPrettyPrinter
  (Lcom/fasterxml/jackson/core/PrettyPrinter;)Lcom/fasterxml/jackson/databind/SerializationConfig;
- (Lcom/fasterxml/jackson/core/PrettyPrinter;)Lcom/fasterxml/jackson/databind/SerializationConfig;
+ (Lcom/fasterxml/jackson/core/PrettyPrinter;)L1com/fasterxml/jackson/databind/SerializationConfig;
 withFeatures
  ([Lcom/fasterxml/jackson/core/FormatFeature;)Lcom/fasterxml/jackson/databind/SerializationConfig;
  ([Lcom/fasterxml/jackson/core/FormatFeature;)Lcom/fasterxml/jackson/databind/SerializationConfig;
@@ -107,7 +107,7 @@ withFeatures
  ([Lcom/fasterxml/jackson/databind/SerializationFeature;)Lcom/fasterxml/jackson/databind/SerializationConfig;
 withFilters
  (Lcom/fasterxml/jackson/databind/ser/FilterProvider;)Lcom/fasterxml/jackson/databind/SerializationConfig;
- (Lcom/fasterxml/jackson/databind/ser/FilterProvider;)Lcom/fasterxml/jackson/databind/SerializationConfig;
+ (Lcom/fasterxml/jackson/databind/ser/FilterProvider;)L1com/fasterxml/jackson/databind/SerializationConfig;
 withPropertyInclusion
  (Lcom/fasterxml/jackson/annotation/JsonInclude$Value;)Lcom/fasterxml/jackson/databind/SerializationConfig;
  (Lcom/fasterxml/jackson/annotation/JsonInclude$Value;)Lcom/fasterxml/jackson/databind/SerializationConfig;
@@ -116,7 +116,7 @@ withRootName
  (Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/SerializationConfig;
 withView
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/SerializationConfig;
- (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/SerializationConfig;
+ (Ljava/lang/Class<*>;)L1com/fasterxml/jackson/databind/SerializationConfig;
 without
  (Lcom/fasterxml/jackson/core/FormatFeature;)Lcom/fasterxml/jackson/databind/SerializationConfig;
  (Lcom/fasterxml/jackson/core/FormatFeature;)Lcom/fasterxml/jackson/databind/SerializationConfig;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/SerializerProvider.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/SerializerProvider.eea
index d52f6fd4dd..a0d8069f1d 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/SerializerProvider.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/SerializerProvider.eea
@@ -52,10 +52,10 @@ _unknownTypeSerializer
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/ser/SerializerCache;)V
 _createAndCacheUntypedSerializer
  (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
 _createAndCacheUntypedSerializer
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
- (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
+ (Ljava/lang/Class<*>;)L0com/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
 _createUntypedSerializer
  (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
  (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
@@ -64,7 +64,7 @@ _dateFormat
  ()Ljava/text/DateFormat;
 _findExplicitUntypedSerializer
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
- (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
+ (Ljava/lang/Class<*>;)L0com/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
 _handleContextualResolvable
  (Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
  (Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
@@ -184,7 +184,7 @@ getFilterProvider
  ()Lcom/fasterxml/jackson/databind/ser/FilterProvider;
 getGenerator
  ()Lcom/fasterxml/jackson/core/JsonGenerator;
- ()Lcom/fasterxml/jackson/core/JsonGenerator;
+ ()L0com/fasterxml/jackson/core/JsonGenerator;
 getLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
@@ -232,19 +232,19 @@ mappingException
  (Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/JsonMappingException;
 reportBadDefinition
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;)TT;
- <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;)TT;
+ <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;)T1T;
 reportBadDefinition
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;Ljava/lang/Throwable;)TT;
- <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;Ljava/lang/Throwable;)TT;
+ <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;Ljava/lang/Throwable;)T1T;
 reportBadDefinition
  <T:Ljava/lang/Object;>(Ljava/lang/Class<*>;Ljava/lang/String;Ljava/lang/Throwable;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<*>;Ljava/lang/String;Ljava/lang/Throwable;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<*>;Ljava/lang/String;Ljava/lang/Throwable;)T1T;
 reportBadPropertyDefinition
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Ljava/lang/String;[Ljava/lang/Object;)TT;
- <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Ljava/lang/String;[Ljava/lang/Object;)TT;
+ <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Ljava/lang/String;[Ljava/lang/Object;)T1T;
 reportBadTypeDefinition
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/BeanDescription;Ljava/lang/String;[Ljava/lang/Object;)TT;
- <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/BeanDescription;Ljava/lang/String;[Ljava/lang/Object;)TT;
+ <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/BeanDescription;Ljava/lang/String;[Ljava/lang/Object;)T1T;
 reportMappingProblem
  (Ljava/lang/String;[Ljava/lang/Object;)V
  (Ljava/lang/String;[Ljava/lang/Object;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/CoercionConfigs.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/CoercionConfigs.eea
index 0d322460d4..50c145ad76 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/CoercionConfigs.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/CoercionConfigs.eea
@@ -33,7 +33,7 @@ findCoercionFromBlankString
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/type/LogicalType;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/cfg/CoercionAction;)Lcom/fasterxml/jackson/databind/cfg/CoercionAction;
 findOrCreateCoercion
  (Lcom/fasterxml/jackson/databind/type/LogicalType;)Lcom/fasterxml/jackson/databind/cfg/MutableCoercionConfig;
- (Lcom/fasterxml/jackson/databind/type/LogicalType;)Lcom/fasterxml/jackson/databind/cfg/MutableCoercionConfig;
+ (Lcom/fasterxml/jackson/databind/type/LogicalType;)L1com/fasterxml/jackson/databind/cfg/MutableCoercionConfig;
 findOrCreateCoercion
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/cfg/MutableCoercionConfig;
- (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/cfg/MutableCoercionConfig;
+ (Ljava/lang/Class<*>;)L1com/fasterxml/jackson/databind/cfg/MutableCoercionConfig;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/ConfigOverrides.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/ConfigOverrides.eea
index 1135f09ef5..81d1e19c2b 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/ConfigOverrides.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/ConfigOverrides.eea
@@ -27,7 +27,7 @@ _visibilityChecker
  (Ljava/util/Map<Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/cfg/MutableConfigOverride;>;Lcom/fasterxml/jackson/annotation/JsonInclude$Value;Lcom/fasterxml/jackson/annotation/JsonSetter$Value;Lcom/fasterxml/jackson/databind/introspect/VisibilityChecker<*>;Ljava/lang/Boolean;Ljava/lang/Boolean;)V
 _newMap
  ()Ljava/util/Map<Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/cfg/MutableConfigOverride;>;
- ()Ljava/util/Map<Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/cfg/MutableConfigOverride;>;
+ ()L1java/util/Map<Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/cfg/MutableConfigOverride;>;
 copy
  ()Lcom/fasterxml/jackson/databind/cfg/ConfigOverrides;
  ()Lcom/fasterxml/jackson/databind/cfg/ConfigOverrides;
@@ -36,10 +36,10 @@ findFormatDefaults
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
 findOrCreateOverride
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/cfg/MutableConfigOverride;
- (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/cfg/MutableConfigOverride;
+ (Ljava/lang/Class<*>;)L1com/fasterxml/jackson/databind/cfg/MutableConfigOverride;
 findOverride
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/cfg/ConfigOverride;
- (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/cfg/ConfigOverride;
+ (Ljava/lang/Class<*>;)L0com/fasterxml/jackson/databind/cfg/ConfigOverride;
 getDefaultInclusion
  ()Lcom/fasterxml/jackson/annotation/JsonInclude$Value;
  ()Lcom/fasterxml/jackson/annotation/JsonInclude$Value;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/ContextAttributes$Impl.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/ContextAttributes$Impl.eea
index 433ead160b..963a93f973 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/ContextAttributes$Impl.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/ContextAttributes$Impl.eea
@@ -26,19 +26,19 @@ _shared
  (Ljava/util/Map<**>;Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;)V
 getAttribute
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L0java/lang/Object;
 nonSharedInstance
  (Ljava/lang/Object;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/cfg/ContextAttributes;
- (Ljava/lang/Object;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/cfg/ContextAttributes;
+ (Ljava/lang/Object;Ljava/lang/Object;)L1com/fasterxml/jackson/databind/cfg/ContextAttributes;
 withPerCallAttribute
  (Ljava/lang/Object;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/cfg/ContextAttributes;
  (Ljava/lang/Object;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/cfg/ContextAttributes;
 withSharedAttribute
  (Ljava/lang/Object;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/cfg/ContextAttributes;
- (Ljava/lang/Object;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/cfg/ContextAttributes;
+ (Ljava/lang/Object;Ljava/lang/Object;)L1com/fasterxml/jackson/databind/cfg/ContextAttributes;
 withSharedAttributes
  (Ljava/util/Map<**>;)Lcom/fasterxml/jackson/databind/cfg/ContextAttributes;
- (Ljava/util/Map<**>;)Lcom/fasterxml/jackson/databind/cfg/ContextAttributes;
+ (Ljava/util/Map<**>;)L1com/fasterxml/jackson/databind/cfg/ContextAttributes;
 withoutSharedAttribute
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/cfg/ContextAttributes;
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/cfg/ContextAttributes;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/DatatypeFeatures.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/DatatypeFeatures.eea
index 1eb2de0d86..b38894835a 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/DatatypeFeatures.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/DatatypeFeatures.eea
@@ -6,7 +6,7 @@ defaultFeatures
 
 getExplicitState
  (Lcom/fasterxml/jackson/databind/cfg/DatatypeFeature;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/cfg/DatatypeFeature;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/cfg/DatatypeFeature;)L0java/lang/Boolean;
 isEnabled
  (Lcom/fasterxml/jackson/databind/cfg/DatatypeFeature;)Z
  (Lcom/fasterxml/jackson/databind/cfg/DatatypeFeature;)Z
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/DefaultCacheProvider.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/DefaultCacheProvider.eea
index 91cbb2fdf6..b966fc6dc8 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/DefaultCacheProvider.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/DefaultCacheProvider.eea
@@ -2,14 +2,14 @@ class com/fasterxml/jackson/databind/cfg/DefaultCacheProvider
 
 builder
  ()Lcom/fasterxml/jackson/databind/cfg/DefaultCacheProvider$Builder;
- ()Lcom/fasterxml/jackson/databind/cfg/DefaultCacheProvider$Builder;
+ ()L1com/fasterxml/jackson/databind/cfg/DefaultCacheProvider$Builder;
 defaultInstance
  ()Lcom/fasterxml/jackson/databind/cfg/CacheProvider;
  ()Lcom/fasterxml/jackson/databind/cfg/CacheProvider;
 
 _buildCache
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Lcom/fasterxml/jackson/databind/util/LookupCache<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Lcom/fasterxml/jackson/databind/util/LookupCache<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)L1com/fasterxml/jackson/databind/util/LookupCache<TK;TV;>;
 forDeserializerCache
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/util/LookupCache<Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;>;
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/util/LookupCache<Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/DeserializerFactoryConfig.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/DeserializerFactoryConfig.eea
index 41c5d05eb6..b20c48b5fb 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/DeserializerFactoryConfig.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/DeserializerFactoryConfig.eea
@@ -37,19 +37,19 @@ _valueInstantiators
  ([Lcom/fasterxml/jackson/databind/deser/Deserializers;[Lcom/fasterxml/jackson/databind/deser/KeyDeserializers;[Lcom/fasterxml/jackson/databind/deser/BeanDeserializerModifier;[Lcom/fasterxml/jackson/databind/AbstractTypeResolver;[Lcom/fasterxml/jackson/databind/deser/ValueInstantiators;)V
 abstractTypeResolvers
  ()Ljava/lang/Iterable<Lcom/fasterxml/jackson/databind/AbstractTypeResolver;>;
- ()Ljava/lang/Iterable<Lcom/fasterxml/jackson/databind/AbstractTypeResolver;>;
+ ()L1java/lang/Iterable<Lcom/fasterxml/jackson/databind/AbstractTypeResolver;>;
 deserializerModifiers
  ()Ljava/lang/Iterable<Lcom/fasterxml/jackson/databind/deser/BeanDeserializerModifier;>;
- ()Ljava/lang/Iterable<Lcom/fasterxml/jackson/databind/deser/BeanDeserializerModifier;>;
+ ()L1java/lang/Iterable<Lcom/fasterxml/jackson/databind/deser/BeanDeserializerModifier;>;
 deserializers
  ()Ljava/lang/Iterable<Lcom/fasterxml/jackson/databind/deser/Deserializers;>;
- ()Ljava/lang/Iterable<Lcom/fasterxml/jackson/databind/deser/Deserializers;>;
+ ()L1java/lang/Iterable<Lcom/fasterxml/jackson/databind/deser/Deserializers;>;
 keyDeserializers
  ()Ljava/lang/Iterable<Lcom/fasterxml/jackson/databind/deser/KeyDeserializers;>;
- ()Ljava/lang/Iterable<Lcom/fasterxml/jackson/databind/deser/KeyDeserializers;>;
+ ()L1java/lang/Iterable<Lcom/fasterxml/jackson/databind/deser/KeyDeserializers;>;
 valueInstantiators
  ()Ljava/lang/Iterable<Lcom/fasterxml/jackson/databind/deser/ValueInstantiators;>;
- ()Ljava/lang/Iterable<Lcom/fasterxml/jackson/databind/deser/ValueInstantiators;>;
+ ()L1java/lang/Iterable<Lcom/fasterxml/jackson/databind/deser/ValueInstantiators;>;
 withAbstractTypeResolver
  (Lcom/fasterxml/jackson/databind/AbstractTypeResolver;)Lcom/fasterxml/jackson/databind/cfg/DeserializerFactoryConfig;
  (Lcom/fasterxml/jackson/databind/AbstractTypeResolver;)Lcom/fasterxml/jackson/databind/cfg/DeserializerFactoryConfig;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/HandlerInstantiator.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/HandlerInstantiator.eea
index 1c47ca5856..7a0ce303e4 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/HandlerInstantiator.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/HandlerInstantiator.eea
@@ -2,25 +2,25 @@ class com/fasterxml/jackson/databind/cfg/HandlerInstantiator
 
 converterInstance
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/util/Converter<**>;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/util/Converter<**>;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Class<*>;)L0com/fasterxml/jackson/databind/util/Converter<**>;
 deserializerInstance
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
 includeFilterInstance
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Ljava/lang/Class<*>;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Ljava/lang/Class<*>;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Ljava/lang/Class<*>;)L0java/lang/Object;
 keyDeserializerInstance
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
 namingStrategyInstance
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/PropertyNamingStrategy;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/PropertyNamingStrategy;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Class<*>;)L0com/fasterxml/jackson/databind/PropertyNamingStrategy;
 objectIdGeneratorInstance
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<*>;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<*>;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Class<*>;)L0com/fasterxml/jackson/annotation/ObjectIdGenerator<*>;
 resolverIdGeneratorInstance
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/ObjectIdResolver;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/ObjectIdResolver;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Class<*>;)L0com/fasterxml/jackson/annotation/ObjectIdResolver;
 serializerInstance
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
@@ -32,7 +32,7 @@ typeResolverBuilderInstance
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
 valueInstantiatorInstance
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/deser/ValueInstantiator;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/deser/ValueInstantiator;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Class<*>;)L0com/fasterxml/jackson/databind/deser/ValueInstantiator;
 virtualPropertyWriterInstance
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/ser/VirtualBeanPropertyWriter;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/ser/VirtualBeanPropertyWriter;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Ljava/lang/Class<*>;)L0com/fasterxml/jackson/databind/ser/VirtualBeanPropertyWriter;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/MapperBuilder.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/MapperBuilder.eea
index d061eaa6a3..1e00fc7ba9 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/MapperBuilder.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/MapperBuilder.eea
@@ -7,7 +7,7 @@ findModules
  ()Ljava/util/List<Lcom/fasterxml/jackson/databind/Module;>;
 findModules
  (Ljava/lang/ClassLoader;)Ljava/util/List<Lcom/fasterxml/jackson/databind/Module;>;
- (Ljava/lang/ClassLoader;)Ljava/util/List<Lcom/fasterxml/jackson/databind/Module;>;
+ (Ljava/lang/ClassLoader;)L1java/util/List<Lcom/fasterxml/jackson/databind/Module;>;
 
 _mapper
  TM;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/MapperConfig.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/MapperConfig.eea
index 0ba45d6256..dbb2327db6 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/MapperConfig.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/MapperConfig.eea
@@ -31,7 +31,7 @@ _base
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<TT;>;Lcom/fasterxml/jackson/databind/cfg/BaseSettings;)V
 compileString
  (Ljava/lang/String;)Lcom/fasterxml/jackson/core/SerializableString;
- (Ljava/lang/String;)Lcom/fasterxml/jackson/core/SerializableString;
+ (Ljava/lang/String;)L1com/fasterxml/jackson/core/SerializableString;
 constructSpecializedType
  (Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JavaType;
  (Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JavaType;
@@ -133,7 +133,7 @@ getLocale
  ()Ljava/util/Locale;
 getPolymorphicTypeValidator
  ()Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;
- ()Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;
+ ()L1com/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;
 getPropertyNamingStrategy
  ()Lcom/fasterxml/jackson/databind/PropertyNamingStrategy;
  ()Lcom/fasterxml/jackson/databind/PropertyNamingStrategy;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/MapperConfigBase.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/MapperConfigBase.eea
index d6eb8305d2..39c2e8f559 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/MapperConfigBase.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/MapperConfigBase.eea
@@ -82,7 +82,7 @@ _withMapperFeatures
  (J)TT;
 copy
  ()Lcom/fasterxml/jackson/databind/introspect/ClassIntrospector$MixInResolver;
- ()Lcom/fasterxml/jackson/databind/introspect/ClassIntrospector$MixInResolver;
+ ()L1com/fasterxml/jackson/databind/introspect/ClassIntrospector$MixInResolver;
 findConfigOverride
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/cfg/ConfigOverride;
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/cfg/ConfigOverride;
@@ -121,7 +121,7 @@ getDefaultPropertyFormat
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
 getDefaultPropertyIgnorals
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/JsonIgnoreProperties$Value;
- (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/JsonIgnoreProperties$Value;
+ (Ljava/lang/Class<*>;)L0com/fasterxml/jackson/annotation/JsonIgnoreProperties$Value;
 getDefaultPropertyIgnorals
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/annotation/JsonIgnoreProperties$Value;
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/annotation/JsonIgnoreProperties$Value;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/MutableCoercionConfig.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/MutableCoercionConfig.eea
index 2173d573c5..06009b818d 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/MutableCoercionConfig.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/MutableCoercionConfig.eea
@@ -5,7 +5,7 @@ class com/fasterxml/jackson/databind/cfg/MutableCoercionConfig
  (Lcom/fasterxml/jackson/databind/cfg/MutableCoercionConfig;)V
 copy
  ()Lcom/fasterxml/jackson/databind/cfg/MutableCoercionConfig;
- ()Lcom/fasterxml/jackson/databind/cfg/MutableCoercionConfig;
+ ()L1com/fasterxml/jackson/databind/cfg/MutableCoercionConfig;
 setAcceptBlankAsEmpty
  (Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/cfg/MutableCoercionConfig;
  (Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/cfg/MutableCoercionConfig;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/MutableConfigOverride.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/MutableConfigOverride.eea
index d825837c63..ce3ed01d3c 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/MutableConfigOverride.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/MutableConfigOverride.eea
@@ -5,7 +5,7 @@ class com/fasterxml/jackson/databind/cfg/MutableConfigOverride
  (Lcom/fasterxml/jackson/databind/cfg/MutableConfigOverride;)V
 copy
  ()Lcom/fasterxml/jackson/databind/cfg/MutableConfigOverride;
- ()Lcom/fasterxml/jackson/databind/cfg/MutableConfigOverride;
+ ()L1com/fasterxml/jackson/databind/cfg/MutableConfigOverride;
 setFormat
  (Lcom/fasterxml/jackson/annotation/JsonFormat$Value;)Lcom/fasterxml/jackson/databind/cfg/MutableConfigOverride;
  (Lcom/fasterxml/jackson/annotation/JsonFormat$Value;)Lcom/fasterxml/jackson/databind/cfg/MutableConfigOverride;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/SerializerFactoryConfig.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/SerializerFactoryConfig.eea
index 088e7f1a6f..0854214233 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/SerializerFactoryConfig.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/cfg/SerializerFactoryConfig.eea
@@ -22,13 +22,13 @@ _modifiers
  ([Lcom/fasterxml/jackson/databind/ser/Serializers;[Lcom/fasterxml/jackson/databind/ser/Serializers;[Lcom/fasterxml/jackson/databind/ser/BeanSerializerModifier;)V
 keySerializers
  ()Ljava/lang/Iterable<Lcom/fasterxml/jackson/databind/ser/Serializers;>;
- ()Ljava/lang/Iterable<Lcom/fasterxml/jackson/databind/ser/Serializers;>;
+ ()L1java/lang/Iterable<Lcom/fasterxml/jackson/databind/ser/Serializers;>;
 serializerModifiers
  ()Ljava/lang/Iterable<Lcom/fasterxml/jackson/databind/ser/BeanSerializerModifier;>;
- ()Ljava/lang/Iterable<Lcom/fasterxml/jackson/databind/ser/BeanSerializerModifier;>;
+ ()L1java/lang/Iterable<Lcom/fasterxml/jackson/databind/ser/BeanSerializerModifier;>;
 serializers
  ()Ljava/lang/Iterable<Lcom/fasterxml/jackson/databind/ser/Serializers;>;
- ()Ljava/lang/Iterable<Lcom/fasterxml/jackson/databind/ser/Serializers;>;
+ ()L1java/lang/Iterable<Lcom/fasterxml/jackson/databind/ser/Serializers;>;
 withAdditionalKeySerializers
  (Lcom/fasterxml/jackson/databind/ser/Serializers;)Lcom/fasterxml/jackson/databind/cfg/SerializerFactoryConfig;
  (Lcom/fasterxml/jackson/databind/ser/Serializers;)Lcom/fasterxml/jackson/databind/cfg/SerializerFactoryConfig;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/AbstractDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/AbstractDeserializer.eea
index 52eeb145c1..01b7e362ba 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/AbstractDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/AbstractDeserializer.eea
@@ -6,7 +6,7 @@ super com/fasterxml/jackson/databind/JsonDeserializer
 
 constructForNonPOJO
  (Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/deser/AbstractDeserializer;
- (Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/deser/AbstractDeserializer;
+ (Lcom/fasterxml/jackson/databind/BeanDescription;)L1com/fasterxml/jackson/databind/deser/AbstractDeserializer;
 
 _backRefProperties
  Ljava/util/Map<Ljava/lang/String;Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;>;
@@ -38,10 +38,10 @@ _deserializeFromObjectId
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
 _deserializeIfNatural
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)L0java/lang/Object;
 createContextual
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.ContextualDeserializer)
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.eea
index 779c83c4e1..dee8267157 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.eea
@@ -43,34 +43,34 @@ _constructDefaultValueInstantiator
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/deser/ValueInstantiator;
 _findCreatorsFromProperties
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;)Ljava/util/Map<Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;[Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;)Ljava/util/Map<Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;[Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;)L1java/util/Map<Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;[Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;>;
 _findCustomArrayDeserializer
  (Lcom/fasterxml/jackson/databind/type/ArrayType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/type/ArrayType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/type/ArrayType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>;
 _findCustomBeanDeserializer
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)L0com/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
 _findCustomCollectionDeserializer
  (Lcom/fasterxml/jackson/databind/type/CollectionType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/type/CollectionType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/type/CollectionType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>;
 _findCustomCollectionLikeDeserializer
  (Lcom/fasterxml/jackson/databind/type/CollectionLikeType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/type/CollectionLikeType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/type/CollectionLikeType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>;
 _findCustomEnumDeserializer
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>;
 _findCustomMapDeserializer
  (Lcom/fasterxml/jackson/databind/type/MapType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/type/MapType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/type/MapType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>;
 _findCustomMapLikeDeserializer
  (Lcom/fasterxml/jackson/databind/type/MapLikeType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/type/MapLikeType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/type/MapLikeType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>;
 _findCustomReferenceDeserializer
  (Lcom/fasterxml/jackson/databind/type/ReferenceType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/type/ReferenceType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/type/ReferenceType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>;
 _findCustomTreeNodeDeserializer
  (Ljava/lang/Class<+Lcom/fasterxml/jackson/databind/JsonNode;>;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Ljava/lang/Class<+Lcom/fasterxml/jackson/databind/JsonNode;>;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Ljava/lang/Class<+Lcom/fasterxml/jackson/databind/JsonNode;>;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>;
 _findJsonValueFor
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
@@ -88,10 +88,10 @@ _hasCreatorAnnotation
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Z
 _mapAbstractCollectionType
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/type/CollectionType;
- (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/type/CollectionType;
+ (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/DeserializationConfig;)L0com/fasterxml/jackson/databind/type/CollectionType;
 _mapAbstractMapType
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/type/MapType;
- (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/type/MapType;
+ (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/DeserializationConfig;)L0com/fasterxml/jackson/databind/type/MapType;
 _reportUnwrappedCreatorProperty
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;)V
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;)V
@@ -100,7 +100,7 @@ _validateNamedPropertyParameter
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/deser/impl/CreatorCandidate;ILcom/fasterxml/jackson/databind/PropertyName;Lcom/fasterxml/jackson/annotation/JacksonInject$Value;)V
 _valueInstantiatorInstance
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/deser/ValueInstantiator;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/deser/ValueInstantiator;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Object;)L0com/fasterxml/jackson/databind/deser/ValueInstantiator;
 constructCreatorProperty
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/PropertyName;ILcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;Lcom/fasterxml/jackson/annotation/JacksonInject$Value;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/PropertyName;ILcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;Lcom/fasterxml/jackson/annotation/JacksonInject$Value;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
@@ -115,43 +115,43 @@ constructEnumResolver
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/util/EnumResolver;
 createArrayDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/ArrayType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/ArrayType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/ArrayType;Lcom/fasterxml/jackson/databind/BeanDescription;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.DeserializerFactory)
 createCollectionDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/CollectionType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/CollectionType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/CollectionType;Lcom/fasterxml/jackson/databind/BeanDescription;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.DeserializerFactory)
 createCollectionLikeDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/CollectionLikeType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/CollectionLikeType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/CollectionLikeType;Lcom/fasterxml/jackson/databind/BeanDescription;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.DeserializerFactory)
 createEnumDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.DeserializerFactory)
 createKeyDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/KeyDeserializer; # @Inherited(com.fasterxml.jackson.databind.deser.DeserializerFactory)
 createMapDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/MapType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/MapType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/MapType;Lcom/fasterxml/jackson/databind/BeanDescription;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.DeserializerFactory)
 createMapLikeDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/MapLikeType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/MapLikeType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/MapLikeType;Lcom/fasterxml/jackson/databind/BeanDescription;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.DeserializerFactory)
 createReferenceDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/ReferenceType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/ReferenceType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/ReferenceType;Lcom/fasterxml/jackson/databind/BeanDescription;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.DeserializerFactory)
 createTreeDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.DeserializerFactory)
 findContentDeserializerFromAnnotation
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
 findDefaultDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
 findDeserializerFromAnnotation
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
 findKeyDeserializerFromAnnotation
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/databind/KeyDeserializer;
 findOptionalStdDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
@@ -163,7 +163,7 @@ findPropertyTypeDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;
 findTypeDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/jsontype/TypeDeserializer;
 findValueInstantiator
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/deser/ValueInstantiator;
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/deser/ValueInstantiator;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/BeanDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/BeanDeserializer.eea
index bc35ada8d1..d0368893fc 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/BeanDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/BeanDeserializer.eea
@@ -51,7 +51,7 @@ _deserializeWithExternalTypeId
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;Lcom/fasterxml/jackson/databind/deser/impl/ExternalTypeHandler;)Ljava/lang/Object;
 asArrayDeserializer
  ()Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
- ()Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
+ ()L1com/fasterxml/jackson/databind/deser/BeanDeserializerBase;
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
@@ -90,13 +90,13 @@ unwrappingDeserializer
  (Lcom/fasterxml/jackson/databind/util/NameTransformer;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
 withBeanProperties
  (Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
- (Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
+ (Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;)L1com/fasterxml/jackson/databind/deser/BeanDeserializerBase; # @Inherited(com.fasterxml.jackson.databind.deser.BeanDeserializerBase)
 withByNameInclusion
  (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializer;
- (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializer;
+ (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)L1com/fasterxml/jackson/databind/deser/BeanDeserializer;
 withIgnoreAllUnknown
  (Z)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
- (Z)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
+ (Z)L1com/fasterxml/jackson/databind/deser/BeanDeserializerBase;
 withObjectIdReader
  (Lcom/fasterxml/jackson/databind/deser/impl/ObjectIdReader;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializer;
- (Lcom/fasterxml/jackson/databind/deser/impl/ObjectIdReader;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializer;
+ (Lcom/fasterxml/jackson/databind/deser/impl/ObjectIdReader;)L1com/fasterxml/jackson/databind/deser/BeanDeserializer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.eea
index f5bf5e8a3f..658016a954 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.eea
@@ -92,7 +92,7 @@ _deserializeUsingPropertyBased
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
 _findPropertyUnwrapper
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;)Lcom/fasterxml/jackson/databind/util/NameTransformer;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;)Lcom/fasterxml/jackson/databind/util/NameTransformer;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;)L0com/fasterxml/jackson/databind/util/NameTransformer;
 _findSubclassDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;Lcom/fasterxml/jackson/databind/util/TokenBuffer;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;Lcom/fasterxml/jackson/databind/util/TokenBuffer;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
@@ -125,7 +125,7 @@ asArrayDeserializer
  ()Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
 createContextual
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.ContextualDeserializer)
 creatorProperties
  ()Ljava/util/Iterator<Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;>;
  ()Ljava/util/Iterator<Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;>;
@@ -167,7 +167,7 @@ findBackReference
  (L1java/lang/String;)L0com/fasterxml/jackson/databind/deser/SettableBeanProperty; # @Inherited(com.fasterxml.jackson.databind.JsonDeserializer)
 findConvertingDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;)L0com/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
 findProperty
  (I)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
  (I)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
@@ -248,7 +248,7 @@ unwrappingDeserializer
  (Lcom/fasterxml/jackson/databind/util/NameTransformer;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
 withBeanProperties
  (Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
- (Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
+ (Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;)L1com/fasterxml/jackson/databind/deser/BeanDeserializerBase;
 withByNameInclusion
  (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
  (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
@@ -263,7 +263,7 @@ withObjectIdReader
  (Lcom/fasterxml/jackson/databind/deser/impl/ObjectIdReader;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
 wrapAndThrow
  <T:Ljava/lang/Object;>(Ljava/lang/Throwable;Ljava/lang/Object;Ljava/lang/String;Lcom/fasterxml/jackson/databind/DeserializationContext;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Throwable;Ljava/lang/Object;Ljava/lang/String;Lcom/fasterxml/jackson/databind/DeserializationContext;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Throwable;Ljava/lang/Object;Ljava/lang/String;Lcom/fasterxml/jackson/databind/DeserializationContext;)T1T;
 wrapInstantiationProblem
  <T:Ljava/lang/Object;>(Ljava/lang/Throwable;Lcom/fasterxml/jackson/databind/DeserializationContext;)TT;
  <T:Ljava/lang/Object;>(Ljava/lang/Throwable;Lcom/fasterxml/jackson/databind/DeserializationContext;)TT;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/BeanDeserializerBuilder.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/BeanDeserializerBuilder.eea
index db85f49a32..e109522eba 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/BeanDeserializerBuilder.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/BeanDeserializerBuilder.eea
@@ -87,7 +87,7 @@ buildBuilderBased
  (Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
 createBuilderBasedDeserializer
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;Z)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;Z)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;Z)L1com/fasterxml/jackson/databind/JsonDeserializer<*>;
 findProperty
  (Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
  (Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/BeanDeserializerFactory.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/BeanDeserializerFactory.eea
index 411108ca8e..5d3e8a7d50 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/BeanDeserializerFactory.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/BeanDeserializerFactory.eea
@@ -9,7 +9,7 @@ instance
  (Lcom/fasterxml/jackson/databind/cfg/DeserializerFactoryConfig;)V
 _findUnsupportedTypeDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)L0com/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
 _validateSubType
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)V
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)V
@@ -42,7 +42,7 @@ constructAnySetter
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/deser/SettableAnyProperty;
 constructBeanDeserializerBuilder
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBuilder;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBuilder;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;)L1com/fasterxml/jackson/databind/deser/BeanDeserializerBuilder;
 constructSettableProperty
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
@@ -51,10 +51,10 @@ constructSetterlessProperty
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
 createBeanDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)L0com/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>; # @Overrides(com.fasterxml.jackson.databind.deser.DeserializerFactory)
 createBuilderBasedDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;Ljava/lang/Class<*>;)L1com/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>; # @Inherited(com.fasterxml.jackson.databind.deser.DeserializerFactory)
 filterBeanProps
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBuilder;Ljava/util/List<Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;>;Ljava/util/Set<Ljava/lang/String;>;)Ljava/util/List<Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;>;
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBuilder;Ljava/util/List<Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;>;Ljava/util/Set<Ljava/lang/String;>;)Ljava/util/List<Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;>;
@@ -72,7 +72,7 @@ isPotentialBeanType
  (Ljava/lang/Class<*>;)Z
 materializeAbstractType
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)L0com/fasterxml/jackson/databind/JavaType;
 withConfig
  (Lcom/fasterxml/jackson/databind/cfg/DeserializerFactoryConfig;)Lcom/fasterxml/jackson/databind/deser/DeserializerFactory;
  (Lcom/fasterxml/jackson/databind/cfg/DeserializerFactoryConfig;)Lcom/fasterxml/jackson/databind/deser/DeserializerFactory;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.eea
index 1adae4823b..f31e0fe738 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.eea
@@ -87,16 +87,16 @@ supportsUpdate
  (L1com/fasterxml/jackson/databind/DeserializationConfig;)L0java/lang/Boolean; # @Inherited(com.fasterxml.jackson.databind.deser.BeanDeserializerBase)
 unwrappingDeserializer
  (Lcom/fasterxml/jackson/databind/util/NameTransformer;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/util/NameTransformer;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/util/NameTransformer;)L1com/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
 withBeanProperties
  (Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
- (Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
+ (Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;)L1com/fasterxml/jackson/databind/deser/BeanDeserializerBase; # @Inherited(com.fasterxml.jackson.databind.deser.BeanDeserializerBase)
 withByNameInclusion
  (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
- (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
+ (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)L1com/fasterxml/jackson/databind/deser/BeanDeserializerBase;
 withIgnoreAllUnknown
  (Z)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
- (Z)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
+ (Z)L1com/fasterxml/jackson/databind/deser/BeanDeserializerBase;
 withObjectIdReader
  (Lcom/fasterxml/jackson/databind/deser/impl/ObjectIdReader;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
- (Lcom/fasterxml/jackson/databind/deser/impl/ObjectIdReader;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
+ (Lcom/fasterxml/jackson/databind/deser/impl/ObjectIdReader;)L1com/fasterxml/jackson/databind/deser/BeanDeserializerBase;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/ContextualDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/ContextualDeserializer.eea
index 87a9ee66c1..ecad391a64 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/ContextualDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/ContextualDeserializer.eea
@@ -2,4 +2,4 @@ class com/fasterxml/jackson/databind/deser/ContextualDeserializer
 
 createContextual
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/ContextualKeyDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/ContextualKeyDeserializer.eea
index a0e6ebd1eb..2389b1b99c 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/ContextualKeyDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/ContextualKeyDeserializer.eea
@@ -2,4 +2,4 @@ class com/fasterxml/jackson/databind/deser/ContextualKeyDeserializer
 
 createContextual
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/KeyDeserializer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/CreatorProperty.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/CreatorProperty.eea
index 9b6134a8bf..9799ff8daf 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/CreatorProperty.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/CreatorProperty.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/deser/CreatorProperty
 
 construct
  (Lcom/fasterxml/jackson/databind/PropertyName;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/PropertyName;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/util/Annotations;Lcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;ILcom/fasterxml/jackson/annotation/JacksonInject$Value;Lcom/fasterxml/jackson/databind/PropertyMetadata;)Lcom/fasterxml/jackson/databind/deser/CreatorProperty;
- (Lcom/fasterxml/jackson/databind/PropertyName;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/PropertyName;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/util/Annotations;Lcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;ILcom/fasterxml/jackson/annotation/JacksonInject$Value;Lcom/fasterxml/jackson/databind/PropertyMetadata;)Lcom/fasterxml/jackson/databind/deser/CreatorProperty;
+ (Lcom/fasterxml/jackson/databind/PropertyName;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/PropertyName;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/util/Annotations;Lcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;ILcom/fasterxml/jackson/annotation/JacksonInject$Value;Lcom/fasterxml/jackson/databind/PropertyMetadata;)L1com/fasterxml/jackson/databind/deser/CreatorProperty;
 
 _annotated
  Lcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;
@@ -40,10 +40,10 @@ fixAccess
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;)V
 getAnnotation
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
- <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
+ <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)T0A;
 getInjectableValueId
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.SettableBeanProperty)
 getMember
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
@@ -67,10 +67,10 @@ toString
  ()L1java/lang/String; # @Inherited(com.fasterxml.jackson.databind.deser.SettableBeanProperty)
 withName
  (Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
- (Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
+ (Lcom/fasterxml/jackson/databind/PropertyName;)L1com/fasterxml/jackson/databind/deser/SettableBeanProperty;
 withNullProvider
  (Lcom/fasterxml/jackson/databind/deser/NullValueProvider;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
- (Lcom/fasterxml/jackson/databind/deser/NullValueProvider;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
+ (Lcom/fasterxml/jackson/databind/deser/NullValueProvider;)L1com/fasterxml/jackson/databind/deser/SettableBeanProperty;
 withValueDeserializer
  (Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
  (Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DataFormatReaders$AccessorForReader.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DataFormatReaders$AccessorForReader.eea
index 5c588a5e5b..9031268355 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DataFormatReaders$AccessorForReader.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DataFormatReaders$AccessorForReader.eea
@@ -11,4 +11,4 @@ class com/fasterxml/jackson/databind/deser/DataFormatReaders$AccessorForReader
  ([BII)V
 createMatcher
  (Lcom/fasterxml/jackson/databind/ObjectReader;Lcom/fasterxml/jackson/core/format/MatchStrength;)Lcom/fasterxml/jackson/databind/deser/DataFormatReaders$Match;
- (Lcom/fasterxml/jackson/databind/ObjectReader;Lcom/fasterxml/jackson/core/format/MatchStrength;)Lcom/fasterxml/jackson/databind/deser/DataFormatReaders$Match;
+ (Lcom/fasterxml/jackson/databind/ObjectReader;Lcom/fasterxml/jackson/core/format/MatchStrength;)L1com/fasterxml/jackson/databind/deser/DataFormatReaders$Match;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DataFormatReaders$Match.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DataFormatReaders$Match.eea
index d969b91eab..61e61c07c5 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DataFormatReaders$Match.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DataFormatReaders$Match.eea
@@ -18,7 +18,7 @@ _originalStream
  (Ljava/io/InputStream;[BIILcom/fasterxml/jackson/databind/ObjectReader;Lcom/fasterxml/jackson/core/format/MatchStrength;)V
 createParserWithMatch
  ()Lcom/fasterxml/jackson/core/JsonParser;
- ()Lcom/fasterxml/jackson/core/JsonParser;
+ ()L0com/fasterxml/jackson/core/JsonParser;
 getDataStream
  ()Ljava/io/InputStream;
  ()Ljava/io/InputStream;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext$Impl.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext$Impl.eea
index 5df80cca77..856b2d2a6b 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext$Impl.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext$Impl.eea
@@ -5,16 +5,16 @@ class com/fasterxml/jackson/databind/deser/DefaultDeserializationContext$Impl
  (Lcom/fasterxml/jackson/databind/deser/DeserializerFactory;)V
 copy
  ()Lcom/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
- ()Lcom/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
+ ()L1com/fasterxml/jackson/databind/deser/DefaultDeserializationContext; # @Inherited(com.fasterxml.jackson.databind.deser.DefaultDeserializationContext)
 createDummyInstance
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;)L1com/fasterxml/jackson/databind/deser/DefaultDeserializationContext; # @Inherited(com.fasterxml.jackson.databind.deser.DefaultDeserializationContext)
 createInstance
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/InjectableValues;)Lcom/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/InjectableValues;)Lcom/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/InjectableValues;)L1com/fasterxml/jackson/databind/deser/DefaultDeserializationContext; # @Inherited(com.fasterxml.jackson.databind.deser.DefaultDeserializationContext)
 with
  (Lcom/fasterxml/jackson/databind/deser/DeserializerFactory;)Lcom/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
- (Lcom/fasterxml/jackson/databind/deser/DeserializerFactory;)Lcom/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
+ (Lcom/fasterxml/jackson/databind/deser/DeserializerFactory;)L1com/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
 withCaches
  (Lcom/fasterxml/jackson/databind/cfg/CacheProvider;)Lcom/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
- (Lcom/fasterxml/jackson/databind/cfg/CacheProvider;)Lcom/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
+ (Lcom/fasterxml/jackson/databind/cfg/CacheProvider;)L1com/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext.eea
index d6c633cf98..f8a48d1d5a 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext.eea
@@ -27,25 +27,25 @@ _unwrapAndDeserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;Ljava/lang/Object;)Ljava/lang/Object;
 copy
  ()Lcom/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
- ()Lcom/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
+ ()L1com/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
 createDummyInstance
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;)L1com/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
 createInstance
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/InjectableValues;)Lcom/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/InjectableValues;)Lcom/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/InjectableValues;)L1com/fasterxml/jackson/databind/deser/DefaultDeserializationContext;
 createReadableObjectId
  (Lcom/fasterxml/jackson/annotation/ObjectIdGenerator$IdKey;)Lcom/fasterxml/jackson/databind/deser/impl/ReadableObjectId;
- (Lcom/fasterxml/jackson/annotation/ObjectIdGenerator$IdKey;)Lcom/fasterxml/jackson/databind/deser/impl/ReadableObjectId;
+ (Lcom/fasterxml/jackson/annotation/ObjectIdGenerator$IdKey;)L1com/fasterxml/jackson/databind/deser/impl/ReadableObjectId;
 deserializerInstance
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Object;)L0com/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
 findObjectId
  (Ljava/lang/Object;Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<*>;Lcom/fasterxml/jackson/annotation/ObjectIdResolver;)Lcom/fasterxml/jackson/databind/deser/impl/ReadableObjectId;
  (Ljava/lang/Object;Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<*>;Lcom/fasterxml/jackson/annotation/ObjectIdResolver;)Lcom/fasterxml/jackson/databind/deser/impl/ReadableObjectId;
 keyDeserializerInstance
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Object;)L0com/fasterxml/jackson/databind/KeyDeserializer;
 readRootValue
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;Ljava/lang/Object;)Ljava/lang/Object;
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DeserializationProblemHandler.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DeserializationProblemHandler.eea
index cda93a3f84..9c6667b4fb 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DeserializationProblemHandler.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DeserializationProblemHandler.eea
@@ -15,7 +15,7 @@ handleMissingInstantiator
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/deser/ValueInstantiator;Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;)Ljava/lang/Object;
 handleMissingTypeId
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/jsontype/TypeIdResolver;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/jsontype/TypeIdResolver;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/jsontype/TypeIdResolver;Ljava/lang/String;)L0com/fasterxml/jackson/databind/JavaType;
 handleUnexpectedToken
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/core/JsonToken;Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;)Ljava/lang/Object;
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/core/JsonToken;Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;)Ljava/lang/Object;
@@ -27,7 +27,7 @@ handleUnknownProperty
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;Ljava/lang/Object;Ljava/lang/String;)Z
 handleUnknownTypeId
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;Lcom/fasterxml/jackson/databind/jsontype/TypeIdResolver;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;Lcom/fasterxml/jackson/databind/jsontype/TypeIdResolver;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;Lcom/fasterxml/jackson/databind/jsontype/TypeIdResolver;Ljava/lang/String;)L0com/fasterxml/jackson/databind/JavaType;
 handleWeirdKey
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Class<*>;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Class<*>;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DeserializerCache.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DeserializerCache.eea
index 54ac7b90df..04bcbcb0cd 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DeserializerCache.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DeserializerCache.eea
@@ -12,7 +12,7 @@ _incompleteDeserializers
  (Lcom/fasterxml/jackson/databind/util/LookupCache<Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;>;)V
 _createAndCache2
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/DeserializerFactory;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/DeserializerFactory;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/DeserializerFactory;Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
 _createAndCacheValueDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/DeserializerFactory;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/DeserializerFactory;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
@@ -24,7 +24,7 @@ _createDeserializer2
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/DeserializerFactory;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
 _findCachedDeserializer
  (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
 _handleUnknownKeyDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
@@ -33,16 +33,16 @@ _handleUnknownValueDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
 emptyCopy
  ()Lcom/fasterxml/jackson/databind/deser/DeserializerCache;
- ()Lcom/fasterxml/jackson/databind/deser/DeserializerCache;
+ ()L1com/fasterxml/jackson/databind/deser/DeserializerCache;
 findConverter
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;Ljava/lang/Object;>;
 findConvertingDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/introspect/Annotated;Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/introspect/Annotated;Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
 findDeserializerFromAnnotation
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
 findKeyDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/DeserializerFactory;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/DeserializerFactory;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DeserializerFactory.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DeserializerFactory.eea
index ea057fca3e..2a8e33f8b0 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DeserializerFactory.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/DeserializerFactory.eea
@@ -6,37 +6,37 @@ NO_DESERIALIZERS
 
 createArrayDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/ArrayType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/ArrayType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/ArrayType;Lcom/fasterxml/jackson/databind/BeanDescription;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>;
 createBeanDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)L1com/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
 createBuilderBasedDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;Ljava/lang/Class<*>;)L1com/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
 createCollectionDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/CollectionType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/CollectionType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/CollectionType;Lcom/fasterxml/jackson/databind/BeanDescription;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>;
 createCollectionLikeDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/CollectionLikeType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/CollectionLikeType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/CollectionLikeType;Lcom/fasterxml/jackson/databind/BeanDescription;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>;
 createEnumDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>;
 createKeyDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/KeyDeserializer;
 createMapDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/MapType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/MapType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/MapType;Lcom/fasterxml/jackson/databind/BeanDescription;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>;
 createMapLikeDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/MapLikeType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/MapLikeType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/MapLikeType;Lcom/fasterxml/jackson/databind/BeanDescription;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>;
 createReferenceDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/ReferenceType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/ReferenceType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/type/ReferenceType;Lcom/fasterxml/jackson/databind/BeanDescription;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>;
 createTreeDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>;
 findTypeDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/Deserializers$Base.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/Deserializers$Base.eea
index 66c25e9e8f..c766c0b0c3 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/Deserializers$Base.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/Deserializers$Base.eea
@@ -2,28 +2,28 @@ class com/fasterxml/jackson/databind/deser/Deserializers$Base
 
 findArrayDeserializer
  (Lcom/fasterxml/jackson/databind/type/ArrayType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/type/ArrayType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/type/ArrayType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>;
 findBeanDeserializer
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>;
 findCollectionDeserializer
  (Lcom/fasterxml/jackson/databind/type/CollectionType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/type/CollectionType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/type/CollectionType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>;
 findCollectionLikeDeserializer
  (Lcom/fasterxml/jackson/databind/type/CollectionLikeType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/type/CollectionLikeType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/type/CollectionLikeType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>;
 findEnumDeserializer
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>;
 findMapDeserializer
  (Lcom/fasterxml/jackson/databind/type/MapType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/type/MapType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/type/MapType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>;
 findMapLikeDeserializer
  (Lcom/fasterxml/jackson/databind/type/MapLikeType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/type/MapLikeType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/type/MapLikeType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>;
 findReferenceDeserializer
  (Lcom/fasterxml/jackson/databind/type/ReferenceType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/type/ReferenceType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/type/ReferenceType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>;
 findTreeNodeDeserializer
  (Ljava/lang/Class<+Lcom/fasterxml/jackson/databind/JsonNode;>;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Ljava/lang/Class<+Lcom/fasterxml/jackson/databind/JsonNode;>;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Ljava/lang/Class<+Lcom/fasterxml/jackson/databind/JsonNode;>;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/SettableAnyProperty.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/SettableAnyProperty.eea
index 057ad89f2f..c6274033dd 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/SettableAnyProperty.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/SettableAnyProperty.eea
@@ -2,13 +2,13 @@ class com/fasterxml/jackson/databind/deser/SettableAnyProperty
 
 constructForJsonNodeField
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/deser/SettableAnyProperty;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/deser/SettableAnyProperty;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;)L1com/fasterxml/jackson/databind/deser/SettableAnyProperty;
 constructForMapField
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;)Lcom/fasterxml/jackson/databind/deser/SettableAnyProperty;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;)Lcom/fasterxml/jackson/databind/deser/SettableAnyProperty;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;)L1com/fasterxml/jackson/databind/deser/SettableAnyProperty;
 constructForMethod
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;)Lcom/fasterxml/jackson/databind/deser/SettableAnyProperty;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;)Lcom/fasterxml/jackson/databind/deser/SettableAnyProperty;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;)L1com/fasterxml/jackson/databind/deser/SettableAnyProperty;
 
 _keyDeserializer
  Lcom/fasterxml/jackson/databind/KeyDeserializer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/SettableBeanProperty$Delegating.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/SettableBeanProperty$Delegating.eea
index 780161ba81..79a4118346 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/SettableBeanProperty$Delegating.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/SettableBeanProperty$Delegating.eea
@@ -30,7 +30,7 @@ getDelegate
  ()Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
 getInjectableValueId
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.SettableBeanProperty)
 getManagedReferenceName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -42,7 +42,7 @@ getObjectIdInfo
  ()Lcom/fasterxml/jackson/databind/introspect/ObjectIdInfo;
 getValueDeserializer
  ()Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
- ()Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
+ ()L0com/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>; # @Inherited(com.fasterxml.jackson.databind.deser.SettableBeanProperty)
 getValueTypeDeserializer
  ()Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;
  ()Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/SettableBeanProperty.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/SettableBeanProperty.eea
index 5e9319d3f2..74cec74ee1 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/SettableBeanProperty.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/SettableBeanProperty.eea
@@ -55,7 +55,7 @@ _wrapperName
  (Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/util/Annotations;)V
 _throwAsIOE
  (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/Exception;)Ljava/io/IOException;
- (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/Exception;)Ljava/io/IOException;
+ (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/Exception;)L1java/io/IOException;
 _throwAsIOE
  (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/Exception;Ljava/lang/Object;)V
  (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/Exception;Ljava/lang/Object;)V
@@ -97,7 +97,7 @@ getFullName
  ()Lcom/fasterxml/jackson/databind/PropertyName;
 getInjectableValueId
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getManagedReferenceName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -118,7 +118,7 @@ getType
  ()Lcom/fasterxml/jackson/databind/JavaType;
 getValueDeserializer
  ()Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
- ()Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
+ ()L0com/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
 getValueTypeDeserializer
  ()Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;
  ()Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/ValueInstantiator$Base.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/ValueInstantiator$Base.eea
index d4fc9b119b..100c6b77d2 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/ValueInstantiator$Base.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/ValueInstantiator$Base.eea
@@ -12,7 +12,7 @@ _valueType
  (Ljava/lang/Class<*>;)V
 getValueClass
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L1java/lang/Class<*>; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 getValueTypeDesc
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/ValueInstantiator$Delegating.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/ValueInstantiator$Delegating.eea
index 92fb27b1ff..aa1c19d56b 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/ValueInstantiator$Delegating.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/ValueInstantiator$Delegating.eea
@@ -9,70 +9,70 @@ _delegate
  (Lcom/fasterxml/jackson/databind/deser/ValueInstantiator;)V
 createContextual
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/deser/ValueInstantiator;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/deser/ValueInstantiator;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;)L1com/fasterxml/jackson/databind/deser/ValueInstantiator; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 createFromBigDecimal
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/math/BigDecimal;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/math/BigDecimal;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/math/BigDecimal;)L1java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 createFromBigInteger
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/math/BigInteger;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/math/BigInteger;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/math/BigInteger;)L1java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 createFromBoolean
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Z)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Z)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Z)L1java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 createFromDouble
  (Lcom/fasterxml/jackson/databind/DeserializationContext;D)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;D)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;D)L1java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 createFromInt
  (Lcom/fasterxml/jackson/databind/DeserializationContext;I)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;I)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;I)L1java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 createFromLong
  (Lcom/fasterxml/jackson/databind/DeserializationContext;J)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;J)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;J)L1java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 createFromObjectWith
  (Lcom/fasterxml/jackson/databind/DeserializationContext;[Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;Lcom/fasterxml/jackson/databind/deser/impl/PropertyValueBuffer;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;[Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;Lcom/fasterxml/jackson/databind/deser/impl/PropertyValueBuffer;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;[Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;Lcom/fasterxml/jackson/databind/deser/impl/PropertyValueBuffer;)L1java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 createFromObjectWith
  (Lcom/fasterxml/jackson/databind/DeserializationContext;[Ljava/lang/Object;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;[Ljava/lang/Object;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;[Ljava/lang/Object;)L1java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 createFromString
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;)L1java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 createUsingArrayDelegate
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)L1java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 createUsingDefault
  (Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;)L1java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 createUsingDelegate
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)L1java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 delegate
  ()Lcom/fasterxml/jackson/databind/deser/ValueInstantiator;
  ()Lcom/fasterxml/jackson/databind/deser/ValueInstantiator;
 getArrayDelegateCreator
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedWithParams; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 getArrayDelegateType
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;)L0com/fasterxml/jackson/databind/JavaType; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 getDefaultCreator
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedWithParams; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 getDelegateCreator
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedWithParams; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 getDelegateType
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;)L0com/fasterxml/jackson/databind/JavaType; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 getFromObjectArguments
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;)[Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;)[Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;)[0Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 getValueClass
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L1java/lang/Class<*>; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 getValueTypeDesc
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getWithArgsCreator
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedWithParams; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/ValueInstantiator.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/ValueInstantiator.eea
index 1abe801100..071c2ad76b 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/ValueInstantiator.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/ValueInstantiator.eea
@@ -2,73 +2,73 @@ class com/fasterxml/jackson/databind/deser/ValueInstantiator
 
 _createFromStringFallbacks
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;)L0java/lang/Object;
 createContextual
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/deser/ValueInstantiator;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/deser/ValueInstantiator;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanDescription;)L1com/fasterxml/jackson/databind/deser/ValueInstantiator;
 createFromBigDecimal
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/math/BigDecimal;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/math/BigDecimal;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/math/BigDecimal;)L1java/lang/Object;
 createFromBigInteger
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/math/BigInteger;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/math/BigInteger;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/math/BigInteger;)L1java/lang/Object;
 createFromBoolean
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Z)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Z)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Z)L1java/lang/Object;
 createFromDouble
  (Lcom/fasterxml/jackson/databind/DeserializationContext;D)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;D)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;D)L1java/lang/Object;
 createFromInt
  (Lcom/fasterxml/jackson/databind/DeserializationContext;I)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;I)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;I)L1java/lang/Object;
 createFromLong
  (Lcom/fasterxml/jackson/databind/DeserializationContext;J)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;J)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;J)L1java/lang/Object;
 createFromObjectWith
  (Lcom/fasterxml/jackson/databind/DeserializationContext;[Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;Lcom/fasterxml/jackson/databind/deser/impl/PropertyValueBuffer;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;[Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;Lcom/fasterxml/jackson/databind/deser/impl/PropertyValueBuffer;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;[Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;Lcom/fasterxml/jackson/databind/deser/impl/PropertyValueBuffer;)L1java/lang/Object;
 createFromObjectWith
  (Lcom/fasterxml/jackson/databind/DeserializationContext;[Ljava/lang/Object;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;[Ljava/lang/Object;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;[Ljava/lang/Object;)L1java/lang/Object;
 createFromString
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;)L1java/lang/Object;
 createUsingArrayDelegate
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)L1java/lang/Object;
 createUsingDefault
  (Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;)L1java/lang/Object;
 createUsingDefaultOrWithoutArguments
  (Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;)L1java/lang/Object;
 createUsingDelegate
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)L1java/lang/Object;
 getArrayDelegateCreator
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
 getArrayDelegateType
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;)L0com/fasterxml/jackson/databind/JavaType;
 getDefaultCreator
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
 getDelegateCreator
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
 getDelegateType
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;)L0com/fasterxml/jackson/databind/JavaType;
 getFromObjectArguments
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;)[Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;)[Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;)[0Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
 getValueClass
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L1java/lang/Class<*>;
 getValueTypeDesc
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getWithArgsCreator
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayBuilderDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayBuilderDeserializer.eea
index d71e0357d6..f5b4149db8 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayBuilderDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayBuilderDeserializer.eea
@@ -48,7 +48,7 @@ unwrappingDeserializer
  (Lcom/fasterxml/jackson/databind/util/NameTransformer;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
 withBeanProperties
  (Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
- (Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
+ (Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;)L1com/fasterxml/jackson/databind/deser/BeanDeserializerBase; # @Inherited(com.fasterxml.jackson.databind.deser.BeanDeserializerBase)
 withByNameInclusion
  (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
  (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayDeserializer.eea
index be96f52bfd..06d03acd3a 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayDeserializer.eea
@@ -36,7 +36,7 @@ unwrappingDeserializer
  (Lcom/fasterxml/jackson/databind/util/NameTransformer;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
 withBeanProperties
  (Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
- (Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
+ (Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;)L1com/fasterxml/jackson/databind/deser/BeanDeserializerBase; # @Inherited(com.fasterxml.jackson.databind.deser.BeanDeserializerBase)
 withByNameInclusion
  (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
  (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/BeanPropertyMap.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/BeanPropertyMap.eea
index 5bc3b3c546..840fbfa81f 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/BeanPropertyMap.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/BeanPropertyMap.eea
@@ -6,13 +6,13 @@ super java/lang/Iterable
 
 construct
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;>;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lcom/fasterxml/jackson/databind/PropertyName;>;>;)Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;>;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lcom/fasterxml/jackson/databind/PropertyName;>;>;)Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;>;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lcom/fasterxml/jackson/databind/PropertyName;>;>;)L1com/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;
 construct
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;>;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lcom/fasterxml/jackson/databind/PropertyName;>;>;Z)Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;>;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lcom/fasterxml/jackson/databind/PropertyName;>;>;Z)Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;>;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lcom/fasterxml/jackson/databind/PropertyName;>;>;Z)L1com/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;
 construct
  (Ljava/util/Collection<Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;>;ZLjava/util/Map<Ljava/lang/String;Ljava/util/List<Lcom/fasterxml/jackson/databind/PropertyName;>;>;)Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;
- (Ljava/util/Collection<Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;>;ZLjava/util/Map<Ljava/lang/String;Ljava/util/List<Lcom/fasterxml/jackson/databind/PropertyName;>;>;)Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;
+ (Ljava/util/Collection<Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;>;ZLjava/util/Map<Ljava/lang/String;Ljava/util/List<Lcom/fasterxml/jackson/databind/PropertyName;>;>;)L1com/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;
 
 <init>
  (Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;Z)V
@@ -31,7 +31,7 @@ assignIndexes
  ()Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;
 find
  (I)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
- (I)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
+ (I)L0com/fasterxml/jackson/databind/deser/SettableBeanProperty;
 find
  (Ljava/lang/String;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
  (Ljava/lang/String;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
@@ -67,7 +67,7 @@ withCaseInsensitivity
  (Z)Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;
 withProperty
  (Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;)Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;
- (Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;)Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;
+ (Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;)L1com/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;
 withoutProperties
  (Ljava/util/Collection<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;
  (Ljava/util/Collection<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/CreatorCandidate$Param.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/CreatorCandidate$Param.eea
index 374d955116..42be3468d0 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/CreatorCandidate$Param.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/CreatorCandidate$Param.eea
@@ -15,4 +15,4 @@ propDef
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Lcom/fasterxml/jackson/annotation/JacksonInject$Value;)V
 fullName
  ()Lcom/fasterxml/jackson/databind/PropertyName;
- ()Lcom/fasterxml/jackson/databind/PropertyName;
+ ()L0com/fasterxml/jackson/databind/PropertyName;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/CreatorCandidate.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/CreatorCandidate.eea
index 754e403728..1eb6d20f80 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/CreatorCandidate.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/CreatorCandidate.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/deser/impl/CreatorCandidate
 
 construct
  (Lcom/fasterxml/jackson/databind/AnnotationIntrospector;Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;[Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;)Lcom/fasterxml/jackson/databind/deser/impl/CreatorCandidate;
- (Lcom/fasterxml/jackson/databind/AnnotationIntrospector;Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;[Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;)Lcom/fasterxml/jackson/databind/deser/impl/CreatorCandidate;
+ (Lcom/fasterxml/jackson/databind/AnnotationIntrospector;Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;[Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;)L1com/fasterxml/jackson/databind/deser/impl/CreatorCandidate;
 
 _creator
  Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
@@ -22,16 +22,16 @@ creator
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
 explicitParamName
  (I)Lcom/fasterxml/jackson/databind/PropertyName;
- (I)Lcom/fasterxml/jackson/databind/PropertyName;
+ (I)L0com/fasterxml/jackson/databind/PropertyName;
 findImplicitParamName
  (I)Lcom/fasterxml/jackson/databind/PropertyName;
- (I)Lcom/fasterxml/jackson/databind/PropertyName;
+ (I)L0com/fasterxml/jackson/databind/PropertyName;
 injection
  (I)Lcom/fasterxml/jackson/annotation/JacksonInject$Value;
  (I)Lcom/fasterxml/jackson/annotation/JacksonInject$Value;
 paramName
  (I)Lcom/fasterxml/jackson/databind/PropertyName;
- (I)Lcom/fasterxml/jackson/databind/PropertyName;
+ (I)L0com/fasterxml/jackson/databind/PropertyName;
 parameter
  (I)Lcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;
  (I)Lcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/CreatorCollector.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/CreatorCollector.eea
index 71f8749d5a..4f86d7830e 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/CreatorCollector.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/CreatorCollector.eea
@@ -58,7 +58,7 @@ addStringCreator
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;Z)V
 constructValueInstantiator
  (Lcom/fasterxml/jackson/databind/DeserializationContext;)Lcom/fasterxml/jackson/databind/deser/ValueInstantiator;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;)Lcom/fasterxml/jackson/databind/deser/ValueInstantiator;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;)L1com/fasterxml/jackson/databind/deser/ValueInstantiator;
 setDefaultCreator
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;)V
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/ErrorThrowingDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/ErrorThrowingDeserializer.eea
index c6c73dbee6..77b2c5a4b5 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/ErrorThrowingDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/ErrorThrowingDeserializer.eea
@@ -9,4 +9,4 @@ super com/fasterxml/jackson/databind/JsonDeserializer
  (Ljava/lang/NoClassDefFoundError;)V
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)L1java/lang/Object;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/ExternalTypeHandler.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/ExternalTypeHandler.eea
index 0ee55eb7f4..ac81664586 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/ExternalTypeHandler.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/ExternalTypeHandler.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/deser/impl/ExternalTypeHandler
 
 builder
  (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/deser/impl/ExternalTypeHandler$Builder;
- (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/deser/impl/ExternalTypeHandler$Builder;
+ (Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/deser/impl/ExternalTypeHandler$Builder;
 
 <init>
  (Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/deser/impl/ExternalTypeHandler$ExtTypedProperty;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;[Ljava/lang/String;[Lcom/fasterxml/jackson/databind/util/TokenBuffer;)V
@@ -12,7 +12,7 @@ builder
  (Lcom/fasterxml/jackson/databind/deser/impl/ExternalTypeHandler;)V
 _deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;ILjava/lang/String;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;ILjava/lang/String;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;ILjava/lang/String;)L0java/lang/Object;
 _deserializeAndSet
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;ILjava/lang/String;)V
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;ILjava/lang/String;)V
@@ -33,4 +33,4 @@ handleTypePropertyValue
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;Ljava/lang/Object;)Z
 start
  ()Lcom/fasterxml/jackson/databind/deser/impl/ExternalTypeHandler;
- ()Lcom/fasterxml/jackson/databind/deser/impl/ExternalTypeHandler;
+ ()L1com/fasterxml/jackson/databind/deser/impl/ExternalTypeHandler;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/FailingDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/FailingDeserializer.eea
index 134ae72952..3ce069ad82 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/FailingDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/FailingDeserializer.eea
@@ -16,4 +16,4 @@ _message
  (Ljava/lang/String;)V
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)L0java/lang/Object;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/FieldProperty.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/FieldProperty.eea
index bc8b5a2eb8..1683d9b8dc 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/FieldProperty.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/FieldProperty.eea
@@ -42,10 +42,10 @@ setAndReturn
  (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 withName
  (Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
- (Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
+ (Lcom/fasterxml/jackson/databind/PropertyName;)L1com/fasterxml/jackson/databind/deser/SettableBeanProperty;
 withNullProvider
  (Lcom/fasterxml/jackson/databind/deser/NullValueProvider;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
- (Lcom/fasterxml/jackson/databind/deser/NullValueProvider;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
+ (Lcom/fasterxml/jackson/databind/deser/NullValueProvider;)L1com/fasterxml/jackson/databind/deser/SettableBeanProperty;
 withValueDeserializer
  (Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
  (Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/JDKValueInstantiators.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/JDKValueInstantiators.eea
index 7fcf29c697..9e5611e3e8 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/JDKValueInstantiators.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/JDKValueInstantiators.eea
@@ -2,4 +2,4 @@ class com/fasterxml/jackson/databind/deser/impl/JDKValueInstantiators
 
 findStdValueInstantiator
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/deser/ValueInstantiator;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/deser/ValueInstantiator;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;Ljava/lang/Class<*>;)L0com/fasterxml/jackson/databind/deser/ValueInstantiator;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/JavaUtilCollectionsDeserializers.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/JavaUtilCollectionsDeserializers.eea
index 7c20fda421..40d0a5984c 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/JavaUtilCollectionsDeserializers.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/JavaUtilCollectionsDeserializers.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/deser/impl/JavaUtilCollectionsDeserializers
 
 findForCollection
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>;
 findForMap
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/ManagedReferenceProperty.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/ManagedReferenceProperty.eea
index 5e07d3f2bb..109e6a42e1 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/ManagedReferenceProperty.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/ManagedReferenceProperty.eea
@@ -27,4 +27,4 @@ setAndReturn
  (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 withDelegate
  (Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
- (Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
+ (Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;)L1com/fasterxml/jackson/databind/deser/SettableBeanProperty;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/MergingSettableBeanProperty.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/MergingSettableBeanProperty.eea
index 5923f91d47..24eeac99ad 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/MergingSettableBeanProperty.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/MergingSettableBeanProperty.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/deser/impl/MergingSettableBeanProperty
 
 construct
  (Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/deser/impl/MergingSettableBeanProperty;
- (Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/deser/impl/MergingSettableBeanProperty;
+ (Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L1com/fasterxml/jackson/databind/deser/impl/MergingSettableBeanProperty;
 
 _accessor
  Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
@@ -28,4 +28,4 @@ setAndReturn
  (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 withDelegate
  (Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
- (Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
+ (Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;)L1com/fasterxml/jackson/databind/deser/SettableBeanProperty;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/MethodProperty.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/MethodProperty.eea
index a54f54f295..cf33b990b2 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/MethodProperty.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/MethodProperty.eea
@@ -24,7 +24,7 @@ deserializeAndSet
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)V
 deserializeSetAndReturn
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)L0java/lang/Object;
 fixAccess
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;)V
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;)V
@@ -39,13 +39,13 @@ set
  (Ljava/lang/Object;Ljava/lang/Object;)V
 setAndReturn
  (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;Ljava/lang/Object;)L0java/lang/Object;
 withName
  (Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
- (Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
+ (Lcom/fasterxml/jackson/databind/PropertyName;)L1com/fasterxml/jackson/databind/deser/SettableBeanProperty;
 withNullProvider
  (Lcom/fasterxml/jackson/databind/deser/NullValueProvider;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
- (Lcom/fasterxml/jackson/databind/deser/NullValueProvider;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
+ (Lcom/fasterxml/jackson/databind/deser/NullValueProvider;)L1com/fasterxml/jackson/databind/deser/SettableBeanProperty;
 withValueDeserializer
  (Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
  (Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/NullsFailProvider.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/NullsFailProvider.eea
index f704e51ddd..eda5ad0ffe 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/NullsFailProvider.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/NullsFailProvider.eea
@@ -5,10 +5,10 @@ constructForProperty
  (Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/deser/impl/NullsFailProvider;
 constructForProperty
  (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/deser/impl/NullsFailProvider;
- (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/deser/impl/NullsFailProvider;
+ (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/deser/impl/NullsFailProvider;
 constructForRootValue
  (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/deser/impl/NullsFailProvider;
- (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/deser/impl/NullsFailProvider;
+ (Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/deser/impl/NullsFailProvider;
 
 _name
  Lcom/fasterxml/jackson/databind/PropertyName;
@@ -25,4 +25,4 @@ getNullAccessPattern
  ()Lcom/fasterxml/jackson/databind/util/AccessPattern;
 getNullValue
  (Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;)L1java/lang/Object;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/ObjectIdReader.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/ObjectIdReader.eea
index d7890c4c95..3f2d29f4e0 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/ObjectIdReader.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/ObjectIdReader.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/deser/impl/ObjectIdReader
 
 construct
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/PropertyName;Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<*>;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;Lcom/fasterxml/jackson/annotation/ObjectIdResolver;)Lcom/fasterxml/jackson/databind/deser/impl/ObjectIdReader;
- (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/PropertyName;Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<*>;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;Lcom/fasterxml/jackson/annotation/ObjectIdResolver;)Lcom/fasterxml/jackson/databind/deser/impl/ObjectIdReader;
+ (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/PropertyName;Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<*>;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;Lcom/fasterxml/jackson/annotation/ObjectIdResolver;)L1com/fasterxml/jackson/databind/deser/impl/ObjectIdReader;
 
 _deserializer
  Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/ObjectIdReferenceProperty.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/ObjectIdReferenceProperty.eea
index 7728f4fd4f..328daa087f 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/ObjectIdReferenceProperty.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/ObjectIdReferenceProperty.eea
@@ -14,7 +14,7 @@ deserializeAndSet
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)V
 deserializeSetAndReturn
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)L0java/lang/Object;
 fixAccess
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;)V
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;)V
@@ -32,10 +32,10 @@ setAndReturn
  (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 withName
  (Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
- (Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
+ (Lcom/fasterxml/jackson/databind/PropertyName;)L1com/fasterxml/jackson/databind/deser/SettableBeanProperty;
 withNullProvider
  (Lcom/fasterxml/jackson/databind/deser/NullValueProvider;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
- (Lcom/fasterxml/jackson/databind/deser/NullValueProvider;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
+ (Lcom/fasterxml/jackson/databind/deser/NullValueProvider;)L1com/fasterxml/jackson/databind/deser/SettableBeanProperty;
 withValueDeserializer
  (Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
  (Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/ObjectIdValueProperty.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/ObjectIdValueProperty.eea
index 7f2b1adc42..cd2b7abff3 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/ObjectIdValueProperty.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/ObjectIdValueProperty.eea
@@ -18,13 +18,13 @@ deserializeAndSet
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)V
 deserializeSetAndReturn
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)L0java/lang/Object;
 getAnnotation
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
- <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
+ <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)T0A;
 getMember
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedMember;
 set
  (Ljava/lang/Object;Ljava/lang/Object;)V
  (Ljava/lang/Object;Ljava/lang/Object;)V
@@ -33,10 +33,10 @@ setAndReturn
  (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 withName
  (Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
- (Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
+ (Lcom/fasterxml/jackson/databind/PropertyName;)L1com/fasterxml/jackson/databind/deser/SettableBeanProperty;
 withNullProvider
  (Lcom/fasterxml/jackson/databind/deser/NullValueProvider;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
- (Lcom/fasterxml/jackson/databind/deser/NullValueProvider;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
+ (Lcom/fasterxml/jackson/databind/deser/NullValueProvider;)L1com/fasterxml/jackson/databind/deser/SettableBeanProperty;
 withValueDeserializer
  (Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
  (Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/PropertyBasedCreator.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/PropertyBasedCreator.eea
index 65d037ad23..0efbb38609 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/PropertyBasedCreator.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/PropertyBasedCreator.eea
@@ -28,7 +28,7 @@ build
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/impl/PropertyValueBuffer;)Ljava/lang/Object;
 findCreatorProperty
  (I)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
- (I)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
+ (I)L0com/fasterxml/jackson/databind/deser/SettableBeanProperty;
 findCreatorProperty
  (Ljava/lang/String;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
  (Ljava/lang/String;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
@@ -37,4 +37,4 @@ properties
  ()Ljava/util/Collection<Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;>;
 startBuilding
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/impl/ObjectIdReader;)Lcom/fasterxml/jackson/databind/deser/impl/PropertyValueBuffer;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/impl/ObjectIdReader;)Lcom/fasterxml/jackson/databind/deser/impl/PropertyValueBuffer;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/impl/ObjectIdReader;)L1com/fasterxml/jackson/databind/deser/impl/PropertyValueBuffer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/PropertyBasedObjectIdGenerator.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/PropertyBasedObjectIdGenerator.eea
index 573d97ee38..7aa9b53d8c 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/PropertyBasedObjectIdGenerator.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/PropertyBasedObjectIdGenerator.eea
@@ -5,13 +5,13 @@ class com/fasterxml/jackson/databind/deser/impl/PropertyBasedObjectIdGenerator
  (Ljava/lang/Class<*>;)V
 forScope
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<Ljava/lang/Object;>;
- (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<Ljava/lang/Object;>;
+ (Ljava/lang/Class<*>;)L1com/fasterxml/jackson/annotation/ObjectIdGenerator<Ljava/lang/Object;>;
 generateId
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object;
 key
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator$IdKey;
- (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator$IdKey;
+ (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator$IdKey; # @PolyNull
 newForSerialization
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<Ljava/lang/Object;>;
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<Ljava/lang/Object;>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/SetterlessProperty.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/SetterlessProperty.eea
index 6fe5fc98e0..6dbcd48abe 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/SetterlessProperty.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/SetterlessProperty.eea
@@ -39,10 +39,10 @@ setAndReturn
  (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 withName
  (Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
- (Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
+ (Lcom/fasterxml/jackson/databind/PropertyName;)L1com/fasterxml/jackson/databind/deser/SettableBeanProperty;
 withNullProvider
  (Lcom/fasterxml/jackson/databind/deser/NullValueProvider;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
- (Lcom/fasterxml/jackson/databind/deser/NullValueProvider;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
+ (Lcom/fasterxml/jackson/databind/deser/NullValueProvider;)L1com/fasterxml/jackson/databind/deser/SettableBeanProperty;
 withValueDeserializer
  (Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
  (Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/UnsupportedTypeDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/UnsupportedTypeDeserializer.eea
index bb1a3b730f..a39f883eae 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/UnsupportedTypeDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/UnsupportedTypeDeserializer.eea
@@ -16,4 +16,4 @@ _type
  (Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;)V
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)L0java/lang/Object;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/UnwrappedPropertyHandler.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/UnwrappedPropertyHandler.eea
index 8324b7fb83..cc45aa2523 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/UnwrappedPropertyHandler.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/impl/UnwrappedPropertyHandler.eea
@@ -15,4 +15,4 @@ processUnwrapped
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;Lcom/fasterxml/jackson/databind/util/TokenBuffer;)Ljava/lang/Object;
 renameAll
  (Lcom/fasterxml/jackson/databind/util/NameTransformer;)Lcom/fasterxml/jackson/databind/deser/impl/UnwrappedPropertyHandler;
- (Lcom/fasterxml/jackson/databind/util/NameTransformer;)Lcom/fasterxml/jackson/databind/deser/impl/UnwrappedPropertyHandler;
+ (Lcom/fasterxml/jackson/databind/util/NameTransformer;)L1com/fasterxml/jackson/databind/deser/impl/UnwrappedPropertyHandler;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/ArrayBlockingQueueDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/ArrayBlockingQueueDeserializer.eea
index 018098fca2..8c09e4a266 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/ArrayBlockingQueueDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/ArrayBlockingQueueDeserializer.eea
@@ -14,7 +14,7 @@ _deserializeFromArray
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/util/Collection<Ljava/lang/Object;>;)Ljava/util/Collection<Ljava/lang/Object;>;
 createDefaultInstance
  (Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/Collection<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/Collection<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;)L0java/util/Collection<Ljava/lang/Object;>; # @Overrides(com.fasterxml.jackson.databind.deser.std.CollectionDeserializer)
 deserializeWithType
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;)Ljava/lang/Object;
  (L1com/fasterxml/jackson/core/JsonParser;L1com/fasterxml/jackson/databind/DeserializationContext;L1com/fasterxml/jackson/databind/jsontype/TypeDeserializer;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.std.CollectionDeserializer)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/AtomicIntegerDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/AtomicIntegerDeserializer.eea
index 51afab2406..86c2766820 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/AtomicIntegerDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/AtomicIntegerDeserializer.eea
@@ -6,7 +6,7 @@ super com/fasterxml/jackson/databind/deser/std/StdScalarDeserializer
 
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/concurrent/atomic/AtomicInteger;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/concurrent/atomic/AtomicInteger;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)L1java/util/concurrent/atomic/AtomicInteger;
 getEmptyValue
  (Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
  (L1com/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object; # @Inherited(com.fasterxml.jackson.databind.JsonDeserializer)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/AtomicReferenceDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/AtomicReferenceDeserializer.eea
index 3c343282a1..dc9bbf8ed2 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/AtomicReferenceDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/AtomicReferenceDeserializer.eea
@@ -15,13 +15,13 @@ getEmptyValue
  (L1com/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.std.ReferenceTypeDeserializer)
 getNullValue
  (Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/concurrent/atomic/AtomicReference<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/concurrent/atomic/AtomicReference<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;)L1java/util/concurrent/atomic/AtomicReference<Ljava/lang/Object;>;
 getReferenced
  (Ljava/util/concurrent/atomic/AtomicReference<Ljava/lang/Object;>;)Ljava/lang/Object;
  (Ljava/util/concurrent/atomic/AtomicReference<Ljava/lang/Object;>;)Ljava/lang/Object;
 referenceValue
  (Ljava/lang/Object;)Ljava/util/concurrent/atomic/AtomicReference<Ljava/lang/Object;>;
- (Ljava/lang/Object;)Ljava/util/concurrent/atomic/AtomicReference<Ljava/lang/Object;>;
+ (Ljava/lang/Object;)L1java/util/concurrent/atomic/AtomicReference<Ljava/lang/Object;>;
 supportsUpdate
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;)Ljava/lang/Boolean;
  (L1com/fasterxml/jackson/databind/DeserializationConfig;)L0java/lang/Boolean; # @Inherited(com.fasterxml.jackson.databind.deser.std.ReferenceTypeDeserializer)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/CollectionDeserializer$CollectionReferringAccumulator.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/CollectionDeserializer$CollectionReferringAccumulator.eea
index 2348a21d84..d350d486cb 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/CollectionDeserializer$CollectionReferringAccumulator.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/CollectionDeserializer$CollectionReferringAccumulator.eea
@@ -8,7 +8,7 @@ add
  (Ljava/lang/Object;)V
 handleUnresolvedReference
  (Lcom/fasterxml/jackson/databind/deser/UnresolvedForwardReference;)Lcom/fasterxml/jackson/databind/deser/impl/ReadableObjectId$Referring;
- (Lcom/fasterxml/jackson/databind/deser/UnresolvedForwardReference;)Lcom/fasterxml/jackson/databind/deser/impl/ReadableObjectId$Referring;
+ (Lcom/fasterxml/jackson/databind/deser/UnresolvedForwardReference;)L1com/fasterxml/jackson/databind/deser/impl/ReadableObjectId$Referring;
 resolveForwardReference
  (Ljava/lang/Object;Ljava/lang/Object;)V
  (Ljava/lang/Object;Ljava/lang/Object;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/CollectionDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/CollectionDeserializer.eea
index 576c1d7c28..3e77a03cba 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/CollectionDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/CollectionDeserializer.eea
@@ -40,10 +40,10 @@ _tryToAddNull
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/util/Collection<*>;)V
 createContextual
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/deser/std/CollectionDeserializer;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/deser/std/CollectionDeserializer;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/deser/std/CollectionDeserializer;
 createDefaultInstance
  (Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/Collection<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/Collection<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;)L1java/util/Collection<Ljava/lang/Object;>;
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/Collection<Ljava/lang/Object;>;
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/Collection<Ljava/lang/Object;>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/ContainerDeserializerBase.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/ContainerDeserializerBase.eea
index 3c8006a6d8..683e9b1aa9 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/ContainerDeserializerBase.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/ContainerDeserializerBase.eea
@@ -51,7 +51,7 @@ supportsUpdate
  (L1com/fasterxml/jackson/databind/DeserializationConfig;)L0java/lang/Boolean; # @Inherited(com.fasterxml.jackson.databind.JsonDeserializer)
 wrapAndThrow
  <BOGUS:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Throwable;Ljava/lang/Object;Ljava/lang/String;)TBOGUS;
- <BOGUS:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Throwable;Ljava/lang/Object;Ljava/lang/String;)TBOGUS;
+ <BOGUS:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Throwable;Ljava/lang/Object;Ljava/lang/String;)T1BOGUS;
 wrapAndThrow
  <BOGUS:Ljava/lang/Object;>(Ljava/lang/Throwable;Ljava/lang/Object;Ljava/lang/String;)TBOGUS;
  <BOGUS:Ljava/lang/Object;>(Ljava/lang/Throwable;Ljava/lang/Object;Ljava/lang/String;)TBOGUS;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DateDeserializers$CalendarDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DateDeserializers$CalendarDeserializer.eea
index a063266ea9..128585c3da 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DateDeserializers$CalendarDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DateDeserializers$CalendarDeserializer.eea
@@ -16,10 +16,10 @@ _defaultCtor
  (Ljava/lang/Class<+Ljava/util/Calendar;>;)V
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/Calendar;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/Calendar;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)L0java/util/Calendar;
 getEmptyValue
  (Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
  (L1com/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object; # @Inherited(com.fasterxml.jackson.databind.JsonDeserializer)
 withDateFormat
  (Ljava/text/DateFormat;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/deser/std/DateDeserializers$CalendarDeserializer;
- (Ljava/text/DateFormat;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/deser/std/DateDeserializers$CalendarDeserializer;
+ (Ljava/text/DateFormat;Ljava/lang/String;)L1com/fasterxml/jackson/databind/deser/std/DateDeserializers$CalendarDeserializer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DateDeserializers$DateBasedDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DateDeserializers$DateBasedDeserializer.eea
index 06699bb462..c6d9bc0cd4 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DateDeserializers$DateBasedDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DateDeserializers$DateBasedDeserializer.eea
@@ -21,10 +21,10 @@ _formatString
  (Ljava/lang/Class<*>;)V
 _parseDate
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/Date;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/Date;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)L0java/util/Date;
 createContextual
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.ContextualDeserializer)
 logicalType
  ()Lcom/fasterxml/jackson/databind/type/LogicalType;
  ()L0com/fasterxml/jackson/databind/type/LogicalType; # @Inherited(com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DateDeserializers$DateDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DateDeserializers$DateDeserializer.eea
index c5e8cc9dd1..62f3005fec 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DateDeserializers$DateDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DateDeserializers$DateDeserializer.eea
@@ -19,4 +19,4 @@ getEmptyValue
  (L1com/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object; # @Inherited(com.fasterxml.jackson.databind.JsonDeserializer)
 withDateFormat
  (Ljava/text/DateFormat;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/deser/std/DateDeserializers$DateDeserializer;
- (Ljava/text/DateFormat;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/deser/std/DateDeserializers$DateDeserializer;
+ (Ljava/text/DateFormat;Ljava/lang/String;)L1com/fasterxml/jackson/databind/deser/std/DateDeserializers$DateDeserializer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DateDeserializers$SqlDateDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DateDeserializers$SqlDateDeserializer.eea
index f854d44330..ac518cd3cf 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DateDeserializers$SqlDateDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DateDeserializers$SqlDateDeserializer.eea
@@ -9,10 +9,10 @@ super com/fasterxml/jackson/databind/deser/std/DateDeserializers$DateBasedDeseri
  (Lcom/fasterxml/jackson/databind/deser/std/DateDeserializers$SqlDateDeserializer;Ljava/text/DateFormat;Ljava/lang/String;)V
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/sql/Date;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/sql/Date;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)L1java/sql/Date;
 getEmptyValue
  (Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
  (L1com/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object; # @Inherited(com.fasterxml.jackson.databind.JsonDeserializer)
 withDateFormat
  (Ljava/text/DateFormat;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/deser/std/DateDeserializers$SqlDateDeserializer;
- (Ljava/text/DateFormat;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/deser/std/DateDeserializers$SqlDateDeserializer;
+ (Ljava/text/DateFormat;Ljava/lang/String;)L1com/fasterxml/jackson/databind/deser/std/DateDeserializers$SqlDateDeserializer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DateDeserializers$TimestampDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DateDeserializers$TimestampDeserializer.eea
index 892def11ed..edd536d813 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DateDeserializers$TimestampDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DateDeserializers$TimestampDeserializer.eea
@@ -9,10 +9,10 @@ super com/fasterxml/jackson/databind/deser/std/DateDeserializers$DateBasedDeseri
  (Lcom/fasterxml/jackson/databind/deser/std/DateDeserializers$TimestampDeserializer;Ljava/text/DateFormat;Ljava/lang/String;)V
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/sql/Timestamp;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/sql/Timestamp;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)L1java/sql/Timestamp;
 getEmptyValue
  (Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
  (L1com/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object; # @Inherited(com.fasterxml.jackson.databind.JsonDeserializer)
 withDateFormat
  (Ljava/text/DateFormat;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/deser/std/DateDeserializers$TimestampDeserializer;
- (Ljava/text/DateFormat;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/deser/std/DateDeserializers$TimestampDeserializer;
+ (Ljava/text/DateFormat;Ljava/lang/String;)L1com/fasterxml/jackson/databind/deser/std/DateDeserializers$TimestampDeserializer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DateDeserializers.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DateDeserializers.eea
index 5bb0178b6b..4f804d8021 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DateDeserializers.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DateDeserializers.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/deser/std/DateDeserializers
 
 find
  (Ljava/lang/Class<*>;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Ljava/lang/Class<*>;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Ljava/lang/Class<*>;Ljava/lang/String;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>;
 hasDeserializerFor
  (Ljava/lang/Class<*>;)Z
  (Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DelegatingDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DelegatingDeserializer.eea
index 8b3af487c4..3bc06b5ec4 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DelegatingDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/DelegatingDeserializer.eea
@@ -13,7 +13,7 @@ _delegatee
  (Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)V
 createContextual
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.ContextualDeserializer)
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/EnumDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/EnumDeserializer.eea
index b81aace95a..169e22a488 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/EnumDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/EnumDeserializer.eea
@@ -12,7 +12,7 @@ deserializerForCreator
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Lcom/fasterxml/jackson/databind/deser/ValueInstantiator;[Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
 deserializerForNoArgsCreator
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>;
 
 _caseInsensitive
  Ljava/lang/Boolean;
@@ -56,7 +56,7 @@ _enumClass
  ()Ljava/lang/Class<*>;
 _fromInteger
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;I)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;I)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;I)L0java/lang/Object;
 _fromString
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;)Ljava/lang/Object;
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;)Ljava/lang/Object;
@@ -65,7 +65,7 @@ _getToStringLookup
  (Lcom/fasterxml/jackson/databind/DeserializationContext;)Lcom/fasterxml/jackson/databind/util/CompactStringObjectMap;
 createContextual
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.ContextualDeserializer)
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/EnumMapDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/EnumMapDeserializer.eea
index 0d9193c76b..6c3ddb0de1 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/EnumMapDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/EnumMapDeserializer.eea
@@ -37,13 +37,13 @@ _valueTypeDeserializer
  (Lcom/fasterxml/jackson/databind/deser/std/EnumMapDeserializer;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/deser/NullValueProvider;)V
 _deserializeUsingProperties
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/EnumMap<**>;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/EnumMap<**>;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)L0java/util/EnumMap<**>;
 constructMap
  (Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/EnumMap<**>;
  (Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/EnumMap<**>;
 createContextual
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.ContextualDeserializer)
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/EnumMap<**>;
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/EnumMap<**>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/EnumSetDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/EnumSetDeserializer.eea
index 049575f1ed..e710d1589a 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/EnumSetDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/EnumSetDeserializer.eea
@@ -37,7 +37,7 @@ _deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/util/EnumSet;)Ljava/util/EnumSet<*>;
 createContextual
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.ContextualDeserializer)
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/EnumSet<*>;
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/EnumSet<*>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/FromStringDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/FromStringDeserializer.eea
index cb8a5d01c0..d1ae96fe9b 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/FromStringDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/FromStringDeserializer.eea
@@ -24,7 +24,7 @@ _deserializeEmbedded
  (L1java/lang/Object;L1com/fasterxml/jackson/databind/DeserializationContext;)TT;
 _deserializeFromEmptyString
  ()TT;
- ()TT;
+ ()T0T;
 _deserializeFromEmptyString
  (Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
  (L1com/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/JdkDeserializers.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/JdkDeserializers.eea
index 9824d493b5..455d1f704d 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/JdkDeserializers.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/JdkDeserializers.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/deser/std/JdkDeserializers
 
 find
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Class<*>;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Class<*>;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Class<*>;Ljava/lang/String;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>;
 find
  (Ljava/lang/Class<*>;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
  (Ljava/lang/Class<*>;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/JsonLocationInstantiator.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/JsonLocationInstantiator.eea
index b135e6d36e..5210e3fed1 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/JsonLocationInstantiator.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/JsonLocationInstantiator.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/deser/std/JsonLocationInstantiator
 
 createFromObjectWith
  (Lcom/fasterxml/jackson/databind/DeserializationContext;[Ljava/lang/Object;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;[Ljava/lang/Object;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;[Ljava/lang/Object;)L1java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 getFromObjectArguments
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;)[Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;)[Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;)[0Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/JsonNodeDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/JsonNodeDeserializer.eea
index 778be0a07d..44e283c9f4 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/JsonNodeDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/JsonNodeDeserializer.eea
@@ -13,7 +13,7 @@ getDeserializer
  (Lcom/fasterxml/jackson/databind/deser/std/JsonNodeDeserializer;ZZ)V
 _createWithMerge
  (ZZ)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (ZZ)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (ZZ)L1com/fasterxml/jackson/databind/JsonDeserializer<*>;
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Lcom/fasterxml/jackson/databind/JsonNode;
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Lcom/fasterxml/jackson/databind/JsonNode;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/MapDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/MapDeserializer.eea
index 86bfc8fff2..c40b94cf58 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/MapDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/MapDeserializer.eea
@@ -46,7 +46,7 @@ _valueTypeDeserializer
  (Lcom/fasterxml/jackson/databind/deser/std/MapDeserializer;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/deser/NullValueProvider;Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)V
 _deserializeUsingCreator
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)L0java/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
 _isStdKeyDeser
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/KeyDeserializer;)Z
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/KeyDeserializer;)Z
@@ -67,7 +67,7 @@ _squashDups
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 createContextual
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.ContextualDeserializer)
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/MapEntryDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/MapEntryDeserializer.eea
index fed6ec068c..f6c95e41f7 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/MapEntryDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/MapEntryDeserializer.eea
@@ -25,13 +25,13 @@ _valueTypeDeserializer
  (Lcom/fasterxml/jackson/databind/deser/std/MapEntryDeserializer;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;)V
 createContextual
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.ContextualDeserializer)
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/Map$Entry<Ljava/lang/Object;Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/Map$Entry<Ljava/lang/Object;Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)L0java/util/Map$Entry<Ljava/lang/Object;Ljava/lang/Object;>;
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/util/Map$Entry<Ljava/lang/Object;Ljava/lang/Object;>;)Ljava/util/Map$Entry<Ljava/lang/Object;Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/util/Map$Entry<Ljava/lang/Object;Ljava/lang/Object;>;)Ljava/util/Map$Entry<Ljava/lang/Object;Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/util/Map$Entry<Ljava/lang/Object;Ljava/lang/Object;>;)L1java/util/Map$Entry<Ljava/lang/Object;Ljava/lang/Object;>;
 deserializeWithType
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;)Ljava/lang/Object;
  (L1com/fasterxml/jackson/core/JsonParser;L1com/fasterxml/jackson/databind/DeserializationContext;L1com/fasterxml/jackson/databind/jsontype/TypeDeserializer;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.std.StdDeserializer)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/NullifyingDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/NullifyingDeserializer.eea
index d75beeada0..f811dd09df 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/NullifyingDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/NullifyingDeserializer.eea
@@ -10,7 +10,7 @@ instance
 
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)L0java/lang/Object;
 deserializeWithType
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;)Ljava/lang/Object;
  (L1com/fasterxml/jackson/core/JsonParser;L1com/fasterxml/jackson/databind/DeserializationContext;L1com/fasterxml/jackson/databind/jsontype/TypeDeserializer;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.std.StdDeserializer)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/NumberDeserializers.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/NumberDeserializers.eea
index 5a92bface0..3f27f005e5 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/NumberDeserializers.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/NumberDeserializers.eea
@@ -2,4 +2,4 @@ class com/fasterxml/jackson/databind/deser/std/NumberDeserializers
 
 find
  (Ljava/lang/Class<*>;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Ljava/lang/Class<*>;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Ljava/lang/Class<*>;Ljava/lang/String;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/ObjectArrayDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/ObjectArrayDeserializer.eea
index 986faf1103..174da31d82 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/ObjectArrayDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/ObjectArrayDeserializer.eea
@@ -25,7 +25,7 @@ _emptyValue
  (Lcom/fasterxml/jackson/databind/deser/std/ObjectArrayDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/deser/NullValueProvider;Ljava/lang/Boolean;)V
 createContextual
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.ContextualDeserializer)
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
@@ -34,7 +34,7 @@ deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
 deserializeFromBase64
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)[Ljava/lang/Byte;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)[Ljava/lang/Byte;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)[1Ljava/lang/Byte;
 deserializeWithType
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;)Ljava/lang/Object;
  (L1com/fasterxml/jackson/core/JsonParser;L1com/fasterxml/jackson/databind/DeserializationContext;L1com/fasterxml/jackson/databind/jsontype/TypeDeserializer;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.std.StdDeserializer)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/PrimitiveArrayDeserializers.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/PrimitiveArrayDeserializers.eea
index 153ba3d04a..4b9f72a1e7 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/PrimitiveArrayDeserializers.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/PrimitiveArrayDeserializers.eea
@@ -34,7 +34,7 @@ _failOnNull
  (Lcom/fasterxml/jackson/databind/DeserializationContext;)V
 createContextual
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.ContextualDeserializer)
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;TT;)TT;
  (L1com/fasterxml/jackson/core/JsonParser;L1com/fasterxml/jackson/databind/DeserializationContext;TT;)TT; # @Inherited(com.fasterxml.jackson.databind.JsonDeserializer)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/ReferenceTypeDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/ReferenceTypeDeserializer.eea
index 146800f9dd..3fe3deb6c7 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/ReferenceTypeDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/ReferenceTypeDeserializer.eea
@@ -27,7 +27,7 @@ _valueTypeDeserializer
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)V
 createContextual
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.ContextualDeserializer)
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)TT;
  (L1com/fasterxml/jackson/core/JsonParser;L1com/fasterxml/jackson/databind/DeserializationContext;)T0T; # @Inherited(com.fasterxml.jackson.databind.JsonDeserializer)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StackTraceElementDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StackTraceElementDeserializer.eea
index 26f6d91872..e38ec09ada 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StackTraceElementDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StackTraceElementDeserializer.eea
@@ -6,7 +6,7 @@ super com/fasterxml/jackson/databind/deser/std/StdScalarDeserializer
 
 construct
  (Lcom/fasterxml/jackson/databind/DeserializationContext;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>;
 
 _adapterDeserializer
  Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
@@ -23,7 +23,7 @@ constructValue
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StackTraceElement;
 constructValue
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StackTraceElement;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StackTraceElement;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1java/lang/StackTraceElement;
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/StackTraceElement;
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/StackTraceElement;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StdDelegatingDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StdDelegatingDeserializer.eea
index 66062741c2..b0e0ea50ea 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StdDelegatingDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StdDelegatingDeserializer.eea
@@ -30,13 +30,13 @@ _convertIfNonNull
  (Ljava/lang/Object;)TT;
 _handleIncompatibleUpdateValue
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)L1java/lang/Object;
 convertValue
  (Ljava/lang/Object;)TT;
  (Ljava/lang/Object;)TT;
 createContextual
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.ContextualDeserializer)
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)TT;
  (L1com/fasterxml/jackson/core/JsonParser;L1com/fasterxml/jackson/databind/DeserializationContext;)T0T; # @Inherited(com.fasterxml.jackson.databind.JsonDeserializer)
@@ -90,4 +90,4 @@ unwrappingDeserializer
  (L1com/fasterxml/jackson/databind/util/NameTransformer;)L1com/fasterxml/jackson/databind/JsonDeserializer<TT;>; # @Inherited(com.fasterxml.jackson.databind.JsonDeserializer)
 withDelegate
  (Lcom/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;TT;>;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/deser/std/StdDelegatingDeserializer<TT;>;
- (Lcom/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;TT;>;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/deser/std/StdDelegatingDeserializer<TT;>;
+ (Lcom/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;TT;>;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)L1com/fasterxml/jackson/databind/deser/std/StdDelegatingDeserializer<TT;>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StdDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StdDeserializer.eea
index 7e3384e514..e6b1f4dc3d 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StdDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StdDeserializer.eea
@@ -43,10 +43,10 @@ _checkCoercionFail
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/cfg/CoercionAction;Ljava/lang/Class<*>;Ljava/lang/Object;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/cfg/CoercionAction;
 _checkDoubleSpecialValue
  (Ljava/lang/String;)Ljava/lang/Double;
- (Ljava/lang/String;)Ljava/lang/Double;
+ (Ljava/lang/String;)L0java/lang/Double;
 _checkFloatSpecialValue
  (Ljava/lang/String;)Ljava/lang/Float;
- (Ljava/lang/String;)Ljava/lang/Float;
+ (Ljava/lang/String;)L0java/lang/Float;
 _checkFloatToIntCoercion
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/cfg/CoercionAction;
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/cfg/CoercionAction;
@@ -73,10 +73,10 @@ _checkToStringCoercion
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Class<*>;Ljava/lang/Object;Lcom/fasterxml/jackson/databind/cfg/CoercionInputShape;)Lcom/fasterxml/jackson/databind/cfg/CoercionAction;
 _coerceBooleanFromInt
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Class<*>;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Class<*>;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Class<*>;)L0java/lang/Boolean;
 _coerceEmptyString
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Z)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Z)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Z)L0java/lang/Object;
 _coerceIntegral
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
@@ -88,19 +88,19 @@ _coerceTextualNull
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Z)Ljava/lang/Object;
 _coercedTypeDesc
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 _coercedTypeDesc
  (Ljava/lang/Class<*>;)Ljava/lang/String;
- (Ljava/lang/Class<*>;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;)L1java/lang/String;
 _deserializeFromArray
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)TT;
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)TT;
 _deserializeFromEmpty
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)TT;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)TT;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)T0T;
 _deserializeFromEmptyString
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/cfg/CoercionAction;Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/cfg/CoercionAction;Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/cfg/CoercionAction;Ljava/lang/Class<*>;Ljava/lang/String;)L0java/lang/Object;
 _deserializeFromString
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)TT;
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)TT;
@@ -121,7 +121,7 @@ _findCoercionFromEmptyString
  (Lcom/fasterxml/jackson/databind/DeserializationContext;)Lcom/fasterxml/jackson/databind/cfg/CoercionAction;
 _findNullProvider
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/annotation/Nulls;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/deser/NullValueProvider;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/annotation/Nulls;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/deser/NullValueProvider;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/annotation/Nulls;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)L0com/fasterxml/jackson/databind/deser/NullValueProvider;
 _hasTextualNull
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
@@ -151,7 +151,7 @@ _nonNullNumber
  (Ljava/lang/Number;)Ljava/lang/Number;
 _parseBoolean
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Class<*>;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Class<*>;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Class<*>;)L0java/lang/Boolean;
 _parseBooleanFromInt
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Z
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Z
@@ -169,7 +169,7 @@ _parseDate
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/Date;
 _parseDate
  (Ljava/lang/String;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/Date;
- (Ljava/lang/String;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/Date;
+ (Ljava/lang/String;Lcom/fasterxml/jackson/databind/DeserializationContext;)L0java/util/Date;
 _parseDateFromArray
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/Date;
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/Date;
@@ -223,7 +223,7 @@ _parseString
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/String;
 _parseString
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/NullValueProvider;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/NullValueProvider;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/NullValueProvider;)L0java/lang/String;
 _reportFailedNullCoerce
  (Lcom/fasterxml/jackson/databind/DeserializationContext;ZLjava/lang/Enum<*>;Ljava/lang/String;)V
  (Lcom/fasterxml/jackson/databind/DeserializationContext;ZLjava/lang/Enum<*>;Ljava/lang/String;)V
@@ -262,13 +262,13 @@ findDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
 findFormatFeature
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/annotation/JsonFormat$Feature;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/annotation/JsonFormat$Feature;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/annotation/JsonFormat$Feature;)L0java/lang/Boolean;
 findFormatOverrides
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
 findValueNullProvider
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;Lcom/fasterxml/jackson/databind/PropertyMetadata;)Lcom/fasterxml/jackson/databind/deser/NullValueProvider;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;Lcom/fasterxml/jackson/databind/PropertyMetadata;)Lcom/fasterxml/jackson/databind/deser/NullValueProvider;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;Lcom/fasterxml/jackson/databind/PropertyMetadata;)L0com/fasterxml/jackson/databind/deser/NullValueProvider;
 getValueClass
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StdKeyDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StdKeyDeserializer.eea
index 6cc13e9ef8..db43d2c7a5 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StdKeyDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StdKeyDeserializer.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/deser/std/StdKeyDeserializer
 
 forType
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/deser/std/StdKeyDeserializer;
- (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/deser/std/StdKeyDeserializer;
+ (Ljava/lang/Class<*>;)L0com/fasterxml/jackson/databind/deser/std/StdKeyDeserializer;
 
 _deser
  Lcom/fasterxml/jackson/databind/deser/std/FromStringDeserializer<*>;
@@ -34,7 +34,7 @@ _weirdKey
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;Ljava/lang/Exception;)Ljava/lang/Object;
 deserializeKey
  (Ljava/lang/String;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
- (Ljava/lang/String;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
+ (Ljava/lang/String;Lcom/fasterxml/jackson/databind/DeserializationContext;)L0java/lang/Object;
 getKeyClass
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StdKeyDeserializers.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StdKeyDeserializers.eea
index 2aec2159c1..1e75358146 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StdKeyDeserializers.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StdKeyDeserializers.eea
@@ -2,22 +2,22 @@ class com/fasterxml/jackson/databind/deser/std/StdKeyDeserializers
 
 constructDelegatingKeyDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)L1com/fasterxml/jackson/databind/KeyDeserializer;
 constructEnumKeyDeserializer
  (Lcom/fasterxml/jackson/databind/util/EnumResolver;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
- (Lcom/fasterxml/jackson/databind/util/EnumResolver;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
+ (Lcom/fasterxml/jackson/databind/util/EnumResolver;)L1com/fasterxml/jackson/databind/KeyDeserializer;
 constructEnumKeyDeserializer
  (Lcom/fasterxml/jackson/databind/util/EnumResolver;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
- (Lcom/fasterxml/jackson/databind/util/EnumResolver;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
+ (Lcom/fasterxml/jackson/databind/util/EnumResolver;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)L1com/fasterxml/jackson/databind/KeyDeserializer;
 constructEnumKeyDeserializer
  (Lcom/fasterxml/jackson/databind/util/EnumResolver;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Lcom/fasterxml/jackson/databind/util/EnumResolver;Lcom/fasterxml/jackson/databind/util/EnumResolver;Lcom/fasterxml/jackson/databind/util/EnumResolver;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
- (Lcom/fasterxml/jackson/databind/util/EnumResolver;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Lcom/fasterxml/jackson/databind/util/EnumResolver;Lcom/fasterxml/jackson/databind/util/EnumResolver;Lcom/fasterxml/jackson/databind/util/EnumResolver;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
+ (Lcom/fasterxml/jackson/databind/util/EnumResolver;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Lcom/fasterxml/jackson/databind/util/EnumResolver;Lcom/fasterxml/jackson/databind/util/EnumResolver;Lcom/fasterxml/jackson/databind/util/EnumResolver;)L1com/fasterxml/jackson/databind/KeyDeserializer;
 constructEnumKeyDeserializer
  (Lcom/fasterxml/jackson/databind/util/EnumResolver;Lcom/fasterxml/jackson/databind/util/EnumResolver;Lcom/fasterxml/jackson/databind/util/EnumResolver;Lcom/fasterxml/jackson/databind/util/EnumResolver;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
- (Lcom/fasterxml/jackson/databind/util/EnumResolver;Lcom/fasterxml/jackson/databind/util/EnumResolver;Lcom/fasterxml/jackson/databind/util/EnumResolver;Lcom/fasterxml/jackson/databind/util/EnumResolver;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
+ (Lcom/fasterxml/jackson/databind/util/EnumResolver;Lcom/fasterxml/jackson/databind/util/EnumResolver;Lcom/fasterxml/jackson/databind/util/EnumResolver;Lcom/fasterxml/jackson/databind/util/EnumResolver;)L1com/fasterxml/jackson/databind/KeyDeserializer;
 findStringBasedKeyDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/KeyDeserializer;
 
 findKeyDeserializer
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StdValueInstantiator.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StdValueInstantiator.eea
index e895817ac5..97f1d5ea66 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StdValueInstantiator.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StdValueInstantiator.eea
@@ -93,67 +93,67 @@ configureFromStringCreator
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;)V
 createFromBigDecimal
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/math/BigDecimal;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/math/BigDecimal;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/math/BigDecimal;)L1java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 createFromBigInteger
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/math/BigInteger;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/math/BigInteger;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/math/BigInteger;)L1java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 createFromBoolean
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Z)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Z)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Z)L1java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 createFromDouble
  (Lcom/fasterxml/jackson/databind/DeserializationContext;D)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;D)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;D)L1java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 createFromInt
  (Lcom/fasterxml/jackson/databind/DeserializationContext;I)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;I)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;I)L1java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 createFromLong
  (Lcom/fasterxml/jackson/databind/DeserializationContext;J)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;J)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;J)L1java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 createFromObjectWith
  (Lcom/fasterxml/jackson/databind/DeserializationContext;[Ljava/lang/Object;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;[Ljava/lang/Object;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;[Ljava/lang/Object;)L1java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 createFromString
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;)L1java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 createUsingArrayDelegate
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)L1java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 createUsingDefault
  (Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;)L1java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 createUsingDefaultOrWithoutArguments
  (Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;)L1java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 createUsingDelegate
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)L1java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 getArrayDelegateCreator
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedWithParams; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 getArrayDelegateType
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;)L0com/fasterxml/jackson/databind/JavaType; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 getDefaultCreator
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedWithParams; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 getDelegateCreator
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedWithParams; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 getDelegateType
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;)L0com/fasterxml/jackson/databind/JavaType; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 getFromObjectArguments
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;)[Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;)[Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;)[0Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 getValueClass
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L1java/lang/Class<*>; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 getValueTypeDesc
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getWithArgsCreator
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedWithParams; # @Inherited(com.fasterxml.jackson.databind.deser.ValueInstantiator)
 rewrapCtorProblem
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Throwable;)Lcom/fasterxml/jackson/databind/JsonMappingException;
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Throwable;)Lcom/fasterxml/jackson/databind/JsonMappingException;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StringArrayDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StringArrayDeserializer.eea
index efe4d77dc5..b12c2143bd 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StringArrayDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StringArrayDeserializer.eea
@@ -26,7 +26,7 @@ _deserializeCustom
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;[Ljava/lang/String;)[Ljava/lang/String;
 createContextual
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.ContextualDeserializer)
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)[Ljava/lang/String;
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)[Ljava/lang/String;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StringCollectionDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StringCollectionDeserializer.eea
index 088b0c7662..fafc3ffbca 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StringCollectionDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/StringCollectionDeserializer.eea
@@ -22,7 +22,7 @@ _valueInstantiator
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/deser/ValueInstantiator;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;Lcom/fasterxml/jackson/databind/deser/NullValueProvider;Ljava/lang/Boolean;)V
 createContextual
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.ContextualDeserializer)
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/Collection<Ljava/lang/String;>;
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/Collection<Ljava/lang/String;>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/ThrowableDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/ThrowableDeserializer.eea
index ef4bfd9627..5b5e7b1919 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/ThrowableDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/ThrowableDeserializer.eea
@@ -12,7 +12,7 @@ PROP_NAME_SUPPRESSED
 
 construct
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/BeanDeserializer;)Lcom/fasterxml/jackson/databind/deser/std/ThrowableDeserializer;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/BeanDeserializer;)Lcom/fasterxml/jackson/databind/deser/std/ThrowableDeserializer;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/deser/BeanDeserializer;)L1com/fasterxml/jackson/databind/deser/std/ThrowableDeserializer;
 
 <init>
  (Lcom/fasterxml/jackson/databind/deser/BeanDeserializer;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer$Vanilla.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer$Vanilla.eea
index a2a50043b5..2fad740d83 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer$Vanilla.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer$Vanilla.eea
@@ -20,7 +20,7 @@ _mapObjectWithDups
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)L0java/lang/Object;
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.eea
index bfe14e4855..66eccfd18f 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.eea
@@ -50,13 +50,13 @@ _mapObjectWithDups
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 createContextual
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.ContextualDeserializer)
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)L0java/lang/Object;
 deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)L0java/lang/Object;
 deserializeWithType
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;)Ljava/lang/Object;
  (L1com/fasterxml/jackson/core/JsonParser;L1com/fasterxml/jackson/databind/DeserializationContext;L1com/fasterxml/jackson/databind/jsontype/TypeDeserializer;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.deser.std.StdDeserializer)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/IgnoredPropertyException.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/IgnoredPropertyException.eea
index 4dfab0ea73..3b06897d4f 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/IgnoredPropertyException.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/IgnoredPropertyException.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/exc/IgnoredPropertyException
 
 from
  (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/Object;Ljava/lang/String;Ljava/util/Collection<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/exc/IgnoredPropertyException;
- (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/Object;Ljava/lang/String;Ljava/util/Collection<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/exc/IgnoredPropertyException;
+ (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/Object;Ljava/lang/String;Ljava/util/Collection<Ljava/lang/Object;>;)L1com/fasterxml/jackson/databind/exc/IgnoredPropertyException;
 
 <init>
  (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;Lcom/fasterxml/jackson/core/JsonLocation;Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/Collection<Ljava/lang/Object;>;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/InvalidDefinitionException.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/InvalidDefinitionException.eea
index 62bbf42e70..904999429b 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/InvalidDefinitionException.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/InvalidDefinitionException.eea
@@ -2,16 +2,16 @@ class com/fasterxml/jackson/databind/exc/InvalidDefinitionException
 
 from
  (Lcom/fasterxml/jackson/core/JsonGenerator;Ljava/lang/String;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;)Lcom/fasterxml/jackson/databind/exc/InvalidDefinitionException;
- (Lcom/fasterxml/jackson/core/JsonGenerator;Ljava/lang/String;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;)Lcom/fasterxml/jackson/databind/exc/InvalidDefinitionException;
+ (Lcom/fasterxml/jackson/core/JsonGenerator;Ljava/lang/String;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;)L1com/fasterxml/jackson/databind/exc/InvalidDefinitionException;
 from
  (Lcom/fasterxml/jackson/core/JsonGenerator;Ljava/lang/String;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/exc/InvalidDefinitionException;
- (Lcom/fasterxml/jackson/core/JsonGenerator;Ljava/lang/String;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/exc/InvalidDefinitionException;
+ (Lcom/fasterxml/jackson/core/JsonGenerator;Ljava/lang/String;Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/exc/InvalidDefinitionException;
 from
  (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;)Lcom/fasterxml/jackson/databind/exc/InvalidDefinitionException;
- (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;)Lcom/fasterxml/jackson/databind/exc/InvalidDefinitionException;
+ (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;)L1com/fasterxml/jackson/databind/exc/InvalidDefinitionException;
 from
  (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/exc/InvalidDefinitionException;
- (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/exc/InvalidDefinitionException;
+ (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/exc/InvalidDefinitionException;
 
 _beanDesc
  Lcom/fasterxml/jackson/databind/BeanDescription;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/InvalidFormatException.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/InvalidFormatException.eea
index 6c5235ede8..ecfb7676af 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/InvalidFormatException.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/InvalidFormatException.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/exc/InvalidFormatException
 
 from
  (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/exc/InvalidFormatException;
- (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/exc/InvalidFormatException;
+ (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Class<*>;)L1com/fasterxml/jackson/databind/exc/InvalidFormatException;
 
 _value
  Ljava/lang/Object;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/InvalidNullException.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/InvalidNullException.eea
index 3b48c35d21..522b7b3e48 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/InvalidNullException.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/InvalidNullException.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/exc/InvalidNullException
 
 from
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/PropertyName;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/exc/InvalidNullException;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/PropertyName;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/exc/InvalidNullException;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/PropertyName;Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/exc/InvalidNullException;
 
 _propertyName
  Lcom/fasterxml/jackson/databind/PropertyName;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/InvalidTypeIdException.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/InvalidTypeIdException.eea
index 8ac7f4e04f..3cd8c07bf5 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/InvalidTypeIdException.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/InvalidTypeIdException.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/exc/InvalidTypeIdException
 
 from
  (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/exc/InvalidTypeIdException;
- (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/exc/InvalidTypeIdException;
+ (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;)L1com/fasterxml/jackson/databind/exc/InvalidTypeIdException;
 
 _baseType
  Lcom/fasterxml/jackson/databind/JavaType;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/MismatchedInputException.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/MismatchedInputException.eea
index 5e30183706..ea01892fcd 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/MismatchedInputException.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/MismatchedInputException.eea
@@ -2,10 +2,10 @@ class com/fasterxml/jackson/databind/exc/MismatchedInputException
 
 from
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/exc/MismatchedInputException;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/exc/MismatchedInputException;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/String;)L1com/fasterxml/jackson/databind/exc/MismatchedInputException;
 from
  (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/Class<*>;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/exc/MismatchedInputException;
- (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/Class<*>;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/exc/MismatchedInputException;
+ (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/Class<*>;Ljava/lang/String;)L1com/fasterxml/jackson/databind/exc/MismatchedInputException;
 from
  (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/exc/MismatchedInputException;
  (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/exc/MismatchedInputException;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/PropertyBindingException.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/PropertyBindingException.eea
index ec3c56b6ac..e51da82628 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/PropertyBindingException.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/PropertyBindingException.eea
@@ -21,10 +21,10 @@ _referringClass
  (Ljava/lang/String;Lcom/fasterxml/jackson/core/JsonLocation;Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/Collection<Ljava/lang/Object;>;)V
 getKnownPropertyIds
  ()Ljava/util/Collection<Ljava/lang/Object;>;
- ()Ljava/util/Collection<Ljava/lang/Object;>;
+ ()L0java/util/Collection<Ljava/lang/Object;>;
 getMessageSuffix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(com.fasterxml.jackson.core.JsonProcessingException)
 getPropertyName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/UnrecognizedPropertyException.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/UnrecognizedPropertyException.eea
index 3d70b48882..feac59e730 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/UnrecognizedPropertyException.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/UnrecognizedPropertyException.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/exc/UnrecognizedPropertyException
 
 from
  (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/Object;Ljava/lang/String;Ljava/util/Collection<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/exc/UnrecognizedPropertyException;
- (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/Object;Ljava/lang/String;Ljava/util/Collection<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/exc/UnrecognizedPropertyException;
+ (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/Object;Ljava/lang/String;Ljava/util/Collection<Ljava/lang/Object;>;)L1com/fasterxml/jackson/databind/exc/UnrecognizedPropertyException;
 
 <init>
  (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;Lcom/fasterxml/jackson/core/JsonLocation;Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/Collection<Ljava/lang/Object;>;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/ValueInstantiationException.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/ValueInstantiationException.eea
index 0da54fe0e2..95b7f2d56a 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/ValueInstantiationException.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/exc/ValueInstantiationException.eea
@@ -2,10 +2,10 @@ class com/fasterxml/jackson/databind/exc/ValueInstantiationException
 
 from
  (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/exc/ValueInstantiationException;
- (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/exc/ValueInstantiationException;
+ (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/exc/ValueInstantiationException;
 from
  (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/Throwable;)Lcom/fasterxml/jackson/databind/exc/ValueInstantiationException;
- (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/Throwable;)Lcom/fasterxml/jackson/databind/exc/ValueInstantiationException;
+ (Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/Throwable;)L1com/fasterxml/jackson/databind/exc/ValueInstantiationException;
 
 _type
  Lcom/fasterxml/jackson/databind/JavaType;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ext/CoreXMLDeserializers.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ext/CoreXMLDeserializers.eea
index cef5817854..d8a2113ac2 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ext/CoreXMLDeserializers.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ext/CoreXMLDeserializers.eea
@@ -6,7 +6,7 @@ EMPTY_QNAME
 
 findBeanDeserializer
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.Deserializers$Base)
 hasDeserializerFor
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Ljava/lang/Class<*>;)Z
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ext/CoreXMLSerializers$XMLGregorianCalendarSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ext/CoreXMLSerializers$XMLGregorianCalendarSerializer.eea
index 4004579dd8..d5f297b2ff 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ext/CoreXMLSerializers$XMLGregorianCalendarSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ext/CoreXMLSerializers$XMLGregorianCalendarSerializer.eea
@@ -15,10 +15,10 @@ acceptJsonFormatVisitor
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;Lcom/fasterxml/jackson/databind/JavaType;)V
 createContextual
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.ContextualSerializer)
 getDelegatee
  ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ ()L0com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.JsonSerializer)
 isEmpty
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljavax/xml/datatype/XMLGregorianCalendar;)Z
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljavax/xml/datatype/XMLGregorianCalendar;)Z
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ext/CoreXMLSerializers.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ext/CoreXMLSerializers.eea
index e1e410fea3..221facce51 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ext/CoreXMLSerializers.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ext/CoreXMLSerializers.eea
@@ -2,4 +2,4 @@ class com/fasterxml/jackson/databind/ext/CoreXMLSerializers
 
 findSerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)L0com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.Serializers$Base)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ext/Java7HandlersImpl.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ext/Java7HandlersImpl.eea
index 8fc03ce7db..f569822fb7 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ext/Java7HandlersImpl.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ext/Java7HandlersImpl.eea
@@ -5,7 +5,7 @@ getClassJavaNioFilePath
  ()Ljava/lang/Class<*>;
 getDeserializerForJavaNioFilePath
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Ljava/lang/Class<*>;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>;
 getSerializerForJavaNioFilePath
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Ljava/lang/Class<*>;)L0com/fasterxml/jackson/databind/JsonSerializer<*>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ext/Java7SupportImpl.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ext/Java7SupportImpl.eea
index 93d7c635f7..701d411799 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ext/Java7SupportImpl.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ext/Java7SupportImpl.eea
@@ -2,10 +2,10 @@ class com/fasterxml/jackson/databind/ext/Java7SupportImpl
 
 findConstructorName
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;)Lcom/fasterxml/jackson/databind/PropertyName;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;)Lcom/fasterxml/jackson/databind/PropertyName;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;)L0com/fasterxml/jackson/databind/PropertyName;
 findTransient
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Boolean;
 hasCreatorAnnotation
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Boolean;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ext/OptionalHandlerFactory.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ext/OptionalHandlerFactory.eea
index 3646b9284c..685466f760 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ext/OptionalHandlerFactory.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ext/OptionalHandlerFactory.eea
@@ -6,10 +6,10 @@ instance
 
 findDeserializer
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>;
 findSerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)L0com/fasterxml/jackson/databind/JsonSerializer<*>;
 hasDeserializerFor
  (Ljava/lang/Class<*>;)Z
  (Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AccessorNamingStrategy$Base.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AccessorNamingStrategy$Base.eea
index d79d643715..54ea79fda7 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AccessorNamingStrategy$Base.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AccessorNamingStrategy$Base.eea
@@ -2,13 +2,13 @@ class com/fasterxml/jackson/databind/introspect/AccessorNamingStrategy$Base
 
 findNameForIsGetter
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;)L0java/lang/String;
 findNameForMutator
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;)L0java/lang/String;
 findNameForRegularGetter
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;)L0java/lang/String;
 modifyFieldName
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedField;Ljava/lang/String;)Ljava/lang/String;
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedField;Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedAndMetadata.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedAndMetadata.eea
index 0244f2d24c..202e5ca8f6 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedAndMetadata.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedAndMetadata.eea
@@ -4,7 +4,7 @@ class com/fasterxml/jackson/databind/introspect/AnnotatedAndMetadata
 
 of
  <A:Lcom/fasterxml/jackson/databind/introspect/Annotated;M:Ljava/lang/Object;>(TA;TM;)Lcom/fasterxml/jackson/databind/introspect/AnnotatedAndMetadata<TA;TM;>;
- <A:Lcom/fasterxml/jackson/databind/introspect/Annotated;M:Ljava/lang/Object;>(TA;TM;)Lcom/fasterxml/jackson/databind/introspect/AnnotatedAndMetadata<TA;TM;>;
+ <A:Lcom/fasterxml/jackson/databind/introspect/Annotated;M:Ljava/lang/Object;>(TA;TM;)L1com/fasterxml/jackson/databind/introspect/AnnotatedAndMetadata<TA;TM;>;
 
 annotated
  TA;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedConstructor.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedConstructor.eea
index 53c82b5b31..ba83c83a57 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedConstructor.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedConstructor.eea
@@ -33,7 +33,7 @@ getDeclaringClass
  ()Ljava/lang/Class<*>;
 getGenericParameterType
  (I)Ljava/lang/reflect/Type;
- (I)Ljava/lang/reflect/Type;
+ (I)L0java/lang/reflect/Type;
 getMember
  ()Ljava/lang/reflect/Member;
  ()Ljava/lang/reflect/Member;
@@ -42,7 +42,7 @@ getName
  ()Ljava/lang/String;
 getParameterType
  (I)Lcom/fasterxml/jackson/databind/JavaType;
- (I)Lcom/fasterxml/jackson/databind/JavaType;
+ (I)L0com/fasterxml/jackson/databind/JavaType;
 getRawParameterType
  (I)Ljava/lang/Class<*>;
  (I)Ljava/lang/Class<*>;
@@ -54,7 +54,7 @@ getType
  ()Lcom/fasterxml/jackson/databind/JavaType;
 getValue
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object;
 setValue
  (Ljava/lang/Object;Ljava/lang/Object;)V
  (Ljava/lang/Object;Ljava/lang/Object;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedMember.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedMember.eea
index 0a8fe29417..152b8d100d 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedMember.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedMember.eea
@@ -21,13 +21,13 @@ getAllAnnotations
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotationMap;
 getAnnotation
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
- <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
+ <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)T0A;
 getDeclaringClass
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
 getFullName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getMember
  ()Ljava/lang/reflect/Member;
  ()Ljava/lang/reflect/Member;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedMethod.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedMethod.eea
index e04aa529a3..6228d1c170 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedMethod.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedMethod.eea
@@ -42,10 +42,10 @@ getDeclaringClass
  ()Ljava/lang/Class<*>;
 getFullName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(com.fasterxml.jackson.databind.introspect.AnnotatedMember)
 getGenericParameterType
  (I)Ljava/lang/reflect/Type;
- (I)Ljava/lang/reflect/Type;
+ (I)L0java/lang/reflect/Type;
 getGenericParameterTypes
  ()[Ljava/lang/reflect/Type;
  ()[Ljava/lang/reflect/Type;
@@ -57,7 +57,7 @@ getName
  ()Ljava/lang/String;
 getParameterType
  (I)Lcom/fasterxml/jackson/databind/JavaType;
- (I)Lcom/fasterxml/jackson/databind/JavaType;
+ (I)L0com/fasterxml/jackson/databind/JavaType;
 getRawParameterType
  (I)Ljava/lang/Class<*>;
  (I)Ljava/lang/Class<*>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedMethodMap.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedMethodMap.eea
index f32f019a9c..002006e7f1 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedMethodMap.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedMethodMap.eea
@@ -13,10 +13,10 @@ _methods
  (Ljava/util/Map<Lcom/fasterxml/jackson/databind/introspect/MemberKey;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;>;)V
 find
  (Ljava/lang/String;[Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
- (Ljava/lang/String;[Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
+ (Ljava/lang/String;[Ljava/lang/Class<*>;)L0com/fasterxml/jackson/databind/introspect/AnnotatedMethod;
 find
  (Ljava/lang/reflect/Method;)Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
- (Ljava/lang/reflect/Method;)Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
+ (Ljava/lang/reflect/Method;)L0com/fasterxml/jackson/databind/introspect/AnnotatedMethod;
 iterator
  ()Ljava/util/Iterator<Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;>;
  ()Ljava/util/Iterator<Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedParameter.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedParameter.eea
index 22dbdb0916..bb4179c026 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedParameter.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedParameter.eea
@@ -15,7 +15,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(com.fasterxml.jackson.databind.introspect.Annotated)
 getAnnotated
  ()Ljava/lang/reflect/AnnotatedElement;
- ()Ljava/lang/reflect/AnnotatedElement;
+ ()L0java/lang/reflect/AnnotatedElement;
 getDeclaringClass
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
@@ -24,7 +24,7 @@ getMember
  ()Ljava/lang/reflect/Member;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getOwner
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedWithParams;
@@ -39,7 +39,7 @@ getType
  ()Lcom/fasterxml/jackson/databind/JavaType;
 getValue
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object;
 setValue
  (Ljava/lang/Object;Ljava/lang/Object;)V
  (Ljava/lang/Object;Ljava/lang/Object;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedWithParams.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedWithParams.eea
index a28ac9d898..03e8d5f66e 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedWithParams.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotatedWithParams.eea
@@ -27,10 +27,10 @@ getGenericParameterType
  (I)Ljava/lang/reflect/Type;
 getParameter
  (I)Lcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;
- (I)Lcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;
+ (I)L1com/fasterxml/jackson/databind/introspect/AnnotatedParameter;
 getParameterAnnotations
  (I)Lcom/fasterxml/jackson/databind/introspect/AnnotationMap;
- (I)Lcom/fasterxml/jackson/databind/introspect/AnnotationMap;
+ (I)L0com/fasterxml/jackson/databind/introspect/AnnotationMap;
 getParameterType
  (I)Lcom/fasterxml/jackson/databind/JavaType;
  (I)Lcom/fasterxml/jackson/databind/JavaType;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotationCollector$NoAnnotations.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotationCollector$NoAnnotations.eea
index b7c68f6557..cd9799a5df 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotationCollector$NoAnnotations.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotationCollector$NoAnnotations.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/introspect/AnnotationCollector$NoAnnotation
 
 get
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
- <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
+ <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)T0A;
 has
  (Ljava/lang/Class<*>;)Z
  (Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotationCollector$OneAnnotation.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotationCollector$OneAnnotation.eea
index c29c2bfdf0..70abf92220 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotationCollector$OneAnnotation.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotationCollector$OneAnnotation.eea
@@ -5,7 +5,7 @@ class com/fasterxml/jackson/databind/introspect/AnnotationCollector$OneAnnotatio
  (Ljava/lang/Class<*>;Ljava/lang/annotation/Annotation;)V
 get
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
- <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
+ <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)T0A;
 has
  (Ljava/lang/Class<*>;)Z
  (Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotationCollector$TwoAnnotations.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotationCollector$TwoAnnotations.eea
index 4bfcbe1cb0..71ecd07c4b 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotationCollector$TwoAnnotations.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotationCollector$TwoAnnotations.eea
@@ -5,7 +5,7 @@ class com/fasterxml/jackson/databind/introspect/AnnotationCollector$TwoAnnotatio
  (Ljava/lang/Class<*>;Ljava/lang/annotation/Annotation;Ljava/lang/Class<*>;Ljava/lang/annotation/Annotation;)V
 get
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
- <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
+ <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)T0A;
 has
  (Ljava/lang/Class<*>;)Z
  (Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotationCollector.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotationCollector.eea
index 67b572063c..7dfb148eed 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotationCollector.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotationCollector.eea
@@ -12,7 +12,7 @@ emptyCollector
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotationCollector;
 emptyCollector
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/introspect/AnnotationCollector;
- (Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/introspect/AnnotationCollector;
+ (Ljava/lang/Object;)L1com/fasterxml/jackson/databind/introspect/AnnotationCollector;
 
 _data
  Ljava/lang/Object;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.eea
index d424ca2792..07283c7aee 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair
 
 create
  (Lcom/fasterxml/jackson/databind/AnnotationIntrospector;Lcom/fasterxml/jackson/databind/AnnotationIntrospector;)Lcom/fasterxml/jackson/databind/AnnotationIntrospector;
- (Lcom/fasterxml/jackson/databind/AnnotationIntrospector;Lcom/fasterxml/jackson/databind/AnnotationIntrospector;)Lcom/fasterxml/jackson/databind/AnnotationIntrospector;
+ (Lcom/fasterxml/jackson/databind/AnnotationIntrospector;Lcom/fasterxml/jackson/databind/AnnotationIntrospector;)L1com/fasterxml/jackson/databind/AnnotationIntrospector;
 
 _primary
  Lcom/fasterxml/jackson/databind/AnnotationIntrospector;
@@ -16,7 +16,7 @@ _secondary
  (Lcom/fasterxml/jackson/databind/AnnotationIntrospector;Lcom/fasterxml/jackson/databind/AnnotationIntrospector;)V
 _explicitClassOrOb
  (Ljava/lang/Object;Ljava/lang/Class<*>;)Ljava/lang/Object;
- (Ljava/lang/Object;Ljava/lang/Class<*>;)Ljava/lang/Object;
+ (Ljava/lang/Object;Ljava/lang/Class<*>;)L0java/lang/Object;
 _isExplicitClassOrOb
  (Ljava/lang/Object;Ljava/lang/Class<*>;)Z
  (Ljava/lang/Object;Ljava/lang/Class<*>;)Z
@@ -34,34 +34,34 @@ findAutoDetectVisibility
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/introspect/VisibilityChecker<*>;)Lcom/fasterxml/jackson/databind/introspect/VisibilityChecker<*>;
 findClassDescription
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0java/lang/String; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findContentDeserializer
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findContentSerializer
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findCreatorAnnotation
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonCreator$Mode;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonCreator$Mode;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/annotation/JsonCreator$Mode; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findCreatorBinding
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonCreator$Mode;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonCreator$Mode;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/annotation/JsonCreator$Mode; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findDefaultEnumValue
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;[Ljava/lang/Enum<*>;)Ljava/lang/Enum<*>;
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;[Ljava/lang/Enum<*>;)Ljava/lang/Enum<*>;
 findDefaultEnumValue
  (Ljava/lang/Class<Ljava/lang/Enum<*>;>;)Ljava/lang/Enum<*>;
- (Ljava/lang/Class<Ljava/lang/Enum<*>;>;)Ljava/lang/Enum<*>;
+ (Ljava/lang/Class<Ljava/lang/Enum<*>;>;)L0java/lang/Enum<*>; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findDeserializationContentConverter
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findDeserializationConverter
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findDeserializer
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findEnumAliases
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;[Ljava/lang/Enum<*>;[[Ljava/lang/String;)V
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;[Ljava/lang/Enum<*>;[[Ljava/lang/String;)V
@@ -70,7 +70,7 @@ findEnumAliases
  (Ljava/lang/Class<*>;[Ljava/lang/Enum<*>;[[Ljava/lang/String;)V
 findEnumNamingStrategy
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findEnumValue
  (Ljava/lang/Enum<*>;)Ljava/lang/String;
  (Ljava/lang/Enum<*>;)Ljava/lang/String;
@@ -82,70 +82,70 @@ findEnumValues
  (Ljava/lang/Class<*>;[Ljava/lang/Enum<*>;[Ljava/lang/String;)[Ljava/lang/String;
 findFilterId
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findFormat
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
 findImplicitPropertyName
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0java/lang/String; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findInjectableValue
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/annotation/JacksonInject$Value;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/annotation/JacksonInject$Value;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0com/fasterxml/jackson/annotation/JacksonInject$Value; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findInjectableValueId
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findKeyDeserializer
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findKeySerializer
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findMergeInfo
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Boolean; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findNameForDeserialization
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/PropertyName;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/PropertyName;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/databind/PropertyName; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findNameForSerialization
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/PropertyName;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/PropertyName;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/databind/PropertyName; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findNamingStrategy
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findNullSerializer
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findObjectIdInfo
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/introspect/ObjectIdInfo;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/introspect/ObjectIdInfo;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/databind/introspect/ObjectIdInfo; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findObjectReferenceInfo
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;Lcom/fasterxml/jackson/databind/introspect/ObjectIdInfo;)Lcom/fasterxml/jackson/databind/introspect/ObjectIdInfo;
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;Lcom/fasterxml/jackson/databind/introspect/ObjectIdInfo;)Lcom/fasterxml/jackson/databind/introspect/ObjectIdInfo;
 findPOJOBuilder
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Class<*>;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Class<*>;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0java/lang/Class<*>; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findPOJOBuilderConfig
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/databind/annotation/JsonPOJOBuilder$Value;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/databind/annotation/JsonPOJOBuilder$Value;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0com/fasterxml/jackson/databind/annotation/JsonPOJOBuilder$Value; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findPolymorphicTypeInfo
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonTypeInfo$Value;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonTypeInfo$Value;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/annotation/JsonTypeInfo$Value; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findPropertyAccess
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonProperty$Access;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonProperty$Access;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/annotation/JsonProperty$Access; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findPropertyAliases
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/util/List<Lcom/fasterxml/jackson/databind/PropertyName;>;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/util/List<Lcom/fasterxml/jackson/databind/PropertyName;>;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/util/List<Lcom/fasterxml/jackson/databind/PropertyName;>; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findPropertyContentTypeResolver
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findPropertyDefaultValue
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/String; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findPropertyDescription
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/String; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findPropertyIgnoralByName
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonIgnoreProperties$Value;
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonIgnoreProperties$Value;
@@ -160,79 +160,79 @@ findPropertyInclusionByName
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonIncludeProperties$Value;
 findPropertyIndex
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Integer;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Integer;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Integer; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findPropertyTypeResolver
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findReferenceType
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0com/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findRenameByField
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedField;Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/PropertyName;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedField;Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/PropertyName;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedField;Lcom/fasterxml/jackson/databind/PropertyName;)L0com/fasterxml/jackson/databind/PropertyName; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findRootName
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/databind/PropertyName;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/databind/PropertyName;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0com/fasterxml/jackson/databind/PropertyName; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findSerializationContentConverter
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findSerializationConverter
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findSerializationPropertyOrder
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)[Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)[Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)[0Ljava/lang/String; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findSerializationSortAlphabetically
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Boolean; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findSerializationTyping
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/annotation/JsonSerialize$Typing;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/annotation/JsonSerialize$Typing;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/databind/annotation/JsonSerialize$Typing; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findSerializer
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findSetterInfo
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonSetter$Value;
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonSetter$Value;
 findSubtypes
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/util/List<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/util/List<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/util/List<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findTypeName
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0java/lang/String; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findTypeResolver
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findUnwrappingNameTransformer
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/util/NameTransformer;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/util/NameTransformer;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0com/fasterxml/jackson/databind/util/NameTransformer; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findValueInstantiator
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findViews
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)[Ljava/lang/Class<*>;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)[Ljava/lang/Class<*>;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)[0Ljava/lang/Class<*>; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findWrapperName
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/PropertyName;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/PropertyName;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/databind/PropertyName; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 hasAnyGetter
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Boolean; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 hasAnyGetterAnnotation
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Z
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Z
 hasAnySetter
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Boolean; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 hasAnySetterAnnotation
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Z
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Z
 hasAsKey
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Boolean; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 hasAsValue
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Boolean; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 hasAsValueAnnotation
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Z
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Z
@@ -244,16 +244,16 @@ hasIgnoreMarker
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Z
 hasRequiredMarker
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0java/lang/Boolean; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 isAnnotationBundle
  (Ljava/lang/annotation/Annotation;)Z
  (Ljava/lang/annotation/Annotation;)Z
 isIgnorableType
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0java/lang/Boolean; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 isTypeId
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0java/lang/Boolean; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 refineDeserializationType
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
@@ -262,7 +262,7 @@ refineSerializationType
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
 resolveSetterConflict
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)L0com/fasterxml/jackson/databind/introspect/AnnotatedMethod; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 version
  ()Lcom/fasterxml/jackson/core/Version;
  ()Lcom/fasterxml/jackson/core/Version;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotationMap.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotationMap.eea
index 5d830df039..b0c005614c 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotationMap.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/AnnotationMap.eea
@@ -5,7 +5,7 @@ merge
  (Lcom/fasterxml/jackson/databind/introspect/AnnotationMap;Lcom/fasterxml/jackson/databind/introspect/AnnotationMap;)Lcom/fasterxml/jackson/databind/introspect/AnnotationMap;
 of
  (Ljava/lang/Class<*>;Ljava/lang/annotation/Annotation;)Lcom/fasterxml/jackson/databind/introspect/AnnotationMap;
- (Ljava/lang/Class<*>;Ljava/lang/annotation/Annotation;)Lcom/fasterxml/jackson/databind/introspect/AnnotationMap;
+ (Ljava/lang/Class<*>;Ljava/lang/annotation/Annotation;)L1com/fasterxml/jackson/databind/introspect/AnnotationMap;
 
 _annotations
  Ljava/util/HashMap<Ljava/lang/Class<*>;Ljava/lang/annotation/Annotation;>;
@@ -25,7 +25,7 @@ annotations
  ()Ljava/lang/Iterable<Ljava/lang/annotation/Annotation;>;
 get
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
- <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
+ <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)T0A;
 has
  (Ljava/lang/Class<*>;)Z
  (Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/BasicBeanDescription.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/BasicBeanDescription.eea
index 54bb9d2fb8..593a2c60c7 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/BasicBeanDescription.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/BasicBeanDescription.eea
@@ -2,13 +2,13 @@ class com/fasterxml/jackson/databind/introspect/BasicBeanDescription
 
 forDeserialization
  (Lcom/fasterxml/jackson/databind/introspect/POJOPropertiesCollector;)Lcom/fasterxml/jackson/databind/introspect/BasicBeanDescription;
- (Lcom/fasterxml/jackson/databind/introspect/POJOPropertiesCollector;)Lcom/fasterxml/jackson/databind/introspect/BasicBeanDescription;
+ (Lcom/fasterxml/jackson/databind/introspect/POJOPropertiesCollector;)L1com/fasterxml/jackson/databind/introspect/BasicBeanDescription;
 forOtherUse
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/databind/introspect/BasicBeanDescription;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/databind/introspect/BasicBeanDescription;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L1com/fasterxml/jackson/databind/introspect/BasicBeanDescription;
 forSerialization
  (Lcom/fasterxml/jackson/databind/introspect/POJOPropertiesCollector;)Lcom/fasterxml/jackson/databind/introspect/BasicBeanDescription;
- (Lcom/fasterxml/jackson/databind/introspect/POJOPropertiesCollector;)Lcom/fasterxml/jackson/databind/introspect/BasicBeanDescription;
+ (Lcom/fasterxml/jackson/databind/introspect/POJOPropertiesCollector;)L1com/fasterxml/jackson/databind/introspect/BasicBeanDescription;
 
 _annotationIntrospector
  Lcom/fasterxml/jackson/databind/AnnotationIntrospector;
@@ -43,13 +43,13 @@ _properties
  (Lcom/fasterxml/jackson/databind/introspect/POJOPropertiesCollector;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)V
 _createConverter
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;Ljava/lang/Object;>;
- (Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;Ljava/lang/Object;>;
+ (Ljava/lang/Object;)L0com/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;Ljava/lang/Object;>;
 _findCreatorPropertyName
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;)Lcom/fasterxml/jackson/databind/PropertyName;
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;)Lcom/fasterxml/jackson/databind/PropertyName;
 _findPropertyFields
  (Ljava/util/Collection<Ljava/lang/String;>;Z)Ljava/util/LinkedHashMap<Ljava/lang/String;Lcom/fasterxml/jackson/databind/introspect/AnnotatedField;>;
- (Ljava/util/Collection<Ljava/lang/String;>;Z)Ljava/util/LinkedHashMap<Ljava/lang/String;Lcom/fasterxml/jackson/databind/introspect/AnnotatedField;>;
+ (Ljava/util/Collection<Ljava/lang/String;>;Z)L1java/util/LinkedHashMap<Ljava/lang/String;Lcom/fasterxml/jackson/databind/introspect/AnnotatedField;>;
 _properties
  ()Ljava/util/List<Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;>;
  ()Ljava/util/List<Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;>;
@@ -61,19 +61,19 @@ bindingsForBeanType
  ()Lcom/fasterxml/jackson/databind/type/TypeBindings;
 findAnyGetter
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedMember;
 findAnySetterAccessor
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedMember;
 findBackReferenceProperties
  ()Ljava/util/Map<Ljava/lang/String;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;>;
- ()Ljava/util/Map<Ljava/lang/String;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;>;
+ ()L0java/util/Map<Ljava/lang/String;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;>;
 findBackReferences
  ()Ljava/util/List<Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;>;
- ()Ljava/util/List<Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;>;
+ ()L1java/util/List<Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;>;
 findClassDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(com.fasterxml.jackson.databind.BeanDescription)
 findDefaultConstructor
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedConstructor;
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedConstructor;
@@ -82,22 +82,22 @@ findDefaultViews
  ()[Ljava/lang/Class<*>;
 findDeserializationConverter
  ()Lcom/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;Ljava/lang/Object;>;
- ()Lcom/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;Ljava/lang/Object;>;
+ ()L0com/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;Ljava/lang/Object;>;
 findExpectedFormat
  ()Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
  ()Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
 findFactoryMethod
  ([Ljava/lang/Class<*>;)Ljava/lang/reflect/Method;
- ([Ljava/lang/Class<*>;)Ljava/lang/reflect/Method;
+ ([Ljava/lang/Class<*>;)L0java/lang/reflect/Method;
 findFactoryMethodMetadata
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Lcom/fasterxml/jackson/databind/introspect/AnnotatedAndMetadata<Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Lcom/fasterxml/jackson/annotation/JsonCreator$Mode;>;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Lcom/fasterxml/jackson/databind/introspect/AnnotatedAndMetadata<Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Lcom/fasterxml/jackson/annotation/JsonCreator$Mode;>;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)L0com/fasterxml/jackson/databind/introspect/AnnotatedAndMetadata<Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Lcom/fasterxml/jackson/annotation/JsonCreator$Mode;>;
 findInjectables
  ()Ljava/util/Map<Ljava/lang/Object;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;>;
  ()Ljava/util/Map<Ljava/lang/Object;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;>;
 findJsonKeyAccessor
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedMember; # @Inherited(com.fasterxml.jackson.databind.BeanDescription)
 findJsonValueAccessor
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
@@ -118,16 +118,16 @@ findProperties
  ()Ljava/util/List<Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;>;
 findProperty
  (Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;
- (Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;
+ (Lcom/fasterxml/jackson/databind/PropertyName;)L0com/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;
 findPropertyInclusion
  (Lcom/fasterxml/jackson/annotation/JsonInclude$Value;)Lcom/fasterxml/jackson/annotation/JsonInclude$Value;
  (Lcom/fasterxml/jackson/annotation/JsonInclude$Value;)Lcom/fasterxml/jackson/annotation/JsonInclude$Value;
 findSerializationConverter
  ()Lcom/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;Ljava/lang/Object;>;
- ()Lcom/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;Ljava/lang/Object;>;
+ ()L0com/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;Ljava/lang/Object;>;
 findSingleArgConstructor
  ([Ljava/lang/Class<*>;)Ljava/lang/reflect/Constructor<*>;
- ([Ljava/lang/Class<*>;)Ljava/lang/reflect/Constructor<*>;
+ ([Ljava/lang/Class<*>;)L0java/lang/reflect/Constructor<*>;
 getClassAnnotations
  ()Lcom/fasterxml/jackson/databind/util/Annotations;
  ()Lcom/fasterxml/jackson/databind/util/Annotations;
@@ -157,7 +157,7 @@ hasProperty
  (Lcom/fasterxml/jackson/databind/PropertyName;)Z
 instantiateBean
  (Z)Ljava/lang/Object;
- (Z)Ljava/lang/Object;
+ (Z)L0java/lang/Object;
 isFactoryMethod
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Z
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Z
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/BasicClassIntrospector.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/BasicClassIntrospector.eea
index 12d983008a..3d3a057d7e 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/BasicClassIntrospector.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/BasicClassIntrospector.eea
@@ -18,10 +18,10 @@ STRING_DESC
 
 _findStdJdkCollectionDesc
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/introspect/BasicBeanDescription;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/introspect/BasicBeanDescription;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/introspect/BasicBeanDescription;
 _findStdTypeDesc
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/introspect/BasicBeanDescription;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/introspect/BasicBeanDescription;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/introspect/BasicBeanDescription;
 _isStdJDKCollection
  (Lcom/fasterxml/jackson/databind/JavaType;)Z
  (Lcom/fasterxml/jackson/databind/JavaType;)Z
@@ -45,13 +45,13 @@ collectPropertiesWithBuilder
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/introspect/ClassIntrospector$MixInResolver;Z)Lcom/fasterxml/jackson/databind/introspect/POJOPropertiesCollector;
 constructPropertyCollector
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/JavaType;ZLcom/fasterxml/jackson/databind/introspect/AccessorNamingStrategy;)Lcom/fasterxml/jackson/databind/introspect/POJOPropertiesCollector;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/JavaType;ZLcom/fasterxml/jackson/databind/introspect/AccessorNamingStrategy;)Lcom/fasterxml/jackson/databind/introspect/POJOPropertiesCollector;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/JavaType;ZLcom/fasterxml/jackson/databind/introspect/AccessorNamingStrategy;)L1com/fasterxml/jackson/databind/introspect/POJOPropertiesCollector;
 constructPropertyCollector
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/JavaType;ZLjava/lang/String;)Lcom/fasterxml/jackson/databind/introspect/POJOPropertiesCollector;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/JavaType;ZLjava/lang/String;)Lcom/fasterxml/jackson/databind/introspect/POJOPropertiesCollector;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/JavaType;ZLjava/lang/String;)L1com/fasterxml/jackson/databind/introspect/POJOPropertiesCollector;
 copy
  ()Lcom/fasterxml/jackson/databind/introspect/ClassIntrospector;
- ()Lcom/fasterxml/jackson/databind/introspect/ClassIntrospector;
+ ()L1com/fasterxml/jackson/databind/introspect/ClassIntrospector;
 forClassAnnotations
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/introspect/ClassIntrospector$MixInResolver;)Lcom/fasterxml/jackson/databind/introspect/BasicBeanDescription;
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/introspect/ClassIntrospector$MixInResolver;)Lcom/fasterxml/jackson/databind/introspect/BasicBeanDescription;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/BeanPropertyDefinition.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/BeanPropertyDefinition.eea
index 75a41f8057..ac5fac0349 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/BeanPropertyDefinition.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/BeanPropertyDefinition.eea
@@ -12,16 +12,16 @@ findInclusion
  ()Lcom/fasterxml/jackson/annotation/JsonInclude$Value;
 findObjectIdInfo
  ()Lcom/fasterxml/jackson/databind/introspect/ObjectIdInfo;
- ()Lcom/fasterxml/jackson/databind/introspect/ObjectIdInfo;
+ ()L0com/fasterxml/jackson/databind/introspect/ObjectIdInfo;
 findReferenceName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 findReferenceType
  ()Lcom/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty;
- ()Lcom/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty;
+ ()L0com/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty;
 findViews
  ()[Ljava/lang/Class<*>;
- ()[Ljava/lang/Class<*>;
+ ()[0Ljava/lang/Class<*>;
 getAccessor
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy$FirstCharBasedValidator.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy$FirstCharBasedValidator.eea
index 17b5ea3e44..e470aeae0a 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy$FirstCharBasedValidator.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy$FirstCharBasedValidator.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy$Fi
 
 forFirstNameRule
  (ZZ)Lcom/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy$BaseNameValidator;
- (ZZ)Lcom/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy$BaseNameValidator;
+ (ZZ)L0com/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy$BaseNameValidator;
 
 accept
  (CLjava/lang/String;I)Z
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy$Provider.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy$Provider.eea
index ea8ec694cb..0657448c1b 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy$Provider.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy$Provider.eea
@@ -33,10 +33,10 @@ forPOJO
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/databind/introspect/AccessorNamingStrategy;
 forRecord
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/databind/introspect/AccessorNamingStrategy;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/databind/introspect/AccessorNamingStrategy;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L1com/fasterxml/jackson/databind/introspect/AccessorNamingStrategy;
 withBaseNameValidator
  (Lcom/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy$BaseNameValidator;)Lcom/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy$Provider;
- (Lcom/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy$BaseNameValidator;)Lcom/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy$Provider;
+ (Lcom/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy$BaseNameValidator;)L1com/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy$Provider;
 withBuilderPrefix
  (Ljava/lang/String;)Lcom/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy$Provider;
  (Ljava/lang/String;)Lcom/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy$Provider;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy$RecordNaming.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy$RecordNaming.eea
index f3ca85a091..2252b96c0f 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy$RecordNaming.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy$RecordNaming.eea
@@ -9,4 +9,4 @@ _fieldNames
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)V
 findNameForRegularGetter
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;)L0java/lang/String; # @Inherited(com.fasterxml.jackson.databind.introspect.DefaultAccessorNamingStrategy)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy.eea
index 80446bd442..3038531cc4 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy.eea
@@ -30,19 +30,19 @@ _isGroovyMetaClassGetter
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Z
 findNameForIsGetter
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;)L0java/lang/String;
 findNameForMutator
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;)L0java/lang/String;
 findNameForRegularGetter
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;)L0java/lang/String;
 legacyManglePropertyName
  (Ljava/lang/String;I)Ljava/lang/String;
- (Ljava/lang/String;I)Ljava/lang/String;
+ (Ljava/lang/String;I)L0java/lang/String;
 modifyFieldName
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedField;Ljava/lang/String;)Ljava/lang/String;
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedField;Ljava/lang/String;)Ljava/lang/String;
 stdManglePropertyName
  (Ljava/lang/String;I)Ljava/lang/String;
- (Ljava/lang/String;I)Ljava/lang/String;
+ (Ljava/lang/String;I)L0java/lang/String;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/EnumNamingStrategyFactory.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/EnumNamingStrategyFactory.eea
index c95ab2a17d..6cf9678833 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/EnumNamingStrategyFactory.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/EnumNamingStrategyFactory.eea
@@ -2,4 +2,4 @@ class com/fasterxml/jackson/databind/introspect/EnumNamingStrategyFactory
 
 createEnumNamingStrategyInstance
  (Ljava/lang/Object;Z)Lcom/fasterxml/jackson/databind/EnumNamingStrategy;
- (Ljava/lang/Object;Z)Lcom/fasterxml/jackson/databind/EnumNamingStrategy;
+ (Ljava/lang/Object;Z)L0com/fasterxml/jackson/databind/EnumNamingStrategy;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector.eea
index b949c955eb..201bf3d0b6 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector.eea
@@ -6,7 +6,7 @@ _annotationsInside
 
 _classIfExplicit
  (Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
- (Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
+ (Ljava/lang/Class<*>;)L0java/lang/Class<*>;
 _classIfExplicit
  (Ljava/lang/Class<*>;Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
  (Ljava/lang/Class<*>;Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
@@ -15,10 +15,10 @@ _constructNoTypeResolverBuilder
  ()Lcom/fasterxml/jackson/databind/jsontype/impl/StdTypeResolverBuilder;
 _constructStdTypeResolverBuilder
  ()Lcom/fasterxml/jackson/databind/jsontype/impl/StdTypeResolverBuilder;
- ()Lcom/fasterxml/jackson/databind/jsontype/impl/StdTypeResolverBuilder;
+ ()L1com/fasterxml/jackson/databind/jsontype/impl/StdTypeResolverBuilder;
 _constructStdTypeResolverBuilder
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/annotation/JsonTypeInfo$Value;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/annotation/JsonTypeInfo$Value;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/annotation/JsonTypeInfo$Value;Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
 _constructVirtualProperty
  (Lcom/fasterxml/jackson/databind/annotation/JsonAppend$Attr;Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;
  (Lcom/fasterxml/jackson/databind/annotation/JsonAppend$Attr;Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;
@@ -27,10 +27,10 @@ _constructVirtualProperty
  (Lcom/fasterxml/jackson/databind/annotation/JsonAppend$Prop;Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;
 _findConstructorName
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/PropertyName;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/PropertyName;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/databind/PropertyName;
 _findTypeResolver
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
 _isIgnorable
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Z
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Z
@@ -45,34 +45,34 @@ findAutoDetectVisibility
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/introspect/VisibilityChecker<*>;)Lcom/fasterxml/jackson/databind/introspect/VisibilityChecker<*>;
 findClassDescription
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0java/lang/String; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findContentDeserializer
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findContentSerializer
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findCreatorAnnotation
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonCreator$Mode;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonCreator$Mode;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/annotation/JsonCreator$Mode; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findCreatorBinding
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonCreator$Mode;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonCreator$Mode;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/annotation/JsonCreator$Mode; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findDefaultEnumValue
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;[Ljava/lang/Enum<*>;)Ljava/lang/Enum<*>;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;[Ljava/lang/Enum<*>;)Ljava/lang/Enum<*>;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;[Ljava/lang/Enum<*>;)L0java/lang/Enum<*>;
 findDefaultEnumValue
  (Ljava/lang/Class<Ljava/lang/Enum<*>;>;)Ljava/lang/Enum<*>;
- (Ljava/lang/Class<Ljava/lang/Enum<*>;>;)Ljava/lang/Enum<*>;
+ (Ljava/lang/Class<Ljava/lang/Enum<*>;>;)L0java/lang/Enum<*>; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findDeserializationContentConverter
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findDeserializationConverter
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findDeserializer
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findEnumAliases
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;[Ljava/lang/Enum<*>;[[Ljava/lang/String;)V
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;[Ljava/lang/Enum<*>;[[Ljava/lang/String;)V
@@ -81,7 +81,7 @@ findEnumAliases
  (Ljava/lang/Class<*>;[Ljava/lang/Enum<*>;[[Ljava/lang/String;)V
 findEnumNamingStrategy
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findEnumValue
  (Ljava/lang/Enum<*>;)Ljava/lang/String;
  (Ljava/lang/Enum<*>;)Ljava/lang/String;
@@ -93,70 +93,70 @@ findEnumValues
  (Ljava/lang/Class<*>;[Ljava/lang/Enum<*>;[Ljava/lang/String;)[Ljava/lang/String;
 findFilterId
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findFormat
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
 findImplicitPropertyName
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0java/lang/String; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findInjectableValue
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/annotation/JacksonInject$Value;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/annotation/JacksonInject$Value;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0com/fasterxml/jackson/annotation/JacksonInject$Value; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findInjectableValueId
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findKeyDeserializer
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findKeySerializer
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findMergeInfo
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Boolean; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findNameForDeserialization
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/PropertyName;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/PropertyName;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/databind/PropertyName; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findNameForSerialization
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/PropertyName;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/PropertyName;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/databind/PropertyName; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findNamingStrategy
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findNullSerializer
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findObjectIdInfo
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/introspect/ObjectIdInfo;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/introspect/ObjectIdInfo;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/databind/introspect/ObjectIdInfo; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findObjectReferenceInfo
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;Lcom/fasterxml/jackson/databind/introspect/ObjectIdInfo;)Lcom/fasterxml/jackson/databind/introspect/ObjectIdInfo;
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;Lcom/fasterxml/jackson/databind/introspect/ObjectIdInfo;)Lcom/fasterxml/jackson/databind/introspect/ObjectIdInfo;
 findPOJOBuilder
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Class<*>;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Class<*>;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0java/lang/Class<*>; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findPOJOBuilderConfig
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/databind/annotation/JsonPOJOBuilder$Value;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/databind/annotation/JsonPOJOBuilder$Value;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L1com/fasterxml/jackson/databind/annotation/JsonPOJOBuilder$Value; # @Overrides(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findPolymorphicTypeInfo
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonTypeInfo$Value;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonTypeInfo$Value;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/annotation/JsonTypeInfo$Value; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findPropertyAccess
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonProperty$Access;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonProperty$Access;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/annotation/JsonProperty$Access; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findPropertyAliases
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/util/List<Lcom/fasterxml/jackson/databind/PropertyName;>;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/util/List<Lcom/fasterxml/jackson/databind/PropertyName;>;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/util/List<Lcom/fasterxml/jackson/databind/PropertyName;>; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findPropertyContentTypeResolver
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findPropertyDefaultValue
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/String; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findPropertyDescription
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/String; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findPropertyIgnoralByName
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonIgnoreProperties$Value;
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonIgnoreProperties$Value;
@@ -171,76 +171,76 @@ findPropertyInclusionByName
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonIncludeProperties$Value;
 findPropertyIndex
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Integer;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Integer;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Integer; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findPropertyTypeResolver
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findReferenceType
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0com/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findRenameByField
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedField;Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/PropertyName;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedField;Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/PropertyName;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedField;Lcom/fasterxml/jackson/databind/PropertyName;)L0com/fasterxml/jackson/databind/PropertyName; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findRootName
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/databind/PropertyName;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/databind/PropertyName;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0com/fasterxml/jackson/databind/PropertyName; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findSerializationContentConverter
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findSerializationConverter
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findSerializationPropertyOrder
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)[Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)[Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)[0Ljava/lang/String; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findSerializationSortAlphabetically
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Boolean; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findSerializationTyping
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/annotation/JsonSerialize$Typing;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/annotation/JsonSerialize$Typing;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/databind/annotation/JsonSerialize$Typing; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findSerializer
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findSetterInfo
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonSetter$Value;
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/annotation/JsonSetter$Value;
 findSubtypes
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/util/List<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/util/List<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/util/List<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findTypeName
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0java/lang/String; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findTypeResolver
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/jsontype/TypeResolverBuilder<*>; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findUnwrappingNameTransformer
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/util/NameTransformer;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/util/NameTransformer;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0com/fasterxml/jackson/databind/util/NameTransformer; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findValueInstantiator
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 findViews
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)[Ljava/lang/Class<*>;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)[Ljava/lang/Class<*>;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)[0Ljava/lang/Class<*>; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 hasAnyGetter
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Boolean; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 hasAnyGetterAnnotation
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Z
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Z
 hasAnySetter
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Boolean; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 hasAnySetterAnnotation
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Z
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Z
 hasAsKey
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Boolean; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 hasAsValue
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0java/lang/Boolean; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 hasAsValueAnnotation
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Z
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Z
@@ -252,16 +252,16 @@ hasIgnoreMarker
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Z
 hasRequiredMarker
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0java/lang/Boolean; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 isAnnotationBundle
  (Ljava/lang/annotation/Annotation;)Z
  (Ljava/lang/annotation/Annotation;)Z
 isIgnorableType
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L0java/lang/Boolean; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 isTypeId
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L0java/lang/Boolean; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 readResolve
  ()Ljava/lang/Object;
  ()L1java/lang/Object;
@@ -273,7 +273,7 @@ refineSerializationType
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/Annotated;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
 resolveSetterConflict
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)L0com/fasterxml/jackson/databind/introspect/AnnotatedMethod; # @Inherited(com.fasterxml.jackson.databind.AnnotationIntrospector)
 setConstructorPropertiesImpliesCreator
  (Z)Lcom/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector;
  (Z)Lcom/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/POJOPropertiesCollector.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/POJOPropertiesCollector.eea
index 18d99789b6..0b394154b8 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/POJOPropertiesCollector.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/POJOPropertiesCollector.eea
@@ -135,16 +135,16 @@ getAnyGetter
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
 getAnyGetterField
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedMember;
 getAnyGetterMethod
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedMember;
 getAnySetterField
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedMember;
 getAnySetterMethod
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedMethod;
 getClassDef
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;
@@ -162,19 +162,19 @@ getInjectables
  ()Ljava/util/Map<Ljava/lang/Object;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;>;
 getJsonKeyAccessor
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedMember;
 getJsonValueAccessor
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedMember;
 getJsonValueMethod
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedMethod;
 getObjectIdInfo
  ()Lcom/fasterxml/jackson/databind/introspect/ObjectIdInfo;
  ()Lcom/fasterxml/jackson/databind/introspect/ObjectIdInfo;
 getProperties
  ()Ljava/util/List<Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;>;
- ()Ljava/util/List<Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;>;
+ ()L1java/util/List<Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;>;
 getPropertyMap
  ()Ljava/util/Map<Ljava/lang/String;Lcom/fasterxml/jackson/databind/introspect/POJOPropertyBuilder;>;
  ()Ljava/util/Map<Ljava/lang/String;Lcom/fasterxml/jackson/databind/introspect/POJOPropertyBuilder;>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/POJOPropertyBuilder.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/POJOPropertyBuilder.eea
index 09cf09ab95..e959c06053 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/POJOPropertyBuilder.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/POJOPropertyBuilder.eea
@@ -97,40 +97,40 @@ findInclusion
  ()Lcom/fasterxml/jackson/annotation/JsonInclude$Value;
 findObjectIdInfo
  ()Lcom/fasterxml/jackson/databind/introspect/ObjectIdInfo;
- ()Lcom/fasterxml/jackson/databind/introspect/ObjectIdInfo;
+ ()L0com/fasterxml/jackson/databind/introspect/ObjectIdInfo; # @Inherited(com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition)
 findReferenceType
  ()Lcom/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty;
- ()Lcom/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty;
+ ()L0com/fasterxml/jackson/databind/AnnotationIntrospector$ReferenceProperty; # @Inherited(com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition)
 findViews
  ()[Ljava/lang/Class<*>;
- ()[Ljava/lang/Class<*>;
+ ()[0Ljava/lang/Class<*>; # @Inherited(com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition)
 fromMemberAnnotations
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/introspect/POJOPropertyBuilder$WithMember<TT;>;)TT;
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/introspect/POJOPropertyBuilder$WithMember<TT;>;)TT;
 fromMemberAnnotationsExcept
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/introspect/POJOPropertyBuilder$WithMember<TT;>;TT;)TT;
- <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/introspect/POJOPropertyBuilder$WithMember<TT;>;TT;)TT;
+ <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/introspect/POJOPropertyBuilder$WithMember<TT;>;TT;)T0T;
 getConstructorParameter
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedParameter;
 getConstructorParameters
  ()Ljava/util/Iterator<Lcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;>;
  ()Ljava/util/Iterator<Lcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;>;
 getField
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedField;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedField;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedField;
 getFieldUnchecked
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedField;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedField;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedField;
 getFullName
  ()Lcom/fasterxml/jackson/databind/PropertyName;
  ()Lcom/fasterxml/jackson/databind/PropertyName;
 getGetter
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedMethod;
 getGetterUnchecked
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedMethod;
 getInternalName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -145,7 +145,7 @@ getPrimaryMember
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
 getPrimaryMemberUnchecked
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedMember;
 getPrimaryType
  ()Lcom/fasterxml/jackson/databind/JavaType;
  ()Lcom/fasterxml/jackson/databind/JavaType;
@@ -154,10 +154,10 @@ getRawPrimaryType
  ()Ljava/lang/Class<*>;
 getSetter
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedMethod;
 getSetterUnchecked
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedMethod;
 getWrapperName
  ()Lcom/fasterxml/jackson/databind/PropertyName;
  ()Lcom/fasterxml/jackson/databind/PropertyName;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/SimpleMixInResolver.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/SimpleMixInResolver.eea
index 5225b044c6..743bee79c3 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/SimpleMixInResolver.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/SimpleMixInResolver.eea
@@ -18,7 +18,7 @@ addLocalDefinition
  (Ljava/lang/Class<*>;Ljava/lang/Class<*>;)V
 copy
  ()Lcom/fasterxml/jackson/databind/introspect/SimpleMixInResolver;
- ()Lcom/fasterxml/jackson/databind/introspect/SimpleMixInResolver;
+ ()L1com/fasterxml/jackson/databind/introspect/SimpleMixInResolver;
 findMixInClassFor
  (Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
  (Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
@@ -27,7 +27,7 @@ setLocalDefinitions
  (Ljava/util/Map<Ljava/lang/Class<*>;Ljava/lang/Class<*>;>;)V
 withOverrides
  (Lcom/fasterxml/jackson/databind/introspect/ClassIntrospector$MixInResolver;)Lcom/fasterxml/jackson/databind/introspect/SimpleMixInResolver;
- (Lcom/fasterxml/jackson/databind/introspect/ClassIntrospector$MixInResolver;)Lcom/fasterxml/jackson/databind/introspect/SimpleMixInResolver;
+ (Lcom/fasterxml/jackson/databind/introspect/ClassIntrospector$MixInResolver;)L1com/fasterxml/jackson/databind/introspect/SimpleMixInResolver;
 withoutLocalDefinitions
  ()Lcom/fasterxml/jackson/databind/introspect/SimpleMixInResolver;
- ()Lcom/fasterxml/jackson/databind/introspect/SimpleMixInResolver;
+ ()L1com/fasterxml/jackson/databind/introspect/SimpleMixInResolver;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/VirtualAnnotatedMember.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/VirtualAnnotatedMember.eea
index db88b1ebda..489d2dfa3b 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/VirtualAnnotatedMember.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/introspect/VirtualAnnotatedMember.eea
@@ -18,13 +18,13 @@ equals
  (L0java/lang/Object;)Z # @Inherited(com.fasterxml.jackson.databind.introspect.Annotated)
 getAnnotated
  ()Ljava/lang/reflect/Field;
- ()Ljava/lang/reflect/Field;
+ ()L0java/lang/reflect/Field;
 getDeclaringClass
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
 getMember
  ()Ljava/lang/reflect/Member;
- ()Ljava/lang/reflect/Member;
+ ()L0java/lang/reflect/Member;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -36,7 +36,7 @@ getType
  ()Lcom/fasterxml/jackson/databind/JavaType;
 getValue
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object;
 setValue
  (Ljava/lang/Object;Ljava/lang/Object;)V
  (Ljava/lang/Object;Ljava/lang/Object;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper$Base.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper$Base.eea
index 9936bad472..b8072f8ae3 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper$Base.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper$Base.eea
@@ -9,31 +9,31 @@ _provider
  (Lcom/fasterxml/jackson/databind/SerializerProvider;)V
 expectAnyFormat
  (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonAnyFormatVisitor;
- (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonAnyFormatVisitor;
+ (Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/jsonFormatVisitors/JsonAnyFormatVisitor;
 expectArrayFormat
  (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonArrayFormatVisitor;
- (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonArrayFormatVisitor;
+ (Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/jsonFormatVisitors/JsonArrayFormatVisitor;
 expectBooleanFormat
  (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonBooleanFormatVisitor;
- (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonBooleanFormatVisitor;
+ (Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/jsonFormatVisitors/JsonBooleanFormatVisitor;
 expectIntegerFormat
  (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonIntegerFormatVisitor;
- (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonIntegerFormatVisitor;
+ (Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/jsonFormatVisitors/JsonIntegerFormatVisitor;
 expectMapFormat
  (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonMapFormatVisitor;
- (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonMapFormatVisitor;
+ (Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/jsonFormatVisitors/JsonMapFormatVisitor;
 expectNullFormat
  (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonNullFormatVisitor;
- (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonNullFormatVisitor;
+ (Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/jsonFormatVisitors/JsonNullFormatVisitor;
 expectNumberFormat
  (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonNumberFormatVisitor;
- (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonNumberFormatVisitor;
+ (Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/jsonFormatVisitors/JsonNumberFormatVisitor;
 expectObjectFormat
  (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonObjectFormatVisitor;
- (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonObjectFormatVisitor;
+ (Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/jsonFormatVisitors/JsonObjectFormatVisitor;
 expectStringFormat
  (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonStringFormatVisitor;
- (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonStringFormatVisitor;
+ (Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/jsonFormatVisitors/JsonStringFormatVisitor;
 getProvider
  ()Lcom/fasterxml/jackson/databind/SerializerProvider;
  ()Lcom/fasterxml/jackson/databind/SerializerProvider;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/BasicPolymorphicTypeValidator.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/BasicPolymorphicTypeValidator.eea
index d3ce43da26..87979b8960 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/BasicPolymorphicTypeValidator.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/BasicPolymorphicTypeValidator.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/jsontype/BasicPolymorphicTypeValidator
 
 builder
  ()Lcom/fasterxml/jackson/databind/jsontype/BasicPolymorphicTypeValidator$Builder;
- ()Lcom/fasterxml/jackson/databind/jsontype/BasicPolymorphicTypeValidator$Builder;
+ ()L1com/fasterxml/jackson/databind/jsontype/BasicPolymorphicTypeValidator$Builder;
 
 _baseTypeMatchers
  [Lcom/fasterxml/jackson/databind/jsontype/BasicPolymorphicTypeValidator$TypeMatcher;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/TypeDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/TypeDeserializer.eea
index 0ebfb4437f..565bea134d 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/TypeDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/TypeDeserializer.eea
@@ -5,7 +5,7 @@ deserializeIfNatural
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/JavaType;)Ljava/lang/Object;
 deserializeIfNatural
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Class<*>;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Class<*>;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Class<*>;)L0java/lang/Object;
 
 deserializeTypedFromAny
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/TypeSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/TypeSerializer.eea
index d15bc8cde3..0179e091d6 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/TypeSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/TypeSerializer.eea
@@ -17,7 +17,7 @@ getTypeInclusion
  ()Lcom/fasterxml/jackson/annotation/JsonTypeInfo$As;
 typeId
  (Ljava/lang/Object;Lcom/fasterxml/jackson/core/JsonToken;)Lcom/fasterxml/jackson/core/type/WritableTypeId;
- (Ljava/lang/Object;Lcom/fasterxml/jackson/core/JsonToken;)Lcom/fasterxml/jackson/core/type/WritableTypeId;
+ (Ljava/lang/Object;Lcom/fasterxml/jackson/core/JsonToken;)L1com/fasterxml/jackson/core/type/WritableTypeId;
 typeId
  (Ljava/lang/Object;Lcom/fasterxml/jackson/core/JsonToken;Ljava/lang/Object;)Lcom/fasterxml/jackson/core/type/WritableTypeId;
  (Ljava/lang/Object;Lcom/fasterxml/jackson/core/JsonToken;Ljava/lang/Object;)Lcom/fasterxml/jackson/core/type/WritableTypeId;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsArrayTypeDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsArrayTypeDeserializer.eea
index 1a8e84d281..4f3d72a064 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsArrayTypeDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsArrayTypeDeserializer.eea
@@ -11,7 +11,7 @@ _deserialize
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
 _locateTypeId
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)L0java/lang/String;
 deserializeTypedFromAny
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
@@ -26,7 +26,7 @@ deserializeTypedFromScalar
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
 forProperty
  (Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;
- (Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;
+ (Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/jsontype/TypeDeserializer;
 getTypeInclusion
  ()Lcom/fasterxml/jackson/annotation/JsonTypeInfo$As;
  ()Lcom/fasterxml/jackson/annotation/JsonTypeInfo$As;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsArrayTypeSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsArrayTypeSerializer.eea
index 963458e59d..4cfd9b230e 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsArrayTypeSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsArrayTypeSerializer.eea
@@ -5,7 +5,7 @@ class com/fasterxml/jackson/databind/jsontype/impl/AsArrayTypeSerializer
  (Lcom/fasterxml/jackson/databind/jsontype/TypeIdResolver;Lcom/fasterxml/jackson/databind/BeanProperty;)V
 forProperty
  (Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/jsontype/impl/AsArrayTypeSerializer;
- (Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/jsontype/impl/AsArrayTypeSerializer;
+ (Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/jsontype/impl/AsArrayTypeSerializer;
 getTypeInclusion
  ()Lcom/fasterxml/jackson/annotation/JsonTypeInfo$As;
  ()Lcom/fasterxml/jackson/annotation/JsonTypeInfo$As;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsDeductionTypeDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsDeductionTypeDeserializer.eea
index 1142bb0be7..2a3d741265 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsDeductionTypeDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsDeductionTypeDeserializer.eea
@@ -8,10 +8,10 @@ class com/fasterxml/jackson/databind/jsontype/impl/AsDeductionTypeDeserializer
  (Lcom/fasterxml/jackson/databind/jsontype/impl/AsDeductionTypeDeserializer;Lcom/fasterxml/jackson/databind/BeanProperty;)V
 buildFingerprints
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;)Ljava/util/Map<Ljava/util/BitSet;Ljava/lang/String;>;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;)Ljava/util/Map<Ljava/util/BitSet;Ljava/lang/String;>;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;)L1java/util/Map<Ljava/util/BitSet;Ljava/lang/String;>;
 deserializeTypedFromObject
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
 forProperty
  (Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;
- (Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;
+ (Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/jsontype/TypeDeserializer; # @Inherited(com.fasterxml.jackson.databind.jsontype.impl.AsPropertyTypeDeserializer)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsDeductionTypeSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsDeductionTypeSerializer.eea
index 16031cac9e..b6a7555c2b 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsDeductionTypeSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsDeductionTypeSerializer.eea
@@ -12,7 +12,7 @@ getTypeInclusion
  ()Lcom/fasterxml/jackson/annotation/JsonTypeInfo$As;
 writeTypePrefix
  (Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/core/type/WritableTypeId;)Lcom/fasterxml/jackson/core/type/WritableTypeId;
- (Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/core/type/WritableTypeId;)Lcom/fasterxml/jackson/core/type/WritableTypeId;
+ (Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/core/type/WritableTypeId;)L0com/fasterxml/jackson/core/type/WritableTypeId; # @Inherited(com.fasterxml.jackson.databind.jsontype.impl.TypeSerializerBase)
 writeTypeSuffix
  (Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/core/type/WritableTypeId;)Lcom/fasterxml/jackson/core/type/WritableTypeId;
  (Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/core/type/WritableTypeId;)Lcom/fasterxml/jackson/core/type/WritableTypeId;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsExternalTypeDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsExternalTypeDeserializer.eea
index 0b4e82bf1f..fc8b08823b 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsExternalTypeDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsExternalTypeDeserializer.eea
@@ -8,7 +8,7 @@ class com/fasterxml/jackson/databind/jsontype/impl/AsExternalTypeDeserializer
  (Lcom/fasterxml/jackson/databind/jsontype/impl/AsExternalTypeDeserializer;Lcom/fasterxml/jackson/databind/BeanProperty;)V
 forProperty
  (Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;
- (Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;
+ (Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/jsontype/TypeDeserializer; # @Inherited(com.fasterxml.jackson.databind.jsontype.impl.AsArrayTypeDeserializer)
 getTypeInclusion
  ()Lcom/fasterxml/jackson/annotation/JsonTypeInfo$As;
  ()Lcom/fasterxml/jackson/annotation/JsonTypeInfo$As;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsExternalTypeSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsExternalTypeSerializer.eea
index 102a0b3750..eb2601a96a 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsExternalTypeSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsExternalTypeSerializer.eea
@@ -30,7 +30,7 @@ forProperty
  (Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/jsontype/impl/AsExternalTypeSerializer;
 getPropertyName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(com.fasterxml.jackson.databind.jsontype.impl.TypeSerializerBase)
 getTypeInclusion
  ()Lcom/fasterxml/jackson/annotation/JsonTypeInfo$As;
  ()Lcom/fasterxml/jackson/annotation/JsonTypeInfo$As;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsPropertyTypeDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsPropertyTypeDeserializer.eea
index d05ee8e95f..131ab77264 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsPropertyTypeDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsPropertyTypeDeserializer.eea
@@ -27,7 +27,7 @@ _deserializeTypedUsingDefaultImpl
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/util/TokenBuffer;)Ljava/lang/Object;
 _deserializeTypedUsingDefaultImpl
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/util/TokenBuffer;Ljava/lang/String;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/util/TokenBuffer;Ljava/lang/String;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/util/TokenBuffer;Ljava/lang/String;)L0java/lang/Object;
 deserializeTypedFromAny
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
@@ -36,7 +36,7 @@ deserializeTypedFromObject
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
 forProperty
  (Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;
- (Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;
+ (Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/jsontype/TypeDeserializer; # @Inherited(com.fasterxml.jackson.databind.jsontype.impl.AsArrayTypeDeserializer)
 getTypeInclusion
  ()Lcom/fasterxml/jackson/annotation/JsonTypeInfo$As;
  ()Lcom/fasterxml/jackson/annotation/JsonTypeInfo$As;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsPropertyTypeSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsPropertyTypeSerializer.eea
index 25da82367f..f3a86e10e3 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsPropertyTypeSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsPropertyTypeSerializer.eea
@@ -12,7 +12,7 @@ forProperty
  (Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/jsontype/impl/AsPropertyTypeSerializer;
 getPropertyName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(com.fasterxml.jackson.databind.jsontype.impl.TypeSerializerBase)
 getTypeInclusion
  ()Lcom/fasterxml/jackson/annotation/JsonTypeInfo$As;
  ()Lcom/fasterxml/jackson/annotation/JsonTypeInfo$As;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsWrapperTypeDeserializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsWrapperTypeDeserializer.eea
index 84c1df275c..c4cee24066 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsWrapperTypeDeserializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsWrapperTypeDeserializer.eea
@@ -23,7 +23,7 @@ deserializeTypedFromScalar
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
 forProperty
  (Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;
- (Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;
+ (Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/jsontype/TypeDeserializer;
 getTypeInclusion
  ()Lcom/fasterxml/jackson/annotation/JsonTypeInfo$As;
  ()Lcom/fasterxml/jackson/annotation/JsonTypeInfo$As;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsWrapperTypeSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsWrapperTypeSerializer.eea
index acb070efca..fe1e6a1020 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsWrapperTypeSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/AsWrapperTypeSerializer.eea
@@ -11,7 +11,7 @@ _writeTypeId
  (Lcom/fasterxml/jackson/core/JsonGenerator;Ljava/lang/String;)V
 forProperty
  (Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/jsontype/impl/AsWrapperTypeSerializer;
- (Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/jsontype/impl/AsWrapperTypeSerializer;
+ (Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/jsontype/impl/AsWrapperTypeSerializer;
 getTypeInclusion
  ()Lcom/fasterxml/jackson/annotation/JsonTypeInfo$As;
  ()Lcom/fasterxml/jackson/annotation/JsonTypeInfo$As;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/ClassNameIdResolver.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/ClassNameIdResolver.eea
index 82aae4a1d2..93f2c20f74 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/ClassNameIdResolver.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/ClassNameIdResolver.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/jsontype/impl/ClassNameIdResolver
 
 construct
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;)Lcom/fasterxml/jackson/databind/jsontype/impl/ClassNameIdResolver;
- (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;)Lcom/fasterxml/jackson/databind/jsontype/impl/ClassNameIdResolver;
+ (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;)L1com/fasterxml/jackson/databind/jsontype/impl/ClassNameIdResolver;
 
 _subTypeValidator
  Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;
@@ -22,7 +22,7 @@ _typeFromId
  (Ljava/lang/String;Lcom/fasterxml/jackson/databind/DatabindContext;)Lcom/fasterxml/jackson/databind/JavaType;
 getDescForKnownTypeIds
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(com.fasterxml.jackson.databind.jsontype.impl.TypeIdResolverBase)
 getMechanism
  ()Lcom/fasterxml/jackson/annotation/JsonTypeInfo$Id;
  ()Lcom/fasterxml/jackson/annotation/JsonTypeInfo$Id;
@@ -37,4 +37,4 @@ registerSubtype
  (Ljava/lang/Class<*>;Ljava/lang/String;)V
 typeFromId
  (Lcom/fasterxml/jackson/databind/DatabindContext;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/DatabindContext;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/DatabindContext;Ljava/lang/String;)L1com/fasterxml/jackson/databind/JavaType; # @Inherited(com.fasterxml.jackson.databind.jsontype.impl.TypeIdResolverBase)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/MinimalClassNameIdResolver.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/MinimalClassNameIdResolver.eea
index 2ad4c561be..8e789aec0a 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/MinimalClassNameIdResolver.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/MinimalClassNameIdResolver.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/jsontype/impl/MinimalClassNameIdResolver
 
 construct
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;)Lcom/fasterxml/jackson/databind/jsontype/impl/MinimalClassNameIdResolver;
- (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;)Lcom/fasterxml/jackson/databind/jsontype/impl/MinimalClassNameIdResolver;
+ (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;)L1com/fasterxml/jackson/databind/jsontype/impl/MinimalClassNameIdResolver;
 
 _basePackageName
  Ljava/lang/String;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/SimpleNameIdResolver.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/SimpleNameIdResolver.eea
index 3c805b0086..2878dec251 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/SimpleNameIdResolver.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/SimpleNameIdResolver.eea
@@ -5,7 +5,7 @@ _defaultTypeId
  (Ljava/lang/Class<*>;)Ljava/lang/String;
 construct
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/JavaType;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;ZZ)Lcom/fasterxml/jackson/databind/jsontype/impl/SimpleNameIdResolver;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/JavaType;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;ZZ)Lcom/fasterxml/jackson/databind/jsontype/impl/SimpleNameIdResolver;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/JavaType;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;ZZ)L1com/fasterxml/jackson/databind/jsontype/impl/SimpleNameIdResolver;
 
 _config
  Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;
@@ -25,7 +25,7 @@ _typeFromId
  (Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JavaType;
 getDescForKnownTypeIds
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(com.fasterxml.jackson.databind.jsontype.impl.TypeIdResolverBase)
 getMechanism
  ()Lcom/fasterxml/jackson/annotation/JsonTypeInfo$Id;
  ()Lcom/fasterxml/jackson/annotation/JsonTypeInfo$Id;
@@ -43,4 +43,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 typeFromId
  (Lcom/fasterxml/jackson/databind/DatabindContext;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/DatabindContext;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/DatabindContext;Ljava/lang/String;)L1com/fasterxml/jackson/databind/JavaType; # @Inherited(com.fasterxml.jackson.databind.jsontype.impl.TypeIdResolverBase)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/StdSubtypeResolver.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/StdSubtypeResolver.eea
index 6f421fb131..628044a038 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/StdSubtypeResolver.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/StdSubtypeResolver.eea
@@ -15,13 +15,13 @@ _collectAndResolveByTypeId
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/jsontype/NamedType;Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Ljava/util/Set<Ljava/lang/Class<*>;>;Ljava/util/Map<Ljava/lang/String;Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;)V
 _combineNamedAndUnnamed
  (Ljava/lang/Class<*>;Ljava/util/Set<Ljava/lang/Class<*>;>;Ljava/util/Map<Ljava/lang/String;Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;)Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;
- (Ljava/lang/Class<*>;Ljava/util/Set<Ljava/lang/Class<*>;>;Ljava/util/Map<Ljava/lang/String;Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;)Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;
+ (Ljava/lang/Class<*>;Ljava/util/Set<Ljava/lang/Class<*>;>;Ljava/util/Map<Ljava/lang/String;Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;)L1java/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;
 collectAndResolveSubtypesByClass
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)L1java/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;
 collectAndResolveSubtypesByClass
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;)Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;)Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;)L1java/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;
 collectAndResolveSubtypesByTypeId
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;
@@ -30,7 +30,7 @@ collectAndResolveSubtypesByTypeId
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/JavaType;)Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;
 copy
  ()Lcom/fasterxml/jackson/databind/jsontype/SubtypeResolver;
- ()Lcom/fasterxml/jackson/databind/jsontype/SubtypeResolver;
+ ()L1com/fasterxml/jackson/databind/jsontype/SubtypeResolver;
 registerSubtypes
  (Ljava/util/Collection<Ljava/lang/Class<*>;>;)V
  (Ljava/util/Collection<Ljava/lang/Class<*>;>;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/StdTypeResolverBuilder.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/StdTypeResolverBuilder.eea
index a6fba185cf..68d18148e6 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/StdTypeResolverBuilder.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/StdTypeResolverBuilder.eea
@@ -50,16 +50,16 @@ allowPrimitiveTypes
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/JavaType;)Z
 buildTypeDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;)Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;)Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;)L0com/fasterxml/jackson/databind/jsontype/TypeDeserializer;
 buildTypeSerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;)Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;)Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;)L0com/fasterxml/jackson/databind/jsontype/TypeSerializer;
 defaultImpl
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/jsontype/impl/StdTypeResolverBuilder;
  (Ljava/lang/Class<*>;)L1com/fasterxml/jackson/databind/jsontype/impl/StdTypeResolverBuilder;
 defineDefaultImpl
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/JavaType;
 getDefaultImpl
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
@@ -68,7 +68,7 @@ getTypeProperty
  ()Ljava/lang/String;
 idResolver
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;ZZ)Lcom/fasterxml/jackson/databind/jsontype/TypeIdResolver;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;ZZ)Lcom/fasterxml/jackson/databind/jsontype/TypeIdResolver;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;ZZ)L0com/fasterxml/jackson/databind/jsontype/TypeIdResolver;
 inclusion
  (Lcom/fasterxml/jackson/annotation/JsonTypeInfo$As;)Lcom/fasterxml/jackson/databind/jsontype/impl/StdTypeResolverBuilder;
  (Lcom/fasterxml/jackson/annotation/JsonTypeInfo$As;)L1com/fasterxml/jackson/databind/jsontype/impl/StdTypeResolverBuilder;
@@ -80,7 +80,7 @@ init
  (Lcom/fasterxml/jackson/annotation/JsonTypeInfo$Value;Lcom/fasterxml/jackson/databind/jsontype/TypeIdResolver;)L1com/fasterxml/jackson/databind/jsontype/impl/StdTypeResolverBuilder;
 reportInvalidBaseType
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;)Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;)Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;)L1com/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;
 subTypeValidator
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;)Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;)Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/TypeDeserializerBase.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/TypeDeserializerBase.eea
index cadc5c5437..f25155669e 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/TypeDeserializerBase.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/TypeDeserializerBase.eea
@@ -36,7 +36,7 @@ _deserializeWithNativeTypeId
  (Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
 _findDefaultImplDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/DeserializationContext;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/DeserializationContext;)L0com/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
 _findDeserializer
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
  (Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JsonDeserializer<Ljava/lang/Object;>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/TypeIdResolverBase.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/TypeIdResolverBase.eea
index a3de049625..f1b35f21e5 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/TypeIdResolverBase.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/TypeIdResolverBase.eea
@@ -12,7 +12,7 @@ _typeFactory
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/type/TypeFactory;)V
 getDescForKnownTypeIds
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 idFromBaseType
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -21,4 +21,4 @@ init
  (Lcom/fasterxml/jackson/databind/JavaType;)V
 typeFromId
  (Lcom/fasterxml/jackson/databind/DatabindContext;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/DatabindContext;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/DatabindContext;Ljava/lang/String;)L1com/fasterxml/jackson/databind/JavaType;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/TypeNameIdResolver.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/TypeNameIdResolver.eea
index ca1edce18d..81a2747242 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/TypeNameIdResolver.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/TypeNameIdResolver.eea
@@ -5,7 +5,7 @@ _defaultTypeId
  (Ljava/lang/Class<*>;)Ljava/lang/String;
 construct
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/JavaType;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;ZZ)Lcom/fasterxml/jackson/databind/jsontype/impl/TypeNameIdResolver;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/JavaType;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;ZZ)Lcom/fasterxml/jackson/databind/jsontype/impl/TypeNameIdResolver;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/JavaType;Ljava/util/Collection<Lcom/fasterxml/jackson/databind/jsontype/NamedType;>;ZZ)L1com/fasterxml/jackson/databind/jsontype/impl/TypeNameIdResolver;
 
 _config
  Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;
@@ -25,7 +25,7 @@ _typeFromId
  (Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JavaType;
 getDescForKnownTypeIds
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(com.fasterxml.jackson.databind.jsontype.impl.TypeIdResolverBase)
 getMechanism
  ()Lcom/fasterxml/jackson/annotation/JsonTypeInfo$Id;
  ()Lcom/fasterxml/jackson/annotation/JsonTypeInfo$Id;
@@ -43,4 +43,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 typeFromId
  (Lcom/fasterxml/jackson/databind/DatabindContext;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/DatabindContext;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/DatabindContext;Ljava/lang/String;)L1com/fasterxml/jackson/databind/JavaType; # @Inherited(com.fasterxml.jackson.databind.jsontype.impl.TypeIdResolverBase)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/TypeSerializerBase.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/TypeSerializerBase.eea
index 98f27d763f..cf21c31c7e 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/TypeSerializerBase.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/jsontype/impl/TypeSerializerBase.eea
@@ -15,7 +15,7 @@ _generateTypeId
  (Lcom/fasterxml/jackson/core/type/WritableTypeId;)V
 getPropertyName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getTypeIdResolver
  ()Lcom/fasterxml/jackson/databind/jsontype/TypeIdResolver;
  ()Lcom/fasterxml/jackson/databind/jsontype/TypeIdResolver;
@@ -33,7 +33,7 @@ idFromValueAndType
  (Ljava/lang/Object;Ljava/lang/Class<*>;)Ljava/lang/String;
 writeTypePrefix
  (Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/core/type/WritableTypeId;)Lcom/fasterxml/jackson/core/type/WritableTypeId;
- (Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/core/type/WritableTypeId;)Lcom/fasterxml/jackson/core/type/WritableTypeId;
+ (Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/core/type/WritableTypeId;)L0com/fasterxml/jackson/core/type/WritableTypeId;
 writeTypeSuffix
  (Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/core/type/WritableTypeId;)Lcom/fasterxml/jackson/core/type/WritableTypeId;
  (Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/core/type/WritableTypeId;)Lcom/fasterxml/jackson/core/type/WritableTypeId;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/module/SimpleAbstractTypeResolver.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/module/SimpleAbstractTypeResolver.eea
index 96cf1d860b..49faced5a8 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/module/SimpleAbstractTypeResolver.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/module/SimpleAbstractTypeResolver.eea
@@ -9,10 +9,10 @@ addMapping
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Class<+TT;>;)Lcom/fasterxml/jackson/databind/module/SimpleAbstractTypeResolver;
 findTypeMapping
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/JavaType; # @Inherited(com.fasterxml.jackson.databind.AbstractTypeResolver)
 resolveAbstractType
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)L0com/fasterxml/jackson/databind/JavaType; # @Inherited(com.fasterxml.jackson.databind.AbstractTypeResolver)
 resolveAbstractType
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/JavaType; # @Inherited(com.fasterxml.jackson.databind.AbstractTypeResolver)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/module/SimpleDeserializers.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/module/SimpleDeserializers.eea
index 17d1515a19..30694de8d6 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/module/SimpleDeserializers.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/module/SimpleDeserializers.eea
@@ -15,31 +15,31 @@ addDeserializers
  (Ljava/util/Map<Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;>;)V
 findArrayDeserializer
  (Lcom/fasterxml/jackson/databind/type/ArrayType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/type/ArrayType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/type/ArrayType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.Deserializers$Base)
 findBeanDeserializer
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.Deserializers$Base)
 findCollectionDeserializer
  (Lcom/fasterxml/jackson/databind/type/CollectionType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/type/CollectionType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/type/CollectionType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.Deserializers$Base)
 findCollectionLikeDeserializer
  (Lcom/fasterxml/jackson/databind/type/CollectionLikeType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/type/CollectionLikeType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/type/CollectionLikeType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.Deserializers$Base)
 findEnumDeserializer
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.Deserializers$Base)
 findMapDeserializer
  (Lcom/fasterxml/jackson/databind/type/MapType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/type/MapType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/type/MapType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.Deserializers$Base)
 findMapLikeDeserializer
  (Lcom/fasterxml/jackson/databind/type/MapLikeType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/type/MapLikeType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/type/MapLikeType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/KeyDeserializer;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.Deserializers$Base)
 findReferenceDeserializer
  (Lcom/fasterxml/jackson/databind/type/ReferenceType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Lcom/fasterxml/jackson/databind/type/ReferenceType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Lcom/fasterxml/jackson/databind/type/ReferenceType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.Deserializers$Base)
 findTreeNodeDeserializer
  (Ljava/lang/Class<+Lcom/fasterxml/jackson/databind/JsonNode;>;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
- (Ljava/lang/Class<+Lcom/fasterxml/jackson/databind/JsonNode;>;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonDeserializer<*>;
+ (Ljava/lang/Class<+Lcom/fasterxml/jackson/databind/JsonNode;>;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)L0com/fasterxml/jackson/databind/JsonDeserializer<*>; # @Inherited(com.fasterxml.jackson.databind.deser.Deserializers$Base)
 hasDeserializerFor
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Ljava/lang/Class<*>;)Z
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/module/SimpleKeyDeserializers.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/module/SimpleKeyDeserializers.eea
index 1396df29c2..bab95f66b0 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/module/SimpleKeyDeserializers.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/module/SimpleKeyDeserializers.eea
@@ -9,4 +9,4 @@ addDeserializer
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/KeyDeserializer;)Lcom/fasterxml/jackson/databind/module/SimpleKeyDeserializers;
 findKeyDeserializer
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
- (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/KeyDeserializer;
+ (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)L0com/fasterxml/jackson/databind/KeyDeserializer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/module/SimpleSerializers.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/module/SimpleSerializers.eea
index 68ec69b4d7..832c2c3856 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/module/SimpleSerializers.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/module/SimpleSerializers.eea
@@ -15,7 +15,7 @@ _addSerializer
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;)V
 _findInterfaceMapping
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/ClassKey;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/ClassKey;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/ClassKey;)L0com/fasterxml/jackson/databind/JsonSerializer<*>;
 addSerializer
  (Lcom/fasterxml/jackson/databind/JsonSerializer<*>;)V
  (Lcom/fasterxml/jackson/databind/JsonSerializer<*>;)V
@@ -27,19 +27,19 @@ addSerializers
  (Ljava/util/List<Lcom/fasterxml/jackson/databind/JsonSerializer<*>;>;)V
 findArraySerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/ArrayType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/ArrayType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/ArrayType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)L0com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.Serializers$Base)
 findCollectionLikeSerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/CollectionLikeType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/CollectionLikeType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/CollectionLikeType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)L0com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.Serializers$Base)
 findCollectionSerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/CollectionType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/CollectionType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/CollectionType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)L0com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.Serializers$Base)
 findMapLikeSerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/MapLikeType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/MapLikeType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/MapLikeType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)L0com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.Serializers$Base)
 findMapSerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/MapType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/MapType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/MapType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)L0com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.Serializers$Base)
 findSerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)L0com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.Serializers$Base)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/ArrayNode.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/ArrayNode.eea
index 4261309dcd..6c231cfa9d 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/ArrayNode.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/ArrayNode.eea
@@ -30,16 +30,16 @@ _set
  (ILcom/fasterxml/jackson/databind/JsonNode;)Lcom/fasterxml/jackson/databind/node/ArrayNode;
 _withArray
  (Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/databind/JsonNode$OverwriteMode;Z)Lcom/fasterxml/jackson/databind/node/ArrayNode;
- (Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/databind/JsonNode$OverwriteMode;Z)Lcom/fasterxml/jackson/databind/node/ArrayNode;
+ (Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/databind/JsonNode$OverwriteMode;Z)L0com/fasterxml/jackson/databind/node/ArrayNode; # @Inherited(com.fasterxml.jackson.databind.node.BaseJsonNode)
 _withArrayAddTailElement
  (Lcom/fasterxml/jackson/core/JsonPointer;Z)Lcom/fasterxml/jackson/databind/node/ArrayNode;
- (Lcom/fasterxml/jackson/core/JsonPointer;Z)Lcom/fasterxml/jackson/databind/node/ArrayNode;
+ (Lcom/fasterxml/jackson/core/JsonPointer;Z)L0com/fasterxml/jackson/databind/node/ArrayNode;
 _withObject
  (Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/databind/JsonNode$OverwriteMode;Z)Lcom/fasterxml/jackson/databind/node/ObjectNode;
- (Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/databind/JsonNode$OverwriteMode;Z)Lcom/fasterxml/jackson/databind/node/ObjectNode;
+ (Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/databind/JsonNode$OverwriteMode;Z)L0com/fasterxml/jackson/databind/node/ObjectNode; # @Inherited(com.fasterxml.jackson.databind.node.ContainerNode)
 _withObjectAddTailElement
  (Lcom/fasterxml/jackson/core/JsonPointer;Z)Lcom/fasterxml/jackson/databind/node/ObjectNode;
- (Lcom/fasterxml/jackson/core/JsonPointer;Z)Lcom/fasterxml/jackson/databind/node/ObjectNode;
+ (Lcom/fasterxml/jackson/core/JsonPointer;Z)L0com/fasterxml/jackson/databind/node/ObjectNode;
 _withXxxSetArrayElement
  (ILcom/fasterxml/jackson/databind/JsonNode;)V
  (ILcom/fasterxml/jackson/databind/JsonNode;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/BaseJsonNode.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/BaseJsonNode.eea
index 2f024f7203..bcd5c599b2 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/BaseJsonNode.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/BaseJsonNode.eea
@@ -5,19 +5,19 @@ _bigIntFromBigDec
  (Ljava/math/BigDecimal;)Ljava/math/BigInteger;
 _jsonPointerIfValid
  (Ljava/lang/String;)Lcom/fasterxml/jackson/core/JsonPointer;
- (Ljava/lang/String;)Lcom/fasterxml/jackson/core/JsonPointer;
+ (Ljava/lang/String;)L0com/fasterxml/jackson/core/JsonPointer;
 _reportWrongNodeOperation
  <T:Ljava/lang/Object;>(Ljava/lang/String;[Ljava/lang/Object;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/String;[Ljava/lang/Object;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/String;[Ljava/lang/Object;)T1T;
 _reportWrongNodeType
  <T:Ljava/lang/Object;>(Ljava/lang/String;[Ljava/lang/Object;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/String;[Ljava/lang/Object;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/String;[Ljava/lang/Object;)T1T;
 _withArray
  (Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/databind/JsonNode$OverwriteMode;Z)Lcom/fasterxml/jackson/databind/node/ArrayNode;
- (Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/databind/JsonNode$OverwriteMode;Z)Lcom/fasterxml/jackson/databind/node/ArrayNode;
+ (Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/databind/JsonNode$OverwriteMode;Z)L0com/fasterxml/jackson/databind/node/ArrayNode;
 _withObject
  (Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/databind/JsonNode$OverwriteMode;Z)Lcom/fasterxml/jackson/databind/node/ObjectNode;
- (Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/databind/JsonNode$OverwriteMode;Z)Lcom/fasterxml/jackson/databind/node/ObjectNode;
+ (Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/databind/JsonNode$OverwriteMode;Z)L0com/fasterxml/jackson/databind/node/ObjectNode;
 _withXxxMayReplace
  (Lcom/fasterxml/jackson/databind/JsonNode;Lcom/fasterxml/jackson/databind/JsonNode$OverwriteMode;)Z
  (Lcom/fasterxml/jackson/databind/JsonNode;Lcom/fasterxml/jackson/databind/JsonNode$OverwriteMode;)Z
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/ContainerNode.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/ContainerNode.eea
index 0fbc50d770..4a455d40dc 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/ContainerNode.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/ContainerNode.eea
@@ -11,7 +11,7 @@ _nodeFactory
  (Lcom/fasterxml/jackson/databind/node/JsonNodeFactory;)V
 _withObject
  (Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/databind/JsonNode$OverwriteMode;Z)Lcom/fasterxml/jackson/databind/node/ObjectNode;
- (Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/databind/JsonNode$OverwriteMode;Z)Lcom/fasterxml/jackson/databind/node/ObjectNode;
+ (Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/databind/JsonNode$OverwriteMode;Z)L0com/fasterxml/jackson/databind/node/ObjectNode; # @Inherited(com.fasterxml.jackson.databind.node.BaseJsonNode)
 arrayNode
  ()Lcom/fasterxml/jackson/databind/node/ArrayNode;
  ()L1com/fasterxml/jackson/databind/node/ArrayNode;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/JsonNodeFactory.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/JsonNodeFactory.eea
index 410633c16e..13504ab478 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/JsonNodeFactory.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/JsonNodeFactory.eea
@@ -6,14 +6,14 @@ instance
 
 withExactBigDecimals
  (Z)Lcom/fasterxml/jackson/databind/node/JsonNodeFactory;
- (Z)Lcom/fasterxml/jackson/databind/node/JsonNodeFactory;
+ (Z)L1com/fasterxml/jackson/databind/node/JsonNodeFactory;
 
 arrayNode
  ()Lcom/fasterxml/jackson/databind/node/ArrayNode;
- ()Lcom/fasterxml/jackson/databind/node/ArrayNode;
+ ()L1com/fasterxml/jackson/databind/node/ArrayNode;
 arrayNode
  (I)Lcom/fasterxml/jackson/databind/node/ArrayNode;
- (I)Lcom/fasterxml/jackson/databind/node/ArrayNode;
+ (I)L1com/fasterxml/jackson/databind/node/ArrayNode;
 binaryNode
  ([B)Lcom/fasterxml/jackson/databind/node/BinaryNode;
  ([B)Lcom/fasterxml/jackson/databind/node/BinaryNode;
@@ -73,13 +73,13 @@ numberNode
  (S)Lcom/fasterxml/jackson/databind/node/NumericNode;
 objectNode
  ()Lcom/fasterxml/jackson/databind/node/ObjectNode;
- ()Lcom/fasterxml/jackson/databind/node/ObjectNode;
+ ()L1com/fasterxml/jackson/databind/node/ObjectNode;
 pojoNode
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/node/ValueNode;
- (Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/node/ValueNode;
+ (Ljava/lang/Object;)L1com/fasterxml/jackson/databind/node/ValueNode;
 rawValueNode
  (Lcom/fasterxml/jackson/databind/util/RawValue;)Lcom/fasterxml/jackson/databind/node/ValueNode;
- (Lcom/fasterxml/jackson/databind/util/RawValue;)Lcom/fasterxml/jackson/databind/node/ValueNode;
+ (Lcom/fasterxml/jackson/databind/util/RawValue;)L1com/fasterxml/jackson/databind/node/ValueNode;
 textNode
  (Ljava/lang/String;)Lcom/fasterxml/jackson/databind/node/TextNode;
  (Ljava/lang/String;)Lcom/fasterxml/jackson/databind/node/TextNode;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/NodeCursor$ArrayCursor.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/NodeCursor$ArrayCursor.eea
index 03fe523c15..848a3335dd 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/NodeCursor$ArrayCursor.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/NodeCursor$ArrayCursor.eea
@@ -18,7 +18,7 @@ nextToken
  ()Lcom/fasterxml/jackson/core/JsonToken;
 startArray
  ()Lcom/fasterxml/jackson/databind/node/NodeCursor;
- ()Lcom/fasterxml/jackson/databind/node/NodeCursor;
+ ()L1com/fasterxml/jackson/databind/node/NodeCursor;
 startObject
  ()Lcom/fasterxml/jackson/databind/node/NodeCursor;
- ()Lcom/fasterxml/jackson/databind/node/NodeCursor;
+ ()L1com/fasterxml/jackson/databind/node/NodeCursor;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/NodeCursor$ObjectCursor.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/NodeCursor$ObjectCursor.eea
index fbe9dcf933..2c64df4884 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/NodeCursor$ObjectCursor.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/NodeCursor$ObjectCursor.eea
@@ -18,7 +18,7 @@ nextToken
  ()Lcom/fasterxml/jackson/core/JsonToken;
 startArray
  ()Lcom/fasterxml/jackson/databind/node/NodeCursor;
- ()Lcom/fasterxml/jackson/databind/node/NodeCursor;
+ ()L1com/fasterxml/jackson/databind/node/NodeCursor;
 startObject
  ()Lcom/fasterxml/jackson/databind/node/NodeCursor;
- ()Lcom/fasterxml/jackson/databind/node/NodeCursor;
+ ()L1com/fasterxml/jackson/databind/node/NodeCursor;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/NodeCursor$RootCursor.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/NodeCursor$RootCursor.eea
index b57c3d06bc..876493c78d 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/NodeCursor$RootCursor.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/NodeCursor$RootCursor.eea
@@ -9,16 +9,16 @@ _node
  (Lcom/fasterxml/jackson/databind/JsonNode;Lcom/fasterxml/jackson/databind/node/NodeCursor;)V
 currentNode
  ()Lcom/fasterxml/jackson/databind/JsonNode;
- ()Lcom/fasterxml/jackson/databind/JsonNode;
+ ()L0com/fasterxml/jackson/databind/JsonNode;
 nextToken
  ()Lcom/fasterxml/jackson/core/JsonToken;
- ()Lcom/fasterxml/jackson/core/JsonToken;
+ ()L0com/fasterxml/jackson/core/JsonToken;
 overrideCurrentName
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
 startArray
  ()Lcom/fasterxml/jackson/databind/node/NodeCursor;
- ()Lcom/fasterxml/jackson/databind/node/NodeCursor;
+ ()L1com/fasterxml/jackson/databind/node/NodeCursor;
 startObject
  ()Lcom/fasterxml/jackson/databind/node/NodeCursor;
- ()Lcom/fasterxml/jackson/databind/node/NodeCursor;
+ ()L1com/fasterxml/jackson/databind/node/NodeCursor;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/ObjectNode.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/ObjectNode.eea
index a6aef4908d..a80ac40710 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/ObjectNode.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/ObjectNode.eea
@@ -28,13 +28,13 @@ _put
  (Ljava/lang/String;Lcom/fasterxml/jackson/databind/JsonNode;)Lcom/fasterxml/jackson/databind/node/ObjectNode;
 _withArray
  (Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/databind/JsonNode$OverwriteMode;Z)Lcom/fasterxml/jackson/databind/node/ArrayNode;
- (Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/databind/JsonNode$OverwriteMode;Z)Lcom/fasterxml/jackson/databind/node/ArrayNode;
+ (Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/databind/JsonNode$OverwriteMode;Z)L0com/fasterxml/jackson/databind/node/ArrayNode; # @Inherited(com.fasterxml.jackson.databind.node.BaseJsonNode)
 _withArrayAddTailProperty
  (Lcom/fasterxml/jackson/core/JsonPointer;Z)Lcom/fasterxml/jackson/databind/node/ArrayNode;
  (Lcom/fasterxml/jackson/core/JsonPointer;Z)Lcom/fasterxml/jackson/databind/node/ArrayNode;
 _withObject
  (Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/databind/JsonNode$OverwriteMode;Z)Lcom/fasterxml/jackson/databind/node/ObjectNode;
- (Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/databind/JsonNode$OverwriteMode;Z)Lcom/fasterxml/jackson/databind/node/ObjectNode;
+ (Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/core/JsonPointer;Lcom/fasterxml/jackson/databind/JsonNode$OverwriteMode;Z)L0com/fasterxml/jackson/databind/node/ObjectNode; # @Inherited(com.fasterxml.jackson.databind.node.ContainerNode)
 _withObjectAddTailProperty
  (Lcom/fasterxml/jackson/core/JsonPointer;Z)Lcom/fasterxml/jackson/databind/node/ObjectNode;
  (Lcom/fasterxml/jackson/core/JsonPointer;Z)Lcom/fasterxml/jackson/databind/node/ObjectNode;
@@ -217,13 +217,13 @@ withArray
  (L1java/lang/String;)L1com/fasterxml/jackson/databind/node/ArrayNode;
 withArrayProperty
  (Ljava/lang/String;)Lcom/fasterxml/jackson/databind/node/ArrayNode;
- (L1java/lang/String;)L1com/fasterxml/jackson/databind/node/ArrayNode; # @Inherited(com.fasterxml.jackson.databind.JsonNode)
+ (Ljava/lang/String;)L1com/fasterxml/jackson/databind/node/ArrayNode; # @Inherited(com.fasterxml.jackson.databind.JsonNode)
 withObject
  (Ljava/lang/String;)Lcom/fasterxml/jackson/databind/node/ObjectNode;
  (L1java/lang/String;)L1com/fasterxml/jackson/databind/node/ObjectNode; # @Inherited(com.fasterxml.jackson.databind.JsonNode)
 withObjectProperty
  (Ljava/lang/String;)Lcom/fasterxml/jackson/databind/node/ObjectNode;
- (L1java/lang/String;)L1com/fasterxml/jackson/databind/node/ObjectNode; # @Inherited(com.fasterxml.jackson.databind.JsonNode)
+ (Ljava/lang/String;)L1com/fasterxml/jackson/databind/node/ObjectNode; # @Inherited(com.fasterxml.jackson.databind.JsonNode)
 without
  <T:Lcom/fasterxml/jackson/databind/JsonNode;>(Ljava/lang/String;)TT;
  <T:Lcom/fasterxml/jackson/databind/JsonNode;>(L1java/lang/String;)T1T;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/TreeTraversingParser.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/TreeTraversingParser.eea
index e15f945d94..05a4202b68 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/TreeTraversingParser.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/TreeTraversingParser.eea
@@ -21,7 +21,7 @@ currentName
  ()Ljava/lang/String;
 currentNode
  ()Lcom/fasterxml/jackson/databind/JsonNode;
- ()Lcom/fasterxml/jackson/databind/JsonNode;
+ ()L0com/fasterxml/jackson/databind/JsonNode;
 currentNumericNode
  ()Lcom/fasterxml/jackson/databind/JsonNode;
  ()Lcom/fasterxml/jackson/databind/JsonNode;
@@ -33,7 +33,7 @@ getBigIntegerValue
  ()Ljava/math/BigInteger;
 getBinaryValue
  (Lcom/fasterxml/jackson/core/Base64Variant;)[B
- (Lcom/fasterxml/jackson/core/Base64Variant;)[B
+ (Lcom/fasterxml/jackson/core/Base64Variant;)[0B
 getCodec
  ()Lcom/fasterxml/jackson/core/ObjectCodec;
  ()Lcom/fasterxml/jackson/core/ObjectCodec;
@@ -48,7 +48,7 @@ getDecimalValue
  ()Ljava/math/BigDecimal;
 getEmbeddedObject
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 getNumberType
  ()Lcom/fasterxml/jackson/core/JsonParser$NumberType;
  ()Lcom/fasterxml/jackson/core/JsonParser$NumberType;
@@ -66,7 +66,7 @@ getReadCapabilities
  ()Lcom/fasterxml/jackson/core/util/JacksonFeatureSet<Lcom/fasterxml/jackson/core/StreamReadCapability;>;
 getText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getTextCharacters
  ()[C
  ()[C
@@ -75,7 +75,7 @@ getTokenLocation
  ()Lcom/fasterxml/jackson/core/JsonLocation;
 nextToken
  ()Lcom/fasterxml/jackson/core/JsonToken;
- ()Lcom/fasterxml/jackson/core/JsonToken;
+ ()L0com/fasterxml/jackson/core/JsonToken;
 overrideCurrentName
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/ValueNode.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/ValueNode.eea
index 3df6910f76..7391d6116d 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/ValueNode.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/node/ValueNode.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/node/ValueNode
 
 _at
  (Lcom/fasterxml/jackson/core/JsonPointer;)Lcom/fasterxml/jackson/databind/JsonNode;
- (Lcom/fasterxml/jackson/core/JsonPointer;)Lcom/fasterxml/jackson/databind/JsonNode;
+ (Lcom/fasterxml/jackson/core/JsonPointer;)L0com/fasterxml/jackson/databind/JsonNode;
 asToken
  ()Lcom/fasterxml/jackson/core/JsonToken;
  ()L1com/fasterxml/jackson/core/JsonToken; # @Inherited(com.fasterxml.jackson.databind.node.BaseJsonNode)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/BasicSerializerFactory.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/BasicSerializerFactory.eea
index 75c1de7023..7d1d012e42 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/BasicSerializerFactory.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/BasicSerializerFactory.eea
@@ -19,13 +19,13 @@ _checkMapContentInclusion
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/ser/std/MapSerializer;)Lcom/fasterxml/jackson/databind/ser/std/MapSerializer;
 _findContentSerializer
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
 _findInclusionWithContent
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/JsonInclude$Value;
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/JsonInclude$Value;
 _findKeySerializer
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
 buildArraySerializer
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/type/ArrayType;Lcom/fasterxml/jackson/databind/BeanDescription;ZLcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/type/ArrayType;Lcom/fasterxml/jackson/databind/BeanDescription;ZLcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
@@ -34,52 +34,52 @@ buildAtomicReferenceSerializer
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/type/ReferenceType;Lcom/fasterxml/jackson/databind/BeanDescription;ZLcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
 buildCollectionSerializer
  (Lcom/fasterxml/jackson/databind/JavaType;ZLcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/ser/ContainerSerializer<*>;
- (Lcom/fasterxml/jackson/databind/JavaType;ZLcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/ser/ContainerSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/JavaType;ZLcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)L1com/fasterxml/jackson/databind/ser/ContainerSerializer<*>;
 buildCollectionSerializer
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/type/CollectionType;Lcom/fasterxml/jackson/databind/BeanDescription;ZLcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/type/CollectionType;Lcom/fasterxml/jackson/databind/BeanDescription;ZLcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/type/CollectionType;Lcom/fasterxml/jackson/databind/BeanDescription;ZLcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)L0com/fasterxml/jackson/databind/JsonSerializer<*>;
 buildContainerSerializer
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;Z)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;Z)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;Z)L0com/fasterxml/jackson/databind/JsonSerializer<*>;
 buildEnumSerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)L0com/fasterxml/jackson/databind/JsonSerializer<*>;
 buildEnumSetSerializer
  (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/JsonSerializer<*>;
 buildIndexedListSerializer
  (Lcom/fasterxml/jackson/databind/JavaType;ZLcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/ser/ContainerSerializer<*>;
- (Lcom/fasterxml/jackson/databind/JavaType;ZLcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/ser/ContainerSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/JavaType;ZLcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)L1com/fasterxml/jackson/databind/ser/ContainerSerializer<*>;
 buildIterableSerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;ZLcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;ZLcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;ZLcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/JsonSerializer<*>;
 buildIteratorSerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;ZLcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;ZLcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;ZLcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/JsonSerializer<*>;
 buildMapEntrySerializer
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;ZLcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;ZLcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;ZLcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/JsonSerializer<*>;
 buildMapSerializer
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/type/MapType;Lcom/fasterxml/jackson/databind/BeanDescription;ZLcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/type/MapType;Lcom/fasterxml/jackson/databind/BeanDescription;ZLcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/type/MapType;Lcom/fasterxml/jackson/databind/BeanDescription;ZLcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)L0com/fasterxml/jackson/databind/JsonSerializer<*>;
 createKeySerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)L1com/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>; # @Inherited(com.fasterxml.jackson.databind.ser.SerializerFactory)
 createKeySerializer
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)L1com/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>; # @Inherited(com.fasterxml.jackson.databind.ser.SerializerFactory)
 createSerializer
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>; # @Inherited(com.fasterxml.jackson.databind.ser.SerializerFactory)
 createTypeSerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/jsontype/TypeSerializer; # @Overrides(com.fasterxml.jackson.databind.ser.SerializerFactory)
 customSerializers
  ()Ljava/lang/Iterable<Lcom/fasterxml/jackson/databind/ser/Serializers;>;
  ()Ljava/lang/Iterable<Lcom/fasterxml/jackson/databind/ser/Serializers;>;
 findConverter
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;Ljava/lang/Object;>;
 findConvertingSerializer
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/introspect/Annotated;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/introspect/Annotated;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
@@ -91,22 +91,22 @@ findOptionalStdSerializer
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;Z)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
 findReferenceSerializer
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/type/ReferenceType;Lcom/fasterxml/jackson/databind/BeanDescription;Z)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/type/ReferenceType;Lcom/fasterxml/jackson/databind/BeanDescription;Z)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/type/ReferenceType;Lcom/fasterxml/jackson/databind/BeanDescription;Z)L0com/fasterxml/jackson/databind/JsonSerializer<*>;
 findSerializerByAddonType
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;Z)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;Z)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;Z)L0com/fasterxml/jackson/databind/JsonSerializer<*>;
 findSerializerByAnnotations
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)L0com/fasterxml/jackson/databind/JsonSerializer<*>;
 findSerializerByLookup
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Z)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Z)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
 findSerializerByPrimaryType
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;Z)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;Z)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;Z)L0com/fasterxml/jackson/databind/JsonSerializer<*>;
 findSerializerFromAnnotation
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/introspect/Annotated;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/introspect/Annotated;)L0com/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
 getFactoryConfig
  ()Lcom/fasterxml/jackson/databind/cfg/SerializerFactoryConfig;
  ()Lcom/fasterxml/jackson/databind/cfg/SerializerFactoryConfig;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/BeanPropertyWriter.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/BeanPropertyWriter.eea
index 29dec236b4..ca02e1d259 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/BeanPropertyWriter.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/BeanPropertyWriter.eea
@@ -79,7 +79,7 @@ _handleSelfReference
  (Ljava/lang/Object;Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;)Z
 _new
  (Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;
- (Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;
+ (Lcom/fasterxml/jackson/databind/PropertyName;)L1com/fasterxml/jackson/databind/ser/BeanPropertyWriter;
 assignNullSerializer
  (Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)V
  (Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)V
@@ -109,10 +109,10 @@ getContextAnnotation
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
 getFullName
  ()Lcom/fasterxml/jackson/databind/PropertyName;
- ()Lcom/fasterxml/jackson/databind/PropertyName;
+ ()L1com/fasterxml/jackson/databind/PropertyName;
 getGenericPropertyType
  ()Ljava/lang/reflect/Type;
- ()Ljava/lang/reflect/Type;
+ ()L0java/lang/reflect/Type;
 getInternalSetting
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
@@ -124,7 +124,7 @@ getName
  ()Ljava/lang/String;
 getPropertyType
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L0java/lang/Class<*>;
 getRawSerializationType
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
@@ -178,7 +178,7 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 unwrappingWriter
  (Lcom/fasterxml/jackson/databind/util/NameTransformer;)Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;
- (Lcom/fasterxml/jackson/databind/util/NameTransformer;)Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;
+ (Lcom/fasterxml/jackson/databind/util/NameTransformer;)L1com/fasterxml/jackson/databind/ser/BeanPropertyWriter;
 wouldConflictWithName
  (Lcom/fasterxml/jackson/databind/PropertyName;)Z
  (Lcom/fasterxml/jackson/databind/PropertyName;)Z
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/BeanSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/BeanSerializer.eea
index 65d27e259c..e07f8cb947 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/BeanSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/BeanSerializer.eea
@@ -2,10 +2,10 @@ class com/fasterxml/jackson/databind/ser/BeanSerializer
 
 createDummy
  (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/ser/BeanSerializer;
- (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/ser/BeanSerializer;
+ (Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/ser/BeanSerializer;
 createDummy
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/ser/BeanSerializerBuilder;)Lcom/fasterxml/jackson/databind/ser/BeanSerializer;
- (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/ser/BeanSerializerBuilder;)Lcom/fasterxml/jackson/databind/ser/BeanSerializer;
+ (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/ser/BeanSerializerBuilder;)L1com/fasterxml/jackson/databind/ser/BeanSerializer;
 
 <init>
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/ser/BeanSerializerBuilder;[Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;[Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;)V
@@ -36,19 +36,19 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 unwrappingSerializer
  (Lcom/fasterxml/jackson/databind/util/NameTransformer;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/util/NameTransformer;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/util/NameTransformer;)L1com/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
 withByNameInclusion
  (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
- (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
+ (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)L1com/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
 withFilterId
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
- (Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
+ (Ljava/lang/Object;)L1com/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
 withIgnoredProperties
  (Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Ljava/util/Set<Ljava/lang/String;>;)L1com/fasterxml/jackson/databind/JsonSerializer<*>;
 withObjectIdWriter
  (Lcom/fasterxml/jackson/databind/ser/impl/ObjectIdWriter;)Lcom/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
- (Lcom/fasterxml/jackson/databind/ser/impl/ObjectIdWriter;)Lcom/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
+ (Lcom/fasterxml/jackson/databind/ser/impl/ObjectIdWriter;)L1com/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
 withProperties
  ([Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;[Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;)Lcom/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
- ([Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;[Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;)Lcom/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
+ ([Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;[Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;)L1com/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/BeanSerializerBuilder.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/BeanSerializerBuilder.eea
index 249af8bc5d..626358bd82 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/BeanSerializerBuilder.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/BeanSerializerBuilder.eea
@@ -36,7 +36,7 @@ build
  ()L1com/fasterxml/jackson/databind/JsonSerializer<*>;
 createDummy
  ()Lcom/fasterxml/jackson/databind/ser/BeanSerializer;
- ()Lcom/fasterxml/jackson/databind/ser/BeanSerializer;
+ ()L1com/fasterxml/jackson/databind/ser/BeanSerializer;
 getAnyGetter
  ()Lcom/fasterxml/jackson/databind/ser/AnyGetterWriter;
  ()Lcom/fasterxml/jackson/databind/ser/AnyGetterWriter;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/BeanSerializerFactory.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/BeanSerializerFactory.eea
index c01e84f753..8c8d934db1 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/BeanSerializerFactory.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/BeanSerializerFactory.eea
@@ -15,7 +15,7 @@ _createSerializer2
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;Z)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
 _findUnsupportedTypeSerializer
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)L0com/fasterxml/jackson/databind/JsonSerializer<*>;
 _isUnserializableJacksonType
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;)Z
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;)Z
@@ -27,19 +27,19 @@ constructBeanSerializer
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
 constructBeanSerializerBuilder
  (Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/ser/BeanSerializerBuilder;
- (Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/ser/BeanSerializerBuilder;
+ (Lcom/fasterxml/jackson/databind/BeanDescription;)L1com/fasterxml/jackson/databind/ser/BeanSerializerBuilder;
 constructFilteredBeanWriter
  (Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;[Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;
  (Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;[Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;
 constructObjectIdHandler
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanDescription;Ljava/util/List<Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;>;)Lcom/fasterxml/jackson/databind/ser/impl/ObjectIdWriter;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanDescription;Ljava/util/List<Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;>;)Lcom/fasterxml/jackson/databind/ser/impl/ObjectIdWriter;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanDescription;Ljava/util/List<Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;>;)L0com/fasterxml/jackson/databind/ser/impl/ObjectIdWriter;
 constructPropertyBuilder
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/ser/PropertyBuilder;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/ser/PropertyBuilder;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)L1com/fasterxml/jackson/databind/ser/PropertyBuilder;
 createSerializer
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>; # @Inherited(com.fasterxml.jackson.databind.ser.BasicSerializerFactory)
 customSerializers
  ()Ljava/lang/Iterable<Lcom/fasterxml/jackson/databind/ser/Serializers;>;
  ()Ljava/lang/Iterable<Lcom/fasterxml/jackson/databind/ser/Serializers;>;
@@ -51,10 +51,10 @@ filterUnwantedJDKProperties
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Ljava/util/List<Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;>;)Ljava/util/List<Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;>;
 findBeanOrAddOnSerializer
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;Z)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;Z)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;Z)L0com/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
 findBeanProperties
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/ser/BeanSerializerBuilder;)Ljava/util/List<Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/ser/BeanSerializerBuilder;)Ljava/util/List<Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/ser/BeanSerializerBuilder;)L0java/util/List<Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;>;
 findBeanSerializer
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/ContextualSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/ContextualSerializer.eea
index 2bee137b1e..ba8c18609c 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/ContextualSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/ContextualSerializer.eea
@@ -2,4 +2,4 @@ class com/fasterxml/jackson/databind/ser/ContextualSerializer
 
 createContextual
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonSerializer<*>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/DefaultSerializerProvider$Impl.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/DefaultSerializerProvider$Impl.eea
index b5c8db5322..0001449ee4 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/DefaultSerializerProvider$Impl.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/DefaultSerializerProvider$Impl.eea
@@ -11,10 +11,10 @@ class com/fasterxml/jackson/databind/ser/DefaultSerializerProvider$Impl
  (Lcom/fasterxml/jackson/databind/ser/DefaultSerializerProvider$Impl;Lcom/fasterxml/jackson/databind/cfg/CacheProvider;)V
 copy
  ()Lcom/fasterxml/jackson/databind/ser/DefaultSerializerProvider;
- ()Lcom/fasterxml/jackson/databind/ser/DefaultSerializerProvider;
+ ()L1com/fasterxml/jackson/databind/ser/DefaultSerializerProvider; # @Inherited(com.fasterxml.jackson.databind.ser.DefaultSerializerProvider)
 createInstance
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/ser/SerializerFactory;)Lcom/fasterxml/jackson/databind/ser/DefaultSerializerProvider$Impl;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/ser/SerializerFactory;)Lcom/fasterxml/jackson/databind/ser/DefaultSerializerProvider$Impl;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/ser/SerializerFactory;)L1com/fasterxml/jackson/databind/ser/DefaultSerializerProvider$Impl;
 withCaches
  (Lcom/fasterxml/jackson/databind/cfg/CacheProvider;)Lcom/fasterxml/jackson/databind/ser/DefaultSerializerProvider;
- (Lcom/fasterxml/jackson/databind/cfg/CacheProvider;)Lcom/fasterxml/jackson/databind/ser/DefaultSerializerProvider;
+ (Lcom/fasterxml/jackson/databind/cfg/CacheProvider;)L1com/fasterxml/jackson/databind/ser/DefaultSerializerProvider;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/DefaultSerializerProvider.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/DefaultSerializerProvider.eea
index d25cad33bc..278b89af24 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/DefaultSerializerProvider.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/DefaultSerializerProvider.eea
@@ -21,7 +21,7 @@ _seenObjectIds
  (Lcom/fasterxml/jackson/databind/ser/DefaultSerializerProvider;Lcom/fasterxml/jackson/databind/cfg/CacheProvider;)V
 _createObjectIdMap
  ()Ljava/util/Map<Ljava/lang/Object;Lcom/fasterxml/jackson/databind/ser/impl/WritableObjectId;>;
- ()Ljava/util/Map<Ljava/lang/Object;Lcom/fasterxml/jackson/databind/ser/impl/WritableObjectId;>;
+ ()L1java/util/Map<Ljava/lang/Object;Lcom/fasterxml/jackson/databind/ser/impl/WritableObjectId;>;
 _serializeNull
  (Lcom/fasterxml/jackson/core/JsonGenerator;)V
  (Lcom/fasterxml/jackson/core/JsonGenerator;)V
@@ -30,19 +30,19 @@ acceptJsonFormatVisitor
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;)V
 copy
  ()Lcom/fasterxml/jackson/databind/ser/DefaultSerializerProvider;
- ()Lcom/fasterxml/jackson/databind/ser/DefaultSerializerProvider;
+ ()L1com/fasterxml/jackson/databind/ser/DefaultSerializerProvider;
 createInstance
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/ser/SerializerFactory;)Lcom/fasterxml/jackson/databind/ser/DefaultSerializerProvider;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/ser/SerializerFactory;)Lcom/fasterxml/jackson/databind/ser/DefaultSerializerProvider;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/ser/SerializerFactory;)L1com/fasterxml/jackson/databind/ser/DefaultSerializerProvider;
 findObjectId
  (Ljava/lang/Object;Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<*>;)Lcom/fasterxml/jackson/databind/ser/impl/WritableObjectId;
  (Ljava/lang/Object;Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<*>;)Lcom/fasterxml/jackson/databind/ser/impl/WritableObjectId;
 generateJsonSchema
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/jsonschema/JsonSchema;
- (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/jsonschema/JsonSchema;
+ (Ljava/lang/Class<*>;)L1com/fasterxml/jackson/databind/jsonschema/JsonSchema;
 getGenerator
  ()Lcom/fasterxml/jackson/core/JsonGenerator;
- ()Lcom/fasterxml/jackson/core/JsonGenerator;
+ ()L0com/fasterxml/jackson/core/JsonGenerator; # @Inherited(com.fasterxml.jackson.databind.SerializerProvider)
 hasSerializerFor
  (Ljava/lang/Class<*>;Ljava/util/concurrent/atomic/AtomicReference<Ljava/lang/Throwable;>;)Z
  (Ljava/lang/Class<*>;Ljava/util/concurrent/atomic/AtomicReference<Ljava/lang/Throwable;>;)Z
@@ -66,7 +66,7 @@ serializeValue
  (Lcom/fasterxml/jackson/core/JsonGenerator;Ljava/lang/Object;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)V
 serializerInstance
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;Ljava/lang/Object;)L0com/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
 withCaches
  (Lcom/fasterxml/jackson/databind/cfg/CacheProvider;)Lcom/fasterxml/jackson/databind/ser/DefaultSerializerProvider;
  (Lcom/fasterxml/jackson/databind/cfg/CacheProvider;)Lcom/fasterxml/jackson/databind/ser/DefaultSerializerProvider;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/FilterProvider.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/FilterProvider.eea
index 2d03dfa36e..db4f7f4fea 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/FilterProvider.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/FilterProvider.eea
@@ -5,4 +5,4 @@ findFilter
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/ser/BeanPropertyFilter;
 findPropertyFilter
  (Ljava/lang/Object;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/ser/PropertyFilter;
- (Ljava/lang/Object;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/ser/PropertyFilter;
+ (Ljava/lang/Object;Ljava/lang/Object;)L0com/fasterxml/jackson/databind/ser/PropertyFilter;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/PropertyBuilder.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/PropertyBuilder.eea
index 674feaf543..587379488a 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/PropertyBuilder.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/PropertyBuilder.eea
@@ -21,16 +21,16 @@ _defaultInclusion
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;)V
 _constructPropertyWriter
  (Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/util/Annotations;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JavaType;ZLjava/lang/Object;[Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;
- (Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/util/Annotations;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JavaType;ZLjava/lang/Object;[Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;
+ (Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/util/Annotations;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JavaType;ZLjava/lang/Object;[Ljava/lang/Class<*>;)L1com/fasterxml/jackson/databind/ser/BeanPropertyWriter;
 _throwWrapped
  (Ljava/lang/Exception;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Exception;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Exception;Ljava/lang/String;Ljava/lang/Object;)L1java/lang/Object;
 buildWriter
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Z)Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Z)Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;
 findSerializationType
  (Lcom/fasterxml/jackson/databind/introspect/Annotated;ZLcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/introspect/Annotated;ZLcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/introspect/Annotated;ZLcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/JavaType;
 getClassAnnotations
  ()Lcom/fasterxml/jackson/databind/util/Annotations;
  ()Lcom/fasterxml/jackson/databind/util/Annotations;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/SerializerFactory.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/SerializerFactory.eea
index 24ff1b38ed..3ab7d31222 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/SerializerFactory.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/SerializerFactory.eea
@@ -2,16 +2,16 @@ class com/fasterxml/jackson/databind/ser/SerializerFactory
 
 createKeySerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)L1com/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
 createKeySerializer
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)L1com/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
 createSerializer
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
 createTypeSerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/jsontype/TypeSerializer;
 withAdditionalKeySerializers
  (Lcom/fasterxml/jackson/databind/ser/Serializers;)Lcom/fasterxml/jackson/databind/ser/SerializerFactory;
  (Lcom/fasterxml/jackson/databind/ser/Serializers;)Lcom/fasterxml/jackson/databind/ser/SerializerFactory;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/Serializers$Base.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/Serializers$Base.eea
index 603d5419ba..a07e7eb558 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/Serializers$Base.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/Serializers$Base.eea
@@ -2,22 +2,22 @@ class com/fasterxml/jackson/databind/ser/Serializers$Base
 
 findArraySerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/ArrayType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/ArrayType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/ArrayType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)L0com/fasterxml/jackson/databind/JsonSerializer<*>;
 findCollectionLikeSerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/CollectionLikeType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/CollectionLikeType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/CollectionLikeType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)L0com/fasterxml/jackson/databind/JsonSerializer<*>;
 findCollectionSerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/CollectionType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/CollectionType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/CollectionType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)L0com/fasterxml/jackson/databind/JsonSerializer<*>;
 findMapLikeSerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/MapLikeType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/MapLikeType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/MapLikeType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)L0com/fasterxml/jackson/databind/JsonSerializer<*>;
 findMapSerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/MapType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/MapType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/MapType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)L0com/fasterxml/jackson/databind/JsonSerializer<*>;
 findReferenceSerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/ReferenceType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/type/ReferenceType;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
 findSerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/BeanDescription;)L0com/fasterxml/jackson/databind/JsonSerializer<*>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/VirtualBeanPropertyWriter.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/VirtualBeanPropertyWriter.eea
index 0ba08f225f..90224e4038 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/VirtualBeanPropertyWriter.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/VirtualBeanPropertyWriter.eea
@@ -5,7 +5,7 @@ _suppressNulls
  (Lcom/fasterxml/jackson/annotation/JsonInclude$Value;)Z
 _suppressableValue
  (Lcom/fasterxml/jackson/annotation/JsonInclude$Value;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/annotation/JsonInclude$Value;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/annotation/JsonInclude$Value;)L0java/lang/Object;
 
 <init>
  (Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Lcom/fasterxml/jackson/databind/util/Annotations;Lcom/fasterxml/jackson/databind/JavaType;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/AttributePropertyWriter.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/AttributePropertyWriter.eea
index 495db0146c..e33bd3f9f5 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/AttributePropertyWriter.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/AttributePropertyWriter.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/ser/impl/AttributePropertyWriter
 
 construct
  (Ljava/lang/String;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Lcom/fasterxml/jackson/databind/util/Annotations;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/ser/impl/AttributePropertyWriter;
- (Ljava/lang/String;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Lcom/fasterxml/jackson/databind/util/Annotations;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/ser/impl/AttributePropertyWriter;
+ (Ljava/lang/String;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Lcom/fasterxml/jackson/databind/util/Annotations;Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/ser/impl/AttributePropertyWriter;
 
 _attrName
  Ljava/lang/String;
@@ -22,4 +22,4 @@ value
  (Ljava/lang/Object;Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/databind/SerializerProvider;)Ljava/lang/Object;
 withConfig
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/ser/VirtualBeanPropertyWriter;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/ser/VirtualBeanPropertyWriter;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/ser/VirtualBeanPropertyWriter;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/BeanAsArraySerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/BeanAsArraySerializer.eea
index 6ecb5b5ee0..8de8933afc 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/BeanAsArraySerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/BeanAsArraySerializer.eea
@@ -36,10 +36,10 @@ unwrappingSerializer
  (Lcom/fasterxml/jackson/databind/util/NameTransformer;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
 withByNameInclusion
  (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/ser/impl/BeanAsArraySerializer;
- (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/ser/impl/BeanAsArraySerializer;
+ (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)L1com/fasterxml/jackson/databind/ser/impl/BeanAsArraySerializer;
 withFilterId
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
- (Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
+ (Ljava/lang/Object;)L1com/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
 withObjectIdWriter
  (Lcom/fasterxml/jackson/databind/ser/impl/ObjectIdWriter;)Lcom/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
  (Lcom/fasterxml/jackson/databind/ser/impl/ObjectIdWriter;)Lcom/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/IndexedListSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/IndexedListSerializer.eea
index a9845d9c14..06bd68abc0 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/IndexedListSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/IndexedListSerializer.eea
@@ -33,4 +33,4 @@ serializeTypedContents
  (Ljava/util/List<*>;Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/databind/SerializerProvider;)V
 withResolved
  (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/ser/impl/IndexedListSerializer;
- (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/ser/impl/IndexedListSerializer;
+ (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Ljava/lang/Boolean;)L1com/fasterxml/jackson/databind/ser/impl/IndexedListSerializer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/IndexedStringListSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/IndexedStringListSerializer.eea
index 3e64088c08..d0c59ce366 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/IndexedStringListSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/IndexedStringListSerializer.eea
@@ -13,7 +13,7 @@ instance
  (Lcom/fasterxml/jackson/databind/ser/impl/IndexedStringListSerializer;Ljava/lang/Boolean;)V
 _withResolved
  (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)L1com/fasterxml/jackson/databind/JsonSerializer<*>;
 acceptContentVisitor
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonArrayFormatVisitor;)V
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonArrayFormatVisitor;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/IteratorSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/IteratorSerializer.eea
index 516ac75397..ed26bd2ee4 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/IteratorSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/IteratorSerializer.eea
@@ -30,4 +30,4 @@ serializeContents
  (Ljava/util/Iterator<*>;Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/databind/SerializerProvider;)V
 withResolved
  (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/ser/impl/IteratorSerializer;
- (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/ser/impl/IteratorSerializer;
+ (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Ljava/lang/Boolean;)L1com/fasterxml/jackson/databind/ser/impl/IteratorSerializer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/MapEntrySerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/MapEntrySerializer.eea
index 291dcc5f88..b6f9682919 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/MapEntrySerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/MapEntrySerializer.eea
@@ -56,7 +56,7 @@ _withValueTypeSerializer
  (Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;)Lcom/fasterxml/jackson/databind/ser/ContainerSerializer<*>;
 createContextual
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.ContextualSerializer)
 getContentSerializer
  ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
  ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
@@ -83,4 +83,4 @@ withContentInclusion
  (Ljava/lang/Object;Z)Lcom/fasterxml/jackson/databind/ser/impl/MapEntrySerializer;
 withResolved
  (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Ljava/lang/Object;Z)Lcom/fasterxml/jackson/databind/ser/impl/MapEntrySerializer;
- (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Ljava/lang/Object;Z)Lcom/fasterxml/jackson/databind/ser/impl/MapEntrySerializer;
+ (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Ljava/lang/Object;Z)L1com/fasterxml/jackson/databind/ser/impl/MapEntrySerializer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/ObjectIdWriter.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/ObjectIdWriter.eea
index 5080b82e2a..e287cb98c4 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/ObjectIdWriter.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/ObjectIdWriter.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/ser/impl/ObjectIdWriter
 
 construct
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/PropertyName;Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<*>;Z)Lcom/fasterxml/jackson/databind/ser/impl/ObjectIdWriter;
- (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/PropertyName;Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<*>;Z)Lcom/fasterxml/jackson/databind/ser/impl/ObjectIdWriter;
+ (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/PropertyName;Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<*>;Z)L1com/fasterxml/jackson/databind/ser/impl/ObjectIdWriter;
 
 generator
  Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<*>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/PropertyBasedObjectIdGenerator.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/PropertyBasedObjectIdGenerator.eea
index 61f106a1fe..9049cb33b5 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/PropertyBasedObjectIdGenerator.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/PropertyBasedObjectIdGenerator.eea
@@ -15,13 +15,13 @@ canUseFor
  (Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<*>;)Z
 forScope
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<Ljava/lang/Object;>;
- (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<Ljava/lang/Object;>;
+ (Ljava/lang/Class<*>;)L1com/fasterxml/jackson/annotation/ObjectIdGenerator<Ljava/lang/Object;>;
 generateId
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
 key
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator$IdKey;
- (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator$IdKey;
+ (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator$IdKey; # @PolyNull
 newForSerialization
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<Ljava/lang/Object;>;
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/annotation/ObjectIdGenerator<Ljava/lang/Object;>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/PropertySerializerMap.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/PropertySerializerMap.eea
index 4386125e79..dc001b8ee7 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/PropertySerializerMap.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/PropertySerializerMap.eea
@@ -12,31 +12,31 @@ emptyForRootValues
  (Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap;)V
 addSerializer
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
- (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
+ (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)L1com/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
 addSerializer
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
- (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
+ (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)L1com/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
 findAndAddKeySerializer
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
- (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
+ (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
 findAndAddPrimarySerializer
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
- (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
+ (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
 findAndAddPrimarySerializer
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
- (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
+ (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
 findAndAddRootValueSerializer
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/SerializerProvider;)Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
- (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/SerializerProvider;)Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
+ (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/SerializerProvider;)L1com/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
 findAndAddRootValueSerializer
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/SerializerProvider;)Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
- (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/SerializerProvider;)Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
+ (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/SerializerProvider;)L1com/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
 findAndAddSecondarySerializer
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
- (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
+ (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
 findAndAddSecondarySerializer
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
- (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
+ (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
 newWith
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap;
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/ReadOnlyClassToSerializerMap.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/ReadOnlyClassToSerializerMap.eea
index aa08362b89..d16e41bffb 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/ReadOnlyClassToSerializerMap.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/ReadOnlyClassToSerializerMap.eea
@@ -2,20 +2,20 @@ class com/fasterxml/jackson/databind/ser/impl/ReadOnlyClassToSerializerMap
 
 from
  (Lcom/fasterxml/jackson/databind/util/LookupCache<Lcom/fasterxml/jackson/databind/util/TypeKey;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;>;)Lcom/fasterxml/jackson/databind/ser/impl/ReadOnlyClassToSerializerMap;
- (Lcom/fasterxml/jackson/databind/util/LookupCache<Lcom/fasterxml/jackson/databind/util/TypeKey;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;>;)Lcom/fasterxml/jackson/databind/ser/impl/ReadOnlyClassToSerializerMap;
+ (Lcom/fasterxml/jackson/databind/util/LookupCache<Lcom/fasterxml/jackson/databind/util/TypeKey;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;>;)L1com/fasterxml/jackson/databind/ser/impl/ReadOnlyClassToSerializerMap;
 
 <init>
  (Lcom/fasterxml/jackson/databind/util/LookupCache<Lcom/fasterxml/jackson/databind/util/TypeKey;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;>;)V
  (Lcom/fasterxml/jackson/databind/util/LookupCache<Lcom/fasterxml/jackson/databind/util/TypeKey;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;>;)V
 typedValueSerializer
  (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
 typedValueSerializer
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
- (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
+ (Ljava/lang/Class<*>;)L0com/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
 untypedValueSerializer
  (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
 untypedValueSerializer
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
- (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
+ (Ljava/lang/Class<*>;)L0com/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter.eea
index cea6981cea..1f2e647f5d 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter.eea
@@ -5,25 +5,25 @@ filterOutAll
  ()Lcom/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter;
 filterOutAllExcept
  (Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter;
- (Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter;
+ (Ljava/util/Set<Ljava/lang/String;>;)L1com/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter;
 filterOutAllExcept
  ([Ljava/lang/String;)Lcom/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter;
- ([Ljava/lang/String;)Lcom/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter;
+ ([Ljava/lang/String;)L1com/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter;
 from
  (Lcom/fasterxml/jackson/databind/ser/BeanPropertyFilter;)Lcom/fasterxml/jackson/databind/ser/PropertyFilter;
- (Lcom/fasterxml/jackson/databind/ser/BeanPropertyFilter;)Lcom/fasterxml/jackson/databind/ser/PropertyFilter;
+ (Lcom/fasterxml/jackson/databind/ser/BeanPropertyFilter;)L1com/fasterxml/jackson/databind/ser/PropertyFilter;
 serializeAll
  ()Lcom/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter;
  ()Lcom/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter;
 serializeAll
  (Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter;
- (Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter;
+ (Ljava/util/Set<Ljava/lang/String;>;)L1com/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter;
 serializeAllExcept
  (Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter;
- (Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter;
+ (Ljava/util/Set<Ljava/lang/String;>;)L1com/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter;
 serializeAllExcept
  ([Ljava/lang/String;)Lcom/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter;
- ([Ljava/lang/String;)Lcom/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter;
+ ([Ljava/lang/String;)L1com/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter;
 
 depositSchemaProperty
  (Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonObjectFormatVisitor;Lcom/fasterxml/jackson/databind/SerializerProvider;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/SimpleFilterProvider.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/SimpleFilterProvider.eea
index 5f93236ea9..26a3e3f982 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/SimpleFilterProvider.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/SimpleFilterProvider.eea
@@ -21,10 +21,10 @@ addFilter
  (Ljava/lang/String;Lcom/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter;)Lcom/fasterxml/jackson/databind/ser/impl/SimpleFilterProvider;
 findFilter
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/ser/BeanPropertyFilter;
- (Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/ser/BeanPropertyFilter;
+ (Ljava/lang/Object;)L1com/fasterxml/jackson/databind/ser/BeanPropertyFilter;
 findPropertyFilter
  (Ljava/lang/Object;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/ser/PropertyFilter;
- (Ljava/lang/Object;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/ser/PropertyFilter;
+ (Ljava/lang/Object;Ljava/lang/Object;)L0com/fasterxml/jackson/databind/ser/PropertyFilter; # @Inherited(com.fasterxml.jackson.databind.ser.FilterProvider)
 getDefaultFilter
  ()Lcom/fasterxml/jackson/databind/ser/PropertyFilter;
  ()Lcom/fasterxml/jackson/databind/ser/PropertyFilter;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/StringArraySerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/StringArraySerializer.eea
index bedd7037d1..a416109533 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/StringArraySerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/StringArraySerializer.eea
@@ -17,7 +17,7 @@ _elementSerializer
  (Lcom/fasterxml/jackson/databind/ser/impl/StringArraySerializer;Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Ljava/lang/Boolean;)V
 _withResolved
  (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)L1com/fasterxml/jackson/databind/JsonSerializer<*>;
 _withValueTypeSerializer
  (Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;)Lcom/fasterxml/jackson/databind/ser/ContainerSerializer<*>;
  (Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;)Lcom/fasterxml/jackson/databind/ser/ContainerSerializer<*>;
@@ -26,7 +26,7 @@ acceptJsonFormatVisitor
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;Lcom/fasterxml/jackson/databind/JavaType;)V
 createContextual
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.std.ArraySerializerBase)
 getContentSerializer
  ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
  ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/StringCollectionSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/StringCollectionSerializer.eea
index 1836c65745..3b5f0637c5 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/StringCollectionSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/StringCollectionSerializer.eea
@@ -13,7 +13,7 @@ instance
  (Lcom/fasterxml/jackson/databind/ser/impl/StringCollectionSerializer;Ljava/lang/Boolean;)V
 _withResolved
  (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)L1com/fasterxml/jackson/databind/JsonSerializer<*>;
 acceptContentVisitor
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonArrayFormatVisitor;)V
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonArrayFormatVisitor;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/TypeWrappedSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/TypeWrappedSerializer.eea
index 5fa2b07424..58bdf2186e 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/TypeWrappedSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/TypeWrappedSerializer.eea
@@ -16,10 +16,10 @@ _typeSerializer
  (Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;)V
 createContextual
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.ContextualSerializer)
 handledType
  ()Ljava/lang/Class<Ljava/lang/Object;>;
- ()Ljava/lang/Class<Ljava/lang/Object;>;
+ ()L1java/lang/Class<Ljava/lang/Object;>;
 serialize
  (Ljava/lang/Object;Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/databind/SerializerProvider;)V
  (Ljava/lang/Object;Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/databind/SerializerProvider;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/UnwrappingBeanPropertyWriter.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/UnwrappingBeanPropertyWriter.eea
index 6c9702d1a1..0bb00b86dc 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/UnwrappingBeanPropertyWriter.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/UnwrappingBeanPropertyWriter.eea
@@ -18,7 +18,7 @@ _findAndAddDynamic
  (Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/SerializerProvider;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
 _new
  (Lcom/fasterxml/jackson/databind/util/NameTransformer;Lcom/fasterxml/jackson/core/io/SerializedString;)Lcom/fasterxml/jackson/databind/ser/impl/UnwrappingBeanPropertyWriter;
- (Lcom/fasterxml/jackson/databind/util/NameTransformer;Lcom/fasterxml/jackson/core/io/SerializedString;)Lcom/fasterxml/jackson/databind/ser/impl/UnwrappingBeanPropertyWriter;
+ (Lcom/fasterxml/jackson/databind/util/NameTransformer;Lcom/fasterxml/jackson/core/io/SerializedString;)L1com/fasterxml/jackson/databind/ser/impl/UnwrappingBeanPropertyWriter;
 assignSerializer
  (Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)V
  (Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/UnwrappingBeanSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/UnwrappingBeanSerializer.eea
index fcdb82a8dd..0edd66927d 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/UnwrappingBeanSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/impl/UnwrappingBeanSerializer.eea
@@ -36,16 +36,16 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 unwrappingSerializer
  (Lcom/fasterxml/jackson/databind/util/NameTransformer;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/util/NameTransformer;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/util/NameTransformer;)L1com/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
 withByNameInclusion
  (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
- (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
+ (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)L1com/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
 withFilterId
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
- (Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
+ (Ljava/lang/Object;)L1com/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
 withObjectIdWriter
  (Lcom/fasterxml/jackson/databind/ser/impl/ObjectIdWriter;)Lcom/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
- (Lcom/fasterxml/jackson/databind/ser/impl/ObjectIdWriter;)Lcom/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
+ (Lcom/fasterxml/jackson/databind/ser/impl/ObjectIdWriter;)L1com/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
 withProperties
  ([Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;[Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;)Lcom/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
- ([Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;[Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;)Lcom/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
+ ([Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;[Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;)L1com/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/ArraySerializerBase.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/ArraySerializerBase.eea
index 530c5dba6a..f49cd2f3c5 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/ArraySerializerBase.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/ArraySerializerBase.eea
@@ -36,7 +36,7 @@ _withResolved
  (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
 createContextual
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.ContextualSerializer)
 serialize
  (TT;Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/databind/SerializerProvider;)V
  (TT;L1com/fasterxml/jackson/core/JsonGenerator;L1com/fasterxml/jackson/databind/SerializerProvider;)V # @Inherited(com.fasterxml.jackson.databind.ser.std.StdSerializer)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/AsArraySerializerBase.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/AsArraySerializerBase.eea
index 00ec5a86d3..a1e3acfb89 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/AsArraySerializerBase.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/AsArraySerializerBase.eea
@@ -51,7 +51,7 @@ acceptJsonFormatVisitor
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;Lcom/fasterxml/jackson/databind/JavaType;)V
 createContextual
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.ContextualSerializer)
 getContentSerializer
  ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
  ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/BeanSerializerBase.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/BeanSerializerBase.eea
index 6df1608de5..163ba740d8 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/BeanSerializerBase.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/BeanSerializerBase.eea
@@ -65,7 +65,7 @@ _typeId
  (Lcom/fasterxml/jackson/databind/ser/std/BeanSerializerBase;[Ljava/lang/String;)V
 _customTypeId
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
 _serializeObjectId
  (Ljava/lang/Object;Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/ser/impl/WritableObjectId;)V
  (Ljava/lang/Object;Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/ser/impl/WritableObjectId;)V
@@ -86,10 +86,10 @@ asArraySerializer
  ()Lcom/fasterxml/jackson/databind/ser/std/BeanSerializerBase;
 createContextual
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.ContextualSerializer)
 findConvertingSerializer
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;)L0com/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
 getSchema
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/reflect/Type;)Lcom/fasterxml/jackson/databind/JsonNode;
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/reflect/Type;)Lcom/fasterxml/jackson/databind/JsonNode;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/BooleanSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/BooleanSerializer.eea
index 22246d50bb..6f4d56e840 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/BooleanSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/BooleanSerializer.eea
@@ -9,7 +9,7 @@ acceptJsonFormatVisitor
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;Lcom/fasterxml/jackson/databind/JavaType;)V
 createContextual
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.ContextualSerializer)
 getSchema
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/reflect/Type;)Lcom/fasterxml/jackson/databind/JsonNode;
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/reflect/Type;)Lcom/fasterxml/jackson/databind/JsonNode;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/CalendarSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/CalendarSerializer.eea
index 94a05b9cb7..28cfc688aa 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/CalendarSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/CalendarSerializer.eea
@@ -19,4 +19,4 @@ serialize
  (Ljava/util/Calendar;Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/databind/SerializerProvider;)V
 withFormat
  (Ljava/lang/Boolean;Ljava/text/DateFormat;)Lcom/fasterxml/jackson/databind/ser/std/CalendarSerializer;
- (Ljava/lang/Boolean;Ljava/text/DateFormat;)Lcom/fasterxml/jackson/databind/ser/std/CalendarSerializer;
+ (Ljava/lang/Boolean;Ljava/text/DateFormat;)L1com/fasterxml/jackson/databind/ser/std/CalendarSerializer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/CollectionSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/CollectionSerializer.eea
index a7dffe3d9f..57b982092f 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/CollectionSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/CollectionSerializer.eea
@@ -33,4 +33,4 @@ serializeContentsUsing
  (Ljava/util/Collection<*>;Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;)V
 withResolved
  (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/ser/std/CollectionSerializer;
- (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/ser/std/CollectionSerializer;
+ (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Ljava/lang/Boolean;)L1com/fasterxml/jackson/databind/ser/std/CollectionSerializer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/DateSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/DateSerializer.eea
index 8e105041b8..5e8c9febd8 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/DateSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/DateSerializer.eea
@@ -19,4 +19,4 @@ serialize
  (Ljava/util/Date;Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/databind/SerializerProvider;)V
 withFormat
  (Ljava/lang/Boolean;Ljava/text/DateFormat;)Lcom/fasterxml/jackson/databind/ser/std/DateSerializer;
- (Ljava/lang/Boolean;Ljava/text/DateFormat;)Lcom/fasterxml/jackson/databind/ser/std/DateSerializer;
+ (Ljava/lang/Boolean;Ljava/text/DateFormat;)L1com/fasterxml/jackson/databind/ser/std/DateSerializer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/DateTimeSerializerBase.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/DateTimeSerializerBase.eea
index 1c26f42d71..abe4dcdc7f 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/DateTimeSerializerBase.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/DateTimeSerializerBase.eea
@@ -36,7 +36,7 @@ acceptJsonFormatVisitor
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;Lcom/fasterxml/jackson/databind/JavaType;)V
 createContextual
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.ContextualSerializer)
 getSchema
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/reflect/Type;)Lcom/fasterxml/jackson/databind/JsonNode;
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/reflect/Type;)Lcom/fasterxml/jackson/databind/JsonNode;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/EnumSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/EnumSerializer.eea
index e9dbf8b7cd..3cc493462a 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/EnumSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/EnumSerializer.eea
@@ -9,7 +9,7 @@ _isShapeWrittenUsingIndex
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/annotation/JsonFormat$Value;ZLjava/lang/Boolean;)Ljava/lang/Boolean;
 construct
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/annotation/JsonFormat$Value;)Lcom/fasterxml/jackson/databind/ser/std/EnumSerializer;
- (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/annotation/JsonFormat$Value;)Lcom/fasterxml/jackson/databind/ser/std/EnumSerializer;
+ (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/annotation/JsonFormat$Value;)L1com/fasterxml/jackson/databind/ser/std/EnumSerializer;
 constructEnumNamingStrategyValues
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Ljava/lang/Class<Ljava/lang/Enum<*>;>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/databind/util/EnumValues;
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Ljava/lang/Class<Ljava/lang/Enum<*>;>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/databind/util/EnumValues;
@@ -44,7 +44,7 @@ acceptJsonFormatVisitor
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;Lcom/fasterxml/jackson/databind/JavaType;)V
 createContextual
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.ContextualSerializer)
 getEnumValues
  ()Lcom/fasterxml/jackson/databind/util/EnumValues;
  ()Lcom/fasterxml/jackson/databind/util/EnumValues;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/EnumSetSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/EnumSetSerializer.eea
index e752fbb7c8..83733401a0 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/EnumSetSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/EnumSetSerializer.eea
@@ -27,4 +27,4 @@ serializeContents
  (Ljava/util/EnumSet<+Ljava/lang/Enum<*>;>;Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/databind/SerializerProvider;)V
 withResolved
  (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/ser/std/EnumSetSerializer;
- (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/ser/std/EnumSetSerializer;
+ (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Ljava/lang/Boolean;)L1com/fasterxml/jackson/databind/ser/std/EnumSetSerializer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/InetAddressSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/InetAddressSerializer.eea
index 4c19973723..681330d738 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/InetAddressSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/InetAddressSerializer.eea
@@ -6,7 +6,7 @@ super com/fasterxml/jackson/databind/ser/std/StdScalarSerializer
 
 createContextual
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.ContextualSerializer)
 serialize
  (Ljava/net/InetAddress;Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/databind/SerializerProvider;)V
  (Ljava/net/InetAddress;Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/databind/SerializerProvider;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/IterableSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/IterableSerializer.eea
index cdcc0ecd1e..efc904a554 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/IterableSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/IterableSerializer.eea
@@ -27,4 +27,4 @@ serializeContents
  (Ljava/lang/Iterable<*>;Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/databind/SerializerProvider;)V
 withResolved
  (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/ser/std/IterableSerializer;
- (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/ser/std/IterableSerializer;
+ (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Ljava/lang/Boolean;)L1com/fasterxml/jackson/databind/ser/std/IterableSerializer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/JsonValueSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/JsonValueSerializer.eea
index 8a6b5d2d1c..abf2d1e634 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/JsonValueSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/JsonValueSerializer.eea
@@ -9,7 +9,7 @@ _withIgnoreProperties
  (Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
 construct
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;)Lcom/fasterxml/jackson/databind/ser/std/JsonValueSerializer;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;)Lcom/fasterxml/jackson/databind/ser/std/JsonValueSerializer;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;)L1com/fasterxml/jackson/databind/ser/std/JsonValueSerializer;
 
 _accessor
  Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
@@ -56,7 +56,7 @@ acceptJsonFormatVisitor
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;Lcom/fasterxml/jackson/databind/JavaType;)V
 createContextual
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.ContextualSerializer)
 getSchema
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/reflect/Type;)Lcom/fasterxml/jackson/databind/JsonNode;
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/reflect/Type;)Lcom/fasterxml/jackson/databind/JsonNode;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/MapProperty.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/MapProperty.eea
index 8d79519724..9e32e19cf1 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/MapProperty.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/MapProperty.eea
@@ -36,7 +36,7 @@ getContextAnnotation
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
 getFullName
  ()Lcom/fasterxml/jackson/databind/PropertyName;
- ()Lcom/fasterxml/jackson/databind/PropertyName;
+ ()L1com/fasterxml/jackson/databind/PropertyName;
 getMember
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/MapSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/MapSerializer.eea
index 5d651f85f4..c1f7c01d6e 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/MapSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/MapSerializer.eea
@@ -105,7 +105,7 @@ acceptJsonFormatVisitor
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;Lcom/fasterxml/jackson/databind/JavaType;)V
 createContextual
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.ContextualSerializer)
 getContentSerializer
  ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
  ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
@@ -162,7 +162,7 @@ withFilterId
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/ser/std/MapSerializer;
 withResolved
  (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;Z)Lcom/fasterxml/jackson/databind/ser/std/MapSerializer;
- (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;Z)Lcom/fasterxml/jackson/databind/ser/std/MapSerializer;
+ (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;Z)L1com/fasterxml/jackson/databind/ser/std/MapSerializer;
 withResolved
  (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Ljava/util/Set<Ljava/lang/String;>;Z)Lcom/fasterxml/jackson/databind/ser/std/MapSerializer;
  (Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;Ljava/util/Set<Ljava/lang/String;>;Z)Lcom/fasterxml/jackson/databind/ser/std/MapSerializer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/NumberSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/NumberSerializer.eea
index 1779bf1ec5..6beefdc107 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/NumberSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/NumberSerializer.eea
@@ -20,7 +20,7 @@ acceptJsonFormatVisitor
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;Lcom/fasterxml/jackson/databind/JavaType;)V
 createContextual
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.ContextualSerializer)
 getSchema
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/reflect/Type;)Lcom/fasterxml/jackson/databind/JsonNode;
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/reflect/Type;)Lcom/fasterxml/jackson/databind/JsonNode;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/NumberSerializers$Base.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/NumberSerializers$Base.eea
index 3a15802b0f..f776e9f69d 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/NumberSerializers$Base.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/NumberSerializers$Base.eea
@@ -21,7 +21,7 @@ acceptJsonFormatVisitor
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;Lcom/fasterxml/jackson/databind/JavaType;)V
 createContextual
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.ContextualSerializer)
 getSchema
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/reflect/Type;)Lcom/fasterxml/jackson/databind/JsonNode;
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/reflect/Type;)Lcom/fasterxml/jackson/databind/JsonNode;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/ObjectArraySerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/ObjectArraySerializer.eea
index a451f49c29..7009bbb556 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/ObjectArraySerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/ObjectArraySerializer.eea
@@ -43,7 +43,7 @@ acceptJsonFormatVisitor
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;Lcom/fasterxml/jackson/databind/JavaType;)V
 createContextual
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.std.ArraySerializerBase)
 getContentSerializer
  ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
  ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/ReferenceTypeSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/ReferenceTypeSerializer.eea
index 2df8cd3cdd..71e07ee093 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/ReferenceTypeSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/ReferenceTypeSerializer.eea
@@ -55,7 +55,7 @@ acceptJsonFormatVisitor
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;Lcom/fasterxml/jackson/databind/JavaType;)V
 createContextual
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.ContextualSerializer)
 getReferredType
  ()Lcom/fasterxml/jackson/databind/JavaType;
  ()Lcom/fasterxml/jackson/databind/JavaType;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/SqlDateSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/SqlDateSerializer.eea
index 55b0f3a8c6..7dbbb13bb4 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/SqlDateSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/SqlDateSerializer.eea
@@ -15,4 +15,4 @@ serialize
  (Ljava/sql/Date;Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/databind/SerializerProvider;)V
 withFormat
  (Ljava/lang/Boolean;Ljava/text/DateFormat;)Lcom/fasterxml/jackson/databind/ser/std/SqlDateSerializer;
- (Ljava/lang/Boolean;Ljava/text/DateFormat;)Lcom/fasterxml/jackson/databind/ser/std/SqlDateSerializer;
+ (Ljava/lang/Boolean;Ljava/text/DateFormat;)L1com/fasterxml/jackson/databind/ser/std/SqlDateSerializer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StaticListSerializerBase.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StaticListSerializerBase.eea
index 34a0e61317..e75f9e873a 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StaticListSerializerBase.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StaticListSerializerBase.eea
@@ -30,7 +30,7 @@ contentSchema
  ()Lcom/fasterxml/jackson/databind/JsonNode;
 createContextual
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.ContextualSerializer)
 getSchema
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/reflect/Type;)Lcom/fasterxml/jackson/databind/JsonNode;
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/reflect/Type;)Lcom/fasterxml/jackson/databind/JsonNode;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdArraySerializers$BooleanArraySerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdArraySerializers$BooleanArraySerializer.eea
index ebaf03fc71..8a5102d950 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdArraySerializers$BooleanArraySerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdArraySerializers$BooleanArraySerializer.eea
@@ -9,7 +9,7 @@ super com/fasterxml/jackson/databind/ser/std/ArraySerializerBase
  (Lcom/fasterxml/jackson/databind/ser/std/StdArraySerializers$BooleanArraySerializer;Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)V
 _withResolved
  (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)L1com/fasterxml/jackson/databind/JsonSerializer<*>;
 _withValueTypeSerializer
  (Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;)Lcom/fasterxml/jackson/databind/ser/ContainerSerializer<*>;
  (Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;)Lcom/fasterxml/jackson/databind/ser/ContainerSerializer<*>;
@@ -18,7 +18,7 @@ acceptJsonFormatVisitor
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;Lcom/fasterxml/jackson/databind/JavaType;)V
 getContentSerializer
  ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ ()L0com/fasterxml/jackson/databind/JsonSerializer<*>;
 getContentType
  ()Lcom/fasterxml/jackson/databind/JavaType;
  ()Lcom/fasterxml/jackson/databind/JavaType;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdArraySerializers$DoubleArraySerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdArraySerializers$DoubleArraySerializer.eea
index 26ead53238..98f3614c53 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdArraySerializers$DoubleArraySerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdArraySerializers$DoubleArraySerializer.eea
@@ -9,7 +9,7 @@ super com/fasterxml/jackson/databind/ser/std/ArraySerializerBase
  (Lcom/fasterxml/jackson/databind/ser/std/StdArraySerializers$DoubleArraySerializer;Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)V
 _withResolved
  (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)L1com/fasterxml/jackson/databind/JsonSerializer<*>;
 _withValueTypeSerializer
  (Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;)Lcom/fasterxml/jackson/databind/ser/ContainerSerializer<*>;
  (Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;)Lcom/fasterxml/jackson/databind/ser/ContainerSerializer<*>;
@@ -18,7 +18,7 @@ acceptJsonFormatVisitor
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;Lcom/fasterxml/jackson/databind/JavaType;)V
 getContentSerializer
  ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ ()L0com/fasterxml/jackson/databind/JsonSerializer<*>;
 getContentType
  ()Lcom/fasterxml/jackson/databind/JavaType;
  ()Lcom/fasterxml/jackson/databind/JavaType;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdArraySerializers$FloatArraySerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdArraySerializers$FloatArraySerializer.eea
index b6563a0444..abeb01cb74 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdArraySerializers$FloatArraySerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdArraySerializers$FloatArraySerializer.eea
@@ -9,13 +9,13 @@ super com/fasterxml/jackson/databind/ser/std/StdArraySerializers$TypedPrimitiveA
  (Lcom/fasterxml/jackson/databind/ser/std/StdArraySerializers$FloatArraySerializer;Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)V
 _withResolved
  (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)L1com/fasterxml/jackson/databind/JsonSerializer<*>;
 acceptJsonFormatVisitor
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;Lcom/fasterxml/jackson/databind/JavaType;)V
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;Lcom/fasterxml/jackson/databind/JavaType;)V
 getContentSerializer
  ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ ()L0com/fasterxml/jackson/databind/JsonSerializer<*>;
 getContentType
  ()Lcom/fasterxml/jackson/databind/JavaType;
  ()Lcom/fasterxml/jackson/databind/JavaType;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdArraySerializers$IntArraySerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdArraySerializers$IntArraySerializer.eea
index c5c9b4dff5..9c37dcac3d 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdArraySerializers$IntArraySerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdArraySerializers$IntArraySerializer.eea
@@ -9,7 +9,7 @@ super com/fasterxml/jackson/databind/ser/std/ArraySerializerBase
  (Lcom/fasterxml/jackson/databind/ser/std/StdArraySerializers$IntArraySerializer;Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)V
 _withResolved
  (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)L1com/fasterxml/jackson/databind/JsonSerializer<*>;
 _withValueTypeSerializer
  (Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;)Lcom/fasterxml/jackson/databind/ser/ContainerSerializer<*>;
  (Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;)Lcom/fasterxml/jackson/databind/ser/ContainerSerializer<*>;
@@ -18,7 +18,7 @@ acceptJsonFormatVisitor
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;Lcom/fasterxml/jackson/databind/JavaType;)V
 getContentSerializer
  ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ ()L0com/fasterxml/jackson/databind/JsonSerializer<*>;
 getContentType
  ()Lcom/fasterxml/jackson/databind/JavaType;
  ()Lcom/fasterxml/jackson/databind/JavaType;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdArraySerializers$LongArraySerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdArraySerializers$LongArraySerializer.eea
index 0751970d6e..8ba5fd9f3f 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdArraySerializers$LongArraySerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdArraySerializers$LongArraySerializer.eea
@@ -9,13 +9,13 @@ super com/fasterxml/jackson/databind/ser/std/StdArraySerializers$TypedPrimitiveA
  (Lcom/fasterxml/jackson/databind/ser/std/StdArraySerializers$LongArraySerializer;Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)V
 _withResolved
  (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)L1com/fasterxml/jackson/databind/JsonSerializer<*>;
 acceptJsonFormatVisitor
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;Lcom/fasterxml/jackson/databind/JavaType;)V
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;Lcom/fasterxml/jackson/databind/JavaType;)V
 getContentSerializer
  ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ ()L0com/fasterxml/jackson/databind/JsonSerializer<*>;
 getContentType
  ()Lcom/fasterxml/jackson/databind/JavaType;
  ()Lcom/fasterxml/jackson/databind/JavaType;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdArraySerializers$ShortArraySerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdArraySerializers$ShortArraySerializer.eea
index a03acc3db6..0f9052793d 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdArraySerializers$ShortArraySerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdArraySerializers$ShortArraySerializer.eea
@@ -9,13 +9,13 @@ super com/fasterxml/jackson/databind/ser/std/StdArraySerializers$TypedPrimitiveA
  (Lcom/fasterxml/jackson/databind/ser/std/StdArraySerializers$ShortArraySerializer;Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)V
 _withResolved
  (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Boolean;)L1com/fasterxml/jackson/databind/JsonSerializer<*>;
 acceptJsonFormatVisitor
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;Lcom/fasterxml/jackson/databind/JavaType;)V
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;Lcom/fasterxml/jackson/databind/JavaType;)V
 getContentSerializer
  ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ ()L0com/fasterxml/jackson/databind/JsonSerializer<*>;
 getContentType
  ()Lcom/fasterxml/jackson/databind/JavaType;
  ()Lcom/fasterxml/jackson/databind/JavaType;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdDelegatingSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdDelegatingSerializer.eea
index 4f9a60e9fa..7322a22fd1 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdDelegatingSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdDelegatingSerializer.eea
@@ -34,13 +34,13 @@ convertValue
  (Ljava/lang/Object;)Ljava/lang/Object;
 createContextual
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.ContextualSerializer)
 getConverter
  ()Lcom/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;*>;
  ()Lcom/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;*>;
 getDelegatee
  ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- ()Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ ()L0com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.JsonSerializer)
 getSchema
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/reflect/Type;)Lcom/fasterxml/jackson/databind/JsonNode;
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/reflect/Type;)Lcom/fasterxml/jackson/databind/JsonNode;
@@ -61,4 +61,4 @@ serializeWithType
  (Ljava/lang/Object;Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;)V
 withDelegate
  (Lcom/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;*>;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;)Lcom/fasterxml/jackson/databind/ser/std/StdDelegatingSerializer;
- (Lcom/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;*>;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;)Lcom/fasterxml/jackson/databind/ser/std/StdDelegatingSerializer;
+ (Lcom/fasterxml/jackson/databind/util/Converter<Ljava/lang/Object;*>;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;)L1com/fasterxml/jackson/databind/ser/std/StdDelegatingSerializer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdKeySerializers$EnumKeySerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdKeySerializers$EnumKeySerializer.eea
index beb454f99e..18a7f3a0b3 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdKeySerializers$EnumKeySerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdKeySerializers$EnumKeySerializer.eea
@@ -6,10 +6,10 @@ super com/fasterxml/jackson/databind/ser/std/StdSerializer
 
 construct
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/util/EnumValues;)Lcom/fasterxml/jackson/databind/ser/std/StdKeySerializers$EnumKeySerializer;
- (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/util/EnumValues;)Lcom/fasterxml/jackson/databind/ser/std/StdKeySerializers$EnumKeySerializer;
+ (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/util/EnumValues;)L1com/fasterxml/jackson/databind/ser/std/StdKeySerializers$EnumKeySerializer;
 construct
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/util/EnumValues;Lcom/fasterxml/jackson/databind/util/EnumValues;)Lcom/fasterxml/jackson/databind/ser/std/StdKeySerializers$EnumKeySerializer;
- (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/util/EnumValues;Lcom/fasterxml/jackson/databind/util/EnumValues;)Lcom/fasterxml/jackson/databind/ser/std/StdKeySerializers$EnumKeySerializer;
+ (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/util/EnumValues;Lcom/fasterxml/jackson/databind/util/EnumValues;)L1com/fasterxml/jackson/databind/ser/std/StdKeySerializers$EnumKeySerializer;
 
 _values
  Lcom/fasterxml/jackson/databind/util/EnumValues;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdKeySerializers.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdKeySerializers.eea
index 699023a8f5..a6a9dc9dee 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdKeySerializers.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdKeySerializers.eea
@@ -15,4 +15,4 @@ getFallbackKeySerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
 getStdKeySerializer
  (Lcom/fasterxml/jackson/databind/SerializationConfig;Ljava/lang/Class<*>;Z)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
- (Lcom/fasterxml/jackson/databind/SerializationConfig;Ljava/lang/Class<*>;Z)Lcom/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
+ (Lcom/fasterxml/jackson/databind/SerializationConfig;Ljava/lang/Class<*>;Z)L0com/fasterxml/jackson/databind/JsonSerializer<Ljava/lang/Object;>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdSerializer.eea
index eda1641349..93096aff5a 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/StdSerializer.eea
@@ -34,13 +34,13 @@ acceptJsonFormatVisitor
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;Lcom/fasterxml/jackson/databind/JavaType;)V
 createSchemaNode
  (Ljava/lang/String;)Lcom/fasterxml/jackson/databind/node/ObjectNode;
- (Ljava/lang/String;)Lcom/fasterxml/jackson/databind/node/ObjectNode;
+ (Ljava/lang/String;)L1com/fasterxml/jackson/databind/node/ObjectNode;
 createSchemaNode
  (Ljava/lang/String;Z)Lcom/fasterxml/jackson/databind/node/ObjectNode;
- (Ljava/lang/String;Z)Lcom/fasterxml/jackson/databind/node/ObjectNode;
+ (Ljava/lang/String;Z)L1com/fasterxml/jackson/databind/node/ObjectNode;
 findAnnotatedContentSerializer
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L0com/fasterxml/jackson/databind/JsonSerializer<*>;
 findContextualConvertingSerializer
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
@@ -49,7 +49,7 @@ findConvertingContentSerializer
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/JsonSerializer<*>;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
 findFormatFeature
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/annotation/JsonFormat$Feature;)Ljava/lang/Boolean;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/annotation/JsonFormat$Feature;)Ljava/lang/Boolean;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/annotation/JsonFormat$Feature;)L0java/lang/Boolean;
 findFormatOverrides
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/annotation/JsonFormat$Value;
@@ -67,7 +67,7 @@ getSchema
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/reflect/Type;Z)Lcom/fasterxml/jackson/databind/JsonNode;
 handledType
  ()Ljava/lang/Class<TT;>;
- ()Ljava/lang/Class<TT;>;
+ ()L0java/lang/Class<TT;>; # @Inherited(com.fasterxml.jackson.databind.JsonSerializer)
 isDefaultSerializer
  (Lcom/fasterxml/jackson/databind/JsonSerializer<*>;)Z
  (Lcom/fasterxml/jackson/databind/JsonSerializer<*>;)Z
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/ToEmptyObjectSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/ToEmptyObjectSerializer.eea
index 6c368db3ec..e6d9688048 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/ToEmptyObjectSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/ToEmptyObjectSerializer.eea
@@ -15,7 +15,7 @@ acceptJsonFormatVisitor
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;Lcom/fasterxml/jackson/databind/JavaType;)V
 getSchema
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/reflect/Type;)Lcom/fasterxml/jackson/databind/JsonNode;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/reflect/Type;)Lcom/fasterxml/jackson/databind/JsonNode;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/reflect/Type;)L0com/fasterxml/jackson/databind/JsonNode;
 isEmpty
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/Object;)Z
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/lang/Object;)Z
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/ToStringSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/ToStringSerializer.eea
index d1a8163519..25642843d4 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/ToStringSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/ToStringSerializer.eea
@@ -9,4 +9,4 @@ instance
  (Ljava/lang/Class<*>;)V
 valueToString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/UUIDSerializer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/UUIDSerializer.eea
index 158616de93..f32ab124ba 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/UUIDSerializer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/ser/std/UUIDSerializer.eea
@@ -19,7 +19,7 @@ acceptJsonFormatVisitor
  (Lcom/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper;Lcom/fasterxml/jackson/databind/JavaType;)V
 createContextual
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
- (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonSerializer<*>;
+ (Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/BeanProperty;)L1com/fasterxml/jackson/databind/JsonSerializer<*>; # @Inherited(com.fasterxml.jackson.databind.ser.ContextualSerializer)
 isEmpty
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/util/UUID;)Z
  (Lcom/fasterxml/jackson/databind/SerializerProvider;Ljava/util/UUID;)Z
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/ArrayType.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/ArrayType.eea
index c231eb03a9..873cec9e64 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/ArrayType.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/ArrayType.eea
@@ -22,13 +22,13 @@ equals
  (L0java/lang/Object;)Z # @Inherited(com.fasterxml.jackson.databind.JavaType)
 getContentType
  ()Lcom/fasterxml/jackson/databind/JavaType;
- ()Lcom/fasterxml/jackson/databind/JavaType;
+ ()L0com/fasterxml/jackson/databind/JavaType; # @Inherited(com.fasterxml.jackson.databind.JavaType)
 getContentTypeHandler
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.JavaType)
 getContentValueHandler
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.JavaType)
 getEmptyArray
  ()[Ljava/lang/Object;
  ()[Ljava/lang/Object;
@@ -40,7 +40,7 @@ getGenericSignature
  (L1java/lang/StringBuilder;)L1java/lang/StringBuilder; # @Inherited(com.fasterxml.jackson.databind.type.TypeBase)
 refine
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
- (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/JavaType;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(com.fasterxml.jackson.databind.JavaType)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/ClassStack.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/ClassStack.eea
index 2d70419ab9..057593a0e4 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/ClassStack.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/ClassStack.eea
@@ -15,10 +15,10 @@ addSelfReference
  (Lcom/fasterxml/jackson/databind/type/ResolvedRecursiveType;)V
 child
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/type/ClassStack;
- (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/type/ClassStack;
+ (Ljava/lang/Class<*>;)L1com/fasterxml/jackson/databind/type/ClassStack;
 find
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/type/ClassStack;
- (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/type/ClassStack;
+ (Ljava/lang/Class<*>;)L0com/fasterxml/jackson/databind/type/ClassStack;
 resolveSelfReferences
  (Lcom/fasterxml/jackson/databind/JavaType;)V
  (Lcom/fasterxml/jackson/databind/JavaType;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/CollectionLikeType.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/CollectionLikeType.eea
index 08dfda0e0a..91a987e385 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/CollectionLikeType.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/CollectionLikeType.eea
@@ -8,7 +8,7 @@ construct
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/type/CollectionLikeType;
 upgradeFrom
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/type/CollectionLikeType;
- (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/type/CollectionLikeType;
+ (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/type/CollectionLikeType;
 
 _elementType
  Lcom/fasterxml/jackson/databind/JavaType;
@@ -22,19 +22,19 @@ _elementType
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/Object;Ljava/lang/Object;Z)V
 buildCanonicalName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(com.fasterxml.jackson.databind.JavaType)
 getContentType
  ()Lcom/fasterxml/jackson/databind/JavaType;
- ()Lcom/fasterxml/jackson/databind/JavaType;
+ ()L0com/fasterxml/jackson/databind/JavaType; # @Inherited(com.fasterxml.jackson.databind.JavaType)
 getContentTypeHandler
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.JavaType)
 getContentValueHandler
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.JavaType)
 getErasedSignature
  (Ljava/lang/StringBuilder;)Ljava/lang/StringBuilder;
  (L1java/lang/StringBuilder;)L1java/lang/StringBuilder; # @Inherited(com.fasterxml.jackson.databind.type.TypeBase)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/IterationType.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/IterationType.eea
index 0411ad1a49..8127b740ee 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/IterationType.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/IterationType.eea
@@ -5,7 +5,7 @@ construct
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/type/IterationType;
 upgradeFrom
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/type/IterationType;
- (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/type/IterationType;
+ (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/type/IterationType;
 
 _iteratedType
  Lcom/fasterxml/jackson/databind/JavaType;
@@ -19,10 +19,10 @@ _iteratedType
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/Object;Ljava/lang/Object;Z)V
 buildCanonicalName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(com.fasterxml.jackson.databind.type.SimpleType)
 getContentType
  ()Lcom/fasterxml/jackson/databind/JavaType;
- ()Lcom/fasterxml/jackson/databind/JavaType;
+ ()L0com/fasterxml/jackson/databind/JavaType; # @Inherited(com.fasterxml.jackson.databind.JavaType)
 getErasedSignature
  (Ljava/lang/StringBuilder;)Ljava/lang/StringBuilder;
  (L1java/lang/StringBuilder;)L1java/lang/StringBuilder; # @Inherited(com.fasterxml.jackson.databind.type.SimpleType)
@@ -31,7 +31,7 @@ getGenericSignature
  (L1java/lang/StringBuilder;)L1java/lang/StringBuilder; # @Inherited(com.fasterxml.jackson.databind.type.SimpleType)
 refine
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
- (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/JavaType; # @Inherited(com.fasterxml.jackson.databind.type.SimpleType)
 withContentType
  (Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
  (Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/JavaType; # @Inherited(com.fasterxml.jackson.databind.type.SimpleType)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/MapLikeType.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/MapLikeType.eea
index 4d88ff5cc4..28858990ac 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/MapLikeType.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/MapLikeType.eea
@@ -5,7 +5,7 @@ construct
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/type/MapLikeType;
 upgradeFrom
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/type/MapLikeType;
- (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/type/MapLikeType;
+ (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/type/MapLikeType;
 
 _keyType
  Lcom/fasterxml/jackson/databind/JavaType;
@@ -22,19 +22,19 @@ _valueType
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/Object;Ljava/lang/Object;Z)V
 buildCanonicalName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(com.fasterxml.jackson.databind.JavaType)
 getContentType
  ()Lcom/fasterxml/jackson/databind/JavaType;
- ()Lcom/fasterxml/jackson/databind/JavaType;
+ ()L0com/fasterxml/jackson/databind/JavaType; # @Inherited(com.fasterxml.jackson.databind.JavaType)
 getContentTypeHandler
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.JavaType)
 getContentValueHandler
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.databind.JavaType)
 getErasedSignature
  (Ljava/lang/StringBuilder;)Ljava/lang/StringBuilder;
  (L1java/lang/StringBuilder;)L1java/lang/StringBuilder; # @Inherited(com.fasterxml.jackson.databind.type.TypeBase)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/PlaceholderForType.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/PlaceholderForType.eea
index 5a71a60e2b..13eaacaf1d 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/PlaceholderForType.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/PlaceholderForType.eea
@@ -12,7 +12,7 @@ actualType
  (Lcom/fasterxml/jackson/databind/JavaType;)V
 buildCanonicalName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getErasedSignature
  (Ljava/lang/StringBuilder;)Ljava/lang/StringBuilder;
  (L1java/lang/StringBuilder;)L1java/lang/StringBuilder; # @Inherited(com.fasterxml.jackson.databind.type.TypeBase)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/ReferenceType.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/ReferenceType.eea
index b71fc7da86..4ea206b346 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/ReferenceType.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/ReferenceType.eea
@@ -8,7 +8,7 @@ construct
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/type/ReferenceType;
 upgradeFrom
  (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/type/ReferenceType;
- (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/type/ReferenceType;
+ (Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/type/ReferenceType;
 
 _anchorType
  Lcom/fasterxml/jackson/databind/JavaType;
@@ -25,7 +25,7 @@ _referencedType
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/Object;Ljava/lang/Object;Z)V
 buildCanonicalName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(com.fasterxml.jackson.databind.type.SimpleType)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(com.fasterxml.jackson.databind.type.SimpleType)
@@ -34,7 +34,7 @@ getAnchorType
  ()Lcom/fasterxml/jackson/databind/JavaType;
 getContentType
  ()Lcom/fasterxml/jackson/databind/JavaType;
- ()Lcom/fasterxml/jackson/databind/JavaType;
+ ()L0com/fasterxml/jackson/databind/JavaType; # @Inherited(com.fasterxml.jackson.databind.JavaType)
 getErasedSignature
  (Ljava/lang/StringBuilder;)Ljava/lang/StringBuilder;
  (L1java/lang/StringBuilder;)L1java/lang/StringBuilder; # @Inherited(com.fasterxml.jackson.databind.type.SimpleType)
@@ -46,7 +46,7 @@ getReferencedType
  ()L0com/fasterxml/jackson/databind/JavaType; # @Inherited(com.fasterxml.jackson.databind.JavaType)
 refine
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
- (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/JavaType; # @Inherited(com.fasterxml.jackson.databind.type.SimpleType)
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(com.fasterxml.jackson.databind.type.SimpleType)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/ResolvedRecursiveType.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/ResolvedRecursiveType.eea
index c9057c78e1..4c8b40bf80 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/ResolvedRecursiveType.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/ResolvedRecursiveType.eea
@@ -24,7 +24,7 @@ getSuperClass
  ()L0com/fasterxml/jackson/databind/JavaType; # @Inherited(com.fasterxml.jackson.databind.type.TypeBase)
 refine
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
- (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/JavaType;
 setReference
  (Lcom/fasterxml/jackson/databind/JavaType;)V
  (Lcom/fasterxml/jackson/databind/JavaType;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/SimpleType.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/SimpleType.eea
index adfd3523a5..a64118d121 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/SimpleType.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/SimpleType.eea
@@ -24,7 +24,7 @@ constructUnsafe
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;Ljava/lang/Object;Ljava/lang/Object;Z)V
 buildCanonicalName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(com.fasterxml.jackson.databind.JavaType)
@@ -36,7 +36,7 @@ getGenericSignature
  (L1java/lang/StringBuilder;)L1java/lang/StringBuilder; # @Inherited(com.fasterxml.jackson.databind.type.TypeBase)
 refine
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
- (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/JavaType;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(com.fasterxml.jackson.databind.JavaType)
@@ -48,7 +48,7 @@ withContentTypeHandler
  (Ljava/lang/Object;)L1com/fasterxml/jackson/databind/JavaType; # @Inherited(com.fasterxml.jackson.databind.JavaType)
 withContentValueHandler
  (Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/type/SimpleType;
- (Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/type/SimpleType;
+ (Ljava/lang/Object;)L1com/fasterxml/jackson/databind/type/SimpleType;
 withStaticTyping
  ()Lcom/fasterxml/jackson/databind/type/SimpleType;
  ()Lcom/fasterxml/jackson/databind/type/SimpleType;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/TypeBase.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/TypeBase.eea
index fe32824e77..6e0500a8c7 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/TypeBase.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/TypeBase.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/type/TypeBase
 
 _bogusSuperClass
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JavaType;
- (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Ljava/lang/Class<*>;)L0com/fasterxml/jackson/databind/JavaType;
 _classSignature
  (Ljava/lang/Class<*>;Ljava/lang/StringBuilder;Z)Ljava/lang/StringBuilder;
  (Ljava/lang/Class<*>;Ljava/lang/StringBuilder;Z)Ljava/lang/StringBuilder;
@@ -34,7 +34,7 @@ containedTypeName
  (I)L0java/lang/String; # @Inherited(com.fasterxml.jackson.databind.JavaType)
 findSuperType
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JavaType;
- (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Ljava/lang/Class<*>;)L0com/fasterxml/jackson/databind/JavaType;
 findTypeParameters
  (Ljava/lang/Class<*>;)[Lcom/fasterxml/jackson/databind/JavaType;
  (Ljava/lang/Class<*>;)[Lcom/fasterxml/jackson/databind/JavaType;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/TypeBindings.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/TypeBindings.eea
index f1afbdbebd..c0bd8b9d70 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/TypeBindings.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/TypeBindings.eea
@@ -2,47 +2,47 @@ class com/fasterxml/jackson/databind/type/TypeBindings
 
 create
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/type/TypeBindings;
- (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/type/TypeBindings;
+ (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/type/TypeBindings;
 create
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/type/TypeBindings;
- (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/type/TypeBindings;
+ (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/type/TypeBindings;
 create
  (Ljava/lang/Class<*>;Ljava/util/List<Lcom/fasterxml/jackson/databind/JavaType;>;)Lcom/fasterxml/jackson/databind/type/TypeBindings;
- (Ljava/lang/Class<*>;Ljava/util/List<Lcom/fasterxml/jackson/databind/JavaType;>;)Lcom/fasterxml/jackson/databind/type/TypeBindings;
+ (Ljava/lang/Class<*>;Ljava/util/List<Lcom/fasterxml/jackson/databind/JavaType;>;)L1com/fasterxml/jackson/databind/type/TypeBindings;
 create
  (Ljava/lang/Class<*>;[Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/type/TypeBindings;
- (Ljava/lang/Class<*>;[Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/type/TypeBindings;
+ (Ljava/lang/Class<*>;[Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/type/TypeBindings;
 create
  (Ljava/util/List<Ljava/lang/String;>;Ljava/util/List<Lcom/fasterxml/jackson/databind/JavaType;>;)Lcom/fasterxml/jackson/databind/type/TypeBindings;
- (Ljava/util/List<Ljava/lang/String;>;Ljava/util/List<Lcom/fasterxml/jackson/databind/JavaType;>;)Lcom/fasterxml/jackson/databind/type/TypeBindings;
+ (Ljava/util/List<Ljava/lang/String;>;Ljava/util/List<Lcom/fasterxml/jackson/databind/JavaType;>;)L1com/fasterxml/jackson/databind/type/TypeBindings;
 createIfNeeded
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/type/TypeBindings;
- (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/type/TypeBindings;
+ (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/type/TypeBindings;
 createIfNeeded
  (Ljava/lang/Class<*>;[Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/type/TypeBindings;
- (Ljava/lang/Class<*>;[Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/type/TypeBindings;
+ (Ljava/lang/Class<*>;[Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/type/TypeBindings;
 emptyBindings
  ()Lcom/fasterxml/jackson/databind/type/TypeBindings;
  ()Lcom/fasterxml/jackson/databind/type/TypeBindings;
 
 asKey
  (Ljava/lang/Class<*>;)Ljava/lang/Object;
- (Ljava/lang/Class<*>;)Ljava/lang/Object;
+ (Ljava/lang/Class<*>;)L0java/lang/Object;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 findBoundType
  (Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JavaType;
- (Ljava/lang/String;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Ljava/lang/String;)L0com/fasterxml/jackson/databind/JavaType;
 getBoundName
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getBoundType
  (I)Lcom/fasterxml/jackson/databind/JavaType;
- (I)Lcom/fasterxml/jackson/databind/JavaType;
+ (I)L0com/fasterxml/jackson/databind/JavaType;
 getBoundTypeOrNull
  (I)Lcom/fasterxml/jackson/databind/JavaType;
- (I)Lcom/fasterxml/jackson/databind/JavaType;
+ (I)L0com/fasterxml/jackson/databind/JavaType;
 getTypeParameters
  ()Ljava/util/List<Lcom/fasterxml/jackson/databind/JavaType;>;
  ()Ljava/util/List<Lcom/fasterxml/jackson/databind/JavaType;>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/TypeFactory.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/TypeFactory.eea
index 11ea01877b..d6ff0b9be4 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/TypeFactory.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/TypeFactory.eea
@@ -71,10 +71,10 @@ _constructSimple
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
 _findPrimitive
  (Ljava/lang/String;)Ljava/lang/Class<*>;
- (Ljava/lang/String;)Ljava/lang/Class<*>;
+ (Ljava/lang/String;)L0java/lang/Class<*>;
 _findWellKnownSimple
  (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JavaType;
- (Ljava/lang/Class<*>;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Ljava/lang/Class<*>;)L0com/fasterxml/jackson/databind/JavaType;
 _fromAny
  (Lcom/fasterxml/jackson/databind/type/ClassStack;Ljava/lang/reflect/Type;Lcom/fasterxml/jackson/databind/type/TypeBindings;)Lcom/fasterxml/jackson/databind/JavaType;
  (Lcom/fasterxml/jackson/databind/type/ClassStack;Ljava/lang/reflect/Type;Lcom/fasterxml/jackson/databind/type/TypeBindings;)Lcom/fasterxml/jackson/databind/JavaType;
@@ -92,19 +92,19 @@ _fromVariable
  (Lcom/fasterxml/jackson/databind/type/ClassStack;Ljava/lang/reflect/TypeVariable<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;)Lcom/fasterxml/jackson/databind/JavaType;
 _fromWellKnownClass
  (Lcom/fasterxml/jackson/databind/type/ClassStack;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/type/ClassStack;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/type/ClassStack;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/JavaType;
 _fromWellKnownInterface
  (Lcom/fasterxml/jackson/databind/type/ClassStack;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/type/ClassStack;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/type/ClassStack;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;)L0com/fasterxml/jackson/databind/JavaType;
 _fromWildcard
  (Lcom/fasterxml/jackson/databind/type/ClassStack;Ljava/lang/reflect/WildcardType;Lcom/fasterxml/jackson/databind/type/TypeBindings;)Lcom/fasterxml/jackson/databind/JavaType;
  (Lcom/fasterxml/jackson/databind/type/ClassStack;Ljava/lang/reflect/WildcardType;Lcom/fasterxml/jackson/databind/type/TypeBindings;)Lcom/fasterxml/jackson/databind/JavaType;
 _newSimpleType
  (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
- (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;Lcom/fasterxml/jackson/databind/JavaType;[Lcom/fasterxml/jackson/databind/JavaType;)L1com/fasterxml/jackson/databind/JavaType;
 _resolveSuperClass
  (Lcom/fasterxml/jackson/databind/type/ClassStack;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;)Lcom/fasterxml/jackson/databind/JavaType;
- (Lcom/fasterxml/jackson/databind/type/ClassStack;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;)Lcom/fasterxml/jackson/databind/JavaType;
+ (Lcom/fasterxml/jackson/databind/type/ClassStack;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;)L0com/fasterxml/jackson/databind/JavaType;
 _resolveSuperInterfaces
  (Lcom/fasterxml/jackson/databind/type/ClassStack;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;)[Lcom/fasterxml/jackson/databind/JavaType;
  (Lcom/fasterxml/jackson/databind/type/ClassStack;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/type/TypeBindings;)[Lcom/fasterxml/jackson/databind/JavaType;
@@ -248,4 +248,4 @@ withClassLoader
  (Ljava/lang/ClassLoader;)Lcom/fasterxml/jackson/databind/type/TypeFactory;
 withModifier
  (Lcom/fasterxml/jackson/databind/type/TypeModifier;)Lcom/fasterxml/jackson/databind/type/TypeFactory;
- (Lcom/fasterxml/jackson/databind/type/TypeModifier;)Lcom/fasterxml/jackson/databind/type/TypeFactory;
+ (Lcom/fasterxml/jackson/databind/type/TypeModifier;)L0com/fasterxml/jackson/databind/type/TypeFactory;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/TypeParser.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/TypeParser.eea
index 1ab1c9e624..04742d7dd0 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/TypeParser.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/type/TypeParser.eea
@@ -21,7 +21,7 @@ parseType
  (Lcom/fasterxml/jackson/databind/type/TypeParser$MyTokenizer;I)Lcom/fasterxml/jackson/databind/JavaType;
 parseTypes
  (Lcom/fasterxml/jackson/databind/type/TypeParser$MyTokenizer;I)Ljava/util/List<Lcom/fasterxml/jackson/databind/JavaType;>;
- (Lcom/fasterxml/jackson/databind/type/TypeParser$MyTokenizer;I)Ljava/util/List<Lcom/fasterxml/jackson/databind/JavaType;>;
+ (Lcom/fasterxml/jackson/databind/type/TypeParser$MyTokenizer;I)L1java/util/List<Lcom/fasterxml/jackson/databind/JavaType;>;
 withFactory
  (Lcom/fasterxml/jackson/databind/type/TypeFactory;)Lcom/fasterxml/jackson/databind/type/TypeParser;
- (Lcom/fasterxml/jackson/databind/type/TypeFactory;)Lcom/fasterxml/jackson/databind/type/TypeParser;
+ (Lcom/fasterxml/jackson/databind/type/TypeFactory;)L1com/fasterxml/jackson/databind/type/TypeParser;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$BooleanBuilder.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$BooleanBuilder.eea
index 3eb60a4196..cad319c2ee 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$BooleanBuilder.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$BooleanBuilder.eea
@@ -6,4 +6,4 @@ super com/fasterxml/jackson/databind/util/PrimitiveArrayBuilder
 
 _constructArray
  (I)[Z
- (I)[Z
+ (I)[1Z
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$ByteBuilder.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$ByteBuilder.eea
index ec6b5df5b2..11c1c89a54 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$ByteBuilder.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$ByteBuilder.eea
@@ -6,4 +6,4 @@ super com/fasterxml/jackson/databind/util/PrimitiveArrayBuilder
 
 _constructArray
  (I)[B
- (I)[B
+ (I)[1B
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$DoubleBuilder.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$DoubleBuilder.eea
index 4363b4d53d..2a9f16f4bc 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$DoubleBuilder.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$DoubleBuilder.eea
@@ -6,4 +6,4 @@ super com/fasterxml/jackson/databind/util/PrimitiveArrayBuilder
 
 _constructArray
  (I)[D
- (I)[D
+ (I)[1D
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$FloatBuilder.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$FloatBuilder.eea
index 52aaac966c..05d2c7ee6e 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$FloatBuilder.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$FloatBuilder.eea
@@ -6,4 +6,4 @@ super com/fasterxml/jackson/databind/util/PrimitiveArrayBuilder
 
 _constructArray
  (I)[F
- (I)[F
+ (I)[1F
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$IntBuilder.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$IntBuilder.eea
index 308fc55495..104075cf37 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$IntBuilder.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$IntBuilder.eea
@@ -6,4 +6,4 @@ super com/fasterxml/jackson/databind/util/PrimitiveArrayBuilder
 
 _constructArray
  (I)[I
- (I)[I
+ (I)[1I
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$LongBuilder.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$LongBuilder.eea
index 058d8d720e..0e30af4ea0 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$LongBuilder.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$LongBuilder.eea
@@ -6,4 +6,4 @@ super com/fasterxml/jackson/databind/util/PrimitiveArrayBuilder
 
 _constructArray
  (I)[J
- (I)[J
+ (I)[1J
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$ShortBuilder.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$ShortBuilder.eea
index b46bf01647..4311c93dfa 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$ShortBuilder.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders$ShortBuilder.eea
@@ -6,4 +6,4 @@ super com/fasterxml/jackson/databind/util/PrimitiveArrayBuilder
 
 _constructArray
  (I)[S
- (I)[S
+ (I)[1S
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders.eea
index e51714ef8e..fe494ac88a 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ArrayBuilders.eea
@@ -2,10 +2,10 @@ class com/fasterxml/jackson/databind/util/ArrayBuilders
 
 arrayToSet
  <T:Ljava/lang/Object;>([TT;)Ljava/util/HashSet<TT;>;
- <T:Ljava/lang/Object;>([TT;)Ljava/util/HashSet<TT;>;
+ <T:Ljava/lang/Object;>([TT;)L1java/util/HashSet<TT;>;
 getArrayComparator
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object;
 insertInListNoDup
  <T:Ljava/lang/Object;>([TT;TT;)[TT;
  <T:Ljava/lang/Object;>([TT;TT;)[TT;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/BeanUtil.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/BeanUtil.eea
index 6073d6e204..ff9c0fa766 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/BeanUtil.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/BeanUtil.eea
@@ -2,10 +2,10 @@ class com/fasterxml/jackson/databind/util/BeanUtil
 
 checkUnsupportedType
  (Lcom/fasterxml/jackson/databind/JavaType;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/JavaType;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/JavaType;)L0java/lang/String;
 getDefaultValue
  (Lcom/fasterxml/jackson/databind/JavaType;)Ljava/lang/Object;
- (Lcom/fasterxml/jackson/databind/JavaType;)Ljava/lang/Object;
+ (Lcom/fasterxml/jackson/databind/JavaType;)L0java/lang/Object;
 isCglibGetCallbacks
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Z
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Z
@@ -23,22 +23,22 @@ isJodaTimeClass
  (Ljava/lang/Class<*>;)Z
 legacyManglePropertyName
  (Ljava/lang/String;I)Ljava/lang/String;
- (Ljava/lang/String;I)Ljava/lang/String;
+ (Ljava/lang/String;I)L0java/lang/String;
 okNameForGetter
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Z)Ljava/lang/String;
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Z)Ljava/lang/String;
 okNameForIsGetter
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;Z)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;Z)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;Z)L0java/lang/String;
 okNameForMutator
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;Z)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;Z)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;Z)L0java/lang/String;
 okNameForRegularGetter
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;Z)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;Z)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Ljava/lang/String;Z)L0java/lang/String;
 okNameForSetter
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Z)Ljava/lang/String;
  (Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;Z)Ljava/lang/String;
 stdManglePropertyName
  (Ljava/lang/String;I)Ljava/lang/String;
- (Ljava/lang/String;I)Ljava/lang/String;
+ (Ljava/lang/String;I)L0java/lang/String;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ClassUtil.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ClassUtil.eea
index 8785dcdfa7..410586653a 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ClassUtil.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ClassUtil.eea
@@ -2,13 +2,13 @@ class com/fasterxml/jackson/databind/util/ClassUtil
 
 apostrophed
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 backticked
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 canBeABeanType
  (Ljava/lang/Class<*>;)Ljava/lang/String;
- (Ljava/lang/Class<*>;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;)L0java/lang/String;
 checkAndFixAccess
  (Ljava/lang/reflect/Member;)V
  (Ljava/lang/reflect/Member;)V
@@ -29,7 +29,7 @@ closeOnFailAndThrowAsIOE
  (Lcom/fasterxml/jackson/core/JsonGenerator;Ljava/lang/Exception;)V
 createInstance
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Z)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Z)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Z)T0T;
 defaultValue
  (Ljava/lang/Class<*>;)Ljava/lang/Object;
  (Ljava/lang/Class<*>;)Ljava/lang/Object;
@@ -44,7 +44,7 @@ findClassAnnotations
  (Ljava/lang/Class<*>;)[Ljava/lang/annotation/Annotation;
 findConstructor
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Z)Ljava/lang/reflect/Constructor<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Z)Ljava/lang/reflect/Constructor<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Z)L0java/lang/reflect/Constructor<TT;>;
 findEnumType
  (Ljava/lang/Class<*>;)Ljava/lang/Class<+Ljava/lang/Enum<*>;>;
  (Ljava/lang/Class<*>;)Ljava/lang/Class<+Ljava/lang/Enum<*>;>;
@@ -59,7 +59,7 @@ findEnumType
  (Ljava/util/EnumSet<*>;)Ljava/lang/Class<+Ljava/lang/Enum<*>;>;
 findFirstAnnotatedEnumValue
  <T::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<Ljava/lang/Enum<*>;>;Ljava/lang/Class<TT;>;)Ljava/lang/Enum<*>;
- <T::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<Ljava/lang/Enum<*>;>;Ljava/lang/Class<TT;>;)Ljava/lang/Enum<*>;
+ <T::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<Ljava/lang/Enum<*>;>;Ljava/lang/Class<TT;>;)L0java/lang/Enum<*>;
 findRawSuperTypes
  (Ljava/lang/Class<*>;Ljava/lang/Class<*>;Z)Ljava/util/List<Ljava/lang/Class<*>;>;
  (Ljava/lang/Class<*>;Ljava/lang/Class<*>;Z)Ljava/util/List<Ljava/lang/Class<*>;>;
@@ -104,7 +104,7 @@ getGenericSuperclass
  (Ljava/lang/Class<*>;)Ljava/lang/reflect/Type;
 getOuterClass
  (Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
- (Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
+ (Ljava/lang/Class<*>;)L0java/lang/Class<*>;
 getPackageName
  (Ljava/lang/Class<*>;)Ljava/lang/String;
  (Ljava/lang/Class<*>;)Ljava/lang/String;
@@ -113,7 +113,7 @@ getRootCause
  (Ljava/lang/Throwable;)Ljava/lang/Throwable;
 getTypeDescription
  (Lcom/fasterxml/jackson/databind/JavaType;)Ljava/lang/String;
- (Lcom/fasterxml/jackson/databind/JavaType;)Ljava/lang/String;
+ (Lcom/fasterxml/jackson/databind/JavaType;)L1java/lang/String;
 hasClass
  (Ljava/lang/Object;Ljava/lang/Class<*>;)Z
  (Ljava/lang/Object;Ljava/lang/Class<*>;)Z
@@ -149,7 +149,7 @@ isJacksonStdImpl
  (Ljava/lang/Object;)Z
 isLocalType
  (Ljava/lang/Class<*>;Z)Ljava/lang/String;
- (Ljava/lang/Class<*>;Z)Ljava/lang/String;
+ (Ljava/lang/Class<*>;Z)L0java/lang/String;
 isNonStaticInnerClass
  (Ljava/lang/Class<*>;)Z
  (Ljava/lang/Class<*>;)Z
@@ -182,10 +182,10 @@ nonNullString
  (Ljava/lang/String;)Ljava/lang/String;
 nullOrToString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)Ljava/lang/String; # @PolyNull
 primitiveType
  (Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
- (Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
+ (Ljava/lang/Class<*>;)L0java/lang/Class<*>;
 quotedOr
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
@@ -200,7 +200,7 @@ throwAsIAE
  (Ljava/lang/Throwable;Ljava/lang/String;)V
 throwAsMappingException
  <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/io/IOException;)TT;
- <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/io/IOException;)TT;
+ <T:Ljava/lang/Object;>(Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/io/IOException;)T1T;
 throwIfError
  (Ljava/lang/Throwable;)Ljava/lang/Throwable;
  (Ljava/lang/Throwable;)Ljava/lang/Throwable;
@@ -224,4 +224,4 @@ verifyMustOverride
  (Ljava/lang/Class<*>;Ljava/lang/Object;Ljava/lang/String;)V
 wrapperType
  (Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
- (Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
+ (Ljava/lang/Class<*>;)L1java/lang/Class<*>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/CompactStringObjectMap.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/CompactStringObjectMap.eea
index af3158422f..314ec0ba8d 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/CompactStringObjectMap.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/CompactStringObjectMap.eea
@@ -9,7 +9,7 @@ find
  (Ljava/lang/String;)Ljava/lang/Object;
 findCaseInsensitive
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 keys
  ()Ljava/util/List<Ljava/lang/String;>;
  ()Ljava/util/List<Ljava/lang/String;>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/EnumResolver.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/EnumResolver.eea
index 0057dc7a2c..d0e0e8b8c0 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/EnumResolver.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/EnumResolver.eea
@@ -8,10 +8,10 @@ _enumConstants
  (Ljava/lang/Class<*>;)[Ljava/lang/Enum<*>;
 _enumDefault
  (Lcom/fasterxml/jackson/databind/AnnotationIntrospector;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;[Ljava/lang/Enum<*>;)Ljava/lang/Enum<*>;
- (Lcom/fasterxml/jackson/databind/AnnotationIntrospector;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;[Ljava/lang/Enum<*>;)Ljava/lang/Enum<*>;
+ (Lcom/fasterxml/jackson/databind/AnnotationIntrospector;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;[Ljava/lang/Enum<*>;)L0java/lang/Enum<*>;
 _enumDefault
  (Lcom/fasterxml/jackson/databind/AnnotationIntrospector;Ljava/lang/Class<*>;)Ljava/lang/Enum<*>;
- (Lcom/fasterxml/jackson/databind/AnnotationIntrospector;Ljava/lang/Class<*>;)Ljava/lang/Enum<*>;
+ (Lcom/fasterxml/jackson/databind/AnnotationIntrospector;Ljava/lang/Class<*>;)L0java/lang/Enum<*>;
 _isIntType
  (Ljava/lang/Class<*>;)Z
  (Ljava/lang/Class<*>;)Z
@@ -35,10 +35,10 @@ constructUsingIndex
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Ljava/lang/Class<Ljava/lang/Enum<*>;>;)Lcom/fasterxml/jackson/databind/util/EnumResolver;
 constructUsingMethod
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/util/EnumResolver;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/util/EnumResolver;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L1com/fasterxml/jackson/databind/util/EnumResolver;
 constructUsingMethod
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/util/EnumResolver;
- (Lcom/fasterxml/jackson/databind/DeserializationConfig;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/util/EnumResolver;
+ (Lcom/fasterxml/jackson/databind/DeserializationConfig;Ljava/lang/Class<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L1com/fasterxml/jackson/databind/util/EnumResolver;
 constructUsingToString
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/databind/util/EnumResolver;
  (Lcom/fasterxml/jackson/databind/DeserializationConfig;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/databind/util/EnumResolver;
@@ -64,7 +64,7 @@ _enumsById
  (Ljava/lang/Class<Ljava/lang/Enum<*>;>;[Ljava/lang/Enum<*>;Ljava/util/HashMap<Ljava/lang/String;Ljava/lang/Enum<*>;>;Ljava/lang/Enum<*>;ZZ)V
 _findEnumCaseInsensitive
  (Ljava/lang/String;)Ljava/lang/Enum<*>;
- (Ljava/lang/String;)Ljava/lang/Enum<*>;
+ (Ljava/lang/String;)L0java/lang/Enum<*>;
 constructLookup
  ()Lcom/fasterxml/jackson/databind/util/CompactStringObjectMap;
  ()Lcom/fasterxml/jackson/databind/util/CompactStringObjectMap;
@@ -76,7 +76,7 @@ getDefaultValue
  ()Ljava/lang/Enum<*>;
 getEnum
  (I)Ljava/lang/Enum<*>;
- (I)Ljava/lang/Enum<*>;
+ (I)L0java/lang/Enum<*>;
 getEnumClass
  ()Ljava/lang/Class<Ljava/lang/Enum<*>;>;
  ()Ljava/lang/Class<Ljava/lang/Enum<*>;>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/EnumValues.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/EnumValues.eea
index 51f106da82..846e03e91d 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/EnumValues.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/EnumValues.eea
@@ -14,7 +14,7 @@ construct
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Ljava/lang/Class<Ljava/lang/Enum<*>;>;Ljava/util/List<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/util/EnumValues;
 construct
  (Ljava/lang/Class<Ljava/lang/Enum<*>;>;[Lcom/fasterxml/jackson/core/SerializableString;)Lcom/fasterxml/jackson/databind/util/EnumValues;
- (Ljava/lang/Class<Ljava/lang/Enum<*>;>;[Lcom/fasterxml/jackson/core/SerializableString;)Lcom/fasterxml/jackson/databind/util/EnumValues;
+ (Ljava/lang/Class<Ljava/lang/Enum<*>;>;[Lcom/fasterxml/jackson/core/SerializableString;)L1com/fasterxml/jackson/databind/util/EnumValues;
 constructFromName
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/databind/util/EnumValues;
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedClass;)Lcom/fasterxml/jackson/databind/util/EnumValues;
@@ -42,7 +42,7 @@ getEnumClass
  ()Ljava/lang/Class<Ljava/lang/Enum<*>;>;
 internalMap
  ()Ljava/util/EnumMap<*Lcom/fasterxml/jackson/core/SerializableString;>;
- ()Ljava/util/EnumMap<*Lcom/fasterxml/jackson/core/SerializableString;>;
+ ()L1java/util/EnumMap<*Lcom/fasterxml/jackson/core/SerializableString;>;
 serializedValueFor
  (Ljava/lang/Enum<*>;)Lcom/fasterxml/jackson/core/SerializableString;
  (Ljava/lang/Enum<*>;)Lcom/fasterxml/jackson/core/SerializableString;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ExceptionUtil.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ExceptionUtil.eea
index c07ef5464d..57009d68eb 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ExceptionUtil.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ExceptionUtil.eea
@@ -5,4 +5,4 @@ rethrowIfFatal
  (Ljava/lang/Throwable;)V
 throwSneaky
  <T:Ljava/lang/Object;>(Ljava/io/IOException;)TT;
- <T:Ljava/lang/Object;>(Ljava/io/IOException;)TT;
+ <T:Ljava/lang/Object;>(Ljava/io/IOException;)T0T;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ISO8601DateFormat.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ISO8601DateFormat.eea
index a85ca30ad9..9d9204daed 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ISO8601DateFormat.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ISO8601DateFormat.eea
@@ -11,4 +11,4 @@ parse
  (Ljava/lang/String;)Ljava/util/Date;
 parse
  (Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/util/Date;
- (Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/util/Date;
+ (Ljava/lang/String;Ljava/text/ParsePosition;)L0java/util/Date;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ISO8601Utils.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ISO8601Utils.eea
index a050172a88..029b644030 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ISO8601Utils.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ISO8601Utils.eea
@@ -11,7 +11,7 @@ format
  (Ljava/util/Date;ZLjava/util/TimeZone;)Ljava/lang/String;
 format
  (Ljava/util/Date;ZLjava/util/TimeZone;Ljava/util/Locale;)Ljava/lang/String;
- (Ljava/util/Date;ZLjava/util/TimeZone;Ljava/util/Locale;)Ljava/lang/String;
+ (Ljava/util/Date;ZLjava/util/TimeZone;Ljava/util/Locale;)L1java/lang/String;
 parse
  (Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/util/Date;
  (Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/util/Date;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/IgnorePropertiesUtil$Checker.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/IgnorePropertiesUtil$Checker.eea
index 72af43b268..2534dc929b 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/IgnorePropertiesUtil$Checker.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/IgnorePropertiesUtil$Checker.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/util/IgnorePropertiesUtil$Checker
 
 construct
  (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/util/IgnorePropertiesUtil$Checker;
- (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/util/IgnorePropertiesUtil$Checker;
+ (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)L1com/fasterxml/jackson/databind/util/IgnorePropertiesUtil$Checker;
 
 shouldIgnore
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/IgnorePropertiesUtil.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/IgnorePropertiesUtil.eea
index f7c6474b87..2c46f398b4 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/IgnorePropertiesUtil.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/IgnorePropertiesUtil.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/util/IgnorePropertiesUtil
 
 buildCheckerIfNeeded
  (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/util/IgnorePropertiesUtil$Checker;
- (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)Lcom/fasterxml/jackson/databind/util/IgnorePropertiesUtil$Checker;
+ (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)L0com/fasterxml/jackson/databind/util/IgnorePropertiesUtil$Checker;
 combineNamesToInclude
  (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)Ljava/util/Set<Ljava/lang/String;>;
  (Ljava/util/Set<Ljava/lang/String;>;Ljava/util/Set<Ljava/lang/String;>;)Ljava/util/Set<Ljava/lang/String;>;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/LRUMap.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/LRUMap.eea
index 7259347bdc..f8c226670c 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/LRUMap.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/LRUMap.eea
@@ -15,7 +15,7 @@ contents
  (Ljava/util/function/BiConsumer<TK;TV;>;)V
 emptyCopy
  ()Lcom/fasterxml/jackson/databind/util/LookupCache<TK;TV;>;
- ()Lcom/fasterxml/jackson/databind/util/LookupCache<TK;TV;>;
+ ()L1com/fasterxml/jackson/databind/util/LookupCache<TK;TV;>; # @Inherited(com.fasterxml.jackson.databind.util.LookupCache)
 get
  (Ljava/lang/Object;)TV;
  (Ljava/lang/Object;)TV;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/LookupCache.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/LookupCache.eea
index 8d11a21a43..07871236f6 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/LookupCache.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/LookupCache.eea
@@ -7,7 +7,7 @@ contents
  (Ljava/util/function/BiConsumer<TK;TV;>;)V
 emptyCopy
  ()Lcom/fasterxml/jackson/databind/util/LookupCache<TK;TV;>;
- ()Lcom/fasterxml/jackson/databind/util/LookupCache<TK;TV;>;
+ ()L1com/fasterxml/jackson/databind/util/LookupCache<TK;TV;>;
 get
  (Ljava/lang/Object;)TV;
  (Ljava/lang/Object;)TV;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/NameTransformer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/NameTransformer.eea
index 0831b41755..eb46507385 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/NameTransformer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/NameTransformer.eea
@@ -6,7 +6,7 @@ NOP
 
 chainedTransformer
  (Lcom/fasterxml/jackson/databind/util/NameTransformer;Lcom/fasterxml/jackson/databind/util/NameTransformer;)Lcom/fasterxml/jackson/databind/util/NameTransformer;
- (Lcom/fasterxml/jackson/databind/util/NameTransformer;Lcom/fasterxml/jackson/databind/util/NameTransformer;)Lcom/fasterxml/jackson/databind/util/NameTransformer;
+ (Lcom/fasterxml/jackson/databind/util/NameTransformer;Lcom/fasterxml/jackson/databind/util/NameTransformer;)L1com/fasterxml/jackson/databind/util/NameTransformer;
 simpleTransformer
  (Ljava/lang/String;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/util/NameTransformer;
  (Ljava/lang/String;Ljava/lang/String;)Lcom/fasterxml/jackson/databind/util/NameTransformer;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ObjectBuffer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ObjectBuffer.eea
index b9326ec9d7..fbdadb1bf2 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ObjectBuffer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/ObjectBuffer.eea
@@ -5,10 +5,10 @@ _copyTo
  (Ljava/lang/Object;I[Ljava/lang/Object;I)V
 appendCompletedChunk
  ([Ljava/lang/Object;)[Ljava/lang/Object;
- ([Ljava/lang/Object;)[Ljava/lang/Object;
+ ([Ljava/lang/Object;)[1Ljava/lang/Object;
 completeAndClearBuffer
  ([Ljava/lang/Object;I)[Ljava/lang/Object;
- ([Ljava/lang/Object;I)[Ljava/lang/Object;
+ ([Ljava/lang/Object;I)[1Ljava/lang/Object;
 completeAndClearBuffer
  ([Ljava/lang/Object;ILjava/util/List<Ljava/lang/Object;>;)V
  ([Ljava/lang/Object;ILjava/util/List<Ljava/lang/Object;>;)V
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/SimpleBeanPropertyDefinition.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/SimpleBeanPropertyDefinition.eea
index 889994e704..9f4c85b06c 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/SimpleBeanPropertyDefinition.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/SimpleBeanPropertyDefinition.eea
@@ -2,16 +2,16 @@ class com/fasterxml/jackson/databind/util/SimpleBeanPropertyDefinition
 
 construct
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/util/SimpleBeanPropertyDefinition;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)Lcom/fasterxml/jackson/databind/util/SimpleBeanPropertyDefinition;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;)L1com/fasterxml/jackson/databind/util/SimpleBeanPropertyDefinition;
 construct
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/util/SimpleBeanPropertyDefinition;
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/PropertyName;)Lcom/fasterxml/jackson/databind/util/SimpleBeanPropertyDefinition;
 construct
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/PropertyName;Lcom/fasterxml/jackson/databind/PropertyMetadata;Lcom/fasterxml/jackson/annotation/JsonInclude$Include;)Lcom/fasterxml/jackson/databind/util/SimpleBeanPropertyDefinition;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/PropertyName;Lcom/fasterxml/jackson/databind/PropertyMetadata;Lcom/fasterxml/jackson/annotation/JsonInclude$Include;)Lcom/fasterxml/jackson/databind/util/SimpleBeanPropertyDefinition;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/PropertyName;Lcom/fasterxml/jackson/databind/PropertyMetadata;Lcom/fasterxml/jackson/annotation/JsonInclude$Include;)L1com/fasterxml/jackson/databind/util/SimpleBeanPropertyDefinition;
 construct
  (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/PropertyName;Lcom/fasterxml/jackson/databind/PropertyMetadata;Lcom/fasterxml/jackson/annotation/JsonInclude$Value;)Lcom/fasterxml/jackson/databind/util/SimpleBeanPropertyDefinition;
- (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/PropertyName;Lcom/fasterxml/jackson/databind/PropertyMetadata;Lcom/fasterxml/jackson/annotation/JsonInclude$Value;)Lcom/fasterxml/jackson/databind/util/SimpleBeanPropertyDefinition;
+ (Lcom/fasterxml/jackson/databind/cfg/MapperConfig<*>;Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;Lcom/fasterxml/jackson/databind/PropertyName;Lcom/fasterxml/jackson/databind/PropertyMetadata;Lcom/fasterxml/jackson/annotation/JsonInclude$Value;)L1com/fasterxml/jackson/databind/util/SimpleBeanPropertyDefinition;
 
 _annotationIntrospector
  Lcom/fasterxml/jackson/databind/AnnotationIntrospector;
@@ -40,19 +40,19 @@ findInclusion
  ()Lcom/fasterxml/jackson/annotation/JsonInclude$Value;
 getConstructorParameter
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedParameter;
 getConstructorParameters
  ()Ljava/util/Iterator<Lcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;>;
  ()Ljava/util/Iterator<Lcom/fasterxml/jackson/databind/introspect/AnnotatedParameter;>;
 getField
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedField;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedField;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedField;
 getFullName
  ()Lcom/fasterxml/jackson/databind/PropertyName;
  ()Lcom/fasterxml/jackson/databind/PropertyName;
 getGetter
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedMethod;
 getInternalName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -73,10 +73,10 @@ getRawPrimaryType
  ()Ljava/lang/Class<*>;
 getSetter
  ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
- ()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;
+ ()L0com/fasterxml/jackson/databind/introspect/AnnotatedMethod;
 getWrapperName
  ()Lcom/fasterxml/jackson/databind/PropertyName;
- ()Lcom/fasterxml/jackson/databind/PropertyName;
+ ()L0com/fasterxml/jackson/databind/PropertyName;
 hasName
  (Lcom/fasterxml/jackson/databind/PropertyName;)Z
  (Lcom/fasterxml/jackson/databind/PropertyName;)Z
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/StdDateFormat.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/StdDateFormat.eea
index e0d4cda1d1..b2e90b0e44 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/StdDateFormat.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/StdDateFormat.eea
@@ -45,7 +45,7 @@ getDefaultTimeZone
  ()Ljava/util/TimeZone;
 getISO8601Format
  (Ljava/util/TimeZone;Ljava/util/Locale;)Ljava/text/DateFormat;
- (Ljava/util/TimeZone;Ljava/util/Locale;)Ljava/text/DateFormat;
+ (Ljava/util/TimeZone;Ljava/util/Locale;)L1java/text/DateFormat;
 getRFC1123Format
  (Ljava/util/TimeZone;Ljava/util/Locale;)Ljava/text/DateFormat;
  (Ljava/util/TimeZone;Ljava/util/Locale;)Ljava/text/DateFormat;
@@ -104,7 +104,7 @@ parse
  (Ljava/lang/String;)Ljava/util/Date;
 parse
  (Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/util/Date;
- (Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/util/Date;
+ (Ljava/lang/String;Ljava/text/ParsePosition;)L0java/util/Date;
 parseAsISO8601
  (Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/util/Date;
  (Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/util/Date;
@@ -116,7 +116,7 @@ setTimeZone
  (Ljava/util/TimeZone;)V
 toPattern
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/TokenBuffer$Parser.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/TokenBuffer$Parser.eea
index 08bbc462bb..ff422acd9f 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/TokenBuffer$Parser.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/TokenBuffer$Parser.eea
@@ -51,7 +51,7 @@ getBigIntegerValue
  ()Ljava/math/BigInteger;
 getBinaryValue
  (Lcom/fasterxml/jackson/core/Base64Variant;)[B
- (Lcom/fasterxml/jackson/core/Base64Variant;)[B
+ (Lcom/fasterxml/jackson/core/Base64Variant;)[0B
 getCodec
  ()Lcom/fasterxml/jackson/core/ObjectCodec;
  ()Lcom/fasterxml/jackson/core/ObjectCodec;
@@ -66,10 +66,10 @@ getDecimalValue
  ()Ljava/math/BigDecimal;
 getEmbeddedObject
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 getNumberType
  ()Lcom/fasterxml/jackson/core/JsonParser$NumberType;
- ()Lcom/fasterxml/jackson/core/JsonParser$NumberType;
+ ()L0com/fasterxml/jackson/core/JsonParser$NumberType;
 getNumberTypeFP
  ()Lcom/fasterxml/jackson/core/JsonParser$NumberTypeFP;
  ()Lcom/fasterxml/jackson/core/JsonParser$NumberTypeFP;
@@ -81,7 +81,7 @@ getNumberValueDeferred
  ()Ljava/lang/Object;
 getObjectId
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 getParsingContext
  ()Lcom/fasterxml/jackson/core/JsonStreamContext;
  ()Lcom/fasterxml/jackson/core/JsonStreamContext;
@@ -90,7 +90,7 @@ getReadCapabilities
  ()Lcom/fasterxml/jackson/core/util/JacksonFeatureSet<Lcom/fasterxml/jackson/core/StreamReadCapability;>;
 getText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getTextCharacters
  ()[C
  ()[C
@@ -99,19 +99,19 @@ getTokenLocation
  ()Lcom/fasterxml/jackson/core/JsonLocation;
 getTypeId
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 nextFieldName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(com.fasterxml.jackson.core.JsonParser)
 nextToken
  ()Lcom/fasterxml/jackson/core/JsonToken;
- ()Lcom/fasterxml/jackson/core/JsonToken;
+ ()L0com/fasterxml/jackson/core/JsonToken;
 overrideCurrentName
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
 peekNextToken
  ()Lcom/fasterxml/jackson/core/JsonToken;
- ()Lcom/fasterxml/jackson/core/JsonToken;
+ ()L0com/fasterxml/jackson/core/JsonToken;
 readBinaryValue
  (Lcom/fasterxml/jackson/core/Base64Variant;Ljava/io/OutputStream;)I
  (Lcom/fasterxml/jackson/core/Base64Variant;Ljava/io/OutputStream;)I
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/TokenBuffer$Segment.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/TokenBuffer$Segment.eea
index 5b0d7b346a..aff3911a15 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/TokenBuffer$Segment.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/TokenBuffer$Segment.eea
@@ -12,16 +12,16 @@ _tokens
 
 append
  (ILcom/fasterxml/jackson/core/JsonToken;)Lcom/fasterxml/jackson/databind/util/TokenBuffer$Segment;
- (ILcom/fasterxml/jackson/core/JsonToken;)Lcom/fasterxml/jackson/databind/util/TokenBuffer$Segment;
+ (ILcom/fasterxml/jackson/core/JsonToken;)L0com/fasterxml/jackson/databind/util/TokenBuffer$Segment;
 append
  (ILcom/fasterxml/jackson/core/JsonToken;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/util/TokenBuffer$Segment;
- (ILcom/fasterxml/jackson/core/JsonToken;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/util/TokenBuffer$Segment;
+ (ILcom/fasterxml/jackson/core/JsonToken;Ljava/lang/Object;)L0com/fasterxml/jackson/databind/util/TokenBuffer$Segment;
 append
  (ILcom/fasterxml/jackson/core/JsonToken;Ljava/lang/Object;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/util/TokenBuffer$Segment;
- (ILcom/fasterxml/jackson/core/JsonToken;Ljava/lang/Object;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/util/TokenBuffer$Segment;
+ (ILcom/fasterxml/jackson/core/JsonToken;Ljava/lang/Object;Ljava/lang/Object;)L0com/fasterxml/jackson/databind/util/TokenBuffer$Segment;
 append
  (ILcom/fasterxml/jackson/core/JsonToken;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/util/TokenBuffer$Segment;
- (ILcom/fasterxml/jackson/core/JsonToken;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/fasterxml/jackson/databind/util/TokenBuffer$Segment;
+ (ILcom/fasterxml/jackson/core/JsonToken;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)L0com/fasterxml/jackson/databind/util/TokenBuffer$Segment;
 get
  (I)Ljava/lang/Object;
  (I)Ljava/lang/Object;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/TokenBuffer.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/TokenBuffer.eea
index c82e7b6ede..5095de9397 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/TokenBuffer.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/TokenBuffer.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/util/TokenBuffer
 
 asCopyOfValue
  (Lcom/fasterxml/jackson/core/JsonParser;)Lcom/fasterxml/jackson/databind/util/TokenBuffer;
- (Lcom/fasterxml/jackson/core/JsonParser;)Lcom/fasterxml/jackson/databind/util/TokenBuffer;
+ (Lcom/fasterxml/jackson/core/JsonParser;)L1com/fasterxml/jackson/databind/util/TokenBuffer;
 
 _first
  Lcom/fasterxml/jackson/databind/util/TokenBuffer$Segment;
diff --git a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/TokenBufferReadContext.eea b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/TokenBufferReadContext.eea
index 7b93b4309d..1a4d6250e9 100644
--- a/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/TokenBufferReadContext.eea
+++ b/libs/eea-jackson-2/src/main/resources/com/fasterxml/jackson/databind/util/TokenBufferReadContext.eea
@@ -2,7 +2,7 @@ class com/fasterxml/jackson/databind/util/TokenBufferReadContext
 
 createRootContext
  (Lcom/fasterxml/jackson/core/JsonStreamContext;)Lcom/fasterxml/jackson/databind/util/TokenBufferReadContext;
- (Lcom/fasterxml/jackson/core/JsonStreamContext;)Lcom/fasterxml/jackson/databind/util/TokenBufferReadContext;
+ (Lcom/fasterxml/jackson/core/JsonStreamContext;)L1com/fasterxml/jackson/databind/util/TokenBufferReadContext;
 
 _currentName
  Ljava/lang/String;
@@ -31,16 +31,16 @@ _startLocation
  (Lcom/fasterxml/jackson/databind/util/TokenBufferReadContext;II)V
 createChildArrayContext
  ()Lcom/fasterxml/jackson/databind/util/TokenBufferReadContext;
- ()Lcom/fasterxml/jackson/databind/util/TokenBufferReadContext;
+ ()L1com/fasterxml/jackson/databind/util/TokenBufferReadContext;
 createChildObjectContext
  ()Lcom/fasterxml/jackson/databind/util/TokenBufferReadContext;
- ()Lcom/fasterxml/jackson/databind/util/TokenBufferReadContext;
+ ()L1com/fasterxml/jackson/databind/util/TokenBufferReadContext;
 getCurrentName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getCurrentValue
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(com.fasterxml.jackson.core.JsonStreamContext)
 getParent
  ()Lcom/fasterxml/jackson/core/JsonStreamContext;
  ()Lcom/fasterxml/jackson/core/JsonStreamContext;
diff --git a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/Authenticator.eea b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/Authenticator.eea
index c759fd2c4d..6a6f700fc3 100644
--- a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/Authenticator.eea
+++ b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/Authenticator.eea
@@ -5,7 +5,7 @@ getDefaultUserName
  ()Ljava/lang/String;
 getPasswordAuthentication
  ()Ljakarta/mail/PasswordAuthentication;
- ()Ljakarta/mail/PasswordAuthentication;
+ ()L0jakarta/mail/PasswordAuthentication;
 getRequestingPrompt
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/FetchProfile.eea b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/FetchProfile.eea
index 043dbc6844..a49e7dcfb1 100644
--- a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/FetchProfile.eea
+++ b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/FetchProfile.eea
@@ -14,7 +14,7 @@ contains
  (Ljava/lang/String;)Z
 getHeaderNames
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 getItems
  ()[Ljakarta/mail/FetchProfile$Item;
- ()[Ljakarta/mail/FetchProfile$Item;
+ ()[1Ljakarta/mail/FetchProfile$Item;
diff --git a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/Flags.eea b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/Flags.eea
index 8c9908f1f3..674434e3be 100644
--- a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/Flags.eea
+++ b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/Flags.eea
@@ -35,10 +35,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getSystemFlags
  ()[Ljakarta/mail/Flags$Flag;
- ()[Ljakarta/mail/Flags$Flag;
+ ()[1Ljakarta/mail/Flags$Flag;
 getUserFlags
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 remove
  (Ljakarta/mail/Flags$Flag;)V
  (Ljakarta/mail/Flags$Flag;)V
diff --git a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/Folder.eea b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/Folder.eea
index f1e400a4c3..89b44cf9ed 100644
--- a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/Folder.eea
+++ b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/Folder.eea
@@ -42,13 +42,13 @@ getMessage
  (I)Ljakarta/mail/Message;
 getMessages
  ()[Ljakarta/mail/Message;
- ()[Ljakarta/mail/Message;
+ ()[1Ljakarta/mail/Message;
 getMessages
  (II)[Ljakarta/mail/Message;
- (II)[Ljakarta/mail/Message;
+ (II)[1Ljakarta/mail/Message;
 getMessages
  ([I)[Ljakarta/mail/Message;
- ([I)[Ljakarta/mail/Message;
+ ([I)[1Ljakarta/mail/Message;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -63,7 +63,7 @@ getStore
  ()Ljakarta/mail/Store;
 getURLName
  ()Ljakarta/mail/URLName;
- ()Ljakarta/mail/URLName;
+ ()L1jakarta/mail/URLName;
 list
  ()[Ljakarta/mail/Folder;
  ()[Ljakarta/mail/Folder;
diff --git a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/MessageContext.eea b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/MessageContext.eea
index 8b947f5247..fc707fd29b 100644
--- a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/MessageContext.eea
+++ b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/MessageContext.eea
@@ -5,10 +5,10 @@ class jakarta/mail/MessageContext
  (Ljakarta/mail/Part;)V
 getMessage
  ()Ljakarta/mail/Message;
- ()Ljakarta/mail/Message;
+ ()L0jakarta/mail/Message;
 getPart
  ()Ljakarta/mail/Part;
  ()Ljakarta/mail/Part;
 getSession
  ()Ljakarta/mail/Session;
- ()Ljakarta/mail/Session;
+ ()L0jakarta/mail/Session;
diff --git a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/Session.eea b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/Session.eea
index 6c71d9fb27..bf60d45427 100644
--- a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/Session.eea
+++ b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/Session.eea
@@ -8,10 +8,10 @@ getDefaultInstance
  (Ljava/util/Properties;Ljakarta/mail/Authenticator;)Ljakarta/mail/Session;
 getInstance
  (Ljava/util/Properties;)Ljakarta/mail/Session;
- (Ljava/util/Properties;)Ljakarta/mail/Session;
+ (Ljava/util/Properties;)L1jakarta/mail/Session;
 getInstance
  (Ljava/util/Properties;Ljakarta/mail/Authenticator;)Ljakarta/mail/Session;
- (Ljava/util/Properties;Ljakarta/mail/Authenticator;)Ljakarta/mail/Session;
+ (Ljava/util/Properties;Ljakarta/mail/Authenticator;)L1jakarta/mail/Session;
 
 addProvider
  (Ljakarta/mail/Provider;)V
@@ -36,7 +36,7 @@ getProvider
  (Ljava/lang/String;)Ljakarta/mail/Provider;
 getProviders
  ()[Ljakarta/mail/Provider;
- ()[Ljakarta/mail/Provider;
+ ()[1Ljakarta/mail/Provider;
 getStore
  ()Ljakarta/mail/Store;
  ()Ljakarta/mail/Store;
@@ -69,7 +69,7 @@ getTransport
  (Ljava/lang/String;)Ljakarta/mail/Transport;
 requestPasswordAuthentication
  (Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljakarta/mail/PasswordAuthentication;
- (Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljakarta/mail/PasswordAuthentication;
+ (Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)L0jakarta/mail/PasswordAuthentication;
 setDebugOut
  (Ljava/io/PrintStream;)V
  (Ljava/io/PrintStream;)V
diff --git a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/Store.eea b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/Store.eea
index bfa9e09b1c..9d60c49ece 100644
--- a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/Store.eea
+++ b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/Store.eea
@@ -23,10 +23,10 @@ getPersonalNamespaces
  ()[Ljakarta/mail/Folder;
 getSharedNamespaces
  ()[Ljakarta/mail/Folder;
- ()[Ljakarta/mail/Folder;
+ ()[1Ljakarta/mail/Folder;
 getUserNamespaces
  (Ljava/lang/String;)[Ljakarta/mail/Folder;
- (Ljava/lang/String;)[Ljakarta/mail/Folder;
+ (Ljava/lang/String;)[1Ljakarta/mail/Folder;
 notifyFolderListeners
  (ILjakarta/mail/Folder;)V
  (ILjakarta/mail/Folder;)V
diff --git a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/URLName.eea b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/URLName.eea
index 1ca279d9c5..7750eabbb8 100644
--- a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/URLName.eea
+++ b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/URLName.eea
@@ -33,7 +33,7 @@ getRef
  ()Ljava/lang/String;
 getURL
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L1java/net/URL;
 getUsername
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/ContentDisposition.eea b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/ContentDisposition.eea
index 8a52e18b37..e615169745 100644
--- a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/ContentDisposition.eea
+++ b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/ContentDisposition.eea
@@ -11,7 +11,7 @@ getDisposition
  ()Ljava/lang/String;
 getParameter
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getParameterList
  ()Ljakarta/mail/internet/ParameterList;
  ()Ljakarta/mail/internet/ParameterList;
diff --git a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/ContentType.eea b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/ContentType.eea
index 31cf0a9334..96fd4a46f8 100644
--- a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/ContentType.eea
+++ b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/ContentType.eea
@@ -8,10 +8,10 @@ class jakarta/mail/internet/ContentType
  (Ljava/lang/String;Ljava/lang/String;Ljakarta/mail/internet/ParameterList;)V
 getBaseType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getParameter
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getParameterList
  ()Ljakarta/mail/internet/ParameterList;
  ()Ljakarta/mail/internet/ParameterList;
diff --git a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/HeaderTokenizer.eea b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/HeaderTokenizer.eea
index 2c54f4c08a..b6b1a08fe1 100644
--- a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/HeaderTokenizer.eea
+++ b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/HeaderTokenizer.eea
@@ -18,7 +18,7 @@ RFC822
  (Ljava/lang/String;Ljava/lang/String;Z)V
 getRemainder
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 next
  ()Ljakarta/mail/internet/HeaderTokenizer$Token;
  ()Ljakarta/mail/internet/HeaderTokenizer$Token;
diff --git a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/InternetAddress.eea b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/InternetAddress.eea
index 82dc5bbbe7..d21a48c5c2 100644
--- a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/InternetAddress.eea
+++ b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/InternetAddress.eea
@@ -2,7 +2,7 @@ class jakarta/mail/internet/InternetAddress
 
 getLocalAddress
  (Ljakarta/mail/Session;)Ljakarta/mail/internet/InternetAddress;
- (Ljakarta/mail/Session;)Ljakarta/mail/internet/InternetAddress;
+ (Ljakarta/mail/Session;)L0jakarta/mail/internet/InternetAddress;
 parse
  (Ljava/lang/String;)[Ljakarta/mail/internet/InternetAddress;
  (Ljava/lang/String;)[Ljakarta/mail/internet/InternetAddress;
@@ -17,13 +17,13 @@ toString
  ([Ljakarta/mail/Address;)Ljava/lang/String;
 toString
  ([Ljakarta/mail/Address;I)Ljava/lang/String;
- ([Ljakarta/mail/Address;I)Ljava/lang/String;
+ ([Ljakarta/mail/Address;I)L0java/lang/String;
 toUnicodeString
  ([Ljakarta/mail/Address;)Ljava/lang/String;
  ([Ljakarta/mail/Address;)Ljava/lang/String;
 toUnicodeString
  ([Ljakarta/mail/Address;I)Ljava/lang/String;
- ([Ljakarta/mail/Address;I)Ljava/lang/String;
+ ([Ljakarta/mail/Address;I)L0java/lang/String;
 
 address
  Ljava/lang/String;
@@ -58,13 +58,13 @@ getAddress
  ()Ljava/lang/String;
 getGroup
  (Z)[Ljakarta/mail/internet/InternetAddress;
- (Z)[Ljakarta/mail/internet/InternetAddress;
+ (Z)[0Ljakarta/mail/internet/InternetAddress;
 getPersonal
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 setAddress
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/InternetHeaders.eea b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/InternetHeaders.eea
index 7e61df426f..54d4740eb3 100644
--- a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/InternetHeaders.eea
+++ b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/InternetHeaders.eea
@@ -24,10 +24,10 @@ getAllHeaders
  ()Ljava/util/Enumeration<Ljakarta/mail/Header;>;
 getHeader
  (Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/String;)[0Ljava/lang/String;
 getHeader
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L0java/lang/String;
 getMatchingHeaderLines
  ([Ljava/lang/String;)Ljava/util/Enumeration<Ljava/lang/String;>;
  ([Ljava/lang/String;)Ljava/util/Enumeration<Ljava/lang/String;>;
diff --git a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/MailDateFormat.eea b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/MailDateFormat.eea
index d3bcee7b4b..78e0137233 100644
--- a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/MailDateFormat.eea
+++ b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/MailDateFormat.eea
@@ -14,10 +14,10 @@ format
  (Ljava/util/Date;Ljava/lang/StringBuffer;Ljava/text/FieldPosition;)Ljava/lang/StringBuffer;
 get2DigitYearStart
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L1java/util/Date;
 parse
  (Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/util/Date;
- (Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/util/Date;
+ (Ljava/lang/String;Ljava/text/ParsePosition;)L0java/util/Date; # @Inherited(java.text.SimpleDateFormat)
 set2DigitYearStart
  (Ljava/util/Date;)V
  (Ljava/util/Date;)V
diff --git a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/MimeBodyPart.eea b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/MimeBodyPart.eea
index dc2ab89eaf..03e2d7dd80 100644
--- a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/MimeBodyPart.eea
+++ b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/MimeBodyPart.eea
@@ -63,7 +63,7 @@ getContentStream
  ()Ljava/io/InputStream;
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getDataHandler
  ()Ljakarta/activation/DataHandler;
  ()Ljakarta/activation/DataHandler;
diff --git a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/MimeMessage.eea b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/MimeMessage.eea
index 8d18fe29ae..f415aa4e4b 100644
--- a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/MimeMessage.eea
+++ b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/MimeMessage.eea
@@ -54,10 +54,10 @@ addRecipients
  (Ljakarta/mail/Message$RecipientType;[Ljakarta/mail/Address;)V
 createInternetHeaders
  (Ljava/io/InputStream;)Ljakarta/mail/internet/InternetHeaders;
- (Ljava/io/InputStream;)Ljakarta/mail/internet/InternetHeaders;
+ (Ljava/io/InputStream;)L1jakarta/mail/internet/InternetHeaders;
 createMimeMessage
  (Ljakarta/mail/Session;)Ljakarta/mail/internet/MimeMessage;
- (Ljakarta/mail/Session;)Ljakarta/mail/internet/MimeMessage;
+ (Ljakarta/mail/Session;)L1jakarta/mail/internet/MimeMessage;
 getAllHeaderLines
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
@@ -135,7 +135,7 @@ getRawInputStream
  ()Ljava/io/InputStream;
 getReceivedDate
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L0java/util/Date;
 getRecipients
  (Ljakarta/mail/Message$RecipientType;)[Ljakarta/mail/Address;
  (Ljakarta/mail/Message$RecipientType;)[Ljakarta/mail/Address;
@@ -144,13 +144,13 @@ getReplyTo
  ()[Ljakarta/mail/Address;
 getSender
  ()Ljakarta/mail/Address;
- ()Ljakarta/mail/Address;
+ ()L0jakarta/mail/Address;
 getSentDate
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L0java/util/Date;
 getSubject
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 isMimeType
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/MimeMultipart.eea b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/MimeMultipart.eea
index 6407d0889d..b3990869e8 100644
--- a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/MimeMultipart.eea
+++ b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/MimeMultipart.eea
@@ -27,19 +27,19 @@ addBodyPart
  (Ljakarta/mail/BodyPart;I)V
 createInternetHeaders
  (Ljava/io/InputStream;)Ljakarta/mail/internet/InternetHeaders;
- (Ljava/io/InputStream;)Ljakarta/mail/internet/InternetHeaders;
+ (Ljava/io/InputStream;)L1jakarta/mail/internet/InternetHeaders;
 createMimeBodyPart
  (Ljakarta/mail/internet/InternetHeaders;[B)Ljakarta/mail/internet/MimeBodyPart;
- (Ljakarta/mail/internet/InternetHeaders;[B)Ljakarta/mail/internet/MimeBodyPart;
+ (Ljakarta/mail/internet/InternetHeaders;[B)L1jakarta/mail/internet/MimeBodyPart;
 createMimeBodyPart
  (Ljava/io/InputStream;)Ljakarta/mail/internet/MimeBodyPart;
- (Ljava/io/InputStream;)Ljakarta/mail/internet/MimeBodyPart;
+ (Ljava/io/InputStream;)L1jakarta/mail/internet/MimeBodyPart;
 getBodyPart
  (I)Ljakarta/mail/BodyPart;
  (I)Ljakarta/mail/BodyPart;
 getBodyPart
  (Ljava/lang/String;)Ljakarta/mail/BodyPart;
- (Ljava/lang/String;)Ljakarta/mail/BodyPart;
+ (Ljava/lang/String;)L0jakarta/mail/BodyPart;
 getPreamble
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/MimePartDataSource.eea b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/MimePartDataSource.eea
index a5008a72a7..0ee536c02b 100644
--- a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/MimePartDataSource.eea
+++ b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/MimePartDataSource.eea
@@ -21,4 +21,4 @@ getName
  ()Ljava/lang/String;
 getOutputStream
  ()Ljava/io/OutputStream;
- ()Ljava/io/OutputStream;
+ ()L1java/io/OutputStream;
diff --git a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/MimeUtility.eea b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/MimeUtility.eea
index 8fa24d21b9..389625eac7 100644
--- a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/MimeUtility.eea
+++ b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/MimeUtility.eea
@@ -8,7 +8,7 @@ decodeText
  (Ljava/lang/String;)Ljava/lang/String;
 decodeWord
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 encode
  (Ljava/io/OutputStream;Ljava/lang/String;)Ljava/io/OutputStream;
  (Ljava/io/OutputStream;Ljava/lang/String;)Ljava/io/OutputStream;
@@ -35,7 +35,7 @@ getBytes
  (Ljava/io/InputStream;)[B
 getBytes
  (Ljava/lang/String;)[B
- (Ljava/lang/String;)[B
+ (Ljava/lang/String;)[1B
 getDefaultJavaCharset
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -47,7 +47,7 @@ getEncoding
  (Ljakarta/activation/DataSource;)Ljava/lang/String;
 javaCharset
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 mimeCharset
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/NewsAddress.eea b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/NewsAddress.eea
index 6aeba3f64b..6357ea8dd4 100644
--- a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/NewsAddress.eea
+++ b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/NewsAddress.eea
@@ -5,7 +5,7 @@ parse
  (Ljava/lang/String;)[Ljakarta/mail/internet/NewsAddress;
 toString
  ([Ljakarta/mail/Address;)Ljava/lang/String;
- ([Ljakarta/mail/Address;)Ljava/lang/String;
+ ([Ljakarta/mail/Address;)L0java/lang/String;
 
 host
  Ljava/lang/String;
@@ -31,7 +31,7 @@ getNewsgroup
  ()Ljava/lang/String;
 getType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 setHost
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/ParameterList.eea b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/ParameterList.eea
index a4b44ba8ff..0749a48a94 100644
--- a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/ParameterList.eea
+++ b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/internet/ParameterList.eea
@@ -8,7 +8,7 @@ get
  (Ljava/lang/String;)Ljava/lang/String;
 getNames
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
- ()Ljava/util/Enumeration<Ljava/lang/String;>;
+ ()L1java/util/Enumeration<Ljava/lang/String;>;
 remove
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
@@ -23,4 +23,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toString
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
diff --git a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/search/DateTerm.eea b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/search/DateTerm.eea
index e857112396..ca2685b1be 100644
--- a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/search/DateTerm.eea
+++ b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/search/DateTerm.eea
@@ -12,7 +12,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(jakarta.mail.search.ComparisonTerm)
 getDate
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L1java/util/Date;
 match
  (Ljava/util/Date;)Z
  (Ljava/util/Date;)Z
diff --git a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/util/ByteArrayDataSource.eea b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/util/ByteArrayDataSource.eea
index 9ce77e04ae..222a080907 100644
--- a/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/util/ByteArrayDataSource.eea
+++ b/libs/eea-jakarta-mail-api-2/src/main/resources/jakarta/mail/util/ByteArrayDataSource.eea
@@ -20,7 +20,7 @@ getName
  ()Ljava/lang/String;
 getOutputStream
  ()Ljava/io/OutputStream;
- ()Ljava/io/OutputStream;
+ ()L1java/io/OutputStream;
 setName
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-jakarta-servlet-api-6/src/main/resources/jakarta/servlet/http/Cookie.eea b/libs/eea-jakarta-servlet-api-6/src/main/resources/jakarta/servlet/http/Cookie.eea
index b5556e0287..73b99329d8 100644
--- a/libs/eea-jakarta-servlet-api-6/src/main/resources/jakarta/servlet/http/Cookie.eea
+++ b/libs/eea-jakarta-servlet-api-6/src/main/resources/jakarta/servlet/http/Cookie.eea
@@ -17,7 +17,7 @@ getAttributes
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
 getComment
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getDomain
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-jakarta-servlet-api-6/src/main/resources/jakarta/servlet/http/HttpServletRequest.eea b/libs/eea-jakarta-servlet-api-6/src/main/resources/jakarta/servlet/http/HttpServletRequest.eea
index 94032f2b83..b01f38e010 100644
--- a/libs/eea-jakarta-servlet-api-6/src/main/resources/jakarta/servlet/http/HttpServletRequest.eea
+++ b/libs/eea-jakarta-servlet-api-6/src/main/resources/jakarta/servlet/http/HttpServletRequest.eea
@@ -42,7 +42,7 @@ getHeaders
  (L1java/lang/String;)L0java/util/Enumeration<Ljava/lang/String;>;
 getHttpServletMapping
  ()Ljakarta/servlet/http/HttpServletMapping;
- ()Ljakarta/servlet/http/HttpServletMapping;
+ ()L1jakarta/servlet/http/HttpServletMapping;
 getIntHeader
  (Ljava/lang/String;)I
  (L1java/lang/String;)I
@@ -99,7 +99,7 @@ login
  (L1java/lang/String;L1java/lang/String;)V
 newPushBuilder
  ()Ljakarta/servlet/http/PushBuilder;
- ()Ljakarta/servlet/http/PushBuilder;
+ ()L0jakarta/servlet/http/PushBuilder;
 upgrade
  <T::Ljakarta/servlet/http/HttpUpgradeHandler;>(Ljava/lang/Class<TT;>;)TT;
  <T::Ljakarta/servlet/http/HttpUpgradeHandler;>(L1java/lang/Class<TT;>;)T1T;
diff --git a/libs/eea-jakarta-servlet-api-6/src/main/resources/jakarta/servlet/http/HttpServletRequestWrapper.eea b/libs/eea-jakarta-servlet-api-6/src/main/resources/jakarta/servlet/http/HttpServletRequestWrapper.eea
index 86c9b103a9..f85088a19f 100644
--- a/libs/eea-jakarta-servlet-api-6/src/main/resources/jakarta/servlet/http/HttpServletRequestWrapper.eea
+++ b/libs/eea-jakarta-servlet-api-6/src/main/resources/jakarta/servlet/http/HttpServletRequestWrapper.eea
@@ -32,7 +32,7 @@ getHeaders
  (L1java/lang/String;)L0java/util/Enumeration<Ljava/lang/String;>; # @Inherited(jakarta.servlet.http.HttpServletRequest)
 getHttpServletMapping
  ()Ljakarta/servlet/http/HttpServletMapping;
- ()Ljakarta/servlet/http/HttpServletMapping;
+ ()L1jakarta/servlet/http/HttpServletMapping; # @Inherited(jakarta.servlet.http.HttpServletRequest)
 getIntHeader
  (Ljava/lang/String;)I
  (L1java/lang/String;)I # @Inherited(jakarta.servlet.http.HttpServletRequest)
@@ -89,7 +89,7 @@ login
  (L1java/lang/String;L1java/lang/String;)V # @Inherited(jakarta.servlet.http.HttpServletRequest)
 newPushBuilder
  ()Ljakarta/servlet/http/PushBuilder;
- ()Ljakarta/servlet/http/PushBuilder;
+ ()L0jakarta/servlet/http/PushBuilder; # @Inherited(jakarta.servlet.http.HttpServletRequest)
 upgrade
  <T::Ljakarta/servlet/http/HttpUpgradeHandler;>(Ljava/lang/Class<TT;>;)TT;
  <T::Ljakarta/servlet/http/HttpUpgradeHandler;>(L1java/lang/Class<TT;>;)T1T; # @Inherited(jakarta.servlet.http.HttpServletRequest)
diff --git a/libs/eea-jakarta-servlet-api-6/src/main/resources/jakarta/servlet/http/HttpServletResponse.eea b/libs/eea-jakarta-servlet-api-6/src/main/resources/jakarta/servlet/http/HttpServletResponse.eea
index f814e4af62..f162151882 100644
--- a/libs/eea-jakarta-servlet-api-6/src/main/resources/jakarta/servlet/http/HttpServletResponse.eea
+++ b/libs/eea-jakarta-servlet-api-6/src/main/resources/jakarta/servlet/http/HttpServletResponse.eea
@@ -32,7 +32,7 @@ getHeaders
  (L1java/lang/String;)L1java/util/Collection<Ljava/lang/String;>;
 getTrailerFields
  ()Ljava/util/function/Supplier<Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;>;
- ()Ljava/util/function/Supplier<Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;>;
+ ()L0java/util/function/Supplier<Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;>;
 sendError
  (ILjava/lang/String;)V
  (IL0java/lang/String;)V
diff --git a/libs/eea-jakarta-servlet-api-6/src/main/resources/jakarta/servlet/http/HttpServletResponseWrapper.eea b/libs/eea-jakarta-servlet-api-6/src/main/resources/jakarta/servlet/http/HttpServletResponseWrapper.eea
index 2f1616dfbb..b7d48cf3de 100644
--- a/libs/eea-jakarta-servlet-api-6/src/main/resources/jakarta/servlet/http/HttpServletResponseWrapper.eea
+++ b/libs/eea-jakarta-servlet-api-6/src/main/resources/jakarta/servlet/http/HttpServletResponseWrapper.eea
@@ -35,7 +35,7 @@ getHeaders
  (L1java/lang/String;)L1java/util/Collection<Ljava/lang/String;>; # @Inherited(jakarta.servlet.http.HttpServletResponse)
 getTrailerFields
  ()Ljava/util/function/Supplier<Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;>;
- ()Ljava/util/function/Supplier<Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;>;
+ ()L0java/util/function/Supplier<Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;>; # @Inherited(jakarta.servlet.http.HttpServletResponse)
 sendError
  (ILjava/lang/String;)V
  (IL0java/lang/String;)V # @Inherited(jakarta.servlet.http.HttpServletResponse)
diff --git a/libs/eea-jakarta-servlet-api-6/src/main/resources/jakarta/servlet/http/HttpSession.eea b/libs/eea-jakarta-servlet-api-6/src/main/resources/jakarta/servlet/http/HttpSession.eea
index a8953f6859..85af3a8f5d 100644
--- a/libs/eea-jakarta-servlet-api-6/src/main/resources/jakarta/servlet/http/HttpSession.eea
+++ b/libs/eea-jakarta-servlet-api-6/src/main/resources/jakarta/servlet/http/HttpSession.eea
@@ -2,7 +2,7 @@ class jakarta/servlet/http/HttpSession
 
 getAccessor
  ()Ljakarta/servlet/http/HttpSession$Accessor;
- ()Ljakarta/servlet/http/HttpSession$Accessor;
+ ()L0jakarta/servlet/http/HttpSession$Accessor;
 getAttribute
  (Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-java-11/src/main/resources/java/applet/Applet.eea b/libs/eea-java-11/src/main/resources/java/applet/Applet.eea
index 0122565f9b..8016efc1df 100644
--- a/libs/eea-java-11/src/main/resources/java/applet/Applet.eea
+++ b/libs/eea-java-11/src/main/resources/java/applet/Applet.eea
@@ -12,13 +12,13 @@ getAppletContext
  ()Ljava/applet/AppletContext;
 getAppletInfo
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getAudioClip
  (Ljava/net/URL;)Ljava/applet/AudioClip;
  (Ljava/net/URL;)Ljava/applet/AudioClip;
 getAudioClip
  (Ljava/net/URL;Ljava/lang/String;)Ljava/applet/AudioClip;
- (Ljava/net/URL;Ljava/lang/String;)Ljava/applet/AudioClip;
+ (Ljava/net/URL;Ljava/lang/String;)L0java/applet/AudioClip;
 getCodeBase
  ()Ljava/net/URL;
  ()Ljava/net/URL;
@@ -30,7 +30,7 @@ getImage
  (Ljava/net/URL;)Ljava/awt/Image;
 getImage
  (Ljava/net/URL;Ljava/lang/String;)Ljava/awt/Image;
- (Ljava/net/URL;Ljava/lang/String;)Ljava/awt/Image;
+ (Ljava/net/URL;Ljava/lang/String;)L0java/awt/Image;
 getLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
@@ -39,7 +39,7 @@ getParameter
  (Ljava/lang/String;)Ljava/lang/String;
 getParameterInfo
  ()[[Ljava/lang/String;
- ()[[Ljava/lang/String;
+ ()[0[Ljava/lang/String;
 play
  (Ljava/net/URL;)V
  (Ljava/net/URL;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/AWTEvent.eea b/libs/eea-java-11/src/main/resources/java/awt/AWTEvent.eea
index a748ee0b09..5481d30710 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/AWTEvent.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/AWTEvent.eea
@@ -8,7 +8,7 @@ class java/awt/AWTEvent
  (Ljava/lang/Object;I)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 setSource
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/AWTKeyStroke.eea b/libs/eea-java-11/src/main/resources/java/awt/AWTKeyStroke.eea
index be39cd61f0..8e828488c9 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/AWTKeyStroke.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/AWTKeyStroke.eea
@@ -17,7 +17,7 @@ getAWTKeyStroke
  (Ljava/lang/String;)Ljava/awt/AWTKeyStroke;
 getAWTKeyStrokeForEvent
  (Ljava/awt/event/KeyEvent;)Ljava/awt/AWTKeyStroke;
- (Ljava/awt/event/KeyEvent;)Ljava/awt/AWTKeyStroke;
+ (Ljava/awt/event/KeyEvent;)L0java/awt/AWTKeyStroke;
 registerSubclass
  (Ljava/lang/Class<*>;)V
  (Ljava/lang/Class<*>;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/AlphaComposite.eea b/libs/eea-java-11/src/main/resources/java/awt/AlphaComposite.eea
index ce4f9a6f28..2fba54041b 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/AlphaComposite.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/AlphaComposite.eea
@@ -46,7 +46,7 @@ getInstance
 
 createContext
  (Ljava/awt/image/ColorModel;Ljava/awt/image/ColorModel;Ljava/awt/RenderingHints;)Ljava/awt/CompositeContext;
- (Ljava/awt/image/ColorModel;Ljava/awt/image/ColorModel;Ljava/awt/RenderingHints;)Ljava/awt/CompositeContext;
+ (Ljava/awt/image/ColorModel;Ljava/awt/image/ColorModel;Ljava/awt/RenderingHints;)L1java/awt/CompositeContext; # @Inherited(java.awt.Composite)
 derive
  (F)Ljava/awt/AlphaComposite;
  (F)Ljava/awt/AlphaComposite;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/BasicStroke.eea b/libs/eea-java-11/src/main/resources/java/awt/BasicStroke.eea
index 192231ef5a..66c7526c31 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/BasicStroke.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/BasicStroke.eea
@@ -5,10 +5,10 @@ class java/awt/BasicStroke
  (FIIF[FF)V
 createStrokedShape
  (Ljava/awt/Shape;)Ljava/awt/Shape;
- (Ljava/awt/Shape;)Ljava/awt/Shape;
+ (Ljava/awt/Shape;)L1java/awt/Shape; # @Inherited(java.awt.Stroke)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getDashArray
  ()[F
- ()[F
+ ()[0F
diff --git a/libs/eea-java-11/src/main/resources/java/awt/BorderLayout.eea b/libs/eea-java-11/src/main/resources/java/awt/BorderLayout.eea
index 5805333e7f..c94a86b689 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/BorderLayout.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/BorderLayout.eea
@@ -48,7 +48,7 @@ addLayoutComponent
  (Ljava/lang/String;Ljava/awt/Component;)V
 getConstraints
  (Ljava/awt/Component;)Ljava/lang/Object;
- (Ljava/awt/Component;)Ljava/lang/Object;
+ (Ljava/awt/Component;)L0java/lang/Object;
 getLayoutAlignmentX
  (Ljava/awt/Container;)F
  (Ljava/awt/Container;)F
@@ -69,7 +69,7 @@ layoutContainer
  (Ljava/awt/Container;)V
 maximumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
- (Ljava/awt/Container;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;)L1java/awt/Dimension;
 minimumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
  (Ljava/awt/Container;)Ljava/awt/Dimension;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Button$AccessibleAWTButton.eea b/libs/eea-java-11/src/main/resources/java/awt/Button$AccessibleAWTButton.eea
index 902032de66..9013393967 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Button$AccessibleAWTButton.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Button$AccessibleAWTButton.eea
@@ -5,10 +5,10 @@ class java/awt/Button$AccessibleAWTButton
  (Ljava/awt/Button;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -17,7 +17,7 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Button.eea b/libs/eea-java-11/src/main/resources/java/awt/Button.eea
index 2f29a41446..36339a6cc5 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Button.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Button.eea
@@ -23,7 +23,7 @@ getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Component)
 processActionEvent
  (Ljava/awt/event/ActionEvent;)V
  (Ljava/awt/event/ActionEvent;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/CardLayout.eea b/libs/eea-java-11/src/main/resources/java/awt/CardLayout.eea
index 288cb6b1d4..24ac061886 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/CardLayout.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/CardLayout.eea
@@ -26,7 +26,7 @@ layoutContainer
  (Ljava/awt/Container;)V
 maximumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
- (Ljava/awt/Container;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;)L1java/awt/Dimension;
 minimumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
  (Ljava/awt/Container;)Ljava/awt/Dimension;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Checkbox$AccessibleAWTCheckbox.eea b/libs/eea-java-11/src/main/resources/java/awt/Checkbox$AccessibleAWTCheckbox.eea
index 4d76d353f7..a8d854ac84 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Checkbox$AccessibleAWTCheckbox.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Checkbox$AccessibleAWTCheckbox.eea
@@ -5,10 +5,10 @@ class java/awt/Checkbox$AccessibleAWTCheckbox
  (Ljava/awt/Checkbox;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
@@ -17,16 +17,16 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getMaximumAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getMinimumAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 itemStateChanged
  (Ljava/awt/event/ItemEvent;)V
  (L1java/awt/event/ItemEvent;)V # @Inherited(java.awt.event.ItemListener)
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Checkbox.eea b/libs/eea-java-11/src/main/resources/java/awt/Checkbox.eea
index 5c744c654c..c79f3c6aa4 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Checkbox.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Checkbox.eea
@@ -32,10 +32,10 @@ getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
 getSelectedObjects
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Component)
 processEvent
  (Ljava/awt/AWTEvent;)V
  (Ljava/awt/AWTEvent;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/CheckboxMenuItem$AccessibleAWTCheckboxMenuItem.eea b/libs/eea-java-11/src/main/resources/java/awt/CheckboxMenuItem$AccessibleAWTCheckboxMenuItem.eea
index d16754c0e8..b1087b3c44 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/CheckboxMenuItem$AccessibleAWTCheckboxMenuItem.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/CheckboxMenuItem$AccessibleAWTCheckboxMenuItem.eea
@@ -5,25 +5,25 @@ class java/awt/CheckboxMenuItem$AccessibleAWTCheckboxMenuItem
  (Ljava/awt/CheckboxMenuItem;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(java.awt.MenuItem$AccessibleAWTMenuItem)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String; # @Inherited(java.awt.MenuItem$AccessibleAWTMenuItem)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(java.awt.MenuItem$AccessibleAWTMenuItem)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getMaximumAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getMinimumAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 setCurrentAccessibleValue
  (Ljava/lang/Number;)Z
  (Ljava/lang/Number;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/awt/CheckboxMenuItem.eea b/libs/eea-java-11/src/main/resources/java/awt/CheckboxMenuItem.eea
index cd1cc2ce0a..d6f0a6dd96 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/CheckboxMenuItem.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/CheckboxMenuItem.eea
@@ -20,10 +20,10 @@ getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
 getSelectedObjects
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.MenuItem)
 processEvent
  (Ljava/awt/AWTEvent;)V
  (Ljava/awt/AWTEvent;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Choice$AccessibleAWTChoice.eea b/libs/eea-java-11/src/main/resources/java/awt/Choice$AccessibleAWTChoice.eea
index b385fa54e6..287768328a 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Choice$AccessibleAWTChoice.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Choice$AccessibleAWTChoice.eea
@@ -5,10 +5,10 @@ class java/awt/Choice$AccessibleAWTChoice
  (Ljava/awt/Choice;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Choice.eea b/libs/eea-java-11/src/main/resources/java/awt/Choice.eea
index 3688241a20..b1ecdbb807 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Choice.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Choice.eea
@@ -23,16 +23,16 @@ getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
 getSelectedItem
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getSelectedObjects
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 insert
  (Ljava/lang/String;I)V
  (Ljava/lang/String;I)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Component)
 processEvent
  (Ljava/awt/AWTEvent;)V
  (Ljava/awt/AWTEvent;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Color.eea b/libs/eea-java-11/src/main/resources/java/awt/Color.eea
index a4861b625b..ff66a2c826 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Color.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Color.eea
@@ -81,7 +81,7 @@ yellow
 
 RGBtoHSB
  (III[F)[F
- (III[F)[F
+ (III[F)[1F
 decode
  (Ljava/lang/String;)Ljava/awt/Color;
  (Ljava/lang/String;)Ljava/awt/Color;
@@ -96,7 +96,7 @@ getColor
  (Ljava/lang/String;Ljava/awt/Color;)Ljava/awt/Color;
 getHSBColor
  (FFF)Ljava/awt/Color;
- (FFF)Ljava/awt/Color;
+ (FFF)L1java/awt/Color;
 
 <init>
  (Ljava/awt/color/ColorSpace;[FF)V
@@ -106,7 +106,7 @@ brighter
  ()Ljava/awt/Color;
 createContext
  (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
- (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
+ (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)L1java/awt/PaintContext; # @Inherited(java.awt.Paint)
 darker
  ()Ljava/awt/Color;
  ()Ljava/awt/Color;
@@ -124,7 +124,7 @@ getColorSpace
  ()Ljava/awt/color/ColorSpace;
 getComponents
  (Ljava/awt/color/ColorSpace;[F)[F
- (Ljava/awt/color/ColorSpace;[F)[F
+ (Ljava/awt/color/ColorSpace;[F)[1F
 getComponents
  ([F)[F
  ([F)[F
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Component$AccessibleAWTComponent.eea b/libs/eea-java-11/src/main/resources/java/awt/Component$AccessibleAWTComponent.eea
index fe3ea6575a..af9af7b222 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Component$AccessibleAWTComponent.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Component$AccessibleAWTComponent.eea
@@ -21,13 +21,13 @@ contains
  (Ljava/awt/Point;)Z
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -36,7 +36,7 @@ getAccessibleName
  ()Ljava/lang/String;
 getAccessibleParent
  ()Ljavax/accessibility/Accessible;
- ()Ljavax/accessibility/Accessible;
+ ()L0javax/accessibility/Accessible;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Component.eea b/libs/eea-java-11/src/main/resources/java/awt/Component.eea
index 084bec911d..eaef49637b 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Component.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Component.eea
@@ -57,22 +57,22 @@ checkImage
  (Ljava/awt/Image;Ljava/awt/image/ImageObserver;)I
 coalesceEvents
  (Ljava/awt/AWTEvent;Ljava/awt/AWTEvent;)Ljava/awt/AWTEvent;
- (Ljava/awt/AWTEvent;Ljava/awt/AWTEvent;)Ljava/awt/AWTEvent;
+ (Ljava/awt/AWTEvent;Ljava/awt/AWTEvent;)L0java/awt/AWTEvent;
 contains
  (Ljava/awt/Point;)Z
  (Ljava/awt/Point;)Z
 createImage
  (II)Ljava/awt/Image;
- (II)Ljava/awt/Image;
+ (II)L0java/awt/Image;
 createImage
  (Ljava/awt/image/ImageProducer;)Ljava/awt/Image;
- (Ljava/awt/image/ImageProducer;)Ljava/awt/Image;
+ (Ljava/awt/image/ImageProducer;)L1java/awt/Image;
 createVolatileImage
  (II)Ljava/awt/image/VolatileImage;
- (II)Ljava/awt/image/VolatileImage;
+ (II)L0java/awt/image/VolatileImage;
 createVolatileImage
  (IILjava/awt/ImageCapabilities;)Ljava/awt/image/VolatileImage;
- (IILjava/awt/ImageCapabilities;)Ljava/awt/image/VolatileImage;
+ (IILjava/awt/ImageCapabilities;)L1java/awt/image/VolatileImage;
 deliverEvent
  (Ljava/awt/Event;)V
  (Ljava/awt/Event;)V
@@ -111,7 +111,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getBaselineResizeBehavior
  ()Ljava/awt/Component$BaselineResizeBehavior;
  ()Ljava/awt/Component$BaselineResizeBehavior;
@@ -159,10 +159,10 @@ getFontMetrics
  (Ljava/awt/Font;)Ljava/awt/FontMetrics;
 getForeground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getGraphics
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L0java/awt/Graphics;
 getGraphicsConfiguration
  ()Ljava/awt/GraphicsConfiguration;
  ()Ljava/awt/GraphicsConfiguration;
@@ -174,13 +174,13 @@ getHierarchyListeners
  ()[Ljava/awt/event/HierarchyListener;
 getInputContext
  ()Ljava/awt/im/InputContext;
- ()Ljava/awt/im/InputContext;
+ ()L0java/awt/im/InputContext;
 getInputMethodListeners
  ()[Ljava/awt/event/InputMethodListener;
  ()[Ljava/awt/event/InputMethodListener;
 getInputMethodRequests
  ()Ljava/awt/im/InputMethodRequests;
- ()Ljava/awt/im/InputMethodRequests;
+ ()L0java/awt/im/InputMethodRequests;
 getKeyListeners
  ()[Ljava/awt/event/KeyListener;
  ()[Ljava/awt/event/KeyListener;
@@ -276,7 +276,7 @@ list
  (Ljava/io/PrintWriter;I)V
 locate
  (II)Ljava/awt/Component;
- (II)Ljava/awt/Component;
+ (II)L0java/awt/Component;
 location
  ()Ljava/awt/Point;
  ()Ljava/awt/Point;
@@ -285,7 +285,7 @@ lostFocus
  (Ljava/awt/Event;Ljava/lang/Object;)Z
 minimumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 mouseDown
  (Ljava/awt/Event;II)Z
  (Ljava/awt/Event;II)Z
@@ -312,13 +312,13 @@ paintAll
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 postEvent
  (Ljava/awt/Event;)Z
  (Ljava/awt/Event;)Z
 preferredSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 prepareImage
  (Ljava/awt/Image;IILjava/awt/image/ImageObserver;)Z
  (Ljava/awt/Image;IILjava/awt/image/ImageObserver;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Composite.eea b/libs/eea-java-11/src/main/resources/java/awt/Composite.eea
index 4a6dd26e29..7cd1591848 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Composite.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Composite.eea
@@ -2,4 +2,4 @@ class java/awt/Composite
 
 createContext
  (Ljava/awt/image/ColorModel;Ljava/awt/image/ColorModel;Ljava/awt/RenderingHints;)Ljava/awt/CompositeContext;
- (Ljava/awt/image/ColorModel;Ljava/awt/image/ColorModel;Ljava/awt/RenderingHints;)Ljava/awt/CompositeContext;
+ (Ljava/awt/image/ColorModel;Ljava/awt/image/ColorModel;Ljava/awt/RenderingHints;)L1java/awt/CompositeContext;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Container$AccessibleAWTContainer.eea b/libs/eea-java-11/src/main/resources/java/awt/Container$AccessibleAWTContainer.eea
index a726d9c5a1..0d0016d725 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Container$AccessibleAWTContainer.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Container$AccessibleAWTContainer.eea
@@ -12,10 +12,10 @@ addPropertyChangeListener
  (L1java/beans/PropertyChangeListener;)V # @Inherited(java.awt.Component$AccessibleAWTComponent)
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Component$AccessibleAWTComponent)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(java.awt.Component$AccessibleAWTComponent)
 removePropertyChangeListener
  (Ljava/beans/PropertyChangeListener;)V
  (L1java/beans/PropertyChangeListener;)V # @Inherited(java.awt.Component$AccessibleAWTComponent)
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Container.eea b/libs/eea-java-11/src/main/resources/java/awt/Container.eea
index 70d832de86..1056608fd8 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Container.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Container.eea
@@ -62,7 +62,7 @@ getFocusTraversalKeys
  (I)Ljava/util/Set<Ljava/awt/AWTKeyStroke;>;
 getFocusTraversalPolicy
  ()Ljava/awt/FocusTraversalPolicy;
- ()Ljava/awt/FocusTraversalPolicy;
+ ()L0java/awt/FocusTraversalPolicy;
 getInsets
  ()Ljava/awt/Insets;
  ()Ljava/awt/Insets;
@@ -101,10 +101,10 @@ list
  (Ljava/io/PrintWriter;I)V
 locate
  (II)Ljava/awt/Component;
- (II)Ljava/awt/Component;
+ (II)L0java/awt/Component; # @Inherited(java.awt.Component)
 minimumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(java.awt.Component)
 paint
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
@@ -113,10 +113,10 @@ paintComponents
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Component)
 preferredSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(java.awt.Component)
 print
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/ContainerOrderFocusTraversalPolicy.eea b/libs/eea-java-11/src/main/resources/java/awt/ContainerOrderFocusTraversalPolicy.eea
index 06325094cd..6105e3f78c 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/ContainerOrderFocusTraversalPolicy.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/ContainerOrderFocusTraversalPolicy.eea
@@ -5,16 +5,16 @@ accept
  (Ljava/awt/Component;)Z
 getComponentAfter
  (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Container;Ljava/awt/Component;)L0java/awt/Component;
 getComponentBefore
  (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Container;Ljava/awt/Component;)L0java/awt/Component;
 getDefaultComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
  (Ljava/awt/Container;)Ljava/awt/Component;
 getFirstComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
- (Ljava/awt/Container;)Ljava/awt/Component;
+ (Ljava/awt/Container;)L0java/awt/Component;
 getLastComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
- (Ljava/awt/Container;)Ljava/awt/Component;
+ (Ljava/awt/Container;)L0java/awt/Component;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Cursor.eea b/libs/eea-java-11/src/main/resources/java/awt/Cursor.eea
index 0e5df71420..b6818fd7a1 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Cursor.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Cursor.eea
@@ -9,10 +9,10 @@ getDefaultCursor
  ()Ljava/awt/Cursor;
 getPredefinedCursor
  (I)Ljava/awt/Cursor;
- (I)Ljava/awt/Cursor;
+ (I)L1java/awt/Cursor;
 getSystemCustomCursor
  (Ljava/lang/String;)Ljava/awt/Cursor;
- (Ljava/lang/String;)Ljava/awt/Cursor;
+ (Ljava/lang/String;)L0java/awt/Cursor;
 
 name
  Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Desktop.eea b/libs/eea-java-11/src/main/resources/java/awt/Desktop.eea
index 8082c30989..95aecda8a2 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Desktop.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Desktop.eea
@@ -2,7 +2,7 @@ class java/awt/Desktop
 
 getDesktop
  ()Ljava/awt/Desktop;
- ()Ljava/awt/Desktop;
+ ()L1java/awt/Desktop;
 
 addAppEventListener
  (Ljava/awt/desktop/SystemEventListener;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Dialog.eea b/libs/eea-java-11/src/main/resources/java/awt/Dialog.eea
index de861bdfab..3cd04b26e4 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Dialog.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Dialog.eea
@@ -57,7 +57,7 @@ getTitle
  ()Ljava/lang/String;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Container)
 setBackground
  (Ljava/awt/Color;)V
  (Ljava/awt/Color;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Event.eea b/libs/eea-java-11/src/main/resources/java/awt/Event.eea
index fed19071c8..4aa816217f 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Event.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Event.eea
@@ -21,7 +21,7 @@ target
  (Ljava/lang/Object;JIIIIILjava/lang/Object;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/java/awt/EventQueue.eea b/libs/eea-java-11/src/main/resources/java/awt/EventQueue.eea
index 6697f7b7b0..3accccf6c9 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/EventQueue.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/EventQueue.eea
@@ -12,7 +12,7 @@ invokeLater
 
 createSecondaryLoop
  ()Ljava/awt/SecondaryLoop;
- ()Ljava/awt/SecondaryLoop;
+ ()L1java/awt/SecondaryLoop;
 dispatchEvent
  (Ljava/awt/AWTEvent;)V
  (Ljava/awt/AWTEvent;)V
@@ -21,10 +21,10 @@ getNextEvent
  ()Ljava/awt/AWTEvent;
 peekEvent
  ()Ljava/awt/AWTEvent;
- ()Ljava/awt/AWTEvent;
+ ()L0java/awt/AWTEvent;
 peekEvent
  (I)Ljava/awt/AWTEvent;
- (I)Ljava/awt/AWTEvent;
+ (I)L0java/awt/AWTEvent;
 postEvent
  (Ljava/awt/AWTEvent;)V
  (Ljava/awt/AWTEvent;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/FileDialog.eea b/libs/eea-java-11/src/main/resources/java/awt/FileDialog.eea
index 2093ddcf4b..b555114759 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/FileDialog.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/FileDialog.eea
@@ -32,7 +32,7 @@ getFiles
  ()[Ljava/io/File;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Dialog)
 setDirectory
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Font.eea b/libs/eea-java-11/src/main/resources/java/awt/Font.eea
index 66c647f594..dde44456f1 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Font.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Font.eea
@@ -18,19 +18,19 @@ SERIF
 
 createFont
  (ILjava/io/File;)Ljava/awt/Font;
- (ILjava/io/File;)Ljava/awt/Font;
+ (ILjava/io/File;)L1java/awt/Font;
 createFont
  (ILjava/io/InputStream;)Ljava/awt/Font;
- (ILjava/io/InputStream;)Ljava/awt/Font;
+ (ILjava/io/InputStream;)L1java/awt/Font;
 createFonts
  (Ljava/io/File;)[Ljava/awt/Font;
- (Ljava/io/File;)[Ljava/awt/Font;
+ (Ljava/io/File;)[1Ljava/awt/Font;
 createFonts
  (Ljava/io/InputStream;)[Ljava/awt/Font;
- (Ljava/io/InputStream;)[Ljava/awt/Font;
+ (Ljava/io/InputStream;)[1Ljava/awt/Font;
 decode
  (Ljava/lang/String;)Ljava/awt/Font;
- (Ljava/lang/String;)Ljava/awt/Font;
+ (Ljava/lang/String;)L1java/awt/Font;
 getFont
  (Ljava/lang/String;)Ljava/awt/Font;
  (Ljava/lang/String;)Ljava/awt/Font;
@@ -68,16 +68,16 @@ canDisplayUpTo
  ([CII)I
 createGlyphVector
  (Ljava/awt/font/FontRenderContext;Ljava/lang/String;)Ljava/awt/font/GlyphVector;
- (Ljava/awt/font/FontRenderContext;Ljava/lang/String;)Ljava/awt/font/GlyphVector;
+ (Ljava/awt/font/FontRenderContext;Ljava/lang/String;)L1java/awt/font/GlyphVector;
 createGlyphVector
  (Ljava/awt/font/FontRenderContext;Ljava/text/CharacterIterator;)Ljava/awt/font/GlyphVector;
- (Ljava/awt/font/FontRenderContext;Ljava/text/CharacterIterator;)Ljava/awt/font/GlyphVector;
+ (Ljava/awt/font/FontRenderContext;Ljava/text/CharacterIterator;)L1java/awt/font/GlyphVector;
 createGlyphVector
  (Ljava/awt/font/FontRenderContext;[C)Ljava/awt/font/GlyphVector;
- (Ljava/awt/font/FontRenderContext;[C)Ljava/awt/font/GlyphVector;
+ (Ljava/awt/font/FontRenderContext;[C)L1java/awt/font/GlyphVector;
 createGlyphVector
  (Ljava/awt/font/FontRenderContext;[I)Ljava/awt/font/GlyphVector;
- (Ljava/awt/font/FontRenderContext;[I)Ljava/awt/font/GlyphVector;
+ (Ljava/awt/font/FontRenderContext;[I)L1java/awt/font/GlyphVector;
 deriveFont
  (F)Ljava/awt/Font;
  (F)Ljava/awt/Font;
@@ -101,7 +101,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getAttributes
  ()Ljava/util/Map<Ljava/awt/font/TextAttribute;*>;
- ()Ljava/util/Map<Ljava/awt/font/TextAttribute;*>;
+ ()L1java/util/Map<Ljava/awt/font/TextAttribute;*>;
 getAvailableAttributes
  ()[Ljava/text/AttributedCharacterIterator$Attribute;
  ()[Ljava/text/AttributedCharacterIterator$Attribute;
@@ -152,7 +152,7 @@ getStringBounds
  ([CIILjava/awt/font/FontRenderContext;)Ljava/awt/geom/Rectangle2D;
 getTransform
  ()Ljava/awt/geom/AffineTransform;
- ()Ljava/awt/geom/AffineTransform;
+ ()L1java/awt/geom/AffineTransform;
 layoutGlyphVector
  (Ljava/awt/font/FontRenderContext;[CIII)Ljava/awt/font/GlyphVector;
  (Ljava/awt/font/FontRenderContext;[CIII)Ljava/awt/font/GlyphVector;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/FontMetrics.eea b/libs/eea-java-11/src/main/resources/java/awt/FontMetrics.eea
index 9b1716d555..dc2502553a 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/FontMetrics.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/FontMetrics.eea
@@ -48,7 +48,7 @@ getStringBounds
  ([CIILjava/awt/Graphics;)Ljava/awt/geom/Rectangle2D;
 getWidths
  ()[I
- ()[I
+ ()[1I
 stringWidth
  (Ljava/lang/String;)I
  (Ljava/lang/String;)I
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Frame.eea b/libs/eea-java-11/src/main/resources/java/awt/Frame.eea
index f72d4a6734..a1a59694cd 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Frame.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Frame.eea
@@ -2,7 +2,7 @@ class java/awt/Frame
 
 getFrames
  ()[Ljava/awt/Frame;
- ()[Ljava/awt/Frame;
+ ()[1Ljava/awt/Frame;
 
 <init>
  (Ljava/awt/GraphicsConfiguration;)V
@@ -18,7 +18,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getIconImage
  ()Ljava/awt/Image;
- ()Ljava/awt/Image;
+ ()L0java/awt/Image;
 getMaximizedBounds
  ()Ljava/awt/Rectangle;
  ()Ljava/awt/Rectangle;
@@ -30,7 +30,7 @@ getTitle
  ()Ljava/lang/String;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Container)
 remove
  (Ljava/awt/MenuComponent;)V
  (Ljava/awt/MenuComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/GradientPaint.eea b/libs/eea-java-11/src/main/resources/java/awt/GradientPaint.eea
index 0da9405202..83a48eabd7 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/GradientPaint.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/GradientPaint.eea
@@ -14,7 +14,7 @@ class java/awt/GradientPaint
  (Ljava/awt/geom/Point2D;Ljava/awt/Color;Ljava/awt/geom/Point2D;Ljava/awt/Color;Z)V
 createContext
  (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
- (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
+ (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)L1java/awt/PaintContext; # @Inherited(java.awt.Paint)
 getColor1
  ()Ljava/awt/Color;
  ()Ljava/awt/Color;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Graphics.eea b/libs/eea-java-11/src/main/resources/java/awt/Graphics.eea
index 54976168c5..94f2567095 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Graphics.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Graphics.eea
@@ -2,10 +2,10 @@ class java/awt/Graphics
 
 create
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L1java/awt/Graphics;
 create
  (IIII)Ljava/awt/Graphics;
- (IIII)Ljava/awt/Graphics;
+ (IIII)L0java/awt/Graphics;
 drawBytes
  ([BIIII)V
  ([BIIII)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/GraphicsConfiguration.eea b/libs/eea-java-11/src/main/resources/java/awt/GraphicsConfiguration.eea
index df24c25796..8690ba6dff 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/GraphicsConfiguration.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/GraphicsConfiguration.eea
@@ -2,22 +2,22 @@ class java/awt/GraphicsConfiguration
 
 createCompatibleImage
  (II)Ljava/awt/image/BufferedImage;
- (II)Ljava/awt/image/BufferedImage;
+ (II)L1java/awt/image/BufferedImage;
 createCompatibleImage
  (III)Ljava/awt/image/BufferedImage;
- (III)Ljava/awt/image/BufferedImage;
+ (III)L1java/awt/image/BufferedImage;
 createCompatibleVolatileImage
  (II)Ljava/awt/image/VolatileImage;
- (II)Ljava/awt/image/VolatileImage;
+ (II)L1java/awt/image/VolatileImage;
 createCompatibleVolatileImage
  (III)Ljava/awt/image/VolatileImage;
- (III)Ljava/awt/image/VolatileImage;
+ (III)L1java/awt/image/VolatileImage;
 createCompatibleVolatileImage
  (IILjava/awt/ImageCapabilities;)Ljava/awt/image/VolatileImage;
- (IILjava/awt/ImageCapabilities;)Ljava/awt/image/VolatileImage;
+ (IILjava/awt/ImageCapabilities;)L1java/awt/image/VolatileImage;
 createCompatibleVolatileImage
  (IILjava/awt/ImageCapabilities;I)Ljava/awt/image/VolatileImage;
- (IILjava/awt/ImageCapabilities;I)Ljava/awt/image/VolatileImage;
+ (IILjava/awt/ImageCapabilities;I)L1java/awt/image/VolatileImage;
 getBounds
  ()Ljava/awt/Rectangle;
  ()Ljava/awt/Rectangle;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/GridBagLayout.eea b/libs/eea-java-11/src/main/resources/java/awt/GridBagLayout.eea
index d26c2e262f..ee0d10c566 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/GridBagLayout.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/GridBagLayout.eea
@@ -33,7 +33,7 @@ GetLayoutInfo
  (Ljava/awt/Container;I)Ljava/awt/GridBagLayoutInfo;
 GetMinSize
  (Ljava/awt/Container;Ljava/awt/GridBagLayoutInfo;)Ljava/awt/Dimension;
- (Ljava/awt/Container;Ljava/awt/GridBagLayoutInfo;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;Ljava/awt/GridBagLayoutInfo;)L1java/awt/Dimension;
 addLayoutComponent
  (Ljava/awt/Component;Ljava/lang/Object;)V
  (Ljava/awt/Component;Ljava/lang/Object;)V
@@ -84,7 +84,7 @@ lookupConstraints
  (Ljava/awt/Component;)Ljava/awt/GridBagConstraints;
 maximumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
- (Ljava/awt/Container;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;)L1java/awt/Dimension;
 minimumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
  (Ljava/awt/Container;)Ljava/awt/Dimension;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/KeyboardFocusManager.eea b/libs/eea-java-11/src/main/resources/java/awt/KeyboardFocusManager.eea
index 7263c541ff..3ce5e9509a 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/KeyboardFocusManager.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/KeyboardFocusManager.eea
@@ -90,10 +90,10 @@ getGlobalPermanentFocusOwner
  ()Ljava/awt/Component;
 getKeyEventDispatchers
  ()Ljava/util/List<Ljava/awt/KeyEventDispatcher;>;
- ()Ljava/util/List<Ljava/awt/KeyEventDispatcher;>;
+ ()L0java/util/List<Ljava/awt/KeyEventDispatcher;>;
 getKeyEventPostProcessors
  ()Ljava/util/List<Ljava/awt/KeyEventPostProcessor;>;
- ()Ljava/util/List<Ljava/awt/KeyEventPostProcessor;>;
+ ()L0java/util/List<Ljava/awt/KeyEventPostProcessor;>;
 getPermanentFocusOwner
  ()Ljava/awt/Component;
  ()Ljava/awt/Component;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Label.eea b/libs/eea-java-11/src/main/resources/java/awt/Label.eea
index 7fac456929..8228cbfcc9 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Label.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Label.eea
@@ -14,7 +14,7 @@ getText
  ()Ljava/lang/String;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Component)
 setText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/LinearGradientPaint.eea b/libs/eea-java-11/src/main/resources/java/awt/LinearGradientPaint.eea
index f27c0a9202..09527fc55a 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/LinearGradientPaint.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/LinearGradientPaint.eea
@@ -17,7 +17,7 @@ class java/awt/LinearGradientPaint
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;[F[Ljava/awt/Color;Ljava/awt/MultipleGradientPaint$CycleMethod;Ljava/awt/MultipleGradientPaint$ColorSpaceType;Ljava/awt/geom/AffineTransform;)V
 createContext
  (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
- (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
+ (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)L1java/awt/PaintContext; # @Inherited(java.awt.Paint)
 getEndPoint
  ()Ljava/awt/geom/Point2D;
  ()Ljava/awt/geom/Point2D;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/List$AccessibleAWTList$AccessibleAWTListChild.eea b/libs/eea-java-11/src/main/resources/java/awt/List$AccessibleAWTList$AccessibleAWTListChild.eea
index 5762efc0fb..fdf54018ad 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/List$AccessibleAWTList$AccessibleAWTListChild.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/List$AccessibleAWTList$AccessibleAWTListChild.eea
@@ -11,10 +11,10 @@ contains
  (Ljava/awt/Point;)Z
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Component$AccessibleAWTComponent)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(java.awt.Component$AccessibleAWTComponent)
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -29,7 +29,7 @@ getBackground
  ()Ljava/awt/Color;
 getBounds
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L0java/awt/Rectangle;
 getCursor
  ()Ljava/awt/Cursor;
  ()Ljava/awt/Cursor;
@@ -47,13 +47,13 @@ getLocale
  ()Ljava/util/Locale;
 getLocation
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getLocationOnScreen
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L0java/awt/Dimension;
 removeFocusListener
  (Ljava/awt/event/FocusListener;)V
  (L1java/awt/event/FocusListener;)V # @Inherited(java.awt.Component$AccessibleAWTComponent)
diff --git a/libs/eea-java-11/src/main/resources/java/awt/List$AccessibleAWTList.eea b/libs/eea-java-11/src/main/resources/java/awt/List$AccessibleAWTList.eea
index ed2874ac5e..a96cb0c076 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/List$AccessibleAWTList.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/List$AccessibleAWTList.eea
@@ -8,16 +8,16 @@ actionPerformed
  (L1java/awt/event/ActionEvent;)V # @Inherited(java.awt.event.ActionListener)
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Component$AccessibleAWTComponent)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(java.awt.Component$AccessibleAWTComponent)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
  (I)Ljavax/accessibility/Accessible;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/List.eea b/libs/eea-java-11/src/main/resources/java/awt/List.eea
index 57a6a5bd46..356cfecdca 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/List.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/List.eea
@@ -32,7 +32,7 @@ getItemListeners
  ()[Ljava/awt/event/ItemListener;
 getItems
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
@@ -56,22 +56,22 @@ getSelectedItem
  ()Ljava/lang/String;
 getSelectedItems
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 getSelectedObjects
  ()[Ljava/lang/Object;
  ()[Ljava/lang/Object;
 minimumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(java.awt.Component)
 minimumSize
  (I)Ljava/awt/Dimension;
  (I)Ljava/awt/Dimension;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Component)
 preferredSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(java.awt.Component)
 preferredSize
  (I)Ljava/awt/Dimension;
  (I)Ljava/awt/Dimension;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/MediaTracker.eea b/libs/eea-java-11/src/main/resources/java/awt/MediaTracker.eea
index 27c4cf0c7c..28ec12e706 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/MediaTracker.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/MediaTracker.eea
@@ -11,10 +11,10 @@ addImage
  (Ljava/awt/Image;III)V
 getErrorsAny
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 getErrorsID
  (I)[Ljava/lang/Object;
- (I)[Ljava/lang/Object;
+ (I)[0Ljava/lang/Object;
 removeImage
  (Ljava/awt/Image;)V
  (Ljava/awt/Image;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Menu.eea b/libs/eea-java-11/src/main/resources/java/awt/Menu.eea
index 730be5ebbc..8189b7c5f1 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Menu.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Menu.eea
@@ -26,7 +26,7 @@ insert
  (Ljava/lang/String;I)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.MenuItem)
 remove
  (Ljava/awt/MenuComponent;)V
  (Ljava/awt/MenuComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/MenuBar.eea b/libs/eea-java-11/src/main/resources/java/awt/MenuBar.eea
index 50ae26171b..7d92c2de7d 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/MenuBar.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/MenuBar.eea
@@ -17,7 +17,7 @@ getMenu
  (I)Ljava/awt/Menu;
 getShortcutMenuItem
  (Ljava/awt/MenuShortcut;)Ljava/awt/MenuItem;
- (Ljava/awt/MenuShortcut;)Ljava/awt/MenuItem;
+ (Ljava/awt/MenuShortcut;)L0java/awt/MenuItem;
 remove
  (Ljava/awt/MenuComponent;)V
  (Ljava/awt/MenuComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/MenuComponent$AccessibleAWTMenuComponent.eea b/libs/eea-java-11/src/main/resources/java/awt/MenuComponent$AccessibleAWTMenuComponent.eea
index 6f68dfc89b..0138f4f1d8 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/MenuComponent$AccessibleAWTMenuComponent.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/MenuComponent$AccessibleAWTMenuComponent.eea
@@ -11,13 +11,13 @@ contains
  (Ljava/awt/Point;)Z
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -26,49 +26,49 @@ getAccessibleName
  ()Ljava/lang/String;
 getAccessibleParent
  ()Ljavax/accessibility/Accessible;
- ()Ljavax/accessibility/Accessible;
+ ()L0javax/accessibility/Accessible;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
  ()Ljavax/accessibility/AccessibleStateSet;
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getBounds
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L0java/awt/Rectangle;
 getCursor
  ()Ljava/awt/Cursor;
- ()Ljava/awt/Cursor;
+ ()L0java/awt/Cursor;
 getFont
  ()Ljava/awt/Font;
  ()Ljava/awt/Font;
 getFontMetrics
  (Ljava/awt/Font;)Ljava/awt/FontMetrics;
- (Ljava/awt/Font;)Ljava/awt/FontMetrics;
+ (Ljava/awt/Font;)L0java/awt/FontMetrics;
 getForeground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
 getLocation
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getLocationOnScreen
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L0java/awt/Dimension;
 removeFocusListener
  (Ljava/awt/event/FocusListener;)V
  (L1java/awt/event/FocusListener;)V # @Inherited(javax.accessibility.AccessibleComponent)
diff --git a/libs/eea-java-11/src/main/resources/java/awt/MenuComponent.eea b/libs/eea-java-11/src/main/resources/java/awt/MenuComponent.eea
index c3582da9f5..b11e5bc4c4 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/MenuComponent.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/MenuComponent.eea
@@ -8,7 +8,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getFont
  ()Ljava/awt/Font;
- ()Ljava/awt/Font;
+ ()L0java/awt/Font;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -20,7 +20,7 @@ getTreeLock
  ()Ljava/lang/Object;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 postEvent
  (Ljava/awt/Event;)Z
  (Ljava/awt/Event;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/awt/MenuItem$AccessibleAWTMenuItem.eea b/libs/eea-java-11/src/main/resources/java/awt/MenuItem$AccessibleAWTMenuItem.eea
index d69ec462f7..862b1cfb1c 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/MenuItem$AccessibleAWTMenuItem.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/MenuItem$AccessibleAWTMenuItem.eea
@@ -5,10 +5,10 @@ class java/awt/MenuItem$AccessibleAWTMenuItem
  (Ljava/awt/MenuItem;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -17,7 +17,7 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/MenuItem.eea b/libs/eea-java-11/src/main/resources/java/awt/MenuItem.eea
index ae0c478594..fd40a6150c 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/MenuItem.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/MenuItem.eea
@@ -29,7 +29,7 @@ getShortcut
  ()Ljava/awt/MenuShortcut;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.MenuComponent)
 processActionEvent
  (Ljava/awt/event/ActionEvent;)V
  (Ljava/awt/event/ActionEvent;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/MenuShortcut.eea b/libs/eea-java-11/src/main/resources/java/awt/MenuShortcut.eea
index 3d2aace5de..170650756a 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/MenuShortcut.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/MenuShortcut.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/java/awt/MultipleGradientPaint.eea b/libs/eea-java-11/src/main/resources/java/awt/MultipleGradientPaint.eea
index 5bdb427a46..7828a0558d 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/MultipleGradientPaint.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/MultipleGradientPaint.eea
@@ -14,4 +14,4 @@ getFractions
  ()[F
 getTransform
  ()Ljava/awt/geom/AffineTransform;
- ()Ljava/awt/geom/AffineTransform;
+ ()L1java/awt/geom/AffineTransform;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/PageAttributes.eea b/libs/eea-java-11/src/main/resources/java/awt/PageAttributes.eea
index ed69e60b79..c2bbb0d142 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/PageAttributes.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/PageAttributes.eea
@@ -29,7 +29,7 @@ getPrintQuality
  ()Ljava/awt/PageAttributes$PrintQualityType;
 getPrinterResolution
  ()[I
- ()[I
+ ()[1I
 set
  (Ljava/awt/PageAttributes;)V
  (Ljava/awt/PageAttributes;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Paint.eea b/libs/eea-java-11/src/main/resources/java/awt/Paint.eea
index 7fa31b296c..a1db839cc7 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Paint.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Paint.eea
@@ -2,4 +2,4 @@ class java/awt/Paint
 
 createContext
  (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
- (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
+ (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)L1java/awt/PaintContext;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Polygon.eea b/libs/eea-java-11/src/main/resources/java/awt/Polygon.eea
index 4965f36570..df2dcc4896 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Polygon.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Polygon.eea
@@ -33,7 +33,7 @@ getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/PopupMenu.eea b/libs/eea-java-11/src/main/resources/java/awt/PopupMenu.eea
index 729c3cdc24..79aca92c30 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/PopupMenu.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/PopupMenu.eea
@@ -8,7 +8,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getParent
  ()Ljava/awt/MenuContainer;
- ()Ljava/awt/MenuContainer;
+ ()L0java/awt/MenuContainer;
 show
  (Ljava/awt/Component;II)V
  (Ljava/awt/Component;II)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/RadialGradientPaint.eea b/libs/eea-java-11/src/main/resources/java/awt/RadialGradientPaint.eea
index 78cfa8601d..efe9107cde 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/RadialGradientPaint.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/RadialGradientPaint.eea
@@ -26,7 +26,7 @@ class java/awt/RadialGradientPaint
  (Ljava/awt/geom/Rectangle2D;[F[Ljava/awt/Color;Ljava/awt/MultipleGradientPaint$CycleMethod;)V
 createContext
  (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
- (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
+ (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)L1java/awt/PaintContext; # @Inherited(java.awt.Paint)
 getCenterPoint
  ()Ljava/awt/geom/Point2D;
  ()Ljava/awt/geom/Point2D;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Rectangle.eea b/libs/eea-java-11/src/main/resources/java/awt/Rectangle.eea
index 96c5ff0e52..8261529405 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Rectangle.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Rectangle.eea
@@ -26,10 +26,10 @@ contains
  (Ljava/awt/Rectangle;)Z
 createIntersection
  (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
- (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
+ (Ljava/awt/geom/Rectangle2D;)L1java/awt/geom/Rectangle2D; # @Inherited(java.awt.geom.Rectangle2D)
 createUnion
  (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
- (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
+ (Ljava/awt/geom/Rectangle2D;)L1java/awt/geom/Rectangle2D; # @Inherited(java.awt.geom.Rectangle2D)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.awt.geom.Rectangle2D)
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Robot.eea b/libs/eea-java-11/src/main/resources/java/awt/Robot.eea
index 0b12fa8bc8..9875c646e4 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Robot.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Robot.eea
@@ -5,10 +5,10 @@ class java/awt/Robot
  (Ljava/awt/GraphicsDevice;)V
 createMultiResolutionScreenCapture
  (Ljava/awt/Rectangle;)Ljava/awt/image/MultiResolutionImage;
- (Ljava/awt/Rectangle;)Ljava/awt/image/MultiResolutionImage;
+ (Ljava/awt/Rectangle;)L1java/awt/image/MultiResolutionImage;
 createScreenCapture
  (Ljava/awt/Rectangle;)Ljava/awt/image/BufferedImage;
- (Ljava/awt/Rectangle;)Ljava/awt/image/BufferedImage;
+ (Ljava/awt/Rectangle;)L1java/awt/image/BufferedImage;
 getPixelColor
  (II)Ljava/awt/Color;
  (II)Ljava/awt/Color;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/ScrollPane.eea b/libs/eea-java-11/src/main/resources/java/awt/ScrollPane.eea
index 58219ffacc..19f3d1dbb9 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/ScrollPane.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/ScrollPane.eea
@@ -20,7 +20,7 @@ getViewportSize
  ()Ljava/awt/Dimension;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Container)
 printComponents
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/ScrollPaneAdjustable.eea b/libs/eea-java-11/src/main/resources/java/awt/ScrollPaneAdjustable.eea
index 155aed02aa..1667bb1a17 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/ScrollPaneAdjustable.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/ScrollPaneAdjustable.eea
@@ -8,7 +8,7 @@ getAdjustmentListeners
  ()[Ljava/awt/event/AdjustmentListener;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 removeAdjustmentListener
  (Ljava/awt/event/AdjustmentListener;)V
  (L1java/awt/event/AdjustmentListener;)V # @Inherited(java.awt.Adjustable)
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Scrollbar$AccessibleAWTScrollBar.eea b/libs/eea-java-11/src/main/resources/java/awt/Scrollbar$AccessibleAWTScrollBar.eea
index 180c0600df..7c39a21217 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Scrollbar$AccessibleAWTScrollBar.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Scrollbar$AccessibleAWTScrollBar.eea
@@ -11,7 +11,7 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Scrollbar.eea b/libs/eea-java-11/src/main/resources/java/awt/Scrollbar.eea
index bc4c6f2635..bc3396e309 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Scrollbar.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Scrollbar.eea
@@ -14,7 +14,7 @@ getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Component)
 processAdjustmentEvent
  (Ljava/awt/event/AdjustmentEvent;)V
  (Ljava/awt/event/AdjustmentEvent;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/SplashScreen.eea b/libs/eea-java-11/src/main/resources/java/awt/SplashScreen.eea
index 9f0e98561f..46c5cfdeb9 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/SplashScreen.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/SplashScreen.eea
@@ -6,7 +6,7 @@ getSplashScreen
 
 createGraphics
  ()Ljava/awt/Graphics2D;
- ()Ljava/awt/Graphics2D;
+ ()L1java/awt/Graphics2D;
 getBounds
  ()Ljava/awt/Rectangle;
  ()Ljava/awt/Rectangle;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Stroke.eea b/libs/eea-java-11/src/main/resources/java/awt/Stroke.eea
index a5739432c8..b2328bb0bc 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Stroke.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Stroke.eea
@@ -2,4 +2,4 @@ class java/awt/Stroke
 
 createStrokedShape
  (Ljava/awt/Shape;)Ljava/awt/Shape;
- (Ljava/awt/Shape;)Ljava/awt/Shape;
+ (Ljava/awt/Shape;)L1java/awt/Shape;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Taskbar.eea b/libs/eea-java-11/src/main/resources/java/awt/Taskbar.eea
index 52703a8925..8d5ee79bce 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Taskbar.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Taskbar.eea
@@ -2,7 +2,7 @@ class java/awt/Taskbar
 
 getTaskbar
  ()Ljava/awt/Taskbar;
- ()Ljava/awt/Taskbar;
+ ()L1java/awt/Taskbar;
 
 getIconImage
  ()Ljava/awt/Image;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/TextArea.eea b/libs/eea-java-11/src/main/resources/java/awt/TextArea.eea
index 947896400e..63d562a834 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/TextArea.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/TextArea.eea
@@ -38,16 +38,16 @@ insertText
  (Ljava/lang/String;I)V
 minimumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(java.awt.Component)
 minimumSize
  (II)Ljava/awt/Dimension;
  (II)Ljava/awt/Dimension;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.TextComponent)
 preferredSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(java.awt.Component)
 preferredSize
  (II)Ljava/awt/Dimension;
  (II)Ljava/awt/Dimension;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/TextComponent$AccessibleAWTTextComponent.eea b/libs/eea-java-11/src/main/resources/java/awt/TextComponent$AccessibleAWTTextComponent.eea
index b18e9275c8..175403f251 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/TextComponent$AccessibleAWTTextComponent.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/TextComponent$AccessibleAWTTextComponent.eea
@@ -11,28 +11,28 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAfterIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getAtIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getBeforeIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getCharacterAttribute
  (I)Ljavax/swing/text/AttributeSet;
- (I)Ljavax/swing/text/AttributeSet;
+ (I)L0javax/swing/text/AttributeSet;
 getCharacterBounds
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L0java/awt/Rectangle;
 getIndexAtPoint
  (Ljava/awt/Point;)I
  (Ljava/awt/Point;)I
 getSelectedText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 textValueChanged
  (Ljava/awt/event/TextEvent;)V
  (L1java/awt/event/TextEvent;)V # @Inherited(java.awt.event.TextListener)
diff --git a/libs/eea-java-11/src/main/resources/java/awt/TextComponent.eea b/libs/eea-java-11/src/main/resources/java/awt/TextComponent.eea
index 6f2d4dc8cc..4491fce163 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/TextComponent.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/TextComponent.eea
@@ -12,10 +12,10 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color; # @Inherited(java.awt.Component)
 getInputMethodRequests
  ()Ljava/awt/im/InputMethodRequests;
- ()Ljava/awt/im/InputMethodRequests;
+ ()L0java/awt/im/InputMethodRequests; # @Inherited(java.awt.Component)
 getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
@@ -30,7 +30,7 @@ getTextListeners
  ()[Ljava/awt/event/TextListener;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Component)
 processEvent
  (Ljava/awt/AWTEvent;)V
  (Ljava/awt/AWTEvent;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/TextField.eea b/libs/eea-java-11/src/main/resources/java/awt/TextField.eea
index 44ebaa2b01..6e9c74d9f0 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/TextField.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/TextField.eea
@@ -32,16 +32,16 @@ getPreferredSize
  (I)Ljava/awt/Dimension;
 minimumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(java.awt.Component)
 minimumSize
  (I)Ljava/awt/Dimension;
  (I)Ljava/awt/Dimension;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.TextComponent)
 preferredSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(java.awt.Component)
 preferredSize
  (I)Ljava/awt/Dimension;
  (I)Ljava/awt/Dimension;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/TexturePaint.eea b/libs/eea-java-11/src/main/resources/java/awt/TexturePaint.eea
index 9498e79288..bdd3239f99 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/TexturePaint.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/TexturePaint.eea
@@ -5,7 +5,7 @@ class java/awt/TexturePaint
  (Ljava/awt/image/BufferedImage;Ljava/awt/geom/Rectangle2D;)V
 createContext
  (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
- (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
+ (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)L1java/awt/PaintContext; # @Inherited(java.awt.Paint)
 getAnchorRect
  ()Ljava/awt/geom/Rectangle2D;
  ()Ljava/awt/geom/Rectangle2D;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Toolkit.eea b/libs/eea-java-11/src/main/resources/java/awt/Toolkit.eea
index 4926505d00..bb3341d850 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Toolkit.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Toolkit.eea
@@ -28,25 +28,25 @@ checkImage
  (Ljava/awt/Image;IILjava/awt/image/ImageObserver;)I
 createCustomCursor
  (Ljava/awt/Image;Ljava/awt/Point;Ljava/lang/String;)Ljava/awt/Cursor;
- (Ljava/awt/Image;Ljava/awt/Point;Ljava/lang/String;)Ljava/awt/Cursor;
+ (Ljava/awt/Image;Ljava/awt/Point;Ljava/lang/String;)L1java/awt/Cursor;
 createDragGestureRecognizer
  <T:Ljava/awt/dnd/DragGestureRecognizer;>(Ljava/lang/Class<TT;>;Ljava/awt/dnd/DragSource;Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)TT;
- <T:Ljava/awt/dnd/DragGestureRecognizer;>(Ljava/lang/Class<TT;>;Ljava/awt/dnd/DragSource;Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)TT;
+ <T:Ljava/awt/dnd/DragGestureRecognizer;>(Ljava/lang/Class<TT;>;Ljava/awt/dnd/DragSource;Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)T0T;
 createImage
  (Ljava/awt/image/ImageProducer;)Ljava/awt/Image;
- (Ljava/awt/image/ImageProducer;)Ljava/awt/Image;
+ (Ljava/awt/image/ImageProducer;)L1java/awt/Image;
 createImage
  (Ljava/lang/String;)Ljava/awt/Image;
- (Ljava/lang/String;)Ljava/awt/Image;
+ (Ljava/lang/String;)L1java/awt/Image;
 createImage
  (Ljava/net/URL;)Ljava/awt/Image;
- (Ljava/net/URL;)Ljava/awt/Image;
+ (Ljava/net/URL;)L1java/awt/Image;
 createImage
  ([B)Ljava/awt/Image;
- ([B)Ljava/awt/Image;
+ ([B)L1java/awt/Image;
 createImage
  ([BII)Ljava/awt/Image;
- ([BII)Ljava/awt/Image;
+ ([BII)L1java/awt/Image;
 getAWTEventListeners
  ()[Ljava/awt/event/AWTEventListener;
  ()[Ljava/awt/event/AWTEventListener;
@@ -103,7 +103,7 @@ getSystemEventQueueImpl
  ()Ljava/awt/EventQueue;
 getSystemSelection
  ()Ljava/awt/datatransfer/Clipboard;
- ()Ljava/awt/datatransfer/Clipboard;
+ ()L0java/awt/datatransfer/Clipboard;
 isModalExclusionTypeSupported
  (Ljava/awt/Dialog$ModalExclusionType;)Z
  (Ljava/awt/Dialog$ModalExclusionType;)Z
@@ -112,7 +112,7 @@ isModalityTypeSupported
  (Ljava/awt/Dialog$ModalityType;)Z
 lazilyLoadDesktopProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 loadSystemColors
  ([I)V
  ([I)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/Window.eea b/libs/eea-java-11/src/main/resources/java/awt/Window.eea
index 277e49e4aa..24f6d79d17 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/Window.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/Window.eea
@@ -2,7 +2,7 @@ class java/awt/Window
 
 getOwnerlessWindows
  ()[Ljava/awt/Window;
- ()[Ljava/awt/Window;
+ ()[1Ljava/awt/Window;
 getWindows
  ()[Ljava/awt/Window;
  ()[Ljava/awt/Window;
@@ -45,25 +45,25 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color; # @Inherited(java.awt.Component)
 getBufferStrategy
  ()Ljava/awt/image/BufferStrategy;
  ()Ljava/awt/image/BufferStrategy;
 getFocusCycleRootAncestor
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L0java/awt/Container;
 getFocusOwner
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 getFocusTraversalKeys
  (I)Ljava/util/Set<Ljava/awt/AWTKeyStroke;>;
- (I)Ljava/util/Set<Ljava/awt/AWTKeyStroke;>;
+ (I)L0java/util/Set<Ljava/awt/AWTKeyStroke;>;
 getIconImages
  ()Ljava/util/List<Ljava/awt/Image;>;
- ()Ljava/util/List<Ljava/awt/Image;>;
+ ()L1java/util/List<Ljava/awt/Image;>;
 getInputContext
  ()Ljava/awt/im/InputContext;
- ()Ljava/awt/im/InputContext;
+ ()L0java/awt/im/InputContext; # @Inherited(java.awt.Component)
 getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
@@ -75,7 +75,7 @@ getModalExclusionType
  ()Ljava/awt/Dialog$ModalExclusionType;
 getMostRecentFocusOwner
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 getOwnedWindows
  ()[Ljava/awt/Window;
  ()[Ljava/awt/Window;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/color/ICC_ColorSpace.eea b/libs/eea-java-11/src/main/resources/java/awt/color/ICC_ColorSpace.eea
index 0d66db046a..d4ced29f93 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/color/ICC_ColorSpace.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/color/ICC_ColorSpace.eea
@@ -5,16 +5,16 @@ class java/awt/color/ICC_ColorSpace
  (Ljava/awt/color/ICC_Profile;)V
 fromCIEXYZ
  ([F)[F
- ([F)[F
+ ([F)[1F
 fromRGB
  ([F)[F
- ([F)[F
+ ([F)[1F
 getProfile
  ()Ljava/awt/color/ICC_Profile;
  ()Ljava/awt/color/ICC_Profile;
 toCIEXYZ
  ([F)[F
- ([F)[F
+ ([F)[1F
 toRGB
  ([F)[F
- ([F)[F
+ ([F)[1F
diff --git a/libs/eea-java-11/src/main/resources/java/awt/color/ICC_Profile.eea b/libs/eea-java-11/src/main/resources/java/awt/color/ICC_Profile.eea
index 7a23bea501..c21857a963 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/color/ICC_Profile.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/color/ICC_Profile.eea
@@ -11,11 +11,11 @@ getInstance
  (Ljava/lang/String;)Ljava/awt/color/ICC_Profile;
 getInstance
  ([B)Ljava/awt/color/ICC_Profile;
- ([B)Ljava/awt/color/ICC_Profile;
+ ([B)L1java/awt/color/ICC_Profile;
 
 getData
  ()[B
- ()[B
+ ()[1B
 getData
  (I)[B
  (I)[B
diff --git a/libs/eea-java-11/src/main/resources/java/awt/datatransfer/DataFlavor.eea b/libs/eea-java-11/src/main/resources/java/awt/datatransfer/DataFlavor.eea
index 542a713f57..98be61c80f 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/datatransfer/DataFlavor.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/datatransfer/DataFlavor.eea
@@ -36,7 +36,7 @@ getTextPlainUnicodeFlavor
  ()Ljava/awt/datatransfer/DataFlavor;
 selectBestTextFlavor
  ([Ljava/awt/datatransfer/DataFlavor;)Ljava/awt/datatransfer/DataFlavor;
- ([Ljava/awt/datatransfer/DataFlavor;)Ljava/awt/datatransfer/DataFlavor;
+ ([Ljava/awt/datatransfer/DataFlavor;)L0java/awt/datatransfer/DataFlavor;
 tryToLoadClass
  (Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/Class<*>;
  (Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/Class<*>;
@@ -76,13 +76,13 @@ getHumanPresentableName
  ()Ljava/lang/String;
 getMimeType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getParameter
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getPrimaryType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getReaderForText
  (Ljava/awt/datatransfer/Transferable;)Ljava/io/Reader;
  (Ljava/awt/datatransfer/Transferable;)Ljava/io/Reader;
@@ -91,7 +91,7 @@ getRepresentationClass
  ()Ljava/lang/Class<*>;
 getSubType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 isMimeTypeEqual
  (Ljava/awt/datatransfer/DataFlavor;)Z
  (Ljava/awt/datatransfer/DataFlavor;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/awt/datatransfer/SystemFlavorMap.eea b/libs/eea-java-11/src/main/resources/java/awt/datatransfer/SystemFlavorMap.eea
index 4f66551538..9fa39bf46d 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/datatransfer/SystemFlavorMap.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/datatransfer/SystemFlavorMap.eea
@@ -2,16 +2,16 @@ class java/awt/datatransfer/SystemFlavorMap
 
 decodeDataFlavor
  (Ljava/lang/String;)Ljava/awt/datatransfer/DataFlavor;
- (Ljava/lang/String;)Ljava/awt/datatransfer/DataFlavor;
+ (Ljava/lang/String;)L0java/awt/datatransfer/DataFlavor;
 decodeJavaMIMEType
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 encodeDataFlavor
  (Ljava/awt/datatransfer/DataFlavor;)Ljava/lang/String;
- (Ljava/awt/datatransfer/DataFlavor;)Ljava/lang/String;
+ (Ljava/awt/datatransfer/DataFlavor;)L0java/lang/String;
 encodeJavaMIMEType
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getDefaultFlavorMap
  ()Ljava/awt/datatransfer/FlavorMap;
  ()Ljava/awt/datatransfer/FlavorMap;
@@ -27,13 +27,13 @@ addUnencodedNativeForFlavor
  (Ljava/awt/datatransfer/DataFlavor;Ljava/lang/String;)V
 getFlavorsForNative
  (Ljava/lang/String;)Ljava/util/List<Ljava/awt/datatransfer/DataFlavor;>;
- (Ljava/lang/String;)Ljava/util/List<Ljava/awt/datatransfer/DataFlavor;>;
+ (Ljava/lang/String;)L1java/util/List<Ljava/awt/datatransfer/DataFlavor;>;
 getFlavorsForNatives
  ([Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/awt/datatransfer/DataFlavor;>;
  ([Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/awt/datatransfer/DataFlavor;>;
 getNativesForFlavor
  (Ljava/awt/datatransfer/DataFlavor;)Ljava/util/List<Ljava/lang/String;>;
- (Ljava/awt/datatransfer/DataFlavor;)Ljava/util/List<Ljava/lang/String;>;
+ (Ljava/awt/datatransfer/DataFlavor;)L1java/util/List<Ljava/lang/String;>;
 getNativesForFlavors
  ([Ljava/awt/datatransfer/DataFlavor;)Ljava/util/Map<Ljava/awt/datatransfer/DataFlavor;Ljava/lang/String;>;
  ([Ljava/awt/datatransfer/DataFlavor;)Ljava/util/Map<Ljava/awt/datatransfer/DataFlavor;Ljava/lang/String;>;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/desktop/FilesEvent.eea b/libs/eea-java-11/src/main/resources/java/awt/desktop/FilesEvent.eea
index 8afc2ddea3..7c7523ae2e 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/desktop/FilesEvent.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/desktop/FilesEvent.eea
@@ -2,4 +2,4 @@ class java/awt/desktop/FilesEvent
 
 getFiles
  ()Ljava/util/List<Ljava/io/File;>;
- ()Ljava/util/List<Ljava/io/File;>;
+ ()L1java/util/List<Ljava/io/File;>;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/dnd/DragSource.eea b/libs/eea-java-11/src/main/resources/java/awt/dnd/DragSource.eea
index d88114865e..3070a955a3 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/dnd/DragSource.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/dnd/DragSource.eea
@@ -31,13 +31,13 @@ addDragSourceMotionListener
  (L1java/awt/dnd/DragSourceMotionListener;)V
 createDefaultDragGestureRecognizer
  (Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)Ljava/awt/dnd/DragGestureRecognizer;
- (Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)Ljava/awt/dnd/DragGestureRecognizer;
+ (Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)L1java/awt/dnd/DragGestureRecognizer;
 createDragGestureRecognizer
  <T:Ljava/awt/dnd/DragGestureRecognizer;>(Ljava/lang/Class<TT;>;Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)TT;
- <T:Ljava/awt/dnd/DragGestureRecognizer;>(Ljava/lang/Class<TT;>;Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)TT;
+ <T:Ljava/awt/dnd/DragGestureRecognizer;>(Ljava/lang/Class<TT;>;Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)T1T;
 createDragSourceContext
  (Ljava/awt/dnd/DragGestureEvent;Ljava/awt/Cursor;Ljava/awt/Image;Ljava/awt/Point;Ljava/awt/datatransfer/Transferable;Ljava/awt/dnd/DragSourceListener;)Ljava/awt/dnd/DragSourceContext;
- (Ljava/awt/dnd/DragGestureEvent;Ljava/awt/Cursor;Ljava/awt/Image;Ljava/awt/Point;Ljava/awt/datatransfer/Transferable;Ljava/awt/dnd/DragSourceListener;)Ljava/awt/dnd/DragSourceContext;
+ (Ljava/awt/dnd/DragGestureEvent;Ljava/awt/Cursor;Ljava/awt/Image;Ljava/awt/Point;Ljava/awt/datatransfer/Transferable;Ljava/awt/dnd/DragSourceListener;)L1java/awt/dnd/DragSourceContext;
 getDragSourceListeners
  ()[Ljava/awt/dnd/DragSourceListener;
  ()[Ljava/awt/dnd/DragSourceListener;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/dnd/DragSourceEvent.eea b/libs/eea-java-11/src/main/resources/java/awt/dnd/DragSourceEvent.eea
index 60eb2eeb01..aeee9e81e2 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/dnd/DragSourceEvent.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/dnd/DragSourceEvent.eea
@@ -11,4 +11,4 @@ getDragSourceContext
  ()Ljava/awt/dnd/DragSourceContext;
 getLocation
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/dnd/DropTarget.eea b/libs/eea-java-11/src/main/resources/java/awt/dnd/DropTarget.eea
index aa168ad706..048b80353d 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/dnd/DropTarget.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/dnd/DropTarget.eea
@@ -17,10 +17,10 @@ addDropTargetListener
  (L1java/awt/dnd/DropTargetListener;)V
 createDropTargetAutoScroller
  (Ljava/awt/Component;Ljava/awt/Point;)Ljava/awt/dnd/DropTarget$DropTargetAutoScroller;
- (Ljava/awt/Component;Ljava/awt/Point;)Ljava/awt/dnd/DropTarget$DropTargetAutoScroller;
+ (Ljava/awt/Component;Ljava/awt/Point;)L1java/awt/dnd/DropTarget$DropTargetAutoScroller;
 createDropTargetContext
  ()Ljava/awt/dnd/DropTargetContext;
- ()Ljava/awt/dnd/DropTargetContext;
+ ()L1java/awt/dnd/DropTargetContext;
 dragEnter
  (Ljava/awt/dnd/DropTargetDragEvent;)V
  (L1java/awt/dnd/DropTargetDragEvent;)V # @Inherited(java.awt.dnd.DropTargetListener)
diff --git a/libs/eea-java-11/src/main/resources/java/awt/dnd/DropTargetContext.eea b/libs/eea-java-11/src/main/resources/java/awt/dnd/DropTargetContext.eea
index f11644ee4f..4b35a47ca3 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/dnd/DropTargetContext.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/dnd/DropTargetContext.eea
@@ -2,13 +2,13 @@ class java/awt/dnd/DropTargetContext
 
 createTransferableProxy
  (Ljava/awt/datatransfer/Transferable;Z)Ljava/awt/datatransfer/Transferable;
- (Ljava/awt/datatransfer/Transferable;Z)Ljava/awt/datatransfer/Transferable;
+ (Ljava/awt/datatransfer/Transferable;Z)L1java/awt/datatransfer/Transferable;
 getComponent
  ()Ljava/awt/Component;
  ()Ljava/awt/Component;
 getCurrentDataFlavors
  ()[Ljava/awt/datatransfer/DataFlavor;
- ()[Ljava/awt/datatransfer/DataFlavor;
+ ()[1Ljava/awt/datatransfer/DataFlavor;
 getCurrentDataFlavorsAsList
  ()Ljava/util/List<Ljava/awt/datatransfer/DataFlavor;>;
  ()Ljava/util/List<Ljava/awt/datatransfer/DataFlavor;>;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/event/ActionEvent.eea b/libs/eea-java-11/src/main/resources/java/awt/event/ActionEvent.eea
index f541fb90e9..7a75bf609e 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/event/ActionEvent.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/event/ActionEvent.eea
@@ -14,4 +14,4 @@ getActionCommand
  ()Ljava/lang/String;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-11/src/main/resources/java/awt/event/AdjustmentEvent.eea b/libs/eea-java-11/src/main/resources/java/awt/event/AdjustmentEvent.eea
index fa963763f9..bf6f4022d0 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/event/AdjustmentEvent.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/event/AdjustmentEvent.eea
@@ -11,4 +11,4 @@ getAdjustable
  ()Ljava/awt/Adjustable;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-11/src/main/resources/java/awt/event/ComponentEvent.eea b/libs/eea-java-11/src/main/resources/java/awt/event/ComponentEvent.eea
index 248278dc87..84735f25fc 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/event/ComponentEvent.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/event/ComponentEvent.eea
@@ -5,7 +5,7 @@ class java/awt/event/ComponentEvent
  (Ljava/awt/Component;I)V
 getComponent
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-11/src/main/resources/java/awt/event/ContainerEvent.eea b/libs/eea-java-11/src/main/resources/java/awt/event/ContainerEvent.eea
index 4505843401..adf4537c74 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/event/ContainerEvent.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/event/ContainerEvent.eea
@@ -8,7 +8,7 @@ getChild
  ()Ljava/awt/Component;
 getContainer
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L0java/awt/Container;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.event.ComponentEvent)
diff --git a/libs/eea-java-11/src/main/resources/java/awt/event/FocusEvent.eea b/libs/eea-java-11/src/main/resources/java/awt/event/FocusEvent.eea
index 667f5751a7..854cb65b7a 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/event/FocusEvent.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/event/FocusEvent.eea
@@ -17,7 +17,7 @@ getCause
  ()Ljava/awt/event/FocusEvent$Cause;
 getOppositeComponent
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.event.ComponentEvent)
diff --git a/libs/eea-java-11/src/main/resources/java/awt/event/HierarchyEvent.eea b/libs/eea-java-11/src/main/resources/java/awt/event/HierarchyEvent.eea
index 1af8e531c7..8001088a04 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/event/HierarchyEvent.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/event/HierarchyEvent.eea
@@ -14,7 +14,7 @@ getChangedParent
  ()Ljava/awt/Container;
 getComponent
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-11/src/main/resources/java/awt/event/InputEvent.eea b/libs/eea-java-11/src/main/resources/java/awt/event/InputEvent.eea
index cbab8383da..bee433f498 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/event/InputEvent.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/event/InputEvent.eea
@@ -2,4 +2,4 @@ class java/awt/event/InputEvent
 
 getModifiersExText
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/event/InputMethodEvent.eea b/libs/eea-java-11/src/main/resources/java/awt/event/InputMethodEvent.eea
index f19223647f..6977a20734 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/event/InputMethodEvent.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/event/InputMethodEvent.eea
@@ -20,4 +20,4 @@ getVisiblePosition
  ()Ljava/awt/font/TextHitInfo;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-11/src/main/resources/java/awt/event/InvocationEvent.eea b/libs/eea-java-11/src/main/resources/java/awt/event/InvocationEvent.eea
index 54d8e5b19d..9431e73858 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/event/InvocationEvent.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/event/InvocationEvent.eea
@@ -21,10 +21,10 @@ runnable
  (Ljava/lang/Object;Ljava/lang/Runnable;Ljava/lang/Runnable;Z)V
 getException
  ()Ljava/lang/Exception;
- ()Ljava/lang/Exception;
+ ()L0java/lang/Exception;
 getThrowable
  ()Ljava/lang/Throwable;
- ()Ljava/lang/Throwable;
+ ()L0java/lang/Throwable;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-11/src/main/resources/java/awt/event/ItemEvent.eea b/libs/eea-java-11/src/main/resources/java/awt/event/ItemEvent.eea
index 26b9fe5399..63c93bbdbf 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/event/ItemEvent.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/event/ItemEvent.eea
@@ -11,4 +11,4 @@ getItemSelectable
  ()Ljava/awt/ItemSelectable;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-11/src/main/resources/java/awt/event/KeyEvent.eea b/libs/eea-java-11/src/main/resources/java/awt/event/KeyEvent.eea
index c8e55094ed..bc2af4dbe9 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/event/KeyEvent.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/event/KeyEvent.eea
@@ -2,7 +2,7 @@ class java/awt/event/KeyEvent
 
 getKeyModifiersText
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 getKeyText
  (I)Ljava/lang/String;
  (I)Ljava/lang/String;
@@ -18,4 +18,4 @@ getKeyText
  (Ljava/awt/Component;IJIICI)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.event.ComponentEvent)
diff --git a/libs/eea-java-11/src/main/resources/java/awt/event/MouseEvent.eea b/libs/eea-java-11/src/main/resources/java/awt/event/MouseEvent.eea
index a4be41b353..f56f197bfa 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/event/MouseEvent.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/event/MouseEvent.eea
@@ -2,7 +2,7 @@ class java/awt/event/MouseEvent
 
 getMouseModifiersText
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 
 <init>
  (Ljava/awt/Component;IJIIIIIIZI)V
@@ -18,7 +18,7 @@ getLocationOnScreen
  ()Ljava/awt/Point;
 getPoint
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L1java/awt/Point;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.event.ComponentEvent)
diff --git a/libs/eea-java-11/src/main/resources/java/awt/event/MouseWheelEvent.eea b/libs/eea-java-11/src/main/resources/java/awt/event/MouseWheelEvent.eea
index ab44cf6c46..bab3618f00 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/event/MouseWheelEvent.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/event/MouseWheelEvent.eea
@@ -11,4 +11,4 @@ class java/awt/event/MouseWheelEvent
  (Ljava/awt/Component;IJIIIIZIII)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.event.MouseEvent)
diff --git a/libs/eea-java-11/src/main/resources/java/awt/event/PaintEvent.eea b/libs/eea-java-11/src/main/resources/java/awt/event/PaintEvent.eea
index 65b2cbfa4b..95d2eaa82e 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/event/PaintEvent.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/event/PaintEvent.eea
@@ -8,7 +8,7 @@ getUpdateRect
  ()Ljava/awt/Rectangle;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.event.ComponentEvent)
 setUpdateRect
  (Ljava/awt/Rectangle;)V
  (Ljava/awt/Rectangle;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/event/TextEvent.eea b/libs/eea-java-11/src/main/resources/java/awt/event/TextEvent.eea
index 381c8e901a..15d46c86ca 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/event/TextEvent.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/event/TextEvent.eea
@@ -5,4 +5,4 @@ class java/awt/event/TextEvent
  (Ljava/lang/Object;I)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-11/src/main/resources/java/awt/event/WindowEvent.eea b/libs/eea-java-11/src/main/resources/java/awt/event/WindowEvent.eea
index b5a35b6220..2fe2c14d44 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/event/WindowEvent.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/event/WindowEvent.eea
@@ -14,10 +14,10 @@ class java/awt/event/WindowEvent
  (Ljava/awt/Window;ILjava/awt/Window;II)V
 getOppositeWindow
  ()Ljava/awt/Window;
- ()Ljava/awt/Window;
+ ()L0java/awt/Window;
 getWindow
  ()Ljava/awt/Window;
- ()Ljava/awt/Window;
+ ()L0java/awt/Window;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.event.ComponentEvent)
diff --git a/libs/eea-java-11/src/main/resources/java/awt/font/FontRenderContext.eea b/libs/eea-java-11/src/main/resources/java/awt/font/FontRenderContext.eea
index 06663117cf..98c1a76b22 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/font/FontRenderContext.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/font/FontRenderContext.eea
@@ -20,4 +20,4 @@ getFractionalMetricsHint
  ()Ljava/lang/Object;
 getTransform
  ()Ljava/awt/geom/AffineTransform;
- ()Ljava/awt/geom/AffineTransform;
+ ()L1java/awt/geom/AffineTransform;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/font/GlyphVector.eea b/libs/eea-java-11/src/main/resources/java/awt/font/GlyphVector.eea
index a2a027c978..a89b16264f 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/font/GlyphVector.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/font/GlyphVector.eea
@@ -11,7 +11,7 @@ getFontRenderContext
  ()Ljava/awt/font/FontRenderContext;
 getGlyphCharIndices
  (II[I)[I
- (II[I)[I
+ (II[I)[1I
 getGlyphCodes
  (II[I)[I
  (II[I)[I
diff --git a/libs/eea-java-11/src/main/resources/java/awt/font/LineBreakMeasurer.eea b/libs/eea-java-11/src/main/resources/java/awt/font/LineBreakMeasurer.eea
index 2439a59f27..b398d391fd 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/font/LineBreakMeasurer.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/font/LineBreakMeasurer.eea
@@ -17,4 +17,4 @@ nextLayout
  (F)Ljava/awt/font/TextLayout;
 nextLayout
  (FIZ)Ljava/awt/font/TextLayout;
- (FIZ)Ljava/awt/font/TextLayout;
+ (FIZ)L0java/awt/font/TextLayout;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/font/NumericShaper.eea b/libs/eea-java-11/src/main/resources/java/awt/font/NumericShaper.eea
index 1bd374a959..004363fe47 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/font/NumericShaper.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/font/NumericShaper.eea
@@ -5,19 +5,19 @@ getContextualShaper
  (I)Ljava/awt/font/NumericShaper;
 getContextualShaper
  (II)Ljava/awt/font/NumericShaper;
- (II)Ljava/awt/font/NumericShaper;
+ (II)L1java/awt/font/NumericShaper;
 getContextualShaper
  (Ljava/util/Set<Ljava/awt/font/NumericShaper$Range;>;)Ljava/awt/font/NumericShaper;
- (Ljava/util/Set<Ljava/awt/font/NumericShaper$Range;>;)Ljava/awt/font/NumericShaper;
+ (Ljava/util/Set<Ljava/awt/font/NumericShaper$Range;>;)L1java/awt/font/NumericShaper;
 getContextualShaper
  (Ljava/util/Set<Ljava/awt/font/NumericShaper$Range;>;Ljava/awt/font/NumericShaper$Range;)Ljava/awt/font/NumericShaper;
- (Ljava/util/Set<Ljava/awt/font/NumericShaper$Range;>;Ljava/awt/font/NumericShaper$Range;)Ljava/awt/font/NumericShaper;
+ (Ljava/util/Set<Ljava/awt/font/NumericShaper$Range;>;Ljava/awt/font/NumericShaper$Range;)L1java/awt/font/NumericShaper;
 getShaper
  (I)Ljava/awt/font/NumericShaper;
- (I)Ljava/awt/font/NumericShaper;
+ (I)L1java/awt/font/NumericShaper;
 getShaper
  (Ljava/awt/font/NumericShaper$Range;)Ljava/awt/font/NumericShaper;
- (Ljava/awt/font/NumericShaper$Range;)Ljava/awt/font/NumericShaper;
+ (Ljava/awt/font/NumericShaper$Range;)L1java/awt/font/NumericShaper;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/awt/font/ShapeGraphicAttribute.eea b/libs/eea-java-11/src/main/resources/java/awt/font/ShapeGraphicAttribute.eea
index 92ab1bca0d..83529bd0c1 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/font/ShapeGraphicAttribute.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/font/ShapeGraphicAttribute.eea
@@ -14,7 +14,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getBounds
  ()Ljava/awt/geom/Rectangle2D;
- ()Ljava/awt/geom/Rectangle2D;
+ ()L1java/awt/geom/Rectangle2D;
 getOutline
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/Shape;
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/Shape;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/font/TextLayout.eea b/libs/eea-java-11/src/main/resources/java/awt/font/TextLayout.eea
index 316f56c56a..fd954819a7 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/font/TextLayout.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/font/TextLayout.eea
@@ -24,13 +24,13 @@ equals
  (Ljava/awt/font/TextLayout;)Z
 getBaselineOffsets
  ()[F
- ()[F
+ ()[1F
 getBlackBoxBounds
  (II)Ljava/awt/Shape;
  (II)Ljava/awt/Shape;
 getBounds
  ()Ljava/awt/geom/Rectangle2D;
- ()Ljava/awt/geom/Rectangle2D;
+ ()L1java/awt/geom/Rectangle2D;
 getCaretInfo
  (Ljava/awt/font/TextHitInfo;)[F
  (Ljava/awt/font/TextHitInfo;)[F
@@ -51,7 +51,7 @@ getCaretShapes
  (ILjava/awt/geom/Rectangle2D;)[Ljava/awt/Shape;
 getCaretShapes
  (ILjava/awt/geom/Rectangle2D;Ljava/awt/font/TextLayout$CaretPolicy;)[Ljava/awt/Shape;
- (ILjava/awt/geom/Rectangle2D;Ljava/awt/font/TextLayout$CaretPolicy;)[Ljava/awt/Shape;
+ (ILjava/awt/geom/Rectangle2D;Ljava/awt/font/TextLayout$CaretPolicy;)[1Ljava/awt/Shape;
 getJustifiedLayout
  (F)Ljava/awt/font/TextLayout;
  (F)Ljava/awt/font/TextLayout;
@@ -66,25 +66,25 @@ getLogicalHighlightShape
  (IILjava/awt/geom/Rectangle2D;)Ljava/awt/Shape;
 getLogicalRangesForVisualSelection
  (Ljava/awt/font/TextHitInfo;Ljava/awt/font/TextHitInfo;)[I
- (Ljava/awt/font/TextHitInfo;Ljava/awt/font/TextHitInfo;)[I
+ (Ljava/awt/font/TextHitInfo;Ljava/awt/font/TextHitInfo;)[1I
 getNextLeftHit
  (I)Ljava/awt/font/TextHitInfo;
  (I)Ljava/awt/font/TextHitInfo;
 getNextLeftHit
  (ILjava/awt/font/TextLayout$CaretPolicy;)Ljava/awt/font/TextHitInfo;
- (ILjava/awt/font/TextLayout$CaretPolicy;)Ljava/awt/font/TextHitInfo;
+ (ILjava/awt/font/TextLayout$CaretPolicy;)L0java/awt/font/TextHitInfo;
 getNextLeftHit
  (Ljava/awt/font/TextHitInfo;)Ljava/awt/font/TextHitInfo;
- (Ljava/awt/font/TextHitInfo;)Ljava/awt/font/TextHitInfo;
+ (Ljava/awt/font/TextHitInfo;)L0java/awt/font/TextHitInfo;
 getNextRightHit
  (I)Ljava/awt/font/TextHitInfo;
  (I)Ljava/awt/font/TextHitInfo;
 getNextRightHit
  (ILjava/awt/font/TextLayout$CaretPolicy;)Ljava/awt/font/TextHitInfo;
- (ILjava/awt/font/TextLayout$CaretPolicy;)Ljava/awt/font/TextHitInfo;
+ (ILjava/awt/font/TextLayout$CaretPolicy;)L0java/awt/font/TextHitInfo;
 getNextRightHit
  (Ljava/awt/font/TextHitInfo;)Ljava/awt/font/TextHitInfo;
- (Ljava/awt/font/TextHitInfo;)Ljava/awt/font/TextHitInfo;
+ (Ljava/awt/font/TextHitInfo;)L0java/awt/font/TextHitInfo;
 getOutline
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/Shape;
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/Shape;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/font/TransformAttribute.eea b/libs/eea-java-11/src/main/resources/java/awt/font/TransformAttribute.eea
index b2dc622d3d..2d737268e5 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/font/TransformAttribute.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/font/TransformAttribute.eea
@@ -12,4 +12,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getTransform
  ()Ljava/awt/geom/AffineTransform;
- ()Ljava/awt/geom/AffineTransform;
+ ()L1java/awt/geom/AffineTransform;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/geom/AffineTransform.eea b/libs/eea-java-11/src/main/resources/java/awt/geom/AffineTransform.eea
index 756de77623..737666a241 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/geom/AffineTransform.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/geom/AffineTransform.eea
@@ -2,31 +2,31 @@ class java/awt/geom/AffineTransform
 
 getQuadrantRotateInstance
  (I)Ljava/awt/geom/AffineTransform;
- (I)Ljava/awt/geom/AffineTransform;
+ (I)L1java/awt/geom/AffineTransform;
 getQuadrantRotateInstance
  (IDD)Ljava/awt/geom/AffineTransform;
- (IDD)Ljava/awt/geom/AffineTransform;
+ (IDD)L1java/awt/geom/AffineTransform;
 getRotateInstance
  (D)Ljava/awt/geom/AffineTransform;
- (D)Ljava/awt/geom/AffineTransform;
+ (D)L1java/awt/geom/AffineTransform;
 getRotateInstance
  (DD)Ljava/awt/geom/AffineTransform;
- (DD)Ljava/awt/geom/AffineTransform;
+ (DD)L1java/awt/geom/AffineTransform;
 getRotateInstance
  (DDD)Ljava/awt/geom/AffineTransform;
- (DDD)Ljava/awt/geom/AffineTransform;
+ (DDD)L1java/awt/geom/AffineTransform;
 getRotateInstance
  (DDDD)Ljava/awt/geom/AffineTransform;
- (DDDD)Ljava/awt/geom/AffineTransform;
+ (DDDD)L1java/awt/geom/AffineTransform;
 getScaleInstance
  (DD)Ljava/awt/geom/AffineTransform;
- (DD)Ljava/awt/geom/AffineTransform;
+ (DD)L1java/awt/geom/AffineTransform;
 getShearInstance
  (DD)Ljava/awt/geom/AffineTransform;
- (DD)Ljava/awt/geom/AffineTransform;
+ (DD)L1java/awt/geom/AffineTransform;
 getTranslateInstance
  (DD)Ljava/awt/geom/AffineTransform;
- (DD)Ljava/awt/geom/AffineTransform;
+ (DD)L1java/awt/geom/AffineTransform;
 
 <init>
  (Ljava/awt/geom/AffineTransform;)V
@@ -45,13 +45,13 @@ concatenate
  (Ljava/awt/geom/AffineTransform;)V
 createInverse
  ()Ljava/awt/geom/AffineTransform;
- ()Ljava/awt/geom/AffineTransform;
+ ()L0java/awt/geom/AffineTransform;
 createTransformedShape
  (Ljava/awt/Shape;)Ljava/awt/Shape;
- (Ljava/awt/Shape;)Ljava/awt/Shape;
+ (Ljava/awt/Shape;)Ljava/awt/Shape; # @PolyNull
 deltaTransform
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
- (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
+ (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)L0java/awt/geom/Point2D;
 deltaTransform
  ([DI[DII)V
  ([DI[DII)V
@@ -63,7 +63,7 @@ getMatrix
  ([D)V
 inverseTransform
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
- (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
+ (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)L1java/awt/geom/Point2D;
 inverseTransform
  ([DI[DII)V
  ([DI[DII)V
@@ -78,7 +78,7 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 transform
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
- (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
+ (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)L0java/awt/geom/Point2D;
 transform
  ([DI[DII)V
  ([DI[DII)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/geom/Arc2D$Double.eea b/libs/eea-java-11/src/main/resources/java/awt/geom/Arc2D$Double.eea
index 2ee4c625cd..efb504cd4a 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/geom/Arc2D$Double.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/geom/Arc2D$Double.eea
@@ -5,4 +5,4 @@ class java/awt/geom/Arc2D$Double
  (Ljava/awt/geom/Rectangle2D;DDI)V
 makeBounds
  (DDDD)Ljava/awt/geom/Rectangle2D;
- (DDDD)Ljava/awt/geom/Rectangle2D;
+ (DDDD)L1java/awt/geom/Rectangle2D;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/geom/Arc2D.eea b/libs/eea-java-11/src/main/resources/java/awt/geom/Arc2D.eea
index bf9809bd63..a64f15ee34 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/geom/Arc2D.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/geom/Arc2D.eea
@@ -11,13 +11,13 @@ getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
 getEndPoint
  ()Ljava/awt/geom/Point2D;
- ()Ljava/awt/geom/Point2D;
+ ()L1java/awt/geom/Point2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 getStartPoint
  ()Ljava/awt/geom/Point2D;
- ()Ljava/awt/geom/Point2D;
+ ()L1java/awt/geom/Point2D;
 makeBounds
  (DDDD)Ljava/awt/geom/Rectangle2D;
  (DDDD)Ljava/awt/geom/Rectangle2D;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/geom/Area.eea b/libs/eea-java-11/src/main/resources/java/awt/geom/Area.eea
index 06439e9b37..fd15031df2 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/geom/Area.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/geom/Area.eea
@@ -17,7 +17,7 @@ contains
  (Ljava/awt/geom/Rectangle2D;)Z
 createTransformedArea
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/Area;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/Area;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/Area;
 equals
  (Ljava/awt/geom/Area;)Z
  (Ljava/awt/geom/Area;)Z
@@ -32,10 +32,10 @@ getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;D)L1java/awt/geom/PathIterator;
 intersect
  (Ljava/awt/geom/Area;)V
  (Ljava/awt/geom/Area;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/geom/CubicCurve2D.eea b/libs/eea-java-11/src/main/resources/java/awt/geom/CubicCurve2D.eea
index f735287c25..6ac45d26b6 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/geom/CubicCurve2D.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/geom/CubicCurve2D.eea
@@ -45,10 +45,10 @@ getP2
  ()Ljava/awt/geom/Point2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;D)L1java/awt/geom/PathIterator;
 intersects
  (Ljava/awt/geom/Rectangle2D;)Z
  (Ljava/awt/geom/Rectangle2D;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/awt/geom/Ellipse2D.eea b/libs/eea-java-11/src/main/resources/java/awt/geom/Ellipse2D.eea
index f1cc1192f8..b4e32bdb66 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/geom/Ellipse2D.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/geom/Ellipse2D.eea
@@ -5,4 +5,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/geom/Line2D$Double.eea b/libs/eea-java-11/src/main/resources/java/awt/geom/Line2D$Double.eea
index 741afd70cf..73d3d64ebf 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/geom/Line2D$Double.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/geom/Line2D$Double.eea
@@ -5,7 +5,7 @@ class java/awt/geom/Line2D$Double
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)V
 getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
- ()Ljava/awt/geom/Rectangle2D;
+ ()L1java/awt/geom/Rectangle2D;
 getP1
  ()Ljava/awt/geom/Point2D;
  ()Ljava/awt/geom/Point2D;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/geom/Line2D$Float.eea b/libs/eea-java-11/src/main/resources/java/awt/geom/Line2D$Float.eea
index 68f4e0365c..caadf613e1 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/geom/Line2D$Float.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/geom/Line2D$Float.eea
@@ -5,7 +5,7 @@ class java/awt/geom/Line2D$Float
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)V
 getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
- ()Ljava/awt/geom/Rectangle2D;
+ ()L1java/awt/geom/Rectangle2D;
 getP1
  ()Ljava/awt/geom/Point2D;
  ()Ljava/awt/geom/Point2D;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/geom/Line2D.eea b/libs/eea-java-11/src/main/resources/java/awt/geom/Line2D.eea
index f58ff2b577..4c6f212e57 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/geom/Line2D.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/geom/Line2D.eea
@@ -20,10 +20,10 @@ getP2
  ()Ljava/awt/geom/Point2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;D)L1java/awt/geom/PathIterator;
 intersects
  (Ljava/awt/geom/Rectangle2D;)Z
  (Ljava/awt/geom/Rectangle2D;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/awt/geom/Path2D$Double.eea b/libs/eea-java-11/src/main/resources/java/awt/geom/Path2D$Double.eea
index c923b76ba6..7e4bd077a7 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/geom/Path2D$Double.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/geom/Path2D$Double.eea
@@ -17,7 +17,7 @@ getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 transform
  (Ljava/awt/geom/AffineTransform;)V
  (Ljava/awt/geom/AffineTransform;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/geom/Path2D$Float.eea b/libs/eea-java-11/src/main/resources/java/awt/geom/Path2D$Float.eea
index d63ab273e6..b9cb4ed35e 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/geom/Path2D$Float.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/geom/Path2D$Float.eea
@@ -17,7 +17,7 @@ getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 transform
  (Ljava/awt/geom/AffineTransform;)V
  (Ljava/awt/geom/AffineTransform;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/geom/Path2D.eea b/libs/eea-java-11/src/main/resources/java/awt/geom/Path2D.eea
index bfcd5ea33d..c66b14211f 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/geom/Path2D.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/geom/Path2D.eea
@@ -36,16 +36,16 @@ contains
  (Ljava/awt/geom/Rectangle2D;)Z
 createTransformedShape
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/Shape;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/Shape;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/Shape;
 getBounds
  ()Ljava/awt/Rectangle;
  ()Ljava/awt/Rectangle;
 getCurrentPoint
  ()Ljava/awt/geom/Point2D;
- ()Ljava/awt/geom/Point2D;
+ ()L0java/awt/geom/Point2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;D)L1java/awt/geom/PathIterator;
 intersects
  (Ljava/awt/geom/Rectangle2D;)Z
  (Ljava/awt/geom/Rectangle2D;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/awt/geom/QuadCurve2D.eea b/libs/eea-java-11/src/main/resources/java/awt/geom/QuadCurve2D.eea
index 6e72041c34..d5d9183932 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/geom/QuadCurve2D.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/geom/QuadCurve2D.eea
@@ -42,10 +42,10 @@ getP2
  ()Ljava/awt/geom/Point2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;D)L1java/awt/geom/PathIterator;
 intersects
  (Ljava/awt/geom/Rectangle2D;)Z
  (Ljava/awt/geom/Rectangle2D;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/awt/geom/Rectangle2D$Double.eea b/libs/eea-java-11/src/main/resources/java/awt/geom/Rectangle2D$Double.eea
index 567d74c9df..d6e216051f 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/geom/Rectangle2D$Double.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/geom/Rectangle2D$Double.eea
@@ -2,10 +2,10 @@ class java/awt/geom/Rectangle2D$Double
 
 createIntersection
  (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
- (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
+ (Ljava/awt/geom/Rectangle2D;)L1java/awt/geom/Rectangle2D; # @Inherited(java.awt.geom.Rectangle2D)
 createUnion
  (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
- (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
+ (Ljava/awt/geom/Rectangle2D;)L1java/awt/geom/Rectangle2D; # @Inherited(java.awt.geom.Rectangle2D)
 getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
  ()Ljava/awt/geom/Rectangle2D;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/geom/Rectangle2D$Float.eea b/libs/eea-java-11/src/main/resources/java/awt/geom/Rectangle2D$Float.eea
index 24f10eff5e..7ec62fc07b 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/geom/Rectangle2D$Float.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/geom/Rectangle2D$Float.eea
@@ -2,10 +2,10 @@ class java/awt/geom/Rectangle2D$Float
 
 createIntersection
  (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
- (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
+ (Ljava/awt/geom/Rectangle2D;)L1java/awt/geom/Rectangle2D; # @Inherited(java.awt.geom.Rectangle2D)
 createUnion
  (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
- (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
+ (Ljava/awt/geom/Rectangle2D;)L1java/awt/geom/Rectangle2D; # @Inherited(java.awt.geom.Rectangle2D)
 getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
  ()Ljava/awt/geom/Rectangle2D;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/geom/Rectangle2D.eea b/libs/eea-java-11/src/main/resources/java/awt/geom/Rectangle2D.eea
index e7d55698e2..a98df9d76b 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/geom/Rectangle2D.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/geom/Rectangle2D.eea
@@ -15,10 +15,10 @@ add
  (Ljava/awt/geom/Rectangle2D;)V
 createIntersection
  (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
- (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
+ (Ljava/awt/geom/Rectangle2D;)L1java/awt/geom/Rectangle2D;
 createUnion
  (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
- (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
+ (Ljava/awt/geom/Rectangle2D;)L1java/awt/geom/Rectangle2D;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -27,10 +27,10 @@ getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;D)L1java/awt/geom/PathIterator; # @Inherited(java.awt.geom.RectangularShape)
 intersectsLine
  (Ljava/awt/geom/Line2D;)Z
  (Ljava/awt/geom/Line2D;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/awt/geom/RectangularShape.eea b/libs/eea-java-11/src/main/resources/java/awt/geom/RectangularShape.eea
index d0aa6206aa..f495b09d74 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/geom/RectangularShape.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/geom/RectangularShape.eea
@@ -14,10 +14,10 @@ getBounds
  ()Ljava/awt/Rectangle;
 getFrame
  ()Ljava/awt/geom/Rectangle2D;
- ()Ljava/awt/geom/Rectangle2D;
+ ()L1java/awt/geom/Rectangle2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;D)L1java/awt/geom/PathIterator;
 intersects
  (Ljava/awt/geom/Rectangle2D;)Z
  (Ljava/awt/geom/Rectangle2D;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/awt/geom/RoundRectangle2D.eea b/libs/eea-java-11/src/main/resources/java/awt/geom/RoundRectangle2D.eea
index 9bc159d4a2..6b9154c5bf 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/geom/RoundRectangle2D.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/geom/RoundRectangle2D.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 setRoundRect
  (Ljava/awt/geom/RoundRectangle2D;)V
  (Ljava/awt/geom/RoundRectangle2D;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/im/InputContext.eea b/libs/eea-java-11/src/main/resources/java/awt/im/InputContext.eea
index 5a942af534..2e1d3ad97c 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/im/InputContext.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/im/InputContext.eea
@@ -2,17 +2,17 @@ class java/awt/im/InputContext
 
 getInstance
  ()Ljava/awt/im/InputContext;
- ()Ljava/awt/im/InputContext;
+ ()L1java/awt/im/InputContext;
 
 dispatchEvent
  (Ljava/awt/AWTEvent;)V
  (Ljava/awt/AWTEvent;)V
 getInputMethodControlObject
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getLocale
  ()Ljava/util/Locale;
- ()Ljava/util/Locale;
+ ()L0java/util/Locale;
 removeNotify
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/im/spi/InputMethodContext.eea b/libs/eea-java-11/src/main/resources/java/awt/im/spi/InputMethodContext.eea
index cdc0882758..e07567ce5b 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/im/spi/InputMethodContext.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/im/spi/InputMethodContext.eea
@@ -2,10 +2,10 @@ class java/awt/im/spi/InputMethodContext
 
 createInputMethodJFrame
  (Ljava/lang/String;Z)Ljavax/swing/JFrame;
- (Ljava/lang/String;Z)Ljavax/swing/JFrame;
+ (Ljava/lang/String;Z)L1javax/swing/JFrame;
 createInputMethodWindow
  (Ljava/lang/String;Z)Ljava/awt/Window;
- (Ljava/lang/String;Z)Ljava/awt/Window;
+ (Ljava/lang/String;Z)L1java/awt/Window;
 dispatchInputMethodEvent
  (ILjava/text/AttributedCharacterIterator;ILjava/awt/font/TextHitInfo;Ljava/awt/font/TextHitInfo;)V
  (ILjava/text/AttributedCharacterIterator;ILjava/awt/font/TextHitInfo;Ljava/awt/font/TextHitInfo;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/im/spi/InputMethodDescriptor.eea b/libs/eea-java-11/src/main/resources/java/awt/im/spi/InputMethodDescriptor.eea
index a5f987a24c..87950a4fb5 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/im/spi/InputMethodDescriptor.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/im/spi/InputMethodDescriptor.eea
@@ -2,7 +2,7 @@ class java/awt/im/spi/InputMethodDescriptor
 
 createInputMethod
  ()Ljava/awt/im/spi/InputMethod;
- ()Ljava/awt/im/spi/InputMethod;
+ ()L1java/awt/im/spi/InputMethod;
 getAvailableLocales
  ()[Ljava/util/Locale;
  ()[Ljava/util/Locale;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/AbstractMultiResolutionImage.eea b/libs/eea-java-11/src/main/resources/java/awt/image/AbstractMultiResolutionImage.eea
index f0574056fd..de6bd012db 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/AbstractMultiResolutionImage.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/AbstractMultiResolutionImage.eea
@@ -5,7 +5,7 @@ getBaseImage
  ()Ljava/awt/Image;
 getGraphics
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L1java/awt/Graphics;
 getHeight
  (Ljava/awt/image/ImageObserver;)I
  (Ljava/awt/image/ImageObserver;)I
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/AffineTransformOp.eea b/libs/eea-java-11/src/main/resources/java/awt/image/AffineTransformOp.eea
index 0cd0b4be15..45005247fa 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/AffineTransformOp.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/AffineTransformOp.eea
@@ -8,10 +8,10 @@ class java/awt/image/AffineTransformOp
  (Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)V
 createCompatibleDestImage
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
- (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
+ (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)L1java/awt/image/BufferedImage; # @Inherited(java.awt.image.BufferedImageOp)
 createCompatibleDestRaster
  (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/Raster;)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.RasterOp)
 filter
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/BandCombineOp.eea b/libs/eea-java-11/src/main/resources/java/awt/image/BandCombineOp.eea
index a073171a66..76987734df 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/BandCombineOp.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/BandCombineOp.eea
@@ -5,7 +5,7 @@ class java/awt/image/BandCombineOp
  ([[FLjava/awt/RenderingHints;)V
 createCompatibleDestRaster
  (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/Raster;)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.RasterOp)
 filter
  (Ljava/awt/image/Raster;Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
  (Ljava/awt/image/Raster;Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
@@ -14,10 +14,10 @@ getBounds2D
  (Ljava/awt/image/Raster;)Ljava/awt/geom/Rectangle2D;
 getMatrix
  ()[[F
- ()[[F
+ ()[1[F
 getPoint2D
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
- (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
+ (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)L1java/awt/geom/Point2D;
 getRenderingHints
  ()Ljava/awt/RenderingHints;
  ()Ljava/awt/RenderingHints;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/BandedSampleModel.eea b/libs/eea-java-11/src/main/resources/java/awt/image/BandedSampleModel.eea
index 533e390b77..339cac02d5 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/BandedSampleModel.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/BandedSampleModel.eea
@@ -5,22 +5,22 @@ class java/awt/image/BandedSampleModel
  (IIII[I[I)V
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.ComponentSampleModel)
 createDataBuffer
  ()Ljava/awt/image/DataBuffer;
- ()Ljava/awt/image/DataBuffer;
+ ()L1java/awt/image/DataBuffer; # @Inherited(java.awt.image.ComponentSampleModel)
 createSubsetSampleModel
  ([I)Ljava/awt/image/SampleModel;
- ([I)Ljava/awt/image/SampleModel;
+ ([I)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.ComponentSampleModel)
 getDataElements
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)Ljava/lang/Object;
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)Ljava/lang/Object;
 getPixel
  (II[ILjava/awt/image/DataBuffer;)[I
- (II[ILjava/awt/image/DataBuffer;)[I
+ (II[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.ComponentSampleModel)
 getPixels
  (IIII[ILjava/awt/image/DataBuffer;)[I
- (IIII[ILjava/awt/image/DataBuffer;)[I
+ (IIII[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.ComponentSampleModel)
 getSample
  (IIILjava/awt/image/DataBuffer;)I
  (IIILjava/awt/image/DataBuffer;)I
@@ -32,7 +32,7 @@ getSampleFloat
  (IIILjava/awt/image/DataBuffer;)F
 getSamples
  (IIIII[ILjava/awt/image/DataBuffer;)[I
- (IIIII[ILjava/awt/image/DataBuffer;)[I
+ (IIIII[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.ComponentSampleModel)
 setDataElements
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)V
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/BufferedImage.eea b/libs/eea-java-11/src/main/resources/java/awt/image/BufferedImage.eea
index e73b963141..0b8c92cb83 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/BufferedImage.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/BufferedImage.eea
@@ -14,7 +14,7 @@ copyData
  (Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
 createGraphics
  ()Ljava/awt/Graphics2D;
- ()Ljava/awt/Graphics2D;
+ ()L1java/awt/Graphics2D;
 getAlphaRaster
  ()Ljava/awt/image/WritableRaster;
  ()Ljava/awt/image/WritableRaster;
@@ -44,7 +44,7 @@ getPropertyNames
  ()[0L1java/lang/String; # @Inherited(java.awt.image.RenderedImage)
 getRGB
  (IIII[III)[I
- (IIII[III)[I
+ (IIII[III)[1I
 getRaster
  ()Ljava/awt/image/WritableRaster;
  ()Ljava/awt/image/WritableRaster;
@@ -56,7 +56,7 @@ getSource
  ()Ljava/awt/image/ImageProducer;
 getSources
  ()Ljava/util/Vector<Ljava/awt/image/RenderedImage;>;
- ()Ljava/util/Vector<Ljava/awt/image/RenderedImage;>;
+ ()L0java/util/Vector<Ljava/awt/image/RenderedImage;>;
 getSubimage
  (IIII)Ljava/awt/image/BufferedImage;
  (IIII)Ljava/awt/image/BufferedImage;
@@ -71,7 +71,7 @@ getWritableTile
  (II)Ljava/awt/image/WritableRaster;
 getWritableTileIndices
  ()[Ljava/awt/Point;
- ()[Ljava/awt/Point;
+ ()[1Ljava/awt/Point;
 removeTileObserver
  (Ljava/awt/image/TileObserver;)V
  (Ljava/awt/image/TileObserver;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/BufferedImageOp.eea b/libs/eea-java-11/src/main/resources/java/awt/image/BufferedImageOp.eea
index 6b79874cf7..6a5da8bb1a 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/BufferedImageOp.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/BufferedImageOp.eea
@@ -2,7 +2,7 @@ class java/awt/image/BufferedImageOp
 
 createCompatibleDestImage
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
- (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
+ (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)L1java/awt/image/BufferedImage;
 filter
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/ByteLookupTable.eea b/libs/eea-java-11/src/main/resources/java/awt/image/ByteLookupTable.eea
index f6c0a968f5..6d56699477 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/ByteLookupTable.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/ByteLookupTable.eea
@@ -11,7 +11,7 @@ getTable
  ()[[B
 lookupPixel
  ([B[B)[B
- ([B[B)[B
+ ([B[B)[1B
 lookupPixel
  ([I[I)[I
- ([I[I)[I
+ ([I[I)[1I
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/ColorConvertOp.eea b/libs/eea-java-11/src/main/resources/java/awt/image/ColorConvertOp.eea
index 9edd6b2ed0..365d158796 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/ColorConvertOp.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/ColorConvertOp.eea
@@ -14,10 +14,10 @@ class java/awt/image/ColorConvertOp
  ([Ljava/awt/color/ICC_Profile;Ljava/awt/RenderingHints;)V
 createCompatibleDestImage
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
- (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
+ (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)L1java/awt/image/BufferedImage; # @Inherited(java.awt.image.BufferedImageOp)
 createCompatibleDestRaster
  (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/Raster;)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.RasterOp)
 filter
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
@@ -32,10 +32,10 @@ getBounds2D
  (Ljava/awt/image/Raster;)Ljava/awt/geom/Rectangle2D;
 getICC_Profiles
  ()[Ljava/awt/color/ICC_Profile;
- ()[Ljava/awt/color/ICC_Profile;
+ ()[0Ljava/awt/color/ICC_Profile;
 getPoint2D
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
- (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
+ (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)L1java/awt/geom/Point2D;
 getRenderingHints
  ()Ljava/awt/RenderingHints;
  ()Ljava/awt/RenderingHints;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/ColorModel.eea b/libs/eea-java-11/src/main/resources/java/awt/image/ColorModel.eea
index 8f27a4e790..d4760ba2c3 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/ColorModel.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/ColorModel.eea
@@ -9,13 +9,13 @@ getRGBdefault
  (I[ILjava/awt/color/ColorSpace;ZZII)V
 coerceData
  (Ljava/awt/image/WritableRaster;Z)Ljava/awt/image/ColorModel;
- (Ljava/awt/image/WritableRaster;Z)Ljava/awt/image/ColorModel;
+ (Ljava/awt/image/WritableRaster;Z)L1java/awt/image/ColorModel;
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel;
 createCompatibleWritableRaster
  (II)Ljava/awt/image/WritableRaster;
- (II)Ljava/awt/image/WritableRaster;
+ (II)L1java/awt/image/WritableRaster;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -24,7 +24,7 @@ getAlpha
  (Ljava/lang/Object;)I
 getAlphaRaster
  (Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/WritableRaster;)L0java/awt/image/WritableRaster;
 getBlue
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
@@ -33,13 +33,13 @@ getColorSpace
  ()Ljava/awt/color/ColorSpace;
 getComponentSize
  ()[I
- ()[I
+ ()[0I
 getComponents
  (I[II)[I
- (I[II)[I
+ (I[II)[1I
 getComponents
  (Ljava/lang/Object;[II)[I
- (Ljava/lang/Object;[II)[I
+ (Ljava/lang/Object;[II)[1I
 getDataElement
  ([FI)I
  ([FI)I
@@ -48,13 +48,13 @@ getDataElement
  ([II)I
 getDataElements
  (ILjava/lang/Object;)Ljava/lang/Object;
- (ILjava/lang/Object;)Ljava/lang/Object;
+ (ILjava/lang/Object;)L1java/lang/Object;
 getDataElements
  ([FILjava/lang/Object;)Ljava/lang/Object;
  ([FILjava/lang/Object;)Ljava/lang/Object;
 getDataElements
  ([IILjava/lang/Object;)Ljava/lang/Object;
- ([IILjava/lang/Object;)Ljava/lang/Object;
+ ([IILjava/lang/Object;)L1java/lang/Object;
 getGreen
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
@@ -63,7 +63,7 @@ getNormalizedComponents
  (Ljava/lang/Object;[FI)[F
 getNormalizedComponents
  ([II[FI)[F
- ([II[FI)[F
+ ([II[FI)[1F
 getRGB
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
@@ -72,7 +72,7 @@ getRed
  (Ljava/lang/Object;)I
 getUnnormalizedComponents
  ([FI[II)[I
- ([FI[II)[I
+ ([FI[II)[1I
 isCompatibleRaster
  (Ljava/awt/image/Raster;)Z
  (Ljava/awt/image/Raster;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/ComponentColorModel.eea b/libs/eea-java-11/src/main/resources/java/awt/image/ComponentColorModel.eea
index e301e468c1..df18f9c4da 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/ComponentColorModel.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/ComponentColorModel.eea
@@ -8,13 +8,13 @@ class java/awt/image/ComponentColorModel
  (Ljava/awt/color/ColorSpace;[IZZII)V
 coerceData
  (Ljava/awt/image/WritableRaster;Z)Ljava/awt/image/ColorModel;
- (Ljava/awt/image/WritableRaster;Z)Ljava/awt/image/ColorModel;
+ (Ljava/awt/image/WritableRaster;Z)L1java/awt/image/ColorModel; # @Inherited(java.awt.image.ColorModel)
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.ColorModel)
 createCompatibleWritableRaster
  (II)Ljava/awt/image/WritableRaster;
- (II)Ljava/awt/image/WritableRaster;
+ (II)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.ColorModel)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.awt.image.ColorModel)
@@ -23,16 +23,16 @@ getAlpha
  (Ljava/lang/Object;)I
 getAlphaRaster
  (Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/WritableRaster;)L0java/awt/image/WritableRaster; # @Inherited(java.awt.image.ColorModel)
 getBlue
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
 getComponents
  (I[II)[I
- (I[II)[I
+ (I[II)[1I # @Inherited(java.awt.image.ColorModel)
 getComponents
  (Ljava/lang/Object;[II)[I
- (Ljava/lang/Object;[II)[I
+ (Ljava/lang/Object;[II)[1I # @Inherited(java.awt.image.ColorModel)
 getDataElement
  ([FI)I
  ([FI)I
@@ -41,22 +41,22 @@ getDataElement
  ([II)I
 getDataElements
  (ILjava/lang/Object;)Ljava/lang/Object;
- (ILjava/lang/Object;)Ljava/lang/Object;
+ (ILjava/lang/Object;)L1java/lang/Object; # @Inherited(java.awt.image.ColorModel)
 getDataElements
  ([FILjava/lang/Object;)Ljava/lang/Object;
  ([FILjava/lang/Object;)Ljava/lang/Object;
 getDataElements
  ([IILjava/lang/Object;)Ljava/lang/Object;
- ([IILjava/lang/Object;)Ljava/lang/Object;
+ ([IILjava/lang/Object;)L1java/lang/Object; # @Inherited(java.awt.image.ColorModel)
 getGreen
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
 getNormalizedComponents
  (Ljava/lang/Object;[FI)[F
- (Ljava/lang/Object;[FI)[F
+ (Ljava/lang/Object;[FI)[1F
 getNormalizedComponents
  ([II[FI)[F
- ([II[FI)[F
+ ([II[FI)[1F # @Inherited(java.awt.image.ColorModel)
 getRGB
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
@@ -65,7 +65,7 @@ getRed
  (Ljava/lang/Object;)I
 getUnnormalizedComponents
  ([FI[II)[I
- ([FI[II)[I
+ ([FI[II)[1I # @Inherited(java.awt.image.ColorModel)
 isCompatibleRaster
  (Ljava/awt/image/Raster;)Z
  (Ljava/awt/image/Raster;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/ComponentSampleModel.eea b/libs/eea-java-11/src/main/resources/java/awt/image/ComponentSampleModel.eea
index 9eaf7c2f1d..ed4bda8c11 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/ComponentSampleModel.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/ComponentSampleModel.eea
@@ -15,13 +15,13 @@ bankIndices
  (IIIII[I[I)V
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.SampleModel)
 createDataBuffer
  ()Ljava/awt/image/DataBuffer;
- ()Ljava/awt/image/DataBuffer;
+ ()L1java/awt/image/DataBuffer; # @Inherited(java.awt.image.SampleModel)
 createSubsetSampleModel
  ([I)Ljava/awt/image/SampleModel;
- ([I)Ljava/awt/image/SampleModel;
+ ([I)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.SampleModel)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -36,10 +36,10 @@ getDataElements
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)Ljava/lang/Object;
 getPixel
  (II[ILjava/awt/image/DataBuffer;)[I
- (II[ILjava/awt/image/DataBuffer;)[I
+ (II[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.SampleModel)
 getPixels
  (IIII[ILjava/awt/image/DataBuffer;)[I
- (IIII[ILjava/awt/image/DataBuffer;)[I
+ (IIII[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.SampleModel)
 getSample
  (IIILjava/awt/image/DataBuffer;)I
  (IIILjava/awt/image/DataBuffer;)I
@@ -51,10 +51,10 @@ getSampleFloat
  (IIILjava/awt/image/DataBuffer;)F
 getSampleSize
  ()[I
- ()[I
+ ()[1I
 getSamples
  (IIIII[ILjava/awt/image/DataBuffer;)[I
- (IIIII[ILjava/awt/image/DataBuffer;)[I
+ (IIIII[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.SampleModel)
 setDataElements
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)V
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/ConvolveOp.eea b/libs/eea-java-11/src/main/resources/java/awt/image/ConvolveOp.eea
index d9c6cbbd13..a13fff1a08 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/ConvolveOp.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/ConvolveOp.eea
@@ -8,10 +8,10 @@ class java/awt/image/ConvolveOp
  (Ljava/awt/image/Kernel;ILjava/awt/RenderingHints;)V
 createCompatibleDestImage
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
- (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
+ (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)L1java/awt/image/BufferedImage; # @Inherited(java.awt.image.BufferedImageOp)
 createCompatibleDestRaster
  (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/Raster;)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.RasterOp)
 filter
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
@@ -29,7 +29,7 @@ getKernel
  ()Ljava/awt/image/Kernel;
 getPoint2D
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
- (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
+ (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)L1java/awt/geom/Point2D;
 getRenderingHints
  ()Ljava/awt/RenderingHints;
  ()Ljava/awt/RenderingHints;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/DirectColorModel.eea b/libs/eea-java-11/src/main/resources/java/awt/image/DirectColorModel.eea
index 5a55f3c255..f188115f45 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/DirectColorModel.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/DirectColorModel.eea
@@ -5,10 +5,10 @@ class java/awt/image/DirectColorModel
  (Ljava/awt/color/ColorSpace;IIIIIZI)V
 coerceData
  (Ljava/awt/image/WritableRaster;Z)Ljava/awt/image/ColorModel;
- (Ljava/awt/image/WritableRaster;Z)Ljava/awt/image/ColorModel;
+ (Ljava/awt/image/WritableRaster;Z)L1java/awt/image/ColorModel; # @Inherited(java.awt.image.ColorModel)
 createCompatibleWritableRaster
  (II)Ljava/awt/image/WritableRaster;
- (II)Ljava/awt/image/WritableRaster;
+ (II)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.ColorModel)
 getAlpha
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
@@ -17,19 +17,19 @@ getBlue
  (Ljava/lang/Object;)I
 getComponents
  (I[II)[I
- (I[II)[I
+ (I[II)[1I # @Inherited(java.awt.image.ColorModel)
 getComponents
  (Ljava/lang/Object;[II)[I
- (Ljava/lang/Object;[II)[I
+ (Ljava/lang/Object;[II)[1I # @Inherited(java.awt.image.ColorModel)
 getDataElement
  ([II)I
  ([II)I
 getDataElements
  (ILjava/lang/Object;)Ljava/lang/Object;
- (ILjava/lang/Object;)Ljava/lang/Object;
+ (ILjava/lang/Object;)L1java/lang/Object; # @Inherited(java.awt.image.ColorModel)
 getDataElements
  ([IILjava/lang/Object;)Ljava/lang/Object;
- ([IILjava/lang/Object;)Ljava/lang/Object;
+ ([IILjava/lang/Object;)L1java/lang/Object; # @Inherited(java.awt.image.ColorModel)
 getGreen
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/IndexColorModel.eea b/libs/eea-java-11/src/main/resources/java/awt/image/IndexColorModel.eea
index 91af132d0a..9ca4e14bf5 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/IndexColorModel.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/IndexColorModel.eea
@@ -26,10 +26,10 @@ convertToIntDiscrete
  (Ljava/awt/image/Raster;Z)Ljava/awt/image/BufferedImage;
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.ColorModel)
 createCompatibleWritableRaster
  (II)Ljava/awt/image/WritableRaster;
- (II)Ljava/awt/image/WritableRaster;
+ (II)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.ColorModel)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.awt.image.ColorModel)
@@ -41,22 +41,22 @@ getBlues
  ([B)V
 getComponentSize
  ()[I
- ()[I
+ ()[0I # @Inherited(java.awt.image.ColorModel)
 getComponents
  (I[II)[I
- (I[II)[I
+ (I[II)[1I # @Inherited(java.awt.image.ColorModel)
 getComponents
  (Ljava/lang/Object;[II)[I
- (Ljava/lang/Object;[II)[I
+ (Ljava/lang/Object;[II)[1I # @Inherited(java.awt.image.ColorModel)
 getDataElement
  ([II)I
  ([II)I
 getDataElements
  (ILjava/lang/Object;)Ljava/lang/Object;
- (ILjava/lang/Object;)Ljava/lang/Object;
+ (ILjava/lang/Object;)L1java/lang/Object; # @Inherited(java.awt.image.ColorModel)
 getDataElements
  ([IILjava/lang/Object;)Ljava/lang/Object;
- ([IILjava/lang/Object;)Ljava/lang/Object;
+ ([IILjava/lang/Object;)L1java/lang/Object; # @Inherited(java.awt.image.ColorModel)
 getGreens
  ([B)V
  ([B)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/Kernel.eea b/libs/eea-java-11/src/main/resources/java/awt/image/Kernel.eea
index 76ecfa1620..ac1dc80e1d 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/Kernel.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/Kernel.eea
@@ -8,4 +8,4 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 getKernelData
  ([F)[F
- ([F)[F
+ ([F)[1F
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/LookupOp.eea b/libs/eea-java-11/src/main/resources/java/awt/image/LookupOp.eea
index 4de7ba1b80..5ec8e5e34a 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/LookupOp.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/LookupOp.eea
@@ -5,10 +5,10 @@ class java/awt/image/LookupOp
  (Ljava/awt/image/LookupTable;Ljava/awt/RenderingHints;)V
 createCompatibleDestImage
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
- (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
+ (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)L1java/awt/image/BufferedImage; # @Inherited(java.awt.image.BufferedImageOp)
 createCompatibleDestRaster
  (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/Raster;)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.RasterOp)
 filter
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
@@ -23,7 +23,7 @@ getBounds2D
  (Ljava/awt/image/Raster;)Ljava/awt/geom/Rectangle2D;
 getPoint2D
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
- (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
+ (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)L1java/awt/geom/Point2D;
 getRenderingHints
  ()Ljava/awt/RenderingHints;
  ()Ljava/awt/RenderingHints;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/MultiPixelPackedSampleModel.eea b/libs/eea-java-11/src/main/resources/java/awt/image/MultiPixelPackedSampleModel.eea
index 7dd02aa196..4f56f2840a 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/MultiPixelPackedSampleModel.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/MultiPixelPackedSampleModel.eea
@@ -2,13 +2,13 @@ class java/awt/image/MultiPixelPackedSampleModel
 
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.SampleModel)
 createDataBuffer
  ()Ljava/awt/image/DataBuffer;
- ()Ljava/awt/image/DataBuffer;
+ ()L1java/awt/image/DataBuffer; # @Inherited(java.awt.image.SampleModel)
 createSubsetSampleModel
  ([I)Ljava/awt/image/SampleModel;
- ([I)Ljava/awt/image/SampleModel;
+ ([I)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.SampleModel)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -17,7 +17,7 @@ getDataElements
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)Ljava/lang/Object;
 getPixel
  (II[ILjava/awt/image/DataBuffer;)[I
- (II[ILjava/awt/image/DataBuffer;)[I
+ (II[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.SampleModel)
 getSample
  (IIILjava/awt/image/DataBuffer;)I
  (IIILjava/awt/image/DataBuffer;)I
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/PackedColorModel.eea b/libs/eea-java-11/src/main/resources/java/awt/image/PackedColorModel.eea
index ec428a8444..053e8be60e 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/PackedColorModel.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/PackedColorModel.eea
@@ -8,13 +8,13 @@ class java/awt/image/PackedColorModel
  (Ljava/awt/color/ColorSpace;I[IIZII)V
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.ColorModel)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.awt.image.ColorModel)
 getAlphaRaster
  (Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/WritableRaster;)L0java/awt/image/WritableRaster; # @Inherited(java.awt.image.ColorModel)
 getMasks
  ()[I
  ()[I
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/PixelInterleavedSampleModel.eea b/libs/eea-java-11/src/main/resources/java/awt/image/PixelInterleavedSampleModel.eea
index 15b33bd214..138f604e45 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/PixelInterleavedSampleModel.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/PixelInterleavedSampleModel.eea
@@ -5,7 +5,7 @@ class java/awt/image/PixelInterleavedSampleModel
  (IIIII[I)V
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.ComponentSampleModel)
 createSubsetSampleModel
  ([I)Ljava/awt/image/SampleModel;
- ([I)Ljava/awt/image/SampleModel;
+ ([I)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.ComponentSampleModel)
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/RGBImageFilter.eea b/libs/eea-java-11/src/main/resources/java/awt/image/RGBImageFilter.eea
index d2caebacd6..5e679f7c4c 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/RGBImageFilter.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/RGBImageFilter.eea
@@ -9,7 +9,7 @@ origmodel
 
 filterIndexColorModel
  (Ljava/awt/image/IndexColorModel;)Ljava/awt/image/IndexColorModel;
- (Ljava/awt/image/IndexColorModel;)Ljava/awt/image/IndexColorModel;
+ (Ljava/awt/image/IndexColorModel;)L1java/awt/image/IndexColorModel;
 filterRGBPixels
  (IIII[III)V
  (IIII[III)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/Raster.eea b/libs/eea-java-11/src/main/resources/java/awt/image/Raster.eea
index dd81dc073b..60d53cd534 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/Raster.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/Raster.eea
@@ -2,43 +2,43 @@ class java/awt/image/Raster
 
 createBandedRaster
  (IIIILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (IIIILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (IIIILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createBandedRaster
  (IIII[I[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (IIII[I[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (IIII[I[ILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createBandedRaster
  (Ljava/awt/image/DataBuffer;III[I[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/DataBuffer;III[I[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/DataBuffer;III[I[ILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createInterleavedRaster
  (IIIII[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (IIIII[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (IIIII[ILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createInterleavedRaster
  (IIIILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (IIIILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (IIIILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createInterleavedRaster
  (Ljava/awt/image/DataBuffer;IIII[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/DataBuffer;IIII[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/DataBuffer;IIII[ILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createPackedRaster
  (IIIIILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (IIIIILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (IIIIILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createPackedRaster
  (III[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (III[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (III[ILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createPackedRaster
  (Ljava/awt/image/DataBuffer;IIILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/DataBuffer;IIILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/DataBuffer;IIILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createPackedRaster
  (Ljava/awt/image/DataBuffer;III[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/DataBuffer;III[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/DataBuffer;III[ILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createRaster
  (Ljava/awt/image/SampleModel;Ljava/awt/image/DataBuffer;Ljava/awt/Point;)Ljava/awt/image/Raster;
- (Ljava/awt/image/SampleModel;Ljava/awt/image/DataBuffer;Ljava/awt/Point;)Ljava/awt/image/Raster;
+ (Ljava/awt/image/SampleModel;Ljava/awt/image/DataBuffer;Ljava/awt/Point;)L1java/awt/image/Raster;
 createWritableRaster
  (Ljava/awt/image/SampleModel;Ljava/awt/Point;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/SampleModel;Ljava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/SampleModel;Ljava/awt/Point;)L1java/awt/image/WritableRaster;
 createWritableRaster
  (Ljava/awt/image/SampleModel;Ljava/awt/image/DataBuffer;Ljava/awt/Point;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/SampleModel;Ljava/awt/image/DataBuffer;Ljava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/SampleModel;Ljava/awt/image/DataBuffer;Ljava/awt/Point;)L1java/awt/image/WritableRaster;
 
 dataBuffer
  Ljava/awt/image/DataBuffer;
@@ -61,22 +61,22 @@ sampleModel
  (Ljava/awt/image/SampleModel;Ljava/awt/image/DataBuffer;Ljava/awt/Rectangle;Ljava/awt/Point;Ljava/awt/image/Raster;)V
 createChild
  (IIIIII[I)Ljava/awt/image/Raster;
- (IIIIII[I)Ljava/awt/image/Raster;
+ (IIIIII[I)L1java/awt/image/Raster;
 createCompatibleWritableRaster
  ()Ljava/awt/image/WritableRaster;
- ()Ljava/awt/image/WritableRaster;
+ ()L1java/awt/image/WritableRaster;
 createCompatibleWritableRaster
  (II)Ljava/awt/image/WritableRaster;
- (II)Ljava/awt/image/WritableRaster;
+ (II)L1java/awt/image/WritableRaster;
 createCompatibleWritableRaster
  (IIII)Ljava/awt/image/WritableRaster;
- (IIII)Ljava/awt/image/WritableRaster;
+ (IIII)L1java/awt/image/WritableRaster;
 createCompatibleWritableRaster
  (Ljava/awt/Rectangle;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/Rectangle;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/Rectangle;)L1java/awt/image/WritableRaster;
 createTranslatedChild
  (II)Ljava/awt/image/Raster;
- (II)Ljava/awt/image/Raster;
+ (II)L1java/awt/image/Raster;
 getBounds
  ()Ljava/awt/Rectangle;
  ()Ljava/awt/Rectangle;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/RasterOp.eea b/libs/eea-java-11/src/main/resources/java/awt/image/RasterOp.eea
index f23fbd18b3..8c59e488b9 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/RasterOp.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/RasterOp.eea
@@ -2,7 +2,7 @@ class java/awt/image/RasterOp
 
 createCompatibleDestRaster
  (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/Raster;)L1java/awt/image/WritableRaster;
 filter
  (Ljava/awt/image/Raster;Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
  (Ljava/awt/image/Raster;Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/RescaleOp.eea b/libs/eea-java-11/src/main/resources/java/awt/image/RescaleOp.eea
index 67e0449316..2b05f46804 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/RescaleOp.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/RescaleOp.eea
@@ -8,10 +8,10 @@ class java/awt/image/RescaleOp
  ([F[FLjava/awt/RenderingHints;)V
 createCompatibleDestImage
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
- (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
+ (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)L1java/awt/image/BufferedImage; # @Inherited(java.awt.image.BufferedImageOp)
 createCompatibleDestRaster
  (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/Raster;)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.RasterOp)
 filter
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
@@ -29,7 +29,7 @@ getOffsets
  ([F)[F
 getPoint2D
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
- (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
+ (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)L1java/awt/geom/Point2D;
 getRenderingHints
  ()Ljava/awt/RenderingHints;
  ()Ljava/awt/RenderingHints;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/SampleModel.eea b/libs/eea-java-11/src/main/resources/java/awt/image/SampleModel.eea
index 9697189f0b..4bb183e0d0 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/SampleModel.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/SampleModel.eea
@@ -2,13 +2,13 @@ class java/awt/image/SampleModel
 
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel;
 createDataBuffer
  ()Ljava/awt/image/DataBuffer;
- ()Ljava/awt/image/DataBuffer;
+ ()L1java/awt/image/DataBuffer;
 createSubsetSampleModel
  ([I)Ljava/awt/image/SampleModel;
- ([I)Ljava/awt/image/SampleModel;
+ ([I)L1java/awt/image/SampleModel;
 getDataElements
  (IIIILjava/lang/Object;Ljava/awt/image/DataBuffer;)Ljava/lang/Object;
  (IIIILjava/lang/Object;Ljava/awt/image/DataBuffer;)Ljava/lang/Object;
@@ -17,22 +17,22 @@ getDataElements
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)Ljava/lang/Object;
 getPixel
  (II[DLjava/awt/image/DataBuffer;)[D
- (II[DLjava/awt/image/DataBuffer;)[D
+ (II[DLjava/awt/image/DataBuffer;)[1D
 getPixel
  (II[FLjava/awt/image/DataBuffer;)[F
- (II[FLjava/awt/image/DataBuffer;)[F
+ (II[FLjava/awt/image/DataBuffer;)[1F
 getPixel
  (II[ILjava/awt/image/DataBuffer;)[I
- (II[ILjava/awt/image/DataBuffer;)[I
+ (II[ILjava/awt/image/DataBuffer;)[1I
 getPixels
  (IIII[DLjava/awt/image/DataBuffer;)[D
- (IIII[DLjava/awt/image/DataBuffer;)[D
+ (IIII[DLjava/awt/image/DataBuffer;)[1D
 getPixels
  (IIII[FLjava/awt/image/DataBuffer;)[F
- (IIII[FLjava/awt/image/DataBuffer;)[F
+ (IIII[FLjava/awt/image/DataBuffer;)[1F
 getPixels
  (IIII[ILjava/awt/image/DataBuffer;)[I
- (IIII[ILjava/awt/image/DataBuffer;)[I
+ (IIII[ILjava/awt/image/DataBuffer;)[1I
 getSample
  (IIILjava/awt/image/DataBuffer;)I
  (IIILjava/awt/image/DataBuffer;)I
@@ -47,13 +47,13 @@ getSampleSize
  ()[I
 getSamples
  (IIIII[DLjava/awt/image/DataBuffer;)[D
- (IIIII[DLjava/awt/image/DataBuffer;)[D
+ (IIIII[DLjava/awt/image/DataBuffer;)[1D
 getSamples
  (IIIII[FLjava/awt/image/DataBuffer;)[F
- (IIIII[FLjava/awt/image/DataBuffer;)[F
+ (IIIII[FLjava/awt/image/DataBuffer;)[1F
 getSamples
  (IIIII[ILjava/awt/image/DataBuffer;)[I
- (IIIII[ILjava/awt/image/DataBuffer;)[I
+ (IIIII[ILjava/awt/image/DataBuffer;)[1I
 setDataElements
  (IIIILjava/lang/Object;Ljava/awt/image/DataBuffer;)V
  (IIIILjava/lang/Object;Ljava/awt/image/DataBuffer;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/ShortLookupTable.eea b/libs/eea-java-11/src/main/resources/java/awt/image/ShortLookupTable.eea
index fa6f647580..27bba26bde 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/ShortLookupTable.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/ShortLookupTable.eea
@@ -11,7 +11,7 @@ getTable
  ()[[S
 lookupPixel
  ([I[I)[I
- ([I[I)[I
+ ([I[I)[1I
 lookupPixel
  ([S[S)[S
- ([S[S)[S
+ ([S[S)[1S
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/SinglePixelPackedSampleModel.eea b/libs/eea-java-11/src/main/resources/java/awt/image/SinglePixelPackedSampleModel.eea
index 0f99485d82..5a3c6c8605 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/SinglePixelPackedSampleModel.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/SinglePixelPackedSampleModel.eea
@@ -8,13 +8,13 @@ class java/awt/image/SinglePixelPackedSampleModel
  (III[I)V
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.SampleModel)
 createDataBuffer
  ()Ljava/awt/image/DataBuffer;
- ()Ljava/awt/image/DataBuffer;
+ ()L1java/awt/image/DataBuffer; # @Inherited(java.awt.image.SampleModel)
 createSubsetSampleModel
  ([I)Ljava/awt/image/SampleModel;
- ([I)Ljava/awt/image/SampleModel;
+ ([I)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.SampleModel)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -29,10 +29,10 @@ getDataElements
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)Ljava/lang/Object;
 getPixel
  (II[ILjava/awt/image/DataBuffer;)[I
- (II[ILjava/awt/image/DataBuffer;)[I
+ (II[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.SampleModel)
 getPixels
  (IIII[ILjava/awt/image/DataBuffer;)[I
- (IIII[ILjava/awt/image/DataBuffer;)[I
+ (IIII[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.SampleModel)
 getSample
  (IIILjava/awt/image/DataBuffer;)I
  (IIILjava/awt/image/DataBuffer;)I
@@ -41,7 +41,7 @@ getSampleSize
  ()[I
 getSamples
  (IIIII[ILjava/awt/image/DataBuffer;)[I
- (IIIII[ILjava/awt/image/DataBuffer;)[I
+ (IIIII[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.SampleModel)
 setDataElements
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)V
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/VolatileImage.eea b/libs/eea-java-11/src/main/resources/java/awt/image/VolatileImage.eea
index 1794b02591..ca20362b67 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/VolatileImage.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/VolatileImage.eea
@@ -2,7 +2,7 @@ class java/awt/image/VolatileImage
 
 createGraphics
  ()Ljava/awt/Graphics2D;
- ()Ljava/awt/Graphics2D;
+ ()L1java/awt/Graphics2D;
 getCapabilities
  ()Ljava/awt/ImageCapabilities;
  ()Ljava/awt/ImageCapabilities;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/WritableRaster.eea b/libs/eea-java-11/src/main/resources/java/awt/image/WritableRaster.eea
index 24040136f1..8e25f20bdb 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/WritableRaster.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/WritableRaster.eea
@@ -11,10 +11,10 @@ class java/awt/image/WritableRaster
  (Ljava/awt/image/SampleModel;Ljava/awt/image/DataBuffer;Ljava/awt/Rectangle;Ljava/awt/Point;Ljava/awt/image/WritableRaster;)V
 createWritableChild
  (IIIIII[I)Ljava/awt/image/WritableRaster;
- (IIIIII[I)Ljava/awt/image/WritableRaster;
+ (IIIIII[I)L1java/awt/image/WritableRaster;
 createWritableTranslatedChild
  (II)Ljava/awt/image/WritableRaster;
- (II)Ljava/awt/image/WritableRaster;
+ (II)L1java/awt/image/WritableRaster;
 getWritableParent
  ()Ljava/awt/image/WritableRaster;
  ()Ljava/awt/image/WritableRaster;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/renderable/ContextualRenderedImageFactory.eea b/libs/eea-java-11/src/main/resources/java/awt/image/renderable/ContextualRenderedImageFactory.eea
index 942cdf9e56..a25920d9bd 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/renderable/ContextualRenderedImageFactory.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/renderable/ContextualRenderedImageFactory.eea
@@ -2,7 +2,7 @@ class java/awt/image/renderable/ContextualRenderedImageFactory
 
 create
  (Ljava/awt/image/renderable/RenderContext;Ljava/awt/image/renderable/ParameterBlock;)Ljava/awt/image/RenderedImage;
- (Ljava/awt/image/renderable/RenderContext;Ljava/awt/image/renderable/ParameterBlock;)Ljava/awt/image/RenderedImage;
+ (Ljava/awt/image/renderable/RenderContext;Ljava/awt/image/renderable/ParameterBlock;)L1java/awt/image/RenderedImage;
 getBounds2D
  (Ljava/awt/image/renderable/ParameterBlock;)Ljava/awt/geom/Rectangle2D;
  (Ljava/awt/image/renderable/ParameterBlock;)Ljava/awt/geom/Rectangle2D;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/renderable/ParameterBlock.eea b/libs/eea-java-11/src/main/resources/java/awt/image/renderable/ParameterBlock.eea
index 19d7b911f1..b04f6e65af 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/renderable/ParameterBlock.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/renderable/ParameterBlock.eea
@@ -48,7 +48,7 @@ getObjectParameter
  (I)Ljava/lang/Object;
 getParamClasses
  ()[Ljava/lang/Class<*>;
- ()[Ljava/lang/Class<*>;
+ ()[1Ljava/lang/Class<*>;
 getParameters
  ()Ljava/util/Vector<Ljava/lang/Object;>;
  ()Ljava/util/Vector<Ljava/lang/Object;>;
@@ -99,4 +99,4 @@ setSources
  (Ljava/util/Vector<Ljava/lang/Object;>;)V
 shallowClone
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/renderable/RenderableImage.eea b/libs/eea-java-11/src/main/resources/java/awt/image/renderable/RenderableImage.eea
index b1f129b753..aa9f8eca5a 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/renderable/RenderableImage.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/renderable/RenderableImage.eea
@@ -6,13 +6,13 @@ HINTS_OBSERVED
 
 createDefaultRendering
  ()Ljava/awt/image/RenderedImage;
- ()Ljava/awt/image/RenderedImage;
+ ()L1java/awt/image/RenderedImage;
 createRendering
  (Ljava/awt/image/renderable/RenderContext;)Ljava/awt/image/RenderedImage;
- (Ljava/awt/image/renderable/RenderContext;)Ljava/awt/image/RenderedImage;
+ (Ljava/awt/image/renderable/RenderContext;)L1java/awt/image/RenderedImage;
 createScaledRendering
  (IILjava/awt/RenderingHints;)Ljava/awt/image/RenderedImage;
- (IILjava/awt/RenderingHints;)Ljava/awt/image/RenderedImage;
+ (IILjava/awt/RenderingHints;)L1java/awt/image/RenderedImage;
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/renderable/RenderableImageOp.eea b/libs/eea-java-11/src/main/resources/java/awt/image/renderable/RenderableImageOp.eea
index 42aa573597..4c5dc010c1 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/renderable/RenderableImageOp.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/renderable/RenderableImageOp.eea
@@ -5,13 +5,13 @@ class java/awt/image/renderable/RenderableImageOp
  (Ljava/awt/image/renderable/ContextualRenderedImageFactory;Ljava/awt/image/renderable/ParameterBlock;)V
 createDefaultRendering
  ()Ljava/awt/image/RenderedImage;
- ()Ljava/awt/image/RenderedImage;
+ ()L1java/awt/image/RenderedImage; # @Inherited(java.awt.image.renderable.RenderableImage)
 createRendering
  (Ljava/awt/image/renderable/RenderContext;)Ljava/awt/image/RenderedImage;
- (Ljava/awt/image/renderable/RenderContext;)Ljava/awt/image/RenderedImage;
+ (Ljava/awt/image/renderable/RenderContext;)L0java/awt/image/RenderedImage; # @Overrides(java.awt.image.renderable.RenderableImage)
 createScaledRendering
  (IILjava/awt/RenderingHints;)Ljava/awt/image/RenderedImage;
- (IILjava/awt/RenderingHints;)Ljava/awt/image/RenderedImage;
+ (IILjava/awt/RenderingHints;)L1java/awt/image/RenderedImage; # @Inherited(java.awt.image.renderable.RenderableImage)
 getParameterBlock
  ()Ljava/awt/image/renderable/ParameterBlock;
  ()Ljava/awt/image/renderable/ParameterBlock;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/image/renderable/RenderedImageFactory.eea b/libs/eea-java-11/src/main/resources/java/awt/image/renderable/RenderedImageFactory.eea
index 6f77700711..68da2f8e55 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/image/renderable/RenderedImageFactory.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/image/renderable/RenderedImageFactory.eea
@@ -2,4 +2,4 @@ class java/awt/image/renderable/RenderedImageFactory
 
 create
  (Ljava/awt/image/renderable/ParameterBlock;Ljava/awt/RenderingHints;)Ljava/awt/image/RenderedImage;
- (Ljava/awt/image/renderable/ParameterBlock;Ljava/awt/RenderingHints;)Ljava/awt/image/RenderedImage;
+ (Ljava/awt/image/renderable/ParameterBlock;Ljava/awt/RenderingHints;)L1java/awt/image/RenderedImage;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/peer/ComponentPeer.eea b/libs/eea-java-11/src/main/resources/java/awt/peer/ComponentPeer.eea
index d93a10b8a5..4723534410 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/peer/ComponentPeer.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/peer/ComponentPeer.eea
@@ -14,13 +14,13 @@ createBuffers
  (ILjava/awt/BufferCapabilities;)V
 createImage
  (II)Ljava/awt/Image;
- (II)Ljava/awt/Image;
+ (II)L1java/awt/Image;
 createImage
  (Ljava/awt/image/ImageProducer;)Ljava/awt/Image;
- (Ljava/awt/image/ImageProducer;)Ljava/awt/Image;
+ (Ljava/awt/image/ImageProducer;)L1java/awt/Image;
 createVolatileImage
  (II)Ljava/awt/image/VolatileImage;
- (II)Ljava/awt/image/VolatileImage;
+ (II)L1java/awt/image/VolatileImage;
 flip
  (IIIILjava/awt/BufferCapabilities$FlipContents;)V
  (IIIILjava/awt/BufferCapabilities$FlipContents;)V
diff --git a/libs/eea-java-11/src/main/resources/java/awt/peer/TaskbarPeer.eea b/libs/eea-java-11/src/main/resources/java/awt/peer/TaskbarPeer.eea
index 913d5524b0..227acfd826 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/peer/TaskbarPeer.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/peer/TaskbarPeer.eea
@@ -2,10 +2,10 @@ class java/awt/peer/TaskbarPeer
 
 getIconImage
  ()Ljava/awt/Image;
- ()Ljava/awt/Image;
+ ()L0java/awt/Image;
 getMenu
  ()Ljava/awt/PopupMenu;
- ()Ljava/awt/PopupMenu;
+ ()L0java/awt/PopupMenu;
 isSupported
  (Ljava/awt/Taskbar$Feature;)Z
  (Ljava/awt/Taskbar$Feature;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/awt/print/PageFormat.eea b/libs/eea-java-11/src/main/resources/java/awt/print/PageFormat.eea
index 1261806716..3b5b2af097 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/print/PageFormat.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/print/PageFormat.eea
@@ -5,7 +5,7 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 getMatrix
  ()[D
- ()[D
+ ()[1D
 getPaper
  ()Ljava/awt/print/Paper;
  ()Ljava/awt/print/Paper;
diff --git a/libs/eea-java-11/src/main/resources/java/awt/print/PrinterJob.eea b/libs/eea-java-11/src/main/resources/java/awt/print/PrinterJob.eea
index a506c344d6..5f51a47337 100644
--- a/libs/eea-java-11/src/main/resources/java/awt/print/PrinterJob.eea
+++ b/libs/eea-java-11/src/main/resources/java/awt/print/PrinterJob.eea
@@ -24,7 +24,7 @@ getPageFormat
  (Ljavax/print/attribute/PrintRequestAttributeSet;)Ljava/awt/print/PageFormat;
 getPrintService
  ()Ljavax/print/PrintService;
- ()Ljavax/print/PrintService;
+ ()L0javax/print/PrintService;
 getUserName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/java/beans/BeanDescriptor.eea b/libs/eea-java-11/src/main/resources/java/beans/BeanDescriptor.eea
index 78ade9cd6f..de0f53a4a4 100644
--- a/libs/eea-java-11/src/main/resources/java/beans/BeanDescriptor.eea
+++ b/libs/eea-java-11/src/main/resources/java/beans/BeanDescriptor.eea
@@ -8,7 +8,7 @@ class java/beans/BeanDescriptor
  (Ljava/lang/Class<*>;Ljava/lang/Class<*>;)V
 getBeanClass
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L0java/lang/Class<*>;
 getCustomizerClass
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L0java/lang/Class<*>;
diff --git a/libs/eea-java-11/src/main/resources/java/beans/DefaultPersistenceDelegate.eea b/libs/eea-java-11/src/main/resources/java/beans/DefaultPersistenceDelegate.eea
index e4a076b50a..12c2a5e6cc 100644
--- a/libs/eea-java-11/src/main/resources/java/beans/DefaultPersistenceDelegate.eea
+++ b/libs/eea-java-11/src/main/resources/java/beans/DefaultPersistenceDelegate.eea
@@ -8,7 +8,7 @@ initialize
  (Ljava/lang/Class<*>;Ljava/lang/Object;Ljava/lang/Object;Ljava/beans/Encoder;)V
 instantiate
  (Ljava/lang/Object;Ljava/beans/Encoder;)Ljava/beans/Expression;
- (Ljava/lang/Object;Ljava/beans/Encoder;)Ljava/beans/Expression;
+ (Ljava/lang/Object;Ljava/beans/Encoder;)L1java/beans/Expression;
 mutatesTo
  (Ljava/lang/Object;Ljava/lang/Object;)Z
  (Ljava/lang/Object;Ljava/lang/Object;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/beans/EventHandler.eea b/libs/eea-java-11/src/main/resources/java/beans/EventHandler.eea
index a7259fabc4..0343c42546 100644
--- a/libs/eea-java-11/src/main/resources/java/beans/EventHandler.eea
+++ b/libs/eea-java-11/src/main/resources/java/beans/EventHandler.eea
@@ -2,13 +2,13 @@ class java/beans/EventHandler
 
 create
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;)T1T;
 create
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;)T1T;
 create
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)T1T;
 
 <init>
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-java-11/src/main/resources/java/beans/EventSetDescriptor.eea b/libs/eea-java-11/src/main/resources/java/beans/EventSetDescriptor.eea
index 65e9133acd..d6522b1093 100644
--- a/libs/eea-java-11/src/main/resources/java/beans/EventSetDescriptor.eea
+++ b/libs/eea-java-11/src/main/resources/java/beans/EventSetDescriptor.eea
@@ -26,13 +26,13 @@ getGetListenerMethod
  ()Ljava/lang/reflect/Method;
 getListenerMethodDescriptors
  ()[Ljava/beans/MethodDescriptor;
- ()[Ljava/beans/MethodDescriptor;
+ ()[0Ljava/beans/MethodDescriptor;
 getListenerMethods
  ()[Ljava/lang/reflect/Method;
- ()[Ljava/lang/reflect/Method;
+ ()[1Ljava/lang/reflect/Method;
 getListenerType
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L0java/lang/Class<*>;
 getRemoveListenerMethod
  ()Ljava/lang/reflect/Method;
  ()Ljava/lang/reflect/Method;
diff --git a/libs/eea-java-11/src/main/resources/java/beans/IndexedPropertyDescriptor.eea b/libs/eea-java-11/src/main/resources/java/beans/IndexedPropertyDescriptor.eea
index 441fe191e7..23e41b70c2 100644
--- a/libs/eea-java-11/src/main/resources/java/beans/IndexedPropertyDescriptor.eea
+++ b/libs/eea-java-11/src/main/resources/java/beans/IndexedPropertyDescriptor.eea
@@ -17,10 +17,10 @@ getIndexedPropertyType
  ()Ljava/lang/Class<*>;
 getIndexedReadMethod
  ()Ljava/lang/reflect/Method;
- ()Ljava/lang/reflect/Method;
+ ()L0java/lang/reflect/Method;
 getIndexedWriteMethod
  ()Ljava/lang/reflect/Method;
- ()Ljava/lang/reflect/Method;
+ ()L0java/lang/reflect/Method;
 setIndexedReadMethod
  (Ljava/lang/reflect/Method;)V
  (Ljava/lang/reflect/Method;)V
diff --git a/libs/eea-java-11/src/main/resources/java/beans/MethodDescriptor.eea b/libs/eea-java-11/src/main/resources/java/beans/MethodDescriptor.eea
index d987c8baa0..ff97284446 100644
--- a/libs/eea-java-11/src/main/resources/java/beans/MethodDescriptor.eea
+++ b/libs/eea-java-11/src/main/resources/java/beans/MethodDescriptor.eea
@@ -11,4 +11,4 @@ getMethod
  ()Ljava/lang/reflect/Method;
 getParameterDescriptors
  ()[Ljava/beans/ParameterDescriptor;
- ()[Ljava/beans/ParameterDescriptor;
+ ()[0Ljava/beans/ParameterDescriptor;
diff --git a/libs/eea-java-11/src/main/resources/java/beans/PropertyDescriptor.eea b/libs/eea-java-11/src/main/resources/java/beans/PropertyDescriptor.eea
index abf6363013..3c7115bfbc 100644
--- a/libs/eea-java-11/src/main/resources/java/beans/PropertyDescriptor.eea
+++ b/libs/eea-java-11/src/main/resources/java/beans/PropertyDescriptor.eea
@@ -11,22 +11,22 @@ class java/beans/PropertyDescriptor
  (Ljava/lang/String;Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;)V
 createPropertyEditor
  (Ljava/lang/Object;)Ljava/beans/PropertyEditor;
- (Ljava/lang/Object;)Ljava/beans/PropertyEditor;
+ (Ljava/lang/Object;)L1java/beans/PropertyEditor;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getPropertyEditorClass
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L0java/lang/Class<*>;
 getPropertyType
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
 getReadMethod
  ()Ljava/lang/reflect/Method;
- ()Ljava/lang/reflect/Method;
+ ()L0java/lang/reflect/Method;
 getWriteMethod
  ()Ljava/lang/reflect/Method;
- ()Ljava/lang/reflect/Method;
+ ()L0java/lang/reflect/Method;
 setPropertyEditorClass
  (Ljava/lang/Class<*>;)V
  (Ljava/lang/Class<*>;)V
diff --git a/libs/eea-java-11/src/main/resources/java/beans/PropertyEditorSupport.eea b/libs/eea-java-11/src/main/resources/java/beans/PropertyEditorSupport.eea
index d4789a4ca8..877cd3e8f0 100644
--- a/libs/eea-java-11/src/main/resources/java/beans/PropertyEditorSupport.eea
+++ b/libs/eea-java-11/src/main/resources/java/beans/PropertyEditorSupport.eea
@@ -8,19 +8,19 @@ addPropertyChangeListener
  (L1java/beans/PropertyChangeListener;)V # @Inherited(java.beans.PropertyEditor)
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getCustomEditor
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 getJavaInitializationString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSource
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
 getTags
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String;
 getValue
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-java-11/src/main/resources/java/beans/SimpleBeanInfo.eea b/libs/eea-java-11/src/main/resources/java/beans/SimpleBeanInfo.eea
index d975845456..4f6fa32084 100644
--- a/libs/eea-java-11/src/main/resources/java/beans/SimpleBeanInfo.eea
+++ b/libs/eea-java-11/src/main/resources/java/beans/SimpleBeanInfo.eea
@@ -2,22 +2,22 @@ class java/beans/SimpleBeanInfo
 
 getAdditionalBeanInfo
  ()[Ljava/beans/BeanInfo;
- ()[Ljava/beans/BeanInfo;
+ ()[0Ljava/beans/BeanInfo;
 getBeanDescriptor
  ()Ljava/beans/BeanDescriptor;
- ()Ljava/beans/BeanDescriptor;
+ ()L0java/beans/BeanDescriptor;
 getEventSetDescriptors
  ()[Ljava/beans/EventSetDescriptor;
- ()[Ljava/beans/EventSetDescriptor;
+ ()[0Ljava/beans/EventSetDescriptor;
 getIcon
  (I)Ljava/awt/Image;
- (I)Ljava/awt/Image;
+ (I)L0java/awt/Image;
 getMethodDescriptors
  ()[Ljava/beans/MethodDescriptor;
- ()[Ljava/beans/MethodDescriptor;
+ ()[0Ljava/beans/MethodDescriptor;
 getPropertyDescriptors
  ()[Ljava/beans/PropertyDescriptor;
- ()[Ljava/beans/PropertyDescriptor;
+ ()[0Ljava/beans/PropertyDescriptor;
 loadImage
  (Ljava/lang/String;)Ljava/awt/Image;
- (Ljava/lang/String;)Ljava/awt/Image;
+ (Ljava/lang/String;)L0java/awt/Image;
diff --git a/libs/eea-java-11/src/main/resources/java/beans/XMLDecoder.eea b/libs/eea-java-11/src/main/resources/java/beans/XMLDecoder.eea
index 3cf52ded06..17322efac1 100644
--- a/libs/eea-java-11/src/main/resources/java/beans/XMLDecoder.eea
+++ b/libs/eea-java-11/src/main/resources/java/beans/XMLDecoder.eea
@@ -2,7 +2,7 @@ class java/beans/XMLDecoder
 
 createHandler
  (Ljava/lang/Object;Ljava/beans/ExceptionListener;Ljava/lang/ClassLoader;)Lorg/xml/sax/helpers/DefaultHandler;
- (Ljava/lang/Object;Ljava/beans/ExceptionListener;Ljava/lang/ClassLoader;)Lorg/xml/sax/helpers/DefaultHandler;
+ (Ljava/lang/Object;Ljava/beans/ExceptionListener;Ljava/lang/ClassLoader;)L1org/xml/sax/helpers/DefaultHandler;
 
 <init>
  (Ljava/io/InputStream;)V
diff --git a/libs/eea-java-11/src/main/resources/java/beans/beancontext/BeanContextServicesSupport$BCSSProxyServiceProvider.eea b/libs/eea-java-11/src/main/resources/java/beans/beancontext/BeanContextServicesSupport$BCSSProxyServiceProvider.eea
index e1cc42a1b9..dfd0d9e087 100644
--- a/libs/eea-java-11/src/main/resources/java/beans/beancontext/BeanContextServicesSupport$BCSSProxyServiceProvider.eea
+++ b/libs/eea-java-11/src/main/resources/java/beans/beancontext/BeanContextServicesSupport$BCSSProxyServiceProvider.eea
@@ -5,7 +5,7 @@ getCurrentServiceSelectors
  (Ljava/beans/beancontext/BeanContextServices;Ljava/lang/Class<*>;)Ljava/util/Iterator<*>;
 getService
  (Ljava/beans/beancontext/BeanContextServices;Ljava/lang/Object;Ljava/lang/Class<*>;Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/beans/beancontext/BeanContextServices;Ljava/lang/Object;Ljava/lang/Class<*>;Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/beans/beancontext/BeanContextServices;Ljava/lang/Object;Ljava/lang/Class<*>;Ljava/lang/Object;)L0java/lang/Object;
 releaseService
  (Ljava/beans/beancontext/BeanContextServices;Ljava/lang/Object;Ljava/lang/Object;)V
  (Ljava/beans/beancontext/BeanContextServices;Ljava/lang/Object;Ljava/lang/Object;)V
diff --git a/libs/eea-java-11/src/main/resources/java/beans/beancontext/BeanContextServicesSupport.eea b/libs/eea-java-11/src/main/resources/java/beans/beancontext/BeanContextServicesSupport.eea
index 14819d232d..345943f8e6 100644
--- a/libs/eea-java-11/src/main/resources/java/beans/beancontext/BeanContextServicesSupport.eea
+++ b/libs/eea-java-11/src/main/resources/java/beans/beancontext/BeanContextServicesSupport.eea
@@ -2,7 +2,7 @@ class java/beans/beancontext/BeanContextServicesSupport
 
 getChildBeanContextServicesListener
  (Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextServicesListener;
- (Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextServicesListener;
+ (Ljava/lang/Object;)L0java/beans/beancontext/BeanContextServicesListener;
 
 bcsListeners
  Ljava/util/ArrayList<Ljava/beans/beancontext/BeanContextServicesListener;>;
@@ -46,10 +46,10 @@ childJustRemovedHook
  (Ljava/lang/Object;Ljava/beans/beancontext/BeanContextSupport$BCSChild;)V
 createBCSChild
  (Ljava/lang/Object;Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextSupport$BCSChild;
- (Ljava/lang/Object;Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextSupport$BCSChild;
+ (Ljava/lang/Object;Ljava/lang/Object;)L1java/beans/beancontext/BeanContextSupport$BCSChild; # @Inherited(java.beans.beancontext.BeanContextSupport)
 createBCSSServiceProvider
  (Ljava/lang/Class<*>;Ljava/beans/beancontext/BeanContextServiceProvider;)Ljava/beans/beancontext/BeanContextServicesSupport$BCSSServiceProvider;
- (Ljava/lang/Class<*>;Ljava/beans/beancontext/BeanContextServiceProvider;)Ljava/beans/beancontext/BeanContextServicesSupport$BCSSServiceProvider;
+ (Ljava/lang/Class<*>;Ljava/beans/beancontext/BeanContextServiceProvider;)L1java/beans/beancontext/BeanContextServicesSupport$BCSSServiceProvider;
 fireServiceAdded
  (Ljava/beans/beancontext/BeanContextServiceAvailableEvent;)V
  (Ljava/beans/beancontext/BeanContextServiceAvailableEvent;)V
@@ -67,13 +67,13 @@ getBeanContextServicesPeer
  ()Ljava/beans/beancontext/BeanContextServices;
 getCurrentServiceClasses
  ()Ljava/util/Iterator<Ljava/lang/Object;>;
- ()Ljava/util/Iterator<Ljava/lang/Object;>;
+ ()L1java/util/Iterator<Ljava/lang/Object;>;
 getCurrentServiceSelectors
  (Ljava/lang/Class<*>;)Ljava/util/Iterator<*>;
- (Ljava/lang/Class<*>;)Ljava/util/Iterator<*>;
+ (Ljava/lang/Class<*>;)L0java/util/Iterator<*>;
 getService
  (Ljava/beans/beancontext/BeanContextChild;Ljava/lang/Object;Ljava/lang/Class<*>;Ljava/lang/Object;Ljava/beans/beancontext/BeanContextServiceRevokedListener;)Ljava/lang/Object;
- (Ljava/beans/beancontext/BeanContextChild;Ljava/lang/Object;Ljava/lang/Class<*>;Ljava/lang/Object;Ljava/beans/beancontext/BeanContextServiceRevokedListener;)Ljava/lang/Object;
+ (Ljava/beans/beancontext/BeanContextChild;Ljava/lang/Object;Ljava/lang/Class<*>;Ljava/lang/Object;Ljava/beans/beancontext/BeanContextServiceRevokedListener;)L0java/lang/Object;
 hasService
  (Ljava/lang/Class<*>;)Z
  (Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/beans/beancontext/BeanContextSupport.eea b/libs/eea-java-11/src/main/resources/java/beans/beancontext/BeanContextSupport.eea
index 769a1566d4..7d2fc0b078 100644
--- a/libs/eea-java-11/src/main/resources/java/beans/beancontext/BeanContextSupport.eea
+++ b/libs/eea-java-11/src/main/resources/java/beans/beancontext/BeanContextSupport.eea
@@ -5,22 +5,22 @@ classEquals
  (Ljava/lang/Class<*>;Ljava/lang/Class<*>;)Z
 getChildBeanContextChild
  (Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextChild;
- (Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextChild;
+ (Ljava/lang/Object;)L0java/beans/beancontext/BeanContextChild;
 getChildBeanContextMembershipListener
  (Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextMembershipListener;
- (Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextMembershipListener;
+ (Ljava/lang/Object;)L0java/beans/beancontext/BeanContextMembershipListener;
 getChildPropertyChangeListener
  (Ljava/lang/Object;)Ljava/beans/PropertyChangeListener;
- (Ljava/lang/Object;)Ljava/beans/PropertyChangeListener;
+ (Ljava/lang/Object;)L0java/beans/PropertyChangeListener;
 getChildSerializable
  (Ljava/lang/Object;)Ljava/io/Serializable;
- (Ljava/lang/Object;)Ljava/io/Serializable;
+ (Ljava/lang/Object;)L0java/io/Serializable;
 getChildVetoableChangeListener
  (Ljava/lang/Object;)Ljava/beans/VetoableChangeListener;
- (Ljava/lang/Object;)Ljava/beans/VetoableChangeListener;
+ (Ljava/lang/Object;)L0java/beans/VetoableChangeListener;
 getChildVisibility
  (Ljava/lang/Object;)Ljava/beans/Visibility;
- (Ljava/lang/Object;)Ljava/beans/Visibility;
+ (Ljava/lang/Object;)L0java/beans/Visibility;
 
 bcmListeners
  Ljava/util/ArrayList<Ljava/beans/beancontext/BeanContextMembershipListener;>;
@@ -85,7 +85,7 @@ copyChildren
  ()[Ljava/lang/Object;
 createBCSChild
  (Ljava/lang/Object;Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextSupport$BCSChild;
- (Ljava/lang/Object;Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextSupport$BCSChild;
+ (Ljava/lang/Object;Ljava/lang/Object;)L1java/beans/beancontext/BeanContextSupport$BCSChild;
 deserialize
  (Ljava/io/ObjectInputStream;Ljava/util/Collection;)V
  (Ljava/io/ObjectInputStream;Ljava/util/Collection;)V
diff --git a/libs/eea-java-11/src/main/resources/java/io/ObjectInputStream.eea b/libs/eea-java-11/src/main/resources/java/io/ObjectInputStream.eea
index d77b4af612..03695d3b4c 100644
--- a/libs/eea-java-11/src/main/resources/java/io/ObjectInputStream.eea
+++ b/libs/eea-java-11/src/main/resources/java/io/ObjectInputStream.eea
@@ -11,10 +11,10 @@ read
  ([1BII)I # @Inherited(java.io.InputStream)
 readClassDescriptor
  ()Ljava/io/ObjectStreamClass;
- ()Ljava/io/ObjectStreamClass;
+ ()L1java/io/ObjectStreamClass;
 readFields
  ()Ljava/io/ObjectInputStream$GetField;
- ()Ljava/io/ObjectInputStream$GetField;
+ ()L1java/io/ObjectInputStream$GetField;
 readFully
  ([B)V
  ([1B)V # @Inherited(java.io.DataInput)
@@ -29,7 +29,7 @@ readObject
  ()L1java/lang/Object; # @Inherited(java.io.ObjectInput)
 readObjectOverride
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 readUTF
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.io.DataInput)
diff --git a/libs/eea-java-11/src/main/resources/java/io/ObjectStreamClass.eea b/libs/eea-java-11/src/main/resources/java/io/ObjectStreamClass.eea
index 38ae60a448..386277a526 100644
--- a/libs/eea-java-11/src/main/resources/java/io/ObjectStreamClass.eea
+++ b/libs/eea-java-11/src/main/resources/java/io/ObjectStreamClass.eea
@@ -13,7 +13,7 @@ lookupAny
 
 forClass
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L0java/lang/Class<*>;
 getField
  (Ljava/lang/String;)Ljava/io/ObjectStreamField;
  (L1java/lang/String;)L0java/io/ObjectStreamField;
diff --git a/libs/eea-java-11/src/main/resources/java/lang/instrument/ClassFileTransformer.eea b/libs/eea-java-11/src/main/resources/java/lang/instrument/ClassFileTransformer.eea
index afac4bd584..f068722d35 100644
--- a/libs/eea-java-11/src/main/resources/java/lang/instrument/ClassFileTransformer.eea
+++ b/libs/eea-java-11/src/main/resources/java/lang/instrument/ClassFileTransformer.eea
@@ -2,7 +2,7 @@ class java/lang/instrument/ClassFileTransformer
 
 transform
  (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[B
- (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[B
+ (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[0B
 transform
  (Ljava/lang/Module;Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[B
  (Ljava/lang/Module;Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[B
diff --git a/libs/eea-java-11/src/main/resources/java/lang/invoke/ClassSpecializer$Factory.eea b/libs/eea-java-11/src/main/resources/java/lang/invoke/ClassSpecializer$Factory.eea
index b4e10bffde..49f075c6e5 100644
--- a/libs/eea-java-11/src/main/resources/java/lang/invoke/ClassSpecializer$Factory.eea
+++ b/libs/eea-java-11/src/main/resources/java/lang/invoke/ClassSpecializer$Factory.eea
@@ -5,7 +5,7 @@ class java/lang/invoke/ClassSpecializer$Factory
  (Ljava/lang/invoke/ClassSpecializer;)V
 chooseFieldName
  (Ljava/lang/Class<*>;I)Ljava/lang/String;
- (Ljava/lang/Class<*>;I)Ljava/lang/String;
+ (Ljava/lang/Class<*>;I)L1java/lang/String;
 linkCodeToSpeciesData
  (Ljava/lang/Class<+TT;>;Ljava/lang/invoke/ClassSpecializer<TT;TK;TS;>.SpeciesData;Z)V
  (Ljava/lang/Class<+TT;>;Ljava/lang/invoke/ClassSpecializer<TT;TK;TS;>.SpeciesData;Z)V
diff --git a/libs/eea-java-11/src/main/resources/java/lang/invoke/ClassSpecializer$SpeciesData.eea b/libs/eea-java-11/src/main/resources/java/lang/invoke/ClassSpecializer$SpeciesData.eea
index 51d318109f..c50957c1c3 100644
--- a/libs/eea-java-11/src/main/resources/java/lang/invoke/ClassSpecializer$SpeciesData.eea
+++ b/libs/eea-java-11/src/main/resources/java/lang/invoke/ClassSpecializer$SpeciesData.eea
@@ -5,7 +5,7 @@ class java/lang/invoke/ClassSpecializer$SpeciesData
  (TK;)V
 deriveClassName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 deriveFieldTypes
  (TK;)Ljava/util/List<Ljava/lang/Class<*>;>;
  (TK;)Ljava/util/List<Ljava/lang/Class<*>;>;
diff --git a/libs/eea-java-11/src/main/resources/java/lang/invoke/ConstantBootstraps.eea b/libs/eea-java-11/src/main/resources/java/lang/invoke/ConstantBootstraps.eea
index 5a8b864845..b777487145 100644
--- a/libs/eea-java-11/src/main/resources/java/lang/invoke/ConstantBootstraps.eea
+++ b/libs/eea-java-11/src/main/resources/java/lang/invoke/ConstantBootstraps.eea
@@ -20,7 +20,7 @@ invoke
  (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/lang/invoke/MethodHandle;[Ljava/lang/Object;)Ljava/lang/Object;
 nullConstant
  (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<*>;)Ljava/lang/Object;
- (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<*>;)Ljava/lang/Object;
+ (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<*>;)L0java/lang/Object;
 primitiveClass
  (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
  (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
diff --git a/libs/eea-java-11/src/main/resources/java/lang/invoke/MethodHandle.eea b/libs/eea-java-11/src/main/resources/java/lang/invoke/MethodHandle.eea
index 93a18da7ce..2ebd8d659f 100644
--- a/libs/eea-java-11/src/main/resources/java/lang/invoke/MethodHandle.eea
+++ b/libs/eea-java-11/src/main/resources/java/lang/invoke/MethodHandle.eea
@@ -26,10 +26,10 @@ bindTo
  (Ljava/lang/Object;)Ljava/lang/invoke/MethodHandle;
 invoke
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 invokeExact
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 invokeWithArguments
  (Ljava/util/List<*>;)Ljava/lang/Object;
  (Ljava/util/List<*>;)Ljava/lang/Object;
diff --git a/libs/eea-java-11/src/main/resources/java/lang/invoke/MethodHandles$Lookup.eea b/libs/eea-java-11/src/main/resources/java/lang/invoke/MethodHandles$Lookup.eea
index 88cebf6503..c488edc244 100644
--- a/libs/eea-java-11/src/main/resources/java/lang/invoke/MethodHandles$Lookup.eea
+++ b/libs/eea-java-11/src/main/resources/java/lang/invoke/MethodHandles$Lookup.eea
@@ -53,7 +53,7 @@ lookupClass
  ()Ljava/lang/Class<*>;
 revealDirect
  (Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandleInfo;
- (Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandleInfo;
+ (Ljava/lang/invoke/MethodHandle;)L1java/lang/invoke/MethodHandleInfo;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/java/lang/invoke/MethodHandles.eea b/libs/eea-java-11/src/main/resources/java/lang/invoke/MethodHandles.eea
index 0a29d470dc..0fdb032649 100644
--- a/libs/eea-java-11/src/main/resources/java/lang/invoke/MethodHandles.eea
+++ b/libs/eea-java-11/src/main/resources/java/lang/invoke/MethodHandles.eea
@@ -95,7 +95,7 @@ permuteArguments
  (Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodType;[I)Ljava/lang/invoke/MethodHandle;
 privateLookupIn
  (Ljava/lang/Class<*>;Ljava/lang/invoke/MethodHandles$Lookup;)Ljava/lang/invoke/MethodHandles$Lookup;
- (Ljava/lang/Class<*>;Ljava/lang/invoke/MethodHandles$Lookup;)Ljava/lang/invoke/MethodHandles$Lookup;
+ (Ljava/lang/Class<*>;Ljava/lang/invoke/MethodHandles$Lookup;)L1java/lang/invoke/MethodHandles$Lookup;
 publicLookup
  ()Ljava/lang/invoke/MethodHandles$Lookup;
  ()Ljava/lang/invoke/MethodHandles$Lookup;
diff --git a/libs/eea-java-11/src/main/resources/java/lang/invoke/VarHandle.eea b/libs/eea-java-11/src/main/resources/java/lang/invoke/VarHandle.eea
index fa95e1a092..cfe0176cb4 100644
--- a/libs/eea-java-11/src/main/resources/java/lang/invoke/VarHandle.eea
+++ b/libs/eea-java-11/src/main/resources/java/lang/invoke/VarHandle.eea
@@ -5,13 +5,13 @@ accessModeType
  (Ljava/lang/invoke/VarHandle$AccessMode;)Ljava/lang/invoke/MethodType;
 compareAndExchange
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 compareAndExchangeAcquire
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 compareAndExchangeRelease
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 compareAndSet
  ([Ljava/lang/Object;)Z
  ([Ljava/lang/Object;)Z
@@ -20,61 +20,61 @@ coordinateTypes
  ()Ljava/util/List<Ljava/lang/Class<*>;>;
 get
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAcquire
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndAdd
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndAddAcquire
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndAddRelease
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseAnd
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseAndAcquire
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseAndRelease
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseOr
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseOrAcquire
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseOrRelease
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseXor
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseXorAcquire
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseXorRelease
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndSet
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndSetAcquire
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndSetRelease
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getOpaque
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getVolatile
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 isAccessModeSupported
  (Ljava/lang/invoke/VarHandle$AccessMode;)Z
  (Ljava/lang/invoke/VarHandle$AccessMode;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/lang/module/Configuration.eea b/libs/eea-java-11/src/main/resources/java/lang/module/Configuration.eea
index 4812249c39..d42b77d202 100644
--- a/libs/eea-java-11/src/main/resources/java/lang/module/Configuration.eea
+++ b/libs/eea-java-11/src/main/resources/java/lang/module/Configuration.eea
@@ -5,10 +5,10 @@ empty
  ()Ljava/lang/module/Configuration;
 resolve
  (Ljava/lang/module/ModuleFinder;Ljava/util/List<Ljava/lang/module/Configuration;>;Ljava/lang/module/ModuleFinder;Ljava/util/Collection<Ljava/lang/String;>;)Ljava/lang/module/Configuration;
- (Ljava/lang/module/ModuleFinder;Ljava/util/List<Ljava/lang/module/Configuration;>;Ljava/lang/module/ModuleFinder;Ljava/util/Collection<Ljava/lang/String;>;)Ljava/lang/module/Configuration;
+ (Ljava/lang/module/ModuleFinder;Ljava/util/List<Ljava/lang/module/Configuration;>;Ljava/lang/module/ModuleFinder;Ljava/util/Collection<Ljava/lang/String;>;)L1java/lang/module/Configuration;
 resolveAndBind
  (Ljava/lang/module/ModuleFinder;Ljava/util/List<Ljava/lang/module/Configuration;>;Ljava/lang/module/ModuleFinder;Ljava/util/Collection<Ljava/lang/String;>;)Ljava/lang/module/Configuration;
- (Ljava/lang/module/ModuleFinder;Ljava/util/List<Ljava/lang/module/Configuration;>;Ljava/lang/module/ModuleFinder;Ljava/util/Collection<Ljava/lang/String;>;)Ljava/lang/module/Configuration;
+ (Ljava/lang/module/ModuleFinder;Ljava/util/List<Ljava/lang/module/Configuration;>;Ljava/lang/module/ModuleFinder;Ljava/util/Collection<Ljava/lang/String;>;)L1java/lang/module/Configuration;
 
 findModule
  (Ljava/lang/String;)Ljava/util/Optional<Ljava/lang/module/ResolvedModule;>;
diff --git a/libs/eea-java-11/src/main/resources/java/lang/module/ModuleDescriptor$Version.eea b/libs/eea-java-11/src/main/resources/java/lang/module/ModuleDescriptor$Version.eea
index 317961212b..0cc2269264 100644
--- a/libs/eea-java-11/src/main/resources/java/lang/module/ModuleDescriptor$Version.eea
+++ b/libs/eea-java-11/src/main/resources/java/lang/module/ModuleDescriptor$Version.eea
@@ -6,7 +6,7 @@ super java/lang/Comparable
 
 parse
  (Ljava/lang/String;)Ljava/lang/module/ModuleDescriptor$Version;
- (Ljava/lang/String;)Ljava/lang/module/ModuleDescriptor$Version;
+ (Ljava/lang/String;)L1java/lang/module/ModuleDescriptor$Version;
 
 compareTo
  (Ljava/lang/module/ModuleDescriptor$Version;)I
diff --git a/libs/eea-java-11/src/main/resources/java/lang/module/ModuleFinder.eea b/libs/eea-java-11/src/main/resources/java/lang/module/ModuleFinder.eea
index 85d29f3133..6b2917121e 100644
--- a/libs/eea-java-11/src/main/resources/java/lang/module/ModuleFinder.eea
+++ b/libs/eea-java-11/src/main/resources/java/lang/module/ModuleFinder.eea
@@ -2,7 +2,7 @@ class java/lang/module/ModuleFinder
 
 compose
  ([Ljava/lang/module/ModuleFinder;)Ljava/lang/module/ModuleFinder;
- ([Ljava/lang/module/ModuleFinder;)Ljava/lang/module/ModuleFinder;
+ ([Ljava/lang/module/ModuleFinder;)L1java/lang/module/ModuleFinder;
 of
  ([Ljava/nio/file/Path;)Ljava/lang/module/ModuleFinder;
  ([Ljava/nio/file/Path;)Ljava/lang/module/ModuleFinder;
diff --git a/libs/eea-java-11/src/main/resources/java/net/Authenticator.eea b/libs/eea-java-11/src/main/resources/java/net/Authenticator.eea
index 3151571c0a..f978702dd4 100644
--- a/libs/eea-java-11/src/main/resources/java/net/Authenticator.eea
+++ b/libs/eea-java-11/src/main/resources/java/net/Authenticator.eea
@@ -5,23 +5,23 @@ getDefault
  ()Ljava/net/Authenticator;
 requestPasswordAuthentication
  (Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/net/PasswordAuthentication;
- (Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/net/PasswordAuthentication;
+ (Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)L0java/net/PasswordAuthentication;
 requestPasswordAuthentication
  (Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/URL;Ljava/net/Authenticator$RequestorType;)Ljava/net/PasswordAuthentication;
- (Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/URL;Ljava/net/Authenticator$RequestorType;)Ljava/net/PasswordAuthentication;
+ (Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/URL;Ljava/net/Authenticator$RequestorType;)L0java/net/PasswordAuthentication;
 requestPasswordAuthentication
  (Ljava/net/Authenticator;Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/URL;Ljava/net/Authenticator$RequestorType;)Ljava/net/PasswordAuthentication;
- (Ljava/net/Authenticator;Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/URL;Ljava/net/Authenticator$RequestorType;)Ljava/net/PasswordAuthentication;
+ (Ljava/net/Authenticator;Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/URL;Ljava/net/Authenticator$RequestorType;)L0java/net/PasswordAuthentication;
 requestPasswordAuthentication
  (Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/net/PasswordAuthentication;
- (Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/net/PasswordAuthentication;
+ (Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)L0java/net/PasswordAuthentication;
 setDefault
  (Ljava/net/Authenticator;)V
  (Ljava/net/Authenticator;)V
 
 getPasswordAuthentication
  ()Ljava/net/PasswordAuthentication;
- ()Ljava/net/PasswordAuthentication;
+ ()L0java/net/PasswordAuthentication;
 getRequestingHost
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/java/net/ContentHandler.eea b/libs/eea-java-11/src/main/resources/java/net/ContentHandler.eea
index 1e1cca6b16..ed6f047606 100644
--- a/libs/eea-java-11/src/main/resources/java/net/ContentHandler.eea
+++ b/libs/eea-java-11/src/main/resources/java/net/ContentHandler.eea
@@ -5,4 +5,4 @@ getContent
  (Ljava/net/URLConnection;)Ljava/lang/Object;
 getContent
  (Ljava/net/URLConnection;[Ljava/lang/Class;)Ljava/lang/Object;
- (Ljava/net/URLConnection;[Ljava/lang/Class;)Ljava/lang/Object;
+ (Ljava/net/URLConnection;[Ljava/lang/Class;)L0java/lang/Object;
diff --git a/libs/eea-java-11/src/main/resources/java/net/ContentHandlerFactory.eea b/libs/eea-java-11/src/main/resources/java/net/ContentHandlerFactory.eea
index c8abe6b8dd..2699ebdcc3 100644
--- a/libs/eea-java-11/src/main/resources/java/net/ContentHandlerFactory.eea
+++ b/libs/eea-java-11/src/main/resources/java/net/ContentHandlerFactory.eea
@@ -2,4 +2,4 @@ class java/net/ContentHandlerFactory
 
 createContentHandler
  (Ljava/lang/String;)Ljava/net/ContentHandler;
- (Ljava/lang/String;)Ljava/net/ContentHandler;
+ (Ljava/lang/String;)L1java/net/ContentHandler;
diff --git a/libs/eea-java-11/src/main/resources/java/net/DatagramPacket.eea b/libs/eea-java-11/src/main/resources/java/net/DatagramPacket.eea
index 5eb8ad8f2d..ae4d558e11 100644
--- a/libs/eea-java-11/src/main/resources/java/net/DatagramPacket.eea
+++ b/libs/eea-java-11/src/main/resources/java/net/DatagramPacket.eea
@@ -26,7 +26,7 @@ getData
  ()[B
 getSocketAddress
  ()Ljava/net/SocketAddress;
- ()Ljava/net/SocketAddress;
+ ()L1java/net/SocketAddress;
 setAddress
  (Ljava/net/InetAddress;)V
  (Ljava/net/InetAddress;)V
diff --git a/libs/eea-java-11/src/main/resources/java/net/DatagramSocket.eea b/libs/eea-java-11/src/main/resources/java/net/DatagramSocket.eea
index f7108ca8c8..2b223c673f 100644
--- a/libs/eea-java-11/src/main/resources/java/net/DatagramSocket.eea
+++ b/libs/eea-java-11/src/main/resources/java/net/DatagramSocket.eea
@@ -24,22 +24,22 @@ connect
  (Ljava/net/SocketAddress;)V
 getChannel
  ()Ljava/nio/channels/DatagramChannel;
- ()Ljava/nio/channels/DatagramChannel;
+ ()L0java/nio/channels/DatagramChannel;
 getInetAddress
  ()Ljava/net/InetAddress;
  ()Ljava/net/InetAddress;
 getLocalAddress
  ()Ljava/net/InetAddress;
- ()Ljava/net/InetAddress;
+ ()L0java/net/InetAddress;
 getLocalSocketAddress
  ()Ljava/net/SocketAddress;
- ()Ljava/net/SocketAddress;
+ ()L0java/net/SocketAddress;
 getOption
  <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)TT;
  <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)TT;
 getRemoteSocketAddress
  ()Ljava/net/SocketAddress;
- ()Ljava/net/SocketAddress;
+ ()L0java/net/SocketAddress;
 receive
  (Ljava/net/DatagramPacket;)V
  (Ljava/net/DatagramPacket;)V
diff --git a/libs/eea-java-11/src/main/resources/java/net/DatagramSocketImplFactory.eea b/libs/eea-java-11/src/main/resources/java/net/DatagramSocketImplFactory.eea
index fff0d4e351..9f2fbb449d 100644
--- a/libs/eea-java-11/src/main/resources/java/net/DatagramSocketImplFactory.eea
+++ b/libs/eea-java-11/src/main/resources/java/net/DatagramSocketImplFactory.eea
@@ -2,4 +2,4 @@ class java/net/DatagramSocketImplFactory
 
 createDatagramSocketImpl
  ()Ljava/net/DatagramSocketImpl;
- ()Ljava/net/DatagramSocketImpl;
+ ()L1java/net/DatagramSocketImpl;
diff --git a/libs/eea-java-11/src/main/resources/java/net/HttpURLConnection.eea b/libs/eea-java-11/src/main/resources/java/net/HttpURLConnection.eea
index f7ed8f092c..6918f60e58 100644
--- a/libs/eea-java-11/src/main/resources/java/net/HttpURLConnection.eea
+++ b/libs/eea-java-11/src/main/resources/java/net/HttpURLConnection.eea
@@ -12,7 +12,7 @@ responseMessage
  (Ljava/net/URL;)V
 getErrorStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L0java/io/InputStream;
 getHeaderField
  (I)Ljava/lang/String;
  (I)L0java/lang/String; # @Inherited(java.net.URLConnection)
@@ -21,7 +21,7 @@ getHeaderFieldDate
  (Ljava/lang/String;J)J
 getHeaderFieldKey
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String; # @Inherited(java.net.URLConnection)
 getPermission
  ()Ljava/security/Permission;
  ()L1java/security/Permission; # @Inherited(java.net.URLConnection)
diff --git a/libs/eea-java-11/src/main/resources/java/net/IDN.eea b/libs/eea-java-11/src/main/resources/java/net/IDN.eea
index e2bcd71ed5..65c48535e7 100644
--- a/libs/eea-java-11/src/main/resources/java/net/IDN.eea
+++ b/libs/eea-java-11/src/main/resources/java/net/IDN.eea
@@ -5,10 +5,10 @@ toASCII
  (Ljava/lang/String;)Ljava/lang/String;
 toASCII
  (Ljava/lang/String;I)Ljava/lang/String;
- (Ljava/lang/String;I)Ljava/lang/String;
+ (Ljava/lang/String;I)L1java/lang/String;
 toUnicode
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
 toUnicode
  (Ljava/lang/String;I)Ljava/lang/String;
- (Ljava/lang/String;I)Ljava/lang/String;
+ (Ljava/lang/String;I)L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/java/net/InetSocketAddress.eea b/libs/eea-java-11/src/main/resources/java/net/InetSocketAddress.eea
index 999cdbd6cb..542c8de311 100644
--- a/libs/eea-java-11/src/main/resources/java/net/InetSocketAddress.eea
+++ b/libs/eea-java-11/src/main/resources/java/net/InetSocketAddress.eea
@@ -2,7 +2,7 @@ class java/net/InetSocketAddress
 
 createUnresolved
  (Ljava/lang/String;I)Ljava/net/InetSocketAddress;
- (Ljava/lang/String;I)Ljava/net/InetSocketAddress;
+ (Ljava/lang/String;I)L1java/net/InetSocketAddress;
 
 <init>
  (Ljava/lang/String;I)V
diff --git a/libs/eea-java-11/src/main/resources/java/net/NetworkInterface.eea b/libs/eea-java-11/src/main/resources/java/net/NetworkInterface.eea
index 5acc228d4f..0e698978a5 100644
--- a/libs/eea-java-11/src/main/resources/java/net/NetworkInterface.eea
+++ b/libs/eea-java-11/src/main/resources/java/net/NetworkInterface.eea
@@ -24,7 +24,7 @@ getDisplayName
  ()Ljava/lang/String;
 getHardwareAddress
  ()[B
- ()[B
+ ()[0B
 getInetAddresses
  ()Ljava/util/Enumeration<Ljava/net/InetAddress;>;
  ()Ljava/util/Enumeration<Ljava/net/InetAddress;>;
diff --git a/libs/eea-java-11/src/main/resources/java/net/ServerSocket.eea b/libs/eea-java-11/src/main/resources/java/net/ServerSocket.eea
index 6d7b99f037..7ecbe9d8a3 100644
--- a/libs/eea-java-11/src/main/resources/java/net/ServerSocket.eea
+++ b/libs/eea-java-11/src/main/resources/java/net/ServerSocket.eea
@@ -18,13 +18,13 @@ bind
  (Ljava/net/SocketAddress;I)V
 getChannel
  ()Ljava/nio/channels/ServerSocketChannel;
- ()Ljava/nio/channels/ServerSocketChannel;
+ ()L0java/nio/channels/ServerSocketChannel;
 getInetAddress
  ()Ljava/net/InetAddress;
- ()Ljava/net/InetAddress;
+ ()L0java/net/InetAddress;
 getLocalSocketAddress
  ()Ljava/net/SocketAddress;
- ()Ljava/net/SocketAddress;
+ ()L0java/net/SocketAddress;
 getOption
  <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)TT;
  <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)TT;
diff --git a/libs/eea-java-11/src/main/resources/java/net/Socket.eea b/libs/eea-java-11/src/main/resources/java/net/Socket.eea
index 917fb41a76..dae3c41618 100644
--- a/libs/eea-java-11/src/main/resources/java/net/Socket.eea
+++ b/libs/eea-java-11/src/main/resources/java/net/Socket.eea
@@ -42,7 +42,7 @@ getChannel
  ()L0java/nio/channels/SocketChannel;
 getInetAddress
  ()Ljava/net/InetAddress;
- ()Ljava/net/InetAddress;
+ ()L0java/net/InetAddress;
 getInputStream
  ()Ljava/io/InputStream;
  ()L1java/io/InputStream;
@@ -51,7 +51,7 @@ getLocalAddress
  ()L1java/net/InetAddress;
 getLocalSocketAddress
  ()Ljava/net/SocketAddress;
- ()Ljava/net/SocketAddress;
+ ()L0java/net/SocketAddress;
 getOption
  <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)TT;
  <T:Ljava/lang/Object;>(L1java/net/SocketOption<TT;>;)TT;
@@ -60,7 +60,7 @@ getOutputStream
  ()L1java/io/OutputStream;
 getRemoteSocketAddress
  ()Ljava/net/SocketAddress;
- ()Ljava/net/SocketAddress;
+ ()L0java/net/SocketAddress;
 setOption
  <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;TT;)Ljava/net/Socket;
  <T:Ljava/lang/Object;>(L1java/net/SocketOption<TT;>;TT;)L1java/net/Socket;
diff --git a/libs/eea-java-11/src/main/resources/java/net/SocketImplFactory.eea b/libs/eea-java-11/src/main/resources/java/net/SocketImplFactory.eea
index 6cb49500ff..c6e0f746a1 100644
--- a/libs/eea-java-11/src/main/resources/java/net/SocketImplFactory.eea
+++ b/libs/eea-java-11/src/main/resources/java/net/SocketImplFactory.eea
@@ -2,4 +2,4 @@ class java/net/SocketImplFactory
 
 createSocketImpl
  ()Ljava/net/SocketImpl;
- ()Ljava/net/SocketImpl;
+ ()L1java/net/SocketImpl;
diff --git a/libs/eea-java-11/src/main/resources/java/net/URLClassLoader.eea b/libs/eea-java-11/src/main/resources/java/net/URLClassLoader.eea
index 718252d120..d0d7932110 100644
--- a/libs/eea-java-11/src/main/resources/java/net/URLClassLoader.eea
+++ b/libs/eea-java-11/src/main/resources/java/net/URLClassLoader.eea
@@ -39,7 +39,7 @@ findResources
  (L0java/lang/String;)L1java/util/Enumeration<L1java/net/URL;>; # @Inherited(java.lang.ClassLoader)
 getPermissions
  (Ljava/security/CodeSource;)Ljava/security/PermissionCollection;
- (Ljava/security/CodeSource;)Ljava/security/PermissionCollection;
+ (Ljava/security/CodeSource;)L1java/security/PermissionCollection; # @Inherited(java.security.SecureClassLoader)
 getResourceAsStream
  (Ljava/lang/String;)Ljava/io/InputStream;
  (L1java/lang/String;)L0java/io/InputStream; # @Inherited(java.lang.ClassLoader)
diff --git a/libs/eea-java-11/src/main/resources/java/net/URLConnection.eea b/libs/eea-java-11/src/main/resources/java/net/URLConnection.eea
index 3e23c7918f..cba94435dd 100644
--- a/libs/eea-java-11/src/main/resources/java/net/URLConnection.eea
+++ b/libs/eea-java-11/src/main/resources/java/net/URLConnection.eea
@@ -2,7 +2,7 @@ class java/net/URLConnection
 
 getDefaultRequestProperty
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getDefaultUseCaches
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
@@ -14,7 +14,7 @@ guessContentTypeFromName
  (Ljava/lang/String;)Ljava/lang/String;
 guessContentTypeFromStream
  (Ljava/io/InputStream;)Ljava/lang/String;
- (Ljava/io/InputStream;)Ljava/lang/String;
+ (Ljava/io/InputStream;)L0java/lang/String;
 setContentHandlerFactory
  (Ljava/net/ContentHandlerFactory;)V
  (Ljava/net/ContentHandlerFactory;)V
@@ -64,7 +64,7 @@ getHeaderFieldInt
  (Ljava/lang/String;I)I
 getHeaderFieldKey
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getHeaderFieldLong
  (Ljava/lang/String;J)J
  (Ljava/lang/String;J)J
@@ -85,7 +85,7 @@ getRequestProperties
  ()Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;
 getRequestProperty
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getURL
  ()Ljava/net/URL;
  ()L1java/net/URL;
diff --git a/libs/eea-java-11/src/main/resources/java/net/URLStreamHandler.eea b/libs/eea-java-11/src/main/resources/java/net/URLStreamHandler.eea
index 9be69df7e3..c6590f2784 100644
--- a/libs/eea-java-11/src/main/resources/java/net/URLStreamHandler.eea
+++ b/libs/eea-java-11/src/main/resources/java/net/URLStreamHandler.eea
@@ -17,7 +17,7 @@ openConnection
  (Ljava/net/URL;)Ljava/net/URLConnection;
 openConnection
  (Ljava/net/URL;Ljava/net/Proxy;)Ljava/net/URLConnection;
- (Ljava/net/URL;Ljava/net/Proxy;)Ljava/net/URLConnection;
+ (Ljava/net/URL;Ljava/net/Proxy;)L1java/net/URLConnection;
 parseURL
  (Ljava/net/URL;Ljava/lang/String;II)V
  (Ljava/net/URL;Ljava/lang/String;II)V
@@ -32,4 +32,4 @@ setURL
  (Ljava/net/URL;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 toExternalForm
  (Ljava/net/URL;)Ljava/lang/String;
- (Ljava/net/URL;)Ljava/lang/String;
+ (Ljava/net/URL;)L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/java/net/URLStreamHandlerFactory.eea b/libs/eea-java-11/src/main/resources/java/net/URLStreamHandlerFactory.eea
index 8f3220380d..92463e2ec7 100644
--- a/libs/eea-java-11/src/main/resources/java/net/URLStreamHandlerFactory.eea
+++ b/libs/eea-java-11/src/main/resources/java/net/URLStreamHandlerFactory.eea
@@ -2,4 +2,4 @@ class java/net/URLStreamHandlerFactory
 
 createURLStreamHandler
  (Ljava/lang/String;)Ljava/net/URLStreamHandler;
- (Ljava/lang/String;)Ljava/net/URLStreamHandler;
+ (Ljava/lang/String;)L1java/net/URLStreamHandler;
diff --git a/libs/eea-java-11/src/main/resources/java/net/http/HttpClient.eea b/libs/eea-java-11/src/main/resources/java/net/http/HttpClient.eea
index d7ad7873a1..6e57fa2ea2 100644
--- a/libs/eea-java-11/src/main/resources/java/net/http/HttpClient.eea
+++ b/libs/eea-java-11/src/main/resources/java/net/http/HttpClient.eea
@@ -24,7 +24,7 @@ followRedirects
  ()Ljava/net/http/HttpClient$Redirect;
 newWebSocketBuilder
  ()Ljava/net/http/WebSocket$Builder;
- ()Ljava/net/http/WebSocket$Builder;
+ ()L1java/net/http/WebSocket$Builder;
 proxy
  ()Ljava/util/Optional<Ljava/net/ProxySelector;>;
  ()Ljava/util/Optional<Ljava/net/ProxySelector;>;
diff --git a/libs/eea-java-11/src/main/resources/java/net/http/HttpRequest.eea b/libs/eea-java-11/src/main/resources/java/net/http/HttpRequest.eea
index b270dc9c20..4339912bf5 100644
--- a/libs/eea-java-11/src/main/resources/java/net/http/HttpRequest.eea
+++ b/libs/eea-java-11/src/main/resources/java/net/http/HttpRequest.eea
@@ -2,10 +2,10 @@ class java/net/http/HttpRequest
 
 newBuilder
  ()Ljava/net/http/HttpRequest$Builder;
- ()Ljava/net/http/HttpRequest$Builder;
+ ()L1java/net/http/HttpRequest$Builder;
 newBuilder
  (Ljava/net/URI;)Ljava/net/http/HttpRequest$Builder;
- (Ljava/net/URI;)Ljava/net/http/HttpRequest$Builder;
+ (Ljava/net/URI;)L1java/net/http/HttpRequest$Builder;
 
 bodyPublisher
  ()Ljava/util/Optional<Ljava/net/http/HttpRequest$BodyPublisher;>;
diff --git a/libs/eea-java-11/src/main/resources/java/net/http/HttpResponse$BodySubscribers.eea b/libs/eea-java-11/src/main/resources/java/net/http/HttpResponse$BodySubscribers.eea
index 24e2632035..4b01d65c7d 100644
--- a/libs/eea-java-11/src/main/resources/java/net/http/HttpResponse$BodySubscribers.eea
+++ b/libs/eea-java-11/src/main/resources/java/net/http/HttpResponse$BodySubscribers.eea
@@ -2,10 +2,10 @@ class java/net/http/HttpResponse$BodySubscribers
 
 buffering
  <T:Ljava/lang/Object;>(Ljava/net/http/HttpResponse$BodySubscriber<TT;>;I)Ljava/net/http/HttpResponse$BodySubscriber<TT;>;
- <T:Ljava/lang/Object;>(Ljava/net/http/HttpResponse$BodySubscriber<TT;>;I)Ljava/net/http/HttpResponse$BodySubscriber<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/net/http/HttpResponse$BodySubscriber<TT;>;I)L1java/net/http/HttpResponse$BodySubscriber<TT;>;
 discarding
  ()Ljava/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
- ()Ljava/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
+ ()L1java/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
 fromLineSubscriber
  (Ljava/util/concurrent/Flow$Subscriber<-Ljava/lang/String;>;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
  (Ljava/util/concurrent/Flow$Subscriber<-Ljava/lang/String;>;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
@@ -17,16 +17,16 @@ fromSubscriber
  (Ljava/util/concurrent/Flow$Subscriber<-Ljava/util/List<Ljava/nio/ByteBuffer;>;>;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
 fromSubscriber
  <S::Ljava/util/concurrent/Flow$Subscriber<-Ljava/util/List<Ljava/nio/ByteBuffer;>;>;T:Ljava/lang/Object;>(TS;Ljava/util/function/Function<-TS;+TT;>;)Ljava/net/http/HttpResponse$BodySubscriber<TT;>;
- <S::Ljava/util/concurrent/Flow$Subscriber<-Ljava/util/List<Ljava/nio/ByteBuffer;>;>;T:Ljava/lang/Object;>(TS;Ljava/util/function/Function<-TS;+TT;>;)Ljava/net/http/HttpResponse$BodySubscriber<TT;>;
+ <S::Ljava/util/concurrent/Flow$Subscriber<-Ljava/util/List<Ljava/nio/ByteBuffer;>;>;T:Ljava/lang/Object;>(TS;Ljava/util/function/Function<-TS;+TT;>;)L1java/net/http/HttpResponse$BodySubscriber<TT;>;
 mapping
  <T:Ljava/lang/Object;U:Ljava/lang/Object;>(Ljava/net/http/HttpResponse$BodySubscriber<TT;>;Ljava/util/function/Function<-TT;+TU;>;)Ljava/net/http/HttpResponse$BodySubscriber<TU;>;
- <T:Ljava/lang/Object;U:Ljava/lang/Object;>(Ljava/net/http/HttpResponse$BodySubscriber<TT;>;Ljava/util/function/Function<-TT;+TU;>;)Ljava/net/http/HttpResponse$BodySubscriber<TU;>;
+ <T:Ljava/lang/Object;U:Ljava/lang/Object;>(Ljava/net/http/HttpResponse$BodySubscriber<TT;>;Ljava/util/function/Function<-TT;+TU;>;)L1java/net/http/HttpResponse$BodySubscriber<TU;>;
 ofByteArray
  ()Ljava/net/http/HttpResponse$BodySubscriber<[B>;
- ()Ljava/net/http/HttpResponse$BodySubscriber<[B>;
+ ()L1java/net/http/HttpResponse$BodySubscriber<[B>;
 ofByteArrayConsumer
  (Ljava/util/function/Consumer<Ljava/util/Optional<[B>;>;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
- (Ljava/util/function/Consumer<Ljava/util/Optional<[B>;>;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
+ (Ljava/util/function/Consumer<Ljava/util/Optional<[B>;>;)L1java/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
 ofFile
  (Ljava/nio/file/Path;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/nio/file/Path;>;
  (Ljava/nio/file/Path;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/nio/file/Path;>;
@@ -35,7 +35,7 @@ ofFile
  (Ljava/nio/file/Path;[Ljava/nio/file/OpenOption;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/nio/file/Path;>;
 ofInputStream
  ()Ljava/net/http/HttpResponse$BodySubscriber<Ljava/io/InputStream;>;
- ()Ljava/net/http/HttpResponse$BodySubscriber<Ljava/io/InputStream;>;
+ ()L1java/net/http/HttpResponse$BodySubscriber<Ljava/io/InputStream;>;
 ofLines
  (Ljava/nio/charset/Charset;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/util/stream/Stream<Ljava/lang/String;>;>;
  (Ljava/nio/charset/Charset;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/util/stream/Stream<Ljava/lang/String;>;>;
@@ -47,4 +47,4 @@ ofString
  (Ljava/nio/charset/Charset;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/lang/String;>;
 replacing
  <U:Ljava/lang/Object;>(TU;)Ljava/net/http/HttpResponse$BodySubscriber<TU;>;
- <U:Ljava/lang/Object;>(TU;)Ljava/net/http/HttpResponse$BodySubscriber<TU;>;
+ <U:Ljava/lang/Object;>(TU;)L1java/net/http/HttpResponse$BodySubscriber<TU;>;
diff --git a/libs/eea-java-11/src/main/resources/java/net/http/HttpResponse$PushPromiseHandler.eea b/libs/eea-java-11/src/main/resources/java/net/http/HttpResponse$PushPromiseHandler.eea
index 936b9a2b6c..d353e41f88 100644
--- a/libs/eea-java-11/src/main/resources/java/net/http/HttpResponse$PushPromiseHandler.eea
+++ b/libs/eea-java-11/src/main/resources/java/net/http/HttpResponse$PushPromiseHandler.eea
@@ -4,7 +4,7 @@ class java/net/http/HttpResponse$PushPromiseHandler
 
 of
  <T:Ljava/lang/Object;>(Ljava/util/function/Function<Ljava/net/http/HttpRequest;Ljava/net/http/HttpResponse$BodyHandler<TT;>;>;Ljava/util/concurrent/ConcurrentMap<Ljava/net/http/HttpRequest;Ljava/util/concurrent/CompletableFuture<Ljava/net/http/HttpResponse<TT;>;>;>;)Ljava/net/http/HttpResponse$PushPromiseHandler<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/function/Function<Ljava/net/http/HttpRequest;Ljava/net/http/HttpResponse$BodyHandler<TT;>;>;Ljava/util/concurrent/ConcurrentMap<Ljava/net/http/HttpRequest;Ljava/util/concurrent/CompletableFuture<Ljava/net/http/HttpResponse<TT;>;>;>;)Ljava/net/http/HttpResponse$PushPromiseHandler<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/function/Function<Ljava/net/http/HttpRequest;Ljava/net/http/HttpResponse$BodyHandler<TT;>;>;Ljava/util/concurrent/ConcurrentMap<Ljava/net/http/HttpRequest;Ljava/util/concurrent/CompletableFuture<Ljava/net/http/HttpResponse<TT;>;>;>;)L1java/net/http/HttpResponse$PushPromiseHandler<TT;>;
 
 applyPushPromise
  (Ljava/net/http/HttpRequest;Ljava/net/http/HttpRequest;Ljava/util/function/Function<Ljava/net/http/HttpResponse$BodyHandler<TT;>;Ljava/util/concurrent/CompletableFuture<Ljava/net/http/HttpResponse<TT;>;>;>;)V
diff --git a/libs/eea-java-11/src/main/resources/java/nio/channels/Channels.eea b/libs/eea-java-11/src/main/resources/java/nio/channels/Channels.eea
index 923b2d7508..56f8111780 100644
--- a/libs/eea-java-11/src/main/resources/java/nio/channels/Channels.eea
+++ b/libs/eea-java-11/src/main/resources/java/nio/channels/Channels.eea
@@ -8,16 +8,16 @@ newChannel
  (Ljava/io/OutputStream;)Ljava/nio/channels/WritableByteChannel;
 newInputStream
  (Ljava/nio/channels/AsynchronousByteChannel;)Ljava/io/InputStream;
- (Ljava/nio/channels/AsynchronousByteChannel;)Ljava/io/InputStream;
+ (Ljava/nio/channels/AsynchronousByteChannel;)L1java/io/InputStream;
 newInputStream
  (Ljava/nio/channels/ReadableByteChannel;)Ljava/io/InputStream;
- (Ljava/nio/channels/ReadableByteChannel;)Ljava/io/InputStream;
+ (Ljava/nio/channels/ReadableByteChannel;)L1java/io/InputStream;
 newOutputStream
  (Ljava/nio/channels/AsynchronousByteChannel;)Ljava/io/OutputStream;
- (Ljava/nio/channels/AsynchronousByteChannel;)Ljava/io/OutputStream;
+ (Ljava/nio/channels/AsynchronousByteChannel;)L1java/io/OutputStream;
 newOutputStream
  (Ljava/nio/channels/WritableByteChannel;)Ljava/io/OutputStream;
- (Ljava/nio/channels/WritableByteChannel;)Ljava/io/OutputStream;
+ (Ljava/nio/channels/WritableByteChannel;)L1java/io/OutputStream;
 newReader
  (Ljava/nio/channels/ReadableByteChannel;Ljava/lang/String;)Ljava/io/Reader;
  (Ljava/nio/channels/ReadableByteChannel;Ljava/lang/String;)Ljava/io/Reader;
diff --git a/libs/eea-java-11/src/main/resources/java/nio/channels/FileLock.eea b/libs/eea-java-11/src/main/resources/java/nio/channels/FileLock.eea
index 1a65dcb231..b3d6e28504 100644
--- a/libs/eea-java-11/src/main/resources/java/nio/channels/FileLock.eea
+++ b/libs/eea-java-11/src/main/resources/java/nio/channels/FileLock.eea
@@ -11,7 +11,7 @@ acquiredBy
  ()Ljava/nio/channels/Channel;
 channel
  ()Ljava/nio/channels/FileChannel;
- ()Ljava/nio/channels/FileChannel;
+ ()L0java/nio/channels/FileChannel;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/java/nio/channels/spi/SelectorProvider.eea b/libs/eea-java-11/src/main/resources/java/nio/channels/spi/SelectorProvider.eea
index 114b5fdb0c..96e78def1a 100644
--- a/libs/eea-java-11/src/main/resources/java/nio/channels/spi/SelectorProvider.eea
+++ b/libs/eea-java-11/src/main/resources/java/nio/channels/spi/SelectorProvider.eea
@@ -6,7 +6,7 @@ provider
 
 inheritedChannel
  ()Ljava/nio/channels/Channel;
- ()Ljava/nio/channels/Channel;
+ ()L0java/nio/channels/Channel;
 openDatagramChannel
  ()Ljava/nio/channels/DatagramChannel;
  ()Ljava/nio/channels/DatagramChannel;
diff --git a/libs/eea-java-11/src/main/resources/java/nio/charset/CharsetDecoder.eea b/libs/eea-java-11/src/main/resources/java/nio/charset/CharsetDecoder.eea
index 437c9ffdba..d0edf1cf5c 100644
--- a/libs/eea-java-11/src/main/resources/java/nio/charset/CharsetDecoder.eea
+++ b/libs/eea-java-11/src/main/resources/java/nio/charset/CharsetDecoder.eea
@@ -17,7 +17,7 @@ decodeLoop
  (Ljava/nio/ByteBuffer;Ljava/nio/CharBuffer;)Ljava/nio/charset/CoderResult;
 detectedCharset
  ()Ljava/nio/charset/Charset;
- ()Ljava/nio/charset/Charset;
+ ()L1java/nio/charset/Charset;
 flush
  (Ljava/nio/CharBuffer;)Ljava/nio/charset/CoderResult;
  (Ljava/nio/CharBuffer;)Ljava/nio/charset/CoderResult;
diff --git a/libs/eea-java-11/src/main/resources/java/nio/file/Files.eea b/libs/eea-java-11/src/main/resources/java/nio/file/Files.eea
index 9444a4824f..58c14e8ce7 100644
--- a/libs/eea-java-11/src/main/resources/java/nio/file/Files.eea
+++ b/libs/eea-java-11/src/main/resources/java/nio/file/Files.eea
@@ -14,28 +14,28 @@ createDirectories
  (L1java/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createDirectory
  (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createFile
  (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createLink
  (Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;Ljava/nio/file/Path;)L1java/nio/file/Path;
 createSymbolicLink
  (Ljava/nio/file/Path;Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createTempDirectory
  (Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createTempDirectory
  (Ljava/nio/file/Path;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createTempFile
  (Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createTempFile
  (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 delete
  (Ljava/nio/file/Path;)V
  (Ljava/nio/file/Path;)V
diff --git a/libs/eea-java-11/src/main/resources/java/nio/file/attribute/AclEntry.eea b/libs/eea-java-11/src/main/resources/java/nio/file/attribute/AclEntry.eea
index ddbe0791a6..c9697f8db0 100644
--- a/libs/eea-java-11/src/main/resources/java/nio/file/attribute/AclEntry.eea
+++ b/libs/eea-java-11/src/main/resources/java/nio/file/attribute/AclEntry.eea
@@ -2,7 +2,7 @@ class java/nio/file/attribute/AclEntry
 
 newBuilder
  ()Ljava/nio/file/attribute/AclEntry$Builder;
- ()Ljava/nio/file/attribute/AclEntry$Builder;
+ ()L1java/nio/file/attribute/AclEntry$Builder;
 newBuilder
  (Ljava/nio/file/attribute/AclEntry;)Ljava/nio/file/attribute/AclEntry$Builder;
  (Ljava/nio/file/attribute/AclEntry;)Ljava/nio/file/attribute/AclEntry$Builder;
@@ -12,10 +12,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 flags
  ()Ljava/util/Set<Ljava/nio/file/attribute/AclEntryFlag;>;
- ()Ljava/util/Set<Ljava/nio/file/attribute/AclEntryFlag;>;
+ ()L1java/util/Set<Ljava/nio/file/attribute/AclEntryFlag;>;
 permissions
  ()Ljava/util/Set<Ljava/nio/file/attribute/AclEntryPermission;>;
- ()Ljava/util/Set<Ljava/nio/file/attribute/AclEntryPermission;>;
+ ()L1java/util/Set<Ljava/nio/file/attribute/AclEntryPermission;>;
 principal
  ()Ljava/nio/file/attribute/UserPrincipal;
  ()Ljava/nio/file/attribute/UserPrincipal;
diff --git a/libs/eea-java-11/src/main/resources/java/nio/file/attribute/FileTime.eea b/libs/eea-java-11/src/main/resources/java/nio/file/attribute/FileTime.eea
index 901f9872e4..22ad44270b 100644
--- a/libs/eea-java-11/src/main/resources/java/nio/file/attribute/FileTime.eea
+++ b/libs/eea-java-11/src/main/resources/java/nio/file/attribute/FileTime.eea
@@ -6,13 +6,13 @@ super java/lang/Comparable
 
 from
  (JLjava/util/concurrent/TimeUnit;)Ljava/nio/file/attribute/FileTime;
- (JLjava/util/concurrent/TimeUnit;)Ljava/nio/file/attribute/FileTime;
+ (JLjava/util/concurrent/TimeUnit;)L1java/nio/file/attribute/FileTime;
 from
  (Ljava/time/Instant;)Ljava/nio/file/attribute/FileTime;
  (Ljava/time/Instant;)Ljava/nio/file/attribute/FileTime;
 fromMillis
  (J)Ljava/nio/file/attribute/FileTime;
- (J)Ljava/nio/file/attribute/FileTime;
+ (J)L1java/nio/file/attribute/FileTime;
 
 compareTo
  (Ljava/nio/file/attribute/FileTime;)I
diff --git a/libs/eea-java-11/src/main/resources/java/nio/file/attribute/PosixFilePermissions.eea b/libs/eea-java-11/src/main/resources/java/nio/file/attribute/PosixFilePermissions.eea
index e5c13010fa..9a02f70214 100644
--- a/libs/eea-java-11/src/main/resources/java/nio/file/attribute/PosixFilePermissions.eea
+++ b/libs/eea-java-11/src/main/resources/java/nio/file/attribute/PosixFilePermissions.eea
@@ -2,10 +2,10 @@ class java/nio/file/attribute/PosixFilePermissions
 
 asFileAttribute
  (Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;)Ljava/nio/file/attribute/FileAttribute<Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;>;
- (Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;)Ljava/nio/file/attribute/FileAttribute<Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;>;
+ (Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;)L1java/nio/file/attribute/FileAttribute<Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;>;
 fromString
  (Ljava/lang/String;)Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;
  (Ljava/lang/String;)Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;
 toString
  (Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;)Ljava/lang/String;
- (Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;)Ljava/lang/String;
+ (Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;)L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/java/nio/file/spi/FileSystemProvider.eea b/libs/eea-java-11/src/main/resources/java/nio/file/spi/FileSystemProvider.eea
index 6669979310..6047dac0b7 100644
--- a/libs/eea-java-11/src/main/resources/java/nio/file/spi/FileSystemProvider.eea
+++ b/libs/eea-java-11/src/main/resources/java/nio/file/spi/FileSystemProvider.eea
@@ -51,7 +51,7 @@ move
  (Ljava/nio/file/Path;Ljava/nio/file/Path;[Ljava/nio/file/CopyOption;)V
 newAsynchronousFileChannel
  (Ljava/nio/file/Path;Ljava/util/Set<+Ljava/nio/file/OpenOption;>;Ljava/util/concurrent/ExecutorService;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/channels/AsynchronousFileChannel;
- (Ljava/nio/file/Path;Ljava/util/Set<+Ljava/nio/file/OpenOption;>;Ljava/util/concurrent/ExecutorService;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/channels/AsynchronousFileChannel;
+ (Ljava/nio/file/Path;Ljava/util/Set<+Ljava/nio/file/OpenOption;>;Ljava/util/concurrent/ExecutorService;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/channels/AsynchronousFileChannel;
 newByteChannel
  (Ljava/nio/file/Path;Ljava/util/Set<+Ljava/nio/file/OpenOption;>;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/channels/SeekableByteChannel;
  (Ljava/nio/file/Path;Ljava/util/Set<+Ljava/nio/file/OpenOption;>;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/channels/SeekableByteChannel;
@@ -60,13 +60,13 @@ newDirectoryStream
  (Ljava/nio/file/Path;Ljava/nio/file/DirectoryStream$Filter<-Ljava/nio/file/Path;>;)Ljava/nio/file/DirectoryStream<Ljava/nio/file/Path;>;
 newFileChannel
  (Ljava/nio/file/Path;Ljava/util/Set<+Ljava/nio/file/OpenOption;>;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/channels/FileChannel;
- (Ljava/nio/file/Path;Ljava/util/Set<+Ljava/nio/file/OpenOption;>;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/channels/FileChannel;
+ (Ljava/nio/file/Path;Ljava/util/Set<+Ljava/nio/file/OpenOption;>;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/channels/FileChannel;
 newFileSystem
  (Ljava/net/URI;Ljava/util/Map<Ljava/lang/String;*>;)Ljava/nio/file/FileSystem;
  (Ljava/net/URI;Ljava/util/Map<Ljava/lang/String;*>;)Ljava/nio/file/FileSystem;
 newFileSystem
  (Ljava/nio/file/Path;Ljava/util/Map<Ljava/lang/String;*>;)Ljava/nio/file/FileSystem;
- (Ljava/nio/file/Path;Ljava/util/Map<Ljava/lang/String;*>;)Ljava/nio/file/FileSystem;
+ (Ljava/nio/file/Path;Ljava/util/Map<Ljava/lang/String;*>;)L1java/nio/file/FileSystem;
 newInputStream
  (Ljava/nio/file/Path;[Ljava/nio/file/OpenOption;)Ljava/io/InputStream;
  (Ljava/nio/file/Path;[Ljava/nio/file/OpenOption;)Ljava/io/InputStream;
@@ -81,7 +81,7 @@ readAttributes
  <A::Ljava/nio/file/attribute/BasicFileAttributes;>(Ljava/nio/file/Path;Ljava/lang/Class<TA;>;[Ljava/nio/file/LinkOption;)TA;
 readSymbolicLink
  (Ljava/nio/file/Path;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;)L1java/nio/file/Path;
 setAttribute
  (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/Object;[Ljava/nio/file/LinkOption;)V
  (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/Object;[Ljava/nio/file/LinkOption;)V
diff --git a/libs/eea-java-11/src/main/resources/java/rmi/MarshalledObject.eea b/libs/eea-java-11/src/main/resources/java/rmi/MarshalledObject.eea
index 4cc4f828d4..db75ee3068 100644
--- a/libs/eea-java-11/src/main/resources/java/rmi/MarshalledObject.eea
+++ b/libs/eea-java-11/src/main/resources/java/rmi/MarshalledObject.eea
@@ -10,4 +10,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 get
  ()TT;
- ()TT;
+ ()T0T;
diff --git a/libs/eea-java-11/src/main/resources/java/rmi/activation/ActivationGroup.eea b/libs/eea-java-11/src/main/resources/java/rmi/activation/ActivationGroup.eea
index 07a55dbfff..a679c74bc1 100644
--- a/libs/eea-java-11/src/main/resources/java/rmi/activation/ActivationGroup.eea
+++ b/libs/eea-java-11/src/main/resources/java/rmi/activation/ActivationGroup.eea
@@ -2,7 +2,7 @@ class java/rmi/activation/ActivationGroup
 
 createGroup
  (Ljava/rmi/activation/ActivationGroupID;Ljava/rmi/activation/ActivationGroupDesc;J)Ljava/rmi/activation/ActivationGroup;
- (Ljava/rmi/activation/ActivationGroupID;Ljava/rmi/activation/ActivationGroupDesc;J)Ljava/rmi/activation/ActivationGroup;
+ (Ljava/rmi/activation/ActivationGroupID;Ljava/rmi/activation/ActivationGroupDesc;J)L1java/rmi/activation/ActivationGroup;
 currentGroupID
  ()Ljava/rmi/activation/ActivationGroupID;
  ()Ljava/rmi/activation/ActivationGroupID;
diff --git a/libs/eea-java-11/src/main/resources/java/rmi/activation/ActivationGroupDesc.eea b/libs/eea-java-11/src/main/resources/java/rmi/activation/ActivationGroupDesc.eea
index 02fb9f4955..8ab9cd60c6 100644
--- a/libs/eea-java-11/src/main/resources/java/rmi/activation/ActivationGroupDesc.eea
+++ b/libs/eea-java-11/src/main/resources/java/rmi/activation/ActivationGroupDesc.eea
@@ -23,4 +23,4 @@ getLocation
  ()Ljava/lang/String;
 getPropertyOverrides
  ()Ljava/util/Properties;
- ()Ljava/util/Properties;
+ ()L0java/util/Properties;
diff --git a/libs/eea-java-11/src/main/resources/java/rmi/registry/LocateRegistry.eea b/libs/eea-java-11/src/main/resources/java/rmi/registry/LocateRegistry.eea
index e70d3d198e..38450d435c 100644
--- a/libs/eea-java-11/src/main/resources/java/rmi/registry/LocateRegistry.eea
+++ b/libs/eea-java-11/src/main/resources/java/rmi/registry/LocateRegistry.eea
@@ -2,10 +2,10 @@ class java/rmi/registry/LocateRegistry
 
 createRegistry
  (I)Ljava/rmi/registry/Registry;
- (I)Ljava/rmi/registry/Registry;
+ (I)L1java/rmi/registry/Registry;
 createRegistry
  (ILjava/rmi/server/RMIClientSocketFactory;Ljava/rmi/server/RMIServerSocketFactory;)Ljava/rmi/registry/Registry;
- (ILjava/rmi/server/RMIClientSocketFactory;Ljava/rmi/server/RMIServerSocketFactory;)Ljava/rmi/registry/Registry;
+ (ILjava/rmi/server/RMIClientSocketFactory;Ljava/rmi/server/RMIServerSocketFactory;)L1java/rmi/registry/Registry;
 getRegistry
  ()Ljava/rmi/registry/Registry;
  ()Ljava/rmi/registry/Registry;
diff --git a/libs/eea-java-11/src/main/resources/java/rmi/server/LogStream.eea b/libs/eea-java-11/src/main/resources/java/rmi/server/LogStream.eea
index aee33be4eb..389cc10db4 100644
--- a/libs/eea-java-11/src/main/resources/java/rmi/server/LogStream.eea
+++ b/libs/eea-java-11/src/main/resources/java/rmi/server/LogStream.eea
@@ -5,7 +5,7 @@ getDefaultStream
  ()Ljava/io/PrintStream;
 log
  (Ljava/lang/String;)Ljava/rmi/server/LogStream;
- (Ljava/lang/String;)Ljava/rmi/server/LogStream;
+ (Ljava/lang/String;)L1java/rmi/server/LogStream;
 parseLevel
  (Ljava/lang/String;)I
  (Ljava/lang/String;)I
diff --git a/libs/eea-java-11/src/main/resources/java/rmi/server/ObjID.eea b/libs/eea-java-11/src/main/resources/java/rmi/server/ObjID.eea
index 37a7c46095..3eac44ce47 100644
--- a/libs/eea-java-11/src/main/resources/java/rmi/server/ObjID.eea
+++ b/libs/eea-java-11/src/main/resources/java/rmi/server/ObjID.eea
@@ -2,7 +2,7 @@ class java/rmi/server/ObjID
 
 read
  (Ljava/io/ObjectInput;)Ljava/rmi/server/ObjID;
- (Ljava/io/ObjectInput;)Ljava/rmi/server/ObjID;
+ (Ljava/io/ObjectInput;)L1java/rmi/server/ObjID;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/rmi/server/RMIClientSocketFactory.eea b/libs/eea-java-11/src/main/resources/java/rmi/server/RMIClientSocketFactory.eea
index b9e5e140b4..b825c98a8b 100644
--- a/libs/eea-java-11/src/main/resources/java/rmi/server/RMIClientSocketFactory.eea
+++ b/libs/eea-java-11/src/main/resources/java/rmi/server/RMIClientSocketFactory.eea
@@ -2,4 +2,4 @@ class java/rmi/server/RMIClientSocketFactory
 
 createSocket
  (Ljava/lang/String;I)Ljava/net/Socket;
- (Ljava/lang/String;I)Ljava/net/Socket;
+ (Ljava/lang/String;I)L1java/net/Socket;
diff --git a/libs/eea-java-11/src/main/resources/java/rmi/server/RMIServerSocketFactory.eea b/libs/eea-java-11/src/main/resources/java/rmi/server/RMIServerSocketFactory.eea
index b26406fbfd..6e702238c3 100644
--- a/libs/eea-java-11/src/main/resources/java/rmi/server/RMIServerSocketFactory.eea
+++ b/libs/eea-java-11/src/main/resources/java/rmi/server/RMIServerSocketFactory.eea
@@ -2,4 +2,4 @@ class java/rmi/server/RMIServerSocketFactory
 
 createServerSocket
  (I)Ljava/net/ServerSocket;
- (I)Ljava/net/ServerSocket;
+ (I)L1java/net/ServerSocket;
diff --git a/libs/eea-java-11/src/main/resources/java/rmi/server/RMISocketFactory.eea b/libs/eea-java-11/src/main/resources/java/rmi/server/RMISocketFactory.eea
index 1af6348b96..fcafc6408d 100644
--- a/libs/eea-java-11/src/main/resources/java/rmi/server/RMISocketFactory.eea
+++ b/libs/eea-java-11/src/main/resources/java/rmi/server/RMISocketFactory.eea
@@ -18,7 +18,7 @@ setSocketFactory
 
 createServerSocket
  (I)Ljava/net/ServerSocket;
- (I)Ljava/net/ServerSocket;
+ (I)L1java/net/ServerSocket; # @Inherited(java.rmi.server.RMIServerSocketFactory)
 createSocket
  (Ljava/lang/String;I)Ljava/net/Socket;
- (Ljava/lang/String;I)Ljava/net/Socket;
+ (Ljava/lang/String;I)L1java/net/Socket; # @Inherited(java.rmi.server.RMIClientSocketFactory)
diff --git a/libs/eea-java-11/src/main/resources/java/rmi/server/UID.eea b/libs/eea-java-11/src/main/resources/java/rmi/server/UID.eea
index c49fffc5f8..3d2dcaaacb 100644
--- a/libs/eea-java-11/src/main/resources/java/rmi/server/UID.eea
+++ b/libs/eea-java-11/src/main/resources/java/rmi/server/UID.eea
@@ -2,7 +2,7 @@ class java/rmi/server/UID
 
 read
  (Ljava/io/DataInput;)Ljava/rmi/server/UID;
- (Ljava/io/DataInput;)Ljava/rmi/server/UID;
+ (Ljava/io/DataInput;)L1java/rmi/server/UID;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/security/AccessController.eea b/libs/eea-java-11/src/main/resources/java/security/AccessController.eea
index 4f0133fa11..799f3f0129 100644
--- a/libs/eea-java-11/src/main/resources/java/security/AccessController.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/AccessController.eea
@@ -5,19 +5,19 @@ checkPermission
  (Ljava/security/Permission;)V
 doPrivileged
  <T:Ljava/lang/Object;>(Ljava/security/PrivilegedAction<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/security/PrivilegedAction<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/security/PrivilegedAction<TT;>;)T1T;
 doPrivileged
  <T:Ljava/lang/Object;>(Ljava/security/PrivilegedAction<TT;>;Ljava/security/AccessControlContext;)TT;
- <T:Ljava/lang/Object;>(Ljava/security/PrivilegedAction<TT;>;Ljava/security/AccessControlContext;)TT;
+ <T:Ljava/lang/Object;>(Ljava/security/PrivilegedAction<TT;>;Ljava/security/AccessControlContext;)T1T;
 doPrivileged
  <T:Ljava/lang/Object;>(Ljava/security/PrivilegedAction<TT;>;Ljava/security/AccessControlContext;[Ljava/security/Permission;)TT;
  <T:Ljava/lang/Object;>(Ljava/security/PrivilegedAction<TT;>;Ljava/security/AccessControlContext;[Ljava/security/Permission;)TT;
 doPrivileged
  <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;)T1T;
 doPrivileged
  <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;Ljava/security/AccessControlContext;)TT;
- <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;Ljava/security/AccessControlContext;)TT;
+ <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;Ljava/security/AccessControlContext;)T1T;
 doPrivileged
  <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;Ljava/security/AccessControlContext;[Ljava/security/Permission;)TT;
  <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;Ljava/security/AccessControlContext;[Ljava/security/Permission;)TT;
diff --git a/libs/eea-java-11/src/main/resources/java/security/CodeSource.eea b/libs/eea-java-11/src/main/resources/java/security/CodeSource.eea
index 60718c2edf..0f0ee8d4a7 100644
--- a/libs/eea-java-11/src/main/resources/java/security/CodeSource.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/CodeSource.eea
@@ -11,10 +11,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getCertificates
  ()[Ljava/security/cert/Certificate;
- ()[Ljava/security/cert/Certificate;
+ ()[0Ljava/security/cert/Certificate;
 getCodeSigners
  ()[Ljava/security/CodeSigner;
- ()[Ljava/security/CodeSigner;
+ ()[0Ljava/security/CodeSigner;
 getLocation
  ()Ljava/net/URL;
  ()Ljava/net/URL;
diff --git a/libs/eea-java-11/src/main/resources/java/security/DomainLoadStoreParameter.eea b/libs/eea-java-11/src/main/resources/java/security/DomainLoadStoreParameter.eea
index 0d426ae789..12a3f2f652 100644
--- a/libs/eea-java-11/src/main/resources/java/security/DomainLoadStoreParameter.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/DomainLoadStoreParameter.eea
@@ -8,7 +8,7 @@ getConfiguration
  ()Ljava/net/URI;
 getProtectionParameter
  ()Ljava/security/KeyStore$ProtectionParameter;
- ()Ljava/security/KeyStore$ProtectionParameter;
+ ()L0java/security/KeyStore$ProtectionParameter;
 getProtectionParams
  ()Ljava/util/Map<Ljava/lang/String;Ljava/security/KeyStore$ProtectionParameter;>;
  ()Ljava/util/Map<Ljava/lang/String;Ljava/security/KeyStore$ProtectionParameter;>;
diff --git a/libs/eea-java-11/src/main/resources/java/security/DrbgParameters.eea b/libs/eea-java-11/src/main/resources/java/security/DrbgParameters.eea
index ae2734e3f0..db4494e05f 100644
--- a/libs/eea-java-11/src/main/resources/java/security/DrbgParameters.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/DrbgParameters.eea
@@ -2,10 +2,10 @@ class java/security/DrbgParameters
 
 instantiation
  (ILjava/security/DrbgParameters$Capability;[B)Ljava/security/DrbgParameters$Instantiation;
- (ILjava/security/DrbgParameters$Capability;[B)Ljava/security/DrbgParameters$Instantiation;
+ (ILjava/security/DrbgParameters$Capability;[B)L1java/security/DrbgParameters$Instantiation;
 nextBytes
  (IZ[B)Ljava/security/DrbgParameters$NextBytes;
- (IZ[B)Ljava/security/DrbgParameters$NextBytes;
+ (IZ[B)L1java/security/DrbgParameters$NextBytes;
 reseed
  (Z[B)Ljava/security/DrbgParameters$Reseed;
- (Z[B)Ljava/security/DrbgParameters$Reseed;
+ (Z[B)L1java/security/DrbgParameters$Reseed;
diff --git a/libs/eea-java-11/src/main/resources/java/security/Identity.eea b/libs/eea-java-11/src/main/resources/java/security/Identity.eea
index 59713a3e1e..d03aa641fa 100644
--- a/libs/eea-java-11/src/main/resources/java/security/Identity.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/Identity.eea
@@ -11,7 +11,7 @@ addCertificate
  (Ljava/security/Certificate;)V
 certificates
  ()[Ljava/security/Certificate;
- ()[Ljava/security/Certificate;
+ ()[1Ljava/security/Certificate;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -44,4 +44,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toString
  (Z)Ljava/lang/String;
- (Z)Ljava/lang/String;
+ (Z)L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/java/security/KeyStore$Builder.eea b/libs/eea-java-11/src/main/resources/java/security/KeyStore$Builder.eea
index cf1a20e5e8..5bc87a68b6 100644
--- a/libs/eea-java-11/src/main/resources/java/security/KeyStore$Builder.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/KeyStore$Builder.eea
@@ -5,13 +5,13 @@ newInstance
  (Ljava/io/File;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Builder;
 newInstance
  (Ljava/lang/String;Ljava/security/Provider;Ljava/io/File;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Builder;
- (Ljava/lang/String;Ljava/security/Provider;Ljava/io/File;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Builder;
+ (Ljava/lang/String;Ljava/security/Provider;Ljava/io/File;Ljava/security/KeyStore$ProtectionParameter;)L1java/security/KeyStore$Builder;
 newInstance
  (Ljava/lang/String;Ljava/security/Provider;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Builder;
- (Ljava/lang/String;Ljava/security/Provider;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Builder;
+ (Ljava/lang/String;Ljava/security/Provider;Ljava/security/KeyStore$ProtectionParameter;)L1java/security/KeyStore$Builder;
 newInstance
  (Ljava/security/KeyStore;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Builder;
- (Ljava/security/KeyStore;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Builder;
+ (Ljava/security/KeyStore;Ljava/security/KeyStore$ProtectionParameter;)L1java/security/KeyStore$Builder;
 
 getKeyStore
  ()Ljava/security/KeyStore;
diff --git a/libs/eea-java-11/src/main/resources/java/security/KeyStoreSpi.eea b/libs/eea-java-11/src/main/resources/java/security/KeyStoreSpi.eea
index 577b1097ff..edab673d60 100644
--- a/libs/eea-java-11/src/main/resources/java/security/KeyStoreSpi.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/KeyStoreSpi.eea
@@ -26,7 +26,7 @@ engineGetCreationDate
  (Ljava/lang/String;)Ljava/util/Date;
 engineGetEntry
  (Ljava/lang/String;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Entry;
- (Ljava/lang/String;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Entry;
+ (Ljava/lang/String;Ljava/security/KeyStore$ProtectionParameter;)L0java/security/KeyStore$Entry;
 engineGetKey
  (Ljava/lang/String;[C)Ljava/security/Key;
  (Ljava/lang/String;[C)Ljava/security/Key;
diff --git a/libs/eea-java-11/src/main/resources/java/security/Permissions.eea b/libs/eea-java-11/src/main/resources/java/security/Permissions.eea
index cbe0395782..375680e40c 100644
--- a/libs/eea-java-11/src/main/resources/java/security/Permissions.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/Permissions.eea
@@ -5,7 +5,7 @@ add
  (Ljava/security/Permission;)V
 elements
  ()Ljava/util/Enumeration<Ljava/security/Permission;>;
- ()Ljava/util/Enumeration<Ljava/security/Permission;>;
+ ()L1java/util/Enumeration<Ljava/security/Permission;>;
 implies
  (Ljava/security/Permission;)Z
  (Ljava/security/Permission;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/security/Policy.eea b/libs/eea-java-11/src/main/resources/java/security/Policy.eea
index c4aae6ca79..8eaf60592f 100644
--- a/libs/eea-java-11/src/main/resources/java/security/Policy.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/Policy.eea
@@ -22,19 +22,19 @@ setPolicy
 
 getParameters
  ()Ljava/security/Policy$Parameters;
- ()Ljava/security/Policy$Parameters;
+ ()L0java/security/Policy$Parameters;
 getPermissions
  (Ljava/security/CodeSource;)Ljava/security/PermissionCollection;
  (Ljava/security/CodeSource;)Ljava/security/PermissionCollection;
 getPermissions
  (Ljava/security/ProtectionDomain;)Ljava/security/PermissionCollection;
- (Ljava/security/ProtectionDomain;)Ljava/security/PermissionCollection;
+ (Ljava/security/ProtectionDomain;)L1java/security/PermissionCollection;
 getProvider
  ()Ljava/security/Provider;
- ()Ljava/security/Provider;
+ ()L0java/security/Provider;
 getType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 implies
  (Ljava/security/ProtectionDomain;Ljava/security/Permission;)Z
  (Ljava/security/ProtectionDomain;Ljava/security/Permission;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/security/Provider.eea b/libs/eea-java-11/src/main/resources/java/security/Provider.eea
index c71de0867e..b0aad14c24 100644
--- a/libs/eea-java-11/src/main/resources/java/security/Provider.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/Provider.eea
@@ -17,7 +17,7 @@ computeIfPresent
  (Ljava/lang/Object;Ljava/util/function/BiFunction<-Ljava/lang/Object;-Ljava/lang/Object;+Ljava/lang/Object;>;)Ljava/lang/Object;
 configure
  (Ljava/lang/String;)Ljava/security/Provider;
- (Ljava/lang/String;)Ljava/security/Provider;
+ (Ljava/lang/String;)L1java/security/Provider;
 elements
  ()Ljava/util/Enumeration<Ljava/lang/Object;>;
  ()L1java/util/Enumeration<L1java/lang/Object;>; # @Inherited(java.util.Properties)
diff --git a/libs/eea-java-11/src/main/resources/java/security/SecureClassLoader.eea b/libs/eea-java-11/src/main/resources/java/security/SecureClassLoader.eea
index b0c532de6b..86ee4db83e 100644
--- a/libs/eea-java-11/src/main/resources/java/security/SecureClassLoader.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/SecureClassLoader.eea
@@ -14,4 +14,4 @@ defineClass
  (Ljava/lang/String;[BIILjava/security/CodeSource;)Ljava/lang/Class<*>;
 getPermissions
  (Ljava/security/CodeSource;)Ljava/security/PermissionCollection;
- (Ljava/security/CodeSource;)Ljava/security/PermissionCollection;
+ (Ljava/security/CodeSource;)L1java/security/PermissionCollection;
diff --git a/libs/eea-java-11/src/main/resources/java/security/SecureRandomSpi.eea b/libs/eea-java-11/src/main/resources/java/security/SecureRandomSpi.eea
index 684ac17c94..3ab73a8f4e 100644
--- a/libs/eea-java-11/src/main/resources/java/security/SecureRandomSpi.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/SecureRandomSpi.eea
@@ -8,7 +8,7 @@ engineGenerateSeed
  (I)[B
 engineGetParameters
  ()Ljava/security/SecureRandomParameters;
- ()Ljava/security/SecureRandomParameters;
+ ()L0java/security/SecureRandomParameters;
 engineNextBytes
  ([B)V
  ([B)V
diff --git a/libs/eea-java-11/src/main/resources/java/security/Security.eea b/libs/eea-java-11/src/main/resources/java/security/Security.eea
index 14b588ce68..e7cd2375e6 100644
--- a/libs/eea-java-11/src/main/resources/java/security/Security.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/Security.eea
@@ -5,7 +5,7 @@ addProvider
  (Ljava/security/Provider;)I
 getAlgorithmProperty
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L0java/lang/String;
 getAlgorithms
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
@@ -23,7 +23,7 @@ getProviders
  (Ljava/lang/String;)[Ljava/security/Provider;
 getProviders
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)[Ljava/security/Provider;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)[Ljava/security/Provider;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)[0Ljava/security/Provider;
 insertProviderAt
  (Ljava/security/Provider;I)I
  (Ljava/security/Provider;I)I
diff --git a/libs/eea-java-11/src/main/resources/java/security/SignatureSpi.eea b/libs/eea-java-11/src/main/resources/java/security/SignatureSpi.eea
index 10230a10ea..ed484886c2 100644
--- a/libs/eea-java-11/src/main/resources/java/security/SignatureSpi.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/SignatureSpi.eea
@@ -12,7 +12,7 @@ engineGetParameter
  (Ljava/lang/String;)Ljava/lang/Object;
 engineGetParameters
  ()Ljava/security/AlgorithmParameters;
- ()Ljava/security/AlgorithmParameters;
+ ()L1java/security/AlgorithmParameters;
 engineInitSign
  (Ljava/security/PrivateKey;)V
  (Ljava/security/PrivateKey;)V
diff --git a/libs/eea-java-11/src/main/resources/java/security/Timestamp.eea b/libs/eea-java-11/src/main/resources/java/security/Timestamp.eea
index 318973770e..1cb24dff41 100644
--- a/libs/eea-java-11/src/main/resources/java/security/Timestamp.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/Timestamp.eea
@@ -11,7 +11,7 @@ getSignerCertPath
  ()Ljava/security/cert/CertPath;
 getTimestamp
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L1java/util/Date;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/java/security/cert/CertPathBuilderSpi.eea b/libs/eea-java-11/src/main/resources/java/security/cert/CertPathBuilderSpi.eea
index d91c1c588f..79c06ad1b9 100644
--- a/libs/eea-java-11/src/main/resources/java/security/cert/CertPathBuilderSpi.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/cert/CertPathBuilderSpi.eea
@@ -5,4 +5,4 @@ engineBuild
  (Ljava/security/cert/CertPathParameters;)Ljava/security/cert/CertPathBuilderResult;
 engineGetRevocationChecker
  ()Ljava/security/cert/CertPathChecker;
- ()Ljava/security/cert/CertPathChecker;
+ ()L1java/security/cert/CertPathChecker;
diff --git a/libs/eea-java-11/src/main/resources/java/security/cert/CertPathValidatorSpi.eea b/libs/eea-java-11/src/main/resources/java/security/cert/CertPathValidatorSpi.eea
index f70189105e..bbb08d937f 100644
--- a/libs/eea-java-11/src/main/resources/java/security/cert/CertPathValidatorSpi.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/cert/CertPathValidatorSpi.eea
@@ -2,7 +2,7 @@ class java/security/cert/CertPathValidatorSpi
 
 engineGetRevocationChecker
  ()Ljava/security/cert/CertPathChecker;
- ()Ljava/security/cert/CertPathChecker;
+ ()L1java/security/cert/CertPathChecker;
 engineValidate
  (Ljava/security/cert/CertPath;Ljava/security/cert/CertPathParameters;)Ljava/security/cert/CertPathValidatorResult;
  (Ljava/security/cert/CertPath;Ljava/security/cert/CertPathParameters;)Ljava/security/cert/CertPathValidatorResult;
diff --git a/libs/eea-java-11/src/main/resources/java/security/cert/CertStore.eea b/libs/eea-java-11/src/main/resources/java/security/cert/CertStore.eea
index a0bc052276..b12f322e3a 100644
--- a/libs/eea-java-11/src/main/resources/java/security/cert/CertStore.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/cert/CertStore.eea
@@ -2,7 +2,7 @@ class java/security/cert/CertStore
 
 getDefaultType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getInstance
  (Ljava/lang/String;Ljava/security/cert/CertStoreParameters;)Ljava/security/cert/CertStore;
  (Ljava/lang/String;Ljava/security/cert/CertStoreParameters;)Ljava/security/cert/CertStore;
diff --git a/libs/eea-java-11/src/main/resources/java/security/cert/CertificateFactorySpi.eea b/libs/eea-java-11/src/main/resources/java/security/cert/CertificateFactorySpi.eea
index 1656ddbc73..c765e55344 100644
--- a/libs/eea-java-11/src/main/resources/java/security/cert/CertificateFactorySpi.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/cert/CertificateFactorySpi.eea
@@ -8,13 +8,13 @@ engineGenerateCRLs
  (Ljava/io/InputStream;)Ljava/util/Collection<+Ljava/security/cert/CRL;>;
 engineGenerateCertPath
  (Ljava/io/InputStream;)Ljava/security/cert/CertPath;
- (Ljava/io/InputStream;)Ljava/security/cert/CertPath;
+ (Ljava/io/InputStream;)L1java/security/cert/CertPath;
 engineGenerateCertPath
  (Ljava/io/InputStream;Ljava/lang/String;)Ljava/security/cert/CertPath;
- (Ljava/io/InputStream;Ljava/lang/String;)Ljava/security/cert/CertPath;
+ (Ljava/io/InputStream;Ljava/lang/String;)L1java/security/cert/CertPath;
 engineGenerateCertPath
  (Ljava/util/List<+Ljava/security/cert/Certificate;>;)Ljava/security/cert/CertPath;
- (Ljava/util/List<+Ljava/security/cert/Certificate;>;)Ljava/security/cert/CertPath;
+ (Ljava/util/List<+Ljava/security/cert/Certificate;>;)L1java/security/cert/CertPath;
 engineGenerateCertificate
  (Ljava/io/InputStream;)Ljava/security/cert/Certificate;
  (Ljava/io/InputStream;)Ljava/security/cert/Certificate;
@@ -23,4 +23,4 @@ engineGenerateCertificates
  (Ljava/io/InputStream;)Ljava/util/Collection<+Ljava/security/cert/Certificate;>;
 engineGetCertPathEncodings
  ()Ljava/util/Iterator<Ljava/lang/String;>;
- ()Ljava/util/Iterator<Ljava/lang/String;>;
+ ()L1java/util/Iterator<Ljava/lang/String;>;
diff --git a/libs/eea-java-11/src/main/resources/java/security/cert/CertificateRevokedException.eea b/libs/eea-java-11/src/main/resources/java/security/cert/CertificateRevokedException.eea
index 8a8156da90..9bec2fe121 100644
--- a/libs/eea-java-11/src/main/resources/java/security/cert/CertificateRevokedException.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/cert/CertificateRevokedException.eea
@@ -11,7 +11,7 @@ getExtensions
  ()Ljava/util/Map<Ljava/lang/String;Ljava/security/cert/Extension;>;
 getInvalidityDate
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L0java/util/Date;
 getMessage
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(java.lang.Throwable)
diff --git a/libs/eea-java-11/src/main/resources/java/security/cert/PKIXParameters.eea b/libs/eea-java-11/src/main/resources/java/security/cert/PKIXParameters.eea
index f86fbdd92b..0e6c12d30a 100644
--- a/libs/eea-java-11/src/main/resources/java/security/cert/PKIXParameters.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/cert/PKIXParameters.eea
@@ -23,7 +23,7 @@ getCertStores
  ()Ljava/util/List<Ljava/security/cert/CertStore;>;
 getDate
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L0java/util/Date;
 getInitialPolicies
  ()Ljava/util/Set<Ljava/lang/String;>;
  ()Ljava/util/Set<Ljava/lang/String;>;
@@ -32,7 +32,7 @@ getSigProvider
  ()Ljava/lang/String;
 getTargetCertConstraints
  ()Ljava/security/cert/CertSelector;
- ()Ljava/security/cert/CertSelector;
+ ()L0java/security/cert/CertSelector;
 getTrustAnchors
  ()Ljava/util/Set<Ljava/security/cert/TrustAnchor;>;
  ()Ljava/util/Set<Ljava/security/cert/TrustAnchor;>;
diff --git a/libs/eea-java-11/src/main/resources/java/security/cert/PKIXRevocationChecker.eea b/libs/eea-java-11/src/main/resources/java/security/cert/PKIXRevocationChecker.eea
index f5aa351552..21684f2051 100644
--- a/libs/eea-java-11/src/main/resources/java/security/cert/PKIXRevocationChecker.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/cert/PKIXRevocationChecker.eea
@@ -14,7 +14,7 @@ getOcspResponderCert
  ()Ljava/security/cert/X509Certificate;
 getOcspResponses
  ()Ljava/util/Map<Ljava/security/cert/X509Certificate;[B>;
- ()Ljava/util/Map<Ljava/security/cert/X509Certificate;[B>;
+ ()L1java/util/Map<Ljava/security/cert/X509Certificate;[B>;
 getOptions
  ()Ljava/util/Set<Ljava/security/cert/PKIXRevocationChecker$Option;>;
  ()Ljava/util/Set<Ljava/security/cert/PKIXRevocationChecker$Option;>;
diff --git a/libs/eea-java-11/src/main/resources/java/security/cert/URICertStoreParameters.eea b/libs/eea-java-11/src/main/resources/java/security/cert/URICertStoreParameters.eea
index 18999e8041..2c72cdc5c4 100644
--- a/libs/eea-java-11/src/main/resources/java/security/cert/URICertStoreParameters.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/cert/URICertStoreParameters.eea
@@ -5,7 +5,7 @@ class java/security/cert/URICertStoreParameters
  (Ljava/net/URI;)V
 clone
  ()Ljava/security/cert/URICertStoreParameters;
- ()Ljava/security/cert/URICertStoreParameters;
+ ()L1java/security/cert/URICertStoreParameters;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/java/security/cert/X509CRL.eea b/libs/eea-java-11/src/main/resources/java/security/cert/X509CRL.eea
index 1fd24153a7..269b4b10ef 100644
--- a/libs/eea-java-11/src/main/resources/java/security/cert/X509CRL.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/cert/X509CRL.eea
@@ -20,7 +20,7 @@ getRevokedCertificate
  (Ljava/math/BigInteger;)Ljava/security/cert/X509CRLEntry;
 getRevokedCertificate
  (Ljava/security/cert/X509Certificate;)Ljava/security/cert/X509CRLEntry;
- (Ljava/security/cert/X509Certificate;)Ljava/security/cert/X509CRLEntry;
+ (Ljava/security/cert/X509Certificate;)L0java/security/cert/X509CRLEntry;
 getRevokedCertificates
  ()Ljava/util/Set<+Ljava/security/cert/X509CRLEntry;>;
  ()Ljava/util/Set<+Ljava/security/cert/X509CRLEntry;>;
diff --git a/libs/eea-java-11/src/main/resources/java/security/cert/X509CRLEntry.eea b/libs/eea-java-11/src/main/resources/java/security/cert/X509CRLEntry.eea
index 4dcdd40744..cc7a3a2edc 100644
--- a/libs/eea-java-11/src/main/resources/java/security/cert/X509CRLEntry.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/cert/X509CRLEntry.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getCertificateIssuer
  ()Ljavax/security/auth/x500/X500Principal;
- ()Ljavax/security/auth/x500/X500Principal;
+ ()L0javax/security/auth/x500/X500Principal;
 getEncoded
  ()[B
  ()[B
@@ -14,7 +14,7 @@ getRevocationDate
  ()Ljava/util/Date;
 getRevocationReason
  ()Ljava/security/cert/CRLReason;
- ()Ljava/security/cert/CRLReason;
+ ()L0java/security/cert/CRLReason;
 getSerialNumber
  ()Ljava/math/BigInteger;
  ()Ljava/math/BigInteger;
diff --git a/libs/eea-java-11/src/main/resources/java/security/cert/X509CRLSelector.eea b/libs/eea-java-11/src/main/resources/java/security/cert/X509CRLSelector.eea
index b90efd4a6f..1a21985dc4 100644
--- a/libs/eea-java-11/src/main/resources/java/security/cert/X509CRLSelector.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/cert/X509CRLSelector.eea
@@ -17,13 +17,13 @@ getCertificateChecking
  ()Ljava/security/cert/X509Certificate;
 getDateAndTime
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L0java/util/Date;
 getIssuerNames
  ()Ljava/util/Collection<Ljava/lang/Object;>;
- ()Ljava/util/Collection<Ljava/lang/Object;>;
+ ()L0java/util/Collection<Ljava/lang/Object;>;
 getIssuers
  ()Ljava/util/Collection<Ljavax/security/auth/x500/X500Principal;>;
- ()Ljava/util/Collection<Ljavax/security/auth/x500/X500Principal;>;
+ ()L0java/util/Collection<Ljavax/security/auth/x500/X500Principal;>;
 getMaxCRL
  ()Ljava/math/BigInteger;
  ()Ljava/math/BigInteger;
diff --git a/libs/eea-java-11/src/main/resources/java/security/cert/X509CertSelector.eea b/libs/eea-java-11/src/main/resources/java/security/cert/X509CertSelector.eea
index 84ad24e969..5226bc7dd2 100644
--- a/libs/eea-java-11/src/main/resources/java/security/cert/X509CertSelector.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/cert/X509CertSelector.eea
@@ -17,13 +17,13 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 getAuthorityKeyIdentifier
  ()[B
- ()[B
+ ()[0B
 getCertificate
  ()Ljava/security/cert/X509Certificate;
  ()Ljava/security/cert/X509Certificate;
 getCertificateValid
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L0java/util/Date;
 getExtendedKeyUsage
  ()Ljava/util/Set<Ljava/lang/String;>;
  ()Ljava/util/Set<Ljava/lang/String;>;
@@ -38,19 +38,19 @@ getIssuerAsString
  ()Ljava/lang/String;
 getKeyUsage
  ()[Z
- ()[Z
+ ()[0Z
 getNameConstraints
  ()[B
- ()[B
+ ()[0B
 getPathToNames
  ()Ljava/util/Collection<Ljava/util/List<*>;>;
- ()Ljava/util/Collection<Ljava/util/List<*>;>;
+ ()L0java/util/Collection<Ljava/util/List<*>;>;
 getPolicy
  ()Ljava/util/Set<Ljava/lang/String;>;
  ()Ljava/util/Set<Ljava/lang/String;>;
 getPrivateKeyValid
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L0java/util/Date;
 getSerialNumber
  ()Ljava/math/BigInteger;
  ()Ljava/math/BigInteger;
@@ -59,7 +59,7 @@ getSubject
  ()Ljavax/security/auth/x500/X500Principal;
 getSubjectAlternativeNames
  ()Ljava/util/Collection<Ljava/util/List<*>;>;
- ()Ljava/util/Collection<Ljava/util/List<*>;>;
+ ()L0java/util/Collection<Ljava/util/List<*>;>;
 getSubjectAsBytes
  ()[B
  ()[B
@@ -68,13 +68,13 @@ getSubjectAsString
  ()Ljava/lang/String;
 getSubjectKeyIdentifier
  ()[B
- ()[B
+ ()[0B
 getSubjectPublicKey
  ()Ljava/security/PublicKey;
  ()Ljava/security/PublicKey;
 getSubjectPublicKeyAlgID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 match
  (Ljava/security/cert/Certificate;)Z
  (Ljava/security/cert/Certificate;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/security/interfaces/RSAKey.eea b/libs/eea-java-11/src/main/resources/java/security/interfaces/RSAKey.eea
index 1c5af2c06f..315113ee92 100644
--- a/libs/eea-java-11/src/main/resources/java/security/interfaces/RSAKey.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/interfaces/RSAKey.eea
@@ -5,4 +5,4 @@ getModulus
  ()Ljava/math/BigInteger;
 getParams
  ()Ljava/security/spec/AlgorithmParameterSpec;
- ()Ljava/security/spec/AlgorithmParameterSpec;
+ ()L0java/security/spec/AlgorithmParameterSpec;
diff --git a/libs/eea-java-11/src/main/resources/java/security/spec/ECFieldF2m.eea b/libs/eea-java-11/src/main/resources/java/security/spec/ECFieldF2m.eea
index 57805fcc69..15b9a8a6de 100644
--- a/libs/eea-java-11/src/main/resources/java/security/spec/ECFieldF2m.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/spec/ECFieldF2m.eea
@@ -11,7 +11,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getMidTermsOfReductionPolynomial
  ()[I
- ()[I
+ ()[0I
 getReductionPolynomial
  ()Ljava/math/BigInteger;
  ()Ljava/math/BigInteger;
diff --git a/libs/eea-java-11/src/main/resources/java/security/spec/EllipticCurve.eea b/libs/eea-java-11/src/main/resources/java/security/spec/EllipticCurve.eea
index dce676208d..eb4facee83 100644
--- a/libs/eea-java-11/src/main/resources/java/security/spec/EllipticCurve.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/spec/EllipticCurve.eea
@@ -20,4 +20,4 @@ getField
  ()Ljava/security/spec/ECField;
 getSeed
  ()[B
- ()[B
+ ()[0B
diff --git a/libs/eea-java-11/src/main/resources/java/security/spec/PKCS8EncodedKeySpec.eea b/libs/eea-java-11/src/main/resources/java/security/spec/PKCS8EncodedKeySpec.eea
index 66dda9eba6..78980c657b 100644
--- a/libs/eea-java-11/src/main/resources/java/security/spec/PKCS8EncodedKeySpec.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/spec/PKCS8EncodedKeySpec.eea
@@ -11,4 +11,4 @@ getEncoded
  ()[B
 getFormat
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.eea b/libs/eea-java-11/src/main/resources/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.eea
index e58064e6d3..94da7d4b87 100644
--- a/libs/eea-java-11/src/main/resources/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.eea
@@ -11,7 +11,7 @@ getCrtCoefficient
  ()Ljava/math/BigInteger;
 getOtherPrimeInfo
  ()[Ljava/security/spec/RSAOtherPrimeInfo;
- ()[Ljava/security/spec/RSAOtherPrimeInfo;
+ ()[0Ljava/security/spec/RSAOtherPrimeInfo;
 getPrimeExponentP
  ()Ljava/math/BigInteger;
  ()Ljava/math/BigInteger;
diff --git a/libs/eea-java-11/src/main/resources/java/security/spec/X509EncodedKeySpec.eea b/libs/eea-java-11/src/main/resources/java/security/spec/X509EncodedKeySpec.eea
index 3b812927c4..927518d19d 100644
--- a/libs/eea-java-11/src/main/resources/java/security/spec/X509EncodedKeySpec.eea
+++ b/libs/eea-java-11/src/main/resources/java/security/spec/X509EncodedKeySpec.eea
@@ -11,4 +11,4 @@ getEncoded
  ()[B
 getFormat
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/java/sql/Connection.eea b/libs/eea-java-11/src/main/resources/java/sql/Connection.eea
index 1c96decc0f..35e3dcc29a 100644
--- a/libs/eea-java-11/src/main/resources/java/sql/Connection.eea
+++ b/libs/eea-java-11/src/main/resources/java/sql/Connection.eea
@@ -5,31 +5,31 @@ abort
  (Ljava/util/concurrent/Executor;)V
 createArrayOf
  (Ljava/lang/String;[Ljava/lang/Object;)Ljava/sql/Array;
- (Ljava/lang/String;[Ljava/lang/Object;)Ljava/sql/Array;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1java/sql/Array;
 createBlob
  ()Ljava/sql/Blob;
- ()Ljava/sql/Blob;
+ ()L1java/sql/Blob;
 createClob
  ()Ljava/sql/Clob;
- ()Ljava/sql/Clob;
+ ()L1java/sql/Clob;
 createNClob
  ()Ljava/sql/NClob;
- ()Ljava/sql/NClob;
+ ()L1java/sql/NClob;
 createSQLXML
  ()Ljava/sql/SQLXML;
- ()Ljava/sql/SQLXML;
+ ()L1java/sql/SQLXML;
 createStatement
  ()Ljava/sql/Statement;
- ()Ljava/sql/Statement;
+ ()L1java/sql/Statement;
 createStatement
  (II)Ljava/sql/Statement;
- (II)Ljava/sql/Statement;
+ (II)L1java/sql/Statement;
 createStatement
  (III)Ljava/sql/Statement;
- (III)Ljava/sql/Statement;
+ (III)L1java/sql/Statement;
 createStruct
  (Ljava/lang/String;[Ljava/lang/Object;)Ljava/sql/Struct;
- (Ljava/lang/String;[Ljava/lang/Object;)Ljava/sql/Struct;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1java/sql/Struct;
 getCatalog
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/java/sql/JDBCType.eea b/libs/eea-java-11/src/main/resources/java/sql/JDBCType.eea
index 1c2fd70909..024a70f9fc 100644
--- a/libs/eea-java-11/src/main/resources/java/sql/JDBCType.eea
+++ b/libs/eea-java-11/src/main/resources/java/sql/JDBCType.eea
@@ -13,7 +13,7 @@ getName
  ()Ljava/lang/String;
 getVendor
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getVendorTypeNumber
  ()Ljava/lang/Integer;
  ()Ljava/lang/Integer;
diff --git a/libs/eea-java-11/src/main/resources/java/sql/SQLException.eea b/libs/eea-java-11/src/main/resources/java/sql/SQLException.eea
index 7f26b22799..b19860c2cd 100644
--- a/libs/eea-java-11/src/main/resources/java/sql/SQLException.eea
+++ b/libs/eea-java-11/src/main/resources/java/sql/SQLException.eea
@@ -33,7 +33,7 @@ getSQLState
  ()Ljava/lang/String;
 iterator
  ()Ljava/util/Iterator<Ljava/lang/Throwable;>;
- ()Ljava/util/Iterator<Ljava/lang/Throwable;>;
+ ()L1java/util/Iterator<Ljava/lang/Throwable;>;
 setNextException
  (Ljava/sql/SQLException;)V
  (Ljava/sql/SQLException;)V
diff --git a/libs/eea-java-11/src/main/resources/java/sql/SQLInput.eea b/libs/eea-java-11/src/main/resources/java/sql/SQLInput.eea
index 8419254679..e61c166ed3 100644
--- a/libs/eea-java-11/src/main/resources/java/sql/SQLInput.eea
+++ b/libs/eea-java-11/src/main/resources/java/sql/SQLInput.eea
@@ -38,7 +38,7 @@ readObject
  ()L1java/lang/Object;
 readObject
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)T1T;
 readRef
  ()Ljava/sql/Ref;
  ()Ljava/sql/Ref;
diff --git a/libs/eea-java-11/src/main/resources/java/sql/Statement.eea b/libs/eea-java-11/src/main/resources/java/sql/Statement.eea
index 5ff613b2ec..602d7d1e5e 100644
--- a/libs/eea-java-11/src/main/resources/java/sql/Statement.eea
+++ b/libs/eea-java-11/src/main/resources/java/sql/Statement.eea
@@ -8,10 +8,10 @@ enquoteIdentifier
  (Ljava/lang/String;Z)Ljava/lang/String;
 enquoteLiteral
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 enquoteNCharLiteral
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 execute
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
@@ -29,7 +29,7 @@ executeBatch
  ()[I
 executeLargeBatch
  ()[J
- ()[J
+ ()[1J
 executeLargeUpdate
  (Ljava/lang/String;)J
  (Ljava/lang/String;)J
diff --git a/libs/eea-java-11/src/main/resources/java/sql/Time.eea b/libs/eea-java-11/src/main/resources/java/sql/Time.eea
index c42bf92262..f998c424d4 100644
--- a/libs/eea-java-11/src/main/resources/java/sql/Time.eea
+++ b/libs/eea-java-11/src/main/resources/java/sql/Time.eea
@@ -2,10 +2,10 @@ class java/sql/Time
 
 valueOf
  (Ljava/lang/String;)Ljava/sql/Time;
- (Ljava/lang/String;)Ljava/sql/Time;
+ (Ljava/lang/String;)L1java/sql/Time;
 valueOf
  (Ljava/time/LocalTime;)Ljava/sql/Time;
- (Ljava/time/LocalTime;)Ljava/sql/Time;
+ (Ljava/time/LocalTime;)L1java/sql/Time;
 
 toInstant
  ()Ljava/time/Instant;
diff --git a/libs/eea-java-11/src/main/resources/java/text/AttributedString.eea b/libs/eea-java-11/src/main/resources/java/text/AttributedString.eea
index 2ddcdddf34..8821d714df 100644
--- a/libs/eea-java-11/src/main/resources/java/text/AttributedString.eea
+++ b/libs/eea-java-11/src/main/resources/java/text/AttributedString.eea
@@ -32,4 +32,4 @@ getIterator
  ([Ljava/text/AttributedCharacterIterator$Attribute;)Ljava/text/AttributedCharacterIterator;
 getIterator
  ([Ljava/text/AttributedCharacterIterator$Attribute;II)Ljava/text/AttributedCharacterIterator;
- ([Ljava/text/AttributedCharacterIterator$Attribute;II)Ljava/text/AttributedCharacterIterator;
+ ([Ljava/text/AttributedCharacterIterator$Attribute;II)L1java/text/AttributedCharacterIterator;
diff --git a/libs/eea-java-11/src/main/resources/java/text/Bidi.eea b/libs/eea-java-11/src/main/resources/java/text/Bidi.eea
index 957a28160f..d2259793c7 100644
--- a/libs/eea-java-11/src/main/resources/java/text/Bidi.eea
+++ b/libs/eea-java-11/src/main/resources/java/text/Bidi.eea
@@ -18,7 +18,7 @@ requiresBidi
  ([CI[BIII)V
 createLineBidi
  (II)Ljava/text/Bidi;
- (II)Ljava/text/Bidi;
+ (II)L1java/text/Bidi;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/java/text/ChoiceFormat.eea b/libs/eea-java-11/src/main/resources/java/text/ChoiceFormat.eea
index 33f252c86c..5a126e0153 100644
--- a/libs/eea-java-11/src/main/resources/java/text/ChoiceFormat.eea
+++ b/libs/eea-java-11/src/main/resources/java/text/ChoiceFormat.eea
@@ -35,4 +35,4 @@ setChoices
  ([D[Ljava/lang/String;)V
 toPattern
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/java/text/DecimalFormat.eea b/libs/eea-java-11/src/main/resources/java/text/DecimalFormat.eea
index 8b3d27b630..37b03b405c 100644
--- a/libs/eea-java-11/src/main/resources/java/text/DecimalFormat.eea
+++ b/libs/eea-java-11/src/main/resources/java/text/DecimalFormat.eea
@@ -35,7 +35,7 @@ getCurrency
  ()L0java/util/Currency; # @Inherited(java.text.NumberFormat)
 getDecimalFormatSymbols
  ()Ljava/text/DecimalFormatSymbols;
- ()Ljava/text/DecimalFormatSymbols;
+ ()L0java/text/DecimalFormatSymbols;
 getNegativePrefix
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/java/text/MessageFormat.eea b/libs/eea-java-11/src/main/resources/java/text/MessageFormat.eea
index 2b0f32bee3..5f63a9cf62 100644
--- a/libs/eea-java-11/src/main/resources/java/text/MessageFormat.eea
+++ b/libs/eea-java-11/src/main/resources/java/text/MessageFormat.eea
@@ -42,7 +42,7 @@ parse
  (Ljava/lang/String;)[Ljava/lang/Object;
 parse
  (Ljava/lang/String;Ljava/text/ParsePosition;)[Ljava/lang/Object;
- (Ljava/lang/String;Ljava/text/ParsePosition;)[Ljava/lang/Object;
+ (Ljava/lang/String;Ljava/text/ParsePosition;)[0Ljava/lang/Object;
 parseObject
  (Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/lang/Object;
  (L1java/lang/String;L1java/text/ParsePosition;)L0java/lang/Object; # @Inherited(java.text.Format)
diff --git a/libs/eea-java-11/src/main/resources/java/text/RuleBasedCollator.eea b/libs/eea-java-11/src/main/resources/java/text/RuleBasedCollator.eea
index bf9ecaccf2..a5357752a0 100644
--- a/libs/eea-java-11/src/main/resources/java/text/RuleBasedCollator.eea
+++ b/libs/eea-java-11/src/main/resources/java/text/RuleBasedCollator.eea
@@ -14,10 +14,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.text.Collator)
 getCollationElementIterator
  (Ljava/lang/String;)Ljava/text/CollationElementIterator;
- (Ljava/lang/String;)Ljava/text/CollationElementIterator;
+ (Ljava/lang/String;)L1java/text/CollationElementIterator;
 getCollationElementIterator
  (Ljava/text/CharacterIterator;)Ljava/text/CollationElementIterator;
- (Ljava/text/CharacterIterator;)Ljava/text/CollationElementIterator;
+ (Ljava/text/CharacterIterator;)L1java/text/CollationElementIterator;
 getCollationKey
  (Ljava/lang/String;)Ljava/text/CollationKey;
  (L0java/lang/String;)L0java/text/CollationKey; # @Inherited(java.text.Collator)
diff --git a/libs/eea-java-11/src/main/resources/java/text/SimpleDateFormat.eea b/libs/eea-java-11/src/main/resources/java/text/SimpleDateFormat.eea
index 3207e33a56..ba6af320bf 100644
--- a/libs/eea-java-11/src/main/resources/java/text/SimpleDateFormat.eea
+++ b/libs/eea-java-11/src/main/resources/java/text/SimpleDateFormat.eea
@@ -35,7 +35,7 @@ getDateFormatSymbols
  ()Ljava/text/DateFormatSymbols;
 parse
  (Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/util/Date;
- (Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/util/Date;
+ (Ljava/lang/String;Ljava/text/ParsePosition;)L0java/util/Date;
 set2DigitYearStart
  (Ljava/util/Date;)V
  (Ljava/util/Date;)V
diff --git a/libs/eea-java-11/src/main/resources/java/time/Clock.eea b/libs/eea-java-11/src/main/resources/java/time/Clock.eea
index a5b72115ce..e468096e45 100644
--- a/libs/eea-java-11/src/main/resources/java/time/Clock.eea
+++ b/libs/eea-java-11/src/main/resources/java/time/Clock.eea
@@ -2,7 +2,7 @@ class java/time/Clock
 
 fixed
  (Ljava/time/Instant;Ljava/time/ZoneId;)Ljava/time/Clock;
- (Ljava/time/Instant;Ljava/time/ZoneId;)Ljava/time/Clock;
+ (Ljava/time/Instant;Ljava/time/ZoneId;)L1java/time/Clock;
 offset
  (Ljava/time/Clock;Ljava/time/Duration;)Ljava/time/Clock;
  (Ljava/time/Clock;Ljava/time/Duration;)Ljava/time/Clock;
@@ -11,7 +11,7 @@ system
  (Ljava/time/ZoneId;)Ljava/time/Clock;
 systemDefaultZone
  ()Ljava/time/Clock;
- ()Ljava/time/Clock;
+ ()L1java/time/Clock;
 systemUTC
  ()Ljava/time/Clock;
  ()Ljava/time/Clock;
@@ -20,13 +20,13 @@ tick
  (Ljava/time/Clock;Ljava/time/Duration;)Ljava/time/Clock;
 tickMillis
  (Ljava/time/ZoneId;)Ljava/time/Clock;
- (Ljava/time/ZoneId;)Ljava/time/Clock;
+ (Ljava/time/ZoneId;)L1java/time/Clock;
 tickMinutes
  (Ljava/time/ZoneId;)Ljava/time/Clock;
- (Ljava/time/ZoneId;)Ljava/time/Clock;
+ (Ljava/time/ZoneId;)L1java/time/Clock;
 tickSeconds
  (Ljava/time/ZoneId;)Ljava/time/Clock;
- (Ljava/time/ZoneId;)Ljava/time/Clock;
+ (Ljava/time/ZoneId;)L1java/time/Clock;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/time/MonthDay.eea b/libs/eea-java-11/src/main/resources/java/time/MonthDay.eea
index f193409527..7e641c24c7 100644
--- a/libs/eea-java-11/src/main/resources/java/time/MonthDay.eea
+++ b/libs/eea-java-11/src/main/resources/java/time/MonthDay.eea
@@ -21,7 +21,7 @@ of
  (II)Ljava/time/MonthDay;
 of
  (Ljava/time/Month;I)Ljava/time/MonthDay;
- (Ljava/time/Month;I)Ljava/time/MonthDay;
+ (Ljava/time/Month;I)L1java/time/MonthDay;
 parse
  (Ljava/lang/CharSequence;)Ljava/time/MonthDay;
  (Ljava/lang/CharSequence;)Ljava/time/MonthDay;
diff --git a/libs/eea-java-11/src/main/resources/java/time/OffsetTime.eea b/libs/eea-java-11/src/main/resources/java/time/OffsetTime.eea
index 5e5eca45ee..ddb59c3553 100644
--- a/libs/eea-java-11/src/main/resources/java/time/OffsetTime.eea
+++ b/libs/eea-java-11/src/main/resources/java/time/OffsetTime.eea
@@ -25,13 +25,13 @@ now
  (Ljava/time/ZoneId;)Ljava/time/OffsetTime;
 of
  (IIIILjava/time/ZoneOffset;)Ljava/time/OffsetTime;
- (IIIILjava/time/ZoneOffset;)Ljava/time/OffsetTime;
+ (IIIILjava/time/ZoneOffset;)L1java/time/OffsetTime;
 of
  (Ljava/time/LocalTime;Ljava/time/ZoneOffset;)Ljava/time/OffsetTime;
- (Ljava/time/LocalTime;Ljava/time/ZoneOffset;)Ljava/time/OffsetTime;
+ (Ljava/time/LocalTime;Ljava/time/ZoneOffset;)L1java/time/OffsetTime;
 ofInstant
  (Ljava/time/Instant;Ljava/time/ZoneId;)Ljava/time/OffsetTime;
- (Ljava/time/Instant;Ljava/time/ZoneId;)Ljava/time/OffsetTime;
+ (Ljava/time/Instant;Ljava/time/ZoneId;)L1java/time/OffsetTime;
 parse
  (Ljava/lang/CharSequence;)Ljava/time/OffsetTime;
  (Ljava/lang/CharSequence;)Ljava/time/OffsetTime;
@@ -155,7 +155,7 @@ withOffsetSameInstant
  (Ljava/time/ZoneOffset;)Ljava/time/OffsetTime;
 withOffsetSameLocal
  (Ljava/time/ZoneOffset;)Ljava/time/OffsetTime;
- (Ljava/time/ZoneOffset;)Ljava/time/OffsetTime;
+ (Ljava/time/ZoneOffset;)L1java/time/OffsetTime;
 withSecond
  (I)Ljava/time/OffsetTime;
  (I)Ljava/time/OffsetTime;
diff --git a/libs/eea-java-11/src/main/resources/java/time/Year.eea b/libs/eea-java-11/src/main/resources/java/time/Year.eea
index 7eaa87a09f..2268b92d3d 100644
--- a/libs/eea-java-11/src/main/resources/java/time/Year.eea
+++ b/libs/eea-java-11/src/main/resources/java/time/Year.eea
@@ -18,7 +18,7 @@ now
  (Ljava/time/ZoneId;)Ljava/time/Year;
 of
  (I)Ljava/time/Year;
- (I)Ljava/time/Year;
+ (I)L1java/time/Year;
 parse
  (Ljava/lang/CharSequence;)Ljava/time/Year;
  (Ljava/lang/CharSequence;)Ljava/time/Year;
diff --git a/libs/eea-java-11/src/main/resources/java/time/YearMonth.eea b/libs/eea-java-11/src/main/resources/java/time/YearMonth.eea
index 8efc62435b..d817e6089f 100644
--- a/libs/eea-java-11/src/main/resources/java/time/YearMonth.eea
+++ b/libs/eea-java-11/src/main/resources/java/time/YearMonth.eea
@@ -18,7 +18,7 @@ now
  (Ljava/time/ZoneId;)Ljava/time/YearMonth;
 of
  (II)Ljava/time/YearMonth;
- (II)Ljava/time/YearMonth;
+ (II)L1java/time/YearMonth;
 of
  (ILjava/time/Month;)Ljava/time/YearMonth;
  (ILjava/time/Month;)Ljava/time/YearMonth;
diff --git a/libs/eea-java-11/src/main/resources/java/time/chrono/AbstractChronology.eea b/libs/eea-java-11/src/main/resources/java/time/chrono/AbstractChronology.eea
index 8c3b7a42d4..32687c5e72 100644
--- a/libs/eea-java-11/src/main/resources/java/time/chrono/AbstractChronology.eea
+++ b/libs/eea-java-11/src/main/resources/java/time/chrono/AbstractChronology.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 resolveDate
  (Ljava/util/Map<Ljava/time/temporal/TemporalField;Ljava/lang/Long;>;Ljava/time/format/ResolverStyle;)Ljava/time/chrono/ChronoLocalDate;
- (Ljava/util/Map<Ljava/time/temporal/TemporalField;Ljava/lang/Long;>;Ljava/time/format/ResolverStyle;)Ljava/time/chrono/ChronoLocalDate;
+ (Ljava/util/Map<Ljava/time/temporal/TemporalField;Ljava/lang/Long;>;Ljava/time/format/ResolverStyle;)L0java/time/chrono/ChronoLocalDate;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/java/time/chrono/Chronology.eea b/libs/eea-java-11/src/main/resources/java/time/chrono/Chronology.eea
index 2db0546904..73fae0ce02 100644
--- a/libs/eea-java-11/src/main/resources/java/time/chrono/Chronology.eea
+++ b/libs/eea-java-11/src/main/resources/java/time/chrono/Chronology.eea
@@ -76,7 +76,7 @@ localDateTime
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoLocalDateTime<+Ljava/time/chrono/ChronoLocalDate;>;
 period
  (III)Ljava/time/chrono/ChronoPeriod;
- (III)Ljava/time/chrono/ChronoPeriod;
+ (III)L1java/time/chrono/ChronoPeriod;
 prolepticYear
  (Ljava/time/chrono/Era;I)I
  (Ljava/time/chrono/Era;I)I
diff --git a/libs/eea-java-11/src/main/resources/java/time/chrono/IsoChronology.eea b/libs/eea-java-11/src/main/resources/java/time/chrono/IsoChronology.eea
index ad07a2dbd0..905f7260a5 100644
--- a/libs/eea-java-11/src/main/resources/java/time/chrono/IsoChronology.eea
+++ b/libs/eea-java-11/src/main/resources/java/time/chrono/IsoChronology.eea
@@ -42,10 +42,10 @@ eras
  ()Ljava/util/List<Ljava/time/chrono/Era;>;
 getCalendarType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 localDateTime
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/LocalDateTime;
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/LocalDateTime;
diff --git a/libs/eea-java-11/src/main/resources/java/time/chrono/JapaneseChronology.eea b/libs/eea-java-11/src/main/resources/java/time/chrono/JapaneseChronology.eea
index 3b3b53fbe0..ff304f1930 100644
--- a/libs/eea-java-11/src/main/resources/java/time/chrono/JapaneseChronology.eea
+++ b/libs/eea-java-11/src/main/resources/java/time/chrono/JapaneseChronology.eea
@@ -6,7 +6,7 @@ INSTANCE
 
 date
  (III)Ljava/time/chrono/JapaneseDate;
- (III)Ljava/time/chrono/JapaneseDate;
+ (III)L1java/time/chrono/JapaneseDate;
 date
  (Ljava/time/chrono/Era;III)Ljava/time/chrono/JapaneseDate;
  (Ljava/time/chrono/Era;III)Ljava/time/chrono/JapaneseDate;
@@ -15,7 +15,7 @@ date
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/JapaneseDate;
 dateEpochDay
  (J)Ljava/time/chrono/JapaneseDate;
- (J)Ljava/time/chrono/JapaneseDate;
+ (J)L1java/time/chrono/JapaneseDate;
 dateNow
  ()Ljava/time/chrono/JapaneseDate;
  ()Ljava/time/chrono/JapaneseDate;
@@ -27,7 +27,7 @@ dateNow
  (Ljava/time/ZoneId;)Ljava/time/chrono/JapaneseDate;
 dateYearDay
  (II)Ljava/time/chrono/JapaneseDate;
- (II)Ljava/time/chrono/JapaneseDate;
+ (II)L1java/time/chrono/JapaneseDate;
 dateYearDay
  (Ljava/time/chrono/Era;II)Ljava/time/chrono/JapaneseDate;
  (Ljava/time/chrono/Era;II)Ljava/time/chrono/JapaneseDate;
@@ -39,10 +39,10 @@ eras
  ()Ljava/util/List<Ljava/time/chrono/Era;>;
 getCalendarType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 localDateTime
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoLocalDateTime<Ljava/time/chrono/JapaneseDate;>;
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoLocalDateTime<Ljava/time/chrono/JapaneseDate;>;
diff --git a/libs/eea-java-11/src/main/resources/java/time/chrono/JapaneseDate.eea b/libs/eea-java-11/src/main/resources/java/time/chrono/JapaneseDate.eea
index 4c66b80baf..4a43f031b1 100644
--- a/libs/eea-java-11/src/main/resources/java/time/chrono/JapaneseDate.eea
+++ b/libs/eea-java-11/src/main/resources/java/time/chrono/JapaneseDate.eea
@@ -12,16 +12,16 @@ now
  ()Ljava/time/chrono/JapaneseDate;
 now
  (Ljava/time/Clock;)Ljava/time/chrono/JapaneseDate;
- (Ljava/time/Clock;)Ljava/time/chrono/JapaneseDate;
+ (Ljava/time/Clock;)L1java/time/chrono/JapaneseDate;
 now
  (Ljava/time/ZoneId;)Ljava/time/chrono/JapaneseDate;
  (Ljava/time/ZoneId;)Ljava/time/chrono/JapaneseDate;
 of
  (III)Ljava/time/chrono/JapaneseDate;
- (III)Ljava/time/chrono/JapaneseDate;
+ (III)L1java/time/chrono/JapaneseDate;
 of
  (Ljava/time/chrono/JapaneseEra;III)Ljava/time/chrono/JapaneseDate;
- (Ljava/time/chrono/JapaneseEra;III)Ljava/time/chrono/JapaneseDate;
+ (Ljava/time/chrono/JapaneseEra;III)L1java/time/chrono/JapaneseDate;
 
 atTime
  (Ljava/time/LocalTime;)Ljava/time/chrono/ChronoLocalDateTime<Ljava/time/chrono/JapaneseDate;>;
diff --git a/libs/eea-java-11/src/main/resources/java/time/chrono/MinguoChronology.eea b/libs/eea-java-11/src/main/resources/java/time/chrono/MinguoChronology.eea
index b4eee86463..8de444614f 100644
--- a/libs/eea-java-11/src/main/resources/java/time/chrono/MinguoChronology.eea
+++ b/libs/eea-java-11/src/main/resources/java/time/chrono/MinguoChronology.eea
@@ -15,7 +15,7 @@ date
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/MinguoDate;
 dateEpochDay
  (J)Ljava/time/chrono/MinguoDate;
- (J)Ljava/time/chrono/MinguoDate;
+ (J)L1java/time/chrono/MinguoDate;
 dateNow
  ()Ljava/time/chrono/MinguoDate;
  ()Ljava/time/chrono/MinguoDate;
@@ -39,10 +39,10 @@ eras
  ()Ljava/util/List<Ljava/time/chrono/Era;>;
 getCalendarType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 localDateTime
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoLocalDateTime<Ljava/time/chrono/MinguoDate;>;
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoLocalDateTime<Ljava/time/chrono/MinguoDate;>;
diff --git a/libs/eea-java-11/src/main/resources/java/time/chrono/MinguoDate.eea b/libs/eea-java-11/src/main/resources/java/time/chrono/MinguoDate.eea
index 6b57859b0c..975508bfd8 100644
--- a/libs/eea-java-11/src/main/resources/java/time/chrono/MinguoDate.eea
+++ b/libs/eea-java-11/src/main/resources/java/time/chrono/MinguoDate.eea
@@ -12,7 +12,7 @@ now
  ()Ljava/time/chrono/MinguoDate;
 now
  (Ljava/time/Clock;)Ljava/time/chrono/MinguoDate;
- (Ljava/time/Clock;)Ljava/time/chrono/MinguoDate;
+ (Ljava/time/Clock;)L1java/time/chrono/MinguoDate;
 now
  (Ljava/time/ZoneId;)Ljava/time/chrono/MinguoDate;
  (Ljava/time/ZoneId;)Ljava/time/chrono/MinguoDate;
diff --git a/libs/eea-java-11/src/main/resources/java/time/chrono/ThaiBuddhistChronology.eea b/libs/eea-java-11/src/main/resources/java/time/chrono/ThaiBuddhistChronology.eea
index ef1112bec4..d56569803c 100644
--- a/libs/eea-java-11/src/main/resources/java/time/chrono/ThaiBuddhistChronology.eea
+++ b/libs/eea-java-11/src/main/resources/java/time/chrono/ThaiBuddhistChronology.eea
@@ -15,7 +15,7 @@ date
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ThaiBuddhistDate;
 dateEpochDay
  (J)Ljava/time/chrono/ThaiBuddhistDate;
- (J)Ljava/time/chrono/ThaiBuddhistDate;
+ (J)L1java/time/chrono/ThaiBuddhistDate;
 dateNow
  ()Ljava/time/chrono/ThaiBuddhistDate;
  ()Ljava/time/chrono/ThaiBuddhistDate;
@@ -39,10 +39,10 @@ eras
  ()Ljava/util/List<Ljava/time/chrono/Era;>;
 getCalendarType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 localDateTime
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoLocalDateTime<Ljava/time/chrono/ThaiBuddhistDate;>;
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoLocalDateTime<Ljava/time/chrono/ThaiBuddhistDate;>;
diff --git a/libs/eea-java-11/src/main/resources/java/time/chrono/ThaiBuddhistDate.eea b/libs/eea-java-11/src/main/resources/java/time/chrono/ThaiBuddhistDate.eea
index cb6bf1a585..7dd86bc7c9 100644
--- a/libs/eea-java-11/src/main/resources/java/time/chrono/ThaiBuddhistDate.eea
+++ b/libs/eea-java-11/src/main/resources/java/time/chrono/ThaiBuddhistDate.eea
@@ -12,7 +12,7 @@ now
  ()Ljava/time/chrono/ThaiBuddhistDate;
 now
  (Ljava/time/Clock;)Ljava/time/chrono/ThaiBuddhistDate;
- (Ljava/time/Clock;)Ljava/time/chrono/ThaiBuddhistDate;
+ (Ljava/time/Clock;)L1java/time/chrono/ThaiBuddhistDate;
 now
  (Ljava/time/ZoneId;)Ljava/time/chrono/ThaiBuddhistDate;
  (Ljava/time/ZoneId;)Ljava/time/chrono/ThaiBuddhistDate;
diff --git a/libs/eea-java-11/src/main/resources/java/time/zone/ZoneOffsetTransition.eea b/libs/eea-java-11/src/main/resources/java/time/zone/ZoneOffsetTransition.eea
index 1f9c2af08b..6162a95b44 100644
--- a/libs/eea-java-11/src/main/resources/java/time/zone/ZoneOffsetTransition.eea
+++ b/libs/eea-java-11/src/main/resources/java/time/zone/ZoneOffsetTransition.eea
@@ -6,7 +6,7 @@ super java/lang/Comparable
 
 of
  (Ljava/time/LocalDateTime;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)Ljava/time/zone/ZoneOffsetTransition;
- (Ljava/time/LocalDateTime;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)Ljava/time/zone/ZoneOffsetTransition;
+ (Ljava/time/LocalDateTime;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)L1java/time/zone/ZoneOffsetTransition;
 
 compareTo
  (Ljava/time/zone/ZoneOffsetTransition;)I
diff --git a/libs/eea-java-11/src/main/resources/java/time/zone/ZoneOffsetTransitionRule$TimeDefinition.eea b/libs/eea-java-11/src/main/resources/java/time/zone/ZoneOffsetTransitionRule$TimeDefinition.eea
index 6eb215f730..7c4d2c9efd 100644
--- a/libs/eea-java-11/src/main/resources/java/time/zone/ZoneOffsetTransitionRule$TimeDefinition.eea
+++ b/libs/eea-java-11/src/main/resources/java/time/zone/ZoneOffsetTransitionRule$TimeDefinition.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 createDateTime
  (Ljava/time/LocalDateTime;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)Ljava/time/LocalDateTime;
- (Ljava/time/LocalDateTime;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)Ljava/time/LocalDateTime;
+ (Ljava/time/LocalDateTime;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)L1java/time/LocalDateTime;
diff --git a/libs/eea-java-11/src/main/resources/java/time/zone/ZoneOffsetTransitionRule.eea b/libs/eea-java-11/src/main/resources/java/time/zone/ZoneOffsetTransitionRule.eea
index 9acb487463..bcfe4cf473 100644
--- a/libs/eea-java-11/src/main/resources/java/time/zone/ZoneOffsetTransitionRule.eea
+++ b/libs/eea-java-11/src/main/resources/java/time/zone/ZoneOffsetTransitionRule.eea
@@ -2,11 +2,11 @@ class java/time/zone/ZoneOffsetTransitionRule
 
 of
  (Ljava/time/Month;ILjava/time/DayOfWeek;Ljava/time/LocalTime;ZLjava/time/zone/ZoneOffsetTransitionRule$TimeDefinition;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)Ljava/time/zone/ZoneOffsetTransitionRule;
- (Ljava/time/Month;ILjava/time/DayOfWeek;Ljava/time/LocalTime;ZLjava/time/zone/ZoneOffsetTransitionRule$TimeDefinition;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)Ljava/time/zone/ZoneOffsetTransitionRule;
+ (Ljava/time/Month;ILjava/time/DayOfWeek;Ljava/time/LocalTime;ZLjava/time/zone/ZoneOffsetTransitionRule$TimeDefinition;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)L1java/time/zone/ZoneOffsetTransitionRule;
 
 createTransition
  (I)Ljava/time/zone/ZoneOffsetTransition;
- (I)Ljava/time/zone/ZoneOffsetTransition;
+ (I)L1java/time/zone/ZoneOffsetTransition;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/java/time/zone/ZoneRules.eea b/libs/eea-java-11/src/main/resources/java/time/zone/ZoneRules.eea
index b9212bcf70..a8b2ecf535 100644
--- a/libs/eea-java-11/src/main/resources/java/time/zone/ZoneRules.eea
+++ b/libs/eea-java-11/src/main/resources/java/time/zone/ZoneRules.eea
@@ -24,7 +24,7 @@ getStandardOffset
  (Ljava/time/Instant;)Ljava/time/ZoneOffset;
 getTransition
  (Ljava/time/LocalDateTime;)Ljava/time/zone/ZoneOffsetTransition;
- (Ljava/time/LocalDateTime;)Ljava/time/zone/ZoneOffsetTransition;
+ (Ljava/time/LocalDateTime;)L0java/time/zone/ZoneOffsetTransition;
 getTransitionRules
  ()Ljava/util/List<Ljava/time/zone/ZoneOffsetTransitionRule;>;
  ()Ljava/util/List<Ljava/time/zone/ZoneOffsetTransitionRule;>;
@@ -42,10 +42,10 @@ isValidOffset
  (Ljava/time/LocalDateTime;Ljava/time/ZoneOffset;)Z
 nextTransition
  (Ljava/time/Instant;)Ljava/time/zone/ZoneOffsetTransition;
- (Ljava/time/Instant;)Ljava/time/zone/ZoneOffsetTransition;
+ (Ljava/time/Instant;)L0java/time/zone/ZoneOffsetTransition;
 previousTransition
  (Ljava/time/Instant;)Ljava/time/zone/ZoneOffsetTransition;
- (Ljava/time/Instant;)Ljava/time/zone/ZoneOffsetTransition;
+ (Ljava/time/Instant;)L0java/time/zone/ZoneOffsetTransition;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/java/util/AbstractList.eea b/libs/eea-java-11/src/main/resources/java/util/AbstractList.eea
index ce2c58c504..e8325f21df 100644
--- a/libs/eea-java-11/src/main/resources/java/util/AbstractList.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/AbstractList.eea
@@ -41,10 +41,10 @@ listIterator
  (I)L1java/util/ListIterator<TE;>; # @Inherited(java.util.List)
 remove
  (I)TE;
- (I)TE;
+ (I)T1E;
 set
  (ITE;)TE;
- (ITE;)TE;
+ (ITE;)T1E;
 subList
  (II)Ljava/util/List<TE;>;
  (II)L1java/util/List<TE;>; # @Inherited(java.util.List)
diff --git a/libs/eea-java-11/src/main/resources/java/util/AbstractMap$SimpleImmutableEntry.eea b/libs/eea-java-11/src/main/resources/java/util/AbstractMap$SimpleImmutableEntry.eea
index 154585fbc0..de45cf7163 100644
--- a/libs/eea-java-11/src/main/resources/java/util/AbstractMap$SimpleImmutableEntry.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/AbstractMap$SimpleImmutableEntry.eea
@@ -23,7 +23,7 @@ getValue
  ()TV;
 setValue
  (TV;)TV;
- (TV;)TV;
+ (TV;)T1V;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/java/util/AbstractSequentialList.eea b/libs/eea-java-11/src/main/resources/java/util/AbstractSequentialList.eea
index f048b54e30..48e661e7c2 100644
--- a/libs/eea-java-11/src/main/resources/java/util/AbstractSequentialList.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/AbstractSequentialList.eea
@@ -23,7 +23,7 @@ listIterator
  (I)L1java/util/ListIterator<TE;>; # @Inherited(java.util.AbstractList)
 remove
  (I)TE;
- (I)TE;
+ (I)T1E; # @Inherited(java.util.AbstractList)
 set
  (ITE;)TE;
- (ITE;)TE;
+ (ITE;)T1E; # @Inherited(java.util.AbstractList)
diff --git a/libs/eea-java-11/src/main/resources/java/util/ArrayList.eea b/libs/eea-java-11/src/main/resources/java/util/ArrayList.eea
index 650c240658..2fdb05a349 100644
--- a/libs/eea-java-11/src/main/resources/java/util/ArrayList.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/ArrayList.eea
@@ -56,7 +56,7 @@ listIterator
  (I)L1java/util/ListIterator<TE;>; # @Inherited(java.util.AbstractList)
 remove
  (I)TE;
- (I)TE;
+ (I)T1E; # @Inherited(java.util.AbstractList)
 remove
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z
@@ -74,7 +74,7 @@ retainAll
  (L1java/util/Collection<*>;)Z # @Inherited(java.util.AbstractCollection)
 set
  (ITE;)TE;
- (ITE;)TE;
+ (ITE;)T1E; # @Inherited(java.util.AbstractList)
 sort
  (Ljava/util/Comparator<-TE;>;)V
  (L1java/util/Comparator<-TE;>;)V # @Inherited(java.util.List)
diff --git a/libs/eea-java-11/src/main/resources/java/util/Collections.eea b/libs/eea-java-11/src/main/resources/java/util/Collections.eea
index b1b45e5f74..6a0a5aecfb 100644
--- a/libs/eea-java-11/src/main/resources/java/util/Collections.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/Collections.eea
@@ -120,7 +120,7 @@ nCopies
  <T:Ljava/lang/Object;>(ITT;)L1java/util/List<TT;>;
 newSetFromMap
  <E:Ljava/lang/Object;>(Ljava/util/Map<TE;Ljava/lang/Boolean;>;)Ljava/util/Set<TE;>;
- <E:Ljava/lang/Object;>(Ljava/util/Map<TE;Ljava/lang/Boolean;>;)Ljava/util/Set<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/util/Map<TE;Ljava/lang/Boolean;>;)L1java/util/Set<TE;>;
 replaceAll
  <T:Ljava/lang/Object;>(Ljava/util/List<TT;>;TT;TT;)Z
  <T:Ljava/lang/Object;>(Ljava/util/List<TT;>;TT;TT;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/util/Enumeration.eea b/libs/eea-java-11/src/main/resources/java/util/Enumeration.eea
index e6c64cebae..5df1626885 100644
--- a/libs/eea-java-11/src/main/resources/java/util/Enumeration.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/Enumeration.eea
@@ -4,7 +4,7 @@ class java/util/Enumeration
 
 asIterator
  ()Ljava/util/Iterator<TE;>;
- ()Ljava/util/Iterator<TE;>;
+ ()L1java/util/Iterator<TE;>;
 nextElement
  ()TE;
  ()TE;
diff --git a/libs/eea-java-11/src/main/resources/java/util/GregorianCalendar.eea b/libs/eea-java-11/src/main/resources/java/util/GregorianCalendar.eea
index d650ced547..ad84ab0c07 100644
--- a/libs/eea-java-11/src/main/resources/java/util/GregorianCalendar.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/GregorianCalendar.eea
@@ -2,7 +2,7 @@ class java/util/GregorianCalendar
 
 from
  (Ljava/time/ZonedDateTime;)Ljava/util/GregorianCalendar;
- (Ljava/time/ZonedDateTime;)Ljava/util/GregorianCalendar;
+ (Ljava/time/ZonedDateTime;)L1java/util/GregorianCalendar;
 
 <init>
  (Ljava/util/Locale;)V
@@ -24,7 +24,7 @@ getCalendarType
  ()L1java/lang/String; # @Inherited(java.util.Calendar)
 getGregorianChange
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L1java/util/Date;
 getTimeZone
  ()Ljava/util/TimeZone;
  ()L1java/util/TimeZone; # @Inherited(java.util.Calendar)
diff --git a/libs/eea-java-11/src/main/resources/java/util/LinkedList.eea b/libs/eea-java-11/src/main/resources/java/util/LinkedList.eea
index 0ccba724a7..52d93235de 100644
--- a/libs/eea-java-11/src/main/resources/java/util/LinkedList.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/LinkedList.eea
@@ -101,7 +101,7 @@ remove
  ()T1E; # @Inherited(java.util.Deque)
 remove
  (I)TE;
- (I)TE;
+ (I)T1E; # @Inherited(java.util.AbstractSequentialList)
 remove
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z
@@ -119,7 +119,7 @@ removeLastOccurrence
  (L0java/lang/Object;)Z
 set
  (ITE;)TE;
- (ITE;)TE;
+ (ITE;)T1E; # @Inherited(java.util.AbstractSequentialList)
 spliterator
  ()Ljava/util/Spliterator<TE;>;
  ()L1java/util/Spliterator<TE;>; # @Inherited(java.util.List)
diff --git a/libs/eea-java-11/src/main/resources/java/util/Locale.eea b/libs/eea-java-11/src/main/resources/java/util/Locale.eea
index e1680a56e8..7c2c87d94c 100644
--- a/libs/eea-java-11/src/main/resources/java/util/Locale.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/Locale.eea
@@ -93,13 +93,13 @@ getDefault
  (Ljava/util/Locale$Category;)Ljava/util/Locale;
 getISOCountries
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 getISOCountries
  (Ljava/util/Locale$IsoCountryCode;)Ljava/util/Set<Ljava/lang/String;>;
  (Ljava/util/Locale$IsoCountryCode;)Ljava/util/Set<Ljava/lang/String;>;
 getISOLanguages
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 lookup
  (Ljava/util/List<Ljava/util/Locale$LanguageRange;>;Ljava/util/Collection<Ljava/util/Locale;>;)Ljava/util/Locale;
  (Ljava/util/List<Ljava/util/Locale$LanguageRange;>;Ljava/util/Collection<Ljava/util/Locale;>;)Ljava/util/Locale;
@@ -163,7 +163,7 @@ getDisplayVariant
  (Ljava/util/Locale;)Ljava/lang/String;
 getExtension
  (C)Ljava/lang/String;
- (C)Ljava/lang/String;
+ (C)L0java/lang/String;
 getExtensionKeys
  ()Ljava/util/Set<Ljava/lang/Character;>;
  ()Ljava/util/Set<Ljava/lang/Character;>;
@@ -187,7 +187,7 @@ getUnicodeLocaleKeys
  ()Ljava/util/Set<Ljava/lang/String;>;
 getUnicodeLocaleType
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getVariant
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/java/util/OptionalDouble.eea b/libs/eea-java-11/src/main/resources/java/util/OptionalDouble.eea
index 0349617271..7d6dd6e1e9 100644
--- a/libs/eea-java-11/src/main/resources/java/util/OptionalDouble.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/OptionalDouble.eea
@@ -5,7 +5,7 @@ empty
  ()Ljava/util/OptionalDouble;
 of
  (D)Ljava/util/OptionalDouble;
- (D)Ljava/util/OptionalDouble;
+ (D)L1java/util/OptionalDouble;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/util/OptionalInt.eea b/libs/eea-java-11/src/main/resources/java/util/OptionalInt.eea
index 08966f732f..01af0df917 100644
--- a/libs/eea-java-11/src/main/resources/java/util/OptionalInt.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/OptionalInt.eea
@@ -5,7 +5,7 @@ empty
  ()Ljava/util/OptionalInt;
 of
  (I)Ljava/util/OptionalInt;
- (I)Ljava/util/OptionalInt;
+ (I)L1java/util/OptionalInt;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/util/OptionalLong.eea b/libs/eea-java-11/src/main/resources/java/util/OptionalLong.eea
index 7903883b4f..3d00043d24 100644
--- a/libs/eea-java-11/src/main/resources/java/util/OptionalLong.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/OptionalLong.eea
@@ -5,7 +5,7 @@ empty
  ()Ljava/util/OptionalLong;
 of
  (J)Ljava/util/OptionalLong;
- (J)Ljava/util/OptionalLong;
+ (J)L1java/util/OptionalLong;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/util/ResourceBundle$Control.eea b/libs/eea-java-11/src/main/resources/java/util/ResourceBundle$Control.eea
index 8960df7376..9338e1b6ee 100644
--- a/libs/eea-java-11/src/main/resources/java/util/ResourceBundle$Control.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/ResourceBundle$Control.eea
@@ -19,7 +19,7 @@ getNoFallbackControl
 
 getCandidateLocales
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/util/List<Ljava/util/Locale;>;
- (Ljava/lang/String;Ljava/util/Locale;)Ljava/util/List<Ljava/util/Locale;>;
+ (Ljava/lang/String;Ljava/util/Locale;)L1java/util/List<Ljava/util/Locale;>;
 getFallbackLocale
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/util/Locale;
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/util/Locale;
@@ -34,10 +34,10 @@ needsReload
  (Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/ClassLoader;Ljava/util/ResourceBundle;J)Z
 newBundle
  (Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/ClassLoader;Z)Ljava/util/ResourceBundle;
- (Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/ClassLoader;Z)Ljava/util/ResourceBundle;
+ (Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/ClassLoader;Z)L0java/util/ResourceBundle;
 toBundleName
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
 toResourceName
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/java/util/Scanner.eea b/libs/eea-java-11/src/main/resources/java/util/Scanner.eea
index 537c2d83cb..9030e2954d 100644
--- a/libs/eea-java-11/src/main/resources/java/util/Scanner.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/Scanner.eea
@@ -60,13 +60,13 @@ findInLine
  (Ljava/lang/String;)Ljava/lang/String;
 findInLine
  (Ljava/util/regex/Pattern;)Ljava/lang/String;
- (Ljava/util/regex/Pattern;)Ljava/lang/String;
+ (Ljava/util/regex/Pattern;)L0java/lang/String;
 findWithinHorizon
  (Ljava/lang/String;I)Ljava/lang/String;
  (Ljava/lang/String;I)Ljava/lang/String;
 findWithinHorizon
  (Ljava/util/regex/Pattern;I)Ljava/lang/String;
- (Ljava/util/regex/Pattern;I)Ljava/lang/String;
+ (Ljava/util/regex/Pattern;I)L0java/lang/String;
 hasNext
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/util/ServiceLoader.eea b/libs/eea-java-11/src/main/resources/java/util/ServiceLoader.eea
index 244768ab70..96d6bfdd62 100644
--- a/libs/eea-java-11/src/main/resources/java/util/ServiceLoader.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/ServiceLoader.eea
@@ -8,23 +8,23 @@ super java/lang/Iterable
 
 load
  <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
- <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
+ <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;)L1java/util/ServiceLoader<TS;>;
 load
  <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;Ljava/lang/ClassLoader;)Ljava/util/ServiceLoader<TS;>;
- <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;Ljava/lang/ClassLoader;)Ljava/util/ServiceLoader<TS;>;
+ <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;Ljava/lang/ClassLoader;)L1java/util/ServiceLoader<TS;>;
 load
  <S:Ljava/lang/Object;>(Ljava/lang/ModuleLayer;Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
- <S:Ljava/lang/Object;>(Ljava/lang/ModuleLayer;Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
+ <S:Ljava/lang/Object;>(Ljava/lang/ModuleLayer;Ljava/lang/Class<TS;>;)L1java/util/ServiceLoader<TS;>;
 loadInstalled
  <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
- <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
+ <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;)L1java/util/ServiceLoader<TS;>;
 
 findFirst
  ()Ljava/util/Optional<TS;>;
  ()Ljava/util/Optional<TS;>;
 iterator
  ()Ljava/util/Iterator<TS;>;
- ()Ljava/util/Iterator<TS;>;
+ ()L1java/util/Iterator<TS;>;
 stream
  ()Ljava/util/stream/Stream<Ljava/util/ServiceLoader$Provider<TS;>;>;
  ()Ljava/util/stream/Stream<Ljava/util/ServiceLoader$Provider<TS;>;>;
diff --git a/libs/eea-java-11/src/main/resources/java/util/Spliterators$AbstractDoubleSpliterator.eea b/libs/eea-java-11/src/main/resources/java/util/Spliterators$AbstractDoubleSpliterator.eea
index 9cabd4a98c..f9cb99c2b3 100644
--- a/libs/eea-java-11/src/main/resources/java/util/Spliterators$AbstractDoubleSpliterator.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/Spliterators$AbstractDoubleSpliterator.eea
@@ -2,4 +2,4 @@ class java/util/Spliterators$AbstractDoubleSpliterator
 
 trySplit
  ()Ljava/util/Spliterator$OfDouble;
- ()Ljava/util/Spliterator$OfDouble;
+ ()L0java/util/Spliterator$OfDouble;
diff --git a/libs/eea-java-11/src/main/resources/java/util/Spliterators$AbstractIntSpliterator.eea b/libs/eea-java-11/src/main/resources/java/util/Spliterators$AbstractIntSpliterator.eea
index 8e485b0c41..48bbd46bcf 100644
--- a/libs/eea-java-11/src/main/resources/java/util/Spliterators$AbstractIntSpliterator.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/Spliterators$AbstractIntSpliterator.eea
@@ -2,4 +2,4 @@ class java/util/Spliterators$AbstractIntSpliterator
 
 trySplit
  ()Ljava/util/Spliterator$OfInt;
- ()Ljava/util/Spliterator$OfInt;
+ ()L0java/util/Spliterator$OfInt;
diff --git a/libs/eea-java-11/src/main/resources/java/util/Spliterators$AbstractLongSpliterator.eea b/libs/eea-java-11/src/main/resources/java/util/Spliterators$AbstractLongSpliterator.eea
index e539d33cf9..81ca6b482a 100644
--- a/libs/eea-java-11/src/main/resources/java/util/Spliterators$AbstractLongSpliterator.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/Spliterators$AbstractLongSpliterator.eea
@@ -2,4 +2,4 @@ class java/util/Spliterators$AbstractLongSpliterator
 
 trySplit
  ()Ljava/util/Spliterator$OfLong;
- ()Ljava/util/Spliterator$OfLong;
+ ()L0java/util/Spliterator$OfLong;
diff --git a/libs/eea-java-11/src/main/resources/java/util/SplittableRandom.eea b/libs/eea-java-11/src/main/resources/java/util/SplittableRandom.eea
index e541bab333..eb3ce0b3b5 100644
--- a/libs/eea-java-11/src/main/resources/java/util/SplittableRandom.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/SplittableRandom.eea
@@ -41,4 +41,4 @@ nextBytes
  ([B)V
 split
  ()Ljava/util/SplittableRandom;
- ()Ljava/util/SplittableRandom;
+ ()L1java/util/SplittableRandom;
diff --git a/libs/eea-java-11/src/main/resources/java/util/Vector.eea b/libs/eea-java-11/src/main/resources/java/util/Vector.eea
index 75322e68f3..4d83cbf96b 100644
--- a/libs/eea-java-11/src/main/resources/java/util/Vector.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/Vector.eea
@@ -48,7 +48,7 @@ elementAt
  (I)TE;
 elements
  ()Ljava/util/Enumeration<TE;>;
- ()Ljava/util/Enumeration<TE;>;
+ ()L1java/util/Enumeration<TE;>;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.util.AbstractList)
@@ -90,7 +90,7 @@ listIterator
  (I)L1java/util/ListIterator<TE;>; # @Inherited(java.util.AbstractList)
 remove
  (I)TE;
- (I)TE;
+ (I)T1E; # @Inherited(java.util.AbstractList)
 remove
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
@@ -111,7 +111,7 @@ retainAll
  (L1java/util/Collection<*>;)Z # @Inherited(java.util.AbstractCollection)
 set
  (ITE;)TE;
- (ITE;)TE;
+ (ITE;)T1E; # @Inherited(java.util.AbstractList)
 setElementAt
  (TE;I)V
  (TE;I)V
diff --git a/libs/eea-java-11/src/main/resources/java/util/concurrent/ConcurrentSkipListMap.eea b/libs/eea-java-11/src/main/resources/java/util/concurrent/ConcurrentSkipListMap.eea
index 7d87fa400c..778ea907ed 100644
--- a/libs/eea-java-11/src/main/resources/java/util/concurrent/ConcurrentSkipListMap.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/concurrent/ConcurrentSkipListMap.eea
@@ -38,7 +38,7 @@ computeIfAbsent
  (TK;L1java/util/function/Function<-TK;+T0V;>;)TV; # @Inherited(java.util.concurrent.ConcurrentMap)
 computeIfPresent
  (TK;Ljava/util/function/BiFunction<-TK;-TV;+TV;>;)TV;
- (TK;Ljava/util/function/BiFunction<-TK;-TV;+TV;>;)TV;
+ (TK;Ljava/util/function/BiFunction<-TK;-TV;+TV;>;)T0V;
 containsKey
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.util.AbstractMap)
@@ -107,7 +107,7 @@ lowerKey
  (TK;)TK;
 merge
  (TK;TV;Ljava/util/function/BiFunction<-TV;-TV;+TV;>;)TV;
- (TK;TV;Ljava/util/function/BiFunction<-TV;-TV;+TV;>;)TV;
+ (TK;TV;Ljava/util/function/BiFunction<-TV;-TV;+TV;>;)T0V;
 navigableKeySet
  ()Ljava/util/NavigableSet<TK;>;
  ()Ljava/util/NavigableSet<TK;>;
diff --git a/libs/eea-java-11/src/main/resources/java/util/concurrent/CountedCompleter.eea b/libs/eea-java-11/src/main/resources/java/util/concurrent/CountedCompleter.eea
index f0828ce3c1..5047da83fa 100644
--- a/libs/eea-java-11/src/main/resources/java/util/concurrent/CountedCompleter.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/concurrent/CountedCompleter.eea
@@ -23,7 +23,7 @@ getCompleter
  ()L1java/util/concurrent/CountedCompleter<*>;
 getRawResult
  ()TT;
- ()TT;
+ ()T0T;
 getRoot
  ()Ljava/util/concurrent/CountedCompleter<*>;
  ()L1java/util/concurrent/CountedCompleter<*>;
diff --git a/libs/eea-java-11/src/main/resources/java/util/concurrent/RecursiveAction.eea b/libs/eea-java-11/src/main/resources/java/util/concurrent/RecursiveAction.eea
index 1c65fb44c9..c7ecea7aa9 100644
--- a/libs/eea-java-11/src/main/resources/java/util/concurrent/RecursiveAction.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/concurrent/RecursiveAction.eea
@@ -6,7 +6,7 @@ super java/util/concurrent/ForkJoinTask
 
 getRawResult
  ()Ljava/lang/Void;
- ()Ljava/lang/Void;
+ ()L0java/lang/Void;
 setRawResult
  (Ljava/lang/Void;)V
  (Ljava/lang/Void;)V
diff --git a/libs/eea-java-11/src/main/resources/java/util/concurrent/SubmissionPublisher.eea b/libs/eea-java-11/src/main/resources/java/util/concurrent/SubmissionPublisher.eea
index de1444c084..b2f3f2d0dd 100644
--- a/libs/eea-java-11/src/main/resources/java/util/concurrent/SubmissionPublisher.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/concurrent/SubmissionPublisher.eea
@@ -17,7 +17,7 @@ closeExceptionally
  (Ljava/lang/Throwable;)V
 consume
  (Ljava/util/function/Consumer<-TT;>;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
- (Ljava/util/function/Consumer<-TT;>;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
+ (Ljava/util/function/Consumer<-TT;>;)L1java/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
 getClosedException
  ()Ljava/lang/Throwable;
  ()Ljava/lang/Throwable;
@@ -26,7 +26,7 @@ getExecutor
  ()Ljava/util/concurrent/Executor;
 getSubscribers
  ()Ljava/util/List<Ljava/util/concurrent/Flow$Subscriber<-TT;>;>;
- ()Ljava/util/List<Ljava/util/concurrent/Flow$Subscriber<-TT;>;>;
+ ()L1java/util/List<Ljava/util/concurrent/Flow$Subscriber<-TT;>;>;
 isSubscribed
  (Ljava/util/concurrent/Flow$Subscriber<-TT;>;)Z
  (Ljava/util/concurrent/Flow$Subscriber<-TT;>;)Z
diff --git a/libs/eea-java-11/src/main/resources/java/util/concurrent/atomic/AtomicLongFieldUpdater.eea b/libs/eea-java-11/src/main/resources/java/util/concurrent/atomic/AtomicLongFieldUpdater.eea
index 4c611ada19..dc901dbcc1 100644
--- a/libs/eea-java-11/src/main/resources/java/util/concurrent/atomic/AtomicLongFieldUpdater.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/concurrent/atomic/AtomicLongFieldUpdater.eea
@@ -4,7 +4,7 @@ class java/util/concurrent/atomic/AtomicLongFieldUpdater
 
 newUpdater
  <U:Ljava/lang/Object;>(Ljava/lang/Class<TU;>;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicLongFieldUpdater<TU;>;
- <U:Ljava/lang/Object;>(Ljava/lang/Class<TU;>;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicLongFieldUpdater<TU;>;
+ <U:Ljava/lang/Object;>(Ljava/lang/Class<TU;>;Ljava/lang/String;)L1java/util/concurrent/atomic/AtomicLongFieldUpdater<TU;>;
 
 accumulateAndGet
  (TT;JLjava/util/function/LongBinaryOperator;)J
diff --git a/libs/eea-java-11/src/main/resources/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.eea b/libs/eea-java-11/src/main/resources/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.eea
index 0be6e7a621..50b6cb13fc 100644
--- a/libs/eea-java-11/src/main/resources/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.eea
@@ -4,7 +4,7 @@ class java/util/concurrent/atomic/AtomicReferenceFieldUpdater
 
 newUpdater
  <U:Ljava/lang/Object;W:Ljava/lang/Object;>(Ljava/lang/Class<TU;>;Ljava/lang/Class<TW;>;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater<TU;TW;>;
- <U:Ljava/lang/Object;W:Ljava/lang/Object;>(Ljava/lang/Class<TU;>;Ljava/lang/Class<TW;>;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater<TU;TW;>;
+ <U:Ljava/lang/Object;W:Ljava/lang/Object;>(Ljava/lang/Class<TU;>;Ljava/lang/Class<TW;>;Ljava/lang/String;)L1java/util/concurrent/atomic/AtomicReferenceFieldUpdater<TU;TW;>;
 
 accumulateAndGet
  (TT;TV;Ljava/util/function/BinaryOperator<TV;>;)TV;
diff --git a/libs/eea-java-11/src/main/resources/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject.eea b/libs/eea-java-11/src/main/resources/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject.eea
index c5df9f2b64..c5b20b85a0 100644
--- a/libs/eea-java-11/src/main/resources/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject.eea
@@ -11,4 +11,4 @@ awaitUntil
  (L1java/util/Date;)Z # @Inherited(java.util.concurrent.locks.Condition)
 getWaitingThreads
  ()Ljava/util/Collection<Ljava/lang/Thread;>;
- ()Ljava/util/Collection<Ljava/lang/Thread;>;
+ ()L1java/util/Collection<Ljava/lang/Thread;>;
diff --git a/libs/eea-java-11/src/main/resources/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.eea b/libs/eea-java-11/src/main/resources/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.eea
index 21f254cffa..42ec6de71f 100644
--- a/libs/eea-java-11/src/main/resources/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.eea
@@ -2,16 +2,16 @@ class java/util/concurrent/locks/AbstractQueuedLongSynchronizer
 
 getExclusiveQueuedThreads
  ()Ljava/util/Collection<Ljava/lang/Thread;>;
- ()Ljava/util/Collection<Ljava/lang/Thread;>;
+ ()L1java/util/Collection<Ljava/lang/Thread;>;
 getFirstQueuedThread
  ()Ljava/lang/Thread;
  ()Ljava/lang/Thread;
 getQueuedThreads
  ()Ljava/util/Collection<Ljava/lang/Thread;>;
- ()Ljava/util/Collection<Ljava/lang/Thread;>;
+ ()L1java/util/Collection<Ljava/lang/Thread;>;
 getSharedQueuedThreads
  ()Ljava/util/Collection<Ljava/lang/Thread;>;
- ()Ljava/util/Collection<Ljava/lang/Thread;>;
+ ()L1java/util/Collection<Ljava/lang/Thread;>;
 getWaitQueueLength
  (Ljava/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject;)I
  (L1java/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject;)I
diff --git a/libs/eea-java-11/src/main/resources/java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject.eea b/libs/eea-java-11/src/main/resources/java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject.eea
index 0f60484bbf..ac8f5b5b96 100644
--- a/libs/eea-java-11/src/main/resources/java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject.eea
@@ -11,4 +11,4 @@ awaitUntil
  (L1java/util/Date;)Z # @Inherited(java.util.concurrent.locks.Condition)
 getWaitingThreads
  ()Ljava/util/Collection<Ljava/lang/Thread;>;
- ()Ljava/util/Collection<Ljava/lang/Thread;>;
+ ()L1java/util/Collection<Ljava/lang/Thread;>;
diff --git a/libs/eea-java-11/src/main/resources/java/util/concurrent/locks/AbstractQueuedSynchronizer.eea b/libs/eea-java-11/src/main/resources/java/util/concurrent/locks/AbstractQueuedSynchronizer.eea
index 607e5aafe9..41c39d9eb5 100644
--- a/libs/eea-java-11/src/main/resources/java/util/concurrent/locks/AbstractQueuedSynchronizer.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/concurrent/locks/AbstractQueuedSynchronizer.eea
@@ -2,16 +2,16 @@ class java/util/concurrent/locks/AbstractQueuedSynchronizer
 
 getExclusiveQueuedThreads
  ()Ljava/util/Collection<Ljava/lang/Thread;>;
- ()Ljava/util/Collection<Ljava/lang/Thread;>;
+ ()L1java/util/Collection<Ljava/lang/Thread;>;
 getFirstQueuedThread
  ()Ljava/lang/Thread;
  ()Ljava/lang/Thread;
 getQueuedThreads
  ()Ljava/util/Collection<Ljava/lang/Thread;>;
- ()Ljava/util/Collection<Ljava/lang/Thread;>;
+ ()L1java/util/Collection<Ljava/lang/Thread;>;
 getSharedQueuedThreads
  ()Ljava/util/Collection<Ljava/lang/Thread;>;
- ()Ljava/util/Collection<Ljava/lang/Thread;>;
+ ()L1java/util/Collection<Ljava/lang/Thread;>;
 getWaitQueueLength
  (Ljava/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject;)I
  (L1java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject;)I
diff --git a/libs/eea-java-11/src/main/resources/java/util/prefs/AbstractPreferences.eea b/libs/eea-java-11/src/main/resources/java/util/prefs/AbstractPreferences.eea
index 8302ecdf34..c838f12a71 100644
--- a/libs/eea-java-11/src/main/resources/java/util/prefs/AbstractPreferences.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/prefs/AbstractPreferences.eea
@@ -45,7 +45,7 @@ getByteArray
  (L1java/lang/String;[B)[B # @Inherited(java.util.prefs.Preferences)
 getChild
  (Ljava/lang/String;)Ljava/util/prefs/AbstractPreferences;
- (Ljava/lang/String;)Ljava/util/prefs/AbstractPreferences;
+ (Ljava/lang/String;)L0java/util/prefs/AbstractPreferences;
 getDouble
  (Ljava/lang/String;D)D
  (L1java/lang/String;D)D # @Inherited(java.util.prefs.Preferences)
diff --git a/libs/eea-java-11/src/main/resources/java/util/spi/CurrencyNameProvider.eea b/libs/eea-java-11/src/main/resources/java/util/spi/CurrencyNameProvider.eea
index fa8345bfac..1bbac79254 100644
--- a/libs/eea-java-11/src/main/resources/java/util/spi/CurrencyNameProvider.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/spi/CurrencyNameProvider.eea
@@ -2,7 +2,7 @@ class java/util/spi/CurrencyNameProvider
 
 getDisplayName
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/util/Locale;)L0java/lang/String;
 getSymbol
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/java/util/spi/LocaleNameProvider.eea b/libs/eea-java-11/src/main/resources/java/util/spi/LocaleNameProvider.eea
index 3c8a30ace6..6e09f3b8fa 100644
--- a/libs/eea-java-11/src/main/resources/java/util/spi/LocaleNameProvider.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/spi/LocaleNameProvider.eea
@@ -8,13 +8,13 @@ getDisplayLanguage
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
 getDisplayScript
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/util/Locale;)L0java/lang/String;
 getDisplayUnicodeExtensionKey
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/util/Locale;)L0java/lang/String;
 getDisplayUnicodeExtensionType
  (Ljava/lang/String;Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/util/Locale;)L0java/lang/String;
 getDisplayVariant
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/java/util/spi/TimeZoneNameProvider.eea b/libs/eea-java-11/src/main/resources/java/util/spi/TimeZoneNameProvider.eea
index 52c2775bcb..e69e361e86 100644
--- a/libs/eea-java-11/src/main/resources/java/util/spi/TimeZoneNameProvider.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/spi/TimeZoneNameProvider.eea
@@ -5,4 +5,4 @@ getDisplayName
  (Ljava/lang/String;ZILjava/util/Locale;)Ljava/lang/String;
 getGenericDisplayName
  (Ljava/lang/String;ILjava/util/Locale;)Ljava/lang/String;
- (Ljava/lang/String;ILjava/util/Locale;)Ljava/lang/String;
+ (Ljava/lang/String;ILjava/util/Locale;)L0java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/java/util/stream/DoubleStream.eea b/libs/eea-java-11/src/main/resources/java/util/stream/DoubleStream.eea
index 4379e52350..9140f79fc7 100644
--- a/libs/eea-java-11/src/main/resources/java/util/stream/DoubleStream.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/stream/DoubleStream.eea
@@ -6,7 +6,7 @@ super java/util/stream/BaseStream
 
 builder
  ()Ljava/util/stream/DoubleStream$Builder;
- ()Ljava/util/stream/DoubleStream$Builder;
+ ()L1java/util/stream/DoubleStream$Builder;
 concat
  (Ljava/util/stream/DoubleStream;Ljava/util/stream/DoubleStream;)Ljava/util/stream/DoubleStream;
  (Ljava/util/stream/DoubleStream;Ljava/util/stream/DoubleStream;)Ljava/util/stream/DoubleStream;
diff --git a/libs/eea-java-11/src/main/resources/java/util/stream/Node$OfPrimitive.eea b/libs/eea-java-11/src/main/resources/java/util/stream/Node$OfPrimitive.eea
index 1ef25a4a11..120d20c21d 100644
--- a/libs/eea-java-11/src/main/resources/java/util/stream/Node$OfPrimitive.eea
+++ b/libs/eea-java-11/src/main/resources/java/util/stream/Node$OfPrimitive.eea
@@ -20,7 +20,7 @@ forEach
  (TT_CONS;)V
 getChild
  (I)TT_NODE;
- (I)TT_NODE;
+ (I)T1T_NODE;
 newArray
  (I)TT_ARR;
  (I)TT_ARR;
diff --git a/libs/eea-java-11/src/main/resources/javax/accessibility/AccessibleContext.eea b/libs/eea-java-11/src/main/resources/javax/accessibility/AccessibleContext.eea
index 2856d43f67..c7aae898f3 100644
--- a/libs/eea-java-11/src/main/resources/javax/accessibility/AccessibleContext.eea
+++ b/libs/eea-java-11/src/main/resources/javax/accessibility/AccessibleContext.eea
@@ -85,22 +85,22 @@ firePropertyChange
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
  (I)Ljavax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent;
 getAccessibleDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getAccessibleEditableText
  ()Ljavax/accessibility/AccessibleEditableText;
- ()Ljavax/accessibility/AccessibleEditableText;
+ ()L0javax/accessibility/AccessibleEditableText;
 getAccessibleIcon
  ()[Ljavax/accessibility/AccessibleIcon;
- ()[Ljavax/accessibility/AccessibleIcon;
+ ()[0Ljavax/accessibility/AccessibleIcon;
 getAccessibleName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -115,19 +115,19 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleTable
  ()Ljavax/accessibility/AccessibleTable;
- ()Ljavax/accessibility/AccessibleTable;
+ ()L0javax/accessibility/AccessibleTable;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue;
 getLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
diff --git a/libs/eea-java-11/src/main/resources/javax/accessibility/AccessibleRelation.eea b/libs/eea-java-11/src/main/resources/javax/accessibility/AccessibleRelation.eea
index aab3b33d3e..16ccc38606 100644
--- a/libs/eea-java-11/src/main/resources/javax/accessibility/AccessibleRelation.eea
+++ b/libs/eea-java-11/src/main/resources/javax/accessibility/AccessibleRelation.eea
@@ -87,7 +87,7 @@ getKey
  ()Ljava/lang/String;
 getTarget
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[1Ljava/lang/Object;
 setTarget
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/accessibility/AccessibleRelationSet.eea b/libs/eea-java-11/src/main/resources/javax/accessibility/AccessibleRelationSet.eea
index 75314e9871..8e57551574 100644
--- a/libs/eea-java-11/src/main/resources/javax/accessibility/AccessibleRelationSet.eea
+++ b/libs/eea-java-11/src/main/resources/javax/accessibility/AccessibleRelationSet.eea
@@ -18,13 +18,13 @@ contains
  (Ljava/lang/String;)Z
 get
  (Ljava/lang/String;)Ljavax/accessibility/AccessibleRelation;
- (Ljava/lang/String;)Ljavax/accessibility/AccessibleRelation;
+ (Ljava/lang/String;)L0javax/accessibility/AccessibleRelation;
 remove
  (Ljavax/accessibility/AccessibleRelation;)Z
  (Ljavax/accessibility/AccessibleRelation;)Z
 toArray
  ()[Ljavax/accessibility/AccessibleRelation;
- ()[Ljavax/accessibility/AccessibleRelation;
+ ()[1Ljavax/accessibility/AccessibleRelation;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/javax/accessibility/AccessibleStateSet.eea b/libs/eea-java-11/src/main/resources/javax/accessibility/AccessibleStateSet.eea
index 33cd259e79..f38cfa85dd 100644
--- a/libs/eea-java-11/src/main/resources/javax/accessibility/AccessibleStateSet.eea
+++ b/libs/eea-java-11/src/main/resources/javax/accessibility/AccessibleStateSet.eea
@@ -21,7 +21,7 @@ remove
  (Ljavax/accessibility/AccessibleState;)Z
 toArray
  ()[Ljavax/accessibility/AccessibleState;
- ()[Ljavax/accessibility/AccessibleState;
+ ()[1Ljavax/accessibility/AccessibleState;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/javax/annotation/processing/Completions.eea b/libs/eea-java-11/src/main/resources/javax/annotation/processing/Completions.eea
index 450a3e19d5..cb428658b1 100644
--- a/libs/eea-java-11/src/main/resources/javax/annotation/processing/Completions.eea
+++ b/libs/eea-java-11/src/main/resources/javax/annotation/processing/Completions.eea
@@ -2,7 +2,7 @@ class javax/annotation/processing/Completions
 
 of
  (Ljava/lang/String;)Ljavax/annotation/processing/Completion;
- (Ljava/lang/String;)Ljavax/annotation/processing/Completion;
+ (Ljava/lang/String;)L1javax/annotation/processing/Completion;
 of
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/annotation/processing/Completion;
- (Ljava/lang/String;Ljava/lang/String;)Ljavax/annotation/processing/Completion;
+ (Ljava/lang/String;Ljava/lang/String;)L1javax/annotation/processing/Completion;
diff --git a/libs/eea-java-11/src/main/resources/javax/annotation/processing/Filer.eea b/libs/eea-java-11/src/main/resources/javax/annotation/processing/Filer.eea
index 08377233c0..7e6baa3b6a 100644
--- a/libs/eea-java-11/src/main/resources/javax/annotation/processing/Filer.eea
+++ b/libs/eea-java-11/src/main/resources/javax/annotation/processing/Filer.eea
@@ -2,13 +2,13 @@ class javax/annotation/processing/Filer
 
 createClassFile
  (Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)Ljavax/tools/JavaFileObject;
- (Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)Ljavax/tools/JavaFileObject;
+ (Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)L1javax/tools/JavaFileObject;
 createResource
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/CharSequence;Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)Ljavax/tools/FileObject;
- (Ljavax/tools/JavaFileManager$Location;Ljava/lang/CharSequence;Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)Ljavax/tools/FileObject;
+ (Ljavax/tools/JavaFileManager$Location;Ljava/lang/CharSequence;Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)L1javax/tools/FileObject;
 createSourceFile
  (Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)Ljavax/tools/JavaFileObject;
- (Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)Ljavax/tools/JavaFileObject;
+ (Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)L1javax/tools/JavaFileObject;
 getResource
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Ljavax/tools/FileObject;
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Ljavax/tools/FileObject;
diff --git a/libs/eea-java-11/src/main/resources/javax/crypto/CipherSpi.eea b/libs/eea-java-11/src/main/resources/javax/crypto/CipherSpi.eea
index 53c0ff1c0d..63c0e4e4a1 100644
--- a/libs/eea-java-11/src/main/resources/javax/crypto/CipherSpi.eea
+++ b/libs/eea-java-11/src/main/resources/javax/crypto/CipherSpi.eea
@@ -35,7 +35,7 @@ engineSetPadding
  (Ljava/lang/String;)V
 engineUnwrap
  ([BLjava/lang/String;I)Ljava/security/Key;
- ([BLjava/lang/String;I)Ljava/security/Key;
+ ([BLjava/lang/String;I)L1java/security/Key;
 engineUpdate
  (Ljava/nio/ByteBuffer;Ljava/nio/ByteBuffer;)I
  (Ljava/nio/ByteBuffer;Ljava/nio/ByteBuffer;)I
@@ -53,4 +53,4 @@ engineUpdateAAD
  ([BII)V
 engineWrap
  (Ljava/security/Key;)[B
- (Ljava/security/Key;)[B
+ (Ljava/security/Key;)[1B
diff --git a/libs/eea-java-11/src/main/resources/javax/crypto/EncryptedPrivateKeyInfo.eea b/libs/eea-java-11/src/main/resources/javax/crypto/EncryptedPrivateKeyInfo.eea
index acc9f0bdbf..9054a16f36 100644
--- a/libs/eea-java-11/src/main/resources/javax/crypto/EncryptedPrivateKeyInfo.eea
+++ b/libs/eea-java-11/src/main/resources/javax/crypto/EncryptedPrivateKeyInfo.eea
@@ -32,4 +32,4 @@ getKeySpec
  (Ljava/security/Key;Ljava/security/Provider;)Ljava/security/spec/PKCS8EncodedKeySpec;
 getKeySpec
  (Ljavax/crypto/Cipher;)Ljava/security/spec/PKCS8EncodedKeySpec;
- (Ljavax/crypto/Cipher;)Ljava/security/spec/PKCS8EncodedKeySpec;
+ (Ljavax/crypto/Cipher;)L1java/security/spec/PKCS8EncodedKeySpec;
diff --git a/libs/eea-java-11/src/main/resources/javax/crypto/KeyAgreement.eea b/libs/eea-java-11/src/main/resources/javax/crypto/KeyAgreement.eea
index 7ff50989eb..19c19cdf32 100644
--- a/libs/eea-java-11/src/main/resources/javax/crypto/KeyAgreement.eea
+++ b/libs/eea-java-11/src/main/resources/javax/crypto/KeyAgreement.eea
@@ -2,7 +2,7 @@ class javax/crypto/KeyAgreement
 
 getInstance
  (Ljava/lang/String;)Ljavax/crypto/KeyAgreement;
- (Ljava/lang/String;)Ljavax/crypto/KeyAgreement;
+ (Ljava/lang/String;)L1javax/crypto/KeyAgreement;
 getInstance
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/crypto/KeyAgreement;
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/crypto/KeyAgreement;
diff --git a/libs/eea-java-11/src/main/resources/javax/crypto/Mac.eea b/libs/eea-java-11/src/main/resources/javax/crypto/Mac.eea
index 5e5668237d..8d10b122a9 100644
--- a/libs/eea-java-11/src/main/resources/javax/crypto/Mac.eea
+++ b/libs/eea-java-11/src/main/resources/javax/crypto/Mac.eea
@@ -2,7 +2,7 @@ class javax/crypto/Mac
 
 getInstance
  (Ljava/lang/String;)Ljavax/crypto/Mac;
- (Ljava/lang/String;)Ljavax/crypto/Mac;
+ (Ljava/lang/String;)L1javax/crypto/Mac;
 getInstance
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/crypto/Mac;
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/crypto/Mac;
diff --git a/libs/eea-java-11/src/main/resources/javax/crypto/SecretKeyFactory.eea b/libs/eea-java-11/src/main/resources/javax/crypto/SecretKeyFactory.eea
index 5ebcc758a3..c3519c029f 100644
--- a/libs/eea-java-11/src/main/resources/javax/crypto/SecretKeyFactory.eea
+++ b/libs/eea-java-11/src/main/resources/javax/crypto/SecretKeyFactory.eea
@@ -2,7 +2,7 @@ class javax/crypto/SecretKeyFactory
 
 getInstance
  (Ljava/lang/String;)Ljavax/crypto/SecretKeyFactory;
- (Ljava/lang/String;)Ljavax/crypto/SecretKeyFactory;
+ (Ljava/lang/String;)L1javax/crypto/SecretKeyFactory;
 getInstance
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/crypto/SecretKeyFactory;
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/crypto/SecretKeyFactory;
diff --git a/libs/eea-java-11/src/main/resources/javax/crypto/spec/PBEKeySpec.eea b/libs/eea-java-11/src/main/resources/javax/crypto/spec/PBEKeySpec.eea
index bd5602ac54..42108d5f56 100644
--- a/libs/eea-java-11/src/main/resources/javax/crypto/spec/PBEKeySpec.eea
+++ b/libs/eea-java-11/src/main/resources/javax/crypto/spec/PBEKeySpec.eea
@@ -14,4 +14,4 @@ getPassword
  ()[C
 getSalt
  ()[B
- ()[B
+ ()[0B
diff --git a/libs/eea-java-11/src/main/resources/javax/imageio/IIOParam.eea b/libs/eea-java-11/src/main/resources/javax/imageio/IIOParam.eea
index c347c58f86..fd56a917db 100644
--- a/libs/eea-java-11/src/main/resources/javax/imageio/IIOParam.eea
+++ b/libs/eea-java-11/src/main/resources/javax/imageio/IIOParam.eea
@@ -33,10 +33,10 @@ getDestinationType
  ()Ljavax/imageio/ImageTypeSpecifier;
 getSourceBands
  ()[I
- ()[I
+ ()[0I
 getSourceRegion
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L0java/awt/Rectangle;
 setController
  (Ljavax/imageio/IIOParamController;)V
  (Ljavax/imageio/IIOParamController;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/imageio/ImageIO.eea b/libs/eea-java-11/src/main/resources/javax/imageio/ImageIO.eea
index 80a6db1dbd..b4dea909bf 100644
--- a/libs/eea-java-11/src/main/resources/javax/imageio/ImageIO.eea
+++ b/libs/eea-java-11/src/main/resources/javax/imageio/ImageIO.eea
@@ -2,16 +2,16 @@ class javax/imageio/ImageIO
 
 createImageInputStream
  (Ljava/lang/Object;)Ljavax/imageio/stream/ImageInputStream;
- (Ljava/lang/Object;)Ljavax/imageio/stream/ImageInputStream;
+ (Ljava/lang/Object;)L0javax/imageio/stream/ImageInputStream;
 createImageOutputStream
  (Ljava/lang/Object;)Ljavax/imageio/stream/ImageOutputStream;
- (Ljava/lang/Object;)Ljavax/imageio/stream/ImageOutputStream;
+ (Ljava/lang/Object;)L0javax/imageio/stream/ImageOutputStream;
 getCacheDirectory
  ()Ljava/io/File;
  ()Ljava/io/File;
 getImageReader
  (Ljavax/imageio/ImageWriter;)Ljavax/imageio/ImageReader;
- (Ljavax/imageio/ImageWriter;)Ljavax/imageio/ImageReader;
+ (Ljavax/imageio/ImageWriter;)L0javax/imageio/ImageReader;
 getImageReaders
  (Ljava/lang/Object;)Ljava/util/Iterator<Ljavax/imageio/ImageReader;>;
  (Ljava/lang/Object;)Ljava/util/Iterator<Ljavax/imageio/ImageReader;>;
@@ -29,7 +29,7 @@ getImageTranscoders
  (Ljavax/imageio/ImageReader;Ljavax/imageio/ImageWriter;)Ljava/util/Iterator<Ljavax/imageio/ImageTranscoder;>;
 getImageWriter
  (Ljavax/imageio/ImageReader;)Ljavax/imageio/ImageWriter;
- (Ljavax/imageio/ImageReader;)Ljavax/imageio/ImageWriter;
+ (Ljavax/imageio/ImageReader;)L0javax/imageio/ImageWriter;
 getImageWriters
  (Ljavax/imageio/ImageTypeSpecifier;Ljava/lang/String;)Ljava/util/Iterator<Ljavax/imageio/ImageWriter;>;
  (Ljavax/imageio/ImageTypeSpecifier;Ljava/lang/String;)Ljava/util/Iterator<Ljavax/imageio/ImageWriter;>;
@@ -71,7 +71,7 @@ read
  (Ljava/net/URL;)Ljava/awt/image/BufferedImage;
 read
  (Ljavax/imageio/stream/ImageInputStream;)Ljava/awt/image/BufferedImage;
- (Ljavax/imageio/stream/ImageInputStream;)Ljava/awt/image/BufferedImage;
+ (Ljavax/imageio/stream/ImageInputStream;)L0java/awt/image/BufferedImage;
 setCacheDirectory
  (Ljava/io/File;)V
  (Ljava/io/File;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/imageio/ImageReadParam.eea b/libs/eea-java-11/src/main/resources/javax/imageio/ImageReadParam.eea
index 82b35aa7df..225c56e3f6 100644
--- a/libs/eea-java-11/src/main/resources/javax/imageio/ImageReadParam.eea
+++ b/libs/eea-java-11/src/main/resources/javax/imageio/ImageReadParam.eea
@@ -15,7 +15,7 @@ getDestination
  ()Ljava/awt/image/BufferedImage;
 getDestinationBands
  ()[I
- ()[I
+ ()[0I
 getSourceRenderSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
diff --git a/libs/eea-java-11/src/main/resources/javax/imageio/ImageReader.eea b/libs/eea-java-11/src/main/resources/javax/imageio/ImageReader.eea
index 063973faab..172f8840b0 100644
--- a/libs/eea-java-11/src/main/resources/javax/imageio/ImageReader.eea
+++ b/libs/eea-java-11/src/main/resources/javax/imageio/ImageReader.eea
@@ -52,10 +52,10 @@ addIIOReadWarningListener
  (L1javax/imageio/event/IIOReadWarningListener;)V
 getAvailableLocales
  ()[Ljava/util/Locale;
- ()[Ljava/util/Locale;
+ ()[0Ljava/util/Locale;
 getDefaultReadParam
  ()Ljavax/imageio/ImageReadParam;
- ()Ljavax/imageio/ImageReadParam;
+ ()L1javax/imageio/ImageReadParam;
 getFormatName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -118,7 +118,7 @@ read
  (ILjavax/imageio/ImageReadParam;)Ljava/awt/image/BufferedImage;
 readAll
  (ILjavax/imageio/ImageReadParam;)Ljavax/imageio/IIOImage;
- (ILjavax/imageio/ImageReadParam;)Ljavax/imageio/IIOImage;
+ (ILjavax/imageio/ImageReadParam;)L1javax/imageio/IIOImage;
 readAll
  (Ljava/util/Iterator<+Ljavax/imageio/ImageReadParam;>;)Ljava/util/Iterator<Ljavax/imageio/IIOImage;>;
  (Ljava/util/Iterator<+Ljavax/imageio/ImageReadParam;>;)Ljava/util/Iterator<Ljavax/imageio/IIOImage;>;
@@ -127,10 +127,10 @@ readAsRenderedImage
  (ILjavax/imageio/ImageReadParam;)Ljava/awt/image/RenderedImage;
 readRaster
  (ILjavax/imageio/ImageReadParam;)Ljava/awt/image/Raster;
- (ILjavax/imageio/ImageReadParam;)Ljava/awt/image/Raster;
+ (ILjavax/imageio/ImageReadParam;)L1java/awt/image/Raster;
 readThumbnail
  (II)Ljava/awt/image/BufferedImage;
- (II)Ljava/awt/image/BufferedImage;
+ (II)L1java/awt/image/BufferedImage;
 readTile
  (III)Ljava/awt/image/BufferedImage;
  (III)Ljava/awt/image/BufferedImage;
diff --git a/libs/eea-java-11/src/main/resources/javax/imageio/ImageTypeSpecifier.eea b/libs/eea-java-11/src/main/resources/javax/imageio/ImageTypeSpecifier.eea
index c1dd1077d2..335eb11e08 100644
--- a/libs/eea-java-11/src/main/resources/javax/imageio/ImageTypeSpecifier.eea
+++ b/libs/eea-java-11/src/main/resources/javax/imageio/ImageTypeSpecifier.eea
@@ -2,28 +2,28 @@ class javax/imageio/ImageTypeSpecifier
 
 createBanded
  (Ljava/awt/color/ColorSpace;[I[IIZZ)Ljavax/imageio/ImageTypeSpecifier;
- (Ljava/awt/color/ColorSpace;[I[IIZZ)Ljavax/imageio/ImageTypeSpecifier;
+ (Ljava/awt/color/ColorSpace;[I[IIZZ)L1javax/imageio/ImageTypeSpecifier;
 createFromBufferedImageType
  (I)Ljavax/imageio/ImageTypeSpecifier;
- (I)Ljavax/imageio/ImageTypeSpecifier;
+ (I)L1javax/imageio/ImageTypeSpecifier;
 createFromRenderedImage
  (Ljava/awt/image/RenderedImage;)Ljavax/imageio/ImageTypeSpecifier;
- (Ljava/awt/image/RenderedImage;)Ljavax/imageio/ImageTypeSpecifier;
+ (Ljava/awt/image/RenderedImage;)L1javax/imageio/ImageTypeSpecifier;
 createGrayscale
  (IIZ)Ljavax/imageio/ImageTypeSpecifier;
- (IIZ)Ljavax/imageio/ImageTypeSpecifier;
+ (IIZ)L1javax/imageio/ImageTypeSpecifier;
 createGrayscale
  (IIZZ)Ljavax/imageio/ImageTypeSpecifier;
- (IIZZ)Ljavax/imageio/ImageTypeSpecifier;
+ (IIZZ)L1javax/imageio/ImageTypeSpecifier;
 createIndexed
  ([B[B[B[BII)Ljavax/imageio/ImageTypeSpecifier;
- ([B[B[B[BII)Ljavax/imageio/ImageTypeSpecifier;
+ ([B[B[B[BII)L1javax/imageio/ImageTypeSpecifier;
 createInterleaved
  (Ljava/awt/color/ColorSpace;[IIZZ)Ljavax/imageio/ImageTypeSpecifier;
- (Ljava/awt/color/ColorSpace;[IIZZ)Ljavax/imageio/ImageTypeSpecifier;
+ (Ljava/awt/color/ColorSpace;[IIZZ)L1javax/imageio/ImageTypeSpecifier;
 createPacked
  (Ljava/awt/color/ColorSpace;IIIIIZ)Ljavax/imageio/ImageTypeSpecifier;
- (Ljava/awt/color/ColorSpace;IIIIIZ)Ljavax/imageio/ImageTypeSpecifier;
+ (Ljava/awt/color/ColorSpace;IIIIIZ)L1javax/imageio/ImageTypeSpecifier;
 
 colorModel
  Ljava/awt/image/ColorModel;
@@ -40,7 +40,7 @@ sampleModel
  (Ljava/awt/image/RenderedImage;)V
 createBufferedImage
  (II)Ljava/awt/image/BufferedImage;
- (II)Ljava/awt/image/BufferedImage;
+ (II)L1java/awt/image/BufferedImage;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/javax/imageio/ImageWriteParam.eea b/libs/eea-java-11/src/main/resources/javax/imageio/ImageWriteParam.eea
index 0530ffdef0..0a9b1107fa 100644
--- a/libs/eea-java-11/src/main/resources/javax/imageio/ImageWriteParam.eea
+++ b/libs/eea-java-11/src/main/resources/javax/imageio/ImageWriteParam.eea
@@ -18,16 +18,16 @@ preferredTileSizes
  (Ljava/util/Locale;)V
 getCompressionQualityDescriptions
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String;
 getCompressionQualityValues
  ()[F
- ()[F
+ ()[0F
 getCompressionType
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getCompressionTypes
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String;
 getLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
diff --git a/libs/eea-java-11/src/main/resources/javax/imageio/ImageWriter.eea b/libs/eea-java-11/src/main/resources/javax/imageio/ImageWriter.eea
index 939d7848b7..b385898415 100644
--- a/libs/eea-java-11/src/main/resources/javax/imageio/ImageWriter.eea
+++ b/libs/eea-java-11/src/main/resources/javax/imageio/ImageWriter.eea
@@ -48,7 +48,7 @@ getDefaultStreamMetadata
  (Ljavax/imageio/ImageWriteParam;)Ljavax/imageio/metadata/IIOMetadata;
 getDefaultWriteParam
  ()Ljavax/imageio/ImageWriteParam;
- ()Ljavax/imageio/ImageWriteParam;
+ ()L1javax/imageio/ImageWriteParam;
 getLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
@@ -63,7 +63,7 @@ getOutput
  ()Ljava/lang/Object;
 getPreferredThumbnailSizes
  (Ljavax/imageio/ImageTypeSpecifier;Ljavax/imageio/ImageWriteParam;Ljavax/imageio/metadata/IIOMetadata;Ljavax/imageio/metadata/IIOMetadata;)[Ljava/awt/Dimension;
- (Ljavax/imageio/ImageTypeSpecifier;Ljavax/imageio/ImageWriteParam;Ljavax/imageio/metadata/IIOMetadata;Ljavax/imageio/metadata/IIOMetadata;)[Ljava/awt/Dimension;
+ (Ljavax/imageio/ImageTypeSpecifier;Ljavax/imageio/ImageWriteParam;Ljavax/imageio/metadata/IIOMetadata;Ljavax/imageio/metadata/IIOMetadata;)[0Ljava/awt/Dimension;
 prepareInsertEmpty
  (ILjavax/imageio/ImageTypeSpecifier;IILjavax/imageio/metadata/IIOMetadata;Ljava/util/List<+Ljava/awt/image/BufferedImage;>;Ljavax/imageio/ImageWriteParam;)V
  (ILjavax/imageio/ImageTypeSpecifier;IILjavax/imageio/metadata/IIOMetadata;Ljava/util/List<+Ljava/awt/image/BufferedImage;>;Ljavax/imageio/ImageWriteParam;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/imageio/metadata/IIOMetadata.eea b/libs/eea-java-11/src/main/resources/javax/imageio/metadata/IIOMetadata.eea
index ea3da925ff..4c2fe4b3fd 100644
--- a/libs/eea-java-11/src/main/resources/javax/imageio/metadata/IIOMetadata.eea
+++ b/libs/eea-java-11/src/main/resources/javax/imageio/metadata/IIOMetadata.eea
@@ -33,43 +33,43 @@ getDefaultController
  ()Ljavax/imageio/metadata/IIOMetadataController;
 getExtraMetadataFormatNames
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String;
 getMetadataFormat
  (Ljava/lang/String;)Ljavax/imageio/metadata/IIOMetadataFormat;
  (Ljava/lang/String;)Ljavax/imageio/metadata/IIOMetadataFormat;
 getMetadataFormatNames
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String;
 getNativeMetadataFormatName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getStandardChromaNode
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L0javax/imageio/metadata/IIOMetadataNode;
 getStandardCompressionNode
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L0javax/imageio/metadata/IIOMetadataNode;
 getStandardDataNode
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L0javax/imageio/metadata/IIOMetadataNode;
 getStandardDimensionNode
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L0javax/imageio/metadata/IIOMetadataNode;
 getStandardDocumentNode
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L0javax/imageio/metadata/IIOMetadataNode;
 getStandardTextNode
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L0javax/imageio/metadata/IIOMetadataNode;
 getStandardTileNode
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L0javax/imageio/metadata/IIOMetadataNode;
 getStandardTransparencyNode
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L0javax/imageio/metadata/IIOMetadataNode;
 getStandardTree
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L1javax/imageio/metadata/IIOMetadataNode;
 mergeTree
  (Ljava/lang/String;Lorg/w3c/dom/Node;)V
  (Ljava/lang/String;Lorg/w3c/dom/Node;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/imageio/metadata/IIOMetadataFormatImpl.eea b/libs/eea-java-11/src/main/resources/javax/imageio/metadata/IIOMetadataFormatImpl.eea
index 570c29bc8c..4f133d5d34 100644
--- a/libs/eea-java-11/src/main/resources/javax/imageio/metadata/IIOMetadataFormatImpl.eea
+++ b/libs/eea-java-11/src/main/resources/javax/imageio/metadata/IIOMetadataFormatImpl.eea
@@ -85,7 +85,7 @@ getAttributeValueType
  (Ljava/lang/String;Ljava/lang/String;)I
 getChildNames
  (Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/String;)[0Ljava/lang/String;
 getChildPolicy
  (Ljava/lang/String;)I
  (Ljava/lang/String;)I
diff --git a/libs/eea-java-11/src/main/resources/javax/imageio/metadata/IIOMetadataNode.eea b/libs/eea-java-11/src/main/resources/javax/imageio/metadata/IIOMetadataNode.eea
index 9b80865fa6..bed21003f8 100644
--- a/libs/eea-java-11/src/main/resources/javax/imageio/metadata/IIOMetadataNode.eea
+++ b/libs/eea-java-11/src/main/resources/javax/imageio/metadata/IIOMetadataNode.eea
@@ -26,7 +26,7 @@ getAttributeNodeNS
  (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/Attr;
 getAttributes
  ()Lorg/w3c/dom/NamedNodeMap;
- ()Lorg/w3c/dom/NamedNodeMap;
+ ()L1org/w3c/dom/NamedNodeMap;
 getBaseURI
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(org.w3c.dom.Node)
@@ -53,7 +53,7 @@ getLocalName
  ()L0java/lang/String; # @Inherited(org.w3c.dom.Node)
 getNamespaceURI
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getNextSibling
  ()Lorg/w3c/dom/Node;
  ()L0org/w3c/dom/Node; # @Inherited(org.w3c.dom.Node)
@@ -77,16 +77,16 @@ getPreviousSibling
  ()L0org/w3c/dom/Node; # @Inherited(org.w3c.dom.Node)
 getSchemaTypeInfo
  ()Lorg/w3c/dom/TypeInfo;
- ()Lorg/w3c/dom/TypeInfo;
+ ()L1org/w3c/dom/TypeInfo;
 getTagName
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(org.w3c.dom.Element)
 getTextContent
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getUserData
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
 getUserObject
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
@@ -113,7 +113,7 @@ isSupported
  (Ljava/lang/String;Ljava/lang/String;)Z
 item
  (I)Lorg/w3c/dom/Node;
- (I)Lorg/w3c/dom/Node;
+ (I)L0org/w3c/dom/Node;
 lookupNamespaceURI
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)L0java/lang/String; # @Inherited(org.w3c.dom.Node)
@@ -143,7 +143,7 @@ setAttributeNS
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 setAttributeNode
  (Lorg/w3c/dom/Attr;)Lorg/w3c/dom/Attr;
- (Lorg/w3c/dom/Attr;)Lorg/w3c/dom/Attr;
+ (Lorg/w3c/dom/Attr;)L0org/w3c/dom/Attr;
 setAttributeNodeNS
  (Lorg/w3c/dom/Attr;)Lorg/w3c/dom/Attr;
  (Lorg/w3c/dom/Attr;)Lorg/w3c/dom/Attr;
@@ -167,7 +167,7 @@ setTextContent
  (Ljava/lang/String;)V
 setUserData
  (Ljava/lang/String;Ljava/lang/Object;Lorg/w3c/dom/UserDataHandler;)Ljava/lang/Object;
- (Ljava/lang/String;Ljava/lang/Object;Lorg/w3c/dom/UserDataHandler;)Ljava/lang/Object;
+ (Ljava/lang/String;Ljava/lang/Object;Lorg/w3c/dom/UserDataHandler;)L1java/lang/Object;
 setUserObject
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/imageio/plugins/jpeg/JPEGImageReadParam.eea b/libs/eea-java-11/src/main/resources/javax/imageio/plugins/jpeg/JPEGImageReadParam.eea
index 71ba123e14..0e9fe601ff 100644
--- a/libs/eea-java-11/src/main/resources/javax/imageio/plugins/jpeg/JPEGImageReadParam.eea
+++ b/libs/eea-java-11/src/main/resources/javax/imageio/plugins/jpeg/JPEGImageReadParam.eea
@@ -2,13 +2,13 @@ class javax/imageio/plugins/jpeg/JPEGImageReadParam
 
 getACHuffmanTables
  ()[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
- ()[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
+ ()[0Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
 getDCHuffmanTables
  ()[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
- ()[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
+ ()[0Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
 getQTables
  ()[Ljavax/imageio/plugins/jpeg/JPEGQTable;
- ()[Ljavax/imageio/plugins/jpeg/JPEGQTable;
+ ()[0Ljavax/imageio/plugins/jpeg/JPEGQTable;
 setDecodeTables
  ([Ljavax/imageio/plugins/jpeg/JPEGQTable;[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;)V
  ([Ljavax/imageio/plugins/jpeg/JPEGQTable;[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/imageio/plugins/jpeg/JPEGImageWriteParam.eea b/libs/eea-java-11/src/main/resources/javax/imageio/plugins/jpeg/JPEGImageWriteParam.eea
index 72ed2dc8b0..14b724e756 100644
--- a/libs/eea-java-11/src/main/resources/javax/imageio/plugins/jpeg/JPEGImageWriteParam.eea
+++ b/libs/eea-java-11/src/main/resources/javax/imageio/plugins/jpeg/JPEGImageWriteParam.eea
@@ -5,19 +5,19 @@ class javax/imageio/plugins/jpeg/JPEGImageWriteParam
  (Ljava/util/Locale;)V
 getACHuffmanTables
  ()[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
- ()[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
+ ()[0Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
 getCompressionQualityDescriptions
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.imageio.ImageWriteParam)
 getCompressionQualityValues
  ()[F
- ()[F
+ ()[0F # @Inherited(javax.imageio.ImageWriteParam)
 getDCHuffmanTables
  ()[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
- ()[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
+ ()[0Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
 getQTables
  ()[Ljavax/imageio/plugins/jpeg/JPEGQTable;
- ()[Ljavax/imageio/plugins/jpeg/JPEGQTable;
+ ()[0Ljavax/imageio/plugins/jpeg/JPEGQTable;
 setEncodeTables
  ([Ljavax/imageio/plugins/jpeg/JPEGQTable;[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;)V
  ([Ljavax/imageio/plugins/jpeg/JPEGQTable;[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/imageio/plugins/jpeg/JPEGQTable.eea b/libs/eea-java-11/src/main/resources/javax/imageio/plugins/jpeg/JPEGQTable.eea
index e923ecb798..793d18c003 100644
--- a/libs/eea-java-11/src/main/resources/javax/imageio/plugins/jpeg/JPEGQTable.eea
+++ b/libs/eea-java-11/src/main/resources/javax/imageio/plugins/jpeg/JPEGQTable.eea
@@ -18,7 +18,7 @@ K2Div2Chrominance
  ([I)V
 getScaledInstance
  (FZ)Ljavax/imageio/plugins/jpeg/JPEGQTable;
- (FZ)Ljavax/imageio/plugins/jpeg/JPEGQTable;
+ (FZ)L1javax/imageio/plugins/jpeg/JPEGQTable;
 getTable
  ()[I
  ()[I
diff --git a/libs/eea-java-11/src/main/resources/javax/imageio/plugins/tiff/TIFFDirectory.eea b/libs/eea-java-11/src/main/resources/javax/imageio/plugins/tiff/TIFFDirectory.eea
index 9a3eceae10..6af5cd2677 100644
--- a/libs/eea-java-11/src/main/resources/javax/imageio/plugins/tiff/TIFFDirectory.eea
+++ b/libs/eea-java-11/src/main/resources/javax/imageio/plugins/tiff/TIFFDirectory.eea
@@ -2,7 +2,7 @@ class javax/imageio/plugins/tiff/TIFFDirectory
 
 createFromMetadata
  (Ljavax/imageio/metadata/IIOMetadata;)Ljavax/imageio/plugins/tiff/TIFFDirectory;
- (Ljavax/imageio/metadata/IIOMetadata;)Ljavax/imageio/plugins/tiff/TIFFDirectory;
+ (Ljavax/imageio/metadata/IIOMetadata;)L1javax/imageio/plugins/tiff/TIFFDirectory;
 
 <init>
  ([Ljavax/imageio/plugins/tiff/TIFFTagSet;Ljavax/imageio/plugins/tiff/TIFFTag;)V
@@ -18,7 +18,7 @@ clone
  ()Ljavax/imageio/plugins/tiff/TIFFDirectory;
 getAsMetadata
  ()Ljavax/imageio/metadata/IIOMetadata;
- ()Ljavax/imageio/metadata/IIOMetadata;
+ ()L1javax/imageio/metadata/IIOMetadata;
 getParentTag
  ()Ljavax/imageio/plugins/tiff/TIFFTag;
  ()Ljavax/imageio/plugins/tiff/TIFFTag;
@@ -27,7 +27,7 @@ getTIFFField
  (I)Ljavax/imageio/plugins/tiff/TIFFField;
 getTIFFFields
  ()[Ljavax/imageio/plugins/tiff/TIFFField;
- ()[Ljavax/imageio/plugins/tiff/TIFFField;
+ ()[1Ljavax/imageio/plugins/tiff/TIFFField;
 getTag
  (I)Ljavax/imageio/plugins/tiff/TIFFTag;
  (I)Ljavax/imageio/plugins/tiff/TIFFTag;
diff --git a/libs/eea-java-11/src/main/resources/javax/imageio/plugins/tiff/TIFFField.eea b/libs/eea-java-11/src/main/resources/javax/imageio/plugins/tiff/TIFFField.eea
index 054b258a53..d262ff83e3 100644
--- a/libs/eea-java-11/src/main/resources/javax/imageio/plugins/tiff/TIFFField.eea
+++ b/libs/eea-java-11/src/main/resources/javax/imageio/plugins/tiff/TIFFField.eea
@@ -2,10 +2,10 @@ class javax/imageio/plugins/tiff/TIFFField
 
 createArrayForType
  (II)Ljava/lang/Object;
- (II)Ljava/lang/Object;
+ (II)L1java/lang/Object;
 createFromMetadataNode
  (Ljavax/imageio/plugins/tiff/TIFFTagSet;Lorg/w3c/dom/Node;)Ljavax/imageio/plugins/tiff/TIFFField;
- (Ljavax/imageio/plugins/tiff/TIFFTagSet;Lorg/w3c/dom/Node;)Ljavax/imageio/plugins/tiff/TIFFField;
+ (Ljavax/imageio/plugins/tiff/TIFFTagSet;Lorg/w3c/dom/Node;)L1javax/imageio/plugins/tiff/TIFFField;
 getTypeByName
  (Ljava/lang/String;)I
  (Ljava/lang/String;)I
@@ -48,7 +48,7 @@ getAsLongs
  ()[J
 getAsNativeNode
  ()Lorg/w3c/dom/Node;
- ()Lorg/w3c/dom/Node;
+ ()L1org/w3c/dom/Node;
 getAsRational
  (I)[J
  (I)[J
diff --git a/libs/eea-java-11/src/main/resources/javax/imageio/plugins/tiff/TIFFTag.eea b/libs/eea-java-11/src/main/resources/javax/imageio/plugins/tiff/TIFFTag.eea
index 1725fdf287..409fb8f1a3 100644
--- a/libs/eea-java-11/src/main/resources/javax/imageio/plugins/tiff/TIFFTag.eea
+++ b/libs/eea-java-11/src/main/resources/javax/imageio/plugins/tiff/TIFFTag.eea
@@ -21,10 +21,10 @@ getName
  ()Ljava/lang/String;
 getNamedValues
  ()[I
- ()[I
+ ()[1I
 getTagSet
  ()Ljavax/imageio/plugins/tiff/TIFFTagSet;
  ()Ljavax/imageio/plugins/tiff/TIFFTagSet;
 getValueName
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/imageio/spi/IIORegistry.eea b/libs/eea-java-11/src/main/resources/javax/imageio/spi/IIORegistry.eea
index 5ed8f1dbe8..35370f0254 100644
--- a/libs/eea-java-11/src/main/resources/javax/imageio/spi/IIORegistry.eea
+++ b/libs/eea-java-11/src/main/resources/javax/imageio/spi/IIORegistry.eea
@@ -2,4 +2,4 @@ class javax/imageio/spi/IIORegistry
 
 getDefaultInstance
  ()Ljavax/imageio/spi/IIORegistry;
- ()Ljavax/imageio/spi/IIORegistry;
+ ()L1javax/imageio/spi/IIORegistry;
diff --git a/libs/eea-java-11/src/main/resources/javax/imageio/spi/ImageInputStreamSpi.eea b/libs/eea-java-11/src/main/resources/javax/imageio/spi/ImageInputStreamSpi.eea
index bdb8677eaa..50f1207a4d 100644
--- a/libs/eea-java-11/src/main/resources/javax/imageio/spi/ImageInputStreamSpi.eea
+++ b/libs/eea-java-11/src/main/resources/javax/imageio/spi/ImageInputStreamSpi.eea
@@ -9,10 +9,10 @@ inputClass
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Class<*>;)V
 createInputStreamInstance
  (Ljava/lang/Object;)Ljavax/imageio/stream/ImageInputStream;
- (Ljava/lang/Object;)Ljavax/imageio/stream/ImageInputStream;
+ (Ljava/lang/Object;)L1javax/imageio/stream/ImageInputStream;
 createInputStreamInstance
  (Ljava/lang/Object;ZLjava/io/File;)Ljavax/imageio/stream/ImageInputStream;
- (Ljava/lang/Object;ZLjava/io/File;)Ljavax/imageio/stream/ImageInputStream;
+ (Ljava/lang/Object;ZLjava/io/File;)L1javax/imageio/stream/ImageInputStream;
 getInputClass
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
diff --git a/libs/eea-java-11/src/main/resources/javax/imageio/spi/ImageOutputStreamSpi.eea b/libs/eea-java-11/src/main/resources/javax/imageio/spi/ImageOutputStreamSpi.eea
index e0e3957b93..23a3557a01 100644
--- a/libs/eea-java-11/src/main/resources/javax/imageio/spi/ImageOutputStreamSpi.eea
+++ b/libs/eea-java-11/src/main/resources/javax/imageio/spi/ImageOutputStreamSpi.eea
@@ -9,10 +9,10 @@ outputClass
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Class<*>;)V
 createOutputStreamInstance
  (Ljava/lang/Object;)Ljavax/imageio/stream/ImageOutputStream;
- (Ljava/lang/Object;)Ljavax/imageio/stream/ImageOutputStream;
+ (Ljava/lang/Object;)L1javax/imageio/stream/ImageOutputStream;
 createOutputStreamInstance
  (Ljava/lang/Object;ZLjava/io/File;)Ljavax/imageio/stream/ImageOutputStream;
- (Ljava/lang/Object;ZLjava/io/File;)Ljavax/imageio/stream/ImageOutputStream;
+ (Ljava/lang/Object;ZLjava/io/File;)L1javax/imageio/stream/ImageOutputStream;
 getOutputClass
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
diff --git a/libs/eea-java-11/src/main/resources/javax/imageio/spi/ImageReaderSpi.eea b/libs/eea-java-11/src/main/resources/javax/imageio/spi/ImageReaderSpi.eea
index c8f60c8cbb..68b9f0578e 100644
--- a/libs/eea-java-11/src/main/resources/javax/imageio/spi/ImageReaderSpi.eea
+++ b/libs/eea-java-11/src/main/resources/javax/imageio/spi/ImageReaderSpi.eea
@@ -19,10 +19,10 @@ canDecodeInput
  (Ljava/lang/Object;)Z
 createReaderInstance
  ()Ljavax/imageio/ImageReader;
- ()Ljavax/imageio/ImageReader;
+ ()L1javax/imageio/ImageReader;
 createReaderInstance
  (Ljava/lang/Object;)Ljavax/imageio/ImageReader;
- (Ljava/lang/Object;)Ljavax/imageio/ImageReader;
+ (Ljava/lang/Object;)L1javax/imageio/ImageReader;
 getImageWriterSpiNames
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/imageio/spi/ImageTranscoderSpi.eea b/libs/eea-java-11/src/main/resources/javax/imageio/spi/ImageTranscoderSpi.eea
index ac15c2cd7a..d10514c15d 100644
--- a/libs/eea-java-11/src/main/resources/javax/imageio/spi/ImageTranscoderSpi.eea
+++ b/libs/eea-java-11/src/main/resources/javax/imageio/spi/ImageTranscoderSpi.eea
@@ -5,7 +5,7 @@ class javax/imageio/spi/ImageTranscoderSpi
  (Ljava/lang/String;Ljava/lang/String;)V
 createTranscoderInstance
  ()Ljavax/imageio/ImageTranscoder;
- ()Ljavax/imageio/ImageTranscoder;
+ ()L1javax/imageio/ImageTranscoder;
 getReaderServiceProviderName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/imageio/spi/ImageWriterSpi.eea b/libs/eea-java-11/src/main/resources/javax/imageio/spi/ImageWriterSpi.eea
index d9a3884876..bb7136daf8 100644
--- a/libs/eea-java-11/src/main/resources/javax/imageio/spi/ImageWriterSpi.eea
+++ b/libs/eea-java-11/src/main/resources/javax/imageio/spi/ImageWriterSpi.eea
@@ -22,10 +22,10 @@ canEncodeImage
  (Ljavax/imageio/ImageTypeSpecifier;)Z
 createWriterInstance
  ()Ljavax/imageio/ImageWriter;
- ()Ljavax/imageio/ImageWriter;
+ ()L1javax/imageio/ImageWriter;
 createWriterInstance
  (Ljava/lang/Object;)Ljavax/imageio/ImageWriter;
- (Ljava/lang/Object;)Ljavax/imageio/ImageWriter;
+ (Ljava/lang/Object;)L1javax/imageio/ImageWriter;
 getImageReaderSpiNames
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/imageio/spi/ServiceRegistry.eea b/libs/eea-java-11/src/main/resources/javax/imageio/spi/ServiceRegistry.eea
index 8d77a7663a..b45f2e88cd 100644
--- a/libs/eea-java-11/src/main/resources/javax/imageio/spi/ServiceRegistry.eea
+++ b/libs/eea-java-11/src/main/resources/javax/imageio/spi/ServiceRegistry.eea
@@ -27,10 +27,10 @@ getCategories
  ()Ljava/util/Iterator<Ljava/lang/Class<*>;>;
 getServiceProviderByClass
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)T0T;
 getServiceProviders
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljavax/imageio/spi/ServiceRegistry$Filter;Z)Ljava/util/Iterator<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljavax/imageio/spi/ServiceRegistry$Filter;Z)Ljava/util/Iterator<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljavax/imageio/spi/ServiceRegistry$Filter;Z)L1java/util/Iterator<TT;>;
 getServiceProviders
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Z)Ljava/util/Iterator<TT;>;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Z)Ljava/util/Iterator<TT;>;
diff --git a/libs/eea-java-11/src/main/resources/javax/lang/model/element/ModuleElement$DirectiveVisitor.eea b/libs/eea-java-11/src/main/resources/javax/lang/model/element/ModuleElement$DirectiveVisitor.eea
index 0189cdee69..e8659adc82 100644
--- a/libs/eea-java-11/src/main/resources/javax/lang/model/element/ModuleElement$DirectiveVisitor.eea
+++ b/libs/eea-java-11/src/main/resources/javax/lang/model/element/ModuleElement$DirectiveVisitor.eea
@@ -22,7 +22,7 @@ visitRequires
  (Ljavax/lang/model/element/ModuleElement$RequiresDirective;TP;)TR;
 visitUnknown
  (Ljavax/lang/model/element/ModuleElement$Directive;TP;)TR;
- (Ljavax/lang/model/element/ModuleElement$Directive;TP;)TR;
+ (Ljavax/lang/model/element/ModuleElement$Directive;TP;)T1R;
 visitUses
  (Ljavax/lang/model/element/ModuleElement$UsesDirective;TP;)TR;
  (Ljavax/lang/model/element/ModuleElement$UsesDirective;TP;)TR;
diff --git a/libs/eea-java-11/src/main/resources/javax/lang/model/util/AbstractAnnotationValueVisitor6.eea b/libs/eea-java-11/src/main/resources/javax/lang/model/util/AbstractAnnotationValueVisitor6.eea
index 1ba2cd34e2..e85c4e1458 100644
--- a/libs/eea-java-11/src/main/resources/javax/lang/model/util/AbstractAnnotationValueVisitor6.eea
+++ b/libs/eea-java-11/src/main/resources/javax/lang/model/util/AbstractAnnotationValueVisitor6.eea
@@ -14,4 +14,4 @@ visit
  (Ljavax/lang/model/element/AnnotationValue;TP;)TR;
 visitUnknown
  (Ljavax/lang/model/element/AnnotationValue;TP;)TR;
- (Ljavax/lang/model/element/AnnotationValue;TP;)TR;
+ (Ljavax/lang/model/element/AnnotationValue;TP;)T1R;
diff --git a/libs/eea-java-11/src/main/resources/javax/lang/model/util/Elements.eea b/libs/eea-java-11/src/main/resources/javax/lang/model/util/Elements.eea
index e79b44727f..25d9f4f446 100644
--- a/libs/eea-java-11/src/main/resources/javax/lang/model/util/Elements.eea
+++ b/libs/eea-java-11/src/main/resources/javax/lang/model/util/Elements.eea
@@ -29,10 +29,10 @@ getElementValuesWithDefaults
  (Ljavax/lang/model/element/AnnotationMirror;)Ljava/util/Map<+Ljavax/lang/model/element/ExecutableElement;+Ljavax/lang/model/element/AnnotationValue;>;
 getModuleElement
  (Ljava/lang/CharSequence;)Ljavax/lang/model/element/ModuleElement;
- (Ljava/lang/CharSequence;)Ljavax/lang/model/element/ModuleElement;
+ (Ljava/lang/CharSequence;)L0javax/lang/model/element/ModuleElement;
 getModuleOf
  (Ljavax/lang/model/element/Element;)Ljavax/lang/model/element/ModuleElement;
- (Ljavax/lang/model/element/Element;)Ljavax/lang/model/element/ModuleElement;
+ (Ljavax/lang/model/element/Element;)L0javax/lang/model/element/ModuleElement;
 getName
  (Ljava/lang/CharSequence;)Ljavax/lang/model/element/Name;
  (Ljava/lang/CharSequence;)Ljavax/lang/model/element/Name;
@@ -50,7 +50,7 @@ getPackageElement
  (Ljava/lang/CharSequence;)Ljavax/lang/model/element/PackageElement;
 getPackageElement
  (Ljavax/lang/model/element/ModuleElement;Ljava/lang/CharSequence;)Ljavax/lang/model/element/PackageElement;
- (Ljavax/lang/model/element/ModuleElement;Ljava/lang/CharSequence;)Ljavax/lang/model/element/PackageElement;
+ (Ljavax/lang/model/element/ModuleElement;Ljava/lang/CharSequence;)L0javax/lang/model/element/PackageElement;
 getPackageOf
  (Ljavax/lang/model/element/Element;)Ljavax/lang/model/element/PackageElement;
  (L1javax/lang/model/element/Element;)L0javax/lang/model/element/PackageElement;
@@ -59,7 +59,7 @@ getTypeElement
  (Ljava/lang/CharSequence;)Ljavax/lang/model/element/TypeElement;
 getTypeElement
  (Ljavax/lang/model/element/ModuleElement;Ljava/lang/CharSequence;)Ljavax/lang/model/element/TypeElement;
- (Ljavax/lang/model/element/ModuleElement;Ljava/lang/CharSequence;)Ljavax/lang/model/element/TypeElement;
+ (Ljavax/lang/model/element/ModuleElement;Ljava/lang/CharSequence;)L0javax/lang/model/element/TypeElement;
 hides
  (Ljavax/lang/model/element/Element;Ljavax/lang/model/element/Element;)Z
  (Ljavax/lang/model/element/Element;Ljavax/lang/model/element/Element;)Z
diff --git a/libs/eea-java-11/src/main/resources/javax/management/AttributeValueExp.eea b/libs/eea-java-11/src/main/resources/javax/management/AttributeValueExp.eea
index 2ef9478507..31153855f3 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/AttributeValueExp.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/AttributeValueExp.eea
@@ -5,10 +5,10 @@ class javax/management/AttributeValueExp
  (Ljava/lang/String;)V
 apply
  (Ljavax/management/ObjectName;)Ljavax/management/ValueExp;
- (Ljavax/management/ObjectName;)Ljavax/management/ValueExp;
+ (Ljavax/management/ObjectName;)L1javax/management/ValueExp;
 getAttribute
  (Ljavax/management/ObjectName;)Ljava/lang/Object;
- (Ljavax/management/ObjectName;)Ljava/lang/Object;
+ (Ljavax/management/ObjectName;)L0java/lang/Object;
 getAttributeName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/management/ImmutableDescriptor.eea b/libs/eea-java-11/src/main/resources/javax/management/ImmutableDescriptor.eea
index dd72371f5b..56eeba7410 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/ImmutableDescriptor.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/ImmutableDescriptor.eea
@@ -28,13 +28,13 @@ getFieldNames
  ()[Ljava/lang/String;
 getFieldValue
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 getFieldValues
  ([Ljava/lang/String;)[Ljava/lang/Object;
  ([Ljava/lang/String;)[Ljava/lang/Object;
 getFields
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 removeField
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/management/MBeanServer.eea b/libs/eea-java-11/src/main/resources/javax/management/MBeanServer.eea
index ace980f19e..8374a8319a 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/MBeanServer.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/MBeanServer.eea
@@ -8,25 +8,25 @@ addNotificationListener
  (Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/management/NotificationFilter;Ljava/lang/Object;)V
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;)L1javax/management/ObjectInstance; # @Inherited(javax.management.MBeanServerConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;)L1javax/management/ObjectInstance; # @Inherited(javax.management.MBeanServerConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)L1javax/management/ObjectInstance; # @Inherited(javax.management.MBeanServerConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)L1javax/management/ObjectInstance; # @Inherited(javax.management.MBeanServerConnection)
 deserialize
  (Ljava/lang/String;Ljavax/management/ObjectName;[B)Ljava/io/ObjectInputStream;
- (Ljava/lang/String;Ljavax/management/ObjectName;[B)Ljava/io/ObjectInputStream;
+ (Ljava/lang/String;Ljavax/management/ObjectName;[B)L1java/io/ObjectInputStream;
 deserialize
  (Ljava/lang/String;[B)Ljava/io/ObjectInputStream;
- (Ljava/lang/String;[B)Ljava/io/ObjectInputStream;
+ (Ljava/lang/String;[B)L1java/io/ObjectInputStream;
 deserialize
  (Ljavax/management/ObjectName;[B)Ljava/io/ObjectInputStream;
- (Ljavax/management/ObjectName;[B)Ljava/io/ObjectInputStream;
+ (Ljavax/management/ObjectName;[B)L1java/io/ObjectInputStream;
 getAttribute
  (Ljavax/management/ObjectName;Ljava/lang/String;)Ljava/lang/Object;
  (Ljavax/management/ObjectName;Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-java-11/src/main/resources/javax/management/MBeanServerConnection.eea b/libs/eea-java-11/src/main/resources/javax/management/MBeanServerConnection.eea
index 3e8b9137df..63f9696e18 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/MBeanServerConnection.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/MBeanServerConnection.eea
@@ -8,16 +8,16 @@ addNotificationListener
  (Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/management/NotificationFilter;Ljava/lang/Object;)V
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;)L1javax/management/ObjectInstance;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;)L1javax/management/ObjectInstance;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)L1javax/management/ObjectInstance;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)L1javax/management/ObjectInstance;
 getAttribute
  (Ljavax/management/ObjectName;Ljava/lang/String;)Ljava/lang/Object;
  (Ljavax/management/ObjectName;Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-java-11/src/main/resources/javax/management/MBeanServerDelegate.eea b/libs/eea-java-11/src/main/resources/javax/management/MBeanServerDelegate.eea
index 06779316b8..68cffe6af6 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/MBeanServerDelegate.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/MBeanServerDelegate.eea
@@ -9,10 +9,10 @@ addNotificationListener
  (Ljavax/management/NotificationListener;Ljavax/management/NotificationFilter;Ljava/lang/Object;)V
 getImplementationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getImplementationVendor
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getImplementationVersion
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -21,16 +21,16 @@ getMBeanServerId
  ()Ljava/lang/String;
 getNotificationInfo
  ()[Ljavax/management/MBeanNotificationInfo;
- ()[Ljavax/management/MBeanNotificationInfo;
+ ()[1Ljavax/management/MBeanNotificationInfo;
 getSpecificationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSpecificationVendor
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSpecificationVersion
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 removeNotificationListener
  (Ljavax/management/NotificationListener;)V
  (L1javax/management/NotificationListener;)V # @Inherited(javax.management.NotificationBroadcaster)
diff --git a/libs/eea-java-11/src/main/resources/javax/management/ObjectName.eea b/libs/eea-java-11/src/main/resources/javax/management/ObjectName.eea
index 393f5d0eae..6321ded6d2 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/ObjectName.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/ObjectName.eea
@@ -10,22 +10,22 @@ WILDCARD
 
 getInstance
  (Ljava/lang/String;)Ljavax/management/ObjectName;
- (Ljava/lang/String;)Ljavax/management/ObjectName;
+ (Ljava/lang/String;)L1javax/management/ObjectName;
 getInstance
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/management/ObjectName;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/management/ObjectName;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1javax/management/ObjectName;
 getInstance
  (Ljava/lang/String;Ljava/util/Hashtable<Ljava/lang/String;Ljava/lang/String;>;)Ljavax/management/ObjectName;
- (Ljava/lang/String;Ljava/util/Hashtable<Ljava/lang/String;Ljava/lang/String;>;)Ljavax/management/ObjectName;
+ (Ljava/lang/String;Ljava/util/Hashtable<Ljava/lang/String;Ljava/lang/String;>;)L1javax/management/ObjectName;
 getInstance
  (Ljavax/management/ObjectName;)Ljavax/management/ObjectName;
  (Ljavax/management/ObjectName;)Ljavax/management/ObjectName;
 quote
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 unquote
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 
 <init>
  (Ljava/lang/String;)V
@@ -59,10 +59,10 @@ getKeyProperty
  (Ljava/lang/String;)Ljava/lang/String;
 getKeyPropertyList
  ()Ljava/util/Hashtable<Ljava/lang/String;Ljava/lang/String;>;
- ()Ljava/util/Hashtable<Ljava/lang/String;Ljava/lang/String;>;
+ ()L1java/util/Hashtable<Ljava/lang/String;Ljava/lang/String;>;
 getKeyPropertyListString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 isPropertyValuePattern
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-java-11/src/main/resources/javax/management/Query.eea b/libs/eea-java-11/src/main/resources/javax/management/Query.eea
index cd19300a3b..f6b1f455d8 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/Query.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/Query.eea
@@ -2,22 +2,22 @@ class javax/management/Query
 
 and
  (Ljavax/management/QueryExp;Ljavax/management/QueryExp;)Ljavax/management/QueryExp;
- (Ljavax/management/QueryExp;Ljavax/management/QueryExp;)Ljavax/management/QueryExp;
+ (Ljavax/management/QueryExp;Ljavax/management/QueryExp;)L1javax/management/QueryExp;
 anySubString
  (Ljavax/management/AttributeValueExp;Ljavax/management/StringValueExp;)Ljavax/management/QueryExp;
  (Ljavax/management/AttributeValueExp;Ljavax/management/StringValueExp;)Ljavax/management/QueryExp;
 attr
  (Ljava/lang/String;)Ljavax/management/AttributeValueExp;
- (Ljava/lang/String;)Ljavax/management/AttributeValueExp;
+ (Ljava/lang/String;)L1javax/management/AttributeValueExp;
 attr
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/management/AttributeValueExp;
- (Ljava/lang/String;Ljava/lang/String;)Ljavax/management/AttributeValueExp;
+ (Ljava/lang/String;Ljava/lang/String;)L1javax/management/AttributeValueExp;
 between
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/QueryExp;
- (Ljavax/management/ValueExp;Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/QueryExp;
+ (Ljavax/management/ValueExp;Ljavax/management/ValueExp;Ljavax/management/ValueExp;)L1javax/management/QueryExp;
 classattr
  ()Ljavax/management/AttributeValueExp;
- ()Ljavax/management/AttributeValueExp;
+ ()L1javax/management/AttributeValueExp;
 div
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/ValueExp;
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/ValueExp;
@@ -35,13 +35,13 @@ gt
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/QueryExp;
 in
  (Ljavax/management/ValueExp;[Ljavax/management/ValueExp;)Ljavax/management/QueryExp;
- (Ljavax/management/ValueExp;[Ljavax/management/ValueExp;)Ljavax/management/QueryExp;
+ (Ljavax/management/ValueExp;[Ljavax/management/ValueExp;)L1javax/management/QueryExp;
 initialSubString
  (Ljavax/management/AttributeValueExp;Ljavax/management/StringValueExp;)Ljavax/management/QueryExp;
  (Ljavax/management/AttributeValueExp;Ljavax/management/StringValueExp;)Ljavax/management/QueryExp;
 isInstanceOf
  (Ljavax/management/StringValueExp;)Ljavax/management/QueryExp;
- (Ljavax/management/StringValueExp;)Ljavax/management/QueryExp;
+ (Ljavax/management/StringValueExp;)L1javax/management/QueryExp;
 leq
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/QueryExp;
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/QueryExp;
@@ -50,16 +50,16 @@ lt
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/QueryExp;
 match
  (Ljavax/management/AttributeValueExp;Ljavax/management/StringValueExp;)Ljavax/management/QueryExp;
- (Ljavax/management/AttributeValueExp;Ljavax/management/StringValueExp;)Ljavax/management/QueryExp;
+ (Ljavax/management/AttributeValueExp;Ljavax/management/StringValueExp;)L1javax/management/QueryExp;
 minus
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/ValueExp;
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/ValueExp;
 not
  (Ljavax/management/QueryExp;)Ljavax/management/QueryExp;
- (Ljavax/management/QueryExp;)Ljavax/management/QueryExp;
+ (Ljavax/management/QueryExp;)L1javax/management/QueryExp;
 or
  (Ljavax/management/QueryExp;Ljavax/management/QueryExp;)Ljavax/management/QueryExp;
- (Ljavax/management/QueryExp;Ljavax/management/QueryExp;)Ljavax/management/QueryExp;
+ (Ljavax/management/QueryExp;Ljavax/management/QueryExp;)L1javax/management/QueryExp;
 plus
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/ValueExp;
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/ValueExp;
@@ -68,7 +68,7 @@ times
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/ValueExp;
 value
  (D)Ljavax/management/ValueExp;
- (D)Ljavax/management/ValueExp;
+ (D)L1javax/management/ValueExp;
 value
  (F)Ljavax/management/ValueExp;
  (F)Ljavax/management/ValueExp;
@@ -77,13 +77,13 @@ value
  (I)Ljavax/management/ValueExp;
 value
  (J)Ljavax/management/ValueExp;
- (J)Ljavax/management/ValueExp;
+ (J)L1javax/management/ValueExp;
 value
  (Ljava/lang/Number;)Ljavax/management/ValueExp;
- (Ljava/lang/Number;)Ljavax/management/ValueExp;
+ (Ljava/lang/Number;)L1javax/management/ValueExp;
 value
  (Ljava/lang/String;)Ljavax/management/StringValueExp;
- (Ljava/lang/String;)Ljavax/management/StringValueExp;
+ (Ljava/lang/String;)L1javax/management/StringValueExp;
 value
  (Z)Ljavax/management/ValueExp;
- (Z)Ljavax/management/ValueExp;
+ (Z)L1javax/management/ValueExp;
diff --git a/libs/eea-java-11/src/main/resources/javax/management/StandardMBean.eea b/libs/eea-java-11/src/main/resources/javax/management/StandardMBean.eea
index ee6a5a71b8..97a3168b1a 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/StandardMBean.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/StandardMBean.eea
@@ -29,7 +29,7 @@ getClassName
  (Ljavax/management/MBeanInfo;)Ljava/lang/String;
 getConstructors
  ([Ljavax/management/MBeanConstructorInfo;Ljava/lang/Object;)[Ljavax/management/MBeanConstructorInfo;
- ([Ljavax/management/MBeanConstructorInfo;Ljava/lang/Object;)[Ljavax/management/MBeanConstructorInfo;
+ ([Ljavax/management/MBeanConstructorInfo;Ljava/lang/Object;)[0Ljavax/management/MBeanConstructorInfo;
 getDescription
  (Ljavax/management/MBeanAttributeInfo;)Ljava/lang/String;
  (Ljavax/management/MBeanAttributeInfo;)Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/management/loading/MLet.eea b/libs/eea-java-11/src/main/resources/javax/management/loading/MLet.eea
index 01bfee50f3..f154266682 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/loading/MLet.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/loading/MLet.eea
@@ -38,7 +38,7 @@ getLibraryDirectory
  ()Ljava/lang/String;
 getMBeansFromURL
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/Object;>;
- (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/Object;>;
+ (Ljava/lang/String;)L1java/util/Set<Ljava/lang/Object;>;
 getMBeansFromURL
  (Ljava/net/URL;)Ljava/util/Set<Ljava/lang/Object;>;
  (Ljava/net/URL;)Ljava/util/Set<Ljava/lang/Object;>;
diff --git a/libs/eea-java-11/src/main/resources/javax/management/modelmbean/DescriptorSupport.eea b/libs/eea-java-11/src/main/resources/javax/management/modelmbean/DescriptorSupport.eea
index 68c5d4b998..c02a2b7478 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/modelmbean/DescriptorSupport.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/modelmbean/DescriptorSupport.eea
@@ -20,16 +20,16 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getFieldNames
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 getFieldValue
  (Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;)Ljava/lang/Object;
 getFieldValues
  ([Ljava/lang/String;)[Ljava/lang/Object;
- ([Ljava/lang/String;)[Ljava/lang/Object;
+ ([Ljava/lang/String;)[1Ljava/lang/Object;
 getFields
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 removeField
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
@@ -44,4 +44,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toXMLString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/management/modelmbean/ModelMBeanInfoSupport.eea b/libs/eea-java-11/src/main/resources/javax/management/modelmbean/ModelMBeanInfoSupport.eea
index fd479f4e3d..32cd11d118 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/modelmbean/ModelMBeanInfoSupport.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/modelmbean/ModelMBeanInfoSupport.eea
@@ -26,10 +26,10 @@ getDescriptor
  (Ljava/lang/String;)Ljavax/management/Descriptor;
 getDescriptor
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/management/Descriptor;
- (Ljava/lang/String;Ljava/lang/String;)Ljavax/management/Descriptor;
+ (Ljava/lang/String;Ljava/lang/String;)L0javax/management/Descriptor;
 getDescriptors
  (Ljava/lang/String;)[Ljavax/management/Descriptor;
- (Ljava/lang/String;)[Ljavax/management/Descriptor;
+ (Ljava/lang/String;)[1Ljavax/management/Descriptor;
 getMBeanDescriptor
  ()Ljavax/management/Descriptor;
  ()Ljavax/management/Descriptor;
diff --git a/libs/eea-java-11/src/main/resources/javax/management/modelmbean/RequiredModelMBean.eea b/libs/eea-java-11/src/main/resources/javax/management/modelmbean/RequiredModelMBean.eea
index 63a295a360..afcb47b9ad 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/modelmbean/RequiredModelMBean.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/modelmbean/RequiredModelMBean.eea
@@ -14,7 +14,7 @@ getAttribute
  (Ljava/lang/String;)Ljava/lang/Object;
 getAttributes
  ([Ljava/lang/String;)Ljavax/management/AttributeList;
- ([Ljava/lang/String;)Ljavax/management/AttributeList;
+ ([Ljava/lang/String;)L1javax/management/AttributeList;
 getClassLoaderRepository
  ()Ljavax/management/loading/ClassLoaderRepository;
  ()Ljavax/management/loading/ClassLoaderRepository;
@@ -23,7 +23,7 @@ getMBeanInfo
  ()Ljavax/management/MBeanInfo;
 getNotificationInfo
  ()[Ljavax/management/MBeanNotificationInfo;
- ()[Ljavax/management/MBeanNotificationInfo;
+ ()[1Ljavax/management/MBeanNotificationInfo;
 invoke
  (Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/String;)Ljava/lang/Object;
@@ -59,7 +59,7 @@ setAttribute
  (Ljavax/management/Attribute;)V
 setAttributes
  (Ljavax/management/AttributeList;)Ljavax/management/AttributeList;
- (Ljavax/management/AttributeList;)Ljavax/management/AttributeList;
+ (Ljavax/management/AttributeList;)L1javax/management/AttributeList;
 setManagedResource
  (Ljava/lang/Object;Ljava/lang/String;)V
  (Ljava/lang/Object;Ljava/lang/String;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/management/monitor/CounterMonitor.eea b/libs/eea-java-11/src/main/resources/javax/management/monitor/CounterMonitor.eea
index 7368488e56..6bae4aa0e8 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/monitor/CounterMonitor.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/monitor/CounterMonitor.eea
@@ -2,7 +2,7 @@ class javax/management/monitor/CounterMonitor
 
 getDerivedGauge
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getDerivedGauge
  (Ljavax/management/ObjectName;)Ljava/lang/Number;
  (Ljavax/management/ObjectName;)Ljava/lang/Number;
@@ -26,7 +26,7 @@ getThreshold
  ()Ljava/lang/Number;
 getThreshold
  (Ljavax/management/ObjectName;)Ljava/lang/Number;
- (Ljavax/management/ObjectName;)Ljava/lang/Number;
+ (Ljavax/management/ObjectName;)L0java/lang/Number;
 setInitThreshold
  (Ljava/lang/Number;)V
  (Ljava/lang/Number;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/management/monitor/GaugeMonitor.eea b/libs/eea-java-11/src/main/resources/javax/management/monitor/GaugeMonitor.eea
index 9a43814c34..7bcbaf5b48 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/monitor/GaugeMonitor.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/monitor/GaugeMonitor.eea
@@ -2,7 +2,7 @@ class javax/management/monitor/GaugeMonitor
 
 getDerivedGauge
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getDerivedGauge
  (Ljavax/management/ObjectName;)Ljava/lang/Number;
  (Ljavax/management/ObjectName;)Ljava/lang/Number;
diff --git a/libs/eea-java-11/src/main/resources/javax/management/monitor/Monitor.eea b/libs/eea-java-11/src/main/resources/javax/management/monitor/Monitor.eea
index 993e9e2570..8382b4d672 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/monitor/Monitor.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/monitor/Monitor.eea
@@ -21,10 +21,10 @@ getObservedAttribute
  ()Ljava/lang/String;
 getObservedObject
  ()Ljavax/management/ObjectName;
- ()Ljavax/management/ObjectName;
+ ()L0javax/management/ObjectName;
 getObservedObjects
  ()[Ljavax/management/ObjectName;
- ()[Ljavax/management/ObjectName;
+ ()[1Ljavax/management/ObjectName;
 postRegister
  (Ljava/lang/Boolean;)V
  (Ljava/lang/Boolean;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/management/monitor/StringMonitor.eea b/libs/eea-java-11/src/main/resources/javax/management/monitor/StringMonitor.eea
index acf8c770c2..3c96ff1119 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/monitor/StringMonitor.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/monitor/StringMonitor.eea
@@ -2,7 +2,7 @@ class javax/management/monitor/StringMonitor
 
 getDerivedGauge
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getDerivedGauge
  (Ljavax/management/ObjectName;)Ljava/lang/String;
  (Ljavax/management/ObjectName;)Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/management/openmbean/CompositeDataSupport.eea b/libs/eea-java-11/src/main/resources/javax/management/openmbean/CompositeDataSupport.eea
index a6bc0a2951..d86cbc6fca 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/openmbean/CompositeDataSupport.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/openmbean/CompositeDataSupport.eea
@@ -20,7 +20,7 @@ get
  (Ljava/lang/String;)Ljava/lang/Object;
 getAll
  ([Ljava/lang/String;)[Ljava/lang/Object;
- ([Ljava/lang/String;)[Ljava/lang/Object;
+ ([Ljava/lang/String;)[1Ljava/lang/Object;
 getCompositeType
  ()Ljavax/management/openmbean/CompositeType;
  ()Ljavax/management/openmbean/CompositeType;
diff --git a/libs/eea-java-11/src/main/resources/javax/management/relation/MBeanServerNotificationFilter.eea b/libs/eea-java-11/src/main/resources/javax/management/relation/MBeanServerNotificationFilter.eea
index 3d5e5fac0b..a3df2336fe 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/relation/MBeanServerNotificationFilter.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/relation/MBeanServerNotificationFilter.eea
@@ -8,10 +8,10 @@ enableObjectName
  (Ljavax/management/ObjectName;)V
 getDisabledObjectNames
  ()Ljava/util/Vector<Ljavax/management/ObjectName;>;
- ()Ljava/util/Vector<Ljavax/management/ObjectName;>;
+ ()L0java/util/Vector<Ljavax/management/ObjectName;>;
 getEnabledObjectNames
  ()Ljava/util/Vector<Ljavax/management/ObjectName;>;
- ()Ljava/util/Vector<Ljavax/management/ObjectName;>;
+ ()L0java/util/Vector<Ljavax/management/ObjectName;>;
 isNotificationEnabled
  (Ljavax/management/Notification;)Z
  (Ljavax/management/Notification;)Z
diff --git a/libs/eea-java-11/src/main/resources/javax/management/relation/RelationService.eea b/libs/eea-java-11/src/main/resources/javax/management/relation/RelationService.eea
index 93ec74b4a5..e4b5eeef97 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/relation/RelationService.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/relation/RelationService.eea
@@ -20,19 +20,19 @@ createRelationType
  (Ljava/lang/String;[Ljavax/management/relation/RoleInfo;)V
 findAssociatedMBeans
  (Ljavax/management/ObjectName;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map<Ljavax/management/ObjectName;Ljava/util/List<Ljava/lang/String;>;>;
- (Ljavax/management/ObjectName;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map<Ljavax/management/ObjectName;Ljava/util/List<Ljava/lang/String;>;>;
+ (Ljavax/management/ObjectName;Ljava/lang/String;Ljava/lang/String;)L1java/util/Map<Ljavax/management/ObjectName;Ljava/util/List<Ljava/lang/String;>;>;
 findReferencingRelations
  (Ljavax/management/ObjectName;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;
- (Ljavax/management/ObjectName;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;
+ (Ljavax/management/ObjectName;Ljava/lang/String;Ljava/lang/String;)L1java/util/Map<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;
 findRelationsOfType
  (Ljava/lang/String;)Ljava/util/List<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/List<Ljava/lang/String;>;
+ (Ljava/lang/String;)L1java/util/List<Ljava/lang/String;>;
 getAllRelationIds
  ()Ljava/util/List<Ljava/lang/String;>;
- ()Ljava/util/List<Ljava/lang/String;>;
+ ()L1java/util/List<Ljava/lang/String;>;
 getAllRelationTypeNames
  ()Ljava/util/List<Ljava/lang/String;>;
- ()Ljava/util/List<Ljava/lang/String;>;
+ ()L1java/util/List<Ljava/lang/String;>;
 getAllRoles
  (Ljava/lang/String;)Ljavax/management/relation/RoleResult;
  (Ljava/lang/String;)Ljavax/management/relation/RoleResult;
@@ -47,7 +47,7 @@ getRelationTypeName
  (Ljava/lang/String;)Ljava/lang/String;
 getRole
  (Ljava/lang/String;Ljava/lang/String;)Ljava/util/List<Ljavax/management/ObjectName;>;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/util/List<Ljavax/management/ObjectName;>;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/util/List<Ljavax/management/ObjectName;>;
 getRoleCardinality
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Integer;
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Integer;
@@ -71,7 +71,7 @@ isRelation
  (Ljavax/management/ObjectName;)Ljava/lang/String;
 isRelationMBean
  (Ljava/lang/String;)Ljavax/management/ObjectName;
- (Ljava/lang/String;)Ljavax/management/ObjectName;
+ (Ljava/lang/String;)L0javax/management/ObjectName;
 postRegister
  (Ljava/lang/Boolean;)V
  (Ljava/lang/Boolean;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/management/relation/RelationSupport.eea b/libs/eea-java-11/src/main/resources/javax/management/relation/RelationSupport.eea
index dd3350e0fa..caa6b49a8e 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/relation/RelationSupport.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/relation/RelationSupport.eea
@@ -11,7 +11,7 @@ getAllRoles
  ()Ljavax/management/relation/RoleResult;
 getReferencedMBeans
  ()Ljava/util/Map<Ljavax/management/ObjectName;Ljava/util/List<Ljava/lang/String;>;>;
- ()Ljava/util/Map<Ljavax/management/ObjectName;Ljava/util/List<Ljava/lang/String;>;>;
+ ()L1java/util/Map<Ljavax/management/ObjectName;Ljava/util/List<Ljava/lang/String;>;>;
 getRelationId
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -44,7 +44,7 @@ preRegister
  (Ljavax/management/MBeanServer;Ljavax/management/ObjectName;)Ljavax/management/ObjectName;
 retrieveAllRoles
  ()Ljavax/management/relation/RoleList;
- ()Ljavax/management/relation/RoleList;
+ ()L1javax/management/relation/RoleList;
 setRelationServiceManagementFlag
  (Ljava/lang/Boolean;)V
  (Ljava/lang/Boolean;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/management/relation/RelationTypeSupport.eea b/libs/eea-java-11/src/main/resources/javax/management/relation/RelationTypeSupport.eea
index f4dab79cc4..56712c5bf7 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/relation/RelationTypeSupport.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/relation/RelationTypeSupport.eea
@@ -17,4 +17,4 @@ getRoleInfo
  (Ljava/lang/String;)Ljavax/management/relation/RoleInfo;
 getRoleInfos
  ()Ljava/util/List<Ljavax/management/relation/RoleInfo;>;
- ()Ljava/util/List<Ljavax/management/relation/RoleInfo;>;
+ ()L1java/util/List<Ljavax/management/relation/RoleInfo;>;
diff --git a/libs/eea-java-11/src/main/resources/javax/management/relation/Role.eea b/libs/eea-java-11/src/main/resources/javax/management/relation/Role.eea
index 5e20a76f59..e3385a36ef 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/relation/Role.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/relation/Role.eea
@@ -2,7 +2,7 @@ class javax/management/relation/Role
 
 roleValueToString
  (Ljava/util/List<Ljavax/management/ObjectName;>;)Ljava/lang/String;
- (Ljava/util/List<Ljavax/management/ObjectName;>;)Ljava/lang/String;
+ (Ljava/util/List<Ljavax/management/ObjectName;>;)L1java/lang/String;
 
 <init>
  (Ljava/lang/String;Ljava/util/List<Ljavax/management/ObjectName;>;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIConnection.eea b/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIConnection.eea
index 1934fdb326..739f21e022 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIConnection.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIConnection.eea
@@ -8,16 +8,16 @@ addNotificationListeners
  ([Ljavax/management/ObjectName;[Ljava/rmi/MarshalledObject;[Ljavax/security/auth/Subject;)[Ljava/lang/Integer;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance;
 fetchNotifications
  (JIJ)Ljavax/management/remote/NotificationResult;
  (JIJ)Ljavax/management/remote/NotificationResult;
diff --git a/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIConnectionImpl.eea b/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIConnectionImpl.eea
index 0c18f7e290..cab2e91d94 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIConnectionImpl.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIConnectionImpl.eea
@@ -8,22 +8,22 @@ addNotificationListener
  (Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;Ljava/rmi/MarshalledObject;Ljavax/security/auth/Subject;)V
 addNotificationListeners
  ([Ljavax/management/ObjectName;[Ljava/rmi/MarshalledObject;[Ljavax/security/auth/Subject;)[Ljava/lang/Integer;
- ([Ljavax/management/ObjectName;[Ljava/rmi/MarshalledObject;[Ljavax/security/auth/Subject;)[Ljava/lang/Integer;
+ ([Ljavax/management/ObjectName;[Ljava/rmi/MarshalledObject;[Ljavax/security/auth/Subject;)[1Ljava/lang/Integer;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance; # @Inherited(javax.management.remote.rmi.RMIConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance; # @Inherited(javax.management.remote.rmi.RMIConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance; # @Inherited(javax.management.remote.rmi.RMIConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance; # @Inherited(javax.management.remote.rmi.RMIConnection)
 fetchNotifications
  (JIJ)Ljavax/management/remote/NotificationResult;
- (JIJ)Ljavax/management/remote/NotificationResult;
+ (JIJ)L0javax/management/remote/NotificationResult;
 getAttribute
  (Ljavax/management/ObjectName;Ljava/lang/String;Ljavax/security/auth/Subject;)Ljava/lang/Object;
  (Ljavax/management/ObjectName;Ljava/lang/String;Ljavax/security/auth/Subject;)Ljava/lang/Object;
diff --git a/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIConnectionImpl_Stub.eea b/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIConnectionImpl_Stub.eea
index 69225c12db..d5ae39362c 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIConnectionImpl_Stub.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIConnectionImpl_Stub.eea
@@ -11,16 +11,16 @@ addNotificationListeners
  ([Ljavax/management/ObjectName;[Ljava/rmi/MarshalledObject;[Ljavax/security/auth/Subject;)[Ljava/lang/Integer;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance; # @Inherited(javax.management.remote.rmi.RMIConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance; # @Inherited(javax.management.remote.rmi.RMIConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance; # @Inherited(javax.management.remote.rmi.RMIConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance; # @Inherited(javax.management.remote.rmi.RMIConnection)
 fetchNotifications
  (JIJ)Ljavax/management/remote/NotificationResult;
  (JIJ)Ljavax/management/remote/NotificationResult;
diff --git a/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIConnectorServer.eea b/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIConnectorServer.eea
index b3c686108a..73f18cefd9 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIConnectorServer.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIConnectorServer.eea
@@ -39,7 +39,7 @@ connectionOpened
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
 getAddress
  ()Ljavax/management/remote/JMXServiceURL;
- ()Ljavax/management/remote/JMXServiceURL;
+ ()L0javax/management/remote/JMXServiceURL;
 getAttributes
  ()Ljava/util/Map<Ljava/lang/String;*>;
  ()Ljava/util/Map<Ljava/lang/String;*>;
@@ -48,4 +48,4 @@ setMBeanServerForwarder
  (Ljavax/management/remote/MBeanServerForwarder;)V
 toJMXConnector
  (Ljava/util/Map<Ljava/lang/String;*>;)Ljavax/management/remote/JMXConnector;
- (Ljava/util/Map<Ljava/lang/String;*>;)Ljavax/management/remote/JMXConnector;
+ (Ljava/util/Map<Ljava/lang/String;*>;)L1javax/management/remote/JMXConnector;
diff --git a/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIIIOPServerImpl.eea b/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIIIOPServerImpl.eea
index 35bbeefc2b..b910ed9f9b 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIIIOPServerImpl.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIIIOPServerImpl.eea
@@ -8,10 +8,10 @@ closeClient
  (Ljavax/management/remote/rmi/RMIConnection;)V
 getProtocol
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 makeClient
  (Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/remote/rmi/RMIConnection;
- (Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/remote/rmi/RMIConnection;
+ (Ljava/lang/String;Ljavax/security/auth/Subject;)L1javax/management/remote/rmi/RMIConnection;
 toStub
  ()Ljava/rmi/Remote;
- ()Ljava/rmi/Remote;
+ ()L1java/rmi/Remote;
diff --git a/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIJRMPServerImpl.eea b/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIJRMPServerImpl.eea
index d1b415967c..e2dc380f4c 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIJRMPServerImpl.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIJRMPServerImpl.eea
@@ -8,10 +8,10 @@ closeClient
  (Ljavax/management/remote/rmi/RMIConnection;)V
 getProtocol
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 makeClient
  (Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/remote/rmi/RMIConnection;
- (Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/remote/rmi/RMIConnection;
+ (Ljava/lang/String;Ljavax/security/auth/Subject;)L1javax/management/remote/rmi/RMIConnection;
 toStub
  ()Ljava/rmi/Remote;
  ()Ljava/rmi/Remote;
diff --git a/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIServerImpl.eea b/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIServerImpl.eea
index ee2dd03dac..77e86a2595 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIServerImpl.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/remote/rmi/RMIServerImpl.eea
@@ -20,7 +20,7 @@ getProtocol
  ()Ljava/lang/String;
 getVersion
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 makeClient
  (Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/remote/rmi/RMIConnection;
  (Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/remote/rmi/RMIConnection;
diff --git a/libs/eea-java-11/src/main/resources/javax/management/timer/Timer.eea b/libs/eea-java-11/src/main/resources/javax/management/timer/Timer.eea
index bf43b96b85..9da1fb6637 100644
--- a/libs/eea-java-11/src/main/resources/javax/management/timer/Timer.eea
+++ b/libs/eea-java-11/src/main/resources/javax/management/timer/Timer.eea
@@ -14,34 +14,34 @@ addNotification
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;Ljava/util/Date;JJZ)Ljava/lang/Integer;
 getAllNotificationIDs
  ()Ljava/util/Vector<Ljava/lang/Integer;>;
- ()Ljava/util/Vector<Ljava/lang/Integer;>;
+ ()L1java/util/Vector<Ljava/lang/Integer;>;
 getDate
  (Ljava/lang/Integer;)Ljava/util/Date;
- (Ljava/lang/Integer;)Ljava/util/Date;
+ (Ljava/lang/Integer;)L0java/util/Date;
 getFixedRate
  (Ljava/lang/Integer;)Ljava/lang/Boolean;
- (Ljava/lang/Integer;)Ljava/lang/Boolean;
+ (Ljava/lang/Integer;)L0java/lang/Boolean;
 getNbOccurences
  (Ljava/lang/Integer;)Ljava/lang/Long;
- (Ljava/lang/Integer;)Ljava/lang/Long;
+ (Ljava/lang/Integer;)L0java/lang/Long;
 getNotificationIDs
  (Ljava/lang/String;)Ljava/util/Vector<Ljava/lang/Integer;>;
- (Ljava/lang/String;)Ljava/util/Vector<Ljava/lang/Integer;>;
+ (Ljava/lang/String;)L1java/util/Vector<Ljava/lang/Integer;>;
 getNotificationInfo
  ()[Ljavax/management/MBeanNotificationInfo;
  ()[Ljavax/management/MBeanNotificationInfo;
 getNotificationMessage
  (Ljava/lang/Integer;)Ljava/lang/String;
- (Ljava/lang/Integer;)Ljava/lang/String;
+ (Ljava/lang/Integer;)L0java/lang/String;
 getNotificationType
  (Ljava/lang/Integer;)Ljava/lang/String;
- (Ljava/lang/Integer;)Ljava/lang/String;
+ (Ljava/lang/Integer;)L0java/lang/String;
 getNotificationUserData
  (Ljava/lang/Integer;)Ljava/lang/Object;
- (Ljava/lang/Integer;)Ljava/lang/Object;
+ (Ljava/lang/Integer;)L0java/lang/Object;
 getPeriod
  (Ljava/lang/Integer;)Ljava/lang/Long;
- (Ljava/lang/Integer;)Ljava/lang/Long;
+ (Ljava/lang/Integer;)L0java/lang/Long;
 postRegister
  (Ljava/lang/Boolean;)V
  (Ljava/lang/Boolean;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/naming/CompositeName.eea b/libs/eea-java-11/src/main/resources/javax/naming/CompositeName.eea
index a353607940..7563c958b9 100644
--- a/libs/eea-java-11/src/main/resources/javax/naming/CompositeName.eea
+++ b/libs/eea-java-11/src/main/resources/javax/naming/CompositeName.eea
@@ -38,10 +38,10 @@ getAll
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
 getPrefix
  (I)Ljavax/naming/Name;
- (I)Ljavax/naming/Name;
+ (I)L1javax/naming/Name;
 getSuffix
  (I)Ljavax/naming/Name;
- (I)Ljavax/naming/Name;
+ (I)L1javax/naming/Name;
 remove
  (I)Ljava/lang/Object;
  (I)Ljava/lang/Object;
diff --git a/libs/eea-java-11/src/main/resources/javax/naming/CompoundName.eea b/libs/eea-java-11/src/main/resources/javax/naming/CompoundName.eea
index 7bc9135079..35c8ed9b25 100644
--- a/libs/eea-java-11/src/main/resources/javax/naming/CompoundName.eea
+++ b/libs/eea-java-11/src/main/resources/javax/naming/CompoundName.eea
@@ -42,10 +42,10 @@ getAll
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
 getPrefix
  (I)Ljavax/naming/Name;
- (I)Ljavax/naming/Name;
+ (I)L1javax/naming/Name;
 getSuffix
  (I)Ljavax/naming/Name;
- (I)Ljavax/naming/Name;
+ (I)L1javax/naming/Name;
 remove
  (I)Ljava/lang/Object;
  (I)Ljava/lang/Object;
diff --git a/libs/eea-java-11/src/main/resources/javax/naming/Context.eea b/libs/eea-java-11/src/main/resources/javax/naming/Context.eea
index d2f162699c..fcfc1da2e1 100644
--- a/libs/eea-java-11/src/main/resources/javax/naming/Context.eea
+++ b/libs/eea-java-11/src/main/resources/javax/naming/Context.eea
@@ -63,10 +63,10 @@ composeName
  (Ljavax/naming/Name;Ljavax/naming/Name;)Ljavax/naming/Name;
 createSubcontext
  (Ljava/lang/String;)Ljavax/naming/Context;
- (Ljava/lang/String;)Ljavax/naming/Context;
+ (Ljava/lang/String;)L1javax/naming/Context;
 createSubcontext
  (Ljavax/naming/Name;)Ljavax/naming/Context;
- (Ljavax/naming/Name;)Ljavax/naming/Context;
+ (Ljavax/naming/Name;)L1javax/naming/Context;
 destroySubcontext
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/naming/InitialContext.eea b/libs/eea-java-11/src/main/resources/javax/naming/InitialContext.eea
index f86cb3b7ce..91526ee959 100644
--- a/libs/eea-java-11/src/main/resources/javax/naming/InitialContext.eea
+++ b/libs/eea-java-11/src/main/resources/javax/naming/InitialContext.eea
@@ -34,10 +34,10 @@ composeName
  (Ljavax/naming/Name;Ljavax/naming/Name;)Ljavax/naming/Name;
 createSubcontext
  (Ljava/lang/String;)Ljavax/naming/Context;
- (Ljava/lang/String;)Ljavax/naming/Context;
+ (Ljava/lang/String;)L1javax/naming/Context; # @Inherited(javax.naming.Context)
 createSubcontext
  (Ljavax/naming/Name;)Ljavax/naming/Context;
- (Ljavax/naming/Name;)Ljavax/naming/Context;
+ (Ljavax/naming/Name;)L1javax/naming/Context; # @Inherited(javax.naming.Context)
 destroySubcontext
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/naming/LinkException.eea b/libs/eea-java-11/src/main/resources/javax/naming/LinkException.eea
index 261faab820..bb01fc325d 100644
--- a/libs/eea-java-11/src/main/resources/javax/naming/LinkException.eea
+++ b/libs/eea-java-11/src/main/resources/javax/naming/LinkException.eea
@@ -45,4 +45,4 @@ toString
  ()L1java/lang/String; # @Inherited(javax.naming.NamingException)
 toString
  (Z)Ljava/lang/String;
- (Z)Ljava/lang/String;
+ (Z)L1java/lang/String; # @Inherited(javax.naming.NamingException)
diff --git a/libs/eea-java-11/src/main/resources/javax/naming/NamingException.eea b/libs/eea-java-11/src/main/resources/javax/naming/NamingException.eea
index c89fcf5bb7..edf12903ea 100644
--- a/libs/eea-java-11/src/main/resources/javax/naming/NamingException.eea
+++ b/libs/eea-java-11/src/main/resources/javax/naming/NamingException.eea
@@ -60,4 +60,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Throwable)
 toString
  (Z)Ljava/lang/String;
- (Z)Ljava/lang/String;
+ (Z)L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/naming/Reference.eea b/libs/eea-java-11/src/main/resources/javax/naming/Reference.eea
index 86b94c0077..ceef018fd9 100644
--- a/libs/eea-java-11/src/main/resources/javax/naming/Reference.eea
+++ b/libs/eea-java-11/src/main/resources/javax/naming/Reference.eea
@@ -42,7 +42,7 @@ get
  (I)Ljavax/naming/RefAddr;
 get
  (Ljava/lang/String;)Ljavax/naming/RefAddr;
- (Ljava/lang/String;)Ljavax/naming/RefAddr;
+ (Ljava/lang/String;)L0javax/naming/RefAddr;
 getAll
  ()Ljava/util/Enumeration<Ljavax/naming/RefAddr;>;
  ()Ljava/util/Enumeration<Ljavax/naming/RefAddr;>;
diff --git a/libs/eea-java-11/src/main/resources/javax/naming/directory/BasicAttribute.eea b/libs/eea-java-11/src/main/resources/javax/naming/directory/BasicAttribute.eea
index 12036d3836..fa92249183 100644
--- a/libs/eea-java-11/src/main/resources/javax/naming/directory/BasicAttribute.eea
+++ b/libs/eea-java-11/src/main/resources/javax/naming/directory/BasicAttribute.eea
@@ -45,10 +45,10 @@ getAll
  ()Ljavax/naming/NamingEnumeration<*1>; # @Inherited(javax.naming.directory.Attribute)
 getAttributeDefinition
  ()Ljavax/naming/directory/DirContext;
- ()Ljavax/naming/directory/DirContext;
+ ()L1javax/naming/directory/DirContext;
 getAttributeSyntaxDefinition
  ()Ljavax/naming/directory/DirContext;
- ()Ljavax/naming/directory/DirContext;
+ ()L1javax/naming/directory/DirContext;
 getID
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/naming/directory/BasicAttributes.eea b/libs/eea-java-11/src/main/resources/javax/naming/directory/BasicAttributes.eea
index 537270a5b8..6ee3706779 100644
--- a/libs/eea-java-11/src/main/resources/javax/naming/directory/BasicAttributes.eea
+++ b/libs/eea-java-11/src/main/resources/javax/naming/directory/BasicAttributes.eea
@@ -17,7 +17,7 @@ get
  (L1java/lang/String;)L0javax/naming/directory/Attribute; # @Inherited(javax.naming.directory.Attributes)
 getAll
  ()Ljavax/naming/NamingEnumeration<Ljavax/naming/directory/Attribute;>;
- ()Ljavax/naming/NamingEnumeration<Ljavax/naming/directory/Attribute;>;
+ ()L1javax/naming/NamingEnumeration<Ljavax/naming/directory/Attribute;>;
 getIDs
  ()Ljavax/naming/NamingEnumeration<Ljava/lang/String;>;
  ()L1javax/naming/NamingEnumeration<Ljava/lang/String;>; # @Inherited(javax.naming.directory.Attributes)
diff --git a/libs/eea-java-11/src/main/resources/javax/naming/directory/DirContext.eea b/libs/eea-java-11/src/main/resources/javax/naming/directory/DirContext.eea
index b32f9a0ee9..48b217d591 100644
--- a/libs/eea-java-11/src/main/resources/javax/naming/directory/DirContext.eea
+++ b/libs/eea-java-11/src/main/resources/javax/naming/directory/DirContext.eea
@@ -8,10 +8,10 @@ bind
  (Ljavax/naming/Name;Ljava/lang/Object;Ljavax/naming/directory/Attributes;)V
 createSubcontext
  (Ljava/lang/String;Ljavax/naming/directory/Attributes;)Ljavax/naming/directory/DirContext;
- (Ljava/lang/String;Ljavax/naming/directory/Attributes;)Ljavax/naming/directory/DirContext;
+ (Ljava/lang/String;Ljavax/naming/directory/Attributes;)L1javax/naming/directory/DirContext;
 createSubcontext
  (Ljavax/naming/Name;Ljavax/naming/directory/Attributes;)Ljavax/naming/directory/DirContext;
- (Ljavax/naming/Name;Ljavax/naming/directory/Attributes;)Ljavax/naming/directory/DirContext;
+ (Ljavax/naming/Name;Ljavax/naming/directory/Attributes;)L1javax/naming/directory/DirContext;
 getAttributes
  (Ljava/lang/String;)Ljavax/naming/directory/Attributes;
  (Ljava/lang/String;)Ljavax/naming/directory/Attributes;
diff --git a/libs/eea-java-11/src/main/resources/javax/naming/directory/InitialDirContext.eea b/libs/eea-java-11/src/main/resources/javax/naming/directory/InitialDirContext.eea
index e79b41c0d5..7655e3fb67 100644
--- a/libs/eea-java-11/src/main/resources/javax/naming/directory/InitialDirContext.eea
+++ b/libs/eea-java-11/src/main/resources/javax/naming/directory/InitialDirContext.eea
@@ -11,10 +11,10 @@ bind
  (Ljavax/naming/Name;Ljava/lang/Object;Ljavax/naming/directory/Attributes;)V
 createSubcontext
  (Ljava/lang/String;Ljavax/naming/directory/Attributes;)Ljavax/naming/directory/DirContext;
- (Ljava/lang/String;Ljavax/naming/directory/Attributes;)Ljavax/naming/directory/DirContext;
+ (Ljava/lang/String;Ljavax/naming/directory/Attributes;)L1javax/naming/directory/DirContext; # @Inherited(javax.naming.directory.DirContext)
 createSubcontext
  (Ljavax/naming/Name;Ljavax/naming/directory/Attributes;)Ljavax/naming/directory/DirContext;
- (Ljavax/naming/Name;Ljavax/naming/directory/Attributes;)Ljavax/naming/directory/DirContext;
+ (Ljavax/naming/Name;Ljavax/naming/directory/Attributes;)L1javax/naming/directory/DirContext; # @Inherited(javax.naming.directory.DirContext)
 getAttributes
  (Ljava/lang/String;)Ljavax/naming/directory/Attributes;
  (Ljava/lang/String;)Ljavax/naming/directory/Attributes;
diff --git a/libs/eea-java-11/src/main/resources/javax/naming/ldap/ExtendedRequest.eea b/libs/eea-java-11/src/main/resources/javax/naming/ldap/ExtendedRequest.eea
index 1b404247e6..f189a4d9a4 100644
--- a/libs/eea-java-11/src/main/resources/javax/naming/ldap/ExtendedRequest.eea
+++ b/libs/eea-java-11/src/main/resources/javax/naming/ldap/ExtendedRequest.eea
@@ -2,7 +2,7 @@ class javax/naming/ldap/ExtendedRequest
 
 createExtendedResponse
  (Ljava/lang/String;[BII)Ljavax/naming/ldap/ExtendedResponse;
- (Ljava/lang/String;[BII)Ljavax/naming/ldap/ExtendedResponse;
+ (Ljava/lang/String;[BII)L1javax/naming/ldap/ExtendedResponse;
 getEncodedValue
  ()[B
  ()[B
diff --git a/libs/eea-java-11/src/main/resources/javax/naming/ldap/LdapName.eea b/libs/eea-java-11/src/main/resources/javax/naming/ldap/LdapName.eea
index 30152704e5..8c0eef185f 100644
--- a/libs/eea-java-11/src/main/resources/javax/naming/ldap/LdapName.eea
+++ b/libs/eea-java-11/src/main/resources/javax/naming/ldap/LdapName.eea
@@ -47,10 +47,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 get
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 getAll
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
- ()Ljava/util/Enumeration<Ljava/lang/String;>;
+ ()L1java/util/Enumeration<Ljava/lang/String;>;
 getPrefix
  (I)Ljavax/naming/Name;
  (I)Ljavax/naming/Name;
@@ -62,10 +62,10 @@ getRdns
  ()Ljava/util/List<Ljavax/naming/ldap/Rdn;>;
 getSuffix
  (I)Ljavax/naming/Name;
- (I)Ljavax/naming/Name;
+ (I)L0javax/naming/Name;
 remove
  (I)Ljava/lang/Object;
- (I)Ljava/lang/Object;
+ (I)L1java/lang/Object;
 startsWith
  (Ljava/util/List<Ljavax/naming/ldap/Rdn;>;)Z
  (Ljava/util/List<Ljavax/naming/ldap/Rdn;>;)Z
diff --git a/libs/eea-java-11/src/main/resources/javax/naming/ldap/PagedResultsResponseControl.eea b/libs/eea-java-11/src/main/resources/javax/naming/ldap/PagedResultsResponseControl.eea
index e9b3cd075d..b2d6097d7e 100644
--- a/libs/eea-java-11/src/main/resources/javax/naming/ldap/PagedResultsResponseControl.eea
+++ b/libs/eea-java-11/src/main/resources/javax/naming/ldap/PagedResultsResponseControl.eea
@@ -9,4 +9,4 @@ OID
  (Ljava/lang/String;Z[B)V
 getCookie
  ()[B
- ()[B
+ ()[0B
diff --git a/libs/eea-java-11/src/main/resources/javax/naming/ldap/StartTlsRequest.eea b/libs/eea-java-11/src/main/resources/javax/naming/ldap/StartTlsRequest.eea
index 25a705e506..0a65e59b66 100644
--- a/libs/eea-java-11/src/main/resources/javax/naming/ldap/StartTlsRequest.eea
+++ b/libs/eea-java-11/src/main/resources/javax/naming/ldap/StartTlsRequest.eea
@@ -6,10 +6,10 @@ OID
 
 createExtendedResponse
  (Ljava/lang/String;[BII)Ljavax/naming/ldap/ExtendedResponse;
- (Ljava/lang/String;[BII)Ljavax/naming/ldap/ExtendedResponse;
+ (Ljava/lang/String;[BII)L1javax/naming/ldap/ExtendedResponse; # @Inherited(javax.naming.ldap.ExtendedRequest)
 getEncodedValue
  ()[B
- ()[B
+ ()[0B
 getID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/naming/ldap/StartTlsResponse.eea b/libs/eea-java-11/src/main/resources/javax/naming/ldap/StartTlsResponse.eea
index 6a20714860..bcb1860c14 100644
--- a/libs/eea-java-11/src/main/resources/javax/naming/ldap/StartTlsResponse.eea
+++ b/libs/eea-java-11/src/main/resources/javax/naming/ldap/StartTlsResponse.eea
@@ -6,10 +6,10 @@ OID
 
 getEncodedValue
  ()[B
- ()[B
+ ()[0B
 getID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 negotiate
  ()Ljavax/net/ssl/SSLSession;
  ()Ljavax/net/ssl/SSLSession;
diff --git a/libs/eea-java-11/src/main/resources/javax/naming/spi/DirectoryManager.eea b/libs/eea-java-11/src/main/resources/javax/naming/spi/DirectoryManager.eea
index 552d69a54d..f7755c97d4 100644
--- a/libs/eea-java-11/src/main/resources/javax/naming/spi/DirectoryManager.eea
+++ b/libs/eea-java-11/src/main/resources/javax/naming/spi/DirectoryManager.eea
@@ -2,10 +2,10 @@ class javax/naming/spi/DirectoryManager
 
 getContinuationDirContext
  (Ljavax/naming/CannotProceedException;)Ljavax/naming/directory/DirContext;
- (Ljavax/naming/CannotProceedException;)Ljavax/naming/directory/DirContext;
+ (Ljavax/naming/CannotProceedException;)L1javax/naming/directory/DirContext;
 getObjectInstance
  (Ljava/lang/Object;Ljavax/naming/Name;Ljavax/naming/Context;Ljava/util/Hashtable<**>;Ljavax/naming/directory/Attributes;)Ljava/lang/Object;
  (Ljava/lang/Object;Ljavax/naming/Name;Ljavax/naming/Context;Ljava/util/Hashtable<**>;Ljavax/naming/directory/Attributes;)Ljava/lang/Object;
 getStateToBind
  (Ljava/lang/Object;Ljavax/naming/Name;Ljavax/naming/Context;Ljava/util/Hashtable<**>;Ljavax/naming/directory/Attributes;)Ljavax/naming/spi/DirStateFactory$Result;
- (Ljava/lang/Object;Ljavax/naming/Name;Ljavax/naming/Context;Ljava/util/Hashtable<**>;Ljavax/naming/directory/Attributes;)Ljavax/naming/spi/DirStateFactory$Result;
+ (Ljava/lang/Object;Ljavax/naming/Name;Ljavax/naming/Context;Ljava/util/Hashtable<**>;Ljavax/naming/directory/Attributes;)L1javax/naming/spi/DirStateFactory$Result;
diff --git a/libs/eea-java-11/src/main/resources/javax/naming/spi/InitialContextFactoryBuilder.eea b/libs/eea-java-11/src/main/resources/javax/naming/spi/InitialContextFactoryBuilder.eea
index 8da241c40a..22d2d30445 100644
--- a/libs/eea-java-11/src/main/resources/javax/naming/spi/InitialContextFactoryBuilder.eea
+++ b/libs/eea-java-11/src/main/resources/javax/naming/spi/InitialContextFactoryBuilder.eea
@@ -2,4 +2,4 @@ class javax/naming/spi/InitialContextFactoryBuilder
 
 createInitialContextFactory
  (Ljava/util/Hashtable<**>;)Ljavax/naming/spi/InitialContextFactory;
- (Ljava/util/Hashtable<**>;)Ljavax/naming/spi/InitialContextFactory;
+ (Ljava/util/Hashtable<**>;)L1javax/naming/spi/InitialContextFactory;
diff --git a/libs/eea-java-11/src/main/resources/javax/naming/spi/NamingManager.eea b/libs/eea-java-11/src/main/resources/javax/naming/spi/NamingManager.eea
index 681be23633..c1314c31fc 100644
--- a/libs/eea-java-11/src/main/resources/javax/naming/spi/NamingManager.eea
+++ b/libs/eea-java-11/src/main/resources/javax/naming/spi/NamingManager.eea
@@ -18,7 +18,7 @@ getStateToBind
  (Ljava/lang/Object;Ljavax/naming/Name;Ljavax/naming/Context;Ljava/util/Hashtable<**>;)Ljava/lang/Object;
 getURLContext
  (Ljava/lang/String;Ljava/util/Hashtable<**>;)Ljavax/naming/Context;
- (Ljava/lang/String;Ljava/util/Hashtable<**>;)Ljavax/naming/Context;
+ (Ljava/lang/String;Ljava/util/Hashtable<**>;)L0javax/naming/Context;
 setInitialContextFactoryBuilder
  (Ljavax/naming/spi/InitialContextFactoryBuilder;)V
  (Ljavax/naming/spi/InitialContextFactoryBuilder;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/naming/spi/ObjectFactoryBuilder.eea b/libs/eea-java-11/src/main/resources/javax/naming/spi/ObjectFactoryBuilder.eea
index a44a345470..475ae35699 100644
--- a/libs/eea-java-11/src/main/resources/javax/naming/spi/ObjectFactoryBuilder.eea
+++ b/libs/eea-java-11/src/main/resources/javax/naming/spi/ObjectFactoryBuilder.eea
@@ -2,4 +2,4 @@ class javax/naming/spi/ObjectFactoryBuilder
 
 createObjectFactory
  (Ljava/lang/Object;Ljava/util/Hashtable<**>;)Ljavax/naming/spi/ObjectFactory;
- (Ljava/lang/Object;Ljava/util/Hashtable<**>;)Ljavax/naming/spi/ObjectFactory;
+ (Ljava/lang/Object;Ljava/util/Hashtable<**>;)L1javax/naming/spi/ObjectFactory;
diff --git a/libs/eea-java-11/src/main/resources/javax/net/ServerSocketFactory.eea b/libs/eea-java-11/src/main/resources/javax/net/ServerSocketFactory.eea
index 341af7f869..f5c6c51b34 100644
--- a/libs/eea-java-11/src/main/resources/javax/net/ServerSocketFactory.eea
+++ b/libs/eea-java-11/src/main/resources/javax/net/ServerSocketFactory.eea
@@ -6,13 +6,13 @@ getDefault
 
 createServerSocket
  ()Ljava/net/ServerSocket;
- ()Ljava/net/ServerSocket;
+ ()L1java/net/ServerSocket;
 createServerSocket
  (I)Ljava/net/ServerSocket;
- (I)Ljava/net/ServerSocket;
+ (I)L1java/net/ServerSocket;
 createServerSocket
  (II)Ljava/net/ServerSocket;
- (II)Ljava/net/ServerSocket;
+ (II)L1java/net/ServerSocket;
 createServerSocket
  (IILjava/net/InetAddress;)Ljava/net/ServerSocket;
- (IILjava/net/InetAddress;)Ljava/net/ServerSocket;
+ (IILjava/net/InetAddress;)L1java/net/ServerSocket;
diff --git a/libs/eea-java-11/src/main/resources/javax/net/SocketFactory.eea b/libs/eea-java-11/src/main/resources/javax/net/SocketFactory.eea
index 3cd3910675..54db905521 100644
--- a/libs/eea-java-11/src/main/resources/javax/net/SocketFactory.eea
+++ b/libs/eea-java-11/src/main/resources/javax/net/SocketFactory.eea
@@ -6,16 +6,16 @@ getDefault
 
 createSocket
  ()Ljava/net/Socket;
- ()Ljava/net/Socket;
+ ()L1java/net/Socket;
 createSocket
  (Ljava/lang/String;I)Ljava/net/Socket;
- (Ljava/lang/String;I)Ljava/net/Socket;
+ (Ljava/lang/String;I)L1java/net/Socket;
 createSocket
  (Ljava/lang/String;ILjava/net/InetAddress;I)Ljava/net/Socket;
- (Ljava/lang/String;ILjava/net/InetAddress;I)Ljava/net/Socket;
+ (Ljava/lang/String;ILjava/net/InetAddress;I)L1java/net/Socket;
 createSocket
  (Ljava/net/InetAddress;I)Ljava/net/Socket;
- (Ljava/net/InetAddress;I)Ljava/net/Socket;
+ (Ljava/net/InetAddress;I)L1java/net/Socket;
 createSocket
  (Ljava/net/InetAddress;ILjava/net/InetAddress;I)Ljava/net/Socket;
- (Ljava/net/InetAddress;ILjava/net/InetAddress;I)Ljava/net/Socket;
+ (Ljava/net/InetAddress;ILjava/net/InetAddress;I)L1java/net/Socket;
diff --git a/libs/eea-java-11/src/main/resources/javax/net/ssl/ExtendedSSLSession.eea b/libs/eea-java-11/src/main/resources/javax/net/ssl/ExtendedSSLSession.eea
index c8f49de935..8700664eaf 100644
--- a/libs/eea-java-11/src/main/resources/javax/net/ssl/ExtendedSSLSession.eea
+++ b/libs/eea-java-11/src/main/resources/javax/net/ssl/ExtendedSSLSession.eea
@@ -8,7 +8,7 @@ getPeerSupportedSignatureAlgorithms
  ()[Ljava/lang/String;
 getRequestedServerNames
  ()Ljava/util/List<Ljavax/net/ssl/SNIServerName;>;
- ()Ljava/util/List<Ljavax/net/ssl/SNIServerName;>;
+ ()L1java/util/List<Ljavax/net/ssl/SNIServerName;>;
 getStatusResponses
  ()Ljava/util/List<[B>;
- ()Ljava/util/List<[B>;
+ ()L1java/util/List<[B>;
diff --git a/libs/eea-java-11/src/main/resources/javax/net/ssl/HttpsURLConnection.eea b/libs/eea-java-11/src/main/resources/javax/net/ssl/HttpsURLConnection.eea
index 4e7f0d9216..5835db01d9 100644
--- a/libs/eea-java-11/src/main/resources/javax/net/ssl/HttpsURLConnection.eea
+++ b/libs/eea-java-11/src/main/resources/javax/net/ssl/HttpsURLConnection.eea
@@ -31,7 +31,7 @@ getLocalCertificates
  ()[Ljava/security/cert/Certificate;
 getLocalPrincipal
  ()Ljava/security/Principal;
- ()Ljava/security/Principal;
+ ()L0java/security/Principal;
 getPeerPrincipal
  ()Ljava/security/Principal;
  ()Ljava/security/Principal;
diff --git a/libs/eea-java-11/src/main/resources/javax/net/ssl/KeyManagerFactory.eea b/libs/eea-java-11/src/main/resources/javax/net/ssl/KeyManagerFactory.eea
index 907f85b544..af4a14e596 100644
--- a/libs/eea-java-11/src/main/resources/javax/net/ssl/KeyManagerFactory.eea
+++ b/libs/eea-java-11/src/main/resources/javax/net/ssl/KeyManagerFactory.eea
@@ -2,7 +2,7 @@ class javax/net/ssl/KeyManagerFactory
 
 getDefaultAlgorithm
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getInstance
  (Ljava/lang/String;)Ljavax/net/ssl/KeyManagerFactory;
  (Ljava/lang/String;)Ljavax/net/ssl/KeyManagerFactory;
diff --git a/libs/eea-java-11/src/main/resources/javax/net/ssl/SNIHostName.eea b/libs/eea-java-11/src/main/resources/javax/net/ssl/SNIHostName.eea
index ca434c7a71..8fc47d5513 100644
--- a/libs/eea-java-11/src/main/resources/javax/net/ssl/SNIHostName.eea
+++ b/libs/eea-java-11/src/main/resources/javax/net/ssl/SNIHostName.eea
@@ -2,7 +2,7 @@ class javax/net/ssl/SNIHostName
 
 createSNIMatcher
  (Ljava/lang/String;)Ljavax/net/ssl/SNIMatcher;
- (Ljava/lang/String;)Ljavax/net/ssl/SNIMatcher;
+ (Ljava/lang/String;)L1javax/net/ssl/SNIMatcher;
 
 <init>
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/net/ssl/SSLContext.eea b/libs/eea-java-11/src/main/resources/javax/net/ssl/SSLContext.eea
index 7df6dcf8a4..9bb1ab25d3 100644
--- a/libs/eea-java-11/src/main/resources/javax/net/ssl/SSLContext.eea
+++ b/libs/eea-java-11/src/main/resources/javax/net/ssl/SSLContext.eea
@@ -21,10 +21,10 @@ setDefault
  (Ljavax/net/ssl/SSLContextSpi;Ljava/security/Provider;Ljava/lang/String;)V
 createSSLEngine
  ()Ljavax/net/ssl/SSLEngine;
- ()Ljavax/net/ssl/SSLEngine;
+ ()L1javax/net/ssl/SSLEngine;
 createSSLEngine
  (Ljava/lang/String;I)Ljavax/net/ssl/SSLEngine;
- (Ljava/lang/String;I)Ljavax/net/ssl/SSLEngine;
+ (Ljava/lang/String;I)L1javax/net/ssl/SSLEngine;
 getClientSessionContext
  ()Ljavax/net/ssl/SSLSessionContext;
  ()Ljavax/net/ssl/SSLSessionContext;
diff --git a/libs/eea-java-11/src/main/resources/javax/net/ssl/SSLEngine.eea b/libs/eea-java-11/src/main/resources/javax/net/ssl/SSLEngine.eea
index ba28fd745a..2729128c45 100644
--- a/libs/eea-java-11/src/main/resources/javax/net/ssl/SSLEngine.eea
+++ b/libs/eea-java-11/src/main/resources/javax/net/ssl/SSLEngine.eea
@@ -5,7 +5,7 @@ class javax/net/ssl/SSLEngine
  (Ljava/lang/String;I)V
 getApplicationProtocol
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getDelegatedTask
  ()Ljava/lang/Runnable;
  ()Ljava/lang/Runnable;
@@ -17,13 +17,13 @@ getEnabledProtocols
  ()[Ljava/lang/String;
 getHandshakeApplicationProtocol
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getHandshakeApplicationProtocolSelector
  ()Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLEngine;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
- ()Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLEngine;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
+ ()L1java/util/function/BiFunction<Ljavax/net/ssl/SSLEngine;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
 getHandshakeSession
  ()Ljavax/net/ssl/SSLSession;
- ()Ljavax/net/ssl/SSLSession;
+ ()L1javax/net/ssl/SSLSession;
 getHandshakeStatus
  ()Ljavax/net/ssl/SSLEngineResult$HandshakeStatus;
  ()Ljavax/net/ssl/SSLEngineResult$HandshakeStatus;
@@ -32,7 +32,7 @@ getPeerHost
  ()Ljava/lang/String;
 getSSLParameters
  ()Ljavax/net/ssl/SSLParameters;
- ()Ljavax/net/ssl/SSLParameters;
+ ()L1javax/net/ssl/SSLParameters;
 getSession
  ()Ljavax/net/ssl/SSLSession;
  ()Ljavax/net/ssl/SSLSession;
diff --git a/libs/eea-java-11/src/main/resources/javax/net/ssl/SSLParameters.eea b/libs/eea-java-11/src/main/resources/javax/net/ssl/SSLParameters.eea
index dbe1406046..971dc4d225 100644
--- a/libs/eea-java-11/src/main/resources/javax/net/ssl/SSLParameters.eea
+++ b/libs/eea-java-11/src/main/resources/javax/net/ssl/SSLParameters.eea
@@ -23,10 +23,10 @@ getProtocols
  ()[Ljava/lang/String;
 getSNIMatchers
  ()Ljava/util/Collection<Ljavax/net/ssl/SNIMatcher;>;
- ()Ljava/util/Collection<Ljavax/net/ssl/SNIMatcher;>;
+ ()L0java/util/Collection<Ljavax/net/ssl/SNIMatcher;>;
 getServerNames
  ()Ljava/util/List<Ljavax/net/ssl/SNIServerName;>;
- ()Ljava/util/List<Ljavax/net/ssl/SNIServerName;>;
+ ()L0java/util/List<Ljavax/net/ssl/SNIServerName;>;
 setAlgorithmConstraints
  (Ljava/security/AlgorithmConstraints;)V
  (Ljava/security/AlgorithmConstraints;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/net/ssl/SSLServerSocket.eea b/libs/eea-java-11/src/main/resources/javax/net/ssl/SSLServerSocket.eea
index ef7465695f..16d134aad6 100644
--- a/libs/eea-java-11/src/main/resources/javax/net/ssl/SSLServerSocket.eea
+++ b/libs/eea-java-11/src/main/resources/javax/net/ssl/SSLServerSocket.eea
@@ -11,7 +11,7 @@ getEnabledProtocols
  ()[Ljava/lang/String;
 getSSLParameters
  ()Ljavax/net/ssl/SSLParameters;
- ()Ljavax/net/ssl/SSLParameters;
+ ()L1javax/net/ssl/SSLParameters;
 getSupportedCipherSuites
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/net/ssl/SSLSocket.eea b/libs/eea-java-11/src/main/resources/javax/net/ssl/SSLSocket.eea
index 394b0b49a7..982b0d12f8 100644
--- a/libs/eea-java-11/src/main/resources/javax/net/ssl/SSLSocket.eea
+++ b/libs/eea-java-11/src/main/resources/javax/net/ssl/SSLSocket.eea
@@ -17,7 +17,7 @@ addHandshakeCompletedListener
  (L1javax/net/ssl/HandshakeCompletedListener;)V
 getApplicationProtocol
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getEnabledCipherSuites
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
@@ -26,16 +26,16 @@ getEnabledProtocols
  ()[Ljava/lang/String;
 getHandshakeApplicationProtocol
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getHandshakeApplicationProtocolSelector
  ()Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLSocket;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
- ()Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLSocket;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
+ ()L1java/util/function/BiFunction<Ljavax/net/ssl/SSLSocket;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
 getHandshakeSession
  ()Ljavax/net/ssl/SSLSession;
- ()Ljavax/net/ssl/SSLSession;
+ ()L1javax/net/ssl/SSLSession;
 getSSLParameters
  ()Ljavax/net/ssl/SSLParameters;
- ()Ljavax/net/ssl/SSLParameters;
+ ()L1javax/net/ssl/SSLParameters;
 getSession
  ()Ljavax/net/ssl/SSLSession;
  ()Ljavax/net/ssl/SSLSession;
diff --git a/libs/eea-java-11/src/main/resources/javax/net/ssl/SSLSocketFactory.eea b/libs/eea-java-11/src/main/resources/javax/net/ssl/SSLSocketFactory.eea
index 1950029695..f6fd2e482a 100644
--- a/libs/eea-java-11/src/main/resources/javax/net/ssl/SSLSocketFactory.eea
+++ b/libs/eea-java-11/src/main/resources/javax/net/ssl/SSLSocketFactory.eea
@@ -6,10 +6,10 @@ getDefault
 
 createSocket
  (Ljava/net/Socket;Ljava/io/InputStream;Z)Ljava/net/Socket;
- (Ljava/net/Socket;Ljava/io/InputStream;Z)Ljava/net/Socket;
+ (Ljava/net/Socket;Ljava/io/InputStream;Z)L1java/net/Socket;
 createSocket
  (Ljava/net/Socket;Ljava/lang/String;IZ)Ljava/net/Socket;
- (Ljava/net/Socket;Ljava/lang/String;IZ)Ljava/net/Socket;
+ (Ljava/net/Socket;Ljava/lang/String;IZ)L1java/net/Socket;
 getDefaultCipherSuites
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/net/ssl/X509ExtendedKeyManager.eea b/libs/eea-java-11/src/main/resources/javax/net/ssl/X509ExtendedKeyManager.eea
index f74f47ee83..9f341c1755 100644
--- a/libs/eea-java-11/src/main/resources/javax/net/ssl/X509ExtendedKeyManager.eea
+++ b/libs/eea-java-11/src/main/resources/javax/net/ssl/X509ExtendedKeyManager.eea
@@ -2,7 +2,7 @@ class javax/net/ssl/X509ExtendedKeyManager
 
 chooseEngineClientAlias
  ([Ljava/lang/String;[Ljava/security/Principal;Ljavax/net/ssl/SSLEngine;)Ljava/lang/String;
- ([Ljava/lang/String;[Ljava/security/Principal;Ljavax/net/ssl/SSLEngine;)Ljava/lang/String;
+ ([Ljava/lang/String;[Ljava/security/Principal;Ljavax/net/ssl/SSLEngine;)L0java/lang/String;
 chooseEngineServerAlias
  (Ljava/lang/String;[Ljava/security/Principal;Ljavax/net/ssl/SSLEngine;)Ljava/lang/String;
- (Ljava/lang/String;[Ljava/security/Principal;Ljavax/net/ssl/SSLEngine;)Ljava/lang/String;
+ (Ljava/lang/String;[Ljava/security/Principal;Ljavax/net/ssl/SSLEngine;)L0java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/MultiDocPrintService.eea b/libs/eea-java-11/src/main/resources/javax/print/MultiDocPrintService.eea
index a4a31e4695..36aa1285c3 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/MultiDocPrintService.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/MultiDocPrintService.eea
@@ -2,4 +2,4 @@ class javax/print/MultiDocPrintService
 
 createMultiDocPrintJob
  ()Ljavax/print/MultiDocPrintJob;
- ()Ljavax/print/MultiDocPrintJob;
+ ()L1javax/print/MultiDocPrintJob;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/PrintService.eea b/libs/eea-java-11/src/main/resources/javax/print/PrintService.eea
index dc5a7f1d8c..ed93cb70a7 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/PrintService.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/PrintService.eea
@@ -5,7 +5,7 @@ addPrintServiceAttributeListener
  (L1javax/print/event/PrintServiceAttributeListener;)V
 createPrintJob
  ()Ljavax/print/DocPrintJob;
- ()Ljavax/print/DocPrintJob;
+ ()L1javax/print/DocPrintJob;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/PrintServiceLookup.eea b/libs/eea-java-11/src/main/resources/javax/print/PrintServiceLookup.eea
index 6491c8f13f..8f74fbd116 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/PrintServiceLookup.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/PrintServiceLookup.eea
@@ -2,7 +2,7 @@ class javax/print/PrintServiceLookup
 
 lookupDefaultPrintService
  ()Ljavax/print/PrintService;
- ()Ljavax/print/PrintService;
+ ()L0javax/print/PrintService;
 lookupMultiDocPrintServices
  ([Ljavax/print/DocFlavor;Ljavax/print/attribute/AttributeSet;)[Ljavax/print/MultiDocPrintService;
  ([Ljavax/print/DocFlavor;Ljavax/print/attribute/AttributeSet;)[Ljavax/print/MultiDocPrintService;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/AttributeSetUtilities.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/AttributeSetUtilities.eea
index 24f843268a..28f333e405 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/AttributeSetUtilities.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/AttributeSetUtilities.eea
@@ -2,34 +2,34 @@ class javax/print/attribute/AttributeSetUtilities
 
 synchronizedView
  (Ljavax/print/attribute/AttributeSet;)Ljavax/print/attribute/AttributeSet;
- (Ljavax/print/attribute/AttributeSet;)Ljavax/print/attribute/AttributeSet;
+ (Ljavax/print/attribute/AttributeSet;)L1javax/print/attribute/AttributeSet;
 synchronizedView
  (Ljavax/print/attribute/DocAttributeSet;)Ljavax/print/attribute/DocAttributeSet;
- (Ljavax/print/attribute/DocAttributeSet;)Ljavax/print/attribute/DocAttributeSet;
+ (Ljavax/print/attribute/DocAttributeSet;)L1javax/print/attribute/DocAttributeSet;
 synchronizedView
  (Ljavax/print/attribute/PrintJobAttributeSet;)Ljavax/print/attribute/PrintJobAttributeSet;
- (Ljavax/print/attribute/PrintJobAttributeSet;)Ljavax/print/attribute/PrintJobAttributeSet;
+ (Ljavax/print/attribute/PrintJobAttributeSet;)L1javax/print/attribute/PrintJobAttributeSet;
 synchronizedView
  (Ljavax/print/attribute/PrintRequestAttributeSet;)Ljavax/print/attribute/PrintRequestAttributeSet;
- (Ljavax/print/attribute/PrintRequestAttributeSet;)Ljavax/print/attribute/PrintRequestAttributeSet;
+ (Ljavax/print/attribute/PrintRequestAttributeSet;)L1javax/print/attribute/PrintRequestAttributeSet;
 synchronizedView
  (Ljavax/print/attribute/PrintServiceAttributeSet;)Ljavax/print/attribute/PrintServiceAttributeSet;
- (Ljavax/print/attribute/PrintServiceAttributeSet;)Ljavax/print/attribute/PrintServiceAttributeSet;
+ (Ljavax/print/attribute/PrintServiceAttributeSet;)L1javax/print/attribute/PrintServiceAttributeSet;
 unmodifiableView
  (Ljavax/print/attribute/AttributeSet;)Ljavax/print/attribute/AttributeSet;
- (Ljavax/print/attribute/AttributeSet;)Ljavax/print/attribute/AttributeSet;
+ (Ljavax/print/attribute/AttributeSet;)L1javax/print/attribute/AttributeSet;
 unmodifiableView
  (Ljavax/print/attribute/DocAttributeSet;)Ljavax/print/attribute/DocAttributeSet;
- (Ljavax/print/attribute/DocAttributeSet;)Ljavax/print/attribute/DocAttributeSet;
+ (Ljavax/print/attribute/DocAttributeSet;)L1javax/print/attribute/DocAttributeSet;
 unmodifiableView
  (Ljavax/print/attribute/PrintJobAttributeSet;)Ljavax/print/attribute/PrintJobAttributeSet;
- (Ljavax/print/attribute/PrintJobAttributeSet;)Ljavax/print/attribute/PrintJobAttributeSet;
+ (Ljavax/print/attribute/PrintJobAttributeSet;)L1javax/print/attribute/PrintJobAttributeSet;
 unmodifiableView
  (Ljavax/print/attribute/PrintRequestAttributeSet;)Ljavax/print/attribute/PrintRequestAttributeSet;
- (Ljavax/print/attribute/PrintRequestAttributeSet;)Ljavax/print/attribute/PrintRequestAttributeSet;
+ (Ljavax/print/attribute/PrintRequestAttributeSet;)L1javax/print/attribute/PrintRequestAttributeSet;
 unmodifiableView
  (Ljavax/print/attribute/PrintServiceAttributeSet;)Ljavax/print/attribute/PrintServiceAttributeSet;
- (Ljavax/print/attribute/PrintServiceAttributeSet;)Ljavax/print/attribute/PrintServiceAttributeSet;
+ (Ljavax/print/attribute/PrintServiceAttributeSet;)L1javax/print/attribute/PrintServiceAttributeSet;
 verifyAttributeCategory
  (Ljava/lang/Object;Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
  (Ljava/lang/Object;Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/DateTimeSyntax.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/DateTimeSyntax.eea
index c90ad40fa5..19809d7862 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/DateTimeSyntax.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/DateTimeSyntax.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getValue
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L1java/util/Date;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/EnumSyntax.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/EnumSyntax.eea
index afc9d899bc..0fe81e3bd5 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/EnumSyntax.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/EnumSyntax.eea
@@ -5,10 +5,10 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String;
 readResolve
  ()Ljava/lang/Object;
  ()L1java/lang/Object;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/HashAttributeSet.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/HashAttributeSet.eea
index 049d58155a..f1403c0911 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/HashAttributeSet.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/HashAttributeSet.eea
@@ -47,4 +47,4 @@ remove
  (Ljavax/print/attribute/Attribute;)Z
 toArray
  ()[Ljavax/print/attribute/Attribute;
- ()[Ljavax/print/attribute/Attribute;
+ ()[1Ljavax/print/attribute/Attribute;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/ResolutionSyntax.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/ResolutionSyntax.eea
index e02d80f007..2a89154c94 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/ResolutionSyntax.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/ResolutionSyntax.eea
@@ -14,4 +14,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toString
  (ILjava/lang/String;)Ljava/lang/String;
- (ILjava/lang/String;)Ljava/lang/String;
+ (ILjava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/SetOfIntegerSyntax.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/SetOfIntegerSyntax.eea
index 950c851b39..7a11989b47 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/SetOfIntegerSyntax.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/SetOfIntegerSyntax.eea
@@ -14,7 +14,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getMembers
  ()[[I
- ()[[I
+ ()[1[I
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/Size2DSyntax.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/Size2DSyntax.eea
index 2a4dfc7dd9..38059f0905 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/Size2DSyntax.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/Size2DSyntax.eea
@@ -11,4 +11,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toString
  (ILjava/lang/String;)Ljava/lang/String;
- (ILjava/lang/String;)Ljava/lang/String;
+ (ILjava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Chromaticity.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Chromaticity.eea
index ece2e75e7a..056f20a71f 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Chromaticity.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Chromaticity.eea
@@ -9,13 +9,13 @@ MONOCHROME
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/ColorSupported.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/ColorSupported.eea
index 0335595d1f..b0562e04c2 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/ColorSupported.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/ColorSupported.eea
@@ -9,13 +9,13 @@ SUPPORTED
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Compression.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Compression.eea
index 371853820d..f1994aebcc 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Compression.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Compression.eea
@@ -15,13 +15,13 @@ NONE
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Copies.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Copies.eea
index c96479e8da..6c6fb67c80 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Copies.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Copies.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/CopiesSupported.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/CopiesSupported.eea
index 301eb3ccd1..0a4f00d59d 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/CopiesSupported.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/CopiesSupported.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.SetOfIntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/DateTimeAtCompleted.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/DateTimeAtCompleted.eea
index ce0d0d92af..3ab9bbce9e 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/DateTimeAtCompleted.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/DateTimeAtCompleted.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.DateTimeSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/DateTimeAtCreation.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/DateTimeAtCreation.eea
index 2e88f101b9..5b8d6ef94e 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/DateTimeAtCreation.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/DateTimeAtCreation.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.DateTimeSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/DateTimeAtProcessing.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/DateTimeAtProcessing.eea
index 0b2dca17d1..b42f8a3dd6 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/DateTimeAtProcessing.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/DateTimeAtProcessing.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.DateTimeSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Destination.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Destination.eea
index b96455abb4..c3a6e36089 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Destination.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Destination.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.URISyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/DialogOwner.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/DialogOwner.eea
index 5e3a9296ac..c5da43f726 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/DialogOwner.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/DialogOwner.eea
@@ -5,10 +5,10 @@ class javax/print/attribute/standard/DialogOwner
  (Ljava/awt/Window;)V
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getOwner
  ()Ljava/awt/Window;
  ()Ljava/awt/Window;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/DialogTypeSelection.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/DialogTypeSelection.eea
index 9c47e594c1..ac80ea19bc 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/DialogTypeSelection.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/DialogTypeSelection.eea
@@ -9,13 +9,13 @@ NATIVE
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/DocumentName.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/DocumentName.eea
index 8a7c11b08c..f498d5d88d 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/DocumentName.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/DocumentName.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Fidelity.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Fidelity.eea
index 63bfa40ca0..58e13fd7f9 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Fidelity.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Fidelity.eea
@@ -9,13 +9,13 @@ FIDELITY_TRUE
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Finishings.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Finishings.eea
index 1357f6fefa..a6df56577d 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Finishings.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Finishings.eea
@@ -57,13 +57,13 @@ STAPLE_TOP_RIGHT
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobHoldUntil.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobHoldUntil.eea
index 684302182e..7ddcd5aabd 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobHoldUntil.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobHoldUntil.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.DateTimeSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobImpressions.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobImpressions.eea
index d5b341e72e..1d1d87f8bf 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobImpressions.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobImpressions.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobImpressionsCompleted.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobImpressionsCompleted.eea
index 7669b7f8fe..d51e218b18 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobImpressionsCompleted.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobImpressionsCompleted.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobImpressionsSupported.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobImpressionsSupported.eea
index 9f661af3bb..62c5785181 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobImpressionsSupported.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobImpressionsSupported.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.SetOfIntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobKOctets.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobKOctets.eea
index 16cd5fad4a..53e9ce573a 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobKOctets.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobKOctets.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobKOctetsProcessed.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobKOctetsProcessed.eea
index 7653e5f930..3aadaa1456 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobKOctetsProcessed.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobKOctetsProcessed.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobKOctetsSupported.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobKOctetsSupported.eea
index 0c07f0ddfd..0a395f470e 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobKOctetsSupported.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobKOctetsSupported.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.SetOfIntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobMediaSheets.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobMediaSheets.eea
index 8fe91af3a9..5fd24899d7 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobMediaSheets.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobMediaSheets.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobMediaSheetsCompleted.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobMediaSheetsCompleted.eea
index abb63547b1..54bf7823e8 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobMediaSheetsCompleted.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobMediaSheetsCompleted.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobMediaSheetsSupported.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobMediaSheetsSupported.eea
index 44613fdb6d..3397cf5ce2 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobMediaSheetsSupported.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobMediaSheetsSupported.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.SetOfIntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobMessageFromOperator.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobMessageFromOperator.eea
index c753b8f050..f8a341b9a4 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobMessageFromOperator.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobMessageFromOperator.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobName.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobName.eea
index 4730df9237..aae5a6c33f 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobName.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobName.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobOriginatingUserName.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobOriginatingUserName.eea
index 36f04e9683..30d2e684ba 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobOriginatingUserName.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobOriginatingUserName.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobPriority.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobPriority.eea
index 95c3c301e3..6969067515 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobPriority.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobPriority.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobPrioritySupported.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobPrioritySupported.eea
index 2027309a54..541b1651f1 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobPrioritySupported.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobPrioritySupported.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobSheets.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobSheets.eea
index 5621b554b1..75a0bab3be 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobSheets.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobSheets.eea
@@ -9,13 +9,13 @@ STANDARD
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobState.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobState.eea
index 558ee0dff2..88deb16943 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobState.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobState.eea
@@ -27,13 +27,13 @@ UNKNOWN
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobStateReason.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobStateReason.eea
index 906f510643..cdc3d1b274 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobStateReason.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobStateReason.eea
@@ -90,13 +90,13 @@ UNSUPPORTED_DOCUMENT_FORMAT
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobStateReasons.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobStateReasons.eea
index 00e699d836..668bceaa94 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobStateReasons.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/JobStateReasons.eea
@@ -12,7 +12,7 @@ add
  (Ljavax/print/attribute/standard/JobStateReason;)Z
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Media.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Media.eea
index 7ee0e6e9fb..2f52fb01ea 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Media.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Media.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/MediaName.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/MediaName.eea
index a94eb9bdf9..79f5466e3a 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/MediaName.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/MediaName.eea
@@ -15,7 +15,7 @@ NA_LETTER_WHITE
 
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/MediaPrintableArea.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/MediaPrintableArea.eea
index 7808504e83..80b2279a2f 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/MediaPrintableArea.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/MediaPrintableArea.eea
@@ -5,10 +5,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getPrintableArea
  (I)[F
  (I)[F
@@ -17,4 +17,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toString
  (ILjava/lang/String;)Ljava/lang/String;
- (ILjava/lang/String;)Ljava/lang/String;
+ (ILjava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/MediaSize.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/MediaSize.eea
index a8b2ec813f..0bc89b5a6f 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/MediaSize.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/MediaSize.eea
@@ -18,10 +18,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.Size2DSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getMediaSizeName
  ()Ljavax/print/attribute/standard/MediaSizeName;
  ()Ljavax/print/attribute/standard/MediaSizeName;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/MediaSizeName.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/MediaSizeName.eea
index bc04b1d935..a43b54f659 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/MediaSizeName.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/MediaSizeName.eea
@@ -222,7 +222,7 @@ TABLOID
 
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/MediaTray.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/MediaTray.eea
index a1fce5504e..6a49a7edf0 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/MediaTray.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/MediaTray.eea
@@ -27,7 +27,7 @@ TOP
 
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/MultipleDocumentHandling.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/MultipleDocumentHandling.eea
index 87f191bb1a..77806f0d72 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/MultipleDocumentHandling.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/MultipleDocumentHandling.eea
@@ -15,13 +15,13 @@ SINGLE_DOCUMENT_NEW_SHEET
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/NumberOfDocuments.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/NumberOfDocuments.eea
index ec744ccf05..b58a2a5134 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/NumberOfDocuments.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/NumberOfDocuments.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/NumberOfInterveningJobs.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/NumberOfInterveningJobs.eea
index 9eddbd3469..8a1bba31f0 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/NumberOfInterveningJobs.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/NumberOfInterveningJobs.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/NumberUp.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/NumberUp.eea
index 5230d0baa2..ebdffeeedb 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/NumberUp.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/NumberUp.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/NumberUpSupported.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/NumberUpSupported.eea
index b7148124c6..61e0a19562 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/NumberUpSupported.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/NumberUpSupported.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.SetOfIntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/OrientationRequested.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/OrientationRequested.eea
index 84c61fcb58..527ecc75df 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/OrientationRequested.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/OrientationRequested.eea
@@ -15,13 +15,13 @@ REVERSE_PORTRAIT
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/OutputDeviceAssigned.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/OutputDeviceAssigned.eea
index 7ad6f83386..f2807ffb05 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/OutputDeviceAssigned.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/OutputDeviceAssigned.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PDLOverrideSupported.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PDLOverrideSupported.eea
index fb46726f95..33ce7d848d 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PDLOverrideSupported.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PDLOverrideSupported.eea
@@ -9,13 +9,13 @@ NOT_ATTEMPTED
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PageRanges.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PageRanges.eea
index e8a282b87e..5816b8bbcd 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PageRanges.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PageRanges.eea
@@ -11,7 +11,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.SetOfIntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PagesPerMinute.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PagesPerMinute.eea
index 6296b0aed5..98ddb139ee 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PagesPerMinute.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PagesPerMinute.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PagesPerMinuteColor.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PagesPerMinuteColor.eea
index ea57e3c253..f6bcbaaef4 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PagesPerMinuteColor.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PagesPerMinuteColor.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PresentationDirection.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PresentationDirection.eea
index e3bba3927f..38b662d9ac 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PresentationDirection.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PresentationDirection.eea
@@ -27,13 +27,13 @@ TOTOP_TORIGHT
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrintQuality.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrintQuality.eea
index 60463a40c0..2f67ff884f 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrintQuality.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrintQuality.eea
@@ -12,13 +12,13 @@ NORMAL
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterInfo.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterInfo.eea
index e51f12d4a2..683b06a222 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterInfo.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterInfo.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterIsAcceptingJobs.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterIsAcceptingJobs.eea
index 83600beadf..10db744523 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterIsAcceptingJobs.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterIsAcceptingJobs.eea
@@ -9,13 +9,13 @@ NOT_ACCEPTING_JOBS
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterLocation.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterLocation.eea
index cdfd09dcaf..ac43413df4 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterLocation.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterLocation.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterMakeAndModel.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterMakeAndModel.eea
index 508bf9bd2d..6559769aed 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterMakeAndModel.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterMakeAndModel.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterMessageFromOperator.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterMessageFromOperator.eea
index 6b0de09a26..99ea77d02d 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterMessageFromOperator.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterMessageFromOperator.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterMoreInfo.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterMoreInfo.eea
index 5282bfd1c0..2541162cce 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterMoreInfo.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterMoreInfo.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.URISyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterMoreInfoManufacturer.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterMoreInfoManufacturer.eea
index 67ebfb5ad1..ac42bb1df9 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterMoreInfoManufacturer.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterMoreInfoManufacturer.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.URISyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterName.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterName.eea
index cdafa23ddc..fba2430e3d 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterName.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterName.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterResolution.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterResolution.eea
index 4288fc72c3..723c48db14 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterResolution.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterResolution.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.ResolutionSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterState.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterState.eea
index 38e723a7d3..0717401881 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterState.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterState.eea
@@ -15,13 +15,13 @@ UNKNOWN
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterStateReason.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterStateReason.eea
index f8f85299fb..bbe76cc038 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterStateReason.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterStateReason.eea
@@ -102,13 +102,13 @@ TONER_LOW
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterStateReasons.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterStateReasons.eea
index ce13c3cfbb..9815c55eaf 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterStateReasons.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterStateReasons.eea
@@ -9,13 +9,13 @@ super java/util/HashMap
  (Ljava/util/Map<Ljavax/print/attribute/standard/PrinterStateReason;Ljavax/print/attribute/standard/Severity;>;)V
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 printerStateReasonSet
  (Ljavax/print/attribute/standard/Severity;)Ljava/util/Set<Ljavax/print/attribute/standard/PrinterStateReason;>;
- (Ljavax/print/attribute/standard/Severity;)Ljava/util/Set<Ljavax/print/attribute/standard/PrinterStateReason;>;
+ (Ljavax/print/attribute/standard/Severity;)L1java/util/Set<Ljavax/print/attribute/standard/PrinterStateReason;>;
 put
  (Ljavax/print/attribute/standard/PrinterStateReason;Ljavax/print/attribute/standard/Severity;)Ljavax/print/attribute/standard/Severity;
  (Ljavax/print/attribute/standard/PrinterStateReason;Ljavax/print/attribute/standard/Severity;)Ljavax/print/attribute/standard/Severity;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterURI.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterURI.eea
index feece3a3d8..60ba1832df 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterURI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/PrinterURI.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.URISyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/QueuedJobCount.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/QueuedJobCount.eea
index 435db8ce98..6c0d66db37 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/QueuedJobCount.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/QueuedJobCount.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/ReferenceUriSchemesSupported.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/ReferenceUriSchemesSupported.eea
index 3f98d45c1d..2d48afad86 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/ReferenceUriSchemesSupported.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/ReferenceUriSchemesSupported.eea
@@ -27,13 +27,13 @@ WAIS
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/RequestingUserName.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/RequestingUserName.eea
index 8c3007f3db..b7d66724b9 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/RequestingUserName.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/RequestingUserName.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Severity.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Severity.eea
index 7880b0cc64..2b19f132fd 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Severity.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Severity.eea
@@ -12,13 +12,13 @@ WARNING
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/SheetCollate.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/SheetCollate.eea
index 3c5ab1ecbf..71283fc7ba 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/SheetCollate.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/SheetCollate.eea
@@ -9,13 +9,13 @@ UNCOLLATED
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Sides.eea b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Sides.eea
index 2de437c6f3..24d0c4d756 100644
--- a/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Sides.eea
+++ b/libs/eea-java-11/src/main/resources/javax/print/attribute/standard/Sides.eea
@@ -18,13 +18,13 @@ TWO_SIDED_SHORT_EDGE
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-11/src/main/resources/javax/rmi/ssl/SslRMIClientSocketFactory.eea b/libs/eea-java-11/src/main/resources/javax/rmi/ssl/SslRMIClientSocketFactory.eea
index ff5f6d43aa..bb56c0bd67 100644
--- a/libs/eea-java-11/src/main/resources/javax/rmi/ssl/SslRMIClientSocketFactory.eea
+++ b/libs/eea-java-11/src/main/resources/javax/rmi/ssl/SslRMIClientSocketFactory.eea
@@ -2,7 +2,7 @@ class javax/rmi/ssl/SslRMIClientSocketFactory
 
 createSocket
  (Ljava/lang/String;I)Ljava/net/Socket;
- (Ljava/lang/String;I)Ljava/net/Socket;
+ (Ljava/lang/String;I)L1java/net/Socket; # @Inherited(java.rmi.server.RMIClientSocketFactory)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/javax/rmi/ssl/SslRMIServerSocketFactory.eea b/libs/eea-java-11/src/main/resources/javax/rmi/ssl/SslRMIServerSocketFactory.eea
index cbf28fc3ec..e2f721b0da 100644
--- a/libs/eea-java-11/src/main/resources/javax/rmi/ssl/SslRMIServerSocketFactory.eea
+++ b/libs/eea-java-11/src/main/resources/javax/rmi/ssl/SslRMIServerSocketFactory.eea
@@ -8,7 +8,7 @@ class javax/rmi/ssl/SslRMIServerSocketFactory
  ([Ljava/lang/String;[Ljava/lang/String;Z)V
 createServerSocket
  (I)Ljava/net/ServerSocket;
- (I)Ljava/net/ServerSocket;
+ (I)L1java/net/ServerSocket; # @Inherited(java.rmi.server.RMIServerSocketFactory)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/javax/script/AbstractScriptEngine.eea b/libs/eea-java-11/src/main/resources/javax/script/AbstractScriptEngine.eea
index 65cb167748..158d3b3ff3 100644
--- a/libs/eea-java-11/src/main/resources/javax/script/AbstractScriptEngine.eea
+++ b/libs/eea-java-11/src/main/resources/javax/script/AbstractScriptEngine.eea
@@ -21,7 +21,7 @@ eval
  (Ljava/lang/String;Ljavax/script/Bindings;)Ljava/lang/Object;
 get
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 getBindings
  (I)Ljavax/script/Bindings;
  (I)Ljavax/script/Bindings;
diff --git a/libs/eea-java-11/src/main/resources/javax/script/ScriptEngine.eea b/libs/eea-java-11/src/main/resources/javax/script/ScriptEngine.eea
index 38e8ba1381..6998a349d8 100644
--- a/libs/eea-java-11/src/main/resources/javax/script/ScriptEngine.eea
+++ b/libs/eea-java-11/src/main/resources/javax/script/ScriptEngine.eea
@@ -24,7 +24,7 @@ NAME
 
 createBindings
  ()Ljavax/script/Bindings;
- ()Ljavax/script/Bindings;
+ ()L1javax/script/Bindings;
 eval
  (Ljava/io/Reader;)Ljava/lang/Object;
  (Ljava/io/Reader;)Ljava/lang/Object;
diff --git a/libs/eea-java-11/src/main/resources/javax/script/ScriptEngineManager.eea b/libs/eea-java-11/src/main/resources/javax/script/ScriptEngineManager.eea
index 25204936d4..34b4ff977e 100644
--- a/libs/eea-java-11/src/main/resources/javax/script/ScriptEngineManager.eea
+++ b/libs/eea-java-11/src/main/resources/javax/script/ScriptEngineManager.eea
@@ -11,13 +11,13 @@ getBindings
  ()Ljavax/script/Bindings;
 getEngineByExtension
  (Ljava/lang/String;)Ljavax/script/ScriptEngine;
- (Ljava/lang/String;)Ljavax/script/ScriptEngine;
+ (Ljava/lang/String;)L0javax/script/ScriptEngine;
 getEngineByMimeType
  (Ljava/lang/String;)Ljavax/script/ScriptEngine;
- (Ljava/lang/String;)Ljavax/script/ScriptEngine;
+ (Ljava/lang/String;)L0javax/script/ScriptEngine;
 getEngineByName
  (Ljava/lang/String;)Ljavax/script/ScriptEngine;
- (Ljava/lang/String;)Ljavax/script/ScriptEngine;
+ (Ljava/lang/String;)L0javax/script/ScriptEngine;
 getEngineFactories
  ()Ljava/util/List<Ljavax/script/ScriptEngineFactory;>;
  ()Ljava/util/List<Ljavax/script/ScriptEngineFactory;>;
diff --git a/libs/eea-java-11/src/main/resources/javax/script/SimpleScriptContext.eea b/libs/eea-java-11/src/main/resources/javax/script/SimpleScriptContext.eea
index 3c946be517..724d5259e0 100644
--- a/libs/eea-java-11/src/main/resources/javax/script/SimpleScriptContext.eea
+++ b/libs/eea-java-11/src/main/resources/javax/script/SimpleScriptContext.eea
@@ -18,10 +18,10 @@ writer
 
 getAttribute
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 getAttribute
  (Ljava/lang/String;I)Ljava/lang/Object;
- (Ljava/lang/String;I)Ljava/lang/Object;
+ (Ljava/lang/String;I)L0java/lang/Object;
 getAttributesScope
  (Ljava/lang/String;)I
  (Ljava/lang/String;)I
@@ -42,7 +42,7 @@ getWriter
  ()Ljava/io/Writer;
 removeAttribute
  (Ljava/lang/String;I)Ljava/lang/Object;
- (Ljava/lang/String;I)Ljava/lang/Object;
+ (Ljava/lang/String;I)L0java/lang/Object;
 setAttribute
  (Ljava/lang/String;Ljava/lang/Object;I)V
  (Ljava/lang/String;Ljava/lang/Object;I)V
diff --git a/libs/eea-java-11/src/main/resources/javax/security/auth/SubjectDomainCombiner.eea b/libs/eea-java-11/src/main/resources/javax/security/auth/SubjectDomainCombiner.eea
index a64fff6a5a..3a1b39078c 100644
--- a/libs/eea-java-11/src/main/resources/javax/security/auth/SubjectDomainCombiner.eea
+++ b/libs/eea-java-11/src/main/resources/javax/security/auth/SubjectDomainCombiner.eea
@@ -5,7 +5,7 @@ class javax/security/auth/SubjectDomainCombiner
  (Ljavax/security/auth/Subject;)V
 combine
  ([Ljava/security/ProtectionDomain;[Ljava/security/ProtectionDomain;)[Ljava/security/ProtectionDomain;
- ([Ljava/security/ProtectionDomain;[Ljava/security/ProtectionDomain;)[Ljava/security/ProtectionDomain;
+ ([Ljava/security/ProtectionDomain;[Ljava/security/ProtectionDomain;)[0Ljava/security/ProtectionDomain;
 getSubject
  ()Ljavax/security/auth/Subject;
  ()Ljavax/security/auth/Subject;
diff --git a/libs/eea-java-11/src/main/resources/javax/security/auth/kerberos/KeyTab.eea b/libs/eea-java-11/src/main/resources/javax/security/auth/kerberos/KeyTab.eea
index 190a0a4672..2ef7cabbee 100644
--- a/libs/eea-java-11/src/main/resources/javax/security/auth/kerberos/KeyTab.eea
+++ b/libs/eea-java-11/src/main/resources/javax/security/auth/kerberos/KeyTab.eea
@@ -24,7 +24,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getKeys
  (Ljavax/security/auth/kerberos/KerberosPrincipal;)[Ljavax/security/auth/kerberos/KerberosKey;
- (Ljavax/security/auth/kerberos/KerberosPrincipal;)[Ljavax/security/auth/kerberos/KerberosKey;
+ (Ljavax/security/auth/kerberos/KerberosPrincipal;)[1Ljavax/security/auth/kerberos/KerberosKey;
 getPrincipal
  ()Ljavax/security/auth/kerberos/KerberosPrincipal;
  ()Ljavax/security/auth/kerberos/KerberosPrincipal;
diff --git a/libs/eea-java-11/src/main/resources/javax/security/auth/login/Configuration.eea b/libs/eea-java-11/src/main/resources/javax/security/auth/login/Configuration.eea
index a672cd6da1..02a870fe84 100644
--- a/libs/eea-java-11/src/main/resources/javax/security/auth/login/Configuration.eea
+++ b/libs/eea-java-11/src/main/resources/javax/security/auth/login/Configuration.eea
@@ -21,10 +21,10 @@ getAppConfigurationEntry
  (Ljava/lang/String;)[Ljavax/security/auth/login/AppConfigurationEntry;
 getParameters
  ()Ljavax/security/auth/login/Configuration$Parameters;
- ()Ljavax/security/auth/login/Configuration$Parameters;
+ ()L0javax/security/auth/login/Configuration$Parameters;
 getProvider
  ()Ljava/security/Provider;
- ()Ljava/security/Provider;
+ ()L0java/security/Provider;
 getType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/security/auth/login/LoginContext.eea b/libs/eea-java-11/src/main/resources/javax/security/auth/login/LoginContext.eea
index 774f33905d..e7eb82cc68 100644
--- a/libs/eea-java-11/src/main/resources/javax/security/auth/login/LoginContext.eea
+++ b/libs/eea-java-11/src/main/resources/javax/security/auth/login/LoginContext.eea
@@ -17,4 +17,4 @@ class javax/security/auth/login/LoginContext
  (Ljava/lang/String;Ljavax/security/auth/callback/CallbackHandler;)V
 getSubject
  ()Ljavax/security/auth/Subject;
- ()Ljavax/security/auth/Subject;
+ ()L0javax/security/auth/Subject;
diff --git a/libs/eea-java-11/src/main/resources/javax/security/sasl/AuthorizeCallback.eea b/libs/eea-java-11/src/main/resources/javax/security/sasl/AuthorizeCallback.eea
index 4a75b410de..a637ae62f6 100644
--- a/libs/eea-java-11/src/main/resources/javax/security/sasl/AuthorizeCallback.eea
+++ b/libs/eea-java-11/src/main/resources/javax/security/sasl/AuthorizeCallback.eea
@@ -11,7 +11,7 @@ getAuthorizationID
  ()Ljava/lang/String;
 getAuthorizedID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 setAuthorizedID
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/security/sasl/Sasl.eea b/libs/eea-java-11/src/main/resources/javax/security/sasl/Sasl.eea
index 7c579f59db..6cda647cf6 100644
--- a/libs/eea-java-11/src/main/resources/javax/security/sasl/Sasl.eea
+++ b/libs/eea-java-11/src/main/resources/javax/security/sasl/Sasl.eea
@@ -45,13 +45,13 @@ STRENGTH
 
 createSaslClient
  ([Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)Ljavax/security/sasl/SaslClient;
- ([Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)Ljavax/security/sasl/SaslClient;
+ ([Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)L0javax/security/sasl/SaslClient;
 createSaslServer
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)Ljavax/security/sasl/SaslServer;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)Ljavax/security/sasl/SaslServer;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)L0javax/security/sasl/SaslServer;
 getSaslClientFactories
  ()Ljava/util/Enumeration<Ljavax/security/sasl/SaslClientFactory;>;
- ()Ljava/util/Enumeration<Ljavax/security/sasl/SaslClientFactory;>;
+ ()L1java/util/Enumeration<Ljavax/security/sasl/SaslClientFactory;>;
 getSaslServerFactories
  ()Ljava/util/Enumeration<Ljavax/security/sasl/SaslServerFactory;>;
- ()Ljava/util/Enumeration<Ljavax/security/sasl/SaslServerFactory;>;
+ ()L1java/util/Enumeration<Ljavax/security/sasl/SaslServerFactory;>;
diff --git a/libs/eea-java-11/src/main/resources/javax/security/sasl/SaslClientFactory.eea b/libs/eea-java-11/src/main/resources/javax/security/sasl/SaslClientFactory.eea
index 0588a46e61..9056eefd25 100644
--- a/libs/eea-java-11/src/main/resources/javax/security/sasl/SaslClientFactory.eea
+++ b/libs/eea-java-11/src/main/resources/javax/security/sasl/SaslClientFactory.eea
@@ -2,7 +2,7 @@ class javax/security/sasl/SaslClientFactory
 
 createSaslClient
  ([Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)Ljavax/security/sasl/SaslClient;
- ([Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)Ljavax/security/sasl/SaslClient;
+ ([Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)L1javax/security/sasl/SaslClient;
 getMechanismNames
  (Ljava/util/Map<Ljava/lang/String;*>;)[Ljava/lang/String;
  (Ljava/util/Map<Ljava/lang/String;*>;)[Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/security/sasl/SaslServerFactory.eea b/libs/eea-java-11/src/main/resources/javax/security/sasl/SaslServerFactory.eea
index a6e9516b4f..8eafe44ddb 100644
--- a/libs/eea-java-11/src/main/resources/javax/security/sasl/SaslServerFactory.eea
+++ b/libs/eea-java-11/src/main/resources/javax/security/sasl/SaslServerFactory.eea
@@ -2,7 +2,7 @@ class javax/security/sasl/SaslServerFactory
 
 createSaslServer
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)Ljavax/security/sasl/SaslServer;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)Ljavax/security/sasl/SaslServer;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)L1javax/security/sasl/SaslServer;
 getMechanismNames
  (Ljava/util/Map<Ljava/lang/String;*>;)[Ljava/lang/String;
  (Ljava/util/Map<Ljava/lang/String;*>;)[Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/smartcardio/ATR.eea b/libs/eea-java-11/src/main/resources/javax/smartcardio/ATR.eea
index 92b5056a4f..098c6d024b 100644
--- a/libs/eea-java-11/src/main/resources/javax/smartcardio/ATR.eea
+++ b/libs/eea-java-11/src/main/resources/javax/smartcardio/ATR.eea
@@ -11,7 +11,7 @@ getBytes
  ()[B
 getHistoricalBytes
  ()[B
- ()[B
+ ()[1B
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/javax/smartcardio/CardTerminals.eea b/libs/eea-java-11/src/main/resources/javax/smartcardio/CardTerminals.eea
index a172837297..f4dcf47be4 100644
--- a/libs/eea-java-11/src/main/resources/javax/smartcardio/CardTerminals.eea
+++ b/libs/eea-java-11/src/main/resources/javax/smartcardio/CardTerminals.eea
@@ -2,7 +2,7 @@ class javax/smartcardio/CardTerminals
 
 getTerminal
  (Ljava/lang/String;)Ljavax/smartcardio/CardTerminal;
- (Ljava/lang/String;)Ljavax/smartcardio/CardTerminal;
+ (Ljava/lang/String;)L0javax/smartcardio/CardTerminal;
 list
  ()Ljava/util/List<Ljavax/smartcardio/CardTerminal;>;
  ()Ljava/util/List<Ljavax/smartcardio/CardTerminal;>;
diff --git a/libs/eea-java-11/src/main/resources/javax/smartcardio/CommandAPDU.eea b/libs/eea-java-11/src/main/resources/javax/smartcardio/CommandAPDU.eea
index b8e7e11a64..629737293c 100644
--- a/libs/eea-java-11/src/main/resources/javax/smartcardio/CommandAPDU.eea
+++ b/libs/eea-java-11/src/main/resources/javax/smartcardio/CommandAPDU.eea
@@ -29,7 +29,7 @@ getBytes
  ()[B
 getData
  ()[B
- ()[B
+ ()[1B
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/javax/smartcardio/ResponseAPDU.eea b/libs/eea-java-11/src/main/resources/javax/smartcardio/ResponseAPDU.eea
index ab740be1f8..792dd25bde 100644
--- a/libs/eea-java-11/src/main/resources/javax/smartcardio/ResponseAPDU.eea
+++ b/libs/eea-java-11/src/main/resources/javax/smartcardio/ResponseAPDU.eea
@@ -11,7 +11,7 @@ getBytes
  ()[B
 getData
  ()[B
- ()[B
+ ()[1B
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/javax/sound/midi/MetaMessage.eea b/libs/eea-java-11/src/main/resources/javax/sound/midi/MetaMessage.eea
index 50fdf1926f..f2b47417d5 100644
--- a/libs/eea-java-11/src/main/resources/javax/sound/midi/MetaMessage.eea
+++ b/libs/eea-java-11/src/main/resources/javax/sound/midi/MetaMessage.eea
@@ -11,7 +11,7 @@ clone
  ()L1java/lang/Object; # @Inherited(javax.sound.midi.MidiMessage)
 getData
  ()[B
- ()[B
+ ()[1B
 setMessage
  (I[BI)V
  (I[BI)V
diff --git a/libs/eea-java-11/src/main/resources/javax/sound/midi/MidiFileFormat.eea b/libs/eea-java-11/src/main/resources/javax/sound/midi/MidiFileFormat.eea
index df1cd1bbbf..528d0480bf 100644
--- a/libs/eea-java-11/src/main/resources/javax/sound/midi/MidiFileFormat.eea
+++ b/libs/eea-java-11/src/main/resources/javax/sound/midi/MidiFileFormat.eea
@@ -5,7 +5,7 @@ class javax/sound/midi/MidiFileFormat
  (IFIIJLjava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)V
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 properties
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
diff --git a/libs/eea-java-11/src/main/resources/javax/sound/midi/MidiMessage.eea b/libs/eea-java-11/src/main/resources/javax/sound/midi/MidiMessage.eea
index 2b3d0cb666..0ff6d91b9d 100644
--- a/libs/eea-java-11/src/main/resources/javax/sound/midi/MidiMessage.eea
+++ b/libs/eea-java-11/src/main/resources/javax/sound/midi/MidiMessage.eea
@@ -12,7 +12,7 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 getMessage
  ()[B
- ()[B
+ ()[1B
 setMessage
  ([BI)V
  ([BI)V
diff --git a/libs/eea-java-11/src/main/resources/javax/sound/midi/MidiSystem.eea b/libs/eea-java-11/src/main/resources/javax/sound/midi/MidiSystem.eea
index 114f898b2c..867b2b5aa3 100644
--- a/libs/eea-java-11/src/main/resources/javax/sound/midi/MidiSystem.eea
+++ b/libs/eea-java-11/src/main/resources/javax/sound/midi/MidiSystem.eea
@@ -17,13 +17,13 @@ getMidiFileFormat
  (Ljava/net/URL;)Ljavax/sound/midi/MidiFileFormat;
 getMidiFileTypes
  ()[I
- ()[I
+ ()[1I
 getMidiFileTypes
  (Ljavax/sound/midi/Sequence;)[I
- (Ljavax/sound/midi/Sequence;)[I
+ (Ljavax/sound/midi/Sequence;)[1I
 getReceiver
  ()Ljavax/sound/midi/Receiver;
- ()Ljavax/sound/midi/Receiver;
+ ()L1javax/sound/midi/Receiver;
 getSequence
  (Ljava/io/File;)Ljavax/sound/midi/Sequence;
  (Ljava/io/File;)Ljavax/sound/midi/Sequence;
@@ -53,7 +53,7 @@ getSynthesizer
  ()Ljavax/sound/midi/Synthesizer;
 getTransmitter
  ()Ljavax/sound/midi/Transmitter;
- ()Ljavax/sound/midi/Transmitter;
+ ()L1javax/sound/midi/Transmitter;
 isFileTypeSupported
  (ILjavax/sound/midi/Sequence;)Z
  (ILjavax/sound/midi/Sequence;)Z
diff --git a/libs/eea-java-11/src/main/resources/javax/sound/midi/Sequence.eea b/libs/eea-java-11/src/main/resources/javax/sound/midi/Sequence.eea
index 655518ac55..508c9fd749 100644
--- a/libs/eea-java-11/src/main/resources/javax/sound/midi/Sequence.eea
+++ b/libs/eea-java-11/src/main/resources/javax/sound/midi/Sequence.eea
@@ -6,13 +6,13 @@ tracks
 
 createTrack
  ()Ljavax/sound/midi/Track;
- ()Ljavax/sound/midi/Track;
+ ()L1javax/sound/midi/Track;
 deleteTrack
  (Ljavax/sound/midi/Track;)Z
  (Ljavax/sound/midi/Track;)Z
 getPatchList
  ()[Ljavax/sound/midi/Patch;
- ()[Ljavax/sound/midi/Patch;
+ ()[1Ljavax/sound/midi/Patch;
 getTracks
  ()[Ljavax/sound/midi/Track;
  ()[Ljavax/sound/midi/Track;
diff --git a/libs/eea-java-11/src/main/resources/javax/sound/midi/SysexMessage.eea b/libs/eea-java-11/src/main/resources/javax/sound/midi/SysexMessage.eea
index 211d500dc8..d2d9c2280c 100644
--- a/libs/eea-java-11/src/main/resources/javax/sound/midi/SysexMessage.eea
+++ b/libs/eea-java-11/src/main/resources/javax/sound/midi/SysexMessage.eea
@@ -14,7 +14,7 @@ clone
  ()L1java/lang/Object; # @Inherited(javax.sound.midi.MidiMessage)
 getData
  ()[B
- ()[B
+ ()[1B
 setMessage
  (I[BI)V
  (I[BI)V
diff --git a/libs/eea-java-11/src/main/resources/javax/sound/sampled/AudioFileFormat.eea b/libs/eea-java-11/src/main/resources/javax/sound/sampled/AudioFileFormat.eea
index 2ffe727b38..8dd6f8d194 100644
--- a/libs/eea-java-11/src/main/resources/javax/sound/sampled/AudioFileFormat.eea
+++ b/libs/eea-java-11/src/main/resources/javax/sound/sampled/AudioFileFormat.eea
@@ -14,7 +14,7 @@ getFormat
  ()Ljavax/sound/sampled/AudioFormat;
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 getType
  ()Ljavax/sound/sampled/AudioFileFormat$Type;
  ()Ljavax/sound/sampled/AudioFileFormat$Type;
diff --git a/libs/eea-java-11/src/main/resources/javax/sound/sampled/AudioFormat.eea b/libs/eea-java-11/src/main/resources/javax/sound/sampled/AudioFormat.eea
index 1fe3ec0a2a..048eed1a0c 100644
--- a/libs/eea-java-11/src/main/resources/javax/sound/sampled/AudioFormat.eea
+++ b/libs/eea-java-11/src/main/resources/javax/sound/sampled/AudioFormat.eea
@@ -15,7 +15,7 @@ getEncoding
  ()Ljavax/sound/sampled/AudioFormat$Encoding;
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 matches
  (Ljavax/sound/sampled/AudioFormat;)Z
  (Ljavax/sound/sampled/AudioFormat;)Z
diff --git a/libs/eea-java-11/src/main/resources/javax/sound/sampled/AudioSystem.eea b/libs/eea-java-11/src/main/resources/javax/sound/sampled/AudioSystem.eea
index f8434db162..f64cc1f5b9 100644
--- a/libs/eea-java-11/src/main/resources/javax/sound/sampled/AudioSystem.eea
+++ b/libs/eea-java-11/src/main/resources/javax/sound/sampled/AudioSystem.eea
@@ -53,7 +53,7 @@ getSourceDataLine
  (Ljavax/sound/sampled/AudioFormat;Ljavax/sound/sampled/Mixer$Info;)Ljavax/sound/sampled/SourceDataLine;
 getSourceLineInfo
  (Ljavax/sound/sampled/Line$Info;)[Ljavax/sound/sampled/Line$Info;
- (Ljavax/sound/sampled/Line$Info;)[Ljavax/sound/sampled/Line$Info;
+ (Ljavax/sound/sampled/Line$Info;)[1Ljavax/sound/sampled/Line$Info;
 getTargetDataLine
  (Ljavax/sound/sampled/AudioFormat;)Ljavax/sound/sampled/TargetDataLine;
  (Ljavax/sound/sampled/AudioFormat;)Ljavax/sound/sampled/TargetDataLine;
@@ -71,7 +71,7 @@ getTargetFormats
  (Ljavax/sound/sampled/AudioFormat$Encoding;Ljavax/sound/sampled/AudioFormat;)[Ljavax/sound/sampled/AudioFormat;
 getTargetLineInfo
  (Ljavax/sound/sampled/Line$Info;)[Ljavax/sound/sampled/Line$Info;
- (Ljavax/sound/sampled/Line$Info;)[Ljavax/sound/sampled/Line$Info;
+ (Ljavax/sound/sampled/Line$Info;)[1Ljavax/sound/sampled/Line$Info;
 isConversionSupported
  (Ljavax/sound/sampled/AudioFormat$Encoding;Ljavax/sound/sampled/AudioFormat;)Z
  (Ljavax/sound/sampled/AudioFormat$Encoding;Ljavax/sound/sampled/AudioFormat;)Z
diff --git a/libs/eea-java-11/src/main/resources/javax/sql/CommonDataSource.eea b/libs/eea-java-11/src/main/resources/javax/sql/CommonDataSource.eea
index 691fef6e3a..c84ab28454 100644
--- a/libs/eea-java-11/src/main/resources/javax/sql/CommonDataSource.eea
+++ b/libs/eea-java-11/src/main/resources/javax/sql/CommonDataSource.eea
@@ -2,7 +2,7 @@ class javax/sql/CommonDataSource
 
 createShardingKeyBuilder
  ()Ljava/sql/ShardingKeyBuilder;
- ()Ljava/sql/ShardingKeyBuilder;
+ ()L1java/sql/ShardingKeyBuilder;
 getLogWriter
  ()Ljava/io/PrintWriter;
  ()Ljava/io/PrintWriter;
diff --git a/libs/eea-java-11/src/main/resources/javax/sql/ConnectionPoolDataSource.eea b/libs/eea-java-11/src/main/resources/javax/sql/ConnectionPoolDataSource.eea
index 18b6caa217..2d392caa73 100644
--- a/libs/eea-java-11/src/main/resources/javax/sql/ConnectionPoolDataSource.eea
+++ b/libs/eea-java-11/src/main/resources/javax/sql/ConnectionPoolDataSource.eea
@@ -2,7 +2,7 @@ class javax/sql/ConnectionPoolDataSource
 
 createPooledConnectionBuilder
  ()Ljavax/sql/PooledConnectionBuilder;
- ()Ljavax/sql/PooledConnectionBuilder;
+ ()L1javax/sql/PooledConnectionBuilder;
 getLogWriter
  ()Ljava/io/PrintWriter;
  ()Ljava/io/PrintWriter;
diff --git a/libs/eea-java-11/src/main/resources/javax/sql/DataSource.eea b/libs/eea-java-11/src/main/resources/javax/sql/DataSource.eea
index 8b8bba6455..ce951da69a 100644
--- a/libs/eea-java-11/src/main/resources/javax/sql/DataSource.eea
+++ b/libs/eea-java-11/src/main/resources/javax/sql/DataSource.eea
@@ -2,7 +2,7 @@ class javax/sql/DataSource
 
 createConnectionBuilder
  ()Ljava/sql/ConnectionBuilder;
- ()Ljava/sql/ConnectionBuilder;
+ ()L1java/sql/ConnectionBuilder;
 getConnection
  ()Ljava/sql/Connection;
  ()Ljava/sql/Connection;
diff --git a/libs/eea-java-11/src/main/resources/javax/sql/XADataSource.eea b/libs/eea-java-11/src/main/resources/javax/sql/XADataSource.eea
index b8c2cf45b2..5f9e8cdae3 100644
--- a/libs/eea-java-11/src/main/resources/javax/sql/XADataSource.eea
+++ b/libs/eea-java-11/src/main/resources/javax/sql/XADataSource.eea
@@ -2,7 +2,7 @@ class javax/sql/XADataSource
 
 createXAConnectionBuilder
  ()Ljavax/sql/XAConnectionBuilder;
- ()Ljavax/sql/XAConnectionBuilder;
+ ()L1javax/sql/XAConnectionBuilder;
 getLogWriter
  ()Ljava/io/PrintWriter;
  ()Ljava/io/PrintWriter;
diff --git a/libs/eea-java-11/src/main/resources/javax/sql/rowset/BaseRowSet.eea b/libs/eea-java-11/src/main/resources/javax/sql/rowset/BaseRowSet.eea
index b96312bcce..4bafcd3edb 100644
--- a/libs/eea-java-11/src/main/resources/javax/sql/rowset/BaseRowSet.eea
+++ b/libs/eea-java-11/src/main/resources/javax/sql/rowset/BaseRowSet.eea
@@ -24,7 +24,7 @@ getDataSourceName
  ()Ljava/lang/String;
 getParams
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[1Ljava/lang/Object;
 getPassword
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/sql/rowset/CachedRowSet.eea b/libs/eea-java-11/src/main/resources/javax/sql/rowset/CachedRowSet.eea
index 0be2c46399..70181ef07f 100644
--- a/libs/eea-java-11/src/main/resources/javax/sql/rowset/CachedRowSet.eea
+++ b/libs/eea-java-11/src/main/resources/javax/sql/rowset/CachedRowSet.eea
@@ -8,16 +8,16 @@ columnUpdated
  (Ljava/lang/String;)Z
 createCopy
  ()Ljavax/sql/rowset/CachedRowSet;
- ()Ljavax/sql/rowset/CachedRowSet;
+ ()L1javax/sql/rowset/CachedRowSet;
 createCopyNoConstraints
  ()Ljavax/sql/rowset/CachedRowSet;
- ()Ljavax/sql/rowset/CachedRowSet;
+ ()L1javax/sql/rowset/CachedRowSet;
 createCopySchema
  ()Ljavax/sql/rowset/CachedRowSet;
- ()Ljavax/sql/rowset/CachedRowSet;
+ ()L1javax/sql/rowset/CachedRowSet;
 createShared
  ()Ljavax/sql/RowSet;
- ()Ljavax/sql/RowSet;
+ ()L1javax/sql/RowSet;
 execute
  (Ljava/sql/Connection;)V
  (Ljava/sql/Connection;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/sql/rowset/RowSetFactory.eea b/libs/eea-java-11/src/main/resources/javax/sql/rowset/RowSetFactory.eea
index cdb0554304..6285cf5fae 100644
--- a/libs/eea-java-11/src/main/resources/javax/sql/rowset/RowSetFactory.eea
+++ b/libs/eea-java-11/src/main/resources/javax/sql/rowset/RowSetFactory.eea
@@ -2,16 +2,16 @@ class javax/sql/rowset/RowSetFactory
 
 createCachedRowSet
  ()Ljavax/sql/rowset/CachedRowSet;
- ()Ljavax/sql/rowset/CachedRowSet;
+ ()L1javax/sql/rowset/CachedRowSet;
 createFilteredRowSet
  ()Ljavax/sql/rowset/FilteredRowSet;
- ()Ljavax/sql/rowset/FilteredRowSet;
+ ()L1javax/sql/rowset/FilteredRowSet;
 createJdbcRowSet
  ()Ljavax/sql/rowset/JdbcRowSet;
- ()Ljavax/sql/rowset/JdbcRowSet;
+ ()L1javax/sql/rowset/JdbcRowSet;
 createJoinRowSet
  ()Ljavax/sql/rowset/JoinRowSet;
- ()Ljavax/sql/rowset/JoinRowSet;
+ ()L1javax/sql/rowset/JoinRowSet;
 createWebRowSet
  ()Ljavax/sql/rowset/WebRowSet;
- ()Ljavax/sql/rowset/WebRowSet;
+ ()L1javax/sql/rowset/WebRowSet;
diff --git a/libs/eea-java-11/src/main/resources/javax/sql/rowset/serial/SerialArray.eea b/libs/eea-java-11/src/main/resources/javax/sql/rowset/serial/SerialArray.eea
index 7a4ac8a501..1d97e965d2 100644
--- a/libs/eea-java-11/src/main/resources/javax/sql/rowset/serial/SerialArray.eea
+++ b/libs/eea-java-11/src/main/resources/javax/sql/rowset/serial/SerialArray.eea
@@ -14,28 +14,28 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getArray
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 getArray
  (JI)Ljava/lang/Object;
- (JI)Ljava/lang/Object;
+ (JI)L1java/lang/Object;
 getArray
  (JILjava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)Ljava/lang/Object;
- (JILjava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)Ljava/lang/Object;
+ (JILjava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)L1java/lang/Object;
 getArray
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)Ljava/lang/Object;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)Ljava/lang/Object;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)L1java/lang/Object;
 getBaseTypeName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getResultSet
  ()Ljava/sql/ResultSet;
- ()Ljava/sql/ResultSet;
+ ()L1java/sql/ResultSet;
 getResultSet
  (JI)Ljava/sql/ResultSet;
- (JI)Ljava/sql/ResultSet;
+ (JI)L1java/sql/ResultSet;
 getResultSet
  (JILjava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)Ljava/sql/ResultSet;
- (JILjava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)Ljava/sql/ResultSet;
+ (JILjava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)L1java/sql/ResultSet;
 getResultSet
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)Ljava/sql/ResultSet;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)Ljava/sql/ResultSet;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)L1java/sql/ResultSet;
diff --git a/libs/eea-java-11/src/main/resources/javax/sql/rowset/serial/SerialBlob.eea b/libs/eea-java-11/src/main/resources/javax/sql/rowset/serial/SerialBlob.eea
index b9ba114359..6f9ee8d06f 100644
--- a/libs/eea-java-11/src/main/resources/javax/sql/rowset/serial/SerialBlob.eea
+++ b/libs/eea-java-11/src/main/resources/javax/sql/rowset/serial/SerialBlob.eea
@@ -14,13 +14,13 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getBinaryStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
 getBinaryStream
  (JJ)Ljava/io/InputStream;
  (JJ)Ljava/io/InputStream;
 getBytes
  (JI)[B
- (JI)[B
+ (JI)[1B
 position
  (Ljava/sql/Blob;J)J
  (Ljava/sql/Blob;J)J
diff --git a/libs/eea-java-11/src/main/resources/javax/sql/rowset/serial/SerialClob.eea b/libs/eea-java-11/src/main/resources/javax/sql/rowset/serial/SerialClob.eea
index 0b9446639e..69ad54e202 100644
--- a/libs/eea-java-11/src/main/resources/javax/sql/rowset/serial/SerialClob.eea
+++ b/libs/eea-java-11/src/main/resources/javax/sql/rowset/serial/SerialClob.eea
@@ -17,7 +17,7 @@ getAsciiStream
  ()Ljava/io/InputStream;
 getCharacterStream
  ()Ljava/io/Reader;
- ()Ljava/io/Reader;
+ ()L1java/io/Reader;
 getCharacterStream
  (JJ)Ljava/io/Reader;
  (JJ)Ljava/io/Reader;
diff --git a/libs/eea-java-11/src/main/resources/javax/sql/rowset/serial/SerialDatalink.eea b/libs/eea-java-11/src/main/resources/javax/sql/rowset/serial/SerialDatalink.eea
index a7da873da9..d49895c716 100644
--- a/libs/eea-java-11/src/main/resources/javax/sql/rowset/serial/SerialDatalink.eea
+++ b/libs/eea-java-11/src/main/resources/javax/sql/rowset/serial/SerialDatalink.eea
@@ -11,4 +11,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getDatalink
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L1java/net/URL;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/AbstractAction.eea b/libs/eea-java-11/src/main/resources/javax/swing/AbstractAction.eea
index 7e04354285..7a01eb80ac 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/AbstractAction.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/AbstractAction.eea
@@ -21,13 +21,13 @@ firePropertyChange
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 getKeys
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 getPropertyChangeListeners
  ()[Ljava/beans/PropertyChangeListener;
  ()[Ljava/beans/PropertyChangeListener;
 getValue
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 putValue
  (Ljava/lang/String;Ljava/lang/Object;)V
  (Ljava/lang/String;Ljava/lang/Object;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/AbstractButton$AccessibleAbstractButton.eea b/libs/eea-java-11/src/main/resources/javax/swing/AbstractButton$AccessibleAbstractButton.eea
index 54aed2c3f3..b5ca9ef6af 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/AbstractButton$AccessibleAbstractButton.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/AbstractButton$AccessibleAbstractButton.eea
@@ -5,16 +5,16 @@ class javax/swing/AbstractButton$AccessibleAbstractButton
  (Ljavax/swing/AbstractButton;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleIcon
  ()[Ljavax/accessibility/AccessibleIcon;
- ()[Ljavax/accessibility/AccessibleIcon;
+ ()[0Ljavax/accessibility/AccessibleIcon; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleKeyBinding
  ()Ljavax/accessibility/AccessibleKeyBinding;
- ()Ljavax/accessibility/AccessibleKeyBinding;
+ ()L0javax/accessibility/AccessibleKeyBinding; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -26,25 +26,25 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getAfterIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getAtIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getBeforeIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getCharacterAttribute
  (I)Ljavax/swing/text/AttributeSet;
- (I)Ljavax/swing/text/AttributeSet;
+ (I)L0javax/swing/text/AttributeSet;
 getCharacterBounds
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L0java/awt/Rectangle;
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
@@ -59,10 +59,10 @@ getMinimumAccessibleValue
  ()Ljava/lang/Number;
 getSelectedText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getTitledBorderText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getToolTipText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/AbstractButton.eea b/libs/eea-java-11/src/main/resources/javax/swing/AbstractButton.eea
index c1e1b2c430..cce0d15535 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/AbstractButton.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/AbstractButton.eea
@@ -100,16 +100,16 @@ configurePropertiesFromAction
  (Ljavax/swing/Action;)V
 createActionListener
  ()Ljava/awt/event/ActionListener;
- ()Ljava/awt/event/ActionListener;
+ ()L1java/awt/event/ActionListener;
 createActionPropertyChangeListener
  (Ljavax/swing/Action;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/Action;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/Action;)L1java/beans/PropertyChangeListener;
 createChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 createItemListener
  ()Ljava/awt/event/ItemListener;
- ()Ljava/awt/event/ItemListener;
+ ()L1java/awt/event/ItemListener;
 fireActionPerformed
  (Ljava/awt/event/ActionEvent;)V
  (Ljava/awt/event/ActionEvent;)V
@@ -163,7 +163,7 @@ getSelectedIcon
  ()Ljavax/swing/Icon;
 getSelectedObjects
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 getText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -181,7 +181,7 @@ paintBorder
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 removeActionListener
  (Ljava/awt/event/ActionListener;)V
  (L1java/awt/event/ActionListener;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/ActionMap.eea b/libs/eea-java-11/src/main/resources/javax/swing/ActionMap.eea
index b25d837676..61ab9043ff 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/ActionMap.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/ActionMap.eea
@@ -11,7 +11,7 @@ getParent
  ()Ljavax/swing/ActionMap;
 keys
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 put
  (Ljava/lang/Object;Ljavax/swing/Action;)V
  (Ljava/lang/Object;Ljavax/swing/Action;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/BorderFactory.eea b/libs/eea-java-11/src/main/resources/javax/swing/BorderFactory.eea
index 64d9017b67..965a859c9a 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/BorderFactory.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/BorderFactory.eea
@@ -2,103 +2,103 @@ class javax/swing/BorderFactory
 
 createBevelBorder
  (I)Ljavax/swing/border/Border;
- (I)Ljavax/swing/border/Border;
+ (I)L1javax/swing/border/Border;
 createBevelBorder
  (ILjava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
- (ILjava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
+ (ILjava/awt/Color;Ljava/awt/Color;)L1javax/swing/border/Border;
 createBevelBorder
  (ILjava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
- (ILjava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
+ (ILjava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;)L1javax/swing/border/Border;
 createCompoundBorder
  ()Ljavax/swing/border/CompoundBorder;
- ()Ljavax/swing/border/CompoundBorder;
+ ()L1javax/swing/border/CompoundBorder;
 createCompoundBorder
  (Ljavax/swing/border/Border;Ljavax/swing/border/Border;)Ljavax/swing/border/CompoundBorder;
- (Ljavax/swing/border/Border;Ljavax/swing/border/Border;)Ljavax/swing/border/CompoundBorder;
+ (Ljavax/swing/border/Border;Ljavax/swing/border/Border;)L1javax/swing/border/CompoundBorder;
 createDashedBorder
  (Ljava/awt/Paint;)Ljavax/swing/border/Border;
- (Ljava/awt/Paint;)Ljavax/swing/border/Border;
+ (Ljava/awt/Paint;)L1javax/swing/border/Border;
 createDashedBorder
  (Ljava/awt/Paint;FF)Ljavax/swing/border/Border;
- (Ljava/awt/Paint;FF)Ljavax/swing/border/Border;
+ (Ljava/awt/Paint;FF)L1javax/swing/border/Border;
 createDashedBorder
  (Ljava/awt/Paint;FFFZ)Ljavax/swing/border/Border;
- (Ljava/awt/Paint;FFFZ)Ljavax/swing/border/Border;
+ (Ljava/awt/Paint;FFFZ)L1javax/swing/border/Border;
 createEmptyBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createEmptyBorder
  (IIII)Ljavax/swing/border/Border;
- (IIII)Ljavax/swing/border/Border;
+ (IIII)L1javax/swing/border/Border;
 createEtchedBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createEtchedBorder
  (I)Ljavax/swing/border/Border;
- (I)Ljavax/swing/border/Border;
+ (I)L1javax/swing/border/Border;
 createEtchedBorder
  (ILjava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
- (ILjava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
+ (ILjava/awt/Color;Ljava/awt/Color;)L1javax/swing/border/Border;
 createEtchedBorder
  (Ljava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
- (Ljava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
+ (Ljava/awt/Color;Ljava/awt/Color;)L1javax/swing/border/Border;
 createLineBorder
  (Ljava/awt/Color;)Ljavax/swing/border/Border;
- (Ljava/awt/Color;)Ljavax/swing/border/Border;
+ (Ljava/awt/Color;)L1javax/swing/border/Border;
 createLineBorder
  (Ljava/awt/Color;I)Ljavax/swing/border/Border;
- (Ljava/awt/Color;I)Ljavax/swing/border/Border;
+ (Ljava/awt/Color;I)L1javax/swing/border/Border;
 createLineBorder
  (Ljava/awt/Color;IZ)Ljavax/swing/border/Border;
- (Ljava/awt/Color;IZ)Ljavax/swing/border/Border;
+ (Ljava/awt/Color;IZ)L1javax/swing/border/Border;
 createLoweredBevelBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createLoweredSoftBevelBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createMatteBorder
  (IIIILjava/awt/Color;)Ljavax/swing/border/MatteBorder;
- (IIIILjava/awt/Color;)Ljavax/swing/border/MatteBorder;
+ (IIIILjava/awt/Color;)L1javax/swing/border/MatteBorder;
 createMatteBorder
  (IIIILjavax/swing/Icon;)Ljavax/swing/border/MatteBorder;
- (IIIILjavax/swing/Icon;)Ljavax/swing/border/MatteBorder;
+ (IIIILjavax/swing/Icon;)L1javax/swing/border/MatteBorder;
 createRaisedBevelBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createRaisedSoftBevelBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createSoftBevelBorder
  (I)Ljavax/swing/border/Border;
- (I)Ljavax/swing/border/Border;
+ (I)L0javax/swing/border/Border;
 createSoftBevelBorder
  (ILjava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
- (ILjava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
+ (ILjava/awt/Color;Ljava/awt/Color;)L1javax/swing/border/Border;
 createSoftBevelBorder
  (ILjava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
- (ILjava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
+ (ILjava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;)L1javax/swing/border/Border;
 createStrokeBorder
  (Ljava/awt/BasicStroke;)Ljavax/swing/border/Border;
- (Ljava/awt/BasicStroke;)Ljavax/swing/border/Border;
+ (Ljava/awt/BasicStroke;)L1javax/swing/border/Border;
 createStrokeBorder
  (Ljava/awt/BasicStroke;Ljava/awt/Paint;)Ljavax/swing/border/Border;
- (Ljava/awt/BasicStroke;Ljava/awt/Paint;)Ljavax/swing/border/Border;
+ (Ljava/awt/BasicStroke;Ljava/awt/Paint;)L1javax/swing/border/Border;
 createTitledBorder
  (Ljava/lang/String;)Ljavax/swing/border/TitledBorder;
- (Ljava/lang/String;)Ljavax/swing/border/TitledBorder;
+ (Ljava/lang/String;)L1javax/swing/border/TitledBorder;
 createTitledBorder
  (Ljavax/swing/border/Border;)Ljavax/swing/border/TitledBorder;
- (Ljavax/swing/border/Border;)Ljavax/swing/border/TitledBorder;
+ (Ljavax/swing/border/Border;)L1javax/swing/border/TitledBorder;
 createTitledBorder
  (Ljavax/swing/border/Border;Ljava/lang/String;)Ljavax/swing/border/TitledBorder;
- (Ljavax/swing/border/Border;Ljava/lang/String;)Ljavax/swing/border/TitledBorder;
+ (Ljavax/swing/border/Border;Ljava/lang/String;)L1javax/swing/border/TitledBorder;
 createTitledBorder
  (Ljavax/swing/border/Border;Ljava/lang/String;II)Ljavax/swing/border/TitledBorder;
- (Ljavax/swing/border/Border;Ljava/lang/String;II)Ljavax/swing/border/TitledBorder;
+ (Ljavax/swing/border/Border;Ljava/lang/String;II)L1javax/swing/border/TitledBorder;
 createTitledBorder
  (Ljavax/swing/border/Border;Ljava/lang/String;IILjava/awt/Font;)Ljavax/swing/border/TitledBorder;
- (Ljavax/swing/border/Border;Ljava/lang/String;IILjava/awt/Font;)Ljavax/swing/border/TitledBorder;
+ (Ljavax/swing/border/Border;Ljava/lang/String;IILjava/awt/Font;)L1javax/swing/border/TitledBorder;
 createTitledBorder
  (Ljavax/swing/border/Border;Ljava/lang/String;IILjava/awt/Font;Ljava/awt/Color;)Ljavax/swing/border/TitledBorder;
- (Ljavax/swing/border/Border;Ljava/lang/String;IILjava/awt/Font;Ljava/awt/Color;)Ljavax/swing/border/TitledBorder;
+ (Ljavax/swing/border/Border;Ljava/lang/String;IILjava/awt/Font;Ljava/awt/Color;)L1javax/swing/border/TitledBorder;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/Box.eea b/libs/eea-java-11/src/main/resources/javax/swing/Box.eea
index 8a729e67b3..bfe7e28a9a 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/Box.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/Box.eea
@@ -2,28 +2,28 @@ class javax/swing/Box
 
 createGlue
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component;
 createHorizontalBox
  ()Ljavax/swing/Box;
- ()Ljavax/swing/Box;
+ ()L1javax/swing/Box;
 createHorizontalGlue
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component;
 createHorizontalStrut
  (I)Ljava/awt/Component;
- (I)Ljava/awt/Component;
+ (I)L1java/awt/Component;
 createRigidArea
  (Ljava/awt/Dimension;)Ljava/awt/Component;
- (Ljava/awt/Dimension;)Ljava/awt/Component;
+ (Ljava/awt/Dimension;)L1java/awt/Component;
 createVerticalBox
  ()Ljavax/swing/Box;
- ()Ljavax/swing/Box;
+ ()L1javax/swing/Box;
 createVerticalGlue
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component;
 createVerticalStrut
  (I)Ljava/awt/Component;
- (I)Ljava/awt/Component;
+ (I)L1java/awt/Component;
 
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/ButtonModel.eea b/libs/eea-java-11/src/main/resources/javax/swing/ButtonModel.eea
index 35682cac51..a01364f96f 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/ButtonModel.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/ButtonModel.eea
@@ -14,7 +14,7 @@ getActionCommand
  ()Ljava/lang/String;
 getGroup
  ()Ljavax/swing/ButtonGroup;
- ()Ljavax/swing/ButtonGroup;
+ ()L0javax/swing/ButtonGroup;
 removeActionListener
  (Ljava/awt/event/ActionListener;)V
  (L1java/awt/event/ActionListener;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/DebugGraphics.eea b/libs/eea-java-11/src/main/resources/javax/swing/DebugGraphics.eea
index 43e7b1a7a2..b9d0e23680 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/DebugGraphics.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/DebugGraphics.eea
@@ -21,10 +21,10 @@ setLogStream
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
 create
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L1java/awt/Graphics; # @Inherited(java.awt.Graphics)
 create
  (IIII)Ljava/awt/Graphics;
- (IIII)Ljava/awt/Graphics;
+ (IIII)L1java/awt/Graphics; # @Overrides(java.awt.Graphics)
 drawBytes
  ([BIIII)V
  ([BIIII)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/DefaultButtonModel.eea b/libs/eea-java-11/src/main/resources/javax/swing/DefaultButtonModel.eea
index c2fc90c8f8..1a4b24d929 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/DefaultButtonModel.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/DefaultButtonModel.eea
@@ -39,7 +39,7 @@ getChangeListeners
  ()[Ljavax/swing/event/ChangeListener;
 getGroup
  ()Ljavax/swing/ButtonGroup;
- ()Ljavax/swing/ButtonGroup;
+ ()L0javax/swing/ButtonGroup; # @Inherited(javax.swing.ButtonModel)
 getItemListeners
  ()[Ljava/awt/event/ItemListener;
  ()[Ljava/awt/event/ItemListener;
@@ -48,7 +48,7 @@ getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
 getSelectedObjects
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 removeActionListener
  (Ljava/awt/event/ActionListener;)V
  (L1java/awt/event/ActionListener;)V # @Inherited(javax.swing.ButtonModel)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/DefaultFocusManager.eea b/libs/eea-java-11/src/main/resources/javax/swing/DefaultFocusManager.eea
index 341f067023..d6b4d73698 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/DefaultFocusManager.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/DefaultFocusManager.eea
@@ -5,13 +5,13 @@ compareTabOrder
  (Ljava/awt/Component;Ljava/awt/Component;)Z
 getComponentAfter
  (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Container;Ljava/awt/Component;)L0java/awt/Component;
 getComponentBefore
  (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Container;Ljava/awt/Component;)L0java/awt/Component;
 getFirstComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
- (Ljava/awt/Container;)Ljava/awt/Component;
+ (Ljava/awt/Container;)L0java/awt/Component;
 getLastComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
- (Ljava/awt/Container;)Ljava/awt/Component;
+ (Ljava/awt/Container;)L0java/awt/Component;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/DefaultListModel.eea b/libs/eea-java-11/src/main/resources/javax/swing/DefaultListModel.eea
index 2d54a32aca..4f923d34b3 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/DefaultListModel.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/DefaultListModel.eea
@@ -71,7 +71,7 @@ setElementAt
  (TE;I)V
 toArray
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[1Ljava/lang/Object;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/DefaultRowSorter$ModelWrapper.eea b/libs/eea-java-11/src/main/resources/javax/swing/DefaultRowSorter$ModelWrapper.eea
index 004dba7572..72f250c4c9 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/DefaultRowSorter$ModelWrapper.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/DefaultRowSorter$ModelWrapper.eea
@@ -10,7 +10,7 @@ getModel
  ()TM;
 getStringValueAt
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L1java/lang/String;
 getValueAt
  (II)Ljava/lang/Object;
  (II)Ljava/lang/Object;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/DefaultRowSorter.eea b/libs/eea-java-11/src/main/resources/javax/swing/DefaultRowSorter.eea
index d7c56f6763..763b5fbc5a 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/DefaultRowSorter.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/DefaultRowSorter.eea
@@ -8,7 +8,7 @@ super javax/swing/RowSorter
 
 getComparator
  (I)Ljava/util/Comparator<*>;
- (I)Ljava/util/Comparator<*>;
+ (I)L0java/util/Comparator<*>;
 getModel
  ()TM;
  ()TM;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/GrayFilter.eea b/libs/eea-java-11/src/main/resources/javax/swing/GrayFilter.eea
index 63a98701b0..96dc8f0129 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/GrayFilter.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/GrayFilter.eea
@@ -2,4 +2,4 @@ class javax/swing/GrayFilter
 
 createDisabledImage
  (Ljava/awt/Image;)Ljava/awt/Image;
- (Ljava/awt/Image;)Ljava/awt/Image;
+ (Ljava/awt/Image;)L1java/awt/Image;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/GroupLayout.eea b/libs/eea-java-11/src/main/resources/javax/swing/GroupLayout.eea
index 492f6c3227..b324c8c229 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/GroupLayout.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/GroupLayout.eea
@@ -11,19 +11,19 @@ addLayoutComponent
  (Ljava/lang/String;Ljava/awt/Component;)V
 createBaselineGroup
  (ZZ)Ljavax/swing/GroupLayout$ParallelGroup;
- (ZZ)Ljavax/swing/GroupLayout$ParallelGroup;
+ (ZZ)L1javax/swing/GroupLayout$ParallelGroup;
 createParallelGroup
  ()Ljavax/swing/GroupLayout$ParallelGroup;
- ()Ljavax/swing/GroupLayout$ParallelGroup;
+ ()L1javax/swing/GroupLayout$ParallelGroup;
 createParallelGroup
  (Ljavax/swing/GroupLayout$Alignment;)Ljavax/swing/GroupLayout$ParallelGroup;
- (Ljavax/swing/GroupLayout$Alignment;)Ljavax/swing/GroupLayout$ParallelGroup;
+ (Ljavax/swing/GroupLayout$Alignment;)L1javax/swing/GroupLayout$ParallelGroup;
 createParallelGroup
  (Ljavax/swing/GroupLayout$Alignment;Z)Ljavax/swing/GroupLayout$ParallelGroup;
- (Ljavax/swing/GroupLayout$Alignment;Z)Ljavax/swing/GroupLayout$ParallelGroup;
+ (Ljavax/swing/GroupLayout$Alignment;Z)L1javax/swing/GroupLayout$ParallelGroup;
 createSequentialGroup
  ()Ljavax/swing/GroupLayout$SequentialGroup;
- ()Ljavax/swing/GroupLayout$SequentialGroup;
+ ()L1javax/swing/GroupLayout$SequentialGroup;
 getLayoutAlignmentX
  (Ljava/awt/Container;)F
  (Ljava/awt/Container;)F
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/ImageIcon$AccessibleImageIcon.eea b/libs/eea-java-11/src/main/resources/javax/swing/ImageIcon$AccessibleImageIcon.eea
index 55271646c1..b9d2e10984 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/ImageIcon$AccessibleImageIcon.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/ImageIcon$AccessibleImageIcon.eea
@@ -5,22 +5,22 @@ class javax/swing/ImageIcon$AccessibleImageIcon
  (Ljavax/swing/ImageIcon;)V
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleIconDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getAccessibleParent
  ()Ljavax/accessibility/Accessible;
- ()Ljavax/accessibility/Accessible;
+ ()L0javax/accessibility/Accessible;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
- ()Ljavax/accessibility/AccessibleStateSet;
+ ()L0javax/accessibility/AccessibleStateSet;
 getLocale
  ()Ljava/util/Locale;
- ()Ljava/util/Locale;
+ ()L0java/util/Locale;
 setAccessibleIconDescription
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/InputMap.eea b/libs/eea-java-11/src/main/resources/javax/swing/InputMap.eea
index b5f99fb884..2181c98970 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/InputMap.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/InputMap.eea
@@ -5,13 +5,13 @@ allKeys
  ()[Ljavax/swing/KeyStroke;
 get
  (Ljavax/swing/KeyStroke;)Ljava/lang/Object;
- (Ljavax/swing/KeyStroke;)Ljava/lang/Object;
+ (Ljavax/swing/KeyStroke;)L0java/lang/Object;
 getParent
  ()Ljavax/swing/InputMap;
  ()Ljavax/swing/InputMap;
 keys
  ()[Ljavax/swing/KeyStroke;
- ()[Ljavax/swing/KeyStroke;
+ ()[0Ljavax/swing/KeyStroke;
 put
  (Ljavax/swing/KeyStroke;Ljava/lang/Object;)V
  (Ljavax/swing/KeyStroke;Ljava/lang/Object;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JApplet.eea b/libs/eea-java-11/src/main/resources/javax/swing/JApplet.eea
index 99bb993e37..149f7a42f3 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JApplet.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JApplet.eea
@@ -12,7 +12,7 @@ addImpl
  (Ljava/awt/Component;Ljava/lang/Object;I)V
 createRootPane
  ()Ljavax/swing/JRootPane;
- ()Ljavax/swing/JRootPane;
+ ()L1javax/swing/JRootPane;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -24,7 +24,7 @@ getGlassPane
  ()Ljava/awt/Component;
 getGraphics
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L0java/awt/Graphics; # @Inherited(java.awt.Component)
 getJMenuBar
  ()Ljavax/swing/JMenuBar;
  ()Ljavax/swing/JMenuBar;
@@ -39,7 +39,7 @@ getTransferHandler
  ()Ljavax/swing/TransferHandler;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Container)
 remove
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JButton.eea b/libs/eea-java-11/src/main/resources/javax/swing/JButton.eea
index e8d6cecacf..afddb49906 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JButton.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JButton.eea
@@ -17,7 +17,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.AbstractButton)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JCheckBox.eea b/libs/eea-java-11/src/main/resources/javax/swing/JCheckBox.eea
index ac6d08518e..b3479bc839 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JCheckBox.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JCheckBox.eea
@@ -30,7 +30,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JToggleButton)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JToggleButton)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JCheckBoxMenuItem.eea b/libs/eea-java-11/src/main/resources/javax/swing/JCheckBoxMenuItem.eea
index 7a924cf2f8..bf60117298 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JCheckBoxMenuItem.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JCheckBoxMenuItem.eea
@@ -23,10 +23,10 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getSelectedObjects
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object; # @Inherited(javax.swing.AbstractButton)
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JMenuItem)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JMenuItem)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JColorChooser.eea b/libs/eea-java-11/src/main/resources/javax/swing/JColorChooser.eea
index bc7eae5b2a..ec0ccb2d70 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JColorChooser.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JColorChooser.eea
@@ -12,7 +12,7 @@ SELECTION_MODEL_PROPERTY
 
 createDialog
  (Ljava/awt/Component;Ljava/lang/String;ZLjavax/swing/JColorChooser;Ljava/awt/event/ActionListener;Ljava/awt/event/ActionListener;)Ljavax/swing/JDialog;
- (Ljava/awt/Component;Ljava/lang/String;ZLjavax/swing/JColorChooser;Ljava/awt/event/ActionListener;Ljava/awt/event/ActionListener;)Ljavax/swing/JDialog;
+ (Ljava/awt/Component;Ljava/lang/String;ZLjavax/swing/JColorChooser;Ljava/awt/event/ActionListener;Ljava/awt/event/ActionListener;)L1javax/swing/JDialog;
 showDialog
  (Ljava/awt/Component;Ljava/lang/String;Ljava/awt/Color;)Ljava/awt/Color;
  (Ljava/awt/Component;Ljava/lang/String;Ljava/awt/Color;)Ljava/awt/Color;
@@ -53,10 +53,10 @@ getUI
  ()Ljavax/swing/plaf/ColorChooserUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 removeChooserPanel
  (Ljavax/swing/colorchooser/AbstractColorChooserPanel;)Ljavax/swing/colorchooser/AbstractColorChooserPanel;
  (Ljavax/swing/colorchooser/AbstractColorChooserPanel;)Ljavax/swing/colorchooser/AbstractColorChooserPanel;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JComboBox$AccessibleJComboBox.eea b/libs/eea-java-11/src/main/resources/javax/swing/JComboBox$AccessibleJComboBox.eea
index b47e0b7d53..01c77c174b 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JComboBox$AccessibleJComboBox.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JComboBox$AccessibleJComboBox.eea
@@ -5,22 +5,22 @@ class javax/swing/JComboBox$AccessibleJComboBox
  (Ljavax/swing/JComboBox;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
- ()Ljavax/accessibility/AccessibleStateSet;
+ ()L1javax/accessibility/AccessibleStateSet;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JComboBox.eea b/libs/eea-java-11/src/main/resources/javax/swing/JComboBox.eea
index 04fea573a9..de808b48d2 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JComboBox.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JComboBox.eea
@@ -59,10 +59,10 @@ contentsChanged
  (L1javax/swing/event/ListDataEvent;)V # @Inherited(javax.swing.event.ListDataListener)
 createActionPropertyChangeListener
  (Ljavax/swing/Action;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/Action;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/Action;)L1java/beans/PropertyChangeListener;
 createDefaultKeySelectionManager
  ()Ljavax/swing/JComboBox$KeySelectionManager;
- ()Ljavax/swing/JComboBox$KeySelectionManager;
+ ()L1javax/swing/JComboBox$KeySelectionManager;
 fireItemStateChanged
  (Ljava/awt/event/ItemEvent;)V
  (Ljava/awt/event/ItemEvent;)V
@@ -107,13 +107,13 @@ getSelectedItem
  ()Ljava/lang/Object;
 getSelectedObjects
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[1Ljava/lang/Object;
 getUI
  ()Ljavax/swing/plaf/ComboBoxUI;
  ()Ljavax/swing/plaf/ComboBoxUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 insertItemAt
  (TE;I)V
  (TE;I)V
@@ -125,7 +125,7 @@ intervalRemoved
  (L1javax/swing/event/ListDataEvent;)V # @Inherited(javax.swing.event.ListDataListener)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 processKeyBinding
  (Ljavax/swing/KeyStroke;Ljava/awt/event/KeyEvent;IZ)Z
  (Ljavax/swing/KeyStroke;Ljava/awt/event/KeyEvent;IZ)Z
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JComponent$AccessibleJComponent.eea b/libs/eea-java-11/src/main/resources/javax/swing/JComponent$AccessibleJComponent.eea
index 3a1238f2ed..b914c34eae 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JComponent$AccessibleJComponent.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JComponent$AccessibleJComponent.eea
@@ -12,13 +12,13 @@ addPropertyChangeListener
  (L1java/beans/PropertyChangeListener;)V # @Inherited(java.awt.Container$AccessibleAWTContainer)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(java.awt.Container$AccessibleAWTContainer)
 getAccessibleDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getAccessibleKeyBinding
  ()Ljavax/accessibility/AccessibleKeyBinding;
- ()Ljavax/accessibility/AccessibleKeyBinding;
+ ()L0javax/accessibility/AccessibleKeyBinding;
 getAccessibleName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -30,10 +30,10 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getBorderTitle
  (Ljavax/swing/border/Border;)Ljava/lang/String;
- (Ljavax/swing/border/Border;)Ljava/lang/String;
+ (Ljavax/swing/border/Border;)L0java/lang/String;
 getTitledBorderText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getToolTipText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JComponent.eea b/libs/eea-java-11/src/main/resources/javax/swing/JComponent.eea
index 4826b5fd3f..57efd656a3 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JComponent.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JComponent.eea
@@ -32,7 +32,7 @@ computeVisibleRect
  (Ljava/awt/Rectangle;)V
 createToolTip
  ()Ljavax/swing/JToolTip;
- ()Ljavax/swing/JToolTip;
+ ()L1javax/swing/JToolTip;
 firePropertyChange
  (Ljava/lang/String;CC)V
  (Ljava/lang/String;CC)V
@@ -47,7 +47,7 @@ fireVetoableChange
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 getActionForKeyStroke
  (Ljavax/swing/KeyStroke;)Ljava/awt/event/ActionListener;
- (Ljavax/swing/KeyStroke;)Ljava/awt/event/ActionListener;
+ (Ljavax/swing/KeyStroke;)L0java/awt/event/ActionListener;
 getActionMap
  ()Ljavax/swing/ActionMap;
  ()Ljavax/swing/ActionMap;
@@ -65,13 +65,13 @@ getBounds
  (Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
 getClientProperty
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L0java/lang/Object;
 getComponentGraphics
  (Ljava/awt/Graphics;)Ljava/awt/Graphics;
- (Ljava/awt/Graphics;)Ljava/awt/Graphics;
+ (Ljava/awt/Graphics;)L1java/awt/Graphics;
 getComponentPopupMenu
  ()Ljavax/swing/JPopupMenu;
- ()Ljavax/swing/JPopupMenu;
+ ()L0javax/swing/JPopupMenu;
 getConditionForKeyStroke
  (Ljavax/swing/KeyStroke;)I
  (Ljavax/swing/KeyStroke;)I
@@ -80,7 +80,7 @@ getFontMetrics
  (Ljava/awt/Font;)Ljava/awt/FontMetrics;
 getGraphics
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L0java/awt/Graphics; # @Inherited(java.awt.Component)
 getInputMap
  ()Ljavax/swing/InputMap;
  ()Ljavax/swing/InputMap;
@@ -113,13 +113,13 @@ getNextFocusableComponent
  ()Ljava/awt/Component;
 getPopupLocation
  (Ljava/awt/event/MouseEvent;)Ljava/awt/Point;
- (Ljava/awt/event/MouseEvent;)Ljava/awt/Point;
+ (Ljava/awt/event/MouseEvent;)L0java/awt/Point;
 getPreferredSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
 getRegisteredKeyStrokes
  ()[Ljavax/swing/KeyStroke;
- ()[Ljavax/swing/KeyStroke;
+ ()[1Ljavax/swing/KeyStroke;
 getRootPane
  ()Ljavax/swing/JRootPane;
  ()Ljavax/swing/JRootPane;
@@ -128,7 +128,7 @@ getSize
  (Ljava/awt/Dimension;)Ljava/awt/Dimension;
 getToolTipLocation
  (Ljava/awt/event/MouseEvent;)Ljava/awt/Point;
- (Ljava/awt/event/MouseEvent;)Ljava/awt/Point;
+ (Ljava/awt/event/MouseEvent;)L0java/awt/Point;
 getToolTipText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -137,7 +137,7 @@ getToolTipText
  (L1java/awt/event/MouseEvent;)Ljava/lang/String;
 getTopLevelAncestor
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L0java/awt/Container;
 getTransferHandler
  ()Ljavax/swing/TransferHandler;
  ()Ljavax/swing/TransferHandler;
@@ -146,13 +146,13 @@ getUI
  ()Ljavax/swing/plaf/ComponentUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getVetoableChangeListeners
  ()[Ljava/beans/VetoableChangeListener;
  ()[Ljava/beans/VetoableChangeListener;
 getVisibleRect
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L1java/awt/Rectangle;
 paint
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
@@ -170,7 +170,7 @@ paintImmediately
  (Ljava/awt/Rectangle;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Container)
 print
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JDesktopPane.eea b/libs/eea-java-11/src/main/resources/javax/swing/JDesktopPane.eea
index 48c92f8629..e2821a1a10 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JDesktopPane.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JDesktopPane.eea
@@ -23,16 +23,16 @@ getUI
  ()Ljavax/swing/plaf/DesktopPaneUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JLayeredPane)
 remove
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
 selectFrame
  (Z)Ljavax/swing/JInternalFrame;
- (Z)Ljavax/swing/JInternalFrame;
+ (Z)L0javax/swing/JInternalFrame;
 setComponentZOrder
  (Ljava/awt/Component;I)V
  (Ljava/awt/Component;I)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JDialog.eea b/libs/eea-java-11/src/main/resources/javax/swing/JDialog.eea
index 88eb273a07..49e970ea95 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JDialog.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JDialog.eea
@@ -57,7 +57,7 @@ addImpl
  (Ljava/awt/Component;Ljava/lang/Object;I)V
 createRootPane
  ()Ljavax/swing/JRootPane;
- ()Ljavax/swing/JRootPane;
+ ()L1javax/swing/JRootPane;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -69,7 +69,7 @@ getGlassPane
  ()Ljava/awt/Component;
 getGraphics
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L0java/awt/Graphics; # @Inherited(java.awt.Component)
 getJMenuBar
  ()Ljavax/swing/JMenuBar;
  ()Ljavax/swing/JMenuBar;
@@ -84,7 +84,7 @@ getTransferHandler
  ()Ljavax/swing/TransferHandler;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Dialog)
 processWindowEvent
  (Ljava/awt/event/WindowEvent;)V
  (Ljava/awt/event/WindowEvent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JEditorPane$AccessibleJEditorPaneHTML.eea b/libs/eea-java-11/src/main/resources/javax/swing/JEditorPane$AccessibleJEditorPaneHTML.eea
index 195f02fdc6..862f2d72f9 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JEditorPane$AccessibleJEditorPaneHTML.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JEditorPane$AccessibleJEditorPaneHTML.eea
@@ -5,10 +5,10 @@ class javax/swing/JEditorPane$AccessibleJEditorPaneHTML
  (Ljavax/swing/JEditorPane;)V
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Container$AccessibleAWTContainer)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L1javax/accessibility/AccessibleText; # @Overrides(javax.swing.text.JTextComponent$AccessibleJTextComponent)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink.eea b/libs/eea-java-11/src/main/resources/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink.eea
index 7b021a01e2..2fde0e9c34 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink.eea
@@ -8,7 +8,7 @@ getAccessibleActionAnchor
  (I)Ljava/lang/Object;
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleActionObject
  (I)Ljava/lang/Object;
- (I)Ljava/lang/Object;
+ (I)L0java/lang/Object;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport.eea b/libs/eea-java-11/src/main/resources/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport.eea
index 5992e31388..8c64fa5426 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport.eea
@@ -5,7 +5,7 @@ class javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport
  (Ljavax/swing/JEditorPane;)V
 getLink
  (I)Ljavax/accessibility/AccessibleHyperlink;
- (I)Ljavax/accessibility/AccessibleHyperlink;
+ (I)L0javax/accessibility/AccessibleHyperlink;
 getLinkText
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JEditorPane.eea b/libs/eea-java-11/src/main/resources/javax/swing/JEditorPane.eea
index 75c2cec41c..c1644780e7 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JEditorPane.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JEditorPane.eea
@@ -9,7 +9,7 @@ W3C_LENGTH_UNITS
 
 createEditorKitForContentType
  (Ljava/lang/String;)Ljavax/swing/text/EditorKit;
- (Ljava/lang/String;)Ljavax/swing/text/EditorKit;
+ (Ljava/lang/String;)L0javax/swing/text/EditorKit;
 getEditorKitClassNameForContentType
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
@@ -34,7 +34,7 @@ addHyperlinkListener
  (L1javax/swing/event/HyperlinkListener;)V
 createDefaultEditorKit
  ()Ljavax/swing/text/EditorKit;
- ()Ljavax/swing/text/EditorKit;
+ ()L1javax/swing/text/EditorKit;
 fireHyperlinkUpdate
  (Ljavax/swing/event/HyperlinkEvent;)V
  (Ljavax/swing/event/HyperlinkEvent;)V
@@ -43,7 +43,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getEditorKit
  ()Ljavax/swing/text/EditorKit;
  ()Ljavax/swing/text/EditorKit;
@@ -58,19 +58,19 @@ getPage
  ()Ljava/net/URL;
 getPreferredSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 getStream
  (Ljava/net/URL;)Ljava/io/InputStream;
  (Ljava/net/URL;)Ljava/io/InputStream;
 getText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(javax.swing.text.JTextComponent)
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.text.JTextComponent)
 read
  (Ljava/io/InputStream;Ljava/lang/Object;)V
  (Ljava/io/InputStream;Ljava/lang/Object;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JFileChooser.eea b/libs/eea-java-11/src/main/resources/javax/swing/JFileChooser.eea
index 43392b156d..6295a82e94 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JFileChooser.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JFileChooser.eea
@@ -91,7 +91,7 @@ addChoosableFileFilter
  (Ljavax/swing/filechooser/FileFilter;)V
 createDialog
  (Ljava/awt/Component;)Ljavax/swing/JDialog;
- (Ljava/awt/Component;)Ljavax/swing/JDialog;
+ (Ljava/awt/Component;)L1javax/swing/JDialog;
 ensureFileIsVisible
  (Ljava/io/File;)V
  (Ljava/io/File;)V
@@ -118,7 +118,7 @@ getApproveButtonToolTipText
  ()Ljava/lang/String;
 getChoosableFileFilters
  ()[Ljavax/swing/filechooser/FileFilter;
- ()[Ljavax/swing/filechooser/FileFilter;
+ ()[1Ljavax/swing/filechooser/FileFilter;
 getCurrentDirectory
  ()Ljava/io/File;
  ()Ljava/io/File;
@@ -157,13 +157,13 @@ getUI
  ()Ljavax/swing/plaf/FileChooserUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 isTraversable
  (Ljava/io/File;)Z
  (Ljava/io/File;)Z
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 removeActionListener
  (Ljava/awt/event/ActionListener;)V
  (L1java/awt/event/ActionListener;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JFormattedTextField$AbstractFormatter.eea b/libs/eea-java-11/src/main/resources/javax/swing/JFormattedTextField$AbstractFormatter.eea
index 486c22e6e6..1f0ba6df4d 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JFormattedTextField$AbstractFormatter.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JFormattedTextField$AbstractFormatter.eea
@@ -5,16 +5,16 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 getActions
  ()[Ljavax/swing/Action;
- ()[Ljavax/swing/Action;
+ ()[0Ljavax/swing/Action;
 getDocumentFilter
  ()Ljavax/swing/text/DocumentFilter;
- ()Ljavax/swing/text/DocumentFilter;
+ ()L0javax/swing/text/DocumentFilter;
 getFormattedTextField
  ()Ljavax/swing/JFormattedTextField;
  ()Ljavax/swing/JFormattedTextField;
 getNavigationFilter
  ()Ljavax/swing/text/NavigationFilter;
- ()Ljavax/swing/text/NavigationFilter;
+ ()L0javax/swing/text/NavigationFilter;
 install
  (Ljavax/swing/JFormattedTextField;)V
  (Ljavax/swing/JFormattedTextField;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JFormattedTextField.eea b/libs/eea-java-11/src/main/resources/javax/swing/JFormattedTextField.eea
index 79133323d9..96e0e3337b 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JFormattedTextField.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JFormattedTextField.eea
@@ -26,7 +26,7 @@ getFormatterFactory
  ()Ljavax/swing/JFormattedTextField$AbstractFormatterFactory;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JTextField)
 getValue
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JFrame.eea b/libs/eea-java-11/src/main/resources/javax/swing/JFrame.eea
index c1425d7d7b..641333f1f7 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JFrame.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JFrame.eea
@@ -21,7 +21,7 @@ addImpl
  (Ljava/awt/Component;Ljava/lang/Object;I)V
 createRootPane
  ()Ljavax/swing/JRootPane;
- ()Ljavax/swing/JRootPane;
+ ()L1javax/swing/JRootPane;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -33,7 +33,7 @@ getGlassPane
  ()Ljava/awt/Component;
 getGraphics
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L0java/awt/Graphics; # @Inherited(java.awt.Component)
 getJMenuBar
  ()Ljavax/swing/JMenuBar;
  ()Ljavax/swing/JMenuBar;
@@ -48,7 +48,7 @@ getTransferHandler
  ()Ljavax/swing/TransferHandler;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Frame)
 processWindowEvent
  (Ljava/awt/event/WindowEvent;)V
  (Ljava/awt/event/WindowEvent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JInternalFrame$AccessibleJInternalFrame.eea b/libs/eea-java-11/src/main/resources/javax/swing/JInternalFrame$AccessibleJInternalFrame.eea
index aacb561c56..7c91b97281 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JInternalFrame$AccessibleJInternalFrame.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JInternalFrame$AccessibleJInternalFrame.eea
@@ -11,7 +11,7 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon.eea b/libs/eea-java-11/src/main/resources/javax/swing/JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon.eea
index 6d7313279f..44797eaf4d 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon.eea
@@ -8,16 +8,16 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getMaximumAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getMinimumAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 setCurrentAccessibleValue
  (Ljava/lang/Number;)Z
  (Ljava/lang/Number;)Z
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JInternalFrame$JDesktopIcon.eea b/libs/eea-java-11/src/main/resources/javax/swing/JInternalFrame$JDesktopIcon.eea
index 94d19ac689..c33e9a7aa4 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JInternalFrame$JDesktopIcon.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JInternalFrame$JDesktopIcon.eea
@@ -8,7 +8,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getDesktopPane
  ()Ljavax/swing/JDesktopPane;
- ()Ljavax/swing/JDesktopPane;
+ ()L0javax/swing/JDesktopPane;
 getInternalFrame
  ()Ljavax/swing/JInternalFrame;
  ()Ljavax/swing/JInternalFrame;
@@ -17,7 +17,7 @@ getUI
  ()Ljavax/swing/plaf/DesktopIconUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setInternalFrame
  (Ljavax/swing/JInternalFrame;)V
  (Ljavax/swing/JInternalFrame;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JInternalFrame.eea b/libs/eea-java-11/src/main/resources/javax/swing/JInternalFrame.eea
index 90840b4bf7..6c78808ec6 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JInternalFrame.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JInternalFrame.eea
@@ -70,7 +70,7 @@ addInternalFrameListener
  (L1javax/swing/event/InternalFrameListener;)V
 createRootPane
  ()Ljavax/swing/JRootPane;
- ()Ljavax/swing/JRootPane;
+ ()L1javax/swing/JRootPane;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -85,10 +85,10 @@ getDesktopPane
  ()Ljavax/swing/JDesktopPane;
 getFocusCycleRootAncestor
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L0java/awt/Container;
 getFocusOwner
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 getFrameIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
@@ -127,16 +127,16 @@ getUI
  ()Ljavax/swing/plaf/InternalFrameUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 getWarningString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 paintComponent
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 remove
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JLabel$AccessibleJLabel.eea b/libs/eea-java-11/src/main/resources/javax/swing/JLabel$AccessibleJLabel.eea
index ad4150119e..f5075dacdf 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JLabel$AccessibleJLabel.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JLabel$AccessibleJLabel.eea
@@ -5,10 +5,10 @@ class javax/swing/JLabel$AccessibleJLabel
  (Ljavax/swing/JLabel;)V
 getAccessibleIcon
  ()[Ljavax/accessibility/AccessibleIcon;
- ()[Ljavax/accessibility/AccessibleIcon;
+ ()[0Ljavax/accessibility/AccessibleIcon; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleKeyBinding
  ()Ljavax/accessibility/AccessibleKeyBinding;
- ()Ljavax/accessibility/AccessibleKeyBinding;
+ ()L0javax/accessibility/AccessibleKeyBinding; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -20,31 +20,31 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAfterIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getAtIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getBeforeIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getCharacterAttribute
  (I)Ljavax/swing/text/AttributeSet;
- (I)Ljavax/swing/text/AttributeSet;
+ (I)L0javax/swing/text/AttributeSet;
 getCharacterBounds
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L0java/awt/Rectangle;
 getIndexAtPoint
  (Ljava/awt/Point;)I
  (Ljava/awt/Point;)I
 getSelectedText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getTitledBorderText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getToolTipText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JLabel.eea b/libs/eea-java-11/src/main/resources/javax/swing/JLabel.eea
index 536410d089..83de700c3b 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JLabel.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JLabel.eea
@@ -45,13 +45,13 @@ getUI
  ()Ljavax/swing/plaf/LabelUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 imageUpdate
  (Ljava/awt/Image;IIIII)Z
  (Ljava/awt/Image;IIIII)Z
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setDisabledIcon
  (Ljavax/swing/Icon;)V
  (Ljavax/swing/Icon;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JLayer.eea b/libs/eea-java-11/src/main/resources/javax/swing/JLayer.eea
index 1def87d320..2efefe68c0 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JLayer.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JLayer.eea
@@ -13,13 +13,13 @@ addImpl
  (Ljava/awt/Component;Ljava/lang/Object;I)V
 createGlassPane
  ()Ljavax/swing/JPanel;
- ()Ljavax/swing/JPanel;
+ ()L1javax/swing/JPanel;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
 getBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L0javax/swing/border/Border;
 getGlassPane
  ()Ljavax/swing/JPanel;
  ()Ljavax/swing/JPanel;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JLayeredPane.eea b/libs/eea-java-11/src/main/resources/javax/swing/JLayeredPane.eea
index 0fb6d4334b..be14fae683 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JLayeredPane.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JLayeredPane.eea
@@ -43,7 +43,7 @@ getComponentToLayer
  ()Ljava/util/Hashtable<Ljava/awt/Component;Ljava/lang/Integer;>;
 getComponentsInLayer
  (I)[Ljava/awt/Component;
- (I)[Ljava/awt/Component;
+ (I)[1Ljava/awt/Component;
 getIndexOf
  (Ljava/awt/Component;)I
  (Ljava/awt/Component;)I
@@ -67,7 +67,7 @@ paint
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setLayer
  (Ljava/awt/Component;I)V
  (Ljava/awt/Component;I)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JList$AccessibleJList$AccessibleJListChild.eea b/libs/eea-java-11/src/main/resources/javax/swing/JList$AccessibleJList$AccessibleJListChild.eea
index 30ba58c67c..4f1d7b218a 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JList$AccessibleJList$AccessibleJListChild.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JList$AccessibleJList$AccessibleJListChild.eea
@@ -14,76 +14,76 @@ contains
  (Ljava/awt/Point;)Z
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
 getAccessibleDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getAccessibleIcon
  ()[Ljavax/accessibility/AccessibleIcon;
- ()[Ljavax/accessibility/AccessibleIcon;
+ ()[0Ljavax/accessibility/AccessibleIcon; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
- ()Ljavax/accessibility/AccessibleRole;
+ ()L0javax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
- ()Ljavax/accessibility/AccessibleStateSet;
+ ()L1javax/accessibility/AccessibleStateSet;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getBounds
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L0java/awt/Rectangle;
 getCursor
  ()Ljava/awt/Cursor;
- ()Ljava/awt/Cursor;
+ ()L0java/awt/Cursor;
 getFont
  ()Ljava/awt/Font;
- ()Ljava/awt/Font;
+ ()L0java/awt/Font;
 getFontMetrics
  (Ljava/awt/Font;)Ljava/awt/FontMetrics;
- (Ljava/awt/Font;)Ljava/awt/FontMetrics;
+ (Ljava/awt/Font;)L0java/awt/FontMetrics;
 getForeground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getLocale
  ()Ljava/util/Locale;
- ()Ljava/util/Locale;
+ ()L0java/util/Locale;
 getLocation
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getLocationOnScreen
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L0java/awt/Dimension;
 removeFocusListener
  (Ljava/awt/event/FocusListener;)V
  (L1java/awt/event/FocusListener;)V # @Inherited(javax.accessibility.AccessibleComponent)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JList$AccessibleJList.eea b/libs/eea-java-11/src/main/resources/javax/swing/JList$AccessibleJList.eea
index 59471d6bf5..059c24e184 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JList$AccessibleJList.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JList$AccessibleJList.eea
@@ -8,19 +8,19 @@ contentsChanged
  (L1javax/swing/event/ListDataEvent;)V # @Inherited(javax.swing.event.ListDataListener)
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Container$AccessibleAWTContainer)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
  ()Ljavax/accessibility/AccessibleStateSet;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JList.eea b/libs/eea-java-11/src/main/resources/javax/swing/JList.eea
index f6c8c404a1..ec69fee525 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JList.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JList.eea
@@ -16,13 +16,13 @@ addListSelectionListener
  (L1javax/swing/event/ListSelectionListener;)V
 createSelectionModel
  ()Ljavax/swing/ListSelectionModel;
- ()Ljavax/swing/ListSelectionModel;
+ ()L1javax/swing/ListSelectionModel;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
 getCellBounds
  (II)Ljava/awt/Rectangle;
- (II)Ljava/awt/Rectangle;
+ (II)L0java/awt/Rectangle;
 getCellRenderer
  ()Ljavax/swing/ListCellRenderer<-TE;>;
  ()Ljavax/swing/ListCellRenderer<-TE;>;
@@ -61,7 +61,7 @@ getSelectedValue
  ()TE;
 getSelectedValues
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[1Ljava/lang/Object;
 getSelectedValuesList
  ()Ljava/util/List<TE;>;
  ()Ljava/util/List<TE;>;
@@ -82,16 +82,16 @@ getUI
  ()Ljavax/swing/plaf/ListUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 indexToLocation
  (I)Ljava/awt/Point;
- (I)Ljava/awt/Point;
+ (I)L0java/awt/Point;
 locationToIndex
  (Ljava/awt/Point;)I
  (Ljava/awt/Point;)I
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 removeListSelectionListener
  (Ljavax/swing/event/ListSelectionListener;)V
  (L1javax/swing/event/ListSelectionListener;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JMenu$AccessibleJMenu.eea b/libs/eea-java-11/src/main/resources/javax/swing/JMenu$AccessibleJMenu.eea
index 8dd847c638..bfc7357bc4 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JMenu$AccessibleJMenu.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JMenu$AccessibleJMenu.eea
@@ -5,13 +5,13 @@ class javax/swing/JMenu$AccessibleJMenu
  (Ljavax/swing/JMenu;)V
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JMenu.eea b/libs/eea-java-11/src/main/resources/javax/swing/JMenu.eea
index bb085a02c5..5d9809882a 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JMenu.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JMenu.eea
@@ -36,13 +36,13 @@ applyComponentOrientation
  (Ljava/awt/ComponentOrientation;)V
 createActionChangeListener
  (Ljavax/swing/JMenuItem;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JMenuItem;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JMenuItem;)L1java/beans/PropertyChangeListener;
 createActionComponent
  (Ljavax/swing/Action;)Ljavax/swing/JMenuItem;
- (Ljavax/swing/Action;)Ljavax/swing/JMenuItem;
+ (Ljavax/swing/Action;)L1javax/swing/JMenuItem;
 createWinListener
  (Ljavax/swing/JPopupMenu;)Ljavax/swing/JMenu$WinListener;
- (Ljavax/swing/JPopupMenu;)Ljavax/swing/JMenu$WinListener;
+ (Ljavax/swing/JPopupMenu;)L1javax/swing/JMenu$WinListener;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -51,10 +51,10 @@ getComponent
  ()Ljava/awt/Component;
 getItem
  (I)Ljavax/swing/JMenuItem;
- (I)Ljavax/swing/JMenuItem;
+ (I)L0javax/swing/JMenuItem;
 getMenuComponent
  (I)Ljava/awt/Component;
- (I)Ljava/awt/Component;
+ (I)L0java/awt/Component;
 getMenuComponents
  ()[Ljava/awt/Component;
  ()[Ljava/awt/Component;
@@ -66,19 +66,19 @@ getPopupMenu
  ()Ljavax/swing/JPopupMenu;
 getPopupMenuOrigin
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L1java/awt/Point;
 getSubElements
  ()[Ljavax/swing/MenuElement;
- ()[Ljavax/swing/MenuElement;
+ ()[1Ljavax/swing/MenuElement; # @Inherited(javax.swing.JMenuItem)
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JMenuItem)
 insert
  (Ljava/lang/String;I)V
  (Ljava/lang/String;I)V
 insert
  (Ljavax/swing/Action;I)Ljavax/swing/JMenuItem;
- (Ljavax/swing/Action;I)Ljavax/swing/JMenuItem;
+ (Ljavax/swing/Action;I)L1javax/swing/JMenuItem;
 insert
  (Ljavax/swing/JMenuItem;I)Ljavax/swing/JMenuItem;
  (Ljavax/swing/JMenuItem;I)Ljavax/swing/JMenuItem;
@@ -87,7 +87,7 @@ isMenuComponent
  (Ljava/awt/Component;)Z
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JMenuItem)
 processKeyEvent
  (Ljava/awt/event/KeyEvent;)V
  (Ljava/awt/event/KeyEvent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JMenuBar$AccessibleJMenuBar.eea b/libs/eea-java-11/src/main/resources/javax/swing/JMenuBar$AccessibleJMenuBar.eea
index 9821e3ea56..4c46e234ac 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JMenuBar$AccessibleJMenuBar.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JMenuBar$AccessibleJMenuBar.eea
@@ -8,10 +8,10 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
  ()Ljavax/accessibility/AccessibleStateSet;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JMenuBar.eea b/libs/eea-java-11/src/main/resources/javax/swing/JMenuBar.eea
index 2f51e53d12..1b302c0fcc 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JMenuBar.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JMenuBar.eea
@@ -11,37 +11,37 @@ getComponent
  ()Ljava/awt/Component;
 getComponentAtIndex
  (I)Ljava/awt/Component;
- (I)Ljava/awt/Component;
+ (I)L0java/awt/Component;
 getComponentIndex
  (Ljava/awt/Component;)I
  (Ljava/awt/Component;)I
 getHelpMenu
  ()Ljavax/swing/JMenu;
- ()Ljavax/swing/JMenu;
+ ()L1javax/swing/JMenu;
 getMargin
  ()Ljava/awt/Insets;
  ()Ljava/awt/Insets;
 getMenu
  (I)Ljavax/swing/JMenu;
- (I)Ljavax/swing/JMenu;
+ (I)L0javax/swing/JMenu;
 getSelectionModel
  ()Ljavax/swing/SingleSelectionModel;
  ()Ljavax/swing/SingleSelectionModel;
 getSubElements
  ()[Ljavax/swing/MenuElement;
- ()[Ljavax/swing/MenuElement;
+ ()[1Ljavax/swing/MenuElement;
 getUI
  ()Ljavax/swing/plaf/MenuBarUI;
  ()Ljavax/swing/plaf/MenuBarUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paintBorder
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 processKeyBinding
  (Ljavax/swing/KeyStroke;Ljava/awt/event/KeyEvent;IZ)Z
  (Ljavax/swing/KeyStroke;Ljava/awt/event/KeyEvent;IZ)Z
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JMenuItem.eea b/libs/eea-java-11/src/main/resources/javax/swing/JMenuItem.eea
index 1c2956607a..60dab4e319 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JMenuItem.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JMenuItem.eea
@@ -65,16 +65,16 @@ getMenuKeyListeners
  ()[Ljavax/swing/event/MenuKeyListener;
 getSubElements
  ()[Ljavax/swing/MenuElement;
- ()[Ljavax/swing/MenuElement;
+ ()[1Ljavax/swing/MenuElement;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 init
  (Ljava/lang/String;Ljavax/swing/Icon;)V
  (Ljava/lang/String;Ljavax/swing/Icon;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.AbstractButton)
 processKeyEvent
  (Ljava/awt/event/KeyEvent;[Ljavax/swing/MenuElement;Ljavax/swing/MenuSelectionManager;)V
  (Ljava/awt/event/KeyEvent;[Ljavax/swing/MenuElement;Ljavax/swing/MenuSelectionManager;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JOptionPane.eea b/libs/eea-java-11/src/main/resources/javax/swing/JOptionPane.eea
index b38d621d41..7819fe3a57 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JOptionPane.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JOptionPane.eea
@@ -72,7 +72,7 @@ showInputDialog
  (Ljava/awt/Component;Ljava/lang/Object;Ljava/lang/String;I)Ljava/lang/String;
 showInputDialog
  (Ljava/awt/Component;Ljava/lang/Object;Ljava/lang/String;ILjavax/swing/Icon;[Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/awt/Component;Ljava/lang/Object;Ljava/lang/String;ILjavax/swing/Icon;[Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/awt/Component;Ljava/lang/Object;Ljava/lang/String;ILjavax/swing/Icon;[Ljava/lang/Object;Ljava/lang/Object;)L0java/lang/Object;
 showInputDialog
  (Ljava/lang/Object;)Ljava/lang/String;
  (Ljava/lang/Object;)Ljava/lang/String;
@@ -99,7 +99,7 @@ showInternalInputDialog
  (Ljava/awt/Component;Ljava/lang/Object;Ljava/lang/String;I)Ljava/lang/String;
 showInternalInputDialog
  (Ljava/awt/Component;Ljava/lang/Object;Ljava/lang/String;ILjavax/swing/Icon;[Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/awt/Component;Ljava/lang/Object;Ljava/lang/String;ILjavax/swing/Icon;[Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/awt/Component;Ljava/lang/Object;Ljava/lang/String;ILjavax/swing/Icon;[Ljava/lang/Object;Ljava/lang/Object;)L0java/lang/Object;
 showInternalMessageDialog
  (Ljava/awt/Component;Ljava/lang/Object;)V
  (Ljava/awt/Component;Ljava/lang/Object;)V
@@ -170,13 +170,13 @@ value
  (Ljava/lang/Object;IILjavax/swing/Icon;[Ljava/lang/Object;Ljava/lang/Object;)V
 createDialog
  (Ljava/awt/Component;Ljava/lang/String;)Ljavax/swing/JDialog;
- (Ljava/awt/Component;Ljava/lang/String;)Ljavax/swing/JDialog;
+ (Ljava/awt/Component;Ljava/lang/String;)L1javax/swing/JDialog;
 createDialog
  (Ljava/lang/String;)Ljavax/swing/JDialog;
- (Ljava/lang/String;)Ljavax/swing/JDialog;
+ (Ljava/lang/String;)L1javax/swing/JDialog;
 createInternalFrame
  (Ljava/awt/Component;Ljava/lang/String;)Ljavax/swing/JInternalFrame;
- (Ljava/awt/Component;Ljava/lang/String;)Ljavax/swing/JInternalFrame;
+ (Ljava/awt/Component;Ljava/lang/String;)L1javax/swing/JInternalFrame;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -206,13 +206,13 @@ getUI
  ()Ljavax/swing/plaf/OptionPaneUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 getValue
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setIcon
  (Ljavax/swing/Icon;)V
  (Ljavax/swing/Icon;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JPanel.eea b/libs/eea-java-11/src/main/resources/javax/swing/JPanel.eea
index ae1e89e511..050023edcc 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JPanel.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JPanel.eea
@@ -14,10 +14,10 @@ getUI
  ()Ljavax/swing/plaf/PanelUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setUI
  (Ljavax/swing/plaf/PanelUI;)V
  (Ljavax/swing/plaf/PanelUI;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JPasswordField$AccessibleJPasswordField.eea b/libs/eea-java-11/src/main/resources/javax/swing/JPasswordField$AccessibleJPasswordField.eea
index b757e265ad..be24a30900 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JPasswordField$AccessibleJPasswordField.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JPasswordField$AccessibleJPasswordField.eea
@@ -8,25 +8,25 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.swing.text.JTextComponent$AccessibleJTextComponent)
 getAfterIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getAtIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getBeforeIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getTextRange
  (II)Ljava/lang/String;
  (II)Ljava/lang/String;
 getTextSequenceAfter
  (II)Ljavax/accessibility/AccessibleTextSequence;
- (II)Ljavax/accessibility/AccessibleTextSequence;
+ (II)L0javax/accessibility/AccessibleTextSequence;
 getTextSequenceAt
  (II)Ljavax/accessibility/AccessibleTextSequence;
- (II)Ljavax/accessibility/AccessibleTextSequence;
+ (II)L0javax/accessibility/AccessibleTextSequence;
 getTextSequenceBefore
  (II)Ljavax/accessibility/AccessibleTextSequence;
- (II)Ljavax/accessibility/AccessibleTextSequence;
+ (II)L0javax/accessibility/AccessibleTextSequence;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JPasswordField.eea b/libs/eea-java-11/src/main/resources/javax/swing/JPasswordField.eea
index 82992090b7..47f6678fc0 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JPasswordField.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JPasswordField.eea
@@ -14,19 +14,19 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getPassword
  ()[C
- ()[C
+ ()[0C
 getText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(javax.swing.text.JTextComponent)
 getText
  (II)Ljava/lang/String;
  (II)Ljava/lang/String;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JTextField)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JTextField)
 setText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JPopupMenu$Separator.eea b/libs/eea-java-11/src/main/resources/javax/swing/JPopupMenu$Separator.eea
index 61f1ce3966..1c4c0143aa 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JPopupMenu$Separator.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JPopupMenu$Separator.eea
@@ -2,4 +2,4 @@ class javax/swing/JPopupMenu$Separator
 
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JSeparator)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JPopupMenu.eea b/libs/eea-java-11/src/main/resources/javax/swing/JPopupMenu.eea
index b9aff19e9c..b07f1d4d4e 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JPopupMenu.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JPopupMenu.eea
@@ -20,10 +20,10 @@ addPopupMenuListener
  (L1javax/swing/event/PopupMenuListener;)V
 createActionChangeListener
  (Ljavax/swing/JMenuItem;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JMenuItem;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JMenuItem;)L1java/beans/PropertyChangeListener;
 createActionComponent
  (Ljavax/swing/Action;)Ljavax/swing/JMenuItem;
- (Ljavax/swing/Action;)Ljavax/swing/JMenuItem;
+ (Ljavax/swing/Action;)L1javax/swing/JMenuItem;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -56,13 +56,13 @@ getSelectionModel
  ()Ljavax/swing/SingleSelectionModel;
 getSubElements
  ()[Ljavax/swing/MenuElement;
- ()[Ljavax/swing/MenuElement;
+ ()[1Ljavax/swing/MenuElement;
 getUI
  ()Ljavax/swing/plaf/PopupMenuUI;
  ()Ljavax/swing/plaf/PopupMenuUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 insert
  (Ljava/awt/Component;I)V
  (Ljava/awt/Component;I)V
@@ -77,7 +77,7 @@ paintBorder
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 processFocusEvent
  (Ljava/awt/event/FocusEvent;)V
  (Ljava/awt/event/FocusEvent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JProgressBar$AccessibleJProgressBar.eea b/libs/eea-java-11/src/main/resources/javax/swing/JProgressBar$AccessibleJProgressBar.eea
index a1463ab534..25b25d2c76 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JProgressBar$AccessibleJProgressBar.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JProgressBar$AccessibleJProgressBar.eea
@@ -11,7 +11,7 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JProgressBar.eea b/libs/eea-java-11/src/main/resources/javax/swing/JProgressBar.eea
index 1c76b91704..d1b23afb41 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JProgressBar.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JProgressBar.eea
@@ -21,7 +21,7 @@ addChangeListener
  (L1javax/swing/event/ChangeListener;)V
 createChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -39,13 +39,13 @@ getUI
  ()Ljavax/swing/plaf/ProgressBarUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paintBorder
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 removeChangeListener
  (Ljavax/swing/event/ChangeListener;)V
  (L1javax/swing/event/ChangeListener;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JRadioButton.eea b/libs/eea-java-11/src/main/resources/javax/swing/JRadioButton.eea
index dcad81dcf2..24a0990a0b 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JRadioButton.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JRadioButton.eea
@@ -26,7 +26,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JToggleButton)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JToggleButton)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JRadioButtonMenuItem.eea b/libs/eea-java-11/src/main/resources/javax/swing/JRadioButtonMenuItem.eea
index bded2dc026..4a0e44138d 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JRadioButtonMenuItem.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JRadioButtonMenuItem.eea
@@ -26,7 +26,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JMenuItem)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JMenuItem)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JRootPane$AccessibleJRootPane.eea b/libs/eea-java-11/src/main/resources/javax/swing/JRootPane$AccessibleJRootPane.eea
index 3dcf5d32a1..d6175ea49c 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JRootPane$AccessibleJRootPane.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JRootPane$AccessibleJRootPane.eea
@@ -5,7 +5,7 @@ class javax/swing/JRootPane$AccessibleJRootPane
  (Ljavax/swing/JRootPane;)V
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JRootPane.eea b/libs/eea-java-11/src/main/resources/javax/swing/JRootPane.eea
index 8afd097c4e..4f46d2ff8f 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JRootPane.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JRootPane.eea
@@ -21,16 +21,16 @@ addImpl
  (Ljava/awt/Component;Ljava/lang/Object;I)V
 createContentPane
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L1java/awt/Container;
 createGlassPane
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component;
 createLayeredPane
  ()Ljavax/swing/JLayeredPane;
- ()Ljavax/swing/JLayeredPane;
+ ()L1javax/swing/JLayeredPane;
 createRootLayout
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -57,10 +57,10 @@ getUI
  ()Ljavax/swing/plaf/RootPaneUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setContentPane
  (Ljava/awt/Container;)V
  (Ljava/awt/Container;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JScrollBar$AccessibleJScrollBar.eea b/libs/eea-java-11/src/main/resources/javax/swing/JScrollBar$AccessibleJScrollBar.eea
index 84ada54923..39cc640545 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JScrollBar$AccessibleJScrollBar.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JScrollBar$AccessibleJScrollBar.eea
@@ -11,7 +11,7 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JScrollBar.eea b/libs/eea-java-11/src/main/resources/javax/swing/JScrollBar.eea
index 2ea7d18ba5..65e3cab27f 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JScrollBar.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JScrollBar.eea
@@ -15,7 +15,7 @@ getAdjustmentListeners
  ()[Ljava/awt/event/AdjustmentListener;
 getMaximumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 getMinimumSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
@@ -27,10 +27,10 @@ getUI
  ()Ljavax/swing/plaf/ScrollBarUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 removeAdjustmentListener
  (Ljava/awt/event/AdjustmentListener;)V
  (L1java/awt/event/AdjustmentListener;)V # @Inherited(java.awt.Adjustable)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JScrollPane.eea b/libs/eea-java-11/src/main/resources/javax/swing/JScrollPane.eea
index 01a161b91b..4a929df02f 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JScrollPane.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JScrollPane.eea
@@ -36,13 +36,13 @@ viewport
  (Ljava/awt/Component;II)V
 createHorizontalScrollBar
  ()Ljavax/swing/JScrollBar;
- ()Ljavax/swing/JScrollBar;
+ ()L1javax/swing/JScrollBar;
 createVerticalScrollBar
  ()Ljavax/swing/JScrollBar;
- ()Ljavax/swing/JScrollBar;
+ ()L1javax/swing/JScrollBar;
 createViewport
  ()Ljavax/swing/JViewport;
- ()Ljavax/swing/JViewport;
+ ()L1javax/swing/JViewport;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -51,7 +51,7 @@ getColumnHeader
  ()Ljavax/swing/JViewport;
 getCorner
  (Ljava/lang/String;)Ljava/awt/Component;
- (Ljava/lang/String;)Ljava/awt/Component;
+ (Ljava/lang/String;)L0java/awt/Component;
 getHorizontalScrollBar
  ()Ljavax/swing/JScrollBar;
  ()Ljavax/swing/JScrollBar;
@@ -63,7 +63,7 @@ getUI
  ()Ljavax/swing/plaf/ScrollPaneUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 getVerticalScrollBar
  ()Ljavax/swing/JScrollBar;
  ()Ljavax/swing/JScrollBar;
@@ -75,10 +75,10 @@ getViewportBorder
  ()Ljavax/swing/border/Border;
 getViewportBorderBounds
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L1java/awt/Rectangle;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setColumnHeader
  (Ljavax/swing/JViewport;)V
  (Ljavax/swing/JViewport;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JSeparator.eea b/libs/eea-java-11/src/main/resources/javax/swing/JSeparator.eea
index d7a79a25cc..02c803d8a0 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JSeparator.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JSeparator.eea
@@ -8,10 +8,10 @@ getUI
  ()Ljavax/swing/plaf/SeparatorUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setUI
  (Ljavax/swing/plaf/SeparatorUI;)V
  (Ljavax/swing/plaf/SeparatorUI;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JSlider$AccessibleJSlider.eea b/libs/eea-java-11/src/main/resources/javax/swing/JSlider$AccessibleJSlider.eea
index 91c34f632a..859028e743 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JSlider$AccessibleJSlider.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JSlider$AccessibleJSlider.eea
@@ -11,7 +11,7 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JSlider.eea b/libs/eea-java-11/src/main/resources/javax/swing/JSlider.eea
index 486f55cbf7..6d05310de6 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JSlider.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JSlider.eea
@@ -18,13 +18,13 @@ addChangeListener
  (L1javax/swing/event/ChangeListener;)V
 createChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 createStandardLabels
  (I)Ljava/util/Hashtable<Ljava/lang/Integer;Ljavax/swing/JComponent;>;
- (I)Ljava/util/Hashtable<Ljava/lang/Integer;Ljavax/swing/JComponent;>;
+ (I)L1java/util/Hashtable<Ljava/lang/Integer;Ljavax/swing/JComponent;>;
 createStandardLabels
  (II)Ljava/util/Hashtable<Ljava/lang/Integer;Ljavax/swing/JComponent;>;
- (II)Ljava/util/Hashtable<Ljava/lang/Integer;Ljavax/swing/JComponent;>;
+ (II)L1java/util/Hashtable<Ljava/lang/Integer;Ljavax/swing/JComponent;>;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -42,13 +42,13 @@ getUI
  ()Ljavax/swing/plaf/SliderUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 imageUpdate
  (Ljava/awt/Image;IIIII)Z
  (Ljava/awt/Image;IIIII)Z
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 removeChangeListener
  (Ljavax/swing/event/ChangeListener;)V
  (L1javax/swing/event/ChangeListener;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JSpinner$AccessibleJSpinner.eea b/libs/eea-java-11/src/main/resources/javax/swing/JSpinner$AccessibleJSpinner.eea
index ed3ba1e3c6..d51eae8f64 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JSpinner$AccessibleJSpinner.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JSpinner$AccessibleJSpinner.eea
@@ -5,55 +5,55 @@ class javax/swing/JSpinner$AccessibleJSpinner
  (Ljavax/swing/JSpinner;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getAfterIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getAtIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getBeforeIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getCharacterAttribute
  (I)Ljavax/swing/text/AttributeSet;
- (I)Ljavax/swing/text/AttributeSet;
+ (I)L0javax/swing/text/AttributeSet;
 getCharacterBounds
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L0java/awt/Rectangle;
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getIndexAtPoint
  (Ljava/awt/Point;)I
  (Ljava/awt/Point;)I
 getMaximumAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getMinimumAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getSelectedText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getTextRange
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 insertTextAtIndex
  (ILjava/lang/String;)V
  (ILjava/lang/String;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JSpinner$DefaultEditor.eea b/libs/eea-java-11/src/main/resources/javax/swing/JSpinner$DefaultEditor.eea
index 4d6c719102..2bdc2466b5 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JSpinner$DefaultEditor.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JSpinner$DefaultEditor.eea
@@ -14,7 +14,7 @@ getBaselineResizeBehavior
  ()Ljava/awt/Component$BaselineResizeBehavior;
 getSpinner
  ()Ljavax/swing/JSpinner;
- ()Ljavax/swing/JSpinner;
+ ()L0javax/swing/JSpinner;
 getTextField
  ()Ljavax/swing/JFormattedTextField;
  ()Ljavax/swing/JFormattedTextField;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JSpinner.eea b/libs/eea-java-11/src/main/resources/javax/swing/JSpinner.eea
index 6702726d90..687101f703 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JSpinner.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JSpinner.eea
@@ -8,7 +8,7 @@ addChangeListener
  (L1javax/swing/event/ChangeListener;)V
 createEditor
  (Ljavax/swing/SpinnerModel;)Ljavax/swing/JComponent;
- (Ljavax/swing/SpinnerModel;)Ljavax/swing/JComponent;
+ (Ljavax/swing/SpinnerModel;)L1javax/swing/JComponent;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -32,7 +32,7 @@ getUI
  ()Ljavax/swing/plaf/SpinnerUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 getValue
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JSplitPane$AccessibleJSplitPane.eea b/libs/eea-java-11/src/main/resources/javax/swing/JSplitPane$AccessibleJSplitPane.eea
index a61c69d732..cb0d8db817 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JSplitPane$AccessibleJSplitPane.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JSplitPane$AccessibleJSplitPane.eea
@@ -11,7 +11,7 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JSplitPane.eea b/libs/eea-java-11/src/main/resources/javax/swing/JSplitPane.eea
index fc00f78cf7..8d8de52525 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JSplitPane.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JSplitPane.eea
@@ -73,13 +73,13 @@ getUI
  ()Ljavax/swing/plaf/SplitPaneUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paintChildren
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 remove
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JTabbedPane$AccessibleJTabbedPane.eea b/libs/eea-java-11/src/main/resources/javax/swing/JTabbedPane$AccessibleJTabbedPane.eea
index 3591d3364a..56fec36568 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JTabbedPane$AccessibleJTabbedPane.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JTabbedPane$AccessibleJTabbedPane.eea
@@ -5,10 +5,10 @@ class javax/swing/JTabbedPane$AccessibleJTabbedPane
  (Ljavax/swing/JTabbedPane;)V
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Container$AccessibleAWTContainer)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -17,10 +17,10 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 stateChanged
  (Ljavax/swing/event/ChangeEvent;)V
  (L1javax/swing/event/ChangeEvent;)V # @Inherited(javax.swing.event.ChangeListener)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JTabbedPane.eea b/libs/eea-java-11/src/main/resources/javax/swing/JTabbedPane.eea
index 4f128f9bef..f21878a031 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JTabbedPane.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JTabbedPane.eea
@@ -39,7 +39,7 @@ addTab
  (Ljava/lang/String;Ljavax/swing/Icon;Ljava/awt/Component;Ljava/lang/String;)V
 createChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -48,7 +48,7 @@ getBackgroundAt
  (I)Ljava/awt/Color;
 getBoundsAt
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L0java/awt/Rectangle;
 getChangeListeners
  ()[Ljavax/swing/event/ChangeListener;
  ()[Ljavax/swing/event/ChangeListener;
@@ -69,7 +69,7 @@ getModel
  ()Ljavax/swing/SingleSelectionModel;
 getSelectedComponent
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 getTabComponentAt
  (I)Ljava/awt/Component;
  (I)Ljava/awt/Component;
@@ -87,7 +87,7 @@ getUI
  ()Ljavax/swing/plaf/TabbedPaneUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 indexOfComponent
  (Ljava/awt/Component;)I
  (Ljava/awt/Component;)I
@@ -105,7 +105,7 @@ insertTab
  (Ljava/lang/String;Ljavax/swing/Icon;Ljava/awt/Component;Ljava/lang/String;I)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 remove
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JTable$AccessibleJTable$AccessibleJTableCell.eea b/libs/eea-java-11/src/main/resources/javax/swing/JTable$AccessibleJTable$AccessibleJTableCell.eea
index 2adc51c6a6..144cb2bad9 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JTable$AccessibleJTable$AccessibleJTableCell.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JTable$AccessibleJTable$AccessibleJTableCell.eea
@@ -14,16 +14,16 @@ contains
  (Ljava/awt/Point;)Z
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -41,52 +41,52 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
- ()Ljavax/accessibility/AccessibleStateSet;
+ ()L1javax/accessibility/AccessibleStateSet;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getBounds
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L0java/awt/Rectangle;
 getCurrentAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
- ()Ljavax/accessibility/AccessibleContext;
+ ()L0javax/accessibility/AccessibleContext;
 getCurrentComponent
  ()Ljava/awt/Component;
  ()Ljava/awt/Component;
 getCursor
  ()Ljava/awt/Cursor;
- ()Ljava/awt/Cursor;
+ ()L0java/awt/Cursor;
 getFont
  ()Ljava/awt/Font;
- ()Ljava/awt/Font;
+ ()L0java/awt/Font;
 getFontMetrics
  (Ljava/awt/Font;)Ljava/awt/FontMetrics;
- (Ljava/awt/Font;)Ljava/awt/FontMetrics;
+ (Ljava/awt/Font;)L0java/awt/FontMetrics;
 getForeground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getLocale
  ()Ljava/util/Locale;
- ()Ljava/util/Locale;
+ ()L0java/util/Locale;
 getLocation
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getLocationOnScreen
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L0java/awt/Dimension;
 removeFocusListener
  (Ljava/awt/event/FocusListener;)V
  (L1java/awt/event/FocusListener;)V # @Inherited(javax.accessibility.AccessibleComponent)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JTable$AccessibleJTable.eea b/libs/eea-java-11/src/main/resources/javax/swing/JTable$AccessibleJTable.eea
index 38665382ec..27ebd18971 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JTable$AccessibleJTable.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JTable$AccessibleJTable.eea
@@ -29,40 +29,40 @@ getAccessibleAt
  (II)Ljavax/accessibility/Accessible;
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Container$AccessibleAWTContainer)
 getAccessibleCaption
  ()Ljavax/accessibility/Accessible;
  ()Ljavax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleColumnDescription
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleColumnHeader
  ()Ljavax/accessibility/AccessibleTable;
- ()Ljavax/accessibility/AccessibleTable;
+ ()L1javax/accessibility/AccessibleTable;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleRowDescription
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleRowHeader
  ()Ljavax/accessibility/AccessibleTable;
- ()Ljavax/accessibility/AccessibleTable;
+ ()L0javax/accessibility/AccessibleTable;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleSummary
  ()Ljavax/accessibility/Accessible;
  ()Ljavax/accessibility/Accessible;
 getAccessibleTable
  ()Ljavax/accessibility/AccessibleTable;
- ()Ljavax/accessibility/AccessibleTable;
+ ()L0javax/accessibility/AccessibleTable; # @Inherited(javax.accessibility.AccessibleContext)
 getSelectedAccessibleColumns
  ()[I
  ()[I
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JTable.eea b/libs/eea-java-11/src/main/resources/javax/swing/JTable.eea
index 5032bf2454..4211e96807 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JTable.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JTable.eea
@@ -2,7 +2,7 @@ class javax/swing/JTable
 
 createScrollPaneForTable
  (Ljavax/swing/JTable;)Ljavax/swing/JScrollPane;
- (Ljavax/swing/JTable;)Ljavax/swing/JScrollPane;
+ (Ljavax/swing/JTable;)L1javax/swing/JScrollPane;
 
 cellEditor
  Ljavax/swing/table/TableCellEditor;
@@ -79,16 +79,16 @@ columnSelectionChanged
  (L1javax/swing/event/ListSelectionEvent;)V # @Inherited(javax.swing.event.TableColumnModelListener)
 createDefaultColumnModel
  ()Ljavax/swing/table/TableColumnModel;
- ()Ljavax/swing/table/TableColumnModel;
+ ()L1javax/swing/table/TableColumnModel;
 createDefaultDataModel
  ()Ljavax/swing/table/TableModel;
- ()Ljavax/swing/table/TableModel;
+ ()L1javax/swing/table/TableModel;
 createDefaultSelectionModel
  ()Ljavax/swing/ListSelectionModel;
- ()Ljavax/swing/ListSelectionModel;
+ ()L1javax/swing/ListSelectionModel;
 createDefaultTableHeader
  ()Ljavax/swing/table/JTableHeader;
- ()Ljavax/swing/table/JTableHeader;
+ ()L1javax/swing/table/JTableHeader;
 editCellAt
  (IILjava/util/EventObject;)Z
  (IILjava/util/EventObject;)Z
@@ -109,7 +109,7 @@ getCellEditor
  (II)Ljavax/swing/table/TableCellEditor;
 getCellRect
  (IIZ)Ljava/awt/Rectangle;
- (IIZ)Ljava/awt/Rectangle;
+ (IIZ)L1java/awt/Rectangle;
 getCellRenderer
  (II)Ljavax/swing/table/TableCellRenderer;
  (II)Ljavax/swing/table/TableCellRenderer;
@@ -145,7 +145,7 @@ getGridColor
  ()Ljava/awt/Color;
 getIntercellSpacing
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 getModel
  ()Ljavax/swing/table/TableModel;
  ()Ljavax/swing/table/TableModel;
@@ -154,10 +154,10 @@ getPreferredScrollableViewportSize
  ()Ljava/awt/Dimension;
 getPrintable
  (Ljavax/swing/JTable$PrintMode;Ljava/text/MessageFormat;Ljava/text/MessageFormat;)Ljava/awt/print/Printable;
- (Ljavax/swing/JTable$PrintMode;Ljava/text/MessageFormat;Ljava/text/MessageFormat;)Ljava/awt/print/Printable;
+ (Ljavax/swing/JTable$PrintMode;Ljava/text/MessageFormat;Ljava/text/MessageFormat;)L1java/awt/print/Printable;
 getRowSorter
  ()Ljavax/swing/RowSorter<+Ljavax/swing/table/TableModel;>;
- ()Ljavax/swing/RowSorter<+Ljavax/swing/table/TableModel;>;
+ ()L0javax/swing/RowSorter<+Ljavax/swing/table/TableModel;>;
 getScrollableBlockIncrement
  (Ljava/awt/Rectangle;II)I
  (Ljava/awt/Rectangle;II)I
@@ -190,13 +190,13 @@ getUI
  ()Ljavax/swing/plaf/TableUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 getValueAt
  (II)Ljava/lang/Object;
  (II)Ljava/lang/Object;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 prepareEditor
  (Ljavax/swing/table/TableCellEditor;II)Ljava/awt/Component;
  (Ljavax/swing/table/TableCellEditor;II)Ljava/awt/Component;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JTextArea.eea b/libs/eea-java-11/src/main/resources/javax/swing/JTextArea.eea
index a1f31fb0dc..5f2eba6d3e 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JTextArea.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JTextArea.eea
@@ -17,7 +17,7 @@ append
  (Ljava/lang/String;)V
 createDefaultModel
  ()Ljavax/swing/text/Document;
- ()Ljavax/swing/text/Document;
+ ()L1javax/swing/text/Document;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -32,13 +32,13 @@ getScrollableUnitIncrement
  (Ljava/awt/Rectangle;II)I
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 insert
  (Ljava/lang/String;I)V
  (Ljava/lang/String;I)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.text.JTextComponent)
 replaceRange
  (Ljava/lang/String;II)V
  (Ljava/lang/String;II)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JTextField.eea b/libs/eea-java-11/src/main/resources/javax/swing/JTextField.eea
index 41693bf4d7..eae1c83fe9 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JTextField.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JTextField.eea
@@ -24,10 +24,10 @@ configurePropertiesFromAction
  (Ljavax/swing/Action;)V
 createActionPropertyChangeListener
  (Ljavax/swing/Action;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/Action;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/Action;)L1java/beans/PropertyChangeListener;
 createDefaultModel
  ()Ljavax/swing/text/Document;
- ()Ljavax/swing/text/Document;
+ ()L1javax/swing/text/Document;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -48,10 +48,10 @@ getPreferredSize
  ()Ljava/awt/Dimension;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.text.JTextComponent)
 removeActionListener
  (Ljava/awt/event/ActionListener;)V
  (L1java/awt/event/ActionListener;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JTextPane.eea b/libs/eea-java-11/src/main/resources/javax/swing/JTextPane.eea
index b30ef66e9f..363e37dc11 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JTextPane.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JTextPane.eea
@@ -8,10 +8,10 @@ addStyle
  (Ljava/lang/String;Ljavax/swing/text/Style;)Ljavax/swing/text/Style;
 createDefaultEditorKit
  ()Ljavax/swing/text/EditorKit;
- ()Ljavax/swing/text/EditorKit;
+ ()L1javax/swing/text/EditorKit; # @Inherited(javax.swing.JEditorPane)
 getCharacterAttributes
  ()Ljavax/swing/text/AttributeSet;
- ()Ljavax/swing/text/AttributeSet;
+ ()L0javax/swing/text/AttributeSet;
 getInputAttributes
  ()Ljavax/swing/text/MutableAttributeSet;
  ()Ljavax/swing/text/MutableAttributeSet;
@@ -20,7 +20,7 @@ getLogicalStyle
  ()Ljavax/swing/text/Style;
 getParagraphAttributes
  ()Ljavax/swing/text/AttributeSet;
- ()Ljavax/swing/text/AttributeSet;
+ ()L0javax/swing/text/AttributeSet;
 getStyle
  (Ljava/lang/String;)Ljavax/swing/text/Style;
  (Ljava/lang/String;)Ljavax/swing/text/Style;
@@ -32,7 +32,7 @@ getStyledEditorKit
  ()Ljavax/swing/text/StyledEditorKit;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JEditorPane)
 insertComponent
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
@@ -41,7 +41,7 @@ insertIcon
  (Ljavax/swing/Icon;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JEditorPane)
 removeStyle
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JToggleButton.eea b/libs/eea-java-11/src/main/resources/javax/swing/JToggleButton.eea
index d3067bc546..50f0b8e14f 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JToggleButton.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JToggleButton.eea
@@ -26,10 +26,10 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.AbstractButton)
 requestFocus
  (Ljava/awt/event/FocusEvent$Cause;)V
  (Ljava/awt/event/FocusEvent$Cause;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JToolBar$Separator.eea b/libs/eea-java-11/src/main/resources/javax/swing/JToolBar$Separator.eea
index 2aaab805bd..1c90fe49be 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JToolBar$Separator.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JToolBar$Separator.eea
@@ -17,7 +17,7 @@ getSeparatorSize
  ()Ljava/awt/Dimension;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JSeparator)
 setSeparatorSize
  (Ljava/awt/Dimension;)V
  (Ljava/awt/Dimension;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JToolBar.eea b/libs/eea-java-11/src/main/resources/javax/swing/JToolBar.eea
index 85f0d38390..c6084c241e 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JToolBar.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JToolBar.eea
@@ -17,16 +17,16 @@ addSeparator
  (Ljava/awt/Dimension;)V
 createActionChangeListener
  (Ljavax/swing/JButton;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JButton;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JButton;)L0java/beans/PropertyChangeListener;
 createActionComponent
  (Ljavax/swing/Action;)Ljavax/swing/JButton;
- (Ljavax/swing/Action;)Ljavax/swing/JButton;
+ (Ljavax/swing/Action;)L1javax/swing/JButton;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
 getComponentAtIndex
  (I)Ljava/awt/Component;
- (I)Ljava/awt/Component;
+ (I)L0java/awt/Component;
 getComponentIndex
  (Ljava/awt/Component;)I
  (Ljava/awt/Component;)I
@@ -38,13 +38,13 @@ getUI
  ()Ljavax/swing/plaf/ToolBarUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paintBorder
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setLayout
  (Ljava/awt/LayoutManager;)V
  (Ljava/awt/LayoutManager;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JToolTip.eea b/libs/eea-java-11/src/main/resources/javax/swing/JToolTip.eea
index 5020b9b41f..598a803095 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JToolTip.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JToolTip.eea
@@ -14,10 +14,10 @@ getUI
  ()Ljavax/swing/plaf/ToolTipUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setComponent
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JTree$AccessibleJTree$AccessibleJTreeNode.eea b/libs/eea-java-11/src/main/resources/javax/swing/JTree$AccessibleJTree$AccessibleJTreeNode.eea
index 24f3a5936d..51c489de8f 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JTree$AccessibleJTree$AccessibleJTreeNode.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JTree$AccessibleJTree$AccessibleJTreeNode.eea
@@ -14,19 +14,19 @@ contains
  (Ljava/awt/Point;)Z
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -35,7 +35,7 @@ getAccessibleDescription
  ()Ljava/lang/String;
 getAccessibleName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getAccessibleParent
  ()Ljavax/accessibility/Accessible;
  ()Ljavax/accessibility/Accessible;
@@ -44,49 +44,49 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
- ()Ljavax/accessibility/AccessibleStateSet;
+ ()L1javax/accessibility/AccessibleStateSet;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getBounds
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L0java/awt/Rectangle;
 getCursor
  ()Ljava/awt/Cursor;
- ()Ljava/awt/Cursor;
+ ()L0java/awt/Cursor;
 getFont
  ()Ljava/awt/Font;
- ()Ljava/awt/Font;
+ ()L0java/awt/Font;
 getFontMetrics
  (Ljava/awt/Font;)Ljava/awt/FontMetrics;
- (Ljava/awt/Font;)Ljava/awt/FontMetrics;
+ (Ljava/awt/Font;)L0java/awt/FontMetrics;
 getForeground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
 getLocation
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getLocationInJTree
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getLocationOnScreen
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JTree$AccessibleJTree.eea b/libs/eea-java-11/src/main/resources/javax/swing/JTree$AccessibleJTree.eea
index fc882fad1c..d35e42fd0f 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JTree$AccessibleJTree.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JTree$AccessibleJTree.eea
@@ -5,19 +5,19 @@ class javax/swing/JTree$AccessibleJTree
  (Ljavax/swing/JTree;)V
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Container$AccessibleAWTContainer)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 treeCollapsed
  (Ljavax/swing/event/TreeExpansionEvent;)V
  (L1javax/swing/event/TreeExpansionEvent;)V # @Inherited(javax.swing.event.TreeExpansionListener)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JTree.eea b/libs/eea-java-11/src/main/resources/javax/swing/JTree.eea
index 930a563eb1..6224a4ec64 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JTree.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JTree.eea
@@ -51,10 +51,10 @@ VISIBLE_ROW_COUNT_PROPERTY
 
 createTreeModel
  (Ljava/lang/Object;)Ljavax/swing/tree/TreeModel;
- (Ljava/lang/Object;)Ljavax/swing/tree/TreeModel;
+ (Ljava/lang/Object;)L1javax/swing/tree/TreeModel;
 getDefaultTreeModel
  ()Ljavax/swing/tree/TreeModel;
- ()Ljavax/swing/tree/TreeModel;
+ ()L1javax/swing/tree/TreeModel;
 
 cellEditor
  Ljavax/swing/tree/TreeCellEditor;
@@ -116,10 +116,10 @@ collapsePath
  (Ljavax/swing/tree/TreePath;)V
 convertValueToText
  (Ljava/lang/Object;ZZZIZ)Ljava/lang/String;
- (Ljava/lang/Object;ZZZIZ)Ljava/lang/String;
+ (Ljava/lang/Object;ZZZIZ)L1java/lang/String;
 createTreeModelListener
  ()Ljavax/swing/event/TreeModelListener;
- ()Ljavax/swing/event/TreeModelListener;
+ ()L1javax/swing/event/TreeModelListener;
 expandPath
  (Ljavax/swing/tree/TreePath;)V
  (Ljavax/swing/tree/TreePath;)V
@@ -152,7 +152,7 @@ getCellRenderer
  ()Ljavax/swing/tree/TreeCellRenderer;
 getClosestPathForLocation
  (II)Ljavax/swing/tree/TreePath;
- (II)Ljavax/swing/tree/TreePath;
+ (II)L0javax/swing/tree/TreePath;
 getDescendantToggledPaths
  (Ljavax/swing/tree/TreePath;)Ljava/util/Enumeration<Ljavax/swing/tree/TreePath;>;
  (Ljavax/swing/tree/TreePath;)Ljava/util/Enumeration<Ljavax/swing/tree/TreePath;>;
@@ -164,13 +164,13 @@ getDropMode
  ()Ljavax/swing/DropMode;
 getEditingPath
  ()Ljavax/swing/tree/TreePath;
- ()Ljavax/swing/tree/TreePath;
+ ()L0javax/swing/tree/TreePath;
 getExpandedDescendants
  (Ljavax/swing/tree/TreePath;)Ljava/util/Enumeration<Ljavax/swing/tree/TreePath;>;
- (Ljavax/swing/tree/TreePath;)Ljava/util/Enumeration<Ljavax/swing/tree/TreePath;>;
+ (Ljavax/swing/tree/TreePath;)L0java/util/Enumeration<Ljavax/swing/tree/TreePath;>;
 getLastSelectedPathComponent
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getLeadSelectionPath
  ()Ljavax/swing/tree/TreePath;
  ()Ljavax/swing/tree/TreePath;
@@ -179,22 +179,22 @@ getModel
  ()Ljavax/swing/tree/TreeModel;
 getNextMatch
  (Ljava/lang/String;ILjavax/swing/text/Position$Bias;)Ljavax/swing/tree/TreePath;
- (Ljava/lang/String;ILjavax/swing/text/Position$Bias;)Ljavax/swing/tree/TreePath;
+ (Ljava/lang/String;ILjavax/swing/text/Position$Bias;)L0javax/swing/tree/TreePath;
 getPathBetweenRows
  (II)[Ljavax/swing/tree/TreePath;
- (II)[Ljavax/swing/tree/TreePath;
+ (II)[1Ljavax/swing/tree/TreePath;
 getPathBounds
  (Ljavax/swing/tree/TreePath;)Ljava/awt/Rectangle;
- (Ljavax/swing/tree/TreePath;)Ljava/awt/Rectangle;
+ (Ljavax/swing/tree/TreePath;)L0java/awt/Rectangle;
 getPathForLocation
  (II)Ljavax/swing/tree/TreePath;
- (II)Ljavax/swing/tree/TreePath;
+ (II)L0javax/swing/tree/TreePath;
 getPathForRow
  (I)Ljavax/swing/tree/TreePath;
- (I)Ljavax/swing/tree/TreePath;
+ (I)L0javax/swing/tree/TreePath;
 getPreferredScrollableViewportSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 getRowBounds
  (I)Ljava/awt/Rectangle;
  (I)Ljava/awt/Rectangle;
@@ -215,7 +215,7 @@ getSelectionPath
  ()Ljavax/swing/tree/TreePath;
 getSelectionPaths
  ()[Ljavax/swing/tree/TreePath;
- ()[Ljavax/swing/tree/TreePath;
+ ()[0Ljavax/swing/tree/TreePath;
 getSelectionRows
  ()[I
  ()[I
@@ -236,7 +236,7 @@ getUI
  ()Ljavax/swing/plaf/TreeUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 hasBeenExpanded
  (Ljavax/swing/tree/TreePath;)Z
  (Ljavax/swing/tree/TreePath;)Z
@@ -260,7 +260,7 @@ makeVisible
  (Ljavax/swing/tree/TreePath;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 removeDescendantSelectedPaths
  (Ljavax/swing/tree/TreePath;Z)Z
  (Ljavax/swing/tree/TreePath;Z)Z
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JViewport.eea b/libs/eea-java-11/src/main/resources/javax/swing/JViewport.eea
index 4cba46c6e5..f5511b7b83 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JViewport.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JViewport.eea
@@ -18,10 +18,10 @@ computeBlit
  (IILjava/awt/Point;Ljava/awt/Point;Ljava/awt/Dimension;Ljava/awt/Rectangle;)Z
 createLayoutManager
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 createViewListener
  ()Ljavax/swing/JViewport$ViewListener;
- ()Ljavax/swing/JViewport$ViewListener;
+ ()L1javax/swing/JViewport$ViewListener;
 firePropertyChange
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
@@ -45,16 +45,16 @@ getUI
  ()Ljavax/swing/plaf/ViewportUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 getView
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 getViewPosition
  ()Ljava/awt/Point;
  ()Ljava/awt/Point;
 getViewRect
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L1java/awt/Rectangle;
 getViewSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
@@ -63,7 +63,7 @@ paint
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 remove
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
@@ -93,7 +93,7 @@ setViewSize
  (Ljava/awt/Dimension;)V
 toViewCoordinates
  (Ljava/awt/Dimension;)Ljava/awt/Dimension;
- (Ljava/awt/Dimension;)Ljava/awt/Dimension;
+ (Ljava/awt/Dimension;)L1java/awt/Dimension;
 toViewCoordinates
  (Ljava/awt/Point;)Ljava/awt/Point;
- (Ljava/awt/Point;)Ljava/awt/Point;
+ (Ljava/awt/Point;)L1java/awt/Point;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/JWindow.eea b/libs/eea-java-11/src/main/resources/javax/swing/JWindow.eea
index 850a362eed..d14e6ff235 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/JWindow.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/JWindow.eea
@@ -24,7 +24,7 @@ addImpl
  (Ljava/awt/Component;Ljava/lang/Object;I)V
 createRootPane
  ()Ljavax/swing/JRootPane;
- ()Ljavax/swing/JRootPane;
+ ()L1javax/swing/JRootPane;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -36,7 +36,7 @@ getGlassPane
  ()Ljava/awt/Component;
 getGraphics
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L0java/awt/Graphics; # @Inherited(java.awt.Component)
 getLayeredPane
  ()Ljavax/swing/JLayeredPane;
  ()Ljavax/swing/JLayeredPane;
@@ -48,7 +48,7 @@ getTransferHandler
  ()Ljavax/swing/TransferHandler;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Container)
 remove
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/KeyStroke.eea b/libs/eea-java-11/src/main/resources/javax/swing/KeyStroke.eea
index 8f5627cef8..3390a7ce70 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/KeyStroke.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/KeyStroke.eea
@@ -17,7 +17,7 @@ getKeyStroke
  (Ljava/lang/Character;I)Ljavax/swing/KeyStroke;
 getKeyStroke
  (Ljava/lang/String;)Ljavax/swing/KeyStroke;
- (Ljava/lang/String;)Ljavax/swing/KeyStroke;
+ (Ljava/lang/String;)L0javax/swing/KeyStroke;
 getKeyStrokeForEvent
  (Ljava/awt/event/KeyEvent;)Ljavax/swing/KeyStroke;
  (Ljava/awt/event/KeyEvent;)Ljavax/swing/KeyStroke;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/LayoutFocusTraversalPolicy.eea b/libs/eea-java-11/src/main/resources/javax/swing/LayoutFocusTraversalPolicy.eea
index 94137a8a96..974b78a36b 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/LayoutFocusTraversalPolicy.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/LayoutFocusTraversalPolicy.eea
@@ -5,13 +5,13 @@ accept
  (Ljava/awt/Component;)Z
 getComponentAfter
  (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Container;Ljava/awt/Component;)L0java/awt/Component; # @Inherited(javax.swing.SortingFocusTraversalPolicy)
 getComponentBefore
  (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Container;Ljava/awt/Component;)L0java/awt/Component; # @Inherited(javax.swing.SortingFocusTraversalPolicy)
 getFirstComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
- (Ljava/awt/Container;)Ljava/awt/Component;
+ (Ljava/awt/Container;)L0java/awt/Component; # @Inherited(javax.swing.SortingFocusTraversalPolicy)
 getLastComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
- (Ljava/awt/Container;)Ljava/awt/Component;
+ (Ljava/awt/Container;)L0java/awt/Component; # @Inherited(javax.swing.SortingFocusTraversalPolicy)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/ListSelectionModel.eea b/libs/eea-java-11/src/main/resources/javax/swing/ListSelectionModel.eea
index 69f6f8565d..edf251abab 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/ListSelectionModel.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/ListSelectionModel.eea
@@ -5,7 +5,7 @@ addListSelectionListener
  (L1javax/swing/event/ListSelectionListener;)V
 getSelectedIndices
  ()[I
- ()[I
+ ()[1I
 removeListSelectionListener
  (Ljavax/swing/event/ListSelectionListener;)V
  (L1javax/swing/event/ListSelectionListener;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/LookAndFeel.eea b/libs/eea-java-11/src/main/resources/javax/swing/LookAndFeel.eea
index c9eae53a9e..335d25ca93 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/LookAndFeel.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/LookAndFeel.eea
@@ -20,29 +20,29 @@ loadKeyBindings
  (Ljavax/swing/InputMap;[Ljava/lang/Object;)V
 makeComponentInputMap
  (Ljavax/swing/JComponent;[Ljava/lang/Object;)Ljavax/swing/ComponentInputMap;
- (Ljavax/swing/JComponent;[Ljava/lang/Object;)Ljavax/swing/ComponentInputMap;
+ (Ljavax/swing/JComponent;[Ljava/lang/Object;)L1javax/swing/ComponentInputMap;
 makeIcon
  (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/Object;
 makeInputMap
  ([Ljava/lang/Object;)Ljavax/swing/InputMap;
- ([Ljava/lang/Object;)Ljavax/swing/InputMap;
+ ([Ljava/lang/Object;)L1javax/swing/InputMap;
 makeKeyBindings
  ([Ljava/lang/Object;)[Ljavax/swing/text/JTextComponent$KeyBinding;
- ([Ljava/lang/Object;)[Ljavax/swing/text/JTextComponent$KeyBinding;
+ ([Ljava/lang/Object;)[1Ljavax/swing/text/JTextComponent$KeyBinding;
 uninstallBorder
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
 
 getDefaults
  ()Ljavax/swing/UIDefaults;
- ()Ljavax/swing/UIDefaults;
+ ()L0javax/swing/UIDefaults;
 getDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getDisabledIcon
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
- (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
+ (Ljavax/swing/JComponent;Ljavax/swing/Icon;)L0javax/swing/Icon;
 getDisabledSelectedIcon
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/MenuSelectionManager.eea b/libs/eea-java-11/src/main/resources/javax/swing/MenuSelectionManager.eea
index debe8e4d8f..72690debfa 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/MenuSelectionManager.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/MenuSelectionManager.eea
@@ -16,13 +16,13 @@ addChangeListener
  (L1javax/swing/event/ChangeListener;)V
 componentForPoint
  (Ljava/awt/Component;Ljava/awt/Point;)Ljava/awt/Component;
- (Ljava/awt/Component;Ljava/awt/Point;)Ljava/awt/Component;
+ (Ljava/awt/Component;Ljava/awt/Point;)L0java/awt/Component;
 getChangeListeners
  ()[Ljavax/swing/event/ChangeListener;
  ()[Ljavax/swing/event/ChangeListener;
 getSelectedPath
  ()[Ljavax/swing/MenuElement;
- ()[Ljavax/swing/MenuElement;
+ ()[1Ljavax/swing/MenuElement;
 isComponentPartOfCurrentMenu
  (Ljava/awt/Component;)Z
  (Ljava/awt/Component;)Z
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/PopupFactory.eea b/libs/eea-java-11/src/main/resources/javax/swing/PopupFactory.eea
index fd93a34928..4a8d5524e8 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/PopupFactory.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/PopupFactory.eea
@@ -2,7 +2,7 @@ class javax/swing/PopupFactory
 
 getSharedInstance
  ()Ljavax/swing/PopupFactory;
- ()Ljavax/swing/PopupFactory;
+ ()L1javax/swing/PopupFactory;
 setSharedInstance
  (Ljavax/swing/PopupFactory;)V
  (Ljavax/swing/PopupFactory;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/ProgressMonitor$AccessibleProgressMonitor.eea b/libs/eea-java-11/src/main/resources/javax/swing/ProgressMonitor$AccessibleProgressMonitor.eea
index 709d8db368..e233e3f65d 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/ProgressMonitor$AccessibleProgressMonitor.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/ProgressMonitor$AccessibleProgressMonitor.eea
@@ -5,16 +5,16 @@ class javax/swing/ProgressMonitor$AccessibleProgressMonitor
  (Ljavax/swing/ProgressMonitor;)V
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getAccessibleName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getAccessibleParent
  ()Ljavax/accessibility/Accessible;
  ()Ljavax/accessibility/Accessible;
@@ -23,37 +23,37 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
- ()Ljavax/accessibility/AccessibleStateSet;
+ ()L0javax/accessibility/AccessibleStateSet;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getAfterIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getAtIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getBeforeIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getCharacterAttribute
  (I)Ljavax/swing/text/AttributeSet;
- (I)Ljavax/swing/text/AttributeSet;
+ (I)L0javax/swing/text/AttributeSet;
 getCharacterBounds
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L0java/awt/Rectangle;
 getIndexAtPoint
  (Ljava/awt/Point;)I
  (Ljava/awt/Point;)I
 getLocale
  ()Ljava/util/Locale;
- ()Ljava/util/Locale;
+ ()L0java/util/Locale;
 getSelectedText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 propertyChange
  (Ljava/beans/PropertyChangeEvent;)V
  (L1java/beans/PropertyChangeEvent;)V # @Inherited(java.beans.PropertyChangeListener)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/RepaintManager.eea b/libs/eea-java-11/src/main/resources/javax/swing/RepaintManager.eea
index feea78b23b..9ab5a254ee 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/RepaintManager.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/RepaintManager.eea
@@ -33,7 +33,7 @@ getOffscreenBuffer
  (Ljava/awt/Component;II)Ljava/awt/Image;
 getVolatileOffscreenBuffer
  (Ljava/awt/Component;II)Ljava/awt/Image;
- (Ljava/awt/Component;II)Ljava/awt/Image;
+ (Ljava/awt/Component;II)L0java/awt/Image;
 isCompletelyDirty
  (Ljavax/swing/JComponent;)Z
  (Ljavax/swing/JComponent;)Z
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/RowFilter$Entry.eea b/libs/eea-java-11/src/main/resources/javax/swing/RowFilter$Entry.eea
index 5ea7f95119..d63141e7e1 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/RowFilter$Entry.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/RowFilter$Entry.eea
@@ -10,7 +10,7 @@ getModel
  ()TM;
 getStringValue
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 getValue
  (I)Ljava/lang/Object;
  (I)Ljava/lang/Object;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/RowFilter.eea b/libs/eea-java-11/src/main/resources/javax/swing/RowFilter.eea
index b990daffe6..eb02429eab 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/RowFilter.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/RowFilter.eea
@@ -4,22 +4,22 @@ class javax/swing/RowFilter
 
 andFilter
  <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljavax/swing/RowFilter<-TM;-TI;>;>;)Ljavax/swing/RowFilter<TM;TI;>;
- <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljavax/swing/RowFilter<-TM;-TI;>;>;)Ljavax/swing/RowFilter<TM;TI;>;
+ <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljavax/swing/RowFilter<-TM;-TI;>;>;)L1javax/swing/RowFilter<TM;TI;>;
 dateFilter
  <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter$ComparisonType;Ljava/util/Date;[I)Ljavax/swing/RowFilter<TM;TI;>;
- <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter$ComparisonType;Ljava/util/Date;[I)Ljavax/swing/RowFilter<TM;TI;>;
+ <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter$ComparisonType;Ljava/util/Date;[I)L1javax/swing/RowFilter<TM;TI;>;
 notFilter
  <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter<TM;TI;>;)Ljavax/swing/RowFilter<TM;TI;>;
- <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter<TM;TI;>;)Ljavax/swing/RowFilter<TM;TI;>;
+ <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter<TM;TI;>;)L1javax/swing/RowFilter<TM;TI;>;
 numberFilter
  <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter$ComparisonType;Ljava/lang/Number;[I)Ljavax/swing/RowFilter<TM;TI;>;
- <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter$ComparisonType;Ljava/lang/Number;[I)Ljavax/swing/RowFilter<TM;TI;>;
+ <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter$ComparisonType;Ljava/lang/Number;[I)L1javax/swing/RowFilter<TM;TI;>;
 orFilter
  <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljavax/swing/RowFilter<-TM;-TI;>;>;)Ljavax/swing/RowFilter<TM;TI;>;
- <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljavax/swing/RowFilter<-TM;-TI;>;>;)Ljavax/swing/RowFilter<TM;TI;>;
+ <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljavax/swing/RowFilter<-TM;-TI;>;>;)L1javax/swing/RowFilter<TM;TI;>;
 regexFilter
  <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/String;[I)Ljavax/swing/RowFilter<TM;TI;>;
- <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/String;[I)Ljavax/swing/RowFilter<TM;TI;>;
+ <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/String;[I)L1javax/swing/RowFilter<TM;TI;>;
 
 include
  (Ljavax/swing/RowFilter$Entry<+TM;+TI;>;)Z
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/ScrollPaneLayout.eea b/libs/eea-java-11/src/main/resources/javax/swing/ScrollPaneLayout.eea
index 08c9409e3d..2f0cf8a94b 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/ScrollPaneLayout.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/ScrollPaneLayout.eea
@@ -39,7 +39,7 @@ getColumnHeader
  ()Ljavax/swing/JViewport;
 getCorner
  (Ljava/lang/String;)Ljava/awt/Component;
- (Ljava/lang/String;)Ljava/awt/Component;
+ (Ljava/lang/String;)L0java/awt/Component;
 getHorizontalScrollBar
  ()Ljavax/swing/JScrollBar;
  ()Ljavax/swing/JScrollBar;
@@ -60,10 +60,10 @@ layoutContainer
  (Ljava/awt/Container;)V
 minimumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
- (Ljava/awt/Container;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;)L1java/awt/Dimension;
 preferredLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
- (Ljava/awt/Container;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;)L1java/awt/Dimension;
 removeLayoutComponent
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/SizeRequirements.eea b/libs/eea-java-11/src/main/resources/javax/swing/SizeRequirements.eea
index efc47c9e40..9cc63af5b6 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/SizeRequirements.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/SizeRequirements.eea
@@ -2,7 +2,7 @@ class javax/swing/SizeRequirements
 
 adjustSizes
  (I[Ljavax/swing/SizeRequirements;)[I
- (I[Ljavax/swing/SizeRequirements;)[I
+ (I[Ljavax/swing/SizeRequirements;)[1I
 calculateAlignedPositions
  (ILjavax/swing/SizeRequirements;[Ljavax/swing/SizeRequirements;[I[I)V
  (ILjavax/swing/SizeRequirements;[Ljavax/swing/SizeRequirements;[I[I)V
@@ -17,10 +17,10 @@ calculateTiledPositions
  (ILjavax/swing/SizeRequirements;[Ljavax/swing/SizeRequirements;[I[IZ)V
 getAlignedSizeRequirements
  ([Ljavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- ([Ljavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ ([Ljavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements;
 getTiledSizeRequirements
  ([Ljavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- ([Ljavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ ([Ljavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements;
 
 toString
  ()Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/SizeSequence.eea b/libs/eea-java-11/src/main/resources/javax/swing/SizeSequence.eea
index 07e12d3271..8a47044011 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/SizeSequence.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/SizeSequence.eea
@@ -5,7 +5,7 @@ class javax/swing/SizeSequence
  ([I)V
 getSizes
  ()[I
- ()[I
+ ()[1I
 setSizes
  ([I)V
  ([I)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/SortingFocusTraversalPolicy.eea b/libs/eea-java-11/src/main/resources/javax/swing/SortingFocusTraversalPolicy.eea
index 868b3c0e68..c56cb5cb57 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/SortingFocusTraversalPolicy.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/SortingFocusTraversalPolicy.eea
@@ -11,19 +11,19 @@ getComparator
  ()Ljava/util/Comparator<-Ljava/awt/Component;>;
 getComponentAfter
  (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Container;Ljava/awt/Component;)L0java/awt/Component;
 getComponentBefore
  (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Container;Ljava/awt/Component;)L0java/awt/Component;
 getDefaultComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
  (Ljava/awt/Container;)Ljava/awt/Component;
 getFirstComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
- (Ljava/awt/Container;)Ljava/awt/Component;
+ (Ljava/awt/Container;)L0java/awt/Component;
 getLastComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
- (Ljava/awt/Container;)Ljava/awt/Component;
+ (Ljava/awt/Container;)L0java/awt/Component;
 setComparator
  (Ljava/util/Comparator<-Ljava/awt/Component;>;)V
  (Ljava/util/Comparator<-Ljava/awt/Component;>;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/SpinnerDateModel.eea b/libs/eea-java-11/src/main/resources/javax/swing/SpinnerDateModel.eea
index 7a98c40134..ebc61eee62 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/SpinnerDateModel.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/SpinnerDateModel.eea
@@ -11,10 +11,10 @@ getEnd
  ()Ljava/lang/Comparable<Ljava/util/Date;>;
 getNextValue
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getPreviousValue
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getStart
  ()Ljava/lang/Comparable<Ljava/util/Date;>;
  ()Ljava/lang/Comparable<Ljava/util/Date;>;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/Spring.eea b/libs/eea-java-11/src/main/resources/javax/swing/Spring.eea
index a4cbc7e607..ca37da6da9 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/Spring.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/Spring.eea
@@ -5,22 +5,22 @@ constant
  (I)Ljavax/swing/Spring;
 constant
  (III)Ljavax/swing/Spring;
- (III)Ljavax/swing/Spring;
+ (III)L1javax/swing/Spring;
 height
  (Ljava/awt/Component;)Ljavax/swing/Spring;
- (Ljava/awt/Component;)Ljavax/swing/Spring;
+ (Ljava/awt/Component;)L1javax/swing/Spring;
 max
  (Ljavax/swing/Spring;Ljavax/swing/Spring;)Ljavax/swing/Spring;
- (Ljavax/swing/Spring;Ljavax/swing/Spring;)Ljavax/swing/Spring;
+ (Ljavax/swing/Spring;Ljavax/swing/Spring;)L1javax/swing/Spring;
 minus
  (Ljavax/swing/Spring;)Ljavax/swing/Spring;
- (Ljavax/swing/Spring;)Ljavax/swing/Spring;
+ (Ljavax/swing/Spring;)L1javax/swing/Spring;
 scale
  (Ljavax/swing/Spring;F)Ljavax/swing/Spring;
- (Ljavax/swing/Spring;F)Ljavax/swing/Spring;
+ (Ljavax/swing/Spring;F)L1javax/swing/Spring;
 sum
  (Ljavax/swing/Spring;Ljavax/swing/Spring;)Ljavax/swing/Spring;
- (Ljavax/swing/Spring;Ljavax/swing/Spring;)Ljavax/swing/Spring;
+ (Ljavax/swing/Spring;Ljavax/swing/Spring;)L1javax/swing/Spring;
 width
  (Ljava/awt/Component;)Ljavax/swing/Spring;
- (Ljava/awt/Component;)Ljavax/swing/Spring;
+ (Ljava/awt/Component;)L1javax/swing/Spring;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/SpringLayout$Constraints.eea b/libs/eea-java-11/src/main/resources/javax/swing/SpringLayout$Constraints.eea
index 09ca6c38ac..b1869bf161 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/SpringLayout$Constraints.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/SpringLayout$Constraints.eea
@@ -11,7 +11,7 @@ class javax/swing/SpringLayout$Constraints
  (Ljavax/swing/Spring;Ljavax/swing/Spring;Ljavax/swing/Spring;Ljavax/swing/Spring;)V
 getConstraint
  (Ljava/lang/String;)Ljavax/swing/Spring;
- (Ljava/lang/String;)Ljavax/swing/Spring;
+ (Ljava/lang/String;)L0javax/swing/Spring;
 getHeight
  ()Ljavax/swing/Spring;
  ()Ljavax/swing/Spring;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/SpringLayout.eea b/libs/eea-java-11/src/main/resources/javax/swing/SpringLayout.eea
index 271d992296..a8581d7b11 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/SpringLayout.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/SpringLayout.eea
@@ -36,7 +36,7 @@ addLayoutComponent
  (Ljava/lang/String;Ljava/awt/Component;)V
 getConstraint
  (Ljava/lang/String;Ljava/awt/Component;)Ljavax/swing/Spring;
- (Ljava/lang/String;Ljava/awt/Component;)Ljavax/swing/Spring;
+ (Ljava/lang/String;Ljava/awt/Component;)L1javax/swing/Spring;
 getConstraints
  (Ljava/awt/Component;)Ljavax/swing/SpringLayout$Constraints;
  (Ljava/awt/Component;)Ljavax/swing/SpringLayout$Constraints;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/SwingUtilities.eea b/libs/eea-java-11/src/main/resources/javax/swing/SwingUtilities.eea
index 24d295cfd4..7c80a81f5e 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/SwingUtilities.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/SwingUtilities.eea
@@ -2,10 +2,10 @@ class javax/swing/SwingUtilities
 
 calculateInnerArea
  (Ljavax/swing/JComponent;Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
- (Ljavax/swing/JComponent;Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
+ (Ljavax/swing/JComponent;Ljava/awt/Rectangle;)Ljava/awt/Rectangle; # @PolyNull
 computeDifference
  (Ljava/awt/Rectangle;Ljava/awt/Rectangle;)[Ljava/awt/Rectangle;
- (Ljava/awt/Rectangle;Ljava/awt/Rectangle;)[Ljava/awt/Rectangle;
+ (Ljava/awt/Rectangle;Ljava/awt/Rectangle;)[1Ljava/awt/Rectangle;
 computeIntersection
  (IIIILjava/awt/Rectangle;)Ljava/awt/Rectangle;
  (IIIILjava/awt/Rectangle;)Ljava/awt/Rectangle;
@@ -35,10 +35,10 @@ convertRectangle
  (Ljava/awt/Component;Ljava/awt/Rectangle;Ljava/awt/Component;)Ljava/awt/Rectangle;
 findFocusOwner
  (Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Component;)L0java/awt/Component;
 getAccessibleAt
  (Ljava/awt/Component;Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Component;Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Component;Ljava/awt/Point;)L0javax/accessibility/Accessible;
 getAccessibleChild
  (Ljava/awt/Component;I)Ljavax/accessibility/Accessible;
  (Ljava/awt/Component;I)Ljavax/accessibility/Accessible;
@@ -59,22 +59,22 @@ getAncestorOfClass
  (Ljava/lang/Class<*>;Ljava/awt/Component;)Ljava/awt/Container;
 getDeepestComponentAt
  (Ljava/awt/Component;II)Ljava/awt/Component;
- (Ljava/awt/Component;II)Ljava/awt/Component;
+ (Ljava/awt/Component;II)L0java/awt/Component;
 getLocalBounds
  (Ljava/awt/Component;)Ljava/awt/Rectangle;
- (Ljava/awt/Component;)Ljava/awt/Rectangle;
+ (Ljava/awt/Component;)L1java/awt/Rectangle;
 getRoot
  (Ljava/awt/Component;)Ljava/awt/Component;
  (Ljava/awt/Component;)Ljava/awt/Component;
 getRootPane
  (Ljava/awt/Component;)Ljavax/swing/JRootPane;
- (Ljava/awt/Component;)Ljavax/swing/JRootPane;
+ (Ljava/awt/Component;)L0javax/swing/JRootPane;
 getUIActionMap
  (Ljavax/swing/JComponent;)Ljavax/swing/ActionMap;
- (Ljavax/swing/JComponent;)Ljavax/swing/ActionMap;
+ (Ljavax/swing/JComponent;)L0javax/swing/ActionMap;
 getUIInputMap
  (Ljavax/swing/JComponent;I)Ljavax/swing/InputMap;
- (Ljavax/swing/JComponent;I)Ljavax/swing/InputMap;
+ (Ljavax/swing/JComponent;I)L0javax/swing/InputMap;
 getUnwrappedParent
  (Ljava/awt/Component;)Ljava/awt/Container;
  (Ljava/awt/Component;)Ljava/awt/Container;
@@ -83,7 +83,7 @@ getUnwrappedView
  (Ljavax/swing/JViewport;)Ljava/awt/Component;
 getWindowAncestor
  (Ljava/awt/Component;)Ljava/awt/Window;
- (Ljava/awt/Component;)Ljava/awt/Window;
+ (Ljava/awt/Component;)L0java/awt/Window;
 invokeAndWait
  (Ljava/lang/Runnable;)V
  (Ljava/lang/Runnable;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/TransferHandler$DropLocation.eea b/libs/eea-java-11/src/main/resources/javax/swing/TransferHandler$DropLocation.eea
index 915cc809d7..e611b8e8a2 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/TransferHandler$DropLocation.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/TransferHandler$DropLocation.eea
@@ -5,7 +5,7 @@ class javax/swing/TransferHandler$DropLocation
  (Ljava/awt/Point;)V
 getDropPoint
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L1java/awt/Point;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/TransferHandler.eea b/libs/eea-java-11/src/main/resources/javax/swing/TransferHandler.eea
index c8da40fd90..4aaa9cc005 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/TransferHandler.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/TransferHandler.eea
@@ -21,7 +21,7 @@ canImport
  (Ljavax/swing/TransferHandler$TransferSupport;)Z
 createTransferable
  (Ljavax/swing/JComponent;)Ljava/awt/datatransfer/Transferable;
- (Ljavax/swing/JComponent;)Ljava/awt/datatransfer/Transferable;
+ (Ljavax/swing/JComponent;)L0java/awt/datatransfer/Transferable;
 exportAsDrag
  (Ljavax/swing/JComponent;Ljava/awt/event/InputEvent;I)V
  (Ljavax/swing/JComponent;Ljava/awt/event/InputEvent;I)V
@@ -42,7 +42,7 @@ getSourceActions
  (Ljavax/swing/JComponent;)I
 getVisualRepresentation
  (Ljava/awt/datatransfer/Transferable;)Ljavax/swing/Icon;
- (Ljava/awt/datatransfer/Transferable;)Ljavax/swing/Icon;
+ (Ljava/awt/datatransfer/Transferable;)L0javax/swing/Icon;
 importData
  (Ljavax/swing/JComponent;Ljava/awt/datatransfer/Transferable;)Z
  (Ljavax/swing/JComponent;Ljava/awt/datatransfer/Transferable;)Z
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/UIDefaults$ActiveValue.eea b/libs/eea-java-11/src/main/resources/javax/swing/UIDefaults$ActiveValue.eea
index ceb6b3e0f1..9103d3dc69 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/UIDefaults$ActiveValue.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/UIDefaults$ActiveValue.eea
@@ -2,4 +2,4 @@ class javax/swing/UIDefaults$ActiveValue
 
 createValue
  (Ljavax/swing/UIDefaults;)Ljava/lang/Object;
- (Ljavax/swing/UIDefaults;)Ljava/lang/Object;
+ (Ljavax/swing/UIDefaults;)L1java/lang/Object;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/UIDefaults$LazyInputMap.eea b/libs/eea-java-11/src/main/resources/javax/swing/UIDefaults$LazyInputMap.eea
index fc1afc290b..bda6d0e916 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/UIDefaults$LazyInputMap.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/UIDefaults$LazyInputMap.eea
@@ -5,4 +5,4 @@ class javax/swing/UIDefaults$LazyInputMap
  ([Ljava/lang/Object;)V
 createValue
  (Ljavax/swing/UIDefaults;)Ljava/lang/Object;
- (Ljavax/swing/UIDefaults;)Ljava/lang/Object;
+ (Ljavax/swing/UIDefaults;)L0java/lang/Object; # @Overrides(javax.swing.UIDefaults$LazyValue)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/UIDefaults$LazyValue.eea b/libs/eea-java-11/src/main/resources/javax/swing/UIDefaults$LazyValue.eea
index 97e6142ed9..c8d2d890e1 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/UIDefaults$LazyValue.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/UIDefaults$LazyValue.eea
@@ -2,4 +2,4 @@ class javax/swing/UIDefaults$LazyValue
 
 createValue
  (Ljavax/swing/UIDefaults;)Ljava/lang/Object;
- (Ljavax/swing/UIDefaults;)Ljava/lang/Object;
+ (Ljavax/swing/UIDefaults;)L1java/lang/Object;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/UIDefaults$ProxyLazyValue.eea b/libs/eea-java-11/src/main/resources/javax/swing/UIDefaults$ProxyLazyValue.eea
index 920514e82b..1bd4d2005e 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/UIDefaults$ProxyLazyValue.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/UIDefaults$ProxyLazyValue.eea
@@ -14,4 +14,4 @@ class javax/swing/UIDefaults$ProxyLazyValue
  (Ljava/lang/String;[Ljava/lang/Object;)V
 createValue
  (Ljavax/swing/UIDefaults;)Ljava/lang/Object;
- (Ljavax/swing/UIDefaults;)Ljava/lang/Object;
+ (Ljavax/swing/UIDefaults;)L1java/lang/Object; # @Inherited(javax.swing.UIDefaults$LazyValue)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/UIDefaults.eea b/libs/eea-java-11/src/main/resources/javax/swing/UIDefaults.eea
index c6ec5d4901..cd7855bb85 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/UIDefaults.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/UIDefaults.eea
@@ -30,43 +30,43 @@ getBoolean
  (Ljava/lang/Object;Ljava/util/Locale;)Z
 getBorder
  (Ljava/lang/Object;)Ljavax/swing/border/Border;
- (Ljava/lang/Object;)Ljavax/swing/border/Border;
+ (Ljava/lang/Object;)L0javax/swing/border/Border;
 getBorder
  (Ljava/lang/Object;Ljava/util/Locale;)Ljavax/swing/border/Border;
- (Ljava/lang/Object;Ljava/util/Locale;)Ljavax/swing/border/Border;
+ (Ljava/lang/Object;Ljava/util/Locale;)L0javax/swing/border/Border;
 getColor
  (Ljava/lang/Object;)Ljava/awt/Color;
- (Ljava/lang/Object;)Ljava/awt/Color;
+ (Ljava/lang/Object;)L0java/awt/Color;
 getColor
  (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Color;
- (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Color;
+ (Ljava/lang/Object;Ljava/util/Locale;)L0java/awt/Color;
 getDefaultLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
 getDimension
  (Ljava/lang/Object;)Ljava/awt/Dimension;
- (Ljava/lang/Object;)Ljava/awt/Dimension;
+ (Ljava/lang/Object;)L0java/awt/Dimension;
 getDimension
  (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Dimension;
- (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Dimension;
+ (Ljava/lang/Object;Ljava/util/Locale;)L0java/awt/Dimension;
 getFont
  (Ljava/lang/Object;)Ljava/awt/Font;
- (Ljava/lang/Object;)Ljava/awt/Font;
+ (Ljava/lang/Object;)L0java/awt/Font;
 getFont
  (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Font;
- (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Font;
+ (Ljava/lang/Object;Ljava/util/Locale;)L0java/awt/Font;
 getIcon
  (Ljava/lang/Object;)Ljavax/swing/Icon;
- (Ljava/lang/Object;)Ljavax/swing/Icon;
+ (Ljava/lang/Object;)L0javax/swing/Icon;
 getIcon
  (Ljava/lang/Object;Ljava/util/Locale;)Ljavax/swing/Icon;
- (Ljava/lang/Object;Ljava/util/Locale;)Ljavax/swing/Icon;
+ (Ljava/lang/Object;Ljava/util/Locale;)L0javax/swing/Icon;
 getInsets
  (Ljava/lang/Object;)Ljava/awt/Insets;
- (Ljava/lang/Object;)Ljava/awt/Insets;
+ (Ljava/lang/Object;)L0java/awt/Insets;
 getInsets
  (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Insets;
- (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Insets;
+ (Ljava/lang/Object;Ljava/util/Locale;)L0java/awt/Insets;
 getInt
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
@@ -78,10 +78,10 @@ getPropertyChangeListeners
  ()[Ljava/beans/PropertyChangeListener;
 getString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L0java/lang/String;
 getString
  (Ljava/lang/Object;Ljava/util/Locale;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/util/Locale;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/util/Locale;)L0java/lang/String;
 getUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
@@ -90,7 +90,7 @@ getUIClass
  (Ljava/lang/String;)Ljava/lang/Class<+Ljavax/swing/plaf/ComponentUI;>;
 getUIClass
  (Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/Class<+Ljavax/swing/plaf/ComponentUI;>;
- (Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/Class<+Ljavax/swing/plaf/ComponentUI;>;
+ (Ljava/lang/String;Ljava/lang/ClassLoader;)L0java/lang/Class<+Ljavax/swing/plaf/ComponentUI;>;
 getUIError
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/UIManager.eea b/libs/eea-java-11/src/main/resources/javax/swing/UIManager.eea
index c18a7c0655..cb31296cc5 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/UIManager.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/UIManager.eea
@@ -8,7 +8,7 @@ addPropertyChangeListener
  (Ljava/beans/PropertyChangeListener;)V
 createLookAndFeel
  (Ljava/lang/String;)Ljavax/swing/LookAndFeel;
- (Ljava/lang/String;)Ljavax/swing/LookAndFeel;
+ (Ljava/lang/String;)L1javax/swing/LookAndFeel;
 get
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
@@ -17,7 +17,7 @@ get
  (Ljava/lang/Object;Ljava/util/Locale;)Ljava/lang/Object;
 getAuxiliaryLookAndFeels
  ()[Ljavax/swing/LookAndFeel;
- ()[Ljavax/swing/LookAndFeel;
+ ()[0Ljavax/swing/LookAndFeel;
 getBoolean
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
@@ -68,7 +68,7 @@ getInsets
  (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Insets;
 getInstalledLookAndFeels
  ()[Ljavax/swing/UIManager$LookAndFeelInfo;
- ()[Ljavax/swing/UIManager$LookAndFeelInfo;
+ ()[1Ljavax/swing/UIManager$LookAndFeelInfo;
 getInt
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/border/LineBorder.eea b/libs/eea-java-11/src/main/resources/javax/swing/border/LineBorder.eea
index e63839ce90..2999935825 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/border/LineBorder.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/border/LineBorder.eea
@@ -2,10 +2,10 @@ class javax/swing/border/LineBorder
 
 createBlackLineBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createGrayLineBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 
 lineColor
  Ljava/awt/Color;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/colorchooser/AbstractColorChooserPanel.eea b/libs/eea-java-11/src/main/resources/javax/swing/colorchooser/AbstractColorChooserPanel.eea
index 45fcff27d9..95f3376866 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/colorchooser/AbstractColorChooserPanel.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/colorchooser/AbstractColorChooserPanel.eea
@@ -6,10 +6,10 @@ TRANSPARENCY_ENABLED_PROPERTY
 
 getColorFromModel
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getColorSelectionModel
  ()Ljavax/swing/colorchooser/ColorSelectionModel;
- ()Ljavax/swing/colorchooser/ColorSelectionModel;
+ ()L0javax/swing/colorchooser/ColorSelectionModel;
 getDisplayName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/colorchooser/ColorChooserComponentFactory.eea b/libs/eea-java-11/src/main/resources/javax/swing/colorchooser/ColorChooserComponentFactory.eea
index 2fc68eac49..b911590d3c 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/colorchooser/ColorChooserComponentFactory.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/colorchooser/ColorChooserComponentFactory.eea
@@ -5,4 +5,4 @@ getDefaultChooserPanels
  ()[Ljavax/swing/colorchooser/AbstractColorChooserPanel;
 getPreviewPanel
  ()Ljavax/swing/JComponent;
- ()Ljavax/swing/JComponent;
+ ()L1javax/swing/JComponent;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/event/InternalFrameEvent.eea b/libs/eea-java-11/src/main/resources/javax/swing/event/InternalFrameEvent.eea
index 702583f747..076e037813 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/event/InternalFrameEvent.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/event/InternalFrameEvent.eea
@@ -5,7 +5,7 @@ class javax/swing/event/InternalFrameEvent
  (Ljavax/swing/JInternalFrame;I)V
 getInternalFrame
  ()Ljavax/swing/JInternalFrame;
- ()Ljavax/swing/JInternalFrame;
+ ()L0javax/swing/JInternalFrame;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/event/TreeModelEvent.eea b/libs/eea-java-11/src/main/resources/javax/swing/event/TreeModelEvent.eea
index 0774b7d0df..13d51e07af 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/event/TreeModelEvent.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/event/TreeModelEvent.eea
@@ -24,13 +24,13 @@ path
  (Ljava/lang/Object;[Ljava/lang/Object;[I[Ljava/lang/Object;)V
 getChildIndices
  ()[I
- ()[I
+ ()[0I
 getChildren
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 getPath
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 getTreePath
  ()Ljavax/swing/tree/TreePath;
  ()Ljavax/swing/tree/TreePath;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/event/TreeSelectionEvent.eea b/libs/eea-java-11/src/main/resources/javax/swing/event/TreeSelectionEvent.eea
index 7841f15cda..f4557e6e00 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/event/TreeSelectionEvent.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/event/TreeSelectionEvent.eea
@@ -33,7 +33,7 @@ getPath
  ()Ljavax/swing/tree/TreePath;
 getPaths
  ()[Ljavax/swing/tree/TreePath;
- ()[Ljavax/swing/tree/TreePath;
+ ()[1Ljavax/swing/tree/TreePath;
 isAddedPath
  (Ljavax/swing/tree/TreePath;)Z
  (Ljavax/swing/tree/TreePath;)Z
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/filechooser/FileNameExtensionFilter.eea b/libs/eea-java-11/src/main/resources/javax/swing/filechooser/FileNameExtensionFilter.eea
index 54f8b9fbbb..58ace28edb 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/filechooser/FileNameExtensionFilter.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/filechooser/FileNameExtensionFilter.eea
@@ -11,7 +11,7 @@ getDescription
  ()Ljava/lang/String;
 getExtensions
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/filechooser/FileSystemView.eea b/libs/eea-java-11/src/main/resources/javax/swing/filechooser/FileSystemView.eea
index 89ad3c64b9..1e22f4caa2 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/filechooser/FileSystemView.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/filechooser/FileSystemView.eea
@@ -6,16 +6,16 @@ getFileSystemView
 
 createFileObject
  (Ljava/io/File;Ljava/lang/String;)Ljava/io/File;
- (Ljava/io/File;Ljava/lang/String;)Ljava/io/File;
+ (Ljava/io/File;Ljava/lang/String;)L1java/io/File;
 createFileObject
  (Ljava/lang/String;)Ljava/io/File;
- (Ljava/lang/String;)Ljava/io/File;
+ (Ljava/lang/String;)L1java/io/File;
 createFileSystemRoot
  (Ljava/io/File;)Ljava/io/File;
- (Ljava/io/File;)Ljava/io/File;
+ (Ljava/io/File;)L1java/io/File;
 createNewFolder
  (Ljava/io/File;)Ljava/io/File;
- (Ljava/io/File;)Ljava/io/File;
+ (Ljava/io/File;)L1java/io/File;
 getChild
  (Ljava/io/File;Ljava/lang/String;)Ljava/io/File;
  (Ljava/io/File;Ljava/lang/String;)Ljava/io/File;
@@ -33,22 +33,22 @@ getHomeDirectory
  ()Ljava/io/File;
 getLinkLocation
  (Ljava/io/File;)Ljava/io/File;
- (Ljava/io/File;)Ljava/io/File;
+ (Ljava/io/File;)L0java/io/File;
 getParentDirectory
  (Ljava/io/File;)Ljava/io/File;
- (Ljava/io/File;)Ljava/io/File;
+ (Ljava/io/File;)L0java/io/File;
 getRoots
  ()[Ljava/io/File;
  ()[Ljava/io/File;
 getSystemDisplayName
  (Ljava/io/File;)Ljava/lang/String;
- (Ljava/io/File;)Ljava/lang/String;
+ (Ljava/io/File;)L0java/lang/String;
 getSystemIcon
  (Ljava/io/File;)Ljavax/swing/Icon;
- (Ljava/io/File;)Ljavax/swing/Icon;
+ (Ljava/io/File;)L0javax/swing/Icon;
 getSystemTypeDescription
  (Ljava/io/File;)Ljava/lang/String;
- (Ljava/io/File;)Ljava/lang/String;
+ (Ljava/io/File;)L0java/lang/String;
 isComputerNode
  (Ljava/io/File;)Z
  (Ljava/io/File;)Z
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/filechooser/FileView.eea b/libs/eea-java-11/src/main/resources/javax/swing/filechooser/FileView.eea
index e0ef4fa52b..0a4ff11d4e 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/filechooser/FileView.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/filechooser/FileView.eea
@@ -2,16 +2,16 @@ class javax/swing/filechooser/FileView
 
 getDescription
  (Ljava/io/File;)Ljava/lang/String;
- (Ljava/io/File;)Ljava/lang/String;
+ (Ljava/io/File;)L0java/lang/String;
 getIcon
  (Ljava/io/File;)Ljavax/swing/Icon;
- (Ljava/io/File;)Ljavax/swing/Icon;
+ (Ljava/io/File;)L0javax/swing/Icon;
 getName
  (Ljava/io/File;)Ljava/lang/String;
- (Ljava/io/File;)Ljava/lang/String;
+ (Ljava/io/File;)L0java/lang/String;
 getTypeDescription
  (Ljava/io/File;)Ljava/lang/String;
- (Ljava/io/File;)Ljava/lang/String;
+ (Ljava/io/File;)L0java/lang/String;
 isTraversable
  (Ljava/io/File;)Ljava/lang/Boolean;
- (Ljava/io/File;)Ljava/lang/Boolean;
+ (Ljava/io/File;)L0java/lang/Boolean;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/ComponentUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/ComponentUI.eea
index 5ec7973883..a2c548e098 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/ComponentUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/ComponentUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/ComponentUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 contains
  (Ljavax/swing/JComponent;II)Z
@@ -27,7 +27,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/FileChooserUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/FileChooserUI.eea
index 9ac7e7c5f4..e81cb87d1c 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/FileChooserUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/FileChooserUI.eea
@@ -11,7 +11,7 @@ getApproveButtonText
  (Ljavax/swing/JFileChooser;)Ljava/lang/String;
 getDefaultButton
  (Ljavax/swing/JFileChooser;)Ljavax/swing/JButton;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/JButton;
+ (Ljavax/swing/JFileChooser;)L0javax/swing/JButton;
 getDialogTitle
  (Ljavax/swing/JFileChooser;)Ljava/lang/String;
  (Ljavax/swing/JFileChooser;)Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/LayerUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/LayerUI.eea
index a6f539c648..e62749b44b 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/LayerUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/LayerUI.eea
@@ -34,7 +34,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getPropertyChangeListeners
  ()[Ljava/beans/PropertyChangeListener;
  ()[Ljava/beans/PropertyChangeListener;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/TextUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/TextUI.eea
index b98043b16e..65625e8751 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/TextUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/TextUI.eea
@@ -17,7 +17,7 @@ getRootView
  (Ljavax/swing/text/JTextComponent;)Ljavax/swing/text/View;
 getToolTipText
  (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)Ljava/lang/String;
- (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)Ljava/lang/String;
+ (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)L0java/lang/String;
 getToolTipText2D
  (Ljavax/swing/text/JTextComponent;Ljava/awt/geom/Point2D;)Ljava/lang/String;
  (Ljavax/swing/text/JTextComponent;Ljava/awt/geom/Point2D;)Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicArrowButton.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicArrowButton.eea
index 7bb20a0fe2..c82518b61d 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicArrowButton.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicArrowButton.eea
@@ -5,7 +5,7 @@ class javax/swing/plaf/basic/BasicArrowButton
  (ILjava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;)V
 getMaximumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 getMinimumSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicBorders.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicBorders.eea
index cbf229d0b2..e1058e82c2 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicBorders.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicBorders.eea
@@ -2,28 +2,28 @@ class javax/swing/plaf/basic/BasicBorders
 
 getButtonBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 getInternalFrameBorder
  ()Ljavax/swing/border/Border;
  ()Ljavax/swing/border/Border;
 getMenuBarBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 getProgressBarBorder
  ()Ljavax/swing/border/Border;
  ()Ljavax/swing/border/Border;
 getRadioButtonBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 getSplitPaneBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 getSplitPaneDividerBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 getTextFieldBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 getToggleButtonBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicButtonUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicButtonUI.eea
index 74aa3a4a21..0222c61576 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicButtonUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicButtonUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createButtonListener
  (Ljavax/swing/AbstractButton;)Ljavax/swing/plaf/basic/BasicButtonListener;
- (Ljavax/swing/AbstractButton;)Ljavax/swing/plaf/basic/BasicButtonListener;
+ (Ljavax/swing/AbstractButton;)L1javax/swing/plaf/basic/BasicButtonListener;
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -24,10 +24,10 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 installDefaults
  (Ljavax/swing/AbstractButton;)V
  (Ljavax/swing/AbstractButton;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.eea
index 9d9f5bc39c..2fa21504bb 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicCheckBoxMenuItemUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 processMouseEvent
  (Ljavax/swing/JMenuItem;Ljava/awt/event/MouseEvent;[Ljavax/swing/MenuElement;Ljavax/swing/MenuSelectionManager;)V
  (Ljavax/swing/JMenuItem;Ljava/awt/event/MouseEvent;[Ljavax/swing/MenuElement;Ljavax/swing/MenuSelectionManager;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicCheckBoxUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicCheckBoxUI.eea
index 5fbe295d12..9b7771641d 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicCheckBoxUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicCheckBoxUI.eea
@@ -2,8 +2,8 @@ class javax/swing/plaf/basic/BasicCheckBoxUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicRadioButtonUI)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicColorChooserUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicColorChooserUI.eea
index 3f06af60a4..0e0f345fc1 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicColorChooserUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicColorChooserUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicColorChooserUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 chooser
  Ljavax/swing/JColorChooser;
@@ -19,10 +19,10 @@ propertyChangeListener
 
 createDefaultChoosers
  ()[Ljavax/swing/colorchooser/AbstractColorChooserPanel;
- ()[Ljavax/swing/colorchooser/AbstractColorChooserPanel;
+ ()[1Ljavax/swing/colorchooser/AbstractColorChooserPanel;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicComboBoxEditor.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicComboBoxEditor.eea
index a6bce29431..a5c1729bf3 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicComboBoxEditor.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicComboBoxEditor.eea
@@ -9,7 +9,7 @@ addActionListener
  (L1java/awt/event/ActionListener;)V # @Inherited(javax.swing.ComboBoxEditor)
 createEditorComponent
  ()Ljavax/swing/JTextField;
- ()Ljavax/swing/JTextField;
+ ()L1javax/swing/JTextField;
 focusGained
  (Ljava/awt/event/FocusEvent;)V
  (L1java/awt/event/FocusEvent;)V # @Inherited(java.awt.event.FocusListener)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicComboBoxUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicComboBoxUI.eea
index 29a0806539..8b16633987 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicComboBoxUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicComboBoxUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicComboBoxUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 arrowButton
  Ljavax/swing/JButton;
@@ -55,37 +55,37 @@ propertyChangeListener
 
 createArrowButton
  ()Ljavax/swing/JButton;
- ()Ljavax/swing/JButton;
+ ()L1javax/swing/JButton;
 createEditor
  ()Ljavax/swing/ComboBoxEditor;
- ()Ljavax/swing/ComboBoxEditor;
+ ()L1javax/swing/ComboBoxEditor;
 createFocusListener
  ()Ljava/awt/event/FocusListener;
- ()Ljava/awt/event/FocusListener;
+ ()L1java/awt/event/FocusListener;
 createItemListener
  ()Ljava/awt/event/ItemListener;
- ()Ljava/awt/event/ItemListener;
+ ()L0java/awt/event/ItemListener;
 createKeyListener
  ()Ljava/awt/event/KeyListener;
- ()Ljava/awt/event/KeyListener;
+ ()L1java/awt/event/KeyListener;
 createLayoutManager
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 createListDataListener
  ()Ljavax/swing/event/ListDataListener;
- ()Ljavax/swing/event/ListDataListener;
+ ()L1javax/swing/event/ListDataListener;
 createPopup
  ()Ljavax/swing/plaf/basic/ComboPopup;
- ()Ljavax/swing/plaf/basic/ComboPopup;
+ ()L1javax/swing/plaf/basic/ComboPopup;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createRenderer
  ()Ljavax/swing/ListCellRenderer<Ljava/lang/Object;>;
- ()Ljavax/swing/ListCellRenderer<Ljava/lang/Object;>;
+ ()L1javax/swing/ListCellRenderer<Ljava/lang/Object;>;
 getAccessibleChild
  (Ljavax/swing/JComponent;I)Ljavax/accessibility/Accessible;
- (Ljavax/swing/JComponent;I)Ljavax/accessibility/Accessible;
+ (Ljavax/swing/JComponent;I)L0javax/accessibility/Accessible;
 getAccessibleChildrenCount
  (Ljavax/swing/JComponent;)I
  (Ljavax/swing/JComponent;)I
@@ -109,10 +109,10 @@ getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getSizeForComponent
  (Ljava/awt/Component;)Ljava/awt/Dimension;
  (Ljava/awt/Component;)Ljava/awt/Dimension;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicComboPopup.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicComboPopup.eea
index 21ba9d998b..dcfc6120a4 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicComboPopup.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicComboPopup.eea
@@ -45,43 +45,43 @@ scroller
  (Ljavax/swing/JComboBox<Ljava/lang/Object;>;)V
 computePopupBounds
  (IIII)Ljava/awt/Rectangle;
- (IIII)Ljava/awt/Rectangle;
+ (IIII)L1java/awt/Rectangle;
 convertMouseEvent
  (Ljava/awt/event/MouseEvent;)Ljava/awt/event/MouseEvent;
  (Ljava/awt/event/MouseEvent;)Ljava/awt/event/MouseEvent;
 createItemListener
  ()Ljava/awt/event/ItemListener;
- ()Ljava/awt/event/ItemListener;
+ ()L1java/awt/event/ItemListener;
 createKeyListener
  ()Ljava/awt/event/KeyListener;
- ()Ljava/awt/event/KeyListener;
+ ()L0java/awt/event/KeyListener;
 createList
  ()Ljavax/swing/JList<Ljava/lang/Object;>;
- ()Ljavax/swing/JList<Ljava/lang/Object;>;
+ ()L1javax/swing/JList<Ljava/lang/Object;>;
 createListDataListener
  ()Ljavax/swing/event/ListDataListener;
- ()Ljavax/swing/event/ListDataListener;
+ ()L0javax/swing/event/ListDataListener;
 createListMouseListener
  ()Ljava/awt/event/MouseListener;
- ()Ljava/awt/event/MouseListener;
+ ()L1java/awt/event/MouseListener;
 createListMouseMotionListener
  ()Ljava/awt/event/MouseMotionListener;
- ()Ljava/awt/event/MouseMotionListener;
+ ()L1java/awt/event/MouseMotionListener;
 createListSelectionListener
  ()Ljavax/swing/event/ListSelectionListener;
- ()Ljavax/swing/event/ListSelectionListener;
+ ()L0javax/swing/event/ListSelectionListener;
 createMouseListener
  ()Ljava/awt/event/MouseListener;
- ()Ljava/awt/event/MouseListener;
+ ()L1java/awt/event/MouseListener;
 createMouseMotionListener
  ()Ljava/awt/event/MouseMotionListener;
- ()Ljava/awt/event/MouseMotionListener;
+ ()L1java/awt/event/MouseMotionListener;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createScroller
  ()Ljavax/swing/JScrollPane;
- ()Ljavax/swing/JScrollPane;
+ ()L1javax/swing/JScrollPane;
 delegateFocus
  (Ljava/awt/event/MouseEvent;)V
  (Ljava/awt/event/MouseEvent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicDesktopIconUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicDesktopIconUI.eea
index 9f6065482b..3b26068ec0 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicDesktopIconUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicDesktopIconUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicDesktopIconUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 desktopIcon
  Ljavax/swing/JInternalFrame$JDesktopIcon;
@@ -16,7 +16,7 @@ iconPane
 
 createMouseInputListener
  ()Ljavax/swing/event/MouseInputListener;
- ()Ljavax/swing/event/MouseInputListener;
+ ()L1javax/swing/event/MouseInputListener;
 getInsets
  (Ljavax/swing/JComponent;)Ljava/awt/Insets;
  (Ljavax/swing/JComponent;)Ljava/awt/Insets;
@@ -25,10 +25,10 @@ getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicDesktopPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicDesktopPaneUI.eea
index 025812e960..827e084006 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicDesktopPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicDesktopPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicDesktopPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 closeKey
  Ljavax/swing/KeyStroke;
@@ -28,16 +28,16 @@ navigateKey2
 
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicEditorPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicEditorPaneUI.eea
index 22580148cb..54169ae3bc 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicEditorPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicEditorPaneUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/basic/BasicEditorPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getEditorKit
  (Ljavax/swing/text/JTextComponent;)Ljavax/swing/text/EditorKit;
  (Ljavax/swing/text/JTextComponent;)Ljavax/swing/text/EditorKit;
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.eea
index 96534ee69f..717dc1c230 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.eea
@@ -15,16 +15,16 @@ getCachedIcon
  (Ljava/io/File;)Ljavax/swing/Icon;
 getDescription
  (Ljava/io/File;)Ljava/lang/String;
- (Ljava/io/File;)Ljava/lang/String;
+ (Ljava/io/File;)L0java/lang/String; # @Inherited(javax.swing.filechooser.FileView)
 getIcon
  (Ljava/io/File;)Ljavax/swing/Icon;
- (Ljava/io/File;)Ljavax/swing/Icon;
+ (Ljava/io/File;)L0javax/swing/Icon; # @Inherited(javax.swing.filechooser.FileView)
 getName
  (Ljava/io/File;)Ljava/lang/String;
- (Ljava/io/File;)Ljava/lang/String;
+ (Ljava/io/File;)L0java/lang/String; # @Inherited(javax.swing.filechooser.FileView)
 getTypeDescription
  (Ljava/io/File;)Ljava/lang/String;
- (Ljava/io/File;)Ljava/lang/String;
+ (Ljava/io/File;)L0java/lang/String; # @Inherited(javax.swing.filechooser.FileView)
 isHidden
  (Ljava/io/File;)Ljava/lang/Boolean;
  (Ljava/io/File;)Ljava/lang/Boolean;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicFileChooserUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicFileChooserUI.eea
index cfe6c34187..27a39da817 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicFileChooserUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicFileChooserUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicFileChooserUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 cancelButtonText
  Ljava/lang/String;
@@ -79,13 +79,13 @@ viewMenuIcon
  (Ljavax/swing/JFileChooser;)V
 createDoubleClickListener
  (Ljavax/swing/JFileChooser;Ljavax/swing/JList<*>;)Ljava/awt/event/MouseListener;
- (Ljavax/swing/JFileChooser;Ljavax/swing/JList<*>;)Ljava/awt/event/MouseListener;
+ (Ljavax/swing/JFileChooser;Ljavax/swing/JList<*>;)L1java/awt/event/MouseListener;
 createListSelectionListener
  (Ljavax/swing/JFileChooser;)Ljavax/swing/event/ListSelectionListener;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/event/ListSelectionListener;
+ (Ljavax/swing/JFileChooser;)L1javax/swing/event/ListSelectionListener;
 createPropertyChangeListener
  (Ljavax/swing/JFileChooser;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JFileChooser;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JFileChooser;)L0java/beans/PropertyChangeListener;
 ensureFileIsVisible
  (Ljavax/swing/JFileChooser;Ljava/io/File;)V
  (Ljavax/swing/JFileChooser;Ljava/io/File;)V
@@ -97,16 +97,16 @@ getAccessoryPanel
  ()Ljavax/swing/JPanel;
 getApproveButton
  (Ljavax/swing/JFileChooser;)Ljavax/swing/JButton;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/JButton;
+ (Ljavax/swing/JFileChooser;)L0javax/swing/JButton;
 getApproveButtonMnemonic
  (Ljavax/swing/JFileChooser;)I
  (Ljavax/swing/JFileChooser;)I
 getApproveButtonText
  (Ljavax/swing/JFileChooser;)Ljava/lang/String;
- (Ljavax/swing/JFileChooser;)Ljava/lang/String;
+ (Ljavax/swing/JFileChooser;)L0java/lang/String;
 getApproveButtonToolTipText
  (Ljavax/swing/JFileChooser;)Ljava/lang/String;
- (Ljavax/swing/JFileChooser;)Ljava/lang/String;
+ (Ljavax/swing/JFileChooser;)L0java/lang/String;
 getApproveSelectionAction
  ()Ljavax/swing/Action;
  ()Ljavax/swing/Action;
@@ -118,7 +118,7 @@ getChangeToParentDirectoryAction
  ()Ljavax/swing/Action;
 getDefaultButton
  (Ljavax/swing/JFileChooser;)Ljavax/swing/JButton;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/JButton;
+ (Ljavax/swing/JFileChooser;)L0javax/swing/JButton; # @Inherited(javax.swing.plaf.FileChooserUI)
 getDialogTitle
  (Ljavax/swing/JFileChooser;)Ljava/lang/String;
  (Ljavax/swing/JFileChooser;)Ljava/lang/String;
@@ -127,13 +127,13 @@ getDirectory
  ()Ljava/io/File;
 getDirectoryName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getFileChooser
  ()Ljavax/swing/JFileChooser;
  ()Ljavax/swing/JFileChooser;
 getFileName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getFileView
  (Ljavax/swing/JFileChooser;)Ljavax/swing/filechooser/FileView;
  (Ljavax/swing/JFileChooser;)Ljavax/swing/filechooser/FileView;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicFormattedTextFieldUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicFormattedTextFieldUI.eea
index 345fdb8dd6..bb83c69302 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicFormattedTextFieldUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicFormattedTextFieldUI.eea
@@ -2,8 +2,8 @@ class javax/swing/plaf/basic/BasicFormattedTextFieldUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicTextFieldUI)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicGraphicsUtils.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicGraphicsUtils.eea
index 5e1ca5785e..9da2bd8bd0 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicGraphicsUtils.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicGraphicsUtils.eea
@@ -38,7 +38,7 @@ getGrooveInsets
  ()Ljava/awt/Insets;
 getPreferredButtonSize
  (Ljavax/swing/AbstractButton;I)Ljava/awt/Dimension;
- (Ljavax/swing/AbstractButton;I)Ljava/awt/Dimension;
+ (Ljavax/swing/AbstractButton;I)L0java/awt/Dimension;
 getStringWidth
  (Ljavax/swing/JComponent;Ljava/awt/FontMetrics;Ljava/lang/String;)F
  (Ljavax/swing/JComponent;Ljava/awt/FontMetrics;Ljava/lang/String;)F
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicHTML.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicHTML.eea
index 1303b07efc..b7be4a6dd9 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicHTML.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicHTML.eea
@@ -9,7 +9,7 @@ propertyKey
 
 createHTMLView
  (Ljavax/swing/JComponent;Ljava/lang/String;)Ljavax/swing/text/View;
- (Ljavax/swing/JComponent;Ljava/lang/String;)Ljavax/swing/text/View;
+ (Ljavax/swing/JComponent;Ljava/lang/String;)L1javax/swing/text/View;
 getHTMLBaseline
  (Ljavax/swing/text/View;II)I
  (Ljavax/swing/text/View;II)I
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicIconFactory.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicIconFactory.eea
index 958ff17940..504f9378d9 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicIconFactory.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicIconFactory.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicIconFactory
 
 createEmptyFrameIcon
  ()Ljavax/swing/Icon;
- ()Ljavax/swing/Icon;
+ ()L1javax/swing/Icon;
 getCheckBoxIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicInternalFrameTitlePane.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicInternalFrameTitlePane.eea
index 61225d556f..991a88c435 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicInternalFrameTitlePane.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicInternalFrameTitlePane.eea
@@ -91,16 +91,16 @@ addSystemMenuItems
  (Ljavax/swing/JMenu;)V
 createLayout
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createSystemMenu
  ()Ljavax/swing/JMenu;
- ()Ljavax/swing/JMenu;
+ ()L1javax/swing/JMenu;
 createSystemMenuBar
  ()Ljavax/swing/JMenuBar;
- ()Ljavax/swing/JMenuBar;
+ ()L1javax/swing/JMenuBar;
 getTitle
  (Ljava/lang/String;Ljava/awt/FontMetrics;I)Ljava/lang/String;
  (Ljava/lang/String;Ljava/awt/FontMetrics;I)Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicInternalFrameUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicInternalFrameUI.eea
index 5a61c7b11a..7bc50d3cf0 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicInternalFrameUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicInternalFrameUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicInternalFrameUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 borderListener
  Ljavax/swing/event/MouseInputAdapter;
@@ -52,34 +52,34 @@ closeFrame
  (Ljavax/swing/JInternalFrame;)V
 createBorderListener
  (Ljavax/swing/JInternalFrame;)Ljavax/swing/event/MouseInputAdapter;
- (Ljavax/swing/JInternalFrame;)Ljavax/swing/event/MouseInputAdapter;
+ (Ljavax/swing/JInternalFrame;)L1javax/swing/event/MouseInputAdapter;
 createComponentListener
  ()Ljava/awt/event/ComponentListener;
- ()Ljava/awt/event/ComponentListener;
+ ()L1java/awt/event/ComponentListener;
 createDesktopManager
  ()Ljavax/swing/DesktopManager;
- ()Ljavax/swing/DesktopManager;
+ ()L1javax/swing/DesktopManager;
 createEastPane
  (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
- (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
+ (Ljavax/swing/JInternalFrame;)L0javax/swing/JComponent;
 createGlassPaneDispatcher
  ()Ljavax/swing/event/MouseInputListener;
- ()Ljavax/swing/event/MouseInputListener;
+ ()L0javax/swing/event/MouseInputListener;
 createLayoutManager
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 createNorthPane
  (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
- (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
+ (Ljavax/swing/JInternalFrame;)L1javax/swing/JComponent;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createSouthPane
  (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
- (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
+ (Ljavax/swing/JInternalFrame;)L0javax/swing/JComponent;
 createWestPane
  (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
- (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
+ (Ljavax/swing/JInternalFrame;)L0javax/swing/JComponent;
 deactivateFrame
  (Ljavax/swing/JInternalFrame;)V
  (Ljavax/swing/JInternalFrame;)V
@@ -97,7 +97,7 @@ getEastPane
  ()Ljavax/swing/JComponent;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
@@ -106,7 +106,7 @@ getNorthPane
  ()Ljavax/swing/JComponent;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getSouthPane
  ()Ljavax/swing/JComponent;
  ()Ljavax/swing/JComponent;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicLabelUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicLabelUI.eea
index 3c1a431d4c..7734c1a4b6 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicLabelUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicLabelUI.eea
@@ -6,7 +6,7 @@ labelUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getBaseline
  (Ljavax/swing/JComponent;II)I
@@ -22,7 +22,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installComponents
  (Ljavax/swing/JLabel;)V
  (Ljavax/swing/JLabel;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicListUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicListUI.eea
index b22d88812e..cfbe388764 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicListUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicListUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicListUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 cellHeights
  [I
@@ -31,19 +31,19 @@ rendererPane
 
 createFocusListener
  ()Ljava/awt/event/FocusListener;
- ()Ljava/awt/event/FocusListener;
+ ()L1java/awt/event/FocusListener;
 createListDataListener
  ()Ljavax/swing/event/ListDataListener;
- ()Ljavax/swing/event/ListDataListener;
+ ()L1javax/swing/event/ListDataListener;
 createListSelectionListener
  ()Ljavax/swing/event/ListSelectionListener;
- ()Ljavax/swing/event/ListSelectionListener;
+ ()L1javax/swing/event/ListSelectionListener;
 createMouseInputListener
  ()Ljavax/swing/event/MouseInputListener;
- ()Ljavax/swing/event/MouseInputListener;
+ ()L1javax/swing/event/MouseInputListener;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -52,13 +52,13 @@ getBaselineResizeBehavior
  (Ljavax/swing/JComponent;)Ljava/awt/Component$BaselineResizeBehavior;
 getCellBounds
  (Ljavax/swing/JList<*>;II)Ljava/awt/Rectangle;
- (Ljavax/swing/JList<*>;II)Ljava/awt/Rectangle;
+ (Ljavax/swing/JList<*>;II)L0java/awt/Rectangle;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 indexToLocation
  (Ljavax/swing/JList<*>;I)Ljava/awt/Point;
- (Ljavax/swing/JList<*>;I)Ljava/awt/Point;
+ (Ljavax/swing/JList<*>;I)L0java/awt/Point;
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicLookAndFeel.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicLookAndFeel.eea
index 34bcd75e87..00340aafe8 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicLookAndFeel.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicLookAndFeel.eea
@@ -2,13 +2,13 @@ class javax/swing/plaf/basic/BasicLookAndFeel
 
 createAudioAction
  (Ljava/lang/Object;)Ljavax/swing/Action;
- (Ljava/lang/Object;)Ljavax/swing/Action;
+ (Ljava/lang/Object;)L0javax/swing/Action;
 getAudioActionMap
  ()Ljavax/swing/ActionMap;
- ()Ljavax/swing/ActionMap;
+ ()L1javax/swing/ActionMap;
 getDefaults
  ()Ljavax/swing/UIDefaults;
- ()Ljavax/swing/UIDefaults;
+ ()L0javax/swing/UIDefaults; # @Inherited(javax.swing.LookAndFeel)
 initClassDefaults
  (Ljavax/swing/UIDefaults;)V
  (Ljavax/swing/UIDefaults;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicMenuBarUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicMenuBarUI.eea
index f438ccead3..49806e056f 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicMenuBarUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicMenuBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicMenuBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 changeListener
  Ljavax/swing/event/ChangeListener;
@@ -16,16 +16,16 @@ menuBar
 
 createChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 createContainerListener
  ()Ljava/awt/event/ContainerListener;
- ()Ljava/awt/event/ContainerListener;
+ ()L1java/awt/event/ContainerListener;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicMenuItemUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicMenuItemUI.eea
index 65327d4bbb..9b25907c91 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicMenuItemUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicMenuItemUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicMenuItemUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 acceleratorDelimiter
  Ljava/lang/String;
@@ -49,16 +49,16 @@ selectionForeground
 
 createMenuDragMouseListener
  (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuDragMouseListener;
- (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuDragMouseListener;
+ (Ljavax/swing/JComponent;)L1javax/swing/event/MenuDragMouseListener;
 createMenuKeyListener
  (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuKeyListener;
- (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuKeyListener;
+ (Ljavax/swing/JComponent;)L0javax/swing/event/MenuKeyListener;
 createMouseInputListener
  (Ljavax/swing/JComponent;)Ljavax/swing/event/MouseInputListener;
- (Ljavax/swing/JComponent;)Ljavax/swing/event/MouseInputListener;
+ (Ljavax/swing/JComponent;)L1javax/swing/event/MouseInputListener;
 createPropertyChangeListener
  (Ljavax/swing/JComponent;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JComponent;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JComponent;)L1java/beans/PropertyChangeListener;
 doClick
  (Ljavax/swing/MenuSelectionManager;)V
  (Ljavax/swing/MenuSelectionManager;)V
@@ -70,16 +70,16 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPath
  ()[Ljavax/swing/MenuElement;
- ()[Ljavax/swing/MenuElement;
+ ()[1Ljavax/swing/MenuElement;
 getPreferredMenuItemSize
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)L1java/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 installComponents
  (Ljavax/swing/JMenuItem;)V
  (Ljavax/swing/JMenuItem;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicMenuUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicMenuUI.eea
index 427aafc68a..71b67ee792 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicMenuUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicMenuUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicMenuUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 changeListener
  Ljavax/swing/event/ChangeListener;
@@ -13,31 +13,31 @@ menuListener
 
 createChangeListener
  (Ljavax/swing/JComponent;)Ljavax/swing/event/ChangeListener;
- (Ljavax/swing/JComponent;)Ljavax/swing/event/ChangeListener;
+ (Ljavax/swing/JComponent;)L0javax/swing/event/ChangeListener;
 createMenuDragMouseListener
  (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuDragMouseListener;
- (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuDragMouseListener;
+ (Ljavax/swing/JComponent;)L1javax/swing/event/MenuDragMouseListener; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 createMenuKeyListener
  (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuKeyListener;
- (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuKeyListener;
+ (Ljavax/swing/JComponent;)L1javax/swing/event/MenuKeyListener; # @Overrides(javax.swing.plaf.basic.BasicMenuItemUI)
 createMenuListener
  (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuListener;
- (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuListener;
+ (Ljavax/swing/JComponent;)L0javax/swing/event/MenuListener;
 createMouseInputListener
  (Ljavax/swing/JComponent;)Ljavax/swing/event/MouseInputListener;
- (Ljavax/swing/JComponent;)Ljavax/swing/event/MouseInputListener;
+ (Ljavax/swing/JComponent;)L1javax/swing/event/MouseInputListener; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 createPropertyChangeListener
  (Ljavax/swing/JComponent;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JComponent;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JComponent;)L1java/beans/PropertyChangeListener; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 setupPostTimer
  (Ljavax/swing/JMenu;)V
  (Ljavax/swing/JMenu;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicOptionPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicOptionPaneUI.eea
index ededf1a60d..e349eab7df 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicOptionPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicOptionPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicOptionPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 initialFocusComponent
  Ljava/awt/Component;
@@ -37,40 +37,40 @@ containsCustomComponents
  (Ljavax/swing/JOptionPane;)Z
 createButtonActionListener
  (I)Ljava/awt/event/ActionListener;
- (I)Ljava/awt/event/ActionListener;
+ (I)L1java/awt/event/ActionListener;
 createButtonArea
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L1java/awt/Container;
 createLayoutManager
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 createMessageArea
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L1java/awt/Container;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createSeparator
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L0java/awt/Container;
 getButtons
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 getIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
 getIconForType
  (I)Ljavax/swing/Icon;
- (I)Ljavax/swing/Icon;
+ (I)L0javax/swing/Icon;
 getMessage
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getMinimumOptionPaneSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicPanelUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicPanelUI.eea
index 04039e1a98..23f3aa3873 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicPanelUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicPanelUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicPanelUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getBaseline
  (Ljavax/swing/JComponent;II)I
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicPasswordFieldUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicPasswordFieldUI.eea
index 2aa8e1f416..7e339d5fac 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicPasswordFieldUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicPasswordFieldUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicPasswordFieldUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 create
  (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
+ (Ljavax/swing/text/Element;)L1javax/swing/text/View; # @Inherited(javax.swing.plaf.basic.BasicTextFieldUI)
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicTextFieldUI)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.eea
index 155f5cba47..219fdcf82e 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicPopupMenuSeparatorUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicSeparatorUI)
 paint
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicPopupMenuUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicPopupMenuUI.eea
index be8ccead39..4020267896 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicPopupMenuUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicPopupMenuUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicPopupMenuUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 popupMenu
  Ljavax/swing/JPopupMenu;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicProgressBarUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicProgressBarUI.eea
index 2655975986..14997c7a20 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicProgressBarUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicProgressBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicProgressBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 boxRect
  Ljava/awt/Rectangle;
@@ -25,7 +25,7 @@ getBaselineResizeBehavior
  (Ljavax/swing/JComponent;)Ljava/awt/Component$BaselineResizeBehavior;
 getBox
  (Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
- (Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
+ (Ljava/awt/Rectangle;)L0java/awt/Rectangle;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
@@ -40,7 +40,7 @@ getPreferredInnerVertical
  ()Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Overrides(javax.swing.plaf.ComponentUI)
 getSelectionBackground
  ()Ljava/awt/Color;
  ()Ljava/awt/Color;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.eea
index cadaa38d8c..2c13e86b34 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicRadioButtonMenuItemUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 processMouseEvent
  (Ljavax/swing/JMenuItem;Ljava/awt/event/MouseEvent;[Ljavax/swing/MenuElement;Ljavax/swing/MenuSelectionManager;)V
  (Ljavax/swing/JMenuItem;Ljava/awt/event/MouseEvent;[Ljavax/swing/MenuElement;Ljavax/swing/MenuSelectionManager;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicRadioButtonUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicRadioButtonUI.eea
index 5a4abe7bee..57b58ed465 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicRadioButtonUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicRadioButtonUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicRadioButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 icon
  Ljavax/swing/Icon;
@@ -13,10 +13,10 @@ getDefaultIcon
  ()Ljavax/swing/Icon;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicButtonUI)
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicToggleButtonUI)
 installDefaults
  (Ljavax/swing/AbstractButton;)V
  (Ljavax/swing/AbstractButton;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicRootPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicRootPaneUI.eea
index 17e9eca72a..f1d7d7c844 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicRootPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicRootPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicRootPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 installComponents
  (Ljavax/swing/JRootPane;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicScrollBarUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicScrollBarUI.eea
index 7f8df9a274..4647ddab0f 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicScrollBarUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicScrollBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicScrollBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 buttonListener
  Ljavax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener;
@@ -67,28 +67,28 @@ addLayoutComponent
  (Ljava/lang/String;Ljava/awt/Component;)V
 createArrowButtonListener
  ()Ljavax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener;
- ()Ljavax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener;
+ ()L1javax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener;
 createDecreaseButton
  (I)Ljavax/swing/JButton;
- (I)Ljavax/swing/JButton;
+ (I)L1javax/swing/JButton;
 createIncreaseButton
  (I)Ljavax/swing/JButton;
- (I)Ljavax/swing/JButton;
+ (I)L1javax/swing/JButton;
 createModelListener
  ()Ljavax/swing/plaf/basic/BasicScrollBarUI$ModelListener;
- ()Ljavax/swing/plaf/basic/BasicScrollBarUI$ModelListener;
+ ()L1javax/swing/plaf/basic/BasicScrollBarUI$ModelListener;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createScrollListener
  ()Ljavax/swing/plaf/basic/BasicScrollBarUI$ScrollListener;
- ()Ljavax/swing/plaf/basic/BasicScrollBarUI$ScrollListener;
+ ()L1javax/swing/plaf/basic/BasicScrollBarUI$ScrollListener;
 createTrackListener
  ()Ljavax/swing/plaf/basic/BasicScrollBarUI$TrackListener;
- ()Ljavax/swing/plaf/basic/BasicScrollBarUI$TrackListener;
+ ()L1javax/swing/plaf/basic/BasicScrollBarUI$TrackListener;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getMaximumThumbSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
@@ -97,7 +97,7 @@ getMinimumThumbSize
  ()Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Overrides(javax.swing.plaf.ComponentUI)
 getThumbBounds
  ()Ljava/awt/Rectangle;
  ()Ljava/awt/Rectangle;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicScrollPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicScrollPaneUI.eea
index ba95b93096..e9c3d8a4f8 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicScrollPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicScrollPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicScrollPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 hsbChangeListener
  Ljavax/swing/event/ChangeListener;
@@ -22,19 +22,19 @@ vsbChangeListener
 
 createHSBChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 createMouseWheelListener
  ()Ljava/awt/event/MouseWheelListener;
- ()Ljava/awt/event/MouseWheelListener;
+ ()L1java/awt/event/MouseWheelListener;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createVSBChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 createViewportChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicSeparatorUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicSeparatorUI.eea
index b11d53122a..ef912e03e3 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicSeparatorUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicSeparatorUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicSeparatorUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 highlight
  Ljava/awt/Color;
@@ -13,13 +13,13 @@ shadow
 
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installDefaults
  (Ljavax/swing/JSeparator;)V
  (Ljavax/swing/JSeparator;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicSliderUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicSliderUI.eea
index 2deac5dc8f..9d3a8cd10c 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicSliderUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicSliderUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicSliderUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 changeListener
  Ljavax/swing/event/ChangeListener;
@@ -58,22 +58,22 @@ trackRect
  (Ljavax/swing/JSlider;)V
 createChangeListener
  (Ljavax/swing/JSlider;)Ljavax/swing/event/ChangeListener;
- (Ljavax/swing/JSlider;)Ljavax/swing/event/ChangeListener;
+ (Ljavax/swing/JSlider;)L1javax/swing/event/ChangeListener;
 createComponentListener
  (Ljavax/swing/JSlider;)Ljava/awt/event/ComponentListener;
- (Ljavax/swing/JSlider;)Ljava/awt/event/ComponentListener;
+ (Ljavax/swing/JSlider;)L1java/awt/event/ComponentListener;
 createFocusListener
  (Ljavax/swing/JSlider;)Ljava/awt/event/FocusListener;
- (Ljavax/swing/JSlider;)Ljava/awt/event/FocusListener;
+ (Ljavax/swing/JSlider;)L1java/awt/event/FocusListener;
 createPropertyChangeListener
  (Ljavax/swing/JSlider;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JSlider;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JSlider;)L1java/beans/PropertyChangeListener;
 createScrollListener
  (Ljavax/swing/JSlider;)Ljavax/swing/plaf/basic/BasicSliderUI$ScrollListener;
- (Ljavax/swing/JSlider;)Ljavax/swing/plaf/basic/BasicSliderUI$ScrollListener;
+ (Ljavax/swing/JSlider;)L1javax/swing/plaf/basic/BasicSliderUI$ScrollListener;
 createTrackListener
  (Ljavax/swing/JSlider;)Ljavax/swing/plaf/basic/BasicSliderUI$TrackListener;
- (Ljavax/swing/JSlider;)Ljavax/swing/plaf/basic/BasicSliderUI$TrackListener;
+ (Ljavax/swing/JSlider;)L1javax/swing/plaf/basic/BasicSliderUI$TrackListener;
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -85,19 +85,19 @@ getFocusColor
  ()Ljava/awt/Color;
 getHighestValue
  ()Ljava/lang/Integer;
- ()Ljava/lang/Integer;
+ ()L0java/lang/Integer;
 getHighestValueLabel
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 getHighlightColor
  ()Ljava/awt/Color;
  ()Ljava/awt/Color;
 getLowestValue
  ()Ljava/lang/Integer;
- ()Ljava/lang/Integer;
+ ()L0java/lang/Integer;
 getLowestValueLabel
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
@@ -106,7 +106,7 @@ getMinimumHorizontalSize
  ()Ljava/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getMinimumVerticalSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
@@ -115,7 +115,7 @@ getPreferredHorizontalSize
  ()Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Overrides(javax.swing.plaf.ComponentUI)
 getPreferredVerticalSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
@@ -124,7 +124,7 @@ getShadowColor
  ()Ljava/awt/Color;
 getThumbSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 installDefaults
  (Ljavax/swing/JSlider;)V
  (Ljavax/swing/JSlider;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicSpinnerUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicSpinnerUI.eea
index 43b73e0304..b72b0dc06b 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicSpinnerUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicSpinnerUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicSpinnerUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 spinner
  Ljavax/swing/JSpinner;
@@ -10,19 +10,19 @@ spinner
 
 createEditor
  ()Ljavax/swing/JComponent;
- ()Ljavax/swing/JComponent;
+ ()L1javax/swing/JComponent;
 createLayout
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 createNextButton
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component;
 createPreviousButton
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneDivider.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneDivider.eea
index ced2adc462..efa6351974 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneDivider.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneDivider.eea
@@ -27,10 +27,10 @@ splitPaneUI
  (Ljavax/swing/plaf/basic/BasicSplitPaneUI;)V
 createLeftOneTouchButton
  ()Ljavax/swing/JButton;
- ()Ljavax/swing/JButton;
+ ()L1javax/swing/JButton;
 createRightOneTouchButton
  ()Ljavax/swing/JButton;
- ()Ljavax/swing/JButton;
+ ()L1javax/swing/JButton;
 getBasicSplitPaneUI
  ()Ljavax/swing/plaf/basic/BasicSplitPaneUI;
  ()Ljavax/swing/plaf/basic/BasicSplitPaneUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.eea
index f62efec6c4..f385dfbbed 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.eea
@@ -33,7 +33,7 @@ getSizeOfComponent
  (Ljava/awt/Component;)I
 getSizes
  ()[I
- ()[I
+ ()[1I
 invalidateLayout
  (Ljava/awt/Container;)V
  (Ljava/awt/Container;)V
@@ -42,13 +42,13 @@ layoutContainer
  (Ljava/awt/Container;)V
 maximumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
- (Ljava/awt/Container;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;)L1java/awt/Dimension;
 minimumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
- (Ljava/awt/Container;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;)L1java/awt/Dimension;
 preferredLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
- (Ljava/awt/Container;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;)L1java/awt/Dimension;
 removeLayoutComponent
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneUI.eea
index a408ac5ec0..886cee9302 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneUI.eea
@@ -6,7 +6,7 @@ NON_CONTINUOUS_DIVIDER
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 divider
  Ljavax/swing/plaf/basic/BasicSplitPaneDivider;
@@ -65,31 +65,31 @@ upKey
 
 createDefaultDivider
  ()Ljavax/swing/plaf/basic/BasicSplitPaneDivider;
- ()Ljavax/swing/plaf/basic/BasicSplitPaneDivider;
+ ()L1javax/swing/plaf/basic/BasicSplitPaneDivider;
 createDefaultNonContinuousLayoutDivider
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component;
 createFocusListener
  ()Ljava/awt/event/FocusListener;
- ()Ljava/awt/event/FocusListener;
+ ()L1java/awt/event/FocusListener;
 createKeyboardDownRightListener
  ()Ljava/awt/event/ActionListener;
- ()Ljava/awt/event/ActionListener;
+ ()L1java/awt/event/ActionListener;
 createKeyboardEndListener
  ()Ljava/awt/event/ActionListener;
- ()Ljava/awt/event/ActionListener;
+ ()L1java/awt/event/ActionListener;
 createKeyboardHomeListener
  ()Ljava/awt/event/ActionListener;
- ()Ljava/awt/event/ActionListener;
+ ()L1java/awt/event/ActionListener;
 createKeyboardResizeToggleListener
  ()Ljava/awt/event/ActionListener;
- ()Ljava/awt/event/ActionListener;
+ ()L1java/awt/event/ActionListener;
 createKeyboardUpLeftListener
  ()Ljava/awt/event/ActionListener;
- ()Ljava/awt/event/ActionListener;
+ ()L1java/awt/event/ActionListener;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 finishedPaintingChildren
  (Ljavax/swing/JSplitPane;Ljava/awt/Graphics;)V
  (Ljavax/swing/JSplitPane;Ljava/awt/Graphics;)V
@@ -101,7 +101,7 @@ getDividerLocation
  (Ljavax/swing/JSplitPane;)I
 getInsets
  (Ljavax/swing/JComponent;)Ljava/awt/Insets;
- (Ljavax/swing/JComponent;)Ljava/awt/Insets;
+ (Ljavax/swing/JComponent;)L0java/awt/Insets;
 getMaximumDividerLocation
  (Ljavax/swing/JSplitPane;)I
  (Ljavax/swing/JSplitPane;)I
@@ -119,7 +119,7 @@ getNonContinuousLayoutDivider
  ()Ljava/awt/Component;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getSplitPane
  ()Ljavax/swing/JSplitPane;
  ()Ljavax/swing/JSplitPane;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTabbedPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTabbedPaneUI.eea
index 1852d9c65a..46e9870fb8 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTabbedPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTabbedPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicTabbedPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 rotateInsets
  (Ljava/awt/Insets;Ljava/awt/Insets;I)V
  (Ljava/awt/Insets;Ljava/awt/Insets;I)V
@@ -76,22 +76,22 @@ calculateTabWidth
  (IILjava/awt/FontMetrics;)I
 createChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 createFocusListener
  ()Ljava/awt/event/FocusListener;
- ()Ljava/awt/event/FocusListener;
+ ()L1java/awt/event/FocusListener;
 createLayoutManager
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 createMouseListener
  ()Ljava/awt/event/MouseListener;
- ()Ljava/awt/event/MouseListener;
+ ()L1java/awt/event/MouseListener;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createScrollButton
  (I)Ljavax/swing/JButton;
- (I)Ljavax/swing/JButton;
+ (I)L1javax/swing/JButton;
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -109,10 +109,10 @@ getIconForTab
  (I)Ljavax/swing/Icon;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getSelectedTabPadInsets
  (I)Ljava/awt/Insets;
  (I)Ljava/awt/Insets;
@@ -133,7 +133,7 @@ getTabRunCount
  (Ljavax/swing/JTabbedPane;)I
 getTextViewForTab
  (I)Ljavax/swing/text/View;
- (I)Ljavax/swing/text/View;
+ (I)L0javax/swing/text/View;
 getVisibleComponent
  ()Ljava/awt/Component;
  ()Ljava/awt/Component;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTableHeaderUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTableHeaderUI.eea
index 37de27cf5b..05912a45f4 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTableHeaderUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTableHeaderUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicTableHeaderUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 header
  Ljavax/swing/table/JTableHeader;
@@ -16,7 +16,7 @@ rendererPane
 
 createMouseInputListener
  ()Ljavax/swing/event/MouseInputListener;
- ()Ljavax/swing/event/MouseInputListener;
+ ()L1javax/swing/event/MouseInputListener;
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -28,7 +28,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTableUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTableUI.eea
index 45527ccb57..b86b7952df 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTableUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTableUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicTableUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 focusListener
  Ljava/awt/event/FocusListener;
@@ -22,13 +22,13 @@ table
 
 createFocusListener
  ()Ljava/awt/event/FocusListener;
- ()Ljava/awt/event/FocusListener;
+ ()L1java/awt/event/FocusListener;
 createKeyListener
  ()Ljava/awt/event/KeyListener;
- ()Ljava/awt/event/KeyListener;
+ ()L0java/awt/event/KeyListener;
 createMouseInputListener
  ()Ljavax/swing/event/MouseInputListener;
- ()Ljavax/swing/event/MouseInputListener;
+ ()L1javax/swing/event/MouseInputListener;
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -43,7 +43,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTextAreaUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTextAreaUI.eea
index 3a44e4bb5e..4bdc980a48 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTextAreaUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTextAreaUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicTextAreaUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 create
  (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
+ (Ljavax/swing/text/Element;)L0javax/swing/text/View; # @Inherited(javax.swing.plaf.basic.BasicTextUI)
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -15,13 +15,13 @@ getBaselineResizeBehavior
  (Ljavax/swing/JComponent;)Ljava/awt/Component$BaselineResizeBehavior;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicTextUI)
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicTextUI)
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 propertyChange
  (Ljava/beans/PropertyChangeEvent;)V
  (Ljava/beans/PropertyChangeEvent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTextFieldUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTextFieldUI.eea
index 7a58a1f961..14ec6a1d60 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTextFieldUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTextFieldUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicTextFieldUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 create
  (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
+ (Ljavax/swing/text/Element;)L1javax/swing/text/View; # @Overrides(javax.swing.plaf.basic.BasicTextUI)
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -15,4 +15,4 @@ getBaselineResizeBehavior
  (Ljavax/swing/JComponent;)Ljava/awt/Component$BaselineResizeBehavior;
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTextPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTextPaneUI.eea
index 35b2aede01..75b15b84d4 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTextPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTextPaneUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicTextPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicEditorPaneUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTextUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTextUI.eea
index 89fafe25cb..879823d8bc 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTextUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTextUI.eea
@@ -2,19 +2,19 @@ class javax/swing/plaf/basic/BasicTextUI
 
 create
  (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
+ (Ljavax/swing/text/Element;)L0javax/swing/text/View; # @Overrides(javax.swing.text.ViewFactory)
 create
  (Ljavax/swing/text/Element;II)Ljavax/swing/text/View;
- (Ljavax/swing/text/Element;II)Ljavax/swing/text/View;
+ (Ljavax/swing/text/Element;II)L0javax/swing/text/View;
 createCaret
  ()Ljavax/swing/text/Caret;
- ()Ljavax/swing/text/Caret;
+ ()L1javax/swing/text/Caret;
 createHighlighter
  ()Ljavax/swing/text/Highlighter;
- ()Ljavax/swing/text/Highlighter;
+ ()L1javax/swing/text/Highlighter;
 createKeymap
  ()Ljavax/swing/text/Keymap;
- ()Ljavax/swing/text/Keymap;
+ ()L1javax/swing/text/Keymap;
 damageRange
  (Ljavax/swing/text/JTextComponent;II)V
  (Ljavax/swing/text/JTextComponent;II)V
@@ -32,16 +32,16 @@ getKeymapName
  ()Ljava/lang/String;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getNextVisualPositionFrom
  (Ljavax/swing/text/JTextComponent;ILjavax/swing/text/Position$Bias;I[Ljavax/swing/text/Position$Bias;)I
  (Ljavax/swing/text/JTextComponent;ILjavax/swing/text/Position$Bias;I[Ljavax/swing/text/Position$Bias;)I
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getPropertyPrefix
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -50,10 +50,10 @@ getRootView
  (Ljavax/swing/text/JTextComponent;)Ljavax/swing/text/View;
 getToolTipText
  (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)Ljava/lang/String;
- (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)Ljava/lang/String;
+ (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)L0java/lang/String; # @Inherited(javax.swing.plaf.TextUI)
 getVisibleEditorRect
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L0java/awt/Rectangle;
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicToggleButtonUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicToggleButtonUI.eea
index f473527bf4..aa6a557dba 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicToggleButtonUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicToggleButtonUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicToggleButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicButtonUI)
 paint
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicToolBarSeparatorUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicToolBarSeparatorUI.eea
index a059db702a..aea46f22cb 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicToolBarSeparatorUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicToolBarSeparatorUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicToolBarSeparatorUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicSeparatorUI)
 installDefaults
  (Ljavax/swing/JSeparator;)V
  (Ljavax/swing/JSeparator;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicToolBarUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicToolBarUI.eea
index eb7c2e55d4..43c55a6481 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicToolBarUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicToolBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicToolBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 constraintBeforeFloating
  Ljava/lang/String;
@@ -55,34 +55,34 @@ canDock
  (Ljava/awt/Component;Ljava/awt/Point;)Z
 createDockingListener
  ()Ljavax/swing/event/MouseInputListener;
- ()Ljavax/swing/event/MouseInputListener;
+ ()L1javax/swing/event/MouseInputListener;
 createDragWindow
  (Ljavax/swing/JToolBar;)Ljavax/swing/plaf/basic/BasicToolBarUI$DragWindow;
- (Ljavax/swing/JToolBar;)Ljavax/swing/plaf/basic/BasicToolBarUI$DragWindow;
+ (Ljavax/swing/JToolBar;)L1javax/swing/plaf/basic/BasicToolBarUI$DragWindow;
 createFloatingFrame
  (Ljavax/swing/JToolBar;)Ljavax/swing/JFrame;
- (Ljavax/swing/JToolBar;)Ljavax/swing/JFrame;
+ (Ljavax/swing/JToolBar;)L1javax/swing/JFrame;
 createFloatingWindow
  (Ljavax/swing/JToolBar;)Ljavax/swing/RootPaneContainer;
- (Ljavax/swing/JToolBar;)Ljavax/swing/RootPaneContainer;
+ (Ljavax/swing/JToolBar;)L1javax/swing/RootPaneContainer;
 createFrameListener
  ()Ljava/awt/event/WindowListener;
- ()Ljava/awt/event/WindowListener;
+ ()L1java/awt/event/WindowListener;
 createNonRolloverBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createPropertyListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createRolloverBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createToolBarContListener
  ()Ljava/awt/event/ContainerListener;
- ()Ljava/awt/event/ContainerListener;
+ ()L1java/awt/event/ContainerListener;
 createToolBarFocusListener
  ()Ljava/awt/event/FocusListener;
- ()Ljava/awt/event/FocusListener;
+ ()L1java/awt/event/FocusListener;
 dragTo
  (Ljava/awt/Point;Ljava/awt/Point;)V
  (Ljava/awt/Point;Ljava/awt/Point;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicToolTipUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicToolTipUI.eea
index 096fc33316..cf5eab2cf0 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicToolTipUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicToolTipUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicToolTipUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
@@ -12,7 +12,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installDefaults
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.eea
index 26ac4d5e03..e0ad91758e 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.eea
@@ -18,4 +18,4 @@ componentMoved
  (L1java/awt/event/ComponentEvent;)V # @Inherited(java.awt.event.ComponentAdapter)
 getScrollPane
  ()Ljavax/swing/JScrollPane;
- ()Ljavax/swing/JScrollPane;
+ ()L0javax/swing/JScrollPane;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.eea
index cefe0eb340..9158381754 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.eea
@@ -5,4 +5,4 @@ class javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler
  (Ljavax/swing/plaf/basic/BasicTreeUI;)V
 getNodeDimensions
  (Ljava/lang/Object;IIZLjava/awt/Rectangle;)Ljava/awt/Rectangle;
- (Ljava/lang/Object;IIZLjava/awt/Rectangle;)Ljava/awt/Rectangle;
+ (Ljava/lang/Object;IIZLjava/awt/Rectangle;)L0java/awt/Rectangle;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTreeUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTreeUI.eea
index 2cf437ab21..a845f99e54 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTreeUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicTreeUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicTreeUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 cellEditor
  Ljavax/swing/tree/TreeCellEditor;
@@ -58,49 +58,49 @@ checkForClickInExpandControl
  (Ljavax/swing/tree/TreePath;II)V
 createCellEditorListener
  ()Ljavax/swing/event/CellEditorListener;
- ()Ljavax/swing/event/CellEditorListener;
+ ()L1javax/swing/event/CellEditorListener;
 createCellRendererPane
  ()Ljavax/swing/CellRendererPane;
- ()Ljavax/swing/CellRendererPane;
+ ()L1javax/swing/CellRendererPane;
 createComponentListener
  ()Ljava/awt/event/ComponentListener;
- ()Ljava/awt/event/ComponentListener;
+ ()L1java/awt/event/ComponentListener;
 createDefaultCellEditor
  ()Ljavax/swing/tree/TreeCellEditor;
- ()Ljavax/swing/tree/TreeCellEditor;
+ ()L1javax/swing/tree/TreeCellEditor;
 createDefaultCellRenderer
  ()Ljavax/swing/tree/TreeCellRenderer;
- ()Ljavax/swing/tree/TreeCellRenderer;
+ ()L1javax/swing/tree/TreeCellRenderer;
 createFocusListener
  ()Ljava/awt/event/FocusListener;
- ()Ljava/awt/event/FocusListener;
+ ()L1java/awt/event/FocusListener;
 createKeyListener
  ()Ljava/awt/event/KeyListener;
- ()Ljava/awt/event/KeyListener;
+ ()L1java/awt/event/KeyListener;
 createLayoutCache
  ()Ljavax/swing/tree/AbstractLayoutCache;
- ()Ljavax/swing/tree/AbstractLayoutCache;
+ ()L1javax/swing/tree/AbstractLayoutCache;
 createMouseListener
  ()Ljava/awt/event/MouseListener;
- ()Ljava/awt/event/MouseListener;
+ ()L1java/awt/event/MouseListener;
 createNodeDimensions
  ()Ljavax/swing/tree/AbstractLayoutCache$NodeDimensions;
- ()Ljavax/swing/tree/AbstractLayoutCache$NodeDimensions;
+ ()L1javax/swing/tree/AbstractLayoutCache$NodeDimensions;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createSelectionModelPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createTreeExpansionListener
  ()Ljavax/swing/event/TreeExpansionListener;
- ()Ljavax/swing/event/TreeExpansionListener;
+ ()L1javax/swing/event/TreeExpansionListener;
 createTreeModelListener
  ()Ljavax/swing/event/TreeModelListener;
- ()Ljavax/swing/event/TreeModelListener;
+ ()L1javax/swing/event/TreeModelListener;
 createTreeSelectionListener
  ()Ljavax/swing/event/TreeSelectionListener;
- ()Ljavax/swing/event/TreeSelectionListener;
+ ()L1javax/swing/event/TreeSelectionListener;
 drawCentered
  (Ljava/awt/Component;Ljava/awt/Graphics;Ljavax/swing/Icon;II)V
  (Ljava/awt/Component;Ljava/awt/Graphics;Ljavax/swing/Icon;II)V
@@ -118,13 +118,13 @@ getBaselineResizeBehavior
  (Ljavax/swing/JComponent;)Ljava/awt/Component$BaselineResizeBehavior;
 getCellEditor
  ()Ljavax/swing/tree/TreeCellEditor;
- ()Ljavax/swing/tree/TreeCellEditor;
+ ()L0javax/swing/tree/TreeCellEditor;
 getCellRenderer
  ()Ljavax/swing/tree/TreeCellRenderer;
  ()Ljavax/swing/tree/TreeCellRenderer;
 getClosestPathForLocation
  (Ljavax/swing/JTree;II)Ljavax/swing/tree/TreePath;
- (Ljavax/swing/JTree;II)Ljavax/swing/tree/TreePath;
+ (Ljavax/swing/JTree;II)L0javax/swing/tree/TreePath;
 getCollapsedIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
@@ -142,7 +142,7 @@ getHashColor
  ()Ljava/awt/Color;
 getLastChildPath
  (Ljavax/swing/tree/TreePath;)Ljavax/swing/tree/TreePath;
- (Ljavax/swing/tree/TreePath;)Ljavax/swing/tree/TreePath;
+ (Ljavax/swing/tree/TreePath;)L0javax/swing/tree/TreePath;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
@@ -154,16 +154,16 @@ getModel
  ()Ljavax/swing/tree/TreeModel;
 getPathBounds
  (Ljavax/swing/JTree;Ljavax/swing/tree/TreePath;)Ljava/awt/Rectangle;
- (Ljavax/swing/JTree;Ljavax/swing/tree/TreePath;)Ljava/awt/Rectangle;
+ (Ljavax/swing/JTree;Ljavax/swing/tree/TreePath;)L0java/awt/Rectangle;
 getPathForRow
  (Ljavax/swing/JTree;I)Ljavax/swing/tree/TreePath;
- (Ljavax/swing/JTree;I)Ljavax/swing/tree/TreePath;
+ (Ljavax/swing/JTree;I)L0javax/swing/tree/TreePath;
 getPreferredMinSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L0java/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getPreferredSize
  (Ljavax/swing/JComponent;Z)Ljava/awt/Dimension;
  (Ljavax/swing/JComponent;Z)Ljava/awt/Dimension;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicViewportUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicViewportUI.eea
index 13aed978c2..f34f32f064 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicViewportUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/basic/BasicViewportUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicViewportUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 installDefaults
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/DefaultMetalTheme.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/DefaultMetalTheme.eea
index 8d887da924..7b1faac3f5 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/DefaultMetalTheme.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/DefaultMetalTheme.eea
@@ -8,7 +8,7 @@ getMenuTextFont
  ()Ljavax/swing/plaf/FontUIResource;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getPrimary1
  ()Ljavax/swing/plaf/ColorUIResource;
  ()Ljavax/swing/plaf/ColorUIResource;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalButtonUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalButtonUI.eea
index 7c8ac6fa05..8f4bece189 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalButtonUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalButtonUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 disabledTextColor
  Ljava/awt/Color;
@@ -16,7 +16,7 @@ selectColor
 
 createButtonListener
  (Ljavax/swing/AbstractButton;)Ljavax/swing/plaf/basic/BasicButtonListener;
- (Ljavax/swing/AbstractButton;)Ljavax/swing/plaf/basic/BasicButtonListener;
+ (Ljavax/swing/AbstractButton;)L1javax/swing/plaf/basic/BasicButtonListener; # @Inherited(javax.swing.plaf.basic.BasicButtonUI)
 getDisabledTextColor
  ()Ljava/awt/Color;
  ()Ljava/awt/Color;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalCheckBoxUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalCheckBoxUI.eea
index b324cd3e8b..2888a1d7aa 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalCheckBoxUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalCheckBoxUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/metal/MetalCheckBoxUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicRadioButtonUI)
 installDefaults
  (Ljavax/swing/AbstractButton;)V
  (Ljavax/swing/AbstractButton;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalComboBoxButton.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalComboBoxButton.eea
index e2dcd29b1c..a8b7d40d60 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalComboBoxButton.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalComboBoxButton.eea
@@ -27,7 +27,7 @@ getComboIcon
  ()Ljavax/swing/Icon;
 getMinimumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 paintComponent
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalComboBoxUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalComboBoxUI.eea
index 751bcd2578..39551827b1 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalComboBoxUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalComboBoxUI.eea
@@ -2,23 +2,23 @@ class javax/swing/plaf/metal/MetalComboBoxUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createArrowButton
  ()Ljavax/swing/JButton;
- ()Ljavax/swing/JButton;
+ ()L1javax/swing/JButton; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 createEditor
  ()Ljavax/swing/ComboBoxEditor;
- ()Ljavax/swing/ComboBoxEditor;
+ ()L1javax/swing/ComboBoxEditor; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 createLayoutManager
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 createPopup
  ()Ljavax/swing/plaf/basic/ComboPopup;
- ()Ljavax/swing/plaf/basic/ComboPopup;
+ ()L1javax/swing/plaf/basic/ComboPopup; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 editablePropertyChanged
  (Ljava/beans/PropertyChangeEvent;)V
  (Ljava/beans/PropertyChangeEvent;)V
@@ -27,7 +27,7 @@ getBaseline
  (Ljavax/swing/JComponent;II)I
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 layoutComboBox
  (Ljava/awt/Container;Ljavax/swing/plaf/metal/MetalComboBoxUI$MetalComboBoxLayoutManager;)V
  (Ljava/awt/Container;Ljavax/swing/plaf/metal/MetalComboBoxUI$MetalComboBoxLayoutManager;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalDesktopIconUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalDesktopIconUI.eea
index 2646c213da..90e5044900 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalDesktopIconUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalDesktopIconUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/metal/MetalDesktopIconUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicDesktopIconUI)
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicDesktopIconUI)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.eea
index 65baf419f3..9afc97ed24 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.eea
@@ -16,7 +16,7 @@ filters
  (Ljavax/swing/plaf/metal/MetalFileChooserUI;)V
 getElementAt
  (I)Ljava/lang/Object;
- (I)Ljava/lang/Object;
+ (I)L0java/lang/Object;
 getSelectedItem
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalFileChooserUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalFileChooserUI.eea
index 987871bbad..2a5f7831d9 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalFileChooserUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalFileChooserUI.eea
@@ -2,35 +2,35 @@ class javax/swing/plaf/metal/MetalFileChooserUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 <init>
  (Ljavax/swing/JFileChooser;)V
  (Ljavax/swing/JFileChooser;)V
 createActionMap
  ()Ljavax/swing/ActionMap;
- ()Ljavax/swing/ActionMap;
+ ()L1javax/swing/ActionMap;
 createDetailsView
  (Ljavax/swing/JFileChooser;)Ljavax/swing/JPanel;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/JPanel;
+ (Ljavax/swing/JFileChooser;)L1javax/swing/JPanel;
 createDirectoryComboBoxModel
  (Ljavax/swing/JFileChooser;)Ljavax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxModel;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxModel;
+ (Ljavax/swing/JFileChooser;)L1javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxModel;
 createFilterComboBoxModel
  ()Ljavax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel;
- ()Ljavax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel;
+ ()L1javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel;
 createFilterComboBoxRenderer
  ()Ljavax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxRenderer;
- ()Ljavax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxRenderer;
+ ()L1javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxRenderer;
 createList
  (Ljavax/swing/JFileChooser;)Ljavax/swing/JPanel;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/JPanel;
+ (Ljavax/swing/JFileChooser;)L1javax/swing/JPanel;
 createListSelectionListener
  (Ljavax/swing/JFileChooser;)Ljavax/swing/event/ListSelectionListener;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/event/ListSelectionListener;
+ (Ljavax/swing/JFileChooser;)L1javax/swing/event/ListSelectionListener; # @Inherited(javax.swing.plaf.basic.BasicFileChooserUI)
 createPropertyChangeListener
  (Ljavax/swing/JFileChooser;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JFileChooser;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JFileChooser;)L1java/beans/PropertyChangeListener; # @Overrides(javax.swing.plaf.basic.BasicFileChooserUI)
 ensureFileIsVisible
  (Ljavax/swing/JFileChooser;Ljava/io/File;)V
  (Ljavax/swing/JFileChooser;Ljava/io/File;)V
@@ -39,7 +39,7 @@ getActionMap
  ()Ljavax/swing/ActionMap;
 getApproveButton
  (Ljavax/swing/JFileChooser;)Ljavax/swing/JButton;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/JButton;
+ (Ljavax/swing/JFileChooser;)L0javax/swing/JButton; # @Inherited(javax.swing.plaf.basic.BasicFileChooserUI)
 getBottomPanel
  ()Ljavax/swing/JPanel;
  ()Ljavax/swing/JPanel;
@@ -48,19 +48,19 @@ getButtonPanel
  ()Ljavax/swing/JPanel;
 getDirectoryName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicFileChooserUI)
 getFileName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicFileChooserUI)
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installComponents
  (Ljavax/swing/JFileChooser;)V
  (Ljavax/swing/JFileChooser;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalIconFactory.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalIconFactory.eea
index 97f52da3ea..12d847f9d6 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalIconFactory.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalIconFactory.eea
@@ -26,19 +26,19 @@ getHorizontalSliderThumbIcon
  ()Ljavax/swing/Icon;
 getInternalFrameAltMaximizeIcon
  (I)Ljavax/swing/Icon;
- (I)Ljavax/swing/Icon;
+ (I)L1javax/swing/Icon;
 getInternalFrameCloseIcon
  (I)Ljavax/swing/Icon;
- (I)Ljavax/swing/Icon;
+ (I)L1javax/swing/Icon;
 getInternalFrameDefaultMenuIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
 getInternalFrameMaximizeIcon
  (I)Ljavax/swing/Icon;
- (I)Ljavax/swing/Icon;
+ (I)L1javax/swing/Icon;
 getInternalFrameMinimizeIcon
  (I)Ljavax/swing/Icon;
- (I)Ljavax/swing/Icon;
+ (I)L1javax/swing/Icon;
 getMenuArrowIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
@@ -47,7 +47,7 @@ getMenuItemArrowIcon
  ()Ljavax/swing/Icon;
 getMenuItemCheckIcon
  ()Ljavax/swing/Icon;
- ()Ljavax/swing/Icon;
+ ()L0javax/swing/Icon;
 getRadioButtonIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
@@ -59,19 +59,19 @@ getTreeComputerIcon
  ()Ljavax/swing/Icon;
 getTreeControlIcon
  (Z)Ljavax/swing/Icon;
- (Z)Ljavax/swing/Icon;
+ (Z)L1javax/swing/Icon;
 getTreeFloppyDriveIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
 getTreeFolderIcon
  ()Ljavax/swing/Icon;
- ()Ljavax/swing/Icon;
+ ()L1javax/swing/Icon;
 getTreeHardDriveIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
 getTreeLeafIcon
  ()Ljavax/swing/Icon;
- ()Ljavax/swing/Icon;
+ ()L1javax/swing/Icon;
 getVerticalSliderThumbIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalInternalFrameTitlePane.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalInternalFrameTitlePane.eea
index 9c49a7ab43..6168ec50e6 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalInternalFrameTitlePane.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalInternalFrameTitlePane.eea
@@ -12,10 +12,10 @@ addSystemMenuItems
  (Ljavax/swing/JMenu;)V
 createLayout
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager; # @Inherited(javax.swing.plaf.basic.BasicInternalFrameTitlePane)
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener; # @Inherited(javax.swing.plaf.basic.BasicInternalFrameTitlePane)
 paintComponent
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalInternalFrameUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalInternalFrameUI.eea
index fd85399a99..71d6d9970b 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalInternalFrameUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalInternalFrameUI.eea
@@ -6,17 +6,17 @@ IS_PALETTE
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 <init>
  (Ljavax/swing/JInternalFrame;)V
  (Ljavax/swing/JInternalFrame;)V
 createBorderListener
  (Ljavax/swing/JInternalFrame;)Ljavax/swing/event/MouseInputAdapter;
- (Ljavax/swing/JInternalFrame;)Ljavax/swing/event/MouseInputAdapter;
+ (Ljavax/swing/JInternalFrame;)L1javax/swing/event/MouseInputAdapter; # @Inherited(javax.swing.plaf.basic.BasicInternalFrameUI)
 createNorthPane
  (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
- (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
+ (Ljavax/swing/JInternalFrame;)L1javax/swing/JComponent; # @Inherited(javax.swing.plaf.basic.BasicInternalFrameUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalLabelUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalLabelUI.eea
index 9db9a15dd3..edd54f07dd 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalLabelUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalLabelUI.eea
@@ -6,7 +6,7 @@ metalLabelUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 paintDisabledText
  (Ljavax/swing/JLabel;Ljava/awt/Graphics;Ljava/lang/String;II)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalLookAndFeel.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalLookAndFeel.eea
index 63042babfc..078de14fdf 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalLookAndFeel.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalLookAndFeel.eea
@@ -35,7 +35,7 @@ getControlTextFont
  ()Ljavax/swing/plaf/FontUIResource;
 getCurrentTheme
  ()Ljavax/swing/plaf/metal/MetalTheme;
- ()Ljavax/swing/plaf/metal/MetalTheme;
+ ()L1javax/swing/plaf/metal/MetalTheme;
 getDesktopColor
  ()Ljavax/swing/plaf/ColorUIResource;
  ()Ljavax/swing/plaf/ColorUIResource;
@@ -135,25 +135,25 @@ setCurrentTheme
 
 getDefaults
  ()Ljavax/swing/UIDefaults;
- ()Ljavax/swing/UIDefaults;
+ ()L0javax/swing/UIDefaults; # @Inherited(javax.swing.plaf.basic.BasicLookAndFeel)
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getDisabledIcon
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
- (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
+ (Ljavax/swing/JComponent;Ljavax/swing/Icon;)L0javax/swing/Icon; # @Inherited(javax.swing.LookAndFeel)
 getDisabledSelectedIcon
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
 getID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getLayoutStyle
  ()Ljavax/swing/LayoutStyle;
  ()Ljavax/swing/LayoutStyle;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 initClassDefaults
  (Ljavax/swing/UIDefaults;)V
  (Ljavax/swing/UIDefaults;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalMenuBarUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalMenuBarUI.eea
index 6662f30197..e430ec3daf 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalMenuBarUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalMenuBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalMenuBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 installUI
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.eea
index 48ddd1cf73..0549ca0411 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/metal/MetalPopupMenuSeparatorUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.metal.MetalSeparatorUI)
 paint
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalProgressBarUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalProgressBarUI.eea
index 07cd53085f..2ce6cc3464 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalProgressBarUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalProgressBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalProgressBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 paintDeterminate
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalRadioButtonUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalRadioButtonUI.eea
index 8ae61adab9..b20a88505d 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalRadioButtonUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalRadioButtonUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalRadioButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 disabledTextColor
  Ljava/awt/Color;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalRootPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalRootPaneUI.eea
index c5cceaf996..2d4b1b58a9 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalRootPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalRootPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalRootPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 installUI
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalScrollBarUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalScrollBarUI.eea
index 217a8c66a0..920f41cd51 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalScrollBarUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalScrollBarUI.eea
@@ -6,7 +6,7 @@ FREE_STANDING_PROP
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 decreaseButton
  Ljavax/swing/plaf/metal/MetalScrollButton;
@@ -17,19 +17,19 @@ increaseButton
 
 createDecreaseButton
  (I)Ljavax/swing/JButton;
- (I)Ljavax/swing/JButton;
+ (I)L1javax/swing/JButton; # @Inherited(javax.swing.plaf.basic.BasicScrollBarUI)
 createIncreaseButton
  (I)Ljavax/swing/JButton;
- (I)Ljavax/swing/JButton;
+ (I)L1javax/swing/JButton; # @Inherited(javax.swing.plaf.basic.BasicScrollBarUI)
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener; # @Inherited(javax.swing.plaf.basic.BasicScrollBarUI)
 getMinimumThumbSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicScrollBarUI)
 paintThumb
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;Ljava/awt/Rectangle;)V
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;Ljava/awt/Rectangle;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalScrollButton.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalScrollButton.eea
index fc6d212975..51cc224969 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalScrollButton.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalScrollButton.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalScrollButton
 
 getMaximumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicArrowButton)
 getMinimumSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalScrollPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalScrollPaneUI.eea
index 36379a64be..29647c61b7 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalScrollPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalScrollPaneUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/metal/MetalScrollPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createScrollBarSwapListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 installListeners
  (Ljavax/swing/JScrollPane;)V
  (Ljavax/swing/JScrollPane;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalSeparatorUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalSeparatorUI.eea
index e0a86cc148..66a9bb6b31 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalSeparatorUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalSeparatorUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/metal/MetalSeparatorUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicSeparatorUI)
 installDefaults
  (Ljavax/swing/JSeparator;)V
  (Ljavax/swing/JSeparator;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalSliderUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalSliderUI.eea
index bb7464ad18..821a4421b7 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalSliderUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalSliderUI.eea
@@ -18,7 +18,7 @@ vertThumbIcon
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 SLIDER_FILL
  Ljava/lang/String;
@@ -26,10 +26,10 @@ SLIDER_FILL
 
 createPropertyChangeListener
  (Ljavax/swing/JSlider;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JSlider;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JSlider;)L1java/beans/PropertyChangeListener; # @Inherited(javax.swing.plaf.basic.BasicSliderUI)
 getThumbSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicSliderUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalSplitPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalSplitPaneUI.eea
index 4f3b06b28a..7b62877d09 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalSplitPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalSplitPaneUI.eea
@@ -2,8 +2,8 @@ class javax/swing/plaf/metal/MetalSplitPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createDefaultDivider
  ()Ljavax/swing/plaf/basic/BasicSplitPaneDivider;
- ()Ljavax/swing/plaf/basic/BasicSplitPaneDivider;
+ ()L1javax/swing/plaf/basic/BasicSplitPaneDivider; # @Inherited(javax.swing.plaf.basic.BasicSplitPaneUI)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalTabbedPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalTabbedPaneUI.eea
index aa4a11899d..021cb05aab 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalTabbedPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalTabbedPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalTabbedPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 selectColor
  Ljava/awt/Color;
@@ -16,7 +16,7 @@ tabAreaBackground
 
 createLayoutManager
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager; # @Inherited(javax.swing.plaf.basic.BasicTabbedPaneUI)
 getColorForGap
  (III)Ljava/awt/Color;
  (III)Ljava/awt/Color;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalTextFieldUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalTextFieldUI.eea
index c6667e587c..d820bf7970 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalTextFieldUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalTextFieldUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalTextFieldUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 propertyChange
  (Ljava/beans/PropertyChangeEvent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalToggleButtonUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalToggleButtonUI.eea
index 0fc321c9f8..f05d29c1a1 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalToggleButtonUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalToggleButtonUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalToggleButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 disabledTextColor
  Ljava/awt/Color;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalToolBarUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalToolBarUI.eea
index 50e6469634..6a1771247a 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalToolBarUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalToolBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalToolBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 contListener
  Ljava/awt/event/ContainerListener;
@@ -13,19 +13,19 @@ rolloverListener
 
 createContainerListener
  ()Ljava/awt/event/ContainerListener;
- ()Ljava/awt/event/ContainerListener;
+ ()L0java/awt/event/ContainerListener;
 createDockingListener
  ()Ljavax/swing/event/MouseInputListener;
- ()Ljavax/swing/event/MouseInputListener;
+ ()L1javax/swing/event/MouseInputListener; # @Inherited(javax.swing.plaf.basic.BasicToolBarUI)
 createNonRolloverBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border; # @Inherited(javax.swing.plaf.basic.BasicToolBarUI)
 createRolloverBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border; # @Inherited(javax.swing.plaf.basic.BasicToolBarUI)
 createRolloverListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L0java/beans/PropertyChangeListener;
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalToolTipUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalToolTipUI.eea
index 4bfbe5f7d1..1519f9002e 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalToolTipUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalToolTipUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/metal/MetalToolTipUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getAcceleratorString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicToolTipUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalTreeUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalTreeUI.eea
index 3abf6f5630..67fce33b1d 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalTreeUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/MetalTreeUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalTreeUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 decodeLineStyle
  (Ljava/lang/Object;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/OceanTheme.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/OceanTheme.eea
index b6461d7fc8..5e35c71969 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/OceanTheme.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/metal/OceanTheme.eea
@@ -20,7 +20,7 @@ getMenuDisabledForeground
  ()Ljavax/swing/plaf/ColorUIResource;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.metal.DefaultMetalTheme)
 getPrimary1
  ()Ljavax/swing/plaf/ColorUIResource;
  ()Ljavax/swing/plaf/ColorUIResource;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiButtonUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiButtonUI.eea
index 8d23cd5b47..4035fc2605 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiButtonUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiButtonUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiColorChooserUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiColorChooserUI.eea
index 12eb56922c..0c91cc49d7 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiColorChooserUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiColorChooserUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiColorChooserUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiComboBoxUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiComboBoxUI.eea
index 9b912cb014..69ed6c3809 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiComboBoxUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiComboBoxUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiComboBoxUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiDesktopIconUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiDesktopIconUI.eea
index eae8c6978f..53cf07f51d 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiDesktopIconUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiDesktopIconUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiDesktopIconUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiDesktopPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiDesktopPaneUI.eea
index cfe93faa41..ab2df60304 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiDesktopPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiDesktopPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiDesktopPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiFileChooserUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiFileChooserUI.eea
index 3b7996dbc3..75dc321e9f 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiFileChooserUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiFileChooserUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiFileChooserUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -40,7 +40,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiInternalFrameUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiInternalFrameUI.eea
index d01883b96c..f179b0e0ce 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiInternalFrameUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiInternalFrameUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiInternalFrameUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiLabelUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiLabelUI.eea
index 3cf7cc4f13..ad4c53c249 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiLabelUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiLabelUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiLabelUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiListUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiListUI.eea
index c68e328dc5..d1a04074d2 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiListUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiListUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiListUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -28,7 +28,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiLookAndFeel.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiLookAndFeel.eea
index a860046de6..0e6a5364ab 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiLookAndFeel.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiLookAndFeel.eea
@@ -2,20 +2,20 @@ class javax/swing/plaf/multi/MultiLookAndFeel
 
 createUIs
  (Ljavax/swing/plaf/ComponentUI;Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/plaf/ComponentUI;Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/plaf/ComponentUI;Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;Ljavax/swing/JComponent;)L0javax/swing/plaf/ComponentUI;
 uisToArray
  (Ljava/util/Vector<+Ljavax/swing/plaf/ComponentUI;>;)[Ljavax/swing/plaf/ComponentUI;
- (Ljava/util/Vector<+Ljavax/swing/plaf/ComponentUI;>;)[Ljavax/swing/plaf/ComponentUI;
+ (Ljava/util/Vector<+Ljavax/swing/plaf/ComponentUI;>;)[0Ljavax/swing/plaf/ComponentUI;
 
 getDefaults
  ()Ljavax/swing/UIDefaults;
- ()Ljavax/swing/UIDefaults;
+ ()L0javax/swing/UIDefaults; # @Inherited(javax.swing.LookAndFeel)
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiMenuBarUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiMenuBarUI.eea
index 8ed26fb170..8858dd6b6d 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiMenuBarUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiMenuBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiMenuBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiMenuItemUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiMenuItemUI.eea
index b878857acb..732ffa8c35 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiMenuItemUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiMenuItemUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiMenuItemUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiOptionPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiOptionPaneUI.eea
index 500f4c5223..5186eefbae 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiOptionPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiOptionPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiOptionPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -28,7 +28,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiPanelUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiPanelUI.eea
index f2922b3030..b1ad12dd78 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiPanelUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiPanelUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiPanelUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiPopupMenuUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiPopupMenuUI.eea
index 52fcd8ceb2..66171dd2af 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiPopupMenuUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiPopupMenuUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiPopupMenuUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -28,7 +28,7 @@ getPopup
  (Ljavax/swing/JPopupMenu;II)Ljavax/swing/Popup;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiProgressBarUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiProgressBarUI.eea
index 99784cbb72..18bbc6caa7 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiProgressBarUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiProgressBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiProgressBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiRootPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiRootPaneUI.eea
index 13853e43b8..c265966556 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiRootPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiRootPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiRootPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiScrollBarUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiScrollBarUI.eea
index 0b5a7aa180..a88e4e09e7 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiScrollBarUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiScrollBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiScrollBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiScrollPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiScrollPaneUI.eea
index e6857dbd9c..e23070ebe2 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiScrollPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiScrollPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiScrollPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiSeparatorUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiSeparatorUI.eea
index 50cd2c102a..ca2676d523 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiSeparatorUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiSeparatorUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiSeparatorUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiSliderUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiSliderUI.eea
index 65d9715206..6a4ccc3cc7 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiSliderUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiSliderUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiSliderUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiSpinnerUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiSpinnerUI.eea
index c512f9a1b8..1391dd9ae8 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiSpinnerUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiSpinnerUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiSpinnerUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiSplitPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiSplitPaneUI.eea
index d742467cc7..b15b72012c 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiSplitPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiSplitPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiSplitPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -37,7 +37,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiTabbedPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiTabbedPaneUI.eea
index e6d36244f8..e17b63906a 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiTabbedPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiTabbedPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiTabbedPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getTabBounds
  (Ljavax/swing/JTabbedPane;I)Ljava/awt/Rectangle;
  (Ljavax/swing/JTabbedPane;I)Ljava/awt/Rectangle;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiTableHeaderUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiTableHeaderUI.eea
index 00d73d248e..55ff7b1d6d 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiTableHeaderUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiTableHeaderUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiTableHeaderUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiTableUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiTableUI.eea
index aeaa395c29..475a20408f 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiTableUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiTableUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiTableUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiTextUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiTextUI.eea
index 9851880229..94d07f605c 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiTextUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiTextUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiTextUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -37,13 +37,13 @@ getNextVisualPositionFrom
  (Ljavax/swing/text/JTextComponent;ILjavax/swing/text/Position$Bias;I[Ljavax/swing/text/Position$Bias;)I
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getRootView
  (Ljavax/swing/text/JTextComponent;)Ljavax/swing/text/View;
  (Ljavax/swing/text/JTextComponent;)Ljavax/swing/text/View;
 getToolTipText
  (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)Ljava/lang/String;
- (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)Ljava/lang/String;
+ (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)L0java/lang/String; # @Inherited(javax.swing.plaf.TextUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiToolBarUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiToolBarUI.eea
index 4aca1c2465..3e8908adc1 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiToolBarUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiToolBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiToolBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiToolTipUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiToolTipUI.eea
index f80290027b..6cb9d80ea6 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiToolTipUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiToolTipUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiToolTipUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiTreeUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiTreeUI.eea
index 126eb5242a..658ebb1213 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiTreeUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiTreeUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiTreeUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -40,7 +40,7 @@ getPathForRow
  (Ljavax/swing/JTree;I)Ljavax/swing/tree/TreePath;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getRowCount
  (Ljavax/swing/JTree;)I
  (Ljavax/swing/JTree;)I
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiViewportUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiViewportUI.eea
index f805494697..41db22b4e6 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiViewportUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/multi/MultiViewportUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiViewportUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/nimbus/AbstractRegionPainter.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/nimbus/AbstractRegionPainter.eea
index 5bf758a0ec..6796d20ea4 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/nimbus/AbstractRegionPainter.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/nimbus/AbstractRegionPainter.eea
@@ -9,16 +9,16 @@ configureGraphics
  (Ljava/awt/Graphics2D;)V
 decodeColor
  (Ljava/awt/Color;Ljava/awt/Color;F)Ljava/awt/Color;
- (Ljava/awt/Color;Ljava/awt/Color;F)Ljava/awt/Color;
+ (Ljava/awt/Color;Ljava/awt/Color;F)L1java/awt/Color;
 decodeColor
  (Ljava/lang/String;FFFI)Ljava/awt/Color;
  (Ljava/lang/String;FFFI)Ljava/awt/Color;
 decodeGradient
  (FFFF[F[Ljava/awt/Color;)Ljava/awt/LinearGradientPaint;
- (FFFF[F[Ljava/awt/Color;)Ljava/awt/LinearGradientPaint;
+ (FFFF[F[Ljava/awt/Color;)L1java/awt/LinearGradientPaint;
 decodeRadialGradient
  (FFF[F[Ljava/awt/Color;)Ljava/awt/RadialGradientPaint;
- (FFF[F[Ljava/awt/Color;)Ljava/awt/RadialGradientPaint;
+ (FFF[F[Ljava/awt/Color;)L1java/awt/RadialGradientPaint;
 doPaint
  (Ljava/awt/Graphics2D;Ljavax/swing/JComponent;II[Ljava/lang/Object;)V
  (Ljava/awt/Graphics2D;Ljavax/swing/JComponent;II[Ljava/lang/Object;)V
@@ -27,7 +27,7 @@ getComponentColor
  (Ljavax/swing/JComponent;Ljava/lang/String;Ljava/awt/Color;FFI)Ljava/awt/Color;
 getExtendedCacheKeys
  (Ljavax/swing/JComponent;)[Ljava/lang/Object;
- (Ljavax/swing/JComponent;)[Ljava/lang/Object;
+ (Ljavax/swing/JComponent;)[0Ljava/lang/Object;
 getPaintContext
  ()Ljavax/swing/plaf/nimbus/AbstractRegionPainter$PaintContext;
  ()Ljavax/swing/plaf/nimbus/AbstractRegionPainter$PaintContext;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/nimbus/Effect$ArrayCache.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/nimbus/Effect$ArrayCache.eea
index ae37bb0a11..a9d4d0b1b7 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/nimbus/Effect$ArrayCache.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/nimbus/Effect$ArrayCache.eea
@@ -2,13 +2,13 @@ class javax/swing/plaf/nimbus/Effect$ArrayCache
 
 getTmpByteArray1
  (I)[B
- (I)[B
+ (I)[1B
 getTmpByteArray2
  (I)[B
- (I)[B
+ (I)[1B
 getTmpByteArray3
  (I)[B
- (I)[B
+ (I)[1B
 getTmpIntArray
  (I)[I
- (I)[I
+ (I)[1I
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/nimbus/NimbusLookAndFeel.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/nimbus/NimbusLookAndFeel.eea
index 73477b1301..62a9362e6b 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/nimbus/NimbusLookAndFeel.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/nimbus/NimbusLookAndFeel.eea
@@ -6,28 +6,28 @@ getStyle
 
 getDefaults
  ()Ljavax/swing/UIDefaults;
- ()Ljavax/swing/UIDefaults;
+ ()L0javax/swing/UIDefaults; # @Inherited(javax.swing.plaf.synth.SynthLookAndFeel)
 getDerivedColor
  (Ljava/awt/Color;Ljava/awt/Color;F)Ljava/awt/Color;
  (Ljava/awt/Color;Ljava/awt/Color;F)Ljava/awt/Color;
 getDerivedColor
  (Ljava/awt/Color;Ljava/awt/Color;FZ)Ljava/awt/Color;
- (Ljava/awt/Color;Ljava/awt/Color;FZ)Ljava/awt/Color;
+ (Ljava/awt/Color;Ljava/awt/Color;FZ)L1java/awt/Color;
 getDerivedColor
  (Ljava/lang/String;FFFIZ)Ljava/awt/Color;
  (Ljava/lang/String;FFFIZ)Ljava/awt/Color;
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.synth.SynthLookAndFeel)
 getDisabledIcon
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
- (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
+ (Ljavax/swing/JComponent;Ljavax/swing/Icon;)L0javax/swing/Icon; # @Inherited(javax.swing.LookAndFeel)
 getID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.synth.SynthLookAndFeel)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.synth.SynthLookAndFeel)
 register
  (Ljavax/swing/plaf/synth/Region;Ljava/lang/String;)V
  (Ljavax/swing/plaf/synth/Region;Ljava/lang/String;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/nimbus/NimbusStyle.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/nimbus/NimbusStyle.eea
index 35a02e7e92..95b97430bd 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/nimbus/NimbusStyle.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/nimbus/NimbusStyle.eea
@@ -33,7 +33,7 @@ getInsets
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Insets;)Ljava/awt/Insets;
 getPainter
  (Ljavax/swing/plaf/synth/SynthContext;)Ljavax/swing/plaf/synth/SynthPainter;
- (Ljavax/swing/plaf/synth/SynthContext;)Ljavax/swing/plaf/synth/SynthPainter;
+ (Ljavax/swing/plaf/synth/SynthContext;)L0javax/swing/plaf/synth/SynthPainter; # @Inherited(javax.swing.plaf.synth.SynthStyle)
 installDefaults
  (Ljavax/swing/plaf/synth/SynthContext;)V
  (Ljavax/swing/plaf/synth/SynthContext;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthButtonUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthButtonUI.eea
index 0f7e619408..79a6ca2246 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthButtonUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthButtonUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getBaseline
  (Ljavax/swing/JComponent;II)I
@@ -18,13 +18,13 @@ getIcon
  (Ljavax/swing/AbstractButton;)Ljavax/swing/Icon;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicButtonUI)
 getSizingIcon
  (Ljavax/swing/AbstractButton;)Ljavax/swing/Icon;
  (Ljavax/swing/AbstractButton;)Ljavax/swing/Icon;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthCheckBoxMenuItemUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthCheckBoxMenuItemUI.eea
index 13863d5a52..5bf11a1ba8 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthCheckBoxMenuItemUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthCheckBoxMenuItemUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthCheckBoxMenuItemUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 paintBorder
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthCheckBoxUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthCheckBoxUI.eea
index 43256ee9da..25d4ab440e 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthCheckBoxUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthCheckBoxUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthCheckBoxUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.synth.SynthRadioButtonUI)
 paintBorder
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthColorChooserUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthColorChooserUI.eea
index 930107c0ea..4d7e504294 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthColorChooserUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthColorChooserUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthColorChooserUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createDefaultChoosers
  ()[Ljavax/swing/colorchooser/AbstractColorChooserPanel;
- ()[Ljavax/swing/colorchooser/AbstractColorChooserPanel;
+ ()[1Ljavax/swing/colorchooser/AbstractColorChooserPanel; # @Inherited(javax.swing.plaf.basic.BasicColorChooserUI)
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthComboBoxUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthComboBoxUI.eea
index 8279acab5e..75a66742cc 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthComboBoxUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthComboBoxUI.eea
@@ -2,20 +2,20 @@ class javax/swing/plaf/synth/SynthComboBoxUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createArrowButton
  ()Ljavax/swing/JButton;
- ()Ljavax/swing/JButton;
+ ()L1javax/swing/JButton; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 createEditor
  ()Ljavax/swing/ComboBoxEditor;
- ()Ljavax/swing/ComboBoxEditor;
+ ()L1javax/swing/ComboBoxEditor; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 createPopup
  ()Ljavax/swing/plaf/basic/ComboPopup;
- ()Ljavax/swing/plaf/basic/ComboPopup;
+ ()L1javax/swing/plaf/basic/ComboPopup; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 createRenderer
  ()Ljavax/swing/ListCellRenderer<Ljava/lang/Object;>;
- ()Ljavax/swing/ListCellRenderer<Ljava/lang/Object;>;
+ ()L1javax/swing/ListCellRenderer<Ljava/lang/Object;>; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthDesktopIconUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthDesktopIconUI.eea
index 3a8c9a94a8..7b74777892 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthDesktopIconUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthDesktopIconUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthDesktopIconUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthDesktopPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthDesktopPaneUI.eea
index f0bb2115c2..4088f732b3 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthDesktopPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthDesktopPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthDesktopPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthEditorPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthEditorPaneUI.eea
index 52d9cb8998..5a2829e0bd 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthEditorPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthEditorPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthEditorPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthFormattedTextFieldUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthFormattedTextFieldUI.eea
index d6cac5c726..8fa27c7c41 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthFormattedTextFieldUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthFormattedTextFieldUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthFormattedTextFieldUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicTextFieldUI)
 paintBorder
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthInternalFrameUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthInternalFrameUI.eea
index 1318315f94..af797619a0 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthInternalFrameUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthInternalFrameUI.eea
@@ -2,17 +2,17 @@ class javax/swing/plaf/synth/SynthInternalFrameUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 <init>
  (Ljavax/swing/JInternalFrame;)V
  (Ljavax/swing/JInternalFrame;)V
 createComponentListener
  ()Ljava/awt/event/ComponentListener;
- ()Ljava/awt/event/ComponentListener;
+ ()L1java/awt/event/ComponentListener; # @Inherited(javax.swing.plaf.basic.BasicInternalFrameUI)
 createNorthPane
  (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
- (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
+ (Ljavax/swing/JInternalFrame;)L1javax/swing/JComponent; # @Inherited(javax.swing.plaf.basic.BasicInternalFrameUI)
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthLabelUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthLabelUI.eea
index 14fc3e07b9..6066056159 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthLabelUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthLabelUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthLabelUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getBaseline
  (Ljavax/swing/JComponent;II)I
@@ -18,7 +18,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicLabelUI)
 installDefaults
  (Ljavax/swing/JLabel;)V
  (Ljavax/swing/JLabel;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthListUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthListUI.eea
index 80e6c8936c..40b6775af8 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthListUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthListUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthListUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthLookAndFeel.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthLookAndFeel.eea
index ccfc63d27a..69f5dee2f7 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthLookAndFeel.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthLookAndFeel.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthLookAndFeel
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L0javax/swing/plaf/ComponentUI;
 getRegion
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/Region;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/Region;
@@ -21,16 +21,16 @@ updateStyles
 
 getDefaults
  ()Ljavax/swing/UIDefaults;
- ()Ljavax/swing/UIDefaults;
+ ()L0javax/swing/UIDefaults; # @Inherited(javax.swing.plaf.basic.BasicLookAndFeel)
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 load
  (Ljava/io/InputStream;Ljava/lang/Class<*>;)V
  (Ljava/io/InputStream;Ljava/lang/Class<*>;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthMenuBarUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthMenuBarUI.eea
index ca810b05eb..611268698e 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthMenuBarUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthMenuBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthMenuBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthMenuItemUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthMenuItemUI.eea
index 3c6e57c8de..37eed0d473 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthMenuItemUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthMenuItemUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthMenuItemUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
 getPreferredMenuItemSize
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 paint
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthMenuUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthMenuUI.eea
index cfe1553f3e..d759b5595d 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthMenuUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthMenuUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthMenuUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
 getPreferredMenuItemSize
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 paint
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthOptionPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthOptionPaneUI.eea
index c595451a2f..b55486707d 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthOptionPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthOptionPaneUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthOptionPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createMessageArea
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L1java/awt/Container; # @Inherited(javax.swing.plaf.basic.BasicOptionPaneUI)
 createSeparator
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L1java/awt/Container; # @Overrides(javax.swing.plaf.basic.BasicOptionPaneUI)
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthPanelUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthPanelUI.eea
index 4f69c52c6e..e08b44736a 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthPanelUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthPanelUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthPanelUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthPasswordFieldUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthPasswordFieldUI.eea
index d6e03cf4d9..121895da30 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthPasswordFieldUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthPasswordFieldUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthPasswordFieldUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 create
  (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
+ (Ljavax/swing/text/Element;)L1javax/swing/text/View; # @Inherited(javax.swing.plaf.basic.BasicTextFieldUI)
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicTextFieldUI)
 paintBorder
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthPopupMenuUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthPopupMenuUI.eea
index 62496d1194..5f0e53dd82 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthPopupMenuUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthPopupMenuUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthPopupMenuUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthProgressBarUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthProgressBarUI.eea
index 0230b78c06..390c441a85 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthProgressBarUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthProgressBarUI.eea
@@ -2,20 +2,20 @@ class javax/swing/plaf/synth/SynthProgressBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
 getBox
  (Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
- (Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
+ (Ljava/awt/Rectangle;)L0java/awt/Rectangle; # @Inherited(javax.swing.plaf.basic.BasicProgressBarUI)
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicProgressBarUI)
 paint
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthRadioButtonMenuItemUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthRadioButtonMenuItemUI.eea
index c52d8f870c..e1e0f42c41 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthRadioButtonMenuItemUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthRadioButtonMenuItemUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthRadioButtonMenuItemUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 paintBorder
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthRadioButtonUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthRadioButtonUI.eea
index f9df39367d..5f90f782fd 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthRadioButtonUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthRadioButtonUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthRadioButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.synth.SynthToggleButtonUI)
 getSizingIcon
  (Ljavax/swing/AbstractButton;)Ljavax/swing/Icon;
  (Ljavax/swing/AbstractButton;)Ljavax/swing/Icon;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthRootPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthRootPaneUI.eea
index 62cceb050f..6d9b0a2429 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthRootPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthRootPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthRootPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthScrollBarUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthScrollBarUI.eea
index 5f087af27a..1e74a8f116 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthScrollBarUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthScrollBarUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthScrollBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createDecreaseButton
  (I)Ljavax/swing/JButton;
- (I)Ljavax/swing/JButton;
+ (I)L1javax/swing/JButton; # @Inherited(javax.swing.plaf.basic.BasicScrollBarUI)
 createIncreaseButton
  (I)Ljavax/swing/JButton;
- (I)Ljavax/swing/JButton;
+ (I)L1javax/swing/JButton; # @Inherited(javax.swing.plaf.basic.BasicScrollBarUI)
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
@@ -18,7 +18,7 @@ getMinimumThumbSize
  ()Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicScrollBarUI)
 paint
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthScrollPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthScrollPaneUI.eea
index 2a803fda26..27598c3111 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthScrollPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthScrollPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthScrollPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthSeparatorUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthSeparatorUI.eea
index 619ac54379..9509575f33 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthSeparatorUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthSeparatorUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthSeparatorUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
@@ -15,7 +15,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installDefaults
  (Ljavax/swing/JSeparator;)V
  (Ljavax/swing/JSeparator;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthSliderUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthSliderUI.eea
index a080130d27..02e35c78c4 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthSliderUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthSliderUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthSliderUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 <init>
  (Ljavax/swing/JSlider;)V
  (Ljavax/swing/JSlider;)V
 createTrackListener
  (Ljavax/swing/JSlider;)Ljavax/swing/plaf/basic/BasicSliderUI$TrackListener;
- (Ljavax/swing/JSlider;)Ljavax/swing/plaf/basic/BasicSliderUI$TrackListener;
+ (Ljavax/swing/JSlider;)L1javax/swing/plaf/basic/BasicSliderUI$TrackListener; # @Inherited(javax.swing.plaf.basic.BasicSliderUI)
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -18,13 +18,13 @@ getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicSliderUI)
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicSliderUI)
 getThumbSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicSliderUI)
 installDefaults
  (Ljavax/swing/JSlider;)V
  (Ljavax/swing/JSlider;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthSpinnerUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthSpinnerUI.eea
index 5113517dc7..270d2398e9 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthSpinnerUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthSpinnerUI.eea
@@ -2,20 +2,20 @@ class javax/swing/plaf/synth/SynthSpinnerUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createEditor
  ()Ljavax/swing/JComponent;
- ()Ljavax/swing/JComponent;
+ ()L1javax/swing/JComponent; # @Inherited(javax.swing.plaf.basic.BasicSpinnerUI)
 createLayout
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager; # @Inherited(javax.swing.plaf.basic.BasicSpinnerUI)
 createNextButton
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component; # @Inherited(javax.swing.plaf.basic.BasicSpinnerUI)
 createPreviousButton
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component; # @Inherited(javax.swing.plaf.basic.BasicSpinnerUI)
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthSplitPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthSplitPaneUI.eea
index c34a0d292d..da18ccd164 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthSplitPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthSplitPaneUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthSplitPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createDefaultDivider
  ()Ljavax/swing/plaf/basic/BasicSplitPaneDivider;
- ()Ljavax/swing/plaf/basic/BasicSplitPaneDivider;
+ ()L1javax/swing/plaf/basic/BasicSplitPaneDivider; # @Inherited(javax.swing.plaf.basic.BasicSplitPaneUI)
 createDefaultNonContinuousLayoutDivider
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component; # @Inherited(javax.swing.plaf.basic.BasicSplitPaneUI)
 finishedPaintingChildren
  (Ljavax/swing/JSplitPane;Ljava/awt/Graphics;)V
  (Ljavax/swing/JSplitPane;Ljava/awt/Graphics;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthStyle.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthStyle.eea
index e5b5ff029b..70108f11bd 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthStyle.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthStyle.eea
@@ -23,7 +23,7 @@ getGraphicsUtils
  (Ljavax/swing/plaf/synth/SynthContext;)Ljavax/swing/plaf/synth/SynthGraphicsUtils;
 getIcon
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/lang/Object;)Ljavax/swing/Icon;
- (Ljavax/swing/plaf/synth/SynthContext;Ljava/lang/Object;)Ljavax/swing/Icon;
+ (Ljavax/swing/plaf/synth/SynthContext;Ljava/lang/Object;)L0javax/swing/Icon;
 getInsets
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Insets;)Ljava/awt/Insets;
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Insets;)Ljava/awt/Insets;
@@ -32,7 +32,7 @@ getInt
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/lang/Object;I)I
 getPainter
  (Ljavax/swing/plaf/synth/SynthContext;)Ljavax/swing/plaf/synth/SynthPainter;
- (Ljavax/swing/plaf/synth/SynthContext;)Ljavax/swing/plaf/synth/SynthPainter;
+ (Ljavax/swing/plaf/synth/SynthContext;)L0javax/swing/plaf/synth/SynthPainter;
 getString
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTabbedPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTabbedPaneUI.eea
index 5dc54ee22b..eabe6bd64f 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTabbedPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTabbedPaneUI.eea
@@ -2,20 +2,20 @@ class javax/swing/plaf/synth/SynthTabbedPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 calculateTabWidth
  (IILjava/awt/FontMetrics;)I
  (IILjava/awt/FontMetrics;)I
 createLayoutManager
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager; # @Inherited(javax.swing.plaf.basic.BasicTabbedPaneUI)
 createMouseListener
  ()Ljava/awt/event/MouseListener;
- ()Ljava/awt/event/MouseListener;
+ ()L1java/awt/event/MouseListener; # @Inherited(javax.swing.plaf.basic.BasicTabbedPaneUI)
 createScrollButton
  (I)Ljavax/swing/JButton;
- (I)Ljavax/swing/JButton;
+ (I)L1javax/swing/JButton; # @Inherited(javax.swing.plaf.basic.BasicTabbedPaneUI)
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTableHeaderUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTableHeaderUI.eea
index 6840d816c7..5e585d20dd 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTableHeaderUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTableHeaderUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthTableHeaderUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTableUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTableUI.eea
index ca494b36c2..1bb650ca25 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTableUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTableUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthTableUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTextAreaUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTextAreaUI.eea
index d8346d2f40..2460f80cae 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTextAreaUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTextAreaUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthTextAreaUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTextFieldUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTextFieldUI.eea
index 58d46559d2..0e2f00d0be 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTextFieldUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTextFieldUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthTextFieldUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTextPaneUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTextPaneUI.eea
index 8b7beca1fe..57799bc37d 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTextPaneUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTextPaneUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthTextPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicEditorPaneUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthToggleButtonUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthToggleButtonUI.eea
index 99b78f0cba..0257d7026d 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthToggleButtonUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthToggleButtonUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthToggleButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicButtonUI)
 paintBorder
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthToolBarUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthToolBarUI.eea
index 6691c6c46e..06b6831bee 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthToolBarUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthToolBarUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthToolBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createLayout
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthToolTipUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthToolTipUI.eea
index e7810ec558..d219541e31 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthToolTipUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthToolTipUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthToolTipUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicToolTipUI)
 installDefaults
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTreeUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTreeUI.eea
index e87eb4d148..2e8ae95c94 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTreeUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthTreeUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthTreeUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createDefaultCellEditor
  ()Ljavax/swing/tree/TreeCellEditor;
- ()Ljavax/swing/tree/TreeCellEditor;
+ ()L1javax/swing/tree/TreeCellEditor; # @Inherited(javax.swing.plaf.basic.BasicTreeUI)
 createDefaultCellRenderer
  ()Ljavax/swing/tree/TreeCellRenderer;
- ()Ljavax/swing/tree/TreeCellRenderer;
+ ()L1javax/swing/tree/TreeCellRenderer; # @Inherited(javax.swing.plaf.basic.BasicTreeUI)
 drawCentered
  (Ljava/awt/Component;Ljava/awt/Graphics;Ljavax/swing/Icon;II)V
  (Ljava/awt/Component;Ljava/awt/Graphics;Ljavax/swing/Icon;II)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthViewportUI.eea b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthViewportUI.eea
index b0a3eddfb4..2913e58d5d 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthViewportUI.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/plaf/synth/SynthViewportUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthViewportUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/table/AbstractTableModel.eea b/libs/eea-java-11/src/main/resources/javax/swing/table/AbstractTableModel.eea
index 7626800919..89d6a7f2a7 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/table/AbstractTableModel.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/table/AbstractTableModel.eea
@@ -15,10 +15,10 @@ fireTableChanged
  (Ljavax/swing/event/TableModelEvent;)V
 getColumnClass
  (I)Ljava/lang/Class<*>;
- (I)Ljava/lang/Class<*>;
+ (I)L1java/lang/Class<*>;
 getColumnName
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/table/DefaultTableColumnModel.eea b/libs/eea-java-11/src/main/resources/javax/swing/table/DefaultTableColumnModel.eea
index b3c6bc0d56..1f30be1e03 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/table/DefaultTableColumnModel.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/table/DefaultTableColumnModel.eea
@@ -21,7 +21,7 @@ addColumnModelListener
  (L1javax/swing/event/TableColumnModelListener;)V # @Inherited(javax.swing.table.TableColumnModel)
 createSelectionModel
  ()Ljavax/swing/ListSelectionModel;
- ()Ljavax/swing/ListSelectionModel;
+ ()L1javax/swing/ListSelectionModel;
 fireColumnAdded
  (Ljavax/swing/event/TableColumnModelEvent;)V
  (Ljavax/swing/event/TableColumnModelEvent;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/table/DefaultTableModel.eea b/libs/eea-java-11/src/main/resources/javax/swing/table/DefaultTableModel.eea
index 673a511d28..ebf8d1cc4d 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/table/DefaultTableModel.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/table/DefaultTableModel.eea
@@ -43,7 +43,7 @@ addRow
  ([Ljava/lang/Object;)V
 getColumnName
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String; # @Inherited(javax.swing.table.AbstractTableModel)
 getDataVector
  ()Ljava/util/Vector<Ljava/util/Vector;>;
  ()Ljava/util/Vector<Ljava/util/Vector;>;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/table/JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry.eea b/libs/eea-java-11/src/main/resources/javax/swing/table/JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry.eea
index 153db759a4..f28fafa531 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/table/JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/table/JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry.eea
@@ -14,16 +14,16 @@ contains
  (Ljava/awt/Point;)Z
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -38,43 +38,43 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getBounds
  ()Ljava/awt/Rectangle;
  ()Ljava/awt/Rectangle;
 getCursor
  ()Ljava/awt/Cursor;
- ()Ljava/awt/Cursor;
+ ()L0java/awt/Cursor;
 getFont
  ()Ljava/awt/Font;
- ()Ljava/awt/Font;
+ ()L0java/awt/Font;
 getFontMetrics
  (Ljava/awt/Font;)Ljava/awt/FontMetrics;
- (Ljava/awt/Font;)Ljava/awt/FontMetrics;
+ (Ljava/awt/Font;)L0java/awt/FontMetrics;
 getForeground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getLocale
  ()Ljava/util/Locale;
- ()Ljava/util/Locale;
+ ()L0java/util/Locale;
 getLocation
  ()Ljava/awt/Point;
  ()Ljava/awt/Point;
 getLocationOnScreen
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/table/JTableHeader$AccessibleJTableHeader.eea b/libs/eea-java-11/src/main/resources/javax/swing/table/JTableHeader$AccessibleJTableHeader.eea
index 6b83f5f593..39fd58d35d 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/table/JTableHeader$AccessibleJTableHeader.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/table/JTableHeader$AccessibleJTableHeader.eea
@@ -5,10 +5,10 @@ class javax/swing/table/JTableHeader$AccessibleJTableHeader
  (Ljavax/swing/table/JTableHeader;)V
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Container$AccessibleAWTContainer)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/table/JTableHeader.eea b/libs/eea-java-11/src/main/resources/javax/swing/table/JTableHeader.eea
index 00faccaad7..7f835c55c0 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/table/JTableHeader.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/table/JTableHeader.eea
@@ -36,10 +36,10 @@ columnSelectionChanged
  (L1javax/swing/event/ListSelectionEvent;)V # @Inherited(javax.swing.event.TableColumnModelListener)
 createDefaultColumnModel
  ()Ljavax/swing/table/TableColumnModel;
- ()Ljavax/swing/table/TableColumnModel;
+ ()L1javax/swing/table/TableColumnModel;
 createDefaultRenderer
  ()Ljavax/swing/table/TableCellRenderer;
- ()Ljavax/swing/table/TableCellRenderer;
+ ()L1javax/swing/table/TableCellRenderer;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -54,7 +54,7 @@ getDraggedColumn
  ()Ljavax/swing/table/TableColumn;
 getHeaderRect
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L1java/awt/Rectangle;
 getPreferredSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
@@ -72,10 +72,10 @@ getUI
  ()Ljavax/swing/plaf/TableHeaderUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setColumnModel
  (Ljavax/swing/table/TableColumnModel;)V
  (Ljavax/swing/table/TableColumnModel;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/table/TableColumn.eea b/libs/eea-java-11/src/main/resources/javax/swing/table/TableColumn.eea
index d039b4490b..7babb780b0 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/table/TableColumn.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/table/TableColumn.eea
@@ -37,7 +37,7 @@ addPropertyChangeListener
  (L1java/beans/PropertyChangeListener;)V
 createDefaultHeaderRenderer
  ()Ljavax/swing/table/TableCellRenderer;
- ()Ljavax/swing/table/TableCellRenderer;
+ ()L1javax/swing/table/TableCellRenderer;
 getCellEditor
  ()Ljavax/swing/table/TableCellEditor;
  ()Ljavax/swing/table/TableCellEditor;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/table/TableRowSorter.eea b/libs/eea-java-11/src/main/resources/javax/swing/table/TableRowSorter.eea
index d1ba4ed4f9..d54722b725 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/table/TableRowSorter.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/table/TableRowSorter.eea
@@ -11,7 +11,7 @@ super javax/swing/DefaultRowSorter
  (TM;)V
 getComparator
  (I)Ljava/util/Comparator<*>;
- (I)Ljava/util/Comparator<*>;
+ (I)L0java/util/Comparator<*>; # @Inherited(javax.swing.DefaultRowSorter)
 getStringConverter
  ()Ljavax/swing/table/TableStringConverter;
  ()Ljavax/swing/table/TableStringConverter;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/AbstractDocument$AbstractElement.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/AbstractDocument$AbstractElement.eea
index 37267eff50..523a8b7a1f 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/AbstractDocument$AbstractElement.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/AbstractDocument$AbstractElement.eea
@@ -47,7 +47,7 @@ getIndex
  (L1javax/swing/tree/TreeNode;)I # @Inherited(javax.swing.tree.TreeNode)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getParent
  ()Ljavax/swing/tree/TreeNode;
  ()Ljavax/swing/tree/TreeNode;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/AbstractDocument$BranchElement.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/AbstractDocument$BranchElement.eea
index ec0937d6ab..c4ec8a3fd6 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/AbstractDocument$BranchElement.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/AbstractDocument$BranchElement.eea
@@ -5,16 +5,16 @@ class javax/swing/text/AbstractDocument$BranchElement
  (Ljavax/swing/text/AbstractDocument;Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;)V
 children
  ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
- ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
+ ()L0java/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
 getElement
  (I)Ljavax/swing/text/Element;
- (I)Ljavax/swing/text/Element;
+ (I)L0javax/swing/text/Element;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(javax.swing.text.AbstractDocument$AbstractElement)
 positionToElement
  (I)Ljavax/swing/text/Element;
- (I)Ljavax/swing/text/Element;
+ (I)L0javax/swing/text/Element;
 replace
  (II[Ljavax/swing/text/Element;)V
  (II[Ljavax/swing/text/Element;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/AbstractDocument$Content.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/AbstractDocument$Content.eea
index b5ddc678be..295a16e4ff 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/AbstractDocument$Content.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/AbstractDocument$Content.eea
@@ -2,7 +2,7 @@ class javax/swing/text/AbstractDocument$Content
 
 createPosition
  (I)Ljavax/swing/text/Position;
- (I)Ljavax/swing/text/Position;
+ (I)L1javax/swing/text/Position;
 getChars
  (IILjavax/swing/text/Segment;)V
  (IILjavax/swing/text/Segment;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/AbstractDocument$DefaultDocumentEvent.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/AbstractDocument$DefaultDocumentEvent.eea
index ae7af3a842..2452bfa427 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/AbstractDocument$DefaultDocumentEvent.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/AbstractDocument$DefaultDocumentEvent.eea
@@ -8,22 +8,22 @@ addEdit
  (Ljavax/swing/undo/UndoableEdit;)Z
 getChange
  (Ljavax/swing/text/Element;)Ljavax/swing/event/DocumentEvent$ElementChange;
- (Ljavax/swing/text/Element;)Ljavax/swing/event/DocumentEvent$ElementChange;
+ (Ljavax/swing/text/Element;)L0javax/swing/event/DocumentEvent$ElementChange;
 getDocument
  ()Ljavax/swing/text/Document;
  ()Ljavax/swing/text/Document;
 getPresentationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.undo.CompoundEdit)
 getRedoPresentationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getType
  ()Ljavax/swing/event/DocumentEvent$EventType;
  ()Ljavax/swing/event/DocumentEvent$EventType;
 getUndoPresentationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(javax.swing.undo.CompoundEdit)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/AbstractDocument$LeafElement.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/AbstractDocument$LeafElement.eea
index 9631e11111..dbee07aebd 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/AbstractDocument$LeafElement.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/AbstractDocument$LeafElement.eea
@@ -5,13 +5,13 @@ class javax/swing/text/AbstractDocument$LeafElement
  (Ljavax/swing/text/AbstractDocument;Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;II)V
 children
  ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
- ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
+ ()L0java/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
 getElement
  (I)Ljavax/swing/text/Element;
- (I)Ljavax/swing/text/Element;
+ (I)L0javax/swing/text/Element;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(javax.swing.text.AbstractDocument$AbstractElement)
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/AbstractDocument.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/AbstractDocument.eea
index 762afba625..405a91a58e 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/AbstractDocument.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/AbstractDocument.eea
@@ -37,13 +37,13 @@ addUndoableEditListener
  (L1javax/swing/event/UndoableEditListener;)V # @Inherited(javax.swing.text.Document)
 createBranchElement
  (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/Element;
- (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/Element;
+ (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;)L1javax/swing/text/Element;
 createLeafElement
  (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;II)Ljavax/swing/text/Element;
- (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;II)Ljavax/swing/text/Element;
+ (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;II)L1javax/swing/text/Element;
 createPosition
  (I)Ljavax/swing/text/Position;
- (I)Ljavax/swing/text/Position;
+ (I)L1javax/swing/text/Position; # @Inherited(javax.swing.text.Document)
 dump
  (Ljava/io/PrintStream;)V
  (Ljava/io/PrintStream;)V
@@ -85,7 +85,7 @@ getDocumentProperties
  ()Ljava/util/Dictionary<Ljava/lang/Object;Ljava/lang/Object;>;
 getEndPosition
  ()Ljavax/swing/text/Position;
- ()Ljavax/swing/text/Position;
+ ()L0javax/swing/text/Position;
 getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
@@ -97,10 +97,10 @@ getProperty
  (Ljava/lang/Object;)Ljava/lang/Object;
 getRootElements
  ()[Ljavax/swing/text/Element;
- ()[Ljavax/swing/text/Element;
+ ()[1Ljavax/swing/text/Element;
 getStartPosition
  ()Ljavax/swing/text/Position;
- ()Ljavax/swing/text/Position;
+ ()L0javax/swing/text/Position;
 getText
  (II)Ljava/lang/String;
  (II)Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/AsyncBoxView.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/AsyncBoxView.eea
index 4ddfdf83b7..d1074e83ab 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/AsyncBoxView.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/AsyncBoxView.eea
@@ -9,10 +9,10 @@ locator
  (Ljavax/swing/text/Element;I)V
 createChildState
  (Ljavax/swing/text/View;)Ljavax/swing/text/AsyncBoxView$ChildState;
- (Ljavax/swing/text/View;)Ljavax/swing/text/AsyncBoxView$ChildState;
+ (Ljavax/swing/text/View;)L1javax/swing/text/AsyncBoxView$ChildState;
 getChildAllocation
  (ILjava/awt/Shape;)Ljava/awt/Shape;
- (ILjava/awt/Shape;)Ljava/awt/Shape;
+ (ILjava/awt/Shape;)L0java/awt/Shape; # @Inherited(javax.swing.text.View)
 getChildState
  (I)Ljavax/swing/text/AsyncBoxView$ChildState;
  (I)Ljavax/swing/text/AsyncBoxView$ChildState;
@@ -24,7 +24,7 @@ getNextVisualPositionFrom
  (ILjavax/swing/text/Position$Bias;Ljava/awt/Shape;I[Ljavax/swing/text/Position$Bias;)I
 getView
  (I)Ljavax/swing/text/View;
- (I)Ljavax/swing/text/View;
+ (I)L0javax/swing/text/View; # @Inherited(javax.swing.text.View)
 getViewIndex
  (ILjavax/swing/text/Position$Bias;)I
  (ILjavax/swing/text/Position$Bias;)I
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/BoxView.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/BoxView.eea
index ca85158431..d839cb27b2 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/BoxView.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/BoxView.eea
@@ -8,13 +8,13 @@ baselineLayout
  (II[I[I)V
 baselineRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements;
 calculateMajorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements;
 calculateMinorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements;
 childAllocation
  (ILjava/awt/Rectangle;)V
  (ILjava/awt/Rectangle;)V
@@ -26,7 +26,7 @@ forwardUpdate
  (Ljavax/swing/event/DocumentEvent$ElementChange;Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
 getChildAllocation
  (ILjava/awt/Shape;)Ljava/awt/Shape;
- (ILjava/awt/Shape;)Ljava/awt/Shape;
+ (ILjava/awt/Shape;)L0java/awt/Shape; # @Inherited(javax.swing.text.CompositeView)
 getViewAtPoint
  (IILjava/awt/Rectangle;)Ljavax/swing/text/View;
  (IILjava/awt/Rectangle;)Ljavax/swing/text/View;
@@ -44,7 +44,7 @@ layoutMinorAxis
  (II[I[I)V
 modelToView
  (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)Ljava/awt/Shape;
- (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)Ljava/awt/Shape;
+ (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)L0java/awt/Shape; # @Inherited(javax.swing.text.CompositeView)
 paint
  (Ljava/awt/Graphics;Ljava/awt/Shape;)V
  (Ljava/awt/Graphics;Ljava/awt/Shape;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/ComponentView.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/ComponentView.eea
index b3be9e825d..985ffeab27 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/ComponentView.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/ComponentView.eea
@@ -5,7 +5,7 @@ class javax/swing/text/ComponentView
  (Ljavax/swing/text/Element;)V
 createComponent
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component;
 getComponent
  ()Ljava/awt/Component;
  ()Ljava/awt/Component;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/CompositeView.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/CompositeView.eea
index 9dcae1f9ff..923c986b58 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/CompositeView.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/CompositeView.eea
@@ -11,10 +11,10 @@ flipEastAndWestAtEnds
  (ILjavax/swing/text/Position$Bias;)Z
 getChildAllocation
  (ILjava/awt/Shape;)Ljava/awt/Shape;
- (ILjava/awt/Shape;)Ljava/awt/Shape;
+ (ILjava/awt/Shape;)L0java/awt/Shape; # @Inherited(javax.swing.text.View)
 getInsideAllocation
  (Ljava/awt/Shape;)Ljava/awt/Rectangle;
- (Ljava/awt/Shape;)Ljava/awt/Rectangle;
+ (Ljava/awt/Shape;)L0java/awt/Rectangle;
 getNextEastWestVisualPositionFrom
  (ILjavax/swing/text/Position$Bias;Ljava/awt/Shape;I[Ljavax/swing/text/Position$Bias;)I
  (ILjavax/swing/text/Position$Bias;Ljava/awt/Shape;I[Ljavax/swing/text/Position$Bias;)I
@@ -26,13 +26,13 @@ getNextVisualPositionFrom
  (ILjavax/swing/text/Position$Bias;Ljava/awt/Shape;I[Ljavax/swing/text/Position$Bias;)I
 getView
  (I)Ljavax/swing/text/View;
- (I)Ljavax/swing/text/View;
+ (I)L0javax/swing/text/View; # @Inherited(javax.swing.text.View)
 getViewAtPoint
  (IILjava/awt/Rectangle;)Ljavax/swing/text/View;
  (IILjava/awt/Rectangle;)Ljavax/swing/text/View;
 getViewAtPosition
  (ILjava/awt/Rectangle;)Ljavax/swing/text/View;
- (ILjava/awt/Rectangle;)Ljavax/swing/text/View;
+ (ILjava/awt/Rectangle;)L0javax/swing/text/View;
 getViewIndex
  (ILjavax/swing/text/Position$Bias;)I
  (ILjavax/swing/text/Position$Bias;)I
@@ -47,7 +47,7 @@ loadChildren
  (Ljavax/swing/text/ViewFactory;)V
 modelToView
  (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)Ljava/awt/Shape;
- (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)Ljava/awt/Shape;
+ (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)L0java/awt/Shape;
 modelToView
  (ILjavax/swing/text/Position$Bias;ILjavax/swing/text/Position$Bias;Ljava/awt/Shape;)Ljava/awt/Shape;
  (ILjavax/swing/text/Position$Bias;ILjavax/swing/text/Position$Bias;Ljava/awt/Shape;)Ljava/awt/Shape;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/DefaultEditorKit.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/DefaultEditorKit.eea
index d6c4100456..eb0a06e3cd 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/DefaultEditorKit.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/DefaultEditorKit.eea
@@ -150,19 +150,19 @@ writableAction
 
 createCaret
  ()Ljavax/swing/text/Caret;
- ()Ljavax/swing/text/Caret;
+ ()L0javax/swing/text/Caret; # @Overrides(javax.swing.text.EditorKit)
 createDefaultDocument
  ()Ljavax/swing/text/Document;
- ()Ljavax/swing/text/Document;
+ ()L1javax/swing/text/Document; # @Inherited(javax.swing.text.EditorKit)
 getActions
  ()[Ljavax/swing/Action;
  ()[Ljavax/swing/Action;
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getViewFactory
  ()Ljavax/swing/text/ViewFactory;
- ()Ljavax/swing/text/ViewFactory;
+ ()L0javax/swing/text/ViewFactory;
 read
  (Ljava/io/InputStream;Ljavax/swing/text/Document;I)V
  (Ljava/io/InputStream;Ljavax/swing/text/Document;I)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/DefaultFormatter.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/DefaultFormatter.eea
index c1b3df5551..a04ae24151 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/DefaultFormatter.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/DefaultFormatter.eea
@@ -5,10 +5,10 @@ clone
  ()L1java/lang/Object; # @Inherited(javax.swing.JFormattedTextField$AbstractFormatter)
 getDocumentFilter
  ()Ljavax/swing/text/DocumentFilter;
- ()Ljavax/swing/text/DocumentFilter;
+ ()L0javax/swing/text/DocumentFilter; # @Inherited(javax.swing.JFormattedTextField$AbstractFormatter)
 getNavigationFilter
  ()Ljavax/swing/text/NavigationFilter;
- ()Ljavax/swing/text/NavigationFilter;
+ ()L0javax/swing/text/NavigationFilter; # @Inherited(javax.swing.JFormattedTextField$AbstractFormatter)
 getValueClass
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
@@ -23,4 +23,4 @@ stringToValue
  (Ljava/lang/String;)Ljava/lang/Object;
 valueToString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/DefaultHighlighter$DefaultHighlightPainter.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/DefaultHighlighter$DefaultHighlightPainter.eea
index 7d9849c288..b21f54f8bc 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/DefaultHighlighter$DefaultHighlightPainter.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/DefaultHighlighter$DefaultHighlightPainter.eea
@@ -11,4 +11,4 @@ paint
  (Ljava/awt/Graphics;IILjava/awt/Shape;Ljavax/swing/text/JTextComponent;)V
 paintLayer
  (Ljava/awt/Graphics;IILjava/awt/Shape;Ljavax/swing/text/JTextComponent;Ljavax/swing/text/View;)Ljava/awt/Shape;
- (Ljava/awt/Graphics;IILjava/awt/Shape;Ljavax/swing/text/JTextComponent;Ljavax/swing/text/View;)Ljava/awt/Shape;
+ (Ljava/awt/Graphics;IILjava/awt/Shape;Ljavax/swing/text/JTextComponent;Ljavax/swing/text/View;)L0java/awt/Shape;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/DefaultHighlighter.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/DefaultHighlighter.eea
index fb9630e22e..5bb51d87f5 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/DefaultHighlighter.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/DefaultHighlighter.eea
@@ -6,7 +6,7 @@ DefaultPainter
 
 addHighlight
  (IILjavax/swing/text/Highlighter$HighlightPainter;)Ljava/lang/Object;
- (IILjavax/swing/text/Highlighter$HighlightPainter;)Ljava/lang/Object;
+ (IILjavax/swing/text/Highlighter$HighlightPainter;)L1java/lang/Object;
 changeHighlight
  (Ljava/lang/Object;II)V
  (Ljava/lang/Object;II)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/DefaultStyledDocument$SectionElement.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/DefaultStyledDocument$SectionElement.eea
index 6e13a61691..75f90ae78b 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/DefaultStyledDocument$SectionElement.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/DefaultStyledDocument$SectionElement.eea
@@ -5,4 +5,4 @@ class javax/swing/text/DefaultStyledDocument$SectionElement
  (Ljavax/swing/text/DefaultStyledDocument;)V
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.text.AbstractDocument$BranchElement)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/DefaultStyledDocument.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/DefaultStyledDocument.eea
index 540216bd5d..375d2f54f7 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/DefaultStyledDocument.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/DefaultStyledDocument.eea
@@ -21,7 +21,7 @@ create
  ([Ljavax/swing/text/DefaultStyledDocument$ElementSpec;)V
 createDefaultRoot
  ()Ljavax/swing/text/AbstractDocument$AbstractElement;
- ()Ljavax/swing/text/AbstractDocument$AbstractElement;
+ ()L1javax/swing/text/AbstractDocument$AbstractElement;
 getBackground
  (Ljavax/swing/text/AttributeSet;)Ljava/awt/Color;
  (Ljavax/swing/text/AttributeSet;)Ljava/awt/Color;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/Document.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/Document.eea
index c42dc008cb..312def38e9 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/Document.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/Document.eea
@@ -15,7 +15,7 @@ addUndoableEditListener
  (L1javax/swing/event/UndoableEditListener;)V
 createPosition
  (I)Ljavax/swing/text/Position;
- (I)Ljavax/swing/text/Position;
+ (I)L1javax/swing/text/Position;
 getDefaultRootElement
  ()Ljavax/swing/text/Element;
  ()Ljavax/swing/text/Element;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/EditorKit.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/EditorKit.eea
index c5e44fb446..bc252fdfb7 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/EditorKit.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/EditorKit.eea
@@ -5,10 +5,10 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 createCaret
  ()Ljavax/swing/text/Caret;
- ()Ljavax/swing/text/Caret;
+ ()L1javax/swing/text/Caret;
 createDefaultDocument
  ()Ljavax/swing/text/Document;
- ()Ljavax/swing/text/Document;
+ ()L1javax/swing/text/Document;
 deinstall
  (Ljavax/swing/JEditorPane;)V
  (Ljavax/swing/JEditorPane;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/ElementIterator.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/ElementIterator.eea
index fd767a3e97..7dba1bc245 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/ElementIterator.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/ElementIterator.eea
@@ -11,13 +11,13 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 current
  ()Ljavax/swing/text/Element;
- ()Ljavax/swing/text/Element;
+ ()L0javax/swing/text/Element;
 first
  ()Ljavax/swing/text/Element;
- ()Ljavax/swing/text/Element;
+ ()L0javax/swing/text/Element;
 next
  ()Ljavax/swing/text/Element;
- ()Ljavax/swing/text/Element;
+ ()L0javax/swing/text/Element;
 previous
  ()Ljavax/swing/text/Element;
- ()Ljavax/swing/text/Element;
+ ()L0javax/swing/text/Element;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/FieldView.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/FieldView.eea
index 7652db99ea..2e2ecae5a9 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/FieldView.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/FieldView.eea
@@ -5,7 +5,7 @@ class javax/swing/text/FieldView
  (Ljavax/swing/text/Element;)V
 adjustAllocation
  (Ljava/awt/Shape;)Ljava/awt/Shape;
- (Ljava/awt/Shape;)Ljava/awt/Shape;
+ (Ljava/awt/Shape;)L0java/awt/Shape;
 getFontMetrics
  ()Ljava/awt/FontMetrics;
  ()Ljava/awt/FontMetrics;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/FlowView$FlowStrategy.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/FlowView$FlowStrategy.eea
index 4802aa146c..0304477407 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/FlowView$FlowStrategy.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/FlowView$FlowStrategy.eea
@@ -8,7 +8,7 @@ changedUpdate
  (Ljavax/swing/text/FlowView;Ljavax/swing/event/DocumentEvent;Ljava/awt/Rectangle;)V
 createView
  (Ljavax/swing/text/FlowView;III)Ljavax/swing/text/View;
- (Ljavax/swing/text/FlowView;III)Ljavax/swing/text/View;
+ (Ljavax/swing/text/FlowView;III)L1javax/swing/text/View;
 getLogicalView
  (Ljavax/swing/text/FlowView;)Ljavax/swing/text/View;
  (Ljavax/swing/text/FlowView;)Ljavax/swing/text/View;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/FlowView.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/FlowView.eea
index fd35fc0a2f..22eff76e4f 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/FlowView.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/FlowView.eea
@@ -12,13 +12,13 @@ strategy
  (Ljavax/swing/text/Element;I)V
 calculateMinorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.BoxView)
 changedUpdate
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
 createRow
  ()Ljavax/swing/text/View;
- ()Ljavax/swing/text/View;
+ ()L1javax/swing/text/View;
 insertUpdate
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/GapContent.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/GapContent.eea
index 6d52002ddf..329824007c 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/GapContent.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/GapContent.eea
@@ -2,10 +2,10 @@ class javax/swing/text/GapContent
 
 allocateArray
  (I)Ljava/lang/Object;
- (I)Ljava/lang/Object;
+ (I)L1java/lang/Object;
 createPosition
  (I)Ljavax/swing/text/Position;
- (I)Ljavax/swing/text/Position;
+ (I)L1javax/swing/text/Position; # @Inherited(javax.swing.text.AbstractDocument$Content)
 getChars
  (IILjavax/swing/text/Segment;)V
  (IILjavax/swing/text/Segment;)V
@@ -17,10 +17,10 @@ getString
  (II)Ljava/lang/String;
 insertString
  (ILjava/lang/String;)Ljavax/swing/undo/UndoableEdit;
- (ILjava/lang/String;)Ljavax/swing/undo/UndoableEdit;
+ (ILjava/lang/String;)L1javax/swing/undo/UndoableEdit;
 remove
  (II)Ljavax/swing/undo/UndoableEdit;
- (II)Ljavax/swing/undo/UndoableEdit;
+ (II)L1javax/swing/undo/UndoableEdit;
 updateUndoPositions
  (Ljava/util/Vector;II)V
  (Ljava/util/Vector;II)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/GlyphView.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/GlyphView.eea
index 0dda4565fe..32c6b8806b 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/GlyphView.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/GlyphView.eea
@@ -14,16 +14,16 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 createFragment
  (II)Ljavax/swing/text/View;
- (II)Ljavax/swing/text/View;
+ (II)L1javax/swing/text/View; # @Inherited(javax.swing.text.View)
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getFont
  ()Ljava/awt/Font;
- ()Ljava/awt/Font;
+ ()L0java/awt/Font;
 getForeground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getGlyphPainter
  ()Ljavax/swing/text/GlyphView$GlyphPainter;
  ()Ljavax/swing/text/GlyphView$GlyphPainter;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/InternationalFormatter.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/InternationalFormatter.eea
index 191d8d4672..7e56644bd6 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/InternationalFormatter.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/InternationalFormatter.eea
@@ -8,7 +8,7 @@ clone
  ()L1java/lang/Object; # @Inherited(javax.swing.text.DefaultFormatter)
 getActions
  ()[Ljavax/swing/Action;
- ()[Ljavax/swing/Action;
+ ()[0Ljavax/swing/Action; # @Inherited(javax.swing.JFormattedTextField$AbstractFormatter)
 getFields
  (I)[Ljava/text/Format$Field;
  (I)[Ljava/text/Format$Field;
@@ -38,4 +38,4 @@ stringToValue
  (Ljava/lang/String;)Ljava/lang/Object;
 valueToString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(javax.swing.text.DefaultFormatter)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/JTextComponent$AccessibleJTextComponent.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/JTextComponent$AccessibleJTextComponent.eea
index 0c70690fb0..c9ae3526d1 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/JTextComponent$AccessibleJTextComponent.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/JTextComponent$AccessibleJTextComponent.eea
@@ -11,13 +11,13 @@ changedUpdate
  (L1javax/swing/event/DocumentEvent;)V # @Inherited(javax.swing.event.DocumentListener)
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleEditableText
  ()Ljavax/accessibility/AccessibleEditableText;
- ()Ljavax/accessibility/AccessibleEditableText;
+ ()L0javax/accessibility/AccessibleEditableText; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
@@ -26,7 +26,7 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAfterIndex
  (II)Ljava/lang/String;
  (II)Ljava/lang/String;
@@ -41,7 +41,7 @@ getCharacterAttribute
  (I)Ljavax/swing/text/AttributeSet;
 getCharacterBounds
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L0java/awt/Rectangle;
 getIndexAtPoint
  (Ljava/awt/Point;)I
  (Ljava/awt/Point;)I
@@ -50,7 +50,7 @@ getSelectedText
  ()Ljava/lang/String;
 getTextBounds
  (II)Ljava/awt/Rectangle;
- (II)Ljava/awt/Rectangle;
+ (II)L0java/awt/Rectangle;
 getTextRange
  (II)Ljava/lang/String;
  (II)Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/JTextComponent.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/JTextComponent.eea
index 01f5a50d28..1af33dc600 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/JTextComponent.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/JTextComponent.eea
@@ -9,7 +9,7 @@ FOCUS_ACCELERATOR_KEY
 
 addKeymap
  (Ljava/lang/String;Ljavax/swing/text/Keymap;)Ljavax/swing/text/Keymap;
- (Ljava/lang/String;Ljavax/swing/text/Keymap;)Ljavax/swing/text/Keymap;
+ (Ljava/lang/String;Ljavax/swing/text/Keymap;)L1javax/swing/text/Keymap;
 getKeymap
  (Ljava/lang/String;)Ljavax/swing/text/Keymap;
  (Ljava/lang/String;)Ljavax/swing/text/Keymap;
@@ -61,7 +61,7 @@ getHighlighter
  ()Ljavax/swing/text/Highlighter;
 getInputMethodRequests
  ()Ljava/awt/im/InputMethodRequests;
- ()Ljava/awt/im/InputMethodRequests;
+ ()L0java/awt/im/InputMethodRequests; # @Inherited(java.awt.Component)
 getKeymap
  ()Ljavax/swing/text/Keymap;
  ()Ljavax/swing/text/Keymap;
@@ -94,7 +94,7 @@ getSelectionColor
  ()Ljava/awt/Color;
 getText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getText
  (II)Ljava/lang/String;
  (II)Ljava/lang/String;
@@ -112,7 +112,7 @@ modelToView2D
  (I)Ljava/awt/geom/Rectangle2D;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 print
  (Ljava/text/MessageFormat;Ljava/text/MessageFormat;)Z
  (Ljava/text/MessageFormat;Ljava/text/MessageFormat;)Z
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/LabelView.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/LabelView.eea
index d717bb4410..306b2a6e94 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/LabelView.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/LabelView.eea
@@ -8,16 +8,16 @@ changedUpdate
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color; # @Inherited(javax.swing.text.GlyphView)
 getFont
  ()Ljava/awt/Font;
- ()Ljava/awt/Font;
+ ()L0java/awt/Font; # @Inherited(javax.swing.text.GlyphView)
 getFontMetrics
  ()Ljava/awt/FontMetrics;
  ()Ljava/awt/FontMetrics;
 getForeground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color; # @Inherited(javax.swing.text.GlyphView)
 setBackground
  (Ljava/awt/Color;)V
  (Ljava/awt/Color;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/LayoutQueue.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/LayoutQueue.eea
index 756cbc7e72..cf430ad96e 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/LayoutQueue.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/LayoutQueue.eea
@@ -12,4 +12,4 @@ addTask
  (Ljava/lang/Runnable;)V
 waitForWork
  ()Ljava/lang/Runnable;
- ()Ljava/lang/Runnable;
+ ()L0java/lang/Runnable;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/MaskFormatter.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/MaskFormatter.eea
index ce7cb146ad..a16f4643c1 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/MaskFormatter.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/MaskFormatter.eea
@@ -35,4 +35,4 @@ stringToValue
  (Ljava/lang/String;)Ljava/lang/Object;
 valueToString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(javax.swing.text.DefaultFormatter)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/ParagraphView.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/ParagraphView.eea
index 8a53f00df9..907ecdb299 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/ParagraphView.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/ParagraphView.eea
@@ -8,13 +8,13 @@ breakView
  (IFLjava/awt/Shape;)Ljavax/swing/text/View;
 calculateMinorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.FlowView)
 changedUpdate
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
 createRow
  ()Ljavax/swing/text/View;
- ()Ljavax/swing/text/View;
+ ()L1javax/swing/text/View; # @Inherited(javax.swing.text.FlowView)
 findOffsetToCharactersInString
  ([CI)I
  ([CI)I
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/PasswordView.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/PasswordView.eea
index d5f21bf789..830c7f5b43 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/PasswordView.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/PasswordView.eea
@@ -23,7 +23,7 @@ drawUnselectedText
  (Ljava/awt/Graphics;IIII)I
 modelToView
  (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)Ljava/awt/Shape;
- (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)Ljava/awt/Shape;
+ (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)L0java/awt/Shape;
 viewToModel
  (FFLjava/awt/Shape;[Ljavax/swing/text/Position$Bias;)I
  (FFLjava/awt/Shape;[Ljavax/swing/text/Position$Bias;)I
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/PlainDocument.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/PlainDocument.eea
index 5361c59181..13dc85433e 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/PlainDocument.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/PlainDocument.eea
@@ -12,7 +12,7 @@ tabSizeAttribute
  (Ljavax/swing/text/AbstractDocument$Content;)V
 createDefaultRoot
  ()Ljavax/swing/text/AbstractDocument$AbstractElement;
- ()Ljavax/swing/text/AbstractDocument$AbstractElement;
+ ()L1javax/swing/text/AbstractDocument$AbstractElement;
 getDefaultRootElement
  ()Ljavax/swing/text/Element;
  ()Ljavax/swing/text/Element;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/StringContent.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/StringContent.eea
index 0752f9a92f..7edbe4975e 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/StringContent.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/StringContent.eea
@@ -2,7 +2,7 @@ class javax/swing/text/StringContent
 
 createPosition
  (I)Ljavax/swing/text/Position;
- (I)Ljavax/swing/text/Position;
+ (I)L1javax/swing/text/Position; # @Inherited(javax.swing.text.AbstractDocument$Content)
 getChars
  (IILjavax/swing/text/Segment;)V
  (IILjavax/swing/text/Segment;)V
@@ -11,13 +11,13 @@ getPositionsInRange
  (Ljava/util/Vector;II)Ljava/util/Vector;
 getString
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L1java/lang/String;
 insertString
  (ILjava/lang/String;)Ljavax/swing/undo/UndoableEdit;
- (ILjava/lang/String;)Ljavax/swing/undo/UndoableEdit;
+ (ILjava/lang/String;)L1javax/swing/undo/UndoableEdit;
 remove
  (II)Ljavax/swing/undo/UndoableEdit;
- (II)Ljavax/swing/undo/UndoableEdit;
+ (II)L1javax/swing/undo/UndoableEdit;
 updateUndoPositions
  (Ljava/util/Vector;)V
  (Ljava/util/Vector;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/StyleConstants.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/StyleConstants.eea
index a09325940c..8b8527f543 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/StyleConstants.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/StyleConstants.eea
@@ -108,7 +108,7 @@ getFirstLineIndent
  (Ljavax/swing/text/AttributeSet;)F
 getFontFamily
  (Ljavax/swing/text/AttributeSet;)Ljava/lang/String;
- (Ljavax/swing/text/AttributeSet;)Ljava/lang/String;
+ (Ljavax/swing/text/AttributeSet;)L1java/lang/String;
 getFontSize
  (Ljavax/swing/text/AttributeSet;)I
  (Ljavax/swing/text/AttributeSet;)I
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/StyleContext$NamedStyle.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/StyleContext$NamedStyle.eea
index aab00b1304..34571e1337 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/StyleContext$NamedStyle.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/StyleContext$NamedStyle.eea
@@ -33,7 +33,7 @@ containsAttributes
  (Ljavax/swing/text/AttributeSet;)Z
 copyAttributes
  ()Ljavax/swing/text/AttributeSet;
- ()Ljavax/swing/text/AttributeSet;
+ ()L1javax/swing/text/AttributeSet;
 getAttribute
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
@@ -48,7 +48,7 @@ getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getResolveParent
  ()Ljavax/swing/text/AttributeSet;
  ()Ljavax/swing/text/AttributeSet;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/StyleContext.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/StyleContext.eea
index 948b3ea0a8..b29875ad05 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/StyleContext.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/StyleContext.eea
@@ -12,7 +12,7 @@ getStaticAttribute
  (Ljava/lang/Object;)Ljava/lang/Object;
 getStaticAttributeKey
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object;
 readAttributeSet
  (Ljava/io/ObjectInputStream;Ljavax/swing/text/MutableAttributeSet;)V
  (Ljava/io/ObjectInputStream;Ljavax/swing/text/MutableAttributeSet;)V
@@ -34,13 +34,13 @@ addChangeListener
  (L1javax/swing/event/ChangeListener;)V
 addStyle
  (Ljava/lang/String;Ljavax/swing/text/Style;)Ljavax/swing/text/Style;
- (Ljava/lang/String;Ljavax/swing/text/Style;)Ljavax/swing/text/Style;
+ (Ljava/lang/String;Ljavax/swing/text/Style;)L1javax/swing/text/Style;
 createLargeAttributeSet
  (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/MutableAttributeSet;
- (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/MutableAttributeSet;
+ (Ljavax/swing/text/AttributeSet;)L1javax/swing/text/MutableAttributeSet;
 createSmallAttributeSet
  (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/StyleContext$SmallAttributeSet;
- (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/StyleContext$SmallAttributeSet;
+ (Ljavax/swing/text/AttributeSet;)L1javax/swing/text/StyleContext$SmallAttributeSet;
 getBackground
  (Ljavax/swing/text/AttributeSet;)Ljava/awt/Color;
  (Ljavax/swing/text/AttributeSet;)Ljava/awt/Color;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/StyledEditorKit$StyledTextAction.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/StyledEditorKit$StyledTextAction.eea
index 9962de143e..864d5776b3 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/StyledEditorKit$StyledTextAction.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/StyledEditorKit$StyledTextAction.eea
@@ -5,7 +5,7 @@ class javax/swing/text/StyledEditorKit$StyledTextAction
  (Ljava/lang/String;)V
 getEditor
  (Ljava/awt/event/ActionEvent;)Ljavax/swing/JEditorPane;
- (Ljava/awt/event/ActionEvent;)Ljavax/swing/JEditorPane;
+ (Ljava/awt/event/ActionEvent;)L0javax/swing/JEditorPane;
 getStyledDocument
  (Ljavax/swing/JEditorPane;)Ljavax/swing/text/StyledDocument;
  (Ljavax/swing/JEditorPane;)Ljavax/swing/text/StyledDocument;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/StyledEditorKit.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/StyledEditorKit.eea
index 73be9f8967..f4bdd9f41a 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/StyledEditorKit.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/StyledEditorKit.eea
@@ -5,7 +5,7 @@ clone
  ()L1java/lang/Object; # @Inherited(javax.swing.text.EditorKit)
 createDefaultDocument
  ()Ljavax/swing/text/Document;
- ()Ljavax/swing/text/Document;
+ ()L1javax/swing/text/Document; # @Inherited(javax.swing.text.DefaultEditorKit)
 createInputAttributes
  (Ljavax/swing/text/Element;Ljavax/swing/text/MutableAttributeSet;)V
  (Ljavax/swing/text/Element;Ljavax/swing/text/MutableAttributeSet;)V
@@ -23,7 +23,7 @@ getInputAttributes
  ()Ljavax/swing/text/MutableAttributeSet;
 getViewFactory
  ()Ljavax/swing/text/ViewFactory;
- ()Ljavax/swing/text/ViewFactory;
+ ()L0javax/swing/text/ViewFactory; # @Inherited(javax.swing.text.DefaultEditorKit)
 install
  (Ljavax/swing/JEditorPane;)V
  (Ljavax/swing/JEditorPane;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/TableView$TableRow.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/TableView$TableRow.eea
index 89206865f2..31bc1801da 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/TableView$TableRow.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/TableView$TableRow.eea
@@ -5,10 +5,10 @@ class javax/swing/text/TableView$TableRow
  (Ljavax/swing/text/TableView;Ljavax/swing/text/Element;)V
 calculateMajorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.BoxView)
 getViewAtPosition
  (ILjava/awt/Rectangle;)Ljavax/swing/text/View;
- (ILjava/awt/Rectangle;)Ljavax/swing/text/View;
+ (ILjava/awt/Rectangle;)L0javax/swing/text/View; # @Inherited(javax.swing.text.CompositeView)
 layoutMajorAxis
  (II[I[I)V
  (II[I[I)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/TableView.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/TableView.eea
index a00db35d7d..53894df1cf 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/TableView.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/TableView.eea
@@ -5,19 +5,19 @@ class javax/swing/text/TableView
  (Ljavax/swing/text/Element;)V
 calculateMinorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.BoxView)
 createTableCell
  (Ljavax/swing/text/Element;)Ljavax/swing/text/TableView$TableCell;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/TableView$TableCell;
+ (Ljavax/swing/text/Element;)L1javax/swing/text/TableView$TableCell;
 createTableRow
  (Ljavax/swing/text/Element;)Ljavax/swing/text/TableView$TableRow;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/TableView$TableRow;
+ (Ljavax/swing/text/Element;)L1javax/swing/text/TableView$TableRow;
 forwardUpdate
  (Ljavax/swing/event/DocumentEvent$ElementChange;Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
  (Ljavax/swing/event/DocumentEvent$ElementChange;Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
 getViewAtPosition
  (ILjava/awt/Rectangle;)Ljavax/swing/text/View;
- (ILjava/awt/Rectangle;)Ljavax/swing/text/View;
+ (ILjava/awt/Rectangle;)L0javax/swing/text/View; # @Inherited(javax.swing.text.CompositeView)
 layoutColumns
  (I[I[I[Ljavax/swing/SizeRequirements;)V
  (I[I[I[Ljavax/swing/SizeRequirements;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/TextAction.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/TextAction.eea
index 42d8f3512e..6f4335d297 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/TextAction.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/TextAction.eea
@@ -2,7 +2,7 @@ class javax/swing/text/TextAction
 
 augmentList
  ([Ljavax/swing/Action;[Ljavax/swing/Action;)[Ljavax/swing/Action;
- ([Ljavax/swing/Action;[Ljavax/swing/Action;)[Ljavax/swing/Action;
+ ([Ljavax/swing/Action;[Ljavax/swing/Action;)[1Ljavax/swing/Action;
 
 <init>
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/Utilities.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/Utilities.eea
index 407ada25b3..57e413f5d4 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/Utilities.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/Utilities.eea
@@ -17,7 +17,7 @@ getNextWord
  (Ljavax/swing/text/JTextComponent;I)I
 getParagraphElement
  (Ljavax/swing/text/JTextComponent;I)Ljavax/swing/text/Element;
- (Ljavax/swing/text/JTextComponent;I)Ljavax/swing/text/Element;
+ (Ljavax/swing/text/JTextComponent;I)L0javax/swing/text/Element;
 getPositionAbove
  (Ljavax/swing/text/JTextComponent;IF)I
  (Ljavax/swing/text/JTextComponent;IF)I
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/View.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/View.eea
index 7c70fcdee3..d11440bd38 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/View.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/View.eea
@@ -14,7 +14,7 @@ changedUpdate
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
 createFragment
  (II)Ljavax/swing/text/View;
- (II)Ljavax/swing/text/View;
+ (II)L1javax/swing/text/View;
 forwardUpdate
  (Ljavax/swing/event/DocumentEvent$ElementChange;Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
  (Ljavax/swing/event/DocumentEvent$ElementChange;Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
@@ -26,10 +26,10 @@ getAttributes
  ()Ljavax/swing/text/AttributeSet;
 getChildAllocation
  (ILjava/awt/Shape;)Ljava/awt/Shape;
- (ILjava/awt/Shape;)Ljava/awt/Shape;
+ (ILjava/awt/Shape;)L0java/awt/Shape;
 getContainer
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L0java/awt/Container;
 getDocument
  ()Ljavax/swing/text/Document;
  ()Ljavax/swing/text/Document;
@@ -47,13 +47,13 @@ getParent
  ()Ljavax/swing/text/View;
 getToolTipText
  (FFLjava/awt/Shape;)Ljava/lang/String;
- (FFLjava/awt/Shape;)Ljava/lang/String;
+ (FFLjava/awt/Shape;)L0java/lang/String;
 getView
  (I)Ljavax/swing/text/View;
- (I)Ljavax/swing/text/View;
+ (I)L0javax/swing/text/View;
 getViewFactory
  ()Ljavax/swing/text/ViewFactory;
- ()Ljavax/swing/text/ViewFactory;
+ ()L0javax/swing/text/ViewFactory;
 getViewIndex
  (FFLjava/awt/Shape;)I
  (FFLjava/awt/Shape;)I
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/ViewFactory.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/ViewFactory.eea
index 1cd710833c..24b5e5fc14 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/ViewFactory.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/ViewFactory.eea
@@ -2,4 +2,4 @@ class javax/swing/text/ViewFactory
 
 create
  (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
+ (Ljavax/swing/text/Element;)L1javax/swing/text/View;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/ZoneView.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/ZoneView.eea
index 84648791a1..0625b177cc 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/ZoneView.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/ZoneView.eea
@@ -5,7 +5,7 @@ class javax/swing/text/ZoneView
  (Ljavax/swing/text/Element;I)V
 createZone
  (II)Ljavax/swing/text/View;
- (II)Ljavax/swing/text/View;
+ (II)L1javax/swing/text/View;
 insertUpdate
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/html/AccessibleHTML$HTMLAccessibleContext.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/html/AccessibleHTML$HTMLAccessibleContext.eea
index 37f9607c94..df1b430e2b 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/html/AccessibleHTML$HTMLAccessibleContext.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/html/AccessibleHTML$HTMLAccessibleContext.eea
@@ -15,19 +15,19 @@ contains
  (Ljava/awt/Point;)Z
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
- ()Ljavax/accessibility/AccessibleStateSet;
+ ()L1javax/accessibility/AccessibleStateSet;
 getBackground
  ()Ljava/awt/Color;
  ()Ljava/awt/Color;
@@ -51,13 +51,13 @@ getLocale
  ()Ljava/util/Locale;
 getLocation
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getLocationOnScreen
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L0java/awt/Dimension;
 removeFocusListener
  (Ljava/awt/event/FocusListener;)V
  (L1java/awt/event/FocusListener;)V # @Inherited(javax.accessibility.AccessibleComponent)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/html/AccessibleHTML$IconElementInfo$IconAccessibleContext.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/html/AccessibleHTML$IconElementInfo$IconAccessibleContext.eea
index fadb848190..80c9102581 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/html/AccessibleHTML$IconElementInfo$IconAccessibleContext.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/html/AccessibleHTML$IconElementInfo$IconAccessibleContext.eea
@@ -8,7 +8,7 @@ getAccessibleDescription
  ()Ljava/lang/String;
 getAccessibleIcon
  ()[Ljavax/accessibility/AccessibleIcon;
- ()[Ljavax/accessibility/AccessibleIcon;
+ ()[1Ljavax/accessibility/AccessibleIcon; # @Overrides(javax.accessibility.AccessibleContext)
 getAccessibleIconDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/html/AccessibleHTML$TableElementInfo$TableAccessibleContext$AccessibleHeadersTable.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/html/AccessibleHTML$TableElementInfo$TableAccessibleContext$AccessibleHeadersTable.eea
index bb89cf1e81..ba7e0a88e4 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/html/AccessibleHTML$TableElementInfo$TableAccessibleContext$AccessibleHeadersTable.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/html/AccessibleHTML$TableElementInfo$TableAccessibleContext$AccessibleHeadersTable.eea
@@ -8,31 +8,31 @@ addHeader
  (Ljavax/swing/text/html/AccessibleHTML$TableElementInfo$TableCellElementInfo;I)V
 getAccessibleAt
  (II)Ljavax/accessibility/Accessible;
- (II)Ljavax/accessibility/Accessible;
+ (II)L0javax/accessibility/Accessible;
 getAccessibleCaption
  ()Ljavax/accessibility/Accessible;
- ()Ljavax/accessibility/Accessible;
+ ()L0javax/accessibility/Accessible;
 getAccessibleColumnDescription
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleColumnHeader
  ()Ljavax/accessibility/AccessibleTable;
- ()Ljavax/accessibility/AccessibleTable;
+ ()L0javax/accessibility/AccessibleTable;
 getAccessibleRowDescription
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleRowHeader
  ()Ljavax/accessibility/AccessibleTable;
- ()Ljavax/accessibility/AccessibleTable;
+ ()L0javax/accessibility/AccessibleTable;
 getAccessibleSummary
  ()Ljavax/accessibility/Accessible;
- ()Ljavax/accessibility/Accessible;
+ ()L0javax/accessibility/Accessible;
 getSelectedAccessibleColumns
  ()[I
- ()[I
+ ()[1I
 getSelectedAccessibleRows
  ()[I
- ()[I
+ ()[1I
 setAccessibleCaption
  (Ljavax/accessibility/Accessible;)V
  (Ljavax/accessibility/Accessible;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/html/AccessibleHTML$TableElementInfo$TableAccessibleContext.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/html/AccessibleHTML$TableElementInfo$TableAccessibleContext.eea
index b7f83f0bf6..e22775a37b 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/html/AccessibleHTML$TableElementInfo$TableAccessibleContext.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/html/AccessibleHTML$TableElementInfo$TableAccessibleContext.eea
@@ -8,52 +8,52 @@ addRowHeader
  (Ljavax/swing/text/html/AccessibleHTML$TableElementInfo$TableCellElementInfo;I)V
 getAccessibleAt
  (II)Ljavax/accessibility/Accessible;
- (II)Ljavax/accessibility/Accessible;
+ (II)L0javax/accessibility/Accessible;
 getAccessibleCaption
  ()Ljavax/accessibility/Accessible;
- ()Ljavax/accessibility/Accessible;
+ ()L0javax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.text.html.AccessibleHTML$HTMLAccessibleContext)
 getAccessibleColumnDescription
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleColumnHeader
  ()Ljavax/accessibility/AccessibleTable;
- ()Ljavax/accessibility/AccessibleTable;
+ ()L0javax/accessibility/AccessibleTable;
 getAccessibleColumnHeader
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getAccessibleName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleRowDescription
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleRowHeader
  ()Ljavax/accessibility/AccessibleTable;
  ()Ljavax/accessibility/AccessibleTable;
 getAccessibleRowHeader
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleSummary
  ()Ljavax/accessibility/Accessible;
- ()Ljavax/accessibility/Accessible;
+ ()L0javax/accessibility/Accessible;
 getAccessibleTable
  ()Ljavax/accessibility/AccessibleTable;
- ()Ljavax/accessibility/AccessibleTable;
+ ()L0javax/accessibility/AccessibleTable; # @Inherited(javax.accessibility.AccessibleContext)
 getSelectedAccessibleColumns
  ()[I
- ()[I
+ ()[1I
 getSelectedAccessibleRows
  ()[I
- ()[I
+ ()[1I
 setAccessibleCaption
  (Ljavax/accessibility/Accessible;)V
  (Ljavax/accessibility/Accessible;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/html/AccessibleHTML$TextElementInfo$TextAccessibleContext.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/html/AccessibleHTML$TextElementInfo$TextAccessibleContext.eea
index 81e1259119..dff38663b5 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/html/AccessibleHTML$TextElementInfo$TextAccessibleContext.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/html/AccessibleHTML$TextElementInfo$TextAccessibleContext.eea
@@ -8,13 +8,13 @@ getAccessibleDescription
  ()Ljava/lang/String;
 getAccessibleName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAfterIndex
  (II)Ljava/lang/String;
  (II)Ljava/lang/String;
@@ -26,10 +26,10 @@ getBeforeIndex
  (II)Ljava/lang/String;
 getCharacterAttribute
  (I)Ljavax/swing/text/AttributeSet;
- (I)Ljavax/swing/text/AttributeSet;
+ (I)L0javax/swing/text/AttributeSet;
 getCharacterBounds
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L0java/awt/Rectangle;
 getIndexAtPoint
  (Ljava/awt/Point;)I
  (Ljava/awt/Point;)I
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/html/BlockView.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/html/BlockView.eea
index fea3280a6f..574dd7a75a 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/html/BlockView.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/html/BlockView.eea
@@ -5,10 +5,10 @@ class javax/swing/text/html/BlockView
  (Ljavax/swing/text/Element;I)V
 calculateMajorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.BoxView)
 calculateMinorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.BoxView)
 changedUpdate
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/html/CSS.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/html/CSS.eea
index 779e06cb3d..7174e0d1aa 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/html/CSS.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/html/CSS.eea
@@ -2,7 +2,7 @@ class javax/swing/text/html/CSS
 
 getAllAttributeKeys
  ()[Ljavax/swing/text/html/CSS$Attribute;
- ()[Ljavax/swing/text/html/CSS$Attribute;
+ ()[1Ljavax/swing/text/html/CSS$Attribute;
 getAttribute
  (Ljava/lang/String;)Ljavax/swing/text/html/CSS$Attribute;
  (Ljava/lang/String;)Ljavax/swing/text/html/CSS$Attribute;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/html/FormView.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/html/FormView.eea
index 88b6a00a26..8164be3bc5 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/html/FormView.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/html/FormView.eea
@@ -15,7 +15,7 @@ actionPerformed
  (L1java/awt/event/ActionEvent;)V # @Inherited(java.awt.event.ActionListener)
 createComponent
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component; # @Inherited(javax.swing.text.ComponentView)
 imageSubmit
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/html/HTML.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/html/HTML.eea
index dee3934459..f5662806f1 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/html/HTML.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/html/HTML.eea
@@ -6,13 +6,13 @@ NULL_ATTRIBUTE_VALUE
 
 getAllAttributeKeys
  ()[Ljavax/swing/text/html/HTML$Attribute;
- ()[Ljavax/swing/text/html/HTML$Attribute;
+ ()[1Ljavax/swing/text/html/HTML$Attribute;
 getAllTags
  ()[Ljavax/swing/text/html/HTML$Tag;
- ()[Ljavax/swing/text/html/HTML$Tag;
+ ()[1Ljavax/swing/text/html/HTML$Tag;
 getAttributeKey
  (Ljava/lang/String;)Ljavax/swing/text/html/HTML$Attribute;
- (Ljava/lang/String;)Ljavax/swing/text/html/HTML$Attribute;
+ (Ljava/lang/String;)L0javax/swing/text/html/HTML$Attribute;
 getIntegerAttributeValue
  (Ljavax/swing/text/AttributeSet;Ljavax/swing/text/html/HTML$Attribute;I)I
  (Ljavax/swing/text/AttributeSet;Ljavax/swing/text/html/HTML$Attribute;I)I
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/html/HTMLDocument$BlockElement.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/html/HTMLDocument$BlockElement.eea
index 5cdf2ba233..e100ec133c 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/html/HTMLDocument$BlockElement.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/html/HTMLDocument$BlockElement.eea
@@ -5,7 +5,7 @@ class javax/swing/text/html/HTMLDocument$BlockElement
  (Ljavax/swing/text/html/HTMLDocument;Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;)V
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.text.AbstractDocument$BranchElement)
 getResolveParent
  ()Ljavax/swing/text/AttributeSet;
- ()Ljavax/swing/text/AttributeSet;
+ ()L0javax/swing/text/AttributeSet;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/html/HTMLDocument$RunElement.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/html/HTMLDocument$RunElement.eea
index 34b4d06888..6f02fa9ffd 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/html/HTMLDocument$RunElement.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/html/HTMLDocument$RunElement.eea
@@ -5,7 +5,7 @@ class javax/swing/text/html/HTMLDocument$RunElement
  (Ljavax/swing/text/html/HTMLDocument;Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;II)V
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.text.AbstractDocument$LeafElement)
 getResolveParent
  ()Ljavax/swing/text/AttributeSet;
- ()Ljavax/swing/text/AttributeSet;
+ ()L0javax/swing/text/AttributeSet;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/html/HTMLDocument.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/html/HTMLDocument.eea
index e242d908df..080fde65ba 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/html/HTMLDocument.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/html/HTMLDocument.eea
@@ -15,13 +15,13 @@ create
  ([Ljavax/swing/text/DefaultStyledDocument$ElementSpec;)V
 createBranchElement
  (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/Element;
- (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/Element;
+ (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;)L1javax/swing/text/Element; # @Inherited(javax.swing.text.AbstractDocument)
 createDefaultRoot
  ()Ljavax/swing/text/AbstractDocument$AbstractElement;
- ()Ljavax/swing/text/AbstractDocument$AbstractElement;
+ ()L1javax/swing/text/AbstractDocument$AbstractElement; # @Inherited(javax.swing.text.DefaultStyledDocument)
 createLeafElement
  (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;II)Ljavax/swing/text/Element;
- (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;II)Ljavax/swing/text/Element;
+ (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;II)L1javax/swing/text/Element; # @Inherited(javax.swing.text.AbstractDocument)
 fireChangedUpdate
  (Ljavax/swing/event/DocumentEvent;)V
  (Ljavax/swing/event/DocumentEvent;)V
@@ -39,13 +39,13 @@ getElement
  (Ljavax/swing/text/Element;Ljava/lang/Object;Ljava/lang/Object;)Ljavax/swing/text/Element;
 getIterator
  (Ljavax/swing/text/html/HTML$Tag;)Ljavax/swing/text/html/HTMLDocument$Iterator;
- (Ljavax/swing/text/html/HTML$Tag;)Ljavax/swing/text/html/HTMLDocument$Iterator;
+ (Ljavax/swing/text/html/HTML$Tag;)L0javax/swing/text/html/HTMLDocument$Iterator;
 getParser
  ()Ljavax/swing/text/html/HTMLEditorKit$Parser;
  ()Ljavax/swing/text/html/HTMLEditorKit$Parser;
 getReader
  (I)Ljavax/swing/text/html/HTMLEditorKit$ParserCallback;
- (I)Ljavax/swing/text/html/HTMLEditorKit$ParserCallback;
+ (I)L1javax/swing/text/html/HTMLEditorKit$ParserCallback;
 getReader
  (IIILjavax/swing/text/html/HTML$Tag;)Ljavax/swing/text/html/HTMLEditorKit$ParserCallback;
  (IIILjavax/swing/text/html/HTML$Tag;)Ljavax/swing/text/html/HTMLEditorKit$ParserCallback;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/html/HTMLEditorKit$HTMLFactory.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/html/HTMLEditorKit$HTMLFactory.eea
index 1bafecc05e..ade9c0a4e8 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/html/HTMLEditorKit$HTMLFactory.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/html/HTMLEditorKit$HTMLFactory.eea
@@ -2,4 +2,4 @@ class javax/swing/text/html/HTMLEditorKit$HTMLFactory
 
 create
  (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
+ (Ljavax/swing/text/Element;)L1javax/swing/text/View; # @Inherited(javax.swing.text.ViewFactory)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/html/HTMLEditorKit.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/html/HTMLEditorKit.eea
index 5ff7133f0d..3f70a13929 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/html/HTMLEditorKit.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/html/HTMLEditorKit.eea
@@ -45,7 +45,7 @@ clone
  ()L1java/lang/Object; # @Inherited(javax.swing.text.StyledEditorKit)
 createDefaultDocument
  ()Ljavax/swing/text/Document;
- ()Ljavax/swing/text/Document;
+ ()L1javax/swing/text/Document; # @Inherited(javax.swing.text.StyledEditorKit)
 createInputAttributes
  (Ljavax/swing/text/Element;Ljavax/swing/text/MutableAttributeSet;)V
  (Ljavax/swing/text/Element;Ljavax/swing/text/MutableAttributeSet;)V
@@ -54,13 +54,13 @@ deinstall
  (Ljavax/swing/JEditorPane;)V
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
- ()Ljavax/accessibility/AccessibleContext;
+ ()L0javax/accessibility/AccessibleContext;
 getActions
  ()[Ljavax/swing/Action;
  ()[Ljavax/swing/Action;
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.text.DefaultEditorKit)
 getDefaultCursor
  ()Ljava/awt/Cursor;
  ()Ljava/awt/Cursor;
@@ -75,10 +75,10 @@ getParser
  ()Ljavax/swing/text/html/HTMLEditorKit$Parser;
 getStyleSheet
  ()Ljavax/swing/text/html/StyleSheet;
- ()Ljavax/swing/text/html/StyleSheet;
+ ()L1javax/swing/text/html/StyleSheet;
 getViewFactory
  ()Ljavax/swing/text/ViewFactory;
- ()Ljavax/swing/text/ViewFactory;
+ ()L0javax/swing/text/ViewFactory; # @Inherited(javax.swing.text.StyledEditorKit)
 insertHTML
  (Ljavax/swing/text/html/HTMLDocument;ILjava/lang/String;IILjavax/swing/text/html/HTML$Tag;)V
  (Ljavax/swing/text/html/HTMLDocument;ILjava/lang/String;IILjavax/swing/text/html/HTML$Tag;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/html/ImageView.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/html/ImageView.eea
index ec0b987cac..9317c516fd 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/html/ImageView.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/html/ImageView.eea
@@ -17,7 +17,7 @@ getImage
  ()Ljava/awt/Image;
 getImageURL
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L0java/net/URL;
 getLoadingImageIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
@@ -29,10 +29,10 @@ getStyleSheet
  ()Ljavax/swing/text/html/StyleSheet;
 getToolTipText
  (FFLjava/awt/Shape;)Ljava/lang/String;
- (FFLjava/awt/Shape;)Ljava/lang/String;
+ (FFLjava/awt/Shape;)L0java/lang/String; # @Inherited(javax.swing.text.View)
 modelToView
  (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)Ljava/awt/Shape;
- (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)Ljava/awt/Shape;
+ (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)L0java/awt/Shape;
 paint
  (Ljava/awt/Graphics;Ljava/awt/Shape;)V
  (Ljava/awt/Graphics;Ljava/awt/Shape;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/html/ObjectView.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/html/ObjectView.eea
index c866e95a2c..b66d5ff681 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/html/ObjectView.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/html/ObjectView.eea
@@ -5,4 +5,4 @@ class javax/swing/text/html/ObjectView
  (Ljavax/swing/text/Element;)V
 createComponent
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component; # @Inherited(javax.swing.text.ComponentView)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/html/ParagraphView.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/html/ParagraphView.eea
index ce3f592638..1178a6cadc 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/html/ParagraphView.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/html/ParagraphView.eea
@@ -5,7 +5,7 @@ class javax/swing/text/html/ParagraphView
  (Ljavax/swing/text/Element;)V
 calculateMinorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.ParagraphView)
 getAttributes
  ()Ljavax/swing/text/AttributeSet;
  ()Ljavax/swing/text/AttributeSet;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/html/StyleSheet.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/html/StyleSheet.eea
index 1ab3dfab2b..119b0d3371 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/html/StyleSheet.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/html/StyleSheet.eea
@@ -20,10 +20,10 @@ addStyleSheet
  (Ljavax/swing/text/html/StyleSheet;)V
 createLargeAttributeSet
  (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/MutableAttributeSet;
- (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/MutableAttributeSet;
+ (Ljavax/swing/text/AttributeSet;)L1javax/swing/text/MutableAttributeSet; # @Inherited(javax.swing.text.StyleContext)
 createSmallAttributeSet
  (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/StyleContext$SmallAttributeSet;
- (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/StyleContext$SmallAttributeSet;
+ (Ljavax/swing/text/AttributeSet;)L1javax/swing/text/StyleContext$SmallAttributeSet; # @Inherited(javax.swing.text.StyleContext)
 getBackground
  (Ljavax/swing/text/AttributeSet;)Ljava/awt/Color;
  (Ljavax/swing/text/AttributeSet;)Ljava/awt/Color;
@@ -32,7 +32,7 @@ getBase
  ()Ljava/net/URL;
 getBoxPainter
  (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/html/StyleSheet$BoxPainter;
- (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/html/StyleSheet$BoxPainter;
+ (Ljavax/swing/text/AttributeSet;)L1javax/swing/text/html/StyleSheet$BoxPainter;
 getDeclaration
  (Ljava/lang/String;)Ljavax/swing/text/AttributeSet;
  (Ljava/lang/String;)Ljavax/swing/text/AttributeSet;
@@ -44,22 +44,22 @@ getForeground
  (Ljavax/swing/text/AttributeSet;)Ljava/awt/Color;
 getListPainter
  (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/html/StyleSheet$ListPainter;
- (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/html/StyleSheet$ListPainter;
+ (Ljavax/swing/text/AttributeSet;)L1javax/swing/text/html/StyleSheet$ListPainter;
 getPointSize
  (Ljava/lang/String;)F
  (Ljava/lang/String;)F
 getRule
  (Ljava/lang/String;)Ljavax/swing/text/Style;
- (Ljava/lang/String;)Ljavax/swing/text/Style;
+ (Ljava/lang/String;)L0javax/swing/text/Style;
 getRule
  (Ljavax/swing/text/html/HTML$Tag;Ljavax/swing/text/Element;)Ljavax/swing/text/Style;
  (Ljavax/swing/text/html/HTML$Tag;Ljavax/swing/text/Element;)Ljavax/swing/text/Style;
 getStyleSheets
  ()[Ljavax/swing/text/html/StyleSheet;
- ()[Ljavax/swing/text/html/StyleSheet;
+ ()[0Ljavax/swing/text/html/StyleSheet;
 getViewAttributes
  (Ljavax/swing/text/View;)Ljavax/swing/text/AttributeSet;
- (Ljavax/swing/text/View;)Ljavax/swing/text/AttributeSet;
+ (Ljavax/swing/text/View;)L1javax/swing/text/AttributeSet;
 importStyleSheet
  (Ljava/net/URL;)V
  (Ljava/net/URL;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/html/TableView$RowView.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/html/TableView$RowView.eea
index 97026d3150..ee648bf7fb 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/html/TableView$RowView.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/html/TableView$RowView.eea
@@ -5,10 +5,10 @@ class javax/swing/text/html/TableView$RowView
  (Ljavax/swing/text/html/TableView;Ljavax/swing/text/Element;)V
 calculateMajorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.BoxView)
 calculateMinorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.BoxView)
 changedUpdate
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
@@ -20,7 +20,7 @@ getStyleSheet
  ()Ljavax/swing/text/html/StyleSheet;
 getViewAtPosition
  (ILjava/awt/Rectangle;)Ljavax/swing/text/View;
- (ILjava/awt/Rectangle;)Ljavax/swing/text/View;
+ (ILjava/awt/Rectangle;)L0javax/swing/text/View; # @Inherited(javax.swing.text.CompositeView)
 layoutMajorAxis
  (II[I[I)V
  (II[I[I)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/html/parser/AttributeList.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/html/parser/AttributeList.eea
index 54e1611eb9..e99866f038 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/html/parser/AttributeList.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/html/parser/AttributeList.eea
@@ -37,7 +37,7 @@ getValue
  ()Ljava/lang/String;
 getValues
  ()Ljava/util/Enumeration<*>;
- ()Ljava/util/Enumeration<*>;
+ ()L0java/util/Enumeration<*>;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/html/parser/ContentModel.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/html/parser/ContentModel.eea
index 89dcf577a8..c92e63b31e 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/html/parser/ContentModel.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/html/parser/ContentModel.eea
@@ -18,7 +18,7 @@ next
  (Ljavax/swing/text/html/parser/Element;)V
 first
  ()Ljavax/swing/text/html/parser/Element;
- ()Ljavax/swing/text/html/parser/Element;
+ ()L0javax/swing/text/html/parser/Element;
 first
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/html/parser/DTD.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/html/parser/DTD.eea
index 73ef37ed5f..f53d1809a3 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/html/parser/DTD.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/html/parser/DTD.eea
@@ -2,7 +2,7 @@ class javax/swing/text/html/parser/DTD
 
 getDTD
  (Ljava/lang/String;)Ljavax/swing/text/html/parser/DTD;
- (Ljava/lang/String;)Ljavax/swing/text/html/parser/DTD;
+ (Ljava/lang/String;)L1javax/swing/text/html/parser/DTD;
 putDTDHash
  (Ljava/lang/String;Ljavax/swing/text/html/parser/DTD;)V
  (Ljava/lang/String;Ljavax/swing/text/html/parser/DTD;)V
@@ -58,10 +58,10 @@ title
  (Ljava/lang/String;)V
 defAttributeList
  (Ljava/lang/String;IILjava/lang/String;Ljava/lang/String;Ljavax/swing/text/html/parser/AttributeList;)Ljavax/swing/text/html/parser/AttributeList;
- (Ljava/lang/String;IILjava/lang/String;Ljava/lang/String;Ljavax/swing/text/html/parser/AttributeList;)Ljavax/swing/text/html/parser/AttributeList;
+ (Ljava/lang/String;IILjava/lang/String;Ljava/lang/String;Ljavax/swing/text/html/parser/AttributeList;)L1javax/swing/text/html/parser/AttributeList;
 defContentModel
  (ILjava/lang/Object;Ljavax/swing/text/html/parser/ContentModel;)Ljavax/swing/text/html/parser/ContentModel;
- (ILjava/lang/Object;Ljavax/swing/text/html/parser/ContentModel;)Ljavax/swing/text/html/parser/ContentModel;
+ (ILjava/lang/Object;Ljavax/swing/text/html/parser/ContentModel;)L1javax/swing/text/html/parser/ContentModel;
 defElement
  (Ljava/lang/String;IZZLjavax/swing/text/html/parser/ContentModel;[Ljava/lang/String;[Ljava/lang/String;Ljavax/swing/text/html/parser/AttributeList;)Ljavax/swing/text/html/parser/Element;
  (Ljava/lang/String;IZZLjavax/swing/text/html/parser/ContentModel;[Ljava/lang/String;[Ljava/lang/String;Ljavax/swing/text/html/parser/AttributeList;)Ljavax/swing/text/html/parser/Element;
@@ -79,13 +79,13 @@ defineElement
  (Ljava/lang/String;IZZLjavax/swing/text/html/parser/ContentModel;Ljava/util/BitSet;Ljava/util/BitSet;Ljavax/swing/text/html/parser/AttributeList;)Ljavax/swing/text/html/parser/Element;
 defineEntity
  (Ljava/lang/String;I[C)Ljavax/swing/text/html/parser/Entity;
- (Ljava/lang/String;I[C)Ljavax/swing/text/html/parser/Entity;
+ (Ljava/lang/String;I[C)L1javax/swing/text/html/parser/Entity;
 getElement
  (I)Ljavax/swing/text/html/parser/Element;
  (I)Ljavax/swing/text/html/parser/Element;
 getElement
  (Ljava/lang/String;)Ljavax/swing/text/html/parser/Element;
- (Ljava/lang/String;)Ljavax/swing/text/html/parser/Element;
+ (Ljava/lang/String;)L1javax/swing/text/html/parser/Element;
 getEntity
  (I)Ljavax/swing/text/html/parser/Entity;
  (I)Ljavax/swing/text/html/parser/Entity;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/html/parser/Element.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/html/parser/Element.eea
index 8590071939..aa2fa88f5e 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/html/parser/Element.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/html/parser/Element.eea
@@ -25,10 +25,10 @@ name
 
 getAttribute
  (Ljava/lang/String;)Ljavax/swing/text/html/parser/AttributeList;
- (Ljava/lang/String;)Ljavax/swing/text/html/parser/AttributeList;
+ (Ljava/lang/String;)L0javax/swing/text/html/parser/AttributeList;
 getAttributeByValue
  (Ljava/lang/String;)Ljavax/swing/text/html/parser/AttributeList;
- (Ljava/lang/String;)Ljavax/swing/text/html/parser/AttributeList;
+ (Ljava/lang/String;)L0javax/swing/text/html/parser/AttributeList;
 getAttributes
  ()Ljavax/swing/text/html/parser/AttributeList;
  ()Ljavax/swing/text/html/parser/AttributeList;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/html/parser/Parser.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/html/parser/Parser.eea
index 1b1a07657e..8b291a0e2d 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/html/parser/Parser.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/html/parser/Parser.eea
@@ -48,7 +48,7 @@ makeTag
  (Ljavax/swing/text/html/parser/Element;)Ljavax/swing/text/html/parser/TagElement;
 makeTag
  (Ljavax/swing/text/html/parser/Element;Z)Ljavax/swing/text/html/parser/TagElement;
- (Ljavax/swing/text/html/parser/Element;Z)Ljavax/swing/text/html/parser/TagElement;
+ (Ljavax/swing/text/html/parser/Element;Z)L1javax/swing/text/html/parser/TagElement;
 markFirstTime
  (Ljavax/swing/text/html/parser/Element;)V
  (Ljavax/swing/text/html/parser/Element;)V
@@ -57,7 +57,7 @@ parse
  (Ljava/io/Reader;)V
 parseDTDMarkup
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 parseMarkupDeclarations
  (Ljava/lang/StringBuffer;)Z
  (Ljava/lang/StringBuffer;)Z
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/html/parser/ParserDelegator.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/html/parser/ParserDelegator.eea
index b310038faa..b46d9d95d0 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/html/parser/ParserDelegator.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/html/parser/ParserDelegator.eea
@@ -2,7 +2,7 @@ class javax/swing/text/html/parser/ParserDelegator
 
 createDTD
  (Ljavax/swing/text/html/parser/DTD;Ljava/lang/String;)Ljavax/swing/text/html/parser/DTD;
- (Ljavax/swing/text/html/parser/DTD;Ljava/lang/String;)Ljavax/swing/text/html/parser/DTD;
+ (Ljavax/swing/text/html/parser/DTD;Ljava/lang/String;)L1javax/swing/text/html/parser/DTD;
 
 parse
  (Ljava/io/Reader;Ljavax/swing/text/html/HTMLEditorKit$ParserCallback;Z)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/text/rtf/RTFEditorKit.eea b/libs/eea-java-11/src/main/resources/javax/swing/text/rtf/RTFEditorKit.eea
index f45a9617fa..8f83af82a9 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/text/rtf/RTFEditorKit.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/text/rtf/RTFEditorKit.eea
@@ -2,7 +2,7 @@ class javax/swing/text/rtf/RTFEditorKit
 
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.text.DefaultEditorKit)
 read
  (Ljava/io/InputStream;Ljavax/swing/text/Document;I)V
  (Ljava/io/InputStream;Ljavax/swing/text/Document;I)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/tree/AbstractLayoutCache.eea b/libs/eea-java-11/src/main/resources/javax/swing/tree/AbstractLayoutCache.eea
index 24a9d1a1b2..9e584778ea 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/tree/AbstractLayoutCache.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/tree/AbstractLayoutCache.eea
@@ -24,7 +24,7 @@ getNodeDimensions
  ()Ljavax/swing/tree/AbstractLayoutCache$NodeDimensions;
 getNodeDimensions
  (Ljava/lang/Object;IIZLjava/awt/Rectangle;)Ljava/awt/Rectangle;
- (Ljava/lang/Object;IIZLjava/awt/Rectangle;)Ljava/awt/Rectangle;
+ (Ljava/lang/Object;IIZLjava/awt/Rectangle;)L0java/awt/Rectangle;
 getPathClosestTo
  (II)Ljavax/swing/tree/TreePath;
  (II)Ljavax/swing/tree/TreePath;
@@ -39,7 +39,7 @@ getRowForPath
  (Ljavax/swing/tree/TreePath;)I
 getRowsForPaths
  ([Ljavax/swing/tree/TreePath;)[I
- ([Ljavax/swing/tree/TreePath;)[I
+ ([Ljavax/swing/tree/TreePath;)[I # @PolyNull
 getSelectionModel
  ()Ljavax/swing/tree/TreeSelectionModel;
  ()Ljavax/swing/tree/TreeSelectionModel;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/tree/DefaultMutableTreeNode.eea b/libs/eea-java-11/src/main/resources/javax/swing/tree/DefaultMutableTreeNode.eea
index e53cb425a9..20bf4b9836 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/tree/DefaultMutableTreeNode.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/tree/DefaultMutableTreeNode.eea
@@ -25,7 +25,7 @@ add
  (Ljavax/swing/tree/MutableTreeNode;)V
 breadthFirstEnumeration
  ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
- ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
+ ()L1java/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
 children
  ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
  ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
@@ -37,13 +37,13 @@ depthFirstEnumeration
  ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
 getChildAfter
  (Ljavax/swing/tree/TreeNode;)Ljavax/swing/tree/TreeNode;
- (Ljavax/swing/tree/TreeNode;)Ljavax/swing/tree/TreeNode;
+ (Ljavax/swing/tree/TreeNode;)L0javax/swing/tree/TreeNode;
 getChildAt
  (I)Ljavax/swing/tree/TreeNode;
  (I)Ljavax/swing/tree/TreeNode;
 getChildBefore
  (Ljavax/swing/tree/TreeNode;)Ljavax/swing/tree/TreeNode;
- (Ljavax/swing/tree/TreeNode;)Ljavax/swing/tree/TreeNode;
+ (Ljavax/swing/tree/TreeNode;)L0javax/swing/tree/TreeNode;
 getFirstChild
  ()Ljavax/swing/tree/TreeNode;
  ()Ljavax/swing/tree/TreeNode;
@@ -61,10 +61,10 @@ getLastLeaf
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
 getNextLeaf
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
- ()Ljavax/swing/tree/DefaultMutableTreeNode;
+ ()L0javax/swing/tree/DefaultMutableTreeNode;
 getNextNode
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
- ()Ljavax/swing/tree/DefaultMutableTreeNode;
+ ()L0javax/swing/tree/DefaultMutableTreeNode;
 getNextSibling
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
@@ -76,13 +76,13 @@ getPath
  ()[Ljavax/swing/tree/TreeNode;
 getPathToRoot
  (Ljavax/swing/tree/TreeNode;I)[Ljavax/swing/tree/TreeNode;
- (Ljavax/swing/tree/TreeNode;I)[Ljavax/swing/tree/TreeNode;
+ (Ljavax/swing/tree/TreeNode;I)[0Ljavax/swing/tree/TreeNode;
 getPreviousLeaf
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
- ()Ljavax/swing/tree/DefaultMutableTreeNode;
+ ()L0javax/swing/tree/DefaultMutableTreeNode;
 getPreviousNode
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
- ()Ljavax/swing/tree/DefaultMutableTreeNode;
+ ()L0javax/swing/tree/DefaultMutableTreeNode;
 getPreviousSibling
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
@@ -91,13 +91,13 @@ getRoot
  ()Ljavax/swing/tree/TreeNode;
 getSharedAncestor
  (Ljavax/swing/tree/DefaultMutableTreeNode;)Ljavax/swing/tree/TreeNode;
- (Ljavax/swing/tree/DefaultMutableTreeNode;)Ljavax/swing/tree/TreeNode;
+ (Ljavax/swing/tree/DefaultMutableTreeNode;)L0javax/swing/tree/TreeNode;
 getUserObject
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
 getUserObjectPath
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[1Ljava/lang/Object;
 insert
  (Ljavax/swing/tree/MutableTreeNode;I)V
  (Ljavax/swing/tree/MutableTreeNode;I)V
@@ -118,13 +118,13 @@ isNodeSibling
  (Ljavax/swing/tree/TreeNode;)Z
 pathFromAncestorEnumeration
  (Ljavax/swing/tree/TreeNode;)Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
- (Ljavax/swing/tree/TreeNode;)Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
+ (Ljavax/swing/tree/TreeNode;)L1java/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
 postorderEnumeration
  ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
- ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
+ ()L1java/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
 preorderEnumeration
  ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
- ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
+ ()L1java/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
 remove
  (Ljavax/swing/tree/MutableTreeNode;)V
  (Ljavax/swing/tree/MutableTreeNode;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/tree/DefaultTreeCellEditor.eea b/libs/eea-java-11/src/main/resources/javax/swing/tree/DefaultTreeCellEditor.eea
index e4ec8ceb20..81cef5e884 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/tree/DefaultTreeCellEditor.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/tree/DefaultTreeCellEditor.eea
@@ -48,10 +48,10 @@ canEditImmediately
  (Ljava/util/EventObject;)Z
 createContainer
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L1java/awt/Container;
 createTreeCellEditor
  ()Ljavax/swing/tree/TreeCellEditor;
- ()Ljavax/swing/tree/TreeCellEditor;
+ ()L1javax/swing/tree/TreeCellEditor;
 determineOffset
  (Ljavax/swing/JTree;Ljava/lang/Object;ZZZI)V
  (Ljavax/swing/JTree;Ljava/lang/Object;ZZZI)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/tree/DefaultTreeModel.eea b/libs/eea-java-11/src/main/resources/javax/swing/tree/DefaultTreeModel.eea
index 6ff14ee4c1..51e5425857 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/tree/DefaultTreeModel.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/tree/DefaultTreeModel.eea
@@ -45,7 +45,7 @@ getPathToRoot
  (Ljavax/swing/tree/TreeNode;)[Ljavax/swing/tree/TreeNode;
 getPathToRoot
  (Ljavax/swing/tree/TreeNode;I)[Ljavax/swing/tree/TreeNode;
- (Ljavax/swing/tree/TreeNode;I)[Ljavax/swing/tree/TreeNode;
+ (Ljavax/swing/tree/TreeNode;I)[0Ljavax/swing/tree/TreeNode;
 getRoot
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/tree/DefaultTreeSelectionModel.eea b/libs/eea-java-11/src/main/resources/javax/swing/tree/DefaultTreeSelectionModel.eea
index f61770361c..98c8fc41a5 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/tree/DefaultTreeSelectionModel.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/tree/DefaultTreeSelectionModel.eea
@@ -64,13 +64,13 @@ getRowMapper
  ()Ljavax/swing/tree/RowMapper;
 getSelectionPath
  ()Ljavax/swing/tree/TreePath;
- ()Ljavax/swing/tree/TreePath;
+ ()L0javax/swing/tree/TreePath;
 getSelectionPaths
  ()[Ljavax/swing/tree/TreePath;
- ()[Ljavax/swing/tree/TreePath;
+ ()[1Ljavax/swing/tree/TreePath;
 getSelectionRows
  ()[I
- ()[I
+ ()[1I
 getTreeSelectionListeners
  ()[Ljavax/swing/event/TreeSelectionListener;
  ()[Ljavax/swing/event/TreeSelectionListener;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/tree/FixedHeightLayoutCache.eea b/libs/eea-java-11/src/main/resources/javax/swing/tree/FixedHeightLayoutCache.eea
index 85b2b881f6..778ab74267 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/tree/FixedHeightLayoutCache.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/tree/FixedHeightLayoutCache.eea
@@ -2,16 +2,16 @@ class javax/swing/tree/FixedHeightLayoutCache
 
 getBounds
  (Ljavax/swing/tree/TreePath;Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
- (Ljavax/swing/tree/TreePath;Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
+ (Ljavax/swing/tree/TreePath;Ljava/awt/Rectangle;)L0java/awt/Rectangle;
 getExpandedState
  (Ljavax/swing/tree/TreePath;)Z
  (Ljavax/swing/tree/TreePath;)Z
 getPathClosestTo
  (II)Ljavax/swing/tree/TreePath;
- (II)Ljavax/swing/tree/TreePath;
+ (II)L0javax/swing/tree/TreePath;
 getPathForRow
  (I)Ljavax/swing/tree/TreePath;
- (I)Ljavax/swing/tree/TreePath;
+ (I)L0javax/swing/tree/TreePath;
 getRowForPath
  (Ljavax/swing/tree/TreePath;)I
  (Ljavax/swing/tree/TreePath;)I
@@ -20,7 +20,7 @@ getVisibleChildCount
  (Ljavax/swing/tree/TreePath;)I
 getVisiblePathsFrom
  (Ljavax/swing/tree/TreePath;)Ljava/util/Enumeration<Ljavax/swing/tree/TreePath;>;
- (Ljavax/swing/tree/TreePath;)Ljava/util/Enumeration<Ljavax/swing/tree/TreePath;>;
+ (Ljavax/swing/tree/TreePath;)L0java/util/Enumeration<Ljavax/swing/tree/TreePath;>;
 invalidatePathBounds
  (Ljavax/swing/tree/TreePath;)V
  (Ljavax/swing/tree/TreePath;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/tree/TreePath.eea b/libs/eea-java-11/src/main/resources/javax/swing/tree/TreePath.eea
index fb9d151197..88b86f83cf 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/tree/TreePath.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/tree/TreePath.eea
@@ -23,7 +23,7 @@ getParentPath
  ()Ljavax/swing/tree/TreePath;
 getPath
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[1Ljava/lang/Object;
 getPathComponent
  (I)Ljava/lang/Object;
  (I)Ljava/lang/Object;
@@ -32,7 +32,7 @@ isDescendant
  (Ljavax/swing/tree/TreePath;)Z
 pathByAddingChild
  (Ljava/lang/Object;)Ljavax/swing/tree/TreePath;
- (Ljava/lang/Object;)Ljavax/swing/tree/TreePath;
+ (Ljava/lang/Object;)L1javax/swing/tree/TreePath;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/tree/VariableHeightLayoutCache.eea b/libs/eea-java-11/src/main/resources/javax/swing/tree/VariableHeightLayoutCache.eea
index 0c7ebf33ff..a8f7b0ac88 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/tree/VariableHeightLayoutCache.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/tree/VariableHeightLayoutCache.eea
@@ -2,16 +2,16 @@ class javax/swing/tree/VariableHeightLayoutCache
 
 getBounds
  (Ljavax/swing/tree/TreePath;Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
- (Ljavax/swing/tree/TreePath;Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
+ (Ljavax/swing/tree/TreePath;Ljava/awt/Rectangle;)L0java/awt/Rectangle;
 getExpandedState
  (Ljavax/swing/tree/TreePath;)Z
  (Ljavax/swing/tree/TreePath;)Z
 getPathClosestTo
  (II)Ljavax/swing/tree/TreePath;
- (II)Ljavax/swing/tree/TreePath;
+ (II)L0javax/swing/tree/TreePath;
 getPathForRow
  (I)Ljavax/swing/tree/TreePath;
- (I)Ljavax/swing/tree/TreePath;
+ (I)L0javax/swing/tree/TreePath;
 getPreferredWidth
  (Ljava/awt/Rectangle;)I
  (Ljava/awt/Rectangle;)I
@@ -23,7 +23,7 @@ getVisibleChildCount
  (Ljavax/swing/tree/TreePath;)I
 getVisiblePathsFrom
  (Ljavax/swing/tree/TreePath;)Ljava/util/Enumeration<Ljavax/swing/tree/TreePath;>;
- (Ljavax/swing/tree/TreePath;)Ljava/util/Enumeration<Ljavax/swing/tree/TreePath;>;
+ (Ljavax/swing/tree/TreePath;)L0java/util/Enumeration<Ljavax/swing/tree/TreePath;>;
 invalidatePathBounds
  (Ljavax/swing/tree/TreePath;)V
  (Ljavax/swing/tree/TreePath;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/undo/AbstractUndoableEdit.eea b/libs/eea-java-11/src/main/resources/javax/swing/undo/AbstractUndoableEdit.eea
index f4dc75513b..61f7013a6a 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/undo/AbstractUndoableEdit.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/undo/AbstractUndoableEdit.eea
@@ -12,7 +12,7 @@ addEdit
  (Ljavax/swing/undo/UndoableEdit;)Z
 getPresentationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getRedoPresentationName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/undo/CompoundEdit.eea b/libs/eea-java-11/src/main/resources/javax/swing/undo/CompoundEdit.eea
index a1eb0144e1..f253090e1c 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/undo/CompoundEdit.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/undo/CompoundEdit.eea
@@ -9,7 +9,7 @@ addEdit
  (Ljavax/swing/undo/UndoableEdit;)Z
 getPresentationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.undo.AbstractUndoableEdit)
 getRedoPresentationName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -18,7 +18,7 @@ getUndoPresentationName
  ()Ljava/lang/String;
 lastEdit
  ()Ljavax/swing/undo/UndoableEdit;
- ()Ljavax/swing/undo/UndoableEdit;
+ ()L0javax/swing/undo/UndoableEdit;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(javax.swing.undo.AbstractUndoableEdit)
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/undo/StateEdit.eea b/libs/eea-java-11/src/main/resources/javax/swing/undo/StateEdit.eea
index d306f4d53f..8736a7920d 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/undo/StateEdit.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/undo/StateEdit.eea
@@ -25,7 +25,7 @@ undoRedoName
  (Ljavax/swing/undo/StateEditable;Ljava/lang/String;)V
 getPresentationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.undo.AbstractUndoableEdit)
 init
  (Ljavax/swing/undo/StateEditable;Ljava/lang/String;)V
  (Ljavax/swing/undo/StateEditable;Ljava/lang/String;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/undo/UndoManager.eea b/libs/eea-java-11/src/main/resources/javax/swing/undo/UndoManager.eea
index 215f924e78..a32cf35d53 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/undo/UndoManager.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/undo/UndoManager.eea
@@ -5,10 +5,10 @@ addEdit
  (Ljavax/swing/undo/UndoableEdit;)Z
 editToBeRedone
  ()Ljavax/swing/undo/UndoableEdit;
- ()Ljavax/swing/undo/UndoableEdit;
+ ()L0javax/swing/undo/UndoableEdit;
 editToBeUndone
  ()Ljavax/swing/undo/UndoableEdit;
- ()Ljavax/swing/undo/UndoableEdit;
+ ()L0javax/swing/undo/UndoableEdit;
 getRedoPresentationName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/javax/swing/undo/UndoableEditSupport.eea b/libs/eea-java-11/src/main/resources/javax/swing/undo/UndoableEditSupport.eea
index 986e5864e4..4002a4a243 100644
--- a/libs/eea-java-11/src/main/resources/javax/swing/undo/UndoableEditSupport.eea
+++ b/libs/eea-java-11/src/main/resources/javax/swing/undo/UndoableEditSupport.eea
@@ -21,7 +21,7 @@ addUndoableEditListener
  (L1javax/swing/event/UndoableEditListener;)V
 createCompoundEdit
  ()Ljavax/swing/undo/CompoundEdit;
- ()Ljavax/swing/undo/CompoundEdit;
+ ()L1javax/swing/undo/CompoundEdit;
 getUndoableEditListeners
  ()[Ljavax/swing/event/UndoableEditListener;
  ()[Ljavax/swing/event/UndoableEditListener;
diff --git a/libs/eea-java-11/src/main/resources/javax/tools/ForwardingJavaFileManager.eea b/libs/eea-java-11/src/main/resources/javax/tools/ForwardingJavaFileManager.eea
index 1f246f2390..0a2bcb781d 100644
--- a/libs/eea-java-11/src/main/resources/javax/tools/ForwardingJavaFileManager.eea
+++ b/libs/eea-java-11/src/main/resources/javax/tools/ForwardingJavaFileManager.eea
@@ -29,13 +29,13 @@ getJavaFileForOutput
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;Ljavax/tools/JavaFileObject$Kind;Ljavax/tools/FileObject;)Ljavax/tools/JavaFileObject;
 getLocationForModule
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;)Ljavax/tools/JavaFileManager$Location;
- (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;)Ljavax/tools/JavaFileManager$Location;
+ (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;)L1javax/tools/JavaFileManager$Location; # @Inherited(javax.tools.JavaFileManager)
 getLocationForModule
  (Ljavax/tools/JavaFileManager$Location;Ljavax/tools/JavaFileObject;)Ljavax/tools/JavaFileManager$Location;
- (Ljavax/tools/JavaFileManager$Location;Ljavax/tools/JavaFileObject;)Ljavax/tools/JavaFileManager$Location;
+ (Ljavax/tools/JavaFileManager$Location;Ljavax/tools/JavaFileObject;)L1javax/tools/JavaFileManager$Location; # @Inherited(javax.tools.JavaFileManager)
 getServiceLoader
  <S:Ljava/lang/Object;>(Ljavax/tools/JavaFileManager$Location;Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
- <S:Ljava/lang/Object;>(Ljavax/tools/JavaFileManager$Location;Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
+ <S:Ljava/lang/Object;>(Ljavax/tools/JavaFileManager$Location;Ljava/lang/Class<TS;>;)L1java/util/ServiceLoader<TS;>; # @Inherited(javax.tools.JavaFileManager)
 handleOption
  (Ljava/lang/String;Ljava/util/Iterator<Ljava/lang/String;>;)Z
  (Ljava/lang/String;Ljava/util/Iterator<Ljava/lang/String;>;)Z
@@ -47,7 +47,7 @@ inferBinaryName
  (Ljavax/tools/JavaFileManager$Location;Ljavax/tools/JavaFileObject;)Ljava/lang/String;
 inferModuleName
  (Ljavax/tools/JavaFileManager$Location;)Ljava/lang/String;
- (Ljavax/tools/JavaFileManager$Location;)Ljava/lang/String;
+ (Ljavax/tools/JavaFileManager$Location;)L1java/lang/String; # @Inherited(javax.tools.JavaFileManager)
 isSameFile
  (Ljavax/tools/FileObject;Ljavax/tools/FileObject;)Z
  (Ljavax/tools/FileObject;Ljavax/tools/FileObject;)Z
@@ -59,4 +59,4 @@ list
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;Ljava/util/Set<Ljavax/tools/JavaFileObject$Kind;>;Z)Ljava/lang/Iterable<Ljavax/tools/JavaFileObject;>;
 listLocationsForModules
  (Ljavax/tools/JavaFileManager$Location;)Ljava/lang/Iterable<Ljava/util/Set<Ljavax/tools/JavaFileManager$Location;>;>;
- (Ljavax/tools/JavaFileManager$Location;)Ljava/lang/Iterable<Ljava/util/Set<Ljavax/tools/JavaFileManager$Location;>;>;
+ (Ljavax/tools/JavaFileManager$Location;)L1java/lang/Iterable<Ljava/util/Set<Ljavax/tools/JavaFileManager$Location;>;>; # @Inherited(javax.tools.JavaFileManager)
diff --git a/libs/eea-java-11/src/main/resources/javax/tools/JavaFileManager.eea b/libs/eea-java-11/src/main/resources/javax/tools/JavaFileManager.eea
index 1ff9286358..b4838968ff 100644
--- a/libs/eea-java-11/src/main/resources/javax/tools/JavaFileManager.eea
+++ b/libs/eea-java-11/src/main/resources/javax/tools/JavaFileManager.eea
@@ -20,13 +20,13 @@ getJavaFileForOutput
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;Ljavax/tools/JavaFileObject$Kind;Ljavax/tools/FileObject;)Ljavax/tools/JavaFileObject;
 getLocationForModule
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;)Ljavax/tools/JavaFileManager$Location;
- (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;)Ljavax/tools/JavaFileManager$Location;
+ (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;)L1javax/tools/JavaFileManager$Location;
 getLocationForModule
  (Ljavax/tools/JavaFileManager$Location;Ljavax/tools/JavaFileObject;)Ljavax/tools/JavaFileManager$Location;
- (Ljavax/tools/JavaFileManager$Location;Ljavax/tools/JavaFileObject;)Ljavax/tools/JavaFileManager$Location;
+ (Ljavax/tools/JavaFileManager$Location;Ljavax/tools/JavaFileObject;)L1javax/tools/JavaFileManager$Location;
 getServiceLoader
  <S:Ljava/lang/Object;>(Ljavax/tools/JavaFileManager$Location;Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
- <S:Ljava/lang/Object;>(Ljavax/tools/JavaFileManager$Location;Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
+ <S:Ljava/lang/Object;>(Ljavax/tools/JavaFileManager$Location;Ljava/lang/Class<TS;>;)L1java/util/ServiceLoader<TS;>;
 handleOption
  (Ljava/lang/String;Ljava/util/Iterator<Ljava/lang/String;>;)Z
  (Ljava/lang/String;Ljava/util/Iterator<Ljava/lang/String;>;)Z
@@ -38,7 +38,7 @@ inferBinaryName
  (Ljavax/tools/JavaFileManager$Location;Ljavax/tools/JavaFileObject;)Ljava/lang/String;
 inferModuleName
  (Ljavax/tools/JavaFileManager$Location;)Ljava/lang/String;
- (Ljavax/tools/JavaFileManager$Location;)Ljava/lang/String;
+ (Ljavax/tools/JavaFileManager$Location;)L1java/lang/String;
 isSameFile
  (Ljavax/tools/FileObject;Ljavax/tools/FileObject;)Z
  (Ljavax/tools/FileObject;Ljavax/tools/FileObject;)Z
@@ -47,4 +47,4 @@ list
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;Ljava/util/Set<Ljavax/tools/JavaFileObject$Kind;>;Z)Ljava/lang/Iterable<Ljavax/tools/JavaFileObject;>;
 listLocationsForModules
  (Ljavax/tools/JavaFileManager$Location;)Ljava/lang/Iterable<Ljava/util/Set<Ljavax/tools/JavaFileManager$Location;>;>;
- (Ljavax/tools/JavaFileManager$Location;)Ljava/lang/Iterable<Ljava/util/Set<Ljavax/tools/JavaFileManager$Location;>;>;
+ (Ljavax/tools/JavaFileManager$Location;)L1java/lang/Iterable<Ljava/util/Set<Ljavax/tools/JavaFileManager$Location;>;>;
diff --git a/libs/eea-java-11/src/main/resources/javax/tools/SimpleJavaFileObject.eea b/libs/eea-java-11/src/main/resources/javax/tools/SimpleJavaFileObject.eea
index 623fc92f89..b128217582 100644
--- a/libs/eea-java-11/src/main/resources/javax/tools/SimpleJavaFileObject.eea
+++ b/libs/eea-java-11/src/main/resources/javax/tools/SimpleJavaFileObject.eea
@@ -12,10 +12,10 @@ uri
  (Ljava/net/URI;Ljavax/tools/JavaFileObject$Kind;)V
 getAccessLevel
  ()Ljavax/lang/model/element/Modifier;
- ()Ljavax/lang/model/element/Modifier;
+ ()L0javax/lang/model/element/Modifier;
 getCharContent
  (Z)Ljava/lang/CharSequence;
- (Z)Ljava/lang/CharSequence;
+ (Z)L1java/lang/CharSequence;
 getKind
  ()Ljavax/tools/JavaFileObject$Kind;
  ()Ljavax/tools/JavaFileObject$Kind;
@@ -24,7 +24,7 @@ getName
  ()Ljava/lang/String;
 getNestingKind
  ()Ljavax/lang/model/element/NestingKind;
- ()Ljavax/lang/model/element/NestingKind;
+ ()L0javax/lang/model/element/NestingKind;
 isNameCompatible
  (Ljava/lang/String;Ljavax/tools/JavaFileObject$Kind;)Z
  (Ljava/lang/String;Ljavax/tools/JavaFileObject$Kind;)Z
@@ -36,7 +36,7 @@ openOutputStream
  ()L1java/io/OutputStream; # @Inherited(javax.tools.FileObject)
 openReader
  (Z)Ljava/io/Reader;
- (Z)Ljava/io/Reader;
+ (Z)L1java/io/Reader;
 openWriter
  ()Ljava/io/Writer;
  ()L1java/io/Writer; # @Inherited(javax.tools.FileObject)
diff --git a/libs/eea-java-11/src/main/resources/javax/tools/StandardJavaFileManager.eea b/libs/eea-java-11/src/main/resources/javax/tools/StandardJavaFileManager.eea
index 233f6c3552..c2d74de052 100644
--- a/libs/eea-java-11/src/main/resources/javax/tools/StandardJavaFileManager.eea
+++ b/libs/eea-java-11/src/main/resources/javax/tools/StandardJavaFileManager.eea
@@ -2,7 +2,7 @@ class javax/tools/StandardJavaFileManager
 
 asPath
  (Ljavax/tools/FileObject;)Ljava/nio/file/Path;
- (Ljavax/tools/FileObject;)Ljava/nio/file/Path;
+ (Ljavax/tools/FileObject;)L1java/nio/file/Path;
 getJavaFileObjects
  ([Ljava/io/File;)Ljava/lang/Iterable<+Ljavax/tools/JavaFileObject;>;
  ([Ljava/io/File;)Ljava/lang/Iterable<+Ljavax/tools/JavaFileObject;>;
diff --git a/libs/eea-java-11/src/main/resources/javax/tools/Tool.eea b/libs/eea-java-11/src/main/resources/javax/tools/Tool.eea
index 1e7dfab261..cc81fcd861 100644
--- a/libs/eea-java-11/src/main/resources/javax/tools/Tool.eea
+++ b/libs/eea-java-11/src/main/resources/javax/tools/Tool.eea
@@ -5,7 +5,7 @@ getSourceVersions
  ()Ljava/util/Set<Ljavax/lang/model/SourceVersion;>;
 name
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 run
  (Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/io/OutputStream;[Ljava/lang/String;)I
  (Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/io/OutputStream;[Ljava/lang/String;)I
diff --git a/libs/eea-java-11/src/main/resources/javax/tools/ToolProvider.eea b/libs/eea-java-11/src/main/resources/javax/tools/ToolProvider.eea
index 03296df3c9..a1132393e0 100644
--- a/libs/eea-java-11/src/main/resources/javax/tools/ToolProvider.eea
+++ b/libs/eea-java-11/src/main/resources/javax/tools/ToolProvider.eea
@@ -8,4 +8,4 @@ getSystemJavaCompiler
  ()Ljavax/tools/JavaCompiler;
 getSystemToolClassLoader
  ()Ljava/lang/ClassLoader;
- ()Ljava/lang/ClassLoader;
+ ()L0java/lang/ClassLoader;
diff --git a/libs/eea-java-11/src/main/resources/javax/xml/catalog/CatalogFeatures.eea b/libs/eea-java-11/src/main/resources/javax/xml/catalog/CatalogFeatures.eea
index 32f8cf4486..ede3b59a03 100644
--- a/libs/eea-java-11/src/main/resources/javax/xml/catalog/CatalogFeatures.eea
+++ b/libs/eea-java-11/src/main/resources/javax/xml/catalog/CatalogFeatures.eea
@@ -2,7 +2,7 @@ class javax/xml/catalog/CatalogFeatures
 
 builder
  ()Ljavax/xml/catalog/CatalogFeatures$Builder;
- ()Ljavax/xml/catalog/CatalogFeatures$Builder;
+ ()L1javax/xml/catalog/CatalogFeatures$Builder;
 defaults
  ()Ljavax/xml/catalog/CatalogFeatures;
  ()Ljavax/xml/catalog/CatalogFeatures;
diff --git a/libs/eea-java-11/src/main/resources/javax/xml/catalog/CatalogManager.eea b/libs/eea-java-11/src/main/resources/javax/xml/catalog/CatalogManager.eea
index be92fd5a79..3f891bea06 100644
--- a/libs/eea-java-11/src/main/resources/javax/xml/catalog/CatalogManager.eea
+++ b/libs/eea-java-11/src/main/resources/javax/xml/catalog/CatalogManager.eea
@@ -2,10 +2,10 @@ class javax/xml/catalog/CatalogManager
 
 catalog
  (Ljavax/xml/catalog/CatalogFeatures;[Ljava/net/URI;)Ljavax/xml/catalog/Catalog;
- (Ljavax/xml/catalog/CatalogFeatures;[Ljava/net/URI;)Ljavax/xml/catalog/Catalog;
+ (Ljavax/xml/catalog/CatalogFeatures;[Ljava/net/URI;)L1javax/xml/catalog/Catalog;
 catalogResolver
  (Ljavax/xml/catalog/Catalog;)Ljavax/xml/catalog/CatalogResolver;
- (Ljavax/xml/catalog/Catalog;)Ljavax/xml/catalog/CatalogResolver;
+ (Ljavax/xml/catalog/Catalog;)L1javax/xml/catalog/CatalogResolver;
 catalogResolver
  (Ljavax/xml/catalog/CatalogFeatures;[Ljava/net/URI;)Ljavax/xml/catalog/CatalogResolver;
- (Ljavax/xml/catalog/CatalogFeatures;[Ljava/net/URI;)Ljavax/xml/catalog/CatalogResolver;
+ (Ljavax/xml/catalog/CatalogFeatures;[Ljava/net/URI;)L1javax/xml/catalog/CatalogResolver;
diff --git a/libs/eea-java-11/src/main/resources/javax/xml/catalog/GroupEntry$ResolveType.eea b/libs/eea-java-11/src/main/resources/javax/xml/catalog/GroupEntry$ResolveType.eea
index 6703a6de7a..db6bdcd020 100644
--- a/libs/eea-java-11/src/main/resources/javax/xml/catalog/GroupEntry$ResolveType.eea
+++ b/libs/eea-java-11/src/main/resources/javax/xml/catalog/GroupEntry$ResolveType.eea
@@ -6,7 +6,7 @@ super java/lang/Enum
 
 getType
  (Ljava/lang/String;)Ljavax/xml/catalog/GroupEntry$ResolveType;
- (Ljava/lang/String;)Ljavax/xml/catalog/GroupEntry$ResolveType;
+ (Ljava/lang/String;)L0javax/xml/catalog/GroupEntry$ResolveType;
 
 isType
  (Ljava/lang/String;)Z
diff --git a/libs/eea-java-11/src/main/resources/javax/xml/crypto/KeySelector.eea b/libs/eea-java-11/src/main/resources/javax/xml/crypto/KeySelector.eea
index ad0a2e4698..a2308507cf 100644
--- a/libs/eea-java-11/src/main/resources/javax/xml/crypto/KeySelector.eea
+++ b/libs/eea-java-11/src/main/resources/javax/xml/crypto/KeySelector.eea
@@ -2,7 +2,7 @@ class javax/xml/crypto/KeySelector
 
 singletonKeySelector
  (Ljava/security/Key;)Ljavax/xml/crypto/KeySelector;
- (Ljava/security/Key;)Ljavax/xml/crypto/KeySelector;
+ (Ljava/security/Key;)L1javax/xml/crypto/KeySelector;
 
 select
  (Ljavax/xml/crypto/dsig/keyinfo/KeyInfo;Ljavax/xml/crypto/KeySelector$Purpose;Ljavax/xml/crypto/AlgorithmMethod;Ljavax/xml/crypto/XMLCryptoContext;)Ljavax/xml/crypto/KeySelectorResult;
diff --git a/libs/eea-java-11/src/main/resources/javax/xml/datatype/DatatypeFactory.eea b/libs/eea-java-11/src/main/resources/javax/xml/datatype/DatatypeFactory.eea
index e7ba0eda22..0d25933fa1 100644
--- a/libs/eea-java-11/src/main/resources/javax/xml/datatype/DatatypeFactory.eea
+++ b/libs/eea-java-11/src/main/resources/javax/xml/datatype/DatatypeFactory.eea
@@ -9,7 +9,7 @@ DATATYPEFACTORY_PROPERTY
 
 newDefaultInstance
  ()Ljavax/xml/datatype/DatatypeFactory;
- ()Ljavax/xml/datatype/DatatypeFactory;
+ ()L1javax/xml/datatype/DatatypeFactory;
 newInstance
  ()Ljavax/xml/datatype/DatatypeFactory;
  ()Ljavax/xml/datatype/DatatypeFactory;
diff --git a/libs/eea-java-11/src/main/resources/javax/xml/parsers/DocumentBuilderFactory.eea b/libs/eea-java-11/src/main/resources/javax/xml/parsers/DocumentBuilderFactory.eea
index 03b8b7e7d8..4579596bc1 100644
--- a/libs/eea-java-11/src/main/resources/javax/xml/parsers/DocumentBuilderFactory.eea
+++ b/libs/eea-java-11/src/main/resources/javax/xml/parsers/DocumentBuilderFactory.eea
@@ -2,7 +2,7 @@ class javax/xml/parsers/DocumentBuilderFactory
 
 newDefaultInstance
  ()Ljavax/xml/parsers/DocumentBuilderFactory;
- ()Ljavax/xml/parsers/DocumentBuilderFactory;
+ ()L1javax/xml/parsers/DocumentBuilderFactory;
 newInstance
  ()Ljavax/xml/parsers/DocumentBuilderFactory;
  ()Ljavax/xml/parsers/DocumentBuilderFactory;
@@ -18,7 +18,7 @@ getFeature
  (Ljava/lang/String;)Z
 getSchema
  ()Ljavax/xml/validation/Schema;
- ()Ljavax/xml/validation/Schema;
+ ()L1javax/xml/validation/Schema;
 newDocumentBuilder
  ()Ljavax/xml/parsers/DocumentBuilder;
  ()Ljavax/xml/parsers/DocumentBuilder;
diff --git a/libs/eea-java-11/src/main/resources/javax/xml/parsers/SAXParser.eea b/libs/eea-java-11/src/main/resources/javax/xml/parsers/SAXParser.eea
index 94dbf9ee2a..e5409c4f1e 100644
--- a/libs/eea-java-11/src/main/resources/javax/xml/parsers/SAXParser.eea
+++ b/libs/eea-java-11/src/main/resources/javax/xml/parsers/SAXParser.eea
@@ -8,7 +8,7 @@ getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
 getSchema
  ()Ljavax/xml/validation/Schema;
- ()Ljavax/xml/validation/Schema;
+ ()L1javax/xml/validation/Schema;
 getXMLReader
  ()Lorg/xml/sax/XMLReader;
  ()Lorg/xml/sax/XMLReader;
diff --git a/libs/eea-java-11/src/main/resources/javax/xml/parsers/SAXParserFactory.eea b/libs/eea-java-11/src/main/resources/javax/xml/parsers/SAXParserFactory.eea
index 7675deac92..9260101ad3 100644
--- a/libs/eea-java-11/src/main/resources/javax/xml/parsers/SAXParserFactory.eea
+++ b/libs/eea-java-11/src/main/resources/javax/xml/parsers/SAXParserFactory.eea
@@ -2,7 +2,7 @@ class javax/xml/parsers/SAXParserFactory
 
 newDefaultInstance
  ()Ljavax/xml/parsers/SAXParserFactory;
- ()Ljavax/xml/parsers/SAXParserFactory;
+ ()L1javax/xml/parsers/SAXParserFactory;
 newInstance
  ()Ljavax/xml/parsers/SAXParserFactory;
  ()Ljavax/xml/parsers/SAXParserFactory;
@@ -15,7 +15,7 @@ getFeature
  (Ljava/lang/String;)Z
 getSchema
  ()Ljavax/xml/validation/Schema;
- ()Ljavax/xml/validation/Schema;
+ ()L1javax/xml/validation/Schema;
 newSAXParser
  ()Ljavax/xml/parsers/SAXParser;
  ()Ljavax/xml/parsers/SAXParser;
diff --git a/libs/eea-java-11/src/main/resources/javax/xml/stream/XMLEventFactory.eea b/libs/eea-java-11/src/main/resources/javax/xml/stream/XMLEventFactory.eea
index 74c77201ff..8949981382 100644
--- a/libs/eea-java-11/src/main/resources/javax/xml/stream/XMLEventFactory.eea
+++ b/libs/eea-java-11/src/main/resources/javax/xml/stream/XMLEventFactory.eea
@@ -2,7 +2,7 @@ class javax/xml/stream/XMLEventFactory
 
 newDefaultFactory
  ()Ljavax/xml/stream/XMLEventFactory;
- ()Ljavax/xml/stream/XMLEventFactory;
+ ()L1javax/xml/stream/XMLEventFactory;
 newFactory
  ()Ljavax/xml/stream/XMLEventFactory;
  ()Ljavax/xml/stream/XMLEventFactory;
@@ -18,79 +18,79 @@ newInstance
 
 createAttribute
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/Attribute;
- (Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/Attribute;
+ (Ljava/lang/String;Ljava/lang/String;)L1javax/xml/stream/events/Attribute;
 createAttribute
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/Attribute;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/Attribute;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1javax/xml/stream/events/Attribute;
 createAttribute
  (Ljavax/xml/namespace/QName;Ljava/lang/String;)Ljavax/xml/stream/events/Attribute;
- (Ljavax/xml/namespace/QName;Ljava/lang/String;)Ljavax/xml/stream/events/Attribute;
+ (Ljavax/xml/namespace/QName;Ljava/lang/String;)L1javax/xml/stream/events/Attribute;
 createCData
  (Ljava/lang/String;)Ljavax/xml/stream/events/Characters;
- (Ljava/lang/String;)Ljavax/xml/stream/events/Characters;
+ (Ljava/lang/String;)L1javax/xml/stream/events/Characters;
 createCharacters
  (Ljava/lang/String;)Ljavax/xml/stream/events/Characters;
- (Ljava/lang/String;)Ljavax/xml/stream/events/Characters;
+ (Ljava/lang/String;)L1javax/xml/stream/events/Characters;
 createComment
  (Ljava/lang/String;)Ljavax/xml/stream/events/Comment;
- (Ljava/lang/String;)Ljavax/xml/stream/events/Comment;
+ (Ljava/lang/String;)L1javax/xml/stream/events/Comment;
 createDTD
  (Ljava/lang/String;)Ljavax/xml/stream/events/DTD;
- (Ljava/lang/String;)Ljavax/xml/stream/events/DTD;
+ (Ljava/lang/String;)L1javax/xml/stream/events/DTD;
 createEndDocument
  ()Ljavax/xml/stream/events/EndDocument;
- ()Ljavax/xml/stream/events/EndDocument;
+ ()L1javax/xml/stream/events/EndDocument;
 createEndElement
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/EndElement;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/EndElement;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1javax/xml/stream/events/EndElement;
 createEndElement
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)Ljavax/xml/stream/events/EndElement;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)Ljavax/xml/stream/events/EndElement;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)L1javax/xml/stream/events/EndElement;
 createEndElement
  (Ljavax/xml/namespace/QName;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)Ljavax/xml/stream/events/EndElement;
- (Ljavax/xml/namespace/QName;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)Ljavax/xml/stream/events/EndElement;
+ (Ljavax/xml/namespace/QName;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)L1javax/xml/stream/events/EndElement;
 createEntityReference
  (Ljava/lang/String;Ljavax/xml/stream/events/EntityDeclaration;)Ljavax/xml/stream/events/EntityReference;
- (Ljava/lang/String;Ljavax/xml/stream/events/EntityDeclaration;)Ljavax/xml/stream/events/EntityReference;
+ (Ljava/lang/String;Ljavax/xml/stream/events/EntityDeclaration;)L1javax/xml/stream/events/EntityReference;
 createIgnorableSpace
  (Ljava/lang/String;)Ljavax/xml/stream/events/Characters;
- (Ljava/lang/String;)Ljavax/xml/stream/events/Characters;
+ (Ljava/lang/String;)L1javax/xml/stream/events/Characters;
 createNamespace
  (Ljava/lang/String;)Ljavax/xml/stream/events/Namespace;
- (Ljava/lang/String;)Ljavax/xml/stream/events/Namespace;
+ (Ljava/lang/String;)L1javax/xml/stream/events/Namespace;
 createNamespace
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/Namespace;
- (Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/Namespace;
+ (Ljava/lang/String;Ljava/lang/String;)L1javax/xml/stream/events/Namespace;
 createProcessingInstruction
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/ProcessingInstruction;
- (Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/ProcessingInstruction;
+ (Ljava/lang/String;Ljava/lang/String;)L1javax/xml/stream/events/ProcessingInstruction;
 createSpace
  (Ljava/lang/String;)Ljavax/xml/stream/events/Characters;
- (Ljava/lang/String;)Ljavax/xml/stream/events/Characters;
+ (Ljava/lang/String;)L1javax/xml/stream/events/Characters;
 createStartDocument
  ()Ljavax/xml/stream/events/StartDocument;
- ()Ljavax/xml/stream/events/StartDocument;
+ ()L1javax/xml/stream/events/StartDocument;
 createStartDocument
  (Ljava/lang/String;)Ljavax/xml/stream/events/StartDocument;
- (Ljava/lang/String;)Ljavax/xml/stream/events/StartDocument;
+ (Ljava/lang/String;)L1javax/xml/stream/events/StartDocument;
 createStartDocument
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/StartDocument;
- (Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/StartDocument;
+ (Ljava/lang/String;Ljava/lang/String;)L1javax/xml/stream/events/StartDocument;
 createStartDocument
  (Ljava/lang/String;Ljava/lang/String;Z)Ljavax/xml/stream/events/StartDocument;
- (Ljava/lang/String;Ljava/lang/String;Z)Ljavax/xml/stream/events/StartDocument;
+ (Ljava/lang/String;Ljava/lang/String;Z)L1javax/xml/stream/events/StartDocument;
 createStartElement
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/StartElement;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/StartElement;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1javax/xml/stream/events/StartElement;
 createStartElement
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)Ljavax/xml/stream/events/StartElement;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)Ljavax/xml/stream/events/StartElement;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)L1javax/xml/stream/events/StartElement;
 createStartElement
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;Ljavax/xml/namespace/NamespaceContext;)Ljavax/xml/stream/events/StartElement;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;Ljavax/xml/namespace/NamespaceContext;)Ljavax/xml/stream/events/StartElement;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;Ljavax/xml/namespace/NamespaceContext;)L1javax/xml/stream/events/StartElement;
 createStartElement
  (Ljavax/xml/namespace/QName;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)Ljavax/xml/stream/events/StartElement;
- (Ljavax/xml/namespace/QName;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)Ljavax/xml/stream/events/StartElement;
+ (Ljavax/xml/namespace/QName;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)L1javax/xml/stream/events/StartElement;
 setLocation
  (Ljavax/xml/stream/Location;)V
  (Ljavax/xml/stream/Location;)V
diff --git a/libs/eea-java-11/src/main/resources/javax/xml/transform/TransformerException.eea b/libs/eea-java-11/src/main/resources/javax/xml/transform/TransformerException.eea
index 398cd55bba..a24d9cb1c9 100644
--- a/libs/eea-java-11/src/main/resources/javax/xml/transform/TransformerException.eea
+++ b/libs/eea-java-11/src/main/resources/javax/xml/transform/TransformerException.eea
@@ -23,13 +23,13 @@ getException
  ()Ljava/lang/Throwable;
 getLocationAsString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getLocator
  ()Ljavax/xml/transform/SourceLocator;
  ()Ljavax/xml/transform/SourceLocator;
 getMessageAndLocation
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 initCause
  (Ljava/lang/Throwable;)Ljava/lang/Throwable;
  (L0java/lang/Throwable;)Ljava/lang/Throwable; # @Inherited(java.lang.Throwable)
diff --git a/libs/eea-java-11/src/main/resources/javax/xml/transform/TransformerFactory.eea b/libs/eea-java-11/src/main/resources/javax/xml/transform/TransformerFactory.eea
index d02b833a77..025dc3b713 100644
--- a/libs/eea-java-11/src/main/resources/javax/xml/transform/TransformerFactory.eea
+++ b/libs/eea-java-11/src/main/resources/javax/xml/transform/TransformerFactory.eea
@@ -2,7 +2,7 @@ class javax/xml/transform/TransformerFactory
 
 newDefaultInstance
  ()Ljavax/xml/transform/TransformerFactory;
- ()Ljavax/xml/transform/TransformerFactory;
+ ()L1javax/xml/transform/TransformerFactory;
 newInstance
  ()Ljavax/xml/transform/TransformerFactory;
  ()Ljavax/xml/transform/TransformerFactory;
diff --git a/libs/eea-java-11/src/main/resources/javax/xml/transform/sax/SAXSource.eea b/libs/eea-java-11/src/main/resources/javax/xml/transform/sax/SAXSource.eea
index ac2247dbea..b1ad8085ac 100644
--- a/libs/eea-java-11/src/main/resources/javax/xml/transform/sax/SAXSource.eea
+++ b/libs/eea-java-11/src/main/resources/javax/xml/transform/sax/SAXSource.eea
@@ -6,7 +6,7 @@ FEATURE
 
 sourceToInputSource
  (Ljavax/xml/transform/Source;)Lorg/xml/sax/InputSource;
- (Ljavax/xml/transform/Source;)Lorg/xml/sax/InputSource;
+ (Ljavax/xml/transform/Source;)L0org/xml/sax/InputSource;
 
 <init>
  (Lorg/xml/sax/InputSource;)V
@@ -19,7 +19,7 @@ getInputSource
  ()Lorg/xml/sax/InputSource;
 getSystemId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getXMLReader
  ()Lorg/xml/sax/XMLReader;
  ()Lorg/xml/sax/XMLReader;
diff --git a/libs/eea-java-11/src/main/resources/javax/xml/transform/stax/StAXResult.eea b/libs/eea-java-11/src/main/resources/javax/xml/transform/stax/StAXResult.eea
index 7398cc8321..e3f984b5c5 100644
--- a/libs/eea-java-11/src/main/resources/javax/xml/transform/stax/StAXResult.eea
+++ b/libs/eea-java-11/src/main/resources/javax/xml/transform/stax/StAXResult.eea
@@ -12,7 +12,7 @@ FEATURE
  (Ljavax/xml/stream/XMLStreamWriter;)V
 getSystemId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getXMLEventWriter
  ()Ljavax/xml/stream/XMLEventWriter;
  ()Ljavax/xml/stream/XMLEventWriter;
diff --git a/libs/eea-java-11/src/main/resources/javax/xml/validation/SchemaFactory.eea b/libs/eea-java-11/src/main/resources/javax/xml/validation/SchemaFactory.eea
index c02b3ef9e4..506ba99df2 100644
--- a/libs/eea-java-11/src/main/resources/javax/xml/validation/SchemaFactory.eea
+++ b/libs/eea-java-11/src/main/resources/javax/xml/validation/SchemaFactory.eea
@@ -2,7 +2,7 @@ class javax/xml/validation/SchemaFactory
 
 newDefaultInstance
  ()Ljavax/xml/validation/SchemaFactory;
- ()Ljavax/xml/validation/SchemaFactory;
+ ()L1javax/xml/validation/SchemaFactory;
 newInstance
  (Ljava/lang/String;)Ljavax/xml/validation/SchemaFactory;
  (Ljava/lang/String;)Ljavax/xml/validation/SchemaFactory;
@@ -18,7 +18,7 @@ getFeature
  (Ljava/lang/String;)Z
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
 getResourceResolver
  ()Lorg/w3c/dom/ls/LSResourceResolver;
  ()Lorg/w3c/dom/ls/LSResourceResolver;
diff --git a/libs/eea-java-11/src/main/resources/javax/xml/validation/Validator.eea b/libs/eea-java-11/src/main/resources/javax/xml/validation/Validator.eea
index a9aeac0e57..df88c55570 100644
--- a/libs/eea-java-11/src/main/resources/javax/xml/validation/Validator.eea
+++ b/libs/eea-java-11/src/main/resources/javax/xml/validation/Validator.eea
@@ -8,7 +8,7 @@ getFeature
  (Ljava/lang/String;)Z
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
 getResourceResolver
  ()Lorg/w3c/dom/ls/LSResourceResolver;
  ()Lorg/w3c/dom/ls/LSResourceResolver;
diff --git a/libs/eea-java-11/src/main/resources/javax/xml/validation/ValidatorHandler.eea b/libs/eea-java-11/src/main/resources/javax/xml/validation/ValidatorHandler.eea
index 1e74745dbf..994007f425 100644
--- a/libs/eea-java-11/src/main/resources/javax/xml/validation/ValidatorHandler.eea
+++ b/libs/eea-java-11/src/main/resources/javax/xml/validation/ValidatorHandler.eea
@@ -11,7 +11,7 @@ getFeature
  (Ljava/lang/String;)Z
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
 getResourceResolver
  ()Lorg/w3c/dom/ls/LSResourceResolver;
  ()Lorg/w3c/dom/ls/LSResourceResolver;
diff --git a/libs/eea-java-11/src/main/resources/javax/xml/xpath/XPathEvaluationResult$XPathResultType.eea b/libs/eea-java-11/src/main/resources/javax/xml/xpath/XPathEvaluationResult$XPathResultType.eea
index 09707c699e..433b6ea250 100644
--- a/libs/eea-java-11/src/main/resources/javax/xml/xpath/XPathEvaluationResult$XPathResultType.eea
+++ b/libs/eea-java-11/src/main/resources/javax/xml/xpath/XPathEvaluationResult$XPathResultType.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 getQNameType
  (Ljava/lang/Class<*>;)Ljavax/xml/namespace/QName;
- (Ljava/lang/Class<*>;)Ljavax/xml/namespace/QName;
+ (Ljava/lang/Class<*>;)L0javax/xml/namespace/QName;
diff --git a/libs/eea-java-11/src/main/resources/javax/xml/xpath/XPathFactory.eea b/libs/eea-java-11/src/main/resources/javax/xml/xpath/XPathFactory.eea
index 49f2467ca1..006f3fb018 100644
--- a/libs/eea-java-11/src/main/resources/javax/xml/xpath/XPathFactory.eea
+++ b/libs/eea-java-11/src/main/resources/javax/xml/xpath/XPathFactory.eea
@@ -9,7 +9,7 @@ DEFAULT_PROPERTY_NAME
 
 newDefaultInstance
  ()Ljavax/xml/xpath/XPathFactory;
- ()Ljavax/xml/xpath/XPathFactory;
+ ()L1javax/xml/xpath/XPathFactory;
 newInstance
  ()Ljavax/xml/xpath/XPathFactory;
  ()Ljavax/xml/xpath/XPathFactory;
diff --git a/libs/eea-java-11/src/main/resources/org/w3c/dom/DOMImplementation.eea b/libs/eea-java-11/src/main/resources/org/w3c/dom/DOMImplementation.eea
index 89d4f76c1c..c0c6bca360 100644
--- a/libs/eea-java-11/src/main/resources/org/w3c/dom/DOMImplementation.eea
+++ b/libs/eea-java-11/src/main/resources/org/w3c/dom/DOMImplementation.eea
@@ -2,10 +2,10 @@ class org/w3c/dom/DOMImplementation
 
 createDocument
  (Ljava/lang/String;Ljava/lang/String;Lorg/w3c/dom/DocumentType;)Lorg/w3c/dom/Document;
- (Ljava/lang/String;Ljava/lang/String;Lorg/w3c/dom/DocumentType;)Lorg/w3c/dom/Document;
+ (Ljava/lang/String;Ljava/lang/String;Lorg/w3c/dom/DocumentType;)L1org/w3c/dom/Document;
 createDocumentType
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/DocumentType;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/DocumentType;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1org/w3c/dom/DocumentType;
 getFeature
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-java-11/src/main/resources/org/w3c/dom/Document.eea b/libs/eea-java-11/src/main/resources/org/w3c/dom/Document.eea
index 9f5649458b..e6ece56fad 100644
--- a/libs/eea-java-11/src/main/resources/org/w3c/dom/Document.eea
+++ b/libs/eea-java-11/src/main/resources/org/w3c/dom/Document.eea
@@ -29,7 +29,7 @@ createEntityReference
  (Ljava/lang/String;)L1org/w3c/dom/EntityReference;
 createProcessingInstruction
  (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/ProcessingInstruction;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/ProcessingInstruction;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/w3c/dom/ProcessingInstruction;
 createTextNode
  (Ljava/lang/String;)Lorg/w3c/dom/Text;
  (Ljava/lang/String;)L1org/w3c/dom/Text;
diff --git a/libs/eea-java-11/src/main/resources/org/w3c/dom/bootstrap/DOMImplementationRegistry.eea b/libs/eea-java-11/src/main/resources/org/w3c/dom/bootstrap/DOMImplementationRegistry.eea
index 79370b4eca..a646afbe91 100644
--- a/libs/eea-java-11/src/main/resources/org/w3c/dom/bootstrap/DOMImplementationRegistry.eea
+++ b/libs/eea-java-11/src/main/resources/org/w3c/dom/bootstrap/DOMImplementationRegistry.eea
@@ -6,14 +6,14 @@ PROPERTY
 
 newInstance
  ()Lorg/w3c/dom/bootstrap/DOMImplementationRegistry;
- ()Lorg/w3c/dom/bootstrap/DOMImplementationRegistry;
+ ()L1org/w3c/dom/bootstrap/DOMImplementationRegistry;
 
 addSource
  (Lorg/w3c/dom/DOMImplementationSource;)V
  (Lorg/w3c/dom/DOMImplementationSource;)V
 getDOMImplementation
  (Ljava/lang/String;)Lorg/w3c/dom/DOMImplementation;
- (Ljava/lang/String;)Lorg/w3c/dom/DOMImplementation;
+ (Ljava/lang/String;)L0org/w3c/dom/DOMImplementation;
 getDOMImplementationList
  (Ljava/lang/String;)Lorg/w3c/dom/DOMImplementationList;
- (Ljava/lang/String;)Lorg/w3c/dom/DOMImplementationList;
+ (Ljava/lang/String;)L1org/w3c/dom/DOMImplementationList;
diff --git a/libs/eea-java-11/src/main/resources/org/w3c/dom/css/DOMImplementationCSS.eea b/libs/eea-java-11/src/main/resources/org/w3c/dom/css/DOMImplementationCSS.eea
index 941911f546..b3ebf8d903 100644
--- a/libs/eea-java-11/src/main/resources/org/w3c/dom/css/DOMImplementationCSS.eea
+++ b/libs/eea-java-11/src/main/resources/org/w3c/dom/css/DOMImplementationCSS.eea
@@ -2,4 +2,4 @@ class org/w3c/dom/css/DOMImplementationCSS
 
 createCSSStyleSheet
  (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/css/CSSStyleSheet;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/css/CSSStyleSheet;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/w3c/dom/css/CSSStyleSheet;
diff --git a/libs/eea-java-11/src/main/resources/org/w3c/dom/events/DocumentEvent.eea b/libs/eea-java-11/src/main/resources/org/w3c/dom/events/DocumentEvent.eea
index 9cfe09a367..bba3043acf 100644
--- a/libs/eea-java-11/src/main/resources/org/w3c/dom/events/DocumentEvent.eea
+++ b/libs/eea-java-11/src/main/resources/org/w3c/dom/events/DocumentEvent.eea
@@ -2,4 +2,4 @@ class org/w3c/dom/events/DocumentEvent
 
 createEvent
  (Ljava/lang/String;)Lorg/w3c/dom/events/Event;
- (Ljava/lang/String;)Lorg/w3c/dom/events/Event;
+ (Ljava/lang/String;)L1org/w3c/dom/events/Event;
diff --git a/libs/eea-java-11/src/main/resources/org/w3c/dom/html/HTMLDOMImplementation.eea b/libs/eea-java-11/src/main/resources/org/w3c/dom/html/HTMLDOMImplementation.eea
index 9cd2452263..d57a172db4 100644
--- a/libs/eea-java-11/src/main/resources/org/w3c/dom/html/HTMLDOMImplementation.eea
+++ b/libs/eea-java-11/src/main/resources/org/w3c/dom/html/HTMLDOMImplementation.eea
@@ -2,4 +2,4 @@ class org/w3c/dom/html/HTMLDOMImplementation
 
 createHTMLDocument
  (Ljava/lang/String;)Lorg/w3c/dom/html/HTMLDocument;
- (Ljava/lang/String;)Lorg/w3c/dom/html/HTMLDocument;
+ (Ljava/lang/String;)L1org/w3c/dom/html/HTMLDocument;
diff --git a/libs/eea-java-11/src/main/resources/org/w3c/dom/html/HTMLTableElement.eea b/libs/eea-java-11/src/main/resources/org/w3c/dom/html/HTMLTableElement.eea
index d948e121cf..a628fbd14e 100644
--- a/libs/eea-java-11/src/main/resources/org/w3c/dom/html/HTMLTableElement.eea
+++ b/libs/eea-java-11/src/main/resources/org/w3c/dom/html/HTMLTableElement.eea
@@ -2,13 +2,13 @@ class org/w3c/dom/html/HTMLTableElement
 
 createCaption
  ()Lorg/w3c/dom/html/HTMLElement;
- ()Lorg/w3c/dom/html/HTMLElement;
+ ()L1org/w3c/dom/html/HTMLElement;
 createTFoot
  ()Lorg/w3c/dom/html/HTMLElement;
- ()Lorg/w3c/dom/html/HTMLElement;
+ ()L1org/w3c/dom/html/HTMLElement;
 createTHead
  ()Lorg/w3c/dom/html/HTMLElement;
- ()Lorg/w3c/dom/html/HTMLElement;
+ ()L1org/w3c/dom/html/HTMLElement;
 getAlign
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/org/w3c/dom/ls/DOMImplementationLS.eea b/libs/eea-java-11/src/main/resources/org/w3c/dom/ls/DOMImplementationLS.eea
index b3a339ba7a..d113174c70 100644
--- a/libs/eea-java-11/src/main/resources/org/w3c/dom/ls/DOMImplementationLS.eea
+++ b/libs/eea-java-11/src/main/resources/org/w3c/dom/ls/DOMImplementationLS.eea
@@ -2,13 +2,13 @@ class org/w3c/dom/ls/DOMImplementationLS
 
 createLSInput
  ()Lorg/w3c/dom/ls/LSInput;
- ()Lorg/w3c/dom/ls/LSInput;
+ ()L1org/w3c/dom/ls/LSInput;
 createLSOutput
  ()Lorg/w3c/dom/ls/LSOutput;
- ()Lorg/w3c/dom/ls/LSOutput;
+ ()L1org/w3c/dom/ls/LSOutput;
 createLSParser
  (SLjava/lang/String;)Lorg/w3c/dom/ls/LSParser;
- (SLjava/lang/String;)Lorg/w3c/dom/ls/LSParser;
+ (SLjava/lang/String;)L1org/w3c/dom/ls/LSParser;
 createLSSerializer
  ()Lorg/w3c/dom/ls/LSSerializer;
- ()Lorg/w3c/dom/ls/LSSerializer;
+ ()L1org/w3c/dom/ls/LSSerializer;
diff --git a/libs/eea-java-11/src/main/resources/org/w3c/dom/ranges/DocumentRange.eea b/libs/eea-java-11/src/main/resources/org/w3c/dom/ranges/DocumentRange.eea
index 863aea84ae..32ebcee572 100644
--- a/libs/eea-java-11/src/main/resources/org/w3c/dom/ranges/DocumentRange.eea
+++ b/libs/eea-java-11/src/main/resources/org/w3c/dom/ranges/DocumentRange.eea
@@ -2,4 +2,4 @@ class org/w3c/dom/ranges/DocumentRange
 
 createRange
  ()Lorg/w3c/dom/ranges/Range;
- ()Lorg/w3c/dom/ranges/Range;
+ ()L1org/w3c/dom/ranges/Range;
diff --git a/libs/eea-java-11/src/main/resources/org/w3c/dom/traversal/DocumentTraversal.eea b/libs/eea-java-11/src/main/resources/org/w3c/dom/traversal/DocumentTraversal.eea
index 5f149e5966..21eaa603f5 100644
--- a/libs/eea-java-11/src/main/resources/org/w3c/dom/traversal/DocumentTraversal.eea
+++ b/libs/eea-java-11/src/main/resources/org/w3c/dom/traversal/DocumentTraversal.eea
@@ -2,7 +2,7 @@ class org/w3c/dom/traversal/DocumentTraversal
 
 createNodeIterator
  (Lorg/w3c/dom/Node;ILorg/w3c/dom/traversal/NodeFilter;Z)Lorg/w3c/dom/traversal/NodeIterator;
- (Lorg/w3c/dom/Node;ILorg/w3c/dom/traversal/NodeFilter;Z)Lorg/w3c/dom/traversal/NodeIterator;
+ (Lorg/w3c/dom/Node;ILorg/w3c/dom/traversal/NodeFilter;Z)L1org/w3c/dom/traversal/NodeIterator;
 createTreeWalker
  (Lorg/w3c/dom/Node;ILorg/w3c/dom/traversal/NodeFilter;Z)Lorg/w3c/dom/traversal/TreeWalker;
- (Lorg/w3c/dom/Node;ILorg/w3c/dom/traversal/NodeFilter;Z)Lorg/w3c/dom/traversal/TreeWalker;
+ (Lorg/w3c/dom/Node;ILorg/w3c/dom/traversal/NodeFilter;Z)L1org/w3c/dom/traversal/TreeWalker;
diff --git a/libs/eea-java-11/src/main/resources/org/w3c/dom/xpath/XPathEvaluator.eea b/libs/eea-java-11/src/main/resources/org/w3c/dom/xpath/XPathEvaluator.eea
index 423a4fda29..cb38c5b162 100644
--- a/libs/eea-java-11/src/main/resources/org/w3c/dom/xpath/XPathEvaluator.eea
+++ b/libs/eea-java-11/src/main/resources/org/w3c/dom/xpath/XPathEvaluator.eea
@@ -2,10 +2,10 @@ class org/w3c/dom/xpath/XPathEvaluator
 
 createExpression
  (Ljava/lang/String;Lorg/w3c/dom/xpath/XPathNSResolver;)Lorg/w3c/dom/xpath/XPathExpression;
- (Ljava/lang/String;Lorg/w3c/dom/xpath/XPathNSResolver;)Lorg/w3c/dom/xpath/XPathExpression;
+ (Ljava/lang/String;Lorg/w3c/dom/xpath/XPathNSResolver;)L1org/w3c/dom/xpath/XPathExpression;
 createNSResolver
  (Lorg/w3c/dom/Node;)Lorg/w3c/dom/xpath/XPathNSResolver;
- (Lorg/w3c/dom/Node;)Lorg/w3c/dom/xpath/XPathNSResolver;
+ (Lorg/w3c/dom/Node;)L1org/w3c/dom/xpath/XPathNSResolver;
 evaluate
  (Ljava/lang/String;Lorg/w3c/dom/Node;Lorg/w3c/dom/xpath/XPathNSResolver;SLjava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/String;Lorg/w3c/dom/Node;Lorg/w3c/dom/xpath/XPathNSResolver;SLjava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-java-11/src/main/resources/org/xml/sax/ext/DefaultHandler2.eea b/libs/eea-java-11/src/main/resources/org/xml/sax/ext/DefaultHandler2.eea
index 83cb1f46c5..53f60346f6 100644
--- a/libs/eea-java-11/src/main/resources/org/xml/sax/ext/DefaultHandler2.eea
+++ b/libs/eea-java-11/src/main/resources/org/xml/sax/ext/DefaultHandler2.eea
@@ -17,7 +17,7 @@ externalEntityDecl
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 getExternalSubset
  (Ljava/lang/String;Ljava/lang/String;)Lorg/xml/sax/InputSource;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/xml/sax/InputSource;
+ (Ljava/lang/String;Ljava/lang/String;)L0org/xml/sax/InputSource;
 internalEntityDecl
  (Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;)V
@@ -26,7 +26,7 @@ resolveEntity
  (L0java/lang/String;L0java/lang/String;)L0org/xml/sax/InputSource; # @Inherited(org.xml.sax.helpers.DefaultHandler)
 resolveEntity
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/xml/sax/InputSource;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/xml/sax/InputSource;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L0org/xml/sax/InputSource;
 startDTD
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-java-11/src/main/resources/org/xml/sax/helpers/AttributeListImpl.eea b/libs/eea-java-11/src/main/resources/org/xml/sax/helpers/AttributeListImpl.eea
index 8eb72058d0..65f82e8c58 100644
--- a/libs/eea-java-11/src/main/resources/org/xml/sax/helpers/AttributeListImpl.eea
+++ b/libs/eea-java-11/src/main/resources/org/xml/sax/helpers/AttributeListImpl.eea
@@ -8,16 +8,16 @@ addAttribute
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 getName
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getType
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getType
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
 getValue
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getValue
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/org/xml/sax/helpers/AttributesImpl.eea b/libs/eea-java-11/src/main/resources/org/xml/sax/helpers/AttributesImpl.eea
index 64dce0d3f0..bb31fecc9b 100644
--- a/libs/eea-java-11/src/main/resources/org/xml/sax/helpers/AttributesImpl.eea
+++ b/libs/eea-java-11/src/main/resources/org/xml/sax/helpers/AttributesImpl.eea
@@ -14,31 +14,31 @@ getIndex
  (Ljava/lang/String;Ljava/lang/String;)I
 getLocalName
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getQName
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getType
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getType
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getType
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L0java/lang/String;
 getURI
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getValue
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getValue
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getValue
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L0java/lang/String;
 setAttribute
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-java-11/src/main/resources/org/xml/sax/helpers/NamespaceSupport.eea b/libs/eea-java-11/src/main/resources/org/xml/sax/helpers/NamespaceSupport.eea
index ee4f732ec7..be8dec00d3 100644
--- a/libs/eea-java-11/src/main/resources/org/xml/sax/helpers/NamespaceSupport.eea
+++ b/libs/eea-java-11/src/main/resources/org/xml/sax/helpers/NamespaceSupport.eea
@@ -27,4 +27,4 @@ getURI
  (Ljava/lang/String;)Ljava/lang/String;
 processName
  (Ljava/lang/String;[Ljava/lang/String;Z)[Ljava/lang/String;
- (Ljava/lang/String;[Ljava/lang/String;Z)[Ljava/lang/String;
+ (Ljava/lang/String;[Ljava/lang/String;Z)[0Ljava/lang/String;
diff --git a/libs/eea-java-11/src/main/resources/org/xml/sax/helpers/ParserAdapter.eea b/libs/eea-java-11/src/main/resources/org/xml/sax/helpers/ParserAdapter.eea
index 87ebae1114..0a162dd55d 100644
--- a/libs/eea-java-11/src/main/resources/org/xml/sax/helpers/ParserAdapter.eea
+++ b/libs/eea-java-11/src/main/resources/org/xml/sax/helpers/ParserAdapter.eea
@@ -26,7 +26,7 @@ getFeature
  (Ljava/lang/String;)Z
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
 ignorableWhitespace
  ([CII)V
  ([1CII)V # @Inherited(org.xml.sax.DocumentHandler)
diff --git a/libs/eea-java-11/src/main/resources/org/xml/sax/helpers/XMLReaderFactory.eea b/libs/eea-java-11/src/main/resources/org/xml/sax/helpers/XMLReaderFactory.eea
index 244b5634dc..1e20a51753 100644
--- a/libs/eea-java-11/src/main/resources/org/xml/sax/helpers/XMLReaderFactory.eea
+++ b/libs/eea-java-11/src/main/resources/org/xml/sax/helpers/XMLReaderFactory.eea
@@ -2,7 +2,7 @@ class org/xml/sax/helpers/XMLReaderFactory
 
 createXMLReader
  ()Lorg/xml/sax/XMLReader;
- ()Lorg/xml/sax/XMLReader;
+ ()L1org/xml/sax/XMLReader;
 createXMLReader
  (Ljava/lang/String;)Lorg/xml/sax/XMLReader;
- (Ljava/lang/String;)Lorg/xml/sax/XMLReader;
+ (Ljava/lang/String;)L1org/xml/sax/XMLReader;
diff --git a/libs/eea-java-17/src/main/resources/java/applet/Applet.eea b/libs/eea-java-17/src/main/resources/java/applet/Applet.eea
index 0122565f9b..8016efc1df 100644
--- a/libs/eea-java-17/src/main/resources/java/applet/Applet.eea
+++ b/libs/eea-java-17/src/main/resources/java/applet/Applet.eea
@@ -12,13 +12,13 @@ getAppletContext
  ()Ljava/applet/AppletContext;
 getAppletInfo
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getAudioClip
  (Ljava/net/URL;)Ljava/applet/AudioClip;
  (Ljava/net/URL;)Ljava/applet/AudioClip;
 getAudioClip
  (Ljava/net/URL;Ljava/lang/String;)Ljava/applet/AudioClip;
- (Ljava/net/URL;Ljava/lang/String;)Ljava/applet/AudioClip;
+ (Ljava/net/URL;Ljava/lang/String;)L0java/applet/AudioClip;
 getCodeBase
  ()Ljava/net/URL;
  ()Ljava/net/URL;
@@ -30,7 +30,7 @@ getImage
  (Ljava/net/URL;)Ljava/awt/Image;
 getImage
  (Ljava/net/URL;Ljava/lang/String;)Ljava/awt/Image;
- (Ljava/net/URL;Ljava/lang/String;)Ljava/awt/Image;
+ (Ljava/net/URL;Ljava/lang/String;)L0java/awt/Image;
 getLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
@@ -39,7 +39,7 @@ getParameter
  (Ljava/lang/String;)Ljava/lang/String;
 getParameterInfo
  ()[[Ljava/lang/String;
- ()[[Ljava/lang/String;
+ ()[0[Ljava/lang/String;
 play
  (Ljava/net/URL;)V
  (Ljava/net/URL;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/AWTEvent.eea b/libs/eea-java-17/src/main/resources/java/awt/AWTEvent.eea
index a748ee0b09..5481d30710 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/AWTEvent.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/AWTEvent.eea
@@ -8,7 +8,7 @@ class java/awt/AWTEvent
  (Ljava/lang/Object;I)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 setSource
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/AWTKeyStroke.eea b/libs/eea-java-17/src/main/resources/java/awt/AWTKeyStroke.eea
index be39cd61f0..8e828488c9 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/AWTKeyStroke.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/AWTKeyStroke.eea
@@ -17,7 +17,7 @@ getAWTKeyStroke
  (Ljava/lang/String;)Ljava/awt/AWTKeyStroke;
 getAWTKeyStrokeForEvent
  (Ljava/awt/event/KeyEvent;)Ljava/awt/AWTKeyStroke;
- (Ljava/awt/event/KeyEvent;)Ljava/awt/AWTKeyStroke;
+ (Ljava/awt/event/KeyEvent;)L0java/awt/AWTKeyStroke;
 registerSubclass
  (Ljava/lang/Class<*>;)V
  (Ljava/lang/Class<*>;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/AlphaComposite.eea b/libs/eea-java-17/src/main/resources/java/awt/AlphaComposite.eea
index ce4f9a6f28..2fba54041b 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/AlphaComposite.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/AlphaComposite.eea
@@ -46,7 +46,7 @@ getInstance
 
 createContext
  (Ljava/awt/image/ColorModel;Ljava/awt/image/ColorModel;Ljava/awt/RenderingHints;)Ljava/awt/CompositeContext;
- (Ljava/awt/image/ColorModel;Ljava/awt/image/ColorModel;Ljava/awt/RenderingHints;)Ljava/awt/CompositeContext;
+ (Ljava/awt/image/ColorModel;Ljava/awt/image/ColorModel;Ljava/awt/RenderingHints;)L1java/awt/CompositeContext; # @Inherited(java.awt.Composite)
 derive
  (F)Ljava/awt/AlphaComposite;
  (F)Ljava/awt/AlphaComposite;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/BasicStroke.eea b/libs/eea-java-17/src/main/resources/java/awt/BasicStroke.eea
index 192231ef5a..66c7526c31 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/BasicStroke.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/BasicStroke.eea
@@ -5,10 +5,10 @@ class java/awt/BasicStroke
  (FIIF[FF)V
 createStrokedShape
  (Ljava/awt/Shape;)Ljava/awt/Shape;
- (Ljava/awt/Shape;)Ljava/awt/Shape;
+ (Ljava/awt/Shape;)L1java/awt/Shape; # @Inherited(java.awt.Stroke)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getDashArray
  ()[F
- ()[F
+ ()[0F
diff --git a/libs/eea-java-17/src/main/resources/java/awt/BorderLayout.eea b/libs/eea-java-17/src/main/resources/java/awt/BorderLayout.eea
index 5805333e7f..c94a86b689 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/BorderLayout.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/BorderLayout.eea
@@ -48,7 +48,7 @@ addLayoutComponent
  (Ljava/lang/String;Ljava/awt/Component;)V
 getConstraints
  (Ljava/awt/Component;)Ljava/lang/Object;
- (Ljava/awt/Component;)Ljava/lang/Object;
+ (Ljava/awt/Component;)L0java/lang/Object;
 getLayoutAlignmentX
  (Ljava/awt/Container;)F
  (Ljava/awt/Container;)F
@@ -69,7 +69,7 @@ layoutContainer
  (Ljava/awt/Container;)V
 maximumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
- (Ljava/awt/Container;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;)L1java/awt/Dimension;
 minimumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
  (Ljava/awt/Container;)Ljava/awt/Dimension;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Button$AccessibleAWTButton.eea b/libs/eea-java-17/src/main/resources/java/awt/Button$AccessibleAWTButton.eea
index 902032de66..9013393967 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Button$AccessibleAWTButton.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Button$AccessibleAWTButton.eea
@@ -5,10 +5,10 @@ class java/awt/Button$AccessibleAWTButton
  (Ljava/awt/Button;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -17,7 +17,7 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Button.eea b/libs/eea-java-17/src/main/resources/java/awt/Button.eea
index 2f29a41446..36339a6cc5 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Button.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Button.eea
@@ -23,7 +23,7 @@ getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Component)
 processActionEvent
  (Ljava/awt/event/ActionEvent;)V
  (Ljava/awt/event/ActionEvent;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/CardLayout.eea b/libs/eea-java-17/src/main/resources/java/awt/CardLayout.eea
index 288cb6b1d4..24ac061886 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/CardLayout.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/CardLayout.eea
@@ -26,7 +26,7 @@ layoutContainer
  (Ljava/awt/Container;)V
 maximumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
- (Ljava/awt/Container;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;)L1java/awt/Dimension;
 minimumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
  (Ljava/awt/Container;)Ljava/awt/Dimension;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Checkbox$AccessibleAWTCheckbox.eea b/libs/eea-java-17/src/main/resources/java/awt/Checkbox$AccessibleAWTCheckbox.eea
index 4d76d353f7..a8d854ac84 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Checkbox$AccessibleAWTCheckbox.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Checkbox$AccessibleAWTCheckbox.eea
@@ -5,10 +5,10 @@ class java/awt/Checkbox$AccessibleAWTCheckbox
  (Ljava/awt/Checkbox;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
@@ -17,16 +17,16 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getMaximumAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getMinimumAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 itemStateChanged
  (Ljava/awt/event/ItemEvent;)V
  (L1java/awt/event/ItemEvent;)V # @Inherited(java.awt.event.ItemListener)
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Checkbox.eea b/libs/eea-java-17/src/main/resources/java/awt/Checkbox.eea
index 5c744c654c..c79f3c6aa4 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Checkbox.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Checkbox.eea
@@ -32,10 +32,10 @@ getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
 getSelectedObjects
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Component)
 processEvent
  (Ljava/awt/AWTEvent;)V
  (Ljava/awt/AWTEvent;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/CheckboxMenuItem$AccessibleAWTCheckboxMenuItem.eea b/libs/eea-java-17/src/main/resources/java/awt/CheckboxMenuItem$AccessibleAWTCheckboxMenuItem.eea
index d16754c0e8..b1087b3c44 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/CheckboxMenuItem$AccessibleAWTCheckboxMenuItem.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/CheckboxMenuItem$AccessibleAWTCheckboxMenuItem.eea
@@ -5,25 +5,25 @@ class java/awt/CheckboxMenuItem$AccessibleAWTCheckboxMenuItem
  (Ljava/awt/CheckboxMenuItem;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(java.awt.MenuItem$AccessibleAWTMenuItem)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String; # @Inherited(java.awt.MenuItem$AccessibleAWTMenuItem)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(java.awt.MenuItem$AccessibleAWTMenuItem)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getMaximumAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getMinimumAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 setCurrentAccessibleValue
  (Ljava/lang/Number;)Z
  (Ljava/lang/Number;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/awt/CheckboxMenuItem.eea b/libs/eea-java-17/src/main/resources/java/awt/CheckboxMenuItem.eea
index cd1cc2ce0a..d6f0a6dd96 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/CheckboxMenuItem.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/CheckboxMenuItem.eea
@@ -20,10 +20,10 @@ getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
 getSelectedObjects
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.MenuItem)
 processEvent
  (Ljava/awt/AWTEvent;)V
  (Ljava/awt/AWTEvent;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Choice$AccessibleAWTChoice.eea b/libs/eea-java-17/src/main/resources/java/awt/Choice$AccessibleAWTChoice.eea
index b385fa54e6..287768328a 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Choice$AccessibleAWTChoice.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Choice$AccessibleAWTChoice.eea
@@ -5,10 +5,10 @@ class java/awt/Choice$AccessibleAWTChoice
  (Ljava/awt/Choice;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Choice.eea b/libs/eea-java-17/src/main/resources/java/awt/Choice.eea
index 3688241a20..b1ecdbb807 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Choice.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Choice.eea
@@ -23,16 +23,16 @@ getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
 getSelectedItem
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getSelectedObjects
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 insert
  (Ljava/lang/String;I)V
  (Ljava/lang/String;I)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Component)
 processEvent
  (Ljava/awt/AWTEvent;)V
  (Ljava/awt/AWTEvent;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Color.eea b/libs/eea-java-17/src/main/resources/java/awt/Color.eea
index a4861b625b..ff66a2c826 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Color.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Color.eea
@@ -81,7 +81,7 @@ yellow
 
 RGBtoHSB
  (III[F)[F
- (III[F)[F
+ (III[F)[1F
 decode
  (Ljava/lang/String;)Ljava/awt/Color;
  (Ljava/lang/String;)Ljava/awt/Color;
@@ -96,7 +96,7 @@ getColor
  (Ljava/lang/String;Ljava/awt/Color;)Ljava/awt/Color;
 getHSBColor
  (FFF)Ljava/awt/Color;
- (FFF)Ljava/awt/Color;
+ (FFF)L1java/awt/Color;
 
 <init>
  (Ljava/awt/color/ColorSpace;[FF)V
@@ -106,7 +106,7 @@ brighter
  ()Ljava/awt/Color;
 createContext
  (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
- (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
+ (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)L1java/awt/PaintContext; # @Inherited(java.awt.Paint)
 darker
  ()Ljava/awt/Color;
  ()Ljava/awt/Color;
@@ -124,7 +124,7 @@ getColorSpace
  ()Ljava/awt/color/ColorSpace;
 getComponents
  (Ljava/awt/color/ColorSpace;[F)[F
- (Ljava/awt/color/ColorSpace;[F)[F
+ (Ljava/awt/color/ColorSpace;[F)[1F
 getComponents
  ([F)[F
  ([F)[F
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Component$AccessibleAWTComponent.eea b/libs/eea-java-17/src/main/resources/java/awt/Component$AccessibleAWTComponent.eea
index fe3ea6575a..af9af7b222 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Component$AccessibleAWTComponent.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Component$AccessibleAWTComponent.eea
@@ -21,13 +21,13 @@ contains
  (Ljava/awt/Point;)Z
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -36,7 +36,7 @@ getAccessibleName
  ()Ljava/lang/String;
 getAccessibleParent
  ()Ljavax/accessibility/Accessible;
- ()Ljavax/accessibility/Accessible;
+ ()L0javax/accessibility/Accessible;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Component.eea b/libs/eea-java-17/src/main/resources/java/awt/Component.eea
index 084bec911d..eaef49637b 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Component.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Component.eea
@@ -57,22 +57,22 @@ checkImage
  (Ljava/awt/Image;Ljava/awt/image/ImageObserver;)I
 coalesceEvents
  (Ljava/awt/AWTEvent;Ljava/awt/AWTEvent;)Ljava/awt/AWTEvent;
- (Ljava/awt/AWTEvent;Ljava/awt/AWTEvent;)Ljava/awt/AWTEvent;
+ (Ljava/awt/AWTEvent;Ljava/awt/AWTEvent;)L0java/awt/AWTEvent;
 contains
  (Ljava/awt/Point;)Z
  (Ljava/awt/Point;)Z
 createImage
  (II)Ljava/awt/Image;
- (II)Ljava/awt/Image;
+ (II)L0java/awt/Image;
 createImage
  (Ljava/awt/image/ImageProducer;)Ljava/awt/Image;
- (Ljava/awt/image/ImageProducer;)Ljava/awt/Image;
+ (Ljava/awt/image/ImageProducer;)L1java/awt/Image;
 createVolatileImage
  (II)Ljava/awt/image/VolatileImage;
- (II)Ljava/awt/image/VolatileImage;
+ (II)L0java/awt/image/VolatileImage;
 createVolatileImage
  (IILjava/awt/ImageCapabilities;)Ljava/awt/image/VolatileImage;
- (IILjava/awt/ImageCapabilities;)Ljava/awt/image/VolatileImage;
+ (IILjava/awt/ImageCapabilities;)L1java/awt/image/VolatileImage;
 deliverEvent
  (Ljava/awt/Event;)V
  (Ljava/awt/Event;)V
@@ -111,7 +111,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getBaselineResizeBehavior
  ()Ljava/awt/Component$BaselineResizeBehavior;
  ()Ljava/awt/Component$BaselineResizeBehavior;
@@ -159,10 +159,10 @@ getFontMetrics
  (Ljava/awt/Font;)Ljava/awt/FontMetrics;
 getForeground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getGraphics
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L0java/awt/Graphics;
 getGraphicsConfiguration
  ()Ljava/awt/GraphicsConfiguration;
  ()Ljava/awt/GraphicsConfiguration;
@@ -174,13 +174,13 @@ getHierarchyListeners
  ()[Ljava/awt/event/HierarchyListener;
 getInputContext
  ()Ljava/awt/im/InputContext;
- ()Ljava/awt/im/InputContext;
+ ()L0java/awt/im/InputContext;
 getInputMethodListeners
  ()[Ljava/awt/event/InputMethodListener;
  ()[Ljava/awt/event/InputMethodListener;
 getInputMethodRequests
  ()Ljava/awt/im/InputMethodRequests;
- ()Ljava/awt/im/InputMethodRequests;
+ ()L0java/awt/im/InputMethodRequests;
 getKeyListeners
  ()[Ljava/awt/event/KeyListener;
  ()[Ljava/awt/event/KeyListener;
@@ -276,7 +276,7 @@ list
  (Ljava/io/PrintWriter;I)V
 locate
  (II)Ljava/awt/Component;
- (II)Ljava/awt/Component;
+ (II)L0java/awt/Component;
 location
  ()Ljava/awt/Point;
  ()Ljava/awt/Point;
@@ -285,7 +285,7 @@ lostFocus
  (Ljava/awt/Event;Ljava/lang/Object;)Z
 minimumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 mouseDown
  (Ljava/awt/Event;II)Z
  (Ljava/awt/Event;II)Z
@@ -312,13 +312,13 @@ paintAll
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 postEvent
  (Ljava/awt/Event;)Z
  (Ljava/awt/Event;)Z
 preferredSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 prepareImage
  (Ljava/awt/Image;IILjava/awt/image/ImageObserver;)Z
  (Ljava/awt/Image;IILjava/awt/image/ImageObserver;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Composite.eea b/libs/eea-java-17/src/main/resources/java/awt/Composite.eea
index 4a6dd26e29..7cd1591848 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Composite.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Composite.eea
@@ -2,4 +2,4 @@ class java/awt/Composite
 
 createContext
  (Ljava/awt/image/ColorModel;Ljava/awt/image/ColorModel;Ljava/awt/RenderingHints;)Ljava/awt/CompositeContext;
- (Ljava/awt/image/ColorModel;Ljava/awt/image/ColorModel;Ljava/awt/RenderingHints;)Ljava/awt/CompositeContext;
+ (Ljava/awt/image/ColorModel;Ljava/awt/image/ColorModel;Ljava/awt/RenderingHints;)L1java/awt/CompositeContext;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Container$AccessibleAWTContainer.eea b/libs/eea-java-17/src/main/resources/java/awt/Container$AccessibleAWTContainer.eea
index a726d9c5a1..0d0016d725 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Container$AccessibleAWTContainer.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Container$AccessibleAWTContainer.eea
@@ -12,10 +12,10 @@ addPropertyChangeListener
  (L1java/beans/PropertyChangeListener;)V # @Inherited(java.awt.Component$AccessibleAWTComponent)
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Component$AccessibleAWTComponent)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(java.awt.Component$AccessibleAWTComponent)
 removePropertyChangeListener
  (Ljava/beans/PropertyChangeListener;)V
  (L1java/beans/PropertyChangeListener;)V # @Inherited(java.awt.Component$AccessibleAWTComponent)
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Container.eea b/libs/eea-java-17/src/main/resources/java/awt/Container.eea
index 70d832de86..1056608fd8 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Container.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Container.eea
@@ -62,7 +62,7 @@ getFocusTraversalKeys
  (I)Ljava/util/Set<Ljava/awt/AWTKeyStroke;>;
 getFocusTraversalPolicy
  ()Ljava/awt/FocusTraversalPolicy;
- ()Ljava/awt/FocusTraversalPolicy;
+ ()L0java/awt/FocusTraversalPolicy;
 getInsets
  ()Ljava/awt/Insets;
  ()Ljava/awt/Insets;
@@ -101,10 +101,10 @@ list
  (Ljava/io/PrintWriter;I)V
 locate
  (II)Ljava/awt/Component;
- (II)Ljava/awt/Component;
+ (II)L0java/awt/Component; # @Inherited(java.awt.Component)
 minimumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(java.awt.Component)
 paint
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
@@ -113,10 +113,10 @@ paintComponents
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Component)
 preferredSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(java.awt.Component)
 print
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/ContainerOrderFocusTraversalPolicy.eea b/libs/eea-java-17/src/main/resources/java/awt/ContainerOrderFocusTraversalPolicy.eea
index 06325094cd..6105e3f78c 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/ContainerOrderFocusTraversalPolicy.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/ContainerOrderFocusTraversalPolicy.eea
@@ -5,16 +5,16 @@ accept
  (Ljava/awt/Component;)Z
 getComponentAfter
  (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Container;Ljava/awt/Component;)L0java/awt/Component;
 getComponentBefore
  (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Container;Ljava/awt/Component;)L0java/awt/Component;
 getDefaultComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
  (Ljava/awt/Container;)Ljava/awt/Component;
 getFirstComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
- (Ljava/awt/Container;)Ljava/awt/Component;
+ (Ljava/awt/Container;)L0java/awt/Component;
 getLastComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
- (Ljava/awt/Container;)Ljava/awt/Component;
+ (Ljava/awt/Container;)L0java/awt/Component;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Cursor.eea b/libs/eea-java-17/src/main/resources/java/awt/Cursor.eea
index 0e5df71420..b6818fd7a1 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Cursor.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Cursor.eea
@@ -9,10 +9,10 @@ getDefaultCursor
  ()Ljava/awt/Cursor;
 getPredefinedCursor
  (I)Ljava/awt/Cursor;
- (I)Ljava/awt/Cursor;
+ (I)L1java/awt/Cursor;
 getSystemCustomCursor
  (Ljava/lang/String;)Ljava/awt/Cursor;
- (Ljava/lang/String;)Ljava/awt/Cursor;
+ (Ljava/lang/String;)L0java/awt/Cursor;
 
 name
  Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Desktop.eea b/libs/eea-java-17/src/main/resources/java/awt/Desktop.eea
index 8082c30989..95aecda8a2 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Desktop.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Desktop.eea
@@ -2,7 +2,7 @@ class java/awt/Desktop
 
 getDesktop
  ()Ljava/awt/Desktop;
- ()Ljava/awt/Desktop;
+ ()L1java/awt/Desktop;
 
 addAppEventListener
  (Ljava/awt/desktop/SystemEventListener;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Dialog.eea b/libs/eea-java-17/src/main/resources/java/awt/Dialog.eea
index de861bdfab..3cd04b26e4 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Dialog.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Dialog.eea
@@ -57,7 +57,7 @@ getTitle
  ()Ljava/lang/String;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Container)
 setBackground
  (Ljava/awt/Color;)V
  (Ljava/awt/Color;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Event.eea b/libs/eea-java-17/src/main/resources/java/awt/Event.eea
index fed19071c8..4aa816217f 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Event.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Event.eea
@@ -21,7 +21,7 @@ target
  (Ljava/lang/Object;JIIIIILjava/lang/Object;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/java/awt/EventQueue.eea b/libs/eea-java-17/src/main/resources/java/awt/EventQueue.eea
index 6697f7b7b0..3accccf6c9 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/EventQueue.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/EventQueue.eea
@@ -12,7 +12,7 @@ invokeLater
 
 createSecondaryLoop
  ()Ljava/awt/SecondaryLoop;
- ()Ljava/awt/SecondaryLoop;
+ ()L1java/awt/SecondaryLoop;
 dispatchEvent
  (Ljava/awt/AWTEvent;)V
  (Ljava/awt/AWTEvent;)V
@@ -21,10 +21,10 @@ getNextEvent
  ()Ljava/awt/AWTEvent;
 peekEvent
  ()Ljava/awt/AWTEvent;
- ()Ljava/awt/AWTEvent;
+ ()L0java/awt/AWTEvent;
 peekEvent
  (I)Ljava/awt/AWTEvent;
- (I)Ljava/awt/AWTEvent;
+ (I)L0java/awt/AWTEvent;
 postEvent
  (Ljava/awt/AWTEvent;)V
  (Ljava/awt/AWTEvent;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/FileDialog.eea b/libs/eea-java-17/src/main/resources/java/awt/FileDialog.eea
index 2093ddcf4b..b555114759 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/FileDialog.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/FileDialog.eea
@@ -32,7 +32,7 @@ getFiles
  ()[Ljava/io/File;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Dialog)
 setDirectory
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Font.eea b/libs/eea-java-17/src/main/resources/java/awt/Font.eea
index 66c647f594..dde44456f1 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Font.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Font.eea
@@ -18,19 +18,19 @@ SERIF
 
 createFont
  (ILjava/io/File;)Ljava/awt/Font;
- (ILjava/io/File;)Ljava/awt/Font;
+ (ILjava/io/File;)L1java/awt/Font;
 createFont
  (ILjava/io/InputStream;)Ljava/awt/Font;
- (ILjava/io/InputStream;)Ljava/awt/Font;
+ (ILjava/io/InputStream;)L1java/awt/Font;
 createFonts
  (Ljava/io/File;)[Ljava/awt/Font;
- (Ljava/io/File;)[Ljava/awt/Font;
+ (Ljava/io/File;)[1Ljava/awt/Font;
 createFonts
  (Ljava/io/InputStream;)[Ljava/awt/Font;
- (Ljava/io/InputStream;)[Ljava/awt/Font;
+ (Ljava/io/InputStream;)[1Ljava/awt/Font;
 decode
  (Ljava/lang/String;)Ljava/awt/Font;
- (Ljava/lang/String;)Ljava/awt/Font;
+ (Ljava/lang/String;)L1java/awt/Font;
 getFont
  (Ljava/lang/String;)Ljava/awt/Font;
  (Ljava/lang/String;)Ljava/awt/Font;
@@ -68,16 +68,16 @@ canDisplayUpTo
  ([CII)I
 createGlyphVector
  (Ljava/awt/font/FontRenderContext;Ljava/lang/String;)Ljava/awt/font/GlyphVector;
- (Ljava/awt/font/FontRenderContext;Ljava/lang/String;)Ljava/awt/font/GlyphVector;
+ (Ljava/awt/font/FontRenderContext;Ljava/lang/String;)L1java/awt/font/GlyphVector;
 createGlyphVector
  (Ljava/awt/font/FontRenderContext;Ljava/text/CharacterIterator;)Ljava/awt/font/GlyphVector;
- (Ljava/awt/font/FontRenderContext;Ljava/text/CharacterIterator;)Ljava/awt/font/GlyphVector;
+ (Ljava/awt/font/FontRenderContext;Ljava/text/CharacterIterator;)L1java/awt/font/GlyphVector;
 createGlyphVector
  (Ljava/awt/font/FontRenderContext;[C)Ljava/awt/font/GlyphVector;
- (Ljava/awt/font/FontRenderContext;[C)Ljava/awt/font/GlyphVector;
+ (Ljava/awt/font/FontRenderContext;[C)L1java/awt/font/GlyphVector;
 createGlyphVector
  (Ljava/awt/font/FontRenderContext;[I)Ljava/awt/font/GlyphVector;
- (Ljava/awt/font/FontRenderContext;[I)Ljava/awt/font/GlyphVector;
+ (Ljava/awt/font/FontRenderContext;[I)L1java/awt/font/GlyphVector;
 deriveFont
  (F)Ljava/awt/Font;
  (F)Ljava/awt/Font;
@@ -101,7 +101,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getAttributes
  ()Ljava/util/Map<Ljava/awt/font/TextAttribute;*>;
- ()Ljava/util/Map<Ljava/awt/font/TextAttribute;*>;
+ ()L1java/util/Map<Ljava/awt/font/TextAttribute;*>;
 getAvailableAttributes
  ()[Ljava/text/AttributedCharacterIterator$Attribute;
  ()[Ljava/text/AttributedCharacterIterator$Attribute;
@@ -152,7 +152,7 @@ getStringBounds
  ([CIILjava/awt/font/FontRenderContext;)Ljava/awt/geom/Rectangle2D;
 getTransform
  ()Ljava/awt/geom/AffineTransform;
- ()Ljava/awt/geom/AffineTransform;
+ ()L1java/awt/geom/AffineTransform;
 layoutGlyphVector
  (Ljava/awt/font/FontRenderContext;[CIII)Ljava/awt/font/GlyphVector;
  (Ljava/awt/font/FontRenderContext;[CIII)Ljava/awt/font/GlyphVector;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/FontMetrics.eea b/libs/eea-java-17/src/main/resources/java/awt/FontMetrics.eea
index 9b1716d555..dc2502553a 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/FontMetrics.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/FontMetrics.eea
@@ -48,7 +48,7 @@ getStringBounds
  ([CIILjava/awt/Graphics;)Ljava/awt/geom/Rectangle2D;
 getWidths
  ()[I
- ()[I
+ ()[1I
 stringWidth
  (Ljava/lang/String;)I
  (Ljava/lang/String;)I
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Frame.eea b/libs/eea-java-17/src/main/resources/java/awt/Frame.eea
index f72d4a6734..a1a59694cd 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Frame.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Frame.eea
@@ -2,7 +2,7 @@ class java/awt/Frame
 
 getFrames
  ()[Ljava/awt/Frame;
- ()[Ljava/awt/Frame;
+ ()[1Ljava/awt/Frame;
 
 <init>
  (Ljava/awt/GraphicsConfiguration;)V
@@ -18,7 +18,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getIconImage
  ()Ljava/awt/Image;
- ()Ljava/awt/Image;
+ ()L0java/awt/Image;
 getMaximizedBounds
  ()Ljava/awt/Rectangle;
  ()Ljava/awt/Rectangle;
@@ -30,7 +30,7 @@ getTitle
  ()Ljava/lang/String;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Container)
 remove
  (Ljava/awt/MenuComponent;)V
  (Ljava/awt/MenuComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/GradientPaint.eea b/libs/eea-java-17/src/main/resources/java/awt/GradientPaint.eea
index 0da9405202..83a48eabd7 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/GradientPaint.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/GradientPaint.eea
@@ -14,7 +14,7 @@ class java/awt/GradientPaint
  (Ljava/awt/geom/Point2D;Ljava/awt/Color;Ljava/awt/geom/Point2D;Ljava/awt/Color;Z)V
 createContext
  (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
- (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
+ (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)L1java/awt/PaintContext; # @Inherited(java.awt.Paint)
 getColor1
  ()Ljava/awt/Color;
  ()Ljava/awt/Color;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Graphics.eea b/libs/eea-java-17/src/main/resources/java/awt/Graphics.eea
index 54976168c5..94f2567095 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Graphics.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Graphics.eea
@@ -2,10 +2,10 @@ class java/awt/Graphics
 
 create
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L1java/awt/Graphics;
 create
  (IIII)Ljava/awt/Graphics;
- (IIII)Ljava/awt/Graphics;
+ (IIII)L0java/awt/Graphics;
 drawBytes
  ([BIIII)V
  ([BIIII)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/GraphicsConfiguration.eea b/libs/eea-java-17/src/main/resources/java/awt/GraphicsConfiguration.eea
index df24c25796..8690ba6dff 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/GraphicsConfiguration.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/GraphicsConfiguration.eea
@@ -2,22 +2,22 @@ class java/awt/GraphicsConfiguration
 
 createCompatibleImage
  (II)Ljava/awt/image/BufferedImage;
- (II)Ljava/awt/image/BufferedImage;
+ (II)L1java/awt/image/BufferedImage;
 createCompatibleImage
  (III)Ljava/awt/image/BufferedImage;
- (III)Ljava/awt/image/BufferedImage;
+ (III)L1java/awt/image/BufferedImage;
 createCompatibleVolatileImage
  (II)Ljava/awt/image/VolatileImage;
- (II)Ljava/awt/image/VolatileImage;
+ (II)L1java/awt/image/VolatileImage;
 createCompatibleVolatileImage
  (III)Ljava/awt/image/VolatileImage;
- (III)Ljava/awt/image/VolatileImage;
+ (III)L1java/awt/image/VolatileImage;
 createCompatibleVolatileImage
  (IILjava/awt/ImageCapabilities;)Ljava/awt/image/VolatileImage;
- (IILjava/awt/ImageCapabilities;)Ljava/awt/image/VolatileImage;
+ (IILjava/awt/ImageCapabilities;)L1java/awt/image/VolatileImage;
 createCompatibleVolatileImage
  (IILjava/awt/ImageCapabilities;I)Ljava/awt/image/VolatileImage;
- (IILjava/awt/ImageCapabilities;I)Ljava/awt/image/VolatileImage;
+ (IILjava/awt/ImageCapabilities;I)L1java/awt/image/VolatileImage;
 getBounds
  ()Ljava/awt/Rectangle;
  ()Ljava/awt/Rectangle;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/GridBagLayout.eea b/libs/eea-java-17/src/main/resources/java/awt/GridBagLayout.eea
index d26c2e262f..ee0d10c566 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/GridBagLayout.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/GridBagLayout.eea
@@ -33,7 +33,7 @@ GetLayoutInfo
  (Ljava/awt/Container;I)Ljava/awt/GridBagLayoutInfo;
 GetMinSize
  (Ljava/awt/Container;Ljava/awt/GridBagLayoutInfo;)Ljava/awt/Dimension;
- (Ljava/awt/Container;Ljava/awt/GridBagLayoutInfo;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;Ljava/awt/GridBagLayoutInfo;)L1java/awt/Dimension;
 addLayoutComponent
  (Ljava/awt/Component;Ljava/lang/Object;)V
  (Ljava/awt/Component;Ljava/lang/Object;)V
@@ -84,7 +84,7 @@ lookupConstraints
  (Ljava/awt/Component;)Ljava/awt/GridBagConstraints;
 maximumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
- (Ljava/awt/Container;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;)L1java/awt/Dimension;
 minimumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
  (Ljava/awt/Container;)Ljava/awt/Dimension;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/KeyboardFocusManager.eea b/libs/eea-java-17/src/main/resources/java/awt/KeyboardFocusManager.eea
index 7263c541ff..3ce5e9509a 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/KeyboardFocusManager.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/KeyboardFocusManager.eea
@@ -90,10 +90,10 @@ getGlobalPermanentFocusOwner
  ()Ljava/awt/Component;
 getKeyEventDispatchers
  ()Ljava/util/List<Ljava/awt/KeyEventDispatcher;>;
- ()Ljava/util/List<Ljava/awt/KeyEventDispatcher;>;
+ ()L0java/util/List<Ljava/awt/KeyEventDispatcher;>;
 getKeyEventPostProcessors
  ()Ljava/util/List<Ljava/awt/KeyEventPostProcessor;>;
- ()Ljava/util/List<Ljava/awt/KeyEventPostProcessor;>;
+ ()L0java/util/List<Ljava/awt/KeyEventPostProcessor;>;
 getPermanentFocusOwner
  ()Ljava/awt/Component;
  ()Ljava/awt/Component;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Label.eea b/libs/eea-java-17/src/main/resources/java/awt/Label.eea
index 7fac456929..8228cbfcc9 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Label.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Label.eea
@@ -14,7 +14,7 @@ getText
  ()Ljava/lang/String;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Component)
 setText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/LinearGradientPaint.eea b/libs/eea-java-17/src/main/resources/java/awt/LinearGradientPaint.eea
index f27c0a9202..09527fc55a 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/LinearGradientPaint.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/LinearGradientPaint.eea
@@ -17,7 +17,7 @@ class java/awt/LinearGradientPaint
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;[F[Ljava/awt/Color;Ljava/awt/MultipleGradientPaint$CycleMethod;Ljava/awt/MultipleGradientPaint$ColorSpaceType;Ljava/awt/geom/AffineTransform;)V
 createContext
  (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
- (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
+ (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)L1java/awt/PaintContext; # @Inherited(java.awt.Paint)
 getEndPoint
  ()Ljava/awt/geom/Point2D;
  ()Ljava/awt/geom/Point2D;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/List$AccessibleAWTList$AccessibleAWTListChild.eea b/libs/eea-java-17/src/main/resources/java/awt/List$AccessibleAWTList$AccessibleAWTListChild.eea
index 5762efc0fb..fdf54018ad 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/List$AccessibleAWTList$AccessibleAWTListChild.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/List$AccessibleAWTList$AccessibleAWTListChild.eea
@@ -11,10 +11,10 @@ contains
  (Ljava/awt/Point;)Z
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Component$AccessibleAWTComponent)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(java.awt.Component$AccessibleAWTComponent)
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -29,7 +29,7 @@ getBackground
  ()Ljava/awt/Color;
 getBounds
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L0java/awt/Rectangle;
 getCursor
  ()Ljava/awt/Cursor;
  ()Ljava/awt/Cursor;
@@ -47,13 +47,13 @@ getLocale
  ()Ljava/util/Locale;
 getLocation
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getLocationOnScreen
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L0java/awt/Dimension;
 removeFocusListener
  (Ljava/awt/event/FocusListener;)V
  (L1java/awt/event/FocusListener;)V # @Inherited(java.awt.Component$AccessibleAWTComponent)
diff --git a/libs/eea-java-17/src/main/resources/java/awt/List$AccessibleAWTList.eea b/libs/eea-java-17/src/main/resources/java/awt/List$AccessibleAWTList.eea
index ed2874ac5e..a96cb0c076 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/List$AccessibleAWTList.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/List$AccessibleAWTList.eea
@@ -8,16 +8,16 @@ actionPerformed
  (L1java/awt/event/ActionEvent;)V # @Inherited(java.awt.event.ActionListener)
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Component$AccessibleAWTComponent)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(java.awt.Component$AccessibleAWTComponent)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
  (I)Ljavax/accessibility/Accessible;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/List.eea b/libs/eea-java-17/src/main/resources/java/awt/List.eea
index 57a6a5bd46..356cfecdca 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/List.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/List.eea
@@ -32,7 +32,7 @@ getItemListeners
  ()[Ljava/awt/event/ItemListener;
 getItems
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
@@ -56,22 +56,22 @@ getSelectedItem
  ()Ljava/lang/String;
 getSelectedItems
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 getSelectedObjects
  ()[Ljava/lang/Object;
  ()[Ljava/lang/Object;
 minimumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(java.awt.Component)
 minimumSize
  (I)Ljava/awt/Dimension;
  (I)Ljava/awt/Dimension;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Component)
 preferredSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(java.awt.Component)
 preferredSize
  (I)Ljava/awt/Dimension;
  (I)Ljava/awt/Dimension;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/MediaTracker.eea b/libs/eea-java-17/src/main/resources/java/awt/MediaTracker.eea
index 27c4cf0c7c..28ec12e706 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/MediaTracker.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/MediaTracker.eea
@@ -11,10 +11,10 @@ addImage
  (Ljava/awt/Image;III)V
 getErrorsAny
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 getErrorsID
  (I)[Ljava/lang/Object;
- (I)[Ljava/lang/Object;
+ (I)[0Ljava/lang/Object;
 removeImage
  (Ljava/awt/Image;)V
  (Ljava/awt/Image;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Menu.eea b/libs/eea-java-17/src/main/resources/java/awt/Menu.eea
index 730be5ebbc..8189b7c5f1 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Menu.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Menu.eea
@@ -26,7 +26,7 @@ insert
  (Ljava/lang/String;I)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.MenuItem)
 remove
  (Ljava/awt/MenuComponent;)V
  (Ljava/awt/MenuComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/MenuBar.eea b/libs/eea-java-17/src/main/resources/java/awt/MenuBar.eea
index 50ae26171b..7d92c2de7d 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/MenuBar.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/MenuBar.eea
@@ -17,7 +17,7 @@ getMenu
  (I)Ljava/awt/Menu;
 getShortcutMenuItem
  (Ljava/awt/MenuShortcut;)Ljava/awt/MenuItem;
- (Ljava/awt/MenuShortcut;)Ljava/awt/MenuItem;
+ (Ljava/awt/MenuShortcut;)L0java/awt/MenuItem;
 remove
  (Ljava/awt/MenuComponent;)V
  (Ljava/awt/MenuComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/MenuComponent$AccessibleAWTMenuComponent.eea b/libs/eea-java-17/src/main/resources/java/awt/MenuComponent$AccessibleAWTMenuComponent.eea
index 6f68dfc89b..0138f4f1d8 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/MenuComponent$AccessibleAWTMenuComponent.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/MenuComponent$AccessibleAWTMenuComponent.eea
@@ -11,13 +11,13 @@ contains
  (Ljava/awt/Point;)Z
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -26,49 +26,49 @@ getAccessibleName
  ()Ljava/lang/String;
 getAccessibleParent
  ()Ljavax/accessibility/Accessible;
- ()Ljavax/accessibility/Accessible;
+ ()L0javax/accessibility/Accessible;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
  ()Ljavax/accessibility/AccessibleStateSet;
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getBounds
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L0java/awt/Rectangle;
 getCursor
  ()Ljava/awt/Cursor;
- ()Ljava/awt/Cursor;
+ ()L0java/awt/Cursor;
 getFont
  ()Ljava/awt/Font;
  ()Ljava/awt/Font;
 getFontMetrics
  (Ljava/awt/Font;)Ljava/awt/FontMetrics;
- (Ljava/awt/Font;)Ljava/awt/FontMetrics;
+ (Ljava/awt/Font;)L0java/awt/FontMetrics;
 getForeground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
 getLocation
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getLocationOnScreen
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L0java/awt/Dimension;
 removeFocusListener
  (Ljava/awt/event/FocusListener;)V
  (L1java/awt/event/FocusListener;)V # @Inherited(javax.accessibility.AccessibleComponent)
diff --git a/libs/eea-java-17/src/main/resources/java/awt/MenuComponent.eea b/libs/eea-java-17/src/main/resources/java/awt/MenuComponent.eea
index c3582da9f5..b11e5bc4c4 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/MenuComponent.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/MenuComponent.eea
@@ -8,7 +8,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getFont
  ()Ljava/awt/Font;
- ()Ljava/awt/Font;
+ ()L0java/awt/Font;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -20,7 +20,7 @@ getTreeLock
  ()Ljava/lang/Object;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 postEvent
  (Ljava/awt/Event;)Z
  (Ljava/awt/Event;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/awt/MenuItem$AccessibleAWTMenuItem.eea b/libs/eea-java-17/src/main/resources/java/awt/MenuItem$AccessibleAWTMenuItem.eea
index d69ec462f7..862b1cfb1c 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/MenuItem$AccessibleAWTMenuItem.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/MenuItem$AccessibleAWTMenuItem.eea
@@ -5,10 +5,10 @@ class java/awt/MenuItem$AccessibleAWTMenuItem
  (Ljava/awt/MenuItem;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -17,7 +17,7 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/MenuItem.eea b/libs/eea-java-17/src/main/resources/java/awt/MenuItem.eea
index ae0c478594..fd40a6150c 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/MenuItem.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/MenuItem.eea
@@ -29,7 +29,7 @@ getShortcut
  ()Ljava/awt/MenuShortcut;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.MenuComponent)
 processActionEvent
  (Ljava/awt/event/ActionEvent;)V
  (Ljava/awt/event/ActionEvent;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/MenuShortcut.eea b/libs/eea-java-17/src/main/resources/java/awt/MenuShortcut.eea
index 3d2aace5de..170650756a 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/MenuShortcut.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/MenuShortcut.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/java/awt/MultipleGradientPaint.eea b/libs/eea-java-17/src/main/resources/java/awt/MultipleGradientPaint.eea
index 5bdb427a46..7828a0558d 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/MultipleGradientPaint.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/MultipleGradientPaint.eea
@@ -14,4 +14,4 @@ getFractions
  ()[F
 getTransform
  ()Ljava/awt/geom/AffineTransform;
- ()Ljava/awt/geom/AffineTransform;
+ ()L1java/awt/geom/AffineTransform;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/PageAttributes.eea b/libs/eea-java-17/src/main/resources/java/awt/PageAttributes.eea
index ed69e60b79..c2bbb0d142 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/PageAttributes.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/PageAttributes.eea
@@ -29,7 +29,7 @@ getPrintQuality
  ()Ljava/awt/PageAttributes$PrintQualityType;
 getPrinterResolution
  ()[I
- ()[I
+ ()[1I
 set
  (Ljava/awt/PageAttributes;)V
  (Ljava/awt/PageAttributes;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Paint.eea b/libs/eea-java-17/src/main/resources/java/awt/Paint.eea
index 7fa31b296c..a1db839cc7 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Paint.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Paint.eea
@@ -2,4 +2,4 @@ class java/awt/Paint
 
 createContext
  (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
- (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
+ (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)L1java/awt/PaintContext;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Polygon.eea b/libs/eea-java-17/src/main/resources/java/awt/Polygon.eea
index 4965f36570..df2dcc4896 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Polygon.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Polygon.eea
@@ -33,7 +33,7 @@ getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/PopupMenu.eea b/libs/eea-java-17/src/main/resources/java/awt/PopupMenu.eea
index 729c3cdc24..79aca92c30 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/PopupMenu.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/PopupMenu.eea
@@ -8,7 +8,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getParent
  ()Ljava/awt/MenuContainer;
- ()Ljava/awt/MenuContainer;
+ ()L0java/awt/MenuContainer;
 show
  (Ljava/awt/Component;II)V
  (Ljava/awt/Component;II)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/RadialGradientPaint.eea b/libs/eea-java-17/src/main/resources/java/awt/RadialGradientPaint.eea
index 78cfa8601d..efe9107cde 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/RadialGradientPaint.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/RadialGradientPaint.eea
@@ -26,7 +26,7 @@ class java/awt/RadialGradientPaint
  (Ljava/awt/geom/Rectangle2D;[F[Ljava/awt/Color;Ljava/awt/MultipleGradientPaint$CycleMethod;)V
 createContext
  (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
- (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
+ (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)L1java/awt/PaintContext; # @Inherited(java.awt.Paint)
 getCenterPoint
  ()Ljava/awt/geom/Point2D;
  ()Ljava/awt/geom/Point2D;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Rectangle.eea b/libs/eea-java-17/src/main/resources/java/awt/Rectangle.eea
index 96c5ff0e52..8261529405 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Rectangle.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Rectangle.eea
@@ -26,10 +26,10 @@ contains
  (Ljava/awt/Rectangle;)Z
 createIntersection
  (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
- (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
+ (Ljava/awt/geom/Rectangle2D;)L1java/awt/geom/Rectangle2D; # @Inherited(java.awt.geom.Rectangle2D)
 createUnion
  (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
- (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
+ (Ljava/awt/geom/Rectangle2D;)L1java/awt/geom/Rectangle2D; # @Inherited(java.awt.geom.Rectangle2D)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.awt.geom.Rectangle2D)
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Robot.eea b/libs/eea-java-17/src/main/resources/java/awt/Robot.eea
index 0b12fa8bc8..9875c646e4 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Robot.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Robot.eea
@@ -5,10 +5,10 @@ class java/awt/Robot
  (Ljava/awt/GraphicsDevice;)V
 createMultiResolutionScreenCapture
  (Ljava/awt/Rectangle;)Ljava/awt/image/MultiResolutionImage;
- (Ljava/awt/Rectangle;)Ljava/awt/image/MultiResolutionImage;
+ (Ljava/awt/Rectangle;)L1java/awt/image/MultiResolutionImage;
 createScreenCapture
  (Ljava/awt/Rectangle;)Ljava/awt/image/BufferedImage;
- (Ljava/awt/Rectangle;)Ljava/awt/image/BufferedImage;
+ (Ljava/awt/Rectangle;)L1java/awt/image/BufferedImage;
 getPixelColor
  (II)Ljava/awt/Color;
  (II)Ljava/awt/Color;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/ScrollPane.eea b/libs/eea-java-17/src/main/resources/java/awt/ScrollPane.eea
index 58219ffacc..19f3d1dbb9 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/ScrollPane.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/ScrollPane.eea
@@ -20,7 +20,7 @@ getViewportSize
  ()Ljava/awt/Dimension;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Container)
 printComponents
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/ScrollPaneAdjustable.eea b/libs/eea-java-17/src/main/resources/java/awt/ScrollPaneAdjustable.eea
index 155aed02aa..1667bb1a17 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/ScrollPaneAdjustable.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/ScrollPaneAdjustable.eea
@@ -8,7 +8,7 @@ getAdjustmentListeners
  ()[Ljava/awt/event/AdjustmentListener;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 removeAdjustmentListener
  (Ljava/awt/event/AdjustmentListener;)V
  (L1java/awt/event/AdjustmentListener;)V # @Inherited(java.awt.Adjustable)
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Scrollbar$AccessibleAWTScrollBar.eea b/libs/eea-java-17/src/main/resources/java/awt/Scrollbar$AccessibleAWTScrollBar.eea
index 180c0600df..7c39a21217 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Scrollbar$AccessibleAWTScrollBar.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Scrollbar$AccessibleAWTScrollBar.eea
@@ -11,7 +11,7 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Scrollbar.eea b/libs/eea-java-17/src/main/resources/java/awt/Scrollbar.eea
index bc4c6f2635..bc3396e309 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Scrollbar.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Scrollbar.eea
@@ -14,7 +14,7 @@ getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Component)
 processAdjustmentEvent
  (Ljava/awt/event/AdjustmentEvent;)V
  (Ljava/awt/event/AdjustmentEvent;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/SplashScreen.eea b/libs/eea-java-17/src/main/resources/java/awt/SplashScreen.eea
index 9f0e98561f..46c5cfdeb9 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/SplashScreen.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/SplashScreen.eea
@@ -6,7 +6,7 @@ getSplashScreen
 
 createGraphics
  ()Ljava/awt/Graphics2D;
- ()Ljava/awt/Graphics2D;
+ ()L1java/awt/Graphics2D;
 getBounds
  ()Ljava/awt/Rectangle;
  ()Ljava/awt/Rectangle;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Stroke.eea b/libs/eea-java-17/src/main/resources/java/awt/Stroke.eea
index a5739432c8..b2328bb0bc 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Stroke.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Stroke.eea
@@ -2,4 +2,4 @@ class java/awt/Stroke
 
 createStrokedShape
  (Ljava/awt/Shape;)Ljava/awt/Shape;
- (Ljava/awt/Shape;)Ljava/awt/Shape;
+ (Ljava/awt/Shape;)L1java/awt/Shape;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Taskbar.eea b/libs/eea-java-17/src/main/resources/java/awt/Taskbar.eea
index 52703a8925..8d5ee79bce 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Taskbar.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Taskbar.eea
@@ -2,7 +2,7 @@ class java/awt/Taskbar
 
 getTaskbar
  ()Ljava/awt/Taskbar;
- ()Ljava/awt/Taskbar;
+ ()L1java/awt/Taskbar;
 
 getIconImage
  ()Ljava/awt/Image;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/TextArea.eea b/libs/eea-java-17/src/main/resources/java/awt/TextArea.eea
index 947896400e..63d562a834 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/TextArea.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/TextArea.eea
@@ -38,16 +38,16 @@ insertText
  (Ljava/lang/String;I)V
 minimumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(java.awt.Component)
 minimumSize
  (II)Ljava/awt/Dimension;
  (II)Ljava/awt/Dimension;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.TextComponent)
 preferredSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(java.awt.Component)
 preferredSize
  (II)Ljava/awt/Dimension;
  (II)Ljava/awt/Dimension;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/TextComponent$AccessibleAWTTextComponent.eea b/libs/eea-java-17/src/main/resources/java/awt/TextComponent$AccessibleAWTTextComponent.eea
index b18e9275c8..175403f251 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/TextComponent$AccessibleAWTTextComponent.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/TextComponent$AccessibleAWTTextComponent.eea
@@ -11,28 +11,28 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAfterIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getAtIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getBeforeIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getCharacterAttribute
  (I)Ljavax/swing/text/AttributeSet;
- (I)Ljavax/swing/text/AttributeSet;
+ (I)L0javax/swing/text/AttributeSet;
 getCharacterBounds
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L0java/awt/Rectangle;
 getIndexAtPoint
  (Ljava/awt/Point;)I
  (Ljava/awt/Point;)I
 getSelectedText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 textValueChanged
  (Ljava/awt/event/TextEvent;)V
  (L1java/awt/event/TextEvent;)V # @Inherited(java.awt.event.TextListener)
diff --git a/libs/eea-java-17/src/main/resources/java/awt/TextComponent.eea b/libs/eea-java-17/src/main/resources/java/awt/TextComponent.eea
index 6f2d4dc8cc..4491fce163 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/TextComponent.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/TextComponent.eea
@@ -12,10 +12,10 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color; # @Inherited(java.awt.Component)
 getInputMethodRequests
  ()Ljava/awt/im/InputMethodRequests;
- ()Ljava/awt/im/InputMethodRequests;
+ ()L0java/awt/im/InputMethodRequests; # @Inherited(java.awt.Component)
 getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
@@ -30,7 +30,7 @@ getTextListeners
  ()[Ljava/awt/event/TextListener;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Component)
 processEvent
  (Ljava/awt/AWTEvent;)V
  (Ljava/awt/AWTEvent;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/TextField.eea b/libs/eea-java-17/src/main/resources/java/awt/TextField.eea
index 44ebaa2b01..6e9c74d9f0 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/TextField.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/TextField.eea
@@ -32,16 +32,16 @@ getPreferredSize
  (I)Ljava/awt/Dimension;
 minimumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(java.awt.Component)
 minimumSize
  (I)Ljava/awt/Dimension;
  (I)Ljava/awt/Dimension;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.TextComponent)
 preferredSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(java.awt.Component)
 preferredSize
  (I)Ljava/awt/Dimension;
  (I)Ljava/awt/Dimension;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/TexturePaint.eea b/libs/eea-java-17/src/main/resources/java/awt/TexturePaint.eea
index 9498e79288..bdd3239f99 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/TexturePaint.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/TexturePaint.eea
@@ -5,7 +5,7 @@ class java/awt/TexturePaint
  (Ljava/awt/image/BufferedImage;Ljava/awt/geom/Rectangle2D;)V
 createContext
  (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
- (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
+ (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)L1java/awt/PaintContext; # @Inherited(java.awt.Paint)
 getAnchorRect
  ()Ljava/awt/geom/Rectangle2D;
  ()Ljava/awt/geom/Rectangle2D;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Toolkit.eea b/libs/eea-java-17/src/main/resources/java/awt/Toolkit.eea
index 4926505d00..bb3341d850 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Toolkit.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Toolkit.eea
@@ -28,25 +28,25 @@ checkImage
  (Ljava/awt/Image;IILjava/awt/image/ImageObserver;)I
 createCustomCursor
  (Ljava/awt/Image;Ljava/awt/Point;Ljava/lang/String;)Ljava/awt/Cursor;
- (Ljava/awt/Image;Ljava/awt/Point;Ljava/lang/String;)Ljava/awt/Cursor;
+ (Ljava/awt/Image;Ljava/awt/Point;Ljava/lang/String;)L1java/awt/Cursor;
 createDragGestureRecognizer
  <T:Ljava/awt/dnd/DragGestureRecognizer;>(Ljava/lang/Class<TT;>;Ljava/awt/dnd/DragSource;Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)TT;
- <T:Ljava/awt/dnd/DragGestureRecognizer;>(Ljava/lang/Class<TT;>;Ljava/awt/dnd/DragSource;Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)TT;
+ <T:Ljava/awt/dnd/DragGestureRecognizer;>(Ljava/lang/Class<TT;>;Ljava/awt/dnd/DragSource;Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)T0T;
 createImage
  (Ljava/awt/image/ImageProducer;)Ljava/awt/Image;
- (Ljava/awt/image/ImageProducer;)Ljava/awt/Image;
+ (Ljava/awt/image/ImageProducer;)L1java/awt/Image;
 createImage
  (Ljava/lang/String;)Ljava/awt/Image;
- (Ljava/lang/String;)Ljava/awt/Image;
+ (Ljava/lang/String;)L1java/awt/Image;
 createImage
  (Ljava/net/URL;)Ljava/awt/Image;
- (Ljava/net/URL;)Ljava/awt/Image;
+ (Ljava/net/URL;)L1java/awt/Image;
 createImage
  ([B)Ljava/awt/Image;
- ([B)Ljava/awt/Image;
+ ([B)L1java/awt/Image;
 createImage
  ([BII)Ljava/awt/Image;
- ([BII)Ljava/awt/Image;
+ ([BII)L1java/awt/Image;
 getAWTEventListeners
  ()[Ljava/awt/event/AWTEventListener;
  ()[Ljava/awt/event/AWTEventListener;
@@ -103,7 +103,7 @@ getSystemEventQueueImpl
  ()Ljava/awt/EventQueue;
 getSystemSelection
  ()Ljava/awt/datatransfer/Clipboard;
- ()Ljava/awt/datatransfer/Clipboard;
+ ()L0java/awt/datatransfer/Clipboard;
 isModalExclusionTypeSupported
  (Ljava/awt/Dialog$ModalExclusionType;)Z
  (Ljava/awt/Dialog$ModalExclusionType;)Z
@@ -112,7 +112,7 @@ isModalityTypeSupported
  (Ljava/awt/Dialog$ModalityType;)Z
 lazilyLoadDesktopProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 loadSystemColors
  ([I)V
  ([I)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/Window.eea b/libs/eea-java-17/src/main/resources/java/awt/Window.eea
index 277e49e4aa..24f6d79d17 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/Window.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/Window.eea
@@ -2,7 +2,7 @@ class java/awt/Window
 
 getOwnerlessWindows
  ()[Ljava/awt/Window;
- ()[Ljava/awt/Window;
+ ()[1Ljava/awt/Window;
 getWindows
  ()[Ljava/awt/Window;
  ()[Ljava/awt/Window;
@@ -45,25 +45,25 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color; # @Inherited(java.awt.Component)
 getBufferStrategy
  ()Ljava/awt/image/BufferStrategy;
  ()Ljava/awt/image/BufferStrategy;
 getFocusCycleRootAncestor
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L0java/awt/Container;
 getFocusOwner
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 getFocusTraversalKeys
  (I)Ljava/util/Set<Ljava/awt/AWTKeyStroke;>;
- (I)Ljava/util/Set<Ljava/awt/AWTKeyStroke;>;
+ (I)L0java/util/Set<Ljava/awt/AWTKeyStroke;>;
 getIconImages
  ()Ljava/util/List<Ljava/awt/Image;>;
- ()Ljava/util/List<Ljava/awt/Image;>;
+ ()L1java/util/List<Ljava/awt/Image;>;
 getInputContext
  ()Ljava/awt/im/InputContext;
- ()Ljava/awt/im/InputContext;
+ ()L0java/awt/im/InputContext; # @Inherited(java.awt.Component)
 getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
@@ -75,7 +75,7 @@ getModalExclusionType
  ()Ljava/awt/Dialog$ModalExclusionType;
 getMostRecentFocusOwner
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 getOwnedWindows
  ()[Ljava/awt/Window;
  ()[Ljava/awt/Window;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/color/ICC_ColorSpace.eea b/libs/eea-java-17/src/main/resources/java/awt/color/ICC_ColorSpace.eea
index 0d66db046a..d4ced29f93 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/color/ICC_ColorSpace.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/color/ICC_ColorSpace.eea
@@ -5,16 +5,16 @@ class java/awt/color/ICC_ColorSpace
  (Ljava/awt/color/ICC_Profile;)V
 fromCIEXYZ
  ([F)[F
- ([F)[F
+ ([F)[1F
 fromRGB
  ([F)[F
- ([F)[F
+ ([F)[1F
 getProfile
  ()Ljava/awt/color/ICC_Profile;
  ()Ljava/awt/color/ICC_Profile;
 toCIEXYZ
  ([F)[F
- ([F)[F
+ ([F)[1F
 toRGB
  ([F)[F
- ([F)[F
+ ([F)[1F
diff --git a/libs/eea-java-17/src/main/resources/java/awt/color/ICC_Profile.eea b/libs/eea-java-17/src/main/resources/java/awt/color/ICC_Profile.eea
index 7a23bea501..0440ce3e82 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/color/ICC_Profile.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/color/ICC_Profile.eea
@@ -11,14 +11,14 @@ getInstance
  (Ljava/lang/String;)Ljava/awt/color/ICC_Profile;
 getInstance
  ([B)Ljava/awt/color/ICC_Profile;
- ([B)Ljava/awt/color/ICC_Profile;
+ ([B)L1java/awt/color/ICC_Profile;
 
 getData
  ()[B
- ()[B
+ ()[1B
 getData
  (I)[B
- (I)[B
+ (I)[0B
 readResolve
  ()Ljava/lang/Object;
  ()L1java/lang/Object;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/datatransfer/DataFlavor.eea b/libs/eea-java-17/src/main/resources/java/awt/datatransfer/DataFlavor.eea
index 542a713f57..85e3534877 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/datatransfer/DataFlavor.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/datatransfer/DataFlavor.eea
@@ -36,7 +36,7 @@ getTextPlainUnicodeFlavor
  ()Ljava/awt/datatransfer/DataFlavor;
 selectBestTextFlavor
  ([Ljava/awt/datatransfer/DataFlavor;)Ljava/awt/datatransfer/DataFlavor;
- ([Ljava/awt/datatransfer/DataFlavor;)Ljava/awt/datatransfer/DataFlavor;
+ ([Ljava/awt/datatransfer/DataFlavor;)L0java/awt/datatransfer/DataFlavor;
 tryToLoadClass
  (Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/Class<*>;
  (Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/Class<*>;
@@ -67,7 +67,7 @@ equals
  (Ljava/lang/String;)Z
 getDefaultRepresentationClass
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L1java/lang/Class<*>;
 getDefaultRepresentationClassAsString
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -76,13 +76,13 @@ getHumanPresentableName
  ()Ljava/lang/String;
 getMimeType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getParameter
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getPrimaryType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getReaderForText
  (Ljava/awt/datatransfer/Transferable;)Ljava/io/Reader;
  (Ljava/awt/datatransfer/Transferable;)Ljava/io/Reader;
@@ -91,7 +91,7 @@ getRepresentationClass
  ()Ljava/lang/Class<*>;
 getSubType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 isMimeTypeEqual
  (Ljava/awt/datatransfer/DataFlavor;)Z
  (Ljava/awt/datatransfer/DataFlavor;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/awt/datatransfer/SystemFlavorMap.eea b/libs/eea-java-17/src/main/resources/java/awt/datatransfer/SystemFlavorMap.eea
index 4f66551538..9fa39bf46d 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/datatransfer/SystemFlavorMap.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/datatransfer/SystemFlavorMap.eea
@@ -2,16 +2,16 @@ class java/awt/datatransfer/SystemFlavorMap
 
 decodeDataFlavor
  (Ljava/lang/String;)Ljava/awt/datatransfer/DataFlavor;
- (Ljava/lang/String;)Ljava/awt/datatransfer/DataFlavor;
+ (Ljava/lang/String;)L0java/awt/datatransfer/DataFlavor;
 decodeJavaMIMEType
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 encodeDataFlavor
  (Ljava/awt/datatransfer/DataFlavor;)Ljava/lang/String;
- (Ljava/awt/datatransfer/DataFlavor;)Ljava/lang/String;
+ (Ljava/awt/datatransfer/DataFlavor;)L0java/lang/String;
 encodeJavaMIMEType
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getDefaultFlavorMap
  ()Ljava/awt/datatransfer/FlavorMap;
  ()Ljava/awt/datatransfer/FlavorMap;
@@ -27,13 +27,13 @@ addUnencodedNativeForFlavor
  (Ljava/awt/datatransfer/DataFlavor;Ljava/lang/String;)V
 getFlavorsForNative
  (Ljava/lang/String;)Ljava/util/List<Ljava/awt/datatransfer/DataFlavor;>;
- (Ljava/lang/String;)Ljava/util/List<Ljava/awt/datatransfer/DataFlavor;>;
+ (Ljava/lang/String;)L1java/util/List<Ljava/awt/datatransfer/DataFlavor;>;
 getFlavorsForNatives
  ([Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/awt/datatransfer/DataFlavor;>;
  ([Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/awt/datatransfer/DataFlavor;>;
 getNativesForFlavor
  (Ljava/awt/datatransfer/DataFlavor;)Ljava/util/List<Ljava/lang/String;>;
- (Ljava/awt/datatransfer/DataFlavor;)Ljava/util/List<Ljava/lang/String;>;
+ (Ljava/awt/datatransfer/DataFlavor;)L1java/util/List<Ljava/lang/String;>;
 getNativesForFlavors
  ([Ljava/awt/datatransfer/DataFlavor;)Ljava/util/Map<Ljava/awt/datatransfer/DataFlavor;Ljava/lang/String;>;
  ([Ljava/awt/datatransfer/DataFlavor;)Ljava/util/Map<Ljava/awt/datatransfer/DataFlavor;Ljava/lang/String;>;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/desktop/FilesEvent.eea b/libs/eea-java-17/src/main/resources/java/awt/desktop/FilesEvent.eea
index 8afc2ddea3..7c7523ae2e 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/desktop/FilesEvent.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/desktop/FilesEvent.eea
@@ -2,4 +2,4 @@ class java/awt/desktop/FilesEvent
 
 getFiles
  ()Ljava/util/List<Ljava/io/File;>;
- ()Ljava/util/List<Ljava/io/File;>;
+ ()L1java/util/List<Ljava/io/File;>;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/dnd/DragSource.eea b/libs/eea-java-17/src/main/resources/java/awt/dnd/DragSource.eea
index d88114865e..3070a955a3 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/dnd/DragSource.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/dnd/DragSource.eea
@@ -31,13 +31,13 @@ addDragSourceMotionListener
  (L1java/awt/dnd/DragSourceMotionListener;)V
 createDefaultDragGestureRecognizer
  (Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)Ljava/awt/dnd/DragGestureRecognizer;
- (Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)Ljava/awt/dnd/DragGestureRecognizer;
+ (Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)L1java/awt/dnd/DragGestureRecognizer;
 createDragGestureRecognizer
  <T:Ljava/awt/dnd/DragGestureRecognizer;>(Ljava/lang/Class<TT;>;Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)TT;
- <T:Ljava/awt/dnd/DragGestureRecognizer;>(Ljava/lang/Class<TT;>;Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)TT;
+ <T:Ljava/awt/dnd/DragGestureRecognizer;>(Ljava/lang/Class<TT;>;Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)T1T;
 createDragSourceContext
  (Ljava/awt/dnd/DragGestureEvent;Ljava/awt/Cursor;Ljava/awt/Image;Ljava/awt/Point;Ljava/awt/datatransfer/Transferable;Ljava/awt/dnd/DragSourceListener;)Ljava/awt/dnd/DragSourceContext;
- (Ljava/awt/dnd/DragGestureEvent;Ljava/awt/Cursor;Ljava/awt/Image;Ljava/awt/Point;Ljava/awt/datatransfer/Transferable;Ljava/awt/dnd/DragSourceListener;)Ljava/awt/dnd/DragSourceContext;
+ (Ljava/awt/dnd/DragGestureEvent;Ljava/awt/Cursor;Ljava/awt/Image;Ljava/awt/Point;Ljava/awt/datatransfer/Transferable;Ljava/awt/dnd/DragSourceListener;)L1java/awt/dnd/DragSourceContext;
 getDragSourceListeners
  ()[Ljava/awt/dnd/DragSourceListener;
  ()[Ljava/awt/dnd/DragSourceListener;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/dnd/DragSourceEvent.eea b/libs/eea-java-17/src/main/resources/java/awt/dnd/DragSourceEvent.eea
index 60eb2eeb01..aeee9e81e2 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/dnd/DragSourceEvent.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/dnd/DragSourceEvent.eea
@@ -11,4 +11,4 @@ getDragSourceContext
  ()Ljava/awt/dnd/DragSourceContext;
 getLocation
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/dnd/DropTarget.eea b/libs/eea-java-17/src/main/resources/java/awt/dnd/DropTarget.eea
index aa168ad706..048b80353d 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/dnd/DropTarget.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/dnd/DropTarget.eea
@@ -17,10 +17,10 @@ addDropTargetListener
  (L1java/awt/dnd/DropTargetListener;)V
 createDropTargetAutoScroller
  (Ljava/awt/Component;Ljava/awt/Point;)Ljava/awt/dnd/DropTarget$DropTargetAutoScroller;
- (Ljava/awt/Component;Ljava/awt/Point;)Ljava/awt/dnd/DropTarget$DropTargetAutoScroller;
+ (Ljava/awt/Component;Ljava/awt/Point;)L1java/awt/dnd/DropTarget$DropTargetAutoScroller;
 createDropTargetContext
  ()Ljava/awt/dnd/DropTargetContext;
- ()Ljava/awt/dnd/DropTargetContext;
+ ()L1java/awt/dnd/DropTargetContext;
 dragEnter
  (Ljava/awt/dnd/DropTargetDragEvent;)V
  (L1java/awt/dnd/DropTargetDragEvent;)V # @Inherited(java.awt.dnd.DropTargetListener)
diff --git a/libs/eea-java-17/src/main/resources/java/awt/dnd/DropTargetContext.eea b/libs/eea-java-17/src/main/resources/java/awt/dnd/DropTargetContext.eea
index f11644ee4f..4b35a47ca3 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/dnd/DropTargetContext.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/dnd/DropTargetContext.eea
@@ -2,13 +2,13 @@ class java/awt/dnd/DropTargetContext
 
 createTransferableProxy
  (Ljava/awt/datatransfer/Transferable;Z)Ljava/awt/datatransfer/Transferable;
- (Ljava/awt/datatransfer/Transferable;Z)Ljava/awt/datatransfer/Transferable;
+ (Ljava/awt/datatransfer/Transferable;Z)L1java/awt/datatransfer/Transferable;
 getComponent
  ()Ljava/awt/Component;
  ()Ljava/awt/Component;
 getCurrentDataFlavors
  ()[Ljava/awt/datatransfer/DataFlavor;
- ()[Ljava/awt/datatransfer/DataFlavor;
+ ()[1Ljava/awt/datatransfer/DataFlavor;
 getCurrentDataFlavorsAsList
  ()Ljava/util/List<Ljava/awt/datatransfer/DataFlavor;>;
  ()Ljava/util/List<Ljava/awt/datatransfer/DataFlavor;>;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/event/ActionEvent.eea b/libs/eea-java-17/src/main/resources/java/awt/event/ActionEvent.eea
index f541fb90e9..7a75bf609e 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/event/ActionEvent.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/event/ActionEvent.eea
@@ -14,4 +14,4 @@ getActionCommand
  ()Ljava/lang/String;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-17/src/main/resources/java/awt/event/AdjustmentEvent.eea b/libs/eea-java-17/src/main/resources/java/awt/event/AdjustmentEvent.eea
index fa963763f9..bf6f4022d0 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/event/AdjustmentEvent.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/event/AdjustmentEvent.eea
@@ -11,4 +11,4 @@ getAdjustable
  ()Ljava/awt/Adjustable;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-17/src/main/resources/java/awt/event/ComponentEvent.eea b/libs/eea-java-17/src/main/resources/java/awt/event/ComponentEvent.eea
index 248278dc87..84735f25fc 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/event/ComponentEvent.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/event/ComponentEvent.eea
@@ -5,7 +5,7 @@ class java/awt/event/ComponentEvent
  (Ljava/awt/Component;I)V
 getComponent
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-17/src/main/resources/java/awt/event/ContainerEvent.eea b/libs/eea-java-17/src/main/resources/java/awt/event/ContainerEvent.eea
index 4505843401..adf4537c74 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/event/ContainerEvent.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/event/ContainerEvent.eea
@@ -8,7 +8,7 @@ getChild
  ()Ljava/awt/Component;
 getContainer
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L0java/awt/Container;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.event.ComponentEvent)
diff --git a/libs/eea-java-17/src/main/resources/java/awt/event/FocusEvent.eea b/libs/eea-java-17/src/main/resources/java/awt/event/FocusEvent.eea
index 667f5751a7..854cb65b7a 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/event/FocusEvent.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/event/FocusEvent.eea
@@ -17,7 +17,7 @@ getCause
  ()Ljava/awt/event/FocusEvent$Cause;
 getOppositeComponent
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.event.ComponentEvent)
diff --git a/libs/eea-java-17/src/main/resources/java/awt/event/HierarchyEvent.eea b/libs/eea-java-17/src/main/resources/java/awt/event/HierarchyEvent.eea
index 1af8e531c7..8001088a04 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/event/HierarchyEvent.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/event/HierarchyEvent.eea
@@ -14,7 +14,7 @@ getChangedParent
  ()Ljava/awt/Container;
 getComponent
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-17/src/main/resources/java/awt/event/InputEvent.eea b/libs/eea-java-17/src/main/resources/java/awt/event/InputEvent.eea
index cbab8383da..bee433f498 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/event/InputEvent.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/event/InputEvent.eea
@@ -2,4 +2,4 @@ class java/awt/event/InputEvent
 
 getModifiersExText
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/event/InputMethodEvent.eea b/libs/eea-java-17/src/main/resources/java/awt/event/InputMethodEvent.eea
index f19223647f..6977a20734 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/event/InputMethodEvent.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/event/InputMethodEvent.eea
@@ -20,4 +20,4 @@ getVisiblePosition
  ()Ljava/awt/font/TextHitInfo;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-17/src/main/resources/java/awt/event/InvocationEvent.eea b/libs/eea-java-17/src/main/resources/java/awt/event/InvocationEvent.eea
index 54d8e5b19d..9431e73858 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/event/InvocationEvent.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/event/InvocationEvent.eea
@@ -21,10 +21,10 @@ runnable
  (Ljava/lang/Object;Ljava/lang/Runnable;Ljava/lang/Runnable;Z)V
 getException
  ()Ljava/lang/Exception;
- ()Ljava/lang/Exception;
+ ()L0java/lang/Exception;
 getThrowable
  ()Ljava/lang/Throwable;
- ()Ljava/lang/Throwable;
+ ()L0java/lang/Throwable;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-17/src/main/resources/java/awt/event/ItemEvent.eea b/libs/eea-java-17/src/main/resources/java/awt/event/ItemEvent.eea
index 26b9fe5399..63c93bbdbf 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/event/ItemEvent.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/event/ItemEvent.eea
@@ -11,4 +11,4 @@ getItemSelectable
  ()Ljava/awt/ItemSelectable;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-17/src/main/resources/java/awt/event/KeyEvent.eea b/libs/eea-java-17/src/main/resources/java/awt/event/KeyEvent.eea
index c8e55094ed..bc2af4dbe9 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/event/KeyEvent.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/event/KeyEvent.eea
@@ -2,7 +2,7 @@ class java/awt/event/KeyEvent
 
 getKeyModifiersText
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 getKeyText
  (I)Ljava/lang/String;
  (I)Ljava/lang/String;
@@ -18,4 +18,4 @@ getKeyText
  (Ljava/awt/Component;IJIICI)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.event.ComponentEvent)
diff --git a/libs/eea-java-17/src/main/resources/java/awt/event/MouseEvent.eea b/libs/eea-java-17/src/main/resources/java/awt/event/MouseEvent.eea
index a4be41b353..f56f197bfa 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/event/MouseEvent.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/event/MouseEvent.eea
@@ -2,7 +2,7 @@ class java/awt/event/MouseEvent
 
 getMouseModifiersText
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 
 <init>
  (Ljava/awt/Component;IJIIIIIIZI)V
@@ -18,7 +18,7 @@ getLocationOnScreen
  ()Ljava/awt/Point;
 getPoint
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L1java/awt/Point;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.event.ComponentEvent)
diff --git a/libs/eea-java-17/src/main/resources/java/awt/event/MouseWheelEvent.eea b/libs/eea-java-17/src/main/resources/java/awt/event/MouseWheelEvent.eea
index ab44cf6c46..bab3618f00 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/event/MouseWheelEvent.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/event/MouseWheelEvent.eea
@@ -11,4 +11,4 @@ class java/awt/event/MouseWheelEvent
  (Ljava/awt/Component;IJIIIIZIII)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.event.MouseEvent)
diff --git a/libs/eea-java-17/src/main/resources/java/awt/event/PaintEvent.eea b/libs/eea-java-17/src/main/resources/java/awt/event/PaintEvent.eea
index 65b2cbfa4b..95d2eaa82e 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/event/PaintEvent.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/event/PaintEvent.eea
@@ -8,7 +8,7 @@ getUpdateRect
  ()Ljava/awt/Rectangle;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.event.ComponentEvent)
 setUpdateRect
  (Ljava/awt/Rectangle;)V
  (Ljava/awt/Rectangle;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/event/TextEvent.eea b/libs/eea-java-17/src/main/resources/java/awt/event/TextEvent.eea
index 381c8e901a..15d46c86ca 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/event/TextEvent.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/event/TextEvent.eea
@@ -5,4 +5,4 @@ class java/awt/event/TextEvent
  (Ljava/lang/Object;I)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-17/src/main/resources/java/awt/event/WindowEvent.eea b/libs/eea-java-17/src/main/resources/java/awt/event/WindowEvent.eea
index b5a35b6220..2fe2c14d44 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/event/WindowEvent.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/event/WindowEvent.eea
@@ -14,10 +14,10 @@ class java/awt/event/WindowEvent
  (Ljava/awt/Window;ILjava/awt/Window;II)V
 getOppositeWindow
  ()Ljava/awt/Window;
- ()Ljava/awt/Window;
+ ()L0java/awt/Window;
 getWindow
  ()Ljava/awt/Window;
- ()Ljava/awt/Window;
+ ()L0java/awt/Window;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.event.ComponentEvent)
diff --git a/libs/eea-java-17/src/main/resources/java/awt/font/FontRenderContext.eea b/libs/eea-java-17/src/main/resources/java/awt/font/FontRenderContext.eea
index 06663117cf..98c1a76b22 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/font/FontRenderContext.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/font/FontRenderContext.eea
@@ -20,4 +20,4 @@ getFractionalMetricsHint
  ()Ljava/lang/Object;
 getTransform
  ()Ljava/awt/geom/AffineTransform;
- ()Ljava/awt/geom/AffineTransform;
+ ()L1java/awt/geom/AffineTransform;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/font/GlyphVector.eea b/libs/eea-java-17/src/main/resources/java/awt/font/GlyphVector.eea
index a2a027c978..a89b16264f 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/font/GlyphVector.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/font/GlyphVector.eea
@@ -11,7 +11,7 @@ getFontRenderContext
  ()Ljava/awt/font/FontRenderContext;
 getGlyphCharIndices
  (II[I)[I
- (II[I)[I
+ (II[I)[1I
 getGlyphCodes
  (II[I)[I
  (II[I)[I
diff --git a/libs/eea-java-17/src/main/resources/java/awt/font/LineBreakMeasurer.eea b/libs/eea-java-17/src/main/resources/java/awt/font/LineBreakMeasurer.eea
index 2439a59f27..b398d391fd 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/font/LineBreakMeasurer.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/font/LineBreakMeasurer.eea
@@ -17,4 +17,4 @@ nextLayout
  (F)Ljava/awt/font/TextLayout;
 nextLayout
  (FIZ)Ljava/awt/font/TextLayout;
- (FIZ)Ljava/awt/font/TextLayout;
+ (FIZ)L0java/awt/font/TextLayout;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/font/NumericShaper.eea b/libs/eea-java-17/src/main/resources/java/awt/font/NumericShaper.eea
index 1bd374a959..004363fe47 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/font/NumericShaper.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/font/NumericShaper.eea
@@ -5,19 +5,19 @@ getContextualShaper
  (I)Ljava/awt/font/NumericShaper;
 getContextualShaper
  (II)Ljava/awt/font/NumericShaper;
- (II)Ljava/awt/font/NumericShaper;
+ (II)L1java/awt/font/NumericShaper;
 getContextualShaper
  (Ljava/util/Set<Ljava/awt/font/NumericShaper$Range;>;)Ljava/awt/font/NumericShaper;
- (Ljava/util/Set<Ljava/awt/font/NumericShaper$Range;>;)Ljava/awt/font/NumericShaper;
+ (Ljava/util/Set<Ljava/awt/font/NumericShaper$Range;>;)L1java/awt/font/NumericShaper;
 getContextualShaper
  (Ljava/util/Set<Ljava/awt/font/NumericShaper$Range;>;Ljava/awt/font/NumericShaper$Range;)Ljava/awt/font/NumericShaper;
- (Ljava/util/Set<Ljava/awt/font/NumericShaper$Range;>;Ljava/awt/font/NumericShaper$Range;)Ljava/awt/font/NumericShaper;
+ (Ljava/util/Set<Ljava/awt/font/NumericShaper$Range;>;Ljava/awt/font/NumericShaper$Range;)L1java/awt/font/NumericShaper;
 getShaper
  (I)Ljava/awt/font/NumericShaper;
- (I)Ljava/awt/font/NumericShaper;
+ (I)L1java/awt/font/NumericShaper;
 getShaper
  (Ljava/awt/font/NumericShaper$Range;)Ljava/awt/font/NumericShaper;
- (Ljava/awt/font/NumericShaper$Range;)Ljava/awt/font/NumericShaper;
+ (Ljava/awt/font/NumericShaper$Range;)L1java/awt/font/NumericShaper;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/awt/font/ShapeGraphicAttribute.eea b/libs/eea-java-17/src/main/resources/java/awt/font/ShapeGraphicAttribute.eea
index 92ab1bca0d..83529bd0c1 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/font/ShapeGraphicAttribute.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/font/ShapeGraphicAttribute.eea
@@ -14,7 +14,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getBounds
  ()Ljava/awt/geom/Rectangle2D;
- ()Ljava/awt/geom/Rectangle2D;
+ ()L1java/awt/geom/Rectangle2D;
 getOutline
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/Shape;
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/Shape;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/font/TextLayout.eea b/libs/eea-java-17/src/main/resources/java/awt/font/TextLayout.eea
index 316f56c56a..fd954819a7 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/font/TextLayout.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/font/TextLayout.eea
@@ -24,13 +24,13 @@ equals
  (Ljava/awt/font/TextLayout;)Z
 getBaselineOffsets
  ()[F
- ()[F
+ ()[1F
 getBlackBoxBounds
  (II)Ljava/awt/Shape;
  (II)Ljava/awt/Shape;
 getBounds
  ()Ljava/awt/geom/Rectangle2D;
- ()Ljava/awt/geom/Rectangle2D;
+ ()L1java/awt/geom/Rectangle2D;
 getCaretInfo
  (Ljava/awt/font/TextHitInfo;)[F
  (Ljava/awt/font/TextHitInfo;)[F
@@ -51,7 +51,7 @@ getCaretShapes
  (ILjava/awt/geom/Rectangle2D;)[Ljava/awt/Shape;
 getCaretShapes
  (ILjava/awt/geom/Rectangle2D;Ljava/awt/font/TextLayout$CaretPolicy;)[Ljava/awt/Shape;
- (ILjava/awt/geom/Rectangle2D;Ljava/awt/font/TextLayout$CaretPolicy;)[Ljava/awt/Shape;
+ (ILjava/awt/geom/Rectangle2D;Ljava/awt/font/TextLayout$CaretPolicy;)[1Ljava/awt/Shape;
 getJustifiedLayout
  (F)Ljava/awt/font/TextLayout;
  (F)Ljava/awt/font/TextLayout;
@@ -66,25 +66,25 @@ getLogicalHighlightShape
  (IILjava/awt/geom/Rectangle2D;)Ljava/awt/Shape;
 getLogicalRangesForVisualSelection
  (Ljava/awt/font/TextHitInfo;Ljava/awt/font/TextHitInfo;)[I
- (Ljava/awt/font/TextHitInfo;Ljava/awt/font/TextHitInfo;)[I
+ (Ljava/awt/font/TextHitInfo;Ljava/awt/font/TextHitInfo;)[1I
 getNextLeftHit
  (I)Ljava/awt/font/TextHitInfo;
  (I)Ljava/awt/font/TextHitInfo;
 getNextLeftHit
  (ILjava/awt/font/TextLayout$CaretPolicy;)Ljava/awt/font/TextHitInfo;
- (ILjava/awt/font/TextLayout$CaretPolicy;)Ljava/awt/font/TextHitInfo;
+ (ILjava/awt/font/TextLayout$CaretPolicy;)L0java/awt/font/TextHitInfo;
 getNextLeftHit
  (Ljava/awt/font/TextHitInfo;)Ljava/awt/font/TextHitInfo;
- (Ljava/awt/font/TextHitInfo;)Ljava/awt/font/TextHitInfo;
+ (Ljava/awt/font/TextHitInfo;)L0java/awt/font/TextHitInfo;
 getNextRightHit
  (I)Ljava/awt/font/TextHitInfo;
  (I)Ljava/awt/font/TextHitInfo;
 getNextRightHit
  (ILjava/awt/font/TextLayout$CaretPolicy;)Ljava/awt/font/TextHitInfo;
- (ILjava/awt/font/TextLayout$CaretPolicy;)Ljava/awt/font/TextHitInfo;
+ (ILjava/awt/font/TextLayout$CaretPolicy;)L0java/awt/font/TextHitInfo;
 getNextRightHit
  (Ljava/awt/font/TextHitInfo;)Ljava/awt/font/TextHitInfo;
- (Ljava/awt/font/TextHitInfo;)Ljava/awt/font/TextHitInfo;
+ (Ljava/awt/font/TextHitInfo;)L0java/awt/font/TextHitInfo;
 getOutline
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/Shape;
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/Shape;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/font/TransformAttribute.eea b/libs/eea-java-17/src/main/resources/java/awt/font/TransformAttribute.eea
index b2dc622d3d..2d737268e5 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/font/TransformAttribute.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/font/TransformAttribute.eea
@@ -12,4 +12,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getTransform
  ()Ljava/awt/geom/AffineTransform;
- ()Ljava/awt/geom/AffineTransform;
+ ()L1java/awt/geom/AffineTransform;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/geom/AffineTransform.eea b/libs/eea-java-17/src/main/resources/java/awt/geom/AffineTransform.eea
index 756de77623..737666a241 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/geom/AffineTransform.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/geom/AffineTransform.eea
@@ -2,31 +2,31 @@ class java/awt/geom/AffineTransform
 
 getQuadrantRotateInstance
  (I)Ljava/awt/geom/AffineTransform;
- (I)Ljava/awt/geom/AffineTransform;
+ (I)L1java/awt/geom/AffineTransform;
 getQuadrantRotateInstance
  (IDD)Ljava/awt/geom/AffineTransform;
- (IDD)Ljava/awt/geom/AffineTransform;
+ (IDD)L1java/awt/geom/AffineTransform;
 getRotateInstance
  (D)Ljava/awt/geom/AffineTransform;
- (D)Ljava/awt/geom/AffineTransform;
+ (D)L1java/awt/geom/AffineTransform;
 getRotateInstance
  (DD)Ljava/awt/geom/AffineTransform;
- (DD)Ljava/awt/geom/AffineTransform;
+ (DD)L1java/awt/geom/AffineTransform;
 getRotateInstance
  (DDD)Ljava/awt/geom/AffineTransform;
- (DDD)Ljava/awt/geom/AffineTransform;
+ (DDD)L1java/awt/geom/AffineTransform;
 getRotateInstance
  (DDDD)Ljava/awt/geom/AffineTransform;
- (DDDD)Ljava/awt/geom/AffineTransform;
+ (DDDD)L1java/awt/geom/AffineTransform;
 getScaleInstance
  (DD)Ljava/awt/geom/AffineTransform;
- (DD)Ljava/awt/geom/AffineTransform;
+ (DD)L1java/awt/geom/AffineTransform;
 getShearInstance
  (DD)Ljava/awt/geom/AffineTransform;
- (DD)Ljava/awt/geom/AffineTransform;
+ (DD)L1java/awt/geom/AffineTransform;
 getTranslateInstance
  (DD)Ljava/awt/geom/AffineTransform;
- (DD)Ljava/awt/geom/AffineTransform;
+ (DD)L1java/awt/geom/AffineTransform;
 
 <init>
  (Ljava/awt/geom/AffineTransform;)V
@@ -45,13 +45,13 @@ concatenate
  (Ljava/awt/geom/AffineTransform;)V
 createInverse
  ()Ljava/awt/geom/AffineTransform;
- ()Ljava/awt/geom/AffineTransform;
+ ()L0java/awt/geom/AffineTransform;
 createTransformedShape
  (Ljava/awt/Shape;)Ljava/awt/Shape;
- (Ljava/awt/Shape;)Ljava/awt/Shape;
+ (Ljava/awt/Shape;)Ljava/awt/Shape; # @PolyNull
 deltaTransform
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
- (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
+ (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)L0java/awt/geom/Point2D;
 deltaTransform
  ([DI[DII)V
  ([DI[DII)V
@@ -63,7 +63,7 @@ getMatrix
  ([D)V
 inverseTransform
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
- (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
+ (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)L1java/awt/geom/Point2D;
 inverseTransform
  ([DI[DII)V
  ([DI[DII)V
@@ -78,7 +78,7 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 transform
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
- (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
+ (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)L0java/awt/geom/Point2D;
 transform
  ([DI[DII)V
  ([DI[DII)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/geom/Arc2D$Double.eea b/libs/eea-java-17/src/main/resources/java/awt/geom/Arc2D$Double.eea
index 2ee4c625cd..efb504cd4a 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/geom/Arc2D$Double.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/geom/Arc2D$Double.eea
@@ -5,4 +5,4 @@ class java/awt/geom/Arc2D$Double
  (Ljava/awt/geom/Rectangle2D;DDI)V
 makeBounds
  (DDDD)Ljava/awt/geom/Rectangle2D;
- (DDDD)Ljava/awt/geom/Rectangle2D;
+ (DDDD)L1java/awt/geom/Rectangle2D;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/geom/Arc2D.eea b/libs/eea-java-17/src/main/resources/java/awt/geom/Arc2D.eea
index bf9809bd63..a64f15ee34 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/geom/Arc2D.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/geom/Arc2D.eea
@@ -11,13 +11,13 @@ getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
 getEndPoint
  ()Ljava/awt/geom/Point2D;
- ()Ljava/awt/geom/Point2D;
+ ()L1java/awt/geom/Point2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 getStartPoint
  ()Ljava/awt/geom/Point2D;
- ()Ljava/awt/geom/Point2D;
+ ()L1java/awt/geom/Point2D;
 makeBounds
  (DDDD)Ljava/awt/geom/Rectangle2D;
  (DDDD)Ljava/awt/geom/Rectangle2D;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/geom/Area.eea b/libs/eea-java-17/src/main/resources/java/awt/geom/Area.eea
index 06439e9b37..fd15031df2 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/geom/Area.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/geom/Area.eea
@@ -17,7 +17,7 @@ contains
  (Ljava/awt/geom/Rectangle2D;)Z
 createTransformedArea
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/Area;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/Area;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/Area;
 equals
  (Ljava/awt/geom/Area;)Z
  (Ljava/awt/geom/Area;)Z
@@ -32,10 +32,10 @@ getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;D)L1java/awt/geom/PathIterator;
 intersect
  (Ljava/awt/geom/Area;)V
  (Ljava/awt/geom/Area;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/geom/CubicCurve2D.eea b/libs/eea-java-17/src/main/resources/java/awt/geom/CubicCurve2D.eea
index f735287c25..6ac45d26b6 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/geom/CubicCurve2D.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/geom/CubicCurve2D.eea
@@ -45,10 +45,10 @@ getP2
  ()Ljava/awt/geom/Point2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;D)L1java/awt/geom/PathIterator;
 intersects
  (Ljava/awt/geom/Rectangle2D;)Z
  (Ljava/awt/geom/Rectangle2D;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/awt/geom/Ellipse2D.eea b/libs/eea-java-17/src/main/resources/java/awt/geom/Ellipse2D.eea
index f1cc1192f8..b4e32bdb66 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/geom/Ellipse2D.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/geom/Ellipse2D.eea
@@ -5,4 +5,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/geom/Line2D$Double.eea b/libs/eea-java-17/src/main/resources/java/awt/geom/Line2D$Double.eea
index 741afd70cf..73d3d64ebf 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/geom/Line2D$Double.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/geom/Line2D$Double.eea
@@ -5,7 +5,7 @@ class java/awt/geom/Line2D$Double
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)V
 getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
- ()Ljava/awt/geom/Rectangle2D;
+ ()L1java/awt/geom/Rectangle2D;
 getP1
  ()Ljava/awt/geom/Point2D;
  ()Ljava/awt/geom/Point2D;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/geom/Line2D$Float.eea b/libs/eea-java-17/src/main/resources/java/awt/geom/Line2D$Float.eea
index 68f4e0365c..caadf613e1 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/geom/Line2D$Float.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/geom/Line2D$Float.eea
@@ -5,7 +5,7 @@ class java/awt/geom/Line2D$Float
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)V
 getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
- ()Ljava/awt/geom/Rectangle2D;
+ ()L1java/awt/geom/Rectangle2D;
 getP1
  ()Ljava/awt/geom/Point2D;
  ()Ljava/awt/geom/Point2D;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/geom/Line2D.eea b/libs/eea-java-17/src/main/resources/java/awt/geom/Line2D.eea
index f58ff2b577..4c6f212e57 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/geom/Line2D.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/geom/Line2D.eea
@@ -20,10 +20,10 @@ getP2
  ()Ljava/awt/geom/Point2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;D)L1java/awt/geom/PathIterator;
 intersects
  (Ljava/awt/geom/Rectangle2D;)Z
  (Ljava/awt/geom/Rectangle2D;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/awt/geom/Path2D$Double.eea b/libs/eea-java-17/src/main/resources/java/awt/geom/Path2D$Double.eea
index c923b76ba6..7e4bd077a7 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/geom/Path2D$Double.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/geom/Path2D$Double.eea
@@ -17,7 +17,7 @@ getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 transform
  (Ljava/awt/geom/AffineTransform;)V
  (Ljava/awt/geom/AffineTransform;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/geom/Path2D$Float.eea b/libs/eea-java-17/src/main/resources/java/awt/geom/Path2D$Float.eea
index d63ab273e6..b9cb4ed35e 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/geom/Path2D$Float.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/geom/Path2D$Float.eea
@@ -17,7 +17,7 @@ getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 transform
  (Ljava/awt/geom/AffineTransform;)V
  (Ljava/awt/geom/AffineTransform;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/geom/Path2D.eea b/libs/eea-java-17/src/main/resources/java/awt/geom/Path2D.eea
index bfcd5ea33d..c66b14211f 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/geom/Path2D.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/geom/Path2D.eea
@@ -36,16 +36,16 @@ contains
  (Ljava/awt/geom/Rectangle2D;)Z
 createTransformedShape
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/Shape;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/Shape;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/Shape;
 getBounds
  ()Ljava/awt/Rectangle;
  ()Ljava/awt/Rectangle;
 getCurrentPoint
  ()Ljava/awt/geom/Point2D;
- ()Ljava/awt/geom/Point2D;
+ ()L0java/awt/geom/Point2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;D)L1java/awt/geom/PathIterator;
 intersects
  (Ljava/awt/geom/Rectangle2D;)Z
  (Ljava/awt/geom/Rectangle2D;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/awt/geom/QuadCurve2D.eea b/libs/eea-java-17/src/main/resources/java/awt/geom/QuadCurve2D.eea
index 6e72041c34..d5d9183932 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/geom/QuadCurve2D.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/geom/QuadCurve2D.eea
@@ -42,10 +42,10 @@ getP2
  ()Ljava/awt/geom/Point2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;D)L1java/awt/geom/PathIterator;
 intersects
  (Ljava/awt/geom/Rectangle2D;)Z
  (Ljava/awt/geom/Rectangle2D;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/awt/geom/Rectangle2D$Double.eea b/libs/eea-java-17/src/main/resources/java/awt/geom/Rectangle2D$Double.eea
index 567d74c9df..d6e216051f 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/geom/Rectangle2D$Double.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/geom/Rectangle2D$Double.eea
@@ -2,10 +2,10 @@ class java/awt/geom/Rectangle2D$Double
 
 createIntersection
  (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
- (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
+ (Ljava/awt/geom/Rectangle2D;)L1java/awt/geom/Rectangle2D; # @Inherited(java.awt.geom.Rectangle2D)
 createUnion
  (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
- (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
+ (Ljava/awt/geom/Rectangle2D;)L1java/awt/geom/Rectangle2D; # @Inherited(java.awt.geom.Rectangle2D)
 getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
  ()Ljava/awt/geom/Rectangle2D;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/geom/Rectangle2D$Float.eea b/libs/eea-java-17/src/main/resources/java/awt/geom/Rectangle2D$Float.eea
index 24f10eff5e..7ec62fc07b 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/geom/Rectangle2D$Float.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/geom/Rectangle2D$Float.eea
@@ -2,10 +2,10 @@ class java/awt/geom/Rectangle2D$Float
 
 createIntersection
  (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
- (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
+ (Ljava/awt/geom/Rectangle2D;)L1java/awt/geom/Rectangle2D; # @Inherited(java.awt.geom.Rectangle2D)
 createUnion
  (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
- (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
+ (Ljava/awt/geom/Rectangle2D;)L1java/awt/geom/Rectangle2D; # @Inherited(java.awt.geom.Rectangle2D)
 getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
  ()Ljava/awt/geom/Rectangle2D;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/geom/Rectangle2D.eea b/libs/eea-java-17/src/main/resources/java/awt/geom/Rectangle2D.eea
index e7d55698e2..a98df9d76b 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/geom/Rectangle2D.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/geom/Rectangle2D.eea
@@ -15,10 +15,10 @@ add
  (Ljava/awt/geom/Rectangle2D;)V
 createIntersection
  (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
- (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
+ (Ljava/awt/geom/Rectangle2D;)L1java/awt/geom/Rectangle2D;
 createUnion
  (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
- (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
+ (Ljava/awt/geom/Rectangle2D;)L1java/awt/geom/Rectangle2D;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -27,10 +27,10 @@ getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;D)L1java/awt/geom/PathIterator; # @Inherited(java.awt.geom.RectangularShape)
 intersectsLine
  (Ljava/awt/geom/Line2D;)Z
  (Ljava/awt/geom/Line2D;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/awt/geom/RectangularShape.eea b/libs/eea-java-17/src/main/resources/java/awt/geom/RectangularShape.eea
index d0aa6206aa..f495b09d74 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/geom/RectangularShape.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/geom/RectangularShape.eea
@@ -14,10 +14,10 @@ getBounds
  ()Ljava/awt/Rectangle;
 getFrame
  ()Ljava/awt/geom/Rectangle2D;
- ()Ljava/awt/geom/Rectangle2D;
+ ()L1java/awt/geom/Rectangle2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;D)L1java/awt/geom/PathIterator;
 intersects
  (Ljava/awt/geom/Rectangle2D;)Z
  (Ljava/awt/geom/Rectangle2D;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/awt/geom/RoundRectangle2D.eea b/libs/eea-java-17/src/main/resources/java/awt/geom/RoundRectangle2D.eea
index 9bc159d4a2..6b9154c5bf 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/geom/RoundRectangle2D.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/geom/RoundRectangle2D.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 setRoundRect
  (Ljava/awt/geom/RoundRectangle2D;)V
  (Ljava/awt/geom/RoundRectangle2D;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/im/InputContext.eea b/libs/eea-java-17/src/main/resources/java/awt/im/InputContext.eea
index 5a942af534..2e1d3ad97c 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/im/InputContext.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/im/InputContext.eea
@@ -2,17 +2,17 @@ class java/awt/im/InputContext
 
 getInstance
  ()Ljava/awt/im/InputContext;
- ()Ljava/awt/im/InputContext;
+ ()L1java/awt/im/InputContext;
 
 dispatchEvent
  (Ljava/awt/AWTEvent;)V
  (Ljava/awt/AWTEvent;)V
 getInputMethodControlObject
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getLocale
  ()Ljava/util/Locale;
- ()Ljava/util/Locale;
+ ()L0java/util/Locale;
 removeNotify
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/im/spi/InputMethodContext.eea b/libs/eea-java-17/src/main/resources/java/awt/im/spi/InputMethodContext.eea
index cdc0882758..e07567ce5b 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/im/spi/InputMethodContext.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/im/spi/InputMethodContext.eea
@@ -2,10 +2,10 @@ class java/awt/im/spi/InputMethodContext
 
 createInputMethodJFrame
  (Ljava/lang/String;Z)Ljavax/swing/JFrame;
- (Ljava/lang/String;Z)Ljavax/swing/JFrame;
+ (Ljava/lang/String;Z)L1javax/swing/JFrame;
 createInputMethodWindow
  (Ljava/lang/String;Z)Ljava/awt/Window;
- (Ljava/lang/String;Z)Ljava/awt/Window;
+ (Ljava/lang/String;Z)L1java/awt/Window;
 dispatchInputMethodEvent
  (ILjava/text/AttributedCharacterIterator;ILjava/awt/font/TextHitInfo;Ljava/awt/font/TextHitInfo;)V
  (ILjava/text/AttributedCharacterIterator;ILjava/awt/font/TextHitInfo;Ljava/awt/font/TextHitInfo;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/im/spi/InputMethodDescriptor.eea b/libs/eea-java-17/src/main/resources/java/awt/im/spi/InputMethodDescriptor.eea
index a5f987a24c..87950a4fb5 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/im/spi/InputMethodDescriptor.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/im/spi/InputMethodDescriptor.eea
@@ -2,7 +2,7 @@ class java/awt/im/spi/InputMethodDescriptor
 
 createInputMethod
  ()Ljava/awt/im/spi/InputMethod;
- ()Ljava/awt/im/spi/InputMethod;
+ ()L1java/awt/im/spi/InputMethod;
 getAvailableLocales
  ()[Ljava/util/Locale;
  ()[Ljava/util/Locale;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/AbstractMultiResolutionImage.eea b/libs/eea-java-17/src/main/resources/java/awt/image/AbstractMultiResolutionImage.eea
index f0574056fd..de6bd012db 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/AbstractMultiResolutionImage.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/AbstractMultiResolutionImage.eea
@@ -5,7 +5,7 @@ getBaseImage
  ()Ljava/awt/Image;
 getGraphics
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L1java/awt/Graphics;
 getHeight
  (Ljava/awt/image/ImageObserver;)I
  (Ljava/awt/image/ImageObserver;)I
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/AffineTransformOp.eea b/libs/eea-java-17/src/main/resources/java/awt/image/AffineTransformOp.eea
index 0cd0b4be15..45005247fa 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/AffineTransformOp.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/AffineTransformOp.eea
@@ -8,10 +8,10 @@ class java/awt/image/AffineTransformOp
  (Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)V
 createCompatibleDestImage
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
- (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
+ (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)L1java/awt/image/BufferedImage; # @Inherited(java.awt.image.BufferedImageOp)
 createCompatibleDestRaster
  (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/Raster;)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.RasterOp)
 filter
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/BandCombineOp.eea b/libs/eea-java-17/src/main/resources/java/awt/image/BandCombineOp.eea
index a073171a66..76987734df 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/BandCombineOp.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/BandCombineOp.eea
@@ -5,7 +5,7 @@ class java/awt/image/BandCombineOp
  ([[FLjava/awt/RenderingHints;)V
 createCompatibleDestRaster
  (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/Raster;)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.RasterOp)
 filter
  (Ljava/awt/image/Raster;Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
  (Ljava/awt/image/Raster;Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
@@ -14,10 +14,10 @@ getBounds2D
  (Ljava/awt/image/Raster;)Ljava/awt/geom/Rectangle2D;
 getMatrix
  ()[[F
- ()[[F
+ ()[1[F
 getPoint2D
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
- (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
+ (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)L1java/awt/geom/Point2D;
 getRenderingHints
  ()Ljava/awt/RenderingHints;
  ()Ljava/awt/RenderingHints;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/BandedSampleModel.eea b/libs/eea-java-17/src/main/resources/java/awt/image/BandedSampleModel.eea
index 533e390b77..339cac02d5 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/BandedSampleModel.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/BandedSampleModel.eea
@@ -5,22 +5,22 @@ class java/awt/image/BandedSampleModel
  (IIII[I[I)V
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.ComponentSampleModel)
 createDataBuffer
  ()Ljava/awt/image/DataBuffer;
- ()Ljava/awt/image/DataBuffer;
+ ()L1java/awt/image/DataBuffer; # @Inherited(java.awt.image.ComponentSampleModel)
 createSubsetSampleModel
  ([I)Ljava/awt/image/SampleModel;
- ([I)Ljava/awt/image/SampleModel;
+ ([I)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.ComponentSampleModel)
 getDataElements
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)Ljava/lang/Object;
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)Ljava/lang/Object;
 getPixel
  (II[ILjava/awt/image/DataBuffer;)[I
- (II[ILjava/awt/image/DataBuffer;)[I
+ (II[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.ComponentSampleModel)
 getPixels
  (IIII[ILjava/awt/image/DataBuffer;)[I
- (IIII[ILjava/awt/image/DataBuffer;)[I
+ (IIII[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.ComponentSampleModel)
 getSample
  (IIILjava/awt/image/DataBuffer;)I
  (IIILjava/awt/image/DataBuffer;)I
@@ -32,7 +32,7 @@ getSampleFloat
  (IIILjava/awt/image/DataBuffer;)F
 getSamples
  (IIIII[ILjava/awt/image/DataBuffer;)[I
- (IIIII[ILjava/awt/image/DataBuffer;)[I
+ (IIIII[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.ComponentSampleModel)
 setDataElements
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)V
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/BufferedImage.eea b/libs/eea-java-17/src/main/resources/java/awt/image/BufferedImage.eea
index e73b963141..0b8c92cb83 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/BufferedImage.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/BufferedImage.eea
@@ -14,7 +14,7 @@ copyData
  (Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
 createGraphics
  ()Ljava/awt/Graphics2D;
- ()Ljava/awt/Graphics2D;
+ ()L1java/awt/Graphics2D;
 getAlphaRaster
  ()Ljava/awt/image/WritableRaster;
  ()Ljava/awt/image/WritableRaster;
@@ -44,7 +44,7 @@ getPropertyNames
  ()[0L1java/lang/String; # @Inherited(java.awt.image.RenderedImage)
 getRGB
  (IIII[III)[I
- (IIII[III)[I
+ (IIII[III)[1I
 getRaster
  ()Ljava/awt/image/WritableRaster;
  ()Ljava/awt/image/WritableRaster;
@@ -56,7 +56,7 @@ getSource
  ()Ljava/awt/image/ImageProducer;
 getSources
  ()Ljava/util/Vector<Ljava/awt/image/RenderedImage;>;
- ()Ljava/util/Vector<Ljava/awt/image/RenderedImage;>;
+ ()L0java/util/Vector<Ljava/awt/image/RenderedImage;>;
 getSubimage
  (IIII)Ljava/awt/image/BufferedImage;
  (IIII)Ljava/awt/image/BufferedImage;
@@ -71,7 +71,7 @@ getWritableTile
  (II)Ljava/awt/image/WritableRaster;
 getWritableTileIndices
  ()[Ljava/awt/Point;
- ()[Ljava/awt/Point;
+ ()[1Ljava/awt/Point;
 removeTileObserver
  (Ljava/awt/image/TileObserver;)V
  (Ljava/awt/image/TileObserver;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/BufferedImageOp.eea b/libs/eea-java-17/src/main/resources/java/awt/image/BufferedImageOp.eea
index 6b79874cf7..6a5da8bb1a 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/BufferedImageOp.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/BufferedImageOp.eea
@@ -2,7 +2,7 @@ class java/awt/image/BufferedImageOp
 
 createCompatibleDestImage
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
- (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
+ (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)L1java/awt/image/BufferedImage;
 filter
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/ByteLookupTable.eea b/libs/eea-java-17/src/main/resources/java/awt/image/ByteLookupTable.eea
index f6c0a968f5..6d56699477 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/ByteLookupTable.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/ByteLookupTable.eea
@@ -11,7 +11,7 @@ getTable
  ()[[B
 lookupPixel
  ([B[B)[B
- ([B[B)[B
+ ([B[B)[1B
 lookupPixel
  ([I[I)[I
- ([I[I)[I
+ ([I[I)[1I
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/ColorConvertOp.eea b/libs/eea-java-17/src/main/resources/java/awt/image/ColorConvertOp.eea
index 9edd6b2ed0..365d158796 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/ColorConvertOp.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/ColorConvertOp.eea
@@ -14,10 +14,10 @@ class java/awt/image/ColorConvertOp
  ([Ljava/awt/color/ICC_Profile;Ljava/awt/RenderingHints;)V
 createCompatibleDestImage
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
- (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
+ (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)L1java/awt/image/BufferedImage; # @Inherited(java.awt.image.BufferedImageOp)
 createCompatibleDestRaster
  (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/Raster;)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.RasterOp)
 filter
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
@@ -32,10 +32,10 @@ getBounds2D
  (Ljava/awt/image/Raster;)Ljava/awt/geom/Rectangle2D;
 getICC_Profiles
  ()[Ljava/awt/color/ICC_Profile;
- ()[Ljava/awt/color/ICC_Profile;
+ ()[0Ljava/awt/color/ICC_Profile;
 getPoint2D
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
- (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
+ (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)L1java/awt/geom/Point2D;
 getRenderingHints
  ()Ljava/awt/RenderingHints;
  ()Ljava/awt/RenderingHints;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/ColorModel.eea b/libs/eea-java-17/src/main/resources/java/awt/image/ColorModel.eea
index 8f27a4e790..d4760ba2c3 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/ColorModel.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/ColorModel.eea
@@ -9,13 +9,13 @@ getRGBdefault
  (I[ILjava/awt/color/ColorSpace;ZZII)V
 coerceData
  (Ljava/awt/image/WritableRaster;Z)Ljava/awt/image/ColorModel;
- (Ljava/awt/image/WritableRaster;Z)Ljava/awt/image/ColorModel;
+ (Ljava/awt/image/WritableRaster;Z)L1java/awt/image/ColorModel;
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel;
 createCompatibleWritableRaster
  (II)Ljava/awt/image/WritableRaster;
- (II)Ljava/awt/image/WritableRaster;
+ (II)L1java/awt/image/WritableRaster;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -24,7 +24,7 @@ getAlpha
  (Ljava/lang/Object;)I
 getAlphaRaster
  (Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/WritableRaster;)L0java/awt/image/WritableRaster;
 getBlue
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
@@ -33,13 +33,13 @@ getColorSpace
  ()Ljava/awt/color/ColorSpace;
 getComponentSize
  ()[I
- ()[I
+ ()[0I
 getComponents
  (I[II)[I
- (I[II)[I
+ (I[II)[1I
 getComponents
  (Ljava/lang/Object;[II)[I
- (Ljava/lang/Object;[II)[I
+ (Ljava/lang/Object;[II)[1I
 getDataElement
  ([FI)I
  ([FI)I
@@ -48,13 +48,13 @@ getDataElement
  ([II)I
 getDataElements
  (ILjava/lang/Object;)Ljava/lang/Object;
- (ILjava/lang/Object;)Ljava/lang/Object;
+ (ILjava/lang/Object;)L1java/lang/Object;
 getDataElements
  ([FILjava/lang/Object;)Ljava/lang/Object;
  ([FILjava/lang/Object;)Ljava/lang/Object;
 getDataElements
  ([IILjava/lang/Object;)Ljava/lang/Object;
- ([IILjava/lang/Object;)Ljava/lang/Object;
+ ([IILjava/lang/Object;)L1java/lang/Object;
 getGreen
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
@@ -63,7 +63,7 @@ getNormalizedComponents
  (Ljava/lang/Object;[FI)[F
 getNormalizedComponents
  ([II[FI)[F
- ([II[FI)[F
+ ([II[FI)[1F
 getRGB
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
@@ -72,7 +72,7 @@ getRed
  (Ljava/lang/Object;)I
 getUnnormalizedComponents
  ([FI[II)[I
- ([FI[II)[I
+ ([FI[II)[1I
 isCompatibleRaster
  (Ljava/awt/image/Raster;)Z
  (Ljava/awt/image/Raster;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/ComponentColorModel.eea b/libs/eea-java-17/src/main/resources/java/awt/image/ComponentColorModel.eea
index e301e468c1..df18f9c4da 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/ComponentColorModel.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/ComponentColorModel.eea
@@ -8,13 +8,13 @@ class java/awt/image/ComponentColorModel
  (Ljava/awt/color/ColorSpace;[IZZII)V
 coerceData
  (Ljava/awt/image/WritableRaster;Z)Ljava/awt/image/ColorModel;
- (Ljava/awt/image/WritableRaster;Z)Ljava/awt/image/ColorModel;
+ (Ljava/awt/image/WritableRaster;Z)L1java/awt/image/ColorModel; # @Inherited(java.awt.image.ColorModel)
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.ColorModel)
 createCompatibleWritableRaster
  (II)Ljava/awt/image/WritableRaster;
- (II)Ljava/awt/image/WritableRaster;
+ (II)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.ColorModel)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.awt.image.ColorModel)
@@ -23,16 +23,16 @@ getAlpha
  (Ljava/lang/Object;)I
 getAlphaRaster
  (Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/WritableRaster;)L0java/awt/image/WritableRaster; # @Inherited(java.awt.image.ColorModel)
 getBlue
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
 getComponents
  (I[II)[I
- (I[II)[I
+ (I[II)[1I # @Inherited(java.awt.image.ColorModel)
 getComponents
  (Ljava/lang/Object;[II)[I
- (Ljava/lang/Object;[II)[I
+ (Ljava/lang/Object;[II)[1I # @Inherited(java.awt.image.ColorModel)
 getDataElement
  ([FI)I
  ([FI)I
@@ -41,22 +41,22 @@ getDataElement
  ([II)I
 getDataElements
  (ILjava/lang/Object;)Ljava/lang/Object;
- (ILjava/lang/Object;)Ljava/lang/Object;
+ (ILjava/lang/Object;)L1java/lang/Object; # @Inherited(java.awt.image.ColorModel)
 getDataElements
  ([FILjava/lang/Object;)Ljava/lang/Object;
  ([FILjava/lang/Object;)Ljava/lang/Object;
 getDataElements
  ([IILjava/lang/Object;)Ljava/lang/Object;
- ([IILjava/lang/Object;)Ljava/lang/Object;
+ ([IILjava/lang/Object;)L1java/lang/Object; # @Inherited(java.awt.image.ColorModel)
 getGreen
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
 getNormalizedComponents
  (Ljava/lang/Object;[FI)[F
- (Ljava/lang/Object;[FI)[F
+ (Ljava/lang/Object;[FI)[1F
 getNormalizedComponents
  ([II[FI)[F
- ([II[FI)[F
+ ([II[FI)[1F # @Inherited(java.awt.image.ColorModel)
 getRGB
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
@@ -65,7 +65,7 @@ getRed
  (Ljava/lang/Object;)I
 getUnnormalizedComponents
  ([FI[II)[I
- ([FI[II)[I
+ ([FI[II)[1I # @Inherited(java.awt.image.ColorModel)
 isCompatibleRaster
  (Ljava/awt/image/Raster;)Z
  (Ljava/awt/image/Raster;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/ComponentSampleModel.eea b/libs/eea-java-17/src/main/resources/java/awt/image/ComponentSampleModel.eea
index 9eaf7c2f1d..ed4bda8c11 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/ComponentSampleModel.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/ComponentSampleModel.eea
@@ -15,13 +15,13 @@ bankIndices
  (IIIII[I[I)V
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.SampleModel)
 createDataBuffer
  ()Ljava/awt/image/DataBuffer;
- ()Ljava/awt/image/DataBuffer;
+ ()L1java/awt/image/DataBuffer; # @Inherited(java.awt.image.SampleModel)
 createSubsetSampleModel
  ([I)Ljava/awt/image/SampleModel;
- ([I)Ljava/awt/image/SampleModel;
+ ([I)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.SampleModel)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -36,10 +36,10 @@ getDataElements
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)Ljava/lang/Object;
 getPixel
  (II[ILjava/awt/image/DataBuffer;)[I
- (II[ILjava/awt/image/DataBuffer;)[I
+ (II[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.SampleModel)
 getPixels
  (IIII[ILjava/awt/image/DataBuffer;)[I
- (IIII[ILjava/awt/image/DataBuffer;)[I
+ (IIII[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.SampleModel)
 getSample
  (IIILjava/awt/image/DataBuffer;)I
  (IIILjava/awt/image/DataBuffer;)I
@@ -51,10 +51,10 @@ getSampleFloat
  (IIILjava/awt/image/DataBuffer;)F
 getSampleSize
  ()[I
- ()[I
+ ()[1I
 getSamples
  (IIIII[ILjava/awt/image/DataBuffer;)[I
- (IIIII[ILjava/awt/image/DataBuffer;)[I
+ (IIIII[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.SampleModel)
 setDataElements
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)V
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/ConvolveOp.eea b/libs/eea-java-17/src/main/resources/java/awt/image/ConvolveOp.eea
index d9c6cbbd13..a13fff1a08 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/ConvolveOp.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/ConvolveOp.eea
@@ -8,10 +8,10 @@ class java/awt/image/ConvolveOp
  (Ljava/awt/image/Kernel;ILjava/awt/RenderingHints;)V
 createCompatibleDestImage
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
- (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
+ (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)L1java/awt/image/BufferedImage; # @Inherited(java.awt.image.BufferedImageOp)
 createCompatibleDestRaster
  (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/Raster;)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.RasterOp)
 filter
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
@@ -29,7 +29,7 @@ getKernel
  ()Ljava/awt/image/Kernel;
 getPoint2D
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
- (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
+ (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)L1java/awt/geom/Point2D;
 getRenderingHints
  ()Ljava/awt/RenderingHints;
  ()Ljava/awt/RenderingHints;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/DirectColorModel.eea b/libs/eea-java-17/src/main/resources/java/awt/image/DirectColorModel.eea
index 5a55f3c255..f188115f45 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/DirectColorModel.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/DirectColorModel.eea
@@ -5,10 +5,10 @@ class java/awt/image/DirectColorModel
  (Ljava/awt/color/ColorSpace;IIIIIZI)V
 coerceData
  (Ljava/awt/image/WritableRaster;Z)Ljava/awt/image/ColorModel;
- (Ljava/awt/image/WritableRaster;Z)Ljava/awt/image/ColorModel;
+ (Ljava/awt/image/WritableRaster;Z)L1java/awt/image/ColorModel; # @Inherited(java.awt.image.ColorModel)
 createCompatibleWritableRaster
  (II)Ljava/awt/image/WritableRaster;
- (II)Ljava/awt/image/WritableRaster;
+ (II)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.ColorModel)
 getAlpha
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
@@ -17,19 +17,19 @@ getBlue
  (Ljava/lang/Object;)I
 getComponents
  (I[II)[I
- (I[II)[I
+ (I[II)[1I # @Inherited(java.awt.image.ColorModel)
 getComponents
  (Ljava/lang/Object;[II)[I
- (Ljava/lang/Object;[II)[I
+ (Ljava/lang/Object;[II)[1I # @Inherited(java.awt.image.ColorModel)
 getDataElement
  ([II)I
  ([II)I
 getDataElements
  (ILjava/lang/Object;)Ljava/lang/Object;
- (ILjava/lang/Object;)Ljava/lang/Object;
+ (ILjava/lang/Object;)L1java/lang/Object; # @Inherited(java.awt.image.ColorModel)
 getDataElements
  ([IILjava/lang/Object;)Ljava/lang/Object;
- ([IILjava/lang/Object;)Ljava/lang/Object;
+ ([IILjava/lang/Object;)L1java/lang/Object; # @Inherited(java.awt.image.ColorModel)
 getGreen
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/IndexColorModel.eea b/libs/eea-java-17/src/main/resources/java/awt/image/IndexColorModel.eea
index 91af132d0a..9ca4e14bf5 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/IndexColorModel.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/IndexColorModel.eea
@@ -26,10 +26,10 @@ convertToIntDiscrete
  (Ljava/awt/image/Raster;Z)Ljava/awt/image/BufferedImage;
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.ColorModel)
 createCompatibleWritableRaster
  (II)Ljava/awt/image/WritableRaster;
- (II)Ljava/awt/image/WritableRaster;
+ (II)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.ColorModel)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.awt.image.ColorModel)
@@ -41,22 +41,22 @@ getBlues
  ([B)V
 getComponentSize
  ()[I
- ()[I
+ ()[0I # @Inherited(java.awt.image.ColorModel)
 getComponents
  (I[II)[I
- (I[II)[I
+ (I[II)[1I # @Inherited(java.awt.image.ColorModel)
 getComponents
  (Ljava/lang/Object;[II)[I
- (Ljava/lang/Object;[II)[I
+ (Ljava/lang/Object;[II)[1I # @Inherited(java.awt.image.ColorModel)
 getDataElement
  ([II)I
  ([II)I
 getDataElements
  (ILjava/lang/Object;)Ljava/lang/Object;
- (ILjava/lang/Object;)Ljava/lang/Object;
+ (ILjava/lang/Object;)L1java/lang/Object; # @Inherited(java.awt.image.ColorModel)
 getDataElements
  ([IILjava/lang/Object;)Ljava/lang/Object;
- ([IILjava/lang/Object;)Ljava/lang/Object;
+ ([IILjava/lang/Object;)L1java/lang/Object; # @Inherited(java.awt.image.ColorModel)
 getGreens
  ([B)V
  ([B)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/Kernel.eea b/libs/eea-java-17/src/main/resources/java/awt/image/Kernel.eea
index 76ecfa1620..ac1dc80e1d 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/Kernel.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/Kernel.eea
@@ -8,4 +8,4 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 getKernelData
  ([F)[F
- ([F)[F
+ ([F)[1F
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/LookupOp.eea b/libs/eea-java-17/src/main/resources/java/awt/image/LookupOp.eea
index 4de7ba1b80..5ec8e5e34a 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/LookupOp.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/LookupOp.eea
@@ -5,10 +5,10 @@ class java/awt/image/LookupOp
  (Ljava/awt/image/LookupTable;Ljava/awt/RenderingHints;)V
 createCompatibleDestImage
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
- (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
+ (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)L1java/awt/image/BufferedImage; # @Inherited(java.awt.image.BufferedImageOp)
 createCompatibleDestRaster
  (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/Raster;)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.RasterOp)
 filter
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
@@ -23,7 +23,7 @@ getBounds2D
  (Ljava/awt/image/Raster;)Ljava/awt/geom/Rectangle2D;
 getPoint2D
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
- (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
+ (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)L1java/awt/geom/Point2D;
 getRenderingHints
  ()Ljava/awt/RenderingHints;
  ()Ljava/awt/RenderingHints;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/MultiPixelPackedSampleModel.eea b/libs/eea-java-17/src/main/resources/java/awt/image/MultiPixelPackedSampleModel.eea
index 7dd02aa196..4f56f2840a 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/MultiPixelPackedSampleModel.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/MultiPixelPackedSampleModel.eea
@@ -2,13 +2,13 @@ class java/awt/image/MultiPixelPackedSampleModel
 
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.SampleModel)
 createDataBuffer
  ()Ljava/awt/image/DataBuffer;
- ()Ljava/awt/image/DataBuffer;
+ ()L1java/awt/image/DataBuffer; # @Inherited(java.awt.image.SampleModel)
 createSubsetSampleModel
  ([I)Ljava/awt/image/SampleModel;
- ([I)Ljava/awt/image/SampleModel;
+ ([I)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.SampleModel)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -17,7 +17,7 @@ getDataElements
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)Ljava/lang/Object;
 getPixel
  (II[ILjava/awt/image/DataBuffer;)[I
- (II[ILjava/awt/image/DataBuffer;)[I
+ (II[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.SampleModel)
 getSample
  (IIILjava/awt/image/DataBuffer;)I
  (IIILjava/awt/image/DataBuffer;)I
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/PackedColorModel.eea b/libs/eea-java-17/src/main/resources/java/awt/image/PackedColorModel.eea
index ec428a8444..053e8be60e 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/PackedColorModel.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/PackedColorModel.eea
@@ -8,13 +8,13 @@ class java/awt/image/PackedColorModel
  (Ljava/awt/color/ColorSpace;I[IIZII)V
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.ColorModel)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.awt.image.ColorModel)
 getAlphaRaster
  (Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/WritableRaster;)L0java/awt/image/WritableRaster; # @Inherited(java.awt.image.ColorModel)
 getMasks
  ()[I
  ()[I
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/PixelInterleavedSampleModel.eea b/libs/eea-java-17/src/main/resources/java/awt/image/PixelInterleavedSampleModel.eea
index 15b33bd214..138f604e45 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/PixelInterleavedSampleModel.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/PixelInterleavedSampleModel.eea
@@ -5,7 +5,7 @@ class java/awt/image/PixelInterleavedSampleModel
  (IIIII[I)V
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.ComponentSampleModel)
 createSubsetSampleModel
  ([I)Ljava/awt/image/SampleModel;
- ([I)Ljava/awt/image/SampleModel;
+ ([I)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.ComponentSampleModel)
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/RGBImageFilter.eea b/libs/eea-java-17/src/main/resources/java/awt/image/RGBImageFilter.eea
index d2caebacd6..5e679f7c4c 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/RGBImageFilter.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/RGBImageFilter.eea
@@ -9,7 +9,7 @@ origmodel
 
 filterIndexColorModel
  (Ljava/awt/image/IndexColorModel;)Ljava/awt/image/IndexColorModel;
- (Ljava/awt/image/IndexColorModel;)Ljava/awt/image/IndexColorModel;
+ (Ljava/awt/image/IndexColorModel;)L1java/awt/image/IndexColorModel;
 filterRGBPixels
  (IIII[III)V
  (IIII[III)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/Raster.eea b/libs/eea-java-17/src/main/resources/java/awt/image/Raster.eea
index dd81dc073b..60d53cd534 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/Raster.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/Raster.eea
@@ -2,43 +2,43 @@ class java/awt/image/Raster
 
 createBandedRaster
  (IIIILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (IIIILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (IIIILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createBandedRaster
  (IIII[I[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (IIII[I[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (IIII[I[ILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createBandedRaster
  (Ljava/awt/image/DataBuffer;III[I[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/DataBuffer;III[I[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/DataBuffer;III[I[ILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createInterleavedRaster
  (IIIII[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (IIIII[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (IIIII[ILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createInterleavedRaster
  (IIIILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (IIIILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (IIIILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createInterleavedRaster
  (Ljava/awt/image/DataBuffer;IIII[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/DataBuffer;IIII[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/DataBuffer;IIII[ILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createPackedRaster
  (IIIIILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (IIIIILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (IIIIILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createPackedRaster
  (III[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (III[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (III[ILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createPackedRaster
  (Ljava/awt/image/DataBuffer;IIILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/DataBuffer;IIILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/DataBuffer;IIILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createPackedRaster
  (Ljava/awt/image/DataBuffer;III[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/DataBuffer;III[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/DataBuffer;III[ILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createRaster
  (Ljava/awt/image/SampleModel;Ljava/awt/image/DataBuffer;Ljava/awt/Point;)Ljava/awt/image/Raster;
- (Ljava/awt/image/SampleModel;Ljava/awt/image/DataBuffer;Ljava/awt/Point;)Ljava/awt/image/Raster;
+ (Ljava/awt/image/SampleModel;Ljava/awt/image/DataBuffer;Ljava/awt/Point;)L1java/awt/image/Raster;
 createWritableRaster
  (Ljava/awt/image/SampleModel;Ljava/awt/Point;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/SampleModel;Ljava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/SampleModel;Ljava/awt/Point;)L1java/awt/image/WritableRaster;
 createWritableRaster
  (Ljava/awt/image/SampleModel;Ljava/awt/image/DataBuffer;Ljava/awt/Point;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/SampleModel;Ljava/awt/image/DataBuffer;Ljava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/SampleModel;Ljava/awt/image/DataBuffer;Ljava/awt/Point;)L1java/awt/image/WritableRaster;
 
 dataBuffer
  Ljava/awt/image/DataBuffer;
@@ -61,22 +61,22 @@ sampleModel
  (Ljava/awt/image/SampleModel;Ljava/awt/image/DataBuffer;Ljava/awt/Rectangle;Ljava/awt/Point;Ljava/awt/image/Raster;)V
 createChild
  (IIIIII[I)Ljava/awt/image/Raster;
- (IIIIII[I)Ljava/awt/image/Raster;
+ (IIIIII[I)L1java/awt/image/Raster;
 createCompatibleWritableRaster
  ()Ljava/awt/image/WritableRaster;
- ()Ljava/awt/image/WritableRaster;
+ ()L1java/awt/image/WritableRaster;
 createCompatibleWritableRaster
  (II)Ljava/awt/image/WritableRaster;
- (II)Ljava/awt/image/WritableRaster;
+ (II)L1java/awt/image/WritableRaster;
 createCompatibleWritableRaster
  (IIII)Ljava/awt/image/WritableRaster;
- (IIII)Ljava/awt/image/WritableRaster;
+ (IIII)L1java/awt/image/WritableRaster;
 createCompatibleWritableRaster
  (Ljava/awt/Rectangle;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/Rectangle;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/Rectangle;)L1java/awt/image/WritableRaster;
 createTranslatedChild
  (II)Ljava/awt/image/Raster;
- (II)Ljava/awt/image/Raster;
+ (II)L1java/awt/image/Raster;
 getBounds
  ()Ljava/awt/Rectangle;
  ()Ljava/awt/Rectangle;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/RasterOp.eea b/libs/eea-java-17/src/main/resources/java/awt/image/RasterOp.eea
index f23fbd18b3..8c59e488b9 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/RasterOp.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/RasterOp.eea
@@ -2,7 +2,7 @@ class java/awt/image/RasterOp
 
 createCompatibleDestRaster
  (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/Raster;)L1java/awt/image/WritableRaster;
 filter
  (Ljava/awt/image/Raster;Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
  (Ljava/awt/image/Raster;Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/RescaleOp.eea b/libs/eea-java-17/src/main/resources/java/awt/image/RescaleOp.eea
index 67e0449316..2b05f46804 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/RescaleOp.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/RescaleOp.eea
@@ -8,10 +8,10 @@ class java/awt/image/RescaleOp
  ([F[FLjava/awt/RenderingHints;)V
 createCompatibleDestImage
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
- (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
+ (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)L1java/awt/image/BufferedImage; # @Inherited(java.awt.image.BufferedImageOp)
 createCompatibleDestRaster
  (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/Raster;)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.RasterOp)
 filter
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
@@ -29,7 +29,7 @@ getOffsets
  ([F)[F
 getPoint2D
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
- (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
+ (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)L1java/awt/geom/Point2D;
 getRenderingHints
  ()Ljava/awt/RenderingHints;
  ()Ljava/awt/RenderingHints;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/SampleModel.eea b/libs/eea-java-17/src/main/resources/java/awt/image/SampleModel.eea
index 9697189f0b..4bb183e0d0 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/SampleModel.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/SampleModel.eea
@@ -2,13 +2,13 @@ class java/awt/image/SampleModel
 
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel;
 createDataBuffer
  ()Ljava/awt/image/DataBuffer;
- ()Ljava/awt/image/DataBuffer;
+ ()L1java/awt/image/DataBuffer;
 createSubsetSampleModel
  ([I)Ljava/awt/image/SampleModel;
- ([I)Ljava/awt/image/SampleModel;
+ ([I)L1java/awt/image/SampleModel;
 getDataElements
  (IIIILjava/lang/Object;Ljava/awt/image/DataBuffer;)Ljava/lang/Object;
  (IIIILjava/lang/Object;Ljava/awt/image/DataBuffer;)Ljava/lang/Object;
@@ -17,22 +17,22 @@ getDataElements
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)Ljava/lang/Object;
 getPixel
  (II[DLjava/awt/image/DataBuffer;)[D
- (II[DLjava/awt/image/DataBuffer;)[D
+ (II[DLjava/awt/image/DataBuffer;)[1D
 getPixel
  (II[FLjava/awt/image/DataBuffer;)[F
- (II[FLjava/awt/image/DataBuffer;)[F
+ (II[FLjava/awt/image/DataBuffer;)[1F
 getPixel
  (II[ILjava/awt/image/DataBuffer;)[I
- (II[ILjava/awt/image/DataBuffer;)[I
+ (II[ILjava/awt/image/DataBuffer;)[1I
 getPixels
  (IIII[DLjava/awt/image/DataBuffer;)[D
- (IIII[DLjava/awt/image/DataBuffer;)[D
+ (IIII[DLjava/awt/image/DataBuffer;)[1D
 getPixels
  (IIII[FLjava/awt/image/DataBuffer;)[F
- (IIII[FLjava/awt/image/DataBuffer;)[F
+ (IIII[FLjava/awt/image/DataBuffer;)[1F
 getPixels
  (IIII[ILjava/awt/image/DataBuffer;)[I
- (IIII[ILjava/awt/image/DataBuffer;)[I
+ (IIII[ILjava/awt/image/DataBuffer;)[1I
 getSample
  (IIILjava/awt/image/DataBuffer;)I
  (IIILjava/awt/image/DataBuffer;)I
@@ -47,13 +47,13 @@ getSampleSize
  ()[I
 getSamples
  (IIIII[DLjava/awt/image/DataBuffer;)[D
- (IIIII[DLjava/awt/image/DataBuffer;)[D
+ (IIIII[DLjava/awt/image/DataBuffer;)[1D
 getSamples
  (IIIII[FLjava/awt/image/DataBuffer;)[F
- (IIIII[FLjava/awt/image/DataBuffer;)[F
+ (IIIII[FLjava/awt/image/DataBuffer;)[1F
 getSamples
  (IIIII[ILjava/awt/image/DataBuffer;)[I
- (IIIII[ILjava/awt/image/DataBuffer;)[I
+ (IIIII[ILjava/awt/image/DataBuffer;)[1I
 setDataElements
  (IIIILjava/lang/Object;Ljava/awt/image/DataBuffer;)V
  (IIIILjava/lang/Object;Ljava/awt/image/DataBuffer;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/ShortLookupTable.eea b/libs/eea-java-17/src/main/resources/java/awt/image/ShortLookupTable.eea
index fa6f647580..27bba26bde 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/ShortLookupTable.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/ShortLookupTable.eea
@@ -11,7 +11,7 @@ getTable
  ()[[S
 lookupPixel
  ([I[I)[I
- ([I[I)[I
+ ([I[I)[1I
 lookupPixel
  ([S[S)[S
- ([S[S)[S
+ ([S[S)[1S
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/SinglePixelPackedSampleModel.eea b/libs/eea-java-17/src/main/resources/java/awt/image/SinglePixelPackedSampleModel.eea
index 0f99485d82..5a3c6c8605 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/SinglePixelPackedSampleModel.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/SinglePixelPackedSampleModel.eea
@@ -8,13 +8,13 @@ class java/awt/image/SinglePixelPackedSampleModel
  (III[I)V
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.SampleModel)
 createDataBuffer
  ()Ljava/awt/image/DataBuffer;
- ()Ljava/awt/image/DataBuffer;
+ ()L1java/awt/image/DataBuffer; # @Inherited(java.awt.image.SampleModel)
 createSubsetSampleModel
  ([I)Ljava/awt/image/SampleModel;
- ([I)Ljava/awt/image/SampleModel;
+ ([I)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.SampleModel)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -29,10 +29,10 @@ getDataElements
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)Ljava/lang/Object;
 getPixel
  (II[ILjava/awt/image/DataBuffer;)[I
- (II[ILjava/awt/image/DataBuffer;)[I
+ (II[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.SampleModel)
 getPixels
  (IIII[ILjava/awt/image/DataBuffer;)[I
- (IIII[ILjava/awt/image/DataBuffer;)[I
+ (IIII[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.SampleModel)
 getSample
  (IIILjava/awt/image/DataBuffer;)I
  (IIILjava/awt/image/DataBuffer;)I
@@ -41,7 +41,7 @@ getSampleSize
  ()[I
 getSamples
  (IIIII[ILjava/awt/image/DataBuffer;)[I
- (IIIII[ILjava/awt/image/DataBuffer;)[I
+ (IIIII[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.SampleModel)
 setDataElements
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)V
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/VolatileImage.eea b/libs/eea-java-17/src/main/resources/java/awt/image/VolatileImage.eea
index 1794b02591..ca20362b67 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/VolatileImage.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/VolatileImage.eea
@@ -2,7 +2,7 @@ class java/awt/image/VolatileImage
 
 createGraphics
  ()Ljava/awt/Graphics2D;
- ()Ljava/awt/Graphics2D;
+ ()L1java/awt/Graphics2D;
 getCapabilities
  ()Ljava/awt/ImageCapabilities;
  ()Ljava/awt/ImageCapabilities;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/WritableRaster.eea b/libs/eea-java-17/src/main/resources/java/awt/image/WritableRaster.eea
index 24040136f1..8e25f20bdb 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/WritableRaster.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/WritableRaster.eea
@@ -11,10 +11,10 @@ class java/awt/image/WritableRaster
  (Ljava/awt/image/SampleModel;Ljava/awt/image/DataBuffer;Ljava/awt/Rectangle;Ljava/awt/Point;Ljava/awt/image/WritableRaster;)V
 createWritableChild
  (IIIIII[I)Ljava/awt/image/WritableRaster;
- (IIIIII[I)Ljava/awt/image/WritableRaster;
+ (IIIIII[I)L1java/awt/image/WritableRaster;
 createWritableTranslatedChild
  (II)Ljava/awt/image/WritableRaster;
- (II)Ljava/awt/image/WritableRaster;
+ (II)L1java/awt/image/WritableRaster;
 getWritableParent
  ()Ljava/awt/image/WritableRaster;
  ()Ljava/awt/image/WritableRaster;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/renderable/ContextualRenderedImageFactory.eea b/libs/eea-java-17/src/main/resources/java/awt/image/renderable/ContextualRenderedImageFactory.eea
index 942cdf9e56..a25920d9bd 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/renderable/ContextualRenderedImageFactory.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/renderable/ContextualRenderedImageFactory.eea
@@ -2,7 +2,7 @@ class java/awt/image/renderable/ContextualRenderedImageFactory
 
 create
  (Ljava/awt/image/renderable/RenderContext;Ljava/awt/image/renderable/ParameterBlock;)Ljava/awt/image/RenderedImage;
- (Ljava/awt/image/renderable/RenderContext;Ljava/awt/image/renderable/ParameterBlock;)Ljava/awt/image/RenderedImage;
+ (Ljava/awt/image/renderable/RenderContext;Ljava/awt/image/renderable/ParameterBlock;)L1java/awt/image/RenderedImage;
 getBounds2D
  (Ljava/awt/image/renderable/ParameterBlock;)Ljava/awt/geom/Rectangle2D;
  (Ljava/awt/image/renderable/ParameterBlock;)Ljava/awt/geom/Rectangle2D;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/renderable/ParameterBlock.eea b/libs/eea-java-17/src/main/resources/java/awt/image/renderable/ParameterBlock.eea
index 19d7b911f1..b04f6e65af 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/renderable/ParameterBlock.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/renderable/ParameterBlock.eea
@@ -48,7 +48,7 @@ getObjectParameter
  (I)Ljava/lang/Object;
 getParamClasses
  ()[Ljava/lang/Class<*>;
- ()[Ljava/lang/Class<*>;
+ ()[1Ljava/lang/Class<*>;
 getParameters
  ()Ljava/util/Vector<Ljava/lang/Object;>;
  ()Ljava/util/Vector<Ljava/lang/Object;>;
@@ -99,4 +99,4 @@ setSources
  (Ljava/util/Vector<Ljava/lang/Object;>;)V
 shallowClone
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/renderable/RenderableImage.eea b/libs/eea-java-17/src/main/resources/java/awt/image/renderable/RenderableImage.eea
index b1f129b753..aa9f8eca5a 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/renderable/RenderableImage.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/renderable/RenderableImage.eea
@@ -6,13 +6,13 @@ HINTS_OBSERVED
 
 createDefaultRendering
  ()Ljava/awt/image/RenderedImage;
- ()Ljava/awt/image/RenderedImage;
+ ()L1java/awt/image/RenderedImage;
 createRendering
  (Ljava/awt/image/renderable/RenderContext;)Ljava/awt/image/RenderedImage;
- (Ljava/awt/image/renderable/RenderContext;)Ljava/awt/image/RenderedImage;
+ (Ljava/awt/image/renderable/RenderContext;)L1java/awt/image/RenderedImage;
 createScaledRendering
  (IILjava/awt/RenderingHints;)Ljava/awt/image/RenderedImage;
- (IILjava/awt/RenderingHints;)Ljava/awt/image/RenderedImage;
+ (IILjava/awt/RenderingHints;)L1java/awt/image/RenderedImage;
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/renderable/RenderableImageOp.eea b/libs/eea-java-17/src/main/resources/java/awt/image/renderable/RenderableImageOp.eea
index 42aa573597..4c5dc010c1 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/renderable/RenderableImageOp.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/renderable/RenderableImageOp.eea
@@ -5,13 +5,13 @@ class java/awt/image/renderable/RenderableImageOp
  (Ljava/awt/image/renderable/ContextualRenderedImageFactory;Ljava/awt/image/renderable/ParameterBlock;)V
 createDefaultRendering
  ()Ljava/awt/image/RenderedImage;
- ()Ljava/awt/image/RenderedImage;
+ ()L1java/awt/image/RenderedImage; # @Inherited(java.awt.image.renderable.RenderableImage)
 createRendering
  (Ljava/awt/image/renderable/RenderContext;)Ljava/awt/image/RenderedImage;
- (Ljava/awt/image/renderable/RenderContext;)Ljava/awt/image/RenderedImage;
+ (Ljava/awt/image/renderable/RenderContext;)L0java/awt/image/RenderedImage; # @Overrides(java.awt.image.renderable.RenderableImage)
 createScaledRendering
  (IILjava/awt/RenderingHints;)Ljava/awt/image/RenderedImage;
- (IILjava/awt/RenderingHints;)Ljava/awt/image/RenderedImage;
+ (IILjava/awt/RenderingHints;)L1java/awt/image/RenderedImage; # @Inherited(java.awt.image.renderable.RenderableImage)
 getParameterBlock
  ()Ljava/awt/image/renderable/ParameterBlock;
  ()Ljava/awt/image/renderable/ParameterBlock;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/image/renderable/RenderedImageFactory.eea b/libs/eea-java-17/src/main/resources/java/awt/image/renderable/RenderedImageFactory.eea
index 6f77700711..68da2f8e55 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/image/renderable/RenderedImageFactory.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/image/renderable/RenderedImageFactory.eea
@@ -2,4 +2,4 @@ class java/awt/image/renderable/RenderedImageFactory
 
 create
  (Ljava/awt/image/renderable/ParameterBlock;Ljava/awt/RenderingHints;)Ljava/awt/image/RenderedImage;
- (Ljava/awt/image/renderable/ParameterBlock;Ljava/awt/RenderingHints;)Ljava/awt/image/RenderedImage;
+ (Ljava/awt/image/renderable/ParameterBlock;Ljava/awt/RenderingHints;)L1java/awt/image/RenderedImage;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/peer/ComponentPeer.eea b/libs/eea-java-17/src/main/resources/java/awt/peer/ComponentPeer.eea
index b49052a716..967682e285 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/peer/ComponentPeer.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/peer/ComponentPeer.eea
@@ -11,10 +11,10 @@ createBuffers
  (ILjava/awt/BufferCapabilities;)V
 createImage
  (II)Ljava/awt/Image;
- (II)Ljava/awt/Image;
+ (II)L1java/awt/Image;
 createVolatileImage
  (II)Ljava/awt/image/VolatileImage;
- (II)Ljava/awt/image/VolatileImage;
+ (II)L1java/awt/image/VolatileImage;
 flip
  (IIIILjava/awt/BufferCapabilities$FlipContents;)V
  (IIIILjava/awt/BufferCapabilities$FlipContents;)V
diff --git a/libs/eea-java-17/src/main/resources/java/awt/peer/TaskbarPeer.eea b/libs/eea-java-17/src/main/resources/java/awt/peer/TaskbarPeer.eea
index 913d5524b0..227acfd826 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/peer/TaskbarPeer.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/peer/TaskbarPeer.eea
@@ -2,10 +2,10 @@ class java/awt/peer/TaskbarPeer
 
 getIconImage
  ()Ljava/awt/Image;
- ()Ljava/awt/Image;
+ ()L0java/awt/Image;
 getMenu
  ()Ljava/awt/PopupMenu;
- ()Ljava/awt/PopupMenu;
+ ()L0java/awt/PopupMenu;
 isSupported
  (Ljava/awt/Taskbar$Feature;)Z
  (Ljava/awt/Taskbar$Feature;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/awt/print/PageFormat.eea b/libs/eea-java-17/src/main/resources/java/awt/print/PageFormat.eea
index 1261806716..3b5b2af097 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/print/PageFormat.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/print/PageFormat.eea
@@ -5,7 +5,7 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 getMatrix
  ()[D
- ()[D
+ ()[1D
 getPaper
  ()Ljava/awt/print/Paper;
  ()Ljava/awt/print/Paper;
diff --git a/libs/eea-java-17/src/main/resources/java/awt/print/PrinterJob.eea b/libs/eea-java-17/src/main/resources/java/awt/print/PrinterJob.eea
index a506c344d6..5f51a47337 100644
--- a/libs/eea-java-17/src/main/resources/java/awt/print/PrinterJob.eea
+++ b/libs/eea-java-17/src/main/resources/java/awt/print/PrinterJob.eea
@@ -24,7 +24,7 @@ getPageFormat
  (Ljavax/print/attribute/PrintRequestAttributeSet;)Ljava/awt/print/PageFormat;
 getPrintService
  ()Ljavax/print/PrintService;
- ()Ljavax/print/PrintService;
+ ()L0javax/print/PrintService;
 getUserName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/java/beans/BeanDescriptor.eea b/libs/eea-java-17/src/main/resources/java/beans/BeanDescriptor.eea
index 78ade9cd6f..de0f53a4a4 100644
--- a/libs/eea-java-17/src/main/resources/java/beans/BeanDescriptor.eea
+++ b/libs/eea-java-17/src/main/resources/java/beans/BeanDescriptor.eea
@@ -8,7 +8,7 @@ class java/beans/BeanDescriptor
  (Ljava/lang/Class<*>;Ljava/lang/Class<*>;)V
 getBeanClass
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L0java/lang/Class<*>;
 getCustomizerClass
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L0java/lang/Class<*>;
diff --git a/libs/eea-java-17/src/main/resources/java/beans/DefaultPersistenceDelegate.eea b/libs/eea-java-17/src/main/resources/java/beans/DefaultPersistenceDelegate.eea
index e4a076b50a..12c2a5e6cc 100644
--- a/libs/eea-java-17/src/main/resources/java/beans/DefaultPersistenceDelegate.eea
+++ b/libs/eea-java-17/src/main/resources/java/beans/DefaultPersistenceDelegate.eea
@@ -8,7 +8,7 @@ initialize
  (Ljava/lang/Class<*>;Ljava/lang/Object;Ljava/lang/Object;Ljava/beans/Encoder;)V
 instantiate
  (Ljava/lang/Object;Ljava/beans/Encoder;)Ljava/beans/Expression;
- (Ljava/lang/Object;Ljava/beans/Encoder;)Ljava/beans/Expression;
+ (Ljava/lang/Object;Ljava/beans/Encoder;)L1java/beans/Expression;
 mutatesTo
  (Ljava/lang/Object;Ljava/lang/Object;)Z
  (Ljava/lang/Object;Ljava/lang/Object;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/beans/EventHandler.eea b/libs/eea-java-17/src/main/resources/java/beans/EventHandler.eea
index a7259fabc4..0343c42546 100644
--- a/libs/eea-java-17/src/main/resources/java/beans/EventHandler.eea
+++ b/libs/eea-java-17/src/main/resources/java/beans/EventHandler.eea
@@ -2,13 +2,13 @@ class java/beans/EventHandler
 
 create
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;)T1T;
 create
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;)T1T;
 create
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)T1T;
 
 <init>
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-java-17/src/main/resources/java/beans/EventSetDescriptor.eea b/libs/eea-java-17/src/main/resources/java/beans/EventSetDescriptor.eea
index 65e9133acd..d6522b1093 100644
--- a/libs/eea-java-17/src/main/resources/java/beans/EventSetDescriptor.eea
+++ b/libs/eea-java-17/src/main/resources/java/beans/EventSetDescriptor.eea
@@ -26,13 +26,13 @@ getGetListenerMethod
  ()Ljava/lang/reflect/Method;
 getListenerMethodDescriptors
  ()[Ljava/beans/MethodDescriptor;
- ()[Ljava/beans/MethodDescriptor;
+ ()[0Ljava/beans/MethodDescriptor;
 getListenerMethods
  ()[Ljava/lang/reflect/Method;
- ()[Ljava/lang/reflect/Method;
+ ()[1Ljava/lang/reflect/Method;
 getListenerType
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L0java/lang/Class<*>;
 getRemoveListenerMethod
  ()Ljava/lang/reflect/Method;
  ()Ljava/lang/reflect/Method;
diff --git a/libs/eea-java-17/src/main/resources/java/beans/IndexedPropertyDescriptor.eea b/libs/eea-java-17/src/main/resources/java/beans/IndexedPropertyDescriptor.eea
index 441fe191e7..23e41b70c2 100644
--- a/libs/eea-java-17/src/main/resources/java/beans/IndexedPropertyDescriptor.eea
+++ b/libs/eea-java-17/src/main/resources/java/beans/IndexedPropertyDescriptor.eea
@@ -17,10 +17,10 @@ getIndexedPropertyType
  ()Ljava/lang/Class<*>;
 getIndexedReadMethod
  ()Ljava/lang/reflect/Method;
- ()Ljava/lang/reflect/Method;
+ ()L0java/lang/reflect/Method;
 getIndexedWriteMethod
  ()Ljava/lang/reflect/Method;
- ()Ljava/lang/reflect/Method;
+ ()L0java/lang/reflect/Method;
 setIndexedReadMethod
  (Ljava/lang/reflect/Method;)V
  (Ljava/lang/reflect/Method;)V
diff --git a/libs/eea-java-17/src/main/resources/java/beans/MethodDescriptor.eea b/libs/eea-java-17/src/main/resources/java/beans/MethodDescriptor.eea
index d987c8baa0..ff97284446 100644
--- a/libs/eea-java-17/src/main/resources/java/beans/MethodDescriptor.eea
+++ b/libs/eea-java-17/src/main/resources/java/beans/MethodDescriptor.eea
@@ -11,4 +11,4 @@ getMethod
  ()Ljava/lang/reflect/Method;
 getParameterDescriptors
  ()[Ljava/beans/ParameterDescriptor;
- ()[Ljava/beans/ParameterDescriptor;
+ ()[0Ljava/beans/ParameterDescriptor;
diff --git a/libs/eea-java-17/src/main/resources/java/beans/PropertyDescriptor.eea b/libs/eea-java-17/src/main/resources/java/beans/PropertyDescriptor.eea
index abf6363013..3c7115bfbc 100644
--- a/libs/eea-java-17/src/main/resources/java/beans/PropertyDescriptor.eea
+++ b/libs/eea-java-17/src/main/resources/java/beans/PropertyDescriptor.eea
@@ -11,22 +11,22 @@ class java/beans/PropertyDescriptor
  (Ljava/lang/String;Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;)V
 createPropertyEditor
  (Ljava/lang/Object;)Ljava/beans/PropertyEditor;
- (Ljava/lang/Object;)Ljava/beans/PropertyEditor;
+ (Ljava/lang/Object;)L1java/beans/PropertyEditor;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getPropertyEditorClass
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L0java/lang/Class<*>;
 getPropertyType
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
 getReadMethod
  ()Ljava/lang/reflect/Method;
- ()Ljava/lang/reflect/Method;
+ ()L0java/lang/reflect/Method;
 getWriteMethod
  ()Ljava/lang/reflect/Method;
- ()Ljava/lang/reflect/Method;
+ ()L0java/lang/reflect/Method;
 setPropertyEditorClass
  (Ljava/lang/Class<*>;)V
  (Ljava/lang/Class<*>;)V
diff --git a/libs/eea-java-17/src/main/resources/java/beans/PropertyEditorSupport.eea b/libs/eea-java-17/src/main/resources/java/beans/PropertyEditorSupport.eea
index d4789a4ca8..877cd3e8f0 100644
--- a/libs/eea-java-17/src/main/resources/java/beans/PropertyEditorSupport.eea
+++ b/libs/eea-java-17/src/main/resources/java/beans/PropertyEditorSupport.eea
@@ -8,19 +8,19 @@ addPropertyChangeListener
  (L1java/beans/PropertyChangeListener;)V # @Inherited(java.beans.PropertyEditor)
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getCustomEditor
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 getJavaInitializationString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSource
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
 getTags
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String;
 getValue
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-java-17/src/main/resources/java/beans/SimpleBeanInfo.eea b/libs/eea-java-17/src/main/resources/java/beans/SimpleBeanInfo.eea
index d975845456..4f6fa32084 100644
--- a/libs/eea-java-17/src/main/resources/java/beans/SimpleBeanInfo.eea
+++ b/libs/eea-java-17/src/main/resources/java/beans/SimpleBeanInfo.eea
@@ -2,22 +2,22 @@ class java/beans/SimpleBeanInfo
 
 getAdditionalBeanInfo
  ()[Ljava/beans/BeanInfo;
- ()[Ljava/beans/BeanInfo;
+ ()[0Ljava/beans/BeanInfo;
 getBeanDescriptor
  ()Ljava/beans/BeanDescriptor;
- ()Ljava/beans/BeanDescriptor;
+ ()L0java/beans/BeanDescriptor;
 getEventSetDescriptors
  ()[Ljava/beans/EventSetDescriptor;
- ()[Ljava/beans/EventSetDescriptor;
+ ()[0Ljava/beans/EventSetDescriptor;
 getIcon
  (I)Ljava/awt/Image;
- (I)Ljava/awt/Image;
+ (I)L0java/awt/Image;
 getMethodDescriptors
  ()[Ljava/beans/MethodDescriptor;
- ()[Ljava/beans/MethodDescriptor;
+ ()[0Ljava/beans/MethodDescriptor;
 getPropertyDescriptors
  ()[Ljava/beans/PropertyDescriptor;
- ()[Ljava/beans/PropertyDescriptor;
+ ()[0Ljava/beans/PropertyDescriptor;
 loadImage
  (Ljava/lang/String;)Ljava/awt/Image;
- (Ljava/lang/String;)Ljava/awt/Image;
+ (Ljava/lang/String;)L0java/awt/Image;
diff --git a/libs/eea-java-17/src/main/resources/java/beans/XMLDecoder.eea b/libs/eea-java-17/src/main/resources/java/beans/XMLDecoder.eea
index 3cf52ded06..17322efac1 100644
--- a/libs/eea-java-17/src/main/resources/java/beans/XMLDecoder.eea
+++ b/libs/eea-java-17/src/main/resources/java/beans/XMLDecoder.eea
@@ -2,7 +2,7 @@ class java/beans/XMLDecoder
 
 createHandler
  (Ljava/lang/Object;Ljava/beans/ExceptionListener;Ljava/lang/ClassLoader;)Lorg/xml/sax/helpers/DefaultHandler;
- (Ljava/lang/Object;Ljava/beans/ExceptionListener;Ljava/lang/ClassLoader;)Lorg/xml/sax/helpers/DefaultHandler;
+ (Ljava/lang/Object;Ljava/beans/ExceptionListener;Ljava/lang/ClassLoader;)L1org/xml/sax/helpers/DefaultHandler;
 
 <init>
  (Ljava/io/InputStream;)V
diff --git a/libs/eea-java-17/src/main/resources/java/beans/beancontext/BeanContextServicesSupport$BCSSProxyServiceProvider.eea b/libs/eea-java-17/src/main/resources/java/beans/beancontext/BeanContextServicesSupport$BCSSProxyServiceProvider.eea
index e1cc42a1b9..dfd0d9e087 100644
--- a/libs/eea-java-17/src/main/resources/java/beans/beancontext/BeanContextServicesSupport$BCSSProxyServiceProvider.eea
+++ b/libs/eea-java-17/src/main/resources/java/beans/beancontext/BeanContextServicesSupport$BCSSProxyServiceProvider.eea
@@ -5,7 +5,7 @@ getCurrentServiceSelectors
  (Ljava/beans/beancontext/BeanContextServices;Ljava/lang/Class<*>;)Ljava/util/Iterator<*>;
 getService
  (Ljava/beans/beancontext/BeanContextServices;Ljava/lang/Object;Ljava/lang/Class<*>;Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/beans/beancontext/BeanContextServices;Ljava/lang/Object;Ljava/lang/Class<*>;Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/beans/beancontext/BeanContextServices;Ljava/lang/Object;Ljava/lang/Class<*>;Ljava/lang/Object;)L0java/lang/Object;
 releaseService
  (Ljava/beans/beancontext/BeanContextServices;Ljava/lang/Object;Ljava/lang/Object;)V
  (Ljava/beans/beancontext/BeanContextServices;Ljava/lang/Object;Ljava/lang/Object;)V
diff --git a/libs/eea-java-17/src/main/resources/java/beans/beancontext/BeanContextServicesSupport.eea b/libs/eea-java-17/src/main/resources/java/beans/beancontext/BeanContextServicesSupport.eea
index 14819d232d..345943f8e6 100644
--- a/libs/eea-java-17/src/main/resources/java/beans/beancontext/BeanContextServicesSupport.eea
+++ b/libs/eea-java-17/src/main/resources/java/beans/beancontext/BeanContextServicesSupport.eea
@@ -2,7 +2,7 @@ class java/beans/beancontext/BeanContextServicesSupport
 
 getChildBeanContextServicesListener
  (Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextServicesListener;
- (Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextServicesListener;
+ (Ljava/lang/Object;)L0java/beans/beancontext/BeanContextServicesListener;
 
 bcsListeners
  Ljava/util/ArrayList<Ljava/beans/beancontext/BeanContextServicesListener;>;
@@ -46,10 +46,10 @@ childJustRemovedHook
  (Ljava/lang/Object;Ljava/beans/beancontext/BeanContextSupport$BCSChild;)V
 createBCSChild
  (Ljava/lang/Object;Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextSupport$BCSChild;
- (Ljava/lang/Object;Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextSupport$BCSChild;
+ (Ljava/lang/Object;Ljava/lang/Object;)L1java/beans/beancontext/BeanContextSupport$BCSChild; # @Inherited(java.beans.beancontext.BeanContextSupport)
 createBCSSServiceProvider
  (Ljava/lang/Class<*>;Ljava/beans/beancontext/BeanContextServiceProvider;)Ljava/beans/beancontext/BeanContextServicesSupport$BCSSServiceProvider;
- (Ljava/lang/Class<*>;Ljava/beans/beancontext/BeanContextServiceProvider;)Ljava/beans/beancontext/BeanContextServicesSupport$BCSSServiceProvider;
+ (Ljava/lang/Class<*>;Ljava/beans/beancontext/BeanContextServiceProvider;)L1java/beans/beancontext/BeanContextServicesSupport$BCSSServiceProvider;
 fireServiceAdded
  (Ljava/beans/beancontext/BeanContextServiceAvailableEvent;)V
  (Ljava/beans/beancontext/BeanContextServiceAvailableEvent;)V
@@ -67,13 +67,13 @@ getBeanContextServicesPeer
  ()Ljava/beans/beancontext/BeanContextServices;
 getCurrentServiceClasses
  ()Ljava/util/Iterator<Ljava/lang/Object;>;
- ()Ljava/util/Iterator<Ljava/lang/Object;>;
+ ()L1java/util/Iterator<Ljava/lang/Object;>;
 getCurrentServiceSelectors
  (Ljava/lang/Class<*>;)Ljava/util/Iterator<*>;
- (Ljava/lang/Class<*>;)Ljava/util/Iterator<*>;
+ (Ljava/lang/Class<*>;)L0java/util/Iterator<*>;
 getService
  (Ljava/beans/beancontext/BeanContextChild;Ljava/lang/Object;Ljava/lang/Class<*>;Ljava/lang/Object;Ljava/beans/beancontext/BeanContextServiceRevokedListener;)Ljava/lang/Object;
- (Ljava/beans/beancontext/BeanContextChild;Ljava/lang/Object;Ljava/lang/Class<*>;Ljava/lang/Object;Ljava/beans/beancontext/BeanContextServiceRevokedListener;)Ljava/lang/Object;
+ (Ljava/beans/beancontext/BeanContextChild;Ljava/lang/Object;Ljava/lang/Class<*>;Ljava/lang/Object;Ljava/beans/beancontext/BeanContextServiceRevokedListener;)L0java/lang/Object;
 hasService
  (Ljava/lang/Class<*>;)Z
  (Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/beans/beancontext/BeanContextSupport.eea b/libs/eea-java-17/src/main/resources/java/beans/beancontext/BeanContextSupport.eea
index 769a1566d4..7d2fc0b078 100644
--- a/libs/eea-java-17/src/main/resources/java/beans/beancontext/BeanContextSupport.eea
+++ b/libs/eea-java-17/src/main/resources/java/beans/beancontext/BeanContextSupport.eea
@@ -5,22 +5,22 @@ classEquals
  (Ljava/lang/Class<*>;Ljava/lang/Class<*>;)Z
 getChildBeanContextChild
  (Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextChild;
- (Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextChild;
+ (Ljava/lang/Object;)L0java/beans/beancontext/BeanContextChild;
 getChildBeanContextMembershipListener
  (Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextMembershipListener;
- (Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextMembershipListener;
+ (Ljava/lang/Object;)L0java/beans/beancontext/BeanContextMembershipListener;
 getChildPropertyChangeListener
  (Ljava/lang/Object;)Ljava/beans/PropertyChangeListener;
- (Ljava/lang/Object;)Ljava/beans/PropertyChangeListener;
+ (Ljava/lang/Object;)L0java/beans/PropertyChangeListener;
 getChildSerializable
  (Ljava/lang/Object;)Ljava/io/Serializable;
- (Ljava/lang/Object;)Ljava/io/Serializable;
+ (Ljava/lang/Object;)L0java/io/Serializable;
 getChildVetoableChangeListener
  (Ljava/lang/Object;)Ljava/beans/VetoableChangeListener;
- (Ljava/lang/Object;)Ljava/beans/VetoableChangeListener;
+ (Ljava/lang/Object;)L0java/beans/VetoableChangeListener;
 getChildVisibility
  (Ljava/lang/Object;)Ljava/beans/Visibility;
- (Ljava/lang/Object;)Ljava/beans/Visibility;
+ (Ljava/lang/Object;)L0java/beans/Visibility;
 
 bcmListeners
  Ljava/util/ArrayList<Ljava/beans/beancontext/BeanContextMembershipListener;>;
@@ -85,7 +85,7 @@ copyChildren
  ()[Ljava/lang/Object;
 createBCSChild
  (Ljava/lang/Object;Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextSupport$BCSChild;
- (Ljava/lang/Object;Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextSupport$BCSChild;
+ (Ljava/lang/Object;Ljava/lang/Object;)L1java/beans/beancontext/BeanContextSupport$BCSChild;
 deserialize
  (Ljava/io/ObjectInputStream;Ljava/util/Collection;)V
  (Ljava/io/ObjectInputStream;Ljava/util/Collection;)V
diff --git a/libs/eea-java-17/src/main/resources/java/io/ObjectInputFilter.eea b/libs/eea-java-17/src/main/resources/java/io/ObjectInputFilter.eea
index 1c6d3352af..d01daa9864 100644
--- a/libs/eea-java-17/src/main/resources/java/io/ObjectInputFilter.eea
+++ b/libs/eea-java-17/src/main/resources/java/io/ObjectInputFilter.eea
@@ -2,16 +2,16 @@ class java/io/ObjectInputFilter
 
 allowFilter
  (Ljava/util/function/Predicate<Ljava/lang/Class<*>;>;Ljava/io/ObjectInputFilter$Status;)Ljava/io/ObjectInputFilter;
- (Ljava/util/function/Predicate<Ljava/lang/Class<*>;>;Ljava/io/ObjectInputFilter$Status;)Ljava/io/ObjectInputFilter;
+ (Ljava/util/function/Predicate<Ljava/lang/Class<*>;>;Ljava/io/ObjectInputFilter$Status;)L1java/io/ObjectInputFilter;
 merge
  (Ljava/io/ObjectInputFilter;Ljava/io/ObjectInputFilter;)Ljava/io/ObjectInputFilter;
- (Ljava/io/ObjectInputFilter;Ljava/io/ObjectInputFilter;)Ljava/io/ObjectInputFilter;
+ (Ljava/io/ObjectInputFilter;Ljava/io/ObjectInputFilter;)L1java/io/ObjectInputFilter;
 rejectFilter
  (Ljava/util/function/Predicate<Ljava/lang/Class<*>;>;Ljava/io/ObjectInputFilter$Status;)Ljava/io/ObjectInputFilter;
- (Ljava/util/function/Predicate<Ljava/lang/Class<*>;>;Ljava/io/ObjectInputFilter$Status;)Ljava/io/ObjectInputFilter;
+ (Ljava/util/function/Predicate<Ljava/lang/Class<*>;>;Ljava/io/ObjectInputFilter$Status;)L1java/io/ObjectInputFilter;
 rejectUndecidedClass
  (Ljava/io/ObjectInputFilter;)Ljava/io/ObjectInputFilter;
- (Ljava/io/ObjectInputFilter;)Ljava/io/ObjectInputFilter;
+ (Ljava/io/ObjectInputFilter;)L1java/io/ObjectInputFilter;
 
 checkInput
  (Ljava/io/ObjectInputFilter$FilterInfo;)Ljava/io/ObjectInputFilter$Status;
diff --git a/libs/eea-java-17/src/main/resources/java/io/ObjectInputStream.eea b/libs/eea-java-17/src/main/resources/java/io/ObjectInputStream.eea
index d77b4af612..03695d3b4c 100644
--- a/libs/eea-java-17/src/main/resources/java/io/ObjectInputStream.eea
+++ b/libs/eea-java-17/src/main/resources/java/io/ObjectInputStream.eea
@@ -11,10 +11,10 @@ read
  ([1BII)I # @Inherited(java.io.InputStream)
 readClassDescriptor
  ()Ljava/io/ObjectStreamClass;
- ()Ljava/io/ObjectStreamClass;
+ ()L1java/io/ObjectStreamClass;
 readFields
  ()Ljava/io/ObjectInputStream$GetField;
- ()Ljava/io/ObjectInputStream$GetField;
+ ()L1java/io/ObjectInputStream$GetField;
 readFully
  ([B)V
  ([1B)V # @Inherited(java.io.DataInput)
@@ -29,7 +29,7 @@ readObject
  ()L1java/lang/Object; # @Inherited(java.io.ObjectInput)
 readObjectOverride
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 readUTF
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.io.DataInput)
diff --git a/libs/eea-java-17/src/main/resources/java/io/ObjectStreamClass.eea b/libs/eea-java-17/src/main/resources/java/io/ObjectStreamClass.eea
index 38ae60a448..386277a526 100644
--- a/libs/eea-java-17/src/main/resources/java/io/ObjectStreamClass.eea
+++ b/libs/eea-java-17/src/main/resources/java/io/ObjectStreamClass.eea
@@ -13,7 +13,7 @@ lookupAny
 
 forClass
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L0java/lang/Class<*>;
 getField
  (Ljava/lang/String;)Ljava/io/ObjectStreamField;
  (L1java/lang/String;)L0java/io/ObjectStreamField;
diff --git a/libs/eea-java-17/src/main/resources/java/lang/Class.eea b/libs/eea-java-17/src/main/resources/java/lang/Class.eea
index 171348992d..267f0676d8 100644
--- a/libs/eea-java-17/src/main/resources/java/lang/Class.eea
+++ b/libs/eea-java-17/src/main/resources/java/lang/Class.eea
@@ -27,7 +27,7 @@ cast
  (L0java/lang/Object;)TT;
 componentType
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L0java/lang/Class<*>;
 describeConstable
  ()Ljava/util/Optional<Ljava/lang/constant/ClassDesc;>;
  ()Ljava/util/Optional<Ljava/lang/constant/ClassDesc;>;
@@ -153,13 +153,13 @@ getPackageName
  ()L1java/lang/String;
 getPermittedSubclasses
  ()[Ljava/lang/Class<*>;
- ()[Ljava/lang/Class<*>;
+ ()[0Ljava/lang/Class<*>;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
  ()L1java/security/ProtectionDomain;
 getRecordComponents
  ()[Ljava/lang/reflect/RecordComponent;
- ()[Ljava/lang/reflect/RecordComponent;
+ ()[0Ljava/lang/reflect/RecordComponent;
 getResource
  (Ljava/lang/String;)Ljava/net/URL;
  (L1java/lang/String;)L0java/net/URL;
diff --git a/libs/eea-java-17/src/main/resources/java/lang/Enum$EnumDesc.eea b/libs/eea-java-17/src/main/resources/java/lang/Enum$EnumDesc.eea
index 19b556211b..0d670424e3 100644
--- a/libs/eea-java-17/src/main/resources/java/lang/Enum$EnumDesc.eea
+++ b/libs/eea-java-17/src/main/resources/java/lang/Enum$EnumDesc.eea
@@ -8,7 +8,7 @@ super java/lang/constant/DynamicConstantDesc
 
 of
  <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/constant/ClassDesc;Ljava/lang/String;)Ljava/lang/Enum$EnumDesc<TE;>;
- <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/constant/ClassDesc;Ljava/lang/String;)Ljava/lang/Enum$EnumDesc<TE;>;
+ <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/constant/ClassDesc;Ljava/lang/String;)L1java/lang/Enum$EnumDesc<TE;>;
 
 resolveConstantDesc
  (Ljava/lang/invoke/MethodHandles$Lookup;)TE;
diff --git a/libs/eea-java-17/src/main/resources/java/lang/String.eea b/libs/eea-java-17/src/main/resources/java/lang/String.eea
index 1b29a51370..e98874a869 100644
--- a/libs/eea-java-17/src/main/resources/java/lang/String.eea
+++ b/libs/eea-java-17/src/main/resources/java/lang/String.eea
@@ -134,7 +134,7 @@ equalsIgnoreCase
  (L0java/lang/String;)Z
 formatted
  ([Ljava/lang/Object;)Ljava/lang/String;
- ([Ljava/lang/Object;)Ljava/lang/String;
+ ([Ljava/lang/Object;)L1java/lang/String;
 getBytes
  ()[B
  ()[1B
diff --git a/libs/eea-java-17/src/main/resources/java/lang/constant/ClassDesc.eea b/libs/eea-java-17/src/main/resources/java/lang/constant/ClassDesc.eea
index 3c8d1821b3..d97313fe91 100644
--- a/libs/eea-java-17/src/main/resources/java/lang/constant/ClassDesc.eea
+++ b/libs/eea-java-17/src/main/resources/java/lang/constant/ClassDesc.eea
@@ -12,7 +12,7 @@ of
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/constant/ClassDesc;
 ofDescriptor
  (Ljava/lang/String;)Ljava/lang/constant/ClassDesc;
- (Ljava/lang/String;)Ljava/lang/constant/ClassDesc;
+ (Ljava/lang/String;)L1java/lang/constant/ClassDesc;
 
 arrayType
  ()Ljava/lang/constant/ClassDesc;
@@ -22,7 +22,7 @@ arrayType
  (I)Ljava/lang/constant/ClassDesc;
 componentType
  ()Ljava/lang/constant/ClassDesc;
- ()Ljava/lang/constant/ClassDesc;
+ ()L0java/lang/constant/ClassDesc;
 descriptorString
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/java/lang/constant/DynamicCallSiteDesc.eea b/libs/eea-java-17/src/main/resources/java/lang/constant/DynamicCallSiteDesc.eea
index e586935930..3b07f02a0f 100644
--- a/libs/eea-java-17/src/main/resources/java/lang/constant/DynamicCallSiteDesc.eea
+++ b/libs/eea-java-17/src/main/resources/java/lang/constant/DynamicCallSiteDesc.eea
@@ -2,10 +2,10 @@ class java/lang/constant/DynamicCallSiteDesc
 
 of
  (Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/String;Ljava/lang/constant/MethodTypeDesc;)Ljava/lang/constant/DynamicCallSiteDesc;
- (Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/String;Ljava/lang/constant/MethodTypeDesc;)Ljava/lang/constant/DynamicCallSiteDesc;
+ (Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/String;Ljava/lang/constant/MethodTypeDesc;)L1java/lang/constant/DynamicCallSiteDesc;
 of
  (Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/String;Ljava/lang/constant/MethodTypeDesc;[Ljava/lang/constant/ConstantDesc;)Ljava/lang/constant/DynamicCallSiteDesc;
- (Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/String;Ljava/lang/constant/MethodTypeDesc;[Ljava/lang/constant/ConstantDesc;)Ljava/lang/constant/DynamicCallSiteDesc;
+ (Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/String;Ljava/lang/constant/MethodTypeDesc;[Ljava/lang/constant/ConstantDesc;)L1java/lang/constant/DynamicCallSiteDesc;
 of
  (Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/constant/MethodTypeDesc;)Ljava/lang/constant/DynamicCallSiteDesc;
  (Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/constant/MethodTypeDesc;)Ljava/lang/constant/DynamicCallSiteDesc;
diff --git a/libs/eea-java-17/src/main/resources/java/lang/constant/DynamicConstantDesc.eea b/libs/eea-java-17/src/main/resources/java/lang/constant/DynamicConstantDesc.eea
index c57a18338f..bd3c4c92d8 100644
--- a/libs/eea-java-17/src/main/resources/java/lang/constant/DynamicConstantDesc.eea
+++ b/libs/eea-java-17/src/main/resources/java/lang/constant/DynamicConstantDesc.eea
@@ -13,7 +13,7 @@ ofCanonical
  <T:Ljava/lang/Object;>(Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;[Ljava/lang/constant/ConstantDesc;)Ljava/lang/constant/ConstantDesc;
 ofNamed
  <T:Ljava/lang/Object;>(Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;[Ljava/lang/constant/ConstantDesc;)Ljava/lang/constant/DynamicConstantDesc<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;[Ljava/lang/constant/ConstantDesc;)Ljava/lang/constant/DynamicConstantDesc<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;[Ljava/lang/constant/ConstantDesc;)L1java/lang/constant/DynamicConstantDesc<TT;>;
 
 <init>
  (Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;[Ljava/lang/constant/ConstantDesc;)V
diff --git a/libs/eea-java-17/src/main/resources/java/lang/constant/MethodHandleDesc.eea b/libs/eea-java-17/src/main/resources/java/lang/constant/MethodHandleDesc.eea
index bce18b3d9e..0cc97d74c1 100644
--- a/libs/eea-java-17/src/main/resources/java/lang/constant/MethodHandleDesc.eea
+++ b/libs/eea-java-17/src/main/resources/java/lang/constant/MethodHandleDesc.eea
@@ -8,14 +8,14 @@ ofConstructor
  (Ljava/lang/constant/ClassDesc;[Ljava/lang/constant/ClassDesc;)Ljava/lang/constant/DirectMethodHandleDesc;
 ofField
  (Ljava/lang/constant/DirectMethodHandleDesc$Kind;Ljava/lang/constant/ClassDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;)Ljava/lang/constant/DirectMethodHandleDesc;
- (Ljava/lang/constant/DirectMethodHandleDesc$Kind;Ljava/lang/constant/ClassDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;)Ljava/lang/constant/DirectMethodHandleDesc;
+ (Ljava/lang/constant/DirectMethodHandleDesc$Kind;Ljava/lang/constant/ClassDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;)L1java/lang/constant/DirectMethodHandleDesc;
 ofMethod
  (Ljava/lang/constant/DirectMethodHandleDesc$Kind;Ljava/lang/constant/ClassDesc;Ljava/lang/String;Ljava/lang/constant/MethodTypeDesc;)Ljava/lang/constant/DirectMethodHandleDesc;
- (Ljava/lang/constant/DirectMethodHandleDesc$Kind;Ljava/lang/constant/ClassDesc;Ljava/lang/String;Ljava/lang/constant/MethodTypeDesc;)Ljava/lang/constant/DirectMethodHandleDesc;
+ (Ljava/lang/constant/DirectMethodHandleDesc$Kind;Ljava/lang/constant/ClassDesc;Ljava/lang/String;Ljava/lang/constant/MethodTypeDesc;)L1java/lang/constant/DirectMethodHandleDesc;
 
 asType
  (Ljava/lang/constant/MethodTypeDesc;)Ljava/lang/constant/MethodHandleDesc;
- (Ljava/lang/constant/MethodTypeDesc;)Ljava/lang/constant/MethodHandleDesc;
+ (Ljava/lang/constant/MethodTypeDesc;)L1java/lang/constant/MethodHandleDesc;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/java/lang/constant/MethodTypeDesc.eea b/libs/eea-java-17/src/main/resources/java/lang/constant/MethodTypeDesc.eea
index f0692c30a1..26f677ad91 100644
--- a/libs/eea-java-17/src/main/resources/java/lang/constant/MethodTypeDesc.eea
+++ b/libs/eea-java-17/src/main/resources/java/lang/constant/MethodTypeDesc.eea
@@ -6,7 +6,7 @@ super java/lang/invoke/TypeDescriptor$OfMethod
 
 of
  (Ljava/lang/constant/ClassDesc;[Ljava/lang/constant/ClassDesc;)Ljava/lang/constant/MethodTypeDesc;
- (Ljava/lang/constant/ClassDesc;[Ljava/lang/constant/ClassDesc;)Ljava/lang/constant/MethodTypeDesc;
+ (Ljava/lang/constant/ClassDesc;[Ljava/lang/constant/ClassDesc;)L1java/lang/constant/MethodTypeDesc;
 ofDescriptor
  (Ljava/lang/String;)Ljava/lang/constant/MethodTypeDesc;
  (Ljava/lang/String;)Ljava/lang/constant/MethodTypeDesc;
diff --git a/libs/eea-java-17/src/main/resources/java/lang/instrument/ClassFileTransformer.eea b/libs/eea-java-17/src/main/resources/java/lang/instrument/ClassFileTransformer.eea
index afac4bd584..f068722d35 100644
--- a/libs/eea-java-17/src/main/resources/java/lang/instrument/ClassFileTransformer.eea
+++ b/libs/eea-java-17/src/main/resources/java/lang/instrument/ClassFileTransformer.eea
@@ -2,7 +2,7 @@ class java/lang/instrument/ClassFileTransformer
 
 transform
  (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[B
- (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[B
+ (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[0B
 transform
  (Ljava/lang/Module;Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[B
  (Ljava/lang/Module;Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[B
diff --git a/libs/eea-java-17/src/main/resources/java/lang/invoke/ClassSpecializer$Factory.eea b/libs/eea-java-17/src/main/resources/java/lang/invoke/ClassSpecializer$Factory.eea
index f02737615f..703aa9bb18 100644
--- a/libs/eea-java-17/src/main/resources/java/lang/invoke/ClassSpecializer$Factory.eea
+++ b/libs/eea-java-17/src/main/resources/java/lang/invoke/ClassSpecializer$Factory.eea
@@ -2,7 +2,7 @@ class java/lang/invoke/ClassSpecializer$Factory
 
 chooseFieldName
  (Ljava/lang/Class<*>;I)Ljava/lang/String;
- (Ljava/lang/Class<*>;I)Ljava/lang/String;
+ (Ljava/lang/Class<*>;I)L1java/lang/String;
 linkCodeToSpeciesData
  (Ljava/lang/Class<+TT;>;Ljava/lang/invoke/ClassSpecializer<TT;TK;TS;>.SpeciesData;Z)V
  (Ljava/lang/Class<+TT;>;Ljava/lang/invoke/ClassSpecializer<TT;TK;TS;>.SpeciesData;Z)V
diff --git a/libs/eea-java-17/src/main/resources/java/lang/invoke/ClassSpecializer$SpeciesData.eea b/libs/eea-java-17/src/main/resources/java/lang/invoke/ClassSpecializer$SpeciesData.eea
index 51d318109f..c50957c1c3 100644
--- a/libs/eea-java-17/src/main/resources/java/lang/invoke/ClassSpecializer$SpeciesData.eea
+++ b/libs/eea-java-17/src/main/resources/java/lang/invoke/ClassSpecializer$SpeciesData.eea
@@ -5,7 +5,7 @@ class java/lang/invoke/ClassSpecializer$SpeciesData
  (TK;)V
 deriveClassName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 deriveFieldTypes
  (TK;)Ljava/util/List<Ljava/lang/Class<*>;>;
  (TK;)Ljava/util/List<Ljava/lang/Class<*>;>;
diff --git a/libs/eea-java-17/src/main/resources/java/lang/invoke/ConstantBootstraps.eea b/libs/eea-java-17/src/main/resources/java/lang/invoke/ConstantBootstraps.eea
index 5e112b4034..f17b899ad0 100644
--- a/libs/eea-java-17/src/main/resources/java/lang/invoke/ConstantBootstraps.eea
+++ b/libs/eea-java-17/src/main/resources/java/lang/invoke/ConstantBootstraps.eea
@@ -23,7 +23,7 @@ invoke
  (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/lang/invoke/MethodHandle;[Ljava/lang/Object;)Ljava/lang/Object;
 nullConstant
  (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<*>;)Ljava/lang/Object;
- (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<*>;)Ljava/lang/Object;
+ (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<*>;)L0java/lang/Object;
 primitiveClass
  (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
  (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
diff --git a/libs/eea-java-17/src/main/resources/java/lang/invoke/MethodHandle.eea b/libs/eea-java-17/src/main/resources/java/lang/invoke/MethodHandle.eea
index 036d4acaa7..4db764239b 100644
--- a/libs/eea-java-17/src/main/resources/java/lang/invoke/MethodHandle.eea
+++ b/libs/eea-java-17/src/main/resources/java/lang/invoke/MethodHandle.eea
@@ -29,10 +29,10 @@ describeConstable
  ()Ljava/util/Optional<Ljava/lang/constant/MethodHandleDesc;>;
 invoke
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 invokeExact
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 invokeWithArguments
  (Ljava/util/List<*>;)Ljava/lang/Object;
  (Ljava/util/List<*>;)Ljava/lang/Object;
diff --git a/libs/eea-java-17/src/main/resources/java/lang/invoke/MethodHandles$Lookup.eea b/libs/eea-java-17/src/main/resources/java/lang/invoke/MethodHandles$Lookup.eea
index 46959bce41..f16fd7e7fb 100644
--- a/libs/eea-java-17/src/main/resources/java/lang/invoke/MethodHandles$Lookup.eea
+++ b/libs/eea-java-17/src/main/resources/java/lang/invoke/MethodHandles$Lookup.eea
@@ -65,7 +65,7 @@ previousLookupClass
  ()Ljava/lang/Class<*>;
 revealDirect
  (Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandleInfo;
- (Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandleInfo;
+ (Ljava/lang/invoke/MethodHandle;)L1java/lang/invoke/MethodHandleInfo;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/java/lang/invoke/MethodHandles.eea b/libs/eea-java-17/src/main/resources/java/lang/invoke/MethodHandles.eea
index 6c7ece2f36..fa61f3d638 100644
--- a/libs/eea-java-17/src/main/resources/java/lang/invoke/MethodHandles.eea
+++ b/libs/eea-java-17/src/main/resources/java/lang/invoke/MethodHandles.eea
@@ -26,10 +26,10 @@ catchException
  (Ljava/lang/invoke/MethodHandle;Ljava/lang/Class<+Ljava/lang/Throwable;>;Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;
 classData
  <T:Ljava/lang/Object;>(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<TT;>;)T0T;
 classDataAt
  <T:Ljava/lang/Object;>(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<TT;>;I)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<TT;>;I)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<TT;>;I)T0T;
 collectArguments
  (Ljava/lang/invoke/MethodHandle;ILjava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;
  (Ljava/lang/invoke/MethodHandle;ILjava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;
@@ -104,7 +104,7 @@ permuteArguments
  (Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodType;[I)Ljava/lang/invoke/MethodHandle;
 privateLookupIn
  (Ljava/lang/Class<*>;Ljava/lang/invoke/MethodHandles$Lookup;)Ljava/lang/invoke/MethodHandles$Lookup;
- (Ljava/lang/Class<*>;Ljava/lang/invoke/MethodHandles$Lookup;)Ljava/lang/invoke/MethodHandles$Lookup;
+ (Ljava/lang/Class<*>;Ljava/lang/invoke/MethodHandles$Lookup;)L1java/lang/invoke/MethodHandles$Lookup;
 publicLookup
  ()Ljava/lang/invoke/MethodHandles$Lookup;
  ()Ljava/lang/invoke/MethodHandles$Lookup;
diff --git a/libs/eea-java-17/src/main/resources/java/lang/invoke/StringConcatFactory.eea b/libs/eea-java-17/src/main/resources/java/lang/invoke/StringConcatFactory.eea
index 7b001549f8..77558ad8df 100644
--- a/libs/eea-java-17/src/main/resources/java/lang/invoke/StringConcatFactory.eea
+++ b/libs/eea-java-17/src/main/resources/java/lang/invoke/StringConcatFactory.eea
@@ -2,7 +2,7 @@ class java/lang/invoke/StringConcatFactory
 
 makeConcat
  (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;
- (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;
+ (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;)L1java/lang/invoke/CallSite;
 makeConcatWithConstants
  (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;
  (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;
diff --git a/libs/eea-java-17/src/main/resources/java/lang/invoke/VarHandle$VarHandleDesc.eea b/libs/eea-java-17/src/main/resources/java/lang/invoke/VarHandle$VarHandleDesc.eea
index 8628296ba9..4af3033230 100644
--- a/libs/eea-java-17/src/main/resources/java/lang/invoke/VarHandle$VarHandleDesc.eea
+++ b/libs/eea-java-17/src/main/resources/java/lang/invoke/VarHandle$VarHandleDesc.eea
@@ -6,13 +6,13 @@ super java/lang/constant/DynamicConstantDesc
 
 ofArray
  (Ljava/lang/constant/ClassDesc;)Ljava/lang/invoke/VarHandle$VarHandleDesc;
- (Ljava/lang/constant/ClassDesc;)Ljava/lang/invoke/VarHandle$VarHandleDesc;
+ (Ljava/lang/constant/ClassDesc;)L1java/lang/invoke/VarHandle$VarHandleDesc;
 ofField
  (Ljava/lang/constant/ClassDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;)Ljava/lang/invoke/VarHandle$VarHandleDesc;
- (Ljava/lang/constant/ClassDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;)Ljava/lang/invoke/VarHandle$VarHandleDesc;
+ (Ljava/lang/constant/ClassDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;)L1java/lang/invoke/VarHandle$VarHandleDesc;
 ofStaticField
  (Ljava/lang/constant/ClassDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;)Ljava/lang/invoke/VarHandle$VarHandleDesc;
- (Ljava/lang/constant/ClassDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;)Ljava/lang/invoke/VarHandle$VarHandleDesc;
+ (Ljava/lang/constant/ClassDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;)L1java/lang/invoke/VarHandle$VarHandleDesc;
 
 resolveConstantDesc
  (Ljava/lang/invoke/MethodHandles$Lookup;)Ljava/lang/invoke/VarHandle;
diff --git a/libs/eea-java-17/src/main/resources/java/lang/invoke/VarHandle.eea b/libs/eea-java-17/src/main/resources/java/lang/invoke/VarHandle.eea
index d80963c9a9..4250fb36eb 100644
--- a/libs/eea-java-17/src/main/resources/java/lang/invoke/VarHandle.eea
+++ b/libs/eea-java-17/src/main/resources/java/lang/invoke/VarHandle.eea
@@ -5,13 +5,13 @@ accessModeType
  (Ljava/lang/invoke/VarHandle$AccessMode;)Ljava/lang/invoke/MethodType;
 compareAndExchange
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 compareAndExchangeAcquire
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 compareAndExchangeRelease
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 compareAndSet
  ([Ljava/lang/Object;)Z
  ([Ljava/lang/Object;)Z
@@ -23,61 +23,61 @@ describeConstable
  ()Ljava/util/Optional<Ljava/lang/invoke/VarHandle$VarHandleDesc;>;
 get
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAcquire
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndAdd
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndAddAcquire
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndAddRelease
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseAnd
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseAndAcquire
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseAndRelease
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseOr
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseOrAcquire
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseOrRelease
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseXor
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseXorAcquire
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseXorRelease
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndSet
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndSetAcquire
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndSetRelease
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getOpaque
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getVolatile
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 isAccessModeSupported
  (Ljava/lang/invoke/VarHandle$AccessMode;)Z
  (Ljava/lang/invoke/VarHandle$AccessMode;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/lang/module/Configuration.eea b/libs/eea-java-17/src/main/resources/java/lang/module/Configuration.eea
index 4812249c39..d42b77d202 100644
--- a/libs/eea-java-17/src/main/resources/java/lang/module/Configuration.eea
+++ b/libs/eea-java-17/src/main/resources/java/lang/module/Configuration.eea
@@ -5,10 +5,10 @@ empty
  ()Ljava/lang/module/Configuration;
 resolve
  (Ljava/lang/module/ModuleFinder;Ljava/util/List<Ljava/lang/module/Configuration;>;Ljava/lang/module/ModuleFinder;Ljava/util/Collection<Ljava/lang/String;>;)Ljava/lang/module/Configuration;
- (Ljava/lang/module/ModuleFinder;Ljava/util/List<Ljava/lang/module/Configuration;>;Ljava/lang/module/ModuleFinder;Ljava/util/Collection<Ljava/lang/String;>;)Ljava/lang/module/Configuration;
+ (Ljava/lang/module/ModuleFinder;Ljava/util/List<Ljava/lang/module/Configuration;>;Ljava/lang/module/ModuleFinder;Ljava/util/Collection<Ljava/lang/String;>;)L1java/lang/module/Configuration;
 resolveAndBind
  (Ljava/lang/module/ModuleFinder;Ljava/util/List<Ljava/lang/module/Configuration;>;Ljava/lang/module/ModuleFinder;Ljava/util/Collection<Ljava/lang/String;>;)Ljava/lang/module/Configuration;
- (Ljava/lang/module/ModuleFinder;Ljava/util/List<Ljava/lang/module/Configuration;>;Ljava/lang/module/ModuleFinder;Ljava/util/Collection<Ljava/lang/String;>;)Ljava/lang/module/Configuration;
+ (Ljava/lang/module/ModuleFinder;Ljava/util/List<Ljava/lang/module/Configuration;>;Ljava/lang/module/ModuleFinder;Ljava/util/Collection<Ljava/lang/String;>;)L1java/lang/module/Configuration;
 
 findModule
  (Ljava/lang/String;)Ljava/util/Optional<Ljava/lang/module/ResolvedModule;>;
diff --git a/libs/eea-java-17/src/main/resources/java/lang/module/ModuleDescriptor$Version.eea b/libs/eea-java-17/src/main/resources/java/lang/module/ModuleDescriptor$Version.eea
index 317961212b..0cc2269264 100644
--- a/libs/eea-java-17/src/main/resources/java/lang/module/ModuleDescriptor$Version.eea
+++ b/libs/eea-java-17/src/main/resources/java/lang/module/ModuleDescriptor$Version.eea
@@ -6,7 +6,7 @@ super java/lang/Comparable
 
 parse
  (Ljava/lang/String;)Ljava/lang/module/ModuleDescriptor$Version;
- (Ljava/lang/String;)Ljava/lang/module/ModuleDescriptor$Version;
+ (Ljava/lang/String;)L1java/lang/module/ModuleDescriptor$Version;
 
 compareTo
  (Ljava/lang/module/ModuleDescriptor$Version;)I
diff --git a/libs/eea-java-17/src/main/resources/java/lang/module/ModuleFinder.eea b/libs/eea-java-17/src/main/resources/java/lang/module/ModuleFinder.eea
index 85d29f3133..6b2917121e 100644
--- a/libs/eea-java-17/src/main/resources/java/lang/module/ModuleFinder.eea
+++ b/libs/eea-java-17/src/main/resources/java/lang/module/ModuleFinder.eea
@@ -2,7 +2,7 @@ class java/lang/module/ModuleFinder
 
 compose
  ([Ljava/lang/module/ModuleFinder;)Ljava/lang/module/ModuleFinder;
- ([Ljava/lang/module/ModuleFinder;)Ljava/lang/module/ModuleFinder;
+ ([Ljava/lang/module/ModuleFinder;)L1java/lang/module/ModuleFinder;
 of
  ([Ljava/nio/file/Path;)Ljava/lang/module/ModuleFinder;
  ([Ljava/nio/file/Path;)Ljava/lang/module/ModuleFinder;
diff --git a/libs/eea-java-17/src/main/resources/java/lang/runtime/SwitchBootstraps.eea b/libs/eea-java-17/src/main/resources/java/lang/runtime/SwitchBootstraps.eea
index e72325cede..dcc3659297 100644
--- a/libs/eea-java-17/src/main/resources/java/lang/runtime/SwitchBootstraps.eea
+++ b/libs/eea-java-17/src/main/resources/java/lang/runtime/SwitchBootstraps.eea
@@ -2,7 +2,7 @@ class java/lang/runtime/SwitchBootstraps
 
 enumSwitch
  (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;
- (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;
+ (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;[Ljava/lang/Object;)L1java/lang/invoke/CallSite;
 typeSwitch
  (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;
- (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;
+ (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;[Ljava/lang/Object;)L1java/lang/invoke/CallSite;
diff --git a/libs/eea-java-17/src/main/resources/java/net/Authenticator.eea b/libs/eea-java-17/src/main/resources/java/net/Authenticator.eea
index 3151571c0a..f978702dd4 100644
--- a/libs/eea-java-17/src/main/resources/java/net/Authenticator.eea
+++ b/libs/eea-java-17/src/main/resources/java/net/Authenticator.eea
@@ -5,23 +5,23 @@ getDefault
  ()Ljava/net/Authenticator;
 requestPasswordAuthentication
  (Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/net/PasswordAuthentication;
- (Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/net/PasswordAuthentication;
+ (Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)L0java/net/PasswordAuthentication;
 requestPasswordAuthentication
  (Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/URL;Ljava/net/Authenticator$RequestorType;)Ljava/net/PasswordAuthentication;
- (Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/URL;Ljava/net/Authenticator$RequestorType;)Ljava/net/PasswordAuthentication;
+ (Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/URL;Ljava/net/Authenticator$RequestorType;)L0java/net/PasswordAuthentication;
 requestPasswordAuthentication
  (Ljava/net/Authenticator;Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/URL;Ljava/net/Authenticator$RequestorType;)Ljava/net/PasswordAuthentication;
- (Ljava/net/Authenticator;Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/URL;Ljava/net/Authenticator$RequestorType;)Ljava/net/PasswordAuthentication;
+ (Ljava/net/Authenticator;Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/URL;Ljava/net/Authenticator$RequestorType;)L0java/net/PasswordAuthentication;
 requestPasswordAuthentication
  (Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/net/PasswordAuthentication;
- (Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/net/PasswordAuthentication;
+ (Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)L0java/net/PasswordAuthentication;
 setDefault
  (Ljava/net/Authenticator;)V
  (Ljava/net/Authenticator;)V
 
 getPasswordAuthentication
  ()Ljava/net/PasswordAuthentication;
- ()Ljava/net/PasswordAuthentication;
+ ()L0java/net/PasswordAuthentication;
 getRequestingHost
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/java/net/ContentHandler.eea b/libs/eea-java-17/src/main/resources/java/net/ContentHandler.eea
index 1e1cca6b16..ed6f047606 100644
--- a/libs/eea-java-17/src/main/resources/java/net/ContentHandler.eea
+++ b/libs/eea-java-17/src/main/resources/java/net/ContentHandler.eea
@@ -5,4 +5,4 @@ getContent
  (Ljava/net/URLConnection;)Ljava/lang/Object;
 getContent
  (Ljava/net/URLConnection;[Ljava/lang/Class;)Ljava/lang/Object;
- (Ljava/net/URLConnection;[Ljava/lang/Class;)Ljava/lang/Object;
+ (Ljava/net/URLConnection;[Ljava/lang/Class;)L0java/lang/Object;
diff --git a/libs/eea-java-17/src/main/resources/java/net/ContentHandlerFactory.eea b/libs/eea-java-17/src/main/resources/java/net/ContentHandlerFactory.eea
index c8abe6b8dd..2699ebdcc3 100644
--- a/libs/eea-java-17/src/main/resources/java/net/ContentHandlerFactory.eea
+++ b/libs/eea-java-17/src/main/resources/java/net/ContentHandlerFactory.eea
@@ -2,4 +2,4 @@ class java/net/ContentHandlerFactory
 
 createContentHandler
  (Ljava/lang/String;)Ljava/net/ContentHandler;
- (Ljava/lang/String;)Ljava/net/ContentHandler;
+ (Ljava/lang/String;)L1java/net/ContentHandler;
diff --git a/libs/eea-java-17/src/main/resources/java/net/DatagramPacket.eea b/libs/eea-java-17/src/main/resources/java/net/DatagramPacket.eea
index 5eb8ad8f2d..ae4d558e11 100644
--- a/libs/eea-java-17/src/main/resources/java/net/DatagramPacket.eea
+++ b/libs/eea-java-17/src/main/resources/java/net/DatagramPacket.eea
@@ -26,7 +26,7 @@ getData
  ()[B
 getSocketAddress
  ()Ljava/net/SocketAddress;
- ()Ljava/net/SocketAddress;
+ ()L1java/net/SocketAddress;
 setAddress
  (Ljava/net/InetAddress;)V
  (Ljava/net/InetAddress;)V
diff --git a/libs/eea-java-17/src/main/resources/java/net/DatagramSocket.eea b/libs/eea-java-17/src/main/resources/java/net/DatagramSocket.eea
index 28f69f342f..3616050d10 100644
--- a/libs/eea-java-17/src/main/resources/java/net/DatagramSocket.eea
+++ b/libs/eea-java-17/src/main/resources/java/net/DatagramSocket.eea
@@ -24,22 +24,22 @@ connect
  (Ljava/net/SocketAddress;)V
 getChannel
  ()Ljava/nio/channels/DatagramChannel;
- ()Ljava/nio/channels/DatagramChannel;
+ ()L0java/nio/channels/DatagramChannel;
 getInetAddress
  ()Ljava/net/InetAddress;
  ()Ljava/net/InetAddress;
 getLocalAddress
  ()Ljava/net/InetAddress;
- ()Ljava/net/InetAddress;
+ ()L0java/net/InetAddress;
 getLocalSocketAddress
  ()Ljava/net/SocketAddress;
- ()Ljava/net/SocketAddress;
+ ()L0java/net/SocketAddress;
 getOption
  <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)TT;
  <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)TT;
 getRemoteSocketAddress
  ()Ljava/net/SocketAddress;
- ()Ljava/net/SocketAddress;
+ ()L0java/net/SocketAddress;
 joinGroup
  (Ljava/net/SocketAddress;Ljava/net/NetworkInterface;)V
  (Ljava/net/SocketAddress;Ljava/net/NetworkInterface;)V
diff --git a/libs/eea-java-17/src/main/resources/java/net/DatagramSocketImpl.eea b/libs/eea-java-17/src/main/resources/java/net/DatagramSocketImpl.eea
index 5a696d7b04..1bb5ab1665 100644
--- a/libs/eea-java-17/src/main/resources/java/net/DatagramSocketImpl.eea
+++ b/libs/eea-java-17/src/main/resources/java/net/DatagramSocketImpl.eea
@@ -15,7 +15,7 @@ getFileDescriptor
  ()Ljava/io/FileDescriptor;
 getOption
  <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)T1T;
 join
  (Ljava/net/InetAddress;)V
  (Ljava/net/InetAddress;)V
diff --git a/libs/eea-java-17/src/main/resources/java/net/DatagramSocketImplFactory.eea b/libs/eea-java-17/src/main/resources/java/net/DatagramSocketImplFactory.eea
index fff0d4e351..9f2fbb449d 100644
--- a/libs/eea-java-17/src/main/resources/java/net/DatagramSocketImplFactory.eea
+++ b/libs/eea-java-17/src/main/resources/java/net/DatagramSocketImplFactory.eea
@@ -2,4 +2,4 @@ class java/net/DatagramSocketImplFactory
 
 createDatagramSocketImpl
  ()Ljava/net/DatagramSocketImpl;
- ()Ljava/net/DatagramSocketImpl;
+ ()L1java/net/DatagramSocketImpl;
diff --git a/libs/eea-java-17/src/main/resources/java/net/HttpURLConnection.eea b/libs/eea-java-17/src/main/resources/java/net/HttpURLConnection.eea
index f7ed8f092c..6918f60e58 100644
--- a/libs/eea-java-17/src/main/resources/java/net/HttpURLConnection.eea
+++ b/libs/eea-java-17/src/main/resources/java/net/HttpURLConnection.eea
@@ -12,7 +12,7 @@ responseMessage
  (Ljava/net/URL;)V
 getErrorStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L0java/io/InputStream;
 getHeaderField
  (I)Ljava/lang/String;
  (I)L0java/lang/String; # @Inherited(java.net.URLConnection)
@@ -21,7 +21,7 @@ getHeaderFieldDate
  (Ljava/lang/String;J)J
 getHeaderFieldKey
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String; # @Inherited(java.net.URLConnection)
 getPermission
  ()Ljava/security/Permission;
  ()L1java/security/Permission; # @Inherited(java.net.URLConnection)
diff --git a/libs/eea-java-17/src/main/resources/java/net/IDN.eea b/libs/eea-java-17/src/main/resources/java/net/IDN.eea
index e2bcd71ed5..65c48535e7 100644
--- a/libs/eea-java-17/src/main/resources/java/net/IDN.eea
+++ b/libs/eea-java-17/src/main/resources/java/net/IDN.eea
@@ -5,10 +5,10 @@ toASCII
  (Ljava/lang/String;)Ljava/lang/String;
 toASCII
  (Ljava/lang/String;I)Ljava/lang/String;
- (Ljava/lang/String;I)Ljava/lang/String;
+ (Ljava/lang/String;I)L1java/lang/String;
 toUnicode
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
 toUnicode
  (Ljava/lang/String;I)Ljava/lang/String;
- (Ljava/lang/String;I)Ljava/lang/String;
+ (Ljava/lang/String;I)L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/java/net/InetSocketAddress.eea b/libs/eea-java-17/src/main/resources/java/net/InetSocketAddress.eea
index 999cdbd6cb..542c8de311 100644
--- a/libs/eea-java-17/src/main/resources/java/net/InetSocketAddress.eea
+++ b/libs/eea-java-17/src/main/resources/java/net/InetSocketAddress.eea
@@ -2,7 +2,7 @@ class java/net/InetSocketAddress
 
 createUnresolved
  (Ljava/lang/String;I)Ljava/net/InetSocketAddress;
- (Ljava/lang/String;I)Ljava/net/InetSocketAddress;
+ (Ljava/lang/String;I)L1java/net/InetSocketAddress;
 
 <init>
  (Ljava/lang/String;I)V
diff --git a/libs/eea-java-17/src/main/resources/java/net/NetworkInterface.eea b/libs/eea-java-17/src/main/resources/java/net/NetworkInterface.eea
index 5acc228d4f..0e698978a5 100644
--- a/libs/eea-java-17/src/main/resources/java/net/NetworkInterface.eea
+++ b/libs/eea-java-17/src/main/resources/java/net/NetworkInterface.eea
@@ -24,7 +24,7 @@ getDisplayName
  ()Ljava/lang/String;
 getHardwareAddress
  ()[B
- ()[B
+ ()[0B
 getInetAddresses
  ()Ljava/util/Enumeration<Ljava/net/InetAddress;>;
  ()Ljava/util/Enumeration<Ljava/net/InetAddress;>;
diff --git a/libs/eea-java-17/src/main/resources/java/net/ServerSocket.eea b/libs/eea-java-17/src/main/resources/java/net/ServerSocket.eea
index e7dda1c6df..836d768000 100644
--- a/libs/eea-java-17/src/main/resources/java/net/ServerSocket.eea
+++ b/libs/eea-java-17/src/main/resources/java/net/ServerSocket.eea
@@ -21,13 +21,13 @@ bind
  (Ljava/net/SocketAddress;I)V
 getChannel
  ()Ljava/nio/channels/ServerSocketChannel;
- ()Ljava/nio/channels/ServerSocketChannel;
+ ()L0java/nio/channels/ServerSocketChannel;
 getInetAddress
  ()Ljava/net/InetAddress;
- ()Ljava/net/InetAddress;
+ ()L0java/net/InetAddress;
 getLocalSocketAddress
  ()Ljava/net/SocketAddress;
- ()Ljava/net/SocketAddress;
+ ()L0java/net/SocketAddress;
 getOption
  <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)TT;
  <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)TT;
diff --git a/libs/eea-java-17/src/main/resources/java/net/Socket.eea b/libs/eea-java-17/src/main/resources/java/net/Socket.eea
index 917fb41a76..dae3c41618 100644
--- a/libs/eea-java-17/src/main/resources/java/net/Socket.eea
+++ b/libs/eea-java-17/src/main/resources/java/net/Socket.eea
@@ -42,7 +42,7 @@ getChannel
  ()L0java/nio/channels/SocketChannel;
 getInetAddress
  ()Ljava/net/InetAddress;
- ()Ljava/net/InetAddress;
+ ()L0java/net/InetAddress;
 getInputStream
  ()Ljava/io/InputStream;
  ()L1java/io/InputStream;
@@ -51,7 +51,7 @@ getLocalAddress
  ()L1java/net/InetAddress;
 getLocalSocketAddress
  ()Ljava/net/SocketAddress;
- ()Ljava/net/SocketAddress;
+ ()L0java/net/SocketAddress;
 getOption
  <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)TT;
  <T:Ljava/lang/Object;>(L1java/net/SocketOption<TT;>;)TT;
@@ -60,7 +60,7 @@ getOutputStream
  ()L1java/io/OutputStream;
 getRemoteSocketAddress
  ()Ljava/net/SocketAddress;
- ()Ljava/net/SocketAddress;
+ ()L0java/net/SocketAddress;
 setOption
  <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;TT;)Ljava/net/Socket;
  <T:Ljava/lang/Object;>(L1java/net/SocketOption<TT;>;TT;)L1java/net/Socket;
diff --git a/libs/eea-java-17/src/main/resources/java/net/SocketImpl.eea b/libs/eea-java-17/src/main/resources/java/net/SocketImpl.eea
index 2541a0b5ca..6fd3a2bd45 100644
--- a/libs/eea-java-17/src/main/resources/java/net/SocketImpl.eea
+++ b/libs/eea-java-17/src/main/resources/java/net/SocketImpl.eea
@@ -33,7 +33,7 @@ getInputStream
  ()Ljava/io/InputStream;
 getOption
  <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)T1T;
 getOutputStream
  ()Ljava/io/OutputStream;
  ()Ljava/io/OutputStream;
diff --git a/libs/eea-java-17/src/main/resources/java/net/SocketImplFactory.eea b/libs/eea-java-17/src/main/resources/java/net/SocketImplFactory.eea
index 6cb49500ff..c6e0f746a1 100644
--- a/libs/eea-java-17/src/main/resources/java/net/SocketImplFactory.eea
+++ b/libs/eea-java-17/src/main/resources/java/net/SocketImplFactory.eea
@@ -2,4 +2,4 @@ class java/net/SocketImplFactory
 
 createSocketImpl
  ()Ljava/net/SocketImpl;
- ()Ljava/net/SocketImpl;
+ ()L1java/net/SocketImpl;
diff --git a/libs/eea-java-17/src/main/resources/java/net/URLClassLoader.eea b/libs/eea-java-17/src/main/resources/java/net/URLClassLoader.eea
index 718252d120..d0d7932110 100644
--- a/libs/eea-java-17/src/main/resources/java/net/URLClassLoader.eea
+++ b/libs/eea-java-17/src/main/resources/java/net/URLClassLoader.eea
@@ -39,7 +39,7 @@ findResources
  (L0java/lang/String;)L1java/util/Enumeration<L1java/net/URL;>; # @Inherited(java.lang.ClassLoader)
 getPermissions
  (Ljava/security/CodeSource;)Ljava/security/PermissionCollection;
- (Ljava/security/CodeSource;)Ljava/security/PermissionCollection;
+ (Ljava/security/CodeSource;)L1java/security/PermissionCollection; # @Inherited(java.security.SecureClassLoader)
 getResourceAsStream
  (Ljava/lang/String;)Ljava/io/InputStream;
  (L1java/lang/String;)L0java/io/InputStream; # @Inherited(java.lang.ClassLoader)
diff --git a/libs/eea-java-17/src/main/resources/java/net/URLConnection.eea b/libs/eea-java-17/src/main/resources/java/net/URLConnection.eea
index 3e23c7918f..cba94435dd 100644
--- a/libs/eea-java-17/src/main/resources/java/net/URLConnection.eea
+++ b/libs/eea-java-17/src/main/resources/java/net/URLConnection.eea
@@ -2,7 +2,7 @@ class java/net/URLConnection
 
 getDefaultRequestProperty
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getDefaultUseCaches
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
@@ -14,7 +14,7 @@ guessContentTypeFromName
  (Ljava/lang/String;)Ljava/lang/String;
 guessContentTypeFromStream
  (Ljava/io/InputStream;)Ljava/lang/String;
- (Ljava/io/InputStream;)Ljava/lang/String;
+ (Ljava/io/InputStream;)L0java/lang/String;
 setContentHandlerFactory
  (Ljava/net/ContentHandlerFactory;)V
  (Ljava/net/ContentHandlerFactory;)V
@@ -64,7 +64,7 @@ getHeaderFieldInt
  (Ljava/lang/String;I)I
 getHeaderFieldKey
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getHeaderFieldLong
  (Ljava/lang/String;J)J
  (Ljava/lang/String;J)J
@@ -85,7 +85,7 @@ getRequestProperties
  ()Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;
 getRequestProperty
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getURL
  ()Ljava/net/URL;
  ()L1java/net/URL;
diff --git a/libs/eea-java-17/src/main/resources/java/net/URLStreamHandler.eea b/libs/eea-java-17/src/main/resources/java/net/URLStreamHandler.eea
index 9be69df7e3..c6590f2784 100644
--- a/libs/eea-java-17/src/main/resources/java/net/URLStreamHandler.eea
+++ b/libs/eea-java-17/src/main/resources/java/net/URLStreamHandler.eea
@@ -17,7 +17,7 @@ openConnection
  (Ljava/net/URL;)Ljava/net/URLConnection;
 openConnection
  (Ljava/net/URL;Ljava/net/Proxy;)Ljava/net/URLConnection;
- (Ljava/net/URL;Ljava/net/Proxy;)Ljava/net/URLConnection;
+ (Ljava/net/URL;Ljava/net/Proxy;)L1java/net/URLConnection;
 parseURL
  (Ljava/net/URL;Ljava/lang/String;II)V
  (Ljava/net/URL;Ljava/lang/String;II)V
@@ -32,4 +32,4 @@ setURL
  (Ljava/net/URL;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 toExternalForm
  (Ljava/net/URL;)Ljava/lang/String;
- (Ljava/net/URL;)Ljava/lang/String;
+ (Ljava/net/URL;)L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/java/net/URLStreamHandlerFactory.eea b/libs/eea-java-17/src/main/resources/java/net/URLStreamHandlerFactory.eea
index 8f3220380d..92463e2ec7 100644
--- a/libs/eea-java-17/src/main/resources/java/net/URLStreamHandlerFactory.eea
+++ b/libs/eea-java-17/src/main/resources/java/net/URLStreamHandlerFactory.eea
@@ -2,4 +2,4 @@ class java/net/URLStreamHandlerFactory
 
 createURLStreamHandler
  (Ljava/lang/String;)Ljava/net/URLStreamHandler;
- (Ljava/lang/String;)Ljava/net/URLStreamHandler;
+ (Ljava/lang/String;)L1java/net/URLStreamHandler;
diff --git a/libs/eea-java-17/src/main/resources/java/net/UnixDomainSocketAddress.eea b/libs/eea-java-17/src/main/resources/java/net/UnixDomainSocketAddress.eea
index bcc326a02f..9e714d7924 100644
--- a/libs/eea-java-17/src/main/resources/java/net/UnixDomainSocketAddress.eea
+++ b/libs/eea-java-17/src/main/resources/java/net/UnixDomainSocketAddress.eea
@@ -5,7 +5,7 @@ of
  (Ljava/lang/String;)Ljava/net/UnixDomainSocketAddress;
 of
  (Ljava/nio/file/Path;)Ljava/net/UnixDomainSocketAddress;
- (Ljava/nio/file/Path;)Ljava/net/UnixDomainSocketAddress;
+ (Ljava/nio/file/Path;)L1java/net/UnixDomainSocketAddress;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/net/http/HttpClient.eea b/libs/eea-java-17/src/main/resources/java/net/http/HttpClient.eea
index d7ad7873a1..6e57fa2ea2 100644
--- a/libs/eea-java-17/src/main/resources/java/net/http/HttpClient.eea
+++ b/libs/eea-java-17/src/main/resources/java/net/http/HttpClient.eea
@@ -24,7 +24,7 @@ followRedirects
  ()Ljava/net/http/HttpClient$Redirect;
 newWebSocketBuilder
  ()Ljava/net/http/WebSocket$Builder;
- ()Ljava/net/http/WebSocket$Builder;
+ ()L1java/net/http/WebSocket$Builder;
 proxy
  ()Ljava/util/Optional<Ljava/net/ProxySelector;>;
  ()Ljava/util/Optional<Ljava/net/ProxySelector;>;
diff --git a/libs/eea-java-17/src/main/resources/java/net/http/HttpRequest.eea b/libs/eea-java-17/src/main/resources/java/net/http/HttpRequest.eea
index 6cfec9af18..6e1068849e 100644
--- a/libs/eea-java-17/src/main/resources/java/net/http/HttpRequest.eea
+++ b/libs/eea-java-17/src/main/resources/java/net/http/HttpRequest.eea
@@ -2,10 +2,10 @@ class java/net/http/HttpRequest
 
 newBuilder
  ()Ljava/net/http/HttpRequest$Builder;
- ()Ljava/net/http/HttpRequest$Builder;
+ ()L1java/net/http/HttpRequest$Builder;
 newBuilder
  (Ljava/net/URI;)Ljava/net/http/HttpRequest$Builder;
- (Ljava/net/URI;)Ljava/net/http/HttpRequest$Builder;
+ (Ljava/net/URI;)L1java/net/http/HttpRequest$Builder;
 newBuilder
  (Ljava/net/http/HttpRequest;Ljava/util/function/BiPredicate<Ljava/lang/String;Ljava/lang/String;>;)Ljava/net/http/HttpRequest$Builder;
  (Ljava/net/http/HttpRequest;Ljava/util/function/BiPredicate<Ljava/lang/String;Ljava/lang/String;>;)Ljava/net/http/HttpRequest$Builder;
diff --git a/libs/eea-java-17/src/main/resources/java/net/http/HttpResponse$BodySubscribers.eea b/libs/eea-java-17/src/main/resources/java/net/http/HttpResponse$BodySubscribers.eea
index 24e2632035..4b01d65c7d 100644
--- a/libs/eea-java-17/src/main/resources/java/net/http/HttpResponse$BodySubscribers.eea
+++ b/libs/eea-java-17/src/main/resources/java/net/http/HttpResponse$BodySubscribers.eea
@@ -2,10 +2,10 @@ class java/net/http/HttpResponse$BodySubscribers
 
 buffering
  <T:Ljava/lang/Object;>(Ljava/net/http/HttpResponse$BodySubscriber<TT;>;I)Ljava/net/http/HttpResponse$BodySubscriber<TT;>;
- <T:Ljava/lang/Object;>(Ljava/net/http/HttpResponse$BodySubscriber<TT;>;I)Ljava/net/http/HttpResponse$BodySubscriber<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/net/http/HttpResponse$BodySubscriber<TT;>;I)L1java/net/http/HttpResponse$BodySubscriber<TT;>;
 discarding
  ()Ljava/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
- ()Ljava/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
+ ()L1java/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
 fromLineSubscriber
  (Ljava/util/concurrent/Flow$Subscriber<-Ljava/lang/String;>;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
  (Ljava/util/concurrent/Flow$Subscriber<-Ljava/lang/String;>;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
@@ -17,16 +17,16 @@ fromSubscriber
  (Ljava/util/concurrent/Flow$Subscriber<-Ljava/util/List<Ljava/nio/ByteBuffer;>;>;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
 fromSubscriber
  <S::Ljava/util/concurrent/Flow$Subscriber<-Ljava/util/List<Ljava/nio/ByteBuffer;>;>;T:Ljava/lang/Object;>(TS;Ljava/util/function/Function<-TS;+TT;>;)Ljava/net/http/HttpResponse$BodySubscriber<TT;>;
- <S::Ljava/util/concurrent/Flow$Subscriber<-Ljava/util/List<Ljava/nio/ByteBuffer;>;>;T:Ljava/lang/Object;>(TS;Ljava/util/function/Function<-TS;+TT;>;)Ljava/net/http/HttpResponse$BodySubscriber<TT;>;
+ <S::Ljava/util/concurrent/Flow$Subscriber<-Ljava/util/List<Ljava/nio/ByteBuffer;>;>;T:Ljava/lang/Object;>(TS;Ljava/util/function/Function<-TS;+TT;>;)L1java/net/http/HttpResponse$BodySubscriber<TT;>;
 mapping
  <T:Ljava/lang/Object;U:Ljava/lang/Object;>(Ljava/net/http/HttpResponse$BodySubscriber<TT;>;Ljava/util/function/Function<-TT;+TU;>;)Ljava/net/http/HttpResponse$BodySubscriber<TU;>;
- <T:Ljava/lang/Object;U:Ljava/lang/Object;>(Ljava/net/http/HttpResponse$BodySubscriber<TT;>;Ljava/util/function/Function<-TT;+TU;>;)Ljava/net/http/HttpResponse$BodySubscriber<TU;>;
+ <T:Ljava/lang/Object;U:Ljava/lang/Object;>(Ljava/net/http/HttpResponse$BodySubscriber<TT;>;Ljava/util/function/Function<-TT;+TU;>;)L1java/net/http/HttpResponse$BodySubscriber<TU;>;
 ofByteArray
  ()Ljava/net/http/HttpResponse$BodySubscriber<[B>;
- ()Ljava/net/http/HttpResponse$BodySubscriber<[B>;
+ ()L1java/net/http/HttpResponse$BodySubscriber<[B>;
 ofByteArrayConsumer
  (Ljava/util/function/Consumer<Ljava/util/Optional<[B>;>;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
- (Ljava/util/function/Consumer<Ljava/util/Optional<[B>;>;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
+ (Ljava/util/function/Consumer<Ljava/util/Optional<[B>;>;)L1java/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
 ofFile
  (Ljava/nio/file/Path;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/nio/file/Path;>;
  (Ljava/nio/file/Path;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/nio/file/Path;>;
@@ -35,7 +35,7 @@ ofFile
  (Ljava/nio/file/Path;[Ljava/nio/file/OpenOption;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/nio/file/Path;>;
 ofInputStream
  ()Ljava/net/http/HttpResponse$BodySubscriber<Ljava/io/InputStream;>;
- ()Ljava/net/http/HttpResponse$BodySubscriber<Ljava/io/InputStream;>;
+ ()L1java/net/http/HttpResponse$BodySubscriber<Ljava/io/InputStream;>;
 ofLines
  (Ljava/nio/charset/Charset;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/util/stream/Stream<Ljava/lang/String;>;>;
  (Ljava/nio/charset/Charset;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/util/stream/Stream<Ljava/lang/String;>;>;
@@ -47,4 +47,4 @@ ofString
  (Ljava/nio/charset/Charset;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/lang/String;>;
 replacing
  <U:Ljava/lang/Object;>(TU;)Ljava/net/http/HttpResponse$BodySubscriber<TU;>;
- <U:Ljava/lang/Object;>(TU;)Ljava/net/http/HttpResponse$BodySubscriber<TU;>;
+ <U:Ljava/lang/Object;>(TU;)L1java/net/http/HttpResponse$BodySubscriber<TU;>;
diff --git a/libs/eea-java-17/src/main/resources/java/net/http/HttpResponse$PushPromiseHandler.eea b/libs/eea-java-17/src/main/resources/java/net/http/HttpResponse$PushPromiseHandler.eea
index 936b9a2b6c..d353e41f88 100644
--- a/libs/eea-java-17/src/main/resources/java/net/http/HttpResponse$PushPromiseHandler.eea
+++ b/libs/eea-java-17/src/main/resources/java/net/http/HttpResponse$PushPromiseHandler.eea
@@ -4,7 +4,7 @@ class java/net/http/HttpResponse$PushPromiseHandler
 
 of
  <T:Ljava/lang/Object;>(Ljava/util/function/Function<Ljava/net/http/HttpRequest;Ljava/net/http/HttpResponse$BodyHandler<TT;>;>;Ljava/util/concurrent/ConcurrentMap<Ljava/net/http/HttpRequest;Ljava/util/concurrent/CompletableFuture<Ljava/net/http/HttpResponse<TT;>;>;>;)Ljava/net/http/HttpResponse$PushPromiseHandler<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/function/Function<Ljava/net/http/HttpRequest;Ljava/net/http/HttpResponse$BodyHandler<TT;>;>;Ljava/util/concurrent/ConcurrentMap<Ljava/net/http/HttpRequest;Ljava/util/concurrent/CompletableFuture<Ljava/net/http/HttpResponse<TT;>;>;>;)Ljava/net/http/HttpResponse$PushPromiseHandler<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/function/Function<Ljava/net/http/HttpRequest;Ljava/net/http/HttpResponse$BodyHandler<TT;>;>;Ljava/util/concurrent/ConcurrentMap<Ljava/net/http/HttpRequest;Ljava/util/concurrent/CompletableFuture<Ljava/net/http/HttpResponse<TT;>;>;>;)L1java/net/http/HttpResponse$PushPromiseHandler<TT;>;
 
 applyPushPromise
  (Ljava/net/http/HttpRequest;Ljava/net/http/HttpRequest;Ljava/util/function/Function<Ljava/net/http/HttpResponse$BodyHandler<TT;>;Ljava/util/concurrent/CompletableFuture<Ljava/net/http/HttpResponse<TT;>;>;>;)V
diff --git a/libs/eea-java-17/src/main/resources/java/nio/channels/Channels.eea b/libs/eea-java-17/src/main/resources/java/nio/channels/Channels.eea
index 923b2d7508..56f8111780 100644
--- a/libs/eea-java-17/src/main/resources/java/nio/channels/Channels.eea
+++ b/libs/eea-java-17/src/main/resources/java/nio/channels/Channels.eea
@@ -8,16 +8,16 @@ newChannel
  (Ljava/io/OutputStream;)Ljava/nio/channels/WritableByteChannel;
 newInputStream
  (Ljava/nio/channels/AsynchronousByteChannel;)Ljava/io/InputStream;
- (Ljava/nio/channels/AsynchronousByteChannel;)Ljava/io/InputStream;
+ (Ljava/nio/channels/AsynchronousByteChannel;)L1java/io/InputStream;
 newInputStream
  (Ljava/nio/channels/ReadableByteChannel;)Ljava/io/InputStream;
- (Ljava/nio/channels/ReadableByteChannel;)Ljava/io/InputStream;
+ (Ljava/nio/channels/ReadableByteChannel;)L1java/io/InputStream;
 newOutputStream
  (Ljava/nio/channels/AsynchronousByteChannel;)Ljava/io/OutputStream;
- (Ljava/nio/channels/AsynchronousByteChannel;)Ljava/io/OutputStream;
+ (Ljava/nio/channels/AsynchronousByteChannel;)L1java/io/OutputStream;
 newOutputStream
  (Ljava/nio/channels/WritableByteChannel;)Ljava/io/OutputStream;
- (Ljava/nio/channels/WritableByteChannel;)Ljava/io/OutputStream;
+ (Ljava/nio/channels/WritableByteChannel;)L1java/io/OutputStream;
 newReader
  (Ljava/nio/channels/ReadableByteChannel;Ljava/lang/String;)Ljava/io/Reader;
  (Ljava/nio/channels/ReadableByteChannel;Ljava/lang/String;)Ljava/io/Reader;
diff --git a/libs/eea-java-17/src/main/resources/java/nio/channels/FileLock.eea b/libs/eea-java-17/src/main/resources/java/nio/channels/FileLock.eea
index 1a65dcb231..b3d6e28504 100644
--- a/libs/eea-java-17/src/main/resources/java/nio/channels/FileLock.eea
+++ b/libs/eea-java-17/src/main/resources/java/nio/channels/FileLock.eea
@@ -11,7 +11,7 @@ acquiredBy
  ()Ljava/nio/channels/Channel;
 channel
  ()Ljava/nio/channels/FileChannel;
- ()Ljava/nio/channels/FileChannel;
+ ()L0java/nio/channels/FileChannel;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/java/nio/channels/spi/SelectorProvider.eea b/libs/eea-java-17/src/main/resources/java/nio/channels/spi/SelectorProvider.eea
index 57149bc701..b1f84c8744 100644
--- a/libs/eea-java-17/src/main/resources/java/nio/channels/spi/SelectorProvider.eea
+++ b/libs/eea-java-17/src/main/resources/java/nio/channels/spi/SelectorProvider.eea
@@ -6,7 +6,7 @@ provider
 
 inheritedChannel
  ()Ljava/nio/channels/Channel;
- ()Ljava/nio/channels/Channel;
+ ()L0java/nio/channels/Channel;
 openDatagramChannel
  ()Ljava/nio/channels/DatagramChannel;
  ()Ljava/nio/channels/DatagramChannel;
@@ -24,10 +24,10 @@ openServerSocketChannel
  ()Ljava/nio/channels/ServerSocketChannel;
 openServerSocketChannel
  (Ljava/net/ProtocolFamily;)Ljava/nio/channels/ServerSocketChannel;
- (Ljava/net/ProtocolFamily;)Ljava/nio/channels/ServerSocketChannel;
+ (Ljava/net/ProtocolFamily;)L1java/nio/channels/ServerSocketChannel;
 openSocketChannel
  ()Ljava/nio/channels/SocketChannel;
  ()Ljava/nio/channels/SocketChannel;
 openSocketChannel
  (Ljava/net/ProtocolFamily;)Ljava/nio/channels/SocketChannel;
- (Ljava/net/ProtocolFamily;)Ljava/nio/channels/SocketChannel;
+ (Ljava/net/ProtocolFamily;)L1java/nio/channels/SocketChannel;
diff --git a/libs/eea-java-17/src/main/resources/java/nio/charset/CharsetDecoder.eea b/libs/eea-java-17/src/main/resources/java/nio/charset/CharsetDecoder.eea
index 437c9ffdba..d0edf1cf5c 100644
--- a/libs/eea-java-17/src/main/resources/java/nio/charset/CharsetDecoder.eea
+++ b/libs/eea-java-17/src/main/resources/java/nio/charset/CharsetDecoder.eea
@@ -17,7 +17,7 @@ decodeLoop
  (Ljava/nio/ByteBuffer;Ljava/nio/CharBuffer;)Ljava/nio/charset/CoderResult;
 detectedCharset
  ()Ljava/nio/charset/Charset;
- ()Ljava/nio/charset/Charset;
+ ()L1java/nio/charset/Charset;
 flush
  (Ljava/nio/CharBuffer;)Ljava/nio/charset/CoderResult;
  (Ljava/nio/CharBuffer;)Ljava/nio/charset/CoderResult;
diff --git a/libs/eea-java-17/src/main/resources/java/nio/file/Files.eea b/libs/eea-java-17/src/main/resources/java/nio/file/Files.eea
index 65681ac721..98b73f8649 100644
--- a/libs/eea-java-17/src/main/resources/java/nio/file/Files.eea
+++ b/libs/eea-java-17/src/main/resources/java/nio/file/Files.eea
@@ -14,28 +14,28 @@ createDirectories
  (L1java/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createDirectory
  (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createFile
  (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createLink
  (Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;Ljava/nio/file/Path;)L1java/nio/file/Path;
 createSymbolicLink
  (Ljava/nio/file/Path;Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createTempDirectory
  (Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createTempDirectory
  (Ljava/nio/file/Path;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createTempFile
  (Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createTempFile
  (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 delete
  (Ljava/nio/file/Path;)V
  (Ljava/nio/file/Path;)V
diff --git a/libs/eea-java-17/src/main/resources/java/nio/file/attribute/AclEntry.eea b/libs/eea-java-17/src/main/resources/java/nio/file/attribute/AclEntry.eea
index ddbe0791a6..c9697f8db0 100644
--- a/libs/eea-java-17/src/main/resources/java/nio/file/attribute/AclEntry.eea
+++ b/libs/eea-java-17/src/main/resources/java/nio/file/attribute/AclEntry.eea
@@ -2,7 +2,7 @@ class java/nio/file/attribute/AclEntry
 
 newBuilder
  ()Ljava/nio/file/attribute/AclEntry$Builder;
- ()Ljava/nio/file/attribute/AclEntry$Builder;
+ ()L1java/nio/file/attribute/AclEntry$Builder;
 newBuilder
  (Ljava/nio/file/attribute/AclEntry;)Ljava/nio/file/attribute/AclEntry$Builder;
  (Ljava/nio/file/attribute/AclEntry;)Ljava/nio/file/attribute/AclEntry$Builder;
@@ -12,10 +12,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 flags
  ()Ljava/util/Set<Ljava/nio/file/attribute/AclEntryFlag;>;
- ()Ljava/util/Set<Ljava/nio/file/attribute/AclEntryFlag;>;
+ ()L1java/util/Set<Ljava/nio/file/attribute/AclEntryFlag;>;
 permissions
  ()Ljava/util/Set<Ljava/nio/file/attribute/AclEntryPermission;>;
- ()Ljava/util/Set<Ljava/nio/file/attribute/AclEntryPermission;>;
+ ()L1java/util/Set<Ljava/nio/file/attribute/AclEntryPermission;>;
 principal
  ()Ljava/nio/file/attribute/UserPrincipal;
  ()Ljava/nio/file/attribute/UserPrincipal;
diff --git a/libs/eea-java-17/src/main/resources/java/nio/file/attribute/FileTime.eea b/libs/eea-java-17/src/main/resources/java/nio/file/attribute/FileTime.eea
index 901f9872e4..22ad44270b 100644
--- a/libs/eea-java-17/src/main/resources/java/nio/file/attribute/FileTime.eea
+++ b/libs/eea-java-17/src/main/resources/java/nio/file/attribute/FileTime.eea
@@ -6,13 +6,13 @@ super java/lang/Comparable
 
 from
  (JLjava/util/concurrent/TimeUnit;)Ljava/nio/file/attribute/FileTime;
- (JLjava/util/concurrent/TimeUnit;)Ljava/nio/file/attribute/FileTime;
+ (JLjava/util/concurrent/TimeUnit;)L1java/nio/file/attribute/FileTime;
 from
  (Ljava/time/Instant;)Ljava/nio/file/attribute/FileTime;
  (Ljava/time/Instant;)Ljava/nio/file/attribute/FileTime;
 fromMillis
  (J)Ljava/nio/file/attribute/FileTime;
- (J)Ljava/nio/file/attribute/FileTime;
+ (J)L1java/nio/file/attribute/FileTime;
 
 compareTo
  (Ljava/nio/file/attribute/FileTime;)I
diff --git a/libs/eea-java-17/src/main/resources/java/nio/file/attribute/PosixFilePermissions.eea b/libs/eea-java-17/src/main/resources/java/nio/file/attribute/PosixFilePermissions.eea
index e5c13010fa..9a02f70214 100644
--- a/libs/eea-java-17/src/main/resources/java/nio/file/attribute/PosixFilePermissions.eea
+++ b/libs/eea-java-17/src/main/resources/java/nio/file/attribute/PosixFilePermissions.eea
@@ -2,10 +2,10 @@ class java/nio/file/attribute/PosixFilePermissions
 
 asFileAttribute
  (Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;)Ljava/nio/file/attribute/FileAttribute<Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;>;
- (Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;)Ljava/nio/file/attribute/FileAttribute<Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;>;
+ (Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;)L1java/nio/file/attribute/FileAttribute<Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;>;
 fromString
  (Ljava/lang/String;)Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;
  (Ljava/lang/String;)Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;
 toString
  (Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;)Ljava/lang/String;
- (Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;)Ljava/lang/String;
+ (Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;)L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/java/nio/file/spi/FileSystemProvider.eea b/libs/eea-java-17/src/main/resources/java/nio/file/spi/FileSystemProvider.eea
index 6669979310..6047dac0b7 100644
--- a/libs/eea-java-17/src/main/resources/java/nio/file/spi/FileSystemProvider.eea
+++ b/libs/eea-java-17/src/main/resources/java/nio/file/spi/FileSystemProvider.eea
@@ -51,7 +51,7 @@ move
  (Ljava/nio/file/Path;Ljava/nio/file/Path;[Ljava/nio/file/CopyOption;)V
 newAsynchronousFileChannel
  (Ljava/nio/file/Path;Ljava/util/Set<+Ljava/nio/file/OpenOption;>;Ljava/util/concurrent/ExecutorService;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/channels/AsynchronousFileChannel;
- (Ljava/nio/file/Path;Ljava/util/Set<+Ljava/nio/file/OpenOption;>;Ljava/util/concurrent/ExecutorService;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/channels/AsynchronousFileChannel;
+ (Ljava/nio/file/Path;Ljava/util/Set<+Ljava/nio/file/OpenOption;>;Ljava/util/concurrent/ExecutorService;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/channels/AsynchronousFileChannel;
 newByteChannel
  (Ljava/nio/file/Path;Ljava/util/Set<+Ljava/nio/file/OpenOption;>;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/channels/SeekableByteChannel;
  (Ljava/nio/file/Path;Ljava/util/Set<+Ljava/nio/file/OpenOption;>;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/channels/SeekableByteChannel;
@@ -60,13 +60,13 @@ newDirectoryStream
  (Ljava/nio/file/Path;Ljava/nio/file/DirectoryStream$Filter<-Ljava/nio/file/Path;>;)Ljava/nio/file/DirectoryStream<Ljava/nio/file/Path;>;
 newFileChannel
  (Ljava/nio/file/Path;Ljava/util/Set<+Ljava/nio/file/OpenOption;>;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/channels/FileChannel;
- (Ljava/nio/file/Path;Ljava/util/Set<+Ljava/nio/file/OpenOption;>;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/channels/FileChannel;
+ (Ljava/nio/file/Path;Ljava/util/Set<+Ljava/nio/file/OpenOption;>;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/channels/FileChannel;
 newFileSystem
  (Ljava/net/URI;Ljava/util/Map<Ljava/lang/String;*>;)Ljava/nio/file/FileSystem;
  (Ljava/net/URI;Ljava/util/Map<Ljava/lang/String;*>;)Ljava/nio/file/FileSystem;
 newFileSystem
  (Ljava/nio/file/Path;Ljava/util/Map<Ljava/lang/String;*>;)Ljava/nio/file/FileSystem;
- (Ljava/nio/file/Path;Ljava/util/Map<Ljava/lang/String;*>;)Ljava/nio/file/FileSystem;
+ (Ljava/nio/file/Path;Ljava/util/Map<Ljava/lang/String;*>;)L1java/nio/file/FileSystem;
 newInputStream
  (Ljava/nio/file/Path;[Ljava/nio/file/OpenOption;)Ljava/io/InputStream;
  (Ljava/nio/file/Path;[Ljava/nio/file/OpenOption;)Ljava/io/InputStream;
@@ -81,7 +81,7 @@ readAttributes
  <A::Ljava/nio/file/attribute/BasicFileAttributes;>(Ljava/nio/file/Path;Ljava/lang/Class<TA;>;[Ljava/nio/file/LinkOption;)TA;
 readSymbolicLink
  (Ljava/nio/file/Path;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;)L1java/nio/file/Path;
 setAttribute
  (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/Object;[Ljava/nio/file/LinkOption;)V
  (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/Object;[Ljava/nio/file/LinkOption;)V
diff --git a/libs/eea-java-17/src/main/resources/java/rmi/MarshalledObject.eea b/libs/eea-java-17/src/main/resources/java/rmi/MarshalledObject.eea
index 4cc4f828d4..db75ee3068 100644
--- a/libs/eea-java-17/src/main/resources/java/rmi/MarshalledObject.eea
+++ b/libs/eea-java-17/src/main/resources/java/rmi/MarshalledObject.eea
@@ -10,4 +10,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 get
  ()TT;
- ()TT;
+ ()T0T;
diff --git a/libs/eea-java-17/src/main/resources/java/rmi/registry/LocateRegistry.eea b/libs/eea-java-17/src/main/resources/java/rmi/registry/LocateRegistry.eea
index e70d3d198e..38450d435c 100644
--- a/libs/eea-java-17/src/main/resources/java/rmi/registry/LocateRegistry.eea
+++ b/libs/eea-java-17/src/main/resources/java/rmi/registry/LocateRegistry.eea
@@ -2,10 +2,10 @@ class java/rmi/registry/LocateRegistry
 
 createRegistry
  (I)Ljava/rmi/registry/Registry;
- (I)Ljava/rmi/registry/Registry;
+ (I)L1java/rmi/registry/Registry;
 createRegistry
  (ILjava/rmi/server/RMIClientSocketFactory;Ljava/rmi/server/RMIServerSocketFactory;)Ljava/rmi/registry/Registry;
- (ILjava/rmi/server/RMIClientSocketFactory;Ljava/rmi/server/RMIServerSocketFactory;)Ljava/rmi/registry/Registry;
+ (ILjava/rmi/server/RMIClientSocketFactory;Ljava/rmi/server/RMIServerSocketFactory;)L1java/rmi/registry/Registry;
 getRegistry
  ()Ljava/rmi/registry/Registry;
  ()Ljava/rmi/registry/Registry;
diff --git a/libs/eea-java-17/src/main/resources/java/rmi/server/LogStream.eea b/libs/eea-java-17/src/main/resources/java/rmi/server/LogStream.eea
index aee33be4eb..389cc10db4 100644
--- a/libs/eea-java-17/src/main/resources/java/rmi/server/LogStream.eea
+++ b/libs/eea-java-17/src/main/resources/java/rmi/server/LogStream.eea
@@ -5,7 +5,7 @@ getDefaultStream
  ()Ljava/io/PrintStream;
 log
  (Ljava/lang/String;)Ljava/rmi/server/LogStream;
- (Ljava/lang/String;)Ljava/rmi/server/LogStream;
+ (Ljava/lang/String;)L1java/rmi/server/LogStream;
 parseLevel
  (Ljava/lang/String;)I
  (Ljava/lang/String;)I
diff --git a/libs/eea-java-17/src/main/resources/java/rmi/server/ObjID.eea b/libs/eea-java-17/src/main/resources/java/rmi/server/ObjID.eea
index 37a7c46095..3eac44ce47 100644
--- a/libs/eea-java-17/src/main/resources/java/rmi/server/ObjID.eea
+++ b/libs/eea-java-17/src/main/resources/java/rmi/server/ObjID.eea
@@ -2,7 +2,7 @@ class java/rmi/server/ObjID
 
 read
  (Ljava/io/ObjectInput;)Ljava/rmi/server/ObjID;
- (Ljava/io/ObjectInput;)Ljava/rmi/server/ObjID;
+ (Ljava/io/ObjectInput;)L1java/rmi/server/ObjID;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/rmi/server/RMIClientSocketFactory.eea b/libs/eea-java-17/src/main/resources/java/rmi/server/RMIClientSocketFactory.eea
index b9e5e140b4..b825c98a8b 100644
--- a/libs/eea-java-17/src/main/resources/java/rmi/server/RMIClientSocketFactory.eea
+++ b/libs/eea-java-17/src/main/resources/java/rmi/server/RMIClientSocketFactory.eea
@@ -2,4 +2,4 @@ class java/rmi/server/RMIClientSocketFactory
 
 createSocket
  (Ljava/lang/String;I)Ljava/net/Socket;
- (Ljava/lang/String;I)Ljava/net/Socket;
+ (Ljava/lang/String;I)L1java/net/Socket;
diff --git a/libs/eea-java-17/src/main/resources/java/rmi/server/RMIServerSocketFactory.eea b/libs/eea-java-17/src/main/resources/java/rmi/server/RMIServerSocketFactory.eea
index b26406fbfd..6e702238c3 100644
--- a/libs/eea-java-17/src/main/resources/java/rmi/server/RMIServerSocketFactory.eea
+++ b/libs/eea-java-17/src/main/resources/java/rmi/server/RMIServerSocketFactory.eea
@@ -2,4 +2,4 @@ class java/rmi/server/RMIServerSocketFactory
 
 createServerSocket
  (I)Ljava/net/ServerSocket;
- (I)Ljava/net/ServerSocket;
+ (I)L1java/net/ServerSocket;
diff --git a/libs/eea-java-17/src/main/resources/java/rmi/server/RMISocketFactory.eea b/libs/eea-java-17/src/main/resources/java/rmi/server/RMISocketFactory.eea
index 1af6348b96..fcafc6408d 100644
--- a/libs/eea-java-17/src/main/resources/java/rmi/server/RMISocketFactory.eea
+++ b/libs/eea-java-17/src/main/resources/java/rmi/server/RMISocketFactory.eea
@@ -18,7 +18,7 @@ setSocketFactory
 
 createServerSocket
  (I)Ljava/net/ServerSocket;
- (I)Ljava/net/ServerSocket;
+ (I)L1java/net/ServerSocket; # @Inherited(java.rmi.server.RMIServerSocketFactory)
 createSocket
  (Ljava/lang/String;I)Ljava/net/Socket;
- (Ljava/lang/String;I)Ljava/net/Socket;
+ (Ljava/lang/String;I)L1java/net/Socket; # @Inherited(java.rmi.server.RMIClientSocketFactory)
diff --git a/libs/eea-java-17/src/main/resources/java/rmi/server/UID.eea b/libs/eea-java-17/src/main/resources/java/rmi/server/UID.eea
index c49fffc5f8..3d2dcaaacb 100644
--- a/libs/eea-java-17/src/main/resources/java/rmi/server/UID.eea
+++ b/libs/eea-java-17/src/main/resources/java/rmi/server/UID.eea
@@ -2,7 +2,7 @@ class java/rmi/server/UID
 
 read
  (Ljava/io/DataInput;)Ljava/rmi/server/UID;
- (Ljava/io/DataInput;)Ljava/rmi/server/UID;
+ (Ljava/io/DataInput;)L1java/rmi/server/UID;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/security/AccessController.eea b/libs/eea-java-17/src/main/resources/java/security/AccessController.eea
index 4f0133fa11..799f3f0129 100644
--- a/libs/eea-java-17/src/main/resources/java/security/AccessController.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/AccessController.eea
@@ -5,19 +5,19 @@ checkPermission
  (Ljava/security/Permission;)V
 doPrivileged
  <T:Ljava/lang/Object;>(Ljava/security/PrivilegedAction<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/security/PrivilegedAction<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/security/PrivilegedAction<TT;>;)T1T;
 doPrivileged
  <T:Ljava/lang/Object;>(Ljava/security/PrivilegedAction<TT;>;Ljava/security/AccessControlContext;)TT;
- <T:Ljava/lang/Object;>(Ljava/security/PrivilegedAction<TT;>;Ljava/security/AccessControlContext;)TT;
+ <T:Ljava/lang/Object;>(Ljava/security/PrivilegedAction<TT;>;Ljava/security/AccessControlContext;)T1T;
 doPrivileged
  <T:Ljava/lang/Object;>(Ljava/security/PrivilegedAction<TT;>;Ljava/security/AccessControlContext;[Ljava/security/Permission;)TT;
  <T:Ljava/lang/Object;>(Ljava/security/PrivilegedAction<TT;>;Ljava/security/AccessControlContext;[Ljava/security/Permission;)TT;
 doPrivileged
  <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;)T1T;
 doPrivileged
  <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;Ljava/security/AccessControlContext;)TT;
- <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;Ljava/security/AccessControlContext;)TT;
+ <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;Ljava/security/AccessControlContext;)T1T;
 doPrivileged
  <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;Ljava/security/AccessControlContext;[Ljava/security/Permission;)TT;
  <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;Ljava/security/AccessControlContext;[Ljava/security/Permission;)TT;
diff --git a/libs/eea-java-17/src/main/resources/java/security/CodeSource.eea b/libs/eea-java-17/src/main/resources/java/security/CodeSource.eea
index 60718c2edf..0f0ee8d4a7 100644
--- a/libs/eea-java-17/src/main/resources/java/security/CodeSource.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/CodeSource.eea
@@ -11,10 +11,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getCertificates
  ()[Ljava/security/cert/Certificate;
- ()[Ljava/security/cert/Certificate;
+ ()[0Ljava/security/cert/Certificate;
 getCodeSigners
  ()[Ljava/security/CodeSigner;
- ()[Ljava/security/CodeSigner;
+ ()[0Ljava/security/CodeSigner;
 getLocation
  ()Ljava/net/URL;
  ()Ljava/net/URL;
diff --git a/libs/eea-java-17/src/main/resources/java/security/DomainLoadStoreParameter.eea b/libs/eea-java-17/src/main/resources/java/security/DomainLoadStoreParameter.eea
index 0d426ae789..12a3f2f652 100644
--- a/libs/eea-java-17/src/main/resources/java/security/DomainLoadStoreParameter.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/DomainLoadStoreParameter.eea
@@ -8,7 +8,7 @@ getConfiguration
  ()Ljava/net/URI;
 getProtectionParameter
  ()Ljava/security/KeyStore$ProtectionParameter;
- ()Ljava/security/KeyStore$ProtectionParameter;
+ ()L0java/security/KeyStore$ProtectionParameter;
 getProtectionParams
  ()Ljava/util/Map<Ljava/lang/String;Ljava/security/KeyStore$ProtectionParameter;>;
  ()Ljava/util/Map<Ljava/lang/String;Ljava/security/KeyStore$ProtectionParameter;>;
diff --git a/libs/eea-java-17/src/main/resources/java/security/DrbgParameters.eea b/libs/eea-java-17/src/main/resources/java/security/DrbgParameters.eea
index ae2734e3f0..db4494e05f 100644
--- a/libs/eea-java-17/src/main/resources/java/security/DrbgParameters.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/DrbgParameters.eea
@@ -2,10 +2,10 @@ class java/security/DrbgParameters
 
 instantiation
  (ILjava/security/DrbgParameters$Capability;[B)Ljava/security/DrbgParameters$Instantiation;
- (ILjava/security/DrbgParameters$Capability;[B)Ljava/security/DrbgParameters$Instantiation;
+ (ILjava/security/DrbgParameters$Capability;[B)L1java/security/DrbgParameters$Instantiation;
 nextBytes
  (IZ[B)Ljava/security/DrbgParameters$NextBytes;
- (IZ[B)Ljava/security/DrbgParameters$NextBytes;
+ (IZ[B)L1java/security/DrbgParameters$NextBytes;
 reseed
  (Z[B)Ljava/security/DrbgParameters$Reseed;
- (Z[B)Ljava/security/DrbgParameters$Reseed;
+ (Z[B)L1java/security/DrbgParameters$Reseed;
diff --git a/libs/eea-java-17/src/main/resources/java/security/Identity.eea b/libs/eea-java-17/src/main/resources/java/security/Identity.eea
index 59713a3e1e..d03aa641fa 100644
--- a/libs/eea-java-17/src/main/resources/java/security/Identity.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/Identity.eea
@@ -11,7 +11,7 @@ addCertificate
  (Ljava/security/Certificate;)V
 certificates
  ()[Ljava/security/Certificate;
- ()[Ljava/security/Certificate;
+ ()[1Ljava/security/Certificate;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -44,4 +44,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toString
  (Z)Ljava/lang/String;
- (Z)Ljava/lang/String;
+ (Z)L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/java/security/KeyStore$Builder.eea b/libs/eea-java-17/src/main/resources/java/security/KeyStore$Builder.eea
index cf1a20e5e8..5bc87a68b6 100644
--- a/libs/eea-java-17/src/main/resources/java/security/KeyStore$Builder.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/KeyStore$Builder.eea
@@ -5,13 +5,13 @@ newInstance
  (Ljava/io/File;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Builder;
 newInstance
  (Ljava/lang/String;Ljava/security/Provider;Ljava/io/File;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Builder;
- (Ljava/lang/String;Ljava/security/Provider;Ljava/io/File;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Builder;
+ (Ljava/lang/String;Ljava/security/Provider;Ljava/io/File;Ljava/security/KeyStore$ProtectionParameter;)L1java/security/KeyStore$Builder;
 newInstance
  (Ljava/lang/String;Ljava/security/Provider;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Builder;
- (Ljava/lang/String;Ljava/security/Provider;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Builder;
+ (Ljava/lang/String;Ljava/security/Provider;Ljava/security/KeyStore$ProtectionParameter;)L1java/security/KeyStore$Builder;
 newInstance
  (Ljava/security/KeyStore;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Builder;
- (Ljava/security/KeyStore;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Builder;
+ (Ljava/security/KeyStore;Ljava/security/KeyStore$ProtectionParameter;)L1java/security/KeyStore$Builder;
 
 getKeyStore
  ()Ljava/security/KeyStore;
diff --git a/libs/eea-java-17/src/main/resources/java/security/KeyStoreSpi.eea b/libs/eea-java-17/src/main/resources/java/security/KeyStoreSpi.eea
index 577b1097ff..edab673d60 100644
--- a/libs/eea-java-17/src/main/resources/java/security/KeyStoreSpi.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/KeyStoreSpi.eea
@@ -26,7 +26,7 @@ engineGetCreationDate
  (Ljava/lang/String;)Ljava/util/Date;
 engineGetEntry
  (Ljava/lang/String;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Entry;
- (Ljava/lang/String;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Entry;
+ (Ljava/lang/String;Ljava/security/KeyStore$ProtectionParameter;)L0java/security/KeyStore$Entry;
 engineGetKey
  (Ljava/lang/String;[C)Ljava/security/Key;
  (Ljava/lang/String;[C)Ljava/security/Key;
diff --git a/libs/eea-java-17/src/main/resources/java/security/Permissions.eea b/libs/eea-java-17/src/main/resources/java/security/Permissions.eea
index cbe0395782..375680e40c 100644
--- a/libs/eea-java-17/src/main/resources/java/security/Permissions.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/Permissions.eea
@@ -5,7 +5,7 @@ add
  (Ljava/security/Permission;)V
 elements
  ()Ljava/util/Enumeration<Ljava/security/Permission;>;
- ()Ljava/util/Enumeration<Ljava/security/Permission;>;
+ ()L1java/util/Enumeration<Ljava/security/Permission;>;
 implies
  (Ljava/security/Permission;)Z
  (Ljava/security/Permission;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/security/Policy.eea b/libs/eea-java-17/src/main/resources/java/security/Policy.eea
index c4aae6ca79..8eaf60592f 100644
--- a/libs/eea-java-17/src/main/resources/java/security/Policy.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/Policy.eea
@@ -22,19 +22,19 @@ setPolicy
 
 getParameters
  ()Ljava/security/Policy$Parameters;
- ()Ljava/security/Policy$Parameters;
+ ()L0java/security/Policy$Parameters;
 getPermissions
  (Ljava/security/CodeSource;)Ljava/security/PermissionCollection;
  (Ljava/security/CodeSource;)Ljava/security/PermissionCollection;
 getPermissions
  (Ljava/security/ProtectionDomain;)Ljava/security/PermissionCollection;
- (Ljava/security/ProtectionDomain;)Ljava/security/PermissionCollection;
+ (Ljava/security/ProtectionDomain;)L1java/security/PermissionCollection;
 getProvider
  ()Ljava/security/Provider;
- ()Ljava/security/Provider;
+ ()L0java/security/Provider;
 getType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 implies
  (Ljava/security/ProtectionDomain;Ljava/security/Permission;)Z
  (Ljava/security/ProtectionDomain;Ljava/security/Permission;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/security/Provider.eea b/libs/eea-java-17/src/main/resources/java/security/Provider.eea
index c71de0867e..b0aad14c24 100644
--- a/libs/eea-java-17/src/main/resources/java/security/Provider.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/Provider.eea
@@ -17,7 +17,7 @@ computeIfPresent
  (Ljava/lang/Object;Ljava/util/function/BiFunction<-Ljava/lang/Object;-Ljava/lang/Object;+Ljava/lang/Object;>;)Ljava/lang/Object;
 configure
  (Ljava/lang/String;)Ljava/security/Provider;
- (Ljava/lang/String;)Ljava/security/Provider;
+ (Ljava/lang/String;)L1java/security/Provider;
 elements
  ()Ljava/util/Enumeration<Ljava/lang/Object;>;
  ()L1java/util/Enumeration<L1java/lang/Object;>; # @Inherited(java.util.Properties)
diff --git a/libs/eea-java-17/src/main/resources/java/security/SecureClassLoader.eea b/libs/eea-java-17/src/main/resources/java/security/SecureClassLoader.eea
index b0c532de6b..86ee4db83e 100644
--- a/libs/eea-java-17/src/main/resources/java/security/SecureClassLoader.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/SecureClassLoader.eea
@@ -14,4 +14,4 @@ defineClass
  (Ljava/lang/String;[BIILjava/security/CodeSource;)Ljava/lang/Class<*>;
 getPermissions
  (Ljava/security/CodeSource;)Ljava/security/PermissionCollection;
- (Ljava/security/CodeSource;)Ljava/security/PermissionCollection;
+ (Ljava/security/CodeSource;)L1java/security/PermissionCollection;
diff --git a/libs/eea-java-17/src/main/resources/java/security/SecureRandomSpi.eea b/libs/eea-java-17/src/main/resources/java/security/SecureRandomSpi.eea
index 684ac17c94..3ab73a8f4e 100644
--- a/libs/eea-java-17/src/main/resources/java/security/SecureRandomSpi.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/SecureRandomSpi.eea
@@ -8,7 +8,7 @@ engineGenerateSeed
  (I)[B
 engineGetParameters
  ()Ljava/security/SecureRandomParameters;
- ()Ljava/security/SecureRandomParameters;
+ ()L0java/security/SecureRandomParameters;
 engineNextBytes
  ([B)V
  ([B)V
diff --git a/libs/eea-java-17/src/main/resources/java/security/Security.eea b/libs/eea-java-17/src/main/resources/java/security/Security.eea
index 14b588ce68..e7cd2375e6 100644
--- a/libs/eea-java-17/src/main/resources/java/security/Security.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/Security.eea
@@ -5,7 +5,7 @@ addProvider
  (Ljava/security/Provider;)I
 getAlgorithmProperty
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L0java/lang/String;
 getAlgorithms
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
@@ -23,7 +23,7 @@ getProviders
  (Ljava/lang/String;)[Ljava/security/Provider;
 getProviders
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)[Ljava/security/Provider;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)[Ljava/security/Provider;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)[0Ljava/security/Provider;
 insertProviderAt
  (Ljava/security/Provider;I)I
  (Ljava/security/Provider;I)I
diff --git a/libs/eea-java-17/src/main/resources/java/security/SignatureSpi.eea b/libs/eea-java-17/src/main/resources/java/security/SignatureSpi.eea
index 10230a10ea..ed484886c2 100644
--- a/libs/eea-java-17/src/main/resources/java/security/SignatureSpi.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/SignatureSpi.eea
@@ -12,7 +12,7 @@ engineGetParameter
  (Ljava/lang/String;)Ljava/lang/Object;
 engineGetParameters
  ()Ljava/security/AlgorithmParameters;
- ()Ljava/security/AlgorithmParameters;
+ ()L1java/security/AlgorithmParameters;
 engineInitSign
  (Ljava/security/PrivateKey;)V
  (Ljava/security/PrivateKey;)V
diff --git a/libs/eea-java-17/src/main/resources/java/security/Timestamp.eea b/libs/eea-java-17/src/main/resources/java/security/Timestamp.eea
index 318973770e..1cb24dff41 100644
--- a/libs/eea-java-17/src/main/resources/java/security/Timestamp.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/Timestamp.eea
@@ -11,7 +11,7 @@ getSignerCertPath
  ()Ljava/security/cert/CertPath;
 getTimestamp
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L1java/util/Date;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/java/security/cert/CertPathBuilderSpi.eea b/libs/eea-java-17/src/main/resources/java/security/cert/CertPathBuilderSpi.eea
index d91c1c588f..79c06ad1b9 100644
--- a/libs/eea-java-17/src/main/resources/java/security/cert/CertPathBuilderSpi.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/cert/CertPathBuilderSpi.eea
@@ -5,4 +5,4 @@ engineBuild
  (Ljava/security/cert/CertPathParameters;)Ljava/security/cert/CertPathBuilderResult;
 engineGetRevocationChecker
  ()Ljava/security/cert/CertPathChecker;
- ()Ljava/security/cert/CertPathChecker;
+ ()L1java/security/cert/CertPathChecker;
diff --git a/libs/eea-java-17/src/main/resources/java/security/cert/CertPathValidatorSpi.eea b/libs/eea-java-17/src/main/resources/java/security/cert/CertPathValidatorSpi.eea
index f70189105e..bbb08d937f 100644
--- a/libs/eea-java-17/src/main/resources/java/security/cert/CertPathValidatorSpi.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/cert/CertPathValidatorSpi.eea
@@ -2,7 +2,7 @@ class java/security/cert/CertPathValidatorSpi
 
 engineGetRevocationChecker
  ()Ljava/security/cert/CertPathChecker;
- ()Ljava/security/cert/CertPathChecker;
+ ()L1java/security/cert/CertPathChecker;
 engineValidate
  (Ljava/security/cert/CertPath;Ljava/security/cert/CertPathParameters;)Ljava/security/cert/CertPathValidatorResult;
  (Ljava/security/cert/CertPath;Ljava/security/cert/CertPathParameters;)Ljava/security/cert/CertPathValidatorResult;
diff --git a/libs/eea-java-17/src/main/resources/java/security/cert/CertStore.eea b/libs/eea-java-17/src/main/resources/java/security/cert/CertStore.eea
index a0bc052276..b12f322e3a 100644
--- a/libs/eea-java-17/src/main/resources/java/security/cert/CertStore.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/cert/CertStore.eea
@@ -2,7 +2,7 @@ class java/security/cert/CertStore
 
 getDefaultType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getInstance
  (Ljava/lang/String;Ljava/security/cert/CertStoreParameters;)Ljava/security/cert/CertStore;
  (Ljava/lang/String;Ljava/security/cert/CertStoreParameters;)Ljava/security/cert/CertStore;
diff --git a/libs/eea-java-17/src/main/resources/java/security/cert/CertificateFactorySpi.eea b/libs/eea-java-17/src/main/resources/java/security/cert/CertificateFactorySpi.eea
index 1656ddbc73..c765e55344 100644
--- a/libs/eea-java-17/src/main/resources/java/security/cert/CertificateFactorySpi.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/cert/CertificateFactorySpi.eea
@@ -8,13 +8,13 @@ engineGenerateCRLs
  (Ljava/io/InputStream;)Ljava/util/Collection<+Ljava/security/cert/CRL;>;
 engineGenerateCertPath
  (Ljava/io/InputStream;)Ljava/security/cert/CertPath;
- (Ljava/io/InputStream;)Ljava/security/cert/CertPath;
+ (Ljava/io/InputStream;)L1java/security/cert/CertPath;
 engineGenerateCertPath
  (Ljava/io/InputStream;Ljava/lang/String;)Ljava/security/cert/CertPath;
- (Ljava/io/InputStream;Ljava/lang/String;)Ljava/security/cert/CertPath;
+ (Ljava/io/InputStream;Ljava/lang/String;)L1java/security/cert/CertPath;
 engineGenerateCertPath
  (Ljava/util/List<+Ljava/security/cert/Certificate;>;)Ljava/security/cert/CertPath;
- (Ljava/util/List<+Ljava/security/cert/Certificate;>;)Ljava/security/cert/CertPath;
+ (Ljava/util/List<+Ljava/security/cert/Certificate;>;)L1java/security/cert/CertPath;
 engineGenerateCertificate
  (Ljava/io/InputStream;)Ljava/security/cert/Certificate;
  (Ljava/io/InputStream;)Ljava/security/cert/Certificate;
@@ -23,4 +23,4 @@ engineGenerateCertificates
  (Ljava/io/InputStream;)Ljava/util/Collection<+Ljava/security/cert/Certificate;>;
 engineGetCertPathEncodings
  ()Ljava/util/Iterator<Ljava/lang/String;>;
- ()Ljava/util/Iterator<Ljava/lang/String;>;
+ ()L1java/util/Iterator<Ljava/lang/String;>;
diff --git a/libs/eea-java-17/src/main/resources/java/security/cert/CertificateRevokedException.eea b/libs/eea-java-17/src/main/resources/java/security/cert/CertificateRevokedException.eea
index 8a8156da90..9bec2fe121 100644
--- a/libs/eea-java-17/src/main/resources/java/security/cert/CertificateRevokedException.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/cert/CertificateRevokedException.eea
@@ -11,7 +11,7 @@ getExtensions
  ()Ljava/util/Map<Ljava/lang/String;Ljava/security/cert/Extension;>;
 getInvalidityDate
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L0java/util/Date;
 getMessage
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(java.lang.Throwable)
diff --git a/libs/eea-java-17/src/main/resources/java/security/cert/PKIXParameters.eea b/libs/eea-java-17/src/main/resources/java/security/cert/PKIXParameters.eea
index f86fbdd92b..0e6c12d30a 100644
--- a/libs/eea-java-17/src/main/resources/java/security/cert/PKIXParameters.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/cert/PKIXParameters.eea
@@ -23,7 +23,7 @@ getCertStores
  ()Ljava/util/List<Ljava/security/cert/CertStore;>;
 getDate
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L0java/util/Date;
 getInitialPolicies
  ()Ljava/util/Set<Ljava/lang/String;>;
  ()Ljava/util/Set<Ljava/lang/String;>;
@@ -32,7 +32,7 @@ getSigProvider
  ()Ljava/lang/String;
 getTargetCertConstraints
  ()Ljava/security/cert/CertSelector;
- ()Ljava/security/cert/CertSelector;
+ ()L0java/security/cert/CertSelector;
 getTrustAnchors
  ()Ljava/util/Set<Ljava/security/cert/TrustAnchor;>;
  ()Ljava/util/Set<Ljava/security/cert/TrustAnchor;>;
diff --git a/libs/eea-java-17/src/main/resources/java/security/cert/PKIXRevocationChecker.eea b/libs/eea-java-17/src/main/resources/java/security/cert/PKIXRevocationChecker.eea
index f5aa351552..21684f2051 100644
--- a/libs/eea-java-17/src/main/resources/java/security/cert/PKIXRevocationChecker.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/cert/PKIXRevocationChecker.eea
@@ -14,7 +14,7 @@ getOcspResponderCert
  ()Ljava/security/cert/X509Certificate;
 getOcspResponses
  ()Ljava/util/Map<Ljava/security/cert/X509Certificate;[B>;
- ()Ljava/util/Map<Ljava/security/cert/X509Certificate;[B>;
+ ()L1java/util/Map<Ljava/security/cert/X509Certificate;[B>;
 getOptions
  ()Ljava/util/Set<Ljava/security/cert/PKIXRevocationChecker$Option;>;
  ()Ljava/util/Set<Ljava/security/cert/PKIXRevocationChecker$Option;>;
diff --git a/libs/eea-java-17/src/main/resources/java/security/cert/URICertStoreParameters.eea b/libs/eea-java-17/src/main/resources/java/security/cert/URICertStoreParameters.eea
index 18999e8041..2c72cdc5c4 100644
--- a/libs/eea-java-17/src/main/resources/java/security/cert/URICertStoreParameters.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/cert/URICertStoreParameters.eea
@@ -5,7 +5,7 @@ class java/security/cert/URICertStoreParameters
  (Ljava/net/URI;)V
 clone
  ()Ljava/security/cert/URICertStoreParameters;
- ()Ljava/security/cert/URICertStoreParameters;
+ ()L1java/security/cert/URICertStoreParameters;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/java/security/cert/X509CRL.eea b/libs/eea-java-17/src/main/resources/java/security/cert/X509CRL.eea
index 1fd24153a7..269b4b10ef 100644
--- a/libs/eea-java-17/src/main/resources/java/security/cert/X509CRL.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/cert/X509CRL.eea
@@ -20,7 +20,7 @@ getRevokedCertificate
  (Ljava/math/BigInteger;)Ljava/security/cert/X509CRLEntry;
 getRevokedCertificate
  (Ljava/security/cert/X509Certificate;)Ljava/security/cert/X509CRLEntry;
- (Ljava/security/cert/X509Certificate;)Ljava/security/cert/X509CRLEntry;
+ (Ljava/security/cert/X509Certificate;)L0java/security/cert/X509CRLEntry;
 getRevokedCertificates
  ()Ljava/util/Set<+Ljava/security/cert/X509CRLEntry;>;
  ()Ljava/util/Set<+Ljava/security/cert/X509CRLEntry;>;
diff --git a/libs/eea-java-17/src/main/resources/java/security/cert/X509CRLEntry.eea b/libs/eea-java-17/src/main/resources/java/security/cert/X509CRLEntry.eea
index 4dcdd40744..cc7a3a2edc 100644
--- a/libs/eea-java-17/src/main/resources/java/security/cert/X509CRLEntry.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/cert/X509CRLEntry.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getCertificateIssuer
  ()Ljavax/security/auth/x500/X500Principal;
- ()Ljavax/security/auth/x500/X500Principal;
+ ()L0javax/security/auth/x500/X500Principal;
 getEncoded
  ()[B
  ()[B
@@ -14,7 +14,7 @@ getRevocationDate
  ()Ljava/util/Date;
 getRevocationReason
  ()Ljava/security/cert/CRLReason;
- ()Ljava/security/cert/CRLReason;
+ ()L0java/security/cert/CRLReason;
 getSerialNumber
  ()Ljava/math/BigInteger;
  ()Ljava/math/BigInteger;
diff --git a/libs/eea-java-17/src/main/resources/java/security/cert/X509CRLSelector.eea b/libs/eea-java-17/src/main/resources/java/security/cert/X509CRLSelector.eea
index b90efd4a6f..1a21985dc4 100644
--- a/libs/eea-java-17/src/main/resources/java/security/cert/X509CRLSelector.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/cert/X509CRLSelector.eea
@@ -17,13 +17,13 @@ getCertificateChecking
  ()Ljava/security/cert/X509Certificate;
 getDateAndTime
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L0java/util/Date;
 getIssuerNames
  ()Ljava/util/Collection<Ljava/lang/Object;>;
- ()Ljava/util/Collection<Ljava/lang/Object;>;
+ ()L0java/util/Collection<Ljava/lang/Object;>;
 getIssuers
  ()Ljava/util/Collection<Ljavax/security/auth/x500/X500Principal;>;
- ()Ljava/util/Collection<Ljavax/security/auth/x500/X500Principal;>;
+ ()L0java/util/Collection<Ljavax/security/auth/x500/X500Principal;>;
 getMaxCRL
  ()Ljava/math/BigInteger;
  ()Ljava/math/BigInteger;
diff --git a/libs/eea-java-17/src/main/resources/java/security/cert/X509CertSelector.eea b/libs/eea-java-17/src/main/resources/java/security/cert/X509CertSelector.eea
index 84ad24e969..5226bc7dd2 100644
--- a/libs/eea-java-17/src/main/resources/java/security/cert/X509CertSelector.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/cert/X509CertSelector.eea
@@ -17,13 +17,13 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 getAuthorityKeyIdentifier
  ()[B
- ()[B
+ ()[0B
 getCertificate
  ()Ljava/security/cert/X509Certificate;
  ()Ljava/security/cert/X509Certificate;
 getCertificateValid
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L0java/util/Date;
 getExtendedKeyUsage
  ()Ljava/util/Set<Ljava/lang/String;>;
  ()Ljava/util/Set<Ljava/lang/String;>;
@@ -38,19 +38,19 @@ getIssuerAsString
  ()Ljava/lang/String;
 getKeyUsage
  ()[Z
- ()[Z
+ ()[0Z
 getNameConstraints
  ()[B
- ()[B
+ ()[0B
 getPathToNames
  ()Ljava/util/Collection<Ljava/util/List<*>;>;
- ()Ljava/util/Collection<Ljava/util/List<*>;>;
+ ()L0java/util/Collection<Ljava/util/List<*>;>;
 getPolicy
  ()Ljava/util/Set<Ljava/lang/String;>;
  ()Ljava/util/Set<Ljava/lang/String;>;
 getPrivateKeyValid
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L0java/util/Date;
 getSerialNumber
  ()Ljava/math/BigInteger;
  ()Ljava/math/BigInteger;
@@ -59,7 +59,7 @@ getSubject
  ()Ljavax/security/auth/x500/X500Principal;
 getSubjectAlternativeNames
  ()Ljava/util/Collection<Ljava/util/List<*>;>;
- ()Ljava/util/Collection<Ljava/util/List<*>;>;
+ ()L0java/util/Collection<Ljava/util/List<*>;>;
 getSubjectAsBytes
  ()[B
  ()[B
@@ -68,13 +68,13 @@ getSubjectAsString
  ()Ljava/lang/String;
 getSubjectKeyIdentifier
  ()[B
- ()[B
+ ()[0B
 getSubjectPublicKey
  ()Ljava/security/PublicKey;
  ()Ljava/security/PublicKey;
 getSubjectPublicKeyAlgID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 match
  (Ljava/security/cert/Certificate;)Z
  (Ljava/security/cert/Certificate;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/security/interfaces/RSAKey.eea b/libs/eea-java-17/src/main/resources/java/security/interfaces/RSAKey.eea
index 1c5af2c06f..315113ee92 100644
--- a/libs/eea-java-17/src/main/resources/java/security/interfaces/RSAKey.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/interfaces/RSAKey.eea
@@ -5,4 +5,4 @@ getModulus
  ()Ljava/math/BigInteger;
 getParams
  ()Ljava/security/spec/AlgorithmParameterSpec;
- ()Ljava/security/spec/AlgorithmParameterSpec;
+ ()L0java/security/spec/AlgorithmParameterSpec;
diff --git a/libs/eea-java-17/src/main/resources/java/security/spec/ECFieldF2m.eea b/libs/eea-java-17/src/main/resources/java/security/spec/ECFieldF2m.eea
index 57805fcc69..15b9a8a6de 100644
--- a/libs/eea-java-17/src/main/resources/java/security/spec/ECFieldF2m.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/spec/ECFieldF2m.eea
@@ -11,7 +11,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getMidTermsOfReductionPolynomial
  ()[I
- ()[I
+ ()[0I
 getReductionPolynomial
  ()Ljava/math/BigInteger;
  ()Ljava/math/BigInteger;
diff --git a/libs/eea-java-17/src/main/resources/java/security/spec/EllipticCurve.eea b/libs/eea-java-17/src/main/resources/java/security/spec/EllipticCurve.eea
index dce676208d..eb4facee83 100644
--- a/libs/eea-java-17/src/main/resources/java/security/spec/EllipticCurve.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/spec/EllipticCurve.eea
@@ -20,4 +20,4 @@ getField
  ()Ljava/security/spec/ECField;
 getSeed
  ()[B
- ()[B
+ ()[0B
diff --git a/libs/eea-java-17/src/main/resources/java/security/spec/PKCS8EncodedKeySpec.eea b/libs/eea-java-17/src/main/resources/java/security/spec/PKCS8EncodedKeySpec.eea
index 66dda9eba6..78980c657b 100644
--- a/libs/eea-java-17/src/main/resources/java/security/spec/PKCS8EncodedKeySpec.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/spec/PKCS8EncodedKeySpec.eea
@@ -11,4 +11,4 @@ getEncoded
  ()[B
 getFormat
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.eea b/libs/eea-java-17/src/main/resources/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.eea
index e58064e6d3..94da7d4b87 100644
--- a/libs/eea-java-17/src/main/resources/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.eea
@@ -11,7 +11,7 @@ getCrtCoefficient
  ()Ljava/math/BigInteger;
 getOtherPrimeInfo
  ()[Ljava/security/spec/RSAOtherPrimeInfo;
- ()[Ljava/security/spec/RSAOtherPrimeInfo;
+ ()[0Ljava/security/spec/RSAOtherPrimeInfo;
 getPrimeExponentP
  ()Ljava/math/BigInteger;
  ()Ljava/math/BigInteger;
diff --git a/libs/eea-java-17/src/main/resources/java/security/spec/X509EncodedKeySpec.eea b/libs/eea-java-17/src/main/resources/java/security/spec/X509EncodedKeySpec.eea
index 3b812927c4..927518d19d 100644
--- a/libs/eea-java-17/src/main/resources/java/security/spec/X509EncodedKeySpec.eea
+++ b/libs/eea-java-17/src/main/resources/java/security/spec/X509EncodedKeySpec.eea
@@ -11,4 +11,4 @@ getEncoded
  ()[B
 getFormat
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/java/sql/Connection.eea b/libs/eea-java-17/src/main/resources/java/sql/Connection.eea
index 1c96decc0f..35e3dcc29a 100644
--- a/libs/eea-java-17/src/main/resources/java/sql/Connection.eea
+++ b/libs/eea-java-17/src/main/resources/java/sql/Connection.eea
@@ -5,31 +5,31 @@ abort
  (Ljava/util/concurrent/Executor;)V
 createArrayOf
  (Ljava/lang/String;[Ljava/lang/Object;)Ljava/sql/Array;
- (Ljava/lang/String;[Ljava/lang/Object;)Ljava/sql/Array;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1java/sql/Array;
 createBlob
  ()Ljava/sql/Blob;
- ()Ljava/sql/Blob;
+ ()L1java/sql/Blob;
 createClob
  ()Ljava/sql/Clob;
- ()Ljava/sql/Clob;
+ ()L1java/sql/Clob;
 createNClob
  ()Ljava/sql/NClob;
- ()Ljava/sql/NClob;
+ ()L1java/sql/NClob;
 createSQLXML
  ()Ljava/sql/SQLXML;
- ()Ljava/sql/SQLXML;
+ ()L1java/sql/SQLXML;
 createStatement
  ()Ljava/sql/Statement;
- ()Ljava/sql/Statement;
+ ()L1java/sql/Statement;
 createStatement
  (II)Ljava/sql/Statement;
- (II)Ljava/sql/Statement;
+ (II)L1java/sql/Statement;
 createStatement
  (III)Ljava/sql/Statement;
- (III)Ljava/sql/Statement;
+ (III)L1java/sql/Statement;
 createStruct
  (Ljava/lang/String;[Ljava/lang/Object;)Ljava/sql/Struct;
- (Ljava/lang/String;[Ljava/lang/Object;)Ljava/sql/Struct;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1java/sql/Struct;
 getCatalog
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/java/sql/JDBCType.eea b/libs/eea-java-17/src/main/resources/java/sql/JDBCType.eea
index 1c2fd70909..024a70f9fc 100644
--- a/libs/eea-java-17/src/main/resources/java/sql/JDBCType.eea
+++ b/libs/eea-java-17/src/main/resources/java/sql/JDBCType.eea
@@ -13,7 +13,7 @@ getName
  ()Ljava/lang/String;
 getVendor
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getVendorTypeNumber
  ()Ljava/lang/Integer;
  ()Ljava/lang/Integer;
diff --git a/libs/eea-java-17/src/main/resources/java/sql/SQLException.eea b/libs/eea-java-17/src/main/resources/java/sql/SQLException.eea
index 7f26b22799..b19860c2cd 100644
--- a/libs/eea-java-17/src/main/resources/java/sql/SQLException.eea
+++ b/libs/eea-java-17/src/main/resources/java/sql/SQLException.eea
@@ -33,7 +33,7 @@ getSQLState
  ()Ljava/lang/String;
 iterator
  ()Ljava/util/Iterator<Ljava/lang/Throwable;>;
- ()Ljava/util/Iterator<Ljava/lang/Throwable;>;
+ ()L1java/util/Iterator<Ljava/lang/Throwable;>;
 setNextException
  (Ljava/sql/SQLException;)V
  (Ljava/sql/SQLException;)V
diff --git a/libs/eea-java-17/src/main/resources/java/sql/SQLInput.eea b/libs/eea-java-17/src/main/resources/java/sql/SQLInput.eea
index 8419254679..e61c166ed3 100644
--- a/libs/eea-java-17/src/main/resources/java/sql/SQLInput.eea
+++ b/libs/eea-java-17/src/main/resources/java/sql/SQLInput.eea
@@ -38,7 +38,7 @@ readObject
  ()L1java/lang/Object;
 readObject
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)T1T;
 readRef
  ()Ljava/sql/Ref;
  ()Ljava/sql/Ref;
diff --git a/libs/eea-java-17/src/main/resources/java/sql/Statement.eea b/libs/eea-java-17/src/main/resources/java/sql/Statement.eea
index 5ff613b2ec..602d7d1e5e 100644
--- a/libs/eea-java-17/src/main/resources/java/sql/Statement.eea
+++ b/libs/eea-java-17/src/main/resources/java/sql/Statement.eea
@@ -8,10 +8,10 @@ enquoteIdentifier
  (Ljava/lang/String;Z)Ljava/lang/String;
 enquoteLiteral
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 enquoteNCharLiteral
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 execute
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
@@ -29,7 +29,7 @@ executeBatch
  ()[I
 executeLargeBatch
  ()[J
- ()[J
+ ()[1J
 executeLargeUpdate
  (Ljava/lang/String;)J
  (Ljava/lang/String;)J
diff --git a/libs/eea-java-17/src/main/resources/java/sql/Time.eea b/libs/eea-java-17/src/main/resources/java/sql/Time.eea
index c42bf92262..f998c424d4 100644
--- a/libs/eea-java-17/src/main/resources/java/sql/Time.eea
+++ b/libs/eea-java-17/src/main/resources/java/sql/Time.eea
@@ -2,10 +2,10 @@ class java/sql/Time
 
 valueOf
  (Ljava/lang/String;)Ljava/sql/Time;
- (Ljava/lang/String;)Ljava/sql/Time;
+ (Ljava/lang/String;)L1java/sql/Time;
 valueOf
  (Ljava/time/LocalTime;)Ljava/sql/Time;
- (Ljava/time/LocalTime;)Ljava/sql/Time;
+ (Ljava/time/LocalTime;)L1java/sql/Time;
 
 toInstant
  ()Ljava/time/Instant;
diff --git a/libs/eea-java-17/src/main/resources/java/text/AttributedString.eea b/libs/eea-java-17/src/main/resources/java/text/AttributedString.eea
index 2ddcdddf34..8821d714df 100644
--- a/libs/eea-java-17/src/main/resources/java/text/AttributedString.eea
+++ b/libs/eea-java-17/src/main/resources/java/text/AttributedString.eea
@@ -32,4 +32,4 @@ getIterator
  ([Ljava/text/AttributedCharacterIterator$Attribute;)Ljava/text/AttributedCharacterIterator;
 getIterator
  ([Ljava/text/AttributedCharacterIterator$Attribute;II)Ljava/text/AttributedCharacterIterator;
- ([Ljava/text/AttributedCharacterIterator$Attribute;II)Ljava/text/AttributedCharacterIterator;
+ ([Ljava/text/AttributedCharacterIterator$Attribute;II)L1java/text/AttributedCharacterIterator;
diff --git a/libs/eea-java-17/src/main/resources/java/text/Bidi.eea b/libs/eea-java-17/src/main/resources/java/text/Bidi.eea
index 957a28160f..d2259793c7 100644
--- a/libs/eea-java-17/src/main/resources/java/text/Bidi.eea
+++ b/libs/eea-java-17/src/main/resources/java/text/Bidi.eea
@@ -18,7 +18,7 @@ requiresBidi
  ([CI[BIII)V
 createLineBidi
  (II)Ljava/text/Bidi;
- (II)Ljava/text/Bidi;
+ (II)L1java/text/Bidi;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/java/text/ChoiceFormat.eea b/libs/eea-java-17/src/main/resources/java/text/ChoiceFormat.eea
index 33f252c86c..5a126e0153 100644
--- a/libs/eea-java-17/src/main/resources/java/text/ChoiceFormat.eea
+++ b/libs/eea-java-17/src/main/resources/java/text/ChoiceFormat.eea
@@ -35,4 +35,4 @@ setChoices
  ([D[Ljava/lang/String;)V
 toPattern
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/java/text/DecimalFormat.eea b/libs/eea-java-17/src/main/resources/java/text/DecimalFormat.eea
index 8b3d27b630..37b03b405c 100644
--- a/libs/eea-java-17/src/main/resources/java/text/DecimalFormat.eea
+++ b/libs/eea-java-17/src/main/resources/java/text/DecimalFormat.eea
@@ -35,7 +35,7 @@ getCurrency
  ()L0java/util/Currency; # @Inherited(java.text.NumberFormat)
 getDecimalFormatSymbols
  ()Ljava/text/DecimalFormatSymbols;
- ()Ljava/text/DecimalFormatSymbols;
+ ()L0java/text/DecimalFormatSymbols;
 getNegativePrefix
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/java/text/MessageFormat.eea b/libs/eea-java-17/src/main/resources/java/text/MessageFormat.eea
index 2b0f32bee3..5f63a9cf62 100644
--- a/libs/eea-java-17/src/main/resources/java/text/MessageFormat.eea
+++ b/libs/eea-java-17/src/main/resources/java/text/MessageFormat.eea
@@ -42,7 +42,7 @@ parse
  (Ljava/lang/String;)[Ljava/lang/Object;
 parse
  (Ljava/lang/String;Ljava/text/ParsePosition;)[Ljava/lang/Object;
- (Ljava/lang/String;Ljava/text/ParsePosition;)[Ljava/lang/Object;
+ (Ljava/lang/String;Ljava/text/ParsePosition;)[0Ljava/lang/Object;
 parseObject
  (Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/lang/Object;
  (L1java/lang/String;L1java/text/ParsePosition;)L0java/lang/Object; # @Inherited(java.text.Format)
diff --git a/libs/eea-java-17/src/main/resources/java/text/RuleBasedCollator.eea b/libs/eea-java-17/src/main/resources/java/text/RuleBasedCollator.eea
index bf9ecaccf2..a5357752a0 100644
--- a/libs/eea-java-17/src/main/resources/java/text/RuleBasedCollator.eea
+++ b/libs/eea-java-17/src/main/resources/java/text/RuleBasedCollator.eea
@@ -14,10 +14,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.text.Collator)
 getCollationElementIterator
  (Ljava/lang/String;)Ljava/text/CollationElementIterator;
- (Ljava/lang/String;)Ljava/text/CollationElementIterator;
+ (Ljava/lang/String;)L1java/text/CollationElementIterator;
 getCollationElementIterator
  (Ljava/text/CharacterIterator;)Ljava/text/CollationElementIterator;
- (Ljava/text/CharacterIterator;)Ljava/text/CollationElementIterator;
+ (Ljava/text/CharacterIterator;)L1java/text/CollationElementIterator;
 getCollationKey
  (Ljava/lang/String;)Ljava/text/CollationKey;
  (L0java/lang/String;)L0java/text/CollationKey; # @Inherited(java.text.Collator)
diff --git a/libs/eea-java-17/src/main/resources/java/text/SimpleDateFormat.eea b/libs/eea-java-17/src/main/resources/java/text/SimpleDateFormat.eea
index 3207e33a56..ba6af320bf 100644
--- a/libs/eea-java-17/src/main/resources/java/text/SimpleDateFormat.eea
+++ b/libs/eea-java-17/src/main/resources/java/text/SimpleDateFormat.eea
@@ -35,7 +35,7 @@ getDateFormatSymbols
  ()Ljava/text/DateFormatSymbols;
 parse
  (Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/util/Date;
- (Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/util/Date;
+ (Ljava/lang/String;Ljava/text/ParsePosition;)L0java/util/Date;
 set2DigitYearStart
  (Ljava/util/Date;)V
  (Ljava/util/Date;)V
diff --git a/libs/eea-java-17/src/main/resources/java/text/spi/NumberFormatProvider.eea b/libs/eea-java-17/src/main/resources/java/text/spi/NumberFormatProvider.eea
index 6ec0687d51..4b153f14c6 100644
--- a/libs/eea-java-17/src/main/resources/java/text/spi/NumberFormatProvider.eea
+++ b/libs/eea-java-17/src/main/resources/java/text/spi/NumberFormatProvider.eea
@@ -2,7 +2,7 @@ class java/text/spi/NumberFormatProvider
 
 getCompactNumberInstance
  (Ljava/util/Locale;Ljava/text/NumberFormat$Style;)Ljava/text/NumberFormat;
- (Ljava/util/Locale;Ljava/text/NumberFormat$Style;)Ljava/text/NumberFormat;
+ (Ljava/util/Locale;Ljava/text/NumberFormat$Style;)L1java/text/NumberFormat;
 getCurrencyInstance
  (Ljava/util/Locale;)Ljava/text/NumberFormat;
  (L1java/util/Locale;)L1java/text/NumberFormat;
diff --git a/libs/eea-java-17/src/main/resources/java/time/Clock.eea b/libs/eea-java-17/src/main/resources/java/time/Clock.eea
index a5b72115ce..400c6f0055 100644
--- a/libs/eea-java-17/src/main/resources/java/time/Clock.eea
+++ b/libs/eea-java-17/src/main/resources/java/time/Clock.eea
@@ -2,7 +2,7 @@ class java/time/Clock
 
 fixed
  (Ljava/time/Instant;Ljava/time/ZoneId;)Ljava/time/Clock;
- (Ljava/time/Instant;Ljava/time/ZoneId;)Ljava/time/Clock;
+ (Ljava/time/Instant;Ljava/time/ZoneId;)L1java/time/Clock;
 offset
  (Ljava/time/Clock;Ljava/time/Duration;)Ljava/time/Clock;
  (Ljava/time/Clock;Ljava/time/Duration;)Ljava/time/Clock;
@@ -11,7 +11,7 @@ system
  (Ljava/time/ZoneId;)Ljava/time/Clock;
 systemDefaultZone
  ()Ljava/time/Clock;
- ()Ljava/time/Clock;
+ ()L1java/time/Clock;
 systemUTC
  ()Ljava/time/Clock;
  ()Ljava/time/Clock;
@@ -20,13 +20,13 @@ tick
  (Ljava/time/Clock;Ljava/time/Duration;)Ljava/time/Clock;
 tickMillis
  (Ljava/time/ZoneId;)Ljava/time/Clock;
- (Ljava/time/ZoneId;)Ljava/time/Clock;
+ (Ljava/time/ZoneId;)L1java/time/Clock;
 tickMinutes
  (Ljava/time/ZoneId;)Ljava/time/Clock;
- (Ljava/time/ZoneId;)Ljava/time/Clock;
+ (Ljava/time/ZoneId;)L1java/time/Clock;
 tickSeconds
  (Ljava/time/ZoneId;)Ljava/time/Clock;
- (Ljava/time/ZoneId;)Ljava/time/Clock;
+ (Ljava/time/ZoneId;)L1java/time/Clock;
 
 equals
  (Ljava/lang/Object;)Z
@@ -39,4 +39,4 @@ instant
  ()Ljava/time/Instant;
 withZone
  (Ljava/time/ZoneId;)Ljava/time/Clock;
- (Ljava/time/ZoneId;)Ljava/time/Clock;
+ (Ljava/time/ZoneId;)L1java/time/Clock; # @Inherited(java.time.InstantSource)
diff --git a/libs/eea-java-17/src/main/resources/java/time/InstantSource.eea b/libs/eea-java-17/src/main/resources/java/time/InstantSource.eea
index d6ac67c235..bf69e01349 100644
--- a/libs/eea-java-17/src/main/resources/java/time/InstantSource.eea
+++ b/libs/eea-java-17/src/main/resources/java/time/InstantSource.eea
@@ -18,4 +18,4 @@ instant
  ()Ljava/time/Instant;
 withZone
  (Ljava/time/ZoneId;)Ljava/time/Clock;
- (Ljava/time/ZoneId;)Ljava/time/Clock;
+ (Ljava/time/ZoneId;)L1java/time/Clock;
diff --git a/libs/eea-java-17/src/main/resources/java/time/MonthDay.eea b/libs/eea-java-17/src/main/resources/java/time/MonthDay.eea
index f193409527..7e641c24c7 100644
--- a/libs/eea-java-17/src/main/resources/java/time/MonthDay.eea
+++ b/libs/eea-java-17/src/main/resources/java/time/MonthDay.eea
@@ -21,7 +21,7 @@ of
  (II)Ljava/time/MonthDay;
 of
  (Ljava/time/Month;I)Ljava/time/MonthDay;
- (Ljava/time/Month;I)Ljava/time/MonthDay;
+ (Ljava/time/Month;I)L1java/time/MonthDay;
 parse
  (Ljava/lang/CharSequence;)Ljava/time/MonthDay;
  (Ljava/lang/CharSequence;)Ljava/time/MonthDay;
diff --git a/libs/eea-java-17/src/main/resources/java/time/OffsetTime.eea b/libs/eea-java-17/src/main/resources/java/time/OffsetTime.eea
index 5e5eca45ee..ddb59c3553 100644
--- a/libs/eea-java-17/src/main/resources/java/time/OffsetTime.eea
+++ b/libs/eea-java-17/src/main/resources/java/time/OffsetTime.eea
@@ -25,13 +25,13 @@ now
  (Ljava/time/ZoneId;)Ljava/time/OffsetTime;
 of
  (IIIILjava/time/ZoneOffset;)Ljava/time/OffsetTime;
- (IIIILjava/time/ZoneOffset;)Ljava/time/OffsetTime;
+ (IIIILjava/time/ZoneOffset;)L1java/time/OffsetTime;
 of
  (Ljava/time/LocalTime;Ljava/time/ZoneOffset;)Ljava/time/OffsetTime;
- (Ljava/time/LocalTime;Ljava/time/ZoneOffset;)Ljava/time/OffsetTime;
+ (Ljava/time/LocalTime;Ljava/time/ZoneOffset;)L1java/time/OffsetTime;
 ofInstant
  (Ljava/time/Instant;Ljava/time/ZoneId;)Ljava/time/OffsetTime;
- (Ljava/time/Instant;Ljava/time/ZoneId;)Ljava/time/OffsetTime;
+ (Ljava/time/Instant;Ljava/time/ZoneId;)L1java/time/OffsetTime;
 parse
  (Ljava/lang/CharSequence;)Ljava/time/OffsetTime;
  (Ljava/lang/CharSequence;)Ljava/time/OffsetTime;
@@ -155,7 +155,7 @@ withOffsetSameInstant
  (Ljava/time/ZoneOffset;)Ljava/time/OffsetTime;
 withOffsetSameLocal
  (Ljava/time/ZoneOffset;)Ljava/time/OffsetTime;
- (Ljava/time/ZoneOffset;)Ljava/time/OffsetTime;
+ (Ljava/time/ZoneOffset;)L1java/time/OffsetTime;
 withSecond
  (I)Ljava/time/OffsetTime;
  (I)Ljava/time/OffsetTime;
diff --git a/libs/eea-java-17/src/main/resources/java/time/Year.eea b/libs/eea-java-17/src/main/resources/java/time/Year.eea
index 7eaa87a09f..2268b92d3d 100644
--- a/libs/eea-java-17/src/main/resources/java/time/Year.eea
+++ b/libs/eea-java-17/src/main/resources/java/time/Year.eea
@@ -18,7 +18,7 @@ now
  (Ljava/time/ZoneId;)Ljava/time/Year;
 of
  (I)Ljava/time/Year;
- (I)Ljava/time/Year;
+ (I)L1java/time/Year;
 parse
  (Ljava/lang/CharSequence;)Ljava/time/Year;
  (Ljava/lang/CharSequence;)Ljava/time/Year;
diff --git a/libs/eea-java-17/src/main/resources/java/time/YearMonth.eea b/libs/eea-java-17/src/main/resources/java/time/YearMonth.eea
index 8efc62435b..d817e6089f 100644
--- a/libs/eea-java-17/src/main/resources/java/time/YearMonth.eea
+++ b/libs/eea-java-17/src/main/resources/java/time/YearMonth.eea
@@ -18,7 +18,7 @@ now
  (Ljava/time/ZoneId;)Ljava/time/YearMonth;
 of
  (II)Ljava/time/YearMonth;
- (II)Ljava/time/YearMonth;
+ (II)L1java/time/YearMonth;
 of
  (ILjava/time/Month;)Ljava/time/YearMonth;
  (ILjava/time/Month;)Ljava/time/YearMonth;
diff --git a/libs/eea-java-17/src/main/resources/java/time/chrono/AbstractChronology.eea b/libs/eea-java-17/src/main/resources/java/time/chrono/AbstractChronology.eea
index 8c3b7a42d4..32687c5e72 100644
--- a/libs/eea-java-17/src/main/resources/java/time/chrono/AbstractChronology.eea
+++ b/libs/eea-java-17/src/main/resources/java/time/chrono/AbstractChronology.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 resolveDate
  (Ljava/util/Map<Ljava/time/temporal/TemporalField;Ljava/lang/Long;>;Ljava/time/format/ResolverStyle;)Ljava/time/chrono/ChronoLocalDate;
- (Ljava/util/Map<Ljava/time/temporal/TemporalField;Ljava/lang/Long;>;Ljava/time/format/ResolverStyle;)Ljava/time/chrono/ChronoLocalDate;
+ (Ljava/util/Map<Ljava/time/temporal/TemporalField;Ljava/lang/Long;>;Ljava/time/format/ResolverStyle;)L0java/time/chrono/ChronoLocalDate;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/java/time/chrono/Chronology.eea b/libs/eea-java-17/src/main/resources/java/time/chrono/Chronology.eea
index 2db0546904..73fae0ce02 100644
--- a/libs/eea-java-17/src/main/resources/java/time/chrono/Chronology.eea
+++ b/libs/eea-java-17/src/main/resources/java/time/chrono/Chronology.eea
@@ -76,7 +76,7 @@ localDateTime
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoLocalDateTime<+Ljava/time/chrono/ChronoLocalDate;>;
 period
  (III)Ljava/time/chrono/ChronoPeriod;
- (III)Ljava/time/chrono/ChronoPeriod;
+ (III)L1java/time/chrono/ChronoPeriod;
 prolepticYear
  (Ljava/time/chrono/Era;I)I
  (Ljava/time/chrono/Era;I)I
diff --git a/libs/eea-java-17/src/main/resources/java/time/chrono/IsoChronology.eea b/libs/eea-java-17/src/main/resources/java/time/chrono/IsoChronology.eea
index ad07a2dbd0..905f7260a5 100644
--- a/libs/eea-java-17/src/main/resources/java/time/chrono/IsoChronology.eea
+++ b/libs/eea-java-17/src/main/resources/java/time/chrono/IsoChronology.eea
@@ -42,10 +42,10 @@ eras
  ()Ljava/util/List<Ljava/time/chrono/Era;>;
 getCalendarType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 localDateTime
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/LocalDateTime;
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/LocalDateTime;
diff --git a/libs/eea-java-17/src/main/resources/java/time/chrono/JapaneseChronology.eea b/libs/eea-java-17/src/main/resources/java/time/chrono/JapaneseChronology.eea
index 3b3b53fbe0..ff304f1930 100644
--- a/libs/eea-java-17/src/main/resources/java/time/chrono/JapaneseChronology.eea
+++ b/libs/eea-java-17/src/main/resources/java/time/chrono/JapaneseChronology.eea
@@ -6,7 +6,7 @@ INSTANCE
 
 date
  (III)Ljava/time/chrono/JapaneseDate;
- (III)Ljava/time/chrono/JapaneseDate;
+ (III)L1java/time/chrono/JapaneseDate;
 date
  (Ljava/time/chrono/Era;III)Ljava/time/chrono/JapaneseDate;
  (Ljava/time/chrono/Era;III)Ljava/time/chrono/JapaneseDate;
@@ -15,7 +15,7 @@ date
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/JapaneseDate;
 dateEpochDay
  (J)Ljava/time/chrono/JapaneseDate;
- (J)Ljava/time/chrono/JapaneseDate;
+ (J)L1java/time/chrono/JapaneseDate;
 dateNow
  ()Ljava/time/chrono/JapaneseDate;
  ()Ljava/time/chrono/JapaneseDate;
@@ -27,7 +27,7 @@ dateNow
  (Ljava/time/ZoneId;)Ljava/time/chrono/JapaneseDate;
 dateYearDay
  (II)Ljava/time/chrono/JapaneseDate;
- (II)Ljava/time/chrono/JapaneseDate;
+ (II)L1java/time/chrono/JapaneseDate;
 dateYearDay
  (Ljava/time/chrono/Era;II)Ljava/time/chrono/JapaneseDate;
  (Ljava/time/chrono/Era;II)Ljava/time/chrono/JapaneseDate;
@@ -39,10 +39,10 @@ eras
  ()Ljava/util/List<Ljava/time/chrono/Era;>;
 getCalendarType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 localDateTime
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoLocalDateTime<Ljava/time/chrono/JapaneseDate;>;
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoLocalDateTime<Ljava/time/chrono/JapaneseDate;>;
diff --git a/libs/eea-java-17/src/main/resources/java/time/chrono/JapaneseDate.eea b/libs/eea-java-17/src/main/resources/java/time/chrono/JapaneseDate.eea
index 4c66b80baf..4a43f031b1 100644
--- a/libs/eea-java-17/src/main/resources/java/time/chrono/JapaneseDate.eea
+++ b/libs/eea-java-17/src/main/resources/java/time/chrono/JapaneseDate.eea
@@ -12,16 +12,16 @@ now
  ()Ljava/time/chrono/JapaneseDate;
 now
  (Ljava/time/Clock;)Ljava/time/chrono/JapaneseDate;
- (Ljava/time/Clock;)Ljava/time/chrono/JapaneseDate;
+ (Ljava/time/Clock;)L1java/time/chrono/JapaneseDate;
 now
  (Ljava/time/ZoneId;)Ljava/time/chrono/JapaneseDate;
  (Ljava/time/ZoneId;)Ljava/time/chrono/JapaneseDate;
 of
  (III)Ljava/time/chrono/JapaneseDate;
- (III)Ljava/time/chrono/JapaneseDate;
+ (III)L1java/time/chrono/JapaneseDate;
 of
  (Ljava/time/chrono/JapaneseEra;III)Ljava/time/chrono/JapaneseDate;
- (Ljava/time/chrono/JapaneseEra;III)Ljava/time/chrono/JapaneseDate;
+ (Ljava/time/chrono/JapaneseEra;III)L1java/time/chrono/JapaneseDate;
 
 atTime
  (Ljava/time/LocalTime;)Ljava/time/chrono/ChronoLocalDateTime<Ljava/time/chrono/JapaneseDate;>;
diff --git a/libs/eea-java-17/src/main/resources/java/time/chrono/MinguoChronology.eea b/libs/eea-java-17/src/main/resources/java/time/chrono/MinguoChronology.eea
index b4eee86463..8de444614f 100644
--- a/libs/eea-java-17/src/main/resources/java/time/chrono/MinguoChronology.eea
+++ b/libs/eea-java-17/src/main/resources/java/time/chrono/MinguoChronology.eea
@@ -15,7 +15,7 @@ date
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/MinguoDate;
 dateEpochDay
  (J)Ljava/time/chrono/MinguoDate;
- (J)Ljava/time/chrono/MinguoDate;
+ (J)L1java/time/chrono/MinguoDate;
 dateNow
  ()Ljava/time/chrono/MinguoDate;
  ()Ljava/time/chrono/MinguoDate;
@@ -39,10 +39,10 @@ eras
  ()Ljava/util/List<Ljava/time/chrono/Era;>;
 getCalendarType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 localDateTime
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoLocalDateTime<Ljava/time/chrono/MinguoDate;>;
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoLocalDateTime<Ljava/time/chrono/MinguoDate;>;
diff --git a/libs/eea-java-17/src/main/resources/java/time/chrono/MinguoDate.eea b/libs/eea-java-17/src/main/resources/java/time/chrono/MinguoDate.eea
index 6b57859b0c..975508bfd8 100644
--- a/libs/eea-java-17/src/main/resources/java/time/chrono/MinguoDate.eea
+++ b/libs/eea-java-17/src/main/resources/java/time/chrono/MinguoDate.eea
@@ -12,7 +12,7 @@ now
  ()Ljava/time/chrono/MinguoDate;
 now
  (Ljava/time/Clock;)Ljava/time/chrono/MinguoDate;
- (Ljava/time/Clock;)Ljava/time/chrono/MinguoDate;
+ (Ljava/time/Clock;)L1java/time/chrono/MinguoDate;
 now
  (Ljava/time/ZoneId;)Ljava/time/chrono/MinguoDate;
  (Ljava/time/ZoneId;)Ljava/time/chrono/MinguoDate;
diff --git a/libs/eea-java-17/src/main/resources/java/time/chrono/ThaiBuddhistChronology.eea b/libs/eea-java-17/src/main/resources/java/time/chrono/ThaiBuddhistChronology.eea
index ef1112bec4..d56569803c 100644
--- a/libs/eea-java-17/src/main/resources/java/time/chrono/ThaiBuddhistChronology.eea
+++ b/libs/eea-java-17/src/main/resources/java/time/chrono/ThaiBuddhistChronology.eea
@@ -15,7 +15,7 @@ date
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ThaiBuddhistDate;
 dateEpochDay
  (J)Ljava/time/chrono/ThaiBuddhistDate;
- (J)Ljava/time/chrono/ThaiBuddhistDate;
+ (J)L1java/time/chrono/ThaiBuddhistDate;
 dateNow
  ()Ljava/time/chrono/ThaiBuddhistDate;
  ()Ljava/time/chrono/ThaiBuddhistDate;
@@ -39,10 +39,10 @@ eras
  ()Ljava/util/List<Ljava/time/chrono/Era;>;
 getCalendarType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 localDateTime
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoLocalDateTime<Ljava/time/chrono/ThaiBuddhistDate;>;
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoLocalDateTime<Ljava/time/chrono/ThaiBuddhistDate;>;
diff --git a/libs/eea-java-17/src/main/resources/java/time/chrono/ThaiBuddhistDate.eea b/libs/eea-java-17/src/main/resources/java/time/chrono/ThaiBuddhistDate.eea
index cb6bf1a585..7dd86bc7c9 100644
--- a/libs/eea-java-17/src/main/resources/java/time/chrono/ThaiBuddhistDate.eea
+++ b/libs/eea-java-17/src/main/resources/java/time/chrono/ThaiBuddhistDate.eea
@@ -12,7 +12,7 @@ now
  ()Ljava/time/chrono/ThaiBuddhistDate;
 now
  (Ljava/time/Clock;)Ljava/time/chrono/ThaiBuddhistDate;
- (Ljava/time/Clock;)Ljava/time/chrono/ThaiBuddhistDate;
+ (Ljava/time/Clock;)L1java/time/chrono/ThaiBuddhistDate;
 now
  (Ljava/time/ZoneId;)Ljava/time/chrono/ThaiBuddhistDate;
  (Ljava/time/ZoneId;)Ljava/time/chrono/ThaiBuddhistDate;
diff --git a/libs/eea-java-17/src/main/resources/java/time/zone/ZoneOffsetTransition.eea b/libs/eea-java-17/src/main/resources/java/time/zone/ZoneOffsetTransition.eea
index 1f9c2af08b..6162a95b44 100644
--- a/libs/eea-java-17/src/main/resources/java/time/zone/ZoneOffsetTransition.eea
+++ b/libs/eea-java-17/src/main/resources/java/time/zone/ZoneOffsetTransition.eea
@@ -6,7 +6,7 @@ super java/lang/Comparable
 
 of
  (Ljava/time/LocalDateTime;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)Ljava/time/zone/ZoneOffsetTransition;
- (Ljava/time/LocalDateTime;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)Ljava/time/zone/ZoneOffsetTransition;
+ (Ljava/time/LocalDateTime;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)L1java/time/zone/ZoneOffsetTransition;
 
 compareTo
  (Ljava/time/zone/ZoneOffsetTransition;)I
diff --git a/libs/eea-java-17/src/main/resources/java/time/zone/ZoneOffsetTransitionRule$TimeDefinition.eea b/libs/eea-java-17/src/main/resources/java/time/zone/ZoneOffsetTransitionRule$TimeDefinition.eea
index 6eb215f730..7c4d2c9efd 100644
--- a/libs/eea-java-17/src/main/resources/java/time/zone/ZoneOffsetTransitionRule$TimeDefinition.eea
+++ b/libs/eea-java-17/src/main/resources/java/time/zone/ZoneOffsetTransitionRule$TimeDefinition.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 createDateTime
  (Ljava/time/LocalDateTime;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)Ljava/time/LocalDateTime;
- (Ljava/time/LocalDateTime;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)Ljava/time/LocalDateTime;
+ (Ljava/time/LocalDateTime;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)L1java/time/LocalDateTime;
diff --git a/libs/eea-java-17/src/main/resources/java/time/zone/ZoneOffsetTransitionRule.eea b/libs/eea-java-17/src/main/resources/java/time/zone/ZoneOffsetTransitionRule.eea
index 9acb487463..bcfe4cf473 100644
--- a/libs/eea-java-17/src/main/resources/java/time/zone/ZoneOffsetTransitionRule.eea
+++ b/libs/eea-java-17/src/main/resources/java/time/zone/ZoneOffsetTransitionRule.eea
@@ -2,11 +2,11 @@ class java/time/zone/ZoneOffsetTransitionRule
 
 of
  (Ljava/time/Month;ILjava/time/DayOfWeek;Ljava/time/LocalTime;ZLjava/time/zone/ZoneOffsetTransitionRule$TimeDefinition;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)Ljava/time/zone/ZoneOffsetTransitionRule;
- (Ljava/time/Month;ILjava/time/DayOfWeek;Ljava/time/LocalTime;ZLjava/time/zone/ZoneOffsetTransitionRule$TimeDefinition;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)Ljava/time/zone/ZoneOffsetTransitionRule;
+ (Ljava/time/Month;ILjava/time/DayOfWeek;Ljava/time/LocalTime;ZLjava/time/zone/ZoneOffsetTransitionRule$TimeDefinition;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)L1java/time/zone/ZoneOffsetTransitionRule;
 
 createTransition
  (I)Ljava/time/zone/ZoneOffsetTransition;
- (I)Ljava/time/zone/ZoneOffsetTransition;
+ (I)L1java/time/zone/ZoneOffsetTransition;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/java/time/zone/ZoneRules.eea b/libs/eea-java-17/src/main/resources/java/time/zone/ZoneRules.eea
index b9212bcf70..a8b2ecf535 100644
--- a/libs/eea-java-17/src/main/resources/java/time/zone/ZoneRules.eea
+++ b/libs/eea-java-17/src/main/resources/java/time/zone/ZoneRules.eea
@@ -24,7 +24,7 @@ getStandardOffset
  (Ljava/time/Instant;)Ljava/time/ZoneOffset;
 getTransition
  (Ljava/time/LocalDateTime;)Ljava/time/zone/ZoneOffsetTransition;
- (Ljava/time/LocalDateTime;)Ljava/time/zone/ZoneOffsetTransition;
+ (Ljava/time/LocalDateTime;)L0java/time/zone/ZoneOffsetTransition;
 getTransitionRules
  ()Ljava/util/List<Ljava/time/zone/ZoneOffsetTransitionRule;>;
  ()Ljava/util/List<Ljava/time/zone/ZoneOffsetTransitionRule;>;
@@ -42,10 +42,10 @@ isValidOffset
  (Ljava/time/LocalDateTime;Ljava/time/ZoneOffset;)Z
 nextTransition
  (Ljava/time/Instant;)Ljava/time/zone/ZoneOffsetTransition;
- (Ljava/time/Instant;)Ljava/time/zone/ZoneOffsetTransition;
+ (Ljava/time/Instant;)L0java/time/zone/ZoneOffsetTransition;
 previousTransition
  (Ljava/time/Instant;)Ljava/time/zone/ZoneOffsetTransition;
- (Ljava/time/Instant;)Ljava/time/zone/ZoneOffsetTransition;
+ (Ljava/time/Instant;)L0java/time/zone/ZoneOffsetTransition;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/java/util/AbstractList.eea b/libs/eea-java-17/src/main/resources/java/util/AbstractList.eea
index ce2c58c504..e8325f21df 100644
--- a/libs/eea-java-17/src/main/resources/java/util/AbstractList.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/AbstractList.eea
@@ -41,10 +41,10 @@ listIterator
  (I)L1java/util/ListIterator<TE;>; # @Inherited(java.util.List)
 remove
  (I)TE;
- (I)TE;
+ (I)T1E;
 set
  (ITE;)TE;
- (ITE;)TE;
+ (ITE;)T1E;
 subList
  (II)Ljava/util/List<TE;>;
  (II)L1java/util/List<TE;>; # @Inherited(java.util.List)
diff --git a/libs/eea-java-17/src/main/resources/java/util/AbstractMap$SimpleImmutableEntry.eea b/libs/eea-java-17/src/main/resources/java/util/AbstractMap$SimpleImmutableEntry.eea
index 154585fbc0..de45cf7163 100644
--- a/libs/eea-java-17/src/main/resources/java/util/AbstractMap$SimpleImmutableEntry.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/AbstractMap$SimpleImmutableEntry.eea
@@ -23,7 +23,7 @@ getValue
  ()TV;
 setValue
  (TV;)TV;
- (TV;)TV;
+ (TV;)T1V;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/java/util/AbstractSequentialList.eea b/libs/eea-java-17/src/main/resources/java/util/AbstractSequentialList.eea
index f048b54e30..48e661e7c2 100644
--- a/libs/eea-java-17/src/main/resources/java/util/AbstractSequentialList.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/AbstractSequentialList.eea
@@ -23,7 +23,7 @@ listIterator
  (I)L1java/util/ListIterator<TE;>; # @Inherited(java.util.AbstractList)
 remove
  (I)TE;
- (I)TE;
+ (I)T1E; # @Inherited(java.util.AbstractList)
 set
  (ITE;)TE;
- (ITE;)TE;
+ (ITE;)T1E; # @Inherited(java.util.AbstractList)
diff --git a/libs/eea-java-17/src/main/resources/java/util/ArrayList.eea b/libs/eea-java-17/src/main/resources/java/util/ArrayList.eea
index 650c240658..2fdb05a349 100644
--- a/libs/eea-java-17/src/main/resources/java/util/ArrayList.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/ArrayList.eea
@@ -56,7 +56,7 @@ listIterator
  (I)L1java/util/ListIterator<TE;>; # @Inherited(java.util.AbstractList)
 remove
  (I)TE;
- (I)TE;
+ (I)T1E; # @Inherited(java.util.AbstractList)
 remove
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z
@@ -74,7 +74,7 @@ retainAll
  (L1java/util/Collection<*>;)Z # @Inherited(java.util.AbstractCollection)
 set
  (ITE;)TE;
- (ITE;)TE;
+ (ITE;)T1E; # @Inherited(java.util.AbstractList)
 sort
  (Ljava/util/Comparator<-TE;>;)V
  (L1java/util/Comparator<-TE;>;)V # @Inherited(java.util.List)
diff --git a/libs/eea-java-17/src/main/resources/java/util/Collections.eea b/libs/eea-java-17/src/main/resources/java/util/Collections.eea
index b1b45e5f74..6a0a5aecfb 100644
--- a/libs/eea-java-17/src/main/resources/java/util/Collections.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/Collections.eea
@@ -120,7 +120,7 @@ nCopies
  <T:Ljava/lang/Object;>(ITT;)L1java/util/List<TT;>;
 newSetFromMap
  <E:Ljava/lang/Object;>(Ljava/util/Map<TE;Ljava/lang/Boolean;>;)Ljava/util/Set<TE;>;
- <E:Ljava/lang/Object;>(Ljava/util/Map<TE;Ljava/lang/Boolean;>;)Ljava/util/Set<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/util/Map<TE;Ljava/lang/Boolean;>;)L1java/util/Set<TE;>;
 replaceAll
  <T:Ljava/lang/Object;>(Ljava/util/List<TT;>;TT;TT;)Z
  <T:Ljava/lang/Object;>(Ljava/util/List<TT;>;TT;TT;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/util/Enumeration.eea b/libs/eea-java-17/src/main/resources/java/util/Enumeration.eea
index e6c64cebae..5df1626885 100644
--- a/libs/eea-java-17/src/main/resources/java/util/Enumeration.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/Enumeration.eea
@@ -4,7 +4,7 @@ class java/util/Enumeration
 
 asIterator
  ()Ljava/util/Iterator<TE;>;
- ()Ljava/util/Iterator<TE;>;
+ ()L1java/util/Iterator<TE;>;
 nextElement
  ()TE;
  ()TE;
diff --git a/libs/eea-java-17/src/main/resources/java/util/GregorianCalendar.eea b/libs/eea-java-17/src/main/resources/java/util/GregorianCalendar.eea
index d650ced547..ad84ab0c07 100644
--- a/libs/eea-java-17/src/main/resources/java/util/GregorianCalendar.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/GregorianCalendar.eea
@@ -2,7 +2,7 @@ class java/util/GregorianCalendar
 
 from
  (Ljava/time/ZonedDateTime;)Ljava/util/GregorianCalendar;
- (Ljava/time/ZonedDateTime;)Ljava/util/GregorianCalendar;
+ (Ljava/time/ZonedDateTime;)L1java/util/GregorianCalendar;
 
 <init>
  (Ljava/util/Locale;)V
@@ -24,7 +24,7 @@ getCalendarType
  ()L1java/lang/String; # @Inherited(java.util.Calendar)
 getGregorianChange
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L1java/util/Date;
 getTimeZone
  ()Ljava/util/TimeZone;
  ()L1java/util/TimeZone; # @Inherited(java.util.Calendar)
diff --git a/libs/eea-java-17/src/main/resources/java/util/HexFormat.eea b/libs/eea-java-17/src/main/resources/java/util/HexFormat.eea
index a03a1fc801..61cd8707df 100644
--- a/libs/eea-java-17/src/main/resources/java/util/HexFormat.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/HexFormat.eea
@@ -17,7 +17,7 @@ of
  ()Ljava/util/HexFormat;
 ofDelimiter
  (Ljava/lang/String;)Ljava/util/HexFormat;
- (Ljava/lang/String;)Ljava/util/HexFormat;
+ (Ljava/lang/String;)L1java/util/HexFormat;
 
 delimiter
  ()Ljava/lang/String;
@@ -30,7 +30,7 @@ formatHex
  ([B)Ljava/lang/String;
 formatHex
  ([BII)Ljava/lang/String;
- ([BII)Ljava/lang/String;
+ ([BII)L1java/lang/String;
 formatHex
  <A::Ljava/lang/Appendable;>(TA;[B)TA;
  <A::Ljava/lang/Appendable;>(TA;[B)TA;
diff --git a/libs/eea-java-17/src/main/resources/java/util/LinkedList.eea b/libs/eea-java-17/src/main/resources/java/util/LinkedList.eea
index 0ccba724a7..52d93235de 100644
--- a/libs/eea-java-17/src/main/resources/java/util/LinkedList.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/LinkedList.eea
@@ -101,7 +101,7 @@ remove
  ()T1E; # @Inherited(java.util.Deque)
 remove
  (I)TE;
- (I)TE;
+ (I)T1E; # @Inherited(java.util.AbstractSequentialList)
 remove
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z
@@ -119,7 +119,7 @@ removeLastOccurrence
  (L0java/lang/Object;)Z
 set
  (ITE;)TE;
- (ITE;)TE;
+ (ITE;)T1E; # @Inherited(java.util.AbstractSequentialList)
 spliterator
  ()Ljava/util/Spliterator<TE;>;
  ()L1java/util/Spliterator<TE;>; # @Inherited(java.util.List)
diff --git a/libs/eea-java-17/src/main/resources/java/util/Locale.eea b/libs/eea-java-17/src/main/resources/java/util/Locale.eea
index e1680a56e8..7c2c87d94c 100644
--- a/libs/eea-java-17/src/main/resources/java/util/Locale.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/Locale.eea
@@ -93,13 +93,13 @@ getDefault
  (Ljava/util/Locale$Category;)Ljava/util/Locale;
 getISOCountries
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 getISOCountries
  (Ljava/util/Locale$IsoCountryCode;)Ljava/util/Set<Ljava/lang/String;>;
  (Ljava/util/Locale$IsoCountryCode;)Ljava/util/Set<Ljava/lang/String;>;
 getISOLanguages
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 lookup
  (Ljava/util/List<Ljava/util/Locale$LanguageRange;>;Ljava/util/Collection<Ljava/util/Locale;>;)Ljava/util/Locale;
  (Ljava/util/List<Ljava/util/Locale$LanguageRange;>;Ljava/util/Collection<Ljava/util/Locale;>;)Ljava/util/Locale;
@@ -163,7 +163,7 @@ getDisplayVariant
  (Ljava/util/Locale;)Ljava/lang/String;
 getExtension
  (C)Ljava/lang/String;
- (C)Ljava/lang/String;
+ (C)L0java/lang/String;
 getExtensionKeys
  ()Ljava/util/Set<Ljava/lang/Character;>;
  ()Ljava/util/Set<Ljava/lang/Character;>;
@@ -187,7 +187,7 @@ getUnicodeLocaleKeys
  ()Ljava/util/Set<Ljava/lang/String;>;
 getUnicodeLocaleType
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getVariant
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/java/util/OptionalDouble.eea b/libs/eea-java-17/src/main/resources/java/util/OptionalDouble.eea
index 0349617271..7d6dd6e1e9 100644
--- a/libs/eea-java-17/src/main/resources/java/util/OptionalDouble.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/OptionalDouble.eea
@@ -5,7 +5,7 @@ empty
  ()Ljava/util/OptionalDouble;
 of
  (D)Ljava/util/OptionalDouble;
- (D)Ljava/util/OptionalDouble;
+ (D)L1java/util/OptionalDouble;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/util/OptionalInt.eea b/libs/eea-java-17/src/main/resources/java/util/OptionalInt.eea
index 08966f732f..01af0df917 100644
--- a/libs/eea-java-17/src/main/resources/java/util/OptionalInt.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/OptionalInt.eea
@@ -5,7 +5,7 @@ empty
  ()Ljava/util/OptionalInt;
 of
  (I)Ljava/util/OptionalInt;
- (I)Ljava/util/OptionalInt;
+ (I)L1java/util/OptionalInt;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/util/OptionalLong.eea b/libs/eea-java-17/src/main/resources/java/util/OptionalLong.eea
index 7903883b4f..3d00043d24 100644
--- a/libs/eea-java-17/src/main/resources/java/util/OptionalLong.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/OptionalLong.eea
@@ -5,7 +5,7 @@ empty
  ()Ljava/util/OptionalLong;
 of
  (J)Ljava/util/OptionalLong;
- (J)Ljava/util/OptionalLong;
+ (J)L1java/util/OptionalLong;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/util/ResourceBundle$Control.eea b/libs/eea-java-17/src/main/resources/java/util/ResourceBundle$Control.eea
index 8960df7376..9338e1b6ee 100644
--- a/libs/eea-java-17/src/main/resources/java/util/ResourceBundle$Control.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/ResourceBundle$Control.eea
@@ -19,7 +19,7 @@ getNoFallbackControl
 
 getCandidateLocales
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/util/List<Ljava/util/Locale;>;
- (Ljava/lang/String;Ljava/util/Locale;)Ljava/util/List<Ljava/util/Locale;>;
+ (Ljava/lang/String;Ljava/util/Locale;)L1java/util/List<Ljava/util/Locale;>;
 getFallbackLocale
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/util/Locale;
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/util/Locale;
@@ -34,10 +34,10 @@ needsReload
  (Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/ClassLoader;Ljava/util/ResourceBundle;J)Z
 newBundle
  (Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/ClassLoader;Z)Ljava/util/ResourceBundle;
- (Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/ClassLoader;Z)Ljava/util/ResourceBundle;
+ (Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/ClassLoader;Z)L0java/util/ResourceBundle;
 toBundleName
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
 toResourceName
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/java/util/Scanner.eea b/libs/eea-java-17/src/main/resources/java/util/Scanner.eea
index 537c2d83cb..9030e2954d 100644
--- a/libs/eea-java-17/src/main/resources/java/util/Scanner.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/Scanner.eea
@@ -60,13 +60,13 @@ findInLine
  (Ljava/lang/String;)Ljava/lang/String;
 findInLine
  (Ljava/util/regex/Pattern;)Ljava/lang/String;
- (Ljava/util/regex/Pattern;)Ljava/lang/String;
+ (Ljava/util/regex/Pattern;)L0java/lang/String;
 findWithinHorizon
  (Ljava/lang/String;I)Ljava/lang/String;
  (Ljava/lang/String;I)Ljava/lang/String;
 findWithinHorizon
  (Ljava/util/regex/Pattern;I)Ljava/lang/String;
- (Ljava/util/regex/Pattern;I)Ljava/lang/String;
+ (Ljava/util/regex/Pattern;I)L0java/lang/String;
 hasNext
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/util/ServiceLoader.eea b/libs/eea-java-17/src/main/resources/java/util/ServiceLoader.eea
index 244768ab70..96d6bfdd62 100644
--- a/libs/eea-java-17/src/main/resources/java/util/ServiceLoader.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/ServiceLoader.eea
@@ -8,23 +8,23 @@ super java/lang/Iterable
 
 load
  <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
- <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
+ <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;)L1java/util/ServiceLoader<TS;>;
 load
  <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;Ljava/lang/ClassLoader;)Ljava/util/ServiceLoader<TS;>;
- <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;Ljava/lang/ClassLoader;)Ljava/util/ServiceLoader<TS;>;
+ <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;Ljava/lang/ClassLoader;)L1java/util/ServiceLoader<TS;>;
 load
  <S:Ljava/lang/Object;>(Ljava/lang/ModuleLayer;Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
- <S:Ljava/lang/Object;>(Ljava/lang/ModuleLayer;Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
+ <S:Ljava/lang/Object;>(Ljava/lang/ModuleLayer;Ljava/lang/Class<TS;>;)L1java/util/ServiceLoader<TS;>;
 loadInstalled
  <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
- <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
+ <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;)L1java/util/ServiceLoader<TS;>;
 
 findFirst
  ()Ljava/util/Optional<TS;>;
  ()Ljava/util/Optional<TS;>;
 iterator
  ()Ljava/util/Iterator<TS;>;
- ()Ljava/util/Iterator<TS;>;
+ ()L1java/util/Iterator<TS;>;
 stream
  ()Ljava/util/stream/Stream<Ljava/util/ServiceLoader$Provider<TS;>;>;
  ()Ljava/util/stream/Stream<Ljava/util/ServiceLoader$Provider<TS;>;>;
diff --git a/libs/eea-java-17/src/main/resources/java/util/Spliterators$AbstractDoubleSpliterator.eea b/libs/eea-java-17/src/main/resources/java/util/Spliterators$AbstractDoubleSpliterator.eea
index 9cabd4a98c..f9cb99c2b3 100644
--- a/libs/eea-java-17/src/main/resources/java/util/Spliterators$AbstractDoubleSpliterator.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/Spliterators$AbstractDoubleSpliterator.eea
@@ -2,4 +2,4 @@ class java/util/Spliterators$AbstractDoubleSpliterator
 
 trySplit
  ()Ljava/util/Spliterator$OfDouble;
- ()Ljava/util/Spliterator$OfDouble;
+ ()L0java/util/Spliterator$OfDouble;
diff --git a/libs/eea-java-17/src/main/resources/java/util/Spliterators$AbstractIntSpliterator.eea b/libs/eea-java-17/src/main/resources/java/util/Spliterators$AbstractIntSpliterator.eea
index 8e485b0c41..48bbd46bcf 100644
--- a/libs/eea-java-17/src/main/resources/java/util/Spliterators$AbstractIntSpliterator.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/Spliterators$AbstractIntSpliterator.eea
@@ -2,4 +2,4 @@ class java/util/Spliterators$AbstractIntSpliterator
 
 trySplit
  ()Ljava/util/Spliterator$OfInt;
- ()Ljava/util/Spliterator$OfInt;
+ ()L0java/util/Spliterator$OfInt;
diff --git a/libs/eea-java-17/src/main/resources/java/util/Spliterators$AbstractLongSpliterator.eea b/libs/eea-java-17/src/main/resources/java/util/Spliterators$AbstractLongSpliterator.eea
index e539d33cf9..81ca6b482a 100644
--- a/libs/eea-java-17/src/main/resources/java/util/Spliterators$AbstractLongSpliterator.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/Spliterators$AbstractLongSpliterator.eea
@@ -2,4 +2,4 @@ class java/util/Spliterators$AbstractLongSpliterator
 
 trySplit
  ()Ljava/util/Spliterator$OfLong;
- ()Ljava/util/Spliterator$OfLong;
+ ()L0java/util/Spliterator$OfLong;
diff --git a/libs/eea-java-17/src/main/resources/java/util/SplittableRandom.eea b/libs/eea-java-17/src/main/resources/java/util/SplittableRandom.eea
index d97b2e40aa..3a67909a3f 100644
--- a/libs/eea-java-17/src/main/resources/java/util/SplittableRandom.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/SplittableRandom.eea
@@ -41,10 +41,10 @@ nextBytes
  ([B)V
 split
  ()Ljava/util/SplittableRandom;
- ()Ljava/util/SplittableRandom;
+ ()L1java/util/SplittableRandom;
 split
  (Ljava/util/random/RandomGenerator$SplittableGenerator;)Ljava/util/SplittableRandom;
- (Ljava/util/random/RandomGenerator$SplittableGenerator;)Ljava/util/SplittableRandom;
+ (Ljava/util/random/RandomGenerator$SplittableGenerator;)L1java/util/SplittableRandom;
 splits
  ()Ljava/util/stream/Stream<Ljava/util/random/RandomGenerator$SplittableGenerator;>;
  ()Ljava/util/stream/Stream<Ljava/util/random/RandomGenerator$SplittableGenerator;>;
diff --git a/libs/eea-java-17/src/main/resources/java/util/Vector.eea b/libs/eea-java-17/src/main/resources/java/util/Vector.eea
index 75322e68f3..4d83cbf96b 100644
--- a/libs/eea-java-17/src/main/resources/java/util/Vector.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/Vector.eea
@@ -48,7 +48,7 @@ elementAt
  (I)TE;
 elements
  ()Ljava/util/Enumeration<TE;>;
- ()Ljava/util/Enumeration<TE;>;
+ ()L1java/util/Enumeration<TE;>;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.util.AbstractList)
@@ -90,7 +90,7 @@ listIterator
  (I)L1java/util/ListIterator<TE;>; # @Inherited(java.util.AbstractList)
 remove
  (I)TE;
- (I)TE;
+ (I)T1E; # @Inherited(java.util.AbstractList)
 remove
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
@@ -111,7 +111,7 @@ retainAll
  (L1java/util/Collection<*>;)Z # @Inherited(java.util.AbstractCollection)
 set
  (ITE;)TE;
- (ITE;)TE;
+ (ITE;)T1E; # @Inherited(java.util.AbstractList)
 setElementAt
  (TE;I)V
  (TE;I)V
diff --git a/libs/eea-java-17/src/main/resources/java/util/concurrent/ConcurrentSkipListMap.eea b/libs/eea-java-17/src/main/resources/java/util/concurrent/ConcurrentSkipListMap.eea
index 7d87fa400c..778ea907ed 100644
--- a/libs/eea-java-17/src/main/resources/java/util/concurrent/ConcurrentSkipListMap.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/concurrent/ConcurrentSkipListMap.eea
@@ -38,7 +38,7 @@ computeIfAbsent
  (TK;L1java/util/function/Function<-TK;+T0V;>;)TV; # @Inherited(java.util.concurrent.ConcurrentMap)
 computeIfPresent
  (TK;Ljava/util/function/BiFunction<-TK;-TV;+TV;>;)TV;
- (TK;Ljava/util/function/BiFunction<-TK;-TV;+TV;>;)TV;
+ (TK;Ljava/util/function/BiFunction<-TK;-TV;+TV;>;)T0V;
 containsKey
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.util.AbstractMap)
@@ -107,7 +107,7 @@ lowerKey
  (TK;)TK;
 merge
  (TK;TV;Ljava/util/function/BiFunction<-TV;-TV;+TV;>;)TV;
- (TK;TV;Ljava/util/function/BiFunction<-TV;-TV;+TV;>;)TV;
+ (TK;TV;Ljava/util/function/BiFunction<-TV;-TV;+TV;>;)T0V;
 navigableKeySet
  ()Ljava/util/NavigableSet<TK;>;
  ()Ljava/util/NavigableSet<TK;>;
diff --git a/libs/eea-java-17/src/main/resources/java/util/concurrent/CountedCompleter.eea b/libs/eea-java-17/src/main/resources/java/util/concurrent/CountedCompleter.eea
index f0828ce3c1..5047da83fa 100644
--- a/libs/eea-java-17/src/main/resources/java/util/concurrent/CountedCompleter.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/concurrent/CountedCompleter.eea
@@ -23,7 +23,7 @@ getCompleter
  ()L1java/util/concurrent/CountedCompleter<*>;
 getRawResult
  ()TT;
- ()TT;
+ ()T0T;
 getRoot
  ()Ljava/util/concurrent/CountedCompleter<*>;
  ()L1java/util/concurrent/CountedCompleter<*>;
diff --git a/libs/eea-java-17/src/main/resources/java/util/concurrent/RecursiveAction.eea b/libs/eea-java-17/src/main/resources/java/util/concurrent/RecursiveAction.eea
index 1c65fb44c9..c7ecea7aa9 100644
--- a/libs/eea-java-17/src/main/resources/java/util/concurrent/RecursiveAction.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/concurrent/RecursiveAction.eea
@@ -6,7 +6,7 @@ super java/util/concurrent/ForkJoinTask
 
 getRawResult
  ()Ljava/lang/Void;
- ()Ljava/lang/Void;
+ ()L0java/lang/Void;
 setRawResult
  (Ljava/lang/Void;)V
  (Ljava/lang/Void;)V
diff --git a/libs/eea-java-17/src/main/resources/java/util/concurrent/SubmissionPublisher.eea b/libs/eea-java-17/src/main/resources/java/util/concurrent/SubmissionPublisher.eea
index de1444c084..b2f3f2d0dd 100644
--- a/libs/eea-java-17/src/main/resources/java/util/concurrent/SubmissionPublisher.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/concurrent/SubmissionPublisher.eea
@@ -17,7 +17,7 @@ closeExceptionally
  (Ljava/lang/Throwable;)V
 consume
  (Ljava/util/function/Consumer<-TT;>;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
- (Ljava/util/function/Consumer<-TT;>;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
+ (Ljava/util/function/Consumer<-TT;>;)L1java/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
 getClosedException
  ()Ljava/lang/Throwable;
  ()Ljava/lang/Throwable;
@@ -26,7 +26,7 @@ getExecutor
  ()Ljava/util/concurrent/Executor;
 getSubscribers
  ()Ljava/util/List<Ljava/util/concurrent/Flow$Subscriber<-TT;>;>;
- ()Ljava/util/List<Ljava/util/concurrent/Flow$Subscriber<-TT;>;>;
+ ()L1java/util/List<Ljava/util/concurrent/Flow$Subscriber<-TT;>;>;
 isSubscribed
  (Ljava/util/concurrent/Flow$Subscriber<-TT;>;)Z
  (Ljava/util/concurrent/Flow$Subscriber<-TT;>;)Z
diff --git a/libs/eea-java-17/src/main/resources/java/util/concurrent/atomic/AtomicLongFieldUpdater.eea b/libs/eea-java-17/src/main/resources/java/util/concurrent/atomic/AtomicLongFieldUpdater.eea
index 4c611ada19..dc901dbcc1 100644
--- a/libs/eea-java-17/src/main/resources/java/util/concurrent/atomic/AtomicLongFieldUpdater.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/concurrent/atomic/AtomicLongFieldUpdater.eea
@@ -4,7 +4,7 @@ class java/util/concurrent/atomic/AtomicLongFieldUpdater
 
 newUpdater
  <U:Ljava/lang/Object;>(Ljava/lang/Class<TU;>;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicLongFieldUpdater<TU;>;
- <U:Ljava/lang/Object;>(Ljava/lang/Class<TU;>;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicLongFieldUpdater<TU;>;
+ <U:Ljava/lang/Object;>(Ljava/lang/Class<TU;>;Ljava/lang/String;)L1java/util/concurrent/atomic/AtomicLongFieldUpdater<TU;>;
 
 accumulateAndGet
  (TT;JLjava/util/function/LongBinaryOperator;)J
diff --git a/libs/eea-java-17/src/main/resources/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.eea b/libs/eea-java-17/src/main/resources/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.eea
index 0be6e7a621..50b6cb13fc 100644
--- a/libs/eea-java-17/src/main/resources/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.eea
@@ -4,7 +4,7 @@ class java/util/concurrent/atomic/AtomicReferenceFieldUpdater
 
 newUpdater
  <U:Ljava/lang/Object;W:Ljava/lang/Object;>(Ljava/lang/Class<TU;>;Ljava/lang/Class<TW;>;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater<TU;TW;>;
- <U:Ljava/lang/Object;W:Ljava/lang/Object;>(Ljava/lang/Class<TU;>;Ljava/lang/Class<TW;>;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater<TU;TW;>;
+ <U:Ljava/lang/Object;W:Ljava/lang/Object;>(Ljava/lang/Class<TU;>;Ljava/lang/Class<TW;>;Ljava/lang/String;)L1java/util/concurrent/atomic/AtomicReferenceFieldUpdater<TU;TW;>;
 
 accumulateAndGet
  (TT;TV;Ljava/util/function/BinaryOperator<TV;>;)TV;
diff --git a/libs/eea-java-17/src/main/resources/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject.eea b/libs/eea-java-17/src/main/resources/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject.eea
index c5df9f2b64..c5b20b85a0 100644
--- a/libs/eea-java-17/src/main/resources/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject.eea
@@ -11,4 +11,4 @@ awaitUntil
  (L1java/util/Date;)Z # @Inherited(java.util.concurrent.locks.Condition)
 getWaitingThreads
  ()Ljava/util/Collection<Ljava/lang/Thread;>;
- ()Ljava/util/Collection<Ljava/lang/Thread;>;
+ ()L1java/util/Collection<Ljava/lang/Thread;>;
diff --git a/libs/eea-java-17/src/main/resources/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.eea b/libs/eea-java-17/src/main/resources/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.eea
index 21f254cffa..42ec6de71f 100644
--- a/libs/eea-java-17/src/main/resources/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.eea
@@ -2,16 +2,16 @@ class java/util/concurrent/locks/AbstractQueuedLongSynchronizer
 
 getExclusiveQueuedThreads
  ()Ljava/util/Collection<Ljava/lang/Thread;>;
- ()Ljava/util/Collection<Ljava/lang/Thread;>;
+ ()L1java/util/Collection<Ljava/lang/Thread;>;
 getFirstQueuedThread
  ()Ljava/lang/Thread;
  ()Ljava/lang/Thread;
 getQueuedThreads
  ()Ljava/util/Collection<Ljava/lang/Thread;>;
- ()Ljava/util/Collection<Ljava/lang/Thread;>;
+ ()L1java/util/Collection<Ljava/lang/Thread;>;
 getSharedQueuedThreads
  ()Ljava/util/Collection<Ljava/lang/Thread;>;
- ()Ljava/util/Collection<Ljava/lang/Thread;>;
+ ()L1java/util/Collection<Ljava/lang/Thread;>;
 getWaitQueueLength
  (Ljava/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject;)I
  (L1java/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject;)I
diff --git a/libs/eea-java-17/src/main/resources/java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject.eea b/libs/eea-java-17/src/main/resources/java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject.eea
index 0f60484bbf..ac8f5b5b96 100644
--- a/libs/eea-java-17/src/main/resources/java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject.eea
@@ -11,4 +11,4 @@ awaitUntil
  (L1java/util/Date;)Z # @Inherited(java.util.concurrent.locks.Condition)
 getWaitingThreads
  ()Ljava/util/Collection<Ljava/lang/Thread;>;
- ()Ljava/util/Collection<Ljava/lang/Thread;>;
+ ()L1java/util/Collection<Ljava/lang/Thread;>;
diff --git a/libs/eea-java-17/src/main/resources/java/util/concurrent/locks/AbstractQueuedSynchronizer.eea b/libs/eea-java-17/src/main/resources/java/util/concurrent/locks/AbstractQueuedSynchronizer.eea
index 607e5aafe9..41c39d9eb5 100644
--- a/libs/eea-java-17/src/main/resources/java/util/concurrent/locks/AbstractQueuedSynchronizer.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/concurrent/locks/AbstractQueuedSynchronizer.eea
@@ -2,16 +2,16 @@ class java/util/concurrent/locks/AbstractQueuedSynchronizer
 
 getExclusiveQueuedThreads
  ()Ljava/util/Collection<Ljava/lang/Thread;>;
- ()Ljava/util/Collection<Ljava/lang/Thread;>;
+ ()L1java/util/Collection<Ljava/lang/Thread;>;
 getFirstQueuedThread
  ()Ljava/lang/Thread;
  ()Ljava/lang/Thread;
 getQueuedThreads
  ()Ljava/util/Collection<Ljava/lang/Thread;>;
- ()Ljava/util/Collection<Ljava/lang/Thread;>;
+ ()L1java/util/Collection<Ljava/lang/Thread;>;
 getSharedQueuedThreads
  ()Ljava/util/Collection<Ljava/lang/Thread;>;
- ()Ljava/util/Collection<Ljava/lang/Thread;>;
+ ()L1java/util/Collection<Ljava/lang/Thread;>;
 getWaitQueueLength
  (Ljava/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject;)I
  (L1java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject;)I
diff --git a/libs/eea-java-17/src/main/resources/java/util/prefs/AbstractPreferences.eea b/libs/eea-java-17/src/main/resources/java/util/prefs/AbstractPreferences.eea
index 8302ecdf34..c838f12a71 100644
--- a/libs/eea-java-17/src/main/resources/java/util/prefs/AbstractPreferences.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/prefs/AbstractPreferences.eea
@@ -45,7 +45,7 @@ getByteArray
  (L1java/lang/String;[B)[B # @Inherited(java.util.prefs.Preferences)
 getChild
  (Ljava/lang/String;)Ljava/util/prefs/AbstractPreferences;
- (Ljava/lang/String;)Ljava/util/prefs/AbstractPreferences;
+ (Ljava/lang/String;)L0java/util/prefs/AbstractPreferences;
 getDouble
  (Ljava/lang/String;D)D
  (L1java/lang/String;D)D # @Inherited(java.util.prefs.Preferences)
diff --git a/libs/eea-java-17/src/main/resources/java/util/random/RandomGeneratorFactory.eea b/libs/eea-java-17/src/main/resources/java/util/random/RandomGeneratorFactory.eea
index 8e1eb64d00..96dc879f88 100644
--- a/libs/eea-java-17/src/main/resources/java/util/random/RandomGeneratorFactory.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/random/RandomGeneratorFactory.eea
@@ -14,13 +14,13 @@ of
 
 create
  ()TT;
- ()TT;
+ ()T1T;
 create
  (J)TT;
- (J)TT;
+ (J)T1T;
 create
  ([B)TT;
- ([B)TT;
+ ([B)T1T;
 group
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/java/util/spi/CurrencyNameProvider.eea b/libs/eea-java-17/src/main/resources/java/util/spi/CurrencyNameProvider.eea
index fa8345bfac..1bbac79254 100644
--- a/libs/eea-java-17/src/main/resources/java/util/spi/CurrencyNameProvider.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/spi/CurrencyNameProvider.eea
@@ -2,7 +2,7 @@ class java/util/spi/CurrencyNameProvider
 
 getDisplayName
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/util/Locale;)L0java/lang/String;
 getSymbol
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/java/util/spi/LocaleNameProvider.eea b/libs/eea-java-17/src/main/resources/java/util/spi/LocaleNameProvider.eea
index 3c8a30ace6..6e09f3b8fa 100644
--- a/libs/eea-java-17/src/main/resources/java/util/spi/LocaleNameProvider.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/spi/LocaleNameProvider.eea
@@ -8,13 +8,13 @@ getDisplayLanguage
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
 getDisplayScript
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/util/Locale;)L0java/lang/String;
 getDisplayUnicodeExtensionKey
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/util/Locale;)L0java/lang/String;
 getDisplayUnicodeExtensionType
  (Ljava/lang/String;Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/util/Locale;)L0java/lang/String;
 getDisplayVariant
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/java/util/spi/TimeZoneNameProvider.eea b/libs/eea-java-17/src/main/resources/java/util/spi/TimeZoneNameProvider.eea
index 52c2775bcb..e69e361e86 100644
--- a/libs/eea-java-17/src/main/resources/java/util/spi/TimeZoneNameProvider.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/spi/TimeZoneNameProvider.eea
@@ -5,4 +5,4 @@ getDisplayName
  (Ljava/lang/String;ZILjava/util/Locale;)Ljava/lang/String;
 getGenericDisplayName
  (Ljava/lang/String;ILjava/util/Locale;)Ljava/lang/String;
- (Ljava/lang/String;ILjava/util/Locale;)Ljava/lang/String;
+ (Ljava/lang/String;ILjava/util/Locale;)L0java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/java/util/stream/DoubleStream.eea b/libs/eea-java-17/src/main/resources/java/util/stream/DoubleStream.eea
index c33757e37f..4b46f90185 100644
--- a/libs/eea-java-17/src/main/resources/java/util/stream/DoubleStream.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/stream/DoubleStream.eea
@@ -6,7 +6,7 @@ super java/util/stream/BaseStream
 
 builder
  ()Ljava/util/stream/DoubleStream$Builder;
- ()Ljava/util/stream/DoubleStream$Builder;
+ ()L1java/util/stream/DoubleStream$Builder;
 concat
  (Ljava/util/stream/DoubleStream;Ljava/util/stream/DoubleStream;)Ljava/util/stream/DoubleStream;
  (Ljava/util/stream/DoubleStream;Ljava/util/stream/DoubleStream;)Ljava/util/stream/DoubleStream;
diff --git a/libs/eea-java-17/src/main/resources/java/util/stream/Node$OfPrimitive.eea b/libs/eea-java-17/src/main/resources/java/util/stream/Node$OfPrimitive.eea
index 1ef25a4a11..120d20c21d 100644
--- a/libs/eea-java-17/src/main/resources/java/util/stream/Node$OfPrimitive.eea
+++ b/libs/eea-java-17/src/main/resources/java/util/stream/Node$OfPrimitive.eea
@@ -20,7 +20,7 @@ forEach
  (TT_CONS;)V
 getChild
  (I)TT_NODE;
- (I)TT_NODE;
+ (I)T1T_NODE;
 newArray
  (I)TT_ARR;
  (I)TT_ARR;
diff --git a/libs/eea-java-17/src/main/resources/javax/accessibility/AccessibleContext.eea b/libs/eea-java-17/src/main/resources/javax/accessibility/AccessibleContext.eea
index 2856d43f67..c7aae898f3 100644
--- a/libs/eea-java-17/src/main/resources/javax/accessibility/AccessibleContext.eea
+++ b/libs/eea-java-17/src/main/resources/javax/accessibility/AccessibleContext.eea
@@ -85,22 +85,22 @@ firePropertyChange
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
  (I)Ljavax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent;
 getAccessibleDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getAccessibleEditableText
  ()Ljavax/accessibility/AccessibleEditableText;
- ()Ljavax/accessibility/AccessibleEditableText;
+ ()L0javax/accessibility/AccessibleEditableText;
 getAccessibleIcon
  ()[Ljavax/accessibility/AccessibleIcon;
- ()[Ljavax/accessibility/AccessibleIcon;
+ ()[0Ljavax/accessibility/AccessibleIcon;
 getAccessibleName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -115,19 +115,19 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleTable
  ()Ljavax/accessibility/AccessibleTable;
- ()Ljavax/accessibility/AccessibleTable;
+ ()L0javax/accessibility/AccessibleTable;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue;
 getLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
diff --git a/libs/eea-java-17/src/main/resources/javax/accessibility/AccessibleRelation.eea b/libs/eea-java-17/src/main/resources/javax/accessibility/AccessibleRelation.eea
index aab3b33d3e..16ccc38606 100644
--- a/libs/eea-java-17/src/main/resources/javax/accessibility/AccessibleRelation.eea
+++ b/libs/eea-java-17/src/main/resources/javax/accessibility/AccessibleRelation.eea
@@ -87,7 +87,7 @@ getKey
  ()Ljava/lang/String;
 getTarget
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[1Ljava/lang/Object;
 setTarget
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/accessibility/AccessibleRelationSet.eea b/libs/eea-java-17/src/main/resources/javax/accessibility/AccessibleRelationSet.eea
index 75314e9871..8e57551574 100644
--- a/libs/eea-java-17/src/main/resources/javax/accessibility/AccessibleRelationSet.eea
+++ b/libs/eea-java-17/src/main/resources/javax/accessibility/AccessibleRelationSet.eea
@@ -18,13 +18,13 @@ contains
  (Ljava/lang/String;)Z
 get
  (Ljava/lang/String;)Ljavax/accessibility/AccessibleRelation;
- (Ljava/lang/String;)Ljavax/accessibility/AccessibleRelation;
+ (Ljava/lang/String;)L0javax/accessibility/AccessibleRelation;
 remove
  (Ljavax/accessibility/AccessibleRelation;)Z
  (Ljavax/accessibility/AccessibleRelation;)Z
 toArray
  ()[Ljavax/accessibility/AccessibleRelation;
- ()[Ljavax/accessibility/AccessibleRelation;
+ ()[1Ljavax/accessibility/AccessibleRelation;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/javax/accessibility/AccessibleStateSet.eea b/libs/eea-java-17/src/main/resources/javax/accessibility/AccessibleStateSet.eea
index 33cd259e79..f38cfa85dd 100644
--- a/libs/eea-java-17/src/main/resources/javax/accessibility/AccessibleStateSet.eea
+++ b/libs/eea-java-17/src/main/resources/javax/accessibility/AccessibleStateSet.eea
@@ -21,7 +21,7 @@ remove
  (Ljavax/accessibility/AccessibleState;)Z
 toArray
  ()[Ljavax/accessibility/AccessibleState;
- ()[Ljavax/accessibility/AccessibleState;
+ ()[1Ljavax/accessibility/AccessibleState;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/javax/annotation/processing/Completions.eea b/libs/eea-java-17/src/main/resources/javax/annotation/processing/Completions.eea
index 450a3e19d5..cb428658b1 100644
--- a/libs/eea-java-17/src/main/resources/javax/annotation/processing/Completions.eea
+++ b/libs/eea-java-17/src/main/resources/javax/annotation/processing/Completions.eea
@@ -2,7 +2,7 @@ class javax/annotation/processing/Completions
 
 of
  (Ljava/lang/String;)Ljavax/annotation/processing/Completion;
- (Ljava/lang/String;)Ljavax/annotation/processing/Completion;
+ (Ljava/lang/String;)L1javax/annotation/processing/Completion;
 of
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/annotation/processing/Completion;
- (Ljava/lang/String;Ljava/lang/String;)Ljavax/annotation/processing/Completion;
+ (Ljava/lang/String;Ljava/lang/String;)L1javax/annotation/processing/Completion;
diff --git a/libs/eea-java-17/src/main/resources/javax/annotation/processing/Filer.eea b/libs/eea-java-17/src/main/resources/javax/annotation/processing/Filer.eea
index 08377233c0..7e6baa3b6a 100644
--- a/libs/eea-java-17/src/main/resources/javax/annotation/processing/Filer.eea
+++ b/libs/eea-java-17/src/main/resources/javax/annotation/processing/Filer.eea
@@ -2,13 +2,13 @@ class javax/annotation/processing/Filer
 
 createClassFile
  (Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)Ljavax/tools/JavaFileObject;
- (Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)Ljavax/tools/JavaFileObject;
+ (Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)L1javax/tools/JavaFileObject;
 createResource
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/CharSequence;Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)Ljavax/tools/FileObject;
- (Ljavax/tools/JavaFileManager$Location;Ljava/lang/CharSequence;Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)Ljavax/tools/FileObject;
+ (Ljavax/tools/JavaFileManager$Location;Ljava/lang/CharSequence;Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)L1javax/tools/FileObject;
 createSourceFile
  (Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)Ljavax/tools/JavaFileObject;
- (Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)Ljavax/tools/JavaFileObject;
+ (Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)L1javax/tools/JavaFileObject;
 getResource
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Ljavax/tools/FileObject;
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Ljavax/tools/FileObject;
diff --git a/libs/eea-java-17/src/main/resources/javax/crypto/CipherSpi.eea b/libs/eea-java-17/src/main/resources/javax/crypto/CipherSpi.eea
index 53c0ff1c0d..63c0e4e4a1 100644
--- a/libs/eea-java-17/src/main/resources/javax/crypto/CipherSpi.eea
+++ b/libs/eea-java-17/src/main/resources/javax/crypto/CipherSpi.eea
@@ -35,7 +35,7 @@ engineSetPadding
  (Ljava/lang/String;)V
 engineUnwrap
  ([BLjava/lang/String;I)Ljava/security/Key;
- ([BLjava/lang/String;I)Ljava/security/Key;
+ ([BLjava/lang/String;I)L1java/security/Key;
 engineUpdate
  (Ljava/nio/ByteBuffer;Ljava/nio/ByteBuffer;)I
  (Ljava/nio/ByteBuffer;Ljava/nio/ByteBuffer;)I
@@ -53,4 +53,4 @@ engineUpdateAAD
  ([BII)V
 engineWrap
  (Ljava/security/Key;)[B
- (Ljava/security/Key;)[B
+ (Ljava/security/Key;)[1B
diff --git a/libs/eea-java-17/src/main/resources/javax/crypto/EncryptedPrivateKeyInfo.eea b/libs/eea-java-17/src/main/resources/javax/crypto/EncryptedPrivateKeyInfo.eea
index acc9f0bdbf..9054a16f36 100644
--- a/libs/eea-java-17/src/main/resources/javax/crypto/EncryptedPrivateKeyInfo.eea
+++ b/libs/eea-java-17/src/main/resources/javax/crypto/EncryptedPrivateKeyInfo.eea
@@ -32,4 +32,4 @@ getKeySpec
  (Ljava/security/Key;Ljava/security/Provider;)Ljava/security/spec/PKCS8EncodedKeySpec;
 getKeySpec
  (Ljavax/crypto/Cipher;)Ljava/security/spec/PKCS8EncodedKeySpec;
- (Ljavax/crypto/Cipher;)Ljava/security/spec/PKCS8EncodedKeySpec;
+ (Ljavax/crypto/Cipher;)L1java/security/spec/PKCS8EncodedKeySpec;
diff --git a/libs/eea-java-17/src/main/resources/javax/crypto/KeyAgreement.eea b/libs/eea-java-17/src/main/resources/javax/crypto/KeyAgreement.eea
index 7ff50989eb..19c19cdf32 100644
--- a/libs/eea-java-17/src/main/resources/javax/crypto/KeyAgreement.eea
+++ b/libs/eea-java-17/src/main/resources/javax/crypto/KeyAgreement.eea
@@ -2,7 +2,7 @@ class javax/crypto/KeyAgreement
 
 getInstance
  (Ljava/lang/String;)Ljavax/crypto/KeyAgreement;
- (Ljava/lang/String;)Ljavax/crypto/KeyAgreement;
+ (Ljava/lang/String;)L1javax/crypto/KeyAgreement;
 getInstance
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/crypto/KeyAgreement;
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/crypto/KeyAgreement;
diff --git a/libs/eea-java-17/src/main/resources/javax/crypto/Mac.eea b/libs/eea-java-17/src/main/resources/javax/crypto/Mac.eea
index 5e5668237d..8d10b122a9 100644
--- a/libs/eea-java-17/src/main/resources/javax/crypto/Mac.eea
+++ b/libs/eea-java-17/src/main/resources/javax/crypto/Mac.eea
@@ -2,7 +2,7 @@ class javax/crypto/Mac
 
 getInstance
  (Ljava/lang/String;)Ljavax/crypto/Mac;
- (Ljava/lang/String;)Ljavax/crypto/Mac;
+ (Ljava/lang/String;)L1javax/crypto/Mac;
 getInstance
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/crypto/Mac;
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/crypto/Mac;
diff --git a/libs/eea-java-17/src/main/resources/javax/crypto/SecretKeyFactory.eea b/libs/eea-java-17/src/main/resources/javax/crypto/SecretKeyFactory.eea
index 5ebcc758a3..c3519c029f 100644
--- a/libs/eea-java-17/src/main/resources/javax/crypto/SecretKeyFactory.eea
+++ b/libs/eea-java-17/src/main/resources/javax/crypto/SecretKeyFactory.eea
@@ -2,7 +2,7 @@ class javax/crypto/SecretKeyFactory
 
 getInstance
  (Ljava/lang/String;)Ljavax/crypto/SecretKeyFactory;
- (Ljava/lang/String;)Ljavax/crypto/SecretKeyFactory;
+ (Ljava/lang/String;)L1javax/crypto/SecretKeyFactory;
 getInstance
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/crypto/SecretKeyFactory;
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/crypto/SecretKeyFactory;
diff --git a/libs/eea-java-17/src/main/resources/javax/crypto/spec/PBEKeySpec.eea b/libs/eea-java-17/src/main/resources/javax/crypto/spec/PBEKeySpec.eea
index bd5602ac54..42108d5f56 100644
--- a/libs/eea-java-17/src/main/resources/javax/crypto/spec/PBEKeySpec.eea
+++ b/libs/eea-java-17/src/main/resources/javax/crypto/spec/PBEKeySpec.eea
@@ -14,4 +14,4 @@ getPassword
  ()[C
 getSalt
  ()[B
- ()[B
+ ()[0B
diff --git a/libs/eea-java-17/src/main/resources/javax/imageio/IIOParam.eea b/libs/eea-java-17/src/main/resources/javax/imageio/IIOParam.eea
index c347c58f86..fd56a917db 100644
--- a/libs/eea-java-17/src/main/resources/javax/imageio/IIOParam.eea
+++ b/libs/eea-java-17/src/main/resources/javax/imageio/IIOParam.eea
@@ -33,10 +33,10 @@ getDestinationType
  ()Ljavax/imageio/ImageTypeSpecifier;
 getSourceBands
  ()[I
- ()[I
+ ()[0I
 getSourceRegion
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L0java/awt/Rectangle;
 setController
  (Ljavax/imageio/IIOParamController;)V
  (Ljavax/imageio/IIOParamController;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/imageio/ImageIO.eea b/libs/eea-java-17/src/main/resources/javax/imageio/ImageIO.eea
index 80a6db1dbd..b4dea909bf 100644
--- a/libs/eea-java-17/src/main/resources/javax/imageio/ImageIO.eea
+++ b/libs/eea-java-17/src/main/resources/javax/imageio/ImageIO.eea
@@ -2,16 +2,16 @@ class javax/imageio/ImageIO
 
 createImageInputStream
  (Ljava/lang/Object;)Ljavax/imageio/stream/ImageInputStream;
- (Ljava/lang/Object;)Ljavax/imageio/stream/ImageInputStream;
+ (Ljava/lang/Object;)L0javax/imageio/stream/ImageInputStream;
 createImageOutputStream
  (Ljava/lang/Object;)Ljavax/imageio/stream/ImageOutputStream;
- (Ljava/lang/Object;)Ljavax/imageio/stream/ImageOutputStream;
+ (Ljava/lang/Object;)L0javax/imageio/stream/ImageOutputStream;
 getCacheDirectory
  ()Ljava/io/File;
  ()Ljava/io/File;
 getImageReader
  (Ljavax/imageio/ImageWriter;)Ljavax/imageio/ImageReader;
- (Ljavax/imageio/ImageWriter;)Ljavax/imageio/ImageReader;
+ (Ljavax/imageio/ImageWriter;)L0javax/imageio/ImageReader;
 getImageReaders
  (Ljava/lang/Object;)Ljava/util/Iterator<Ljavax/imageio/ImageReader;>;
  (Ljava/lang/Object;)Ljava/util/Iterator<Ljavax/imageio/ImageReader;>;
@@ -29,7 +29,7 @@ getImageTranscoders
  (Ljavax/imageio/ImageReader;Ljavax/imageio/ImageWriter;)Ljava/util/Iterator<Ljavax/imageio/ImageTranscoder;>;
 getImageWriter
  (Ljavax/imageio/ImageReader;)Ljavax/imageio/ImageWriter;
- (Ljavax/imageio/ImageReader;)Ljavax/imageio/ImageWriter;
+ (Ljavax/imageio/ImageReader;)L0javax/imageio/ImageWriter;
 getImageWriters
  (Ljavax/imageio/ImageTypeSpecifier;Ljava/lang/String;)Ljava/util/Iterator<Ljavax/imageio/ImageWriter;>;
  (Ljavax/imageio/ImageTypeSpecifier;Ljava/lang/String;)Ljava/util/Iterator<Ljavax/imageio/ImageWriter;>;
@@ -71,7 +71,7 @@ read
  (Ljava/net/URL;)Ljava/awt/image/BufferedImage;
 read
  (Ljavax/imageio/stream/ImageInputStream;)Ljava/awt/image/BufferedImage;
- (Ljavax/imageio/stream/ImageInputStream;)Ljava/awt/image/BufferedImage;
+ (Ljavax/imageio/stream/ImageInputStream;)L0java/awt/image/BufferedImage;
 setCacheDirectory
  (Ljava/io/File;)V
  (Ljava/io/File;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/imageio/ImageReadParam.eea b/libs/eea-java-17/src/main/resources/javax/imageio/ImageReadParam.eea
index 82b35aa7df..225c56e3f6 100644
--- a/libs/eea-java-17/src/main/resources/javax/imageio/ImageReadParam.eea
+++ b/libs/eea-java-17/src/main/resources/javax/imageio/ImageReadParam.eea
@@ -15,7 +15,7 @@ getDestination
  ()Ljava/awt/image/BufferedImage;
 getDestinationBands
  ()[I
- ()[I
+ ()[0I
 getSourceRenderSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
diff --git a/libs/eea-java-17/src/main/resources/javax/imageio/ImageReader.eea b/libs/eea-java-17/src/main/resources/javax/imageio/ImageReader.eea
index 063973faab..172f8840b0 100644
--- a/libs/eea-java-17/src/main/resources/javax/imageio/ImageReader.eea
+++ b/libs/eea-java-17/src/main/resources/javax/imageio/ImageReader.eea
@@ -52,10 +52,10 @@ addIIOReadWarningListener
  (L1javax/imageio/event/IIOReadWarningListener;)V
 getAvailableLocales
  ()[Ljava/util/Locale;
- ()[Ljava/util/Locale;
+ ()[0Ljava/util/Locale;
 getDefaultReadParam
  ()Ljavax/imageio/ImageReadParam;
- ()Ljavax/imageio/ImageReadParam;
+ ()L1javax/imageio/ImageReadParam;
 getFormatName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -118,7 +118,7 @@ read
  (ILjavax/imageio/ImageReadParam;)Ljava/awt/image/BufferedImage;
 readAll
  (ILjavax/imageio/ImageReadParam;)Ljavax/imageio/IIOImage;
- (ILjavax/imageio/ImageReadParam;)Ljavax/imageio/IIOImage;
+ (ILjavax/imageio/ImageReadParam;)L1javax/imageio/IIOImage;
 readAll
  (Ljava/util/Iterator<+Ljavax/imageio/ImageReadParam;>;)Ljava/util/Iterator<Ljavax/imageio/IIOImage;>;
  (Ljava/util/Iterator<+Ljavax/imageio/ImageReadParam;>;)Ljava/util/Iterator<Ljavax/imageio/IIOImage;>;
@@ -127,10 +127,10 @@ readAsRenderedImage
  (ILjavax/imageio/ImageReadParam;)Ljava/awt/image/RenderedImage;
 readRaster
  (ILjavax/imageio/ImageReadParam;)Ljava/awt/image/Raster;
- (ILjavax/imageio/ImageReadParam;)Ljava/awt/image/Raster;
+ (ILjavax/imageio/ImageReadParam;)L1java/awt/image/Raster;
 readThumbnail
  (II)Ljava/awt/image/BufferedImage;
- (II)Ljava/awt/image/BufferedImage;
+ (II)L1java/awt/image/BufferedImage;
 readTile
  (III)Ljava/awt/image/BufferedImage;
  (III)Ljava/awt/image/BufferedImage;
diff --git a/libs/eea-java-17/src/main/resources/javax/imageio/ImageTypeSpecifier.eea b/libs/eea-java-17/src/main/resources/javax/imageio/ImageTypeSpecifier.eea
index c1dd1077d2..335eb11e08 100644
--- a/libs/eea-java-17/src/main/resources/javax/imageio/ImageTypeSpecifier.eea
+++ b/libs/eea-java-17/src/main/resources/javax/imageio/ImageTypeSpecifier.eea
@@ -2,28 +2,28 @@ class javax/imageio/ImageTypeSpecifier
 
 createBanded
  (Ljava/awt/color/ColorSpace;[I[IIZZ)Ljavax/imageio/ImageTypeSpecifier;
- (Ljava/awt/color/ColorSpace;[I[IIZZ)Ljavax/imageio/ImageTypeSpecifier;
+ (Ljava/awt/color/ColorSpace;[I[IIZZ)L1javax/imageio/ImageTypeSpecifier;
 createFromBufferedImageType
  (I)Ljavax/imageio/ImageTypeSpecifier;
- (I)Ljavax/imageio/ImageTypeSpecifier;
+ (I)L1javax/imageio/ImageTypeSpecifier;
 createFromRenderedImage
  (Ljava/awt/image/RenderedImage;)Ljavax/imageio/ImageTypeSpecifier;
- (Ljava/awt/image/RenderedImage;)Ljavax/imageio/ImageTypeSpecifier;
+ (Ljava/awt/image/RenderedImage;)L1javax/imageio/ImageTypeSpecifier;
 createGrayscale
  (IIZ)Ljavax/imageio/ImageTypeSpecifier;
- (IIZ)Ljavax/imageio/ImageTypeSpecifier;
+ (IIZ)L1javax/imageio/ImageTypeSpecifier;
 createGrayscale
  (IIZZ)Ljavax/imageio/ImageTypeSpecifier;
- (IIZZ)Ljavax/imageio/ImageTypeSpecifier;
+ (IIZZ)L1javax/imageio/ImageTypeSpecifier;
 createIndexed
  ([B[B[B[BII)Ljavax/imageio/ImageTypeSpecifier;
- ([B[B[B[BII)Ljavax/imageio/ImageTypeSpecifier;
+ ([B[B[B[BII)L1javax/imageio/ImageTypeSpecifier;
 createInterleaved
  (Ljava/awt/color/ColorSpace;[IIZZ)Ljavax/imageio/ImageTypeSpecifier;
- (Ljava/awt/color/ColorSpace;[IIZZ)Ljavax/imageio/ImageTypeSpecifier;
+ (Ljava/awt/color/ColorSpace;[IIZZ)L1javax/imageio/ImageTypeSpecifier;
 createPacked
  (Ljava/awt/color/ColorSpace;IIIIIZ)Ljavax/imageio/ImageTypeSpecifier;
- (Ljava/awt/color/ColorSpace;IIIIIZ)Ljavax/imageio/ImageTypeSpecifier;
+ (Ljava/awt/color/ColorSpace;IIIIIZ)L1javax/imageio/ImageTypeSpecifier;
 
 colorModel
  Ljava/awt/image/ColorModel;
@@ -40,7 +40,7 @@ sampleModel
  (Ljava/awt/image/RenderedImage;)V
 createBufferedImage
  (II)Ljava/awt/image/BufferedImage;
- (II)Ljava/awt/image/BufferedImage;
+ (II)L1java/awt/image/BufferedImage;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/javax/imageio/ImageWriteParam.eea b/libs/eea-java-17/src/main/resources/javax/imageio/ImageWriteParam.eea
index 0530ffdef0..0a9b1107fa 100644
--- a/libs/eea-java-17/src/main/resources/javax/imageio/ImageWriteParam.eea
+++ b/libs/eea-java-17/src/main/resources/javax/imageio/ImageWriteParam.eea
@@ -18,16 +18,16 @@ preferredTileSizes
  (Ljava/util/Locale;)V
 getCompressionQualityDescriptions
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String;
 getCompressionQualityValues
  ()[F
- ()[F
+ ()[0F
 getCompressionType
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getCompressionTypes
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String;
 getLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
diff --git a/libs/eea-java-17/src/main/resources/javax/imageio/ImageWriter.eea b/libs/eea-java-17/src/main/resources/javax/imageio/ImageWriter.eea
index 939d7848b7..b385898415 100644
--- a/libs/eea-java-17/src/main/resources/javax/imageio/ImageWriter.eea
+++ b/libs/eea-java-17/src/main/resources/javax/imageio/ImageWriter.eea
@@ -48,7 +48,7 @@ getDefaultStreamMetadata
  (Ljavax/imageio/ImageWriteParam;)Ljavax/imageio/metadata/IIOMetadata;
 getDefaultWriteParam
  ()Ljavax/imageio/ImageWriteParam;
- ()Ljavax/imageio/ImageWriteParam;
+ ()L1javax/imageio/ImageWriteParam;
 getLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
@@ -63,7 +63,7 @@ getOutput
  ()Ljava/lang/Object;
 getPreferredThumbnailSizes
  (Ljavax/imageio/ImageTypeSpecifier;Ljavax/imageio/ImageWriteParam;Ljavax/imageio/metadata/IIOMetadata;Ljavax/imageio/metadata/IIOMetadata;)[Ljava/awt/Dimension;
- (Ljavax/imageio/ImageTypeSpecifier;Ljavax/imageio/ImageWriteParam;Ljavax/imageio/metadata/IIOMetadata;Ljavax/imageio/metadata/IIOMetadata;)[Ljava/awt/Dimension;
+ (Ljavax/imageio/ImageTypeSpecifier;Ljavax/imageio/ImageWriteParam;Ljavax/imageio/metadata/IIOMetadata;Ljavax/imageio/metadata/IIOMetadata;)[0Ljava/awt/Dimension;
 prepareInsertEmpty
  (ILjavax/imageio/ImageTypeSpecifier;IILjavax/imageio/metadata/IIOMetadata;Ljava/util/List<+Ljava/awt/image/BufferedImage;>;Ljavax/imageio/ImageWriteParam;)V
  (ILjavax/imageio/ImageTypeSpecifier;IILjavax/imageio/metadata/IIOMetadata;Ljava/util/List<+Ljava/awt/image/BufferedImage;>;Ljavax/imageio/ImageWriteParam;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/imageio/metadata/IIOMetadata.eea b/libs/eea-java-17/src/main/resources/javax/imageio/metadata/IIOMetadata.eea
index ea3da925ff..4c2fe4b3fd 100644
--- a/libs/eea-java-17/src/main/resources/javax/imageio/metadata/IIOMetadata.eea
+++ b/libs/eea-java-17/src/main/resources/javax/imageio/metadata/IIOMetadata.eea
@@ -33,43 +33,43 @@ getDefaultController
  ()Ljavax/imageio/metadata/IIOMetadataController;
 getExtraMetadataFormatNames
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String;
 getMetadataFormat
  (Ljava/lang/String;)Ljavax/imageio/metadata/IIOMetadataFormat;
  (Ljava/lang/String;)Ljavax/imageio/metadata/IIOMetadataFormat;
 getMetadataFormatNames
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String;
 getNativeMetadataFormatName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getStandardChromaNode
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L0javax/imageio/metadata/IIOMetadataNode;
 getStandardCompressionNode
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L0javax/imageio/metadata/IIOMetadataNode;
 getStandardDataNode
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L0javax/imageio/metadata/IIOMetadataNode;
 getStandardDimensionNode
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L0javax/imageio/metadata/IIOMetadataNode;
 getStandardDocumentNode
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L0javax/imageio/metadata/IIOMetadataNode;
 getStandardTextNode
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L0javax/imageio/metadata/IIOMetadataNode;
 getStandardTileNode
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L0javax/imageio/metadata/IIOMetadataNode;
 getStandardTransparencyNode
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L0javax/imageio/metadata/IIOMetadataNode;
 getStandardTree
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L1javax/imageio/metadata/IIOMetadataNode;
 mergeTree
  (Ljava/lang/String;Lorg/w3c/dom/Node;)V
  (Ljava/lang/String;Lorg/w3c/dom/Node;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/imageio/metadata/IIOMetadataFormatImpl.eea b/libs/eea-java-17/src/main/resources/javax/imageio/metadata/IIOMetadataFormatImpl.eea
index 570c29bc8c..4f133d5d34 100644
--- a/libs/eea-java-17/src/main/resources/javax/imageio/metadata/IIOMetadataFormatImpl.eea
+++ b/libs/eea-java-17/src/main/resources/javax/imageio/metadata/IIOMetadataFormatImpl.eea
@@ -85,7 +85,7 @@ getAttributeValueType
  (Ljava/lang/String;Ljava/lang/String;)I
 getChildNames
  (Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/String;)[0Ljava/lang/String;
 getChildPolicy
  (Ljava/lang/String;)I
  (Ljava/lang/String;)I
diff --git a/libs/eea-java-17/src/main/resources/javax/imageio/metadata/IIOMetadataNode.eea b/libs/eea-java-17/src/main/resources/javax/imageio/metadata/IIOMetadataNode.eea
index 9b80865fa6..bed21003f8 100644
--- a/libs/eea-java-17/src/main/resources/javax/imageio/metadata/IIOMetadataNode.eea
+++ b/libs/eea-java-17/src/main/resources/javax/imageio/metadata/IIOMetadataNode.eea
@@ -26,7 +26,7 @@ getAttributeNodeNS
  (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/Attr;
 getAttributes
  ()Lorg/w3c/dom/NamedNodeMap;
- ()Lorg/w3c/dom/NamedNodeMap;
+ ()L1org/w3c/dom/NamedNodeMap;
 getBaseURI
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(org.w3c.dom.Node)
@@ -53,7 +53,7 @@ getLocalName
  ()L0java/lang/String; # @Inherited(org.w3c.dom.Node)
 getNamespaceURI
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getNextSibling
  ()Lorg/w3c/dom/Node;
  ()L0org/w3c/dom/Node; # @Inherited(org.w3c.dom.Node)
@@ -77,16 +77,16 @@ getPreviousSibling
  ()L0org/w3c/dom/Node; # @Inherited(org.w3c.dom.Node)
 getSchemaTypeInfo
  ()Lorg/w3c/dom/TypeInfo;
- ()Lorg/w3c/dom/TypeInfo;
+ ()L1org/w3c/dom/TypeInfo;
 getTagName
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(org.w3c.dom.Element)
 getTextContent
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getUserData
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
 getUserObject
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
@@ -113,7 +113,7 @@ isSupported
  (Ljava/lang/String;Ljava/lang/String;)Z
 item
  (I)Lorg/w3c/dom/Node;
- (I)Lorg/w3c/dom/Node;
+ (I)L0org/w3c/dom/Node;
 lookupNamespaceURI
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)L0java/lang/String; # @Inherited(org.w3c.dom.Node)
@@ -143,7 +143,7 @@ setAttributeNS
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 setAttributeNode
  (Lorg/w3c/dom/Attr;)Lorg/w3c/dom/Attr;
- (Lorg/w3c/dom/Attr;)Lorg/w3c/dom/Attr;
+ (Lorg/w3c/dom/Attr;)L0org/w3c/dom/Attr;
 setAttributeNodeNS
  (Lorg/w3c/dom/Attr;)Lorg/w3c/dom/Attr;
  (Lorg/w3c/dom/Attr;)Lorg/w3c/dom/Attr;
@@ -167,7 +167,7 @@ setTextContent
  (Ljava/lang/String;)V
 setUserData
  (Ljava/lang/String;Ljava/lang/Object;Lorg/w3c/dom/UserDataHandler;)Ljava/lang/Object;
- (Ljava/lang/String;Ljava/lang/Object;Lorg/w3c/dom/UserDataHandler;)Ljava/lang/Object;
+ (Ljava/lang/String;Ljava/lang/Object;Lorg/w3c/dom/UserDataHandler;)L1java/lang/Object;
 setUserObject
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/imageio/plugins/jpeg/JPEGImageReadParam.eea b/libs/eea-java-17/src/main/resources/javax/imageio/plugins/jpeg/JPEGImageReadParam.eea
index 71ba123e14..0e9fe601ff 100644
--- a/libs/eea-java-17/src/main/resources/javax/imageio/plugins/jpeg/JPEGImageReadParam.eea
+++ b/libs/eea-java-17/src/main/resources/javax/imageio/plugins/jpeg/JPEGImageReadParam.eea
@@ -2,13 +2,13 @@ class javax/imageio/plugins/jpeg/JPEGImageReadParam
 
 getACHuffmanTables
  ()[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
- ()[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
+ ()[0Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
 getDCHuffmanTables
  ()[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
- ()[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
+ ()[0Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
 getQTables
  ()[Ljavax/imageio/plugins/jpeg/JPEGQTable;
- ()[Ljavax/imageio/plugins/jpeg/JPEGQTable;
+ ()[0Ljavax/imageio/plugins/jpeg/JPEGQTable;
 setDecodeTables
  ([Ljavax/imageio/plugins/jpeg/JPEGQTable;[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;)V
  ([Ljavax/imageio/plugins/jpeg/JPEGQTable;[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/imageio/plugins/jpeg/JPEGImageWriteParam.eea b/libs/eea-java-17/src/main/resources/javax/imageio/plugins/jpeg/JPEGImageWriteParam.eea
index 72ed2dc8b0..14b724e756 100644
--- a/libs/eea-java-17/src/main/resources/javax/imageio/plugins/jpeg/JPEGImageWriteParam.eea
+++ b/libs/eea-java-17/src/main/resources/javax/imageio/plugins/jpeg/JPEGImageWriteParam.eea
@@ -5,19 +5,19 @@ class javax/imageio/plugins/jpeg/JPEGImageWriteParam
  (Ljava/util/Locale;)V
 getACHuffmanTables
  ()[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
- ()[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
+ ()[0Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
 getCompressionQualityDescriptions
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.imageio.ImageWriteParam)
 getCompressionQualityValues
  ()[F
- ()[F
+ ()[0F # @Inherited(javax.imageio.ImageWriteParam)
 getDCHuffmanTables
  ()[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
- ()[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
+ ()[0Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
 getQTables
  ()[Ljavax/imageio/plugins/jpeg/JPEGQTable;
- ()[Ljavax/imageio/plugins/jpeg/JPEGQTable;
+ ()[0Ljavax/imageio/plugins/jpeg/JPEGQTable;
 setEncodeTables
  ([Ljavax/imageio/plugins/jpeg/JPEGQTable;[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;)V
  ([Ljavax/imageio/plugins/jpeg/JPEGQTable;[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/imageio/plugins/jpeg/JPEGQTable.eea b/libs/eea-java-17/src/main/resources/javax/imageio/plugins/jpeg/JPEGQTable.eea
index e923ecb798..793d18c003 100644
--- a/libs/eea-java-17/src/main/resources/javax/imageio/plugins/jpeg/JPEGQTable.eea
+++ b/libs/eea-java-17/src/main/resources/javax/imageio/plugins/jpeg/JPEGQTable.eea
@@ -18,7 +18,7 @@ K2Div2Chrominance
  ([I)V
 getScaledInstance
  (FZ)Ljavax/imageio/plugins/jpeg/JPEGQTable;
- (FZ)Ljavax/imageio/plugins/jpeg/JPEGQTable;
+ (FZ)L1javax/imageio/plugins/jpeg/JPEGQTable;
 getTable
  ()[I
  ()[I
diff --git a/libs/eea-java-17/src/main/resources/javax/imageio/plugins/tiff/TIFFDirectory.eea b/libs/eea-java-17/src/main/resources/javax/imageio/plugins/tiff/TIFFDirectory.eea
index 9a3eceae10..6af5cd2677 100644
--- a/libs/eea-java-17/src/main/resources/javax/imageio/plugins/tiff/TIFFDirectory.eea
+++ b/libs/eea-java-17/src/main/resources/javax/imageio/plugins/tiff/TIFFDirectory.eea
@@ -2,7 +2,7 @@ class javax/imageio/plugins/tiff/TIFFDirectory
 
 createFromMetadata
  (Ljavax/imageio/metadata/IIOMetadata;)Ljavax/imageio/plugins/tiff/TIFFDirectory;
- (Ljavax/imageio/metadata/IIOMetadata;)Ljavax/imageio/plugins/tiff/TIFFDirectory;
+ (Ljavax/imageio/metadata/IIOMetadata;)L1javax/imageio/plugins/tiff/TIFFDirectory;
 
 <init>
  ([Ljavax/imageio/plugins/tiff/TIFFTagSet;Ljavax/imageio/plugins/tiff/TIFFTag;)V
@@ -18,7 +18,7 @@ clone
  ()Ljavax/imageio/plugins/tiff/TIFFDirectory;
 getAsMetadata
  ()Ljavax/imageio/metadata/IIOMetadata;
- ()Ljavax/imageio/metadata/IIOMetadata;
+ ()L1javax/imageio/metadata/IIOMetadata;
 getParentTag
  ()Ljavax/imageio/plugins/tiff/TIFFTag;
  ()Ljavax/imageio/plugins/tiff/TIFFTag;
@@ -27,7 +27,7 @@ getTIFFField
  (I)Ljavax/imageio/plugins/tiff/TIFFField;
 getTIFFFields
  ()[Ljavax/imageio/plugins/tiff/TIFFField;
- ()[Ljavax/imageio/plugins/tiff/TIFFField;
+ ()[1Ljavax/imageio/plugins/tiff/TIFFField;
 getTag
  (I)Ljavax/imageio/plugins/tiff/TIFFTag;
  (I)Ljavax/imageio/plugins/tiff/TIFFTag;
diff --git a/libs/eea-java-17/src/main/resources/javax/imageio/plugins/tiff/TIFFField.eea b/libs/eea-java-17/src/main/resources/javax/imageio/plugins/tiff/TIFFField.eea
index 054b258a53..d262ff83e3 100644
--- a/libs/eea-java-17/src/main/resources/javax/imageio/plugins/tiff/TIFFField.eea
+++ b/libs/eea-java-17/src/main/resources/javax/imageio/plugins/tiff/TIFFField.eea
@@ -2,10 +2,10 @@ class javax/imageio/plugins/tiff/TIFFField
 
 createArrayForType
  (II)Ljava/lang/Object;
- (II)Ljava/lang/Object;
+ (II)L1java/lang/Object;
 createFromMetadataNode
  (Ljavax/imageio/plugins/tiff/TIFFTagSet;Lorg/w3c/dom/Node;)Ljavax/imageio/plugins/tiff/TIFFField;
- (Ljavax/imageio/plugins/tiff/TIFFTagSet;Lorg/w3c/dom/Node;)Ljavax/imageio/plugins/tiff/TIFFField;
+ (Ljavax/imageio/plugins/tiff/TIFFTagSet;Lorg/w3c/dom/Node;)L1javax/imageio/plugins/tiff/TIFFField;
 getTypeByName
  (Ljava/lang/String;)I
  (Ljava/lang/String;)I
@@ -48,7 +48,7 @@ getAsLongs
  ()[J
 getAsNativeNode
  ()Lorg/w3c/dom/Node;
- ()Lorg/w3c/dom/Node;
+ ()L1org/w3c/dom/Node;
 getAsRational
  (I)[J
  (I)[J
diff --git a/libs/eea-java-17/src/main/resources/javax/imageio/plugins/tiff/TIFFTag.eea b/libs/eea-java-17/src/main/resources/javax/imageio/plugins/tiff/TIFFTag.eea
index 1725fdf287..409fb8f1a3 100644
--- a/libs/eea-java-17/src/main/resources/javax/imageio/plugins/tiff/TIFFTag.eea
+++ b/libs/eea-java-17/src/main/resources/javax/imageio/plugins/tiff/TIFFTag.eea
@@ -21,10 +21,10 @@ getName
  ()Ljava/lang/String;
 getNamedValues
  ()[I
- ()[I
+ ()[1I
 getTagSet
  ()Ljavax/imageio/plugins/tiff/TIFFTagSet;
  ()Ljavax/imageio/plugins/tiff/TIFFTagSet;
 getValueName
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/imageio/spi/IIORegistry.eea b/libs/eea-java-17/src/main/resources/javax/imageio/spi/IIORegistry.eea
index 5ed8f1dbe8..35370f0254 100644
--- a/libs/eea-java-17/src/main/resources/javax/imageio/spi/IIORegistry.eea
+++ b/libs/eea-java-17/src/main/resources/javax/imageio/spi/IIORegistry.eea
@@ -2,4 +2,4 @@ class javax/imageio/spi/IIORegistry
 
 getDefaultInstance
  ()Ljavax/imageio/spi/IIORegistry;
- ()Ljavax/imageio/spi/IIORegistry;
+ ()L1javax/imageio/spi/IIORegistry;
diff --git a/libs/eea-java-17/src/main/resources/javax/imageio/spi/ImageInputStreamSpi.eea b/libs/eea-java-17/src/main/resources/javax/imageio/spi/ImageInputStreamSpi.eea
index bdb8677eaa..50f1207a4d 100644
--- a/libs/eea-java-17/src/main/resources/javax/imageio/spi/ImageInputStreamSpi.eea
+++ b/libs/eea-java-17/src/main/resources/javax/imageio/spi/ImageInputStreamSpi.eea
@@ -9,10 +9,10 @@ inputClass
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Class<*>;)V
 createInputStreamInstance
  (Ljava/lang/Object;)Ljavax/imageio/stream/ImageInputStream;
- (Ljava/lang/Object;)Ljavax/imageio/stream/ImageInputStream;
+ (Ljava/lang/Object;)L1javax/imageio/stream/ImageInputStream;
 createInputStreamInstance
  (Ljava/lang/Object;ZLjava/io/File;)Ljavax/imageio/stream/ImageInputStream;
- (Ljava/lang/Object;ZLjava/io/File;)Ljavax/imageio/stream/ImageInputStream;
+ (Ljava/lang/Object;ZLjava/io/File;)L1javax/imageio/stream/ImageInputStream;
 getInputClass
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
diff --git a/libs/eea-java-17/src/main/resources/javax/imageio/spi/ImageOutputStreamSpi.eea b/libs/eea-java-17/src/main/resources/javax/imageio/spi/ImageOutputStreamSpi.eea
index e0e3957b93..23a3557a01 100644
--- a/libs/eea-java-17/src/main/resources/javax/imageio/spi/ImageOutputStreamSpi.eea
+++ b/libs/eea-java-17/src/main/resources/javax/imageio/spi/ImageOutputStreamSpi.eea
@@ -9,10 +9,10 @@ outputClass
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Class<*>;)V
 createOutputStreamInstance
  (Ljava/lang/Object;)Ljavax/imageio/stream/ImageOutputStream;
- (Ljava/lang/Object;)Ljavax/imageio/stream/ImageOutputStream;
+ (Ljava/lang/Object;)L1javax/imageio/stream/ImageOutputStream;
 createOutputStreamInstance
  (Ljava/lang/Object;ZLjava/io/File;)Ljavax/imageio/stream/ImageOutputStream;
- (Ljava/lang/Object;ZLjava/io/File;)Ljavax/imageio/stream/ImageOutputStream;
+ (Ljava/lang/Object;ZLjava/io/File;)L1javax/imageio/stream/ImageOutputStream;
 getOutputClass
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
diff --git a/libs/eea-java-17/src/main/resources/javax/imageio/spi/ImageReaderSpi.eea b/libs/eea-java-17/src/main/resources/javax/imageio/spi/ImageReaderSpi.eea
index c8f60c8cbb..68b9f0578e 100644
--- a/libs/eea-java-17/src/main/resources/javax/imageio/spi/ImageReaderSpi.eea
+++ b/libs/eea-java-17/src/main/resources/javax/imageio/spi/ImageReaderSpi.eea
@@ -19,10 +19,10 @@ canDecodeInput
  (Ljava/lang/Object;)Z
 createReaderInstance
  ()Ljavax/imageio/ImageReader;
- ()Ljavax/imageio/ImageReader;
+ ()L1javax/imageio/ImageReader;
 createReaderInstance
  (Ljava/lang/Object;)Ljavax/imageio/ImageReader;
- (Ljava/lang/Object;)Ljavax/imageio/ImageReader;
+ (Ljava/lang/Object;)L1javax/imageio/ImageReader;
 getImageWriterSpiNames
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/imageio/spi/ImageTranscoderSpi.eea b/libs/eea-java-17/src/main/resources/javax/imageio/spi/ImageTranscoderSpi.eea
index ac15c2cd7a..d10514c15d 100644
--- a/libs/eea-java-17/src/main/resources/javax/imageio/spi/ImageTranscoderSpi.eea
+++ b/libs/eea-java-17/src/main/resources/javax/imageio/spi/ImageTranscoderSpi.eea
@@ -5,7 +5,7 @@ class javax/imageio/spi/ImageTranscoderSpi
  (Ljava/lang/String;Ljava/lang/String;)V
 createTranscoderInstance
  ()Ljavax/imageio/ImageTranscoder;
- ()Ljavax/imageio/ImageTranscoder;
+ ()L1javax/imageio/ImageTranscoder;
 getReaderServiceProviderName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/imageio/spi/ImageWriterSpi.eea b/libs/eea-java-17/src/main/resources/javax/imageio/spi/ImageWriterSpi.eea
index d9a3884876..bb7136daf8 100644
--- a/libs/eea-java-17/src/main/resources/javax/imageio/spi/ImageWriterSpi.eea
+++ b/libs/eea-java-17/src/main/resources/javax/imageio/spi/ImageWriterSpi.eea
@@ -22,10 +22,10 @@ canEncodeImage
  (Ljavax/imageio/ImageTypeSpecifier;)Z
 createWriterInstance
  ()Ljavax/imageio/ImageWriter;
- ()Ljavax/imageio/ImageWriter;
+ ()L1javax/imageio/ImageWriter;
 createWriterInstance
  (Ljava/lang/Object;)Ljavax/imageio/ImageWriter;
- (Ljava/lang/Object;)Ljavax/imageio/ImageWriter;
+ (Ljava/lang/Object;)L1javax/imageio/ImageWriter;
 getImageReaderSpiNames
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/imageio/spi/ServiceRegistry.eea b/libs/eea-java-17/src/main/resources/javax/imageio/spi/ServiceRegistry.eea
index 8d77a7663a..b45f2e88cd 100644
--- a/libs/eea-java-17/src/main/resources/javax/imageio/spi/ServiceRegistry.eea
+++ b/libs/eea-java-17/src/main/resources/javax/imageio/spi/ServiceRegistry.eea
@@ -27,10 +27,10 @@ getCategories
  ()Ljava/util/Iterator<Ljava/lang/Class<*>;>;
 getServiceProviderByClass
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)T0T;
 getServiceProviders
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljavax/imageio/spi/ServiceRegistry$Filter;Z)Ljava/util/Iterator<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljavax/imageio/spi/ServiceRegistry$Filter;Z)Ljava/util/Iterator<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljavax/imageio/spi/ServiceRegistry$Filter;Z)L1java/util/Iterator<TT;>;
 getServiceProviders
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Z)Ljava/util/Iterator<TT;>;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Z)Ljava/util/Iterator<TT;>;
diff --git a/libs/eea-java-17/src/main/resources/javax/lang/model/element/ModuleElement$DirectiveVisitor.eea b/libs/eea-java-17/src/main/resources/javax/lang/model/element/ModuleElement$DirectiveVisitor.eea
index 0189cdee69..e8659adc82 100644
--- a/libs/eea-java-17/src/main/resources/javax/lang/model/element/ModuleElement$DirectiveVisitor.eea
+++ b/libs/eea-java-17/src/main/resources/javax/lang/model/element/ModuleElement$DirectiveVisitor.eea
@@ -22,7 +22,7 @@ visitRequires
  (Ljavax/lang/model/element/ModuleElement$RequiresDirective;TP;)TR;
 visitUnknown
  (Ljavax/lang/model/element/ModuleElement$Directive;TP;)TR;
- (Ljavax/lang/model/element/ModuleElement$Directive;TP;)TR;
+ (Ljavax/lang/model/element/ModuleElement$Directive;TP;)T1R;
 visitUses
  (Ljavax/lang/model/element/ModuleElement$UsesDirective;TP;)TR;
  (Ljavax/lang/model/element/ModuleElement$UsesDirective;TP;)TR;
diff --git a/libs/eea-java-17/src/main/resources/javax/lang/model/util/AbstractAnnotationValueVisitor6.eea b/libs/eea-java-17/src/main/resources/javax/lang/model/util/AbstractAnnotationValueVisitor6.eea
index 1ba2cd34e2..e85c4e1458 100644
--- a/libs/eea-java-17/src/main/resources/javax/lang/model/util/AbstractAnnotationValueVisitor6.eea
+++ b/libs/eea-java-17/src/main/resources/javax/lang/model/util/AbstractAnnotationValueVisitor6.eea
@@ -14,4 +14,4 @@ visit
  (Ljavax/lang/model/element/AnnotationValue;TP;)TR;
 visitUnknown
  (Ljavax/lang/model/element/AnnotationValue;TP;)TR;
- (Ljavax/lang/model/element/AnnotationValue;TP;)TR;
+ (Ljavax/lang/model/element/AnnotationValue;TP;)T1R;
diff --git a/libs/eea-java-17/src/main/resources/javax/lang/model/util/Elements.eea b/libs/eea-java-17/src/main/resources/javax/lang/model/util/Elements.eea
index 91e786c8f2..6271a2237a 100644
--- a/libs/eea-java-17/src/main/resources/javax/lang/model/util/Elements.eea
+++ b/libs/eea-java-17/src/main/resources/javax/lang/model/util/Elements.eea
@@ -29,10 +29,10 @@ getElementValuesWithDefaults
  (Ljavax/lang/model/element/AnnotationMirror;)Ljava/util/Map<+Ljavax/lang/model/element/ExecutableElement;+Ljavax/lang/model/element/AnnotationValue;>;
 getModuleElement
  (Ljava/lang/CharSequence;)Ljavax/lang/model/element/ModuleElement;
- (Ljava/lang/CharSequence;)Ljavax/lang/model/element/ModuleElement;
+ (Ljava/lang/CharSequence;)L0javax/lang/model/element/ModuleElement;
 getModuleOf
  (Ljavax/lang/model/element/Element;)Ljavax/lang/model/element/ModuleElement;
- (Ljavax/lang/model/element/Element;)Ljavax/lang/model/element/ModuleElement;
+ (Ljavax/lang/model/element/Element;)L0javax/lang/model/element/ModuleElement;
 getName
  (Ljava/lang/CharSequence;)Ljavax/lang/model/element/Name;
  (Ljava/lang/CharSequence;)Ljavax/lang/model/element/Name;
@@ -50,7 +50,7 @@ getPackageElement
  (Ljava/lang/CharSequence;)Ljavax/lang/model/element/PackageElement;
 getPackageElement
  (Ljavax/lang/model/element/ModuleElement;Ljava/lang/CharSequence;)Ljavax/lang/model/element/PackageElement;
- (Ljavax/lang/model/element/ModuleElement;Ljava/lang/CharSequence;)Ljavax/lang/model/element/PackageElement;
+ (Ljavax/lang/model/element/ModuleElement;Ljava/lang/CharSequence;)L0javax/lang/model/element/PackageElement;
 getPackageOf
  (Ljavax/lang/model/element/Element;)Ljavax/lang/model/element/PackageElement;
  (L1javax/lang/model/element/Element;)L0javax/lang/model/element/PackageElement;
@@ -59,7 +59,7 @@ getTypeElement
  (Ljava/lang/CharSequence;)Ljavax/lang/model/element/TypeElement;
 getTypeElement
  (Ljavax/lang/model/element/ModuleElement;Ljava/lang/CharSequence;)Ljavax/lang/model/element/TypeElement;
- (Ljavax/lang/model/element/ModuleElement;Ljava/lang/CharSequence;)Ljavax/lang/model/element/TypeElement;
+ (Ljavax/lang/model/element/ModuleElement;Ljava/lang/CharSequence;)L0javax/lang/model/element/TypeElement;
 hides
  (Ljavax/lang/model/element/Element;Ljavax/lang/model/element/Element;)Z
  (Ljavax/lang/model/element/Element;Ljavax/lang/model/element/Element;)Z
@@ -83,4 +83,4 @@ printElements
  (Ljava/io/Writer;[Ljavax/lang/model/element/Element;)V
 recordComponentFor
  (Ljavax/lang/model/element/ExecutableElement;)Ljavax/lang/model/element/RecordComponentElement;
- (Ljavax/lang/model/element/ExecutableElement;)Ljavax/lang/model/element/RecordComponentElement;
+ (Ljavax/lang/model/element/ExecutableElement;)L0javax/lang/model/element/RecordComponentElement;
diff --git a/libs/eea-java-17/src/main/resources/javax/management/AttributeValueExp.eea b/libs/eea-java-17/src/main/resources/javax/management/AttributeValueExp.eea
index 2ef9478507..31153855f3 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/AttributeValueExp.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/AttributeValueExp.eea
@@ -5,10 +5,10 @@ class javax/management/AttributeValueExp
  (Ljava/lang/String;)V
 apply
  (Ljavax/management/ObjectName;)Ljavax/management/ValueExp;
- (Ljavax/management/ObjectName;)Ljavax/management/ValueExp;
+ (Ljavax/management/ObjectName;)L1javax/management/ValueExp;
 getAttribute
  (Ljavax/management/ObjectName;)Ljava/lang/Object;
- (Ljavax/management/ObjectName;)Ljava/lang/Object;
+ (Ljavax/management/ObjectName;)L0java/lang/Object;
 getAttributeName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/management/ImmutableDescriptor.eea b/libs/eea-java-17/src/main/resources/javax/management/ImmutableDescriptor.eea
index dd72371f5b..56eeba7410 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/ImmutableDescriptor.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/ImmutableDescriptor.eea
@@ -28,13 +28,13 @@ getFieldNames
  ()[Ljava/lang/String;
 getFieldValue
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 getFieldValues
  ([Ljava/lang/String;)[Ljava/lang/Object;
  ([Ljava/lang/String;)[Ljava/lang/Object;
 getFields
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 removeField
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/management/MBeanServer.eea b/libs/eea-java-17/src/main/resources/javax/management/MBeanServer.eea
index ace980f19e..8374a8319a 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/MBeanServer.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/MBeanServer.eea
@@ -8,25 +8,25 @@ addNotificationListener
  (Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/management/NotificationFilter;Ljava/lang/Object;)V
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;)L1javax/management/ObjectInstance; # @Inherited(javax.management.MBeanServerConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;)L1javax/management/ObjectInstance; # @Inherited(javax.management.MBeanServerConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)L1javax/management/ObjectInstance; # @Inherited(javax.management.MBeanServerConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)L1javax/management/ObjectInstance; # @Inherited(javax.management.MBeanServerConnection)
 deserialize
  (Ljava/lang/String;Ljavax/management/ObjectName;[B)Ljava/io/ObjectInputStream;
- (Ljava/lang/String;Ljavax/management/ObjectName;[B)Ljava/io/ObjectInputStream;
+ (Ljava/lang/String;Ljavax/management/ObjectName;[B)L1java/io/ObjectInputStream;
 deserialize
  (Ljava/lang/String;[B)Ljava/io/ObjectInputStream;
- (Ljava/lang/String;[B)Ljava/io/ObjectInputStream;
+ (Ljava/lang/String;[B)L1java/io/ObjectInputStream;
 deserialize
  (Ljavax/management/ObjectName;[B)Ljava/io/ObjectInputStream;
- (Ljavax/management/ObjectName;[B)Ljava/io/ObjectInputStream;
+ (Ljavax/management/ObjectName;[B)L1java/io/ObjectInputStream;
 getAttribute
  (Ljavax/management/ObjectName;Ljava/lang/String;)Ljava/lang/Object;
  (Ljavax/management/ObjectName;Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-java-17/src/main/resources/javax/management/MBeanServerConnection.eea b/libs/eea-java-17/src/main/resources/javax/management/MBeanServerConnection.eea
index 3e8b9137df..63f9696e18 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/MBeanServerConnection.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/MBeanServerConnection.eea
@@ -8,16 +8,16 @@ addNotificationListener
  (Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/management/NotificationFilter;Ljava/lang/Object;)V
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;)L1javax/management/ObjectInstance;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;)L1javax/management/ObjectInstance;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)L1javax/management/ObjectInstance;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)L1javax/management/ObjectInstance;
 getAttribute
  (Ljavax/management/ObjectName;Ljava/lang/String;)Ljava/lang/Object;
  (Ljavax/management/ObjectName;Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-java-17/src/main/resources/javax/management/MBeanServerDelegate.eea b/libs/eea-java-17/src/main/resources/javax/management/MBeanServerDelegate.eea
index 06779316b8..68cffe6af6 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/MBeanServerDelegate.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/MBeanServerDelegate.eea
@@ -9,10 +9,10 @@ addNotificationListener
  (Ljavax/management/NotificationListener;Ljavax/management/NotificationFilter;Ljava/lang/Object;)V
 getImplementationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getImplementationVendor
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getImplementationVersion
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -21,16 +21,16 @@ getMBeanServerId
  ()Ljava/lang/String;
 getNotificationInfo
  ()[Ljavax/management/MBeanNotificationInfo;
- ()[Ljavax/management/MBeanNotificationInfo;
+ ()[1Ljavax/management/MBeanNotificationInfo;
 getSpecificationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSpecificationVendor
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSpecificationVersion
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 removeNotificationListener
  (Ljavax/management/NotificationListener;)V
  (L1javax/management/NotificationListener;)V # @Inherited(javax.management.NotificationBroadcaster)
diff --git a/libs/eea-java-17/src/main/resources/javax/management/ObjectName.eea b/libs/eea-java-17/src/main/resources/javax/management/ObjectName.eea
index 393f5d0eae..6321ded6d2 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/ObjectName.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/ObjectName.eea
@@ -10,22 +10,22 @@ WILDCARD
 
 getInstance
  (Ljava/lang/String;)Ljavax/management/ObjectName;
- (Ljava/lang/String;)Ljavax/management/ObjectName;
+ (Ljava/lang/String;)L1javax/management/ObjectName;
 getInstance
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/management/ObjectName;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/management/ObjectName;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1javax/management/ObjectName;
 getInstance
  (Ljava/lang/String;Ljava/util/Hashtable<Ljava/lang/String;Ljava/lang/String;>;)Ljavax/management/ObjectName;
- (Ljava/lang/String;Ljava/util/Hashtable<Ljava/lang/String;Ljava/lang/String;>;)Ljavax/management/ObjectName;
+ (Ljava/lang/String;Ljava/util/Hashtable<Ljava/lang/String;Ljava/lang/String;>;)L1javax/management/ObjectName;
 getInstance
  (Ljavax/management/ObjectName;)Ljavax/management/ObjectName;
  (Ljavax/management/ObjectName;)Ljavax/management/ObjectName;
 quote
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 unquote
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 
 <init>
  (Ljava/lang/String;)V
@@ -59,10 +59,10 @@ getKeyProperty
  (Ljava/lang/String;)Ljava/lang/String;
 getKeyPropertyList
  ()Ljava/util/Hashtable<Ljava/lang/String;Ljava/lang/String;>;
- ()Ljava/util/Hashtable<Ljava/lang/String;Ljava/lang/String;>;
+ ()L1java/util/Hashtable<Ljava/lang/String;Ljava/lang/String;>;
 getKeyPropertyListString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 isPropertyValuePattern
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-java-17/src/main/resources/javax/management/Query.eea b/libs/eea-java-17/src/main/resources/javax/management/Query.eea
index cd19300a3b..f6b1f455d8 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/Query.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/Query.eea
@@ -2,22 +2,22 @@ class javax/management/Query
 
 and
  (Ljavax/management/QueryExp;Ljavax/management/QueryExp;)Ljavax/management/QueryExp;
- (Ljavax/management/QueryExp;Ljavax/management/QueryExp;)Ljavax/management/QueryExp;
+ (Ljavax/management/QueryExp;Ljavax/management/QueryExp;)L1javax/management/QueryExp;
 anySubString
  (Ljavax/management/AttributeValueExp;Ljavax/management/StringValueExp;)Ljavax/management/QueryExp;
  (Ljavax/management/AttributeValueExp;Ljavax/management/StringValueExp;)Ljavax/management/QueryExp;
 attr
  (Ljava/lang/String;)Ljavax/management/AttributeValueExp;
- (Ljava/lang/String;)Ljavax/management/AttributeValueExp;
+ (Ljava/lang/String;)L1javax/management/AttributeValueExp;
 attr
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/management/AttributeValueExp;
- (Ljava/lang/String;Ljava/lang/String;)Ljavax/management/AttributeValueExp;
+ (Ljava/lang/String;Ljava/lang/String;)L1javax/management/AttributeValueExp;
 between
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/QueryExp;
- (Ljavax/management/ValueExp;Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/QueryExp;
+ (Ljavax/management/ValueExp;Ljavax/management/ValueExp;Ljavax/management/ValueExp;)L1javax/management/QueryExp;
 classattr
  ()Ljavax/management/AttributeValueExp;
- ()Ljavax/management/AttributeValueExp;
+ ()L1javax/management/AttributeValueExp;
 div
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/ValueExp;
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/ValueExp;
@@ -35,13 +35,13 @@ gt
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/QueryExp;
 in
  (Ljavax/management/ValueExp;[Ljavax/management/ValueExp;)Ljavax/management/QueryExp;
- (Ljavax/management/ValueExp;[Ljavax/management/ValueExp;)Ljavax/management/QueryExp;
+ (Ljavax/management/ValueExp;[Ljavax/management/ValueExp;)L1javax/management/QueryExp;
 initialSubString
  (Ljavax/management/AttributeValueExp;Ljavax/management/StringValueExp;)Ljavax/management/QueryExp;
  (Ljavax/management/AttributeValueExp;Ljavax/management/StringValueExp;)Ljavax/management/QueryExp;
 isInstanceOf
  (Ljavax/management/StringValueExp;)Ljavax/management/QueryExp;
- (Ljavax/management/StringValueExp;)Ljavax/management/QueryExp;
+ (Ljavax/management/StringValueExp;)L1javax/management/QueryExp;
 leq
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/QueryExp;
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/QueryExp;
@@ -50,16 +50,16 @@ lt
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/QueryExp;
 match
  (Ljavax/management/AttributeValueExp;Ljavax/management/StringValueExp;)Ljavax/management/QueryExp;
- (Ljavax/management/AttributeValueExp;Ljavax/management/StringValueExp;)Ljavax/management/QueryExp;
+ (Ljavax/management/AttributeValueExp;Ljavax/management/StringValueExp;)L1javax/management/QueryExp;
 minus
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/ValueExp;
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/ValueExp;
 not
  (Ljavax/management/QueryExp;)Ljavax/management/QueryExp;
- (Ljavax/management/QueryExp;)Ljavax/management/QueryExp;
+ (Ljavax/management/QueryExp;)L1javax/management/QueryExp;
 or
  (Ljavax/management/QueryExp;Ljavax/management/QueryExp;)Ljavax/management/QueryExp;
- (Ljavax/management/QueryExp;Ljavax/management/QueryExp;)Ljavax/management/QueryExp;
+ (Ljavax/management/QueryExp;Ljavax/management/QueryExp;)L1javax/management/QueryExp;
 plus
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/ValueExp;
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/ValueExp;
@@ -68,7 +68,7 @@ times
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/ValueExp;
 value
  (D)Ljavax/management/ValueExp;
- (D)Ljavax/management/ValueExp;
+ (D)L1javax/management/ValueExp;
 value
  (F)Ljavax/management/ValueExp;
  (F)Ljavax/management/ValueExp;
@@ -77,13 +77,13 @@ value
  (I)Ljavax/management/ValueExp;
 value
  (J)Ljavax/management/ValueExp;
- (J)Ljavax/management/ValueExp;
+ (J)L1javax/management/ValueExp;
 value
  (Ljava/lang/Number;)Ljavax/management/ValueExp;
- (Ljava/lang/Number;)Ljavax/management/ValueExp;
+ (Ljava/lang/Number;)L1javax/management/ValueExp;
 value
  (Ljava/lang/String;)Ljavax/management/StringValueExp;
- (Ljava/lang/String;)Ljavax/management/StringValueExp;
+ (Ljava/lang/String;)L1javax/management/StringValueExp;
 value
  (Z)Ljavax/management/ValueExp;
- (Z)Ljavax/management/ValueExp;
+ (Z)L1javax/management/ValueExp;
diff --git a/libs/eea-java-17/src/main/resources/javax/management/StandardMBean.eea b/libs/eea-java-17/src/main/resources/javax/management/StandardMBean.eea
index ee6a5a71b8..97a3168b1a 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/StandardMBean.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/StandardMBean.eea
@@ -29,7 +29,7 @@ getClassName
  (Ljavax/management/MBeanInfo;)Ljava/lang/String;
 getConstructors
  ([Ljavax/management/MBeanConstructorInfo;Ljava/lang/Object;)[Ljavax/management/MBeanConstructorInfo;
- ([Ljavax/management/MBeanConstructorInfo;Ljava/lang/Object;)[Ljavax/management/MBeanConstructorInfo;
+ ([Ljavax/management/MBeanConstructorInfo;Ljava/lang/Object;)[0Ljavax/management/MBeanConstructorInfo;
 getDescription
  (Ljavax/management/MBeanAttributeInfo;)Ljava/lang/String;
  (Ljavax/management/MBeanAttributeInfo;)Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/management/loading/MLet.eea b/libs/eea-java-17/src/main/resources/javax/management/loading/MLet.eea
index 01bfee50f3..f154266682 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/loading/MLet.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/loading/MLet.eea
@@ -38,7 +38,7 @@ getLibraryDirectory
  ()Ljava/lang/String;
 getMBeansFromURL
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/Object;>;
- (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/Object;>;
+ (Ljava/lang/String;)L1java/util/Set<Ljava/lang/Object;>;
 getMBeansFromURL
  (Ljava/net/URL;)Ljava/util/Set<Ljava/lang/Object;>;
  (Ljava/net/URL;)Ljava/util/Set<Ljava/lang/Object;>;
diff --git a/libs/eea-java-17/src/main/resources/javax/management/modelmbean/DescriptorSupport.eea b/libs/eea-java-17/src/main/resources/javax/management/modelmbean/DescriptorSupport.eea
index 68c5d4b998..c02a2b7478 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/modelmbean/DescriptorSupport.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/modelmbean/DescriptorSupport.eea
@@ -20,16 +20,16 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getFieldNames
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 getFieldValue
  (Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;)Ljava/lang/Object;
 getFieldValues
  ([Ljava/lang/String;)[Ljava/lang/Object;
- ([Ljava/lang/String;)[Ljava/lang/Object;
+ ([Ljava/lang/String;)[1Ljava/lang/Object;
 getFields
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 removeField
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
@@ -44,4 +44,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toXMLString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/management/modelmbean/ModelMBeanInfoSupport.eea b/libs/eea-java-17/src/main/resources/javax/management/modelmbean/ModelMBeanInfoSupport.eea
index fd479f4e3d..32cd11d118 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/modelmbean/ModelMBeanInfoSupport.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/modelmbean/ModelMBeanInfoSupport.eea
@@ -26,10 +26,10 @@ getDescriptor
  (Ljava/lang/String;)Ljavax/management/Descriptor;
 getDescriptor
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/management/Descriptor;
- (Ljava/lang/String;Ljava/lang/String;)Ljavax/management/Descriptor;
+ (Ljava/lang/String;Ljava/lang/String;)L0javax/management/Descriptor;
 getDescriptors
  (Ljava/lang/String;)[Ljavax/management/Descriptor;
- (Ljava/lang/String;)[Ljavax/management/Descriptor;
+ (Ljava/lang/String;)[1Ljavax/management/Descriptor;
 getMBeanDescriptor
  ()Ljavax/management/Descriptor;
  ()Ljavax/management/Descriptor;
diff --git a/libs/eea-java-17/src/main/resources/javax/management/modelmbean/RequiredModelMBean.eea b/libs/eea-java-17/src/main/resources/javax/management/modelmbean/RequiredModelMBean.eea
index 63a295a360..afcb47b9ad 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/modelmbean/RequiredModelMBean.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/modelmbean/RequiredModelMBean.eea
@@ -14,7 +14,7 @@ getAttribute
  (Ljava/lang/String;)Ljava/lang/Object;
 getAttributes
  ([Ljava/lang/String;)Ljavax/management/AttributeList;
- ([Ljava/lang/String;)Ljavax/management/AttributeList;
+ ([Ljava/lang/String;)L1javax/management/AttributeList;
 getClassLoaderRepository
  ()Ljavax/management/loading/ClassLoaderRepository;
  ()Ljavax/management/loading/ClassLoaderRepository;
@@ -23,7 +23,7 @@ getMBeanInfo
  ()Ljavax/management/MBeanInfo;
 getNotificationInfo
  ()[Ljavax/management/MBeanNotificationInfo;
- ()[Ljavax/management/MBeanNotificationInfo;
+ ()[1Ljavax/management/MBeanNotificationInfo;
 invoke
  (Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/String;)Ljava/lang/Object;
@@ -59,7 +59,7 @@ setAttribute
  (Ljavax/management/Attribute;)V
 setAttributes
  (Ljavax/management/AttributeList;)Ljavax/management/AttributeList;
- (Ljavax/management/AttributeList;)Ljavax/management/AttributeList;
+ (Ljavax/management/AttributeList;)L1javax/management/AttributeList;
 setManagedResource
  (Ljava/lang/Object;Ljava/lang/String;)V
  (Ljava/lang/Object;Ljava/lang/String;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/management/monitor/CounterMonitor.eea b/libs/eea-java-17/src/main/resources/javax/management/monitor/CounterMonitor.eea
index 7368488e56..6bae4aa0e8 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/monitor/CounterMonitor.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/monitor/CounterMonitor.eea
@@ -2,7 +2,7 @@ class javax/management/monitor/CounterMonitor
 
 getDerivedGauge
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getDerivedGauge
  (Ljavax/management/ObjectName;)Ljava/lang/Number;
  (Ljavax/management/ObjectName;)Ljava/lang/Number;
@@ -26,7 +26,7 @@ getThreshold
  ()Ljava/lang/Number;
 getThreshold
  (Ljavax/management/ObjectName;)Ljava/lang/Number;
- (Ljavax/management/ObjectName;)Ljava/lang/Number;
+ (Ljavax/management/ObjectName;)L0java/lang/Number;
 setInitThreshold
  (Ljava/lang/Number;)V
  (Ljava/lang/Number;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/management/monitor/GaugeMonitor.eea b/libs/eea-java-17/src/main/resources/javax/management/monitor/GaugeMonitor.eea
index 9a43814c34..7bcbaf5b48 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/monitor/GaugeMonitor.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/monitor/GaugeMonitor.eea
@@ -2,7 +2,7 @@ class javax/management/monitor/GaugeMonitor
 
 getDerivedGauge
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getDerivedGauge
  (Ljavax/management/ObjectName;)Ljava/lang/Number;
  (Ljavax/management/ObjectName;)Ljava/lang/Number;
diff --git a/libs/eea-java-17/src/main/resources/javax/management/monitor/Monitor.eea b/libs/eea-java-17/src/main/resources/javax/management/monitor/Monitor.eea
index 993e9e2570..8382b4d672 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/monitor/Monitor.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/monitor/Monitor.eea
@@ -21,10 +21,10 @@ getObservedAttribute
  ()Ljava/lang/String;
 getObservedObject
  ()Ljavax/management/ObjectName;
- ()Ljavax/management/ObjectName;
+ ()L0javax/management/ObjectName;
 getObservedObjects
  ()[Ljavax/management/ObjectName;
- ()[Ljavax/management/ObjectName;
+ ()[1Ljavax/management/ObjectName;
 postRegister
  (Ljava/lang/Boolean;)V
  (Ljava/lang/Boolean;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/management/monitor/StringMonitor.eea b/libs/eea-java-17/src/main/resources/javax/management/monitor/StringMonitor.eea
index acf8c770c2..3c96ff1119 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/monitor/StringMonitor.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/monitor/StringMonitor.eea
@@ -2,7 +2,7 @@ class javax/management/monitor/StringMonitor
 
 getDerivedGauge
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getDerivedGauge
  (Ljavax/management/ObjectName;)Ljava/lang/String;
  (Ljavax/management/ObjectName;)Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/management/openmbean/CompositeDataSupport.eea b/libs/eea-java-17/src/main/resources/javax/management/openmbean/CompositeDataSupport.eea
index a6bc0a2951..d86cbc6fca 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/openmbean/CompositeDataSupport.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/openmbean/CompositeDataSupport.eea
@@ -20,7 +20,7 @@ get
  (Ljava/lang/String;)Ljava/lang/Object;
 getAll
  ([Ljava/lang/String;)[Ljava/lang/Object;
- ([Ljava/lang/String;)[Ljava/lang/Object;
+ ([Ljava/lang/String;)[1Ljava/lang/Object;
 getCompositeType
  ()Ljavax/management/openmbean/CompositeType;
  ()Ljavax/management/openmbean/CompositeType;
diff --git a/libs/eea-java-17/src/main/resources/javax/management/relation/MBeanServerNotificationFilter.eea b/libs/eea-java-17/src/main/resources/javax/management/relation/MBeanServerNotificationFilter.eea
index 3d5e5fac0b..a3df2336fe 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/relation/MBeanServerNotificationFilter.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/relation/MBeanServerNotificationFilter.eea
@@ -8,10 +8,10 @@ enableObjectName
  (Ljavax/management/ObjectName;)V
 getDisabledObjectNames
  ()Ljava/util/Vector<Ljavax/management/ObjectName;>;
- ()Ljava/util/Vector<Ljavax/management/ObjectName;>;
+ ()L0java/util/Vector<Ljavax/management/ObjectName;>;
 getEnabledObjectNames
  ()Ljava/util/Vector<Ljavax/management/ObjectName;>;
- ()Ljava/util/Vector<Ljavax/management/ObjectName;>;
+ ()L0java/util/Vector<Ljavax/management/ObjectName;>;
 isNotificationEnabled
  (Ljavax/management/Notification;)Z
  (Ljavax/management/Notification;)Z
diff --git a/libs/eea-java-17/src/main/resources/javax/management/relation/RelationService.eea b/libs/eea-java-17/src/main/resources/javax/management/relation/RelationService.eea
index 93ec74b4a5..e4b5eeef97 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/relation/RelationService.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/relation/RelationService.eea
@@ -20,19 +20,19 @@ createRelationType
  (Ljava/lang/String;[Ljavax/management/relation/RoleInfo;)V
 findAssociatedMBeans
  (Ljavax/management/ObjectName;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map<Ljavax/management/ObjectName;Ljava/util/List<Ljava/lang/String;>;>;
- (Ljavax/management/ObjectName;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map<Ljavax/management/ObjectName;Ljava/util/List<Ljava/lang/String;>;>;
+ (Ljavax/management/ObjectName;Ljava/lang/String;Ljava/lang/String;)L1java/util/Map<Ljavax/management/ObjectName;Ljava/util/List<Ljava/lang/String;>;>;
 findReferencingRelations
  (Ljavax/management/ObjectName;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;
- (Ljavax/management/ObjectName;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;
+ (Ljavax/management/ObjectName;Ljava/lang/String;Ljava/lang/String;)L1java/util/Map<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;
 findRelationsOfType
  (Ljava/lang/String;)Ljava/util/List<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/List<Ljava/lang/String;>;
+ (Ljava/lang/String;)L1java/util/List<Ljava/lang/String;>;
 getAllRelationIds
  ()Ljava/util/List<Ljava/lang/String;>;
- ()Ljava/util/List<Ljava/lang/String;>;
+ ()L1java/util/List<Ljava/lang/String;>;
 getAllRelationTypeNames
  ()Ljava/util/List<Ljava/lang/String;>;
- ()Ljava/util/List<Ljava/lang/String;>;
+ ()L1java/util/List<Ljava/lang/String;>;
 getAllRoles
  (Ljava/lang/String;)Ljavax/management/relation/RoleResult;
  (Ljava/lang/String;)Ljavax/management/relation/RoleResult;
@@ -47,7 +47,7 @@ getRelationTypeName
  (Ljava/lang/String;)Ljava/lang/String;
 getRole
  (Ljava/lang/String;Ljava/lang/String;)Ljava/util/List<Ljavax/management/ObjectName;>;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/util/List<Ljavax/management/ObjectName;>;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/util/List<Ljavax/management/ObjectName;>;
 getRoleCardinality
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Integer;
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Integer;
@@ -71,7 +71,7 @@ isRelation
  (Ljavax/management/ObjectName;)Ljava/lang/String;
 isRelationMBean
  (Ljava/lang/String;)Ljavax/management/ObjectName;
- (Ljava/lang/String;)Ljavax/management/ObjectName;
+ (Ljava/lang/String;)L0javax/management/ObjectName;
 postRegister
  (Ljava/lang/Boolean;)V
  (Ljava/lang/Boolean;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/management/relation/RelationSupport.eea b/libs/eea-java-17/src/main/resources/javax/management/relation/RelationSupport.eea
index dd3350e0fa..caa6b49a8e 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/relation/RelationSupport.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/relation/RelationSupport.eea
@@ -11,7 +11,7 @@ getAllRoles
  ()Ljavax/management/relation/RoleResult;
 getReferencedMBeans
  ()Ljava/util/Map<Ljavax/management/ObjectName;Ljava/util/List<Ljava/lang/String;>;>;
- ()Ljava/util/Map<Ljavax/management/ObjectName;Ljava/util/List<Ljava/lang/String;>;>;
+ ()L1java/util/Map<Ljavax/management/ObjectName;Ljava/util/List<Ljava/lang/String;>;>;
 getRelationId
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -44,7 +44,7 @@ preRegister
  (Ljavax/management/MBeanServer;Ljavax/management/ObjectName;)Ljavax/management/ObjectName;
 retrieveAllRoles
  ()Ljavax/management/relation/RoleList;
- ()Ljavax/management/relation/RoleList;
+ ()L1javax/management/relation/RoleList;
 setRelationServiceManagementFlag
  (Ljava/lang/Boolean;)V
  (Ljava/lang/Boolean;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/management/relation/RelationTypeSupport.eea b/libs/eea-java-17/src/main/resources/javax/management/relation/RelationTypeSupport.eea
index f4dab79cc4..56712c5bf7 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/relation/RelationTypeSupport.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/relation/RelationTypeSupport.eea
@@ -17,4 +17,4 @@ getRoleInfo
  (Ljava/lang/String;)Ljavax/management/relation/RoleInfo;
 getRoleInfos
  ()Ljava/util/List<Ljavax/management/relation/RoleInfo;>;
- ()Ljava/util/List<Ljavax/management/relation/RoleInfo;>;
+ ()L1java/util/List<Ljavax/management/relation/RoleInfo;>;
diff --git a/libs/eea-java-17/src/main/resources/javax/management/relation/Role.eea b/libs/eea-java-17/src/main/resources/javax/management/relation/Role.eea
index 5e20a76f59..e3385a36ef 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/relation/Role.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/relation/Role.eea
@@ -2,7 +2,7 @@ class javax/management/relation/Role
 
 roleValueToString
  (Ljava/util/List<Ljavax/management/ObjectName;>;)Ljava/lang/String;
- (Ljava/util/List<Ljavax/management/ObjectName;>;)Ljava/lang/String;
+ (Ljava/util/List<Ljavax/management/ObjectName;>;)L1java/lang/String;
 
 <init>
  (Ljava/lang/String;Ljava/util/List<Ljavax/management/ObjectName;>;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIConnection.eea b/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIConnection.eea
index 1934fdb326..739f21e022 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIConnection.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIConnection.eea
@@ -8,16 +8,16 @@ addNotificationListeners
  ([Ljavax/management/ObjectName;[Ljava/rmi/MarshalledObject;[Ljavax/security/auth/Subject;)[Ljava/lang/Integer;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance;
 fetchNotifications
  (JIJ)Ljavax/management/remote/NotificationResult;
  (JIJ)Ljavax/management/remote/NotificationResult;
diff --git a/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIConnectionImpl.eea b/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIConnectionImpl.eea
index 0c18f7e290..cab2e91d94 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIConnectionImpl.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIConnectionImpl.eea
@@ -8,22 +8,22 @@ addNotificationListener
  (Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;Ljava/rmi/MarshalledObject;Ljavax/security/auth/Subject;)V
 addNotificationListeners
  ([Ljavax/management/ObjectName;[Ljava/rmi/MarshalledObject;[Ljavax/security/auth/Subject;)[Ljava/lang/Integer;
- ([Ljavax/management/ObjectName;[Ljava/rmi/MarshalledObject;[Ljavax/security/auth/Subject;)[Ljava/lang/Integer;
+ ([Ljavax/management/ObjectName;[Ljava/rmi/MarshalledObject;[Ljavax/security/auth/Subject;)[1Ljava/lang/Integer;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance; # @Inherited(javax.management.remote.rmi.RMIConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance; # @Inherited(javax.management.remote.rmi.RMIConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance; # @Inherited(javax.management.remote.rmi.RMIConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance; # @Inherited(javax.management.remote.rmi.RMIConnection)
 fetchNotifications
  (JIJ)Ljavax/management/remote/NotificationResult;
- (JIJ)Ljavax/management/remote/NotificationResult;
+ (JIJ)L0javax/management/remote/NotificationResult;
 getAttribute
  (Ljavax/management/ObjectName;Ljava/lang/String;Ljavax/security/auth/Subject;)Ljava/lang/Object;
  (Ljavax/management/ObjectName;Ljava/lang/String;Ljavax/security/auth/Subject;)Ljava/lang/Object;
diff --git a/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIConnectionImpl_Stub.eea b/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIConnectionImpl_Stub.eea
index 69225c12db..d5ae39362c 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIConnectionImpl_Stub.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIConnectionImpl_Stub.eea
@@ -11,16 +11,16 @@ addNotificationListeners
  ([Ljavax/management/ObjectName;[Ljava/rmi/MarshalledObject;[Ljavax/security/auth/Subject;)[Ljava/lang/Integer;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance; # @Inherited(javax.management.remote.rmi.RMIConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance; # @Inherited(javax.management.remote.rmi.RMIConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance; # @Inherited(javax.management.remote.rmi.RMIConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance; # @Inherited(javax.management.remote.rmi.RMIConnection)
 fetchNotifications
  (JIJ)Ljavax/management/remote/NotificationResult;
  (JIJ)Ljavax/management/remote/NotificationResult;
diff --git a/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIConnectorServer.eea b/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIConnectorServer.eea
index 2cfa788c4f..3407cfc1e2 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIConnectorServer.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIConnectorServer.eea
@@ -36,7 +36,7 @@ connectionOpened
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
 getAddress
  ()Ljavax/management/remote/JMXServiceURL;
- ()Ljavax/management/remote/JMXServiceURL;
+ ()L0javax/management/remote/JMXServiceURL;
 getAttributes
  ()Ljava/util/Map<Ljava/lang/String;*>;
  ()Ljava/util/Map<Ljava/lang/String;*>;
@@ -45,4 +45,4 @@ setMBeanServerForwarder
  (Ljavax/management/remote/MBeanServerForwarder;)V
 toJMXConnector
  (Ljava/util/Map<Ljava/lang/String;*>;)Ljavax/management/remote/JMXConnector;
- (Ljava/util/Map<Ljava/lang/String;*>;)Ljavax/management/remote/JMXConnector;
+ (Ljava/util/Map<Ljava/lang/String;*>;)L1javax/management/remote/JMXConnector;
diff --git a/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIIIOPServerImpl.eea b/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIIIOPServerImpl.eea
index 35bbeefc2b..b910ed9f9b 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIIIOPServerImpl.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIIIOPServerImpl.eea
@@ -8,10 +8,10 @@ closeClient
  (Ljavax/management/remote/rmi/RMIConnection;)V
 getProtocol
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 makeClient
  (Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/remote/rmi/RMIConnection;
- (Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/remote/rmi/RMIConnection;
+ (Ljava/lang/String;Ljavax/security/auth/Subject;)L1javax/management/remote/rmi/RMIConnection;
 toStub
  ()Ljava/rmi/Remote;
- ()Ljava/rmi/Remote;
+ ()L1java/rmi/Remote;
diff --git a/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIJRMPServerImpl.eea b/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIJRMPServerImpl.eea
index d1b415967c..e2dc380f4c 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIJRMPServerImpl.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIJRMPServerImpl.eea
@@ -8,10 +8,10 @@ closeClient
  (Ljavax/management/remote/rmi/RMIConnection;)V
 getProtocol
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 makeClient
  (Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/remote/rmi/RMIConnection;
- (Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/remote/rmi/RMIConnection;
+ (Ljava/lang/String;Ljavax/security/auth/Subject;)L1javax/management/remote/rmi/RMIConnection;
 toStub
  ()Ljava/rmi/Remote;
  ()Ljava/rmi/Remote;
diff --git a/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIServerImpl.eea b/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIServerImpl.eea
index ee2dd03dac..77e86a2595 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIServerImpl.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/remote/rmi/RMIServerImpl.eea
@@ -20,7 +20,7 @@ getProtocol
  ()Ljava/lang/String;
 getVersion
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 makeClient
  (Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/remote/rmi/RMIConnection;
  (Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/remote/rmi/RMIConnection;
diff --git a/libs/eea-java-17/src/main/resources/javax/management/timer/Timer.eea b/libs/eea-java-17/src/main/resources/javax/management/timer/Timer.eea
index bf43b96b85..9da1fb6637 100644
--- a/libs/eea-java-17/src/main/resources/javax/management/timer/Timer.eea
+++ b/libs/eea-java-17/src/main/resources/javax/management/timer/Timer.eea
@@ -14,34 +14,34 @@ addNotification
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;Ljava/util/Date;JJZ)Ljava/lang/Integer;
 getAllNotificationIDs
  ()Ljava/util/Vector<Ljava/lang/Integer;>;
- ()Ljava/util/Vector<Ljava/lang/Integer;>;
+ ()L1java/util/Vector<Ljava/lang/Integer;>;
 getDate
  (Ljava/lang/Integer;)Ljava/util/Date;
- (Ljava/lang/Integer;)Ljava/util/Date;
+ (Ljava/lang/Integer;)L0java/util/Date;
 getFixedRate
  (Ljava/lang/Integer;)Ljava/lang/Boolean;
- (Ljava/lang/Integer;)Ljava/lang/Boolean;
+ (Ljava/lang/Integer;)L0java/lang/Boolean;
 getNbOccurences
  (Ljava/lang/Integer;)Ljava/lang/Long;
- (Ljava/lang/Integer;)Ljava/lang/Long;
+ (Ljava/lang/Integer;)L0java/lang/Long;
 getNotificationIDs
  (Ljava/lang/String;)Ljava/util/Vector<Ljava/lang/Integer;>;
- (Ljava/lang/String;)Ljava/util/Vector<Ljava/lang/Integer;>;
+ (Ljava/lang/String;)L1java/util/Vector<Ljava/lang/Integer;>;
 getNotificationInfo
  ()[Ljavax/management/MBeanNotificationInfo;
  ()[Ljavax/management/MBeanNotificationInfo;
 getNotificationMessage
  (Ljava/lang/Integer;)Ljava/lang/String;
- (Ljava/lang/Integer;)Ljava/lang/String;
+ (Ljava/lang/Integer;)L0java/lang/String;
 getNotificationType
  (Ljava/lang/Integer;)Ljava/lang/String;
- (Ljava/lang/Integer;)Ljava/lang/String;
+ (Ljava/lang/Integer;)L0java/lang/String;
 getNotificationUserData
  (Ljava/lang/Integer;)Ljava/lang/Object;
- (Ljava/lang/Integer;)Ljava/lang/Object;
+ (Ljava/lang/Integer;)L0java/lang/Object;
 getPeriod
  (Ljava/lang/Integer;)Ljava/lang/Long;
- (Ljava/lang/Integer;)Ljava/lang/Long;
+ (Ljava/lang/Integer;)L0java/lang/Long;
 postRegister
  (Ljava/lang/Boolean;)V
  (Ljava/lang/Boolean;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/naming/CompositeName.eea b/libs/eea-java-17/src/main/resources/javax/naming/CompositeName.eea
index a353607940..7563c958b9 100644
--- a/libs/eea-java-17/src/main/resources/javax/naming/CompositeName.eea
+++ b/libs/eea-java-17/src/main/resources/javax/naming/CompositeName.eea
@@ -38,10 +38,10 @@ getAll
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
 getPrefix
  (I)Ljavax/naming/Name;
- (I)Ljavax/naming/Name;
+ (I)L1javax/naming/Name;
 getSuffix
  (I)Ljavax/naming/Name;
- (I)Ljavax/naming/Name;
+ (I)L1javax/naming/Name;
 remove
  (I)Ljava/lang/Object;
  (I)Ljava/lang/Object;
diff --git a/libs/eea-java-17/src/main/resources/javax/naming/CompoundName.eea b/libs/eea-java-17/src/main/resources/javax/naming/CompoundName.eea
index 7bc9135079..35c8ed9b25 100644
--- a/libs/eea-java-17/src/main/resources/javax/naming/CompoundName.eea
+++ b/libs/eea-java-17/src/main/resources/javax/naming/CompoundName.eea
@@ -42,10 +42,10 @@ getAll
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
 getPrefix
  (I)Ljavax/naming/Name;
- (I)Ljavax/naming/Name;
+ (I)L1javax/naming/Name;
 getSuffix
  (I)Ljavax/naming/Name;
- (I)Ljavax/naming/Name;
+ (I)L1javax/naming/Name;
 remove
  (I)Ljava/lang/Object;
  (I)Ljava/lang/Object;
diff --git a/libs/eea-java-17/src/main/resources/javax/naming/Context.eea b/libs/eea-java-17/src/main/resources/javax/naming/Context.eea
index d2f162699c..fcfc1da2e1 100644
--- a/libs/eea-java-17/src/main/resources/javax/naming/Context.eea
+++ b/libs/eea-java-17/src/main/resources/javax/naming/Context.eea
@@ -63,10 +63,10 @@ composeName
  (Ljavax/naming/Name;Ljavax/naming/Name;)Ljavax/naming/Name;
 createSubcontext
  (Ljava/lang/String;)Ljavax/naming/Context;
- (Ljava/lang/String;)Ljavax/naming/Context;
+ (Ljava/lang/String;)L1javax/naming/Context;
 createSubcontext
  (Ljavax/naming/Name;)Ljavax/naming/Context;
- (Ljavax/naming/Name;)Ljavax/naming/Context;
+ (Ljavax/naming/Name;)L1javax/naming/Context;
 destroySubcontext
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/naming/InitialContext.eea b/libs/eea-java-17/src/main/resources/javax/naming/InitialContext.eea
index f86cb3b7ce..91526ee959 100644
--- a/libs/eea-java-17/src/main/resources/javax/naming/InitialContext.eea
+++ b/libs/eea-java-17/src/main/resources/javax/naming/InitialContext.eea
@@ -34,10 +34,10 @@ composeName
  (Ljavax/naming/Name;Ljavax/naming/Name;)Ljavax/naming/Name;
 createSubcontext
  (Ljava/lang/String;)Ljavax/naming/Context;
- (Ljava/lang/String;)Ljavax/naming/Context;
+ (Ljava/lang/String;)L1javax/naming/Context; # @Inherited(javax.naming.Context)
 createSubcontext
  (Ljavax/naming/Name;)Ljavax/naming/Context;
- (Ljavax/naming/Name;)Ljavax/naming/Context;
+ (Ljavax/naming/Name;)L1javax/naming/Context; # @Inherited(javax.naming.Context)
 destroySubcontext
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/naming/LinkException.eea b/libs/eea-java-17/src/main/resources/javax/naming/LinkException.eea
index 261faab820..bb01fc325d 100644
--- a/libs/eea-java-17/src/main/resources/javax/naming/LinkException.eea
+++ b/libs/eea-java-17/src/main/resources/javax/naming/LinkException.eea
@@ -45,4 +45,4 @@ toString
  ()L1java/lang/String; # @Inherited(javax.naming.NamingException)
 toString
  (Z)Ljava/lang/String;
- (Z)Ljava/lang/String;
+ (Z)L1java/lang/String; # @Inherited(javax.naming.NamingException)
diff --git a/libs/eea-java-17/src/main/resources/javax/naming/NamingException.eea b/libs/eea-java-17/src/main/resources/javax/naming/NamingException.eea
index c89fcf5bb7..edf12903ea 100644
--- a/libs/eea-java-17/src/main/resources/javax/naming/NamingException.eea
+++ b/libs/eea-java-17/src/main/resources/javax/naming/NamingException.eea
@@ -60,4 +60,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Throwable)
 toString
  (Z)Ljava/lang/String;
- (Z)Ljava/lang/String;
+ (Z)L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/naming/Reference.eea b/libs/eea-java-17/src/main/resources/javax/naming/Reference.eea
index 86b94c0077..ceef018fd9 100644
--- a/libs/eea-java-17/src/main/resources/javax/naming/Reference.eea
+++ b/libs/eea-java-17/src/main/resources/javax/naming/Reference.eea
@@ -42,7 +42,7 @@ get
  (I)Ljavax/naming/RefAddr;
 get
  (Ljava/lang/String;)Ljavax/naming/RefAddr;
- (Ljava/lang/String;)Ljavax/naming/RefAddr;
+ (Ljava/lang/String;)L0javax/naming/RefAddr;
 getAll
  ()Ljava/util/Enumeration<Ljavax/naming/RefAddr;>;
  ()Ljava/util/Enumeration<Ljavax/naming/RefAddr;>;
diff --git a/libs/eea-java-17/src/main/resources/javax/naming/directory/BasicAttribute.eea b/libs/eea-java-17/src/main/resources/javax/naming/directory/BasicAttribute.eea
index 12036d3836..fa92249183 100644
--- a/libs/eea-java-17/src/main/resources/javax/naming/directory/BasicAttribute.eea
+++ b/libs/eea-java-17/src/main/resources/javax/naming/directory/BasicAttribute.eea
@@ -45,10 +45,10 @@ getAll
  ()Ljavax/naming/NamingEnumeration<*1>; # @Inherited(javax.naming.directory.Attribute)
 getAttributeDefinition
  ()Ljavax/naming/directory/DirContext;
- ()Ljavax/naming/directory/DirContext;
+ ()L1javax/naming/directory/DirContext;
 getAttributeSyntaxDefinition
  ()Ljavax/naming/directory/DirContext;
- ()Ljavax/naming/directory/DirContext;
+ ()L1javax/naming/directory/DirContext;
 getID
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/naming/directory/BasicAttributes.eea b/libs/eea-java-17/src/main/resources/javax/naming/directory/BasicAttributes.eea
index 537270a5b8..6ee3706779 100644
--- a/libs/eea-java-17/src/main/resources/javax/naming/directory/BasicAttributes.eea
+++ b/libs/eea-java-17/src/main/resources/javax/naming/directory/BasicAttributes.eea
@@ -17,7 +17,7 @@ get
  (L1java/lang/String;)L0javax/naming/directory/Attribute; # @Inherited(javax.naming.directory.Attributes)
 getAll
  ()Ljavax/naming/NamingEnumeration<Ljavax/naming/directory/Attribute;>;
- ()Ljavax/naming/NamingEnumeration<Ljavax/naming/directory/Attribute;>;
+ ()L1javax/naming/NamingEnumeration<Ljavax/naming/directory/Attribute;>;
 getIDs
  ()Ljavax/naming/NamingEnumeration<Ljava/lang/String;>;
  ()L1javax/naming/NamingEnumeration<Ljava/lang/String;>; # @Inherited(javax.naming.directory.Attributes)
diff --git a/libs/eea-java-17/src/main/resources/javax/naming/directory/DirContext.eea b/libs/eea-java-17/src/main/resources/javax/naming/directory/DirContext.eea
index b32f9a0ee9..48b217d591 100644
--- a/libs/eea-java-17/src/main/resources/javax/naming/directory/DirContext.eea
+++ b/libs/eea-java-17/src/main/resources/javax/naming/directory/DirContext.eea
@@ -8,10 +8,10 @@ bind
  (Ljavax/naming/Name;Ljava/lang/Object;Ljavax/naming/directory/Attributes;)V
 createSubcontext
  (Ljava/lang/String;Ljavax/naming/directory/Attributes;)Ljavax/naming/directory/DirContext;
- (Ljava/lang/String;Ljavax/naming/directory/Attributes;)Ljavax/naming/directory/DirContext;
+ (Ljava/lang/String;Ljavax/naming/directory/Attributes;)L1javax/naming/directory/DirContext;
 createSubcontext
  (Ljavax/naming/Name;Ljavax/naming/directory/Attributes;)Ljavax/naming/directory/DirContext;
- (Ljavax/naming/Name;Ljavax/naming/directory/Attributes;)Ljavax/naming/directory/DirContext;
+ (Ljavax/naming/Name;Ljavax/naming/directory/Attributes;)L1javax/naming/directory/DirContext;
 getAttributes
  (Ljava/lang/String;)Ljavax/naming/directory/Attributes;
  (Ljava/lang/String;)Ljavax/naming/directory/Attributes;
diff --git a/libs/eea-java-17/src/main/resources/javax/naming/directory/InitialDirContext.eea b/libs/eea-java-17/src/main/resources/javax/naming/directory/InitialDirContext.eea
index e79b41c0d5..7655e3fb67 100644
--- a/libs/eea-java-17/src/main/resources/javax/naming/directory/InitialDirContext.eea
+++ b/libs/eea-java-17/src/main/resources/javax/naming/directory/InitialDirContext.eea
@@ -11,10 +11,10 @@ bind
  (Ljavax/naming/Name;Ljava/lang/Object;Ljavax/naming/directory/Attributes;)V
 createSubcontext
  (Ljava/lang/String;Ljavax/naming/directory/Attributes;)Ljavax/naming/directory/DirContext;
- (Ljava/lang/String;Ljavax/naming/directory/Attributes;)Ljavax/naming/directory/DirContext;
+ (Ljava/lang/String;Ljavax/naming/directory/Attributes;)L1javax/naming/directory/DirContext; # @Inherited(javax.naming.directory.DirContext)
 createSubcontext
  (Ljavax/naming/Name;Ljavax/naming/directory/Attributes;)Ljavax/naming/directory/DirContext;
- (Ljavax/naming/Name;Ljavax/naming/directory/Attributes;)Ljavax/naming/directory/DirContext;
+ (Ljavax/naming/Name;Ljavax/naming/directory/Attributes;)L1javax/naming/directory/DirContext; # @Inherited(javax.naming.directory.DirContext)
 getAttributes
  (Ljava/lang/String;)Ljavax/naming/directory/Attributes;
  (Ljava/lang/String;)Ljavax/naming/directory/Attributes;
diff --git a/libs/eea-java-17/src/main/resources/javax/naming/ldap/ExtendedRequest.eea b/libs/eea-java-17/src/main/resources/javax/naming/ldap/ExtendedRequest.eea
index 1b404247e6..f189a4d9a4 100644
--- a/libs/eea-java-17/src/main/resources/javax/naming/ldap/ExtendedRequest.eea
+++ b/libs/eea-java-17/src/main/resources/javax/naming/ldap/ExtendedRequest.eea
@@ -2,7 +2,7 @@ class javax/naming/ldap/ExtendedRequest
 
 createExtendedResponse
  (Ljava/lang/String;[BII)Ljavax/naming/ldap/ExtendedResponse;
- (Ljava/lang/String;[BII)Ljavax/naming/ldap/ExtendedResponse;
+ (Ljava/lang/String;[BII)L1javax/naming/ldap/ExtendedResponse;
 getEncodedValue
  ()[B
  ()[B
diff --git a/libs/eea-java-17/src/main/resources/javax/naming/ldap/LdapName.eea b/libs/eea-java-17/src/main/resources/javax/naming/ldap/LdapName.eea
index 30152704e5..8c0eef185f 100644
--- a/libs/eea-java-17/src/main/resources/javax/naming/ldap/LdapName.eea
+++ b/libs/eea-java-17/src/main/resources/javax/naming/ldap/LdapName.eea
@@ -47,10 +47,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 get
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 getAll
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
- ()Ljava/util/Enumeration<Ljava/lang/String;>;
+ ()L1java/util/Enumeration<Ljava/lang/String;>;
 getPrefix
  (I)Ljavax/naming/Name;
  (I)Ljavax/naming/Name;
@@ -62,10 +62,10 @@ getRdns
  ()Ljava/util/List<Ljavax/naming/ldap/Rdn;>;
 getSuffix
  (I)Ljavax/naming/Name;
- (I)Ljavax/naming/Name;
+ (I)L0javax/naming/Name;
 remove
  (I)Ljava/lang/Object;
- (I)Ljava/lang/Object;
+ (I)L1java/lang/Object;
 startsWith
  (Ljava/util/List<Ljavax/naming/ldap/Rdn;>;)Z
  (Ljava/util/List<Ljavax/naming/ldap/Rdn;>;)Z
diff --git a/libs/eea-java-17/src/main/resources/javax/naming/ldap/PagedResultsResponseControl.eea b/libs/eea-java-17/src/main/resources/javax/naming/ldap/PagedResultsResponseControl.eea
index e9b3cd075d..b2d6097d7e 100644
--- a/libs/eea-java-17/src/main/resources/javax/naming/ldap/PagedResultsResponseControl.eea
+++ b/libs/eea-java-17/src/main/resources/javax/naming/ldap/PagedResultsResponseControl.eea
@@ -9,4 +9,4 @@ OID
  (Ljava/lang/String;Z[B)V
 getCookie
  ()[B
- ()[B
+ ()[0B
diff --git a/libs/eea-java-17/src/main/resources/javax/naming/ldap/StartTlsRequest.eea b/libs/eea-java-17/src/main/resources/javax/naming/ldap/StartTlsRequest.eea
index 25a705e506..0a65e59b66 100644
--- a/libs/eea-java-17/src/main/resources/javax/naming/ldap/StartTlsRequest.eea
+++ b/libs/eea-java-17/src/main/resources/javax/naming/ldap/StartTlsRequest.eea
@@ -6,10 +6,10 @@ OID
 
 createExtendedResponse
  (Ljava/lang/String;[BII)Ljavax/naming/ldap/ExtendedResponse;
- (Ljava/lang/String;[BII)Ljavax/naming/ldap/ExtendedResponse;
+ (Ljava/lang/String;[BII)L1javax/naming/ldap/ExtendedResponse; # @Inherited(javax.naming.ldap.ExtendedRequest)
 getEncodedValue
  ()[B
- ()[B
+ ()[0B
 getID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/naming/ldap/StartTlsResponse.eea b/libs/eea-java-17/src/main/resources/javax/naming/ldap/StartTlsResponse.eea
index 6a20714860..bcb1860c14 100644
--- a/libs/eea-java-17/src/main/resources/javax/naming/ldap/StartTlsResponse.eea
+++ b/libs/eea-java-17/src/main/resources/javax/naming/ldap/StartTlsResponse.eea
@@ -6,10 +6,10 @@ OID
 
 getEncodedValue
  ()[B
- ()[B
+ ()[0B
 getID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 negotiate
  ()Ljavax/net/ssl/SSLSession;
  ()Ljavax/net/ssl/SSLSession;
diff --git a/libs/eea-java-17/src/main/resources/javax/naming/spi/DirectoryManager.eea b/libs/eea-java-17/src/main/resources/javax/naming/spi/DirectoryManager.eea
index 552d69a54d..f7755c97d4 100644
--- a/libs/eea-java-17/src/main/resources/javax/naming/spi/DirectoryManager.eea
+++ b/libs/eea-java-17/src/main/resources/javax/naming/spi/DirectoryManager.eea
@@ -2,10 +2,10 @@ class javax/naming/spi/DirectoryManager
 
 getContinuationDirContext
  (Ljavax/naming/CannotProceedException;)Ljavax/naming/directory/DirContext;
- (Ljavax/naming/CannotProceedException;)Ljavax/naming/directory/DirContext;
+ (Ljavax/naming/CannotProceedException;)L1javax/naming/directory/DirContext;
 getObjectInstance
  (Ljava/lang/Object;Ljavax/naming/Name;Ljavax/naming/Context;Ljava/util/Hashtable<**>;Ljavax/naming/directory/Attributes;)Ljava/lang/Object;
  (Ljava/lang/Object;Ljavax/naming/Name;Ljavax/naming/Context;Ljava/util/Hashtable<**>;Ljavax/naming/directory/Attributes;)Ljava/lang/Object;
 getStateToBind
  (Ljava/lang/Object;Ljavax/naming/Name;Ljavax/naming/Context;Ljava/util/Hashtable<**>;Ljavax/naming/directory/Attributes;)Ljavax/naming/spi/DirStateFactory$Result;
- (Ljava/lang/Object;Ljavax/naming/Name;Ljavax/naming/Context;Ljava/util/Hashtable<**>;Ljavax/naming/directory/Attributes;)Ljavax/naming/spi/DirStateFactory$Result;
+ (Ljava/lang/Object;Ljavax/naming/Name;Ljavax/naming/Context;Ljava/util/Hashtable<**>;Ljavax/naming/directory/Attributes;)L1javax/naming/spi/DirStateFactory$Result;
diff --git a/libs/eea-java-17/src/main/resources/javax/naming/spi/InitialContextFactoryBuilder.eea b/libs/eea-java-17/src/main/resources/javax/naming/spi/InitialContextFactoryBuilder.eea
index 8da241c40a..22d2d30445 100644
--- a/libs/eea-java-17/src/main/resources/javax/naming/spi/InitialContextFactoryBuilder.eea
+++ b/libs/eea-java-17/src/main/resources/javax/naming/spi/InitialContextFactoryBuilder.eea
@@ -2,4 +2,4 @@ class javax/naming/spi/InitialContextFactoryBuilder
 
 createInitialContextFactory
  (Ljava/util/Hashtable<**>;)Ljavax/naming/spi/InitialContextFactory;
- (Ljava/util/Hashtable<**>;)Ljavax/naming/spi/InitialContextFactory;
+ (Ljava/util/Hashtable<**>;)L1javax/naming/spi/InitialContextFactory;
diff --git a/libs/eea-java-17/src/main/resources/javax/naming/spi/NamingManager.eea b/libs/eea-java-17/src/main/resources/javax/naming/spi/NamingManager.eea
index 681be23633..c1314c31fc 100644
--- a/libs/eea-java-17/src/main/resources/javax/naming/spi/NamingManager.eea
+++ b/libs/eea-java-17/src/main/resources/javax/naming/spi/NamingManager.eea
@@ -18,7 +18,7 @@ getStateToBind
  (Ljava/lang/Object;Ljavax/naming/Name;Ljavax/naming/Context;Ljava/util/Hashtable<**>;)Ljava/lang/Object;
 getURLContext
  (Ljava/lang/String;Ljava/util/Hashtable<**>;)Ljavax/naming/Context;
- (Ljava/lang/String;Ljava/util/Hashtable<**>;)Ljavax/naming/Context;
+ (Ljava/lang/String;Ljava/util/Hashtable<**>;)L0javax/naming/Context;
 setInitialContextFactoryBuilder
  (Ljavax/naming/spi/InitialContextFactoryBuilder;)V
  (Ljavax/naming/spi/InitialContextFactoryBuilder;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/naming/spi/ObjectFactoryBuilder.eea b/libs/eea-java-17/src/main/resources/javax/naming/spi/ObjectFactoryBuilder.eea
index a44a345470..475ae35699 100644
--- a/libs/eea-java-17/src/main/resources/javax/naming/spi/ObjectFactoryBuilder.eea
+++ b/libs/eea-java-17/src/main/resources/javax/naming/spi/ObjectFactoryBuilder.eea
@@ -2,4 +2,4 @@ class javax/naming/spi/ObjectFactoryBuilder
 
 createObjectFactory
  (Ljava/lang/Object;Ljava/util/Hashtable<**>;)Ljavax/naming/spi/ObjectFactory;
- (Ljava/lang/Object;Ljava/util/Hashtable<**>;)Ljavax/naming/spi/ObjectFactory;
+ (Ljava/lang/Object;Ljava/util/Hashtable<**>;)L1javax/naming/spi/ObjectFactory;
diff --git a/libs/eea-java-17/src/main/resources/javax/net/ServerSocketFactory.eea b/libs/eea-java-17/src/main/resources/javax/net/ServerSocketFactory.eea
index 341af7f869..f5c6c51b34 100644
--- a/libs/eea-java-17/src/main/resources/javax/net/ServerSocketFactory.eea
+++ b/libs/eea-java-17/src/main/resources/javax/net/ServerSocketFactory.eea
@@ -6,13 +6,13 @@ getDefault
 
 createServerSocket
  ()Ljava/net/ServerSocket;
- ()Ljava/net/ServerSocket;
+ ()L1java/net/ServerSocket;
 createServerSocket
  (I)Ljava/net/ServerSocket;
- (I)Ljava/net/ServerSocket;
+ (I)L1java/net/ServerSocket;
 createServerSocket
  (II)Ljava/net/ServerSocket;
- (II)Ljava/net/ServerSocket;
+ (II)L1java/net/ServerSocket;
 createServerSocket
  (IILjava/net/InetAddress;)Ljava/net/ServerSocket;
- (IILjava/net/InetAddress;)Ljava/net/ServerSocket;
+ (IILjava/net/InetAddress;)L1java/net/ServerSocket;
diff --git a/libs/eea-java-17/src/main/resources/javax/net/SocketFactory.eea b/libs/eea-java-17/src/main/resources/javax/net/SocketFactory.eea
index 3cd3910675..54db905521 100644
--- a/libs/eea-java-17/src/main/resources/javax/net/SocketFactory.eea
+++ b/libs/eea-java-17/src/main/resources/javax/net/SocketFactory.eea
@@ -6,16 +6,16 @@ getDefault
 
 createSocket
  ()Ljava/net/Socket;
- ()Ljava/net/Socket;
+ ()L1java/net/Socket;
 createSocket
  (Ljava/lang/String;I)Ljava/net/Socket;
- (Ljava/lang/String;I)Ljava/net/Socket;
+ (Ljava/lang/String;I)L1java/net/Socket;
 createSocket
  (Ljava/lang/String;ILjava/net/InetAddress;I)Ljava/net/Socket;
- (Ljava/lang/String;ILjava/net/InetAddress;I)Ljava/net/Socket;
+ (Ljava/lang/String;ILjava/net/InetAddress;I)L1java/net/Socket;
 createSocket
  (Ljava/net/InetAddress;I)Ljava/net/Socket;
- (Ljava/net/InetAddress;I)Ljava/net/Socket;
+ (Ljava/net/InetAddress;I)L1java/net/Socket;
 createSocket
  (Ljava/net/InetAddress;ILjava/net/InetAddress;I)Ljava/net/Socket;
- (Ljava/net/InetAddress;ILjava/net/InetAddress;I)Ljava/net/Socket;
+ (Ljava/net/InetAddress;ILjava/net/InetAddress;I)L1java/net/Socket;
diff --git a/libs/eea-java-17/src/main/resources/javax/net/ssl/ExtendedSSLSession.eea b/libs/eea-java-17/src/main/resources/javax/net/ssl/ExtendedSSLSession.eea
index c8f49de935..8700664eaf 100644
--- a/libs/eea-java-17/src/main/resources/javax/net/ssl/ExtendedSSLSession.eea
+++ b/libs/eea-java-17/src/main/resources/javax/net/ssl/ExtendedSSLSession.eea
@@ -8,7 +8,7 @@ getPeerSupportedSignatureAlgorithms
  ()[Ljava/lang/String;
 getRequestedServerNames
  ()Ljava/util/List<Ljavax/net/ssl/SNIServerName;>;
- ()Ljava/util/List<Ljavax/net/ssl/SNIServerName;>;
+ ()L1java/util/List<Ljavax/net/ssl/SNIServerName;>;
 getStatusResponses
  ()Ljava/util/List<[B>;
- ()Ljava/util/List<[B>;
+ ()L1java/util/List<[B>;
diff --git a/libs/eea-java-17/src/main/resources/javax/net/ssl/HttpsURLConnection.eea b/libs/eea-java-17/src/main/resources/javax/net/ssl/HttpsURLConnection.eea
index c82e64021c..2cbab8a85d 100644
--- a/libs/eea-java-17/src/main/resources/javax/net/ssl/HttpsURLConnection.eea
+++ b/libs/eea-java-17/src/main/resources/javax/net/ssl/HttpsURLConnection.eea
@@ -31,7 +31,7 @@ getLocalCertificates
  ()[Ljava/security/cert/Certificate;
 getLocalPrincipal
  ()Ljava/security/Principal;
- ()Ljava/security/Principal;
+ ()L0java/security/Principal;
 getPeerPrincipal
  ()Ljava/security/Principal;
  ()Ljava/security/Principal;
diff --git a/libs/eea-java-17/src/main/resources/javax/net/ssl/KeyManagerFactory.eea b/libs/eea-java-17/src/main/resources/javax/net/ssl/KeyManagerFactory.eea
index 907f85b544..af4a14e596 100644
--- a/libs/eea-java-17/src/main/resources/javax/net/ssl/KeyManagerFactory.eea
+++ b/libs/eea-java-17/src/main/resources/javax/net/ssl/KeyManagerFactory.eea
@@ -2,7 +2,7 @@ class javax/net/ssl/KeyManagerFactory
 
 getDefaultAlgorithm
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getInstance
  (Ljava/lang/String;)Ljavax/net/ssl/KeyManagerFactory;
  (Ljava/lang/String;)Ljavax/net/ssl/KeyManagerFactory;
diff --git a/libs/eea-java-17/src/main/resources/javax/net/ssl/SNIHostName.eea b/libs/eea-java-17/src/main/resources/javax/net/ssl/SNIHostName.eea
index ca434c7a71..8fc47d5513 100644
--- a/libs/eea-java-17/src/main/resources/javax/net/ssl/SNIHostName.eea
+++ b/libs/eea-java-17/src/main/resources/javax/net/ssl/SNIHostName.eea
@@ -2,7 +2,7 @@ class javax/net/ssl/SNIHostName
 
 createSNIMatcher
  (Ljava/lang/String;)Ljavax/net/ssl/SNIMatcher;
- (Ljava/lang/String;)Ljavax/net/ssl/SNIMatcher;
+ (Ljava/lang/String;)L1javax/net/ssl/SNIMatcher;
 
 <init>
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLContext.eea b/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLContext.eea
index 7df6dcf8a4..9bb1ab25d3 100644
--- a/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLContext.eea
+++ b/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLContext.eea
@@ -21,10 +21,10 @@ setDefault
  (Ljavax/net/ssl/SSLContextSpi;Ljava/security/Provider;Ljava/lang/String;)V
 createSSLEngine
  ()Ljavax/net/ssl/SSLEngine;
- ()Ljavax/net/ssl/SSLEngine;
+ ()L1javax/net/ssl/SSLEngine;
 createSSLEngine
  (Ljava/lang/String;I)Ljavax/net/ssl/SSLEngine;
- (Ljava/lang/String;I)Ljavax/net/ssl/SSLEngine;
+ (Ljava/lang/String;I)L1javax/net/ssl/SSLEngine;
 getClientSessionContext
  ()Ljavax/net/ssl/SSLSessionContext;
  ()Ljavax/net/ssl/SSLSessionContext;
diff --git a/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLEngine.eea b/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLEngine.eea
index ba28fd745a..2729128c45 100644
--- a/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLEngine.eea
+++ b/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLEngine.eea
@@ -5,7 +5,7 @@ class javax/net/ssl/SSLEngine
  (Ljava/lang/String;I)V
 getApplicationProtocol
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getDelegatedTask
  ()Ljava/lang/Runnable;
  ()Ljava/lang/Runnable;
@@ -17,13 +17,13 @@ getEnabledProtocols
  ()[Ljava/lang/String;
 getHandshakeApplicationProtocol
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getHandshakeApplicationProtocolSelector
  ()Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLEngine;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
- ()Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLEngine;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
+ ()L1java/util/function/BiFunction<Ljavax/net/ssl/SSLEngine;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
 getHandshakeSession
  ()Ljavax/net/ssl/SSLSession;
- ()Ljavax/net/ssl/SSLSession;
+ ()L1javax/net/ssl/SSLSession;
 getHandshakeStatus
  ()Ljavax/net/ssl/SSLEngineResult$HandshakeStatus;
  ()Ljavax/net/ssl/SSLEngineResult$HandshakeStatus;
@@ -32,7 +32,7 @@ getPeerHost
  ()Ljava/lang/String;
 getSSLParameters
  ()Ljavax/net/ssl/SSLParameters;
- ()Ljavax/net/ssl/SSLParameters;
+ ()L1javax/net/ssl/SSLParameters;
 getSession
  ()Ljavax/net/ssl/SSLSession;
  ()Ljavax/net/ssl/SSLSession;
diff --git a/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLParameters.eea b/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLParameters.eea
index dbe1406046..971dc4d225 100644
--- a/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLParameters.eea
+++ b/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLParameters.eea
@@ -23,10 +23,10 @@ getProtocols
  ()[Ljava/lang/String;
 getSNIMatchers
  ()Ljava/util/Collection<Ljavax/net/ssl/SNIMatcher;>;
- ()Ljava/util/Collection<Ljavax/net/ssl/SNIMatcher;>;
+ ()L0java/util/Collection<Ljavax/net/ssl/SNIMatcher;>;
 getServerNames
  ()Ljava/util/List<Ljavax/net/ssl/SNIServerName;>;
- ()Ljava/util/List<Ljavax/net/ssl/SNIServerName;>;
+ ()L0java/util/List<Ljavax/net/ssl/SNIServerName;>;
 setAlgorithmConstraints
  (Ljava/security/AlgorithmConstraints;)V
  (Ljava/security/AlgorithmConstraints;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLServerSocket.eea b/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLServerSocket.eea
index ef7465695f..16d134aad6 100644
--- a/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLServerSocket.eea
+++ b/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLServerSocket.eea
@@ -11,7 +11,7 @@ getEnabledProtocols
  ()[Ljava/lang/String;
 getSSLParameters
  ()Ljavax/net/ssl/SSLParameters;
- ()Ljavax/net/ssl/SSLParameters;
+ ()L1javax/net/ssl/SSLParameters;
 getSupportedCipherSuites
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLSession.eea b/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLSession.eea
index abdcb3ff95..bbad32201d 100644
--- a/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLSession.eea
+++ b/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLSession.eea
@@ -14,7 +14,7 @@ getLocalPrincipal
  ()Ljava/security/Principal;
 getPeerCertificateChain
  ()[Ljavax/security/cert/X509Certificate;
- ()[Ljavax/security/cert/X509Certificate;
+ ()[1Ljavax/security/cert/X509Certificate;
 getPeerCertificates
  ()[Ljava/security/cert/Certificate;
  ()[Ljava/security/cert/Certificate;
diff --git a/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLSocket.eea b/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLSocket.eea
index 394b0b49a7..982b0d12f8 100644
--- a/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLSocket.eea
+++ b/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLSocket.eea
@@ -17,7 +17,7 @@ addHandshakeCompletedListener
  (L1javax/net/ssl/HandshakeCompletedListener;)V
 getApplicationProtocol
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getEnabledCipherSuites
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
@@ -26,16 +26,16 @@ getEnabledProtocols
  ()[Ljava/lang/String;
 getHandshakeApplicationProtocol
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getHandshakeApplicationProtocolSelector
  ()Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLSocket;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
- ()Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLSocket;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
+ ()L1java/util/function/BiFunction<Ljavax/net/ssl/SSLSocket;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
 getHandshakeSession
  ()Ljavax/net/ssl/SSLSession;
- ()Ljavax/net/ssl/SSLSession;
+ ()L1javax/net/ssl/SSLSession;
 getSSLParameters
  ()Ljavax/net/ssl/SSLParameters;
- ()Ljavax/net/ssl/SSLParameters;
+ ()L1javax/net/ssl/SSLParameters;
 getSession
  ()Ljavax/net/ssl/SSLSession;
  ()Ljavax/net/ssl/SSLSession;
diff --git a/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLSocketFactory.eea b/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLSocketFactory.eea
index 1950029695..f6fd2e482a 100644
--- a/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLSocketFactory.eea
+++ b/libs/eea-java-17/src/main/resources/javax/net/ssl/SSLSocketFactory.eea
@@ -6,10 +6,10 @@ getDefault
 
 createSocket
  (Ljava/net/Socket;Ljava/io/InputStream;Z)Ljava/net/Socket;
- (Ljava/net/Socket;Ljava/io/InputStream;Z)Ljava/net/Socket;
+ (Ljava/net/Socket;Ljava/io/InputStream;Z)L1java/net/Socket;
 createSocket
  (Ljava/net/Socket;Ljava/lang/String;IZ)Ljava/net/Socket;
- (Ljava/net/Socket;Ljava/lang/String;IZ)Ljava/net/Socket;
+ (Ljava/net/Socket;Ljava/lang/String;IZ)L1java/net/Socket;
 getDefaultCipherSuites
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/net/ssl/X509ExtendedKeyManager.eea b/libs/eea-java-17/src/main/resources/javax/net/ssl/X509ExtendedKeyManager.eea
index f74f47ee83..9f341c1755 100644
--- a/libs/eea-java-17/src/main/resources/javax/net/ssl/X509ExtendedKeyManager.eea
+++ b/libs/eea-java-17/src/main/resources/javax/net/ssl/X509ExtendedKeyManager.eea
@@ -2,7 +2,7 @@ class javax/net/ssl/X509ExtendedKeyManager
 
 chooseEngineClientAlias
  ([Ljava/lang/String;[Ljava/security/Principal;Ljavax/net/ssl/SSLEngine;)Ljava/lang/String;
- ([Ljava/lang/String;[Ljava/security/Principal;Ljavax/net/ssl/SSLEngine;)Ljava/lang/String;
+ ([Ljava/lang/String;[Ljava/security/Principal;Ljavax/net/ssl/SSLEngine;)L0java/lang/String;
 chooseEngineServerAlias
  (Ljava/lang/String;[Ljava/security/Principal;Ljavax/net/ssl/SSLEngine;)Ljava/lang/String;
- (Ljava/lang/String;[Ljava/security/Principal;Ljavax/net/ssl/SSLEngine;)Ljava/lang/String;
+ (Ljava/lang/String;[Ljava/security/Principal;Ljavax/net/ssl/SSLEngine;)L0java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/MultiDocPrintService.eea b/libs/eea-java-17/src/main/resources/javax/print/MultiDocPrintService.eea
index a4a31e4695..36aa1285c3 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/MultiDocPrintService.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/MultiDocPrintService.eea
@@ -2,4 +2,4 @@ class javax/print/MultiDocPrintService
 
 createMultiDocPrintJob
  ()Ljavax/print/MultiDocPrintJob;
- ()Ljavax/print/MultiDocPrintJob;
+ ()L1javax/print/MultiDocPrintJob;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/PrintService.eea b/libs/eea-java-17/src/main/resources/javax/print/PrintService.eea
index dc5a7f1d8c..ed93cb70a7 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/PrintService.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/PrintService.eea
@@ -5,7 +5,7 @@ addPrintServiceAttributeListener
  (L1javax/print/event/PrintServiceAttributeListener;)V
 createPrintJob
  ()Ljavax/print/DocPrintJob;
- ()Ljavax/print/DocPrintJob;
+ ()L1javax/print/DocPrintJob;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/PrintServiceLookup.eea b/libs/eea-java-17/src/main/resources/javax/print/PrintServiceLookup.eea
index 6491c8f13f..8f74fbd116 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/PrintServiceLookup.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/PrintServiceLookup.eea
@@ -2,7 +2,7 @@ class javax/print/PrintServiceLookup
 
 lookupDefaultPrintService
  ()Ljavax/print/PrintService;
- ()Ljavax/print/PrintService;
+ ()L0javax/print/PrintService;
 lookupMultiDocPrintServices
  ([Ljavax/print/DocFlavor;Ljavax/print/attribute/AttributeSet;)[Ljavax/print/MultiDocPrintService;
  ([Ljavax/print/DocFlavor;Ljavax/print/attribute/AttributeSet;)[Ljavax/print/MultiDocPrintService;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/AttributeSetUtilities.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/AttributeSetUtilities.eea
index 24f843268a..28f333e405 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/AttributeSetUtilities.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/AttributeSetUtilities.eea
@@ -2,34 +2,34 @@ class javax/print/attribute/AttributeSetUtilities
 
 synchronizedView
  (Ljavax/print/attribute/AttributeSet;)Ljavax/print/attribute/AttributeSet;
- (Ljavax/print/attribute/AttributeSet;)Ljavax/print/attribute/AttributeSet;
+ (Ljavax/print/attribute/AttributeSet;)L1javax/print/attribute/AttributeSet;
 synchronizedView
  (Ljavax/print/attribute/DocAttributeSet;)Ljavax/print/attribute/DocAttributeSet;
- (Ljavax/print/attribute/DocAttributeSet;)Ljavax/print/attribute/DocAttributeSet;
+ (Ljavax/print/attribute/DocAttributeSet;)L1javax/print/attribute/DocAttributeSet;
 synchronizedView
  (Ljavax/print/attribute/PrintJobAttributeSet;)Ljavax/print/attribute/PrintJobAttributeSet;
- (Ljavax/print/attribute/PrintJobAttributeSet;)Ljavax/print/attribute/PrintJobAttributeSet;
+ (Ljavax/print/attribute/PrintJobAttributeSet;)L1javax/print/attribute/PrintJobAttributeSet;
 synchronizedView
  (Ljavax/print/attribute/PrintRequestAttributeSet;)Ljavax/print/attribute/PrintRequestAttributeSet;
- (Ljavax/print/attribute/PrintRequestAttributeSet;)Ljavax/print/attribute/PrintRequestAttributeSet;
+ (Ljavax/print/attribute/PrintRequestAttributeSet;)L1javax/print/attribute/PrintRequestAttributeSet;
 synchronizedView
  (Ljavax/print/attribute/PrintServiceAttributeSet;)Ljavax/print/attribute/PrintServiceAttributeSet;
- (Ljavax/print/attribute/PrintServiceAttributeSet;)Ljavax/print/attribute/PrintServiceAttributeSet;
+ (Ljavax/print/attribute/PrintServiceAttributeSet;)L1javax/print/attribute/PrintServiceAttributeSet;
 unmodifiableView
  (Ljavax/print/attribute/AttributeSet;)Ljavax/print/attribute/AttributeSet;
- (Ljavax/print/attribute/AttributeSet;)Ljavax/print/attribute/AttributeSet;
+ (Ljavax/print/attribute/AttributeSet;)L1javax/print/attribute/AttributeSet;
 unmodifiableView
  (Ljavax/print/attribute/DocAttributeSet;)Ljavax/print/attribute/DocAttributeSet;
- (Ljavax/print/attribute/DocAttributeSet;)Ljavax/print/attribute/DocAttributeSet;
+ (Ljavax/print/attribute/DocAttributeSet;)L1javax/print/attribute/DocAttributeSet;
 unmodifiableView
  (Ljavax/print/attribute/PrintJobAttributeSet;)Ljavax/print/attribute/PrintJobAttributeSet;
- (Ljavax/print/attribute/PrintJobAttributeSet;)Ljavax/print/attribute/PrintJobAttributeSet;
+ (Ljavax/print/attribute/PrintJobAttributeSet;)L1javax/print/attribute/PrintJobAttributeSet;
 unmodifiableView
  (Ljavax/print/attribute/PrintRequestAttributeSet;)Ljavax/print/attribute/PrintRequestAttributeSet;
- (Ljavax/print/attribute/PrintRequestAttributeSet;)Ljavax/print/attribute/PrintRequestAttributeSet;
+ (Ljavax/print/attribute/PrintRequestAttributeSet;)L1javax/print/attribute/PrintRequestAttributeSet;
 unmodifiableView
  (Ljavax/print/attribute/PrintServiceAttributeSet;)Ljavax/print/attribute/PrintServiceAttributeSet;
- (Ljavax/print/attribute/PrintServiceAttributeSet;)Ljavax/print/attribute/PrintServiceAttributeSet;
+ (Ljavax/print/attribute/PrintServiceAttributeSet;)L1javax/print/attribute/PrintServiceAttributeSet;
 verifyAttributeCategory
  (Ljava/lang/Object;Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
  (Ljava/lang/Object;Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/DateTimeSyntax.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/DateTimeSyntax.eea
index c90ad40fa5..19809d7862 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/DateTimeSyntax.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/DateTimeSyntax.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getValue
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L1java/util/Date;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/EnumSyntax.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/EnumSyntax.eea
index afc9d899bc..0fe81e3bd5 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/EnumSyntax.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/EnumSyntax.eea
@@ -5,10 +5,10 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String;
 readResolve
  ()Ljava/lang/Object;
  ()L1java/lang/Object;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/HashAttributeSet.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/HashAttributeSet.eea
index 049d58155a..f1403c0911 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/HashAttributeSet.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/HashAttributeSet.eea
@@ -47,4 +47,4 @@ remove
  (Ljavax/print/attribute/Attribute;)Z
 toArray
  ()[Ljavax/print/attribute/Attribute;
- ()[Ljavax/print/attribute/Attribute;
+ ()[1Ljavax/print/attribute/Attribute;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/ResolutionSyntax.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/ResolutionSyntax.eea
index e02d80f007..2a89154c94 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/ResolutionSyntax.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/ResolutionSyntax.eea
@@ -14,4 +14,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toString
  (ILjava/lang/String;)Ljava/lang/String;
- (ILjava/lang/String;)Ljava/lang/String;
+ (ILjava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/SetOfIntegerSyntax.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/SetOfIntegerSyntax.eea
index 950c851b39..7a11989b47 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/SetOfIntegerSyntax.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/SetOfIntegerSyntax.eea
@@ -14,7 +14,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getMembers
  ()[[I
- ()[[I
+ ()[1[I
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/Size2DSyntax.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/Size2DSyntax.eea
index 2a4dfc7dd9..38059f0905 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/Size2DSyntax.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/Size2DSyntax.eea
@@ -11,4 +11,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toString
  (ILjava/lang/String;)Ljava/lang/String;
- (ILjava/lang/String;)Ljava/lang/String;
+ (ILjava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Chromaticity.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Chromaticity.eea
index ece2e75e7a..056f20a71f 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Chromaticity.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Chromaticity.eea
@@ -9,13 +9,13 @@ MONOCHROME
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/ColorSupported.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/ColorSupported.eea
index 0335595d1f..b0562e04c2 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/ColorSupported.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/ColorSupported.eea
@@ -9,13 +9,13 @@ SUPPORTED
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Compression.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Compression.eea
index 371853820d..f1994aebcc 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Compression.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Compression.eea
@@ -15,13 +15,13 @@ NONE
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Copies.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Copies.eea
index c96479e8da..6c6fb67c80 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Copies.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Copies.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/CopiesSupported.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/CopiesSupported.eea
index 301eb3ccd1..0a4f00d59d 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/CopiesSupported.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/CopiesSupported.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.SetOfIntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/DateTimeAtCompleted.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/DateTimeAtCompleted.eea
index ce0d0d92af..3ab9bbce9e 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/DateTimeAtCompleted.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/DateTimeAtCompleted.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.DateTimeSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/DateTimeAtCreation.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/DateTimeAtCreation.eea
index 2e88f101b9..5b8d6ef94e 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/DateTimeAtCreation.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/DateTimeAtCreation.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.DateTimeSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/DateTimeAtProcessing.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/DateTimeAtProcessing.eea
index 0b2dca17d1..b42f8a3dd6 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/DateTimeAtProcessing.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/DateTimeAtProcessing.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.DateTimeSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Destination.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Destination.eea
index b96455abb4..c3a6e36089 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Destination.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Destination.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.URISyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/DialogOwner.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/DialogOwner.eea
index 5e3a9296ac..c5da43f726 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/DialogOwner.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/DialogOwner.eea
@@ -5,10 +5,10 @@ class javax/print/attribute/standard/DialogOwner
  (Ljava/awt/Window;)V
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getOwner
  ()Ljava/awt/Window;
  ()Ljava/awt/Window;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/DialogTypeSelection.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/DialogTypeSelection.eea
index 9c47e594c1..ac80ea19bc 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/DialogTypeSelection.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/DialogTypeSelection.eea
@@ -9,13 +9,13 @@ NATIVE
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/DocumentName.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/DocumentName.eea
index 8a7c11b08c..f498d5d88d 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/DocumentName.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/DocumentName.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Fidelity.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Fidelity.eea
index 63bfa40ca0..58e13fd7f9 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Fidelity.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Fidelity.eea
@@ -9,13 +9,13 @@ FIDELITY_TRUE
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Finishings.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Finishings.eea
index 1357f6fefa..a6df56577d 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Finishings.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Finishings.eea
@@ -57,13 +57,13 @@ STAPLE_TOP_RIGHT
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobHoldUntil.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobHoldUntil.eea
index 684302182e..7ddcd5aabd 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobHoldUntil.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobHoldUntil.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.DateTimeSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobImpressions.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobImpressions.eea
index d5b341e72e..1d1d87f8bf 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobImpressions.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobImpressions.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobImpressionsCompleted.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobImpressionsCompleted.eea
index 7669b7f8fe..d51e218b18 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobImpressionsCompleted.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobImpressionsCompleted.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobImpressionsSupported.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobImpressionsSupported.eea
index 9f661af3bb..62c5785181 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobImpressionsSupported.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobImpressionsSupported.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.SetOfIntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobKOctets.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobKOctets.eea
index 16cd5fad4a..53e9ce573a 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobKOctets.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobKOctets.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobKOctetsProcessed.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobKOctetsProcessed.eea
index 7653e5f930..3aadaa1456 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobKOctetsProcessed.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobKOctetsProcessed.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobKOctetsSupported.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobKOctetsSupported.eea
index 0c07f0ddfd..0a395f470e 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobKOctetsSupported.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobKOctetsSupported.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.SetOfIntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobMediaSheets.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobMediaSheets.eea
index 8fe91af3a9..5fd24899d7 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobMediaSheets.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobMediaSheets.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobMediaSheetsCompleted.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobMediaSheetsCompleted.eea
index abb63547b1..54bf7823e8 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobMediaSheetsCompleted.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobMediaSheetsCompleted.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobMediaSheetsSupported.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobMediaSheetsSupported.eea
index 44613fdb6d..3397cf5ce2 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobMediaSheetsSupported.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobMediaSheetsSupported.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.SetOfIntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobMessageFromOperator.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobMessageFromOperator.eea
index c753b8f050..f8a341b9a4 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobMessageFromOperator.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobMessageFromOperator.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobName.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobName.eea
index 4730df9237..aae5a6c33f 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobName.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobName.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobOriginatingUserName.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobOriginatingUserName.eea
index 36f04e9683..30d2e684ba 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobOriginatingUserName.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobOriginatingUserName.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobPriority.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobPriority.eea
index 95c3c301e3..6969067515 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobPriority.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobPriority.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobPrioritySupported.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobPrioritySupported.eea
index 2027309a54..541b1651f1 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobPrioritySupported.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobPrioritySupported.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobSheets.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobSheets.eea
index 5621b554b1..75a0bab3be 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobSheets.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobSheets.eea
@@ -9,13 +9,13 @@ STANDARD
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobState.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobState.eea
index 558ee0dff2..88deb16943 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobState.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobState.eea
@@ -27,13 +27,13 @@ UNKNOWN
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobStateReason.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobStateReason.eea
index 906f510643..cdc3d1b274 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobStateReason.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobStateReason.eea
@@ -90,13 +90,13 @@ UNSUPPORTED_DOCUMENT_FORMAT
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobStateReasons.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobStateReasons.eea
index 00e699d836..668bceaa94 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobStateReasons.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/JobStateReasons.eea
@@ -12,7 +12,7 @@ add
  (Ljavax/print/attribute/standard/JobStateReason;)Z
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Media.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Media.eea
index 7ee0e6e9fb..2f52fb01ea 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Media.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Media.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/MediaName.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/MediaName.eea
index a94eb9bdf9..79f5466e3a 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/MediaName.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/MediaName.eea
@@ -15,7 +15,7 @@ NA_LETTER_WHITE
 
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/MediaPrintableArea.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/MediaPrintableArea.eea
index 7808504e83..80b2279a2f 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/MediaPrintableArea.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/MediaPrintableArea.eea
@@ -5,10 +5,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getPrintableArea
  (I)[F
  (I)[F
@@ -17,4 +17,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toString
  (ILjava/lang/String;)Ljava/lang/String;
- (ILjava/lang/String;)Ljava/lang/String;
+ (ILjava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/MediaSize.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/MediaSize.eea
index a8b2ec813f..0bc89b5a6f 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/MediaSize.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/MediaSize.eea
@@ -18,10 +18,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.Size2DSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getMediaSizeName
  ()Ljavax/print/attribute/standard/MediaSizeName;
  ()Ljavax/print/attribute/standard/MediaSizeName;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/MediaSizeName.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/MediaSizeName.eea
index bc04b1d935..a43b54f659 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/MediaSizeName.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/MediaSizeName.eea
@@ -222,7 +222,7 @@ TABLOID
 
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/MediaTray.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/MediaTray.eea
index a1fce5504e..6a49a7edf0 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/MediaTray.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/MediaTray.eea
@@ -27,7 +27,7 @@ TOP
 
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/MultipleDocumentHandling.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/MultipleDocumentHandling.eea
index 87f191bb1a..77806f0d72 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/MultipleDocumentHandling.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/MultipleDocumentHandling.eea
@@ -15,13 +15,13 @@ SINGLE_DOCUMENT_NEW_SHEET
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/NumberOfDocuments.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/NumberOfDocuments.eea
index ec744ccf05..b58a2a5134 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/NumberOfDocuments.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/NumberOfDocuments.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/NumberOfInterveningJobs.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/NumberOfInterveningJobs.eea
index 9eddbd3469..8a1bba31f0 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/NumberOfInterveningJobs.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/NumberOfInterveningJobs.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/NumberUp.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/NumberUp.eea
index 5230d0baa2..ebdffeeedb 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/NumberUp.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/NumberUp.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/NumberUpSupported.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/NumberUpSupported.eea
index b7148124c6..61e0a19562 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/NumberUpSupported.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/NumberUpSupported.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.SetOfIntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/OrientationRequested.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/OrientationRequested.eea
index 84c61fcb58..527ecc75df 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/OrientationRequested.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/OrientationRequested.eea
@@ -15,13 +15,13 @@ REVERSE_PORTRAIT
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/OutputDeviceAssigned.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/OutputDeviceAssigned.eea
index 7ad6f83386..f2807ffb05 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/OutputDeviceAssigned.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/OutputDeviceAssigned.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PDLOverrideSupported.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PDLOverrideSupported.eea
index fb46726f95..33ce7d848d 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PDLOverrideSupported.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PDLOverrideSupported.eea
@@ -9,13 +9,13 @@ NOT_ATTEMPTED
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PageRanges.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PageRanges.eea
index e8a282b87e..5816b8bbcd 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PageRanges.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PageRanges.eea
@@ -11,7 +11,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.SetOfIntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PagesPerMinute.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PagesPerMinute.eea
index 6296b0aed5..98ddb139ee 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PagesPerMinute.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PagesPerMinute.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PagesPerMinuteColor.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PagesPerMinuteColor.eea
index ea57e3c253..f6bcbaaef4 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PagesPerMinuteColor.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PagesPerMinuteColor.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PresentationDirection.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PresentationDirection.eea
index e3bba3927f..38b662d9ac 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PresentationDirection.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PresentationDirection.eea
@@ -27,13 +27,13 @@ TOTOP_TORIGHT
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrintQuality.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrintQuality.eea
index 60463a40c0..2f67ff884f 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrintQuality.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrintQuality.eea
@@ -12,13 +12,13 @@ NORMAL
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterInfo.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterInfo.eea
index e51f12d4a2..683b06a222 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterInfo.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterInfo.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterIsAcceptingJobs.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterIsAcceptingJobs.eea
index 83600beadf..10db744523 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterIsAcceptingJobs.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterIsAcceptingJobs.eea
@@ -9,13 +9,13 @@ NOT_ACCEPTING_JOBS
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterLocation.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterLocation.eea
index cdfd09dcaf..ac43413df4 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterLocation.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterLocation.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterMakeAndModel.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterMakeAndModel.eea
index 508bf9bd2d..6559769aed 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterMakeAndModel.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterMakeAndModel.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterMessageFromOperator.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterMessageFromOperator.eea
index 6b0de09a26..99ea77d02d 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterMessageFromOperator.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterMessageFromOperator.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterMoreInfo.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterMoreInfo.eea
index 5282bfd1c0..2541162cce 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterMoreInfo.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterMoreInfo.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.URISyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterMoreInfoManufacturer.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterMoreInfoManufacturer.eea
index 67ebfb5ad1..ac42bb1df9 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterMoreInfoManufacturer.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterMoreInfoManufacturer.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.URISyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterName.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterName.eea
index cdafa23ddc..fba2430e3d 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterName.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterName.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterResolution.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterResolution.eea
index 4288fc72c3..723c48db14 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterResolution.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterResolution.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.ResolutionSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterState.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterState.eea
index 38e723a7d3..0717401881 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterState.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterState.eea
@@ -15,13 +15,13 @@ UNKNOWN
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterStateReason.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterStateReason.eea
index f8f85299fb..bbe76cc038 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterStateReason.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterStateReason.eea
@@ -102,13 +102,13 @@ TONER_LOW
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterStateReasons.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterStateReasons.eea
index ce13c3cfbb..9815c55eaf 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterStateReasons.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterStateReasons.eea
@@ -9,13 +9,13 @@ super java/util/HashMap
  (Ljava/util/Map<Ljavax/print/attribute/standard/PrinterStateReason;Ljavax/print/attribute/standard/Severity;>;)V
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 printerStateReasonSet
  (Ljavax/print/attribute/standard/Severity;)Ljava/util/Set<Ljavax/print/attribute/standard/PrinterStateReason;>;
- (Ljavax/print/attribute/standard/Severity;)Ljava/util/Set<Ljavax/print/attribute/standard/PrinterStateReason;>;
+ (Ljavax/print/attribute/standard/Severity;)L1java/util/Set<Ljavax/print/attribute/standard/PrinterStateReason;>;
 put
  (Ljavax/print/attribute/standard/PrinterStateReason;Ljavax/print/attribute/standard/Severity;)Ljavax/print/attribute/standard/Severity;
  (Ljavax/print/attribute/standard/PrinterStateReason;Ljavax/print/attribute/standard/Severity;)Ljavax/print/attribute/standard/Severity;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterURI.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterURI.eea
index feece3a3d8..60ba1832df 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterURI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/PrinterURI.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.URISyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/QueuedJobCount.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/QueuedJobCount.eea
index 435db8ce98..6c0d66db37 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/QueuedJobCount.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/QueuedJobCount.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/ReferenceUriSchemesSupported.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/ReferenceUriSchemesSupported.eea
index 3f98d45c1d..2d48afad86 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/ReferenceUriSchemesSupported.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/ReferenceUriSchemesSupported.eea
@@ -27,13 +27,13 @@ WAIS
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/RequestingUserName.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/RequestingUserName.eea
index 8c3007f3db..b7d66724b9 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/RequestingUserName.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/RequestingUserName.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Severity.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Severity.eea
index 7880b0cc64..2b19f132fd 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Severity.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Severity.eea
@@ -12,13 +12,13 @@ WARNING
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/SheetCollate.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/SheetCollate.eea
index 3c5ab1ecbf..71283fc7ba 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/SheetCollate.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/SheetCollate.eea
@@ -9,13 +9,13 @@ UNCOLLATED
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Sides.eea b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Sides.eea
index 2de437c6f3..24d0c4d756 100644
--- a/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Sides.eea
+++ b/libs/eea-java-17/src/main/resources/javax/print/attribute/standard/Sides.eea
@@ -18,13 +18,13 @@ TWO_SIDED_SHORT_EDGE
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-17/src/main/resources/javax/rmi/ssl/SslRMIClientSocketFactory.eea b/libs/eea-java-17/src/main/resources/javax/rmi/ssl/SslRMIClientSocketFactory.eea
index ff5f6d43aa..bb56c0bd67 100644
--- a/libs/eea-java-17/src/main/resources/javax/rmi/ssl/SslRMIClientSocketFactory.eea
+++ b/libs/eea-java-17/src/main/resources/javax/rmi/ssl/SslRMIClientSocketFactory.eea
@@ -2,7 +2,7 @@ class javax/rmi/ssl/SslRMIClientSocketFactory
 
 createSocket
  (Ljava/lang/String;I)Ljava/net/Socket;
- (Ljava/lang/String;I)Ljava/net/Socket;
+ (Ljava/lang/String;I)L1java/net/Socket; # @Inherited(java.rmi.server.RMIClientSocketFactory)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/javax/rmi/ssl/SslRMIServerSocketFactory.eea b/libs/eea-java-17/src/main/resources/javax/rmi/ssl/SslRMIServerSocketFactory.eea
index cbf28fc3ec..e2f721b0da 100644
--- a/libs/eea-java-17/src/main/resources/javax/rmi/ssl/SslRMIServerSocketFactory.eea
+++ b/libs/eea-java-17/src/main/resources/javax/rmi/ssl/SslRMIServerSocketFactory.eea
@@ -8,7 +8,7 @@ class javax/rmi/ssl/SslRMIServerSocketFactory
  ([Ljava/lang/String;[Ljava/lang/String;Z)V
 createServerSocket
  (I)Ljava/net/ServerSocket;
- (I)Ljava/net/ServerSocket;
+ (I)L1java/net/ServerSocket; # @Inherited(java.rmi.server.RMIServerSocketFactory)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/javax/script/AbstractScriptEngine.eea b/libs/eea-java-17/src/main/resources/javax/script/AbstractScriptEngine.eea
index 65cb167748..158d3b3ff3 100644
--- a/libs/eea-java-17/src/main/resources/javax/script/AbstractScriptEngine.eea
+++ b/libs/eea-java-17/src/main/resources/javax/script/AbstractScriptEngine.eea
@@ -21,7 +21,7 @@ eval
  (Ljava/lang/String;Ljavax/script/Bindings;)Ljava/lang/Object;
 get
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 getBindings
  (I)Ljavax/script/Bindings;
  (I)Ljavax/script/Bindings;
diff --git a/libs/eea-java-17/src/main/resources/javax/script/ScriptEngine.eea b/libs/eea-java-17/src/main/resources/javax/script/ScriptEngine.eea
index 38e8ba1381..6998a349d8 100644
--- a/libs/eea-java-17/src/main/resources/javax/script/ScriptEngine.eea
+++ b/libs/eea-java-17/src/main/resources/javax/script/ScriptEngine.eea
@@ -24,7 +24,7 @@ NAME
 
 createBindings
  ()Ljavax/script/Bindings;
- ()Ljavax/script/Bindings;
+ ()L1javax/script/Bindings;
 eval
  (Ljava/io/Reader;)Ljava/lang/Object;
  (Ljava/io/Reader;)Ljava/lang/Object;
diff --git a/libs/eea-java-17/src/main/resources/javax/script/ScriptEngineManager.eea b/libs/eea-java-17/src/main/resources/javax/script/ScriptEngineManager.eea
index 25204936d4..34b4ff977e 100644
--- a/libs/eea-java-17/src/main/resources/javax/script/ScriptEngineManager.eea
+++ b/libs/eea-java-17/src/main/resources/javax/script/ScriptEngineManager.eea
@@ -11,13 +11,13 @@ getBindings
  ()Ljavax/script/Bindings;
 getEngineByExtension
  (Ljava/lang/String;)Ljavax/script/ScriptEngine;
- (Ljava/lang/String;)Ljavax/script/ScriptEngine;
+ (Ljava/lang/String;)L0javax/script/ScriptEngine;
 getEngineByMimeType
  (Ljava/lang/String;)Ljavax/script/ScriptEngine;
- (Ljava/lang/String;)Ljavax/script/ScriptEngine;
+ (Ljava/lang/String;)L0javax/script/ScriptEngine;
 getEngineByName
  (Ljava/lang/String;)Ljavax/script/ScriptEngine;
- (Ljava/lang/String;)Ljavax/script/ScriptEngine;
+ (Ljava/lang/String;)L0javax/script/ScriptEngine;
 getEngineFactories
  ()Ljava/util/List<Ljavax/script/ScriptEngineFactory;>;
  ()Ljava/util/List<Ljavax/script/ScriptEngineFactory;>;
diff --git a/libs/eea-java-17/src/main/resources/javax/script/SimpleScriptContext.eea b/libs/eea-java-17/src/main/resources/javax/script/SimpleScriptContext.eea
index 3c946be517..724d5259e0 100644
--- a/libs/eea-java-17/src/main/resources/javax/script/SimpleScriptContext.eea
+++ b/libs/eea-java-17/src/main/resources/javax/script/SimpleScriptContext.eea
@@ -18,10 +18,10 @@ writer
 
 getAttribute
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 getAttribute
  (Ljava/lang/String;I)Ljava/lang/Object;
- (Ljava/lang/String;I)Ljava/lang/Object;
+ (Ljava/lang/String;I)L0java/lang/Object;
 getAttributesScope
  (Ljava/lang/String;)I
  (Ljava/lang/String;)I
@@ -42,7 +42,7 @@ getWriter
  ()Ljava/io/Writer;
 removeAttribute
  (Ljava/lang/String;I)Ljava/lang/Object;
- (Ljava/lang/String;I)Ljava/lang/Object;
+ (Ljava/lang/String;I)L0java/lang/Object;
 setAttribute
  (Ljava/lang/String;Ljava/lang/Object;I)V
  (Ljava/lang/String;Ljava/lang/Object;I)V
diff --git a/libs/eea-java-17/src/main/resources/javax/security/auth/SubjectDomainCombiner.eea b/libs/eea-java-17/src/main/resources/javax/security/auth/SubjectDomainCombiner.eea
index a64fff6a5a..3a1b39078c 100644
--- a/libs/eea-java-17/src/main/resources/javax/security/auth/SubjectDomainCombiner.eea
+++ b/libs/eea-java-17/src/main/resources/javax/security/auth/SubjectDomainCombiner.eea
@@ -5,7 +5,7 @@ class javax/security/auth/SubjectDomainCombiner
  (Ljavax/security/auth/Subject;)V
 combine
  ([Ljava/security/ProtectionDomain;[Ljava/security/ProtectionDomain;)[Ljava/security/ProtectionDomain;
- ([Ljava/security/ProtectionDomain;[Ljava/security/ProtectionDomain;)[Ljava/security/ProtectionDomain;
+ ([Ljava/security/ProtectionDomain;[Ljava/security/ProtectionDomain;)[0Ljava/security/ProtectionDomain;
 getSubject
  ()Ljavax/security/auth/Subject;
  ()Ljavax/security/auth/Subject;
diff --git a/libs/eea-java-17/src/main/resources/javax/security/auth/kerberos/KeyTab.eea b/libs/eea-java-17/src/main/resources/javax/security/auth/kerberos/KeyTab.eea
index 190a0a4672..2ef7cabbee 100644
--- a/libs/eea-java-17/src/main/resources/javax/security/auth/kerberos/KeyTab.eea
+++ b/libs/eea-java-17/src/main/resources/javax/security/auth/kerberos/KeyTab.eea
@@ -24,7 +24,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getKeys
  (Ljavax/security/auth/kerberos/KerberosPrincipal;)[Ljavax/security/auth/kerberos/KerberosKey;
- (Ljavax/security/auth/kerberos/KerberosPrincipal;)[Ljavax/security/auth/kerberos/KerberosKey;
+ (Ljavax/security/auth/kerberos/KerberosPrincipal;)[1Ljavax/security/auth/kerberos/KerberosKey;
 getPrincipal
  ()Ljavax/security/auth/kerberos/KerberosPrincipal;
  ()Ljavax/security/auth/kerberos/KerberosPrincipal;
diff --git a/libs/eea-java-17/src/main/resources/javax/security/auth/login/Configuration.eea b/libs/eea-java-17/src/main/resources/javax/security/auth/login/Configuration.eea
index a672cd6da1..02a870fe84 100644
--- a/libs/eea-java-17/src/main/resources/javax/security/auth/login/Configuration.eea
+++ b/libs/eea-java-17/src/main/resources/javax/security/auth/login/Configuration.eea
@@ -21,10 +21,10 @@ getAppConfigurationEntry
  (Ljava/lang/String;)[Ljavax/security/auth/login/AppConfigurationEntry;
 getParameters
  ()Ljavax/security/auth/login/Configuration$Parameters;
- ()Ljavax/security/auth/login/Configuration$Parameters;
+ ()L0javax/security/auth/login/Configuration$Parameters;
 getProvider
  ()Ljava/security/Provider;
- ()Ljava/security/Provider;
+ ()L0java/security/Provider;
 getType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/security/auth/login/LoginContext.eea b/libs/eea-java-17/src/main/resources/javax/security/auth/login/LoginContext.eea
index 774f33905d..e7eb82cc68 100644
--- a/libs/eea-java-17/src/main/resources/javax/security/auth/login/LoginContext.eea
+++ b/libs/eea-java-17/src/main/resources/javax/security/auth/login/LoginContext.eea
@@ -17,4 +17,4 @@ class javax/security/auth/login/LoginContext
  (Ljava/lang/String;Ljavax/security/auth/callback/CallbackHandler;)V
 getSubject
  ()Ljavax/security/auth/Subject;
- ()Ljavax/security/auth/Subject;
+ ()L0javax/security/auth/Subject;
diff --git a/libs/eea-java-17/src/main/resources/javax/security/sasl/AuthorizeCallback.eea b/libs/eea-java-17/src/main/resources/javax/security/sasl/AuthorizeCallback.eea
index 4a75b410de..a637ae62f6 100644
--- a/libs/eea-java-17/src/main/resources/javax/security/sasl/AuthorizeCallback.eea
+++ b/libs/eea-java-17/src/main/resources/javax/security/sasl/AuthorizeCallback.eea
@@ -11,7 +11,7 @@ getAuthorizationID
  ()Ljava/lang/String;
 getAuthorizedID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 setAuthorizedID
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/security/sasl/Sasl.eea b/libs/eea-java-17/src/main/resources/javax/security/sasl/Sasl.eea
index 7c579f59db..6cda647cf6 100644
--- a/libs/eea-java-17/src/main/resources/javax/security/sasl/Sasl.eea
+++ b/libs/eea-java-17/src/main/resources/javax/security/sasl/Sasl.eea
@@ -45,13 +45,13 @@ STRENGTH
 
 createSaslClient
  ([Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)Ljavax/security/sasl/SaslClient;
- ([Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)Ljavax/security/sasl/SaslClient;
+ ([Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)L0javax/security/sasl/SaslClient;
 createSaslServer
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)Ljavax/security/sasl/SaslServer;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)Ljavax/security/sasl/SaslServer;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)L0javax/security/sasl/SaslServer;
 getSaslClientFactories
  ()Ljava/util/Enumeration<Ljavax/security/sasl/SaslClientFactory;>;
- ()Ljava/util/Enumeration<Ljavax/security/sasl/SaslClientFactory;>;
+ ()L1java/util/Enumeration<Ljavax/security/sasl/SaslClientFactory;>;
 getSaslServerFactories
  ()Ljava/util/Enumeration<Ljavax/security/sasl/SaslServerFactory;>;
- ()Ljava/util/Enumeration<Ljavax/security/sasl/SaslServerFactory;>;
+ ()L1java/util/Enumeration<Ljavax/security/sasl/SaslServerFactory;>;
diff --git a/libs/eea-java-17/src/main/resources/javax/security/sasl/SaslClientFactory.eea b/libs/eea-java-17/src/main/resources/javax/security/sasl/SaslClientFactory.eea
index 0588a46e61..9056eefd25 100644
--- a/libs/eea-java-17/src/main/resources/javax/security/sasl/SaslClientFactory.eea
+++ b/libs/eea-java-17/src/main/resources/javax/security/sasl/SaslClientFactory.eea
@@ -2,7 +2,7 @@ class javax/security/sasl/SaslClientFactory
 
 createSaslClient
  ([Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)Ljavax/security/sasl/SaslClient;
- ([Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)Ljavax/security/sasl/SaslClient;
+ ([Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)L1javax/security/sasl/SaslClient;
 getMechanismNames
  (Ljava/util/Map<Ljava/lang/String;*>;)[Ljava/lang/String;
  (Ljava/util/Map<Ljava/lang/String;*>;)[Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/security/sasl/SaslServerFactory.eea b/libs/eea-java-17/src/main/resources/javax/security/sasl/SaslServerFactory.eea
index a6e9516b4f..8eafe44ddb 100644
--- a/libs/eea-java-17/src/main/resources/javax/security/sasl/SaslServerFactory.eea
+++ b/libs/eea-java-17/src/main/resources/javax/security/sasl/SaslServerFactory.eea
@@ -2,7 +2,7 @@ class javax/security/sasl/SaslServerFactory
 
 createSaslServer
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)Ljavax/security/sasl/SaslServer;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)Ljavax/security/sasl/SaslServer;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)L1javax/security/sasl/SaslServer;
 getMechanismNames
  (Ljava/util/Map<Ljava/lang/String;*>;)[Ljava/lang/String;
  (Ljava/util/Map<Ljava/lang/String;*>;)[Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/smartcardio/ATR.eea b/libs/eea-java-17/src/main/resources/javax/smartcardio/ATR.eea
index 92b5056a4f..098c6d024b 100644
--- a/libs/eea-java-17/src/main/resources/javax/smartcardio/ATR.eea
+++ b/libs/eea-java-17/src/main/resources/javax/smartcardio/ATR.eea
@@ -11,7 +11,7 @@ getBytes
  ()[B
 getHistoricalBytes
  ()[B
- ()[B
+ ()[1B
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/javax/smartcardio/CardTerminals.eea b/libs/eea-java-17/src/main/resources/javax/smartcardio/CardTerminals.eea
index a172837297..f4dcf47be4 100644
--- a/libs/eea-java-17/src/main/resources/javax/smartcardio/CardTerminals.eea
+++ b/libs/eea-java-17/src/main/resources/javax/smartcardio/CardTerminals.eea
@@ -2,7 +2,7 @@ class javax/smartcardio/CardTerminals
 
 getTerminal
  (Ljava/lang/String;)Ljavax/smartcardio/CardTerminal;
- (Ljava/lang/String;)Ljavax/smartcardio/CardTerminal;
+ (Ljava/lang/String;)L0javax/smartcardio/CardTerminal;
 list
  ()Ljava/util/List<Ljavax/smartcardio/CardTerminal;>;
  ()Ljava/util/List<Ljavax/smartcardio/CardTerminal;>;
diff --git a/libs/eea-java-17/src/main/resources/javax/smartcardio/CommandAPDU.eea b/libs/eea-java-17/src/main/resources/javax/smartcardio/CommandAPDU.eea
index b8e7e11a64..629737293c 100644
--- a/libs/eea-java-17/src/main/resources/javax/smartcardio/CommandAPDU.eea
+++ b/libs/eea-java-17/src/main/resources/javax/smartcardio/CommandAPDU.eea
@@ -29,7 +29,7 @@ getBytes
  ()[B
 getData
  ()[B
- ()[B
+ ()[1B
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/javax/smartcardio/ResponseAPDU.eea b/libs/eea-java-17/src/main/resources/javax/smartcardio/ResponseAPDU.eea
index ab740be1f8..792dd25bde 100644
--- a/libs/eea-java-17/src/main/resources/javax/smartcardio/ResponseAPDU.eea
+++ b/libs/eea-java-17/src/main/resources/javax/smartcardio/ResponseAPDU.eea
@@ -11,7 +11,7 @@ getBytes
  ()[B
 getData
  ()[B
- ()[B
+ ()[1B
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/javax/sound/midi/MetaMessage.eea b/libs/eea-java-17/src/main/resources/javax/sound/midi/MetaMessage.eea
index 50fdf1926f..f2b47417d5 100644
--- a/libs/eea-java-17/src/main/resources/javax/sound/midi/MetaMessage.eea
+++ b/libs/eea-java-17/src/main/resources/javax/sound/midi/MetaMessage.eea
@@ -11,7 +11,7 @@ clone
  ()L1java/lang/Object; # @Inherited(javax.sound.midi.MidiMessage)
 getData
  ()[B
- ()[B
+ ()[1B
 setMessage
  (I[BI)V
  (I[BI)V
diff --git a/libs/eea-java-17/src/main/resources/javax/sound/midi/MidiFileFormat.eea b/libs/eea-java-17/src/main/resources/javax/sound/midi/MidiFileFormat.eea
index df1cd1bbbf..528d0480bf 100644
--- a/libs/eea-java-17/src/main/resources/javax/sound/midi/MidiFileFormat.eea
+++ b/libs/eea-java-17/src/main/resources/javax/sound/midi/MidiFileFormat.eea
@@ -5,7 +5,7 @@ class javax/sound/midi/MidiFileFormat
  (IFIIJLjava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)V
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 properties
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
diff --git a/libs/eea-java-17/src/main/resources/javax/sound/midi/MidiMessage.eea b/libs/eea-java-17/src/main/resources/javax/sound/midi/MidiMessage.eea
index 2b3d0cb666..0ff6d91b9d 100644
--- a/libs/eea-java-17/src/main/resources/javax/sound/midi/MidiMessage.eea
+++ b/libs/eea-java-17/src/main/resources/javax/sound/midi/MidiMessage.eea
@@ -12,7 +12,7 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 getMessage
  ()[B
- ()[B
+ ()[1B
 setMessage
  ([BI)V
  ([BI)V
diff --git a/libs/eea-java-17/src/main/resources/javax/sound/midi/MidiSystem.eea b/libs/eea-java-17/src/main/resources/javax/sound/midi/MidiSystem.eea
index 114f898b2c..867b2b5aa3 100644
--- a/libs/eea-java-17/src/main/resources/javax/sound/midi/MidiSystem.eea
+++ b/libs/eea-java-17/src/main/resources/javax/sound/midi/MidiSystem.eea
@@ -17,13 +17,13 @@ getMidiFileFormat
  (Ljava/net/URL;)Ljavax/sound/midi/MidiFileFormat;
 getMidiFileTypes
  ()[I
- ()[I
+ ()[1I
 getMidiFileTypes
  (Ljavax/sound/midi/Sequence;)[I
- (Ljavax/sound/midi/Sequence;)[I
+ (Ljavax/sound/midi/Sequence;)[1I
 getReceiver
  ()Ljavax/sound/midi/Receiver;
- ()Ljavax/sound/midi/Receiver;
+ ()L1javax/sound/midi/Receiver;
 getSequence
  (Ljava/io/File;)Ljavax/sound/midi/Sequence;
  (Ljava/io/File;)Ljavax/sound/midi/Sequence;
@@ -53,7 +53,7 @@ getSynthesizer
  ()Ljavax/sound/midi/Synthesizer;
 getTransmitter
  ()Ljavax/sound/midi/Transmitter;
- ()Ljavax/sound/midi/Transmitter;
+ ()L1javax/sound/midi/Transmitter;
 isFileTypeSupported
  (ILjavax/sound/midi/Sequence;)Z
  (ILjavax/sound/midi/Sequence;)Z
diff --git a/libs/eea-java-17/src/main/resources/javax/sound/midi/Sequence.eea b/libs/eea-java-17/src/main/resources/javax/sound/midi/Sequence.eea
index 655518ac55..508c9fd749 100644
--- a/libs/eea-java-17/src/main/resources/javax/sound/midi/Sequence.eea
+++ b/libs/eea-java-17/src/main/resources/javax/sound/midi/Sequence.eea
@@ -6,13 +6,13 @@ tracks
 
 createTrack
  ()Ljavax/sound/midi/Track;
- ()Ljavax/sound/midi/Track;
+ ()L1javax/sound/midi/Track;
 deleteTrack
  (Ljavax/sound/midi/Track;)Z
  (Ljavax/sound/midi/Track;)Z
 getPatchList
  ()[Ljavax/sound/midi/Patch;
- ()[Ljavax/sound/midi/Patch;
+ ()[1Ljavax/sound/midi/Patch;
 getTracks
  ()[Ljavax/sound/midi/Track;
  ()[Ljavax/sound/midi/Track;
diff --git a/libs/eea-java-17/src/main/resources/javax/sound/midi/SysexMessage.eea b/libs/eea-java-17/src/main/resources/javax/sound/midi/SysexMessage.eea
index 211d500dc8..d2d9c2280c 100644
--- a/libs/eea-java-17/src/main/resources/javax/sound/midi/SysexMessage.eea
+++ b/libs/eea-java-17/src/main/resources/javax/sound/midi/SysexMessage.eea
@@ -14,7 +14,7 @@ clone
  ()L1java/lang/Object; # @Inherited(javax.sound.midi.MidiMessage)
 getData
  ()[B
- ()[B
+ ()[1B
 setMessage
  (I[BI)V
  (I[BI)V
diff --git a/libs/eea-java-17/src/main/resources/javax/sound/sampled/AudioFileFormat.eea b/libs/eea-java-17/src/main/resources/javax/sound/sampled/AudioFileFormat.eea
index 2ffe727b38..8dd6f8d194 100644
--- a/libs/eea-java-17/src/main/resources/javax/sound/sampled/AudioFileFormat.eea
+++ b/libs/eea-java-17/src/main/resources/javax/sound/sampled/AudioFileFormat.eea
@@ -14,7 +14,7 @@ getFormat
  ()Ljavax/sound/sampled/AudioFormat;
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 getType
  ()Ljavax/sound/sampled/AudioFileFormat$Type;
  ()Ljavax/sound/sampled/AudioFileFormat$Type;
diff --git a/libs/eea-java-17/src/main/resources/javax/sound/sampled/AudioFormat.eea b/libs/eea-java-17/src/main/resources/javax/sound/sampled/AudioFormat.eea
index 1fe3ec0a2a..048eed1a0c 100644
--- a/libs/eea-java-17/src/main/resources/javax/sound/sampled/AudioFormat.eea
+++ b/libs/eea-java-17/src/main/resources/javax/sound/sampled/AudioFormat.eea
@@ -15,7 +15,7 @@ getEncoding
  ()Ljavax/sound/sampled/AudioFormat$Encoding;
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 matches
  (Ljavax/sound/sampled/AudioFormat;)Z
  (Ljavax/sound/sampled/AudioFormat;)Z
diff --git a/libs/eea-java-17/src/main/resources/javax/sound/sampled/AudioSystem.eea b/libs/eea-java-17/src/main/resources/javax/sound/sampled/AudioSystem.eea
index f8434db162..f64cc1f5b9 100644
--- a/libs/eea-java-17/src/main/resources/javax/sound/sampled/AudioSystem.eea
+++ b/libs/eea-java-17/src/main/resources/javax/sound/sampled/AudioSystem.eea
@@ -53,7 +53,7 @@ getSourceDataLine
  (Ljavax/sound/sampled/AudioFormat;Ljavax/sound/sampled/Mixer$Info;)Ljavax/sound/sampled/SourceDataLine;
 getSourceLineInfo
  (Ljavax/sound/sampled/Line$Info;)[Ljavax/sound/sampled/Line$Info;
- (Ljavax/sound/sampled/Line$Info;)[Ljavax/sound/sampled/Line$Info;
+ (Ljavax/sound/sampled/Line$Info;)[1Ljavax/sound/sampled/Line$Info;
 getTargetDataLine
  (Ljavax/sound/sampled/AudioFormat;)Ljavax/sound/sampled/TargetDataLine;
  (Ljavax/sound/sampled/AudioFormat;)Ljavax/sound/sampled/TargetDataLine;
@@ -71,7 +71,7 @@ getTargetFormats
  (Ljavax/sound/sampled/AudioFormat$Encoding;Ljavax/sound/sampled/AudioFormat;)[Ljavax/sound/sampled/AudioFormat;
 getTargetLineInfo
  (Ljavax/sound/sampled/Line$Info;)[Ljavax/sound/sampled/Line$Info;
- (Ljavax/sound/sampled/Line$Info;)[Ljavax/sound/sampled/Line$Info;
+ (Ljavax/sound/sampled/Line$Info;)[1Ljavax/sound/sampled/Line$Info;
 isConversionSupported
  (Ljavax/sound/sampled/AudioFormat$Encoding;Ljavax/sound/sampled/AudioFormat;)Z
  (Ljavax/sound/sampled/AudioFormat$Encoding;Ljavax/sound/sampled/AudioFormat;)Z
diff --git a/libs/eea-java-17/src/main/resources/javax/sql/CommonDataSource.eea b/libs/eea-java-17/src/main/resources/javax/sql/CommonDataSource.eea
index 691fef6e3a..c84ab28454 100644
--- a/libs/eea-java-17/src/main/resources/javax/sql/CommonDataSource.eea
+++ b/libs/eea-java-17/src/main/resources/javax/sql/CommonDataSource.eea
@@ -2,7 +2,7 @@ class javax/sql/CommonDataSource
 
 createShardingKeyBuilder
  ()Ljava/sql/ShardingKeyBuilder;
- ()Ljava/sql/ShardingKeyBuilder;
+ ()L1java/sql/ShardingKeyBuilder;
 getLogWriter
  ()Ljava/io/PrintWriter;
  ()Ljava/io/PrintWriter;
diff --git a/libs/eea-java-17/src/main/resources/javax/sql/ConnectionPoolDataSource.eea b/libs/eea-java-17/src/main/resources/javax/sql/ConnectionPoolDataSource.eea
index 18b6caa217..2d392caa73 100644
--- a/libs/eea-java-17/src/main/resources/javax/sql/ConnectionPoolDataSource.eea
+++ b/libs/eea-java-17/src/main/resources/javax/sql/ConnectionPoolDataSource.eea
@@ -2,7 +2,7 @@ class javax/sql/ConnectionPoolDataSource
 
 createPooledConnectionBuilder
  ()Ljavax/sql/PooledConnectionBuilder;
- ()Ljavax/sql/PooledConnectionBuilder;
+ ()L1javax/sql/PooledConnectionBuilder;
 getLogWriter
  ()Ljava/io/PrintWriter;
  ()Ljava/io/PrintWriter;
diff --git a/libs/eea-java-17/src/main/resources/javax/sql/DataSource.eea b/libs/eea-java-17/src/main/resources/javax/sql/DataSource.eea
index 8b8bba6455..ce951da69a 100644
--- a/libs/eea-java-17/src/main/resources/javax/sql/DataSource.eea
+++ b/libs/eea-java-17/src/main/resources/javax/sql/DataSource.eea
@@ -2,7 +2,7 @@ class javax/sql/DataSource
 
 createConnectionBuilder
  ()Ljava/sql/ConnectionBuilder;
- ()Ljava/sql/ConnectionBuilder;
+ ()L1java/sql/ConnectionBuilder;
 getConnection
  ()Ljava/sql/Connection;
  ()Ljava/sql/Connection;
diff --git a/libs/eea-java-17/src/main/resources/javax/sql/XADataSource.eea b/libs/eea-java-17/src/main/resources/javax/sql/XADataSource.eea
index b8c2cf45b2..5f9e8cdae3 100644
--- a/libs/eea-java-17/src/main/resources/javax/sql/XADataSource.eea
+++ b/libs/eea-java-17/src/main/resources/javax/sql/XADataSource.eea
@@ -2,7 +2,7 @@ class javax/sql/XADataSource
 
 createXAConnectionBuilder
  ()Ljavax/sql/XAConnectionBuilder;
- ()Ljavax/sql/XAConnectionBuilder;
+ ()L1javax/sql/XAConnectionBuilder;
 getLogWriter
  ()Ljava/io/PrintWriter;
  ()Ljava/io/PrintWriter;
diff --git a/libs/eea-java-17/src/main/resources/javax/sql/rowset/BaseRowSet.eea b/libs/eea-java-17/src/main/resources/javax/sql/rowset/BaseRowSet.eea
index b96312bcce..4bafcd3edb 100644
--- a/libs/eea-java-17/src/main/resources/javax/sql/rowset/BaseRowSet.eea
+++ b/libs/eea-java-17/src/main/resources/javax/sql/rowset/BaseRowSet.eea
@@ -24,7 +24,7 @@ getDataSourceName
  ()Ljava/lang/String;
 getParams
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[1Ljava/lang/Object;
 getPassword
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/sql/rowset/CachedRowSet.eea b/libs/eea-java-17/src/main/resources/javax/sql/rowset/CachedRowSet.eea
index 0be2c46399..70181ef07f 100644
--- a/libs/eea-java-17/src/main/resources/javax/sql/rowset/CachedRowSet.eea
+++ b/libs/eea-java-17/src/main/resources/javax/sql/rowset/CachedRowSet.eea
@@ -8,16 +8,16 @@ columnUpdated
  (Ljava/lang/String;)Z
 createCopy
  ()Ljavax/sql/rowset/CachedRowSet;
- ()Ljavax/sql/rowset/CachedRowSet;
+ ()L1javax/sql/rowset/CachedRowSet;
 createCopyNoConstraints
  ()Ljavax/sql/rowset/CachedRowSet;
- ()Ljavax/sql/rowset/CachedRowSet;
+ ()L1javax/sql/rowset/CachedRowSet;
 createCopySchema
  ()Ljavax/sql/rowset/CachedRowSet;
- ()Ljavax/sql/rowset/CachedRowSet;
+ ()L1javax/sql/rowset/CachedRowSet;
 createShared
  ()Ljavax/sql/RowSet;
- ()Ljavax/sql/RowSet;
+ ()L1javax/sql/RowSet;
 execute
  (Ljava/sql/Connection;)V
  (Ljava/sql/Connection;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/sql/rowset/RowSetFactory.eea b/libs/eea-java-17/src/main/resources/javax/sql/rowset/RowSetFactory.eea
index cdb0554304..6285cf5fae 100644
--- a/libs/eea-java-17/src/main/resources/javax/sql/rowset/RowSetFactory.eea
+++ b/libs/eea-java-17/src/main/resources/javax/sql/rowset/RowSetFactory.eea
@@ -2,16 +2,16 @@ class javax/sql/rowset/RowSetFactory
 
 createCachedRowSet
  ()Ljavax/sql/rowset/CachedRowSet;
- ()Ljavax/sql/rowset/CachedRowSet;
+ ()L1javax/sql/rowset/CachedRowSet;
 createFilteredRowSet
  ()Ljavax/sql/rowset/FilteredRowSet;
- ()Ljavax/sql/rowset/FilteredRowSet;
+ ()L1javax/sql/rowset/FilteredRowSet;
 createJdbcRowSet
  ()Ljavax/sql/rowset/JdbcRowSet;
- ()Ljavax/sql/rowset/JdbcRowSet;
+ ()L1javax/sql/rowset/JdbcRowSet;
 createJoinRowSet
  ()Ljavax/sql/rowset/JoinRowSet;
- ()Ljavax/sql/rowset/JoinRowSet;
+ ()L1javax/sql/rowset/JoinRowSet;
 createWebRowSet
  ()Ljavax/sql/rowset/WebRowSet;
- ()Ljavax/sql/rowset/WebRowSet;
+ ()L1javax/sql/rowset/WebRowSet;
diff --git a/libs/eea-java-17/src/main/resources/javax/sql/rowset/serial/SerialArray.eea b/libs/eea-java-17/src/main/resources/javax/sql/rowset/serial/SerialArray.eea
index 7a4ac8a501..1d97e965d2 100644
--- a/libs/eea-java-17/src/main/resources/javax/sql/rowset/serial/SerialArray.eea
+++ b/libs/eea-java-17/src/main/resources/javax/sql/rowset/serial/SerialArray.eea
@@ -14,28 +14,28 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getArray
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 getArray
  (JI)Ljava/lang/Object;
- (JI)Ljava/lang/Object;
+ (JI)L1java/lang/Object;
 getArray
  (JILjava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)Ljava/lang/Object;
- (JILjava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)Ljava/lang/Object;
+ (JILjava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)L1java/lang/Object;
 getArray
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)Ljava/lang/Object;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)Ljava/lang/Object;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)L1java/lang/Object;
 getBaseTypeName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getResultSet
  ()Ljava/sql/ResultSet;
- ()Ljava/sql/ResultSet;
+ ()L1java/sql/ResultSet;
 getResultSet
  (JI)Ljava/sql/ResultSet;
- (JI)Ljava/sql/ResultSet;
+ (JI)L1java/sql/ResultSet;
 getResultSet
  (JILjava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)Ljava/sql/ResultSet;
- (JILjava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)Ljava/sql/ResultSet;
+ (JILjava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)L1java/sql/ResultSet;
 getResultSet
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)Ljava/sql/ResultSet;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)Ljava/sql/ResultSet;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)L1java/sql/ResultSet;
diff --git a/libs/eea-java-17/src/main/resources/javax/sql/rowset/serial/SerialBlob.eea b/libs/eea-java-17/src/main/resources/javax/sql/rowset/serial/SerialBlob.eea
index b9ba114359..6f9ee8d06f 100644
--- a/libs/eea-java-17/src/main/resources/javax/sql/rowset/serial/SerialBlob.eea
+++ b/libs/eea-java-17/src/main/resources/javax/sql/rowset/serial/SerialBlob.eea
@@ -14,13 +14,13 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getBinaryStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
 getBinaryStream
  (JJ)Ljava/io/InputStream;
  (JJ)Ljava/io/InputStream;
 getBytes
  (JI)[B
- (JI)[B
+ (JI)[1B
 position
  (Ljava/sql/Blob;J)J
  (Ljava/sql/Blob;J)J
diff --git a/libs/eea-java-17/src/main/resources/javax/sql/rowset/serial/SerialClob.eea b/libs/eea-java-17/src/main/resources/javax/sql/rowset/serial/SerialClob.eea
index 0b9446639e..69ad54e202 100644
--- a/libs/eea-java-17/src/main/resources/javax/sql/rowset/serial/SerialClob.eea
+++ b/libs/eea-java-17/src/main/resources/javax/sql/rowset/serial/SerialClob.eea
@@ -17,7 +17,7 @@ getAsciiStream
  ()Ljava/io/InputStream;
 getCharacterStream
  ()Ljava/io/Reader;
- ()Ljava/io/Reader;
+ ()L1java/io/Reader;
 getCharacterStream
  (JJ)Ljava/io/Reader;
  (JJ)Ljava/io/Reader;
diff --git a/libs/eea-java-17/src/main/resources/javax/sql/rowset/serial/SerialDatalink.eea b/libs/eea-java-17/src/main/resources/javax/sql/rowset/serial/SerialDatalink.eea
index a7da873da9..d49895c716 100644
--- a/libs/eea-java-17/src/main/resources/javax/sql/rowset/serial/SerialDatalink.eea
+++ b/libs/eea-java-17/src/main/resources/javax/sql/rowset/serial/SerialDatalink.eea
@@ -11,4 +11,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getDatalink
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L1java/net/URL;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/AbstractAction.eea b/libs/eea-java-17/src/main/resources/javax/swing/AbstractAction.eea
index 7e04354285..7a01eb80ac 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/AbstractAction.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/AbstractAction.eea
@@ -21,13 +21,13 @@ firePropertyChange
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 getKeys
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 getPropertyChangeListeners
  ()[Ljava/beans/PropertyChangeListener;
  ()[Ljava/beans/PropertyChangeListener;
 getValue
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 putValue
  (Ljava/lang/String;Ljava/lang/Object;)V
  (Ljava/lang/String;Ljava/lang/Object;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/AbstractButton$AccessibleAbstractButton.eea b/libs/eea-java-17/src/main/resources/javax/swing/AbstractButton$AccessibleAbstractButton.eea
index 54aed2c3f3..b5ca9ef6af 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/AbstractButton$AccessibleAbstractButton.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/AbstractButton$AccessibleAbstractButton.eea
@@ -5,16 +5,16 @@ class javax/swing/AbstractButton$AccessibleAbstractButton
  (Ljavax/swing/AbstractButton;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleIcon
  ()[Ljavax/accessibility/AccessibleIcon;
- ()[Ljavax/accessibility/AccessibleIcon;
+ ()[0Ljavax/accessibility/AccessibleIcon; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleKeyBinding
  ()Ljavax/accessibility/AccessibleKeyBinding;
- ()Ljavax/accessibility/AccessibleKeyBinding;
+ ()L0javax/accessibility/AccessibleKeyBinding; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -26,25 +26,25 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getAfterIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getAtIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getBeforeIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getCharacterAttribute
  (I)Ljavax/swing/text/AttributeSet;
- (I)Ljavax/swing/text/AttributeSet;
+ (I)L0javax/swing/text/AttributeSet;
 getCharacterBounds
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L0java/awt/Rectangle;
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
@@ -59,10 +59,10 @@ getMinimumAccessibleValue
  ()Ljava/lang/Number;
 getSelectedText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getTitledBorderText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getToolTipText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/AbstractButton.eea b/libs/eea-java-17/src/main/resources/javax/swing/AbstractButton.eea
index c1e1b2c430..cce0d15535 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/AbstractButton.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/AbstractButton.eea
@@ -100,16 +100,16 @@ configurePropertiesFromAction
  (Ljavax/swing/Action;)V
 createActionListener
  ()Ljava/awt/event/ActionListener;
- ()Ljava/awt/event/ActionListener;
+ ()L1java/awt/event/ActionListener;
 createActionPropertyChangeListener
  (Ljavax/swing/Action;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/Action;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/Action;)L1java/beans/PropertyChangeListener;
 createChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 createItemListener
  ()Ljava/awt/event/ItemListener;
- ()Ljava/awt/event/ItemListener;
+ ()L1java/awt/event/ItemListener;
 fireActionPerformed
  (Ljava/awt/event/ActionEvent;)V
  (Ljava/awt/event/ActionEvent;)V
@@ -163,7 +163,7 @@ getSelectedIcon
  ()Ljavax/swing/Icon;
 getSelectedObjects
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 getText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -181,7 +181,7 @@ paintBorder
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 removeActionListener
  (Ljava/awt/event/ActionListener;)V
  (L1java/awt/event/ActionListener;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/ActionMap.eea b/libs/eea-java-17/src/main/resources/javax/swing/ActionMap.eea
index b25d837676..61ab9043ff 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/ActionMap.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/ActionMap.eea
@@ -11,7 +11,7 @@ getParent
  ()Ljavax/swing/ActionMap;
 keys
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 put
  (Ljava/lang/Object;Ljavax/swing/Action;)V
  (Ljava/lang/Object;Ljavax/swing/Action;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/BorderFactory.eea b/libs/eea-java-17/src/main/resources/javax/swing/BorderFactory.eea
index 64d9017b67..965a859c9a 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/BorderFactory.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/BorderFactory.eea
@@ -2,103 +2,103 @@ class javax/swing/BorderFactory
 
 createBevelBorder
  (I)Ljavax/swing/border/Border;
- (I)Ljavax/swing/border/Border;
+ (I)L1javax/swing/border/Border;
 createBevelBorder
  (ILjava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
- (ILjava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
+ (ILjava/awt/Color;Ljava/awt/Color;)L1javax/swing/border/Border;
 createBevelBorder
  (ILjava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
- (ILjava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
+ (ILjava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;)L1javax/swing/border/Border;
 createCompoundBorder
  ()Ljavax/swing/border/CompoundBorder;
- ()Ljavax/swing/border/CompoundBorder;
+ ()L1javax/swing/border/CompoundBorder;
 createCompoundBorder
  (Ljavax/swing/border/Border;Ljavax/swing/border/Border;)Ljavax/swing/border/CompoundBorder;
- (Ljavax/swing/border/Border;Ljavax/swing/border/Border;)Ljavax/swing/border/CompoundBorder;
+ (Ljavax/swing/border/Border;Ljavax/swing/border/Border;)L1javax/swing/border/CompoundBorder;
 createDashedBorder
  (Ljava/awt/Paint;)Ljavax/swing/border/Border;
- (Ljava/awt/Paint;)Ljavax/swing/border/Border;
+ (Ljava/awt/Paint;)L1javax/swing/border/Border;
 createDashedBorder
  (Ljava/awt/Paint;FF)Ljavax/swing/border/Border;
- (Ljava/awt/Paint;FF)Ljavax/swing/border/Border;
+ (Ljava/awt/Paint;FF)L1javax/swing/border/Border;
 createDashedBorder
  (Ljava/awt/Paint;FFFZ)Ljavax/swing/border/Border;
- (Ljava/awt/Paint;FFFZ)Ljavax/swing/border/Border;
+ (Ljava/awt/Paint;FFFZ)L1javax/swing/border/Border;
 createEmptyBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createEmptyBorder
  (IIII)Ljavax/swing/border/Border;
- (IIII)Ljavax/swing/border/Border;
+ (IIII)L1javax/swing/border/Border;
 createEtchedBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createEtchedBorder
  (I)Ljavax/swing/border/Border;
- (I)Ljavax/swing/border/Border;
+ (I)L1javax/swing/border/Border;
 createEtchedBorder
  (ILjava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
- (ILjava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
+ (ILjava/awt/Color;Ljava/awt/Color;)L1javax/swing/border/Border;
 createEtchedBorder
  (Ljava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
- (Ljava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
+ (Ljava/awt/Color;Ljava/awt/Color;)L1javax/swing/border/Border;
 createLineBorder
  (Ljava/awt/Color;)Ljavax/swing/border/Border;
- (Ljava/awt/Color;)Ljavax/swing/border/Border;
+ (Ljava/awt/Color;)L1javax/swing/border/Border;
 createLineBorder
  (Ljava/awt/Color;I)Ljavax/swing/border/Border;
- (Ljava/awt/Color;I)Ljavax/swing/border/Border;
+ (Ljava/awt/Color;I)L1javax/swing/border/Border;
 createLineBorder
  (Ljava/awt/Color;IZ)Ljavax/swing/border/Border;
- (Ljava/awt/Color;IZ)Ljavax/swing/border/Border;
+ (Ljava/awt/Color;IZ)L1javax/swing/border/Border;
 createLoweredBevelBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createLoweredSoftBevelBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createMatteBorder
  (IIIILjava/awt/Color;)Ljavax/swing/border/MatteBorder;
- (IIIILjava/awt/Color;)Ljavax/swing/border/MatteBorder;
+ (IIIILjava/awt/Color;)L1javax/swing/border/MatteBorder;
 createMatteBorder
  (IIIILjavax/swing/Icon;)Ljavax/swing/border/MatteBorder;
- (IIIILjavax/swing/Icon;)Ljavax/swing/border/MatteBorder;
+ (IIIILjavax/swing/Icon;)L1javax/swing/border/MatteBorder;
 createRaisedBevelBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createRaisedSoftBevelBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createSoftBevelBorder
  (I)Ljavax/swing/border/Border;
- (I)Ljavax/swing/border/Border;
+ (I)L0javax/swing/border/Border;
 createSoftBevelBorder
  (ILjava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
- (ILjava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
+ (ILjava/awt/Color;Ljava/awt/Color;)L1javax/swing/border/Border;
 createSoftBevelBorder
  (ILjava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
- (ILjava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
+ (ILjava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;)L1javax/swing/border/Border;
 createStrokeBorder
  (Ljava/awt/BasicStroke;)Ljavax/swing/border/Border;
- (Ljava/awt/BasicStroke;)Ljavax/swing/border/Border;
+ (Ljava/awt/BasicStroke;)L1javax/swing/border/Border;
 createStrokeBorder
  (Ljava/awt/BasicStroke;Ljava/awt/Paint;)Ljavax/swing/border/Border;
- (Ljava/awt/BasicStroke;Ljava/awt/Paint;)Ljavax/swing/border/Border;
+ (Ljava/awt/BasicStroke;Ljava/awt/Paint;)L1javax/swing/border/Border;
 createTitledBorder
  (Ljava/lang/String;)Ljavax/swing/border/TitledBorder;
- (Ljava/lang/String;)Ljavax/swing/border/TitledBorder;
+ (Ljava/lang/String;)L1javax/swing/border/TitledBorder;
 createTitledBorder
  (Ljavax/swing/border/Border;)Ljavax/swing/border/TitledBorder;
- (Ljavax/swing/border/Border;)Ljavax/swing/border/TitledBorder;
+ (Ljavax/swing/border/Border;)L1javax/swing/border/TitledBorder;
 createTitledBorder
  (Ljavax/swing/border/Border;Ljava/lang/String;)Ljavax/swing/border/TitledBorder;
- (Ljavax/swing/border/Border;Ljava/lang/String;)Ljavax/swing/border/TitledBorder;
+ (Ljavax/swing/border/Border;Ljava/lang/String;)L1javax/swing/border/TitledBorder;
 createTitledBorder
  (Ljavax/swing/border/Border;Ljava/lang/String;II)Ljavax/swing/border/TitledBorder;
- (Ljavax/swing/border/Border;Ljava/lang/String;II)Ljavax/swing/border/TitledBorder;
+ (Ljavax/swing/border/Border;Ljava/lang/String;II)L1javax/swing/border/TitledBorder;
 createTitledBorder
  (Ljavax/swing/border/Border;Ljava/lang/String;IILjava/awt/Font;)Ljavax/swing/border/TitledBorder;
- (Ljavax/swing/border/Border;Ljava/lang/String;IILjava/awt/Font;)Ljavax/swing/border/TitledBorder;
+ (Ljavax/swing/border/Border;Ljava/lang/String;IILjava/awt/Font;)L1javax/swing/border/TitledBorder;
 createTitledBorder
  (Ljavax/swing/border/Border;Ljava/lang/String;IILjava/awt/Font;Ljava/awt/Color;)Ljavax/swing/border/TitledBorder;
- (Ljavax/swing/border/Border;Ljava/lang/String;IILjava/awt/Font;Ljava/awt/Color;)Ljavax/swing/border/TitledBorder;
+ (Ljavax/swing/border/Border;Ljava/lang/String;IILjava/awt/Font;Ljava/awt/Color;)L1javax/swing/border/TitledBorder;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/Box.eea b/libs/eea-java-17/src/main/resources/javax/swing/Box.eea
index 8a729e67b3..bfe7e28a9a 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/Box.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/Box.eea
@@ -2,28 +2,28 @@ class javax/swing/Box
 
 createGlue
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component;
 createHorizontalBox
  ()Ljavax/swing/Box;
- ()Ljavax/swing/Box;
+ ()L1javax/swing/Box;
 createHorizontalGlue
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component;
 createHorizontalStrut
  (I)Ljava/awt/Component;
- (I)Ljava/awt/Component;
+ (I)L1java/awt/Component;
 createRigidArea
  (Ljava/awt/Dimension;)Ljava/awt/Component;
- (Ljava/awt/Dimension;)Ljava/awt/Component;
+ (Ljava/awt/Dimension;)L1java/awt/Component;
 createVerticalBox
  ()Ljavax/swing/Box;
- ()Ljavax/swing/Box;
+ ()L1javax/swing/Box;
 createVerticalGlue
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component;
 createVerticalStrut
  (I)Ljava/awt/Component;
- (I)Ljava/awt/Component;
+ (I)L1java/awt/Component;
 
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/ButtonModel.eea b/libs/eea-java-17/src/main/resources/javax/swing/ButtonModel.eea
index 35682cac51..a01364f96f 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/ButtonModel.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/ButtonModel.eea
@@ -14,7 +14,7 @@ getActionCommand
  ()Ljava/lang/String;
 getGroup
  ()Ljavax/swing/ButtonGroup;
- ()Ljavax/swing/ButtonGroup;
+ ()L0javax/swing/ButtonGroup;
 removeActionListener
  (Ljava/awt/event/ActionListener;)V
  (L1java/awt/event/ActionListener;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/DebugGraphics.eea b/libs/eea-java-17/src/main/resources/javax/swing/DebugGraphics.eea
index 43e7b1a7a2..b9d0e23680 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/DebugGraphics.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/DebugGraphics.eea
@@ -21,10 +21,10 @@ setLogStream
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
 create
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L1java/awt/Graphics; # @Inherited(java.awt.Graphics)
 create
  (IIII)Ljava/awt/Graphics;
- (IIII)Ljava/awt/Graphics;
+ (IIII)L1java/awt/Graphics; # @Overrides(java.awt.Graphics)
 drawBytes
  ([BIIII)V
  ([BIIII)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/DefaultButtonModel.eea b/libs/eea-java-17/src/main/resources/javax/swing/DefaultButtonModel.eea
index c2fc90c8f8..1a4b24d929 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/DefaultButtonModel.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/DefaultButtonModel.eea
@@ -39,7 +39,7 @@ getChangeListeners
  ()[Ljavax/swing/event/ChangeListener;
 getGroup
  ()Ljavax/swing/ButtonGroup;
- ()Ljavax/swing/ButtonGroup;
+ ()L0javax/swing/ButtonGroup; # @Inherited(javax.swing.ButtonModel)
 getItemListeners
  ()[Ljava/awt/event/ItemListener;
  ()[Ljava/awt/event/ItemListener;
@@ -48,7 +48,7 @@ getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
 getSelectedObjects
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 removeActionListener
  (Ljava/awt/event/ActionListener;)V
  (L1java/awt/event/ActionListener;)V # @Inherited(javax.swing.ButtonModel)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/DefaultFocusManager.eea b/libs/eea-java-17/src/main/resources/javax/swing/DefaultFocusManager.eea
index 341f067023..d6b4d73698 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/DefaultFocusManager.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/DefaultFocusManager.eea
@@ -5,13 +5,13 @@ compareTabOrder
  (Ljava/awt/Component;Ljava/awt/Component;)Z
 getComponentAfter
  (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Container;Ljava/awt/Component;)L0java/awt/Component;
 getComponentBefore
  (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Container;Ljava/awt/Component;)L0java/awt/Component;
 getFirstComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
- (Ljava/awt/Container;)Ljava/awt/Component;
+ (Ljava/awt/Container;)L0java/awt/Component;
 getLastComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
- (Ljava/awt/Container;)Ljava/awt/Component;
+ (Ljava/awt/Container;)L0java/awt/Component;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/DefaultListModel.eea b/libs/eea-java-17/src/main/resources/javax/swing/DefaultListModel.eea
index 2d54a32aca..4f923d34b3 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/DefaultListModel.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/DefaultListModel.eea
@@ -71,7 +71,7 @@ setElementAt
  (TE;I)V
 toArray
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[1Ljava/lang/Object;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/DefaultRowSorter$ModelWrapper.eea b/libs/eea-java-17/src/main/resources/javax/swing/DefaultRowSorter$ModelWrapper.eea
index 004dba7572..72f250c4c9 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/DefaultRowSorter$ModelWrapper.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/DefaultRowSorter$ModelWrapper.eea
@@ -10,7 +10,7 @@ getModel
  ()TM;
 getStringValueAt
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L1java/lang/String;
 getValueAt
  (II)Ljava/lang/Object;
  (II)Ljava/lang/Object;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/DefaultRowSorter.eea b/libs/eea-java-17/src/main/resources/javax/swing/DefaultRowSorter.eea
index d7c56f6763..763b5fbc5a 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/DefaultRowSorter.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/DefaultRowSorter.eea
@@ -8,7 +8,7 @@ super javax/swing/RowSorter
 
 getComparator
  (I)Ljava/util/Comparator<*>;
- (I)Ljava/util/Comparator<*>;
+ (I)L0java/util/Comparator<*>;
 getModel
  ()TM;
  ()TM;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/GrayFilter.eea b/libs/eea-java-17/src/main/resources/javax/swing/GrayFilter.eea
index 63a98701b0..96dc8f0129 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/GrayFilter.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/GrayFilter.eea
@@ -2,4 +2,4 @@ class javax/swing/GrayFilter
 
 createDisabledImage
  (Ljava/awt/Image;)Ljava/awt/Image;
- (Ljava/awt/Image;)Ljava/awt/Image;
+ (Ljava/awt/Image;)L1java/awt/Image;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/GroupLayout.eea b/libs/eea-java-17/src/main/resources/javax/swing/GroupLayout.eea
index 492f6c3227..b324c8c229 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/GroupLayout.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/GroupLayout.eea
@@ -11,19 +11,19 @@ addLayoutComponent
  (Ljava/lang/String;Ljava/awt/Component;)V
 createBaselineGroup
  (ZZ)Ljavax/swing/GroupLayout$ParallelGroup;
- (ZZ)Ljavax/swing/GroupLayout$ParallelGroup;
+ (ZZ)L1javax/swing/GroupLayout$ParallelGroup;
 createParallelGroup
  ()Ljavax/swing/GroupLayout$ParallelGroup;
- ()Ljavax/swing/GroupLayout$ParallelGroup;
+ ()L1javax/swing/GroupLayout$ParallelGroup;
 createParallelGroup
  (Ljavax/swing/GroupLayout$Alignment;)Ljavax/swing/GroupLayout$ParallelGroup;
- (Ljavax/swing/GroupLayout$Alignment;)Ljavax/swing/GroupLayout$ParallelGroup;
+ (Ljavax/swing/GroupLayout$Alignment;)L1javax/swing/GroupLayout$ParallelGroup;
 createParallelGroup
  (Ljavax/swing/GroupLayout$Alignment;Z)Ljavax/swing/GroupLayout$ParallelGroup;
- (Ljavax/swing/GroupLayout$Alignment;Z)Ljavax/swing/GroupLayout$ParallelGroup;
+ (Ljavax/swing/GroupLayout$Alignment;Z)L1javax/swing/GroupLayout$ParallelGroup;
 createSequentialGroup
  ()Ljavax/swing/GroupLayout$SequentialGroup;
- ()Ljavax/swing/GroupLayout$SequentialGroup;
+ ()L1javax/swing/GroupLayout$SequentialGroup;
 getLayoutAlignmentX
  (Ljava/awt/Container;)F
  (Ljava/awt/Container;)F
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/ImageIcon$AccessibleImageIcon.eea b/libs/eea-java-17/src/main/resources/javax/swing/ImageIcon$AccessibleImageIcon.eea
index 55271646c1..b9d2e10984 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/ImageIcon$AccessibleImageIcon.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/ImageIcon$AccessibleImageIcon.eea
@@ -5,22 +5,22 @@ class javax/swing/ImageIcon$AccessibleImageIcon
  (Ljavax/swing/ImageIcon;)V
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleIconDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getAccessibleParent
  ()Ljavax/accessibility/Accessible;
- ()Ljavax/accessibility/Accessible;
+ ()L0javax/accessibility/Accessible;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
- ()Ljavax/accessibility/AccessibleStateSet;
+ ()L0javax/accessibility/AccessibleStateSet;
 getLocale
  ()Ljava/util/Locale;
- ()Ljava/util/Locale;
+ ()L0java/util/Locale;
 setAccessibleIconDescription
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/InputMap.eea b/libs/eea-java-17/src/main/resources/javax/swing/InputMap.eea
index b5f99fb884..2181c98970 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/InputMap.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/InputMap.eea
@@ -5,13 +5,13 @@ allKeys
  ()[Ljavax/swing/KeyStroke;
 get
  (Ljavax/swing/KeyStroke;)Ljava/lang/Object;
- (Ljavax/swing/KeyStroke;)Ljava/lang/Object;
+ (Ljavax/swing/KeyStroke;)L0java/lang/Object;
 getParent
  ()Ljavax/swing/InputMap;
  ()Ljavax/swing/InputMap;
 keys
  ()[Ljavax/swing/KeyStroke;
- ()[Ljavax/swing/KeyStroke;
+ ()[0Ljavax/swing/KeyStroke;
 put
  (Ljavax/swing/KeyStroke;Ljava/lang/Object;)V
  (Ljavax/swing/KeyStroke;Ljava/lang/Object;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JApplet.eea b/libs/eea-java-17/src/main/resources/javax/swing/JApplet.eea
index 99bb993e37..149f7a42f3 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JApplet.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JApplet.eea
@@ -12,7 +12,7 @@ addImpl
  (Ljava/awt/Component;Ljava/lang/Object;I)V
 createRootPane
  ()Ljavax/swing/JRootPane;
- ()Ljavax/swing/JRootPane;
+ ()L1javax/swing/JRootPane;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -24,7 +24,7 @@ getGlassPane
  ()Ljava/awt/Component;
 getGraphics
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L0java/awt/Graphics; # @Inherited(java.awt.Component)
 getJMenuBar
  ()Ljavax/swing/JMenuBar;
  ()Ljavax/swing/JMenuBar;
@@ -39,7 +39,7 @@ getTransferHandler
  ()Ljavax/swing/TransferHandler;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Container)
 remove
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JButton.eea b/libs/eea-java-17/src/main/resources/javax/swing/JButton.eea
index e8d6cecacf..afddb49906 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JButton.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JButton.eea
@@ -17,7 +17,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.AbstractButton)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JCheckBox.eea b/libs/eea-java-17/src/main/resources/javax/swing/JCheckBox.eea
index ac6d08518e..b3479bc839 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JCheckBox.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JCheckBox.eea
@@ -30,7 +30,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JToggleButton)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JToggleButton)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JCheckBoxMenuItem.eea b/libs/eea-java-17/src/main/resources/javax/swing/JCheckBoxMenuItem.eea
index 7a924cf2f8..bf60117298 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JCheckBoxMenuItem.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JCheckBoxMenuItem.eea
@@ -23,10 +23,10 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getSelectedObjects
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object; # @Inherited(javax.swing.AbstractButton)
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JMenuItem)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JMenuItem)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JColorChooser.eea b/libs/eea-java-17/src/main/resources/javax/swing/JColorChooser.eea
index bc7eae5b2a..ec0ccb2d70 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JColorChooser.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JColorChooser.eea
@@ -12,7 +12,7 @@ SELECTION_MODEL_PROPERTY
 
 createDialog
  (Ljava/awt/Component;Ljava/lang/String;ZLjavax/swing/JColorChooser;Ljava/awt/event/ActionListener;Ljava/awt/event/ActionListener;)Ljavax/swing/JDialog;
- (Ljava/awt/Component;Ljava/lang/String;ZLjavax/swing/JColorChooser;Ljava/awt/event/ActionListener;Ljava/awt/event/ActionListener;)Ljavax/swing/JDialog;
+ (Ljava/awt/Component;Ljava/lang/String;ZLjavax/swing/JColorChooser;Ljava/awt/event/ActionListener;Ljava/awt/event/ActionListener;)L1javax/swing/JDialog;
 showDialog
  (Ljava/awt/Component;Ljava/lang/String;Ljava/awt/Color;)Ljava/awt/Color;
  (Ljava/awt/Component;Ljava/lang/String;Ljava/awt/Color;)Ljava/awt/Color;
@@ -53,10 +53,10 @@ getUI
  ()Ljavax/swing/plaf/ColorChooserUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 removeChooserPanel
  (Ljavax/swing/colorchooser/AbstractColorChooserPanel;)Ljavax/swing/colorchooser/AbstractColorChooserPanel;
  (Ljavax/swing/colorchooser/AbstractColorChooserPanel;)Ljavax/swing/colorchooser/AbstractColorChooserPanel;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JComboBox$AccessibleJComboBox.eea b/libs/eea-java-17/src/main/resources/javax/swing/JComboBox$AccessibleJComboBox.eea
index b47e0b7d53..01c77c174b 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JComboBox$AccessibleJComboBox.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JComboBox$AccessibleJComboBox.eea
@@ -5,22 +5,22 @@ class javax/swing/JComboBox$AccessibleJComboBox
  (Ljavax/swing/JComboBox;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
- ()Ljavax/accessibility/AccessibleStateSet;
+ ()L1javax/accessibility/AccessibleStateSet;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JComboBox.eea b/libs/eea-java-17/src/main/resources/javax/swing/JComboBox.eea
index 04fea573a9..de808b48d2 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JComboBox.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JComboBox.eea
@@ -59,10 +59,10 @@ contentsChanged
  (L1javax/swing/event/ListDataEvent;)V # @Inherited(javax.swing.event.ListDataListener)
 createActionPropertyChangeListener
  (Ljavax/swing/Action;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/Action;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/Action;)L1java/beans/PropertyChangeListener;
 createDefaultKeySelectionManager
  ()Ljavax/swing/JComboBox$KeySelectionManager;
- ()Ljavax/swing/JComboBox$KeySelectionManager;
+ ()L1javax/swing/JComboBox$KeySelectionManager;
 fireItemStateChanged
  (Ljava/awt/event/ItemEvent;)V
  (Ljava/awt/event/ItemEvent;)V
@@ -107,13 +107,13 @@ getSelectedItem
  ()Ljava/lang/Object;
 getSelectedObjects
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[1Ljava/lang/Object;
 getUI
  ()Ljavax/swing/plaf/ComboBoxUI;
  ()Ljavax/swing/plaf/ComboBoxUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 insertItemAt
  (TE;I)V
  (TE;I)V
@@ -125,7 +125,7 @@ intervalRemoved
  (L1javax/swing/event/ListDataEvent;)V # @Inherited(javax.swing.event.ListDataListener)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 processKeyBinding
  (Ljavax/swing/KeyStroke;Ljava/awt/event/KeyEvent;IZ)Z
  (Ljavax/swing/KeyStroke;Ljava/awt/event/KeyEvent;IZ)Z
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JComponent$AccessibleJComponent.eea b/libs/eea-java-17/src/main/resources/javax/swing/JComponent$AccessibleJComponent.eea
index 3a1238f2ed..b914c34eae 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JComponent$AccessibleJComponent.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JComponent$AccessibleJComponent.eea
@@ -12,13 +12,13 @@ addPropertyChangeListener
  (L1java/beans/PropertyChangeListener;)V # @Inherited(java.awt.Container$AccessibleAWTContainer)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(java.awt.Container$AccessibleAWTContainer)
 getAccessibleDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getAccessibleKeyBinding
  ()Ljavax/accessibility/AccessibleKeyBinding;
- ()Ljavax/accessibility/AccessibleKeyBinding;
+ ()L0javax/accessibility/AccessibleKeyBinding;
 getAccessibleName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -30,10 +30,10 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getBorderTitle
  (Ljavax/swing/border/Border;)Ljava/lang/String;
- (Ljavax/swing/border/Border;)Ljava/lang/String;
+ (Ljavax/swing/border/Border;)L0java/lang/String;
 getTitledBorderText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getToolTipText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JComponent.eea b/libs/eea-java-17/src/main/resources/javax/swing/JComponent.eea
index 4826b5fd3f..57efd656a3 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JComponent.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JComponent.eea
@@ -32,7 +32,7 @@ computeVisibleRect
  (Ljava/awt/Rectangle;)V
 createToolTip
  ()Ljavax/swing/JToolTip;
- ()Ljavax/swing/JToolTip;
+ ()L1javax/swing/JToolTip;
 firePropertyChange
  (Ljava/lang/String;CC)V
  (Ljava/lang/String;CC)V
@@ -47,7 +47,7 @@ fireVetoableChange
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 getActionForKeyStroke
  (Ljavax/swing/KeyStroke;)Ljava/awt/event/ActionListener;
- (Ljavax/swing/KeyStroke;)Ljava/awt/event/ActionListener;
+ (Ljavax/swing/KeyStroke;)L0java/awt/event/ActionListener;
 getActionMap
  ()Ljavax/swing/ActionMap;
  ()Ljavax/swing/ActionMap;
@@ -65,13 +65,13 @@ getBounds
  (Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
 getClientProperty
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L0java/lang/Object;
 getComponentGraphics
  (Ljava/awt/Graphics;)Ljava/awt/Graphics;
- (Ljava/awt/Graphics;)Ljava/awt/Graphics;
+ (Ljava/awt/Graphics;)L1java/awt/Graphics;
 getComponentPopupMenu
  ()Ljavax/swing/JPopupMenu;
- ()Ljavax/swing/JPopupMenu;
+ ()L0javax/swing/JPopupMenu;
 getConditionForKeyStroke
  (Ljavax/swing/KeyStroke;)I
  (Ljavax/swing/KeyStroke;)I
@@ -80,7 +80,7 @@ getFontMetrics
  (Ljava/awt/Font;)Ljava/awt/FontMetrics;
 getGraphics
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L0java/awt/Graphics; # @Inherited(java.awt.Component)
 getInputMap
  ()Ljavax/swing/InputMap;
  ()Ljavax/swing/InputMap;
@@ -113,13 +113,13 @@ getNextFocusableComponent
  ()Ljava/awt/Component;
 getPopupLocation
  (Ljava/awt/event/MouseEvent;)Ljava/awt/Point;
- (Ljava/awt/event/MouseEvent;)Ljava/awt/Point;
+ (Ljava/awt/event/MouseEvent;)L0java/awt/Point;
 getPreferredSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
 getRegisteredKeyStrokes
  ()[Ljavax/swing/KeyStroke;
- ()[Ljavax/swing/KeyStroke;
+ ()[1Ljavax/swing/KeyStroke;
 getRootPane
  ()Ljavax/swing/JRootPane;
  ()Ljavax/swing/JRootPane;
@@ -128,7 +128,7 @@ getSize
  (Ljava/awt/Dimension;)Ljava/awt/Dimension;
 getToolTipLocation
  (Ljava/awt/event/MouseEvent;)Ljava/awt/Point;
- (Ljava/awt/event/MouseEvent;)Ljava/awt/Point;
+ (Ljava/awt/event/MouseEvent;)L0java/awt/Point;
 getToolTipText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -137,7 +137,7 @@ getToolTipText
  (L1java/awt/event/MouseEvent;)Ljava/lang/String;
 getTopLevelAncestor
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L0java/awt/Container;
 getTransferHandler
  ()Ljavax/swing/TransferHandler;
  ()Ljavax/swing/TransferHandler;
@@ -146,13 +146,13 @@ getUI
  ()Ljavax/swing/plaf/ComponentUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getVetoableChangeListeners
  ()[Ljava/beans/VetoableChangeListener;
  ()[Ljava/beans/VetoableChangeListener;
 getVisibleRect
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L1java/awt/Rectangle;
 paint
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
@@ -170,7 +170,7 @@ paintImmediately
  (Ljava/awt/Rectangle;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Container)
 print
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JDesktopPane.eea b/libs/eea-java-17/src/main/resources/javax/swing/JDesktopPane.eea
index 48c92f8629..e2821a1a10 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JDesktopPane.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JDesktopPane.eea
@@ -23,16 +23,16 @@ getUI
  ()Ljavax/swing/plaf/DesktopPaneUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JLayeredPane)
 remove
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
 selectFrame
  (Z)Ljavax/swing/JInternalFrame;
- (Z)Ljavax/swing/JInternalFrame;
+ (Z)L0javax/swing/JInternalFrame;
 setComponentZOrder
  (Ljava/awt/Component;I)V
  (Ljava/awt/Component;I)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JDialog.eea b/libs/eea-java-17/src/main/resources/javax/swing/JDialog.eea
index 88eb273a07..49e970ea95 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JDialog.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JDialog.eea
@@ -57,7 +57,7 @@ addImpl
  (Ljava/awt/Component;Ljava/lang/Object;I)V
 createRootPane
  ()Ljavax/swing/JRootPane;
- ()Ljavax/swing/JRootPane;
+ ()L1javax/swing/JRootPane;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -69,7 +69,7 @@ getGlassPane
  ()Ljava/awt/Component;
 getGraphics
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L0java/awt/Graphics; # @Inherited(java.awt.Component)
 getJMenuBar
  ()Ljavax/swing/JMenuBar;
  ()Ljavax/swing/JMenuBar;
@@ -84,7 +84,7 @@ getTransferHandler
  ()Ljavax/swing/TransferHandler;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Dialog)
 processWindowEvent
  (Ljava/awt/event/WindowEvent;)V
  (Ljava/awt/event/WindowEvent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JEditorPane$AccessibleJEditorPaneHTML.eea b/libs/eea-java-17/src/main/resources/javax/swing/JEditorPane$AccessibleJEditorPaneHTML.eea
index 195f02fdc6..862f2d72f9 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JEditorPane$AccessibleJEditorPaneHTML.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JEditorPane$AccessibleJEditorPaneHTML.eea
@@ -5,10 +5,10 @@ class javax/swing/JEditorPane$AccessibleJEditorPaneHTML
  (Ljavax/swing/JEditorPane;)V
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Container$AccessibleAWTContainer)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L1javax/accessibility/AccessibleText; # @Overrides(javax.swing.text.JTextComponent$AccessibleJTextComponent)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink.eea b/libs/eea-java-17/src/main/resources/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink.eea
index 7b021a01e2..2fde0e9c34 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink.eea
@@ -8,7 +8,7 @@ getAccessibleActionAnchor
  (I)Ljava/lang/Object;
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleActionObject
  (I)Ljava/lang/Object;
- (I)Ljava/lang/Object;
+ (I)L0java/lang/Object;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport.eea b/libs/eea-java-17/src/main/resources/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport.eea
index 5992e31388..8c64fa5426 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport.eea
@@ -5,7 +5,7 @@ class javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport
  (Ljavax/swing/JEditorPane;)V
 getLink
  (I)Ljavax/accessibility/AccessibleHyperlink;
- (I)Ljavax/accessibility/AccessibleHyperlink;
+ (I)L0javax/accessibility/AccessibleHyperlink;
 getLinkText
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JEditorPane.eea b/libs/eea-java-17/src/main/resources/javax/swing/JEditorPane.eea
index 75c2cec41c..c1644780e7 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JEditorPane.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JEditorPane.eea
@@ -9,7 +9,7 @@ W3C_LENGTH_UNITS
 
 createEditorKitForContentType
  (Ljava/lang/String;)Ljavax/swing/text/EditorKit;
- (Ljava/lang/String;)Ljavax/swing/text/EditorKit;
+ (Ljava/lang/String;)L0javax/swing/text/EditorKit;
 getEditorKitClassNameForContentType
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
@@ -34,7 +34,7 @@ addHyperlinkListener
  (L1javax/swing/event/HyperlinkListener;)V
 createDefaultEditorKit
  ()Ljavax/swing/text/EditorKit;
- ()Ljavax/swing/text/EditorKit;
+ ()L1javax/swing/text/EditorKit;
 fireHyperlinkUpdate
  (Ljavax/swing/event/HyperlinkEvent;)V
  (Ljavax/swing/event/HyperlinkEvent;)V
@@ -43,7 +43,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getEditorKit
  ()Ljavax/swing/text/EditorKit;
  ()Ljavax/swing/text/EditorKit;
@@ -58,19 +58,19 @@ getPage
  ()Ljava/net/URL;
 getPreferredSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 getStream
  (Ljava/net/URL;)Ljava/io/InputStream;
  (Ljava/net/URL;)Ljava/io/InputStream;
 getText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(javax.swing.text.JTextComponent)
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.text.JTextComponent)
 read
  (Ljava/io/InputStream;Ljava/lang/Object;)V
  (Ljava/io/InputStream;Ljava/lang/Object;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JFileChooser.eea b/libs/eea-java-17/src/main/resources/javax/swing/JFileChooser.eea
index 43392b156d..6295a82e94 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JFileChooser.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JFileChooser.eea
@@ -91,7 +91,7 @@ addChoosableFileFilter
  (Ljavax/swing/filechooser/FileFilter;)V
 createDialog
  (Ljava/awt/Component;)Ljavax/swing/JDialog;
- (Ljava/awt/Component;)Ljavax/swing/JDialog;
+ (Ljava/awt/Component;)L1javax/swing/JDialog;
 ensureFileIsVisible
  (Ljava/io/File;)V
  (Ljava/io/File;)V
@@ -118,7 +118,7 @@ getApproveButtonToolTipText
  ()Ljava/lang/String;
 getChoosableFileFilters
  ()[Ljavax/swing/filechooser/FileFilter;
- ()[Ljavax/swing/filechooser/FileFilter;
+ ()[1Ljavax/swing/filechooser/FileFilter;
 getCurrentDirectory
  ()Ljava/io/File;
  ()Ljava/io/File;
@@ -157,13 +157,13 @@ getUI
  ()Ljavax/swing/plaf/FileChooserUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 isTraversable
  (Ljava/io/File;)Z
  (Ljava/io/File;)Z
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 removeActionListener
  (Ljava/awt/event/ActionListener;)V
  (L1java/awt/event/ActionListener;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JFormattedTextField$AbstractFormatter.eea b/libs/eea-java-17/src/main/resources/javax/swing/JFormattedTextField$AbstractFormatter.eea
index 486c22e6e6..1f0ba6df4d 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JFormattedTextField$AbstractFormatter.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JFormattedTextField$AbstractFormatter.eea
@@ -5,16 +5,16 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 getActions
  ()[Ljavax/swing/Action;
- ()[Ljavax/swing/Action;
+ ()[0Ljavax/swing/Action;
 getDocumentFilter
  ()Ljavax/swing/text/DocumentFilter;
- ()Ljavax/swing/text/DocumentFilter;
+ ()L0javax/swing/text/DocumentFilter;
 getFormattedTextField
  ()Ljavax/swing/JFormattedTextField;
  ()Ljavax/swing/JFormattedTextField;
 getNavigationFilter
  ()Ljavax/swing/text/NavigationFilter;
- ()Ljavax/swing/text/NavigationFilter;
+ ()L0javax/swing/text/NavigationFilter;
 install
  (Ljavax/swing/JFormattedTextField;)V
  (Ljavax/swing/JFormattedTextField;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JFormattedTextField.eea b/libs/eea-java-17/src/main/resources/javax/swing/JFormattedTextField.eea
index 79133323d9..96e0e3337b 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JFormattedTextField.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JFormattedTextField.eea
@@ -26,7 +26,7 @@ getFormatterFactory
  ()Ljavax/swing/JFormattedTextField$AbstractFormatterFactory;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JTextField)
 getValue
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JFrame.eea b/libs/eea-java-17/src/main/resources/javax/swing/JFrame.eea
index c1425d7d7b..641333f1f7 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JFrame.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JFrame.eea
@@ -21,7 +21,7 @@ addImpl
  (Ljava/awt/Component;Ljava/lang/Object;I)V
 createRootPane
  ()Ljavax/swing/JRootPane;
- ()Ljavax/swing/JRootPane;
+ ()L1javax/swing/JRootPane;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -33,7 +33,7 @@ getGlassPane
  ()Ljava/awt/Component;
 getGraphics
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L0java/awt/Graphics; # @Inherited(java.awt.Component)
 getJMenuBar
  ()Ljavax/swing/JMenuBar;
  ()Ljavax/swing/JMenuBar;
@@ -48,7 +48,7 @@ getTransferHandler
  ()Ljavax/swing/TransferHandler;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Frame)
 processWindowEvent
  (Ljava/awt/event/WindowEvent;)V
  (Ljava/awt/event/WindowEvent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JInternalFrame$AccessibleJInternalFrame.eea b/libs/eea-java-17/src/main/resources/javax/swing/JInternalFrame$AccessibleJInternalFrame.eea
index aacb561c56..7c91b97281 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JInternalFrame$AccessibleJInternalFrame.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JInternalFrame$AccessibleJInternalFrame.eea
@@ -11,7 +11,7 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon.eea b/libs/eea-java-17/src/main/resources/javax/swing/JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon.eea
index 6d7313279f..44797eaf4d 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon.eea
@@ -8,16 +8,16 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getMaximumAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getMinimumAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 setCurrentAccessibleValue
  (Ljava/lang/Number;)Z
  (Ljava/lang/Number;)Z
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JInternalFrame$JDesktopIcon.eea b/libs/eea-java-17/src/main/resources/javax/swing/JInternalFrame$JDesktopIcon.eea
index 94d19ac689..c33e9a7aa4 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JInternalFrame$JDesktopIcon.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JInternalFrame$JDesktopIcon.eea
@@ -8,7 +8,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getDesktopPane
  ()Ljavax/swing/JDesktopPane;
- ()Ljavax/swing/JDesktopPane;
+ ()L0javax/swing/JDesktopPane;
 getInternalFrame
  ()Ljavax/swing/JInternalFrame;
  ()Ljavax/swing/JInternalFrame;
@@ -17,7 +17,7 @@ getUI
  ()Ljavax/swing/plaf/DesktopIconUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setInternalFrame
  (Ljavax/swing/JInternalFrame;)V
  (Ljavax/swing/JInternalFrame;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JInternalFrame.eea b/libs/eea-java-17/src/main/resources/javax/swing/JInternalFrame.eea
index 90840b4bf7..6c78808ec6 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JInternalFrame.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JInternalFrame.eea
@@ -70,7 +70,7 @@ addInternalFrameListener
  (L1javax/swing/event/InternalFrameListener;)V
 createRootPane
  ()Ljavax/swing/JRootPane;
- ()Ljavax/swing/JRootPane;
+ ()L1javax/swing/JRootPane;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -85,10 +85,10 @@ getDesktopPane
  ()Ljavax/swing/JDesktopPane;
 getFocusCycleRootAncestor
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L0java/awt/Container;
 getFocusOwner
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 getFrameIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
@@ -127,16 +127,16 @@ getUI
  ()Ljavax/swing/plaf/InternalFrameUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 getWarningString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 paintComponent
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 remove
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JLabel$AccessibleJLabel.eea b/libs/eea-java-17/src/main/resources/javax/swing/JLabel$AccessibleJLabel.eea
index ad4150119e..f5075dacdf 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JLabel$AccessibleJLabel.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JLabel$AccessibleJLabel.eea
@@ -5,10 +5,10 @@ class javax/swing/JLabel$AccessibleJLabel
  (Ljavax/swing/JLabel;)V
 getAccessibleIcon
  ()[Ljavax/accessibility/AccessibleIcon;
- ()[Ljavax/accessibility/AccessibleIcon;
+ ()[0Ljavax/accessibility/AccessibleIcon; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleKeyBinding
  ()Ljavax/accessibility/AccessibleKeyBinding;
- ()Ljavax/accessibility/AccessibleKeyBinding;
+ ()L0javax/accessibility/AccessibleKeyBinding; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -20,31 +20,31 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAfterIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getAtIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getBeforeIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getCharacterAttribute
  (I)Ljavax/swing/text/AttributeSet;
- (I)Ljavax/swing/text/AttributeSet;
+ (I)L0javax/swing/text/AttributeSet;
 getCharacterBounds
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L0java/awt/Rectangle;
 getIndexAtPoint
  (Ljava/awt/Point;)I
  (Ljava/awt/Point;)I
 getSelectedText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getTitledBorderText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getToolTipText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JLabel.eea b/libs/eea-java-17/src/main/resources/javax/swing/JLabel.eea
index 536410d089..83de700c3b 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JLabel.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JLabel.eea
@@ -45,13 +45,13 @@ getUI
  ()Ljavax/swing/plaf/LabelUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 imageUpdate
  (Ljava/awt/Image;IIIII)Z
  (Ljava/awt/Image;IIIII)Z
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setDisabledIcon
  (Ljavax/swing/Icon;)V
  (Ljavax/swing/Icon;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JLayer.eea b/libs/eea-java-17/src/main/resources/javax/swing/JLayer.eea
index 1def87d320..2efefe68c0 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JLayer.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JLayer.eea
@@ -13,13 +13,13 @@ addImpl
  (Ljava/awt/Component;Ljava/lang/Object;I)V
 createGlassPane
  ()Ljavax/swing/JPanel;
- ()Ljavax/swing/JPanel;
+ ()L1javax/swing/JPanel;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
 getBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L0javax/swing/border/Border;
 getGlassPane
  ()Ljavax/swing/JPanel;
  ()Ljavax/swing/JPanel;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JLayeredPane.eea b/libs/eea-java-17/src/main/resources/javax/swing/JLayeredPane.eea
index 0fb6d4334b..be14fae683 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JLayeredPane.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JLayeredPane.eea
@@ -43,7 +43,7 @@ getComponentToLayer
  ()Ljava/util/Hashtable<Ljava/awt/Component;Ljava/lang/Integer;>;
 getComponentsInLayer
  (I)[Ljava/awt/Component;
- (I)[Ljava/awt/Component;
+ (I)[1Ljava/awt/Component;
 getIndexOf
  (Ljava/awt/Component;)I
  (Ljava/awt/Component;)I
@@ -67,7 +67,7 @@ paint
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setLayer
  (Ljava/awt/Component;I)V
  (Ljava/awt/Component;I)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JList$AccessibleJList$AccessibleJListChild.eea b/libs/eea-java-17/src/main/resources/javax/swing/JList$AccessibleJList$AccessibleJListChild.eea
index 30ba58c67c..4f1d7b218a 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JList$AccessibleJList$AccessibleJListChild.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JList$AccessibleJList$AccessibleJListChild.eea
@@ -14,76 +14,76 @@ contains
  (Ljava/awt/Point;)Z
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
 getAccessibleDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getAccessibleIcon
  ()[Ljavax/accessibility/AccessibleIcon;
- ()[Ljavax/accessibility/AccessibleIcon;
+ ()[0Ljavax/accessibility/AccessibleIcon; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
- ()Ljavax/accessibility/AccessibleRole;
+ ()L0javax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
- ()Ljavax/accessibility/AccessibleStateSet;
+ ()L1javax/accessibility/AccessibleStateSet;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getBounds
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L0java/awt/Rectangle;
 getCursor
  ()Ljava/awt/Cursor;
- ()Ljava/awt/Cursor;
+ ()L0java/awt/Cursor;
 getFont
  ()Ljava/awt/Font;
- ()Ljava/awt/Font;
+ ()L0java/awt/Font;
 getFontMetrics
  (Ljava/awt/Font;)Ljava/awt/FontMetrics;
- (Ljava/awt/Font;)Ljava/awt/FontMetrics;
+ (Ljava/awt/Font;)L0java/awt/FontMetrics;
 getForeground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getLocale
  ()Ljava/util/Locale;
- ()Ljava/util/Locale;
+ ()L0java/util/Locale;
 getLocation
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getLocationOnScreen
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L0java/awt/Dimension;
 removeFocusListener
  (Ljava/awt/event/FocusListener;)V
  (L1java/awt/event/FocusListener;)V # @Inherited(javax.accessibility.AccessibleComponent)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JList$AccessibleJList.eea b/libs/eea-java-17/src/main/resources/javax/swing/JList$AccessibleJList.eea
index 59471d6bf5..059c24e184 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JList$AccessibleJList.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JList$AccessibleJList.eea
@@ -8,19 +8,19 @@ contentsChanged
  (L1javax/swing/event/ListDataEvent;)V # @Inherited(javax.swing.event.ListDataListener)
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Container$AccessibleAWTContainer)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
  ()Ljavax/accessibility/AccessibleStateSet;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JList.eea b/libs/eea-java-17/src/main/resources/javax/swing/JList.eea
index f6c8c404a1..ec69fee525 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JList.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JList.eea
@@ -16,13 +16,13 @@ addListSelectionListener
  (L1javax/swing/event/ListSelectionListener;)V
 createSelectionModel
  ()Ljavax/swing/ListSelectionModel;
- ()Ljavax/swing/ListSelectionModel;
+ ()L1javax/swing/ListSelectionModel;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
 getCellBounds
  (II)Ljava/awt/Rectangle;
- (II)Ljava/awt/Rectangle;
+ (II)L0java/awt/Rectangle;
 getCellRenderer
  ()Ljavax/swing/ListCellRenderer<-TE;>;
  ()Ljavax/swing/ListCellRenderer<-TE;>;
@@ -61,7 +61,7 @@ getSelectedValue
  ()TE;
 getSelectedValues
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[1Ljava/lang/Object;
 getSelectedValuesList
  ()Ljava/util/List<TE;>;
  ()Ljava/util/List<TE;>;
@@ -82,16 +82,16 @@ getUI
  ()Ljavax/swing/plaf/ListUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 indexToLocation
  (I)Ljava/awt/Point;
- (I)Ljava/awt/Point;
+ (I)L0java/awt/Point;
 locationToIndex
  (Ljava/awt/Point;)I
  (Ljava/awt/Point;)I
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 removeListSelectionListener
  (Ljavax/swing/event/ListSelectionListener;)V
  (L1javax/swing/event/ListSelectionListener;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JMenu$AccessibleJMenu.eea b/libs/eea-java-17/src/main/resources/javax/swing/JMenu$AccessibleJMenu.eea
index 8dd847c638..bfc7357bc4 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JMenu$AccessibleJMenu.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JMenu$AccessibleJMenu.eea
@@ -5,13 +5,13 @@ class javax/swing/JMenu$AccessibleJMenu
  (Ljavax/swing/JMenu;)V
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JMenu.eea b/libs/eea-java-17/src/main/resources/javax/swing/JMenu.eea
index bb085a02c5..5d9809882a 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JMenu.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JMenu.eea
@@ -36,13 +36,13 @@ applyComponentOrientation
  (Ljava/awt/ComponentOrientation;)V
 createActionChangeListener
  (Ljavax/swing/JMenuItem;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JMenuItem;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JMenuItem;)L1java/beans/PropertyChangeListener;
 createActionComponent
  (Ljavax/swing/Action;)Ljavax/swing/JMenuItem;
- (Ljavax/swing/Action;)Ljavax/swing/JMenuItem;
+ (Ljavax/swing/Action;)L1javax/swing/JMenuItem;
 createWinListener
  (Ljavax/swing/JPopupMenu;)Ljavax/swing/JMenu$WinListener;
- (Ljavax/swing/JPopupMenu;)Ljavax/swing/JMenu$WinListener;
+ (Ljavax/swing/JPopupMenu;)L1javax/swing/JMenu$WinListener;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -51,10 +51,10 @@ getComponent
  ()Ljava/awt/Component;
 getItem
  (I)Ljavax/swing/JMenuItem;
- (I)Ljavax/swing/JMenuItem;
+ (I)L0javax/swing/JMenuItem;
 getMenuComponent
  (I)Ljava/awt/Component;
- (I)Ljava/awt/Component;
+ (I)L0java/awt/Component;
 getMenuComponents
  ()[Ljava/awt/Component;
  ()[Ljava/awt/Component;
@@ -66,19 +66,19 @@ getPopupMenu
  ()Ljavax/swing/JPopupMenu;
 getPopupMenuOrigin
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L1java/awt/Point;
 getSubElements
  ()[Ljavax/swing/MenuElement;
- ()[Ljavax/swing/MenuElement;
+ ()[1Ljavax/swing/MenuElement; # @Inherited(javax.swing.JMenuItem)
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JMenuItem)
 insert
  (Ljava/lang/String;I)V
  (Ljava/lang/String;I)V
 insert
  (Ljavax/swing/Action;I)Ljavax/swing/JMenuItem;
- (Ljavax/swing/Action;I)Ljavax/swing/JMenuItem;
+ (Ljavax/swing/Action;I)L1javax/swing/JMenuItem;
 insert
  (Ljavax/swing/JMenuItem;I)Ljavax/swing/JMenuItem;
  (Ljavax/swing/JMenuItem;I)Ljavax/swing/JMenuItem;
@@ -87,7 +87,7 @@ isMenuComponent
  (Ljava/awt/Component;)Z
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JMenuItem)
 processKeyEvent
  (Ljava/awt/event/KeyEvent;)V
  (Ljava/awt/event/KeyEvent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JMenuBar$AccessibleJMenuBar.eea b/libs/eea-java-17/src/main/resources/javax/swing/JMenuBar$AccessibleJMenuBar.eea
index 9821e3ea56..4c46e234ac 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JMenuBar$AccessibleJMenuBar.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JMenuBar$AccessibleJMenuBar.eea
@@ -8,10 +8,10 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
  ()Ljavax/accessibility/AccessibleStateSet;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JMenuBar.eea b/libs/eea-java-17/src/main/resources/javax/swing/JMenuBar.eea
index 2f51e53d12..1b302c0fcc 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JMenuBar.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JMenuBar.eea
@@ -11,37 +11,37 @@ getComponent
  ()Ljava/awt/Component;
 getComponentAtIndex
  (I)Ljava/awt/Component;
- (I)Ljava/awt/Component;
+ (I)L0java/awt/Component;
 getComponentIndex
  (Ljava/awt/Component;)I
  (Ljava/awt/Component;)I
 getHelpMenu
  ()Ljavax/swing/JMenu;
- ()Ljavax/swing/JMenu;
+ ()L1javax/swing/JMenu;
 getMargin
  ()Ljava/awt/Insets;
  ()Ljava/awt/Insets;
 getMenu
  (I)Ljavax/swing/JMenu;
- (I)Ljavax/swing/JMenu;
+ (I)L0javax/swing/JMenu;
 getSelectionModel
  ()Ljavax/swing/SingleSelectionModel;
  ()Ljavax/swing/SingleSelectionModel;
 getSubElements
  ()[Ljavax/swing/MenuElement;
- ()[Ljavax/swing/MenuElement;
+ ()[1Ljavax/swing/MenuElement;
 getUI
  ()Ljavax/swing/plaf/MenuBarUI;
  ()Ljavax/swing/plaf/MenuBarUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paintBorder
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 processKeyBinding
  (Ljavax/swing/KeyStroke;Ljava/awt/event/KeyEvent;IZ)Z
  (Ljavax/swing/KeyStroke;Ljava/awt/event/KeyEvent;IZ)Z
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JMenuItem.eea b/libs/eea-java-17/src/main/resources/javax/swing/JMenuItem.eea
index 1c2956607a..60dab4e319 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JMenuItem.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JMenuItem.eea
@@ -65,16 +65,16 @@ getMenuKeyListeners
  ()[Ljavax/swing/event/MenuKeyListener;
 getSubElements
  ()[Ljavax/swing/MenuElement;
- ()[Ljavax/swing/MenuElement;
+ ()[1Ljavax/swing/MenuElement;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 init
  (Ljava/lang/String;Ljavax/swing/Icon;)V
  (Ljava/lang/String;Ljavax/swing/Icon;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.AbstractButton)
 processKeyEvent
  (Ljava/awt/event/KeyEvent;[Ljavax/swing/MenuElement;Ljavax/swing/MenuSelectionManager;)V
  (Ljava/awt/event/KeyEvent;[Ljavax/swing/MenuElement;Ljavax/swing/MenuSelectionManager;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JOptionPane.eea b/libs/eea-java-17/src/main/resources/javax/swing/JOptionPane.eea
index b38d621d41..7819fe3a57 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JOptionPane.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JOptionPane.eea
@@ -72,7 +72,7 @@ showInputDialog
  (Ljava/awt/Component;Ljava/lang/Object;Ljava/lang/String;I)Ljava/lang/String;
 showInputDialog
  (Ljava/awt/Component;Ljava/lang/Object;Ljava/lang/String;ILjavax/swing/Icon;[Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/awt/Component;Ljava/lang/Object;Ljava/lang/String;ILjavax/swing/Icon;[Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/awt/Component;Ljava/lang/Object;Ljava/lang/String;ILjavax/swing/Icon;[Ljava/lang/Object;Ljava/lang/Object;)L0java/lang/Object;
 showInputDialog
  (Ljava/lang/Object;)Ljava/lang/String;
  (Ljava/lang/Object;)Ljava/lang/String;
@@ -99,7 +99,7 @@ showInternalInputDialog
  (Ljava/awt/Component;Ljava/lang/Object;Ljava/lang/String;I)Ljava/lang/String;
 showInternalInputDialog
  (Ljava/awt/Component;Ljava/lang/Object;Ljava/lang/String;ILjavax/swing/Icon;[Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/awt/Component;Ljava/lang/Object;Ljava/lang/String;ILjavax/swing/Icon;[Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/awt/Component;Ljava/lang/Object;Ljava/lang/String;ILjavax/swing/Icon;[Ljava/lang/Object;Ljava/lang/Object;)L0java/lang/Object;
 showInternalMessageDialog
  (Ljava/awt/Component;Ljava/lang/Object;)V
  (Ljava/awt/Component;Ljava/lang/Object;)V
@@ -170,13 +170,13 @@ value
  (Ljava/lang/Object;IILjavax/swing/Icon;[Ljava/lang/Object;Ljava/lang/Object;)V
 createDialog
  (Ljava/awt/Component;Ljava/lang/String;)Ljavax/swing/JDialog;
- (Ljava/awt/Component;Ljava/lang/String;)Ljavax/swing/JDialog;
+ (Ljava/awt/Component;Ljava/lang/String;)L1javax/swing/JDialog;
 createDialog
  (Ljava/lang/String;)Ljavax/swing/JDialog;
- (Ljava/lang/String;)Ljavax/swing/JDialog;
+ (Ljava/lang/String;)L1javax/swing/JDialog;
 createInternalFrame
  (Ljava/awt/Component;Ljava/lang/String;)Ljavax/swing/JInternalFrame;
- (Ljava/awt/Component;Ljava/lang/String;)Ljavax/swing/JInternalFrame;
+ (Ljava/awt/Component;Ljava/lang/String;)L1javax/swing/JInternalFrame;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -206,13 +206,13 @@ getUI
  ()Ljavax/swing/plaf/OptionPaneUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 getValue
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setIcon
  (Ljavax/swing/Icon;)V
  (Ljavax/swing/Icon;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JPanel.eea b/libs/eea-java-17/src/main/resources/javax/swing/JPanel.eea
index ae1e89e511..050023edcc 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JPanel.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JPanel.eea
@@ -14,10 +14,10 @@ getUI
  ()Ljavax/swing/plaf/PanelUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setUI
  (Ljavax/swing/plaf/PanelUI;)V
  (Ljavax/swing/plaf/PanelUI;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JPasswordField$AccessibleJPasswordField.eea b/libs/eea-java-17/src/main/resources/javax/swing/JPasswordField$AccessibleJPasswordField.eea
index b757e265ad..be24a30900 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JPasswordField$AccessibleJPasswordField.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JPasswordField$AccessibleJPasswordField.eea
@@ -8,25 +8,25 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.swing.text.JTextComponent$AccessibleJTextComponent)
 getAfterIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getAtIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getBeforeIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getTextRange
  (II)Ljava/lang/String;
  (II)Ljava/lang/String;
 getTextSequenceAfter
  (II)Ljavax/accessibility/AccessibleTextSequence;
- (II)Ljavax/accessibility/AccessibleTextSequence;
+ (II)L0javax/accessibility/AccessibleTextSequence;
 getTextSequenceAt
  (II)Ljavax/accessibility/AccessibleTextSequence;
- (II)Ljavax/accessibility/AccessibleTextSequence;
+ (II)L0javax/accessibility/AccessibleTextSequence;
 getTextSequenceBefore
  (II)Ljavax/accessibility/AccessibleTextSequence;
- (II)Ljavax/accessibility/AccessibleTextSequence;
+ (II)L0javax/accessibility/AccessibleTextSequence;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JPasswordField.eea b/libs/eea-java-17/src/main/resources/javax/swing/JPasswordField.eea
index 82992090b7..47f6678fc0 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JPasswordField.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JPasswordField.eea
@@ -14,19 +14,19 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getPassword
  ()[C
- ()[C
+ ()[0C
 getText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(javax.swing.text.JTextComponent)
 getText
  (II)Ljava/lang/String;
  (II)Ljava/lang/String;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JTextField)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JTextField)
 setText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JPopupMenu$Separator.eea b/libs/eea-java-17/src/main/resources/javax/swing/JPopupMenu$Separator.eea
index 61f1ce3966..1c4c0143aa 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JPopupMenu$Separator.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JPopupMenu$Separator.eea
@@ -2,4 +2,4 @@ class javax/swing/JPopupMenu$Separator
 
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JSeparator)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JPopupMenu.eea b/libs/eea-java-17/src/main/resources/javax/swing/JPopupMenu.eea
index b9aff19e9c..b07f1d4d4e 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JPopupMenu.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JPopupMenu.eea
@@ -20,10 +20,10 @@ addPopupMenuListener
  (L1javax/swing/event/PopupMenuListener;)V
 createActionChangeListener
  (Ljavax/swing/JMenuItem;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JMenuItem;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JMenuItem;)L1java/beans/PropertyChangeListener;
 createActionComponent
  (Ljavax/swing/Action;)Ljavax/swing/JMenuItem;
- (Ljavax/swing/Action;)Ljavax/swing/JMenuItem;
+ (Ljavax/swing/Action;)L1javax/swing/JMenuItem;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -56,13 +56,13 @@ getSelectionModel
  ()Ljavax/swing/SingleSelectionModel;
 getSubElements
  ()[Ljavax/swing/MenuElement;
- ()[Ljavax/swing/MenuElement;
+ ()[1Ljavax/swing/MenuElement;
 getUI
  ()Ljavax/swing/plaf/PopupMenuUI;
  ()Ljavax/swing/plaf/PopupMenuUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 insert
  (Ljava/awt/Component;I)V
  (Ljava/awt/Component;I)V
@@ -77,7 +77,7 @@ paintBorder
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 processFocusEvent
  (Ljava/awt/event/FocusEvent;)V
  (Ljava/awt/event/FocusEvent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JProgressBar$AccessibleJProgressBar.eea b/libs/eea-java-17/src/main/resources/javax/swing/JProgressBar$AccessibleJProgressBar.eea
index a1463ab534..25b25d2c76 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JProgressBar$AccessibleJProgressBar.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JProgressBar$AccessibleJProgressBar.eea
@@ -11,7 +11,7 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JProgressBar.eea b/libs/eea-java-17/src/main/resources/javax/swing/JProgressBar.eea
index 1c76b91704..d1b23afb41 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JProgressBar.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JProgressBar.eea
@@ -21,7 +21,7 @@ addChangeListener
  (L1javax/swing/event/ChangeListener;)V
 createChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -39,13 +39,13 @@ getUI
  ()Ljavax/swing/plaf/ProgressBarUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paintBorder
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 removeChangeListener
  (Ljavax/swing/event/ChangeListener;)V
  (L1javax/swing/event/ChangeListener;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JRadioButton.eea b/libs/eea-java-17/src/main/resources/javax/swing/JRadioButton.eea
index dcad81dcf2..24a0990a0b 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JRadioButton.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JRadioButton.eea
@@ -26,7 +26,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JToggleButton)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JToggleButton)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JRadioButtonMenuItem.eea b/libs/eea-java-17/src/main/resources/javax/swing/JRadioButtonMenuItem.eea
index bded2dc026..4a0e44138d 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JRadioButtonMenuItem.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JRadioButtonMenuItem.eea
@@ -26,7 +26,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JMenuItem)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JMenuItem)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JRootPane$AccessibleJRootPane.eea b/libs/eea-java-17/src/main/resources/javax/swing/JRootPane$AccessibleJRootPane.eea
index 3dcf5d32a1..d6175ea49c 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JRootPane$AccessibleJRootPane.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JRootPane$AccessibleJRootPane.eea
@@ -5,7 +5,7 @@ class javax/swing/JRootPane$AccessibleJRootPane
  (Ljavax/swing/JRootPane;)V
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JRootPane.eea b/libs/eea-java-17/src/main/resources/javax/swing/JRootPane.eea
index 8afd097c4e..4f46d2ff8f 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JRootPane.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JRootPane.eea
@@ -21,16 +21,16 @@ addImpl
  (Ljava/awt/Component;Ljava/lang/Object;I)V
 createContentPane
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L1java/awt/Container;
 createGlassPane
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component;
 createLayeredPane
  ()Ljavax/swing/JLayeredPane;
- ()Ljavax/swing/JLayeredPane;
+ ()L1javax/swing/JLayeredPane;
 createRootLayout
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -57,10 +57,10 @@ getUI
  ()Ljavax/swing/plaf/RootPaneUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setContentPane
  (Ljava/awt/Container;)V
  (Ljava/awt/Container;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JScrollBar$AccessibleJScrollBar.eea b/libs/eea-java-17/src/main/resources/javax/swing/JScrollBar$AccessibleJScrollBar.eea
index 84ada54923..39cc640545 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JScrollBar$AccessibleJScrollBar.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JScrollBar$AccessibleJScrollBar.eea
@@ -11,7 +11,7 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JScrollBar.eea b/libs/eea-java-17/src/main/resources/javax/swing/JScrollBar.eea
index 2ea7d18ba5..65e3cab27f 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JScrollBar.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JScrollBar.eea
@@ -15,7 +15,7 @@ getAdjustmentListeners
  ()[Ljava/awt/event/AdjustmentListener;
 getMaximumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 getMinimumSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
@@ -27,10 +27,10 @@ getUI
  ()Ljavax/swing/plaf/ScrollBarUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 removeAdjustmentListener
  (Ljava/awt/event/AdjustmentListener;)V
  (L1java/awt/event/AdjustmentListener;)V # @Inherited(java.awt.Adjustable)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JScrollPane.eea b/libs/eea-java-17/src/main/resources/javax/swing/JScrollPane.eea
index 01a161b91b..4a929df02f 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JScrollPane.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JScrollPane.eea
@@ -36,13 +36,13 @@ viewport
  (Ljava/awt/Component;II)V
 createHorizontalScrollBar
  ()Ljavax/swing/JScrollBar;
- ()Ljavax/swing/JScrollBar;
+ ()L1javax/swing/JScrollBar;
 createVerticalScrollBar
  ()Ljavax/swing/JScrollBar;
- ()Ljavax/swing/JScrollBar;
+ ()L1javax/swing/JScrollBar;
 createViewport
  ()Ljavax/swing/JViewport;
- ()Ljavax/swing/JViewport;
+ ()L1javax/swing/JViewport;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -51,7 +51,7 @@ getColumnHeader
  ()Ljavax/swing/JViewport;
 getCorner
  (Ljava/lang/String;)Ljava/awt/Component;
- (Ljava/lang/String;)Ljava/awt/Component;
+ (Ljava/lang/String;)L0java/awt/Component;
 getHorizontalScrollBar
  ()Ljavax/swing/JScrollBar;
  ()Ljavax/swing/JScrollBar;
@@ -63,7 +63,7 @@ getUI
  ()Ljavax/swing/plaf/ScrollPaneUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 getVerticalScrollBar
  ()Ljavax/swing/JScrollBar;
  ()Ljavax/swing/JScrollBar;
@@ -75,10 +75,10 @@ getViewportBorder
  ()Ljavax/swing/border/Border;
 getViewportBorderBounds
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L1java/awt/Rectangle;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setColumnHeader
  (Ljavax/swing/JViewport;)V
  (Ljavax/swing/JViewport;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JSeparator.eea b/libs/eea-java-17/src/main/resources/javax/swing/JSeparator.eea
index d7a79a25cc..02c803d8a0 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JSeparator.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JSeparator.eea
@@ -8,10 +8,10 @@ getUI
  ()Ljavax/swing/plaf/SeparatorUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setUI
  (Ljavax/swing/plaf/SeparatorUI;)V
  (Ljavax/swing/plaf/SeparatorUI;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JSlider$AccessibleJSlider.eea b/libs/eea-java-17/src/main/resources/javax/swing/JSlider$AccessibleJSlider.eea
index a6e6ea29cb..44e38bc0c4 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JSlider$AccessibleJSlider.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JSlider$AccessibleJSlider.eea
@@ -5,10 +5,10 @@ class javax/swing/JSlider$AccessibleJSlider
  (Ljavax/swing/JSlider;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
@@ -17,7 +17,7 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JSlider.eea b/libs/eea-java-17/src/main/resources/javax/swing/JSlider.eea
index 486f55cbf7..6d05310de6 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JSlider.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JSlider.eea
@@ -18,13 +18,13 @@ addChangeListener
  (L1javax/swing/event/ChangeListener;)V
 createChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 createStandardLabels
  (I)Ljava/util/Hashtable<Ljava/lang/Integer;Ljavax/swing/JComponent;>;
- (I)Ljava/util/Hashtable<Ljava/lang/Integer;Ljavax/swing/JComponent;>;
+ (I)L1java/util/Hashtable<Ljava/lang/Integer;Ljavax/swing/JComponent;>;
 createStandardLabels
  (II)Ljava/util/Hashtable<Ljava/lang/Integer;Ljavax/swing/JComponent;>;
- (II)Ljava/util/Hashtable<Ljava/lang/Integer;Ljavax/swing/JComponent;>;
+ (II)L1java/util/Hashtable<Ljava/lang/Integer;Ljavax/swing/JComponent;>;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -42,13 +42,13 @@ getUI
  ()Ljavax/swing/plaf/SliderUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 imageUpdate
  (Ljava/awt/Image;IIIII)Z
  (Ljava/awt/Image;IIIII)Z
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 removeChangeListener
  (Ljavax/swing/event/ChangeListener;)V
  (L1javax/swing/event/ChangeListener;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JSpinner$AccessibleJSpinner.eea b/libs/eea-java-17/src/main/resources/javax/swing/JSpinner$AccessibleJSpinner.eea
index ed3ba1e3c6..d51eae8f64 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JSpinner$AccessibleJSpinner.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JSpinner$AccessibleJSpinner.eea
@@ -5,55 +5,55 @@ class javax/swing/JSpinner$AccessibleJSpinner
  (Ljavax/swing/JSpinner;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getAfterIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getAtIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getBeforeIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getCharacterAttribute
  (I)Ljavax/swing/text/AttributeSet;
- (I)Ljavax/swing/text/AttributeSet;
+ (I)L0javax/swing/text/AttributeSet;
 getCharacterBounds
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L0java/awt/Rectangle;
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getIndexAtPoint
  (Ljava/awt/Point;)I
  (Ljava/awt/Point;)I
 getMaximumAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getMinimumAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getSelectedText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getTextRange
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 insertTextAtIndex
  (ILjava/lang/String;)V
  (ILjava/lang/String;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JSpinner$DefaultEditor.eea b/libs/eea-java-17/src/main/resources/javax/swing/JSpinner$DefaultEditor.eea
index 4d6c719102..2bdc2466b5 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JSpinner$DefaultEditor.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JSpinner$DefaultEditor.eea
@@ -14,7 +14,7 @@ getBaselineResizeBehavior
  ()Ljava/awt/Component$BaselineResizeBehavior;
 getSpinner
  ()Ljavax/swing/JSpinner;
- ()Ljavax/swing/JSpinner;
+ ()L0javax/swing/JSpinner;
 getTextField
  ()Ljavax/swing/JFormattedTextField;
  ()Ljavax/swing/JFormattedTextField;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JSpinner.eea b/libs/eea-java-17/src/main/resources/javax/swing/JSpinner.eea
index 6702726d90..687101f703 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JSpinner.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JSpinner.eea
@@ -8,7 +8,7 @@ addChangeListener
  (L1javax/swing/event/ChangeListener;)V
 createEditor
  (Ljavax/swing/SpinnerModel;)Ljavax/swing/JComponent;
- (Ljavax/swing/SpinnerModel;)Ljavax/swing/JComponent;
+ (Ljavax/swing/SpinnerModel;)L1javax/swing/JComponent;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -32,7 +32,7 @@ getUI
  ()Ljavax/swing/plaf/SpinnerUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 getValue
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JSplitPane$AccessibleJSplitPane.eea b/libs/eea-java-17/src/main/resources/javax/swing/JSplitPane$AccessibleJSplitPane.eea
index a61c69d732..cb0d8db817 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JSplitPane$AccessibleJSplitPane.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JSplitPane$AccessibleJSplitPane.eea
@@ -11,7 +11,7 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JSplitPane.eea b/libs/eea-java-17/src/main/resources/javax/swing/JSplitPane.eea
index fc00f78cf7..8d8de52525 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JSplitPane.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JSplitPane.eea
@@ -73,13 +73,13 @@ getUI
  ()Ljavax/swing/plaf/SplitPaneUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paintChildren
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 remove
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JTabbedPane$AccessibleJTabbedPane.eea b/libs/eea-java-17/src/main/resources/javax/swing/JTabbedPane$AccessibleJTabbedPane.eea
index 3591d3364a..56fec36568 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JTabbedPane$AccessibleJTabbedPane.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JTabbedPane$AccessibleJTabbedPane.eea
@@ -5,10 +5,10 @@ class javax/swing/JTabbedPane$AccessibleJTabbedPane
  (Ljavax/swing/JTabbedPane;)V
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Container$AccessibleAWTContainer)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -17,10 +17,10 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 stateChanged
  (Ljavax/swing/event/ChangeEvent;)V
  (L1javax/swing/event/ChangeEvent;)V # @Inherited(javax.swing.event.ChangeListener)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JTabbedPane.eea b/libs/eea-java-17/src/main/resources/javax/swing/JTabbedPane.eea
index 4f128f9bef..f21878a031 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JTabbedPane.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JTabbedPane.eea
@@ -39,7 +39,7 @@ addTab
  (Ljava/lang/String;Ljavax/swing/Icon;Ljava/awt/Component;Ljava/lang/String;)V
 createChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -48,7 +48,7 @@ getBackgroundAt
  (I)Ljava/awt/Color;
 getBoundsAt
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L0java/awt/Rectangle;
 getChangeListeners
  ()[Ljavax/swing/event/ChangeListener;
  ()[Ljavax/swing/event/ChangeListener;
@@ -69,7 +69,7 @@ getModel
  ()Ljavax/swing/SingleSelectionModel;
 getSelectedComponent
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 getTabComponentAt
  (I)Ljava/awt/Component;
  (I)Ljava/awt/Component;
@@ -87,7 +87,7 @@ getUI
  ()Ljavax/swing/plaf/TabbedPaneUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 indexOfComponent
  (Ljava/awt/Component;)I
  (Ljava/awt/Component;)I
@@ -105,7 +105,7 @@ insertTab
  (Ljava/lang/String;Ljavax/swing/Icon;Ljava/awt/Component;Ljava/lang/String;I)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 remove
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JTable$AccessibleJTable$AccessibleJTableCell.eea b/libs/eea-java-17/src/main/resources/javax/swing/JTable$AccessibleJTable$AccessibleJTableCell.eea
index 2adc51c6a6..144cb2bad9 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JTable$AccessibleJTable$AccessibleJTableCell.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JTable$AccessibleJTable$AccessibleJTableCell.eea
@@ -14,16 +14,16 @@ contains
  (Ljava/awt/Point;)Z
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -41,52 +41,52 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
- ()Ljavax/accessibility/AccessibleStateSet;
+ ()L1javax/accessibility/AccessibleStateSet;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getBounds
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L0java/awt/Rectangle;
 getCurrentAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
- ()Ljavax/accessibility/AccessibleContext;
+ ()L0javax/accessibility/AccessibleContext;
 getCurrentComponent
  ()Ljava/awt/Component;
  ()Ljava/awt/Component;
 getCursor
  ()Ljava/awt/Cursor;
- ()Ljava/awt/Cursor;
+ ()L0java/awt/Cursor;
 getFont
  ()Ljava/awt/Font;
- ()Ljava/awt/Font;
+ ()L0java/awt/Font;
 getFontMetrics
  (Ljava/awt/Font;)Ljava/awt/FontMetrics;
- (Ljava/awt/Font;)Ljava/awt/FontMetrics;
+ (Ljava/awt/Font;)L0java/awt/FontMetrics;
 getForeground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getLocale
  ()Ljava/util/Locale;
- ()Ljava/util/Locale;
+ ()L0java/util/Locale;
 getLocation
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getLocationOnScreen
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L0java/awt/Dimension;
 removeFocusListener
  (Ljava/awt/event/FocusListener;)V
  (L1java/awt/event/FocusListener;)V # @Inherited(javax.accessibility.AccessibleComponent)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JTable$AccessibleJTable.eea b/libs/eea-java-17/src/main/resources/javax/swing/JTable$AccessibleJTable.eea
index 38665382ec..27ebd18971 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JTable$AccessibleJTable.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JTable$AccessibleJTable.eea
@@ -29,40 +29,40 @@ getAccessibleAt
  (II)Ljavax/accessibility/Accessible;
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Container$AccessibleAWTContainer)
 getAccessibleCaption
  ()Ljavax/accessibility/Accessible;
  ()Ljavax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleColumnDescription
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleColumnHeader
  ()Ljavax/accessibility/AccessibleTable;
- ()Ljavax/accessibility/AccessibleTable;
+ ()L1javax/accessibility/AccessibleTable;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleRowDescription
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleRowHeader
  ()Ljavax/accessibility/AccessibleTable;
- ()Ljavax/accessibility/AccessibleTable;
+ ()L0javax/accessibility/AccessibleTable;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleSummary
  ()Ljavax/accessibility/Accessible;
  ()Ljavax/accessibility/Accessible;
 getAccessibleTable
  ()Ljavax/accessibility/AccessibleTable;
- ()Ljavax/accessibility/AccessibleTable;
+ ()L0javax/accessibility/AccessibleTable; # @Inherited(javax.accessibility.AccessibleContext)
 getSelectedAccessibleColumns
  ()[I
  ()[I
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JTable.eea b/libs/eea-java-17/src/main/resources/javax/swing/JTable.eea
index 5032bf2454..4211e96807 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JTable.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JTable.eea
@@ -2,7 +2,7 @@ class javax/swing/JTable
 
 createScrollPaneForTable
  (Ljavax/swing/JTable;)Ljavax/swing/JScrollPane;
- (Ljavax/swing/JTable;)Ljavax/swing/JScrollPane;
+ (Ljavax/swing/JTable;)L1javax/swing/JScrollPane;
 
 cellEditor
  Ljavax/swing/table/TableCellEditor;
@@ -79,16 +79,16 @@ columnSelectionChanged
  (L1javax/swing/event/ListSelectionEvent;)V # @Inherited(javax.swing.event.TableColumnModelListener)
 createDefaultColumnModel
  ()Ljavax/swing/table/TableColumnModel;
- ()Ljavax/swing/table/TableColumnModel;
+ ()L1javax/swing/table/TableColumnModel;
 createDefaultDataModel
  ()Ljavax/swing/table/TableModel;
- ()Ljavax/swing/table/TableModel;
+ ()L1javax/swing/table/TableModel;
 createDefaultSelectionModel
  ()Ljavax/swing/ListSelectionModel;
- ()Ljavax/swing/ListSelectionModel;
+ ()L1javax/swing/ListSelectionModel;
 createDefaultTableHeader
  ()Ljavax/swing/table/JTableHeader;
- ()Ljavax/swing/table/JTableHeader;
+ ()L1javax/swing/table/JTableHeader;
 editCellAt
  (IILjava/util/EventObject;)Z
  (IILjava/util/EventObject;)Z
@@ -109,7 +109,7 @@ getCellEditor
  (II)Ljavax/swing/table/TableCellEditor;
 getCellRect
  (IIZ)Ljava/awt/Rectangle;
- (IIZ)Ljava/awt/Rectangle;
+ (IIZ)L1java/awt/Rectangle;
 getCellRenderer
  (II)Ljavax/swing/table/TableCellRenderer;
  (II)Ljavax/swing/table/TableCellRenderer;
@@ -145,7 +145,7 @@ getGridColor
  ()Ljava/awt/Color;
 getIntercellSpacing
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 getModel
  ()Ljavax/swing/table/TableModel;
  ()Ljavax/swing/table/TableModel;
@@ -154,10 +154,10 @@ getPreferredScrollableViewportSize
  ()Ljava/awt/Dimension;
 getPrintable
  (Ljavax/swing/JTable$PrintMode;Ljava/text/MessageFormat;Ljava/text/MessageFormat;)Ljava/awt/print/Printable;
- (Ljavax/swing/JTable$PrintMode;Ljava/text/MessageFormat;Ljava/text/MessageFormat;)Ljava/awt/print/Printable;
+ (Ljavax/swing/JTable$PrintMode;Ljava/text/MessageFormat;Ljava/text/MessageFormat;)L1java/awt/print/Printable;
 getRowSorter
  ()Ljavax/swing/RowSorter<+Ljavax/swing/table/TableModel;>;
- ()Ljavax/swing/RowSorter<+Ljavax/swing/table/TableModel;>;
+ ()L0javax/swing/RowSorter<+Ljavax/swing/table/TableModel;>;
 getScrollableBlockIncrement
  (Ljava/awt/Rectangle;II)I
  (Ljava/awt/Rectangle;II)I
@@ -190,13 +190,13 @@ getUI
  ()Ljavax/swing/plaf/TableUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 getValueAt
  (II)Ljava/lang/Object;
  (II)Ljava/lang/Object;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 prepareEditor
  (Ljavax/swing/table/TableCellEditor;II)Ljava/awt/Component;
  (Ljavax/swing/table/TableCellEditor;II)Ljava/awt/Component;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JTextArea.eea b/libs/eea-java-17/src/main/resources/javax/swing/JTextArea.eea
index a1f31fb0dc..5f2eba6d3e 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JTextArea.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JTextArea.eea
@@ -17,7 +17,7 @@ append
  (Ljava/lang/String;)V
 createDefaultModel
  ()Ljavax/swing/text/Document;
- ()Ljavax/swing/text/Document;
+ ()L1javax/swing/text/Document;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -32,13 +32,13 @@ getScrollableUnitIncrement
  (Ljava/awt/Rectangle;II)I
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 insert
  (Ljava/lang/String;I)V
  (Ljava/lang/String;I)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.text.JTextComponent)
 replaceRange
  (Ljava/lang/String;II)V
  (Ljava/lang/String;II)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JTextField.eea b/libs/eea-java-17/src/main/resources/javax/swing/JTextField.eea
index 41693bf4d7..eae1c83fe9 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JTextField.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JTextField.eea
@@ -24,10 +24,10 @@ configurePropertiesFromAction
  (Ljavax/swing/Action;)V
 createActionPropertyChangeListener
  (Ljavax/swing/Action;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/Action;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/Action;)L1java/beans/PropertyChangeListener;
 createDefaultModel
  ()Ljavax/swing/text/Document;
- ()Ljavax/swing/text/Document;
+ ()L1javax/swing/text/Document;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -48,10 +48,10 @@ getPreferredSize
  ()Ljava/awt/Dimension;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.text.JTextComponent)
 removeActionListener
  (Ljava/awt/event/ActionListener;)V
  (L1java/awt/event/ActionListener;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JTextPane.eea b/libs/eea-java-17/src/main/resources/javax/swing/JTextPane.eea
index b30ef66e9f..363e37dc11 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JTextPane.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JTextPane.eea
@@ -8,10 +8,10 @@ addStyle
  (Ljava/lang/String;Ljavax/swing/text/Style;)Ljavax/swing/text/Style;
 createDefaultEditorKit
  ()Ljavax/swing/text/EditorKit;
- ()Ljavax/swing/text/EditorKit;
+ ()L1javax/swing/text/EditorKit; # @Inherited(javax.swing.JEditorPane)
 getCharacterAttributes
  ()Ljavax/swing/text/AttributeSet;
- ()Ljavax/swing/text/AttributeSet;
+ ()L0javax/swing/text/AttributeSet;
 getInputAttributes
  ()Ljavax/swing/text/MutableAttributeSet;
  ()Ljavax/swing/text/MutableAttributeSet;
@@ -20,7 +20,7 @@ getLogicalStyle
  ()Ljavax/swing/text/Style;
 getParagraphAttributes
  ()Ljavax/swing/text/AttributeSet;
- ()Ljavax/swing/text/AttributeSet;
+ ()L0javax/swing/text/AttributeSet;
 getStyle
  (Ljava/lang/String;)Ljavax/swing/text/Style;
  (Ljava/lang/String;)Ljavax/swing/text/Style;
@@ -32,7 +32,7 @@ getStyledEditorKit
  ()Ljavax/swing/text/StyledEditorKit;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JEditorPane)
 insertComponent
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
@@ -41,7 +41,7 @@ insertIcon
  (Ljavax/swing/Icon;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JEditorPane)
 removeStyle
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JToggleButton.eea b/libs/eea-java-17/src/main/resources/javax/swing/JToggleButton.eea
index d3067bc546..50f0b8e14f 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JToggleButton.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JToggleButton.eea
@@ -26,10 +26,10 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.AbstractButton)
 requestFocus
  (Ljava/awt/event/FocusEvent$Cause;)V
  (Ljava/awt/event/FocusEvent$Cause;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JToolBar$Separator.eea b/libs/eea-java-17/src/main/resources/javax/swing/JToolBar$Separator.eea
index 2aaab805bd..1c90fe49be 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JToolBar$Separator.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JToolBar$Separator.eea
@@ -17,7 +17,7 @@ getSeparatorSize
  ()Ljava/awt/Dimension;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JSeparator)
 setSeparatorSize
  (Ljava/awt/Dimension;)V
  (Ljava/awt/Dimension;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JToolBar.eea b/libs/eea-java-17/src/main/resources/javax/swing/JToolBar.eea
index 85f0d38390..c6084c241e 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JToolBar.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JToolBar.eea
@@ -17,16 +17,16 @@ addSeparator
  (Ljava/awt/Dimension;)V
 createActionChangeListener
  (Ljavax/swing/JButton;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JButton;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JButton;)L0java/beans/PropertyChangeListener;
 createActionComponent
  (Ljavax/swing/Action;)Ljavax/swing/JButton;
- (Ljavax/swing/Action;)Ljavax/swing/JButton;
+ (Ljavax/swing/Action;)L1javax/swing/JButton;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
 getComponentAtIndex
  (I)Ljava/awt/Component;
- (I)Ljava/awt/Component;
+ (I)L0java/awt/Component;
 getComponentIndex
  (Ljava/awt/Component;)I
  (Ljava/awt/Component;)I
@@ -38,13 +38,13 @@ getUI
  ()Ljavax/swing/plaf/ToolBarUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paintBorder
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setLayout
  (Ljava/awt/LayoutManager;)V
  (Ljava/awt/LayoutManager;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JToolTip.eea b/libs/eea-java-17/src/main/resources/javax/swing/JToolTip.eea
index 5020b9b41f..598a803095 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JToolTip.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JToolTip.eea
@@ -14,10 +14,10 @@ getUI
  ()Ljavax/swing/plaf/ToolTipUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setComponent
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JTree$AccessibleJTree$AccessibleJTreeNode.eea b/libs/eea-java-17/src/main/resources/javax/swing/JTree$AccessibleJTree$AccessibleJTreeNode.eea
index 24f3a5936d..51c489de8f 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JTree$AccessibleJTree$AccessibleJTreeNode.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JTree$AccessibleJTree$AccessibleJTreeNode.eea
@@ -14,19 +14,19 @@ contains
  (Ljava/awt/Point;)Z
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -35,7 +35,7 @@ getAccessibleDescription
  ()Ljava/lang/String;
 getAccessibleName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getAccessibleParent
  ()Ljavax/accessibility/Accessible;
  ()Ljavax/accessibility/Accessible;
@@ -44,49 +44,49 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
- ()Ljavax/accessibility/AccessibleStateSet;
+ ()L1javax/accessibility/AccessibleStateSet;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getBounds
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L0java/awt/Rectangle;
 getCursor
  ()Ljava/awt/Cursor;
- ()Ljava/awt/Cursor;
+ ()L0java/awt/Cursor;
 getFont
  ()Ljava/awt/Font;
- ()Ljava/awt/Font;
+ ()L0java/awt/Font;
 getFontMetrics
  (Ljava/awt/Font;)Ljava/awt/FontMetrics;
- (Ljava/awt/Font;)Ljava/awt/FontMetrics;
+ (Ljava/awt/Font;)L0java/awt/FontMetrics;
 getForeground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
 getLocation
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getLocationInJTree
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getLocationOnScreen
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JTree$AccessibleJTree.eea b/libs/eea-java-17/src/main/resources/javax/swing/JTree$AccessibleJTree.eea
index fc882fad1c..d35e42fd0f 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JTree$AccessibleJTree.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JTree$AccessibleJTree.eea
@@ -5,19 +5,19 @@ class javax/swing/JTree$AccessibleJTree
  (Ljavax/swing/JTree;)V
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Container$AccessibleAWTContainer)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 treeCollapsed
  (Ljavax/swing/event/TreeExpansionEvent;)V
  (L1javax/swing/event/TreeExpansionEvent;)V # @Inherited(javax.swing.event.TreeExpansionListener)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JTree.eea b/libs/eea-java-17/src/main/resources/javax/swing/JTree.eea
index 930a563eb1..6224a4ec64 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JTree.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JTree.eea
@@ -51,10 +51,10 @@ VISIBLE_ROW_COUNT_PROPERTY
 
 createTreeModel
  (Ljava/lang/Object;)Ljavax/swing/tree/TreeModel;
- (Ljava/lang/Object;)Ljavax/swing/tree/TreeModel;
+ (Ljava/lang/Object;)L1javax/swing/tree/TreeModel;
 getDefaultTreeModel
  ()Ljavax/swing/tree/TreeModel;
- ()Ljavax/swing/tree/TreeModel;
+ ()L1javax/swing/tree/TreeModel;
 
 cellEditor
  Ljavax/swing/tree/TreeCellEditor;
@@ -116,10 +116,10 @@ collapsePath
  (Ljavax/swing/tree/TreePath;)V
 convertValueToText
  (Ljava/lang/Object;ZZZIZ)Ljava/lang/String;
- (Ljava/lang/Object;ZZZIZ)Ljava/lang/String;
+ (Ljava/lang/Object;ZZZIZ)L1java/lang/String;
 createTreeModelListener
  ()Ljavax/swing/event/TreeModelListener;
- ()Ljavax/swing/event/TreeModelListener;
+ ()L1javax/swing/event/TreeModelListener;
 expandPath
  (Ljavax/swing/tree/TreePath;)V
  (Ljavax/swing/tree/TreePath;)V
@@ -152,7 +152,7 @@ getCellRenderer
  ()Ljavax/swing/tree/TreeCellRenderer;
 getClosestPathForLocation
  (II)Ljavax/swing/tree/TreePath;
- (II)Ljavax/swing/tree/TreePath;
+ (II)L0javax/swing/tree/TreePath;
 getDescendantToggledPaths
  (Ljavax/swing/tree/TreePath;)Ljava/util/Enumeration<Ljavax/swing/tree/TreePath;>;
  (Ljavax/swing/tree/TreePath;)Ljava/util/Enumeration<Ljavax/swing/tree/TreePath;>;
@@ -164,13 +164,13 @@ getDropMode
  ()Ljavax/swing/DropMode;
 getEditingPath
  ()Ljavax/swing/tree/TreePath;
- ()Ljavax/swing/tree/TreePath;
+ ()L0javax/swing/tree/TreePath;
 getExpandedDescendants
  (Ljavax/swing/tree/TreePath;)Ljava/util/Enumeration<Ljavax/swing/tree/TreePath;>;
- (Ljavax/swing/tree/TreePath;)Ljava/util/Enumeration<Ljavax/swing/tree/TreePath;>;
+ (Ljavax/swing/tree/TreePath;)L0java/util/Enumeration<Ljavax/swing/tree/TreePath;>;
 getLastSelectedPathComponent
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getLeadSelectionPath
  ()Ljavax/swing/tree/TreePath;
  ()Ljavax/swing/tree/TreePath;
@@ -179,22 +179,22 @@ getModel
  ()Ljavax/swing/tree/TreeModel;
 getNextMatch
  (Ljava/lang/String;ILjavax/swing/text/Position$Bias;)Ljavax/swing/tree/TreePath;
- (Ljava/lang/String;ILjavax/swing/text/Position$Bias;)Ljavax/swing/tree/TreePath;
+ (Ljava/lang/String;ILjavax/swing/text/Position$Bias;)L0javax/swing/tree/TreePath;
 getPathBetweenRows
  (II)[Ljavax/swing/tree/TreePath;
- (II)[Ljavax/swing/tree/TreePath;
+ (II)[1Ljavax/swing/tree/TreePath;
 getPathBounds
  (Ljavax/swing/tree/TreePath;)Ljava/awt/Rectangle;
- (Ljavax/swing/tree/TreePath;)Ljava/awt/Rectangle;
+ (Ljavax/swing/tree/TreePath;)L0java/awt/Rectangle;
 getPathForLocation
  (II)Ljavax/swing/tree/TreePath;
- (II)Ljavax/swing/tree/TreePath;
+ (II)L0javax/swing/tree/TreePath;
 getPathForRow
  (I)Ljavax/swing/tree/TreePath;
- (I)Ljavax/swing/tree/TreePath;
+ (I)L0javax/swing/tree/TreePath;
 getPreferredScrollableViewportSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 getRowBounds
  (I)Ljava/awt/Rectangle;
  (I)Ljava/awt/Rectangle;
@@ -215,7 +215,7 @@ getSelectionPath
  ()Ljavax/swing/tree/TreePath;
 getSelectionPaths
  ()[Ljavax/swing/tree/TreePath;
- ()[Ljavax/swing/tree/TreePath;
+ ()[0Ljavax/swing/tree/TreePath;
 getSelectionRows
  ()[I
  ()[I
@@ -236,7 +236,7 @@ getUI
  ()Ljavax/swing/plaf/TreeUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 hasBeenExpanded
  (Ljavax/swing/tree/TreePath;)Z
  (Ljavax/swing/tree/TreePath;)Z
@@ -260,7 +260,7 @@ makeVisible
  (Ljavax/swing/tree/TreePath;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 removeDescendantSelectedPaths
  (Ljavax/swing/tree/TreePath;Z)Z
  (Ljavax/swing/tree/TreePath;Z)Z
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JViewport.eea b/libs/eea-java-17/src/main/resources/javax/swing/JViewport.eea
index 4cba46c6e5..f5511b7b83 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JViewport.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JViewport.eea
@@ -18,10 +18,10 @@ computeBlit
  (IILjava/awt/Point;Ljava/awt/Point;Ljava/awt/Dimension;Ljava/awt/Rectangle;)Z
 createLayoutManager
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 createViewListener
  ()Ljavax/swing/JViewport$ViewListener;
- ()Ljavax/swing/JViewport$ViewListener;
+ ()L1javax/swing/JViewport$ViewListener;
 firePropertyChange
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
@@ -45,16 +45,16 @@ getUI
  ()Ljavax/swing/plaf/ViewportUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 getView
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 getViewPosition
  ()Ljava/awt/Point;
  ()Ljava/awt/Point;
 getViewRect
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L1java/awt/Rectangle;
 getViewSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
@@ -63,7 +63,7 @@ paint
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 remove
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
@@ -93,7 +93,7 @@ setViewSize
  (Ljava/awt/Dimension;)V
 toViewCoordinates
  (Ljava/awt/Dimension;)Ljava/awt/Dimension;
- (Ljava/awt/Dimension;)Ljava/awt/Dimension;
+ (Ljava/awt/Dimension;)L1java/awt/Dimension;
 toViewCoordinates
  (Ljava/awt/Point;)Ljava/awt/Point;
- (Ljava/awt/Point;)Ljava/awt/Point;
+ (Ljava/awt/Point;)L1java/awt/Point;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/JWindow.eea b/libs/eea-java-17/src/main/resources/javax/swing/JWindow.eea
index 850a362eed..d14e6ff235 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/JWindow.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/JWindow.eea
@@ -24,7 +24,7 @@ addImpl
  (Ljava/awt/Component;Ljava/lang/Object;I)V
 createRootPane
  ()Ljavax/swing/JRootPane;
- ()Ljavax/swing/JRootPane;
+ ()L1javax/swing/JRootPane;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -36,7 +36,7 @@ getGlassPane
  ()Ljava/awt/Component;
 getGraphics
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L0java/awt/Graphics; # @Inherited(java.awt.Component)
 getLayeredPane
  ()Ljavax/swing/JLayeredPane;
  ()Ljavax/swing/JLayeredPane;
@@ -48,7 +48,7 @@ getTransferHandler
  ()Ljavax/swing/TransferHandler;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Container)
 remove
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/KeyStroke.eea b/libs/eea-java-17/src/main/resources/javax/swing/KeyStroke.eea
index 8f5627cef8..3390a7ce70 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/KeyStroke.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/KeyStroke.eea
@@ -17,7 +17,7 @@ getKeyStroke
  (Ljava/lang/Character;I)Ljavax/swing/KeyStroke;
 getKeyStroke
  (Ljava/lang/String;)Ljavax/swing/KeyStroke;
- (Ljava/lang/String;)Ljavax/swing/KeyStroke;
+ (Ljava/lang/String;)L0javax/swing/KeyStroke;
 getKeyStrokeForEvent
  (Ljava/awt/event/KeyEvent;)Ljavax/swing/KeyStroke;
  (Ljava/awt/event/KeyEvent;)Ljavax/swing/KeyStroke;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/LayoutFocusTraversalPolicy.eea b/libs/eea-java-17/src/main/resources/javax/swing/LayoutFocusTraversalPolicy.eea
index 94137a8a96..974b78a36b 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/LayoutFocusTraversalPolicy.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/LayoutFocusTraversalPolicy.eea
@@ -5,13 +5,13 @@ accept
  (Ljava/awt/Component;)Z
 getComponentAfter
  (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Container;Ljava/awt/Component;)L0java/awt/Component; # @Inherited(javax.swing.SortingFocusTraversalPolicy)
 getComponentBefore
  (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Container;Ljava/awt/Component;)L0java/awt/Component; # @Inherited(javax.swing.SortingFocusTraversalPolicy)
 getFirstComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
- (Ljava/awt/Container;)Ljava/awt/Component;
+ (Ljava/awt/Container;)L0java/awt/Component; # @Inherited(javax.swing.SortingFocusTraversalPolicy)
 getLastComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
- (Ljava/awt/Container;)Ljava/awt/Component;
+ (Ljava/awt/Container;)L0java/awt/Component; # @Inherited(javax.swing.SortingFocusTraversalPolicy)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/ListSelectionModel.eea b/libs/eea-java-17/src/main/resources/javax/swing/ListSelectionModel.eea
index 69f6f8565d..edf251abab 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/ListSelectionModel.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/ListSelectionModel.eea
@@ -5,7 +5,7 @@ addListSelectionListener
  (L1javax/swing/event/ListSelectionListener;)V
 getSelectedIndices
  ()[I
- ()[I
+ ()[1I
 removeListSelectionListener
  (Ljavax/swing/event/ListSelectionListener;)V
  (L1javax/swing/event/ListSelectionListener;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/LookAndFeel.eea b/libs/eea-java-17/src/main/resources/javax/swing/LookAndFeel.eea
index c9eae53a9e..335d25ca93 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/LookAndFeel.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/LookAndFeel.eea
@@ -20,29 +20,29 @@ loadKeyBindings
  (Ljavax/swing/InputMap;[Ljava/lang/Object;)V
 makeComponentInputMap
  (Ljavax/swing/JComponent;[Ljava/lang/Object;)Ljavax/swing/ComponentInputMap;
- (Ljavax/swing/JComponent;[Ljava/lang/Object;)Ljavax/swing/ComponentInputMap;
+ (Ljavax/swing/JComponent;[Ljava/lang/Object;)L1javax/swing/ComponentInputMap;
 makeIcon
  (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/Object;
 makeInputMap
  ([Ljava/lang/Object;)Ljavax/swing/InputMap;
- ([Ljava/lang/Object;)Ljavax/swing/InputMap;
+ ([Ljava/lang/Object;)L1javax/swing/InputMap;
 makeKeyBindings
  ([Ljava/lang/Object;)[Ljavax/swing/text/JTextComponent$KeyBinding;
- ([Ljava/lang/Object;)[Ljavax/swing/text/JTextComponent$KeyBinding;
+ ([Ljava/lang/Object;)[1Ljavax/swing/text/JTextComponent$KeyBinding;
 uninstallBorder
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
 
 getDefaults
  ()Ljavax/swing/UIDefaults;
- ()Ljavax/swing/UIDefaults;
+ ()L0javax/swing/UIDefaults;
 getDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getDisabledIcon
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
- (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
+ (Ljavax/swing/JComponent;Ljavax/swing/Icon;)L0javax/swing/Icon;
 getDisabledSelectedIcon
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/MenuSelectionManager.eea b/libs/eea-java-17/src/main/resources/javax/swing/MenuSelectionManager.eea
index debe8e4d8f..72690debfa 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/MenuSelectionManager.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/MenuSelectionManager.eea
@@ -16,13 +16,13 @@ addChangeListener
  (L1javax/swing/event/ChangeListener;)V
 componentForPoint
  (Ljava/awt/Component;Ljava/awt/Point;)Ljava/awt/Component;
- (Ljava/awt/Component;Ljava/awt/Point;)Ljava/awt/Component;
+ (Ljava/awt/Component;Ljava/awt/Point;)L0java/awt/Component;
 getChangeListeners
  ()[Ljavax/swing/event/ChangeListener;
  ()[Ljavax/swing/event/ChangeListener;
 getSelectedPath
  ()[Ljavax/swing/MenuElement;
- ()[Ljavax/swing/MenuElement;
+ ()[1Ljavax/swing/MenuElement;
 isComponentPartOfCurrentMenu
  (Ljava/awt/Component;)Z
  (Ljava/awt/Component;)Z
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/PopupFactory.eea b/libs/eea-java-17/src/main/resources/javax/swing/PopupFactory.eea
index fd93a34928..4a8d5524e8 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/PopupFactory.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/PopupFactory.eea
@@ -2,7 +2,7 @@ class javax/swing/PopupFactory
 
 getSharedInstance
  ()Ljavax/swing/PopupFactory;
- ()Ljavax/swing/PopupFactory;
+ ()L1javax/swing/PopupFactory;
 setSharedInstance
  (Ljavax/swing/PopupFactory;)V
  (Ljavax/swing/PopupFactory;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/ProgressMonitor$AccessibleProgressMonitor.eea b/libs/eea-java-17/src/main/resources/javax/swing/ProgressMonitor$AccessibleProgressMonitor.eea
index 709d8db368..e233e3f65d 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/ProgressMonitor$AccessibleProgressMonitor.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/ProgressMonitor$AccessibleProgressMonitor.eea
@@ -5,16 +5,16 @@ class javax/swing/ProgressMonitor$AccessibleProgressMonitor
  (Ljavax/swing/ProgressMonitor;)V
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getAccessibleName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getAccessibleParent
  ()Ljavax/accessibility/Accessible;
  ()Ljavax/accessibility/Accessible;
@@ -23,37 +23,37 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
- ()Ljavax/accessibility/AccessibleStateSet;
+ ()L0javax/accessibility/AccessibleStateSet;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getAfterIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getAtIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getBeforeIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getCharacterAttribute
  (I)Ljavax/swing/text/AttributeSet;
- (I)Ljavax/swing/text/AttributeSet;
+ (I)L0javax/swing/text/AttributeSet;
 getCharacterBounds
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L0java/awt/Rectangle;
 getIndexAtPoint
  (Ljava/awt/Point;)I
  (Ljava/awt/Point;)I
 getLocale
  ()Ljava/util/Locale;
- ()Ljava/util/Locale;
+ ()L0java/util/Locale;
 getSelectedText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 propertyChange
  (Ljava/beans/PropertyChangeEvent;)V
  (L1java/beans/PropertyChangeEvent;)V # @Inherited(java.beans.PropertyChangeListener)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/RepaintManager.eea b/libs/eea-java-17/src/main/resources/javax/swing/RepaintManager.eea
index feea78b23b..9ab5a254ee 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/RepaintManager.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/RepaintManager.eea
@@ -33,7 +33,7 @@ getOffscreenBuffer
  (Ljava/awt/Component;II)Ljava/awt/Image;
 getVolatileOffscreenBuffer
  (Ljava/awt/Component;II)Ljava/awt/Image;
- (Ljava/awt/Component;II)Ljava/awt/Image;
+ (Ljava/awt/Component;II)L0java/awt/Image;
 isCompletelyDirty
  (Ljavax/swing/JComponent;)Z
  (Ljavax/swing/JComponent;)Z
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/RowFilter$Entry.eea b/libs/eea-java-17/src/main/resources/javax/swing/RowFilter$Entry.eea
index 5ea7f95119..d63141e7e1 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/RowFilter$Entry.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/RowFilter$Entry.eea
@@ -10,7 +10,7 @@ getModel
  ()TM;
 getStringValue
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 getValue
  (I)Ljava/lang/Object;
  (I)Ljava/lang/Object;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/RowFilter.eea b/libs/eea-java-17/src/main/resources/javax/swing/RowFilter.eea
index b990daffe6..eb02429eab 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/RowFilter.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/RowFilter.eea
@@ -4,22 +4,22 @@ class javax/swing/RowFilter
 
 andFilter
  <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljavax/swing/RowFilter<-TM;-TI;>;>;)Ljavax/swing/RowFilter<TM;TI;>;
- <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljavax/swing/RowFilter<-TM;-TI;>;>;)Ljavax/swing/RowFilter<TM;TI;>;
+ <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljavax/swing/RowFilter<-TM;-TI;>;>;)L1javax/swing/RowFilter<TM;TI;>;
 dateFilter
  <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter$ComparisonType;Ljava/util/Date;[I)Ljavax/swing/RowFilter<TM;TI;>;
- <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter$ComparisonType;Ljava/util/Date;[I)Ljavax/swing/RowFilter<TM;TI;>;
+ <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter$ComparisonType;Ljava/util/Date;[I)L1javax/swing/RowFilter<TM;TI;>;
 notFilter
  <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter<TM;TI;>;)Ljavax/swing/RowFilter<TM;TI;>;
- <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter<TM;TI;>;)Ljavax/swing/RowFilter<TM;TI;>;
+ <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter<TM;TI;>;)L1javax/swing/RowFilter<TM;TI;>;
 numberFilter
  <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter$ComparisonType;Ljava/lang/Number;[I)Ljavax/swing/RowFilter<TM;TI;>;
- <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter$ComparisonType;Ljava/lang/Number;[I)Ljavax/swing/RowFilter<TM;TI;>;
+ <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter$ComparisonType;Ljava/lang/Number;[I)L1javax/swing/RowFilter<TM;TI;>;
 orFilter
  <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljavax/swing/RowFilter<-TM;-TI;>;>;)Ljavax/swing/RowFilter<TM;TI;>;
- <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljavax/swing/RowFilter<-TM;-TI;>;>;)Ljavax/swing/RowFilter<TM;TI;>;
+ <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljavax/swing/RowFilter<-TM;-TI;>;>;)L1javax/swing/RowFilter<TM;TI;>;
 regexFilter
  <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/String;[I)Ljavax/swing/RowFilter<TM;TI;>;
- <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/String;[I)Ljavax/swing/RowFilter<TM;TI;>;
+ <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/String;[I)L1javax/swing/RowFilter<TM;TI;>;
 
 include
  (Ljavax/swing/RowFilter$Entry<+TM;+TI;>;)Z
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/ScrollPaneLayout.eea b/libs/eea-java-17/src/main/resources/javax/swing/ScrollPaneLayout.eea
index 08c9409e3d..2f0cf8a94b 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/ScrollPaneLayout.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/ScrollPaneLayout.eea
@@ -39,7 +39,7 @@ getColumnHeader
  ()Ljavax/swing/JViewport;
 getCorner
  (Ljava/lang/String;)Ljava/awt/Component;
- (Ljava/lang/String;)Ljava/awt/Component;
+ (Ljava/lang/String;)L0java/awt/Component;
 getHorizontalScrollBar
  ()Ljavax/swing/JScrollBar;
  ()Ljavax/swing/JScrollBar;
@@ -60,10 +60,10 @@ layoutContainer
  (Ljava/awt/Container;)V
 minimumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
- (Ljava/awt/Container;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;)L1java/awt/Dimension;
 preferredLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
- (Ljava/awt/Container;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;)L1java/awt/Dimension;
 removeLayoutComponent
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/SizeRequirements.eea b/libs/eea-java-17/src/main/resources/javax/swing/SizeRequirements.eea
index efc47c9e40..9cc63af5b6 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/SizeRequirements.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/SizeRequirements.eea
@@ -2,7 +2,7 @@ class javax/swing/SizeRequirements
 
 adjustSizes
  (I[Ljavax/swing/SizeRequirements;)[I
- (I[Ljavax/swing/SizeRequirements;)[I
+ (I[Ljavax/swing/SizeRequirements;)[1I
 calculateAlignedPositions
  (ILjavax/swing/SizeRequirements;[Ljavax/swing/SizeRequirements;[I[I)V
  (ILjavax/swing/SizeRequirements;[Ljavax/swing/SizeRequirements;[I[I)V
@@ -17,10 +17,10 @@ calculateTiledPositions
  (ILjavax/swing/SizeRequirements;[Ljavax/swing/SizeRequirements;[I[IZ)V
 getAlignedSizeRequirements
  ([Ljavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- ([Ljavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ ([Ljavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements;
 getTiledSizeRequirements
  ([Ljavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- ([Ljavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ ([Ljavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements;
 
 toString
  ()Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/SizeSequence.eea b/libs/eea-java-17/src/main/resources/javax/swing/SizeSequence.eea
index 07e12d3271..8a47044011 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/SizeSequence.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/SizeSequence.eea
@@ -5,7 +5,7 @@ class javax/swing/SizeSequence
  ([I)V
 getSizes
  ()[I
- ()[I
+ ()[1I
 setSizes
  ([I)V
  ([I)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/SortingFocusTraversalPolicy.eea b/libs/eea-java-17/src/main/resources/javax/swing/SortingFocusTraversalPolicy.eea
index 868b3c0e68..c56cb5cb57 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/SortingFocusTraversalPolicy.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/SortingFocusTraversalPolicy.eea
@@ -11,19 +11,19 @@ getComparator
  ()Ljava/util/Comparator<-Ljava/awt/Component;>;
 getComponentAfter
  (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Container;Ljava/awt/Component;)L0java/awt/Component;
 getComponentBefore
  (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Container;Ljava/awt/Component;)L0java/awt/Component;
 getDefaultComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
  (Ljava/awt/Container;)Ljava/awt/Component;
 getFirstComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
- (Ljava/awt/Container;)Ljava/awt/Component;
+ (Ljava/awt/Container;)L0java/awt/Component;
 getLastComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
- (Ljava/awt/Container;)Ljava/awt/Component;
+ (Ljava/awt/Container;)L0java/awt/Component;
 setComparator
  (Ljava/util/Comparator<-Ljava/awt/Component;>;)V
  (Ljava/util/Comparator<-Ljava/awt/Component;>;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/SpinnerDateModel.eea b/libs/eea-java-17/src/main/resources/javax/swing/SpinnerDateModel.eea
index 7a98c40134..ebc61eee62 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/SpinnerDateModel.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/SpinnerDateModel.eea
@@ -11,10 +11,10 @@ getEnd
  ()Ljava/lang/Comparable<Ljava/util/Date;>;
 getNextValue
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getPreviousValue
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getStart
  ()Ljava/lang/Comparable<Ljava/util/Date;>;
  ()Ljava/lang/Comparable<Ljava/util/Date;>;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/Spring.eea b/libs/eea-java-17/src/main/resources/javax/swing/Spring.eea
index a4cbc7e607..ca37da6da9 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/Spring.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/Spring.eea
@@ -5,22 +5,22 @@ constant
  (I)Ljavax/swing/Spring;
 constant
  (III)Ljavax/swing/Spring;
- (III)Ljavax/swing/Spring;
+ (III)L1javax/swing/Spring;
 height
  (Ljava/awt/Component;)Ljavax/swing/Spring;
- (Ljava/awt/Component;)Ljavax/swing/Spring;
+ (Ljava/awt/Component;)L1javax/swing/Spring;
 max
  (Ljavax/swing/Spring;Ljavax/swing/Spring;)Ljavax/swing/Spring;
- (Ljavax/swing/Spring;Ljavax/swing/Spring;)Ljavax/swing/Spring;
+ (Ljavax/swing/Spring;Ljavax/swing/Spring;)L1javax/swing/Spring;
 minus
  (Ljavax/swing/Spring;)Ljavax/swing/Spring;
- (Ljavax/swing/Spring;)Ljavax/swing/Spring;
+ (Ljavax/swing/Spring;)L1javax/swing/Spring;
 scale
  (Ljavax/swing/Spring;F)Ljavax/swing/Spring;
- (Ljavax/swing/Spring;F)Ljavax/swing/Spring;
+ (Ljavax/swing/Spring;F)L1javax/swing/Spring;
 sum
  (Ljavax/swing/Spring;Ljavax/swing/Spring;)Ljavax/swing/Spring;
- (Ljavax/swing/Spring;Ljavax/swing/Spring;)Ljavax/swing/Spring;
+ (Ljavax/swing/Spring;Ljavax/swing/Spring;)L1javax/swing/Spring;
 width
  (Ljava/awt/Component;)Ljavax/swing/Spring;
- (Ljava/awt/Component;)Ljavax/swing/Spring;
+ (Ljava/awt/Component;)L1javax/swing/Spring;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/SpringLayout$Constraints.eea b/libs/eea-java-17/src/main/resources/javax/swing/SpringLayout$Constraints.eea
index 09ca6c38ac..b1869bf161 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/SpringLayout$Constraints.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/SpringLayout$Constraints.eea
@@ -11,7 +11,7 @@ class javax/swing/SpringLayout$Constraints
  (Ljavax/swing/Spring;Ljavax/swing/Spring;Ljavax/swing/Spring;Ljavax/swing/Spring;)V
 getConstraint
  (Ljava/lang/String;)Ljavax/swing/Spring;
- (Ljava/lang/String;)Ljavax/swing/Spring;
+ (Ljava/lang/String;)L0javax/swing/Spring;
 getHeight
  ()Ljavax/swing/Spring;
  ()Ljavax/swing/Spring;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/SpringLayout.eea b/libs/eea-java-17/src/main/resources/javax/swing/SpringLayout.eea
index 271d992296..a8581d7b11 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/SpringLayout.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/SpringLayout.eea
@@ -36,7 +36,7 @@ addLayoutComponent
  (Ljava/lang/String;Ljava/awt/Component;)V
 getConstraint
  (Ljava/lang/String;Ljava/awt/Component;)Ljavax/swing/Spring;
- (Ljava/lang/String;Ljava/awt/Component;)Ljavax/swing/Spring;
+ (Ljava/lang/String;Ljava/awt/Component;)L1javax/swing/Spring;
 getConstraints
  (Ljava/awt/Component;)Ljavax/swing/SpringLayout$Constraints;
  (Ljava/awt/Component;)Ljavax/swing/SpringLayout$Constraints;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/SwingUtilities.eea b/libs/eea-java-17/src/main/resources/javax/swing/SwingUtilities.eea
index 24d295cfd4..7c80a81f5e 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/SwingUtilities.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/SwingUtilities.eea
@@ -2,10 +2,10 @@ class javax/swing/SwingUtilities
 
 calculateInnerArea
  (Ljavax/swing/JComponent;Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
- (Ljavax/swing/JComponent;Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
+ (Ljavax/swing/JComponent;Ljava/awt/Rectangle;)Ljava/awt/Rectangle; # @PolyNull
 computeDifference
  (Ljava/awt/Rectangle;Ljava/awt/Rectangle;)[Ljava/awt/Rectangle;
- (Ljava/awt/Rectangle;Ljava/awt/Rectangle;)[Ljava/awt/Rectangle;
+ (Ljava/awt/Rectangle;Ljava/awt/Rectangle;)[1Ljava/awt/Rectangle;
 computeIntersection
  (IIIILjava/awt/Rectangle;)Ljava/awt/Rectangle;
  (IIIILjava/awt/Rectangle;)Ljava/awt/Rectangle;
@@ -35,10 +35,10 @@ convertRectangle
  (Ljava/awt/Component;Ljava/awt/Rectangle;Ljava/awt/Component;)Ljava/awt/Rectangle;
 findFocusOwner
  (Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Component;)L0java/awt/Component;
 getAccessibleAt
  (Ljava/awt/Component;Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Component;Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Component;Ljava/awt/Point;)L0javax/accessibility/Accessible;
 getAccessibleChild
  (Ljava/awt/Component;I)Ljavax/accessibility/Accessible;
  (Ljava/awt/Component;I)Ljavax/accessibility/Accessible;
@@ -59,22 +59,22 @@ getAncestorOfClass
  (Ljava/lang/Class<*>;Ljava/awt/Component;)Ljava/awt/Container;
 getDeepestComponentAt
  (Ljava/awt/Component;II)Ljava/awt/Component;
- (Ljava/awt/Component;II)Ljava/awt/Component;
+ (Ljava/awt/Component;II)L0java/awt/Component;
 getLocalBounds
  (Ljava/awt/Component;)Ljava/awt/Rectangle;
- (Ljava/awt/Component;)Ljava/awt/Rectangle;
+ (Ljava/awt/Component;)L1java/awt/Rectangle;
 getRoot
  (Ljava/awt/Component;)Ljava/awt/Component;
  (Ljava/awt/Component;)Ljava/awt/Component;
 getRootPane
  (Ljava/awt/Component;)Ljavax/swing/JRootPane;
- (Ljava/awt/Component;)Ljavax/swing/JRootPane;
+ (Ljava/awt/Component;)L0javax/swing/JRootPane;
 getUIActionMap
  (Ljavax/swing/JComponent;)Ljavax/swing/ActionMap;
- (Ljavax/swing/JComponent;)Ljavax/swing/ActionMap;
+ (Ljavax/swing/JComponent;)L0javax/swing/ActionMap;
 getUIInputMap
  (Ljavax/swing/JComponent;I)Ljavax/swing/InputMap;
- (Ljavax/swing/JComponent;I)Ljavax/swing/InputMap;
+ (Ljavax/swing/JComponent;I)L0javax/swing/InputMap;
 getUnwrappedParent
  (Ljava/awt/Component;)Ljava/awt/Container;
  (Ljava/awt/Component;)Ljava/awt/Container;
@@ -83,7 +83,7 @@ getUnwrappedView
  (Ljavax/swing/JViewport;)Ljava/awt/Component;
 getWindowAncestor
  (Ljava/awt/Component;)Ljava/awt/Window;
- (Ljava/awt/Component;)Ljava/awt/Window;
+ (Ljava/awt/Component;)L0java/awt/Window;
 invokeAndWait
  (Ljava/lang/Runnable;)V
  (Ljava/lang/Runnable;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/TransferHandler$DropLocation.eea b/libs/eea-java-17/src/main/resources/javax/swing/TransferHandler$DropLocation.eea
index 915cc809d7..e611b8e8a2 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/TransferHandler$DropLocation.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/TransferHandler$DropLocation.eea
@@ -5,7 +5,7 @@ class javax/swing/TransferHandler$DropLocation
  (Ljava/awt/Point;)V
 getDropPoint
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L1java/awt/Point;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/TransferHandler.eea b/libs/eea-java-17/src/main/resources/javax/swing/TransferHandler.eea
index c8da40fd90..4aaa9cc005 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/TransferHandler.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/TransferHandler.eea
@@ -21,7 +21,7 @@ canImport
  (Ljavax/swing/TransferHandler$TransferSupport;)Z
 createTransferable
  (Ljavax/swing/JComponent;)Ljava/awt/datatransfer/Transferable;
- (Ljavax/swing/JComponent;)Ljava/awt/datatransfer/Transferable;
+ (Ljavax/swing/JComponent;)L0java/awt/datatransfer/Transferable;
 exportAsDrag
  (Ljavax/swing/JComponent;Ljava/awt/event/InputEvent;I)V
  (Ljavax/swing/JComponent;Ljava/awt/event/InputEvent;I)V
@@ -42,7 +42,7 @@ getSourceActions
  (Ljavax/swing/JComponent;)I
 getVisualRepresentation
  (Ljava/awt/datatransfer/Transferable;)Ljavax/swing/Icon;
- (Ljava/awt/datatransfer/Transferable;)Ljavax/swing/Icon;
+ (Ljava/awt/datatransfer/Transferable;)L0javax/swing/Icon;
 importData
  (Ljavax/swing/JComponent;Ljava/awt/datatransfer/Transferable;)Z
  (Ljavax/swing/JComponent;Ljava/awt/datatransfer/Transferable;)Z
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/UIDefaults$ActiveValue.eea b/libs/eea-java-17/src/main/resources/javax/swing/UIDefaults$ActiveValue.eea
index ceb6b3e0f1..9103d3dc69 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/UIDefaults$ActiveValue.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/UIDefaults$ActiveValue.eea
@@ -2,4 +2,4 @@ class javax/swing/UIDefaults$ActiveValue
 
 createValue
  (Ljavax/swing/UIDefaults;)Ljava/lang/Object;
- (Ljavax/swing/UIDefaults;)Ljava/lang/Object;
+ (Ljavax/swing/UIDefaults;)L1java/lang/Object;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/UIDefaults$LazyInputMap.eea b/libs/eea-java-17/src/main/resources/javax/swing/UIDefaults$LazyInputMap.eea
index fc1afc290b..bda6d0e916 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/UIDefaults$LazyInputMap.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/UIDefaults$LazyInputMap.eea
@@ -5,4 +5,4 @@ class javax/swing/UIDefaults$LazyInputMap
  ([Ljava/lang/Object;)V
 createValue
  (Ljavax/swing/UIDefaults;)Ljava/lang/Object;
- (Ljavax/swing/UIDefaults;)Ljava/lang/Object;
+ (Ljavax/swing/UIDefaults;)L0java/lang/Object; # @Overrides(javax.swing.UIDefaults$LazyValue)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/UIDefaults$LazyValue.eea b/libs/eea-java-17/src/main/resources/javax/swing/UIDefaults$LazyValue.eea
index 97e6142ed9..c8d2d890e1 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/UIDefaults$LazyValue.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/UIDefaults$LazyValue.eea
@@ -2,4 +2,4 @@ class javax/swing/UIDefaults$LazyValue
 
 createValue
  (Ljavax/swing/UIDefaults;)Ljava/lang/Object;
- (Ljavax/swing/UIDefaults;)Ljava/lang/Object;
+ (Ljavax/swing/UIDefaults;)L1java/lang/Object;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/UIDefaults$ProxyLazyValue.eea b/libs/eea-java-17/src/main/resources/javax/swing/UIDefaults$ProxyLazyValue.eea
index 920514e82b..1bd4d2005e 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/UIDefaults$ProxyLazyValue.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/UIDefaults$ProxyLazyValue.eea
@@ -14,4 +14,4 @@ class javax/swing/UIDefaults$ProxyLazyValue
  (Ljava/lang/String;[Ljava/lang/Object;)V
 createValue
  (Ljavax/swing/UIDefaults;)Ljava/lang/Object;
- (Ljavax/swing/UIDefaults;)Ljava/lang/Object;
+ (Ljavax/swing/UIDefaults;)L1java/lang/Object; # @Inherited(javax.swing.UIDefaults$LazyValue)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/UIDefaults.eea b/libs/eea-java-17/src/main/resources/javax/swing/UIDefaults.eea
index c6ec5d4901..cd7855bb85 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/UIDefaults.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/UIDefaults.eea
@@ -30,43 +30,43 @@ getBoolean
  (Ljava/lang/Object;Ljava/util/Locale;)Z
 getBorder
  (Ljava/lang/Object;)Ljavax/swing/border/Border;
- (Ljava/lang/Object;)Ljavax/swing/border/Border;
+ (Ljava/lang/Object;)L0javax/swing/border/Border;
 getBorder
  (Ljava/lang/Object;Ljava/util/Locale;)Ljavax/swing/border/Border;
- (Ljava/lang/Object;Ljava/util/Locale;)Ljavax/swing/border/Border;
+ (Ljava/lang/Object;Ljava/util/Locale;)L0javax/swing/border/Border;
 getColor
  (Ljava/lang/Object;)Ljava/awt/Color;
- (Ljava/lang/Object;)Ljava/awt/Color;
+ (Ljava/lang/Object;)L0java/awt/Color;
 getColor
  (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Color;
- (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Color;
+ (Ljava/lang/Object;Ljava/util/Locale;)L0java/awt/Color;
 getDefaultLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
 getDimension
  (Ljava/lang/Object;)Ljava/awt/Dimension;
- (Ljava/lang/Object;)Ljava/awt/Dimension;
+ (Ljava/lang/Object;)L0java/awt/Dimension;
 getDimension
  (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Dimension;
- (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Dimension;
+ (Ljava/lang/Object;Ljava/util/Locale;)L0java/awt/Dimension;
 getFont
  (Ljava/lang/Object;)Ljava/awt/Font;
- (Ljava/lang/Object;)Ljava/awt/Font;
+ (Ljava/lang/Object;)L0java/awt/Font;
 getFont
  (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Font;
- (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Font;
+ (Ljava/lang/Object;Ljava/util/Locale;)L0java/awt/Font;
 getIcon
  (Ljava/lang/Object;)Ljavax/swing/Icon;
- (Ljava/lang/Object;)Ljavax/swing/Icon;
+ (Ljava/lang/Object;)L0javax/swing/Icon;
 getIcon
  (Ljava/lang/Object;Ljava/util/Locale;)Ljavax/swing/Icon;
- (Ljava/lang/Object;Ljava/util/Locale;)Ljavax/swing/Icon;
+ (Ljava/lang/Object;Ljava/util/Locale;)L0javax/swing/Icon;
 getInsets
  (Ljava/lang/Object;)Ljava/awt/Insets;
- (Ljava/lang/Object;)Ljava/awt/Insets;
+ (Ljava/lang/Object;)L0java/awt/Insets;
 getInsets
  (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Insets;
- (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Insets;
+ (Ljava/lang/Object;Ljava/util/Locale;)L0java/awt/Insets;
 getInt
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
@@ -78,10 +78,10 @@ getPropertyChangeListeners
  ()[Ljava/beans/PropertyChangeListener;
 getString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L0java/lang/String;
 getString
  (Ljava/lang/Object;Ljava/util/Locale;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/util/Locale;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/util/Locale;)L0java/lang/String;
 getUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
@@ -90,7 +90,7 @@ getUIClass
  (Ljava/lang/String;)Ljava/lang/Class<+Ljavax/swing/plaf/ComponentUI;>;
 getUIClass
  (Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/Class<+Ljavax/swing/plaf/ComponentUI;>;
- (Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/Class<+Ljavax/swing/plaf/ComponentUI;>;
+ (Ljava/lang/String;Ljava/lang/ClassLoader;)L0java/lang/Class<+Ljavax/swing/plaf/ComponentUI;>;
 getUIError
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/UIManager.eea b/libs/eea-java-17/src/main/resources/javax/swing/UIManager.eea
index c18a7c0655..cb31296cc5 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/UIManager.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/UIManager.eea
@@ -8,7 +8,7 @@ addPropertyChangeListener
  (Ljava/beans/PropertyChangeListener;)V
 createLookAndFeel
  (Ljava/lang/String;)Ljavax/swing/LookAndFeel;
- (Ljava/lang/String;)Ljavax/swing/LookAndFeel;
+ (Ljava/lang/String;)L1javax/swing/LookAndFeel;
 get
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
@@ -17,7 +17,7 @@ get
  (Ljava/lang/Object;Ljava/util/Locale;)Ljava/lang/Object;
 getAuxiliaryLookAndFeels
  ()[Ljavax/swing/LookAndFeel;
- ()[Ljavax/swing/LookAndFeel;
+ ()[0Ljavax/swing/LookAndFeel;
 getBoolean
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
@@ -68,7 +68,7 @@ getInsets
  (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Insets;
 getInstalledLookAndFeels
  ()[Ljavax/swing/UIManager$LookAndFeelInfo;
- ()[Ljavax/swing/UIManager$LookAndFeelInfo;
+ ()[1Ljavax/swing/UIManager$LookAndFeelInfo;
 getInt
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/border/LineBorder.eea b/libs/eea-java-17/src/main/resources/javax/swing/border/LineBorder.eea
index e63839ce90..2999935825 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/border/LineBorder.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/border/LineBorder.eea
@@ -2,10 +2,10 @@ class javax/swing/border/LineBorder
 
 createBlackLineBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createGrayLineBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 
 lineColor
  Ljava/awt/Color;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/colorchooser/AbstractColorChooserPanel.eea b/libs/eea-java-17/src/main/resources/javax/swing/colorchooser/AbstractColorChooserPanel.eea
index 45fcff27d9..95f3376866 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/colorchooser/AbstractColorChooserPanel.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/colorchooser/AbstractColorChooserPanel.eea
@@ -6,10 +6,10 @@ TRANSPARENCY_ENABLED_PROPERTY
 
 getColorFromModel
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getColorSelectionModel
  ()Ljavax/swing/colorchooser/ColorSelectionModel;
- ()Ljavax/swing/colorchooser/ColorSelectionModel;
+ ()L0javax/swing/colorchooser/ColorSelectionModel;
 getDisplayName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/colorchooser/ColorChooserComponentFactory.eea b/libs/eea-java-17/src/main/resources/javax/swing/colorchooser/ColorChooserComponentFactory.eea
index 2fc68eac49..b911590d3c 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/colorchooser/ColorChooserComponentFactory.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/colorchooser/ColorChooserComponentFactory.eea
@@ -5,4 +5,4 @@ getDefaultChooserPanels
  ()[Ljavax/swing/colorchooser/AbstractColorChooserPanel;
 getPreviewPanel
  ()Ljavax/swing/JComponent;
- ()Ljavax/swing/JComponent;
+ ()L1javax/swing/JComponent;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/event/InternalFrameEvent.eea b/libs/eea-java-17/src/main/resources/javax/swing/event/InternalFrameEvent.eea
index 702583f747..076e037813 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/event/InternalFrameEvent.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/event/InternalFrameEvent.eea
@@ -5,7 +5,7 @@ class javax/swing/event/InternalFrameEvent
  (Ljavax/swing/JInternalFrame;I)V
 getInternalFrame
  ()Ljavax/swing/JInternalFrame;
- ()Ljavax/swing/JInternalFrame;
+ ()L0javax/swing/JInternalFrame;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/event/TreeModelEvent.eea b/libs/eea-java-17/src/main/resources/javax/swing/event/TreeModelEvent.eea
index 0774b7d0df..13d51e07af 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/event/TreeModelEvent.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/event/TreeModelEvent.eea
@@ -24,13 +24,13 @@ path
  (Ljava/lang/Object;[Ljava/lang/Object;[I[Ljava/lang/Object;)V
 getChildIndices
  ()[I
- ()[I
+ ()[0I
 getChildren
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 getPath
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 getTreePath
  ()Ljavax/swing/tree/TreePath;
  ()Ljavax/swing/tree/TreePath;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/event/TreeSelectionEvent.eea b/libs/eea-java-17/src/main/resources/javax/swing/event/TreeSelectionEvent.eea
index 7841f15cda..f4557e6e00 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/event/TreeSelectionEvent.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/event/TreeSelectionEvent.eea
@@ -33,7 +33,7 @@ getPath
  ()Ljavax/swing/tree/TreePath;
 getPaths
  ()[Ljavax/swing/tree/TreePath;
- ()[Ljavax/swing/tree/TreePath;
+ ()[1Ljavax/swing/tree/TreePath;
 isAddedPath
  (Ljavax/swing/tree/TreePath;)Z
  (Ljavax/swing/tree/TreePath;)Z
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/filechooser/FileNameExtensionFilter.eea b/libs/eea-java-17/src/main/resources/javax/swing/filechooser/FileNameExtensionFilter.eea
index 54f8b9fbbb..58ace28edb 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/filechooser/FileNameExtensionFilter.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/filechooser/FileNameExtensionFilter.eea
@@ -11,7 +11,7 @@ getDescription
  ()Ljava/lang/String;
 getExtensions
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/filechooser/FileSystemView.eea b/libs/eea-java-17/src/main/resources/javax/swing/filechooser/FileSystemView.eea
index dd0e595550..25fad9f30c 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/filechooser/FileSystemView.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/filechooser/FileSystemView.eea
@@ -6,16 +6,16 @@ getFileSystemView
 
 createFileObject
  (Ljava/io/File;Ljava/lang/String;)Ljava/io/File;
- (Ljava/io/File;Ljava/lang/String;)Ljava/io/File;
+ (Ljava/io/File;Ljava/lang/String;)L1java/io/File;
 createFileObject
  (Ljava/lang/String;)Ljava/io/File;
- (Ljava/lang/String;)Ljava/io/File;
+ (Ljava/lang/String;)L1java/io/File;
 createFileSystemRoot
  (Ljava/io/File;)Ljava/io/File;
- (Ljava/io/File;)Ljava/io/File;
+ (Ljava/io/File;)L1java/io/File;
 createNewFolder
  (Ljava/io/File;)Ljava/io/File;
- (Ljava/io/File;)Ljava/io/File;
+ (Ljava/io/File;)L1java/io/File;
 getChild
  (Ljava/io/File;Ljava/lang/String;)Ljava/io/File;
  (Ljava/io/File;Ljava/lang/String;)Ljava/io/File;
@@ -36,25 +36,25 @@ getHomeDirectory
  ()Ljava/io/File;
 getLinkLocation
  (Ljava/io/File;)Ljava/io/File;
- (Ljava/io/File;)Ljava/io/File;
+ (Ljava/io/File;)L0java/io/File;
 getParentDirectory
  (Ljava/io/File;)Ljava/io/File;
- (Ljava/io/File;)Ljava/io/File;
+ (Ljava/io/File;)L0java/io/File;
 getRoots
  ()[Ljava/io/File;
  ()[Ljava/io/File;
 getSystemDisplayName
  (Ljava/io/File;)Ljava/lang/String;
- (Ljava/io/File;)Ljava/lang/String;
+ (Ljava/io/File;)L0java/lang/String;
 getSystemIcon
  (Ljava/io/File;)Ljavax/swing/Icon;
- (Ljava/io/File;)Ljavax/swing/Icon;
+ (Ljava/io/File;)L0javax/swing/Icon;
 getSystemIcon
  (Ljava/io/File;II)Ljavax/swing/Icon;
- (Ljava/io/File;II)Ljavax/swing/Icon;
+ (Ljava/io/File;II)L0javax/swing/Icon;
 getSystemTypeDescription
  (Ljava/io/File;)Ljava/lang/String;
- (Ljava/io/File;)Ljava/lang/String;
+ (Ljava/io/File;)L0java/lang/String;
 isComputerNode
  (Ljava/io/File;)Z
  (Ljava/io/File;)Z
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/filechooser/FileView.eea b/libs/eea-java-17/src/main/resources/javax/swing/filechooser/FileView.eea
index e0ef4fa52b..0a4ff11d4e 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/filechooser/FileView.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/filechooser/FileView.eea
@@ -2,16 +2,16 @@ class javax/swing/filechooser/FileView
 
 getDescription
  (Ljava/io/File;)Ljava/lang/String;
- (Ljava/io/File;)Ljava/lang/String;
+ (Ljava/io/File;)L0java/lang/String;
 getIcon
  (Ljava/io/File;)Ljavax/swing/Icon;
- (Ljava/io/File;)Ljavax/swing/Icon;
+ (Ljava/io/File;)L0javax/swing/Icon;
 getName
  (Ljava/io/File;)Ljava/lang/String;
- (Ljava/io/File;)Ljava/lang/String;
+ (Ljava/io/File;)L0java/lang/String;
 getTypeDescription
  (Ljava/io/File;)Ljava/lang/String;
- (Ljava/io/File;)Ljava/lang/String;
+ (Ljava/io/File;)L0java/lang/String;
 isTraversable
  (Ljava/io/File;)Ljava/lang/Boolean;
- (Ljava/io/File;)Ljava/lang/Boolean;
+ (Ljava/io/File;)L0java/lang/Boolean;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/ComponentUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/ComponentUI.eea
index 5ec7973883..a2c548e098 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/ComponentUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/ComponentUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/ComponentUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 contains
  (Ljavax/swing/JComponent;II)Z
@@ -27,7 +27,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/FileChooserUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/FileChooserUI.eea
index 9ac7e7c5f4..e81cb87d1c 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/FileChooserUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/FileChooserUI.eea
@@ -11,7 +11,7 @@ getApproveButtonText
  (Ljavax/swing/JFileChooser;)Ljava/lang/String;
 getDefaultButton
  (Ljavax/swing/JFileChooser;)Ljavax/swing/JButton;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/JButton;
+ (Ljavax/swing/JFileChooser;)L0javax/swing/JButton;
 getDialogTitle
  (Ljavax/swing/JFileChooser;)Ljava/lang/String;
  (Ljavax/swing/JFileChooser;)Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/LayerUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/LayerUI.eea
index a6f539c648..e62749b44b 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/LayerUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/LayerUI.eea
@@ -34,7 +34,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getPropertyChangeListeners
  ()[Ljava/beans/PropertyChangeListener;
  ()[Ljava/beans/PropertyChangeListener;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/TextUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/TextUI.eea
index b98043b16e..65625e8751 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/TextUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/TextUI.eea
@@ -17,7 +17,7 @@ getRootView
  (Ljavax/swing/text/JTextComponent;)Ljavax/swing/text/View;
 getToolTipText
  (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)Ljava/lang/String;
- (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)Ljava/lang/String;
+ (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)L0java/lang/String;
 getToolTipText2D
  (Ljavax/swing/text/JTextComponent;Ljava/awt/geom/Point2D;)Ljava/lang/String;
  (Ljavax/swing/text/JTextComponent;Ljava/awt/geom/Point2D;)Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicArrowButton.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicArrowButton.eea
index 7bb20a0fe2..c82518b61d 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicArrowButton.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicArrowButton.eea
@@ -5,7 +5,7 @@ class javax/swing/plaf/basic/BasicArrowButton
  (ILjava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;)V
 getMaximumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 getMinimumSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicBorders.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicBorders.eea
index cbf229d0b2..e1058e82c2 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicBorders.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicBorders.eea
@@ -2,28 +2,28 @@ class javax/swing/plaf/basic/BasicBorders
 
 getButtonBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 getInternalFrameBorder
  ()Ljavax/swing/border/Border;
  ()Ljavax/swing/border/Border;
 getMenuBarBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 getProgressBarBorder
  ()Ljavax/swing/border/Border;
  ()Ljavax/swing/border/Border;
 getRadioButtonBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 getSplitPaneBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 getSplitPaneDividerBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 getTextFieldBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 getToggleButtonBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicButtonUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicButtonUI.eea
index 74aa3a4a21..0222c61576 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicButtonUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicButtonUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createButtonListener
  (Ljavax/swing/AbstractButton;)Ljavax/swing/plaf/basic/BasicButtonListener;
- (Ljavax/swing/AbstractButton;)Ljavax/swing/plaf/basic/BasicButtonListener;
+ (Ljavax/swing/AbstractButton;)L1javax/swing/plaf/basic/BasicButtonListener;
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -24,10 +24,10 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 installDefaults
  (Ljavax/swing/AbstractButton;)V
  (Ljavax/swing/AbstractButton;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.eea
index 9d9f5bc39c..2fa21504bb 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicCheckBoxMenuItemUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 processMouseEvent
  (Ljavax/swing/JMenuItem;Ljava/awt/event/MouseEvent;[Ljavax/swing/MenuElement;Ljavax/swing/MenuSelectionManager;)V
  (Ljavax/swing/JMenuItem;Ljava/awt/event/MouseEvent;[Ljavax/swing/MenuElement;Ljavax/swing/MenuSelectionManager;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicCheckBoxUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicCheckBoxUI.eea
index 5fbe295d12..9b7771641d 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicCheckBoxUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicCheckBoxUI.eea
@@ -2,8 +2,8 @@ class javax/swing/plaf/basic/BasicCheckBoxUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicRadioButtonUI)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicColorChooserUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicColorChooserUI.eea
index 3f06af60a4..0e0f345fc1 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicColorChooserUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicColorChooserUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicColorChooserUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 chooser
  Ljavax/swing/JColorChooser;
@@ -19,10 +19,10 @@ propertyChangeListener
 
 createDefaultChoosers
  ()[Ljavax/swing/colorchooser/AbstractColorChooserPanel;
- ()[Ljavax/swing/colorchooser/AbstractColorChooserPanel;
+ ()[1Ljavax/swing/colorchooser/AbstractColorChooserPanel;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicComboBoxEditor.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicComboBoxEditor.eea
index a6bce29431..a5c1729bf3 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicComboBoxEditor.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicComboBoxEditor.eea
@@ -9,7 +9,7 @@ addActionListener
  (L1java/awt/event/ActionListener;)V # @Inherited(javax.swing.ComboBoxEditor)
 createEditorComponent
  ()Ljavax/swing/JTextField;
- ()Ljavax/swing/JTextField;
+ ()L1javax/swing/JTextField;
 focusGained
  (Ljava/awt/event/FocusEvent;)V
  (L1java/awt/event/FocusEvent;)V # @Inherited(java.awt.event.FocusListener)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicComboBoxUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicComboBoxUI.eea
index 29a0806539..8b16633987 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicComboBoxUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicComboBoxUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicComboBoxUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 arrowButton
  Ljavax/swing/JButton;
@@ -55,37 +55,37 @@ propertyChangeListener
 
 createArrowButton
  ()Ljavax/swing/JButton;
- ()Ljavax/swing/JButton;
+ ()L1javax/swing/JButton;
 createEditor
  ()Ljavax/swing/ComboBoxEditor;
- ()Ljavax/swing/ComboBoxEditor;
+ ()L1javax/swing/ComboBoxEditor;
 createFocusListener
  ()Ljava/awt/event/FocusListener;
- ()Ljava/awt/event/FocusListener;
+ ()L1java/awt/event/FocusListener;
 createItemListener
  ()Ljava/awt/event/ItemListener;
- ()Ljava/awt/event/ItemListener;
+ ()L0java/awt/event/ItemListener;
 createKeyListener
  ()Ljava/awt/event/KeyListener;
- ()Ljava/awt/event/KeyListener;
+ ()L1java/awt/event/KeyListener;
 createLayoutManager
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 createListDataListener
  ()Ljavax/swing/event/ListDataListener;
- ()Ljavax/swing/event/ListDataListener;
+ ()L1javax/swing/event/ListDataListener;
 createPopup
  ()Ljavax/swing/plaf/basic/ComboPopup;
- ()Ljavax/swing/plaf/basic/ComboPopup;
+ ()L1javax/swing/plaf/basic/ComboPopup;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createRenderer
  ()Ljavax/swing/ListCellRenderer<Ljava/lang/Object;>;
- ()Ljavax/swing/ListCellRenderer<Ljava/lang/Object;>;
+ ()L1javax/swing/ListCellRenderer<Ljava/lang/Object;>;
 getAccessibleChild
  (Ljavax/swing/JComponent;I)Ljavax/accessibility/Accessible;
- (Ljavax/swing/JComponent;I)Ljavax/accessibility/Accessible;
+ (Ljavax/swing/JComponent;I)L0javax/accessibility/Accessible;
 getAccessibleChildrenCount
  (Ljavax/swing/JComponent;)I
  (Ljavax/swing/JComponent;)I
@@ -109,10 +109,10 @@ getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getSizeForComponent
  (Ljava/awt/Component;)Ljava/awt/Dimension;
  (Ljava/awt/Component;)Ljava/awt/Dimension;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicComboPopup.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicComboPopup.eea
index 21ba9d998b..dcfc6120a4 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicComboPopup.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicComboPopup.eea
@@ -45,43 +45,43 @@ scroller
  (Ljavax/swing/JComboBox<Ljava/lang/Object;>;)V
 computePopupBounds
  (IIII)Ljava/awt/Rectangle;
- (IIII)Ljava/awt/Rectangle;
+ (IIII)L1java/awt/Rectangle;
 convertMouseEvent
  (Ljava/awt/event/MouseEvent;)Ljava/awt/event/MouseEvent;
  (Ljava/awt/event/MouseEvent;)Ljava/awt/event/MouseEvent;
 createItemListener
  ()Ljava/awt/event/ItemListener;
- ()Ljava/awt/event/ItemListener;
+ ()L1java/awt/event/ItemListener;
 createKeyListener
  ()Ljava/awt/event/KeyListener;
- ()Ljava/awt/event/KeyListener;
+ ()L0java/awt/event/KeyListener;
 createList
  ()Ljavax/swing/JList<Ljava/lang/Object;>;
- ()Ljavax/swing/JList<Ljava/lang/Object;>;
+ ()L1javax/swing/JList<Ljava/lang/Object;>;
 createListDataListener
  ()Ljavax/swing/event/ListDataListener;
- ()Ljavax/swing/event/ListDataListener;
+ ()L0javax/swing/event/ListDataListener;
 createListMouseListener
  ()Ljava/awt/event/MouseListener;
- ()Ljava/awt/event/MouseListener;
+ ()L1java/awt/event/MouseListener;
 createListMouseMotionListener
  ()Ljava/awt/event/MouseMotionListener;
- ()Ljava/awt/event/MouseMotionListener;
+ ()L1java/awt/event/MouseMotionListener;
 createListSelectionListener
  ()Ljavax/swing/event/ListSelectionListener;
- ()Ljavax/swing/event/ListSelectionListener;
+ ()L0javax/swing/event/ListSelectionListener;
 createMouseListener
  ()Ljava/awt/event/MouseListener;
- ()Ljava/awt/event/MouseListener;
+ ()L1java/awt/event/MouseListener;
 createMouseMotionListener
  ()Ljava/awt/event/MouseMotionListener;
- ()Ljava/awt/event/MouseMotionListener;
+ ()L1java/awt/event/MouseMotionListener;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createScroller
  ()Ljavax/swing/JScrollPane;
- ()Ljavax/swing/JScrollPane;
+ ()L1javax/swing/JScrollPane;
 delegateFocus
  (Ljava/awt/event/MouseEvent;)V
  (Ljava/awt/event/MouseEvent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicDesktopIconUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicDesktopIconUI.eea
index 9f6065482b..3b26068ec0 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicDesktopIconUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicDesktopIconUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicDesktopIconUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 desktopIcon
  Ljavax/swing/JInternalFrame$JDesktopIcon;
@@ -16,7 +16,7 @@ iconPane
 
 createMouseInputListener
  ()Ljavax/swing/event/MouseInputListener;
- ()Ljavax/swing/event/MouseInputListener;
+ ()L1javax/swing/event/MouseInputListener;
 getInsets
  (Ljavax/swing/JComponent;)Ljava/awt/Insets;
  (Ljavax/swing/JComponent;)Ljava/awt/Insets;
@@ -25,10 +25,10 @@ getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicDesktopPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicDesktopPaneUI.eea
index 025812e960..827e084006 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicDesktopPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicDesktopPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicDesktopPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 closeKey
  Ljavax/swing/KeyStroke;
@@ -28,16 +28,16 @@ navigateKey2
 
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicEditorPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicEditorPaneUI.eea
index 22580148cb..54169ae3bc 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicEditorPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicEditorPaneUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/basic/BasicEditorPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getEditorKit
  (Ljavax/swing/text/JTextComponent;)Ljavax/swing/text/EditorKit;
  (Ljavax/swing/text/JTextComponent;)Ljavax/swing/text/EditorKit;
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.eea
index 96534ee69f..717dc1c230 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.eea
@@ -15,16 +15,16 @@ getCachedIcon
  (Ljava/io/File;)Ljavax/swing/Icon;
 getDescription
  (Ljava/io/File;)Ljava/lang/String;
- (Ljava/io/File;)Ljava/lang/String;
+ (Ljava/io/File;)L0java/lang/String; # @Inherited(javax.swing.filechooser.FileView)
 getIcon
  (Ljava/io/File;)Ljavax/swing/Icon;
- (Ljava/io/File;)Ljavax/swing/Icon;
+ (Ljava/io/File;)L0javax/swing/Icon; # @Inherited(javax.swing.filechooser.FileView)
 getName
  (Ljava/io/File;)Ljava/lang/String;
- (Ljava/io/File;)Ljava/lang/String;
+ (Ljava/io/File;)L0java/lang/String; # @Inherited(javax.swing.filechooser.FileView)
 getTypeDescription
  (Ljava/io/File;)Ljava/lang/String;
- (Ljava/io/File;)Ljava/lang/String;
+ (Ljava/io/File;)L0java/lang/String; # @Inherited(javax.swing.filechooser.FileView)
 isHidden
  (Ljava/io/File;)Ljava/lang/Boolean;
  (Ljava/io/File;)Ljava/lang/Boolean;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicFileChooserUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicFileChooserUI.eea
index cfe6c34187..27a39da817 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicFileChooserUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicFileChooserUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicFileChooserUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 cancelButtonText
  Ljava/lang/String;
@@ -79,13 +79,13 @@ viewMenuIcon
  (Ljavax/swing/JFileChooser;)V
 createDoubleClickListener
  (Ljavax/swing/JFileChooser;Ljavax/swing/JList<*>;)Ljava/awt/event/MouseListener;
- (Ljavax/swing/JFileChooser;Ljavax/swing/JList<*>;)Ljava/awt/event/MouseListener;
+ (Ljavax/swing/JFileChooser;Ljavax/swing/JList<*>;)L1java/awt/event/MouseListener;
 createListSelectionListener
  (Ljavax/swing/JFileChooser;)Ljavax/swing/event/ListSelectionListener;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/event/ListSelectionListener;
+ (Ljavax/swing/JFileChooser;)L1javax/swing/event/ListSelectionListener;
 createPropertyChangeListener
  (Ljavax/swing/JFileChooser;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JFileChooser;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JFileChooser;)L0java/beans/PropertyChangeListener;
 ensureFileIsVisible
  (Ljavax/swing/JFileChooser;Ljava/io/File;)V
  (Ljavax/swing/JFileChooser;Ljava/io/File;)V
@@ -97,16 +97,16 @@ getAccessoryPanel
  ()Ljavax/swing/JPanel;
 getApproveButton
  (Ljavax/swing/JFileChooser;)Ljavax/swing/JButton;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/JButton;
+ (Ljavax/swing/JFileChooser;)L0javax/swing/JButton;
 getApproveButtonMnemonic
  (Ljavax/swing/JFileChooser;)I
  (Ljavax/swing/JFileChooser;)I
 getApproveButtonText
  (Ljavax/swing/JFileChooser;)Ljava/lang/String;
- (Ljavax/swing/JFileChooser;)Ljava/lang/String;
+ (Ljavax/swing/JFileChooser;)L0java/lang/String;
 getApproveButtonToolTipText
  (Ljavax/swing/JFileChooser;)Ljava/lang/String;
- (Ljavax/swing/JFileChooser;)Ljava/lang/String;
+ (Ljavax/swing/JFileChooser;)L0java/lang/String;
 getApproveSelectionAction
  ()Ljavax/swing/Action;
  ()Ljavax/swing/Action;
@@ -118,7 +118,7 @@ getChangeToParentDirectoryAction
  ()Ljavax/swing/Action;
 getDefaultButton
  (Ljavax/swing/JFileChooser;)Ljavax/swing/JButton;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/JButton;
+ (Ljavax/swing/JFileChooser;)L0javax/swing/JButton; # @Inherited(javax.swing.plaf.FileChooserUI)
 getDialogTitle
  (Ljavax/swing/JFileChooser;)Ljava/lang/String;
  (Ljavax/swing/JFileChooser;)Ljava/lang/String;
@@ -127,13 +127,13 @@ getDirectory
  ()Ljava/io/File;
 getDirectoryName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getFileChooser
  ()Ljavax/swing/JFileChooser;
  ()Ljavax/swing/JFileChooser;
 getFileName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getFileView
  (Ljavax/swing/JFileChooser;)Ljavax/swing/filechooser/FileView;
  (Ljavax/swing/JFileChooser;)Ljavax/swing/filechooser/FileView;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicFormattedTextFieldUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicFormattedTextFieldUI.eea
index 345fdb8dd6..bb83c69302 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicFormattedTextFieldUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicFormattedTextFieldUI.eea
@@ -2,8 +2,8 @@ class javax/swing/plaf/basic/BasicFormattedTextFieldUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicTextFieldUI)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicGraphicsUtils.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicGraphicsUtils.eea
index 5e1ca5785e..9da2bd8bd0 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicGraphicsUtils.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicGraphicsUtils.eea
@@ -38,7 +38,7 @@ getGrooveInsets
  ()Ljava/awt/Insets;
 getPreferredButtonSize
  (Ljavax/swing/AbstractButton;I)Ljava/awt/Dimension;
- (Ljavax/swing/AbstractButton;I)Ljava/awt/Dimension;
+ (Ljavax/swing/AbstractButton;I)L0java/awt/Dimension;
 getStringWidth
  (Ljavax/swing/JComponent;Ljava/awt/FontMetrics;Ljava/lang/String;)F
  (Ljavax/swing/JComponent;Ljava/awt/FontMetrics;Ljava/lang/String;)F
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicHTML.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicHTML.eea
index 1303b07efc..b7be4a6dd9 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicHTML.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicHTML.eea
@@ -9,7 +9,7 @@ propertyKey
 
 createHTMLView
  (Ljavax/swing/JComponent;Ljava/lang/String;)Ljavax/swing/text/View;
- (Ljavax/swing/JComponent;Ljava/lang/String;)Ljavax/swing/text/View;
+ (Ljavax/swing/JComponent;Ljava/lang/String;)L1javax/swing/text/View;
 getHTMLBaseline
  (Ljavax/swing/text/View;II)I
  (Ljavax/swing/text/View;II)I
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicIconFactory.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicIconFactory.eea
index 958ff17940..504f9378d9 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicIconFactory.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicIconFactory.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicIconFactory
 
 createEmptyFrameIcon
  ()Ljavax/swing/Icon;
- ()Ljavax/swing/Icon;
+ ()L1javax/swing/Icon;
 getCheckBoxIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicInternalFrameTitlePane.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicInternalFrameTitlePane.eea
index 61225d556f..991a88c435 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicInternalFrameTitlePane.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicInternalFrameTitlePane.eea
@@ -91,16 +91,16 @@ addSystemMenuItems
  (Ljavax/swing/JMenu;)V
 createLayout
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createSystemMenu
  ()Ljavax/swing/JMenu;
- ()Ljavax/swing/JMenu;
+ ()L1javax/swing/JMenu;
 createSystemMenuBar
  ()Ljavax/swing/JMenuBar;
- ()Ljavax/swing/JMenuBar;
+ ()L1javax/swing/JMenuBar;
 getTitle
  (Ljava/lang/String;Ljava/awt/FontMetrics;I)Ljava/lang/String;
  (Ljava/lang/String;Ljava/awt/FontMetrics;I)Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicInternalFrameUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicInternalFrameUI.eea
index 5a61c7b11a..7bc50d3cf0 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicInternalFrameUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicInternalFrameUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicInternalFrameUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 borderListener
  Ljavax/swing/event/MouseInputAdapter;
@@ -52,34 +52,34 @@ closeFrame
  (Ljavax/swing/JInternalFrame;)V
 createBorderListener
  (Ljavax/swing/JInternalFrame;)Ljavax/swing/event/MouseInputAdapter;
- (Ljavax/swing/JInternalFrame;)Ljavax/swing/event/MouseInputAdapter;
+ (Ljavax/swing/JInternalFrame;)L1javax/swing/event/MouseInputAdapter;
 createComponentListener
  ()Ljava/awt/event/ComponentListener;
- ()Ljava/awt/event/ComponentListener;
+ ()L1java/awt/event/ComponentListener;
 createDesktopManager
  ()Ljavax/swing/DesktopManager;
- ()Ljavax/swing/DesktopManager;
+ ()L1javax/swing/DesktopManager;
 createEastPane
  (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
- (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
+ (Ljavax/swing/JInternalFrame;)L0javax/swing/JComponent;
 createGlassPaneDispatcher
  ()Ljavax/swing/event/MouseInputListener;
- ()Ljavax/swing/event/MouseInputListener;
+ ()L0javax/swing/event/MouseInputListener;
 createLayoutManager
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 createNorthPane
  (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
- (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
+ (Ljavax/swing/JInternalFrame;)L1javax/swing/JComponent;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createSouthPane
  (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
- (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
+ (Ljavax/swing/JInternalFrame;)L0javax/swing/JComponent;
 createWestPane
  (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
- (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
+ (Ljavax/swing/JInternalFrame;)L0javax/swing/JComponent;
 deactivateFrame
  (Ljavax/swing/JInternalFrame;)V
  (Ljavax/swing/JInternalFrame;)V
@@ -97,7 +97,7 @@ getEastPane
  ()Ljavax/swing/JComponent;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
@@ -106,7 +106,7 @@ getNorthPane
  ()Ljavax/swing/JComponent;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getSouthPane
  ()Ljavax/swing/JComponent;
  ()Ljavax/swing/JComponent;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicLabelUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicLabelUI.eea
index 3c1a431d4c..7734c1a4b6 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicLabelUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicLabelUI.eea
@@ -6,7 +6,7 @@ labelUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getBaseline
  (Ljavax/swing/JComponent;II)I
@@ -22,7 +22,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installComponents
  (Ljavax/swing/JLabel;)V
  (Ljavax/swing/JLabel;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicListUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicListUI.eea
index b22d88812e..cfbe388764 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicListUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicListUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicListUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 cellHeights
  [I
@@ -31,19 +31,19 @@ rendererPane
 
 createFocusListener
  ()Ljava/awt/event/FocusListener;
- ()Ljava/awt/event/FocusListener;
+ ()L1java/awt/event/FocusListener;
 createListDataListener
  ()Ljavax/swing/event/ListDataListener;
- ()Ljavax/swing/event/ListDataListener;
+ ()L1javax/swing/event/ListDataListener;
 createListSelectionListener
  ()Ljavax/swing/event/ListSelectionListener;
- ()Ljavax/swing/event/ListSelectionListener;
+ ()L1javax/swing/event/ListSelectionListener;
 createMouseInputListener
  ()Ljavax/swing/event/MouseInputListener;
- ()Ljavax/swing/event/MouseInputListener;
+ ()L1javax/swing/event/MouseInputListener;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -52,13 +52,13 @@ getBaselineResizeBehavior
  (Ljavax/swing/JComponent;)Ljava/awt/Component$BaselineResizeBehavior;
 getCellBounds
  (Ljavax/swing/JList<*>;II)Ljava/awt/Rectangle;
- (Ljavax/swing/JList<*>;II)Ljava/awt/Rectangle;
+ (Ljavax/swing/JList<*>;II)L0java/awt/Rectangle;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 indexToLocation
  (Ljavax/swing/JList<*>;I)Ljava/awt/Point;
- (Ljavax/swing/JList<*>;I)Ljava/awt/Point;
+ (Ljavax/swing/JList<*>;I)L0java/awt/Point;
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicLookAndFeel.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicLookAndFeel.eea
index 34bcd75e87..00340aafe8 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicLookAndFeel.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicLookAndFeel.eea
@@ -2,13 +2,13 @@ class javax/swing/plaf/basic/BasicLookAndFeel
 
 createAudioAction
  (Ljava/lang/Object;)Ljavax/swing/Action;
- (Ljava/lang/Object;)Ljavax/swing/Action;
+ (Ljava/lang/Object;)L0javax/swing/Action;
 getAudioActionMap
  ()Ljavax/swing/ActionMap;
- ()Ljavax/swing/ActionMap;
+ ()L1javax/swing/ActionMap;
 getDefaults
  ()Ljavax/swing/UIDefaults;
- ()Ljavax/swing/UIDefaults;
+ ()L0javax/swing/UIDefaults; # @Inherited(javax.swing.LookAndFeel)
 initClassDefaults
  (Ljavax/swing/UIDefaults;)V
  (Ljavax/swing/UIDefaults;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicMenuBarUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicMenuBarUI.eea
index f438ccead3..49806e056f 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicMenuBarUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicMenuBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicMenuBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 changeListener
  Ljavax/swing/event/ChangeListener;
@@ -16,16 +16,16 @@ menuBar
 
 createChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 createContainerListener
  ()Ljava/awt/event/ContainerListener;
- ()Ljava/awt/event/ContainerListener;
+ ()L1java/awt/event/ContainerListener;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicMenuItemUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicMenuItemUI.eea
index 65327d4bbb..9b25907c91 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicMenuItemUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicMenuItemUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicMenuItemUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 acceleratorDelimiter
  Ljava/lang/String;
@@ -49,16 +49,16 @@ selectionForeground
 
 createMenuDragMouseListener
  (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuDragMouseListener;
- (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuDragMouseListener;
+ (Ljavax/swing/JComponent;)L1javax/swing/event/MenuDragMouseListener;
 createMenuKeyListener
  (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuKeyListener;
- (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuKeyListener;
+ (Ljavax/swing/JComponent;)L0javax/swing/event/MenuKeyListener;
 createMouseInputListener
  (Ljavax/swing/JComponent;)Ljavax/swing/event/MouseInputListener;
- (Ljavax/swing/JComponent;)Ljavax/swing/event/MouseInputListener;
+ (Ljavax/swing/JComponent;)L1javax/swing/event/MouseInputListener;
 createPropertyChangeListener
  (Ljavax/swing/JComponent;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JComponent;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JComponent;)L1java/beans/PropertyChangeListener;
 doClick
  (Ljavax/swing/MenuSelectionManager;)V
  (Ljavax/swing/MenuSelectionManager;)V
@@ -70,16 +70,16 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPath
  ()[Ljavax/swing/MenuElement;
- ()[Ljavax/swing/MenuElement;
+ ()[1Ljavax/swing/MenuElement;
 getPreferredMenuItemSize
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)L1java/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 installComponents
  (Ljavax/swing/JMenuItem;)V
  (Ljavax/swing/JMenuItem;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicMenuUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicMenuUI.eea
index 427aafc68a..71b67ee792 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicMenuUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicMenuUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicMenuUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 changeListener
  Ljavax/swing/event/ChangeListener;
@@ -13,31 +13,31 @@ menuListener
 
 createChangeListener
  (Ljavax/swing/JComponent;)Ljavax/swing/event/ChangeListener;
- (Ljavax/swing/JComponent;)Ljavax/swing/event/ChangeListener;
+ (Ljavax/swing/JComponent;)L0javax/swing/event/ChangeListener;
 createMenuDragMouseListener
  (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuDragMouseListener;
- (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuDragMouseListener;
+ (Ljavax/swing/JComponent;)L1javax/swing/event/MenuDragMouseListener; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 createMenuKeyListener
  (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuKeyListener;
- (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuKeyListener;
+ (Ljavax/swing/JComponent;)L1javax/swing/event/MenuKeyListener; # @Overrides(javax.swing.plaf.basic.BasicMenuItemUI)
 createMenuListener
  (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuListener;
- (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuListener;
+ (Ljavax/swing/JComponent;)L0javax/swing/event/MenuListener;
 createMouseInputListener
  (Ljavax/swing/JComponent;)Ljavax/swing/event/MouseInputListener;
- (Ljavax/swing/JComponent;)Ljavax/swing/event/MouseInputListener;
+ (Ljavax/swing/JComponent;)L1javax/swing/event/MouseInputListener; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 createPropertyChangeListener
  (Ljavax/swing/JComponent;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JComponent;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JComponent;)L1java/beans/PropertyChangeListener; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 setupPostTimer
  (Ljavax/swing/JMenu;)V
  (Ljavax/swing/JMenu;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicOptionPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicOptionPaneUI.eea
index ededf1a60d..e349eab7df 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicOptionPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicOptionPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicOptionPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 initialFocusComponent
  Ljava/awt/Component;
@@ -37,40 +37,40 @@ containsCustomComponents
  (Ljavax/swing/JOptionPane;)Z
 createButtonActionListener
  (I)Ljava/awt/event/ActionListener;
- (I)Ljava/awt/event/ActionListener;
+ (I)L1java/awt/event/ActionListener;
 createButtonArea
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L1java/awt/Container;
 createLayoutManager
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 createMessageArea
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L1java/awt/Container;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createSeparator
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L0java/awt/Container;
 getButtons
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 getIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
 getIconForType
  (I)Ljavax/swing/Icon;
- (I)Ljavax/swing/Icon;
+ (I)L0javax/swing/Icon;
 getMessage
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getMinimumOptionPaneSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicPanelUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicPanelUI.eea
index 04039e1a98..23f3aa3873 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicPanelUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicPanelUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicPanelUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getBaseline
  (Ljavax/swing/JComponent;II)I
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicPasswordFieldUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicPasswordFieldUI.eea
index 2aa8e1f416..7e339d5fac 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicPasswordFieldUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicPasswordFieldUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicPasswordFieldUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 create
  (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
+ (Ljavax/swing/text/Element;)L1javax/swing/text/View; # @Inherited(javax.swing.plaf.basic.BasicTextFieldUI)
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicTextFieldUI)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.eea
index 155f5cba47..219fdcf82e 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicPopupMenuSeparatorUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicSeparatorUI)
 paint
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicPopupMenuUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicPopupMenuUI.eea
index be8ccead39..4020267896 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicPopupMenuUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicPopupMenuUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicPopupMenuUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 popupMenu
  Ljavax/swing/JPopupMenu;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicProgressBarUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicProgressBarUI.eea
index 2655975986..14997c7a20 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicProgressBarUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicProgressBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicProgressBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 boxRect
  Ljava/awt/Rectangle;
@@ -25,7 +25,7 @@ getBaselineResizeBehavior
  (Ljavax/swing/JComponent;)Ljava/awt/Component$BaselineResizeBehavior;
 getBox
  (Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
- (Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
+ (Ljava/awt/Rectangle;)L0java/awt/Rectangle;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
@@ -40,7 +40,7 @@ getPreferredInnerVertical
  ()Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Overrides(javax.swing.plaf.ComponentUI)
 getSelectionBackground
  ()Ljava/awt/Color;
  ()Ljava/awt/Color;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.eea
index cadaa38d8c..2c13e86b34 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicRadioButtonMenuItemUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 processMouseEvent
  (Ljavax/swing/JMenuItem;Ljava/awt/event/MouseEvent;[Ljavax/swing/MenuElement;Ljavax/swing/MenuSelectionManager;)V
  (Ljavax/swing/JMenuItem;Ljava/awt/event/MouseEvent;[Ljavax/swing/MenuElement;Ljavax/swing/MenuSelectionManager;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicRadioButtonUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicRadioButtonUI.eea
index 5a4abe7bee..57b58ed465 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicRadioButtonUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicRadioButtonUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicRadioButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 icon
  Ljavax/swing/Icon;
@@ -13,10 +13,10 @@ getDefaultIcon
  ()Ljavax/swing/Icon;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicButtonUI)
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicToggleButtonUI)
 installDefaults
  (Ljavax/swing/AbstractButton;)V
  (Ljavax/swing/AbstractButton;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicRootPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicRootPaneUI.eea
index 17e9eca72a..f1d7d7c844 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicRootPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicRootPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicRootPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 installComponents
  (Ljavax/swing/JRootPane;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicScrollBarUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicScrollBarUI.eea
index 7f8df9a274..4647ddab0f 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicScrollBarUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicScrollBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicScrollBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 buttonListener
  Ljavax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener;
@@ -67,28 +67,28 @@ addLayoutComponent
  (Ljava/lang/String;Ljava/awt/Component;)V
 createArrowButtonListener
  ()Ljavax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener;
- ()Ljavax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener;
+ ()L1javax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener;
 createDecreaseButton
  (I)Ljavax/swing/JButton;
- (I)Ljavax/swing/JButton;
+ (I)L1javax/swing/JButton;
 createIncreaseButton
  (I)Ljavax/swing/JButton;
- (I)Ljavax/swing/JButton;
+ (I)L1javax/swing/JButton;
 createModelListener
  ()Ljavax/swing/plaf/basic/BasicScrollBarUI$ModelListener;
- ()Ljavax/swing/plaf/basic/BasicScrollBarUI$ModelListener;
+ ()L1javax/swing/plaf/basic/BasicScrollBarUI$ModelListener;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createScrollListener
  ()Ljavax/swing/plaf/basic/BasicScrollBarUI$ScrollListener;
- ()Ljavax/swing/plaf/basic/BasicScrollBarUI$ScrollListener;
+ ()L1javax/swing/plaf/basic/BasicScrollBarUI$ScrollListener;
 createTrackListener
  ()Ljavax/swing/plaf/basic/BasicScrollBarUI$TrackListener;
- ()Ljavax/swing/plaf/basic/BasicScrollBarUI$TrackListener;
+ ()L1javax/swing/plaf/basic/BasicScrollBarUI$TrackListener;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getMaximumThumbSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
@@ -97,7 +97,7 @@ getMinimumThumbSize
  ()Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Overrides(javax.swing.plaf.ComponentUI)
 getThumbBounds
  ()Ljava/awt/Rectangle;
  ()Ljava/awt/Rectangle;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicScrollPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicScrollPaneUI.eea
index ba95b93096..e9c3d8a4f8 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicScrollPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicScrollPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicScrollPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 hsbChangeListener
  Ljavax/swing/event/ChangeListener;
@@ -22,19 +22,19 @@ vsbChangeListener
 
 createHSBChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 createMouseWheelListener
  ()Ljava/awt/event/MouseWheelListener;
- ()Ljava/awt/event/MouseWheelListener;
+ ()L1java/awt/event/MouseWheelListener;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createVSBChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 createViewportChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicSeparatorUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicSeparatorUI.eea
index b11d53122a..ef912e03e3 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicSeparatorUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicSeparatorUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicSeparatorUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 highlight
  Ljava/awt/Color;
@@ -13,13 +13,13 @@ shadow
 
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installDefaults
  (Ljavax/swing/JSeparator;)V
  (Ljavax/swing/JSeparator;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicSliderUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicSliderUI.eea
index 2deac5dc8f..9d3a8cd10c 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicSliderUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicSliderUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicSliderUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 changeListener
  Ljavax/swing/event/ChangeListener;
@@ -58,22 +58,22 @@ trackRect
  (Ljavax/swing/JSlider;)V
 createChangeListener
  (Ljavax/swing/JSlider;)Ljavax/swing/event/ChangeListener;
- (Ljavax/swing/JSlider;)Ljavax/swing/event/ChangeListener;
+ (Ljavax/swing/JSlider;)L1javax/swing/event/ChangeListener;
 createComponentListener
  (Ljavax/swing/JSlider;)Ljava/awt/event/ComponentListener;
- (Ljavax/swing/JSlider;)Ljava/awt/event/ComponentListener;
+ (Ljavax/swing/JSlider;)L1java/awt/event/ComponentListener;
 createFocusListener
  (Ljavax/swing/JSlider;)Ljava/awt/event/FocusListener;
- (Ljavax/swing/JSlider;)Ljava/awt/event/FocusListener;
+ (Ljavax/swing/JSlider;)L1java/awt/event/FocusListener;
 createPropertyChangeListener
  (Ljavax/swing/JSlider;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JSlider;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JSlider;)L1java/beans/PropertyChangeListener;
 createScrollListener
  (Ljavax/swing/JSlider;)Ljavax/swing/plaf/basic/BasicSliderUI$ScrollListener;
- (Ljavax/swing/JSlider;)Ljavax/swing/plaf/basic/BasicSliderUI$ScrollListener;
+ (Ljavax/swing/JSlider;)L1javax/swing/plaf/basic/BasicSliderUI$ScrollListener;
 createTrackListener
  (Ljavax/swing/JSlider;)Ljavax/swing/plaf/basic/BasicSliderUI$TrackListener;
- (Ljavax/swing/JSlider;)Ljavax/swing/plaf/basic/BasicSliderUI$TrackListener;
+ (Ljavax/swing/JSlider;)L1javax/swing/plaf/basic/BasicSliderUI$TrackListener;
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -85,19 +85,19 @@ getFocusColor
  ()Ljava/awt/Color;
 getHighestValue
  ()Ljava/lang/Integer;
- ()Ljava/lang/Integer;
+ ()L0java/lang/Integer;
 getHighestValueLabel
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 getHighlightColor
  ()Ljava/awt/Color;
  ()Ljava/awt/Color;
 getLowestValue
  ()Ljava/lang/Integer;
- ()Ljava/lang/Integer;
+ ()L0java/lang/Integer;
 getLowestValueLabel
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
@@ -106,7 +106,7 @@ getMinimumHorizontalSize
  ()Ljava/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getMinimumVerticalSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
@@ -115,7 +115,7 @@ getPreferredHorizontalSize
  ()Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Overrides(javax.swing.plaf.ComponentUI)
 getPreferredVerticalSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
@@ -124,7 +124,7 @@ getShadowColor
  ()Ljava/awt/Color;
 getThumbSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 installDefaults
  (Ljavax/swing/JSlider;)V
  (Ljavax/swing/JSlider;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicSpinnerUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicSpinnerUI.eea
index 43b73e0304..b72b0dc06b 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicSpinnerUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicSpinnerUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicSpinnerUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 spinner
  Ljavax/swing/JSpinner;
@@ -10,19 +10,19 @@ spinner
 
 createEditor
  ()Ljavax/swing/JComponent;
- ()Ljavax/swing/JComponent;
+ ()L1javax/swing/JComponent;
 createLayout
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 createNextButton
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component;
 createPreviousButton
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneDivider.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneDivider.eea
index ced2adc462..efa6351974 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneDivider.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneDivider.eea
@@ -27,10 +27,10 @@ splitPaneUI
  (Ljavax/swing/plaf/basic/BasicSplitPaneUI;)V
 createLeftOneTouchButton
  ()Ljavax/swing/JButton;
- ()Ljavax/swing/JButton;
+ ()L1javax/swing/JButton;
 createRightOneTouchButton
  ()Ljavax/swing/JButton;
- ()Ljavax/swing/JButton;
+ ()L1javax/swing/JButton;
 getBasicSplitPaneUI
  ()Ljavax/swing/plaf/basic/BasicSplitPaneUI;
  ()Ljavax/swing/plaf/basic/BasicSplitPaneUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.eea
index f62efec6c4..f385dfbbed 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.eea
@@ -33,7 +33,7 @@ getSizeOfComponent
  (Ljava/awt/Component;)I
 getSizes
  ()[I
- ()[I
+ ()[1I
 invalidateLayout
  (Ljava/awt/Container;)V
  (Ljava/awt/Container;)V
@@ -42,13 +42,13 @@ layoutContainer
  (Ljava/awt/Container;)V
 maximumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
- (Ljava/awt/Container;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;)L1java/awt/Dimension;
 minimumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
- (Ljava/awt/Container;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;)L1java/awt/Dimension;
 preferredLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
- (Ljava/awt/Container;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;)L1java/awt/Dimension;
 removeLayoutComponent
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneUI.eea
index a408ac5ec0..886cee9302 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneUI.eea
@@ -6,7 +6,7 @@ NON_CONTINUOUS_DIVIDER
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 divider
  Ljavax/swing/plaf/basic/BasicSplitPaneDivider;
@@ -65,31 +65,31 @@ upKey
 
 createDefaultDivider
  ()Ljavax/swing/plaf/basic/BasicSplitPaneDivider;
- ()Ljavax/swing/plaf/basic/BasicSplitPaneDivider;
+ ()L1javax/swing/plaf/basic/BasicSplitPaneDivider;
 createDefaultNonContinuousLayoutDivider
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component;
 createFocusListener
  ()Ljava/awt/event/FocusListener;
- ()Ljava/awt/event/FocusListener;
+ ()L1java/awt/event/FocusListener;
 createKeyboardDownRightListener
  ()Ljava/awt/event/ActionListener;
- ()Ljava/awt/event/ActionListener;
+ ()L1java/awt/event/ActionListener;
 createKeyboardEndListener
  ()Ljava/awt/event/ActionListener;
- ()Ljava/awt/event/ActionListener;
+ ()L1java/awt/event/ActionListener;
 createKeyboardHomeListener
  ()Ljava/awt/event/ActionListener;
- ()Ljava/awt/event/ActionListener;
+ ()L1java/awt/event/ActionListener;
 createKeyboardResizeToggleListener
  ()Ljava/awt/event/ActionListener;
- ()Ljava/awt/event/ActionListener;
+ ()L1java/awt/event/ActionListener;
 createKeyboardUpLeftListener
  ()Ljava/awt/event/ActionListener;
- ()Ljava/awt/event/ActionListener;
+ ()L1java/awt/event/ActionListener;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 finishedPaintingChildren
  (Ljavax/swing/JSplitPane;Ljava/awt/Graphics;)V
  (Ljavax/swing/JSplitPane;Ljava/awt/Graphics;)V
@@ -101,7 +101,7 @@ getDividerLocation
  (Ljavax/swing/JSplitPane;)I
 getInsets
  (Ljavax/swing/JComponent;)Ljava/awt/Insets;
- (Ljavax/swing/JComponent;)Ljava/awt/Insets;
+ (Ljavax/swing/JComponent;)L0java/awt/Insets;
 getMaximumDividerLocation
  (Ljavax/swing/JSplitPane;)I
  (Ljavax/swing/JSplitPane;)I
@@ -119,7 +119,7 @@ getNonContinuousLayoutDivider
  ()Ljava/awt/Component;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getSplitPane
  ()Ljavax/swing/JSplitPane;
  ()Ljavax/swing/JSplitPane;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTabbedPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTabbedPaneUI.eea
index 1852d9c65a..46e9870fb8 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTabbedPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTabbedPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicTabbedPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 rotateInsets
  (Ljava/awt/Insets;Ljava/awt/Insets;I)V
  (Ljava/awt/Insets;Ljava/awt/Insets;I)V
@@ -76,22 +76,22 @@ calculateTabWidth
  (IILjava/awt/FontMetrics;)I
 createChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 createFocusListener
  ()Ljava/awt/event/FocusListener;
- ()Ljava/awt/event/FocusListener;
+ ()L1java/awt/event/FocusListener;
 createLayoutManager
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 createMouseListener
  ()Ljava/awt/event/MouseListener;
- ()Ljava/awt/event/MouseListener;
+ ()L1java/awt/event/MouseListener;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createScrollButton
  (I)Ljavax/swing/JButton;
- (I)Ljavax/swing/JButton;
+ (I)L1javax/swing/JButton;
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -109,10 +109,10 @@ getIconForTab
  (I)Ljavax/swing/Icon;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getSelectedTabPadInsets
  (I)Ljava/awt/Insets;
  (I)Ljava/awt/Insets;
@@ -133,7 +133,7 @@ getTabRunCount
  (Ljavax/swing/JTabbedPane;)I
 getTextViewForTab
  (I)Ljavax/swing/text/View;
- (I)Ljavax/swing/text/View;
+ (I)L0javax/swing/text/View;
 getVisibleComponent
  ()Ljava/awt/Component;
  ()Ljava/awt/Component;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTableHeaderUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTableHeaderUI.eea
index 37de27cf5b..05912a45f4 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTableHeaderUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTableHeaderUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicTableHeaderUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 header
  Ljavax/swing/table/JTableHeader;
@@ -16,7 +16,7 @@ rendererPane
 
 createMouseInputListener
  ()Ljavax/swing/event/MouseInputListener;
- ()Ljavax/swing/event/MouseInputListener;
+ ()L1javax/swing/event/MouseInputListener;
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -28,7 +28,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTableUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTableUI.eea
index 45527ccb57..b86b7952df 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTableUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTableUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicTableUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 focusListener
  Ljava/awt/event/FocusListener;
@@ -22,13 +22,13 @@ table
 
 createFocusListener
  ()Ljava/awt/event/FocusListener;
- ()Ljava/awt/event/FocusListener;
+ ()L1java/awt/event/FocusListener;
 createKeyListener
  ()Ljava/awt/event/KeyListener;
- ()Ljava/awt/event/KeyListener;
+ ()L0java/awt/event/KeyListener;
 createMouseInputListener
  ()Ljavax/swing/event/MouseInputListener;
- ()Ljavax/swing/event/MouseInputListener;
+ ()L1javax/swing/event/MouseInputListener;
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -43,7 +43,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTextAreaUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTextAreaUI.eea
index 3a44e4bb5e..4bdc980a48 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTextAreaUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTextAreaUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicTextAreaUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 create
  (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
+ (Ljavax/swing/text/Element;)L0javax/swing/text/View; # @Inherited(javax.swing.plaf.basic.BasicTextUI)
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -15,13 +15,13 @@ getBaselineResizeBehavior
  (Ljavax/swing/JComponent;)Ljava/awt/Component$BaselineResizeBehavior;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicTextUI)
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicTextUI)
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 propertyChange
  (Ljava/beans/PropertyChangeEvent;)V
  (Ljava/beans/PropertyChangeEvent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTextFieldUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTextFieldUI.eea
index 7a58a1f961..14ec6a1d60 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTextFieldUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTextFieldUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicTextFieldUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 create
  (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
+ (Ljavax/swing/text/Element;)L1javax/swing/text/View; # @Overrides(javax.swing.plaf.basic.BasicTextUI)
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -15,4 +15,4 @@ getBaselineResizeBehavior
  (Ljavax/swing/JComponent;)Ljava/awt/Component$BaselineResizeBehavior;
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTextPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTextPaneUI.eea
index 35b2aede01..75b15b84d4 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTextPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTextPaneUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicTextPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicEditorPaneUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTextUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTextUI.eea
index 89fafe25cb..879823d8bc 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTextUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTextUI.eea
@@ -2,19 +2,19 @@ class javax/swing/plaf/basic/BasicTextUI
 
 create
  (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
+ (Ljavax/swing/text/Element;)L0javax/swing/text/View; # @Overrides(javax.swing.text.ViewFactory)
 create
  (Ljavax/swing/text/Element;II)Ljavax/swing/text/View;
- (Ljavax/swing/text/Element;II)Ljavax/swing/text/View;
+ (Ljavax/swing/text/Element;II)L0javax/swing/text/View;
 createCaret
  ()Ljavax/swing/text/Caret;
- ()Ljavax/swing/text/Caret;
+ ()L1javax/swing/text/Caret;
 createHighlighter
  ()Ljavax/swing/text/Highlighter;
- ()Ljavax/swing/text/Highlighter;
+ ()L1javax/swing/text/Highlighter;
 createKeymap
  ()Ljavax/swing/text/Keymap;
- ()Ljavax/swing/text/Keymap;
+ ()L1javax/swing/text/Keymap;
 damageRange
  (Ljavax/swing/text/JTextComponent;II)V
  (Ljavax/swing/text/JTextComponent;II)V
@@ -32,16 +32,16 @@ getKeymapName
  ()Ljava/lang/String;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getNextVisualPositionFrom
  (Ljavax/swing/text/JTextComponent;ILjavax/swing/text/Position$Bias;I[Ljavax/swing/text/Position$Bias;)I
  (Ljavax/swing/text/JTextComponent;ILjavax/swing/text/Position$Bias;I[Ljavax/swing/text/Position$Bias;)I
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getPropertyPrefix
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -50,10 +50,10 @@ getRootView
  (Ljavax/swing/text/JTextComponent;)Ljavax/swing/text/View;
 getToolTipText
  (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)Ljava/lang/String;
- (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)Ljava/lang/String;
+ (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)L0java/lang/String; # @Inherited(javax.swing.plaf.TextUI)
 getVisibleEditorRect
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L0java/awt/Rectangle;
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicToggleButtonUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicToggleButtonUI.eea
index f473527bf4..aa6a557dba 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicToggleButtonUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicToggleButtonUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicToggleButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicButtonUI)
 paint
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicToolBarSeparatorUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicToolBarSeparatorUI.eea
index a059db702a..aea46f22cb 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicToolBarSeparatorUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicToolBarSeparatorUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicToolBarSeparatorUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicSeparatorUI)
 installDefaults
  (Ljavax/swing/JSeparator;)V
  (Ljavax/swing/JSeparator;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicToolBarUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicToolBarUI.eea
index eb7c2e55d4..43c55a6481 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicToolBarUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicToolBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicToolBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 constraintBeforeFloating
  Ljava/lang/String;
@@ -55,34 +55,34 @@ canDock
  (Ljava/awt/Component;Ljava/awt/Point;)Z
 createDockingListener
  ()Ljavax/swing/event/MouseInputListener;
- ()Ljavax/swing/event/MouseInputListener;
+ ()L1javax/swing/event/MouseInputListener;
 createDragWindow
  (Ljavax/swing/JToolBar;)Ljavax/swing/plaf/basic/BasicToolBarUI$DragWindow;
- (Ljavax/swing/JToolBar;)Ljavax/swing/plaf/basic/BasicToolBarUI$DragWindow;
+ (Ljavax/swing/JToolBar;)L1javax/swing/plaf/basic/BasicToolBarUI$DragWindow;
 createFloatingFrame
  (Ljavax/swing/JToolBar;)Ljavax/swing/JFrame;
- (Ljavax/swing/JToolBar;)Ljavax/swing/JFrame;
+ (Ljavax/swing/JToolBar;)L1javax/swing/JFrame;
 createFloatingWindow
  (Ljavax/swing/JToolBar;)Ljavax/swing/RootPaneContainer;
- (Ljavax/swing/JToolBar;)Ljavax/swing/RootPaneContainer;
+ (Ljavax/swing/JToolBar;)L1javax/swing/RootPaneContainer;
 createFrameListener
  ()Ljava/awt/event/WindowListener;
- ()Ljava/awt/event/WindowListener;
+ ()L1java/awt/event/WindowListener;
 createNonRolloverBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createPropertyListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createRolloverBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createToolBarContListener
  ()Ljava/awt/event/ContainerListener;
- ()Ljava/awt/event/ContainerListener;
+ ()L1java/awt/event/ContainerListener;
 createToolBarFocusListener
  ()Ljava/awt/event/FocusListener;
- ()Ljava/awt/event/FocusListener;
+ ()L1java/awt/event/FocusListener;
 dragTo
  (Ljava/awt/Point;Ljava/awt/Point;)V
  (Ljava/awt/Point;Ljava/awt/Point;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicToolTipUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicToolTipUI.eea
index 096fc33316..cf5eab2cf0 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicToolTipUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicToolTipUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicToolTipUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
@@ -12,7 +12,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installDefaults
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.eea
index 26ac4d5e03..e0ad91758e 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.eea
@@ -18,4 +18,4 @@ componentMoved
  (L1java/awt/event/ComponentEvent;)V # @Inherited(java.awt.event.ComponentAdapter)
 getScrollPane
  ()Ljavax/swing/JScrollPane;
- ()Ljavax/swing/JScrollPane;
+ ()L0javax/swing/JScrollPane;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.eea
index cefe0eb340..9158381754 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.eea
@@ -5,4 +5,4 @@ class javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler
  (Ljavax/swing/plaf/basic/BasicTreeUI;)V
 getNodeDimensions
  (Ljava/lang/Object;IIZLjava/awt/Rectangle;)Ljava/awt/Rectangle;
- (Ljava/lang/Object;IIZLjava/awt/Rectangle;)Ljava/awt/Rectangle;
+ (Ljava/lang/Object;IIZLjava/awt/Rectangle;)L0java/awt/Rectangle;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTreeUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTreeUI.eea
index 2cf437ab21..a845f99e54 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTreeUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicTreeUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicTreeUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 cellEditor
  Ljavax/swing/tree/TreeCellEditor;
@@ -58,49 +58,49 @@ checkForClickInExpandControl
  (Ljavax/swing/tree/TreePath;II)V
 createCellEditorListener
  ()Ljavax/swing/event/CellEditorListener;
- ()Ljavax/swing/event/CellEditorListener;
+ ()L1javax/swing/event/CellEditorListener;
 createCellRendererPane
  ()Ljavax/swing/CellRendererPane;
- ()Ljavax/swing/CellRendererPane;
+ ()L1javax/swing/CellRendererPane;
 createComponentListener
  ()Ljava/awt/event/ComponentListener;
- ()Ljava/awt/event/ComponentListener;
+ ()L1java/awt/event/ComponentListener;
 createDefaultCellEditor
  ()Ljavax/swing/tree/TreeCellEditor;
- ()Ljavax/swing/tree/TreeCellEditor;
+ ()L1javax/swing/tree/TreeCellEditor;
 createDefaultCellRenderer
  ()Ljavax/swing/tree/TreeCellRenderer;
- ()Ljavax/swing/tree/TreeCellRenderer;
+ ()L1javax/swing/tree/TreeCellRenderer;
 createFocusListener
  ()Ljava/awt/event/FocusListener;
- ()Ljava/awt/event/FocusListener;
+ ()L1java/awt/event/FocusListener;
 createKeyListener
  ()Ljava/awt/event/KeyListener;
- ()Ljava/awt/event/KeyListener;
+ ()L1java/awt/event/KeyListener;
 createLayoutCache
  ()Ljavax/swing/tree/AbstractLayoutCache;
- ()Ljavax/swing/tree/AbstractLayoutCache;
+ ()L1javax/swing/tree/AbstractLayoutCache;
 createMouseListener
  ()Ljava/awt/event/MouseListener;
- ()Ljava/awt/event/MouseListener;
+ ()L1java/awt/event/MouseListener;
 createNodeDimensions
  ()Ljavax/swing/tree/AbstractLayoutCache$NodeDimensions;
- ()Ljavax/swing/tree/AbstractLayoutCache$NodeDimensions;
+ ()L1javax/swing/tree/AbstractLayoutCache$NodeDimensions;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createSelectionModelPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createTreeExpansionListener
  ()Ljavax/swing/event/TreeExpansionListener;
- ()Ljavax/swing/event/TreeExpansionListener;
+ ()L1javax/swing/event/TreeExpansionListener;
 createTreeModelListener
  ()Ljavax/swing/event/TreeModelListener;
- ()Ljavax/swing/event/TreeModelListener;
+ ()L1javax/swing/event/TreeModelListener;
 createTreeSelectionListener
  ()Ljavax/swing/event/TreeSelectionListener;
- ()Ljavax/swing/event/TreeSelectionListener;
+ ()L1javax/swing/event/TreeSelectionListener;
 drawCentered
  (Ljava/awt/Component;Ljava/awt/Graphics;Ljavax/swing/Icon;II)V
  (Ljava/awt/Component;Ljava/awt/Graphics;Ljavax/swing/Icon;II)V
@@ -118,13 +118,13 @@ getBaselineResizeBehavior
  (Ljavax/swing/JComponent;)Ljava/awt/Component$BaselineResizeBehavior;
 getCellEditor
  ()Ljavax/swing/tree/TreeCellEditor;
- ()Ljavax/swing/tree/TreeCellEditor;
+ ()L0javax/swing/tree/TreeCellEditor;
 getCellRenderer
  ()Ljavax/swing/tree/TreeCellRenderer;
  ()Ljavax/swing/tree/TreeCellRenderer;
 getClosestPathForLocation
  (Ljavax/swing/JTree;II)Ljavax/swing/tree/TreePath;
- (Ljavax/swing/JTree;II)Ljavax/swing/tree/TreePath;
+ (Ljavax/swing/JTree;II)L0javax/swing/tree/TreePath;
 getCollapsedIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
@@ -142,7 +142,7 @@ getHashColor
  ()Ljava/awt/Color;
 getLastChildPath
  (Ljavax/swing/tree/TreePath;)Ljavax/swing/tree/TreePath;
- (Ljavax/swing/tree/TreePath;)Ljavax/swing/tree/TreePath;
+ (Ljavax/swing/tree/TreePath;)L0javax/swing/tree/TreePath;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
@@ -154,16 +154,16 @@ getModel
  ()Ljavax/swing/tree/TreeModel;
 getPathBounds
  (Ljavax/swing/JTree;Ljavax/swing/tree/TreePath;)Ljava/awt/Rectangle;
- (Ljavax/swing/JTree;Ljavax/swing/tree/TreePath;)Ljava/awt/Rectangle;
+ (Ljavax/swing/JTree;Ljavax/swing/tree/TreePath;)L0java/awt/Rectangle;
 getPathForRow
  (Ljavax/swing/JTree;I)Ljavax/swing/tree/TreePath;
- (Ljavax/swing/JTree;I)Ljavax/swing/tree/TreePath;
+ (Ljavax/swing/JTree;I)L0javax/swing/tree/TreePath;
 getPreferredMinSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L0java/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getPreferredSize
  (Ljavax/swing/JComponent;Z)Ljava/awt/Dimension;
  (Ljavax/swing/JComponent;Z)Ljava/awt/Dimension;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicViewportUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicViewportUI.eea
index 13aed978c2..f34f32f064 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicViewportUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/basic/BasicViewportUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicViewportUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 installDefaults
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/DefaultMetalTheme.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/DefaultMetalTheme.eea
index 8d887da924..7b1faac3f5 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/DefaultMetalTheme.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/DefaultMetalTheme.eea
@@ -8,7 +8,7 @@ getMenuTextFont
  ()Ljavax/swing/plaf/FontUIResource;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getPrimary1
  ()Ljavax/swing/plaf/ColorUIResource;
  ()Ljavax/swing/plaf/ColorUIResource;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalButtonUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalButtonUI.eea
index 7c8ac6fa05..8f4bece189 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalButtonUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalButtonUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 disabledTextColor
  Ljava/awt/Color;
@@ -16,7 +16,7 @@ selectColor
 
 createButtonListener
  (Ljavax/swing/AbstractButton;)Ljavax/swing/plaf/basic/BasicButtonListener;
- (Ljavax/swing/AbstractButton;)Ljavax/swing/plaf/basic/BasicButtonListener;
+ (Ljavax/swing/AbstractButton;)L1javax/swing/plaf/basic/BasicButtonListener; # @Inherited(javax.swing.plaf.basic.BasicButtonUI)
 getDisabledTextColor
  ()Ljava/awt/Color;
  ()Ljava/awt/Color;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalCheckBoxUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalCheckBoxUI.eea
index b324cd3e8b..2888a1d7aa 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalCheckBoxUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalCheckBoxUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/metal/MetalCheckBoxUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicRadioButtonUI)
 installDefaults
  (Ljavax/swing/AbstractButton;)V
  (Ljavax/swing/AbstractButton;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalComboBoxButton.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalComboBoxButton.eea
index e2dcd29b1c..a8b7d40d60 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalComboBoxButton.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalComboBoxButton.eea
@@ -27,7 +27,7 @@ getComboIcon
  ()Ljavax/swing/Icon;
 getMinimumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 paintComponent
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalComboBoxUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalComboBoxUI.eea
index 751bcd2578..39551827b1 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalComboBoxUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalComboBoxUI.eea
@@ -2,23 +2,23 @@ class javax/swing/plaf/metal/MetalComboBoxUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createArrowButton
  ()Ljavax/swing/JButton;
- ()Ljavax/swing/JButton;
+ ()L1javax/swing/JButton; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 createEditor
  ()Ljavax/swing/ComboBoxEditor;
- ()Ljavax/swing/ComboBoxEditor;
+ ()L1javax/swing/ComboBoxEditor; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 createLayoutManager
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 createPopup
  ()Ljavax/swing/plaf/basic/ComboPopup;
- ()Ljavax/swing/plaf/basic/ComboPopup;
+ ()L1javax/swing/plaf/basic/ComboPopup; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 editablePropertyChanged
  (Ljava/beans/PropertyChangeEvent;)V
  (Ljava/beans/PropertyChangeEvent;)V
@@ -27,7 +27,7 @@ getBaseline
  (Ljavax/swing/JComponent;II)I
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 layoutComboBox
  (Ljava/awt/Container;Ljavax/swing/plaf/metal/MetalComboBoxUI$MetalComboBoxLayoutManager;)V
  (Ljava/awt/Container;Ljavax/swing/plaf/metal/MetalComboBoxUI$MetalComboBoxLayoutManager;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalDesktopIconUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalDesktopIconUI.eea
index 2646c213da..90e5044900 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalDesktopIconUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalDesktopIconUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/metal/MetalDesktopIconUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicDesktopIconUI)
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicDesktopIconUI)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.eea
index 65baf419f3..9afc97ed24 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.eea
@@ -16,7 +16,7 @@ filters
  (Ljavax/swing/plaf/metal/MetalFileChooserUI;)V
 getElementAt
  (I)Ljava/lang/Object;
- (I)Ljava/lang/Object;
+ (I)L0java/lang/Object;
 getSelectedItem
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalFileChooserUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalFileChooserUI.eea
index 987871bbad..2a5f7831d9 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalFileChooserUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalFileChooserUI.eea
@@ -2,35 +2,35 @@ class javax/swing/plaf/metal/MetalFileChooserUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 <init>
  (Ljavax/swing/JFileChooser;)V
  (Ljavax/swing/JFileChooser;)V
 createActionMap
  ()Ljavax/swing/ActionMap;
- ()Ljavax/swing/ActionMap;
+ ()L1javax/swing/ActionMap;
 createDetailsView
  (Ljavax/swing/JFileChooser;)Ljavax/swing/JPanel;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/JPanel;
+ (Ljavax/swing/JFileChooser;)L1javax/swing/JPanel;
 createDirectoryComboBoxModel
  (Ljavax/swing/JFileChooser;)Ljavax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxModel;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxModel;
+ (Ljavax/swing/JFileChooser;)L1javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxModel;
 createFilterComboBoxModel
  ()Ljavax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel;
- ()Ljavax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel;
+ ()L1javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel;
 createFilterComboBoxRenderer
  ()Ljavax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxRenderer;
- ()Ljavax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxRenderer;
+ ()L1javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxRenderer;
 createList
  (Ljavax/swing/JFileChooser;)Ljavax/swing/JPanel;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/JPanel;
+ (Ljavax/swing/JFileChooser;)L1javax/swing/JPanel;
 createListSelectionListener
  (Ljavax/swing/JFileChooser;)Ljavax/swing/event/ListSelectionListener;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/event/ListSelectionListener;
+ (Ljavax/swing/JFileChooser;)L1javax/swing/event/ListSelectionListener; # @Inherited(javax.swing.plaf.basic.BasicFileChooserUI)
 createPropertyChangeListener
  (Ljavax/swing/JFileChooser;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JFileChooser;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JFileChooser;)L1java/beans/PropertyChangeListener; # @Overrides(javax.swing.plaf.basic.BasicFileChooserUI)
 ensureFileIsVisible
  (Ljavax/swing/JFileChooser;Ljava/io/File;)V
  (Ljavax/swing/JFileChooser;Ljava/io/File;)V
@@ -39,7 +39,7 @@ getActionMap
  ()Ljavax/swing/ActionMap;
 getApproveButton
  (Ljavax/swing/JFileChooser;)Ljavax/swing/JButton;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/JButton;
+ (Ljavax/swing/JFileChooser;)L0javax/swing/JButton; # @Inherited(javax.swing.plaf.basic.BasicFileChooserUI)
 getBottomPanel
  ()Ljavax/swing/JPanel;
  ()Ljavax/swing/JPanel;
@@ -48,19 +48,19 @@ getButtonPanel
  ()Ljavax/swing/JPanel;
 getDirectoryName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicFileChooserUI)
 getFileName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicFileChooserUI)
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installComponents
  (Ljavax/swing/JFileChooser;)V
  (Ljavax/swing/JFileChooser;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalIconFactory.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalIconFactory.eea
index 97f52da3ea..12d847f9d6 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalIconFactory.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalIconFactory.eea
@@ -26,19 +26,19 @@ getHorizontalSliderThumbIcon
  ()Ljavax/swing/Icon;
 getInternalFrameAltMaximizeIcon
  (I)Ljavax/swing/Icon;
- (I)Ljavax/swing/Icon;
+ (I)L1javax/swing/Icon;
 getInternalFrameCloseIcon
  (I)Ljavax/swing/Icon;
- (I)Ljavax/swing/Icon;
+ (I)L1javax/swing/Icon;
 getInternalFrameDefaultMenuIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
 getInternalFrameMaximizeIcon
  (I)Ljavax/swing/Icon;
- (I)Ljavax/swing/Icon;
+ (I)L1javax/swing/Icon;
 getInternalFrameMinimizeIcon
  (I)Ljavax/swing/Icon;
- (I)Ljavax/swing/Icon;
+ (I)L1javax/swing/Icon;
 getMenuArrowIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
@@ -47,7 +47,7 @@ getMenuItemArrowIcon
  ()Ljavax/swing/Icon;
 getMenuItemCheckIcon
  ()Ljavax/swing/Icon;
- ()Ljavax/swing/Icon;
+ ()L0javax/swing/Icon;
 getRadioButtonIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
@@ -59,19 +59,19 @@ getTreeComputerIcon
  ()Ljavax/swing/Icon;
 getTreeControlIcon
  (Z)Ljavax/swing/Icon;
- (Z)Ljavax/swing/Icon;
+ (Z)L1javax/swing/Icon;
 getTreeFloppyDriveIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
 getTreeFolderIcon
  ()Ljavax/swing/Icon;
- ()Ljavax/swing/Icon;
+ ()L1javax/swing/Icon;
 getTreeHardDriveIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
 getTreeLeafIcon
  ()Ljavax/swing/Icon;
- ()Ljavax/swing/Icon;
+ ()L1javax/swing/Icon;
 getVerticalSliderThumbIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalInternalFrameTitlePane.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalInternalFrameTitlePane.eea
index 9c49a7ab43..6168ec50e6 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalInternalFrameTitlePane.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalInternalFrameTitlePane.eea
@@ -12,10 +12,10 @@ addSystemMenuItems
  (Ljavax/swing/JMenu;)V
 createLayout
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager; # @Inherited(javax.swing.plaf.basic.BasicInternalFrameTitlePane)
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener; # @Inherited(javax.swing.plaf.basic.BasicInternalFrameTitlePane)
 paintComponent
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalInternalFrameUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalInternalFrameUI.eea
index fd85399a99..71d6d9970b 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalInternalFrameUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalInternalFrameUI.eea
@@ -6,17 +6,17 @@ IS_PALETTE
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 <init>
  (Ljavax/swing/JInternalFrame;)V
  (Ljavax/swing/JInternalFrame;)V
 createBorderListener
  (Ljavax/swing/JInternalFrame;)Ljavax/swing/event/MouseInputAdapter;
- (Ljavax/swing/JInternalFrame;)Ljavax/swing/event/MouseInputAdapter;
+ (Ljavax/swing/JInternalFrame;)L1javax/swing/event/MouseInputAdapter; # @Inherited(javax.swing.plaf.basic.BasicInternalFrameUI)
 createNorthPane
  (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
- (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
+ (Ljavax/swing/JInternalFrame;)L1javax/swing/JComponent; # @Inherited(javax.swing.plaf.basic.BasicInternalFrameUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalLabelUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalLabelUI.eea
index 9db9a15dd3..edd54f07dd 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalLabelUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalLabelUI.eea
@@ -6,7 +6,7 @@ metalLabelUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 paintDisabledText
  (Ljavax/swing/JLabel;Ljava/awt/Graphics;Ljava/lang/String;II)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalLookAndFeel.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalLookAndFeel.eea
index 63042babfc..078de14fdf 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalLookAndFeel.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalLookAndFeel.eea
@@ -35,7 +35,7 @@ getControlTextFont
  ()Ljavax/swing/plaf/FontUIResource;
 getCurrentTheme
  ()Ljavax/swing/plaf/metal/MetalTheme;
- ()Ljavax/swing/plaf/metal/MetalTheme;
+ ()L1javax/swing/plaf/metal/MetalTheme;
 getDesktopColor
  ()Ljavax/swing/plaf/ColorUIResource;
  ()Ljavax/swing/plaf/ColorUIResource;
@@ -135,25 +135,25 @@ setCurrentTheme
 
 getDefaults
  ()Ljavax/swing/UIDefaults;
- ()Ljavax/swing/UIDefaults;
+ ()L0javax/swing/UIDefaults; # @Inherited(javax.swing.plaf.basic.BasicLookAndFeel)
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getDisabledIcon
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
- (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
+ (Ljavax/swing/JComponent;Ljavax/swing/Icon;)L0javax/swing/Icon; # @Inherited(javax.swing.LookAndFeel)
 getDisabledSelectedIcon
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
 getID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getLayoutStyle
  ()Ljavax/swing/LayoutStyle;
  ()Ljavax/swing/LayoutStyle;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 initClassDefaults
  (Ljavax/swing/UIDefaults;)V
  (Ljavax/swing/UIDefaults;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalMenuBarUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalMenuBarUI.eea
index 6662f30197..e430ec3daf 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalMenuBarUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalMenuBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalMenuBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 installUI
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.eea
index 48ddd1cf73..0549ca0411 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/metal/MetalPopupMenuSeparatorUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.metal.MetalSeparatorUI)
 paint
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalProgressBarUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalProgressBarUI.eea
index 07cd53085f..2ce6cc3464 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalProgressBarUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalProgressBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalProgressBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 paintDeterminate
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalRadioButtonUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalRadioButtonUI.eea
index 8ae61adab9..b20a88505d 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalRadioButtonUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalRadioButtonUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalRadioButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 disabledTextColor
  Ljava/awt/Color;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalRootPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalRootPaneUI.eea
index c5cceaf996..2d4b1b58a9 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalRootPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalRootPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalRootPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 installUI
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalScrollBarUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalScrollBarUI.eea
index 217a8c66a0..920f41cd51 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalScrollBarUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalScrollBarUI.eea
@@ -6,7 +6,7 @@ FREE_STANDING_PROP
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 decreaseButton
  Ljavax/swing/plaf/metal/MetalScrollButton;
@@ -17,19 +17,19 @@ increaseButton
 
 createDecreaseButton
  (I)Ljavax/swing/JButton;
- (I)Ljavax/swing/JButton;
+ (I)L1javax/swing/JButton; # @Inherited(javax.swing.plaf.basic.BasicScrollBarUI)
 createIncreaseButton
  (I)Ljavax/swing/JButton;
- (I)Ljavax/swing/JButton;
+ (I)L1javax/swing/JButton; # @Inherited(javax.swing.plaf.basic.BasicScrollBarUI)
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener; # @Inherited(javax.swing.plaf.basic.BasicScrollBarUI)
 getMinimumThumbSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicScrollBarUI)
 paintThumb
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;Ljava/awt/Rectangle;)V
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;Ljava/awt/Rectangle;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalScrollButton.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalScrollButton.eea
index fc6d212975..51cc224969 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalScrollButton.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalScrollButton.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalScrollButton
 
 getMaximumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicArrowButton)
 getMinimumSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalScrollPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalScrollPaneUI.eea
index 36379a64be..29647c61b7 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalScrollPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalScrollPaneUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/metal/MetalScrollPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createScrollBarSwapListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 installListeners
  (Ljavax/swing/JScrollPane;)V
  (Ljavax/swing/JScrollPane;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalSeparatorUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalSeparatorUI.eea
index e0a86cc148..66a9bb6b31 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalSeparatorUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalSeparatorUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/metal/MetalSeparatorUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicSeparatorUI)
 installDefaults
  (Ljavax/swing/JSeparator;)V
  (Ljavax/swing/JSeparator;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalSliderUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalSliderUI.eea
index bb7464ad18..821a4421b7 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalSliderUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalSliderUI.eea
@@ -18,7 +18,7 @@ vertThumbIcon
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 SLIDER_FILL
  Ljava/lang/String;
@@ -26,10 +26,10 @@ SLIDER_FILL
 
 createPropertyChangeListener
  (Ljavax/swing/JSlider;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JSlider;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JSlider;)L1java/beans/PropertyChangeListener; # @Inherited(javax.swing.plaf.basic.BasicSliderUI)
 getThumbSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicSliderUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalSplitPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalSplitPaneUI.eea
index 4f3b06b28a..7b62877d09 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalSplitPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalSplitPaneUI.eea
@@ -2,8 +2,8 @@ class javax/swing/plaf/metal/MetalSplitPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createDefaultDivider
  ()Ljavax/swing/plaf/basic/BasicSplitPaneDivider;
- ()Ljavax/swing/plaf/basic/BasicSplitPaneDivider;
+ ()L1javax/swing/plaf/basic/BasicSplitPaneDivider; # @Inherited(javax.swing.plaf.basic.BasicSplitPaneUI)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalTabbedPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalTabbedPaneUI.eea
index aa4a11899d..021cb05aab 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalTabbedPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalTabbedPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalTabbedPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 selectColor
  Ljava/awt/Color;
@@ -16,7 +16,7 @@ tabAreaBackground
 
 createLayoutManager
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager; # @Inherited(javax.swing.plaf.basic.BasicTabbedPaneUI)
 getColorForGap
  (III)Ljava/awt/Color;
  (III)Ljava/awt/Color;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalTextFieldUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalTextFieldUI.eea
index c6667e587c..d820bf7970 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalTextFieldUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalTextFieldUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalTextFieldUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 propertyChange
  (Ljava/beans/PropertyChangeEvent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalToggleButtonUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalToggleButtonUI.eea
index 0fc321c9f8..f05d29c1a1 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalToggleButtonUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalToggleButtonUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalToggleButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 disabledTextColor
  Ljava/awt/Color;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalToolBarUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalToolBarUI.eea
index 50e6469634..6a1771247a 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalToolBarUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalToolBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalToolBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 contListener
  Ljava/awt/event/ContainerListener;
@@ -13,19 +13,19 @@ rolloverListener
 
 createContainerListener
  ()Ljava/awt/event/ContainerListener;
- ()Ljava/awt/event/ContainerListener;
+ ()L0java/awt/event/ContainerListener;
 createDockingListener
  ()Ljavax/swing/event/MouseInputListener;
- ()Ljavax/swing/event/MouseInputListener;
+ ()L1javax/swing/event/MouseInputListener; # @Inherited(javax.swing.plaf.basic.BasicToolBarUI)
 createNonRolloverBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border; # @Inherited(javax.swing.plaf.basic.BasicToolBarUI)
 createRolloverBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border; # @Inherited(javax.swing.plaf.basic.BasicToolBarUI)
 createRolloverListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L0java/beans/PropertyChangeListener;
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalToolTipUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalToolTipUI.eea
index 4bfbe5f7d1..1519f9002e 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalToolTipUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalToolTipUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/metal/MetalToolTipUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getAcceleratorString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicToolTipUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalTreeUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalTreeUI.eea
index 3abf6f5630..67fce33b1d 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalTreeUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/MetalTreeUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalTreeUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 decodeLineStyle
  (Ljava/lang/Object;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/OceanTheme.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/OceanTheme.eea
index b6461d7fc8..5e35c71969 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/OceanTheme.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/metal/OceanTheme.eea
@@ -20,7 +20,7 @@ getMenuDisabledForeground
  ()Ljavax/swing/plaf/ColorUIResource;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.metal.DefaultMetalTheme)
 getPrimary1
  ()Ljavax/swing/plaf/ColorUIResource;
  ()Ljavax/swing/plaf/ColorUIResource;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiButtonUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiButtonUI.eea
index 8d23cd5b47..4035fc2605 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiButtonUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiButtonUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiColorChooserUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiColorChooserUI.eea
index 12eb56922c..0c91cc49d7 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiColorChooserUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiColorChooserUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiColorChooserUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiComboBoxUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiComboBoxUI.eea
index 9b912cb014..69ed6c3809 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiComboBoxUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiComboBoxUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiComboBoxUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiDesktopIconUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiDesktopIconUI.eea
index eae8c6978f..53cf07f51d 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiDesktopIconUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiDesktopIconUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiDesktopIconUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiDesktopPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiDesktopPaneUI.eea
index cfe93faa41..ab2df60304 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiDesktopPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiDesktopPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiDesktopPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiFileChooserUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiFileChooserUI.eea
index 3b7996dbc3..75dc321e9f 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiFileChooserUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiFileChooserUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiFileChooserUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -40,7 +40,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiInternalFrameUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiInternalFrameUI.eea
index d01883b96c..f179b0e0ce 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiInternalFrameUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiInternalFrameUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiInternalFrameUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiLabelUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiLabelUI.eea
index 3cf7cc4f13..ad4c53c249 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiLabelUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiLabelUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiLabelUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiListUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiListUI.eea
index c68e328dc5..d1a04074d2 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiListUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiListUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiListUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -28,7 +28,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiLookAndFeel.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiLookAndFeel.eea
index a860046de6..0e6a5364ab 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiLookAndFeel.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiLookAndFeel.eea
@@ -2,20 +2,20 @@ class javax/swing/plaf/multi/MultiLookAndFeel
 
 createUIs
  (Ljavax/swing/plaf/ComponentUI;Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/plaf/ComponentUI;Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/plaf/ComponentUI;Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;Ljavax/swing/JComponent;)L0javax/swing/plaf/ComponentUI;
 uisToArray
  (Ljava/util/Vector<+Ljavax/swing/plaf/ComponentUI;>;)[Ljavax/swing/plaf/ComponentUI;
- (Ljava/util/Vector<+Ljavax/swing/plaf/ComponentUI;>;)[Ljavax/swing/plaf/ComponentUI;
+ (Ljava/util/Vector<+Ljavax/swing/plaf/ComponentUI;>;)[0Ljavax/swing/plaf/ComponentUI;
 
 getDefaults
  ()Ljavax/swing/UIDefaults;
- ()Ljavax/swing/UIDefaults;
+ ()L0javax/swing/UIDefaults; # @Inherited(javax.swing.LookAndFeel)
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiMenuBarUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiMenuBarUI.eea
index 8ed26fb170..8858dd6b6d 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiMenuBarUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiMenuBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiMenuBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiMenuItemUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiMenuItemUI.eea
index b878857acb..732ffa8c35 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiMenuItemUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiMenuItemUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiMenuItemUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiOptionPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiOptionPaneUI.eea
index 500f4c5223..5186eefbae 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiOptionPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiOptionPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiOptionPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -28,7 +28,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiPanelUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiPanelUI.eea
index f2922b3030..b1ad12dd78 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiPanelUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiPanelUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiPanelUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiPopupMenuUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiPopupMenuUI.eea
index 52fcd8ceb2..66171dd2af 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiPopupMenuUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiPopupMenuUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiPopupMenuUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -28,7 +28,7 @@ getPopup
  (Ljavax/swing/JPopupMenu;II)Ljavax/swing/Popup;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiProgressBarUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiProgressBarUI.eea
index 99784cbb72..18bbc6caa7 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiProgressBarUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiProgressBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiProgressBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiRootPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiRootPaneUI.eea
index 13853e43b8..c265966556 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiRootPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiRootPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiRootPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiScrollBarUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiScrollBarUI.eea
index 0b5a7aa180..a88e4e09e7 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiScrollBarUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiScrollBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiScrollBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiScrollPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiScrollPaneUI.eea
index e6857dbd9c..e23070ebe2 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiScrollPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiScrollPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiScrollPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiSeparatorUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiSeparatorUI.eea
index 50cd2c102a..ca2676d523 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiSeparatorUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiSeparatorUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiSeparatorUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiSliderUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiSliderUI.eea
index 65d9715206..6a4ccc3cc7 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiSliderUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiSliderUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiSliderUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiSpinnerUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiSpinnerUI.eea
index c512f9a1b8..1391dd9ae8 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiSpinnerUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiSpinnerUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiSpinnerUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiSplitPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiSplitPaneUI.eea
index d742467cc7..b15b72012c 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiSplitPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiSplitPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiSplitPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -37,7 +37,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiTabbedPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiTabbedPaneUI.eea
index e6d36244f8..e17b63906a 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiTabbedPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiTabbedPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiTabbedPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getTabBounds
  (Ljavax/swing/JTabbedPane;I)Ljava/awt/Rectangle;
  (Ljavax/swing/JTabbedPane;I)Ljava/awt/Rectangle;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiTableHeaderUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiTableHeaderUI.eea
index 00d73d248e..55ff7b1d6d 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiTableHeaderUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiTableHeaderUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiTableHeaderUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiTableUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiTableUI.eea
index aeaa395c29..475a20408f 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiTableUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiTableUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiTableUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiTextUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiTextUI.eea
index 9851880229..94d07f605c 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiTextUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiTextUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiTextUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -37,13 +37,13 @@ getNextVisualPositionFrom
  (Ljavax/swing/text/JTextComponent;ILjavax/swing/text/Position$Bias;I[Ljavax/swing/text/Position$Bias;)I
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getRootView
  (Ljavax/swing/text/JTextComponent;)Ljavax/swing/text/View;
  (Ljavax/swing/text/JTextComponent;)Ljavax/swing/text/View;
 getToolTipText
  (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)Ljava/lang/String;
- (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)Ljava/lang/String;
+ (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)L0java/lang/String; # @Inherited(javax.swing.plaf.TextUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiToolBarUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiToolBarUI.eea
index 4aca1c2465..3e8908adc1 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiToolBarUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiToolBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiToolBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiToolTipUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiToolTipUI.eea
index f80290027b..6cb9d80ea6 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiToolTipUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiToolTipUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiToolTipUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiTreeUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiTreeUI.eea
index 126eb5242a..658ebb1213 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiTreeUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiTreeUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiTreeUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -40,7 +40,7 @@ getPathForRow
  (Ljavax/swing/JTree;I)Ljavax/swing/tree/TreePath;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getRowCount
  (Ljavax/swing/JTree;)I
  (Ljavax/swing/JTree;)I
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiViewportUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiViewportUI.eea
index f805494697..41db22b4e6 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiViewportUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/multi/MultiViewportUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiViewportUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/nimbus/AbstractRegionPainter.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/nimbus/AbstractRegionPainter.eea
index 5bf758a0ec..6796d20ea4 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/nimbus/AbstractRegionPainter.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/nimbus/AbstractRegionPainter.eea
@@ -9,16 +9,16 @@ configureGraphics
  (Ljava/awt/Graphics2D;)V
 decodeColor
  (Ljava/awt/Color;Ljava/awt/Color;F)Ljava/awt/Color;
- (Ljava/awt/Color;Ljava/awt/Color;F)Ljava/awt/Color;
+ (Ljava/awt/Color;Ljava/awt/Color;F)L1java/awt/Color;
 decodeColor
  (Ljava/lang/String;FFFI)Ljava/awt/Color;
  (Ljava/lang/String;FFFI)Ljava/awt/Color;
 decodeGradient
  (FFFF[F[Ljava/awt/Color;)Ljava/awt/LinearGradientPaint;
- (FFFF[F[Ljava/awt/Color;)Ljava/awt/LinearGradientPaint;
+ (FFFF[F[Ljava/awt/Color;)L1java/awt/LinearGradientPaint;
 decodeRadialGradient
  (FFF[F[Ljava/awt/Color;)Ljava/awt/RadialGradientPaint;
- (FFF[F[Ljava/awt/Color;)Ljava/awt/RadialGradientPaint;
+ (FFF[F[Ljava/awt/Color;)L1java/awt/RadialGradientPaint;
 doPaint
  (Ljava/awt/Graphics2D;Ljavax/swing/JComponent;II[Ljava/lang/Object;)V
  (Ljava/awt/Graphics2D;Ljavax/swing/JComponent;II[Ljava/lang/Object;)V
@@ -27,7 +27,7 @@ getComponentColor
  (Ljavax/swing/JComponent;Ljava/lang/String;Ljava/awt/Color;FFI)Ljava/awt/Color;
 getExtendedCacheKeys
  (Ljavax/swing/JComponent;)[Ljava/lang/Object;
- (Ljavax/swing/JComponent;)[Ljava/lang/Object;
+ (Ljavax/swing/JComponent;)[0Ljava/lang/Object;
 getPaintContext
  ()Ljavax/swing/plaf/nimbus/AbstractRegionPainter$PaintContext;
  ()Ljavax/swing/plaf/nimbus/AbstractRegionPainter$PaintContext;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/nimbus/Effect$ArrayCache.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/nimbus/Effect$ArrayCache.eea
index ae37bb0a11..a9d4d0b1b7 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/nimbus/Effect$ArrayCache.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/nimbus/Effect$ArrayCache.eea
@@ -2,13 +2,13 @@ class javax/swing/plaf/nimbus/Effect$ArrayCache
 
 getTmpByteArray1
  (I)[B
- (I)[B
+ (I)[1B
 getTmpByteArray2
  (I)[B
- (I)[B
+ (I)[1B
 getTmpByteArray3
  (I)[B
- (I)[B
+ (I)[1B
 getTmpIntArray
  (I)[I
- (I)[I
+ (I)[1I
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/nimbus/NimbusLookAndFeel.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/nimbus/NimbusLookAndFeel.eea
index 73477b1301..62a9362e6b 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/nimbus/NimbusLookAndFeel.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/nimbus/NimbusLookAndFeel.eea
@@ -6,28 +6,28 @@ getStyle
 
 getDefaults
  ()Ljavax/swing/UIDefaults;
- ()Ljavax/swing/UIDefaults;
+ ()L0javax/swing/UIDefaults; # @Inherited(javax.swing.plaf.synth.SynthLookAndFeel)
 getDerivedColor
  (Ljava/awt/Color;Ljava/awt/Color;F)Ljava/awt/Color;
  (Ljava/awt/Color;Ljava/awt/Color;F)Ljava/awt/Color;
 getDerivedColor
  (Ljava/awt/Color;Ljava/awt/Color;FZ)Ljava/awt/Color;
- (Ljava/awt/Color;Ljava/awt/Color;FZ)Ljava/awt/Color;
+ (Ljava/awt/Color;Ljava/awt/Color;FZ)L1java/awt/Color;
 getDerivedColor
  (Ljava/lang/String;FFFIZ)Ljava/awt/Color;
  (Ljava/lang/String;FFFIZ)Ljava/awt/Color;
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.synth.SynthLookAndFeel)
 getDisabledIcon
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
- (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
+ (Ljavax/swing/JComponent;Ljavax/swing/Icon;)L0javax/swing/Icon; # @Inherited(javax.swing.LookAndFeel)
 getID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.synth.SynthLookAndFeel)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.synth.SynthLookAndFeel)
 register
  (Ljavax/swing/plaf/synth/Region;Ljava/lang/String;)V
  (Ljavax/swing/plaf/synth/Region;Ljava/lang/String;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/nimbus/NimbusStyle.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/nimbus/NimbusStyle.eea
index 35a02e7e92..95b97430bd 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/nimbus/NimbusStyle.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/nimbus/NimbusStyle.eea
@@ -33,7 +33,7 @@ getInsets
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Insets;)Ljava/awt/Insets;
 getPainter
  (Ljavax/swing/plaf/synth/SynthContext;)Ljavax/swing/plaf/synth/SynthPainter;
- (Ljavax/swing/plaf/synth/SynthContext;)Ljavax/swing/plaf/synth/SynthPainter;
+ (Ljavax/swing/plaf/synth/SynthContext;)L0javax/swing/plaf/synth/SynthPainter; # @Inherited(javax.swing.plaf.synth.SynthStyle)
 installDefaults
  (Ljavax/swing/plaf/synth/SynthContext;)V
  (Ljavax/swing/plaf/synth/SynthContext;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthButtonUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthButtonUI.eea
index 0f7e619408..79a6ca2246 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthButtonUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthButtonUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getBaseline
  (Ljavax/swing/JComponent;II)I
@@ -18,13 +18,13 @@ getIcon
  (Ljavax/swing/AbstractButton;)Ljavax/swing/Icon;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicButtonUI)
 getSizingIcon
  (Ljavax/swing/AbstractButton;)Ljavax/swing/Icon;
  (Ljavax/swing/AbstractButton;)Ljavax/swing/Icon;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthCheckBoxMenuItemUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthCheckBoxMenuItemUI.eea
index 13863d5a52..5bf11a1ba8 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthCheckBoxMenuItemUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthCheckBoxMenuItemUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthCheckBoxMenuItemUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 paintBorder
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthCheckBoxUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthCheckBoxUI.eea
index 43256ee9da..25d4ab440e 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthCheckBoxUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthCheckBoxUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthCheckBoxUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.synth.SynthRadioButtonUI)
 paintBorder
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthColorChooserUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthColorChooserUI.eea
index 930107c0ea..4d7e504294 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthColorChooserUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthColorChooserUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthColorChooserUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createDefaultChoosers
  ()[Ljavax/swing/colorchooser/AbstractColorChooserPanel;
- ()[Ljavax/swing/colorchooser/AbstractColorChooserPanel;
+ ()[1Ljavax/swing/colorchooser/AbstractColorChooserPanel; # @Inherited(javax.swing.plaf.basic.BasicColorChooserUI)
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthComboBoxUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthComboBoxUI.eea
index 8279acab5e..75a66742cc 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthComboBoxUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthComboBoxUI.eea
@@ -2,20 +2,20 @@ class javax/swing/plaf/synth/SynthComboBoxUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createArrowButton
  ()Ljavax/swing/JButton;
- ()Ljavax/swing/JButton;
+ ()L1javax/swing/JButton; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 createEditor
  ()Ljavax/swing/ComboBoxEditor;
- ()Ljavax/swing/ComboBoxEditor;
+ ()L1javax/swing/ComboBoxEditor; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 createPopup
  ()Ljavax/swing/plaf/basic/ComboPopup;
- ()Ljavax/swing/plaf/basic/ComboPopup;
+ ()L1javax/swing/plaf/basic/ComboPopup; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 createRenderer
  ()Ljavax/swing/ListCellRenderer<Ljava/lang/Object;>;
- ()Ljavax/swing/ListCellRenderer<Ljava/lang/Object;>;
+ ()L1javax/swing/ListCellRenderer<Ljava/lang/Object;>; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthDesktopIconUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthDesktopIconUI.eea
index 3a8c9a94a8..7b74777892 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthDesktopIconUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthDesktopIconUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthDesktopIconUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthDesktopPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthDesktopPaneUI.eea
index f0bb2115c2..4088f732b3 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthDesktopPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthDesktopPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthDesktopPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthEditorPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthEditorPaneUI.eea
index 52d9cb8998..5a2829e0bd 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthEditorPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthEditorPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthEditorPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthFormattedTextFieldUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthFormattedTextFieldUI.eea
index d6cac5c726..8fa27c7c41 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthFormattedTextFieldUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthFormattedTextFieldUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthFormattedTextFieldUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicTextFieldUI)
 paintBorder
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthInternalFrameUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthInternalFrameUI.eea
index 1318315f94..af797619a0 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthInternalFrameUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthInternalFrameUI.eea
@@ -2,17 +2,17 @@ class javax/swing/plaf/synth/SynthInternalFrameUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 <init>
  (Ljavax/swing/JInternalFrame;)V
  (Ljavax/swing/JInternalFrame;)V
 createComponentListener
  ()Ljava/awt/event/ComponentListener;
- ()Ljava/awt/event/ComponentListener;
+ ()L1java/awt/event/ComponentListener; # @Inherited(javax.swing.plaf.basic.BasicInternalFrameUI)
 createNorthPane
  (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
- (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
+ (Ljavax/swing/JInternalFrame;)L1javax/swing/JComponent; # @Inherited(javax.swing.plaf.basic.BasicInternalFrameUI)
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthLabelUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthLabelUI.eea
index 14fc3e07b9..6066056159 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthLabelUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthLabelUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthLabelUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getBaseline
  (Ljavax/swing/JComponent;II)I
@@ -18,7 +18,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicLabelUI)
 installDefaults
  (Ljavax/swing/JLabel;)V
  (Ljavax/swing/JLabel;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthListUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthListUI.eea
index 80e6c8936c..40b6775af8 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthListUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthListUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthListUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthLookAndFeel.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthLookAndFeel.eea
index ccfc63d27a..69f5dee2f7 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthLookAndFeel.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthLookAndFeel.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthLookAndFeel
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L0javax/swing/plaf/ComponentUI;
 getRegion
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/Region;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/Region;
@@ -21,16 +21,16 @@ updateStyles
 
 getDefaults
  ()Ljavax/swing/UIDefaults;
- ()Ljavax/swing/UIDefaults;
+ ()L0javax/swing/UIDefaults; # @Inherited(javax.swing.plaf.basic.BasicLookAndFeel)
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 load
  (Ljava/io/InputStream;Ljava/lang/Class<*>;)V
  (Ljava/io/InputStream;Ljava/lang/Class<*>;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthMenuBarUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthMenuBarUI.eea
index ca810b05eb..611268698e 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthMenuBarUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthMenuBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthMenuBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthMenuItemUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthMenuItemUI.eea
index 3c6e57c8de..37eed0d473 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthMenuItemUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthMenuItemUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthMenuItemUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
 getPreferredMenuItemSize
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 paint
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthMenuUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthMenuUI.eea
index cfe1553f3e..d759b5595d 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthMenuUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthMenuUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthMenuUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
 getPreferredMenuItemSize
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 paint
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthOptionPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthOptionPaneUI.eea
index c595451a2f..b55486707d 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthOptionPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthOptionPaneUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthOptionPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createMessageArea
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L1java/awt/Container; # @Inherited(javax.swing.plaf.basic.BasicOptionPaneUI)
 createSeparator
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L1java/awt/Container; # @Overrides(javax.swing.plaf.basic.BasicOptionPaneUI)
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthPanelUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthPanelUI.eea
index 4f69c52c6e..e08b44736a 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthPanelUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthPanelUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthPanelUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthPasswordFieldUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthPasswordFieldUI.eea
index d6e03cf4d9..121895da30 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthPasswordFieldUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthPasswordFieldUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthPasswordFieldUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 create
  (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
+ (Ljavax/swing/text/Element;)L1javax/swing/text/View; # @Inherited(javax.swing.plaf.basic.BasicTextFieldUI)
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicTextFieldUI)
 paintBorder
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthPopupMenuUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthPopupMenuUI.eea
index 62496d1194..5f0e53dd82 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthPopupMenuUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthPopupMenuUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthPopupMenuUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthProgressBarUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthProgressBarUI.eea
index 0230b78c06..390c441a85 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthProgressBarUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthProgressBarUI.eea
@@ -2,20 +2,20 @@ class javax/swing/plaf/synth/SynthProgressBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
 getBox
  (Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
- (Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
+ (Ljava/awt/Rectangle;)L0java/awt/Rectangle; # @Inherited(javax.swing.plaf.basic.BasicProgressBarUI)
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicProgressBarUI)
 paint
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthRadioButtonMenuItemUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthRadioButtonMenuItemUI.eea
index c52d8f870c..e1e0f42c41 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthRadioButtonMenuItemUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthRadioButtonMenuItemUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthRadioButtonMenuItemUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 paintBorder
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthRadioButtonUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthRadioButtonUI.eea
index f9df39367d..5f90f782fd 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthRadioButtonUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthRadioButtonUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthRadioButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.synth.SynthToggleButtonUI)
 getSizingIcon
  (Ljavax/swing/AbstractButton;)Ljavax/swing/Icon;
  (Ljavax/swing/AbstractButton;)Ljavax/swing/Icon;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthRootPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthRootPaneUI.eea
index 62cceb050f..6d9b0a2429 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthRootPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthRootPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthRootPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthScrollBarUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthScrollBarUI.eea
index 5f087af27a..1e74a8f116 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthScrollBarUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthScrollBarUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthScrollBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createDecreaseButton
  (I)Ljavax/swing/JButton;
- (I)Ljavax/swing/JButton;
+ (I)L1javax/swing/JButton; # @Inherited(javax.swing.plaf.basic.BasicScrollBarUI)
 createIncreaseButton
  (I)Ljavax/swing/JButton;
- (I)Ljavax/swing/JButton;
+ (I)L1javax/swing/JButton; # @Inherited(javax.swing.plaf.basic.BasicScrollBarUI)
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
@@ -18,7 +18,7 @@ getMinimumThumbSize
  ()Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicScrollBarUI)
 paint
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthScrollPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthScrollPaneUI.eea
index 2a803fda26..27598c3111 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthScrollPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthScrollPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthScrollPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthSeparatorUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthSeparatorUI.eea
index 619ac54379..9509575f33 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthSeparatorUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthSeparatorUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthSeparatorUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
@@ -15,7 +15,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installDefaults
  (Ljavax/swing/JSeparator;)V
  (Ljavax/swing/JSeparator;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthSliderUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthSliderUI.eea
index a080130d27..02e35c78c4 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthSliderUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthSliderUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthSliderUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 <init>
  (Ljavax/swing/JSlider;)V
  (Ljavax/swing/JSlider;)V
 createTrackListener
  (Ljavax/swing/JSlider;)Ljavax/swing/plaf/basic/BasicSliderUI$TrackListener;
- (Ljavax/swing/JSlider;)Ljavax/swing/plaf/basic/BasicSliderUI$TrackListener;
+ (Ljavax/swing/JSlider;)L1javax/swing/plaf/basic/BasicSliderUI$TrackListener; # @Inherited(javax.swing.plaf.basic.BasicSliderUI)
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -18,13 +18,13 @@ getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicSliderUI)
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicSliderUI)
 getThumbSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicSliderUI)
 installDefaults
  (Ljavax/swing/JSlider;)V
  (Ljavax/swing/JSlider;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthSpinnerUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthSpinnerUI.eea
index 5113517dc7..270d2398e9 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthSpinnerUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthSpinnerUI.eea
@@ -2,20 +2,20 @@ class javax/swing/plaf/synth/SynthSpinnerUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createEditor
  ()Ljavax/swing/JComponent;
- ()Ljavax/swing/JComponent;
+ ()L1javax/swing/JComponent; # @Inherited(javax.swing.plaf.basic.BasicSpinnerUI)
 createLayout
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager; # @Inherited(javax.swing.plaf.basic.BasicSpinnerUI)
 createNextButton
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component; # @Inherited(javax.swing.plaf.basic.BasicSpinnerUI)
 createPreviousButton
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component; # @Inherited(javax.swing.plaf.basic.BasicSpinnerUI)
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthSplitPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthSplitPaneUI.eea
index c34a0d292d..da18ccd164 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthSplitPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthSplitPaneUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthSplitPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createDefaultDivider
  ()Ljavax/swing/plaf/basic/BasicSplitPaneDivider;
- ()Ljavax/swing/plaf/basic/BasicSplitPaneDivider;
+ ()L1javax/swing/plaf/basic/BasicSplitPaneDivider; # @Inherited(javax.swing.plaf.basic.BasicSplitPaneUI)
 createDefaultNonContinuousLayoutDivider
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component; # @Inherited(javax.swing.plaf.basic.BasicSplitPaneUI)
 finishedPaintingChildren
  (Ljavax/swing/JSplitPane;Ljava/awt/Graphics;)V
  (Ljavax/swing/JSplitPane;Ljava/awt/Graphics;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthStyle.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthStyle.eea
index e5b5ff029b..70108f11bd 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthStyle.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthStyle.eea
@@ -23,7 +23,7 @@ getGraphicsUtils
  (Ljavax/swing/plaf/synth/SynthContext;)Ljavax/swing/plaf/synth/SynthGraphicsUtils;
 getIcon
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/lang/Object;)Ljavax/swing/Icon;
- (Ljavax/swing/plaf/synth/SynthContext;Ljava/lang/Object;)Ljavax/swing/Icon;
+ (Ljavax/swing/plaf/synth/SynthContext;Ljava/lang/Object;)L0javax/swing/Icon;
 getInsets
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Insets;)Ljava/awt/Insets;
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Insets;)Ljava/awt/Insets;
@@ -32,7 +32,7 @@ getInt
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/lang/Object;I)I
 getPainter
  (Ljavax/swing/plaf/synth/SynthContext;)Ljavax/swing/plaf/synth/SynthPainter;
- (Ljavax/swing/plaf/synth/SynthContext;)Ljavax/swing/plaf/synth/SynthPainter;
+ (Ljavax/swing/plaf/synth/SynthContext;)L0javax/swing/plaf/synth/SynthPainter;
 getString
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTabbedPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTabbedPaneUI.eea
index 5dc54ee22b..eabe6bd64f 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTabbedPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTabbedPaneUI.eea
@@ -2,20 +2,20 @@ class javax/swing/plaf/synth/SynthTabbedPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 calculateTabWidth
  (IILjava/awt/FontMetrics;)I
  (IILjava/awt/FontMetrics;)I
 createLayoutManager
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager; # @Inherited(javax.swing.plaf.basic.BasicTabbedPaneUI)
 createMouseListener
  ()Ljava/awt/event/MouseListener;
- ()Ljava/awt/event/MouseListener;
+ ()L1java/awt/event/MouseListener; # @Inherited(javax.swing.plaf.basic.BasicTabbedPaneUI)
 createScrollButton
  (I)Ljavax/swing/JButton;
- (I)Ljavax/swing/JButton;
+ (I)L1javax/swing/JButton; # @Inherited(javax.swing.plaf.basic.BasicTabbedPaneUI)
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTableHeaderUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTableHeaderUI.eea
index 6840d816c7..5e585d20dd 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTableHeaderUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTableHeaderUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthTableHeaderUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTableUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTableUI.eea
index ca494b36c2..1bb650ca25 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTableUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTableUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthTableUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTextAreaUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTextAreaUI.eea
index d8346d2f40..2460f80cae 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTextAreaUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTextAreaUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthTextAreaUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTextFieldUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTextFieldUI.eea
index 58d46559d2..0e2f00d0be 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTextFieldUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTextFieldUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthTextFieldUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTextPaneUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTextPaneUI.eea
index 8b7beca1fe..57799bc37d 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTextPaneUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTextPaneUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthTextPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicEditorPaneUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthToggleButtonUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthToggleButtonUI.eea
index 99b78f0cba..0257d7026d 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthToggleButtonUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthToggleButtonUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthToggleButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicButtonUI)
 paintBorder
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthToolBarUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthToolBarUI.eea
index 6691c6c46e..06b6831bee 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthToolBarUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthToolBarUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthToolBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createLayout
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthToolTipUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthToolTipUI.eea
index e7810ec558..d219541e31 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthToolTipUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthToolTipUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthToolTipUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicToolTipUI)
 installDefaults
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTreeUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTreeUI.eea
index e87eb4d148..2e8ae95c94 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTreeUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthTreeUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthTreeUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createDefaultCellEditor
  ()Ljavax/swing/tree/TreeCellEditor;
- ()Ljavax/swing/tree/TreeCellEditor;
+ ()L1javax/swing/tree/TreeCellEditor; # @Inherited(javax.swing.plaf.basic.BasicTreeUI)
 createDefaultCellRenderer
  ()Ljavax/swing/tree/TreeCellRenderer;
- ()Ljavax/swing/tree/TreeCellRenderer;
+ ()L1javax/swing/tree/TreeCellRenderer; # @Inherited(javax.swing.plaf.basic.BasicTreeUI)
 drawCentered
  (Ljava/awt/Component;Ljava/awt/Graphics;Ljavax/swing/Icon;II)V
  (Ljava/awt/Component;Ljava/awt/Graphics;Ljavax/swing/Icon;II)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthViewportUI.eea b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthViewportUI.eea
index b0a3eddfb4..2913e58d5d 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthViewportUI.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/plaf/synth/SynthViewportUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthViewportUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/table/AbstractTableModel.eea b/libs/eea-java-17/src/main/resources/javax/swing/table/AbstractTableModel.eea
index 7626800919..89d6a7f2a7 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/table/AbstractTableModel.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/table/AbstractTableModel.eea
@@ -15,10 +15,10 @@ fireTableChanged
  (Ljavax/swing/event/TableModelEvent;)V
 getColumnClass
  (I)Ljava/lang/Class<*>;
- (I)Ljava/lang/Class<*>;
+ (I)L1java/lang/Class<*>;
 getColumnName
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/table/DefaultTableColumnModel.eea b/libs/eea-java-17/src/main/resources/javax/swing/table/DefaultTableColumnModel.eea
index b3c6bc0d56..1f30be1e03 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/table/DefaultTableColumnModel.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/table/DefaultTableColumnModel.eea
@@ -21,7 +21,7 @@ addColumnModelListener
  (L1javax/swing/event/TableColumnModelListener;)V # @Inherited(javax.swing.table.TableColumnModel)
 createSelectionModel
  ()Ljavax/swing/ListSelectionModel;
- ()Ljavax/swing/ListSelectionModel;
+ ()L1javax/swing/ListSelectionModel;
 fireColumnAdded
  (Ljavax/swing/event/TableColumnModelEvent;)V
  (Ljavax/swing/event/TableColumnModelEvent;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/table/DefaultTableModel.eea b/libs/eea-java-17/src/main/resources/javax/swing/table/DefaultTableModel.eea
index 673a511d28..ebf8d1cc4d 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/table/DefaultTableModel.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/table/DefaultTableModel.eea
@@ -43,7 +43,7 @@ addRow
  ([Ljava/lang/Object;)V
 getColumnName
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String; # @Inherited(javax.swing.table.AbstractTableModel)
 getDataVector
  ()Ljava/util/Vector<Ljava/util/Vector;>;
  ()Ljava/util/Vector<Ljava/util/Vector;>;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/table/JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry.eea b/libs/eea-java-17/src/main/resources/javax/swing/table/JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry.eea
index 153db759a4..f28fafa531 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/table/JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/table/JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry.eea
@@ -14,16 +14,16 @@ contains
  (Ljava/awt/Point;)Z
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -38,43 +38,43 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getBounds
  ()Ljava/awt/Rectangle;
  ()Ljava/awt/Rectangle;
 getCursor
  ()Ljava/awt/Cursor;
- ()Ljava/awt/Cursor;
+ ()L0java/awt/Cursor;
 getFont
  ()Ljava/awt/Font;
- ()Ljava/awt/Font;
+ ()L0java/awt/Font;
 getFontMetrics
  (Ljava/awt/Font;)Ljava/awt/FontMetrics;
- (Ljava/awt/Font;)Ljava/awt/FontMetrics;
+ (Ljava/awt/Font;)L0java/awt/FontMetrics;
 getForeground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getLocale
  ()Ljava/util/Locale;
- ()Ljava/util/Locale;
+ ()L0java/util/Locale;
 getLocation
  ()Ljava/awt/Point;
  ()Ljava/awt/Point;
 getLocationOnScreen
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/table/JTableHeader$AccessibleJTableHeader.eea b/libs/eea-java-17/src/main/resources/javax/swing/table/JTableHeader$AccessibleJTableHeader.eea
index 6b83f5f593..39fd58d35d 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/table/JTableHeader$AccessibleJTableHeader.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/table/JTableHeader$AccessibleJTableHeader.eea
@@ -5,10 +5,10 @@ class javax/swing/table/JTableHeader$AccessibleJTableHeader
  (Ljavax/swing/table/JTableHeader;)V
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Container$AccessibleAWTContainer)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/table/JTableHeader.eea b/libs/eea-java-17/src/main/resources/javax/swing/table/JTableHeader.eea
index 00faccaad7..7f835c55c0 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/table/JTableHeader.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/table/JTableHeader.eea
@@ -36,10 +36,10 @@ columnSelectionChanged
  (L1javax/swing/event/ListSelectionEvent;)V # @Inherited(javax.swing.event.TableColumnModelListener)
 createDefaultColumnModel
  ()Ljavax/swing/table/TableColumnModel;
- ()Ljavax/swing/table/TableColumnModel;
+ ()L1javax/swing/table/TableColumnModel;
 createDefaultRenderer
  ()Ljavax/swing/table/TableCellRenderer;
- ()Ljavax/swing/table/TableCellRenderer;
+ ()L1javax/swing/table/TableCellRenderer;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -54,7 +54,7 @@ getDraggedColumn
  ()Ljavax/swing/table/TableColumn;
 getHeaderRect
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L1java/awt/Rectangle;
 getPreferredSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
@@ -72,10 +72,10 @@ getUI
  ()Ljavax/swing/plaf/TableHeaderUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setColumnModel
  (Ljavax/swing/table/TableColumnModel;)V
  (Ljavax/swing/table/TableColumnModel;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/table/TableColumn.eea b/libs/eea-java-17/src/main/resources/javax/swing/table/TableColumn.eea
index d039b4490b..7babb780b0 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/table/TableColumn.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/table/TableColumn.eea
@@ -37,7 +37,7 @@ addPropertyChangeListener
  (L1java/beans/PropertyChangeListener;)V
 createDefaultHeaderRenderer
  ()Ljavax/swing/table/TableCellRenderer;
- ()Ljavax/swing/table/TableCellRenderer;
+ ()L1javax/swing/table/TableCellRenderer;
 getCellEditor
  ()Ljavax/swing/table/TableCellEditor;
  ()Ljavax/swing/table/TableCellEditor;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/table/TableRowSorter.eea b/libs/eea-java-17/src/main/resources/javax/swing/table/TableRowSorter.eea
index d1ba4ed4f9..d54722b725 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/table/TableRowSorter.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/table/TableRowSorter.eea
@@ -11,7 +11,7 @@ super javax/swing/DefaultRowSorter
  (TM;)V
 getComparator
  (I)Ljava/util/Comparator<*>;
- (I)Ljava/util/Comparator<*>;
+ (I)L0java/util/Comparator<*>; # @Inherited(javax.swing.DefaultRowSorter)
 getStringConverter
  ()Ljavax/swing/table/TableStringConverter;
  ()Ljavax/swing/table/TableStringConverter;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/AbstractDocument$AbstractElement.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/AbstractDocument$AbstractElement.eea
index 37267eff50..523a8b7a1f 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/AbstractDocument$AbstractElement.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/AbstractDocument$AbstractElement.eea
@@ -47,7 +47,7 @@ getIndex
  (L1javax/swing/tree/TreeNode;)I # @Inherited(javax.swing.tree.TreeNode)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getParent
  ()Ljavax/swing/tree/TreeNode;
  ()Ljavax/swing/tree/TreeNode;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/AbstractDocument$BranchElement.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/AbstractDocument$BranchElement.eea
index ec0937d6ab..c4ec8a3fd6 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/AbstractDocument$BranchElement.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/AbstractDocument$BranchElement.eea
@@ -5,16 +5,16 @@ class javax/swing/text/AbstractDocument$BranchElement
  (Ljavax/swing/text/AbstractDocument;Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;)V
 children
  ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
- ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
+ ()L0java/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
 getElement
  (I)Ljavax/swing/text/Element;
- (I)Ljavax/swing/text/Element;
+ (I)L0javax/swing/text/Element;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(javax.swing.text.AbstractDocument$AbstractElement)
 positionToElement
  (I)Ljavax/swing/text/Element;
- (I)Ljavax/swing/text/Element;
+ (I)L0javax/swing/text/Element;
 replace
  (II[Ljavax/swing/text/Element;)V
  (II[Ljavax/swing/text/Element;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/AbstractDocument$Content.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/AbstractDocument$Content.eea
index b5ddc678be..295a16e4ff 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/AbstractDocument$Content.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/AbstractDocument$Content.eea
@@ -2,7 +2,7 @@ class javax/swing/text/AbstractDocument$Content
 
 createPosition
  (I)Ljavax/swing/text/Position;
- (I)Ljavax/swing/text/Position;
+ (I)L1javax/swing/text/Position;
 getChars
  (IILjavax/swing/text/Segment;)V
  (IILjavax/swing/text/Segment;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/AbstractDocument$DefaultDocumentEvent.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/AbstractDocument$DefaultDocumentEvent.eea
index ae7af3a842..2452bfa427 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/AbstractDocument$DefaultDocumentEvent.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/AbstractDocument$DefaultDocumentEvent.eea
@@ -8,22 +8,22 @@ addEdit
  (Ljavax/swing/undo/UndoableEdit;)Z
 getChange
  (Ljavax/swing/text/Element;)Ljavax/swing/event/DocumentEvent$ElementChange;
- (Ljavax/swing/text/Element;)Ljavax/swing/event/DocumentEvent$ElementChange;
+ (Ljavax/swing/text/Element;)L0javax/swing/event/DocumentEvent$ElementChange;
 getDocument
  ()Ljavax/swing/text/Document;
  ()Ljavax/swing/text/Document;
 getPresentationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.undo.CompoundEdit)
 getRedoPresentationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getType
  ()Ljavax/swing/event/DocumentEvent$EventType;
  ()Ljavax/swing/event/DocumentEvent$EventType;
 getUndoPresentationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(javax.swing.undo.CompoundEdit)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/AbstractDocument$LeafElement.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/AbstractDocument$LeafElement.eea
index 9631e11111..dbee07aebd 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/AbstractDocument$LeafElement.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/AbstractDocument$LeafElement.eea
@@ -5,13 +5,13 @@ class javax/swing/text/AbstractDocument$LeafElement
  (Ljavax/swing/text/AbstractDocument;Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;II)V
 children
  ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
- ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
+ ()L0java/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
 getElement
  (I)Ljavax/swing/text/Element;
- (I)Ljavax/swing/text/Element;
+ (I)L0javax/swing/text/Element;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(javax.swing.text.AbstractDocument$AbstractElement)
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/AbstractDocument.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/AbstractDocument.eea
index 762afba625..405a91a58e 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/AbstractDocument.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/AbstractDocument.eea
@@ -37,13 +37,13 @@ addUndoableEditListener
  (L1javax/swing/event/UndoableEditListener;)V # @Inherited(javax.swing.text.Document)
 createBranchElement
  (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/Element;
- (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/Element;
+ (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;)L1javax/swing/text/Element;
 createLeafElement
  (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;II)Ljavax/swing/text/Element;
- (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;II)Ljavax/swing/text/Element;
+ (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;II)L1javax/swing/text/Element;
 createPosition
  (I)Ljavax/swing/text/Position;
- (I)Ljavax/swing/text/Position;
+ (I)L1javax/swing/text/Position; # @Inherited(javax.swing.text.Document)
 dump
  (Ljava/io/PrintStream;)V
  (Ljava/io/PrintStream;)V
@@ -85,7 +85,7 @@ getDocumentProperties
  ()Ljava/util/Dictionary<Ljava/lang/Object;Ljava/lang/Object;>;
 getEndPosition
  ()Ljavax/swing/text/Position;
- ()Ljavax/swing/text/Position;
+ ()L0javax/swing/text/Position;
 getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
@@ -97,10 +97,10 @@ getProperty
  (Ljava/lang/Object;)Ljava/lang/Object;
 getRootElements
  ()[Ljavax/swing/text/Element;
- ()[Ljavax/swing/text/Element;
+ ()[1Ljavax/swing/text/Element;
 getStartPosition
  ()Ljavax/swing/text/Position;
- ()Ljavax/swing/text/Position;
+ ()L0javax/swing/text/Position;
 getText
  (II)Ljava/lang/String;
  (II)Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/AsyncBoxView.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/AsyncBoxView.eea
index 4ddfdf83b7..d1074e83ab 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/AsyncBoxView.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/AsyncBoxView.eea
@@ -9,10 +9,10 @@ locator
  (Ljavax/swing/text/Element;I)V
 createChildState
  (Ljavax/swing/text/View;)Ljavax/swing/text/AsyncBoxView$ChildState;
- (Ljavax/swing/text/View;)Ljavax/swing/text/AsyncBoxView$ChildState;
+ (Ljavax/swing/text/View;)L1javax/swing/text/AsyncBoxView$ChildState;
 getChildAllocation
  (ILjava/awt/Shape;)Ljava/awt/Shape;
- (ILjava/awt/Shape;)Ljava/awt/Shape;
+ (ILjava/awt/Shape;)L0java/awt/Shape; # @Inherited(javax.swing.text.View)
 getChildState
  (I)Ljavax/swing/text/AsyncBoxView$ChildState;
  (I)Ljavax/swing/text/AsyncBoxView$ChildState;
@@ -24,7 +24,7 @@ getNextVisualPositionFrom
  (ILjavax/swing/text/Position$Bias;Ljava/awt/Shape;I[Ljavax/swing/text/Position$Bias;)I
 getView
  (I)Ljavax/swing/text/View;
- (I)Ljavax/swing/text/View;
+ (I)L0javax/swing/text/View; # @Inherited(javax.swing.text.View)
 getViewIndex
  (ILjavax/swing/text/Position$Bias;)I
  (ILjavax/swing/text/Position$Bias;)I
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/BoxView.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/BoxView.eea
index ca85158431..d839cb27b2 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/BoxView.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/BoxView.eea
@@ -8,13 +8,13 @@ baselineLayout
  (II[I[I)V
 baselineRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements;
 calculateMajorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements;
 calculateMinorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements;
 childAllocation
  (ILjava/awt/Rectangle;)V
  (ILjava/awt/Rectangle;)V
@@ -26,7 +26,7 @@ forwardUpdate
  (Ljavax/swing/event/DocumentEvent$ElementChange;Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
 getChildAllocation
  (ILjava/awt/Shape;)Ljava/awt/Shape;
- (ILjava/awt/Shape;)Ljava/awt/Shape;
+ (ILjava/awt/Shape;)L0java/awt/Shape; # @Inherited(javax.swing.text.CompositeView)
 getViewAtPoint
  (IILjava/awt/Rectangle;)Ljavax/swing/text/View;
  (IILjava/awt/Rectangle;)Ljavax/swing/text/View;
@@ -44,7 +44,7 @@ layoutMinorAxis
  (II[I[I)V
 modelToView
  (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)Ljava/awt/Shape;
- (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)Ljava/awt/Shape;
+ (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)L0java/awt/Shape; # @Inherited(javax.swing.text.CompositeView)
 paint
  (Ljava/awt/Graphics;Ljava/awt/Shape;)V
  (Ljava/awt/Graphics;Ljava/awt/Shape;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/ComponentView.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/ComponentView.eea
index b3be9e825d..985ffeab27 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/ComponentView.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/ComponentView.eea
@@ -5,7 +5,7 @@ class javax/swing/text/ComponentView
  (Ljavax/swing/text/Element;)V
 createComponent
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component;
 getComponent
  ()Ljava/awt/Component;
  ()Ljava/awt/Component;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/CompositeView.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/CompositeView.eea
index 9dcae1f9ff..923c986b58 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/CompositeView.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/CompositeView.eea
@@ -11,10 +11,10 @@ flipEastAndWestAtEnds
  (ILjavax/swing/text/Position$Bias;)Z
 getChildAllocation
  (ILjava/awt/Shape;)Ljava/awt/Shape;
- (ILjava/awt/Shape;)Ljava/awt/Shape;
+ (ILjava/awt/Shape;)L0java/awt/Shape; # @Inherited(javax.swing.text.View)
 getInsideAllocation
  (Ljava/awt/Shape;)Ljava/awt/Rectangle;
- (Ljava/awt/Shape;)Ljava/awt/Rectangle;
+ (Ljava/awt/Shape;)L0java/awt/Rectangle;
 getNextEastWestVisualPositionFrom
  (ILjavax/swing/text/Position$Bias;Ljava/awt/Shape;I[Ljavax/swing/text/Position$Bias;)I
  (ILjavax/swing/text/Position$Bias;Ljava/awt/Shape;I[Ljavax/swing/text/Position$Bias;)I
@@ -26,13 +26,13 @@ getNextVisualPositionFrom
  (ILjavax/swing/text/Position$Bias;Ljava/awt/Shape;I[Ljavax/swing/text/Position$Bias;)I
 getView
  (I)Ljavax/swing/text/View;
- (I)Ljavax/swing/text/View;
+ (I)L0javax/swing/text/View; # @Inherited(javax.swing.text.View)
 getViewAtPoint
  (IILjava/awt/Rectangle;)Ljavax/swing/text/View;
  (IILjava/awt/Rectangle;)Ljavax/swing/text/View;
 getViewAtPosition
  (ILjava/awt/Rectangle;)Ljavax/swing/text/View;
- (ILjava/awt/Rectangle;)Ljavax/swing/text/View;
+ (ILjava/awt/Rectangle;)L0javax/swing/text/View;
 getViewIndex
  (ILjavax/swing/text/Position$Bias;)I
  (ILjavax/swing/text/Position$Bias;)I
@@ -47,7 +47,7 @@ loadChildren
  (Ljavax/swing/text/ViewFactory;)V
 modelToView
  (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)Ljava/awt/Shape;
- (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)Ljava/awt/Shape;
+ (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)L0java/awt/Shape;
 modelToView
  (ILjavax/swing/text/Position$Bias;ILjavax/swing/text/Position$Bias;Ljava/awt/Shape;)Ljava/awt/Shape;
  (ILjavax/swing/text/Position$Bias;ILjavax/swing/text/Position$Bias;Ljava/awt/Shape;)Ljava/awt/Shape;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/DefaultEditorKit.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/DefaultEditorKit.eea
index d6c4100456..eb0a06e3cd 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/DefaultEditorKit.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/DefaultEditorKit.eea
@@ -150,19 +150,19 @@ writableAction
 
 createCaret
  ()Ljavax/swing/text/Caret;
- ()Ljavax/swing/text/Caret;
+ ()L0javax/swing/text/Caret; # @Overrides(javax.swing.text.EditorKit)
 createDefaultDocument
  ()Ljavax/swing/text/Document;
- ()Ljavax/swing/text/Document;
+ ()L1javax/swing/text/Document; # @Inherited(javax.swing.text.EditorKit)
 getActions
  ()[Ljavax/swing/Action;
  ()[Ljavax/swing/Action;
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getViewFactory
  ()Ljavax/swing/text/ViewFactory;
- ()Ljavax/swing/text/ViewFactory;
+ ()L0javax/swing/text/ViewFactory;
 read
  (Ljava/io/InputStream;Ljavax/swing/text/Document;I)V
  (Ljava/io/InputStream;Ljavax/swing/text/Document;I)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/DefaultFormatter.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/DefaultFormatter.eea
index c1b3df5551..a04ae24151 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/DefaultFormatter.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/DefaultFormatter.eea
@@ -5,10 +5,10 @@ clone
  ()L1java/lang/Object; # @Inherited(javax.swing.JFormattedTextField$AbstractFormatter)
 getDocumentFilter
  ()Ljavax/swing/text/DocumentFilter;
- ()Ljavax/swing/text/DocumentFilter;
+ ()L0javax/swing/text/DocumentFilter; # @Inherited(javax.swing.JFormattedTextField$AbstractFormatter)
 getNavigationFilter
  ()Ljavax/swing/text/NavigationFilter;
- ()Ljavax/swing/text/NavigationFilter;
+ ()L0javax/swing/text/NavigationFilter; # @Inherited(javax.swing.JFormattedTextField$AbstractFormatter)
 getValueClass
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
@@ -23,4 +23,4 @@ stringToValue
  (Ljava/lang/String;)Ljava/lang/Object;
 valueToString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/DefaultHighlighter$DefaultHighlightPainter.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/DefaultHighlighter$DefaultHighlightPainter.eea
index 7d9849c288..b21f54f8bc 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/DefaultHighlighter$DefaultHighlightPainter.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/DefaultHighlighter$DefaultHighlightPainter.eea
@@ -11,4 +11,4 @@ paint
  (Ljava/awt/Graphics;IILjava/awt/Shape;Ljavax/swing/text/JTextComponent;)V
 paintLayer
  (Ljava/awt/Graphics;IILjava/awt/Shape;Ljavax/swing/text/JTextComponent;Ljavax/swing/text/View;)Ljava/awt/Shape;
- (Ljava/awt/Graphics;IILjava/awt/Shape;Ljavax/swing/text/JTextComponent;Ljavax/swing/text/View;)Ljava/awt/Shape;
+ (Ljava/awt/Graphics;IILjava/awt/Shape;Ljavax/swing/text/JTextComponent;Ljavax/swing/text/View;)L0java/awt/Shape;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/DefaultHighlighter.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/DefaultHighlighter.eea
index fb9630e22e..5bb51d87f5 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/DefaultHighlighter.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/DefaultHighlighter.eea
@@ -6,7 +6,7 @@ DefaultPainter
 
 addHighlight
  (IILjavax/swing/text/Highlighter$HighlightPainter;)Ljava/lang/Object;
- (IILjavax/swing/text/Highlighter$HighlightPainter;)Ljava/lang/Object;
+ (IILjavax/swing/text/Highlighter$HighlightPainter;)L1java/lang/Object;
 changeHighlight
  (Ljava/lang/Object;II)V
  (Ljava/lang/Object;II)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/DefaultStyledDocument$SectionElement.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/DefaultStyledDocument$SectionElement.eea
index 6e13a61691..75f90ae78b 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/DefaultStyledDocument$SectionElement.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/DefaultStyledDocument$SectionElement.eea
@@ -5,4 +5,4 @@ class javax/swing/text/DefaultStyledDocument$SectionElement
  (Ljavax/swing/text/DefaultStyledDocument;)V
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.text.AbstractDocument$BranchElement)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/DefaultStyledDocument.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/DefaultStyledDocument.eea
index 540216bd5d..375d2f54f7 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/DefaultStyledDocument.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/DefaultStyledDocument.eea
@@ -21,7 +21,7 @@ create
  ([Ljavax/swing/text/DefaultStyledDocument$ElementSpec;)V
 createDefaultRoot
  ()Ljavax/swing/text/AbstractDocument$AbstractElement;
- ()Ljavax/swing/text/AbstractDocument$AbstractElement;
+ ()L1javax/swing/text/AbstractDocument$AbstractElement;
 getBackground
  (Ljavax/swing/text/AttributeSet;)Ljava/awt/Color;
  (Ljavax/swing/text/AttributeSet;)Ljava/awt/Color;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/Document.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/Document.eea
index c42dc008cb..312def38e9 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/Document.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/Document.eea
@@ -15,7 +15,7 @@ addUndoableEditListener
  (L1javax/swing/event/UndoableEditListener;)V
 createPosition
  (I)Ljavax/swing/text/Position;
- (I)Ljavax/swing/text/Position;
+ (I)L1javax/swing/text/Position;
 getDefaultRootElement
  ()Ljavax/swing/text/Element;
  ()Ljavax/swing/text/Element;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/EditorKit.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/EditorKit.eea
index c5e44fb446..bc252fdfb7 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/EditorKit.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/EditorKit.eea
@@ -5,10 +5,10 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 createCaret
  ()Ljavax/swing/text/Caret;
- ()Ljavax/swing/text/Caret;
+ ()L1javax/swing/text/Caret;
 createDefaultDocument
  ()Ljavax/swing/text/Document;
- ()Ljavax/swing/text/Document;
+ ()L1javax/swing/text/Document;
 deinstall
  (Ljavax/swing/JEditorPane;)V
  (Ljavax/swing/JEditorPane;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/ElementIterator.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/ElementIterator.eea
index fd767a3e97..7dba1bc245 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/ElementIterator.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/ElementIterator.eea
@@ -11,13 +11,13 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 current
  ()Ljavax/swing/text/Element;
- ()Ljavax/swing/text/Element;
+ ()L0javax/swing/text/Element;
 first
  ()Ljavax/swing/text/Element;
- ()Ljavax/swing/text/Element;
+ ()L0javax/swing/text/Element;
 next
  ()Ljavax/swing/text/Element;
- ()Ljavax/swing/text/Element;
+ ()L0javax/swing/text/Element;
 previous
  ()Ljavax/swing/text/Element;
- ()Ljavax/swing/text/Element;
+ ()L0javax/swing/text/Element;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/FieldView.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/FieldView.eea
index 7652db99ea..2e2ecae5a9 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/FieldView.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/FieldView.eea
@@ -5,7 +5,7 @@ class javax/swing/text/FieldView
  (Ljavax/swing/text/Element;)V
 adjustAllocation
  (Ljava/awt/Shape;)Ljava/awt/Shape;
- (Ljava/awt/Shape;)Ljava/awt/Shape;
+ (Ljava/awt/Shape;)L0java/awt/Shape;
 getFontMetrics
  ()Ljava/awt/FontMetrics;
  ()Ljava/awt/FontMetrics;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/FlowView$FlowStrategy.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/FlowView$FlowStrategy.eea
index 4802aa146c..0304477407 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/FlowView$FlowStrategy.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/FlowView$FlowStrategy.eea
@@ -8,7 +8,7 @@ changedUpdate
  (Ljavax/swing/text/FlowView;Ljavax/swing/event/DocumentEvent;Ljava/awt/Rectangle;)V
 createView
  (Ljavax/swing/text/FlowView;III)Ljavax/swing/text/View;
- (Ljavax/swing/text/FlowView;III)Ljavax/swing/text/View;
+ (Ljavax/swing/text/FlowView;III)L1javax/swing/text/View;
 getLogicalView
  (Ljavax/swing/text/FlowView;)Ljavax/swing/text/View;
  (Ljavax/swing/text/FlowView;)Ljavax/swing/text/View;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/FlowView.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/FlowView.eea
index fd35fc0a2f..22eff76e4f 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/FlowView.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/FlowView.eea
@@ -12,13 +12,13 @@ strategy
  (Ljavax/swing/text/Element;I)V
 calculateMinorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.BoxView)
 changedUpdate
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
 createRow
  ()Ljavax/swing/text/View;
- ()Ljavax/swing/text/View;
+ ()L1javax/swing/text/View;
 insertUpdate
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/GapContent.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/GapContent.eea
index 6d52002ddf..329824007c 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/GapContent.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/GapContent.eea
@@ -2,10 +2,10 @@ class javax/swing/text/GapContent
 
 allocateArray
  (I)Ljava/lang/Object;
- (I)Ljava/lang/Object;
+ (I)L1java/lang/Object;
 createPosition
  (I)Ljavax/swing/text/Position;
- (I)Ljavax/swing/text/Position;
+ (I)L1javax/swing/text/Position; # @Inherited(javax.swing.text.AbstractDocument$Content)
 getChars
  (IILjavax/swing/text/Segment;)V
  (IILjavax/swing/text/Segment;)V
@@ -17,10 +17,10 @@ getString
  (II)Ljava/lang/String;
 insertString
  (ILjava/lang/String;)Ljavax/swing/undo/UndoableEdit;
- (ILjava/lang/String;)Ljavax/swing/undo/UndoableEdit;
+ (ILjava/lang/String;)L1javax/swing/undo/UndoableEdit;
 remove
  (II)Ljavax/swing/undo/UndoableEdit;
- (II)Ljavax/swing/undo/UndoableEdit;
+ (II)L1javax/swing/undo/UndoableEdit;
 updateUndoPositions
  (Ljava/util/Vector;II)V
  (Ljava/util/Vector;II)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/GlyphView.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/GlyphView.eea
index 0dda4565fe..32c6b8806b 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/GlyphView.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/GlyphView.eea
@@ -14,16 +14,16 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 createFragment
  (II)Ljavax/swing/text/View;
- (II)Ljavax/swing/text/View;
+ (II)L1javax/swing/text/View; # @Inherited(javax.swing.text.View)
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getFont
  ()Ljava/awt/Font;
- ()Ljava/awt/Font;
+ ()L0java/awt/Font;
 getForeground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getGlyphPainter
  ()Ljavax/swing/text/GlyphView$GlyphPainter;
  ()Ljavax/swing/text/GlyphView$GlyphPainter;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/InternationalFormatter.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/InternationalFormatter.eea
index 191d8d4672..7e56644bd6 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/InternationalFormatter.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/InternationalFormatter.eea
@@ -8,7 +8,7 @@ clone
  ()L1java/lang/Object; # @Inherited(javax.swing.text.DefaultFormatter)
 getActions
  ()[Ljavax/swing/Action;
- ()[Ljavax/swing/Action;
+ ()[0Ljavax/swing/Action; # @Inherited(javax.swing.JFormattedTextField$AbstractFormatter)
 getFields
  (I)[Ljava/text/Format$Field;
  (I)[Ljava/text/Format$Field;
@@ -38,4 +38,4 @@ stringToValue
  (Ljava/lang/String;)Ljava/lang/Object;
 valueToString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(javax.swing.text.DefaultFormatter)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/JTextComponent$AccessibleJTextComponent.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/JTextComponent$AccessibleJTextComponent.eea
index 0c70690fb0..c9ae3526d1 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/JTextComponent$AccessibleJTextComponent.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/JTextComponent$AccessibleJTextComponent.eea
@@ -11,13 +11,13 @@ changedUpdate
  (L1javax/swing/event/DocumentEvent;)V # @Inherited(javax.swing.event.DocumentListener)
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleEditableText
  ()Ljavax/accessibility/AccessibleEditableText;
- ()Ljavax/accessibility/AccessibleEditableText;
+ ()L0javax/accessibility/AccessibleEditableText; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
@@ -26,7 +26,7 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAfterIndex
  (II)Ljava/lang/String;
  (II)Ljava/lang/String;
@@ -41,7 +41,7 @@ getCharacterAttribute
  (I)Ljavax/swing/text/AttributeSet;
 getCharacterBounds
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L0java/awt/Rectangle;
 getIndexAtPoint
  (Ljava/awt/Point;)I
  (Ljava/awt/Point;)I
@@ -50,7 +50,7 @@ getSelectedText
  ()Ljava/lang/String;
 getTextBounds
  (II)Ljava/awt/Rectangle;
- (II)Ljava/awt/Rectangle;
+ (II)L0java/awt/Rectangle;
 getTextRange
  (II)Ljava/lang/String;
  (II)Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/JTextComponent.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/JTextComponent.eea
index 01f5a50d28..1af33dc600 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/JTextComponent.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/JTextComponent.eea
@@ -9,7 +9,7 @@ FOCUS_ACCELERATOR_KEY
 
 addKeymap
  (Ljava/lang/String;Ljavax/swing/text/Keymap;)Ljavax/swing/text/Keymap;
- (Ljava/lang/String;Ljavax/swing/text/Keymap;)Ljavax/swing/text/Keymap;
+ (Ljava/lang/String;Ljavax/swing/text/Keymap;)L1javax/swing/text/Keymap;
 getKeymap
  (Ljava/lang/String;)Ljavax/swing/text/Keymap;
  (Ljava/lang/String;)Ljavax/swing/text/Keymap;
@@ -61,7 +61,7 @@ getHighlighter
  ()Ljavax/swing/text/Highlighter;
 getInputMethodRequests
  ()Ljava/awt/im/InputMethodRequests;
- ()Ljava/awt/im/InputMethodRequests;
+ ()L0java/awt/im/InputMethodRequests; # @Inherited(java.awt.Component)
 getKeymap
  ()Ljavax/swing/text/Keymap;
  ()Ljavax/swing/text/Keymap;
@@ -94,7 +94,7 @@ getSelectionColor
  ()Ljava/awt/Color;
 getText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getText
  (II)Ljava/lang/String;
  (II)Ljava/lang/String;
@@ -112,7 +112,7 @@ modelToView2D
  (I)Ljava/awt/geom/Rectangle2D;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 print
  (Ljava/text/MessageFormat;Ljava/text/MessageFormat;)Z
  (Ljava/text/MessageFormat;Ljava/text/MessageFormat;)Z
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/LabelView.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/LabelView.eea
index d717bb4410..306b2a6e94 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/LabelView.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/LabelView.eea
@@ -8,16 +8,16 @@ changedUpdate
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color; # @Inherited(javax.swing.text.GlyphView)
 getFont
  ()Ljava/awt/Font;
- ()Ljava/awt/Font;
+ ()L0java/awt/Font; # @Inherited(javax.swing.text.GlyphView)
 getFontMetrics
  ()Ljava/awt/FontMetrics;
  ()Ljava/awt/FontMetrics;
 getForeground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color; # @Inherited(javax.swing.text.GlyphView)
 setBackground
  (Ljava/awt/Color;)V
  (Ljava/awt/Color;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/LayoutQueue.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/LayoutQueue.eea
index 756cbc7e72..cf430ad96e 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/LayoutQueue.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/LayoutQueue.eea
@@ -12,4 +12,4 @@ addTask
  (Ljava/lang/Runnable;)V
 waitForWork
  ()Ljava/lang/Runnable;
- ()Ljava/lang/Runnable;
+ ()L0java/lang/Runnable;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/MaskFormatter.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/MaskFormatter.eea
index ce7cb146ad..a16f4643c1 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/MaskFormatter.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/MaskFormatter.eea
@@ -35,4 +35,4 @@ stringToValue
  (Ljava/lang/String;)Ljava/lang/Object;
 valueToString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(javax.swing.text.DefaultFormatter)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/ParagraphView.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/ParagraphView.eea
index 8a53f00df9..907ecdb299 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/ParagraphView.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/ParagraphView.eea
@@ -8,13 +8,13 @@ breakView
  (IFLjava/awt/Shape;)Ljavax/swing/text/View;
 calculateMinorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.FlowView)
 changedUpdate
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
 createRow
  ()Ljavax/swing/text/View;
- ()Ljavax/swing/text/View;
+ ()L1javax/swing/text/View; # @Inherited(javax.swing.text.FlowView)
 findOffsetToCharactersInString
  ([CI)I
  ([CI)I
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/PasswordView.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/PasswordView.eea
index d5f21bf789..830c7f5b43 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/PasswordView.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/PasswordView.eea
@@ -23,7 +23,7 @@ drawUnselectedText
  (Ljava/awt/Graphics;IIII)I
 modelToView
  (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)Ljava/awt/Shape;
- (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)Ljava/awt/Shape;
+ (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)L0java/awt/Shape;
 viewToModel
  (FFLjava/awt/Shape;[Ljavax/swing/text/Position$Bias;)I
  (FFLjava/awt/Shape;[Ljavax/swing/text/Position$Bias;)I
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/PlainDocument.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/PlainDocument.eea
index 5361c59181..13dc85433e 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/PlainDocument.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/PlainDocument.eea
@@ -12,7 +12,7 @@ tabSizeAttribute
  (Ljavax/swing/text/AbstractDocument$Content;)V
 createDefaultRoot
  ()Ljavax/swing/text/AbstractDocument$AbstractElement;
- ()Ljavax/swing/text/AbstractDocument$AbstractElement;
+ ()L1javax/swing/text/AbstractDocument$AbstractElement;
 getDefaultRootElement
  ()Ljavax/swing/text/Element;
  ()Ljavax/swing/text/Element;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/StringContent.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/StringContent.eea
index 0752f9a92f..7edbe4975e 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/StringContent.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/StringContent.eea
@@ -2,7 +2,7 @@ class javax/swing/text/StringContent
 
 createPosition
  (I)Ljavax/swing/text/Position;
- (I)Ljavax/swing/text/Position;
+ (I)L1javax/swing/text/Position; # @Inherited(javax.swing.text.AbstractDocument$Content)
 getChars
  (IILjavax/swing/text/Segment;)V
  (IILjavax/swing/text/Segment;)V
@@ -11,13 +11,13 @@ getPositionsInRange
  (Ljava/util/Vector;II)Ljava/util/Vector;
 getString
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L1java/lang/String;
 insertString
  (ILjava/lang/String;)Ljavax/swing/undo/UndoableEdit;
- (ILjava/lang/String;)Ljavax/swing/undo/UndoableEdit;
+ (ILjava/lang/String;)L1javax/swing/undo/UndoableEdit;
 remove
  (II)Ljavax/swing/undo/UndoableEdit;
- (II)Ljavax/swing/undo/UndoableEdit;
+ (II)L1javax/swing/undo/UndoableEdit;
 updateUndoPositions
  (Ljava/util/Vector;)V
  (Ljava/util/Vector;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/StyleConstants.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/StyleConstants.eea
index a09325940c..8b8527f543 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/StyleConstants.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/StyleConstants.eea
@@ -108,7 +108,7 @@ getFirstLineIndent
  (Ljavax/swing/text/AttributeSet;)F
 getFontFamily
  (Ljavax/swing/text/AttributeSet;)Ljava/lang/String;
- (Ljavax/swing/text/AttributeSet;)Ljava/lang/String;
+ (Ljavax/swing/text/AttributeSet;)L1java/lang/String;
 getFontSize
  (Ljavax/swing/text/AttributeSet;)I
  (Ljavax/swing/text/AttributeSet;)I
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/StyleContext$NamedStyle.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/StyleContext$NamedStyle.eea
index aab00b1304..34571e1337 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/StyleContext$NamedStyle.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/StyleContext$NamedStyle.eea
@@ -33,7 +33,7 @@ containsAttributes
  (Ljavax/swing/text/AttributeSet;)Z
 copyAttributes
  ()Ljavax/swing/text/AttributeSet;
- ()Ljavax/swing/text/AttributeSet;
+ ()L1javax/swing/text/AttributeSet;
 getAttribute
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
@@ -48,7 +48,7 @@ getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getResolveParent
  ()Ljavax/swing/text/AttributeSet;
  ()Ljavax/swing/text/AttributeSet;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/StyleContext.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/StyleContext.eea
index 948b3ea0a8..b29875ad05 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/StyleContext.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/StyleContext.eea
@@ -12,7 +12,7 @@ getStaticAttribute
  (Ljava/lang/Object;)Ljava/lang/Object;
 getStaticAttributeKey
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object;
 readAttributeSet
  (Ljava/io/ObjectInputStream;Ljavax/swing/text/MutableAttributeSet;)V
  (Ljava/io/ObjectInputStream;Ljavax/swing/text/MutableAttributeSet;)V
@@ -34,13 +34,13 @@ addChangeListener
  (L1javax/swing/event/ChangeListener;)V
 addStyle
  (Ljava/lang/String;Ljavax/swing/text/Style;)Ljavax/swing/text/Style;
- (Ljava/lang/String;Ljavax/swing/text/Style;)Ljavax/swing/text/Style;
+ (Ljava/lang/String;Ljavax/swing/text/Style;)L1javax/swing/text/Style;
 createLargeAttributeSet
  (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/MutableAttributeSet;
- (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/MutableAttributeSet;
+ (Ljavax/swing/text/AttributeSet;)L1javax/swing/text/MutableAttributeSet;
 createSmallAttributeSet
  (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/StyleContext$SmallAttributeSet;
- (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/StyleContext$SmallAttributeSet;
+ (Ljavax/swing/text/AttributeSet;)L1javax/swing/text/StyleContext$SmallAttributeSet;
 getBackground
  (Ljavax/swing/text/AttributeSet;)Ljava/awt/Color;
  (Ljavax/swing/text/AttributeSet;)Ljava/awt/Color;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/StyledEditorKit$StyledTextAction.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/StyledEditorKit$StyledTextAction.eea
index 9962de143e..864d5776b3 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/StyledEditorKit$StyledTextAction.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/StyledEditorKit$StyledTextAction.eea
@@ -5,7 +5,7 @@ class javax/swing/text/StyledEditorKit$StyledTextAction
  (Ljava/lang/String;)V
 getEditor
  (Ljava/awt/event/ActionEvent;)Ljavax/swing/JEditorPane;
- (Ljava/awt/event/ActionEvent;)Ljavax/swing/JEditorPane;
+ (Ljava/awt/event/ActionEvent;)L0javax/swing/JEditorPane;
 getStyledDocument
  (Ljavax/swing/JEditorPane;)Ljavax/swing/text/StyledDocument;
  (Ljavax/swing/JEditorPane;)Ljavax/swing/text/StyledDocument;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/StyledEditorKit.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/StyledEditorKit.eea
index 73be9f8967..f4bdd9f41a 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/StyledEditorKit.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/StyledEditorKit.eea
@@ -5,7 +5,7 @@ clone
  ()L1java/lang/Object; # @Inherited(javax.swing.text.EditorKit)
 createDefaultDocument
  ()Ljavax/swing/text/Document;
- ()Ljavax/swing/text/Document;
+ ()L1javax/swing/text/Document; # @Inherited(javax.swing.text.DefaultEditorKit)
 createInputAttributes
  (Ljavax/swing/text/Element;Ljavax/swing/text/MutableAttributeSet;)V
  (Ljavax/swing/text/Element;Ljavax/swing/text/MutableAttributeSet;)V
@@ -23,7 +23,7 @@ getInputAttributes
  ()Ljavax/swing/text/MutableAttributeSet;
 getViewFactory
  ()Ljavax/swing/text/ViewFactory;
- ()Ljavax/swing/text/ViewFactory;
+ ()L0javax/swing/text/ViewFactory; # @Inherited(javax.swing.text.DefaultEditorKit)
 install
  (Ljavax/swing/JEditorPane;)V
  (Ljavax/swing/JEditorPane;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/TableView$TableRow.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/TableView$TableRow.eea
index 89206865f2..31bc1801da 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/TableView$TableRow.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/TableView$TableRow.eea
@@ -5,10 +5,10 @@ class javax/swing/text/TableView$TableRow
  (Ljavax/swing/text/TableView;Ljavax/swing/text/Element;)V
 calculateMajorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.BoxView)
 getViewAtPosition
  (ILjava/awt/Rectangle;)Ljavax/swing/text/View;
- (ILjava/awt/Rectangle;)Ljavax/swing/text/View;
+ (ILjava/awt/Rectangle;)L0javax/swing/text/View; # @Inherited(javax.swing.text.CompositeView)
 layoutMajorAxis
  (II[I[I)V
  (II[I[I)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/TableView.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/TableView.eea
index a00db35d7d..53894df1cf 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/TableView.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/TableView.eea
@@ -5,19 +5,19 @@ class javax/swing/text/TableView
  (Ljavax/swing/text/Element;)V
 calculateMinorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.BoxView)
 createTableCell
  (Ljavax/swing/text/Element;)Ljavax/swing/text/TableView$TableCell;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/TableView$TableCell;
+ (Ljavax/swing/text/Element;)L1javax/swing/text/TableView$TableCell;
 createTableRow
  (Ljavax/swing/text/Element;)Ljavax/swing/text/TableView$TableRow;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/TableView$TableRow;
+ (Ljavax/swing/text/Element;)L1javax/swing/text/TableView$TableRow;
 forwardUpdate
  (Ljavax/swing/event/DocumentEvent$ElementChange;Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
  (Ljavax/swing/event/DocumentEvent$ElementChange;Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
 getViewAtPosition
  (ILjava/awt/Rectangle;)Ljavax/swing/text/View;
- (ILjava/awt/Rectangle;)Ljavax/swing/text/View;
+ (ILjava/awt/Rectangle;)L0javax/swing/text/View; # @Inherited(javax.swing.text.CompositeView)
 layoutColumns
  (I[I[I[Ljavax/swing/SizeRequirements;)V
  (I[I[I[Ljavax/swing/SizeRequirements;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/TextAction.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/TextAction.eea
index 42d8f3512e..6f4335d297 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/TextAction.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/TextAction.eea
@@ -2,7 +2,7 @@ class javax/swing/text/TextAction
 
 augmentList
  ([Ljavax/swing/Action;[Ljavax/swing/Action;)[Ljavax/swing/Action;
- ([Ljavax/swing/Action;[Ljavax/swing/Action;)[Ljavax/swing/Action;
+ ([Ljavax/swing/Action;[Ljavax/swing/Action;)[1Ljavax/swing/Action;
 
 <init>
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/Utilities.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/Utilities.eea
index 407ada25b3..57e413f5d4 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/Utilities.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/Utilities.eea
@@ -17,7 +17,7 @@ getNextWord
  (Ljavax/swing/text/JTextComponent;I)I
 getParagraphElement
  (Ljavax/swing/text/JTextComponent;I)Ljavax/swing/text/Element;
- (Ljavax/swing/text/JTextComponent;I)Ljavax/swing/text/Element;
+ (Ljavax/swing/text/JTextComponent;I)L0javax/swing/text/Element;
 getPositionAbove
  (Ljavax/swing/text/JTextComponent;IF)I
  (Ljavax/swing/text/JTextComponent;IF)I
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/View.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/View.eea
index 7c70fcdee3..d11440bd38 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/View.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/View.eea
@@ -14,7 +14,7 @@ changedUpdate
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
 createFragment
  (II)Ljavax/swing/text/View;
- (II)Ljavax/swing/text/View;
+ (II)L1javax/swing/text/View;
 forwardUpdate
  (Ljavax/swing/event/DocumentEvent$ElementChange;Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
  (Ljavax/swing/event/DocumentEvent$ElementChange;Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
@@ -26,10 +26,10 @@ getAttributes
  ()Ljavax/swing/text/AttributeSet;
 getChildAllocation
  (ILjava/awt/Shape;)Ljava/awt/Shape;
- (ILjava/awt/Shape;)Ljava/awt/Shape;
+ (ILjava/awt/Shape;)L0java/awt/Shape;
 getContainer
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L0java/awt/Container;
 getDocument
  ()Ljavax/swing/text/Document;
  ()Ljavax/swing/text/Document;
@@ -47,13 +47,13 @@ getParent
  ()Ljavax/swing/text/View;
 getToolTipText
  (FFLjava/awt/Shape;)Ljava/lang/String;
- (FFLjava/awt/Shape;)Ljava/lang/String;
+ (FFLjava/awt/Shape;)L0java/lang/String;
 getView
  (I)Ljavax/swing/text/View;
- (I)Ljavax/swing/text/View;
+ (I)L0javax/swing/text/View;
 getViewFactory
  ()Ljavax/swing/text/ViewFactory;
- ()Ljavax/swing/text/ViewFactory;
+ ()L0javax/swing/text/ViewFactory;
 getViewIndex
  (FFLjava/awt/Shape;)I
  (FFLjava/awt/Shape;)I
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/ViewFactory.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/ViewFactory.eea
index 1cd710833c..24b5e5fc14 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/ViewFactory.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/ViewFactory.eea
@@ -2,4 +2,4 @@ class javax/swing/text/ViewFactory
 
 create
  (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
+ (Ljavax/swing/text/Element;)L1javax/swing/text/View;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/ZoneView.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/ZoneView.eea
index 84648791a1..0625b177cc 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/ZoneView.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/ZoneView.eea
@@ -5,7 +5,7 @@ class javax/swing/text/ZoneView
  (Ljavax/swing/text/Element;I)V
 createZone
  (II)Ljavax/swing/text/View;
- (II)Ljavax/swing/text/View;
+ (II)L1javax/swing/text/View;
 insertUpdate
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/html/AccessibleHTML$HTMLAccessibleContext.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/html/AccessibleHTML$HTMLAccessibleContext.eea
index 37f9607c94..df1b430e2b 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/html/AccessibleHTML$HTMLAccessibleContext.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/html/AccessibleHTML$HTMLAccessibleContext.eea
@@ -15,19 +15,19 @@ contains
  (Ljava/awt/Point;)Z
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
- ()Ljavax/accessibility/AccessibleStateSet;
+ ()L1javax/accessibility/AccessibleStateSet;
 getBackground
  ()Ljava/awt/Color;
  ()Ljava/awt/Color;
@@ -51,13 +51,13 @@ getLocale
  ()Ljava/util/Locale;
 getLocation
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getLocationOnScreen
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L0java/awt/Dimension;
 removeFocusListener
  (Ljava/awt/event/FocusListener;)V
  (L1java/awt/event/FocusListener;)V # @Inherited(javax.accessibility.AccessibleComponent)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/html/AccessibleHTML$IconElementInfo$IconAccessibleContext.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/html/AccessibleHTML$IconElementInfo$IconAccessibleContext.eea
index fadb848190..80c9102581 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/html/AccessibleHTML$IconElementInfo$IconAccessibleContext.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/html/AccessibleHTML$IconElementInfo$IconAccessibleContext.eea
@@ -8,7 +8,7 @@ getAccessibleDescription
  ()Ljava/lang/String;
 getAccessibleIcon
  ()[Ljavax/accessibility/AccessibleIcon;
- ()[Ljavax/accessibility/AccessibleIcon;
+ ()[1Ljavax/accessibility/AccessibleIcon; # @Overrides(javax.accessibility.AccessibleContext)
 getAccessibleIconDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/html/AccessibleHTML$TableElementInfo$TableAccessibleContext$AccessibleHeadersTable.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/html/AccessibleHTML$TableElementInfo$TableAccessibleContext$AccessibleHeadersTable.eea
index bb89cf1e81..ba7e0a88e4 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/html/AccessibleHTML$TableElementInfo$TableAccessibleContext$AccessibleHeadersTable.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/html/AccessibleHTML$TableElementInfo$TableAccessibleContext$AccessibleHeadersTable.eea
@@ -8,31 +8,31 @@ addHeader
  (Ljavax/swing/text/html/AccessibleHTML$TableElementInfo$TableCellElementInfo;I)V
 getAccessibleAt
  (II)Ljavax/accessibility/Accessible;
- (II)Ljavax/accessibility/Accessible;
+ (II)L0javax/accessibility/Accessible;
 getAccessibleCaption
  ()Ljavax/accessibility/Accessible;
- ()Ljavax/accessibility/Accessible;
+ ()L0javax/accessibility/Accessible;
 getAccessibleColumnDescription
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleColumnHeader
  ()Ljavax/accessibility/AccessibleTable;
- ()Ljavax/accessibility/AccessibleTable;
+ ()L0javax/accessibility/AccessibleTable;
 getAccessibleRowDescription
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleRowHeader
  ()Ljavax/accessibility/AccessibleTable;
- ()Ljavax/accessibility/AccessibleTable;
+ ()L0javax/accessibility/AccessibleTable;
 getAccessibleSummary
  ()Ljavax/accessibility/Accessible;
- ()Ljavax/accessibility/Accessible;
+ ()L0javax/accessibility/Accessible;
 getSelectedAccessibleColumns
  ()[I
- ()[I
+ ()[1I
 getSelectedAccessibleRows
  ()[I
- ()[I
+ ()[1I
 setAccessibleCaption
  (Ljavax/accessibility/Accessible;)V
  (Ljavax/accessibility/Accessible;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/html/AccessibleHTML$TableElementInfo$TableAccessibleContext.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/html/AccessibleHTML$TableElementInfo$TableAccessibleContext.eea
index b7f83f0bf6..e22775a37b 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/html/AccessibleHTML$TableElementInfo$TableAccessibleContext.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/html/AccessibleHTML$TableElementInfo$TableAccessibleContext.eea
@@ -8,52 +8,52 @@ addRowHeader
  (Ljavax/swing/text/html/AccessibleHTML$TableElementInfo$TableCellElementInfo;I)V
 getAccessibleAt
  (II)Ljavax/accessibility/Accessible;
- (II)Ljavax/accessibility/Accessible;
+ (II)L0javax/accessibility/Accessible;
 getAccessibleCaption
  ()Ljavax/accessibility/Accessible;
- ()Ljavax/accessibility/Accessible;
+ ()L0javax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.text.html.AccessibleHTML$HTMLAccessibleContext)
 getAccessibleColumnDescription
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleColumnHeader
  ()Ljavax/accessibility/AccessibleTable;
- ()Ljavax/accessibility/AccessibleTable;
+ ()L0javax/accessibility/AccessibleTable;
 getAccessibleColumnHeader
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getAccessibleName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleRowDescription
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleRowHeader
  ()Ljavax/accessibility/AccessibleTable;
  ()Ljavax/accessibility/AccessibleTable;
 getAccessibleRowHeader
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleSummary
  ()Ljavax/accessibility/Accessible;
- ()Ljavax/accessibility/Accessible;
+ ()L0javax/accessibility/Accessible;
 getAccessibleTable
  ()Ljavax/accessibility/AccessibleTable;
- ()Ljavax/accessibility/AccessibleTable;
+ ()L0javax/accessibility/AccessibleTable; # @Inherited(javax.accessibility.AccessibleContext)
 getSelectedAccessibleColumns
  ()[I
- ()[I
+ ()[1I
 getSelectedAccessibleRows
  ()[I
- ()[I
+ ()[1I
 setAccessibleCaption
  (Ljavax/accessibility/Accessible;)V
  (Ljavax/accessibility/Accessible;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/html/AccessibleHTML$TextElementInfo$TextAccessibleContext.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/html/AccessibleHTML$TextElementInfo$TextAccessibleContext.eea
index 81e1259119..dff38663b5 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/html/AccessibleHTML$TextElementInfo$TextAccessibleContext.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/html/AccessibleHTML$TextElementInfo$TextAccessibleContext.eea
@@ -8,13 +8,13 @@ getAccessibleDescription
  ()Ljava/lang/String;
 getAccessibleName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAfterIndex
  (II)Ljava/lang/String;
  (II)Ljava/lang/String;
@@ -26,10 +26,10 @@ getBeforeIndex
  (II)Ljava/lang/String;
 getCharacterAttribute
  (I)Ljavax/swing/text/AttributeSet;
- (I)Ljavax/swing/text/AttributeSet;
+ (I)L0javax/swing/text/AttributeSet;
 getCharacterBounds
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L0java/awt/Rectangle;
 getIndexAtPoint
  (Ljava/awt/Point;)I
  (Ljava/awt/Point;)I
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/html/BlockView.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/html/BlockView.eea
index fea3280a6f..574dd7a75a 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/html/BlockView.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/html/BlockView.eea
@@ -5,10 +5,10 @@ class javax/swing/text/html/BlockView
  (Ljavax/swing/text/Element;I)V
 calculateMajorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.BoxView)
 calculateMinorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.BoxView)
 changedUpdate
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/html/CSS.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/html/CSS.eea
index 779e06cb3d..7174e0d1aa 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/html/CSS.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/html/CSS.eea
@@ -2,7 +2,7 @@ class javax/swing/text/html/CSS
 
 getAllAttributeKeys
  ()[Ljavax/swing/text/html/CSS$Attribute;
- ()[Ljavax/swing/text/html/CSS$Attribute;
+ ()[1Ljavax/swing/text/html/CSS$Attribute;
 getAttribute
  (Ljava/lang/String;)Ljavax/swing/text/html/CSS$Attribute;
  (Ljava/lang/String;)Ljavax/swing/text/html/CSS$Attribute;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/html/FormView.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/html/FormView.eea
index 88b6a00a26..8164be3bc5 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/html/FormView.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/html/FormView.eea
@@ -15,7 +15,7 @@ actionPerformed
  (L1java/awt/event/ActionEvent;)V # @Inherited(java.awt.event.ActionListener)
 createComponent
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component; # @Inherited(javax.swing.text.ComponentView)
 imageSubmit
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/html/HTML.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/html/HTML.eea
index dee3934459..f5662806f1 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/html/HTML.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/html/HTML.eea
@@ -6,13 +6,13 @@ NULL_ATTRIBUTE_VALUE
 
 getAllAttributeKeys
  ()[Ljavax/swing/text/html/HTML$Attribute;
- ()[Ljavax/swing/text/html/HTML$Attribute;
+ ()[1Ljavax/swing/text/html/HTML$Attribute;
 getAllTags
  ()[Ljavax/swing/text/html/HTML$Tag;
- ()[Ljavax/swing/text/html/HTML$Tag;
+ ()[1Ljavax/swing/text/html/HTML$Tag;
 getAttributeKey
  (Ljava/lang/String;)Ljavax/swing/text/html/HTML$Attribute;
- (Ljava/lang/String;)Ljavax/swing/text/html/HTML$Attribute;
+ (Ljava/lang/String;)L0javax/swing/text/html/HTML$Attribute;
 getIntegerAttributeValue
  (Ljavax/swing/text/AttributeSet;Ljavax/swing/text/html/HTML$Attribute;I)I
  (Ljavax/swing/text/AttributeSet;Ljavax/swing/text/html/HTML$Attribute;I)I
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/html/HTMLDocument$BlockElement.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/html/HTMLDocument$BlockElement.eea
index 5cdf2ba233..e100ec133c 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/html/HTMLDocument$BlockElement.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/html/HTMLDocument$BlockElement.eea
@@ -5,7 +5,7 @@ class javax/swing/text/html/HTMLDocument$BlockElement
  (Ljavax/swing/text/html/HTMLDocument;Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;)V
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.text.AbstractDocument$BranchElement)
 getResolveParent
  ()Ljavax/swing/text/AttributeSet;
- ()Ljavax/swing/text/AttributeSet;
+ ()L0javax/swing/text/AttributeSet;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/html/HTMLDocument$RunElement.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/html/HTMLDocument$RunElement.eea
index 34b4d06888..6f02fa9ffd 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/html/HTMLDocument$RunElement.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/html/HTMLDocument$RunElement.eea
@@ -5,7 +5,7 @@ class javax/swing/text/html/HTMLDocument$RunElement
  (Ljavax/swing/text/html/HTMLDocument;Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;II)V
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.text.AbstractDocument$LeafElement)
 getResolveParent
  ()Ljavax/swing/text/AttributeSet;
- ()Ljavax/swing/text/AttributeSet;
+ ()L0javax/swing/text/AttributeSet;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/html/HTMLDocument.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/html/HTMLDocument.eea
index e242d908df..080fde65ba 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/html/HTMLDocument.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/html/HTMLDocument.eea
@@ -15,13 +15,13 @@ create
  ([Ljavax/swing/text/DefaultStyledDocument$ElementSpec;)V
 createBranchElement
  (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/Element;
- (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/Element;
+ (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;)L1javax/swing/text/Element; # @Inherited(javax.swing.text.AbstractDocument)
 createDefaultRoot
  ()Ljavax/swing/text/AbstractDocument$AbstractElement;
- ()Ljavax/swing/text/AbstractDocument$AbstractElement;
+ ()L1javax/swing/text/AbstractDocument$AbstractElement; # @Inherited(javax.swing.text.DefaultStyledDocument)
 createLeafElement
  (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;II)Ljavax/swing/text/Element;
- (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;II)Ljavax/swing/text/Element;
+ (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;II)L1javax/swing/text/Element; # @Inherited(javax.swing.text.AbstractDocument)
 fireChangedUpdate
  (Ljavax/swing/event/DocumentEvent;)V
  (Ljavax/swing/event/DocumentEvent;)V
@@ -39,13 +39,13 @@ getElement
  (Ljavax/swing/text/Element;Ljava/lang/Object;Ljava/lang/Object;)Ljavax/swing/text/Element;
 getIterator
  (Ljavax/swing/text/html/HTML$Tag;)Ljavax/swing/text/html/HTMLDocument$Iterator;
- (Ljavax/swing/text/html/HTML$Tag;)Ljavax/swing/text/html/HTMLDocument$Iterator;
+ (Ljavax/swing/text/html/HTML$Tag;)L0javax/swing/text/html/HTMLDocument$Iterator;
 getParser
  ()Ljavax/swing/text/html/HTMLEditorKit$Parser;
  ()Ljavax/swing/text/html/HTMLEditorKit$Parser;
 getReader
  (I)Ljavax/swing/text/html/HTMLEditorKit$ParserCallback;
- (I)Ljavax/swing/text/html/HTMLEditorKit$ParserCallback;
+ (I)L1javax/swing/text/html/HTMLEditorKit$ParserCallback;
 getReader
  (IIILjavax/swing/text/html/HTML$Tag;)Ljavax/swing/text/html/HTMLEditorKit$ParserCallback;
  (IIILjavax/swing/text/html/HTML$Tag;)Ljavax/swing/text/html/HTMLEditorKit$ParserCallback;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/html/HTMLEditorKit$HTMLFactory.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/html/HTMLEditorKit$HTMLFactory.eea
index 1bafecc05e..ade9c0a4e8 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/html/HTMLEditorKit$HTMLFactory.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/html/HTMLEditorKit$HTMLFactory.eea
@@ -2,4 +2,4 @@ class javax/swing/text/html/HTMLEditorKit$HTMLFactory
 
 create
  (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
+ (Ljavax/swing/text/Element;)L1javax/swing/text/View; # @Inherited(javax.swing.text.ViewFactory)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/html/HTMLEditorKit.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/html/HTMLEditorKit.eea
index 5ff7133f0d..3f70a13929 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/html/HTMLEditorKit.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/html/HTMLEditorKit.eea
@@ -45,7 +45,7 @@ clone
  ()L1java/lang/Object; # @Inherited(javax.swing.text.StyledEditorKit)
 createDefaultDocument
  ()Ljavax/swing/text/Document;
- ()Ljavax/swing/text/Document;
+ ()L1javax/swing/text/Document; # @Inherited(javax.swing.text.StyledEditorKit)
 createInputAttributes
  (Ljavax/swing/text/Element;Ljavax/swing/text/MutableAttributeSet;)V
  (Ljavax/swing/text/Element;Ljavax/swing/text/MutableAttributeSet;)V
@@ -54,13 +54,13 @@ deinstall
  (Ljavax/swing/JEditorPane;)V
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
- ()Ljavax/accessibility/AccessibleContext;
+ ()L0javax/accessibility/AccessibleContext;
 getActions
  ()[Ljavax/swing/Action;
  ()[Ljavax/swing/Action;
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.text.DefaultEditorKit)
 getDefaultCursor
  ()Ljava/awt/Cursor;
  ()Ljava/awt/Cursor;
@@ -75,10 +75,10 @@ getParser
  ()Ljavax/swing/text/html/HTMLEditorKit$Parser;
 getStyleSheet
  ()Ljavax/swing/text/html/StyleSheet;
- ()Ljavax/swing/text/html/StyleSheet;
+ ()L1javax/swing/text/html/StyleSheet;
 getViewFactory
  ()Ljavax/swing/text/ViewFactory;
- ()Ljavax/swing/text/ViewFactory;
+ ()L0javax/swing/text/ViewFactory; # @Inherited(javax.swing.text.StyledEditorKit)
 insertHTML
  (Ljavax/swing/text/html/HTMLDocument;ILjava/lang/String;IILjavax/swing/text/html/HTML$Tag;)V
  (Ljavax/swing/text/html/HTMLDocument;ILjava/lang/String;IILjavax/swing/text/html/HTML$Tag;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/html/ImageView.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/html/ImageView.eea
index ec0b987cac..9317c516fd 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/html/ImageView.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/html/ImageView.eea
@@ -17,7 +17,7 @@ getImage
  ()Ljava/awt/Image;
 getImageURL
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L0java/net/URL;
 getLoadingImageIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
@@ -29,10 +29,10 @@ getStyleSheet
  ()Ljavax/swing/text/html/StyleSheet;
 getToolTipText
  (FFLjava/awt/Shape;)Ljava/lang/String;
- (FFLjava/awt/Shape;)Ljava/lang/String;
+ (FFLjava/awt/Shape;)L0java/lang/String; # @Inherited(javax.swing.text.View)
 modelToView
  (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)Ljava/awt/Shape;
- (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)Ljava/awt/Shape;
+ (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)L0java/awt/Shape;
 paint
  (Ljava/awt/Graphics;Ljava/awt/Shape;)V
  (Ljava/awt/Graphics;Ljava/awt/Shape;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/html/ObjectView.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/html/ObjectView.eea
index c866e95a2c..b66d5ff681 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/html/ObjectView.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/html/ObjectView.eea
@@ -5,4 +5,4 @@ class javax/swing/text/html/ObjectView
  (Ljavax/swing/text/Element;)V
 createComponent
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component; # @Inherited(javax.swing.text.ComponentView)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/html/ParagraphView.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/html/ParagraphView.eea
index ce3f592638..1178a6cadc 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/html/ParagraphView.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/html/ParagraphView.eea
@@ -5,7 +5,7 @@ class javax/swing/text/html/ParagraphView
  (Ljavax/swing/text/Element;)V
 calculateMinorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.ParagraphView)
 getAttributes
  ()Ljavax/swing/text/AttributeSet;
  ()Ljavax/swing/text/AttributeSet;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/html/StyleSheet.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/html/StyleSheet.eea
index 1ab3dfab2b..119b0d3371 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/html/StyleSheet.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/html/StyleSheet.eea
@@ -20,10 +20,10 @@ addStyleSheet
  (Ljavax/swing/text/html/StyleSheet;)V
 createLargeAttributeSet
  (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/MutableAttributeSet;
- (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/MutableAttributeSet;
+ (Ljavax/swing/text/AttributeSet;)L1javax/swing/text/MutableAttributeSet; # @Inherited(javax.swing.text.StyleContext)
 createSmallAttributeSet
  (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/StyleContext$SmallAttributeSet;
- (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/StyleContext$SmallAttributeSet;
+ (Ljavax/swing/text/AttributeSet;)L1javax/swing/text/StyleContext$SmallAttributeSet; # @Inherited(javax.swing.text.StyleContext)
 getBackground
  (Ljavax/swing/text/AttributeSet;)Ljava/awt/Color;
  (Ljavax/swing/text/AttributeSet;)Ljava/awt/Color;
@@ -32,7 +32,7 @@ getBase
  ()Ljava/net/URL;
 getBoxPainter
  (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/html/StyleSheet$BoxPainter;
- (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/html/StyleSheet$BoxPainter;
+ (Ljavax/swing/text/AttributeSet;)L1javax/swing/text/html/StyleSheet$BoxPainter;
 getDeclaration
  (Ljava/lang/String;)Ljavax/swing/text/AttributeSet;
  (Ljava/lang/String;)Ljavax/swing/text/AttributeSet;
@@ -44,22 +44,22 @@ getForeground
  (Ljavax/swing/text/AttributeSet;)Ljava/awt/Color;
 getListPainter
  (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/html/StyleSheet$ListPainter;
- (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/html/StyleSheet$ListPainter;
+ (Ljavax/swing/text/AttributeSet;)L1javax/swing/text/html/StyleSheet$ListPainter;
 getPointSize
  (Ljava/lang/String;)F
  (Ljava/lang/String;)F
 getRule
  (Ljava/lang/String;)Ljavax/swing/text/Style;
- (Ljava/lang/String;)Ljavax/swing/text/Style;
+ (Ljava/lang/String;)L0javax/swing/text/Style;
 getRule
  (Ljavax/swing/text/html/HTML$Tag;Ljavax/swing/text/Element;)Ljavax/swing/text/Style;
  (Ljavax/swing/text/html/HTML$Tag;Ljavax/swing/text/Element;)Ljavax/swing/text/Style;
 getStyleSheets
  ()[Ljavax/swing/text/html/StyleSheet;
- ()[Ljavax/swing/text/html/StyleSheet;
+ ()[0Ljavax/swing/text/html/StyleSheet;
 getViewAttributes
  (Ljavax/swing/text/View;)Ljavax/swing/text/AttributeSet;
- (Ljavax/swing/text/View;)Ljavax/swing/text/AttributeSet;
+ (Ljavax/swing/text/View;)L1javax/swing/text/AttributeSet;
 importStyleSheet
  (Ljava/net/URL;)V
  (Ljava/net/URL;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/html/TableView$RowView.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/html/TableView$RowView.eea
index 97026d3150..ee648bf7fb 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/html/TableView$RowView.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/html/TableView$RowView.eea
@@ -5,10 +5,10 @@ class javax/swing/text/html/TableView$RowView
  (Ljavax/swing/text/html/TableView;Ljavax/swing/text/Element;)V
 calculateMajorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.BoxView)
 calculateMinorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.BoxView)
 changedUpdate
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
@@ -20,7 +20,7 @@ getStyleSheet
  ()Ljavax/swing/text/html/StyleSheet;
 getViewAtPosition
  (ILjava/awt/Rectangle;)Ljavax/swing/text/View;
- (ILjava/awt/Rectangle;)Ljavax/swing/text/View;
+ (ILjava/awt/Rectangle;)L0javax/swing/text/View; # @Inherited(javax.swing.text.CompositeView)
 layoutMajorAxis
  (II[I[I)V
  (II[I[I)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/html/parser/AttributeList.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/html/parser/AttributeList.eea
index 54e1611eb9..e99866f038 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/html/parser/AttributeList.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/html/parser/AttributeList.eea
@@ -37,7 +37,7 @@ getValue
  ()Ljava/lang/String;
 getValues
  ()Ljava/util/Enumeration<*>;
- ()Ljava/util/Enumeration<*>;
+ ()L0java/util/Enumeration<*>;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/html/parser/ContentModel.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/html/parser/ContentModel.eea
index 89dcf577a8..c92e63b31e 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/html/parser/ContentModel.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/html/parser/ContentModel.eea
@@ -18,7 +18,7 @@ next
  (Ljavax/swing/text/html/parser/Element;)V
 first
  ()Ljavax/swing/text/html/parser/Element;
- ()Ljavax/swing/text/html/parser/Element;
+ ()L0javax/swing/text/html/parser/Element;
 first
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/html/parser/DTD.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/html/parser/DTD.eea
index 73ef37ed5f..f53d1809a3 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/html/parser/DTD.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/html/parser/DTD.eea
@@ -2,7 +2,7 @@ class javax/swing/text/html/parser/DTD
 
 getDTD
  (Ljava/lang/String;)Ljavax/swing/text/html/parser/DTD;
- (Ljava/lang/String;)Ljavax/swing/text/html/parser/DTD;
+ (Ljava/lang/String;)L1javax/swing/text/html/parser/DTD;
 putDTDHash
  (Ljava/lang/String;Ljavax/swing/text/html/parser/DTD;)V
  (Ljava/lang/String;Ljavax/swing/text/html/parser/DTD;)V
@@ -58,10 +58,10 @@ title
  (Ljava/lang/String;)V
 defAttributeList
  (Ljava/lang/String;IILjava/lang/String;Ljava/lang/String;Ljavax/swing/text/html/parser/AttributeList;)Ljavax/swing/text/html/parser/AttributeList;
- (Ljava/lang/String;IILjava/lang/String;Ljava/lang/String;Ljavax/swing/text/html/parser/AttributeList;)Ljavax/swing/text/html/parser/AttributeList;
+ (Ljava/lang/String;IILjava/lang/String;Ljava/lang/String;Ljavax/swing/text/html/parser/AttributeList;)L1javax/swing/text/html/parser/AttributeList;
 defContentModel
  (ILjava/lang/Object;Ljavax/swing/text/html/parser/ContentModel;)Ljavax/swing/text/html/parser/ContentModel;
- (ILjava/lang/Object;Ljavax/swing/text/html/parser/ContentModel;)Ljavax/swing/text/html/parser/ContentModel;
+ (ILjava/lang/Object;Ljavax/swing/text/html/parser/ContentModel;)L1javax/swing/text/html/parser/ContentModel;
 defElement
  (Ljava/lang/String;IZZLjavax/swing/text/html/parser/ContentModel;[Ljava/lang/String;[Ljava/lang/String;Ljavax/swing/text/html/parser/AttributeList;)Ljavax/swing/text/html/parser/Element;
  (Ljava/lang/String;IZZLjavax/swing/text/html/parser/ContentModel;[Ljava/lang/String;[Ljava/lang/String;Ljavax/swing/text/html/parser/AttributeList;)Ljavax/swing/text/html/parser/Element;
@@ -79,13 +79,13 @@ defineElement
  (Ljava/lang/String;IZZLjavax/swing/text/html/parser/ContentModel;Ljava/util/BitSet;Ljava/util/BitSet;Ljavax/swing/text/html/parser/AttributeList;)Ljavax/swing/text/html/parser/Element;
 defineEntity
  (Ljava/lang/String;I[C)Ljavax/swing/text/html/parser/Entity;
- (Ljava/lang/String;I[C)Ljavax/swing/text/html/parser/Entity;
+ (Ljava/lang/String;I[C)L1javax/swing/text/html/parser/Entity;
 getElement
  (I)Ljavax/swing/text/html/parser/Element;
  (I)Ljavax/swing/text/html/parser/Element;
 getElement
  (Ljava/lang/String;)Ljavax/swing/text/html/parser/Element;
- (Ljava/lang/String;)Ljavax/swing/text/html/parser/Element;
+ (Ljava/lang/String;)L1javax/swing/text/html/parser/Element;
 getEntity
  (I)Ljavax/swing/text/html/parser/Entity;
  (I)Ljavax/swing/text/html/parser/Entity;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/html/parser/Element.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/html/parser/Element.eea
index 8590071939..aa2fa88f5e 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/html/parser/Element.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/html/parser/Element.eea
@@ -25,10 +25,10 @@ name
 
 getAttribute
  (Ljava/lang/String;)Ljavax/swing/text/html/parser/AttributeList;
- (Ljava/lang/String;)Ljavax/swing/text/html/parser/AttributeList;
+ (Ljava/lang/String;)L0javax/swing/text/html/parser/AttributeList;
 getAttributeByValue
  (Ljava/lang/String;)Ljavax/swing/text/html/parser/AttributeList;
- (Ljava/lang/String;)Ljavax/swing/text/html/parser/AttributeList;
+ (Ljava/lang/String;)L0javax/swing/text/html/parser/AttributeList;
 getAttributes
  ()Ljavax/swing/text/html/parser/AttributeList;
  ()Ljavax/swing/text/html/parser/AttributeList;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/html/parser/Parser.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/html/parser/Parser.eea
index 1b1a07657e..8b291a0e2d 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/html/parser/Parser.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/html/parser/Parser.eea
@@ -48,7 +48,7 @@ makeTag
  (Ljavax/swing/text/html/parser/Element;)Ljavax/swing/text/html/parser/TagElement;
 makeTag
  (Ljavax/swing/text/html/parser/Element;Z)Ljavax/swing/text/html/parser/TagElement;
- (Ljavax/swing/text/html/parser/Element;Z)Ljavax/swing/text/html/parser/TagElement;
+ (Ljavax/swing/text/html/parser/Element;Z)L1javax/swing/text/html/parser/TagElement;
 markFirstTime
  (Ljavax/swing/text/html/parser/Element;)V
  (Ljavax/swing/text/html/parser/Element;)V
@@ -57,7 +57,7 @@ parse
  (Ljava/io/Reader;)V
 parseDTDMarkup
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 parseMarkupDeclarations
  (Ljava/lang/StringBuffer;)Z
  (Ljava/lang/StringBuffer;)Z
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/html/parser/ParserDelegator.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/html/parser/ParserDelegator.eea
index b310038faa..b46d9d95d0 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/html/parser/ParserDelegator.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/html/parser/ParserDelegator.eea
@@ -2,7 +2,7 @@ class javax/swing/text/html/parser/ParserDelegator
 
 createDTD
  (Ljavax/swing/text/html/parser/DTD;Ljava/lang/String;)Ljavax/swing/text/html/parser/DTD;
- (Ljavax/swing/text/html/parser/DTD;Ljava/lang/String;)Ljavax/swing/text/html/parser/DTD;
+ (Ljavax/swing/text/html/parser/DTD;Ljava/lang/String;)L1javax/swing/text/html/parser/DTD;
 
 parse
  (Ljava/io/Reader;Ljavax/swing/text/html/HTMLEditorKit$ParserCallback;Z)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/text/rtf/RTFEditorKit.eea b/libs/eea-java-17/src/main/resources/javax/swing/text/rtf/RTFEditorKit.eea
index f45a9617fa..8f83af82a9 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/text/rtf/RTFEditorKit.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/text/rtf/RTFEditorKit.eea
@@ -2,7 +2,7 @@ class javax/swing/text/rtf/RTFEditorKit
 
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.text.DefaultEditorKit)
 read
  (Ljava/io/InputStream;Ljavax/swing/text/Document;I)V
  (Ljava/io/InputStream;Ljavax/swing/text/Document;I)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/tree/AbstractLayoutCache.eea b/libs/eea-java-17/src/main/resources/javax/swing/tree/AbstractLayoutCache.eea
index 24a9d1a1b2..9e584778ea 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/tree/AbstractLayoutCache.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/tree/AbstractLayoutCache.eea
@@ -24,7 +24,7 @@ getNodeDimensions
  ()Ljavax/swing/tree/AbstractLayoutCache$NodeDimensions;
 getNodeDimensions
  (Ljava/lang/Object;IIZLjava/awt/Rectangle;)Ljava/awt/Rectangle;
- (Ljava/lang/Object;IIZLjava/awt/Rectangle;)Ljava/awt/Rectangle;
+ (Ljava/lang/Object;IIZLjava/awt/Rectangle;)L0java/awt/Rectangle;
 getPathClosestTo
  (II)Ljavax/swing/tree/TreePath;
  (II)Ljavax/swing/tree/TreePath;
@@ -39,7 +39,7 @@ getRowForPath
  (Ljavax/swing/tree/TreePath;)I
 getRowsForPaths
  ([Ljavax/swing/tree/TreePath;)[I
- ([Ljavax/swing/tree/TreePath;)[I
+ ([Ljavax/swing/tree/TreePath;)[I # @PolyNull
 getSelectionModel
  ()Ljavax/swing/tree/TreeSelectionModel;
  ()Ljavax/swing/tree/TreeSelectionModel;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/tree/DefaultMutableTreeNode.eea b/libs/eea-java-17/src/main/resources/javax/swing/tree/DefaultMutableTreeNode.eea
index e53cb425a9..20bf4b9836 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/tree/DefaultMutableTreeNode.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/tree/DefaultMutableTreeNode.eea
@@ -25,7 +25,7 @@ add
  (Ljavax/swing/tree/MutableTreeNode;)V
 breadthFirstEnumeration
  ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
- ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
+ ()L1java/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
 children
  ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
  ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
@@ -37,13 +37,13 @@ depthFirstEnumeration
  ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
 getChildAfter
  (Ljavax/swing/tree/TreeNode;)Ljavax/swing/tree/TreeNode;
- (Ljavax/swing/tree/TreeNode;)Ljavax/swing/tree/TreeNode;
+ (Ljavax/swing/tree/TreeNode;)L0javax/swing/tree/TreeNode;
 getChildAt
  (I)Ljavax/swing/tree/TreeNode;
  (I)Ljavax/swing/tree/TreeNode;
 getChildBefore
  (Ljavax/swing/tree/TreeNode;)Ljavax/swing/tree/TreeNode;
- (Ljavax/swing/tree/TreeNode;)Ljavax/swing/tree/TreeNode;
+ (Ljavax/swing/tree/TreeNode;)L0javax/swing/tree/TreeNode;
 getFirstChild
  ()Ljavax/swing/tree/TreeNode;
  ()Ljavax/swing/tree/TreeNode;
@@ -61,10 +61,10 @@ getLastLeaf
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
 getNextLeaf
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
- ()Ljavax/swing/tree/DefaultMutableTreeNode;
+ ()L0javax/swing/tree/DefaultMutableTreeNode;
 getNextNode
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
- ()Ljavax/swing/tree/DefaultMutableTreeNode;
+ ()L0javax/swing/tree/DefaultMutableTreeNode;
 getNextSibling
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
@@ -76,13 +76,13 @@ getPath
  ()[Ljavax/swing/tree/TreeNode;
 getPathToRoot
  (Ljavax/swing/tree/TreeNode;I)[Ljavax/swing/tree/TreeNode;
- (Ljavax/swing/tree/TreeNode;I)[Ljavax/swing/tree/TreeNode;
+ (Ljavax/swing/tree/TreeNode;I)[0Ljavax/swing/tree/TreeNode;
 getPreviousLeaf
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
- ()Ljavax/swing/tree/DefaultMutableTreeNode;
+ ()L0javax/swing/tree/DefaultMutableTreeNode;
 getPreviousNode
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
- ()Ljavax/swing/tree/DefaultMutableTreeNode;
+ ()L0javax/swing/tree/DefaultMutableTreeNode;
 getPreviousSibling
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
@@ -91,13 +91,13 @@ getRoot
  ()Ljavax/swing/tree/TreeNode;
 getSharedAncestor
  (Ljavax/swing/tree/DefaultMutableTreeNode;)Ljavax/swing/tree/TreeNode;
- (Ljavax/swing/tree/DefaultMutableTreeNode;)Ljavax/swing/tree/TreeNode;
+ (Ljavax/swing/tree/DefaultMutableTreeNode;)L0javax/swing/tree/TreeNode;
 getUserObject
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
 getUserObjectPath
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[1Ljava/lang/Object;
 insert
  (Ljavax/swing/tree/MutableTreeNode;I)V
  (Ljavax/swing/tree/MutableTreeNode;I)V
@@ -118,13 +118,13 @@ isNodeSibling
  (Ljavax/swing/tree/TreeNode;)Z
 pathFromAncestorEnumeration
  (Ljavax/swing/tree/TreeNode;)Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
- (Ljavax/swing/tree/TreeNode;)Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
+ (Ljavax/swing/tree/TreeNode;)L1java/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
 postorderEnumeration
  ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
- ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
+ ()L1java/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
 preorderEnumeration
  ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
- ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
+ ()L1java/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
 remove
  (Ljavax/swing/tree/MutableTreeNode;)V
  (Ljavax/swing/tree/MutableTreeNode;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/tree/DefaultTreeCellEditor.eea b/libs/eea-java-17/src/main/resources/javax/swing/tree/DefaultTreeCellEditor.eea
index e4ec8ceb20..81cef5e884 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/tree/DefaultTreeCellEditor.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/tree/DefaultTreeCellEditor.eea
@@ -48,10 +48,10 @@ canEditImmediately
  (Ljava/util/EventObject;)Z
 createContainer
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L1java/awt/Container;
 createTreeCellEditor
  ()Ljavax/swing/tree/TreeCellEditor;
- ()Ljavax/swing/tree/TreeCellEditor;
+ ()L1javax/swing/tree/TreeCellEditor;
 determineOffset
  (Ljavax/swing/JTree;Ljava/lang/Object;ZZZI)V
  (Ljavax/swing/JTree;Ljava/lang/Object;ZZZI)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/tree/DefaultTreeModel.eea b/libs/eea-java-17/src/main/resources/javax/swing/tree/DefaultTreeModel.eea
index 6ff14ee4c1..51e5425857 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/tree/DefaultTreeModel.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/tree/DefaultTreeModel.eea
@@ -45,7 +45,7 @@ getPathToRoot
  (Ljavax/swing/tree/TreeNode;)[Ljavax/swing/tree/TreeNode;
 getPathToRoot
  (Ljavax/swing/tree/TreeNode;I)[Ljavax/swing/tree/TreeNode;
- (Ljavax/swing/tree/TreeNode;I)[Ljavax/swing/tree/TreeNode;
+ (Ljavax/swing/tree/TreeNode;I)[0Ljavax/swing/tree/TreeNode;
 getRoot
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/tree/DefaultTreeSelectionModel.eea b/libs/eea-java-17/src/main/resources/javax/swing/tree/DefaultTreeSelectionModel.eea
index f61770361c..98c8fc41a5 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/tree/DefaultTreeSelectionModel.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/tree/DefaultTreeSelectionModel.eea
@@ -64,13 +64,13 @@ getRowMapper
  ()Ljavax/swing/tree/RowMapper;
 getSelectionPath
  ()Ljavax/swing/tree/TreePath;
- ()Ljavax/swing/tree/TreePath;
+ ()L0javax/swing/tree/TreePath;
 getSelectionPaths
  ()[Ljavax/swing/tree/TreePath;
- ()[Ljavax/swing/tree/TreePath;
+ ()[1Ljavax/swing/tree/TreePath;
 getSelectionRows
  ()[I
- ()[I
+ ()[1I
 getTreeSelectionListeners
  ()[Ljavax/swing/event/TreeSelectionListener;
  ()[Ljavax/swing/event/TreeSelectionListener;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/tree/FixedHeightLayoutCache.eea b/libs/eea-java-17/src/main/resources/javax/swing/tree/FixedHeightLayoutCache.eea
index 85b2b881f6..778ab74267 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/tree/FixedHeightLayoutCache.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/tree/FixedHeightLayoutCache.eea
@@ -2,16 +2,16 @@ class javax/swing/tree/FixedHeightLayoutCache
 
 getBounds
  (Ljavax/swing/tree/TreePath;Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
- (Ljavax/swing/tree/TreePath;Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
+ (Ljavax/swing/tree/TreePath;Ljava/awt/Rectangle;)L0java/awt/Rectangle;
 getExpandedState
  (Ljavax/swing/tree/TreePath;)Z
  (Ljavax/swing/tree/TreePath;)Z
 getPathClosestTo
  (II)Ljavax/swing/tree/TreePath;
- (II)Ljavax/swing/tree/TreePath;
+ (II)L0javax/swing/tree/TreePath;
 getPathForRow
  (I)Ljavax/swing/tree/TreePath;
- (I)Ljavax/swing/tree/TreePath;
+ (I)L0javax/swing/tree/TreePath;
 getRowForPath
  (Ljavax/swing/tree/TreePath;)I
  (Ljavax/swing/tree/TreePath;)I
@@ -20,7 +20,7 @@ getVisibleChildCount
  (Ljavax/swing/tree/TreePath;)I
 getVisiblePathsFrom
  (Ljavax/swing/tree/TreePath;)Ljava/util/Enumeration<Ljavax/swing/tree/TreePath;>;
- (Ljavax/swing/tree/TreePath;)Ljava/util/Enumeration<Ljavax/swing/tree/TreePath;>;
+ (Ljavax/swing/tree/TreePath;)L0java/util/Enumeration<Ljavax/swing/tree/TreePath;>;
 invalidatePathBounds
  (Ljavax/swing/tree/TreePath;)V
  (Ljavax/swing/tree/TreePath;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/tree/TreePath.eea b/libs/eea-java-17/src/main/resources/javax/swing/tree/TreePath.eea
index fb9d151197..88b86f83cf 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/tree/TreePath.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/tree/TreePath.eea
@@ -23,7 +23,7 @@ getParentPath
  ()Ljavax/swing/tree/TreePath;
 getPath
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[1Ljava/lang/Object;
 getPathComponent
  (I)Ljava/lang/Object;
  (I)Ljava/lang/Object;
@@ -32,7 +32,7 @@ isDescendant
  (Ljavax/swing/tree/TreePath;)Z
 pathByAddingChild
  (Ljava/lang/Object;)Ljavax/swing/tree/TreePath;
- (Ljava/lang/Object;)Ljavax/swing/tree/TreePath;
+ (Ljava/lang/Object;)L1javax/swing/tree/TreePath;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/tree/VariableHeightLayoutCache.eea b/libs/eea-java-17/src/main/resources/javax/swing/tree/VariableHeightLayoutCache.eea
index 0c7ebf33ff..a8f7b0ac88 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/tree/VariableHeightLayoutCache.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/tree/VariableHeightLayoutCache.eea
@@ -2,16 +2,16 @@ class javax/swing/tree/VariableHeightLayoutCache
 
 getBounds
  (Ljavax/swing/tree/TreePath;Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
- (Ljavax/swing/tree/TreePath;Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
+ (Ljavax/swing/tree/TreePath;Ljava/awt/Rectangle;)L0java/awt/Rectangle;
 getExpandedState
  (Ljavax/swing/tree/TreePath;)Z
  (Ljavax/swing/tree/TreePath;)Z
 getPathClosestTo
  (II)Ljavax/swing/tree/TreePath;
- (II)Ljavax/swing/tree/TreePath;
+ (II)L0javax/swing/tree/TreePath;
 getPathForRow
  (I)Ljavax/swing/tree/TreePath;
- (I)Ljavax/swing/tree/TreePath;
+ (I)L0javax/swing/tree/TreePath;
 getPreferredWidth
  (Ljava/awt/Rectangle;)I
  (Ljava/awt/Rectangle;)I
@@ -23,7 +23,7 @@ getVisibleChildCount
  (Ljavax/swing/tree/TreePath;)I
 getVisiblePathsFrom
  (Ljavax/swing/tree/TreePath;)Ljava/util/Enumeration<Ljavax/swing/tree/TreePath;>;
- (Ljavax/swing/tree/TreePath;)Ljava/util/Enumeration<Ljavax/swing/tree/TreePath;>;
+ (Ljavax/swing/tree/TreePath;)L0java/util/Enumeration<Ljavax/swing/tree/TreePath;>;
 invalidatePathBounds
  (Ljavax/swing/tree/TreePath;)V
  (Ljavax/swing/tree/TreePath;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/undo/AbstractUndoableEdit.eea b/libs/eea-java-17/src/main/resources/javax/swing/undo/AbstractUndoableEdit.eea
index f4dc75513b..61f7013a6a 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/undo/AbstractUndoableEdit.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/undo/AbstractUndoableEdit.eea
@@ -12,7 +12,7 @@ addEdit
  (Ljavax/swing/undo/UndoableEdit;)Z
 getPresentationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getRedoPresentationName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/undo/CompoundEdit.eea b/libs/eea-java-17/src/main/resources/javax/swing/undo/CompoundEdit.eea
index a1eb0144e1..f253090e1c 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/undo/CompoundEdit.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/undo/CompoundEdit.eea
@@ -9,7 +9,7 @@ addEdit
  (Ljavax/swing/undo/UndoableEdit;)Z
 getPresentationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.undo.AbstractUndoableEdit)
 getRedoPresentationName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -18,7 +18,7 @@ getUndoPresentationName
  ()Ljava/lang/String;
 lastEdit
  ()Ljavax/swing/undo/UndoableEdit;
- ()Ljavax/swing/undo/UndoableEdit;
+ ()L0javax/swing/undo/UndoableEdit;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(javax.swing.undo.AbstractUndoableEdit)
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/undo/StateEdit.eea b/libs/eea-java-17/src/main/resources/javax/swing/undo/StateEdit.eea
index d306f4d53f..8736a7920d 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/undo/StateEdit.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/undo/StateEdit.eea
@@ -25,7 +25,7 @@ undoRedoName
  (Ljavax/swing/undo/StateEditable;Ljava/lang/String;)V
 getPresentationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.undo.AbstractUndoableEdit)
 init
  (Ljavax/swing/undo/StateEditable;Ljava/lang/String;)V
  (Ljavax/swing/undo/StateEditable;Ljava/lang/String;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/undo/UndoManager.eea b/libs/eea-java-17/src/main/resources/javax/swing/undo/UndoManager.eea
index 215f924e78..a32cf35d53 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/undo/UndoManager.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/undo/UndoManager.eea
@@ -5,10 +5,10 @@ addEdit
  (Ljavax/swing/undo/UndoableEdit;)Z
 editToBeRedone
  ()Ljavax/swing/undo/UndoableEdit;
- ()Ljavax/swing/undo/UndoableEdit;
+ ()L0javax/swing/undo/UndoableEdit;
 editToBeUndone
  ()Ljavax/swing/undo/UndoableEdit;
- ()Ljavax/swing/undo/UndoableEdit;
+ ()L0javax/swing/undo/UndoableEdit;
 getRedoPresentationName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/javax/swing/undo/UndoableEditSupport.eea b/libs/eea-java-17/src/main/resources/javax/swing/undo/UndoableEditSupport.eea
index 986e5864e4..4002a4a243 100644
--- a/libs/eea-java-17/src/main/resources/javax/swing/undo/UndoableEditSupport.eea
+++ b/libs/eea-java-17/src/main/resources/javax/swing/undo/UndoableEditSupport.eea
@@ -21,7 +21,7 @@ addUndoableEditListener
  (L1javax/swing/event/UndoableEditListener;)V
 createCompoundEdit
  ()Ljavax/swing/undo/CompoundEdit;
- ()Ljavax/swing/undo/CompoundEdit;
+ ()L1javax/swing/undo/CompoundEdit;
 getUndoableEditListeners
  ()[Ljavax/swing/event/UndoableEditListener;
  ()[Ljavax/swing/event/UndoableEditListener;
diff --git a/libs/eea-java-17/src/main/resources/javax/tools/ForwardingJavaFileManager.eea b/libs/eea-java-17/src/main/resources/javax/tools/ForwardingJavaFileManager.eea
index 1f246f2390..0a2bcb781d 100644
--- a/libs/eea-java-17/src/main/resources/javax/tools/ForwardingJavaFileManager.eea
+++ b/libs/eea-java-17/src/main/resources/javax/tools/ForwardingJavaFileManager.eea
@@ -29,13 +29,13 @@ getJavaFileForOutput
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;Ljavax/tools/JavaFileObject$Kind;Ljavax/tools/FileObject;)Ljavax/tools/JavaFileObject;
 getLocationForModule
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;)Ljavax/tools/JavaFileManager$Location;
- (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;)Ljavax/tools/JavaFileManager$Location;
+ (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;)L1javax/tools/JavaFileManager$Location; # @Inherited(javax.tools.JavaFileManager)
 getLocationForModule
  (Ljavax/tools/JavaFileManager$Location;Ljavax/tools/JavaFileObject;)Ljavax/tools/JavaFileManager$Location;
- (Ljavax/tools/JavaFileManager$Location;Ljavax/tools/JavaFileObject;)Ljavax/tools/JavaFileManager$Location;
+ (Ljavax/tools/JavaFileManager$Location;Ljavax/tools/JavaFileObject;)L1javax/tools/JavaFileManager$Location; # @Inherited(javax.tools.JavaFileManager)
 getServiceLoader
  <S:Ljava/lang/Object;>(Ljavax/tools/JavaFileManager$Location;Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
- <S:Ljava/lang/Object;>(Ljavax/tools/JavaFileManager$Location;Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
+ <S:Ljava/lang/Object;>(Ljavax/tools/JavaFileManager$Location;Ljava/lang/Class<TS;>;)L1java/util/ServiceLoader<TS;>; # @Inherited(javax.tools.JavaFileManager)
 handleOption
  (Ljava/lang/String;Ljava/util/Iterator<Ljava/lang/String;>;)Z
  (Ljava/lang/String;Ljava/util/Iterator<Ljava/lang/String;>;)Z
@@ -47,7 +47,7 @@ inferBinaryName
  (Ljavax/tools/JavaFileManager$Location;Ljavax/tools/JavaFileObject;)Ljava/lang/String;
 inferModuleName
  (Ljavax/tools/JavaFileManager$Location;)Ljava/lang/String;
- (Ljavax/tools/JavaFileManager$Location;)Ljava/lang/String;
+ (Ljavax/tools/JavaFileManager$Location;)L1java/lang/String; # @Inherited(javax.tools.JavaFileManager)
 isSameFile
  (Ljavax/tools/FileObject;Ljavax/tools/FileObject;)Z
  (Ljavax/tools/FileObject;Ljavax/tools/FileObject;)Z
@@ -59,4 +59,4 @@ list
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;Ljava/util/Set<Ljavax/tools/JavaFileObject$Kind;>;Z)Ljava/lang/Iterable<Ljavax/tools/JavaFileObject;>;
 listLocationsForModules
  (Ljavax/tools/JavaFileManager$Location;)Ljava/lang/Iterable<Ljava/util/Set<Ljavax/tools/JavaFileManager$Location;>;>;
- (Ljavax/tools/JavaFileManager$Location;)Ljava/lang/Iterable<Ljava/util/Set<Ljavax/tools/JavaFileManager$Location;>;>;
+ (Ljavax/tools/JavaFileManager$Location;)L1java/lang/Iterable<Ljava/util/Set<Ljavax/tools/JavaFileManager$Location;>;>; # @Inherited(javax.tools.JavaFileManager)
diff --git a/libs/eea-java-17/src/main/resources/javax/tools/JavaFileManager.eea b/libs/eea-java-17/src/main/resources/javax/tools/JavaFileManager.eea
index 1ff9286358..b4838968ff 100644
--- a/libs/eea-java-17/src/main/resources/javax/tools/JavaFileManager.eea
+++ b/libs/eea-java-17/src/main/resources/javax/tools/JavaFileManager.eea
@@ -20,13 +20,13 @@ getJavaFileForOutput
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;Ljavax/tools/JavaFileObject$Kind;Ljavax/tools/FileObject;)Ljavax/tools/JavaFileObject;
 getLocationForModule
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;)Ljavax/tools/JavaFileManager$Location;
- (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;)Ljavax/tools/JavaFileManager$Location;
+ (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;)L1javax/tools/JavaFileManager$Location;
 getLocationForModule
  (Ljavax/tools/JavaFileManager$Location;Ljavax/tools/JavaFileObject;)Ljavax/tools/JavaFileManager$Location;
- (Ljavax/tools/JavaFileManager$Location;Ljavax/tools/JavaFileObject;)Ljavax/tools/JavaFileManager$Location;
+ (Ljavax/tools/JavaFileManager$Location;Ljavax/tools/JavaFileObject;)L1javax/tools/JavaFileManager$Location;
 getServiceLoader
  <S:Ljava/lang/Object;>(Ljavax/tools/JavaFileManager$Location;Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
- <S:Ljava/lang/Object;>(Ljavax/tools/JavaFileManager$Location;Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
+ <S:Ljava/lang/Object;>(Ljavax/tools/JavaFileManager$Location;Ljava/lang/Class<TS;>;)L1java/util/ServiceLoader<TS;>;
 handleOption
  (Ljava/lang/String;Ljava/util/Iterator<Ljava/lang/String;>;)Z
  (Ljava/lang/String;Ljava/util/Iterator<Ljava/lang/String;>;)Z
@@ -38,7 +38,7 @@ inferBinaryName
  (Ljavax/tools/JavaFileManager$Location;Ljavax/tools/JavaFileObject;)Ljava/lang/String;
 inferModuleName
  (Ljavax/tools/JavaFileManager$Location;)Ljava/lang/String;
- (Ljavax/tools/JavaFileManager$Location;)Ljava/lang/String;
+ (Ljavax/tools/JavaFileManager$Location;)L1java/lang/String;
 isSameFile
  (Ljavax/tools/FileObject;Ljavax/tools/FileObject;)Z
  (Ljavax/tools/FileObject;Ljavax/tools/FileObject;)Z
@@ -47,4 +47,4 @@ list
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;Ljava/util/Set<Ljavax/tools/JavaFileObject$Kind;>;Z)Ljava/lang/Iterable<Ljavax/tools/JavaFileObject;>;
 listLocationsForModules
  (Ljavax/tools/JavaFileManager$Location;)Ljava/lang/Iterable<Ljava/util/Set<Ljavax/tools/JavaFileManager$Location;>;>;
- (Ljavax/tools/JavaFileManager$Location;)Ljava/lang/Iterable<Ljava/util/Set<Ljavax/tools/JavaFileManager$Location;>;>;
+ (Ljavax/tools/JavaFileManager$Location;)L1java/lang/Iterable<Ljava/util/Set<Ljavax/tools/JavaFileManager$Location;>;>;
diff --git a/libs/eea-java-17/src/main/resources/javax/tools/SimpleJavaFileObject.eea b/libs/eea-java-17/src/main/resources/javax/tools/SimpleJavaFileObject.eea
index 623fc92f89..b128217582 100644
--- a/libs/eea-java-17/src/main/resources/javax/tools/SimpleJavaFileObject.eea
+++ b/libs/eea-java-17/src/main/resources/javax/tools/SimpleJavaFileObject.eea
@@ -12,10 +12,10 @@ uri
  (Ljava/net/URI;Ljavax/tools/JavaFileObject$Kind;)V
 getAccessLevel
  ()Ljavax/lang/model/element/Modifier;
- ()Ljavax/lang/model/element/Modifier;
+ ()L0javax/lang/model/element/Modifier;
 getCharContent
  (Z)Ljava/lang/CharSequence;
- (Z)Ljava/lang/CharSequence;
+ (Z)L1java/lang/CharSequence;
 getKind
  ()Ljavax/tools/JavaFileObject$Kind;
  ()Ljavax/tools/JavaFileObject$Kind;
@@ -24,7 +24,7 @@ getName
  ()Ljava/lang/String;
 getNestingKind
  ()Ljavax/lang/model/element/NestingKind;
- ()Ljavax/lang/model/element/NestingKind;
+ ()L0javax/lang/model/element/NestingKind;
 isNameCompatible
  (Ljava/lang/String;Ljavax/tools/JavaFileObject$Kind;)Z
  (Ljava/lang/String;Ljavax/tools/JavaFileObject$Kind;)Z
@@ -36,7 +36,7 @@ openOutputStream
  ()L1java/io/OutputStream; # @Inherited(javax.tools.FileObject)
 openReader
  (Z)Ljava/io/Reader;
- (Z)Ljava/io/Reader;
+ (Z)L1java/io/Reader;
 openWriter
  ()Ljava/io/Writer;
  ()L1java/io/Writer; # @Inherited(javax.tools.FileObject)
diff --git a/libs/eea-java-17/src/main/resources/javax/tools/StandardJavaFileManager.eea b/libs/eea-java-17/src/main/resources/javax/tools/StandardJavaFileManager.eea
index 9dba40b49b..2c109ddf8d 100644
--- a/libs/eea-java-17/src/main/resources/javax/tools/StandardJavaFileManager.eea
+++ b/libs/eea-java-17/src/main/resources/javax/tools/StandardJavaFileManager.eea
@@ -2,7 +2,7 @@ class javax/tools/StandardJavaFileManager
 
 asPath
  (Ljavax/tools/FileObject;)Ljava/nio/file/Path;
- (Ljavax/tools/FileObject;)Ljava/nio/file/Path;
+ (Ljavax/tools/FileObject;)L1java/nio/file/Path;
 getJavaFileObjects
  ([Ljava/io/File;)Ljava/lang/Iterable<+Ljavax/tools/JavaFileObject;>;
  ([Ljava/io/File;)Ljava/lang/Iterable<+Ljavax/tools/JavaFileObject;>;
diff --git a/libs/eea-java-17/src/main/resources/javax/tools/Tool.eea b/libs/eea-java-17/src/main/resources/javax/tools/Tool.eea
index 1e7dfab261..cc81fcd861 100644
--- a/libs/eea-java-17/src/main/resources/javax/tools/Tool.eea
+++ b/libs/eea-java-17/src/main/resources/javax/tools/Tool.eea
@@ -5,7 +5,7 @@ getSourceVersions
  ()Ljava/util/Set<Ljavax/lang/model/SourceVersion;>;
 name
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 run
  (Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/io/OutputStream;[Ljava/lang/String;)I
  (Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/io/OutputStream;[Ljava/lang/String;)I
diff --git a/libs/eea-java-17/src/main/resources/javax/tools/ToolProvider.eea b/libs/eea-java-17/src/main/resources/javax/tools/ToolProvider.eea
index 03296df3c9..a1132393e0 100644
--- a/libs/eea-java-17/src/main/resources/javax/tools/ToolProvider.eea
+++ b/libs/eea-java-17/src/main/resources/javax/tools/ToolProvider.eea
@@ -8,4 +8,4 @@ getSystemJavaCompiler
  ()Ljavax/tools/JavaCompiler;
 getSystemToolClassLoader
  ()Ljava/lang/ClassLoader;
- ()Ljava/lang/ClassLoader;
+ ()L0java/lang/ClassLoader;
diff --git a/libs/eea-java-17/src/main/resources/javax/xml/catalog/CatalogFeatures.eea b/libs/eea-java-17/src/main/resources/javax/xml/catalog/CatalogFeatures.eea
index 32f8cf4486..ede3b59a03 100644
--- a/libs/eea-java-17/src/main/resources/javax/xml/catalog/CatalogFeatures.eea
+++ b/libs/eea-java-17/src/main/resources/javax/xml/catalog/CatalogFeatures.eea
@@ -2,7 +2,7 @@ class javax/xml/catalog/CatalogFeatures
 
 builder
  ()Ljavax/xml/catalog/CatalogFeatures$Builder;
- ()Ljavax/xml/catalog/CatalogFeatures$Builder;
+ ()L1javax/xml/catalog/CatalogFeatures$Builder;
 defaults
  ()Ljavax/xml/catalog/CatalogFeatures;
  ()Ljavax/xml/catalog/CatalogFeatures;
diff --git a/libs/eea-java-17/src/main/resources/javax/xml/catalog/CatalogManager.eea b/libs/eea-java-17/src/main/resources/javax/xml/catalog/CatalogManager.eea
index be92fd5a79..3f891bea06 100644
--- a/libs/eea-java-17/src/main/resources/javax/xml/catalog/CatalogManager.eea
+++ b/libs/eea-java-17/src/main/resources/javax/xml/catalog/CatalogManager.eea
@@ -2,10 +2,10 @@ class javax/xml/catalog/CatalogManager
 
 catalog
  (Ljavax/xml/catalog/CatalogFeatures;[Ljava/net/URI;)Ljavax/xml/catalog/Catalog;
- (Ljavax/xml/catalog/CatalogFeatures;[Ljava/net/URI;)Ljavax/xml/catalog/Catalog;
+ (Ljavax/xml/catalog/CatalogFeatures;[Ljava/net/URI;)L1javax/xml/catalog/Catalog;
 catalogResolver
  (Ljavax/xml/catalog/Catalog;)Ljavax/xml/catalog/CatalogResolver;
- (Ljavax/xml/catalog/Catalog;)Ljavax/xml/catalog/CatalogResolver;
+ (Ljavax/xml/catalog/Catalog;)L1javax/xml/catalog/CatalogResolver;
 catalogResolver
  (Ljavax/xml/catalog/CatalogFeatures;[Ljava/net/URI;)Ljavax/xml/catalog/CatalogResolver;
- (Ljavax/xml/catalog/CatalogFeatures;[Ljava/net/URI;)Ljavax/xml/catalog/CatalogResolver;
+ (Ljavax/xml/catalog/CatalogFeatures;[Ljava/net/URI;)L1javax/xml/catalog/CatalogResolver;
diff --git a/libs/eea-java-17/src/main/resources/javax/xml/catalog/GroupEntry$ResolveType.eea b/libs/eea-java-17/src/main/resources/javax/xml/catalog/GroupEntry$ResolveType.eea
index 6703a6de7a..db6bdcd020 100644
--- a/libs/eea-java-17/src/main/resources/javax/xml/catalog/GroupEntry$ResolveType.eea
+++ b/libs/eea-java-17/src/main/resources/javax/xml/catalog/GroupEntry$ResolveType.eea
@@ -6,7 +6,7 @@ super java/lang/Enum
 
 getType
  (Ljava/lang/String;)Ljavax/xml/catalog/GroupEntry$ResolveType;
- (Ljava/lang/String;)Ljavax/xml/catalog/GroupEntry$ResolveType;
+ (Ljava/lang/String;)L0javax/xml/catalog/GroupEntry$ResolveType;
 
 isType
  (Ljava/lang/String;)Z
diff --git a/libs/eea-java-17/src/main/resources/javax/xml/crypto/KeySelector.eea b/libs/eea-java-17/src/main/resources/javax/xml/crypto/KeySelector.eea
index ad0a2e4698..a2308507cf 100644
--- a/libs/eea-java-17/src/main/resources/javax/xml/crypto/KeySelector.eea
+++ b/libs/eea-java-17/src/main/resources/javax/xml/crypto/KeySelector.eea
@@ -2,7 +2,7 @@ class javax/xml/crypto/KeySelector
 
 singletonKeySelector
  (Ljava/security/Key;)Ljavax/xml/crypto/KeySelector;
- (Ljava/security/Key;)Ljavax/xml/crypto/KeySelector;
+ (Ljava/security/Key;)L1javax/xml/crypto/KeySelector;
 
 select
  (Ljavax/xml/crypto/dsig/keyinfo/KeyInfo;Ljavax/xml/crypto/KeySelector$Purpose;Ljavax/xml/crypto/AlgorithmMethod;Ljavax/xml/crypto/XMLCryptoContext;)Ljavax/xml/crypto/KeySelectorResult;
diff --git a/libs/eea-java-17/src/main/resources/javax/xml/datatype/DatatypeFactory.eea b/libs/eea-java-17/src/main/resources/javax/xml/datatype/DatatypeFactory.eea
index e7ba0eda22..0d25933fa1 100644
--- a/libs/eea-java-17/src/main/resources/javax/xml/datatype/DatatypeFactory.eea
+++ b/libs/eea-java-17/src/main/resources/javax/xml/datatype/DatatypeFactory.eea
@@ -9,7 +9,7 @@ DATATYPEFACTORY_PROPERTY
 
 newDefaultInstance
  ()Ljavax/xml/datatype/DatatypeFactory;
- ()Ljavax/xml/datatype/DatatypeFactory;
+ ()L1javax/xml/datatype/DatatypeFactory;
 newInstance
  ()Ljavax/xml/datatype/DatatypeFactory;
  ()Ljavax/xml/datatype/DatatypeFactory;
diff --git a/libs/eea-java-17/src/main/resources/javax/xml/parsers/DocumentBuilderFactory.eea b/libs/eea-java-17/src/main/resources/javax/xml/parsers/DocumentBuilderFactory.eea
index ab2cf64f48..54efea612e 100644
--- a/libs/eea-java-17/src/main/resources/javax/xml/parsers/DocumentBuilderFactory.eea
+++ b/libs/eea-java-17/src/main/resources/javax/xml/parsers/DocumentBuilderFactory.eea
@@ -2,7 +2,7 @@ class javax/xml/parsers/DocumentBuilderFactory
 
 newDefaultInstance
  ()Ljavax/xml/parsers/DocumentBuilderFactory;
- ()Ljavax/xml/parsers/DocumentBuilderFactory;
+ ()L1javax/xml/parsers/DocumentBuilderFactory;
 newDefaultNSInstance
  ()Ljavax/xml/parsers/DocumentBuilderFactory;
  ()Ljavax/xml/parsers/DocumentBuilderFactory;
@@ -27,7 +27,7 @@ getFeature
  (Ljava/lang/String;)Z
 getSchema
  ()Ljavax/xml/validation/Schema;
- ()Ljavax/xml/validation/Schema;
+ ()L1javax/xml/validation/Schema;
 newDocumentBuilder
  ()Ljavax/xml/parsers/DocumentBuilder;
  ()Ljavax/xml/parsers/DocumentBuilder;
diff --git a/libs/eea-java-17/src/main/resources/javax/xml/parsers/SAXParser.eea b/libs/eea-java-17/src/main/resources/javax/xml/parsers/SAXParser.eea
index 94dbf9ee2a..e5409c4f1e 100644
--- a/libs/eea-java-17/src/main/resources/javax/xml/parsers/SAXParser.eea
+++ b/libs/eea-java-17/src/main/resources/javax/xml/parsers/SAXParser.eea
@@ -8,7 +8,7 @@ getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
 getSchema
  ()Ljavax/xml/validation/Schema;
- ()Ljavax/xml/validation/Schema;
+ ()L1javax/xml/validation/Schema;
 getXMLReader
  ()Lorg/xml/sax/XMLReader;
  ()Lorg/xml/sax/XMLReader;
diff --git a/libs/eea-java-17/src/main/resources/javax/xml/parsers/SAXParserFactory.eea b/libs/eea-java-17/src/main/resources/javax/xml/parsers/SAXParserFactory.eea
index 91e8095cde..7d488a979f 100644
--- a/libs/eea-java-17/src/main/resources/javax/xml/parsers/SAXParserFactory.eea
+++ b/libs/eea-java-17/src/main/resources/javax/xml/parsers/SAXParserFactory.eea
@@ -2,7 +2,7 @@ class javax/xml/parsers/SAXParserFactory
 
 newDefaultInstance
  ()Ljavax/xml/parsers/SAXParserFactory;
- ()Ljavax/xml/parsers/SAXParserFactory;
+ ()L1javax/xml/parsers/SAXParserFactory;
 newDefaultNSInstance
  ()Ljavax/xml/parsers/SAXParserFactory;
  ()Ljavax/xml/parsers/SAXParserFactory;
@@ -24,7 +24,7 @@ getFeature
  (Ljava/lang/String;)Z
 getSchema
  ()Ljavax/xml/validation/Schema;
- ()Ljavax/xml/validation/Schema;
+ ()L1javax/xml/validation/Schema;
 newSAXParser
  ()Ljavax/xml/parsers/SAXParser;
  ()Ljavax/xml/parsers/SAXParser;
diff --git a/libs/eea-java-17/src/main/resources/javax/xml/stream/XMLEventFactory.eea b/libs/eea-java-17/src/main/resources/javax/xml/stream/XMLEventFactory.eea
index 74c77201ff..8949981382 100644
--- a/libs/eea-java-17/src/main/resources/javax/xml/stream/XMLEventFactory.eea
+++ b/libs/eea-java-17/src/main/resources/javax/xml/stream/XMLEventFactory.eea
@@ -2,7 +2,7 @@ class javax/xml/stream/XMLEventFactory
 
 newDefaultFactory
  ()Ljavax/xml/stream/XMLEventFactory;
- ()Ljavax/xml/stream/XMLEventFactory;
+ ()L1javax/xml/stream/XMLEventFactory;
 newFactory
  ()Ljavax/xml/stream/XMLEventFactory;
  ()Ljavax/xml/stream/XMLEventFactory;
@@ -18,79 +18,79 @@ newInstance
 
 createAttribute
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/Attribute;
- (Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/Attribute;
+ (Ljava/lang/String;Ljava/lang/String;)L1javax/xml/stream/events/Attribute;
 createAttribute
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/Attribute;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/Attribute;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1javax/xml/stream/events/Attribute;
 createAttribute
  (Ljavax/xml/namespace/QName;Ljava/lang/String;)Ljavax/xml/stream/events/Attribute;
- (Ljavax/xml/namespace/QName;Ljava/lang/String;)Ljavax/xml/stream/events/Attribute;
+ (Ljavax/xml/namespace/QName;Ljava/lang/String;)L1javax/xml/stream/events/Attribute;
 createCData
  (Ljava/lang/String;)Ljavax/xml/stream/events/Characters;
- (Ljava/lang/String;)Ljavax/xml/stream/events/Characters;
+ (Ljava/lang/String;)L1javax/xml/stream/events/Characters;
 createCharacters
  (Ljava/lang/String;)Ljavax/xml/stream/events/Characters;
- (Ljava/lang/String;)Ljavax/xml/stream/events/Characters;
+ (Ljava/lang/String;)L1javax/xml/stream/events/Characters;
 createComment
  (Ljava/lang/String;)Ljavax/xml/stream/events/Comment;
- (Ljava/lang/String;)Ljavax/xml/stream/events/Comment;
+ (Ljava/lang/String;)L1javax/xml/stream/events/Comment;
 createDTD
  (Ljava/lang/String;)Ljavax/xml/stream/events/DTD;
- (Ljava/lang/String;)Ljavax/xml/stream/events/DTD;
+ (Ljava/lang/String;)L1javax/xml/stream/events/DTD;
 createEndDocument
  ()Ljavax/xml/stream/events/EndDocument;
- ()Ljavax/xml/stream/events/EndDocument;
+ ()L1javax/xml/stream/events/EndDocument;
 createEndElement
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/EndElement;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/EndElement;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1javax/xml/stream/events/EndElement;
 createEndElement
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)Ljavax/xml/stream/events/EndElement;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)Ljavax/xml/stream/events/EndElement;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)L1javax/xml/stream/events/EndElement;
 createEndElement
  (Ljavax/xml/namespace/QName;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)Ljavax/xml/stream/events/EndElement;
- (Ljavax/xml/namespace/QName;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)Ljavax/xml/stream/events/EndElement;
+ (Ljavax/xml/namespace/QName;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)L1javax/xml/stream/events/EndElement;
 createEntityReference
  (Ljava/lang/String;Ljavax/xml/stream/events/EntityDeclaration;)Ljavax/xml/stream/events/EntityReference;
- (Ljava/lang/String;Ljavax/xml/stream/events/EntityDeclaration;)Ljavax/xml/stream/events/EntityReference;
+ (Ljava/lang/String;Ljavax/xml/stream/events/EntityDeclaration;)L1javax/xml/stream/events/EntityReference;
 createIgnorableSpace
  (Ljava/lang/String;)Ljavax/xml/stream/events/Characters;
- (Ljava/lang/String;)Ljavax/xml/stream/events/Characters;
+ (Ljava/lang/String;)L1javax/xml/stream/events/Characters;
 createNamespace
  (Ljava/lang/String;)Ljavax/xml/stream/events/Namespace;
- (Ljava/lang/String;)Ljavax/xml/stream/events/Namespace;
+ (Ljava/lang/String;)L1javax/xml/stream/events/Namespace;
 createNamespace
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/Namespace;
- (Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/Namespace;
+ (Ljava/lang/String;Ljava/lang/String;)L1javax/xml/stream/events/Namespace;
 createProcessingInstruction
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/ProcessingInstruction;
- (Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/ProcessingInstruction;
+ (Ljava/lang/String;Ljava/lang/String;)L1javax/xml/stream/events/ProcessingInstruction;
 createSpace
  (Ljava/lang/String;)Ljavax/xml/stream/events/Characters;
- (Ljava/lang/String;)Ljavax/xml/stream/events/Characters;
+ (Ljava/lang/String;)L1javax/xml/stream/events/Characters;
 createStartDocument
  ()Ljavax/xml/stream/events/StartDocument;
- ()Ljavax/xml/stream/events/StartDocument;
+ ()L1javax/xml/stream/events/StartDocument;
 createStartDocument
  (Ljava/lang/String;)Ljavax/xml/stream/events/StartDocument;
- (Ljava/lang/String;)Ljavax/xml/stream/events/StartDocument;
+ (Ljava/lang/String;)L1javax/xml/stream/events/StartDocument;
 createStartDocument
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/StartDocument;
- (Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/StartDocument;
+ (Ljava/lang/String;Ljava/lang/String;)L1javax/xml/stream/events/StartDocument;
 createStartDocument
  (Ljava/lang/String;Ljava/lang/String;Z)Ljavax/xml/stream/events/StartDocument;
- (Ljava/lang/String;Ljava/lang/String;Z)Ljavax/xml/stream/events/StartDocument;
+ (Ljava/lang/String;Ljava/lang/String;Z)L1javax/xml/stream/events/StartDocument;
 createStartElement
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/StartElement;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/StartElement;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1javax/xml/stream/events/StartElement;
 createStartElement
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)Ljavax/xml/stream/events/StartElement;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)Ljavax/xml/stream/events/StartElement;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)L1javax/xml/stream/events/StartElement;
 createStartElement
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;Ljavax/xml/namespace/NamespaceContext;)Ljavax/xml/stream/events/StartElement;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;Ljavax/xml/namespace/NamespaceContext;)Ljavax/xml/stream/events/StartElement;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;Ljavax/xml/namespace/NamespaceContext;)L1javax/xml/stream/events/StartElement;
 createStartElement
  (Ljavax/xml/namespace/QName;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)Ljavax/xml/stream/events/StartElement;
- (Ljavax/xml/namespace/QName;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)Ljavax/xml/stream/events/StartElement;
+ (Ljavax/xml/namespace/QName;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)L1javax/xml/stream/events/StartElement;
 setLocation
  (Ljavax/xml/stream/Location;)V
  (Ljavax/xml/stream/Location;)V
diff --git a/libs/eea-java-17/src/main/resources/javax/xml/transform/TransformerException.eea b/libs/eea-java-17/src/main/resources/javax/xml/transform/TransformerException.eea
index 398cd55bba..a24d9cb1c9 100644
--- a/libs/eea-java-17/src/main/resources/javax/xml/transform/TransformerException.eea
+++ b/libs/eea-java-17/src/main/resources/javax/xml/transform/TransformerException.eea
@@ -23,13 +23,13 @@ getException
  ()Ljava/lang/Throwable;
 getLocationAsString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getLocator
  ()Ljavax/xml/transform/SourceLocator;
  ()Ljavax/xml/transform/SourceLocator;
 getMessageAndLocation
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 initCause
  (Ljava/lang/Throwable;)Ljava/lang/Throwable;
  (L0java/lang/Throwable;)Ljava/lang/Throwable; # @Inherited(java.lang.Throwable)
diff --git a/libs/eea-java-17/src/main/resources/javax/xml/transform/TransformerFactory.eea b/libs/eea-java-17/src/main/resources/javax/xml/transform/TransformerFactory.eea
index d02b833a77..025dc3b713 100644
--- a/libs/eea-java-17/src/main/resources/javax/xml/transform/TransformerFactory.eea
+++ b/libs/eea-java-17/src/main/resources/javax/xml/transform/TransformerFactory.eea
@@ -2,7 +2,7 @@ class javax/xml/transform/TransformerFactory
 
 newDefaultInstance
  ()Ljavax/xml/transform/TransformerFactory;
- ()Ljavax/xml/transform/TransformerFactory;
+ ()L1javax/xml/transform/TransformerFactory;
 newInstance
  ()Ljavax/xml/transform/TransformerFactory;
  ()Ljavax/xml/transform/TransformerFactory;
diff --git a/libs/eea-java-17/src/main/resources/javax/xml/transform/sax/SAXSource.eea b/libs/eea-java-17/src/main/resources/javax/xml/transform/sax/SAXSource.eea
index ac2247dbea..b1ad8085ac 100644
--- a/libs/eea-java-17/src/main/resources/javax/xml/transform/sax/SAXSource.eea
+++ b/libs/eea-java-17/src/main/resources/javax/xml/transform/sax/SAXSource.eea
@@ -6,7 +6,7 @@ FEATURE
 
 sourceToInputSource
  (Ljavax/xml/transform/Source;)Lorg/xml/sax/InputSource;
- (Ljavax/xml/transform/Source;)Lorg/xml/sax/InputSource;
+ (Ljavax/xml/transform/Source;)L0org/xml/sax/InputSource;
 
 <init>
  (Lorg/xml/sax/InputSource;)V
@@ -19,7 +19,7 @@ getInputSource
  ()Lorg/xml/sax/InputSource;
 getSystemId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getXMLReader
  ()Lorg/xml/sax/XMLReader;
  ()Lorg/xml/sax/XMLReader;
diff --git a/libs/eea-java-17/src/main/resources/javax/xml/transform/stax/StAXResult.eea b/libs/eea-java-17/src/main/resources/javax/xml/transform/stax/StAXResult.eea
index 7398cc8321..e3f984b5c5 100644
--- a/libs/eea-java-17/src/main/resources/javax/xml/transform/stax/StAXResult.eea
+++ b/libs/eea-java-17/src/main/resources/javax/xml/transform/stax/StAXResult.eea
@@ -12,7 +12,7 @@ FEATURE
  (Ljavax/xml/stream/XMLStreamWriter;)V
 getSystemId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getXMLEventWriter
  ()Ljavax/xml/stream/XMLEventWriter;
  ()Ljavax/xml/stream/XMLEventWriter;
diff --git a/libs/eea-java-17/src/main/resources/javax/xml/validation/SchemaFactory.eea b/libs/eea-java-17/src/main/resources/javax/xml/validation/SchemaFactory.eea
index c02b3ef9e4..506ba99df2 100644
--- a/libs/eea-java-17/src/main/resources/javax/xml/validation/SchemaFactory.eea
+++ b/libs/eea-java-17/src/main/resources/javax/xml/validation/SchemaFactory.eea
@@ -2,7 +2,7 @@ class javax/xml/validation/SchemaFactory
 
 newDefaultInstance
  ()Ljavax/xml/validation/SchemaFactory;
- ()Ljavax/xml/validation/SchemaFactory;
+ ()L1javax/xml/validation/SchemaFactory;
 newInstance
  (Ljava/lang/String;)Ljavax/xml/validation/SchemaFactory;
  (Ljava/lang/String;)Ljavax/xml/validation/SchemaFactory;
@@ -18,7 +18,7 @@ getFeature
  (Ljava/lang/String;)Z
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
 getResourceResolver
  ()Lorg/w3c/dom/ls/LSResourceResolver;
  ()Lorg/w3c/dom/ls/LSResourceResolver;
diff --git a/libs/eea-java-17/src/main/resources/javax/xml/validation/Validator.eea b/libs/eea-java-17/src/main/resources/javax/xml/validation/Validator.eea
index a9aeac0e57..df88c55570 100644
--- a/libs/eea-java-17/src/main/resources/javax/xml/validation/Validator.eea
+++ b/libs/eea-java-17/src/main/resources/javax/xml/validation/Validator.eea
@@ -8,7 +8,7 @@ getFeature
  (Ljava/lang/String;)Z
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
 getResourceResolver
  ()Lorg/w3c/dom/ls/LSResourceResolver;
  ()Lorg/w3c/dom/ls/LSResourceResolver;
diff --git a/libs/eea-java-17/src/main/resources/javax/xml/validation/ValidatorHandler.eea b/libs/eea-java-17/src/main/resources/javax/xml/validation/ValidatorHandler.eea
index 1e74745dbf..994007f425 100644
--- a/libs/eea-java-17/src/main/resources/javax/xml/validation/ValidatorHandler.eea
+++ b/libs/eea-java-17/src/main/resources/javax/xml/validation/ValidatorHandler.eea
@@ -11,7 +11,7 @@ getFeature
  (Ljava/lang/String;)Z
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
 getResourceResolver
  ()Lorg/w3c/dom/ls/LSResourceResolver;
  ()Lorg/w3c/dom/ls/LSResourceResolver;
diff --git a/libs/eea-java-17/src/main/resources/javax/xml/xpath/XPathEvaluationResult$XPathResultType.eea b/libs/eea-java-17/src/main/resources/javax/xml/xpath/XPathEvaluationResult$XPathResultType.eea
index 09707c699e..433b6ea250 100644
--- a/libs/eea-java-17/src/main/resources/javax/xml/xpath/XPathEvaluationResult$XPathResultType.eea
+++ b/libs/eea-java-17/src/main/resources/javax/xml/xpath/XPathEvaluationResult$XPathResultType.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 getQNameType
  (Ljava/lang/Class<*>;)Ljavax/xml/namespace/QName;
- (Ljava/lang/Class<*>;)Ljavax/xml/namespace/QName;
+ (Ljava/lang/Class<*>;)L0javax/xml/namespace/QName;
diff --git a/libs/eea-java-17/src/main/resources/javax/xml/xpath/XPathFactory.eea b/libs/eea-java-17/src/main/resources/javax/xml/xpath/XPathFactory.eea
index 49f2467ca1..006f3fb018 100644
--- a/libs/eea-java-17/src/main/resources/javax/xml/xpath/XPathFactory.eea
+++ b/libs/eea-java-17/src/main/resources/javax/xml/xpath/XPathFactory.eea
@@ -9,7 +9,7 @@ DEFAULT_PROPERTY_NAME
 
 newDefaultInstance
  ()Ljavax/xml/xpath/XPathFactory;
- ()Ljavax/xml/xpath/XPathFactory;
+ ()L1javax/xml/xpath/XPathFactory;
 newInstance
  ()Ljavax/xml/xpath/XPathFactory;
  ()Ljavax/xml/xpath/XPathFactory;
diff --git a/libs/eea-java-17/src/main/resources/org/w3c/dom/DOMImplementation.eea b/libs/eea-java-17/src/main/resources/org/w3c/dom/DOMImplementation.eea
index 89d4f76c1c..c0c6bca360 100644
--- a/libs/eea-java-17/src/main/resources/org/w3c/dom/DOMImplementation.eea
+++ b/libs/eea-java-17/src/main/resources/org/w3c/dom/DOMImplementation.eea
@@ -2,10 +2,10 @@ class org/w3c/dom/DOMImplementation
 
 createDocument
  (Ljava/lang/String;Ljava/lang/String;Lorg/w3c/dom/DocumentType;)Lorg/w3c/dom/Document;
- (Ljava/lang/String;Ljava/lang/String;Lorg/w3c/dom/DocumentType;)Lorg/w3c/dom/Document;
+ (Ljava/lang/String;Ljava/lang/String;Lorg/w3c/dom/DocumentType;)L1org/w3c/dom/Document;
 createDocumentType
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/DocumentType;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/DocumentType;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1org/w3c/dom/DocumentType;
 getFeature
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-java-17/src/main/resources/org/w3c/dom/Document.eea b/libs/eea-java-17/src/main/resources/org/w3c/dom/Document.eea
index 9f5649458b..e6ece56fad 100644
--- a/libs/eea-java-17/src/main/resources/org/w3c/dom/Document.eea
+++ b/libs/eea-java-17/src/main/resources/org/w3c/dom/Document.eea
@@ -29,7 +29,7 @@ createEntityReference
  (Ljava/lang/String;)L1org/w3c/dom/EntityReference;
 createProcessingInstruction
  (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/ProcessingInstruction;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/ProcessingInstruction;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/w3c/dom/ProcessingInstruction;
 createTextNode
  (Ljava/lang/String;)Lorg/w3c/dom/Text;
  (Ljava/lang/String;)L1org/w3c/dom/Text;
diff --git a/libs/eea-java-17/src/main/resources/org/w3c/dom/bootstrap/DOMImplementationRegistry.eea b/libs/eea-java-17/src/main/resources/org/w3c/dom/bootstrap/DOMImplementationRegistry.eea
index 79370b4eca..a646afbe91 100644
--- a/libs/eea-java-17/src/main/resources/org/w3c/dom/bootstrap/DOMImplementationRegistry.eea
+++ b/libs/eea-java-17/src/main/resources/org/w3c/dom/bootstrap/DOMImplementationRegistry.eea
@@ -6,14 +6,14 @@ PROPERTY
 
 newInstance
  ()Lorg/w3c/dom/bootstrap/DOMImplementationRegistry;
- ()Lorg/w3c/dom/bootstrap/DOMImplementationRegistry;
+ ()L1org/w3c/dom/bootstrap/DOMImplementationRegistry;
 
 addSource
  (Lorg/w3c/dom/DOMImplementationSource;)V
  (Lorg/w3c/dom/DOMImplementationSource;)V
 getDOMImplementation
  (Ljava/lang/String;)Lorg/w3c/dom/DOMImplementation;
- (Ljava/lang/String;)Lorg/w3c/dom/DOMImplementation;
+ (Ljava/lang/String;)L0org/w3c/dom/DOMImplementation;
 getDOMImplementationList
  (Ljava/lang/String;)Lorg/w3c/dom/DOMImplementationList;
- (Ljava/lang/String;)Lorg/w3c/dom/DOMImplementationList;
+ (Ljava/lang/String;)L1org/w3c/dom/DOMImplementationList;
diff --git a/libs/eea-java-17/src/main/resources/org/w3c/dom/css/DOMImplementationCSS.eea b/libs/eea-java-17/src/main/resources/org/w3c/dom/css/DOMImplementationCSS.eea
index 941911f546..b3ebf8d903 100644
--- a/libs/eea-java-17/src/main/resources/org/w3c/dom/css/DOMImplementationCSS.eea
+++ b/libs/eea-java-17/src/main/resources/org/w3c/dom/css/DOMImplementationCSS.eea
@@ -2,4 +2,4 @@ class org/w3c/dom/css/DOMImplementationCSS
 
 createCSSStyleSheet
  (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/css/CSSStyleSheet;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/css/CSSStyleSheet;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/w3c/dom/css/CSSStyleSheet;
diff --git a/libs/eea-java-17/src/main/resources/org/w3c/dom/events/DocumentEvent.eea b/libs/eea-java-17/src/main/resources/org/w3c/dom/events/DocumentEvent.eea
index 9cfe09a367..bba3043acf 100644
--- a/libs/eea-java-17/src/main/resources/org/w3c/dom/events/DocumentEvent.eea
+++ b/libs/eea-java-17/src/main/resources/org/w3c/dom/events/DocumentEvent.eea
@@ -2,4 +2,4 @@ class org/w3c/dom/events/DocumentEvent
 
 createEvent
  (Ljava/lang/String;)Lorg/w3c/dom/events/Event;
- (Ljava/lang/String;)Lorg/w3c/dom/events/Event;
+ (Ljava/lang/String;)L1org/w3c/dom/events/Event;
diff --git a/libs/eea-java-17/src/main/resources/org/w3c/dom/html/HTMLDOMImplementation.eea b/libs/eea-java-17/src/main/resources/org/w3c/dom/html/HTMLDOMImplementation.eea
index 9cd2452263..d57a172db4 100644
--- a/libs/eea-java-17/src/main/resources/org/w3c/dom/html/HTMLDOMImplementation.eea
+++ b/libs/eea-java-17/src/main/resources/org/w3c/dom/html/HTMLDOMImplementation.eea
@@ -2,4 +2,4 @@ class org/w3c/dom/html/HTMLDOMImplementation
 
 createHTMLDocument
  (Ljava/lang/String;)Lorg/w3c/dom/html/HTMLDocument;
- (Ljava/lang/String;)Lorg/w3c/dom/html/HTMLDocument;
+ (Ljava/lang/String;)L1org/w3c/dom/html/HTMLDocument;
diff --git a/libs/eea-java-17/src/main/resources/org/w3c/dom/html/HTMLTableElement.eea b/libs/eea-java-17/src/main/resources/org/w3c/dom/html/HTMLTableElement.eea
index d948e121cf..a628fbd14e 100644
--- a/libs/eea-java-17/src/main/resources/org/w3c/dom/html/HTMLTableElement.eea
+++ b/libs/eea-java-17/src/main/resources/org/w3c/dom/html/HTMLTableElement.eea
@@ -2,13 +2,13 @@ class org/w3c/dom/html/HTMLTableElement
 
 createCaption
  ()Lorg/w3c/dom/html/HTMLElement;
- ()Lorg/w3c/dom/html/HTMLElement;
+ ()L1org/w3c/dom/html/HTMLElement;
 createTFoot
  ()Lorg/w3c/dom/html/HTMLElement;
- ()Lorg/w3c/dom/html/HTMLElement;
+ ()L1org/w3c/dom/html/HTMLElement;
 createTHead
  ()Lorg/w3c/dom/html/HTMLElement;
- ()Lorg/w3c/dom/html/HTMLElement;
+ ()L1org/w3c/dom/html/HTMLElement;
 getAlign
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/org/w3c/dom/ls/DOMImplementationLS.eea b/libs/eea-java-17/src/main/resources/org/w3c/dom/ls/DOMImplementationLS.eea
index b3a339ba7a..d113174c70 100644
--- a/libs/eea-java-17/src/main/resources/org/w3c/dom/ls/DOMImplementationLS.eea
+++ b/libs/eea-java-17/src/main/resources/org/w3c/dom/ls/DOMImplementationLS.eea
@@ -2,13 +2,13 @@ class org/w3c/dom/ls/DOMImplementationLS
 
 createLSInput
  ()Lorg/w3c/dom/ls/LSInput;
- ()Lorg/w3c/dom/ls/LSInput;
+ ()L1org/w3c/dom/ls/LSInput;
 createLSOutput
  ()Lorg/w3c/dom/ls/LSOutput;
- ()Lorg/w3c/dom/ls/LSOutput;
+ ()L1org/w3c/dom/ls/LSOutput;
 createLSParser
  (SLjava/lang/String;)Lorg/w3c/dom/ls/LSParser;
- (SLjava/lang/String;)Lorg/w3c/dom/ls/LSParser;
+ (SLjava/lang/String;)L1org/w3c/dom/ls/LSParser;
 createLSSerializer
  ()Lorg/w3c/dom/ls/LSSerializer;
- ()Lorg/w3c/dom/ls/LSSerializer;
+ ()L1org/w3c/dom/ls/LSSerializer;
diff --git a/libs/eea-java-17/src/main/resources/org/w3c/dom/ranges/DocumentRange.eea b/libs/eea-java-17/src/main/resources/org/w3c/dom/ranges/DocumentRange.eea
index 863aea84ae..32ebcee572 100644
--- a/libs/eea-java-17/src/main/resources/org/w3c/dom/ranges/DocumentRange.eea
+++ b/libs/eea-java-17/src/main/resources/org/w3c/dom/ranges/DocumentRange.eea
@@ -2,4 +2,4 @@ class org/w3c/dom/ranges/DocumentRange
 
 createRange
  ()Lorg/w3c/dom/ranges/Range;
- ()Lorg/w3c/dom/ranges/Range;
+ ()L1org/w3c/dom/ranges/Range;
diff --git a/libs/eea-java-17/src/main/resources/org/w3c/dom/traversal/DocumentTraversal.eea b/libs/eea-java-17/src/main/resources/org/w3c/dom/traversal/DocumentTraversal.eea
index 5f149e5966..21eaa603f5 100644
--- a/libs/eea-java-17/src/main/resources/org/w3c/dom/traversal/DocumentTraversal.eea
+++ b/libs/eea-java-17/src/main/resources/org/w3c/dom/traversal/DocumentTraversal.eea
@@ -2,7 +2,7 @@ class org/w3c/dom/traversal/DocumentTraversal
 
 createNodeIterator
  (Lorg/w3c/dom/Node;ILorg/w3c/dom/traversal/NodeFilter;Z)Lorg/w3c/dom/traversal/NodeIterator;
- (Lorg/w3c/dom/Node;ILorg/w3c/dom/traversal/NodeFilter;Z)Lorg/w3c/dom/traversal/NodeIterator;
+ (Lorg/w3c/dom/Node;ILorg/w3c/dom/traversal/NodeFilter;Z)L1org/w3c/dom/traversal/NodeIterator;
 createTreeWalker
  (Lorg/w3c/dom/Node;ILorg/w3c/dom/traversal/NodeFilter;Z)Lorg/w3c/dom/traversal/TreeWalker;
- (Lorg/w3c/dom/Node;ILorg/w3c/dom/traversal/NodeFilter;Z)Lorg/w3c/dom/traversal/TreeWalker;
+ (Lorg/w3c/dom/Node;ILorg/w3c/dom/traversal/NodeFilter;Z)L1org/w3c/dom/traversal/TreeWalker;
diff --git a/libs/eea-java-17/src/main/resources/org/w3c/dom/xpath/XPathEvaluator.eea b/libs/eea-java-17/src/main/resources/org/w3c/dom/xpath/XPathEvaluator.eea
index 423a4fda29..cb38c5b162 100644
--- a/libs/eea-java-17/src/main/resources/org/w3c/dom/xpath/XPathEvaluator.eea
+++ b/libs/eea-java-17/src/main/resources/org/w3c/dom/xpath/XPathEvaluator.eea
@@ -2,10 +2,10 @@ class org/w3c/dom/xpath/XPathEvaluator
 
 createExpression
  (Ljava/lang/String;Lorg/w3c/dom/xpath/XPathNSResolver;)Lorg/w3c/dom/xpath/XPathExpression;
- (Ljava/lang/String;Lorg/w3c/dom/xpath/XPathNSResolver;)Lorg/w3c/dom/xpath/XPathExpression;
+ (Ljava/lang/String;Lorg/w3c/dom/xpath/XPathNSResolver;)L1org/w3c/dom/xpath/XPathExpression;
 createNSResolver
  (Lorg/w3c/dom/Node;)Lorg/w3c/dom/xpath/XPathNSResolver;
- (Lorg/w3c/dom/Node;)Lorg/w3c/dom/xpath/XPathNSResolver;
+ (Lorg/w3c/dom/Node;)L1org/w3c/dom/xpath/XPathNSResolver;
 evaluate
  (Ljava/lang/String;Lorg/w3c/dom/Node;Lorg/w3c/dom/xpath/XPathNSResolver;SLjava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/String;Lorg/w3c/dom/Node;Lorg/w3c/dom/xpath/XPathNSResolver;SLjava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-java-17/src/main/resources/org/xml/sax/ext/DefaultHandler2.eea b/libs/eea-java-17/src/main/resources/org/xml/sax/ext/DefaultHandler2.eea
index 83cb1f46c5..53f60346f6 100644
--- a/libs/eea-java-17/src/main/resources/org/xml/sax/ext/DefaultHandler2.eea
+++ b/libs/eea-java-17/src/main/resources/org/xml/sax/ext/DefaultHandler2.eea
@@ -17,7 +17,7 @@ externalEntityDecl
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 getExternalSubset
  (Ljava/lang/String;Ljava/lang/String;)Lorg/xml/sax/InputSource;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/xml/sax/InputSource;
+ (Ljava/lang/String;Ljava/lang/String;)L0org/xml/sax/InputSource;
 internalEntityDecl
  (Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;)V
@@ -26,7 +26,7 @@ resolveEntity
  (L0java/lang/String;L0java/lang/String;)L0org/xml/sax/InputSource; # @Inherited(org.xml.sax.helpers.DefaultHandler)
 resolveEntity
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/xml/sax/InputSource;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/xml/sax/InputSource;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L0org/xml/sax/InputSource;
 startDTD
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-java-17/src/main/resources/org/xml/sax/helpers/AttributeListImpl.eea b/libs/eea-java-17/src/main/resources/org/xml/sax/helpers/AttributeListImpl.eea
index 8eb72058d0..65f82e8c58 100644
--- a/libs/eea-java-17/src/main/resources/org/xml/sax/helpers/AttributeListImpl.eea
+++ b/libs/eea-java-17/src/main/resources/org/xml/sax/helpers/AttributeListImpl.eea
@@ -8,16 +8,16 @@ addAttribute
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 getName
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getType
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getType
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
 getValue
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getValue
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/org/xml/sax/helpers/AttributesImpl.eea b/libs/eea-java-17/src/main/resources/org/xml/sax/helpers/AttributesImpl.eea
index 64dce0d3f0..bb31fecc9b 100644
--- a/libs/eea-java-17/src/main/resources/org/xml/sax/helpers/AttributesImpl.eea
+++ b/libs/eea-java-17/src/main/resources/org/xml/sax/helpers/AttributesImpl.eea
@@ -14,31 +14,31 @@ getIndex
  (Ljava/lang/String;Ljava/lang/String;)I
 getLocalName
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getQName
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getType
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getType
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getType
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L0java/lang/String;
 getURI
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getValue
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getValue
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getValue
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L0java/lang/String;
 setAttribute
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-java-17/src/main/resources/org/xml/sax/helpers/NamespaceSupport.eea b/libs/eea-java-17/src/main/resources/org/xml/sax/helpers/NamespaceSupport.eea
index ee4f732ec7..be8dec00d3 100644
--- a/libs/eea-java-17/src/main/resources/org/xml/sax/helpers/NamespaceSupport.eea
+++ b/libs/eea-java-17/src/main/resources/org/xml/sax/helpers/NamespaceSupport.eea
@@ -27,4 +27,4 @@ getURI
  (Ljava/lang/String;)Ljava/lang/String;
 processName
  (Ljava/lang/String;[Ljava/lang/String;Z)[Ljava/lang/String;
- (Ljava/lang/String;[Ljava/lang/String;Z)[Ljava/lang/String;
+ (Ljava/lang/String;[Ljava/lang/String;Z)[0Ljava/lang/String;
diff --git a/libs/eea-java-17/src/main/resources/org/xml/sax/helpers/ParserAdapter.eea b/libs/eea-java-17/src/main/resources/org/xml/sax/helpers/ParserAdapter.eea
index 87ebae1114..0a162dd55d 100644
--- a/libs/eea-java-17/src/main/resources/org/xml/sax/helpers/ParserAdapter.eea
+++ b/libs/eea-java-17/src/main/resources/org/xml/sax/helpers/ParserAdapter.eea
@@ -26,7 +26,7 @@ getFeature
  (Ljava/lang/String;)Z
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
 ignorableWhitespace
  ([CII)V
  ([1CII)V # @Inherited(org.xml.sax.DocumentHandler)
diff --git a/libs/eea-java-17/src/main/resources/org/xml/sax/helpers/XMLReaderFactory.eea b/libs/eea-java-17/src/main/resources/org/xml/sax/helpers/XMLReaderFactory.eea
index 244b5634dc..1e20a51753 100644
--- a/libs/eea-java-17/src/main/resources/org/xml/sax/helpers/XMLReaderFactory.eea
+++ b/libs/eea-java-17/src/main/resources/org/xml/sax/helpers/XMLReaderFactory.eea
@@ -2,7 +2,7 @@ class org/xml/sax/helpers/XMLReaderFactory
 
 createXMLReader
  ()Lorg/xml/sax/XMLReader;
- ()Lorg/xml/sax/XMLReader;
+ ()L1org/xml/sax/XMLReader;
 createXMLReader
  (Ljava/lang/String;)Lorg/xml/sax/XMLReader;
- (Ljava/lang/String;)Lorg/xml/sax/XMLReader;
+ (Ljava/lang/String;)L1org/xml/sax/XMLReader;
diff --git a/libs/eea-java-21/src/main/resources/java/applet/Applet.eea b/libs/eea-java-21/src/main/resources/java/applet/Applet.eea
index 0122565f9b..8016efc1df 100644
--- a/libs/eea-java-21/src/main/resources/java/applet/Applet.eea
+++ b/libs/eea-java-21/src/main/resources/java/applet/Applet.eea
@@ -12,13 +12,13 @@ getAppletContext
  ()Ljava/applet/AppletContext;
 getAppletInfo
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getAudioClip
  (Ljava/net/URL;)Ljava/applet/AudioClip;
  (Ljava/net/URL;)Ljava/applet/AudioClip;
 getAudioClip
  (Ljava/net/URL;Ljava/lang/String;)Ljava/applet/AudioClip;
- (Ljava/net/URL;Ljava/lang/String;)Ljava/applet/AudioClip;
+ (Ljava/net/URL;Ljava/lang/String;)L0java/applet/AudioClip;
 getCodeBase
  ()Ljava/net/URL;
  ()Ljava/net/URL;
@@ -30,7 +30,7 @@ getImage
  (Ljava/net/URL;)Ljava/awt/Image;
 getImage
  (Ljava/net/URL;Ljava/lang/String;)Ljava/awt/Image;
- (Ljava/net/URL;Ljava/lang/String;)Ljava/awt/Image;
+ (Ljava/net/URL;Ljava/lang/String;)L0java/awt/Image;
 getLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
@@ -39,7 +39,7 @@ getParameter
  (Ljava/lang/String;)Ljava/lang/String;
 getParameterInfo
  ()[[Ljava/lang/String;
- ()[[Ljava/lang/String;
+ ()[0[Ljava/lang/String;
 play
  (Ljava/net/URL;)V
  (Ljava/net/URL;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/AWTEvent.eea b/libs/eea-java-21/src/main/resources/java/awt/AWTEvent.eea
index a748ee0b09..5481d30710 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/AWTEvent.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/AWTEvent.eea
@@ -8,7 +8,7 @@ class java/awt/AWTEvent
  (Ljava/lang/Object;I)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 setSource
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/AWTKeyStroke.eea b/libs/eea-java-21/src/main/resources/java/awt/AWTKeyStroke.eea
index be39cd61f0..8e828488c9 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/AWTKeyStroke.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/AWTKeyStroke.eea
@@ -17,7 +17,7 @@ getAWTKeyStroke
  (Ljava/lang/String;)Ljava/awt/AWTKeyStroke;
 getAWTKeyStrokeForEvent
  (Ljava/awt/event/KeyEvent;)Ljava/awt/AWTKeyStroke;
- (Ljava/awt/event/KeyEvent;)Ljava/awt/AWTKeyStroke;
+ (Ljava/awt/event/KeyEvent;)L0java/awt/AWTKeyStroke;
 registerSubclass
  (Ljava/lang/Class<*>;)V
  (Ljava/lang/Class<*>;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/AlphaComposite.eea b/libs/eea-java-21/src/main/resources/java/awt/AlphaComposite.eea
index ce4f9a6f28..2fba54041b 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/AlphaComposite.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/AlphaComposite.eea
@@ -46,7 +46,7 @@ getInstance
 
 createContext
  (Ljava/awt/image/ColorModel;Ljava/awt/image/ColorModel;Ljava/awt/RenderingHints;)Ljava/awt/CompositeContext;
- (Ljava/awt/image/ColorModel;Ljava/awt/image/ColorModel;Ljava/awt/RenderingHints;)Ljava/awt/CompositeContext;
+ (Ljava/awt/image/ColorModel;Ljava/awt/image/ColorModel;Ljava/awt/RenderingHints;)L1java/awt/CompositeContext; # @Inherited(java.awt.Composite)
 derive
  (F)Ljava/awt/AlphaComposite;
  (F)Ljava/awt/AlphaComposite;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/BasicStroke.eea b/libs/eea-java-21/src/main/resources/java/awt/BasicStroke.eea
index 192231ef5a..66c7526c31 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/BasicStroke.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/BasicStroke.eea
@@ -5,10 +5,10 @@ class java/awt/BasicStroke
  (FIIF[FF)V
 createStrokedShape
  (Ljava/awt/Shape;)Ljava/awt/Shape;
- (Ljava/awt/Shape;)Ljava/awt/Shape;
+ (Ljava/awt/Shape;)L1java/awt/Shape; # @Inherited(java.awt.Stroke)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getDashArray
  ()[F
- ()[F
+ ()[0F
diff --git a/libs/eea-java-21/src/main/resources/java/awt/BorderLayout.eea b/libs/eea-java-21/src/main/resources/java/awt/BorderLayout.eea
index 5805333e7f..c94a86b689 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/BorderLayout.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/BorderLayout.eea
@@ -48,7 +48,7 @@ addLayoutComponent
  (Ljava/lang/String;Ljava/awt/Component;)V
 getConstraints
  (Ljava/awt/Component;)Ljava/lang/Object;
- (Ljava/awt/Component;)Ljava/lang/Object;
+ (Ljava/awt/Component;)L0java/lang/Object;
 getLayoutAlignmentX
  (Ljava/awt/Container;)F
  (Ljava/awt/Container;)F
@@ -69,7 +69,7 @@ layoutContainer
  (Ljava/awt/Container;)V
 maximumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
- (Ljava/awt/Container;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;)L1java/awt/Dimension;
 minimumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
  (Ljava/awt/Container;)Ljava/awt/Dimension;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Button$AccessibleAWTButton.eea b/libs/eea-java-21/src/main/resources/java/awt/Button$AccessibleAWTButton.eea
index 902032de66..9013393967 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Button$AccessibleAWTButton.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Button$AccessibleAWTButton.eea
@@ -5,10 +5,10 @@ class java/awt/Button$AccessibleAWTButton
  (Ljava/awt/Button;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -17,7 +17,7 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Button.eea b/libs/eea-java-21/src/main/resources/java/awt/Button.eea
index 2f29a41446..36339a6cc5 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Button.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Button.eea
@@ -23,7 +23,7 @@ getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Component)
 processActionEvent
  (Ljava/awt/event/ActionEvent;)V
  (Ljava/awt/event/ActionEvent;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/CardLayout.eea b/libs/eea-java-21/src/main/resources/java/awt/CardLayout.eea
index 288cb6b1d4..24ac061886 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/CardLayout.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/CardLayout.eea
@@ -26,7 +26,7 @@ layoutContainer
  (Ljava/awt/Container;)V
 maximumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
- (Ljava/awt/Container;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;)L1java/awt/Dimension;
 minimumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
  (Ljava/awt/Container;)Ljava/awt/Dimension;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Checkbox$AccessibleAWTCheckbox.eea b/libs/eea-java-21/src/main/resources/java/awt/Checkbox$AccessibleAWTCheckbox.eea
index 4d76d353f7..a8d854ac84 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Checkbox$AccessibleAWTCheckbox.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Checkbox$AccessibleAWTCheckbox.eea
@@ -5,10 +5,10 @@ class java/awt/Checkbox$AccessibleAWTCheckbox
  (Ljava/awt/Checkbox;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
@@ -17,16 +17,16 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getMaximumAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getMinimumAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 itemStateChanged
  (Ljava/awt/event/ItemEvent;)V
  (L1java/awt/event/ItemEvent;)V # @Inherited(java.awt.event.ItemListener)
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Checkbox.eea b/libs/eea-java-21/src/main/resources/java/awt/Checkbox.eea
index 5c744c654c..c79f3c6aa4 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Checkbox.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Checkbox.eea
@@ -32,10 +32,10 @@ getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
 getSelectedObjects
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Component)
 processEvent
  (Ljava/awt/AWTEvent;)V
  (Ljava/awt/AWTEvent;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/CheckboxMenuItem$AccessibleAWTCheckboxMenuItem.eea b/libs/eea-java-21/src/main/resources/java/awt/CheckboxMenuItem$AccessibleAWTCheckboxMenuItem.eea
index d16754c0e8..b1087b3c44 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/CheckboxMenuItem$AccessibleAWTCheckboxMenuItem.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/CheckboxMenuItem$AccessibleAWTCheckboxMenuItem.eea
@@ -5,25 +5,25 @@ class java/awt/CheckboxMenuItem$AccessibleAWTCheckboxMenuItem
  (Ljava/awt/CheckboxMenuItem;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(java.awt.MenuItem$AccessibleAWTMenuItem)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String; # @Inherited(java.awt.MenuItem$AccessibleAWTMenuItem)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(java.awt.MenuItem$AccessibleAWTMenuItem)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getMaximumAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getMinimumAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 setCurrentAccessibleValue
  (Ljava/lang/Number;)Z
  (Ljava/lang/Number;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/awt/CheckboxMenuItem.eea b/libs/eea-java-21/src/main/resources/java/awt/CheckboxMenuItem.eea
index cd1cc2ce0a..d6f0a6dd96 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/CheckboxMenuItem.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/CheckboxMenuItem.eea
@@ -20,10 +20,10 @@ getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
 getSelectedObjects
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.MenuItem)
 processEvent
  (Ljava/awt/AWTEvent;)V
  (Ljava/awt/AWTEvent;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Choice$AccessibleAWTChoice.eea b/libs/eea-java-21/src/main/resources/java/awt/Choice$AccessibleAWTChoice.eea
index b385fa54e6..287768328a 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Choice$AccessibleAWTChoice.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Choice$AccessibleAWTChoice.eea
@@ -5,10 +5,10 @@ class java/awt/Choice$AccessibleAWTChoice
  (Ljava/awt/Choice;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Choice.eea b/libs/eea-java-21/src/main/resources/java/awt/Choice.eea
index 3688241a20..b1ecdbb807 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Choice.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Choice.eea
@@ -23,16 +23,16 @@ getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
 getSelectedItem
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getSelectedObjects
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 insert
  (Ljava/lang/String;I)V
  (Ljava/lang/String;I)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Component)
 processEvent
  (Ljava/awt/AWTEvent;)V
  (Ljava/awt/AWTEvent;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Color.eea b/libs/eea-java-21/src/main/resources/java/awt/Color.eea
index a4861b625b..ff66a2c826 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Color.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Color.eea
@@ -81,7 +81,7 @@ yellow
 
 RGBtoHSB
  (III[F)[F
- (III[F)[F
+ (III[F)[1F
 decode
  (Ljava/lang/String;)Ljava/awt/Color;
  (Ljava/lang/String;)Ljava/awt/Color;
@@ -96,7 +96,7 @@ getColor
  (Ljava/lang/String;Ljava/awt/Color;)Ljava/awt/Color;
 getHSBColor
  (FFF)Ljava/awt/Color;
- (FFF)Ljava/awt/Color;
+ (FFF)L1java/awt/Color;
 
 <init>
  (Ljava/awt/color/ColorSpace;[FF)V
@@ -106,7 +106,7 @@ brighter
  ()Ljava/awt/Color;
 createContext
  (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
- (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
+ (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)L1java/awt/PaintContext; # @Inherited(java.awt.Paint)
 darker
  ()Ljava/awt/Color;
  ()Ljava/awt/Color;
@@ -124,7 +124,7 @@ getColorSpace
  ()Ljava/awt/color/ColorSpace;
 getComponents
  (Ljava/awt/color/ColorSpace;[F)[F
- (Ljava/awt/color/ColorSpace;[F)[F
+ (Ljava/awt/color/ColorSpace;[F)[1F
 getComponents
  ([F)[F
  ([F)[F
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Component$AccessibleAWTComponent.eea b/libs/eea-java-21/src/main/resources/java/awt/Component$AccessibleAWTComponent.eea
index fe3ea6575a..af9af7b222 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Component$AccessibleAWTComponent.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Component$AccessibleAWTComponent.eea
@@ -21,13 +21,13 @@ contains
  (Ljava/awt/Point;)Z
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -36,7 +36,7 @@ getAccessibleName
  ()Ljava/lang/String;
 getAccessibleParent
  ()Ljavax/accessibility/Accessible;
- ()Ljavax/accessibility/Accessible;
+ ()L0javax/accessibility/Accessible;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Component.eea b/libs/eea-java-21/src/main/resources/java/awt/Component.eea
index 084bec911d..eaef49637b 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Component.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Component.eea
@@ -57,22 +57,22 @@ checkImage
  (Ljava/awt/Image;Ljava/awt/image/ImageObserver;)I
 coalesceEvents
  (Ljava/awt/AWTEvent;Ljava/awt/AWTEvent;)Ljava/awt/AWTEvent;
- (Ljava/awt/AWTEvent;Ljava/awt/AWTEvent;)Ljava/awt/AWTEvent;
+ (Ljava/awt/AWTEvent;Ljava/awt/AWTEvent;)L0java/awt/AWTEvent;
 contains
  (Ljava/awt/Point;)Z
  (Ljava/awt/Point;)Z
 createImage
  (II)Ljava/awt/Image;
- (II)Ljava/awt/Image;
+ (II)L0java/awt/Image;
 createImage
  (Ljava/awt/image/ImageProducer;)Ljava/awt/Image;
- (Ljava/awt/image/ImageProducer;)Ljava/awt/Image;
+ (Ljava/awt/image/ImageProducer;)L1java/awt/Image;
 createVolatileImage
  (II)Ljava/awt/image/VolatileImage;
- (II)Ljava/awt/image/VolatileImage;
+ (II)L0java/awt/image/VolatileImage;
 createVolatileImage
  (IILjava/awt/ImageCapabilities;)Ljava/awt/image/VolatileImage;
- (IILjava/awt/ImageCapabilities;)Ljava/awt/image/VolatileImage;
+ (IILjava/awt/ImageCapabilities;)L1java/awt/image/VolatileImage;
 deliverEvent
  (Ljava/awt/Event;)V
  (Ljava/awt/Event;)V
@@ -111,7 +111,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getBaselineResizeBehavior
  ()Ljava/awt/Component$BaselineResizeBehavior;
  ()Ljava/awt/Component$BaselineResizeBehavior;
@@ -159,10 +159,10 @@ getFontMetrics
  (Ljava/awt/Font;)Ljava/awt/FontMetrics;
 getForeground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getGraphics
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L0java/awt/Graphics;
 getGraphicsConfiguration
  ()Ljava/awt/GraphicsConfiguration;
  ()Ljava/awt/GraphicsConfiguration;
@@ -174,13 +174,13 @@ getHierarchyListeners
  ()[Ljava/awt/event/HierarchyListener;
 getInputContext
  ()Ljava/awt/im/InputContext;
- ()Ljava/awt/im/InputContext;
+ ()L0java/awt/im/InputContext;
 getInputMethodListeners
  ()[Ljava/awt/event/InputMethodListener;
  ()[Ljava/awt/event/InputMethodListener;
 getInputMethodRequests
  ()Ljava/awt/im/InputMethodRequests;
- ()Ljava/awt/im/InputMethodRequests;
+ ()L0java/awt/im/InputMethodRequests;
 getKeyListeners
  ()[Ljava/awt/event/KeyListener;
  ()[Ljava/awt/event/KeyListener;
@@ -276,7 +276,7 @@ list
  (Ljava/io/PrintWriter;I)V
 locate
  (II)Ljava/awt/Component;
- (II)Ljava/awt/Component;
+ (II)L0java/awt/Component;
 location
  ()Ljava/awt/Point;
  ()Ljava/awt/Point;
@@ -285,7 +285,7 @@ lostFocus
  (Ljava/awt/Event;Ljava/lang/Object;)Z
 minimumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 mouseDown
  (Ljava/awt/Event;II)Z
  (Ljava/awt/Event;II)Z
@@ -312,13 +312,13 @@ paintAll
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 postEvent
  (Ljava/awt/Event;)Z
  (Ljava/awt/Event;)Z
 preferredSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 prepareImage
  (Ljava/awt/Image;IILjava/awt/image/ImageObserver;)Z
  (Ljava/awt/Image;IILjava/awt/image/ImageObserver;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Composite.eea b/libs/eea-java-21/src/main/resources/java/awt/Composite.eea
index 4a6dd26e29..7cd1591848 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Composite.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Composite.eea
@@ -2,4 +2,4 @@ class java/awt/Composite
 
 createContext
  (Ljava/awt/image/ColorModel;Ljava/awt/image/ColorModel;Ljava/awt/RenderingHints;)Ljava/awt/CompositeContext;
- (Ljava/awt/image/ColorModel;Ljava/awt/image/ColorModel;Ljava/awt/RenderingHints;)Ljava/awt/CompositeContext;
+ (Ljava/awt/image/ColorModel;Ljava/awt/image/ColorModel;Ljava/awt/RenderingHints;)L1java/awt/CompositeContext;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Container$AccessibleAWTContainer.eea b/libs/eea-java-21/src/main/resources/java/awt/Container$AccessibleAWTContainer.eea
index a726d9c5a1..0d0016d725 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Container$AccessibleAWTContainer.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Container$AccessibleAWTContainer.eea
@@ -12,10 +12,10 @@ addPropertyChangeListener
  (L1java/beans/PropertyChangeListener;)V # @Inherited(java.awt.Component$AccessibleAWTComponent)
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Component$AccessibleAWTComponent)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(java.awt.Component$AccessibleAWTComponent)
 removePropertyChangeListener
  (Ljava/beans/PropertyChangeListener;)V
  (L1java/beans/PropertyChangeListener;)V # @Inherited(java.awt.Component$AccessibleAWTComponent)
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Container.eea b/libs/eea-java-21/src/main/resources/java/awt/Container.eea
index 70d832de86..1056608fd8 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Container.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Container.eea
@@ -62,7 +62,7 @@ getFocusTraversalKeys
  (I)Ljava/util/Set<Ljava/awt/AWTKeyStroke;>;
 getFocusTraversalPolicy
  ()Ljava/awt/FocusTraversalPolicy;
- ()Ljava/awt/FocusTraversalPolicy;
+ ()L0java/awt/FocusTraversalPolicy;
 getInsets
  ()Ljava/awt/Insets;
  ()Ljava/awt/Insets;
@@ -101,10 +101,10 @@ list
  (Ljava/io/PrintWriter;I)V
 locate
  (II)Ljava/awt/Component;
- (II)Ljava/awt/Component;
+ (II)L0java/awt/Component; # @Inherited(java.awt.Component)
 minimumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(java.awt.Component)
 paint
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
@@ -113,10 +113,10 @@ paintComponents
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Component)
 preferredSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(java.awt.Component)
 print
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/ContainerOrderFocusTraversalPolicy.eea b/libs/eea-java-21/src/main/resources/java/awt/ContainerOrderFocusTraversalPolicy.eea
index 06325094cd..6105e3f78c 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/ContainerOrderFocusTraversalPolicy.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/ContainerOrderFocusTraversalPolicy.eea
@@ -5,16 +5,16 @@ accept
  (Ljava/awt/Component;)Z
 getComponentAfter
  (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Container;Ljava/awt/Component;)L0java/awt/Component;
 getComponentBefore
  (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Container;Ljava/awt/Component;)L0java/awt/Component;
 getDefaultComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
  (Ljava/awt/Container;)Ljava/awt/Component;
 getFirstComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
- (Ljava/awt/Container;)Ljava/awt/Component;
+ (Ljava/awt/Container;)L0java/awt/Component;
 getLastComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
- (Ljava/awt/Container;)Ljava/awt/Component;
+ (Ljava/awt/Container;)L0java/awt/Component;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Cursor.eea b/libs/eea-java-21/src/main/resources/java/awt/Cursor.eea
index 0e5df71420..b6818fd7a1 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Cursor.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Cursor.eea
@@ -9,10 +9,10 @@ getDefaultCursor
  ()Ljava/awt/Cursor;
 getPredefinedCursor
  (I)Ljava/awt/Cursor;
- (I)Ljava/awt/Cursor;
+ (I)L1java/awt/Cursor;
 getSystemCustomCursor
  (Ljava/lang/String;)Ljava/awt/Cursor;
- (Ljava/lang/String;)Ljava/awt/Cursor;
+ (Ljava/lang/String;)L0java/awt/Cursor;
 
 name
  Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Desktop.eea b/libs/eea-java-21/src/main/resources/java/awt/Desktop.eea
index 8082c30989..95aecda8a2 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Desktop.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Desktop.eea
@@ -2,7 +2,7 @@ class java/awt/Desktop
 
 getDesktop
  ()Ljava/awt/Desktop;
- ()Ljava/awt/Desktop;
+ ()L1java/awt/Desktop;
 
 addAppEventListener
  (Ljava/awt/desktop/SystemEventListener;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Dialog.eea b/libs/eea-java-21/src/main/resources/java/awt/Dialog.eea
index de861bdfab..3cd04b26e4 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Dialog.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Dialog.eea
@@ -57,7 +57,7 @@ getTitle
  ()Ljava/lang/String;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Container)
 setBackground
  (Ljava/awt/Color;)V
  (Ljava/awt/Color;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Event.eea b/libs/eea-java-21/src/main/resources/java/awt/Event.eea
index fed19071c8..4aa816217f 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Event.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Event.eea
@@ -21,7 +21,7 @@ target
  (Ljava/lang/Object;JIIIIILjava/lang/Object;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/java/awt/EventQueue.eea b/libs/eea-java-21/src/main/resources/java/awt/EventQueue.eea
index 6697f7b7b0..3accccf6c9 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/EventQueue.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/EventQueue.eea
@@ -12,7 +12,7 @@ invokeLater
 
 createSecondaryLoop
  ()Ljava/awt/SecondaryLoop;
- ()Ljava/awt/SecondaryLoop;
+ ()L1java/awt/SecondaryLoop;
 dispatchEvent
  (Ljava/awt/AWTEvent;)V
  (Ljava/awt/AWTEvent;)V
@@ -21,10 +21,10 @@ getNextEvent
  ()Ljava/awt/AWTEvent;
 peekEvent
  ()Ljava/awt/AWTEvent;
- ()Ljava/awt/AWTEvent;
+ ()L0java/awt/AWTEvent;
 peekEvent
  (I)Ljava/awt/AWTEvent;
- (I)Ljava/awt/AWTEvent;
+ (I)L0java/awt/AWTEvent;
 postEvent
  (Ljava/awt/AWTEvent;)V
  (Ljava/awt/AWTEvent;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/FileDialog.eea b/libs/eea-java-21/src/main/resources/java/awt/FileDialog.eea
index 2093ddcf4b..b555114759 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/FileDialog.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/FileDialog.eea
@@ -32,7 +32,7 @@ getFiles
  ()[Ljava/io/File;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Dialog)
 setDirectory
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Font.eea b/libs/eea-java-21/src/main/resources/java/awt/Font.eea
index 66c647f594..dde44456f1 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Font.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Font.eea
@@ -18,19 +18,19 @@ SERIF
 
 createFont
  (ILjava/io/File;)Ljava/awt/Font;
- (ILjava/io/File;)Ljava/awt/Font;
+ (ILjava/io/File;)L1java/awt/Font;
 createFont
  (ILjava/io/InputStream;)Ljava/awt/Font;
- (ILjava/io/InputStream;)Ljava/awt/Font;
+ (ILjava/io/InputStream;)L1java/awt/Font;
 createFonts
  (Ljava/io/File;)[Ljava/awt/Font;
- (Ljava/io/File;)[Ljava/awt/Font;
+ (Ljava/io/File;)[1Ljava/awt/Font;
 createFonts
  (Ljava/io/InputStream;)[Ljava/awt/Font;
- (Ljava/io/InputStream;)[Ljava/awt/Font;
+ (Ljava/io/InputStream;)[1Ljava/awt/Font;
 decode
  (Ljava/lang/String;)Ljava/awt/Font;
- (Ljava/lang/String;)Ljava/awt/Font;
+ (Ljava/lang/String;)L1java/awt/Font;
 getFont
  (Ljava/lang/String;)Ljava/awt/Font;
  (Ljava/lang/String;)Ljava/awt/Font;
@@ -68,16 +68,16 @@ canDisplayUpTo
  ([CII)I
 createGlyphVector
  (Ljava/awt/font/FontRenderContext;Ljava/lang/String;)Ljava/awt/font/GlyphVector;
- (Ljava/awt/font/FontRenderContext;Ljava/lang/String;)Ljava/awt/font/GlyphVector;
+ (Ljava/awt/font/FontRenderContext;Ljava/lang/String;)L1java/awt/font/GlyphVector;
 createGlyphVector
  (Ljava/awt/font/FontRenderContext;Ljava/text/CharacterIterator;)Ljava/awt/font/GlyphVector;
- (Ljava/awt/font/FontRenderContext;Ljava/text/CharacterIterator;)Ljava/awt/font/GlyphVector;
+ (Ljava/awt/font/FontRenderContext;Ljava/text/CharacterIterator;)L1java/awt/font/GlyphVector;
 createGlyphVector
  (Ljava/awt/font/FontRenderContext;[C)Ljava/awt/font/GlyphVector;
- (Ljava/awt/font/FontRenderContext;[C)Ljava/awt/font/GlyphVector;
+ (Ljava/awt/font/FontRenderContext;[C)L1java/awt/font/GlyphVector;
 createGlyphVector
  (Ljava/awt/font/FontRenderContext;[I)Ljava/awt/font/GlyphVector;
- (Ljava/awt/font/FontRenderContext;[I)Ljava/awt/font/GlyphVector;
+ (Ljava/awt/font/FontRenderContext;[I)L1java/awt/font/GlyphVector;
 deriveFont
  (F)Ljava/awt/Font;
  (F)Ljava/awt/Font;
@@ -101,7 +101,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getAttributes
  ()Ljava/util/Map<Ljava/awt/font/TextAttribute;*>;
- ()Ljava/util/Map<Ljava/awt/font/TextAttribute;*>;
+ ()L1java/util/Map<Ljava/awt/font/TextAttribute;*>;
 getAvailableAttributes
  ()[Ljava/text/AttributedCharacterIterator$Attribute;
  ()[Ljava/text/AttributedCharacterIterator$Attribute;
@@ -152,7 +152,7 @@ getStringBounds
  ([CIILjava/awt/font/FontRenderContext;)Ljava/awt/geom/Rectangle2D;
 getTransform
  ()Ljava/awt/geom/AffineTransform;
- ()Ljava/awt/geom/AffineTransform;
+ ()L1java/awt/geom/AffineTransform;
 layoutGlyphVector
  (Ljava/awt/font/FontRenderContext;[CIII)Ljava/awt/font/GlyphVector;
  (Ljava/awt/font/FontRenderContext;[CIII)Ljava/awt/font/GlyphVector;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/FontMetrics.eea b/libs/eea-java-21/src/main/resources/java/awt/FontMetrics.eea
index 9b1716d555..dc2502553a 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/FontMetrics.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/FontMetrics.eea
@@ -48,7 +48,7 @@ getStringBounds
  ([CIILjava/awt/Graphics;)Ljava/awt/geom/Rectangle2D;
 getWidths
  ()[I
- ()[I
+ ()[1I
 stringWidth
  (Ljava/lang/String;)I
  (Ljava/lang/String;)I
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Frame.eea b/libs/eea-java-21/src/main/resources/java/awt/Frame.eea
index f72d4a6734..a1a59694cd 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Frame.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Frame.eea
@@ -2,7 +2,7 @@ class java/awt/Frame
 
 getFrames
  ()[Ljava/awt/Frame;
- ()[Ljava/awt/Frame;
+ ()[1Ljava/awt/Frame;
 
 <init>
  (Ljava/awt/GraphicsConfiguration;)V
@@ -18,7 +18,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getIconImage
  ()Ljava/awt/Image;
- ()Ljava/awt/Image;
+ ()L0java/awt/Image;
 getMaximizedBounds
  ()Ljava/awt/Rectangle;
  ()Ljava/awt/Rectangle;
@@ -30,7 +30,7 @@ getTitle
  ()Ljava/lang/String;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Container)
 remove
  (Ljava/awt/MenuComponent;)V
  (Ljava/awt/MenuComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/GradientPaint.eea b/libs/eea-java-21/src/main/resources/java/awt/GradientPaint.eea
index 0da9405202..83a48eabd7 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/GradientPaint.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/GradientPaint.eea
@@ -14,7 +14,7 @@ class java/awt/GradientPaint
  (Ljava/awt/geom/Point2D;Ljava/awt/Color;Ljava/awt/geom/Point2D;Ljava/awt/Color;Z)V
 createContext
  (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
- (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
+ (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)L1java/awt/PaintContext; # @Inherited(java.awt.Paint)
 getColor1
  ()Ljava/awt/Color;
  ()Ljava/awt/Color;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Graphics.eea b/libs/eea-java-21/src/main/resources/java/awt/Graphics.eea
index 54976168c5..94f2567095 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Graphics.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Graphics.eea
@@ -2,10 +2,10 @@ class java/awt/Graphics
 
 create
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L1java/awt/Graphics;
 create
  (IIII)Ljava/awt/Graphics;
- (IIII)Ljava/awt/Graphics;
+ (IIII)L0java/awt/Graphics;
 drawBytes
  ([BIIII)V
  ([BIIII)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/GraphicsConfiguration.eea b/libs/eea-java-21/src/main/resources/java/awt/GraphicsConfiguration.eea
index df24c25796..8690ba6dff 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/GraphicsConfiguration.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/GraphicsConfiguration.eea
@@ -2,22 +2,22 @@ class java/awt/GraphicsConfiguration
 
 createCompatibleImage
  (II)Ljava/awt/image/BufferedImage;
- (II)Ljava/awt/image/BufferedImage;
+ (II)L1java/awt/image/BufferedImage;
 createCompatibleImage
  (III)Ljava/awt/image/BufferedImage;
- (III)Ljava/awt/image/BufferedImage;
+ (III)L1java/awt/image/BufferedImage;
 createCompatibleVolatileImage
  (II)Ljava/awt/image/VolatileImage;
- (II)Ljava/awt/image/VolatileImage;
+ (II)L1java/awt/image/VolatileImage;
 createCompatibleVolatileImage
  (III)Ljava/awt/image/VolatileImage;
- (III)Ljava/awt/image/VolatileImage;
+ (III)L1java/awt/image/VolatileImage;
 createCompatibleVolatileImage
  (IILjava/awt/ImageCapabilities;)Ljava/awt/image/VolatileImage;
- (IILjava/awt/ImageCapabilities;)Ljava/awt/image/VolatileImage;
+ (IILjava/awt/ImageCapabilities;)L1java/awt/image/VolatileImage;
 createCompatibleVolatileImage
  (IILjava/awt/ImageCapabilities;I)Ljava/awt/image/VolatileImage;
- (IILjava/awt/ImageCapabilities;I)Ljava/awt/image/VolatileImage;
+ (IILjava/awt/ImageCapabilities;I)L1java/awt/image/VolatileImage;
 getBounds
  ()Ljava/awt/Rectangle;
  ()Ljava/awt/Rectangle;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/GridBagLayout.eea b/libs/eea-java-21/src/main/resources/java/awt/GridBagLayout.eea
index d26c2e262f..ee0d10c566 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/GridBagLayout.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/GridBagLayout.eea
@@ -33,7 +33,7 @@ GetLayoutInfo
  (Ljava/awt/Container;I)Ljava/awt/GridBagLayoutInfo;
 GetMinSize
  (Ljava/awt/Container;Ljava/awt/GridBagLayoutInfo;)Ljava/awt/Dimension;
- (Ljava/awt/Container;Ljava/awt/GridBagLayoutInfo;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;Ljava/awt/GridBagLayoutInfo;)L1java/awt/Dimension;
 addLayoutComponent
  (Ljava/awt/Component;Ljava/lang/Object;)V
  (Ljava/awt/Component;Ljava/lang/Object;)V
@@ -84,7 +84,7 @@ lookupConstraints
  (Ljava/awt/Component;)Ljava/awt/GridBagConstraints;
 maximumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
- (Ljava/awt/Container;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;)L1java/awt/Dimension;
 minimumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
  (Ljava/awt/Container;)Ljava/awt/Dimension;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/KeyboardFocusManager.eea b/libs/eea-java-21/src/main/resources/java/awt/KeyboardFocusManager.eea
index 7263c541ff..3ce5e9509a 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/KeyboardFocusManager.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/KeyboardFocusManager.eea
@@ -90,10 +90,10 @@ getGlobalPermanentFocusOwner
  ()Ljava/awt/Component;
 getKeyEventDispatchers
  ()Ljava/util/List<Ljava/awt/KeyEventDispatcher;>;
- ()Ljava/util/List<Ljava/awt/KeyEventDispatcher;>;
+ ()L0java/util/List<Ljava/awt/KeyEventDispatcher;>;
 getKeyEventPostProcessors
  ()Ljava/util/List<Ljava/awt/KeyEventPostProcessor;>;
- ()Ljava/util/List<Ljava/awt/KeyEventPostProcessor;>;
+ ()L0java/util/List<Ljava/awt/KeyEventPostProcessor;>;
 getPermanentFocusOwner
  ()Ljava/awt/Component;
  ()Ljava/awt/Component;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Label.eea b/libs/eea-java-21/src/main/resources/java/awt/Label.eea
index 7fac456929..8228cbfcc9 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Label.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Label.eea
@@ -14,7 +14,7 @@ getText
  ()Ljava/lang/String;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Component)
 setText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/LinearGradientPaint.eea b/libs/eea-java-21/src/main/resources/java/awt/LinearGradientPaint.eea
index f27c0a9202..09527fc55a 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/LinearGradientPaint.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/LinearGradientPaint.eea
@@ -17,7 +17,7 @@ class java/awt/LinearGradientPaint
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;[F[Ljava/awt/Color;Ljava/awt/MultipleGradientPaint$CycleMethod;Ljava/awt/MultipleGradientPaint$ColorSpaceType;Ljava/awt/geom/AffineTransform;)V
 createContext
  (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
- (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
+ (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)L1java/awt/PaintContext; # @Inherited(java.awt.Paint)
 getEndPoint
  ()Ljava/awt/geom/Point2D;
  ()Ljava/awt/geom/Point2D;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/List$AccessibleAWTList$AccessibleAWTListChild.eea b/libs/eea-java-21/src/main/resources/java/awt/List$AccessibleAWTList$AccessibleAWTListChild.eea
index 5762efc0fb..fdf54018ad 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/List$AccessibleAWTList$AccessibleAWTListChild.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/List$AccessibleAWTList$AccessibleAWTListChild.eea
@@ -11,10 +11,10 @@ contains
  (Ljava/awt/Point;)Z
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Component$AccessibleAWTComponent)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(java.awt.Component$AccessibleAWTComponent)
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -29,7 +29,7 @@ getBackground
  ()Ljava/awt/Color;
 getBounds
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L0java/awt/Rectangle;
 getCursor
  ()Ljava/awt/Cursor;
  ()Ljava/awt/Cursor;
@@ -47,13 +47,13 @@ getLocale
  ()Ljava/util/Locale;
 getLocation
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getLocationOnScreen
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L0java/awt/Dimension;
 removeFocusListener
  (Ljava/awt/event/FocusListener;)V
  (L1java/awt/event/FocusListener;)V # @Inherited(java.awt.Component$AccessibleAWTComponent)
diff --git a/libs/eea-java-21/src/main/resources/java/awt/List$AccessibleAWTList.eea b/libs/eea-java-21/src/main/resources/java/awt/List$AccessibleAWTList.eea
index ed2874ac5e..a96cb0c076 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/List$AccessibleAWTList.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/List$AccessibleAWTList.eea
@@ -8,16 +8,16 @@ actionPerformed
  (L1java/awt/event/ActionEvent;)V # @Inherited(java.awt.event.ActionListener)
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Component$AccessibleAWTComponent)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(java.awt.Component$AccessibleAWTComponent)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
  (I)Ljavax/accessibility/Accessible;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/List.eea b/libs/eea-java-21/src/main/resources/java/awt/List.eea
index 57a6a5bd46..356cfecdca 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/List.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/List.eea
@@ -32,7 +32,7 @@ getItemListeners
  ()[Ljava/awt/event/ItemListener;
 getItems
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
@@ -56,22 +56,22 @@ getSelectedItem
  ()Ljava/lang/String;
 getSelectedItems
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 getSelectedObjects
  ()[Ljava/lang/Object;
  ()[Ljava/lang/Object;
 minimumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(java.awt.Component)
 minimumSize
  (I)Ljava/awt/Dimension;
  (I)Ljava/awt/Dimension;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Component)
 preferredSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(java.awt.Component)
 preferredSize
  (I)Ljava/awt/Dimension;
  (I)Ljava/awt/Dimension;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/MediaTracker.eea b/libs/eea-java-21/src/main/resources/java/awt/MediaTracker.eea
index 27c4cf0c7c..28ec12e706 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/MediaTracker.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/MediaTracker.eea
@@ -11,10 +11,10 @@ addImage
  (Ljava/awt/Image;III)V
 getErrorsAny
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 getErrorsID
  (I)[Ljava/lang/Object;
- (I)[Ljava/lang/Object;
+ (I)[0Ljava/lang/Object;
 removeImage
  (Ljava/awt/Image;)V
  (Ljava/awt/Image;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Menu.eea b/libs/eea-java-21/src/main/resources/java/awt/Menu.eea
index 730be5ebbc..8189b7c5f1 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Menu.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Menu.eea
@@ -26,7 +26,7 @@ insert
  (Ljava/lang/String;I)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.MenuItem)
 remove
  (Ljava/awt/MenuComponent;)V
  (Ljava/awt/MenuComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/MenuBar.eea b/libs/eea-java-21/src/main/resources/java/awt/MenuBar.eea
index 50ae26171b..7d92c2de7d 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/MenuBar.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/MenuBar.eea
@@ -17,7 +17,7 @@ getMenu
  (I)Ljava/awt/Menu;
 getShortcutMenuItem
  (Ljava/awt/MenuShortcut;)Ljava/awt/MenuItem;
- (Ljava/awt/MenuShortcut;)Ljava/awt/MenuItem;
+ (Ljava/awt/MenuShortcut;)L0java/awt/MenuItem;
 remove
  (Ljava/awt/MenuComponent;)V
  (Ljava/awt/MenuComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/MenuComponent$AccessibleAWTMenuComponent.eea b/libs/eea-java-21/src/main/resources/java/awt/MenuComponent$AccessibleAWTMenuComponent.eea
index 6f68dfc89b..0138f4f1d8 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/MenuComponent$AccessibleAWTMenuComponent.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/MenuComponent$AccessibleAWTMenuComponent.eea
@@ -11,13 +11,13 @@ contains
  (Ljava/awt/Point;)Z
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -26,49 +26,49 @@ getAccessibleName
  ()Ljava/lang/String;
 getAccessibleParent
  ()Ljavax/accessibility/Accessible;
- ()Ljavax/accessibility/Accessible;
+ ()L0javax/accessibility/Accessible;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
  ()Ljavax/accessibility/AccessibleStateSet;
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getBounds
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L0java/awt/Rectangle;
 getCursor
  ()Ljava/awt/Cursor;
- ()Ljava/awt/Cursor;
+ ()L0java/awt/Cursor;
 getFont
  ()Ljava/awt/Font;
  ()Ljava/awt/Font;
 getFontMetrics
  (Ljava/awt/Font;)Ljava/awt/FontMetrics;
- (Ljava/awt/Font;)Ljava/awt/FontMetrics;
+ (Ljava/awt/Font;)L0java/awt/FontMetrics;
 getForeground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
 getLocation
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getLocationOnScreen
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L0java/awt/Dimension;
 removeFocusListener
  (Ljava/awt/event/FocusListener;)V
  (L1java/awt/event/FocusListener;)V # @Inherited(javax.accessibility.AccessibleComponent)
diff --git a/libs/eea-java-21/src/main/resources/java/awt/MenuComponent.eea b/libs/eea-java-21/src/main/resources/java/awt/MenuComponent.eea
index c3582da9f5..b11e5bc4c4 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/MenuComponent.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/MenuComponent.eea
@@ -8,7 +8,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getFont
  ()Ljava/awt/Font;
- ()Ljava/awt/Font;
+ ()L0java/awt/Font;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -20,7 +20,7 @@ getTreeLock
  ()Ljava/lang/Object;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 postEvent
  (Ljava/awt/Event;)Z
  (Ljava/awt/Event;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/awt/MenuItem$AccessibleAWTMenuItem.eea b/libs/eea-java-21/src/main/resources/java/awt/MenuItem$AccessibleAWTMenuItem.eea
index d69ec462f7..862b1cfb1c 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/MenuItem$AccessibleAWTMenuItem.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/MenuItem$AccessibleAWTMenuItem.eea
@@ -5,10 +5,10 @@ class java/awt/MenuItem$AccessibleAWTMenuItem
  (Ljava/awt/MenuItem;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -17,7 +17,7 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/MenuItem.eea b/libs/eea-java-21/src/main/resources/java/awt/MenuItem.eea
index ae0c478594..fd40a6150c 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/MenuItem.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/MenuItem.eea
@@ -29,7 +29,7 @@ getShortcut
  ()Ljava/awt/MenuShortcut;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.MenuComponent)
 processActionEvent
  (Ljava/awt/event/ActionEvent;)V
  (Ljava/awt/event/ActionEvent;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/MenuShortcut.eea b/libs/eea-java-21/src/main/resources/java/awt/MenuShortcut.eea
index 3d2aace5de..170650756a 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/MenuShortcut.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/MenuShortcut.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/java/awt/MultipleGradientPaint.eea b/libs/eea-java-21/src/main/resources/java/awt/MultipleGradientPaint.eea
index 5bdb427a46..7828a0558d 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/MultipleGradientPaint.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/MultipleGradientPaint.eea
@@ -14,4 +14,4 @@ getFractions
  ()[F
 getTransform
  ()Ljava/awt/geom/AffineTransform;
- ()Ljava/awt/geom/AffineTransform;
+ ()L1java/awt/geom/AffineTransform;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/PageAttributes.eea b/libs/eea-java-21/src/main/resources/java/awt/PageAttributes.eea
index ed69e60b79..c2bbb0d142 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/PageAttributes.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/PageAttributes.eea
@@ -29,7 +29,7 @@ getPrintQuality
  ()Ljava/awt/PageAttributes$PrintQualityType;
 getPrinterResolution
  ()[I
- ()[I
+ ()[1I
 set
  (Ljava/awt/PageAttributes;)V
  (Ljava/awt/PageAttributes;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Paint.eea b/libs/eea-java-21/src/main/resources/java/awt/Paint.eea
index 7fa31b296c..a1db839cc7 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Paint.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Paint.eea
@@ -2,4 +2,4 @@ class java/awt/Paint
 
 createContext
  (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
- (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
+ (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)L1java/awt/PaintContext;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Polygon.eea b/libs/eea-java-21/src/main/resources/java/awt/Polygon.eea
index 4965f36570..df2dcc4896 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Polygon.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Polygon.eea
@@ -33,7 +33,7 @@ getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/PopupMenu.eea b/libs/eea-java-21/src/main/resources/java/awt/PopupMenu.eea
index 729c3cdc24..79aca92c30 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/PopupMenu.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/PopupMenu.eea
@@ -8,7 +8,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getParent
  ()Ljava/awt/MenuContainer;
- ()Ljava/awt/MenuContainer;
+ ()L0java/awt/MenuContainer;
 show
  (Ljava/awt/Component;II)V
  (Ljava/awt/Component;II)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/RadialGradientPaint.eea b/libs/eea-java-21/src/main/resources/java/awt/RadialGradientPaint.eea
index 78cfa8601d..efe9107cde 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/RadialGradientPaint.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/RadialGradientPaint.eea
@@ -26,7 +26,7 @@ class java/awt/RadialGradientPaint
  (Ljava/awt/geom/Rectangle2D;[F[Ljava/awt/Color;Ljava/awt/MultipleGradientPaint$CycleMethod;)V
 createContext
  (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
- (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
+ (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)L1java/awt/PaintContext; # @Inherited(java.awt.Paint)
 getCenterPoint
  ()Ljava/awt/geom/Point2D;
  ()Ljava/awt/geom/Point2D;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Rectangle.eea b/libs/eea-java-21/src/main/resources/java/awt/Rectangle.eea
index 96c5ff0e52..8261529405 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Rectangle.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Rectangle.eea
@@ -26,10 +26,10 @@ contains
  (Ljava/awt/Rectangle;)Z
 createIntersection
  (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
- (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
+ (Ljava/awt/geom/Rectangle2D;)L1java/awt/geom/Rectangle2D; # @Inherited(java.awt.geom.Rectangle2D)
 createUnion
  (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
- (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
+ (Ljava/awt/geom/Rectangle2D;)L1java/awt/geom/Rectangle2D; # @Inherited(java.awt.geom.Rectangle2D)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.awt.geom.Rectangle2D)
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Robot.eea b/libs/eea-java-21/src/main/resources/java/awt/Robot.eea
index 0b12fa8bc8..9875c646e4 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Robot.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Robot.eea
@@ -5,10 +5,10 @@ class java/awt/Robot
  (Ljava/awt/GraphicsDevice;)V
 createMultiResolutionScreenCapture
  (Ljava/awt/Rectangle;)Ljava/awt/image/MultiResolutionImage;
- (Ljava/awt/Rectangle;)Ljava/awt/image/MultiResolutionImage;
+ (Ljava/awt/Rectangle;)L1java/awt/image/MultiResolutionImage;
 createScreenCapture
  (Ljava/awt/Rectangle;)Ljava/awt/image/BufferedImage;
- (Ljava/awt/Rectangle;)Ljava/awt/image/BufferedImage;
+ (Ljava/awt/Rectangle;)L1java/awt/image/BufferedImage;
 getPixelColor
  (II)Ljava/awt/Color;
  (II)Ljava/awt/Color;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/ScrollPane.eea b/libs/eea-java-21/src/main/resources/java/awt/ScrollPane.eea
index 58219ffacc..19f3d1dbb9 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/ScrollPane.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/ScrollPane.eea
@@ -20,7 +20,7 @@ getViewportSize
  ()Ljava/awt/Dimension;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Container)
 printComponents
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/ScrollPaneAdjustable.eea b/libs/eea-java-21/src/main/resources/java/awt/ScrollPaneAdjustable.eea
index 155aed02aa..1667bb1a17 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/ScrollPaneAdjustable.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/ScrollPaneAdjustable.eea
@@ -8,7 +8,7 @@ getAdjustmentListeners
  ()[Ljava/awt/event/AdjustmentListener;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 removeAdjustmentListener
  (Ljava/awt/event/AdjustmentListener;)V
  (L1java/awt/event/AdjustmentListener;)V # @Inherited(java.awt.Adjustable)
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Scrollbar$AccessibleAWTScrollBar.eea b/libs/eea-java-21/src/main/resources/java/awt/Scrollbar$AccessibleAWTScrollBar.eea
index 180c0600df..7c39a21217 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Scrollbar$AccessibleAWTScrollBar.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Scrollbar$AccessibleAWTScrollBar.eea
@@ -11,7 +11,7 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Scrollbar.eea b/libs/eea-java-21/src/main/resources/java/awt/Scrollbar.eea
index bc4c6f2635..bc3396e309 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Scrollbar.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Scrollbar.eea
@@ -14,7 +14,7 @@ getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Component)
 processAdjustmentEvent
  (Ljava/awt/event/AdjustmentEvent;)V
  (Ljava/awt/event/AdjustmentEvent;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/SplashScreen.eea b/libs/eea-java-21/src/main/resources/java/awt/SplashScreen.eea
index 9f0e98561f..46c5cfdeb9 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/SplashScreen.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/SplashScreen.eea
@@ -6,7 +6,7 @@ getSplashScreen
 
 createGraphics
  ()Ljava/awt/Graphics2D;
- ()Ljava/awt/Graphics2D;
+ ()L1java/awt/Graphics2D;
 getBounds
  ()Ljava/awt/Rectangle;
  ()Ljava/awt/Rectangle;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Stroke.eea b/libs/eea-java-21/src/main/resources/java/awt/Stroke.eea
index a5739432c8..b2328bb0bc 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Stroke.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Stroke.eea
@@ -2,4 +2,4 @@ class java/awt/Stroke
 
 createStrokedShape
  (Ljava/awt/Shape;)Ljava/awt/Shape;
- (Ljava/awt/Shape;)Ljava/awt/Shape;
+ (Ljava/awt/Shape;)L1java/awt/Shape;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Taskbar.eea b/libs/eea-java-21/src/main/resources/java/awt/Taskbar.eea
index 52703a8925..8d5ee79bce 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Taskbar.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Taskbar.eea
@@ -2,7 +2,7 @@ class java/awt/Taskbar
 
 getTaskbar
  ()Ljava/awt/Taskbar;
- ()Ljava/awt/Taskbar;
+ ()L1java/awt/Taskbar;
 
 getIconImage
  ()Ljava/awt/Image;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/TextArea.eea b/libs/eea-java-21/src/main/resources/java/awt/TextArea.eea
index 947896400e..63d562a834 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/TextArea.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/TextArea.eea
@@ -38,16 +38,16 @@ insertText
  (Ljava/lang/String;I)V
 minimumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(java.awt.Component)
 minimumSize
  (II)Ljava/awt/Dimension;
  (II)Ljava/awt/Dimension;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.TextComponent)
 preferredSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(java.awt.Component)
 preferredSize
  (II)Ljava/awt/Dimension;
  (II)Ljava/awt/Dimension;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/TextComponent$AccessibleAWTTextComponent.eea b/libs/eea-java-21/src/main/resources/java/awt/TextComponent$AccessibleAWTTextComponent.eea
index b18e9275c8..175403f251 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/TextComponent$AccessibleAWTTextComponent.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/TextComponent$AccessibleAWTTextComponent.eea
@@ -11,28 +11,28 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAfterIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getAtIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getBeforeIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getCharacterAttribute
  (I)Ljavax/swing/text/AttributeSet;
- (I)Ljavax/swing/text/AttributeSet;
+ (I)L0javax/swing/text/AttributeSet;
 getCharacterBounds
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L0java/awt/Rectangle;
 getIndexAtPoint
  (Ljava/awt/Point;)I
  (Ljava/awt/Point;)I
 getSelectedText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 textValueChanged
  (Ljava/awt/event/TextEvent;)V
  (L1java/awt/event/TextEvent;)V # @Inherited(java.awt.event.TextListener)
diff --git a/libs/eea-java-21/src/main/resources/java/awt/TextComponent.eea b/libs/eea-java-21/src/main/resources/java/awt/TextComponent.eea
index 6f2d4dc8cc..4491fce163 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/TextComponent.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/TextComponent.eea
@@ -12,10 +12,10 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color; # @Inherited(java.awt.Component)
 getInputMethodRequests
  ()Ljava/awt/im/InputMethodRequests;
- ()Ljava/awt/im/InputMethodRequests;
+ ()L0java/awt/im/InputMethodRequests; # @Inherited(java.awt.Component)
 getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
@@ -30,7 +30,7 @@ getTextListeners
  ()[Ljava/awt/event/TextListener;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Component)
 processEvent
  (Ljava/awt/AWTEvent;)V
  (Ljava/awt/AWTEvent;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/TextField.eea b/libs/eea-java-21/src/main/resources/java/awt/TextField.eea
index 44ebaa2b01..6e9c74d9f0 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/TextField.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/TextField.eea
@@ -32,16 +32,16 @@ getPreferredSize
  (I)Ljava/awt/Dimension;
 minimumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(java.awt.Component)
 minimumSize
  (I)Ljava/awt/Dimension;
  (I)Ljava/awt/Dimension;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.TextComponent)
 preferredSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(java.awt.Component)
 preferredSize
  (I)Ljava/awt/Dimension;
  (I)Ljava/awt/Dimension;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/TexturePaint.eea b/libs/eea-java-21/src/main/resources/java/awt/TexturePaint.eea
index 9498e79288..bdd3239f99 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/TexturePaint.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/TexturePaint.eea
@@ -5,7 +5,7 @@ class java/awt/TexturePaint
  (Ljava/awt/image/BufferedImage;Ljava/awt/geom/Rectangle2D;)V
 createContext
  (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
- (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
+ (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)L1java/awt/PaintContext; # @Inherited(java.awt.Paint)
 getAnchorRect
  ()Ljava/awt/geom/Rectangle2D;
  ()Ljava/awt/geom/Rectangle2D;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Toolkit.eea b/libs/eea-java-21/src/main/resources/java/awt/Toolkit.eea
index 4926505d00..bb3341d850 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Toolkit.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Toolkit.eea
@@ -28,25 +28,25 @@ checkImage
  (Ljava/awt/Image;IILjava/awt/image/ImageObserver;)I
 createCustomCursor
  (Ljava/awt/Image;Ljava/awt/Point;Ljava/lang/String;)Ljava/awt/Cursor;
- (Ljava/awt/Image;Ljava/awt/Point;Ljava/lang/String;)Ljava/awt/Cursor;
+ (Ljava/awt/Image;Ljava/awt/Point;Ljava/lang/String;)L1java/awt/Cursor;
 createDragGestureRecognizer
  <T:Ljava/awt/dnd/DragGestureRecognizer;>(Ljava/lang/Class<TT;>;Ljava/awt/dnd/DragSource;Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)TT;
- <T:Ljava/awt/dnd/DragGestureRecognizer;>(Ljava/lang/Class<TT;>;Ljava/awt/dnd/DragSource;Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)TT;
+ <T:Ljava/awt/dnd/DragGestureRecognizer;>(Ljava/lang/Class<TT;>;Ljava/awt/dnd/DragSource;Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)T0T;
 createImage
  (Ljava/awt/image/ImageProducer;)Ljava/awt/Image;
- (Ljava/awt/image/ImageProducer;)Ljava/awt/Image;
+ (Ljava/awt/image/ImageProducer;)L1java/awt/Image;
 createImage
  (Ljava/lang/String;)Ljava/awt/Image;
- (Ljava/lang/String;)Ljava/awt/Image;
+ (Ljava/lang/String;)L1java/awt/Image;
 createImage
  (Ljava/net/URL;)Ljava/awt/Image;
- (Ljava/net/URL;)Ljava/awt/Image;
+ (Ljava/net/URL;)L1java/awt/Image;
 createImage
  ([B)Ljava/awt/Image;
- ([B)Ljava/awt/Image;
+ ([B)L1java/awt/Image;
 createImage
  ([BII)Ljava/awt/Image;
- ([BII)Ljava/awt/Image;
+ ([BII)L1java/awt/Image;
 getAWTEventListeners
  ()[Ljava/awt/event/AWTEventListener;
  ()[Ljava/awt/event/AWTEventListener;
@@ -103,7 +103,7 @@ getSystemEventQueueImpl
  ()Ljava/awt/EventQueue;
 getSystemSelection
  ()Ljava/awt/datatransfer/Clipboard;
- ()Ljava/awt/datatransfer/Clipboard;
+ ()L0java/awt/datatransfer/Clipboard;
 isModalExclusionTypeSupported
  (Ljava/awt/Dialog$ModalExclusionType;)Z
  (Ljava/awt/Dialog$ModalExclusionType;)Z
@@ -112,7 +112,7 @@ isModalityTypeSupported
  (Ljava/awt/Dialog$ModalityType;)Z
 lazilyLoadDesktopProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 loadSystemColors
  ([I)V
  ([I)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/Window.eea b/libs/eea-java-21/src/main/resources/java/awt/Window.eea
index 277e49e4aa..24f6d79d17 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/Window.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/Window.eea
@@ -2,7 +2,7 @@ class java/awt/Window
 
 getOwnerlessWindows
  ()[Ljava/awt/Window;
- ()[Ljava/awt/Window;
+ ()[1Ljava/awt/Window;
 getWindows
  ()[Ljava/awt/Window;
  ()[Ljava/awt/Window;
@@ -45,25 +45,25 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color; # @Inherited(java.awt.Component)
 getBufferStrategy
  ()Ljava/awt/image/BufferStrategy;
  ()Ljava/awt/image/BufferStrategy;
 getFocusCycleRootAncestor
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L0java/awt/Container;
 getFocusOwner
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 getFocusTraversalKeys
  (I)Ljava/util/Set<Ljava/awt/AWTKeyStroke;>;
- (I)Ljava/util/Set<Ljava/awt/AWTKeyStroke;>;
+ (I)L0java/util/Set<Ljava/awt/AWTKeyStroke;>;
 getIconImages
  ()Ljava/util/List<Ljava/awt/Image;>;
- ()Ljava/util/List<Ljava/awt/Image;>;
+ ()L1java/util/List<Ljava/awt/Image;>;
 getInputContext
  ()Ljava/awt/im/InputContext;
- ()Ljava/awt/im/InputContext;
+ ()L0java/awt/im/InputContext; # @Inherited(java.awt.Component)
 getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
@@ -75,7 +75,7 @@ getModalExclusionType
  ()Ljava/awt/Dialog$ModalExclusionType;
 getMostRecentFocusOwner
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 getOwnedWindows
  ()[Ljava/awt/Window;
  ()[Ljava/awt/Window;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/color/ICC_ColorSpace.eea b/libs/eea-java-21/src/main/resources/java/awt/color/ICC_ColorSpace.eea
index 0d66db046a..d4ced29f93 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/color/ICC_ColorSpace.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/color/ICC_ColorSpace.eea
@@ -5,16 +5,16 @@ class java/awt/color/ICC_ColorSpace
  (Ljava/awt/color/ICC_Profile;)V
 fromCIEXYZ
  ([F)[F
- ([F)[F
+ ([F)[1F
 fromRGB
  ([F)[F
- ([F)[F
+ ([F)[1F
 getProfile
  ()Ljava/awt/color/ICC_Profile;
  ()Ljava/awt/color/ICC_Profile;
 toCIEXYZ
  ([F)[F
- ([F)[F
+ ([F)[1F
 toRGB
  ([F)[F
- ([F)[F
+ ([F)[1F
diff --git a/libs/eea-java-21/src/main/resources/java/awt/color/ICC_Profile.eea b/libs/eea-java-21/src/main/resources/java/awt/color/ICC_Profile.eea
index 7a23bea501..0440ce3e82 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/color/ICC_Profile.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/color/ICC_Profile.eea
@@ -11,14 +11,14 @@ getInstance
  (Ljava/lang/String;)Ljava/awt/color/ICC_Profile;
 getInstance
  ([B)Ljava/awt/color/ICC_Profile;
- ([B)Ljava/awt/color/ICC_Profile;
+ ([B)L1java/awt/color/ICC_Profile;
 
 getData
  ()[B
- ()[B
+ ()[1B
 getData
  (I)[B
- (I)[B
+ (I)[0B
 readResolve
  ()Ljava/lang/Object;
  ()L1java/lang/Object;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/datatransfer/DataFlavor.eea b/libs/eea-java-21/src/main/resources/java/awt/datatransfer/DataFlavor.eea
index 542a713f57..85e3534877 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/datatransfer/DataFlavor.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/datatransfer/DataFlavor.eea
@@ -36,7 +36,7 @@ getTextPlainUnicodeFlavor
  ()Ljava/awt/datatransfer/DataFlavor;
 selectBestTextFlavor
  ([Ljava/awt/datatransfer/DataFlavor;)Ljava/awt/datatransfer/DataFlavor;
- ([Ljava/awt/datatransfer/DataFlavor;)Ljava/awt/datatransfer/DataFlavor;
+ ([Ljava/awt/datatransfer/DataFlavor;)L0java/awt/datatransfer/DataFlavor;
 tryToLoadClass
  (Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/Class<*>;
  (Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/Class<*>;
@@ -67,7 +67,7 @@ equals
  (Ljava/lang/String;)Z
 getDefaultRepresentationClass
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L1java/lang/Class<*>;
 getDefaultRepresentationClassAsString
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -76,13 +76,13 @@ getHumanPresentableName
  ()Ljava/lang/String;
 getMimeType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getParameter
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getPrimaryType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getReaderForText
  (Ljava/awt/datatransfer/Transferable;)Ljava/io/Reader;
  (Ljava/awt/datatransfer/Transferable;)Ljava/io/Reader;
@@ -91,7 +91,7 @@ getRepresentationClass
  ()Ljava/lang/Class<*>;
 getSubType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 isMimeTypeEqual
  (Ljava/awt/datatransfer/DataFlavor;)Z
  (Ljava/awt/datatransfer/DataFlavor;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/awt/datatransfer/SystemFlavorMap.eea b/libs/eea-java-21/src/main/resources/java/awt/datatransfer/SystemFlavorMap.eea
index 4f66551538..9fa39bf46d 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/datatransfer/SystemFlavorMap.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/datatransfer/SystemFlavorMap.eea
@@ -2,16 +2,16 @@ class java/awt/datatransfer/SystemFlavorMap
 
 decodeDataFlavor
  (Ljava/lang/String;)Ljava/awt/datatransfer/DataFlavor;
- (Ljava/lang/String;)Ljava/awt/datatransfer/DataFlavor;
+ (Ljava/lang/String;)L0java/awt/datatransfer/DataFlavor;
 decodeJavaMIMEType
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 encodeDataFlavor
  (Ljava/awt/datatransfer/DataFlavor;)Ljava/lang/String;
- (Ljava/awt/datatransfer/DataFlavor;)Ljava/lang/String;
+ (Ljava/awt/datatransfer/DataFlavor;)L0java/lang/String;
 encodeJavaMIMEType
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getDefaultFlavorMap
  ()Ljava/awt/datatransfer/FlavorMap;
  ()Ljava/awt/datatransfer/FlavorMap;
@@ -27,13 +27,13 @@ addUnencodedNativeForFlavor
  (Ljava/awt/datatransfer/DataFlavor;Ljava/lang/String;)V
 getFlavorsForNative
  (Ljava/lang/String;)Ljava/util/List<Ljava/awt/datatransfer/DataFlavor;>;
- (Ljava/lang/String;)Ljava/util/List<Ljava/awt/datatransfer/DataFlavor;>;
+ (Ljava/lang/String;)L1java/util/List<Ljava/awt/datatransfer/DataFlavor;>;
 getFlavorsForNatives
  ([Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/awt/datatransfer/DataFlavor;>;
  ([Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/awt/datatransfer/DataFlavor;>;
 getNativesForFlavor
  (Ljava/awt/datatransfer/DataFlavor;)Ljava/util/List<Ljava/lang/String;>;
- (Ljava/awt/datatransfer/DataFlavor;)Ljava/util/List<Ljava/lang/String;>;
+ (Ljava/awt/datatransfer/DataFlavor;)L1java/util/List<Ljava/lang/String;>;
 getNativesForFlavors
  ([Ljava/awt/datatransfer/DataFlavor;)Ljava/util/Map<Ljava/awt/datatransfer/DataFlavor;Ljava/lang/String;>;
  ([Ljava/awt/datatransfer/DataFlavor;)Ljava/util/Map<Ljava/awt/datatransfer/DataFlavor;Ljava/lang/String;>;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/desktop/FilesEvent.eea b/libs/eea-java-21/src/main/resources/java/awt/desktop/FilesEvent.eea
index 8afc2ddea3..7c7523ae2e 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/desktop/FilesEvent.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/desktop/FilesEvent.eea
@@ -2,4 +2,4 @@ class java/awt/desktop/FilesEvent
 
 getFiles
  ()Ljava/util/List<Ljava/io/File;>;
- ()Ljava/util/List<Ljava/io/File;>;
+ ()L1java/util/List<Ljava/io/File;>;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/dnd/DragSource.eea b/libs/eea-java-21/src/main/resources/java/awt/dnd/DragSource.eea
index d88114865e..3070a955a3 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/dnd/DragSource.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/dnd/DragSource.eea
@@ -31,13 +31,13 @@ addDragSourceMotionListener
  (L1java/awt/dnd/DragSourceMotionListener;)V
 createDefaultDragGestureRecognizer
  (Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)Ljava/awt/dnd/DragGestureRecognizer;
- (Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)Ljava/awt/dnd/DragGestureRecognizer;
+ (Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)L1java/awt/dnd/DragGestureRecognizer;
 createDragGestureRecognizer
  <T:Ljava/awt/dnd/DragGestureRecognizer;>(Ljava/lang/Class<TT;>;Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)TT;
- <T:Ljava/awt/dnd/DragGestureRecognizer;>(Ljava/lang/Class<TT;>;Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)TT;
+ <T:Ljava/awt/dnd/DragGestureRecognizer;>(Ljava/lang/Class<TT;>;Ljava/awt/Component;ILjava/awt/dnd/DragGestureListener;)T1T;
 createDragSourceContext
  (Ljava/awt/dnd/DragGestureEvent;Ljava/awt/Cursor;Ljava/awt/Image;Ljava/awt/Point;Ljava/awt/datatransfer/Transferable;Ljava/awt/dnd/DragSourceListener;)Ljava/awt/dnd/DragSourceContext;
- (Ljava/awt/dnd/DragGestureEvent;Ljava/awt/Cursor;Ljava/awt/Image;Ljava/awt/Point;Ljava/awt/datatransfer/Transferable;Ljava/awt/dnd/DragSourceListener;)Ljava/awt/dnd/DragSourceContext;
+ (Ljava/awt/dnd/DragGestureEvent;Ljava/awt/Cursor;Ljava/awt/Image;Ljava/awt/Point;Ljava/awt/datatransfer/Transferable;Ljava/awt/dnd/DragSourceListener;)L1java/awt/dnd/DragSourceContext;
 getDragSourceListeners
  ()[Ljava/awt/dnd/DragSourceListener;
  ()[Ljava/awt/dnd/DragSourceListener;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/dnd/DragSourceEvent.eea b/libs/eea-java-21/src/main/resources/java/awt/dnd/DragSourceEvent.eea
index 60eb2eeb01..aeee9e81e2 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/dnd/DragSourceEvent.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/dnd/DragSourceEvent.eea
@@ -11,4 +11,4 @@ getDragSourceContext
  ()Ljava/awt/dnd/DragSourceContext;
 getLocation
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/dnd/DropTarget.eea b/libs/eea-java-21/src/main/resources/java/awt/dnd/DropTarget.eea
index aa168ad706..048b80353d 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/dnd/DropTarget.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/dnd/DropTarget.eea
@@ -17,10 +17,10 @@ addDropTargetListener
  (L1java/awt/dnd/DropTargetListener;)V
 createDropTargetAutoScroller
  (Ljava/awt/Component;Ljava/awt/Point;)Ljava/awt/dnd/DropTarget$DropTargetAutoScroller;
- (Ljava/awt/Component;Ljava/awt/Point;)Ljava/awt/dnd/DropTarget$DropTargetAutoScroller;
+ (Ljava/awt/Component;Ljava/awt/Point;)L1java/awt/dnd/DropTarget$DropTargetAutoScroller;
 createDropTargetContext
  ()Ljava/awt/dnd/DropTargetContext;
- ()Ljava/awt/dnd/DropTargetContext;
+ ()L1java/awt/dnd/DropTargetContext;
 dragEnter
  (Ljava/awt/dnd/DropTargetDragEvent;)V
  (L1java/awt/dnd/DropTargetDragEvent;)V # @Inherited(java.awt.dnd.DropTargetListener)
diff --git a/libs/eea-java-21/src/main/resources/java/awt/dnd/DropTargetContext.eea b/libs/eea-java-21/src/main/resources/java/awt/dnd/DropTargetContext.eea
index f11644ee4f..4b35a47ca3 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/dnd/DropTargetContext.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/dnd/DropTargetContext.eea
@@ -2,13 +2,13 @@ class java/awt/dnd/DropTargetContext
 
 createTransferableProxy
  (Ljava/awt/datatransfer/Transferable;Z)Ljava/awt/datatransfer/Transferable;
- (Ljava/awt/datatransfer/Transferable;Z)Ljava/awt/datatransfer/Transferable;
+ (Ljava/awt/datatransfer/Transferable;Z)L1java/awt/datatransfer/Transferable;
 getComponent
  ()Ljava/awt/Component;
  ()Ljava/awt/Component;
 getCurrentDataFlavors
  ()[Ljava/awt/datatransfer/DataFlavor;
- ()[Ljava/awt/datatransfer/DataFlavor;
+ ()[1Ljava/awt/datatransfer/DataFlavor;
 getCurrentDataFlavorsAsList
  ()Ljava/util/List<Ljava/awt/datatransfer/DataFlavor;>;
  ()Ljava/util/List<Ljava/awt/datatransfer/DataFlavor;>;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/event/ActionEvent.eea b/libs/eea-java-21/src/main/resources/java/awt/event/ActionEvent.eea
index f541fb90e9..7a75bf609e 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/event/ActionEvent.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/event/ActionEvent.eea
@@ -14,4 +14,4 @@ getActionCommand
  ()Ljava/lang/String;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-21/src/main/resources/java/awt/event/AdjustmentEvent.eea b/libs/eea-java-21/src/main/resources/java/awt/event/AdjustmentEvent.eea
index fa963763f9..bf6f4022d0 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/event/AdjustmentEvent.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/event/AdjustmentEvent.eea
@@ -11,4 +11,4 @@ getAdjustable
  ()Ljava/awt/Adjustable;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-21/src/main/resources/java/awt/event/ComponentEvent.eea b/libs/eea-java-21/src/main/resources/java/awt/event/ComponentEvent.eea
index 248278dc87..84735f25fc 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/event/ComponentEvent.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/event/ComponentEvent.eea
@@ -5,7 +5,7 @@ class java/awt/event/ComponentEvent
  (Ljava/awt/Component;I)V
 getComponent
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-21/src/main/resources/java/awt/event/ContainerEvent.eea b/libs/eea-java-21/src/main/resources/java/awt/event/ContainerEvent.eea
index 4505843401..adf4537c74 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/event/ContainerEvent.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/event/ContainerEvent.eea
@@ -8,7 +8,7 @@ getChild
  ()Ljava/awt/Component;
 getContainer
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L0java/awt/Container;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.event.ComponentEvent)
diff --git a/libs/eea-java-21/src/main/resources/java/awt/event/FocusEvent.eea b/libs/eea-java-21/src/main/resources/java/awt/event/FocusEvent.eea
index 667f5751a7..854cb65b7a 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/event/FocusEvent.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/event/FocusEvent.eea
@@ -17,7 +17,7 @@ getCause
  ()Ljava/awt/event/FocusEvent$Cause;
 getOppositeComponent
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.event.ComponentEvent)
diff --git a/libs/eea-java-21/src/main/resources/java/awt/event/HierarchyEvent.eea b/libs/eea-java-21/src/main/resources/java/awt/event/HierarchyEvent.eea
index 1af8e531c7..8001088a04 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/event/HierarchyEvent.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/event/HierarchyEvent.eea
@@ -14,7 +14,7 @@ getChangedParent
  ()Ljava/awt/Container;
 getComponent
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-21/src/main/resources/java/awt/event/InputEvent.eea b/libs/eea-java-21/src/main/resources/java/awt/event/InputEvent.eea
index cbab8383da..bee433f498 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/event/InputEvent.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/event/InputEvent.eea
@@ -2,4 +2,4 @@ class java/awt/event/InputEvent
 
 getModifiersExText
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/event/InputMethodEvent.eea b/libs/eea-java-21/src/main/resources/java/awt/event/InputMethodEvent.eea
index f19223647f..6977a20734 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/event/InputMethodEvent.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/event/InputMethodEvent.eea
@@ -20,4 +20,4 @@ getVisiblePosition
  ()Ljava/awt/font/TextHitInfo;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-21/src/main/resources/java/awt/event/InvocationEvent.eea b/libs/eea-java-21/src/main/resources/java/awt/event/InvocationEvent.eea
index 54d8e5b19d..9431e73858 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/event/InvocationEvent.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/event/InvocationEvent.eea
@@ -21,10 +21,10 @@ runnable
  (Ljava/lang/Object;Ljava/lang/Runnable;Ljava/lang/Runnable;Z)V
 getException
  ()Ljava/lang/Exception;
- ()Ljava/lang/Exception;
+ ()L0java/lang/Exception;
 getThrowable
  ()Ljava/lang/Throwable;
- ()Ljava/lang/Throwable;
+ ()L0java/lang/Throwable;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-21/src/main/resources/java/awt/event/ItemEvent.eea b/libs/eea-java-21/src/main/resources/java/awt/event/ItemEvent.eea
index 26b9fe5399..63c93bbdbf 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/event/ItemEvent.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/event/ItemEvent.eea
@@ -11,4 +11,4 @@ getItemSelectable
  ()Ljava/awt/ItemSelectable;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-21/src/main/resources/java/awt/event/KeyEvent.eea b/libs/eea-java-21/src/main/resources/java/awt/event/KeyEvent.eea
index c8e55094ed..bc2af4dbe9 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/event/KeyEvent.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/event/KeyEvent.eea
@@ -2,7 +2,7 @@ class java/awt/event/KeyEvent
 
 getKeyModifiersText
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 getKeyText
  (I)Ljava/lang/String;
  (I)Ljava/lang/String;
@@ -18,4 +18,4 @@ getKeyText
  (Ljava/awt/Component;IJIICI)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.event.ComponentEvent)
diff --git a/libs/eea-java-21/src/main/resources/java/awt/event/MouseEvent.eea b/libs/eea-java-21/src/main/resources/java/awt/event/MouseEvent.eea
index a4be41b353..f56f197bfa 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/event/MouseEvent.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/event/MouseEvent.eea
@@ -2,7 +2,7 @@ class java/awt/event/MouseEvent
 
 getMouseModifiersText
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 
 <init>
  (Ljava/awt/Component;IJIIIIIIZI)V
@@ -18,7 +18,7 @@ getLocationOnScreen
  ()Ljava/awt/Point;
 getPoint
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L1java/awt/Point;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.event.ComponentEvent)
diff --git a/libs/eea-java-21/src/main/resources/java/awt/event/MouseWheelEvent.eea b/libs/eea-java-21/src/main/resources/java/awt/event/MouseWheelEvent.eea
index ab44cf6c46..bab3618f00 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/event/MouseWheelEvent.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/event/MouseWheelEvent.eea
@@ -11,4 +11,4 @@ class java/awt/event/MouseWheelEvent
  (Ljava/awt/Component;IJIIIIZIII)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.event.MouseEvent)
diff --git a/libs/eea-java-21/src/main/resources/java/awt/event/PaintEvent.eea b/libs/eea-java-21/src/main/resources/java/awt/event/PaintEvent.eea
index 65b2cbfa4b..95d2eaa82e 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/event/PaintEvent.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/event/PaintEvent.eea
@@ -8,7 +8,7 @@ getUpdateRect
  ()Ljava/awt/Rectangle;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.event.ComponentEvent)
 setUpdateRect
  (Ljava/awt/Rectangle;)V
  (Ljava/awt/Rectangle;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/event/TextEvent.eea b/libs/eea-java-21/src/main/resources/java/awt/event/TextEvent.eea
index 381c8e901a..15d46c86ca 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/event/TextEvent.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/event/TextEvent.eea
@@ -5,4 +5,4 @@ class java/awt/event/TextEvent
  (Ljava/lang/Object;I)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-21/src/main/resources/java/awt/event/WindowEvent.eea b/libs/eea-java-21/src/main/resources/java/awt/event/WindowEvent.eea
index b5a35b6220..2fe2c14d44 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/event/WindowEvent.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/event/WindowEvent.eea
@@ -14,10 +14,10 @@ class java/awt/event/WindowEvent
  (Ljava/awt/Window;ILjava/awt/Window;II)V
 getOppositeWindow
  ()Ljava/awt/Window;
- ()Ljava/awt/Window;
+ ()L0java/awt/Window;
 getWindow
  ()Ljava/awt/Window;
- ()Ljava/awt/Window;
+ ()L0java/awt/Window;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.event.ComponentEvent)
diff --git a/libs/eea-java-21/src/main/resources/java/awt/font/FontRenderContext.eea b/libs/eea-java-21/src/main/resources/java/awt/font/FontRenderContext.eea
index 06663117cf..98c1a76b22 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/font/FontRenderContext.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/font/FontRenderContext.eea
@@ -20,4 +20,4 @@ getFractionalMetricsHint
  ()Ljava/lang/Object;
 getTransform
  ()Ljava/awt/geom/AffineTransform;
- ()Ljava/awt/geom/AffineTransform;
+ ()L1java/awt/geom/AffineTransform;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/font/GlyphVector.eea b/libs/eea-java-21/src/main/resources/java/awt/font/GlyphVector.eea
index a2a027c978..a89b16264f 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/font/GlyphVector.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/font/GlyphVector.eea
@@ -11,7 +11,7 @@ getFontRenderContext
  ()Ljava/awt/font/FontRenderContext;
 getGlyphCharIndices
  (II[I)[I
- (II[I)[I
+ (II[I)[1I
 getGlyphCodes
  (II[I)[I
  (II[I)[I
diff --git a/libs/eea-java-21/src/main/resources/java/awt/font/LineBreakMeasurer.eea b/libs/eea-java-21/src/main/resources/java/awt/font/LineBreakMeasurer.eea
index 2439a59f27..b398d391fd 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/font/LineBreakMeasurer.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/font/LineBreakMeasurer.eea
@@ -17,4 +17,4 @@ nextLayout
  (F)Ljava/awt/font/TextLayout;
 nextLayout
  (FIZ)Ljava/awt/font/TextLayout;
- (FIZ)Ljava/awt/font/TextLayout;
+ (FIZ)L0java/awt/font/TextLayout;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/font/NumericShaper.eea b/libs/eea-java-21/src/main/resources/java/awt/font/NumericShaper.eea
index 1bd374a959..004363fe47 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/font/NumericShaper.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/font/NumericShaper.eea
@@ -5,19 +5,19 @@ getContextualShaper
  (I)Ljava/awt/font/NumericShaper;
 getContextualShaper
  (II)Ljava/awt/font/NumericShaper;
- (II)Ljava/awt/font/NumericShaper;
+ (II)L1java/awt/font/NumericShaper;
 getContextualShaper
  (Ljava/util/Set<Ljava/awt/font/NumericShaper$Range;>;)Ljava/awt/font/NumericShaper;
- (Ljava/util/Set<Ljava/awt/font/NumericShaper$Range;>;)Ljava/awt/font/NumericShaper;
+ (Ljava/util/Set<Ljava/awt/font/NumericShaper$Range;>;)L1java/awt/font/NumericShaper;
 getContextualShaper
  (Ljava/util/Set<Ljava/awt/font/NumericShaper$Range;>;Ljava/awt/font/NumericShaper$Range;)Ljava/awt/font/NumericShaper;
- (Ljava/util/Set<Ljava/awt/font/NumericShaper$Range;>;Ljava/awt/font/NumericShaper$Range;)Ljava/awt/font/NumericShaper;
+ (Ljava/util/Set<Ljava/awt/font/NumericShaper$Range;>;Ljava/awt/font/NumericShaper$Range;)L1java/awt/font/NumericShaper;
 getShaper
  (I)Ljava/awt/font/NumericShaper;
- (I)Ljava/awt/font/NumericShaper;
+ (I)L1java/awt/font/NumericShaper;
 getShaper
  (Ljava/awt/font/NumericShaper$Range;)Ljava/awt/font/NumericShaper;
- (Ljava/awt/font/NumericShaper$Range;)Ljava/awt/font/NumericShaper;
+ (Ljava/awt/font/NumericShaper$Range;)L1java/awt/font/NumericShaper;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/awt/font/ShapeGraphicAttribute.eea b/libs/eea-java-21/src/main/resources/java/awt/font/ShapeGraphicAttribute.eea
index 92ab1bca0d..83529bd0c1 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/font/ShapeGraphicAttribute.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/font/ShapeGraphicAttribute.eea
@@ -14,7 +14,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getBounds
  ()Ljava/awt/geom/Rectangle2D;
- ()Ljava/awt/geom/Rectangle2D;
+ ()L1java/awt/geom/Rectangle2D;
 getOutline
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/Shape;
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/Shape;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/font/TextLayout.eea b/libs/eea-java-21/src/main/resources/java/awt/font/TextLayout.eea
index 316f56c56a..fd954819a7 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/font/TextLayout.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/font/TextLayout.eea
@@ -24,13 +24,13 @@ equals
  (Ljava/awt/font/TextLayout;)Z
 getBaselineOffsets
  ()[F
- ()[F
+ ()[1F
 getBlackBoxBounds
  (II)Ljava/awt/Shape;
  (II)Ljava/awt/Shape;
 getBounds
  ()Ljava/awt/geom/Rectangle2D;
- ()Ljava/awt/geom/Rectangle2D;
+ ()L1java/awt/geom/Rectangle2D;
 getCaretInfo
  (Ljava/awt/font/TextHitInfo;)[F
  (Ljava/awt/font/TextHitInfo;)[F
@@ -51,7 +51,7 @@ getCaretShapes
  (ILjava/awt/geom/Rectangle2D;)[Ljava/awt/Shape;
 getCaretShapes
  (ILjava/awt/geom/Rectangle2D;Ljava/awt/font/TextLayout$CaretPolicy;)[Ljava/awt/Shape;
- (ILjava/awt/geom/Rectangle2D;Ljava/awt/font/TextLayout$CaretPolicy;)[Ljava/awt/Shape;
+ (ILjava/awt/geom/Rectangle2D;Ljava/awt/font/TextLayout$CaretPolicy;)[1Ljava/awt/Shape;
 getJustifiedLayout
  (F)Ljava/awt/font/TextLayout;
  (F)Ljava/awt/font/TextLayout;
@@ -66,25 +66,25 @@ getLogicalHighlightShape
  (IILjava/awt/geom/Rectangle2D;)Ljava/awt/Shape;
 getLogicalRangesForVisualSelection
  (Ljava/awt/font/TextHitInfo;Ljava/awt/font/TextHitInfo;)[I
- (Ljava/awt/font/TextHitInfo;Ljava/awt/font/TextHitInfo;)[I
+ (Ljava/awt/font/TextHitInfo;Ljava/awt/font/TextHitInfo;)[1I
 getNextLeftHit
  (I)Ljava/awt/font/TextHitInfo;
  (I)Ljava/awt/font/TextHitInfo;
 getNextLeftHit
  (ILjava/awt/font/TextLayout$CaretPolicy;)Ljava/awt/font/TextHitInfo;
- (ILjava/awt/font/TextLayout$CaretPolicy;)Ljava/awt/font/TextHitInfo;
+ (ILjava/awt/font/TextLayout$CaretPolicy;)L0java/awt/font/TextHitInfo;
 getNextLeftHit
  (Ljava/awt/font/TextHitInfo;)Ljava/awt/font/TextHitInfo;
- (Ljava/awt/font/TextHitInfo;)Ljava/awt/font/TextHitInfo;
+ (Ljava/awt/font/TextHitInfo;)L0java/awt/font/TextHitInfo;
 getNextRightHit
  (I)Ljava/awt/font/TextHitInfo;
  (I)Ljava/awt/font/TextHitInfo;
 getNextRightHit
  (ILjava/awt/font/TextLayout$CaretPolicy;)Ljava/awt/font/TextHitInfo;
- (ILjava/awt/font/TextLayout$CaretPolicy;)Ljava/awt/font/TextHitInfo;
+ (ILjava/awt/font/TextLayout$CaretPolicy;)L0java/awt/font/TextHitInfo;
 getNextRightHit
  (Ljava/awt/font/TextHitInfo;)Ljava/awt/font/TextHitInfo;
- (Ljava/awt/font/TextHitInfo;)Ljava/awt/font/TextHitInfo;
+ (Ljava/awt/font/TextHitInfo;)L0java/awt/font/TextHitInfo;
 getOutline
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/Shape;
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/Shape;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/font/TransformAttribute.eea b/libs/eea-java-21/src/main/resources/java/awt/font/TransformAttribute.eea
index b2dc622d3d..2d737268e5 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/font/TransformAttribute.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/font/TransformAttribute.eea
@@ -12,4 +12,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getTransform
  ()Ljava/awt/geom/AffineTransform;
- ()Ljava/awt/geom/AffineTransform;
+ ()L1java/awt/geom/AffineTransform;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/geom/AffineTransform.eea b/libs/eea-java-21/src/main/resources/java/awt/geom/AffineTransform.eea
index 756de77623..737666a241 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/geom/AffineTransform.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/geom/AffineTransform.eea
@@ -2,31 +2,31 @@ class java/awt/geom/AffineTransform
 
 getQuadrantRotateInstance
  (I)Ljava/awt/geom/AffineTransform;
- (I)Ljava/awt/geom/AffineTransform;
+ (I)L1java/awt/geom/AffineTransform;
 getQuadrantRotateInstance
  (IDD)Ljava/awt/geom/AffineTransform;
- (IDD)Ljava/awt/geom/AffineTransform;
+ (IDD)L1java/awt/geom/AffineTransform;
 getRotateInstance
  (D)Ljava/awt/geom/AffineTransform;
- (D)Ljava/awt/geom/AffineTransform;
+ (D)L1java/awt/geom/AffineTransform;
 getRotateInstance
  (DD)Ljava/awt/geom/AffineTransform;
- (DD)Ljava/awt/geom/AffineTransform;
+ (DD)L1java/awt/geom/AffineTransform;
 getRotateInstance
  (DDD)Ljava/awt/geom/AffineTransform;
- (DDD)Ljava/awt/geom/AffineTransform;
+ (DDD)L1java/awt/geom/AffineTransform;
 getRotateInstance
  (DDDD)Ljava/awt/geom/AffineTransform;
- (DDDD)Ljava/awt/geom/AffineTransform;
+ (DDDD)L1java/awt/geom/AffineTransform;
 getScaleInstance
  (DD)Ljava/awt/geom/AffineTransform;
- (DD)Ljava/awt/geom/AffineTransform;
+ (DD)L1java/awt/geom/AffineTransform;
 getShearInstance
  (DD)Ljava/awt/geom/AffineTransform;
- (DD)Ljava/awt/geom/AffineTransform;
+ (DD)L1java/awt/geom/AffineTransform;
 getTranslateInstance
  (DD)Ljava/awt/geom/AffineTransform;
- (DD)Ljava/awt/geom/AffineTransform;
+ (DD)L1java/awt/geom/AffineTransform;
 
 <init>
  (Ljava/awt/geom/AffineTransform;)V
@@ -45,13 +45,13 @@ concatenate
  (Ljava/awt/geom/AffineTransform;)V
 createInverse
  ()Ljava/awt/geom/AffineTransform;
- ()Ljava/awt/geom/AffineTransform;
+ ()L0java/awt/geom/AffineTransform;
 createTransformedShape
  (Ljava/awt/Shape;)Ljava/awt/Shape;
- (Ljava/awt/Shape;)Ljava/awt/Shape;
+ (Ljava/awt/Shape;)Ljava/awt/Shape; # @PolyNull
 deltaTransform
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
- (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
+ (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)L0java/awt/geom/Point2D;
 deltaTransform
  ([DI[DII)V
  ([DI[DII)V
@@ -63,7 +63,7 @@ getMatrix
  ([D)V
 inverseTransform
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
- (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
+ (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)L1java/awt/geom/Point2D;
 inverseTransform
  ([DI[DII)V
  ([DI[DII)V
@@ -78,7 +78,7 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 transform
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
- (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
+ (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)L0java/awt/geom/Point2D;
 transform
  ([DI[DII)V
  ([DI[DII)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/geom/Arc2D$Double.eea b/libs/eea-java-21/src/main/resources/java/awt/geom/Arc2D$Double.eea
index 2ee4c625cd..efb504cd4a 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/geom/Arc2D$Double.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/geom/Arc2D$Double.eea
@@ -5,4 +5,4 @@ class java/awt/geom/Arc2D$Double
  (Ljava/awt/geom/Rectangle2D;DDI)V
 makeBounds
  (DDDD)Ljava/awt/geom/Rectangle2D;
- (DDDD)Ljava/awt/geom/Rectangle2D;
+ (DDDD)L1java/awt/geom/Rectangle2D;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/geom/Arc2D.eea b/libs/eea-java-21/src/main/resources/java/awt/geom/Arc2D.eea
index bf9809bd63..a64f15ee34 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/geom/Arc2D.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/geom/Arc2D.eea
@@ -11,13 +11,13 @@ getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
 getEndPoint
  ()Ljava/awt/geom/Point2D;
- ()Ljava/awt/geom/Point2D;
+ ()L1java/awt/geom/Point2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 getStartPoint
  ()Ljava/awt/geom/Point2D;
- ()Ljava/awt/geom/Point2D;
+ ()L1java/awt/geom/Point2D;
 makeBounds
  (DDDD)Ljava/awt/geom/Rectangle2D;
  (DDDD)Ljava/awt/geom/Rectangle2D;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/geom/Area.eea b/libs/eea-java-21/src/main/resources/java/awt/geom/Area.eea
index 06439e9b37..fd15031df2 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/geom/Area.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/geom/Area.eea
@@ -17,7 +17,7 @@ contains
  (Ljava/awt/geom/Rectangle2D;)Z
 createTransformedArea
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/Area;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/Area;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/Area;
 equals
  (Ljava/awt/geom/Area;)Z
  (Ljava/awt/geom/Area;)Z
@@ -32,10 +32,10 @@ getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;D)L1java/awt/geom/PathIterator;
 intersect
  (Ljava/awt/geom/Area;)V
  (Ljava/awt/geom/Area;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/geom/CubicCurve2D.eea b/libs/eea-java-21/src/main/resources/java/awt/geom/CubicCurve2D.eea
index 1757500190..79f125abb8 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/geom/CubicCurve2D.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/geom/CubicCurve2D.eea
@@ -48,10 +48,10 @@ getP2
  ()Ljava/awt/geom/Point2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;D)L1java/awt/geom/PathIterator;
 intersects
  (Ljava/awt/geom/Rectangle2D;)Z
  (Ljava/awt/geom/Rectangle2D;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/awt/geom/Ellipse2D.eea b/libs/eea-java-21/src/main/resources/java/awt/geom/Ellipse2D.eea
index f1cc1192f8..b4e32bdb66 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/geom/Ellipse2D.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/geom/Ellipse2D.eea
@@ -5,4 +5,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/geom/Line2D$Double.eea b/libs/eea-java-21/src/main/resources/java/awt/geom/Line2D$Double.eea
index 741afd70cf..73d3d64ebf 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/geom/Line2D$Double.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/geom/Line2D$Double.eea
@@ -5,7 +5,7 @@ class java/awt/geom/Line2D$Double
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)V
 getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
- ()Ljava/awt/geom/Rectangle2D;
+ ()L1java/awt/geom/Rectangle2D;
 getP1
  ()Ljava/awt/geom/Point2D;
  ()Ljava/awt/geom/Point2D;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/geom/Line2D$Float.eea b/libs/eea-java-21/src/main/resources/java/awt/geom/Line2D$Float.eea
index 68f4e0365c..caadf613e1 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/geom/Line2D$Float.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/geom/Line2D$Float.eea
@@ -5,7 +5,7 @@ class java/awt/geom/Line2D$Float
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)V
 getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
- ()Ljava/awt/geom/Rectangle2D;
+ ()L1java/awt/geom/Rectangle2D;
 getP1
  ()Ljava/awt/geom/Point2D;
  ()Ljava/awt/geom/Point2D;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/geom/Line2D.eea b/libs/eea-java-21/src/main/resources/java/awt/geom/Line2D.eea
index f58ff2b577..4c6f212e57 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/geom/Line2D.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/geom/Line2D.eea
@@ -20,10 +20,10 @@ getP2
  ()Ljava/awt/geom/Point2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;D)L1java/awt/geom/PathIterator;
 intersects
  (Ljava/awt/geom/Rectangle2D;)Z
  (Ljava/awt/geom/Rectangle2D;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/awt/geom/Path2D$Double.eea b/libs/eea-java-21/src/main/resources/java/awt/geom/Path2D$Double.eea
index c923b76ba6..7e4bd077a7 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/geom/Path2D$Double.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/geom/Path2D$Double.eea
@@ -17,7 +17,7 @@ getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 transform
  (Ljava/awt/geom/AffineTransform;)V
  (Ljava/awt/geom/AffineTransform;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/geom/Path2D$Float.eea b/libs/eea-java-21/src/main/resources/java/awt/geom/Path2D$Float.eea
index d63ab273e6..b9cb4ed35e 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/geom/Path2D$Float.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/geom/Path2D$Float.eea
@@ -17,7 +17,7 @@ getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 transform
  (Ljava/awt/geom/AffineTransform;)V
  (Ljava/awt/geom/AffineTransform;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/geom/Path2D.eea b/libs/eea-java-21/src/main/resources/java/awt/geom/Path2D.eea
index bfcd5ea33d..c66b14211f 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/geom/Path2D.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/geom/Path2D.eea
@@ -36,16 +36,16 @@ contains
  (Ljava/awt/geom/Rectangle2D;)Z
 createTransformedShape
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/Shape;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/Shape;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/Shape;
 getBounds
  ()Ljava/awt/Rectangle;
  ()Ljava/awt/Rectangle;
 getCurrentPoint
  ()Ljava/awt/geom/Point2D;
- ()Ljava/awt/geom/Point2D;
+ ()L0java/awt/geom/Point2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;D)L1java/awt/geom/PathIterator;
 intersects
  (Ljava/awt/geom/Rectangle2D;)Z
  (Ljava/awt/geom/Rectangle2D;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/awt/geom/QuadCurve2D.eea b/libs/eea-java-21/src/main/resources/java/awt/geom/QuadCurve2D.eea
index 238ad0d5db..da6cfcbe29 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/geom/QuadCurve2D.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/geom/QuadCurve2D.eea
@@ -45,10 +45,10 @@ getP2
  ()Ljava/awt/geom/Point2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;D)L1java/awt/geom/PathIterator;
 intersects
  (Ljava/awt/geom/Rectangle2D;)Z
  (Ljava/awt/geom/Rectangle2D;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/awt/geom/Rectangle2D$Double.eea b/libs/eea-java-21/src/main/resources/java/awt/geom/Rectangle2D$Double.eea
index 567d74c9df..d6e216051f 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/geom/Rectangle2D$Double.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/geom/Rectangle2D$Double.eea
@@ -2,10 +2,10 @@ class java/awt/geom/Rectangle2D$Double
 
 createIntersection
  (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
- (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
+ (Ljava/awt/geom/Rectangle2D;)L1java/awt/geom/Rectangle2D; # @Inherited(java.awt.geom.Rectangle2D)
 createUnion
  (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
- (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
+ (Ljava/awt/geom/Rectangle2D;)L1java/awt/geom/Rectangle2D; # @Inherited(java.awt.geom.Rectangle2D)
 getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
  ()Ljava/awt/geom/Rectangle2D;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/geom/Rectangle2D$Float.eea b/libs/eea-java-21/src/main/resources/java/awt/geom/Rectangle2D$Float.eea
index 24f10eff5e..7ec62fc07b 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/geom/Rectangle2D$Float.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/geom/Rectangle2D$Float.eea
@@ -2,10 +2,10 @@ class java/awt/geom/Rectangle2D$Float
 
 createIntersection
  (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
- (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
+ (Ljava/awt/geom/Rectangle2D;)L1java/awt/geom/Rectangle2D; # @Inherited(java.awt.geom.Rectangle2D)
 createUnion
  (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
- (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
+ (Ljava/awt/geom/Rectangle2D;)L1java/awt/geom/Rectangle2D; # @Inherited(java.awt.geom.Rectangle2D)
 getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
  ()Ljava/awt/geom/Rectangle2D;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/geom/Rectangle2D.eea b/libs/eea-java-21/src/main/resources/java/awt/geom/Rectangle2D.eea
index e7d55698e2..a98df9d76b 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/geom/Rectangle2D.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/geom/Rectangle2D.eea
@@ -15,10 +15,10 @@ add
  (Ljava/awt/geom/Rectangle2D;)V
 createIntersection
  (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
- (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
+ (Ljava/awt/geom/Rectangle2D;)L1java/awt/geom/Rectangle2D;
 createUnion
  (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
- (Ljava/awt/geom/Rectangle2D;)Ljava/awt/geom/Rectangle2D;
+ (Ljava/awt/geom/Rectangle2D;)L1java/awt/geom/Rectangle2D;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -27,10 +27,10 @@ getBounds2D
  ()Ljava/awt/geom/Rectangle2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;D)L1java/awt/geom/PathIterator; # @Inherited(java.awt.geom.RectangularShape)
 intersectsLine
  (Ljava/awt/geom/Line2D;)Z
  (Ljava/awt/geom/Line2D;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/awt/geom/RectangularShape.eea b/libs/eea-java-21/src/main/resources/java/awt/geom/RectangularShape.eea
index d0aa6206aa..f495b09d74 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/geom/RectangularShape.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/geom/RectangularShape.eea
@@ -14,10 +14,10 @@ getBounds
  ()Ljava/awt/Rectangle;
 getFrame
  ()Ljava/awt/geom/Rectangle2D;
- ()Ljava/awt/geom/Rectangle2D;
+ ()L1java/awt/geom/Rectangle2D;
 getPathIterator
  (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;D)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;D)L1java/awt/geom/PathIterator;
 intersects
  (Ljava/awt/geom/Rectangle2D;)Z
  (Ljava/awt/geom/Rectangle2D;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/awt/geom/RoundRectangle2D.eea b/libs/eea-java-21/src/main/resources/java/awt/geom/RoundRectangle2D.eea
index 9bc159d4a2..6b9154c5bf 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/geom/RoundRectangle2D.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/geom/RoundRectangle2D.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getPathIterator
  (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
- (Ljava/awt/geom/AffineTransform;)Ljava/awt/geom/PathIterator;
+ (Ljava/awt/geom/AffineTransform;)L1java/awt/geom/PathIterator;
 setRoundRect
  (Ljava/awt/geom/RoundRectangle2D;)V
  (Ljava/awt/geom/RoundRectangle2D;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/im/InputContext.eea b/libs/eea-java-21/src/main/resources/java/awt/im/InputContext.eea
index 5a942af534..2e1d3ad97c 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/im/InputContext.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/im/InputContext.eea
@@ -2,17 +2,17 @@ class java/awt/im/InputContext
 
 getInstance
  ()Ljava/awt/im/InputContext;
- ()Ljava/awt/im/InputContext;
+ ()L1java/awt/im/InputContext;
 
 dispatchEvent
  (Ljava/awt/AWTEvent;)V
  (Ljava/awt/AWTEvent;)V
 getInputMethodControlObject
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getLocale
  ()Ljava/util/Locale;
- ()Ljava/util/Locale;
+ ()L0java/util/Locale;
 removeNotify
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/im/spi/InputMethodContext.eea b/libs/eea-java-21/src/main/resources/java/awt/im/spi/InputMethodContext.eea
index cdc0882758..e07567ce5b 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/im/spi/InputMethodContext.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/im/spi/InputMethodContext.eea
@@ -2,10 +2,10 @@ class java/awt/im/spi/InputMethodContext
 
 createInputMethodJFrame
  (Ljava/lang/String;Z)Ljavax/swing/JFrame;
- (Ljava/lang/String;Z)Ljavax/swing/JFrame;
+ (Ljava/lang/String;Z)L1javax/swing/JFrame;
 createInputMethodWindow
  (Ljava/lang/String;Z)Ljava/awt/Window;
- (Ljava/lang/String;Z)Ljava/awt/Window;
+ (Ljava/lang/String;Z)L1java/awt/Window;
 dispatchInputMethodEvent
  (ILjava/text/AttributedCharacterIterator;ILjava/awt/font/TextHitInfo;Ljava/awt/font/TextHitInfo;)V
  (ILjava/text/AttributedCharacterIterator;ILjava/awt/font/TextHitInfo;Ljava/awt/font/TextHitInfo;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/im/spi/InputMethodDescriptor.eea b/libs/eea-java-21/src/main/resources/java/awt/im/spi/InputMethodDescriptor.eea
index a5f987a24c..87950a4fb5 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/im/spi/InputMethodDescriptor.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/im/spi/InputMethodDescriptor.eea
@@ -2,7 +2,7 @@ class java/awt/im/spi/InputMethodDescriptor
 
 createInputMethod
  ()Ljava/awt/im/spi/InputMethod;
- ()Ljava/awt/im/spi/InputMethod;
+ ()L1java/awt/im/spi/InputMethod;
 getAvailableLocales
  ()[Ljava/util/Locale;
  ()[Ljava/util/Locale;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/AbstractMultiResolutionImage.eea b/libs/eea-java-21/src/main/resources/java/awt/image/AbstractMultiResolutionImage.eea
index f0574056fd..de6bd012db 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/AbstractMultiResolutionImage.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/AbstractMultiResolutionImage.eea
@@ -5,7 +5,7 @@ getBaseImage
  ()Ljava/awt/Image;
 getGraphics
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L1java/awt/Graphics;
 getHeight
  (Ljava/awt/image/ImageObserver;)I
  (Ljava/awt/image/ImageObserver;)I
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/AffineTransformOp.eea b/libs/eea-java-21/src/main/resources/java/awt/image/AffineTransformOp.eea
index 0cd0b4be15..45005247fa 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/AffineTransformOp.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/AffineTransformOp.eea
@@ -8,10 +8,10 @@ class java/awt/image/AffineTransformOp
  (Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)V
 createCompatibleDestImage
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
- (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
+ (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)L1java/awt/image/BufferedImage; # @Inherited(java.awt.image.BufferedImageOp)
 createCompatibleDestRaster
  (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/Raster;)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.RasterOp)
 filter
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/BandCombineOp.eea b/libs/eea-java-21/src/main/resources/java/awt/image/BandCombineOp.eea
index a073171a66..76987734df 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/BandCombineOp.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/BandCombineOp.eea
@@ -5,7 +5,7 @@ class java/awt/image/BandCombineOp
  ([[FLjava/awt/RenderingHints;)V
 createCompatibleDestRaster
  (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/Raster;)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.RasterOp)
 filter
  (Ljava/awt/image/Raster;Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
  (Ljava/awt/image/Raster;Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
@@ -14,10 +14,10 @@ getBounds2D
  (Ljava/awt/image/Raster;)Ljava/awt/geom/Rectangle2D;
 getMatrix
  ()[[F
- ()[[F
+ ()[1[F
 getPoint2D
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
- (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
+ (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)L1java/awt/geom/Point2D;
 getRenderingHints
  ()Ljava/awt/RenderingHints;
  ()Ljava/awt/RenderingHints;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/BandedSampleModel.eea b/libs/eea-java-21/src/main/resources/java/awt/image/BandedSampleModel.eea
index 533e390b77..339cac02d5 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/BandedSampleModel.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/BandedSampleModel.eea
@@ -5,22 +5,22 @@ class java/awt/image/BandedSampleModel
  (IIII[I[I)V
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.ComponentSampleModel)
 createDataBuffer
  ()Ljava/awt/image/DataBuffer;
- ()Ljava/awt/image/DataBuffer;
+ ()L1java/awt/image/DataBuffer; # @Inherited(java.awt.image.ComponentSampleModel)
 createSubsetSampleModel
  ([I)Ljava/awt/image/SampleModel;
- ([I)Ljava/awt/image/SampleModel;
+ ([I)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.ComponentSampleModel)
 getDataElements
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)Ljava/lang/Object;
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)Ljava/lang/Object;
 getPixel
  (II[ILjava/awt/image/DataBuffer;)[I
- (II[ILjava/awt/image/DataBuffer;)[I
+ (II[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.ComponentSampleModel)
 getPixels
  (IIII[ILjava/awt/image/DataBuffer;)[I
- (IIII[ILjava/awt/image/DataBuffer;)[I
+ (IIII[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.ComponentSampleModel)
 getSample
  (IIILjava/awt/image/DataBuffer;)I
  (IIILjava/awt/image/DataBuffer;)I
@@ -32,7 +32,7 @@ getSampleFloat
  (IIILjava/awt/image/DataBuffer;)F
 getSamples
  (IIIII[ILjava/awt/image/DataBuffer;)[I
- (IIIII[ILjava/awt/image/DataBuffer;)[I
+ (IIIII[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.ComponentSampleModel)
 setDataElements
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)V
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/BufferedImage.eea b/libs/eea-java-21/src/main/resources/java/awt/image/BufferedImage.eea
index e73b963141..0b8c92cb83 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/BufferedImage.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/BufferedImage.eea
@@ -14,7 +14,7 @@ copyData
  (Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
 createGraphics
  ()Ljava/awt/Graphics2D;
- ()Ljava/awt/Graphics2D;
+ ()L1java/awt/Graphics2D;
 getAlphaRaster
  ()Ljava/awt/image/WritableRaster;
  ()Ljava/awt/image/WritableRaster;
@@ -44,7 +44,7 @@ getPropertyNames
  ()[0L1java/lang/String; # @Inherited(java.awt.image.RenderedImage)
 getRGB
  (IIII[III)[I
- (IIII[III)[I
+ (IIII[III)[1I
 getRaster
  ()Ljava/awt/image/WritableRaster;
  ()Ljava/awt/image/WritableRaster;
@@ -56,7 +56,7 @@ getSource
  ()Ljava/awt/image/ImageProducer;
 getSources
  ()Ljava/util/Vector<Ljava/awt/image/RenderedImage;>;
- ()Ljava/util/Vector<Ljava/awt/image/RenderedImage;>;
+ ()L0java/util/Vector<Ljava/awt/image/RenderedImage;>;
 getSubimage
  (IIII)Ljava/awt/image/BufferedImage;
  (IIII)Ljava/awt/image/BufferedImage;
@@ -71,7 +71,7 @@ getWritableTile
  (II)Ljava/awt/image/WritableRaster;
 getWritableTileIndices
  ()[Ljava/awt/Point;
- ()[Ljava/awt/Point;
+ ()[1Ljava/awt/Point;
 removeTileObserver
  (Ljava/awt/image/TileObserver;)V
  (Ljava/awt/image/TileObserver;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/BufferedImageOp.eea b/libs/eea-java-21/src/main/resources/java/awt/image/BufferedImageOp.eea
index 6b79874cf7..6a5da8bb1a 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/BufferedImageOp.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/BufferedImageOp.eea
@@ -2,7 +2,7 @@ class java/awt/image/BufferedImageOp
 
 createCompatibleDestImage
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
- (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
+ (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)L1java/awt/image/BufferedImage;
 filter
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/ByteLookupTable.eea b/libs/eea-java-21/src/main/resources/java/awt/image/ByteLookupTable.eea
index f6c0a968f5..6d56699477 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/ByteLookupTable.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/ByteLookupTable.eea
@@ -11,7 +11,7 @@ getTable
  ()[[B
 lookupPixel
  ([B[B)[B
- ([B[B)[B
+ ([B[B)[1B
 lookupPixel
  ([I[I)[I
- ([I[I)[I
+ ([I[I)[1I
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/ColorConvertOp.eea b/libs/eea-java-21/src/main/resources/java/awt/image/ColorConvertOp.eea
index 9edd6b2ed0..365d158796 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/ColorConvertOp.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/ColorConvertOp.eea
@@ -14,10 +14,10 @@ class java/awt/image/ColorConvertOp
  ([Ljava/awt/color/ICC_Profile;Ljava/awt/RenderingHints;)V
 createCompatibleDestImage
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
- (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
+ (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)L1java/awt/image/BufferedImage; # @Inherited(java.awt.image.BufferedImageOp)
 createCompatibleDestRaster
  (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/Raster;)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.RasterOp)
 filter
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
@@ -32,10 +32,10 @@ getBounds2D
  (Ljava/awt/image/Raster;)Ljava/awt/geom/Rectangle2D;
 getICC_Profiles
  ()[Ljava/awt/color/ICC_Profile;
- ()[Ljava/awt/color/ICC_Profile;
+ ()[0Ljava/awt/color/ICC_Profile;
 getPoint2D
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
- (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
+ (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)L1java/awt/geom/Point2D;
 getRenderingHints
  ()Ljava/awt/RenderingHints;
  ()Ljava/awt/RenderingHints;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/ColorModel.eea b/libs/eea-java-21/src/main/resources/java/awt/image/ColorModel.eea
index 8f27a4e790..d4760ba2c3 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/ColorModel.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/ColorModel.eea
@@ -9,13 +9,13 @@ getRGBdefault
  (I[ILjava/awt/color/ColorSpace;ZZII)V
 coerceData
  (Ljava/awt/image/WritableRaster;Z)Ljava/awt/image/ColorModel;
- (Ljava/awt/image/WritableRaster;Z)Ljava/awt/image/ColorModel;
+ (Ljava/awt/image/WritableRaster;Z)L1java/awt/image/ColorModel;
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel;
 createCompatibleWritableRaster
  (II)Ljava/awt/image/WritableRaster;
- (II)Ljava/awt/image/WritableRaster;
+ (II)L1java/awt/image/WritableRaster;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -24,7 +24,7 @@ getAlpha
  (Ljava/lang/Object;)I
 getAlphaRaster
  (Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/WritableRaster;)L0java/awt/image/WritableRaster;
 getBlue
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
@@ -33,13 +33,13 @@ getColorSpace
  ()Ljava/awt/color/ColorSpace;
 getComponentSize
  ()[I
- ()[I
+ ()[0I
 getComponents
  (I[II)[I
- (I[II)[I
+ (I[II)[1I
 getComponents
  (Ljava/lang/Object;[II)[I
- (Ljava/lang/Object;[II)[I
+ (Ljava/lang/Object;[II)[1I
 getDataElement
  ([FI)I
  ([FI)I
@@ -48,13 +48,13 @@ getDataElement
  ([II)I
 getDataElements
  (ILjava/lang/Object;)Ljava/lang/Object;
- (ILjava/lang/Object;)Ljava/lang/Object;
+ (ILjava/lang/Object;)L1java/lang/Object;
 getDataElements
  ([FILjava/lang/Object;)Ljava/lang/Object;
  ([FILjava/lang/Object;)Ljava/lang/Object;
 getDataElements
  ([IILjava/lang/Object;)Ljava/lang/Object;
- ([IILjava/lang/Object;)Ljava/lang/Object;
+ ([IILjava/lang/Object;)L1java/lang/Object;
 getGreen
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
@@ -63,7 +63,7 @@ getNormalizedComponents
  (Ljava/lang/Object;[FI)[F
 getNormalizedComponents
  ([II[FI)[F
- ([II[FI)[F
+ ([II[FI)[1F
 getRGB
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
@@ -72,7 +72,7 @@ getRed
  (Ljava/lang/Object;)I
 getUnnormalizedComponents
  ([FI[II)[I
- ([FI[II)[I
+ ([FI[II)[1I
 isCompatibleRaster
  (Ljava/awt/image/Raster;)Z
  (Ljava/awt/image/Raster;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/ComponentColorModel.eea b/libs/eea-java-21/src/main/resources/java/awt/image/ComponentColorModel.eea
index e301e468c1..df18f9c4da 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/ComponentColorModel.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/ComponentColorModel.eea
@@ -8,13 +8,13 @@ class java/awt/image/ComponentColorModel
  (Ljava/awt/color/ColorSpace;[IZZII)V
 coerceData
  (Ljava/awt/image/WritableRaster;Z)Ljava/awt/image/ColorModel;
- (Ljava/awt/image/WritableRaster;Z)Ljava/awt/image/ColorModel;
+ (Ljava/awt/image/WritableRaster;Z)L1java/awt/image/ColorModel; # @Inherited(java.awt.image.ColorModel)
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.ColorModel)
 createCompatibleWritableRaster
  (II)Ljava/awt/image/WritableRaster;
- (II)Ljava/awt/image/WritableRaster;
+ (II)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.ColorModel)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.awt.image.ColorModel)
@@ -23,16 +23,16 @@ getAlpha
  (Ljava/lang/Object;)I
 getAlphaRaster
  (Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/WritableRaster;)L0java/awt/image/WritableRaster; # @Inherited(java.awt.image.ColorModel)
 getBlue
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
 getComponents
  (I[II)[I
- (I[II)[I
+ (I[II)[1I # @Inherited(java.awt.image.ColorModel)
 getComponents
  (Ljava/lang/Object;[II)[I
- (Ljava/lang/Object;[II)[I
+ (Ljava/lang/Object;[II)[1I # @Inherited(java.awt.image.ColorModel)
 getDataElement
  ([FI)I
  ([FI)I
@@ -41,22 +41,22 @@ getDataElement
  ([II)I
 getDataElements
  (ILjava/lang/Object;)Ljava/lang/Object;
- (ILjava/lang/Object;)Ljava/lang/Object;
+ (ILjava/lang/Object;)L1java/lang/Object; # @Inherited(java.awt.image.ColorModel)
 getDataElements
  ([FILjava/lang/Object;)Ljava/lang/Object;
  ([FILjava/lang/Object;)Ljava/lang/Object;
 getDataElements
  ([IILjava/lang/Object;)Ljava/lang/Object;
- ([IILjava/lang/Object;)Ljava/lang/Object;
+ ([IILjava/lang/Object;)L1java/lang/Object; # @Inherited(java.awt.image.ColorModel)
 getGreen
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
 getNormalizedComponents
  (Ljava/lang/Object;[FI)[F
- (Ljava/lang/Object;[FI)[F
+ (Ljava/lang/Object;[FI)[1F
 getNormalizedComponents
  ([II[FI)[F
- ([II[FI)[F
+ ([II[FI)[1F # @Inherited(java.awt.image.ColorModel)
 getRGB
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
@@ -65,7 +65,7 @@ getRed
  (Ljava/lang/Object;)I
 getUnnormalizedComponents
  ([FI[II)[I
- ([FI[II)[I
+ ([FI[II)[1I # @Inherited(java.awt.image.ColorModel)
 isCompatibleRaster
  (Ljava/awt/image/Raster;)Z
  (Ljava/awt/image/Raster;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/ComponentSampleModel.eea b/libs/eea-java-21/src/main/resources/java/awt/image/ComponentSampleModel.eea
index 9eaf7c2f1d..ed4bda8c11 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/ComponentSampleModel.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/ComponentSampleModel.eea
@@ -15,13 +15,13 @@ bankIndices
  (IIIII[I[I)V
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.SampleModel)
 createDataBuffer
  ()Ljava/awt/image/DataBuffer;
- ()Ljava/awt/image/DataBuffer;
+ ()L1java/awt/image/DataBuffer; # @Inherited(java.awt.image.SampleModel)
 createSubsetSampleModel
  ([I)Ljava/awt/image/SampleModel;
- ([I)Ljava/awt/image/SampleModel;
+ ([I)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.SampleModel)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -36,10 +36,10 @@ getDataElements
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)Ljava/lang/Object;
 getPixel
  (II[ILjava/awt/image/DataBuffer;)[I
- (II[ILjava/awt/image/DataBuffer;)[I
+ (II[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.SampleModel)
 getPixels
  (IIII[ILjava/awt/image/DataBuffer;)[I
- (IIII[ILjava/awt/image/DataBuffer;)[I
+ (IIII[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.SampleModel)
 getSample
  (IIILjava/awt/image/DataBuffer;)I
  (IIILjava/awt/image/DataBuffer;)I
@@ -51,10 +51,10 @@ getSampleFloat
  (IIILjava/awt/image/DataBuffer;)F
 getSampleSize
  ()[I
- ()[I
+ ()[1I
 getSamples
  (IIIII[ILjava/awt/image/DataBuffer;)[I
- (IIIII[ILjava/awt/image/DataBuffer;)[I
+ (IIIII[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.SampleModel)
 setDataElements
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)V
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/ConvolveOp.eea b/libs/eea-java-21/src/main/resources/java/awt/image/ConvolveOp.eea
index d9c6cbbd13..a13fff1a08 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/ConvolveOp.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/ConvolveOp.eea
@@ -8,10 +8,10 @@ class java/awt/image/ConvolveOp
  (Ljava/awt/image/Kernel;ILjava/awt/RenderingHints;)V
 createCompatibleDestImage
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
- (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
+ (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)L1java/awt/image/BufferedImage; # @Inherited(java.awt.image.BufferedImageOp)
 createCompatibleDestRaster
  (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/Raster;)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.RasterOp)
 filter
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
@@ -29,7 +29,7 @@ getKernel
  ()Ljava/awt/image/Kernel;
 getPoint2D
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
- (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
+ (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)L1java/awt/geom/Point2D;
 getRenderingHints
  ()Ljava/awt/RenderingHints;
  ()Ljava/awt/RenderingHints;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/DirectColorModel.eea b/libs/eea-java-21/src/main/resources/java/awt/image/DirectColorModel.eea
index 5a55f3c255..f188115f45 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/DirectColorModel.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/DirectColorModel.eea
@@ -5,10 +5,10 @@ class java/awt/image/DirectColorModel
  (Ljava/awt/color/ColorSpace;IIIIIZI)V
 coerceData
  (Ljava/awt/image/WritableRaster;Z)Ljava/awt/image/ColorModel;
- (Ljava/awt/image/WritableRaster;Z)Ljava/awt/image/ColorModel;
+ (Ljava/awt/image/WritableRaster;Z)L1java/awt/image/ColorModel; # @Inherited(java.awt.image.ColorModel)
 createCompatibleWritableRaster
  (II)Ljava/awt/image/WritableRaster;
- (II)Ljava/awt/image/WritableRaster;
+ (II)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.ColorModel)
 getAlpha
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
@@ -17,19 +17,19 @@ getBlue
  (Ljava/lang/Object;)I
 getComponents
  (I[II)[I
- (I[II)[I
+ (I[II)[1I # @Inherited(java.awt.image.ColorModel)
 getComponents
  (Ljava/lang/Object;[II)[I
- (Ljava/lang/Object;[II)[I
+ (Ljava/lang/Object;[II)[1I # @Inherited(java.awt.image.ColorModel)
 getDataElement
  ([II)I
  ([II)I
 getDataElements
  (ILjava/lang/Object;)Ljava/lang/Object;
- (ILjava/lang/Object;)Ljava/lang/Object;
+ (ILjava/lang/Object;)L1java/lang/Object; # @Inherited(java.awt.image.ColorModel)
 getDataElements
  ([IILjava/lang/Object;)Ljava/lang/Object;
- ([IILjava/lang/Object;)Ljava/lang/Object;
+ ([IILjava/lang/Object;)L1java/lang/Object; # @Inherited(java.awt.image.ColorModel)
 getGreen
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/IndexColorModel.eea b/libs/eea-java-21/src/main/resources/java/awt/image/IndexColorModel.eea
index 91af132d0a..9ca4e14bf5 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/IndexColorModel.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/IndexColorModel.eea
@@ -26,10 +26,10 @@ convertToIntDiscrete
  (Ljava/awt/image/Raster;Z)Ljava/awt/image/BufferedImage;
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.ColorModel)
 createCompatibleWritableRaster
  (II)Ljava/awt/image/WritableRaster;
- (II)Ljava/awt/image/WritableRaster;
+ (II)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.ColorModel)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.awt.image.ColorModel)
@@ -41,22 +41,22 @@ getBlues
  ([B)V
 getComponentSize
  ()[I
- ()[I
+ ()[0I # @Inherited(java.awt.image.ColorModel)
 getComponents
  (I[II)[I
- (I[II)[I
+ (I[II)[1I # @Inherited(java.awt.image.ColorModel)
 getComponents
  (Ljava/lang/Object;[II)[I
- (Ljava/lang/Object;[II)[I
+ (Ljava/lang/Object;[II)[1I # @Inherited(java.awt.image.ColorModel)
 getDataElement
  ([II)I
  ([II)I
 getDataElements
  (ILjava/lang/Object;)Ljava/lang/Object;
- (ILjava/lang/Object;)Ljava/lang/Object;
+ (ILjava/lang/Object;)L1java/lang/Object; # @Inherited(java.awt.image.ColorModel)
 getDataElements
  ([IILjava/lang/Object;)Ljava/lang/Object;
- ([IILjava/lang/Object;)Ljava/lang/Object;
+ ([IILjava/lang/Object;)L1java/lang/Object; # @Inherited(java.awt.image.ColorModel)
 getGreens
  ([B)V
  ([B)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/Kernel.eea b/libs/eea-java-21/src/main/resources/java/awt/image/Kernel.eea
index 76ecfa1620..ac1dc80e1d 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/Kernel.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/Kernel.eea
@@ -8,4 +8,4 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 getKernelData
  ([F)[F
- ([F)[F
+ ([F)[1F
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/LookupOp.eea b/libs/eea-java-21/src/main/resources/java/awt/image/LookupOp.eea
index 4de7ba1b80..5ec8e5e34a 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/LookupOp.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/LookupOp.eea
@@ -5,10 +5,10 @@ class java/awt/image/LookupOp
  (Ljava/awt/image/LookupTable;Ljava/awt/RenderingHints;)V
 createCompatibleDestImage
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
- (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
+ (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)L1java/awt/image/BufferedImage; # @Inherited(java.awt.image.BufferedImageOp)
 createCompatibleDestRaster
  (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/Raster;)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.RasterOp)
 filter
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
@@ -23,7 +23,7 @@ getBounds2D
  (Ljava/awt/image/Raster;)Ljava/awt/geom/Rectangle2D;
 getPoint2D
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
- (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
+ (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)L1java/awt/geom/Point2D;
 getRenderingHints
  ()Ljava/awt/RenderingHints;
  ()Ljava/awt/RenderingHints;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/MultiPixelPackedSampleModel.eea b/libs/eea-java-21/src/main/resources/java/awt/image/MultiPixelPackedSampleModel.eea
index 7dd02aa196..4f56f2840a 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/MultiPixelPackedSampleModel.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/MultiPixelPackedSampleModel.eea
@@ -2,13 +2,13 @@ class java/awt/image/MultiPixelPackedSampleModel
 
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.SampleModel)
 createDataBuffer
  ()Ljava/awt/image/DataBuffer;
- ()Ljava/awt/image/DataBuffer;
+ ()L1java/awt/image/DataBuffer; # @Inherited(java.awt.image.SampleModel)
 createSubsetSampleModel
  ([I)Ljava/awt/image/SampleModel;
- ([I)Ljava/awt/image/SampleModel;
+ ([I)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.SampleModel)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -17,7 +17,7 @@ getDataElements
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)Ljava/lang/Object;
 getPixel
  (II[ILjava/awt/image/DataBuffer;)[I
- (II[ILjava/awt/image/DataBuffer;)[I
+ (II[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.SampleModel)
 getSample
  (IIILjava/awt/image/DataBuffer;)I
  (IIILjava/awt/image/DataBuffer;)I
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/PackedColorModel.eea b/libs/eea-java-21/src/main/resources/java/awt/image/PackedColorModel.eea
index ec428a8444..053e8be60e 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/PackedColorModel.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/PackedColorModel.eea
@@ -8,13 +8,13 @@ class java/awt/image/PackedColorModel
  (Ljava/awt/color/ColorSpace;I[IIZII)V
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.ColorModel)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.awt.image.ColorModel)
 getAlphaRaster
  (Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/WritableRaster;)L0java/awt/image/WritableRaster; # @Inherited(java.awt.image.ColorModel)
 getMasks
  ()[I
  ()[I
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/PixelInterleavedSampleModel.eea b/libs/eea-java-21/src/main/resources/java/awt/image/PixelInterleavedSampleModel.eea
index 15b33bd214..138f604e45 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/PixelInterleavedSampleModel.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/PixelInterleavedSampleModel.eea
@@ -5,7 +5,7 @@ class java/awt/image/PixelInterleavedSampleModel
  (IIIII[I)V
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.ComponentSampleModel)
 createSubsetSampleModel
  ([I)Ljava/awt/image/SampleModel;
- ([I)Ljava/awt/image/SampleModel;
+ ([I)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.ComponentSampleModel)
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/RGBImageFilter.eea b/libs/eea-java-21/src/main/resources/java/awt/image/RGBImageFilter.eea
index d2caebacd6..5e679f7c4c 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/RGBImageFilter.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/RGBImageFilter.eea
@@ -9,7 +9,7 @@ origmodel
 
 filterIndexColorModel
  (Ljava/awt/image/IndexColorModel;)Ljava/awt/image/IndexColorModel;
- (Ljava/awt/image/IndexColorModel;)Ljava/awt/image/IndexColorModel;
+ (Ljava/awt/image/IndexColorModel;)L1java/awt/image/IndexColorModel;
 filterRGBPixels
  (IIII[III)V
  (IIII[III)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/Raster.eea b/libs/eea-java-21/src/main/resources/java/awt/image/Raster.eea
index dd81dc073b..60d53cd534 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/Raster.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/Raster.eea
@@ -2,43 +2,43 @@ class java/awt/image/Raster
 
 createBandedRaster
  (IIIILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (IIIILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (IIIILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createBandedRaster
  (IIII[I[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (IIII[I[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (IIII[I[ILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createBandedRaster
  (Ljava/awt/image/DataBuffer;III[I[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/DataBuffer;III[I[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/DataBuffer;III[I[ILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createInterleavedRaster
  (IIIII[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (IIIII[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (IIIII[ILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createInterleavedRaster
  (IIIILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (IIIILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (IIIILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createInterleavedRaster
  (Ljava/awt/image/DataBuffer;IIII[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/DataBuffer;IIII[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/DataBuffer;IIII[ILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createPackedRaster
  (IIIIILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (IIIIILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (IIIIILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createPackedRaster
  (III[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (III[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (III[ILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createPackedRaster
  (Ljava/awt/image/DataBuffer;IIILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/DataBuffer;IIILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/DataBuffer;IIILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createPackedRaster
  (Ljava/awt/image/DataBuffer;III[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/DataBuffer;III[ILjava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/DataBuffer;III[ILjava/awt/Point;)L1java/awt/image/WritableRaster;
 createRaster
  (Ljava/awt/image/SampleModel;Ljava/awt/image/DataBuffer;Ljava/awt/Point;)Ljava/awt/image/Raster;
- (Ljava/awt/image/SampleModel;Ljava/awt/image/DataBuffer;Ljava/awt/Point;)Ljava/awt/image/Raster;
+ (Ljava/awt/image/SampleModel;Ljava/awt/image/DataBuffer;Ljava/awt/Point;)L1java/awt/image/Raster;
 createWritableRaster
  (Ljava/awt/image/SampleModel;Ljava/awt/Point;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/SampleModel;Ljava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/SampleModel;Ljava/awt/Point;)L1java/awt/image/WritableRaster;
 createWritableRaster
  (Ljava/awt/image/SampleModel;Ljava/awt/image/DataBuffer;Ljava/awt/Point;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/SampleModel;Ljava/awt/image/DataBuffer;Ljava/awt/Point;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/SampleModel;Ljava/awt/image/DataBuffer;Ljava/awt/Point;)L1java/awt/image/WritableRaster;
 
 dataBuffer
  Ljava/awt/image/DataBuffer;
@@ -61,22 +61,22 @@ sampleModel
  (Ljava/awt/image/SampleModel;Ljava/awt/image/DataBuffer;Ljava/awt/Rectangle;Ljava/awt/Point;Ljava/awt/image/Raster;)V
 createChild
  (IIIIII[I)Ljava/awt/image/Raster;
- (IIIIII[I)Ljava/awt/image/Raster;
+ (IIIIII[I)L1java/awt/image/Raster;
 createCompatibleWritableRaster
  ()Ljava/awt/image/WritableRaster;
- ()Ljava/awt/image/WritableRaster;
+ ()L1java/awt/image/WritableRaster;
 createCompatibleWritableRaster
  (II)Ljava/awt/image/WritableRaster;
- (II)Ljava/awt/image/WritableRaster;
+ (II)L1java/awt/image/WritableRaster;
 createCompatibleWritableRaster
  (IIII)Ljava/awt/image/WritableRaster;
- (IIII)Ljava/awt/image/WritableRaster;
+ (IIII)L1java/awt/image/WritableRaster;
 createCompatibleWritableRaster
  (Ljava/awt/Rectangle;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/Rectangle;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/Rectangle;)L1java/awt/image/WritableRaster;
 createTranslatedChild
  (II)Ljava/awt/image/Raster;
- (II)Ljava/awt/image/Raster;
+ (II)L1java/awt/image/Raster;
 getBounds
  ()Ljava/awt/Rectangle;
  ()Ljava/awt/Rectangle;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/RasterOp.eea b/libs/eea-java-21/src/main/resources/java/awt/image/RasterOp.eea
index f23fbd18b3..8c59e488b9 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/RasterOp.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/RasterOp.eea
@@ -2,7 +2,7 @@ class java/awt/image/RasterOp
 
 createCompatibleDestRaster
  (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/Raster;)L1java/awt/image/WritableRaster;
 filter
  (Ljava/awt/image/Raster;Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
  (Ljava/awt/image/Raster;Ljava/awt/image/WritableRaster;)Ljava/awt/image/WritableRaster;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/RescaleOp.eea b/libs/eea-java-21/src/main/resources/java/awt/image/RescaleOp.eea
index 67e0449316..2b05f46804 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/RescaleOp.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/RescaleOp.eea
@@ -8,10 +8,10 @@ class java/awt/image/RescaleOp
  ([F[FLjava/awt/RenderingHints;)V
 createCompatibleDestImage
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
- (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)Ljava/awt/image/BufferedImage;
+ (Ljava/awt/image/BufferedImage;Ljava/awt/image/ColorModel;)L1java/awt/image/BufferedImage; # @Inherited(java.awt.image.BufferedImageOp)
 createCompatibleDestRaster
  (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
- (Ljava/awt/image/Raster;)Ljava/awt/image/WritableRaster;
+ (Ljava/awt/image/Raster;)L1java/awt/image/WritableRaster; # @Inherited(java.awt.image.RasterOp)
 filter
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
  (Ljava/awt/image/BufferedImage;Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
@@ -29,7 +29,7 @@ getOffsets
  ([F)[F
 getPoint2D
  (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
- (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)Ljava/awt/geom/Point2D;
+ (Ljava/awt/geom/Point2D;Ljava/awt/geom/Point2D;)L1java/awt/geom/Point2D;
 getRenderingHints
  ()Ljava/awt/RenderingHints;
  ()Ljava/awt/RenderingHints;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/SampleModel.eea b/libs/eea-java-21/src/main/resources/java/awt/image/SampleModel.eea
index 9697189f0b..4bb183e0d0 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/SampleModel.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/SampleModel.eea
@@ -2,13 +2,13 @@ class java/awt/image/SampleModel
 
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel;
 createDataBuffer
  ()Ljava/awt/image/DataBuffer;
- ()Ljava/awt/image/DataBuffer;
+ ()L1java/awt/image/DataBuffer;
 createSubsetSampleModel
  ([I)Ljava/awt/image/SampleModel;
- ([I)Ljava/awt/image/SampleModel;
+ ([I)L1java/awt/image/SampleModel;
 getDataElements
  (IIIILjava/lang/Object;Ljava/awt/image/DataBuffer;)Ljava/lang/Object;
  (IIIILjava/lang/Object;Ljava/awt/image/DataBuffer;)Ljava/lang/Object;
@@ -17,22 +17,22 @@ getDataElements
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)Ljava/lang/Object;
 getPixel
  (II[DLjava/awt/image/DataBuffer;)[D
- (II[DLjava/awt/image/DataBuffer;)[D
+ (II[DLjava/awt/image/DataBuffer;)[1D
 getPixel
  (II[FLjava/awt/image/DataBuffer;)[F
- (II[FLjava/awt/image/DataBuffer;)[F
+ (II[FLjava/awt/image/DataBuffer;)[1F
 getPixel
  (II[ILjava/awt/image/DataBuffer;)[I
- (II[ILjava/awt/image/DataBuffer;)[I
+ (II[ILjava/awt/image/DataBuffer;)[1I
 getPixels
  (IIII[DLjava/awt/image/DataBuffer;)[D
- (IIII[DLjava/awt/image/DataBuffer;)[D
+ (IIII[DLjava/awt/image/DataBuffer;)[1D
 getPixels
  (IIII[FLjava/awt/image/DataBuffer;)[F
- (IIII[FLjava/awt/image/DataBuffer;)[F
+ (IIII[FLjava/awt/image/DataBuffer;)[1F
 getPixels
  (IIII[ILjava/awt/image/DataBuffer;)[I
- (IIII[ILjava/awt/image/DataBuffer;)[I
+ (IIII[ILjava/awt/image/DataBuffer;)[1I
 getSample
  (IIILjava/awt/image/DataBuffer;)I
  (IIILjava/awt/image/DataBuffer;)I
@@ -47,13 +47,13 @@ getSampleSize
  ()[I
 getSamples
  (IIIII[DLjava/awt/image/DataBuffer;)[D
- (IIIII[DLjava/awt/image/DataBuffer;)[D
+ (IIIII[DLjava/awt/image/DataBuffer;)[1D
 getSamples
  (IIIII[FLjava/awt/image/DataBuffer;)[F
- (IIIII[FLjava/awt/image/DataBuffer;)[F
+ (IIIII[FLjava/awt/image/DataBuffer;)[1F
 getSamples
  (IIIII[ILjava/awt/image/DataBuffer;)[I
- (IIIII[ILjava/awt/image/DataBuffer;)[I
+ (IIIII[ILjava/awt/image/DataBuffer;)[1I
 setDataElements
  (IIIILjava/lang/Object;Ljava/awt/image/DataBuffer;)V
  (IIIILjava/lang/Object;Ljava/awt/image/DataBuffer;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/ShortLookupTable.eea b/libs/eea-java-21/src/main/resources/java/awt/image/ShortLookupTable.eea
index fa6f647580..27bba26bde 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/ShortLookupTable.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/ShortLookupTable.eea
@@ -11,7 +11,7 @@ getTable
  ()[[S
 lookupPixel
  ([I[I)[I
- ([I[I)[I
+ ([I[I)[1I
 lookupPixel
  ([S[S)[S
- ([S[S)[S
+ ([S[S)[1S
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/SinglePixelPackedSampleModel.eea b/libs/eea-java-21/src/main/resources/java/awt/image/SinglePixelPackedSampleModel.eea
index 0f99485d82..5a3c6c8605 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/SinglePixelPackedSampleModel.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/SinglePixelPackedSampleModel.eea
@@ -8,13 +8,13 @@ class java/awt/image/SinglePixelPackedSampleModel
  (III[I)V
 createCompatibleSampleModel
  (II)Ljava/awt/image/SampleModel;
- (II)Ljava/awt/image/SampleModel;
+ (II)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.SampleModel)
 createDataBuffer
  ()Ljava/awt/image/DataBuffer;
- ()Ljava/awt/image/DataBuffer;
+ ()L1java/awt/image/DataBuffer; # @Inherited(java.awt.image.SampleModel)
 createSubsetSampleModel
  ([I)Ljava/awt/image/SampleModel;
- ([I)Ljava/awt/image/SampleModel;
+ ([I)L1java/awt/image/SampleModel; # @Inherited(java.awt.image.SampleModel)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -29,10 +29,10 @@ getDataElements
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)Ljava/lang/Object;
 getPixel
  (II[ILjava/awt/image/DataBuffer;)[I
- (II[ILjava/awt/image/DataBuffer;)[I
+ (II[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.SampleModel)
 getPixels
  (IIII[ILjava/awt/image/DataBuffer;)[I
- (IIII[ILjava/awt/image/DataBuffer;)[I
+ (IIII[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.SampleModel)
 getSample
  (IIILjava/awt/image/DataBuffer;)I
  (IIILjava/awt/image/DataBuffer;)I
@@ -41,7 +41,7 @@ getSampleSize
  ()[I
 getSamples
  (IIIII[ILjava/awt/image/DataBuffer;)[I
- (IIIII[ILjava/awt/image/DataBuffer;)[I
+ (IIIII[ILjava/awt/image/DataBuffer;)[1I # @Inherited(java.awt.image.SampleModel)
 setDataElements
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)V
  (IILjava/lang/Object;Ljava/awt/image/DataBuffer;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/VolatileImage.eea b/libs/eea-java-21/src/main/resources/java/awt/image/VolatileImage.eea
index 1794b02591..ca20362b67 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/VolatileImage.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/VolatileImage.eea
@@ -2,7 +2,7 @@ class java/awt/image/VolatileImage
 
 createGraphics
  ()Ljava/awt/Graphics2D;
- ()Ljava/awt/Graphics2D;
+ ()L1java/awt/Graphics2D;
 getCapabilities
  ()Ljava/awt/ImageCapabilities;
  ()Ljava/awt/ImageCapabilities;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/WritableRaster.eea b/libs/eea-java-21/src/main/resources/java/awt/image/WritableRaster.eea
index 24040136f1..8e25f20bdb 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/WritableRaster.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/WritableRaster.eea
@@ -11,10 +11,10 @@ class java/awt/image/WritableRaster
  (Ljava/awt/image/SampleModel;Ljava/awt/image/DataBuffer;Ljava/awt/Rectangle;Ljava/awt/Point;Ljava/awt/image/WritableRaster;)V
 createWritableChild
  (IIIIII[I)Ljava/awt/image/WritableRaster;
- (IIIIII[I)Ljava/awt/image/WritableRaster;
+ (IIIIII[I)L1java/awt/image/WritableRaster;
 createWritableTranslatedChild
  (II)Ljava/awt/image/WritableRaster;
- (II)Ljava/awt/image/WritableRaster;
+ (II)L1java/awt/image/WritableRaster;
 getWritableParent
  ()Ljava/awt/image/WritableRaster;
  ()Ljava/awt/image/WritableRaster;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/renderable/ContextualRenderedImageFactory.eea b/libs/eea-java-21/src/main/resources/java/awt/image/renderable/ContextualRenderedImageFactory.eea
index 942cdf9e56..a25920d9bd 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/renderable/ContextualRenderedImageFactory.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/renderable/ContextualRenderedImageFactory.eea
@@ -2,7 +2,7 @@ class java/awt/image/renderable/ContextualRenderedImageFactory
 
 create
  (Ljava/awt/image/renderable/RenderContext;Ljava/awt/image/renderable/ParameterBlock;)Ljava/awt/image/RenderedImage;
- (Ljava/awt/image/renderable/RenderContext;Ljava/awt/image/renderable/ParameterBlock;)Ljava/awt/image/RenderedImage;
+ (Ljava/awt/image/renderable/RenderContext;Ljava/awt/image/renderable/ParameterBlock;)L1java/awt/image/RenderedImage;
 getBounds2D
  (Ljava/awt/image/renderable/ParameterBlock;)Ljava/awt/geom/Rectangle2D;
  (Ljava/awt/image/renderable/ParameterBlock;)Ljava/awt/geom/Rectangle2D;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/renderable/ParameterBlock.eea b/libs/eea-java-21/src/main/resources/java/awt/image/renderable/ParameterBlock.eea
index 19d7b911f1..b04f6e65af 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/renderable/ParameterBlock.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/renderable/ParameterBlock.eea
@@ -48,7 +48,7 @@ getObjectParameter
  (I)Ljava/lang/Object;
 getParamClasses
  ()[Ljava/lang/Class<*>;
- ()[Ljava/lang/Class<*>;
+ ()[1Ljava/lang/Class<*>;
 getParameters
  ()Ljava/util/Vector<Ljava/lang/Object;>;
  ()Ljava/util/Vector<Ljava/lang/Object;>;
@@ -99,4 +99,4 @@ setSources
  (Ljava/util/Vector<Ljava/lang/Object;>;)V
 shallowClone
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/renderable/RenderableImage.eea b/libs/eea-java-21/src/main/resources/java/awt/image/renderable/RenderableImage.eea
index b1f129b753..aa9f8eca5a 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/renderable/RenderableImage.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/renderable/RenderableImage.eea
@@ -6,13 +6,13 @@ HINTS_OBSERVED
 
 createDefaultRendering
  ()Ljava/awt/image/RenderedImage;
- ()Ljava/awt/image/RenderedImage;
+ ()L1java/awt/image/RenderedImage;
 createRendering
  (Ljava/awt/image/renderable/RenderContext;)Ljava/awt/image/RenderedImage;
- (Ljava/awt/image/renderable/RenderContext;)Ljava/awt/image/RenderedImage;
+ (Ljava/awt/image/renderable/RenderContext;)L1java/awt/image/RenderedImage;
 createScaledRendering
  (IILjava/awt/RenderingHints;)Ljava/awt/image/RenderedImage;
- (IILjava/awt/RenderingHints;)Ljava/awt/image/RenderedImage;
+ (IILjava/awt/RenderingHints;)L1java/awt/image/RenderedImage;
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/renderable/RenderableImageOp.eea b/libs/eea-java-21/src/main/resources/java/awt/image/renderable/RenderableImageOp.eea
index 42aa573597..4c5dc010c1 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/renderable/RenderableImageOp.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/renderable/RenderableImageOp.eea
@@ -5,13 +5,13 @@ class java/awt/image/renderable/RenderableImageOp
  (Ljava/awt/image/renderable/ContextualRenderedImageFactory;Ljava/awt/image/renderable/ParameterBlock;)V
 createDefaultRendering
  ()Ljava/awt/image/RenderedImage;
- ()Ljava/awt/image/RenderedImage;
+ ()L1java/awt/image/RenderedImage; # @Inherited(java.awt.image.renderable.RenderableImage)
 createRendering
  (Ljava/awt/image/renderable/RenderContext;)Ljava/awt/image/RenderedImage;
- (Ljava/awt/image/renderable/RenderContext;)Ljava/awt/image/RenderedImage;
+ (Ljava/awt/image/renderable/RenderContext;)L0java/awt/image/RenderedImage; # @Overrides(java.awt.image.renderable.RenderableImage)
 createScaledRendering
  (IILjava/awt/RenderingHints;)Ljava/awt/image/RenderedImage;
- (IILjava/awt/RenderingHints;)Ljava/awt/image/RenderedImage;
+ (IILjava/awt/RenderingHints;)L1java/awt/image/RenderedImage; # @Inherited(java.awt.image.renderable.RenderableImage)
 getParameterBlock
  ()Ljava/awt/image/renderable/ParameterBlock;
  ()Ljava/awt/image/renderable/ParameterBlock;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/image/renderable/RenderedImageFactory.eea b/libs/eea-java-21/src/main/resources/java/awt/image/renderable/RenderedImageFactory.eea
index 6f77700711..68da2f8e55 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/image/renderable/RenderedImageFactory.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/image/renderable/RenderedImageFactory.eea
@@ -2,4 +2,4 @@ class java/awt/image/renderable/RenderedImageFactory
 
 create
  (Ljava/awt/image/renderable/ParameterBlock;Ljava/awt/RenderingHints;)Ljava/awt/image/RenderedImage;
- (Ljava/awt/image/renderable/ParameterBlock;Ljava/awt/RenderingHints;)Ljava/awt/image/RenderedImage;
+ (Ljava/awt/image/renderable/ParameterBlock;Ljava/awt/RenderingHints;)L1java/awt/image/RenderedImage;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/peer/ComponentPeer.eea b/libs/eea-java-21/src/main/resources/java/awt/peer/ComponentPeer.eea
index b49052a716..967682e285 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/peer/ComponentPeer.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/peer/ComponentPeer.eea
@@ -11,10 +11,10 @@ createBuffers
  (ILjava/awt/BufferCapabilities;)V
 createImage
  (II)Ljava/awt/Image;
- (II)Ljava/awt/Image;
+ (II)L1java/awt/Image;
 createVolatileImage
  (II)Ljava/awt/image/VolatileImage;
- (II)Ljava/awt/image/VolatileImage;
+ (II)L1java/awt/image/VolatileImage;
 flip
  (IIIILjava/awt/BufferCapabilities$FlipContents;)V
  (IIIILjava/awt/BufferCapabilities$FlipContents;)V
diff --git a/libs/eea-java-21/src/main/resources/java/awt/peer/TaskbarPeer.eea b/libs/eea-java-21/src/main/resources/java/awt/peer/TaskbarPeer.eea
index 913d5524b0..227acfd826 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/peer/TaskbarPeer.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/peer/TaskbarPeer.eea
@@ -2,10 +2,10 @@ class java/awt/peer/TaskbarPeer
 
 getIconImage
  ()Ljava/awt/Image;
- ()Ljava/awt/Image;
+ ()L0java/awt/Image;
 getMenu
  ()Ljava/awt/PopupMenu;
- ()Ljava/awt/PopupMenu;
+ ()L0java/awt/PopupMenu;
 isSupported
  (Ljava/awt/Taskbar$Feature;)Z
  (Ljava/awt/Taskbar$Feature;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/awt/print/PageFormat.eea b/libs/eea-java-21/src/main/resources/java/awt/print/PageFormat.eea
index 1261806716..3b5b2af097 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/print/PageFormat.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/print/PageFormat.eea
@@ -5,7 +5,7 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 getMatrix
  ()[D
- ()[D
+ ()[1D
 getPaper
  ()Ljava/awt/print/Paper;
  ()Ljava/awt/print/Paper;
diff --git a/libs/eea-java-21/src/main/resources/java/awt/print/PrinterJob.eea b/libs/eea-java-21/src/main/resources/java/awt/print/PrinterJob.eea
index a506c344d6..5f51a47337 100644
--- a/libs/eea-java-21/src/main/resources/java/awt/print/PrinterJob.eea
+++ b/libs/eea-java-21/src/main/resources/java/awt/print/PrinterJob.eea
@@ -24,7 +24,7 @@ getPageFormat
  (Ljavax/print/attribute/PrintRequestAttributeSet;)Ljava/awt/print/PageFormat;
 getPrintService
  ()Ljavax/print/PrintService;
- ()Ljavax/print/PrintService;
+ ()L0javax/print/PrintService;
 getUserName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/java/beans/BeanDescriptor.eea b/libs/eea-java-21/src/main/resources/java/beans/BeanDescriptor.eea
index 78ade9cd6f..de0f53a4a4 100644
--- a/libs/eea-java-21/src/main/resources/java/beans/BeanDescriptor.eea
+++ b/libs/eea-java-21/src/main/resources/java/beans/BeanDescriptor.eea
@@ -8,7 +8,7 @@ class java/beans/BeanDescriptor
  (Ljava/lang/Class<*>;Ljava/lang/Class<*>;)V
 getBeanClass
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L0java/lang/Class<*>;
 getCustomizerClass
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L0java/lang/Class<*>;
diff --git a/libs/eea-java-21/src/main/resources/java/beans/DefaultPersistenceDelegate.eea b/libs/eea-java-21/src/main/resources/java/beans/DefaultPersistenceDelegate.eea
index e4a076b50a..12c2a5e6cc 100644
--- a/libs/eea-java-21/src/main/resources/java/beans/DefaultPersistenceDelegate.eea
+++ b/libs/eea-java-21/src/main/resources/java/beans/DefaultPersistenceDelegate.eea
@@ -8,7 +8,7 @@ initialize
  (Ljava/lang/Class<*>;Ljava/lang/Object;Ljava/lang/Object;Ljava/beans/Encoder;)V
 instantiate
  (Ljava/lang/Object;Ljava/beans/Encoder;)Ljava/beans/Expression;
- (Ljava/lang/Object;Ljava/beans/Encoder;)Ljava/beans/Expression;
+ (Ljava/lang/Object;Ljava/beans/Encoder;)L1java/beans/Expression;
 mutatesTo
  (Ljava/lang/Object;Ljava/lang/Object;)Z
  (Ljava/lang/Object;Ljava/lang/Object;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/beans/EventHandler.eea b/libs/eea-java-21/src/main/resources/java/beans/EventHandler.eea
index a7259fabc4..0343c42546 100644
--- a/libs/eea-java-21/src/main/resources/java/beans/EventHandler.eea
+++ b/libs/eea-java-21/src/main/resources/java/beans/EventHandler.eea
@@ -2,13 +2,13 @@ class java/beans/EventHandler
 
 create
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;)T1T;
 create
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;)T1T;
 create
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)T1T;
 
 <init>
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-java-21/src/main/resources/java/beans/EventSetDescriptor.eea b/libs/eea-java-21/src/main/resources/java/beans/EventSetDescriptor.eea
index 65e9133acd..d6522b1093 100644
--- a/libs/eea-java-21/src/main/resources/java/beans/EventSetDescriptor.eea
+++ b/libs/eea-java-21/src/main/resources/java/beans/EventSetDescriptor.eea
@@ -26,13 +26,13 @@ getGetListenerMethod
  ()Ljava/lang/reflect/Method;
 getListenerMethodDescriptors
  ()[Ljava/beans/MethodDescriptor;
- ()[Ljava/beans/MethodDescriptor;
+ ()[0Ljava/beans/MethodDescriptor;
 getListenerMethods
  ()[Ljava/lang/reflect/Method;
- ()[Ljava/lang/reflect/Method;
+ ()[1Ljava/lang/reflect/Method;
 getListenerType
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L0java/lang/Class<*>;
 getRemoveListenerMethod
  ()Ljava/lang/reflect/Method;
  ()Ljava/lang/reflect/Method;
diff --git a/libs/eea-java-21/src/main/resources/java/beans/IndexedPropertyDescriptor.eea b/libs/eea-java-21/src/main/resources/java/beans/IndexedPropertyDescriptor.eea
index 441fe191e7..23e41b70c2 100644
--- a/libs/eea-java-21/src/main/resources/java/beans/IndexedPropertyDescriptor.eea
+++ b/libs/eea-java-21/src/main/resources/java/beans/IndexedPropertyDescriptor.eea
@@ -17,10 +17,10 @@ getIndexedPropertyType
  ()Ljava/lang/Class<*>;
 getIndexedReadMethod
  ()Ljava/lang/reflect/Method;
- ()Ljava/lang/reflect/Method;
+ ()L0java/lang/reflect/Method;
 getIndexedWriteMethod
  ()Ljava/lang/reflect/Method;
- ()Ljava/lang/reflect/Method;
+ ()L0java/lang/reflect/Method;
 setIndexedReadMethod
  (Ljava/lang/reflect/Method;)V
  (Ljava/lang/reflect/Method;)V
diff --git a/libs/eea-java-21/src/main/resources/java/beans/MethodDescriptor.eea b/libs/eea-java-21/src/main/resources/java/beans/MethodDescriptor.eea
index d987c8baa0..ff97284446 100644
--- a/libs/eea-java-21/src/main/resources/java/beans/MethodDescriptor.eea
+++ b/libs/eea-java-21/src/main/resources/java/beans/MethodDescriptor.eea
@@ -11,4 +11,4 @@ getMethod
  ()Ljava/lang/reflect/Method;
 getParameterDescriptors
  ()[Ljava/beans/ParameterDescriptor;
- ()[Ljava/beans/ParameterDescriptor;
+ ()[0Ljava/beans/ParameterDescriptor;
diff --git a/libs/eea-java-21/src/main/resources/java/beans/PropertyDescriptor.eea b/libs/eea-java-21/src/main/resources/java/beans/PropertyDescriptor.eea
index abf6363013..3c7115bfbc 100644
--- a/libs/eea-java-21/src/main/resources/java/beans/PropertyDescriptor.eea
+++ b/libs/eea-java-21/src/main/resources/java/beans/PropertyDescriptor.eea
@@ -11,22 +11,22 @@ class java/beans/PropertyDescriptor
  (Ljava/lang/String;Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;)V
 createPropertyEditor
  (Ljava/lang/Object;)Ljava/beans/PropertyEditor;
- (Ljava/lang/Object;)Ljava/beans/PropertyEditor;
+ (Ljava/lang/Object;)L1java/beans/PropertyEditor;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getPropertyEditorClass
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L0java/lang/Class<*>;
 getPropertyType
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
 getReadMethod
  ()Ljava/lang/reflect/Method;
- ()Ljava/lang/reflect/Method;
+ ()L0java/lang/reflect/Method;
 getWriteMethod
  ()Ljava/lang/reflect/Method;
- ()Ljava/lang/reflect/Method;
+ ()L0java/lang/reflect/Method;
 setPropertyEditorClass
  (Ljava/lang/Class<*>;)V
  (Ljava/lang/Class<*>;)V
diff --git a/libs/eea-java-21/src/main/resources/java/beans/PropertyEditorSupport.eea b/libs/eea-java-21/src/main/resources/java/beans/PropertyEditorSupport.eea
index d4789a4ca8..877cd3e8f0 100644
--- a/libs/eea-java-21/src/main/resources/java/beans/PropertyEditorSupport.eea
+++ b/libs/eea-java-21/src/main/resources/java/beans/PropertyEditorSupport.eea
@@ -8,19 +8,19 @@ addPropertyChangeListener
  (L1java/beans/PropertyChangeListener;)V # @Inherited(java.beans.PropertyEditor)
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getCustomEditor
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 getJavaInitializationString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSource
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
 getTags
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String;
 getValue
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-java-21/src/main/resources/java/beans/SimpleBeanInfo.eea b/libs/eea-java-21/src/main/resources/java/beans/SimpleBeanInfo.eea
index d975845456..4f6fa32084 100644
--- a/libs/eea-java-21/src/main/resources/java/beans/SimpleBeanInfo.eea
+++ b/libs/eea-java-21/src/main/resources/java/beans/SimpleBeanInfo.eea
@@ -2,22 +2,22 @@ class java/beans/SimpleBeanInfo
 
 getAdditionalBeanInfo
  ()[Ljava/beans/BeanInfo;
- ()[Ljava/beans/BeanInfo;
+ ()[0Ljava/beans/BeanInfo;
 getBeanDescriptor
  ()Ljava/beans/BeanDescriptor;
- ()Ljava/beans/BeanDescriptor;
+ ()L0java/beans/BeanDescriptor;
 getEventSetDescriptors
  ()[Ljava/beans/EventSetDescriptor;
- ()[Ljava/beans/EventSetDescriptor;
+ ()[0Ljava/beans/EventSetDescriptor;
 getIcon
  (I)Ljava/awt/Image;
- (I)Ljava/awt/Image;
+ (I)L0java/awt/Image;
 getMethodDescriptors
  ()[Ljava/beans/MethodDescriptor;
- ()[Ljava/beans/MethodDescriptor;
+ ()[0Ljava/beans/MethodDescriptor;
 getPropertyDescriptors
  ()[Ljava/beans/PropertyDescriptor;
- ()[Ljava/beans/PropertyDescriptor;
+ ()[0Ljava/beans/PropertyDescriptor;
 loadImage
  (Ljava/lang/String;)Ljava/awt/Image;
- (Ljava/lang/String;)Ljava/awt/Image;
+ (Ljava/lang/String;)L0java/awt/Image;
diff --git a/libs/eea-java-21/src/main/resources/java/beans/XMLDecoder.eea b/libs/eea-java-21/src/main/resources/java/beans/XMLDecoder.eea
index 3cf52ded06..17322efac1 100644
--- a/libs/eea-java-21/src/main/resources/java/beans/XMLDecoder.eea
+++ b/libs/eea-java-21/src/main/resources/java/beans/XMLDecoder.eea
@@ -2,7 +2,7 @@ class java/beans/XMLDecoder
 
 createHandler
  (Ljava/lang/Object;Ljava/beans/ExceptionListener;Ljava/lang/ClassLoader;)Lorg/xml/sax/helpers/DefaultHandler;
- (Ljava/lang/Object;Ljava/beans/ExceptionListener;Ljava/lang/ClassLoader;)Lorg/xml/sax/helpers/DefaultHandler;
+ (Ljava/lang/Object;Ljava/beans/ExceptionListener;Ljava/lang/ClassLoader;)L1org/xml/sax/helpers/DefaultHandler;
 
 <init>
  (Ljava/io/InputStream;)V
diff --git a/libs/eea-java-21/src/main/resources/java/beans/beancontext/BeanContextServicesSupport$BCSSProxyServiceProvider.eea b/libs/eea-java-21/src/main/resources/java/beans/beancontext/BeanContextServicesSupport$BCSSProxyServiceProvider.eea
index e1cc42a1b9..dfd0d9e087 100644
--- a/libs/eea-java-21/src/main/resources/java/beans/beancontext/BeanContextServicesSupport$BCSSProxyServiceProvider.eea
+++ b/libs/eea-java-21/src/main/resources/java/beans/beancontext/BeanContextServicesSupport$BCSSProxyServiceProvider.eea
@@ -5,7 +5,7 @@ getCurrentServiceSelectors
  (Ljava/beans/beancontext/BeanContextServices;Ljava/lang/Class<*>;)Ljava/util/Iterator<*>;
 getService
  (Ljava/beans/beancontext/BeanContextServices;Ljava/lang/Object;Ljava/lang/Class<*>;Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/beans/beancontext/BeanContextServices;Ljava/lang/Object;Ljava/lang/Class<*>;Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/beans/beancontext/BeanContextServices;Ljava/lang/Object;Ljava/lang/Class<*>;Ljava/lang/Object;)L0java/lang/Object;
 releaseService
  (Ljava/beans/beancontext/BeanContextServices;Ljava/lang/Object;Ljava/lang/Object;)V
  (Ljava/beans/beancontext/BeanContextServices;Ljava/lang/Object;Ljava/lang/Object;)V
diff --git a/libs/eea-java-21/src/main/resources/java/beans/beancontext/BeanContextServicesSupport.eea b/libs/eea-java-21/src/main/resources/java/beans/beancontext/BeanContextServicesSupport.eea
index 14819d232d..345943f8e6 100644
--- a/libs/eea-java-21/src/main/resources/java/beans/beancontext/BeanContextServicesSupport.eea
+++ b/libs/eea-java-21/src/main/resources/java/beans/beancontext/BeanContextServicesSupport.eea
@@ -2,7 +2,7 @@ class java/beans/beancontext/BeanContextServicesSupport
 
 getChildBeanContextServicesListener
  (Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextServicesListener;
- (Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextServicesListener;
+ (Ljava/lang/Object;)L0java/beans/beancontext/BeanContextServicesListener;
 
 bcsListeners
  Ljava/util/ArrayList<Ljava/beans/beancontext/BeanContextServicesListener;>;
@@ -46,10 +46,10 @@ childJustRemovedHook
  (Ljava/lang/Object;Ljava/beans/beancontext/BeanContextSupport$BCSChild;)V
 createBCSChild
  (Ljava/lang/Object;Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextSupport$BCSChild;
- (Ljava/lang/Object;Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextSupport$BCSChild;
+ (Ljava/lang/Object;Ljava/lang/Object;)L1java/beans/beancontext/BeanContextSupport$BCSChild; # @Inherited(java.beans.beancontext.BeanContextSupport)
 createBCSSServiceProvider
  (Ljava/lang/Class<*>;Ljava/beans/beancontext/BeanContextServiceProvider;)Ljava/beans/beancontext/BeanContextServicesSupport$BCSSServiceProvider;
- (Ljava/lang/Class<*>;Ljava/beans/beancontext/BeanContextServiceProvider;)Ljava/beans/beancontext/BeanContextServicesSupport$BCSSServiceProvider;
+ (Ljava/lang/Class<*>;Ljava/beans/beancontext/BeanContextServiceProvider;)L1java/beans/beancontext/BeanContextServicesSupport$BCSSServiceProvider;
 fireServiceAdded
  (Ljava/beans/beancontext/BeanContextServiceAvailableEvent;)V
  (Ljava/beans/beancontext/BeanContextServiceAvailableEvent;)V
@@ -67,13 +67,13 @@ getBeanContextServicesPeer
  ()Ljava/beans/beancontext/BeanContextServices;
 getCurrentServiceClasses
  ()Ljava/util/Iterator<Ljava/lang/Object;>;
- ()Ljava/util/Iterator<Ljava/lang/Object;>;
+ ()L1java/util/Iterator<Ljava/lang/Object;>;
 getCurrentServiceSelectors
  (Ljava/lang/Class<*>;)Ljava/util/Iterator<*>;
- (Ljava/lang/Class<*>;)Ljava/util/Iterator<*>;
+ (Ljava/lang/Class<*>;)L0java/util/Iterator<*>;
 getService
  (Ljava/beans/beancontext/BeanContextChild;Ljava/lang/Object;Ljava/lang/Class<*>;Ljava/lang/Object;Ljava/beans/beancontext/BeanContextServiceRevokedListener;)Ljava/lang/Object;
- (Ljava/beans/beancontext/BeanContextChild;Ljava/lang/Object;Ljava/lang/Class<*>;Ljava/lang/Object;Ljava/beans/beancontext/BeanContextServiceRevokedListener;)Ljava/lang/Object;
+ (Ljava/beans/beancontext/BeanContextChild;Ljava/lang/Object;Ljava/lang/Class<*>;Ljava/lang/Object;Ljava/beans/beancontext/BeanContextServiceRevokedListener;)L0java/lang/Object;
 hasService
  (Ljava/lang/Class<*>;)Z
  (Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/beans/beancontext/BeanContextSupport.eea b/libs/eea-java-21/src/main/resources/java/beans/beancontext/BeanContextSupport.eea
index 769a1566d4..7d2fc0b078 100644
--- a/libs/eea-java-21/src/main/resources/java/beans/beancontext/BeanContextSupport.eea
+++ b/libs/eea-java-21/src/main/resources/java/beans/beancontext/BeanContextSupport.eea
@@ -5,22 +5,22 @@ classEquals
  (Ljava/lang/Class<*>;Ljava/lang/Class<*>;)Z
 getChildBeanContextChild
  (Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextChild;
- (Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextChild;
+ (Ljava/lang/Object;)L0java/beans/beancontext/BeanContextChild;
 getChildBeanContextMembershipListener
  (Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextMembershipListener;
- (Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextMembershipListener;
+ (Ljava/lang/Object;)L0java/beans/beancontext/BeanContextMembershipListener;
 getChildPropertyChangeListener
  (Ljava/lang/Object;)Ljava/beans/PropertyChangeListener;
- (Ljava/lang/Object;)Ljava/beans/PropertyChangeListener;
+ (Ljava/lang/Object;)L0java/beans/PropertyChangeListener;
 getChildSerializable
  (Ljava/lang/Object;)Ljava/io/Serializable;
- (Ljava/lang/Object;)Ljava/io/Serializable;
+ (Ljava/lang/Object;)L0java/io/Serializable;
 getChildVetoableChangeListener
  (Ljava/lang/Object;)Ljava/beans/VetoableChangeListener;
- (Ljava/lang/Object;)Ljava/beans/VetoableChangeListener;
+ (Ljava/lang/Object;)L0java/beans/VetoableChangeListener;
 getChildVisibility
  (Ljava/lang/Object;)Ljava/beans/Visibility;
- (Ljava/lang/Object;)Ljava/beans/Visibility;
+ (Ljava/lang/Object;)L0java/beans/Visibility;
 
 bcmListeners
  Ljava/util/ArrayList<Ljava/beans/beancontext/BeanContextMembershipListener;>;
@@ -85,7 +85,7 @@ copyChildren
  ()[Ljava/lang/Object;
 createBCSChild
  (Ljava/lang/Object;Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextSupport$BCSChild;
- (Ljava/lang/Object;Ljava/lang/Object;)Ljava/beans/beancontext/BeanContextSupport$BCSChild;
+ (Ljava/lang/Object;Ljava/lang/Object;)L1java/beans/beancontext/BeanContextSupport$BCSChild;
 deserialize
  (Ljava/io/ObjectInputStream;Ljava/util/Collection;)V
  (Ljava/io/ObjectInputStream;Ljava/util/Collection;)V
diff --git a/libs/eea-java-21/src/main/resources/java/io/Console.eea b/libs/eea-java-21/src/main/resources/java/io/Console.eea
index a591015663..229fe45bc0 100644
--- a/libs/eea-java-21/src/main/resources/java/io/Console.eea
+++ b/libs/eea-java-21/src/main/resources/java/io/Console.eea
@@ -2,7 +2,7 @@ class java/io/Console
 
 charset
  ()Ljava/nio/charset/Charset;
- ()Ljava/nio/charset/Charset;
+ ()L1java/nio/charset/Charset;
 format
  (Ljava/lang/String;[Ljava/lang/Object;)Ljava/io/Console;
  (L1java/lang/String;[0Ljava/lang/Object;)L1java/io/Console;
@@ -17,7 +17,7 @@ readLine
  (L1java/lang/String;[0Ljava/lang/Object;)L0java/lang/String;
 readPassword
  ()[C
- ()[C
+ ()[1C
 readPassword
  (Ljava/lang/String;[Ljava/lang/Object;)[C
  (L1java/lang/String;[0Ljava/lang/Object;)[0C
diff --git a/libs/eea-java-21/src/main/resources/java/io/ObjectInputFilter.eea b/libs/eea-java-21/src/main/resources/java/io/ObjectInputFilter.eea
index 1c6d3352af..d01daa9864 100644
--- a/libs/eea-java-21/src/main/resources/java/io/ObjectInputFilter.eea
+++ b/libs/eea-java-21/src/main/resources/java/io/ObjectInputFilter.eea
@@ -2,16 +2,16 @@ class java/io/ObjectInputFilter
 
 allowFilter
  (Ljava/util/function/Predicate<Ljava/lang/Class<*>;>;Ljava/io/ObjectInputFilter$Status;)Ljava/io/ObjectInputFilter;
- (Ljava/util/function/Predicate<Ljava/lang/Class<*>;>;Ljava/io/ObjectInputFilter$Status;)Ljava/io/ObjectInputFilter;
+ (Ljava/util/function/Predicate<Ljava/lang/Class<*>;>;Ljava/io/ObjectInputFilter$Status;)L1java/io/ObjectInputFilter;
 merge
  (Ljava/io/ObjectInputFilter;Ljava/io/ObjectInputFilter;)Ljava/io/ObjectInputFilter;
- (Ljava/io/ObjectInputFilter;Ljava/io/ObjectInputFilter;)Ljava/io/ObjectInputFilter;
+ (Ljava/io/ObjectInputFilter;Ljava/io/ObjectInputFilter;)L1java/io/ObjectInputFilter;
 rejectFilter
  (Ljava/util/function/Predicate<Ljava/lang/Class<*>;>;Ljava/io/ObjectInputFilter$Status;)Ljava/io/ObjectInputFilter;
- (Ljava/util/function/Predicate<Ljava/lang/Class<*>;>;Ljava/io/ObjectInputFilter$Status;)Ljava/io/ObjectInputFilter;
+ (Ljava/util/function/Predicate<Ljava/lang/Class<*>;>;Ljava/io/ObjectInputFilter$Status;)L1java/io/ObjectInputFilter;
 rejectUndecidedClass
  (Ljava/io/ObjectInputFilter;)Ljava/io/ObjectInputFilter;
- (Ljava/io/ObjectInputFilter;)Ljava/io/ObjectInputFilter;
+ (Ljava/io/ObjectInputFilter;)L1java/io/ObjectInputFilter;
 
 checkInput
  (Ljava/io/ObjectInputFilter$FilterInfo;)Ljava/io/ObjectInputFilter$Status;
diff --git a/libs/eea-java-21/src/main/resources/java/io/ObjectInputStream.eea b/libs/eea-java-21/src/main/resources/java/io/ObjectInputStream.eea
index d77b4af612..03695d3b4c 100644
--- a/libs/eea-java-21/src/main/resources/java/io/ObjectInputStream.eea
+++ b/libs/eea-java-21/src/main/resources/java/io/ObjectInputStream.eea
@@ -11,10 +11,10 @@ read
  ([1BII)I # @Inherited(java.io.InputStream)
 readClassDescriptor
  ()Ljava/io/ObjectStreamClass;
- ()Ljava/io/ObjectStreamClass;
+ ()L1java/io/ObjectStreamClass;
 readFields
  ()Ljava/io/ObjectInputStream$GetField;
- ()Ljava/io/ObjectInputStream$GetField;
+ ()L1java/io/ObjectInputStream$GetField;
 readFully
  ([B)V
  ([1B)V # @Inherited(java.io.DataInput)
@@ -29,7 +29,7 @@ readObject
  ()L1java/lang/Object; # @Inherited(java.io.ObjectInput)
 readObjectOverride
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 readUTF
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.io.DataInput)
diff --git a/libs/eea-java-21/src/main/resources/java/io/ObjectStreamClass.eea b/libs/eea-java-21/src/main/resources/java/io/ObjectStreamClass.eea
index 38ae60a448..386277a526 100644
--- a/libs/eea-java-21/src/main/resources/java/io/ObjectStreamClass.eea
+++ b/libs/eea-java-21/src/main/resources/java/io/ObjectStreamClass.eea
@@ -13,7 +13,7 @@ lookupAny
 
 forClass
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L0java/lang/Class<*>;
 getField
  (Ljava/lang/String;)Ljava/io/ObjectStreamField;
  (L1java/lang/String;)L0java/io/ObjectStreamField;
diff --git a/libs/eea-java-21/src/main/resources/java/lang/Class.eea b/libs/eea-java-21/src/main/resources/java/lang/Class.eea
index e53228708d..62eb52ddf0 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/Class.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/Class.eea
@@ -30,7 +30,7 @@ cast
  (L0java/lang/Object;)TT;
 componentType
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L0java/lang/Class<*>;
 describeConstable
  ()Ljava/util/Optional<Ljava/lang/constant/ClassDesc;>;
  ()Ljava/util/Optional<Ljava/lang/constant/ClassDesc;>;
@@ -156,13 +156,13 @@ getPackageName
  ()L1java/lang/String;
 getPermittedSubclasses
  ()[Ljava/lang/Class<*>;
- ()[Ljava/lang/Class<*>;
+ ()[0Ljava/lang/Class<*>;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
  ()L1java/security/ProtectionDomain;
 getRecordComponents
  ()[Ljava/lang/reflect/RecordComponent;
- ()[Ljava/lang/reflect/RecordComponent;
+ ()[0Ljava/lang/reflect/RecordComponent;
 getResource
  (Ljava/lang/String;)Ljava/net/URL;
  (L1java/lang/String;)L0java/net/URL;
diff --git a/libs/eea-java-21/src/main/resources/java/lang/Enum$EnumDesc.eea b/libs/eea-java-21/src/main/resources/java/lang/Enum$EnumDesc.eea
index 19b556211b..0d670424e3 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/Enum$EnumDesc.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/Enum$EnumDesc.eea
@@ -8,7 +8,7 @@ super java/lang/constant/DynamicConstantDesc
 
 of
  <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/constant/ClassDesc;Ljava/lang/String;)Ljava/lang/Enum$EnumDesc<TE;>;
- <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/constant/ClassDesc;Ljava/lang/String;)Ljava/lang/Enum$EnumDesc<TE;>;
+ <E:Ljava/lang/Enum<TE;>;>(Ljava/lang/constant/ClassDesc;Ljava/lang/String;)L1java/lang/Enum$EnumDesc<TE;>;
 
 resolveConstantDesc
  (Ljava/lang/invoke/MethodHandles$Lookup;)TE;
diff --git a/libs/eea-java-21/src/main/resources/java/lang/ScopedValue.eea b/libs/eea-java-21/src/main/resources/java/lang/ScopedValue.eea
index c5f213be9b..4db58fc4b2 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/ScopedValue.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/ScopedValue.eea
@@ -10,7 +10,7 @@ getWhere
  <T:Ljava/lang/Object;R:Ljava/lang/Object;>(Ljava/lang/ScopedValue<TT;>;TT;Ljava/util/function/Supplier<+TR;>;)TR;
 newInstance
  <T:Ljava/lang/Object;>()Ljava/lang/ScopedValue<TT;>;
- <T:Ljava/lang/Object;>()Ljava/lang/ScopedValue<TT;>;
+ <T:Ljava/lang/Object;>()L1java/lang/ScopedValue<TT;>;
 runWhere
  <T:Ljava/lang/Object;>(Ljava/lang/ScopedValue<TT;>;TT;Ljava/lang/Runnable;)V
  <T:Ljava/lang/Object;>(Ljava/lang/ScopedValue<TT;>;TT;Ljava/lang/Runnable;)V
diff --git a/libs/eea-java-21/src/main/resources/java/lang/String.eea b/libs/eea-java-21/src/main/resources/java/lang/String.eea
index e5c9777c0c..bfa95fffb7 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/String.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/String.eea
@@ -134,7 +134,7 @@ equalsIgnoreCase
  (L0java/lang/String;)Z
 formatted
  ([Ljava/lang/Object;)Ljava/lang/String;
- ([Ljava/lang/Object;)Ljava/lang/String;
+ ([Ljava/lang/Object;)L1java/lang/String;
 getBytes
  ()[B
  ()[1B
diff --git a/libs/eea-java-21/src/main/resources/java/lang/StringTemplate.eea b/libs/eea-java-21/src/main/resources/java/lang/StringTemplate.eea
index 294a3cf7a3..e0952929fe 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/StringTemplate.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/StringTemplate.eea
@@ -24,7 +24,7 @@ of
  (Ljava/util/List<Ljava/lang/String;>;Ljava/util/List<*>;)Ljava/lang/StringTemplate;
 toString
  (Ljava/lang/StringTemplate;)Ljava/lang/String;
- (Ljava/lang/StringTemplate;)Ljava/lang/String;
+ (Ljava/lang/StringTemplate;)L1java/lang/String;
 
 fragments
  ()Ljava/util/List<Ljava/lang/String;>;
diff --git a/libs/eea-java-21/src/main/resources/java/lang/Thread.eea b/libs/eea-java-21/src/main/resources/java/lang/Thread.eea
index 53aed3c542..841e6e649c 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/Thread.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/Thread.eea
@@ -17,10 +17,10 @@ holdsLock
  (L1java/lang/Object;)Z
 ofPlatform
  ()Ljava/lang/Thread$Builder$OfPlatform;
- ()Ljava/lang/Thread$Builder$OfPlatform;
+ ()L1java/lang/Thread$Builder$OfPlatform;
 ofVirtual
  ()Ljava/lang/Thread$Builder$OfVirtual;
- ()Ljava/lang/Thread$Builder$OfVirtual;
+ ()L1java/lang/Thread$Builder$OfVirtual;
 setDefaultUncaughtExceptionHandler
  (Ljava/lang/Thread$UncaughtExceptionHandler;)V
  (L0java/lang/Thread$UncaughtExceptionHandler;)V
diff --git a/libs/eea-java-21/src/main/resources/java/lang/constant/ClassDesc.eea b/libs/eea-java-21/src/main/resources/java/lang/constant/ClassDesc.eea
index 4a9391b6c6..28524fb7f4 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/constant/ClassDesc.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/constant/ClassDesc.eea
@@ -12,7 +12,7 @@ of
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/constant/ClassDesc;
 ofDescriptor
  (Ljava/lang/String;)Ljava/lang/constant/ClassDesc;
- (Ljava/lang/String;)Ljava/lang/constant/ClassDesc;
+ (Ljava/lang/String;)L1java/lang/constant/ClassDesc;
 ofInternalName
  (Ljava/lang/String;)Ljava/lang/constant/ClassDesc;
  (Ljava/lang/String;)Ljava/lang/constant/ClassDesc;
@@ -25,7 +25,7 @@ arrayType
  (I)Ljava/lang/constant/ClassDesc;
 componentType
  ()Ljava/lang/constant/ClassDesc;
- ()Ljava/lang/constant/ClassDesc;
+ ()L0java/lang/constant/ClassDesc;
 descriptorString
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/java/lang/constant/DynamicCallSiteDesc.eea b/libs/eea-java-21/src/main/resources/java/lang/constant/DynamicCallSiteDesc.eea
index e586935930..3b07f02a0f 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/constant/DynamicCallSiteDesc.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/constant/DynamicCallSiteDesc.eea
@@ -2,10 +2,10 @@ class java/lang/constant/DynamicCallSiteDesc
 
 of
  (Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/String;Ljava/lang/constant/MethodTypeDesc;)Ljava/lang/constant/DynamicCallSiteDesc;
- (Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/String;Ljava/lang/constant/MethodTypeDesc;)Ljava/lang/constant/DynamicCallSiteDesc;
+ (Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/String;Ljava/lang/constant/MethodTypeDesc;)L1java/lang/constant/DynamicCallSiteDesc;
 of
  (Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/String;Ljava/lang/constant/MethodTypeDesc;[Ljava/lang/constant/ConstantDesc;)Ljava/lang/constant/DynamicCallSiteDesc;
- (Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/String;Ljava/lang/constant/MethodTypeDesc;[Ljava/lang/constant/ConstantDesc;)Ljava/lang/constant/DynamicCallSiteDesc;
+ (Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/String;Ljava/lang/constant/MethodTypeDesc;[Ljava/lang/constant/ConstantDesc;)L1java/lang/constant/DynamicCallSiteDesc;
 of
  (Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/constant/MethodTypeDesc;)Ljava/lang/constant/DynamicCallSiteDesc;
  (Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/constant/MethodTypeDesc;)Ljava/lang/constant/DynamicCallSiteDesc;
diff --git a/libs/eea-java-21/src/main/resources/java/lang/constant/DynamicConstantDesc.eea b/libs/eea-java-21/src/main/resources/java/lang/constant/DynamicConstantDesc.eea
index c57a18338f..bd3c4c92d8 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/constant/DynamicConstantDesc.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/constant/DynamicConstantDesc.eea
@@ -13,7 +13,7 @@ ofCanonical
  <T:Ljava/lang/Object;>(Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;[Ljava/lang/constant/ConstantDesc;)Ljava/lang/constant/ConstantDesc;
 ofNamed
  <T:Ljava/lang/Object;>(Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;[Ljava/lang/constant/ConstantDesc;)Ljava/lang/constant/DynamicConstantDesc<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;[Ljava/lang/constant/ConstantDesc;)Ljava/lang/constant/DynamicConstantDesc<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;[Ljava/lang/constant/ConstantDesc;)L1java/lang/constant/DynamicConstantDesc<TT;>;
 
 <init>
  (Ljava/lang/constant/DirectMethodHandleDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;[Ljava/lang/constant/ConstantDesc;)V
diff --git a/libs/eea-java-21/src/main/resources/java/lang/constant/MethodHandleDesc.eea b/libs/eea-java-21/src/main/resources/java/lang/constant/MethodHandleDesc.eea
index c32337ffe5..1bc30e83db 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/constant/MethodHandleDesc.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/constant/MethodHandleDesc.eea
@@ -8,14 +8,14 @@ ofConstructor
  (Ljava/lang/constant/ClassDesc;[Ljava/lang/constant/ClassDesc;)Ljava/lang/constant/DirectMethodHandleDesc;
 ofField
  (Ljava/lang/constant/DirectMethodHandleDesc$Kind;Ljava/lang/constant/ClassDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;)Ljava/lang/constant/DirectMethodHandleDesc;
- (Ljava/lang/constant/DirectMethodHandleDesc$Kind;Ljava/lang/constant/ClassDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;)Ljava/lang/constant/DirectMethodHandleDesc;
+ (Ljava/lang/constant/DirectMethodHandleDesc$Kind;Ljava/lang/constant/ClassDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;)L1java/lang/constant/DirectMethodHandleDesc;
 ofMethod
  (Ljava/lang/constant/DirectMethodHandleDesc$Kind;Ljava/lang/constant/ClassDesc;Ljava/lang/String;Ljava/lang/constant/MethodTypeDesc;)Ljava/lang/constant/DirectMethodHandleDesc;
- (Ljava/lang/constant/DirectMethodHandleDesc$Kind;Ljava/lang/constant/ClassDesc;Ljava/lang/String;Ljava/lang/constant/MethodTypeDesc;)Ljava/lang/constant/DirectMethodHandleDesc;
+ (Ljava/lang/constant/DirectMethodHandleDesc$Kind;Ljava/lang/constant/ClassDesc;Ljava/lang/String;Ljava/lang/constant/MethodTypeDesc;)L1java/lang/constant/DirectMethodHandleDesc;
 
 asType
  (Ljava/lang/constant/MethodTypeDesc;)Ljava/lang/constant/MethodHandleDesc;
- (Ljava/lang/constant/MethodTypeDesc;)Ljava/lang/constant/MethodHandleDesc;
+ (Ljava/lang/constant/MethodTypeDesc;)L1java/lang/constant/MethodHandleDesc;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/java/lang/constant/MethodTypeDesc.eea b/libs/eea-java-21/src/main/resources/java/lang/constant/MethodTypeDesc.eea
index 7c66833a29..8a832e6e62 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/constant/MethodTypeDesc.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/constant/MethodTypeDesc.eea
@@ -12,7 +12,7 @@ of
  (Ljava/lang/constant/ClassDesc;Ljava/util/List<Ljava/lang/constant/ClassDesc;>;)Ljava/lang/constant/MethodTypeDesc;
 of
  (Ljava/lang/constant/ClassDesc;[Ljava/lang/constant/ClassDesc;)Ljava/lang/constant/MethodTypeDesc;
- (Ljava/lang/constant/ClassDesc;[Ljava/lang/constant/ClassDesc;)Ljava/lang/constant/MethodTypeDesc;
+ (Ljava/lang/constant/ClassDesc;[Ljava/lang/constant/ClassDesc;)L1java/lang/constant/MethodTypeDesc;
 ofDescriptor
  (Ljava/lang/String;)Ljava/lang/constant/MethodTypeDesc;
  (Ljava/lang/String;)Ljava/lang/constant/MethodTypeDesc;
diff --git a/libs/eea-java-21/src/main/resources/java/lang/constant/ModuleDesc.eea b/libs/eea-java-21/src/main/resources/java/lang/constant/ModuleDesc.eea
index 6c87cf4657..7e28ada9ea 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/constant/ModuleDesc.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/constant/ModuleDesc.eea
@@ -2,7 +2,7 @@ class java/lang/constant/ModuleDesc
 
 of
  (Ljava/lang/String;)Ljava/lang/constant/ModuleDesc;
- (Ljava/lang/String;)Ljava/lang/constant/ModuleDesc;
+ (Ljava/lang/String;)L1java/lang/constant/ModuleDesc;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/lang/constant/PackageDesc.eea b/libs/eea-java-21/src/main/resources/java/lang/constant/PackageDesc.eea
index 611b07adcf..aa1f42eb5a 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/constant/PackageDesc.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/constant/PackageDesc.eea
@@ -2,10 +2,10 @@ class java/lang/constant/PackageDesc
 
 of
  (Ljava/lang/String;)Ljava/lang/constant/PackageDesc;
- (Ljava/lang/String;)Ljava/lang/constant/PackageDesc;
+ (Ljava/lang/String;)L1java/lang/constant/PackageDesc;
 ofInternalName
  (Ljava/lang/String;)Ljava/lang/constant/PackageDesc;
- (Ljava/lang/String;)Ljava/lang/constant/PackageDesc;
+ (Ljava/lang/String;)L1java/lang/constant/PackageDesc;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/lang/foreign/Linker$Option.eea b/libs/eea-java-21/src/main/resources/java/lang/foreign/Linker$Option.eea
index 34b521235a..8ed7bd5c20 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/foreign/Linker$Option.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/foreign/Linker$Option.eea
@@ -2,13 +2,13 @@ class java/lang/foreign/Linker$Option
 
 captureCallState
  ([Ljava/lang/String;)Ljava/lang/foreign/Linker$Option;
- ([Ljava/lang/String;)Ljava/lang/foreign/Linker$Option;
+ ([Ljava/lang/String;)L1java/lang/foreign/Linker$Option;
 captureStateLayout
  ()Ljava/lang/foreign/StructLayout;
  ()Ljava/lang/foreign/StructLayout;
 firstVariadicArg
  (I)Ljava/lang/foreign/Linker$Option;
- (I)Ljava/lang/foreign/Linker$Option;
+ (I)L1java/lang/foreign/Linker$Option;
 isTrivial
  ()Ljava/lang/foreign/Linker$Option;
  ()Ljava/lang/foreign/Linker$Option;
diff --git a/libs/eea-java-21/src/main/resources/java/lang/foreign/SegmentAllocator.eea b/libs/eea-java-21/src/main/resources/java/lang/foreign/SegmentAllocator.eea
index cc860d7622..30c8661ec8 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/foreign/SegmentAllocator.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/foreign/SegmentAllocator.eea
@@ -5,7 +5,7 @@ prefixAllocator
  (Ljava/lang/foreign/MemorySegment;)Ljava/lang/foreign/SegmentAllocator;
 slicingAllocator
  (Ljava/lang/foreign/MemorySegment;)Ljava/lang/foreign/SegmentAllocator;
- (Ljava/lang/foreign/MemorySegment;)Ljava/lang/foreign/SegmentAllocator;
+ (Ljava/lang/foreign/MemorySegment;)L1java/lang/foreign/SegmentAllocator;
 
 allocate
  (J)Ljava/lang/foreign/MemorySegment;
diff --git a/libs/eea-java-21/src/main/resources/java/lang/instrument/ClassFileTransformer.eea b/libs/eea-java-21/src/main/resources/java/lang/instrument/ClassFileTransformer.eea
index afac4bd584..f068722d35 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/instrument/ClassFileTransformer.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/instrument/ClassFileTransformer.eea
@@ -2,7 +2,7 @@ class java/lang/instrument/ClassFileTransformer
 
 transform
  (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[B
- (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[B
+ (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[0B
 transform
  (Ljava/lang/Module;Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[B
  (Ljava/lang/Module;Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/security/ProtectionDomain;[B)[B
diff --git a/libs/eea-java-21/src/main/resources/java/lang/invoke/ConstantBootstraps.eea b/libs/eea-java-21/src/main/resources/java/lang/invoke/ConstantBootstraps.eea
index 5e112b4034..f17b899ad0 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/invoke/ConstantBootstraps.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/invoke/ConstantBootstraps.eea
@@ -23,7 +23,7 @@ invoke
  (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<*>;Ljava/lang/invoke/MethodHandle;[Ljava/lang/Object;)Ljava/lang/Object;
 nullConstant
  (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<*>;)Ljava/lang/Object;
- (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<*>;)Ljava/lang/Object;
+ (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<*>;)L0java/lang/Object;
 primitiveClass
  (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
  (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
diff --git a/libs/eea-java-21/src/main/resources/java/lang/invoke/MethodHandle.eea b/libs/eea-java-21/src/main/resources/java/lang/invoke/MethodHandle.eea
index 036d4acaa7..4db764239b 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/invoke/MethodHandle.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/invoke/MethodHandle.eea
@@ -29,10 +29,10 @@ describeConstable
  ()Ljava/util/Optional<Ljava/lang/constant/MethodHandleDesc;>;
 invoke
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 invokeExact
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 invokeWithArguments
  (Ljava/util/List<*>;)Ljava/lang/Object;
  (Ljava/util/List<*>;)Ljava/lang/Object;
diff --git a/libs/eea-java-21/src/main/resources/java/lang/invoke/MethodHandles$Lookup.eea b/libs/eea-java-21/src/main/resources/java/lang/invoke/MethodHandles$Lookup.eea
index fa59626233..5f560ae14d 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/invoke/MethodHandles$Lookup.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/invoke/MethodHandles$Lookup.eea
@@ -65,7 +65,7 @@ previousLookupClass
  ()Ljava/lang/Class<*>;
 revealDirect
  (Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandleInfo;
- (Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandleInfo;
+ (Ljava/lang/invoke/MethodHandle;)L1java/lang/invoke/MethodHandleInfo;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/java/lang/invoke/MethodHandles.eea b/libs/eea-java-21/src/main/resources/java/lang/invoke/MethodHandles.eea
index 298c6282ae..0cc8a1e388 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/invoke/MethodHandles.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/invoke/MethodHandles.eea
@@ -26,10 +26,10 @@ catchException
  (Ljava/lang/invoke/MethodHandle;Ljava/lang/Class<+Ljava/lang/Throwable;>;Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;
 classData
  <T:Ljava/lang/Object;>(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<TT;>;)T0T;
 classDataAt
  <T:Ljava/lang/Object;>(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<TT;>;I)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<TT;>;I)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class<TT;>;I)T0T;
 collectArguments
  (Ljava/lang/invoke/MethodHandle;ILjava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;
  (Ljava/lang/invoke/MethodHandle;ILjava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;
@@ -125,7 +125,7 @@ permuteCoordinates
  (Ljava/lang/invoke/VarHandle;Ljava/util/List<Ljava/lang/Class<*>;>;[I)Ljava/lang/invoke/VarHandle;
 privateLookupIn
  (Ljava/lang/Class<*>;Ljava/lang/invoke/MethodHandles$Lookup;)Ljava/lang/invoke/MethodHandles$Lookup;
- (Ljava/lang/Class<*>;Ljava/lang/invoke/MethodHandles$Lookup;)Ljava/lang/invoke/MethodHandles$Lookup;
+ (Ljava/lang/Class<*>;Ljava/lang/invoke/MethodHandles$Lookup;)L1java/lang/invoke/MethodHandles$Lookup;
 publicLookup
  ()Ljava/lang/invoke/MethodHandles$Lookup;
  ()Ljava/lang/invoke/MethodHandles$Lookup;
diff --git a/libs/eea-java-21/src/main/resources/java/lang/invoke/StringConcatFactory.eea b/libs/eea-java-21/src/main/resources/java/lang/invoke/StringConcatFactory.eea
index 272e39ef6a..252414f672 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/invoke/StringConcatFactory.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/invoke/StringConcatFactory.eea
@@ -2,7 +2,7 @@ class java/lang/invoke/StringConcatFactory
 
 makeConcat
  (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;
- (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;
+ (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;)L1java/lang/invoke/CallSite;
 makeConcatWithConstants
  (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;
  (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;
diff --git a/libs/eea-java-21/src/main/resources/java/lang/invoke/VarHandle$VarHandleDesc.eea b/libs/eea-java-21/src/main/resources/java/lang/invoke/VarHandle$VarHandleDesc.eea
index 8628296ba9..4af3033230 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/invoke/VarHandle$VarHandleDesc.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/invoke/VarHandle$VarHandleDesc.eea
@@ -6,13 +6,13 @@ super java/lang/constant/DynamicConstantDesc
 
 ofArray
  (Ljava/lang/constant/ClassDesc;)Ljava/lang/invoke/VarHandle$VarHandleDesc;
- (Ljava/lang/constant/ClassDesc;)Ljava/lang/invoke/VarHandle$VarHandleDesc;
+ (Ljava/lang/constant/ClassDesc;)L1java/lang/invoke/VarHandle$VarHandleDesc;
 ofField
  (Ljava/lang/constant/ClassDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;)Ljava/lang/invoke/VarHandle$VarHandleDesc;
- (Ljava/lang/constant/ClassDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;)Ljava/lang/invoke/VarHandle$VarHandleDesc;
+ (Ljava/lang/constant/ClassDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;)L1java/lang/invoke/VarHandle$VarHandleDesc;
 ofStaticField
  (Ljava/lang/constant/ClassDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;)Ljava/lang/invoke/VarHandle$VarHandleDesc;
- (Ljava/lang/constant/ClassDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;)Ljava/lang/invoke/VarHandle$VarHandleDesc;
+ (Ljava/lang/constant/ClassDesc;Ljava/lang/String;Ljava/lang/constant/ClassDesc;)L1java/lang/invoke/VarHandle$VarHandleDesc;
 
 resolveConstantDesc
  (Ljava/lang/invoke/MethodHandles$Lookup;)Ljava/lang/invoke/VarHandle;
diff --git a/libs/eea-java-21/src/main/resources/java/lang/invoke/VarHandle.eea b/libs/eea-java-21/src/main/resources/java/lang/invoke/VarHandle.eea
index d80963c9a9..4250fb36eb 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/invoke/VarHandle.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/invoke/VarHandle.eea
@@ -5,13 +5,13 @@ accessModeType
  (Ljava/lang/invoke/VarHandle$AccessMode;)Ljava/lang/invoke/MethodType;
 compareAndExchange
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 compareAndExchangeAcquire
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 compareAndExchangeRelease
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 compareAndSet
  ([Ljava/lang/Object;)Z
  ([Ljava/lang/Object;)Z
@@ -23,61 +23,61 @@ describeConstable
  ()Ljava/util/Optional<Ljava/lang/invoke/VarHandle$VarHandleDesc;>;
 get
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAcquire
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndAdd
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndAddAcquire
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndAddRelease
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseAnd
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseAndAcquire
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseAndRelease
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseOr
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseOrAcquire
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseOrRelease
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseXor
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseXorAcquire
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndBitwiseXorRelease
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndSet
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndSetAcquire
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getAndSetRelease
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getOpaque
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 getVolatile
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
 isAccessModeSupported
  (Ljava/lang/invoke/VarHandle$AccessMode;)Z
  (Ljava/lang/invoke/VarHandle$AccessMode;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/lang/module/Configuration.eea b/libs/eea-java-21/src/main/resources/java/lang/module/Configuration.eea
index 4812249c39..d42b77d202 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/module/Configuration.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/module/Configuration.eea
@@ -5,10 +5,10 @@ empty
  ()Ljava/lang/module/Configuration;
 resolve
  (Ljava/lang/module/ModuleFinder;Ljava/util/List<Ljava/lang/module/Configuration;>;Ljava/lang/module/ModuleFinder;Ljava/util/Collection<Ljava/lang/String;>;)Ljava/lang/module/Configuration;
- (Ljava/lang/module/ModuleFinder;Ljava/util/List<Ljava/lang/module/Configuration;>;Ljava/lang/module/ModuleFinder;Ljava/util/Collection<Ljava/lang/String;>;)Ljava/lang/module/Configuration;
+ (Ljava/lang/module/ModuleFinder;Ljava/util/List<Ljava/lang/module/Configuration;>;Ljava/lang/module/ModuleFinder;Ljava/util/Collection<Ljava/lang/String;>;)L1java/lang/module/Configuration;
 resolveAndBind
  (Ljava/lang/module/ModuleFinder;Ljava/util/List<Ljava/lang/module/Configuration;>;Ljava/lang/module/ModuleFinder;Ljava/util/Collection<Ljava/lang/String;>;)Ljava/lang/module/Configuration;
- (Ljava/lang/module/ModuleFinder;Ljava/util/List<Ljava/lang/module/Configuration;>;Ljava/lang/module/ModuleFinder;Ljava/util/Collection<Ljava/lang/String;>;)Ljava/lang/module/Configuration;
+ (Ljava/lang/module/ModuleFinder;Ljava/util/List<Ljava/lang/module/Configuration;>;Ljava/lang/module/ModuleFinder;Ljava/util/Collection<Ljava/lang/String;>;)L1java/lang/module/Configuration;
 
 findModule
  (Ljava/lang/String;)Ljava/util/Optional<Ljava/lang/module/ResolvedModule;>;
diff --git a/libs/eea-java-21/src/main/resources/java/lang/module/ModuleDescriptor$Version.eea b/libs/eea-java-21/src/main/resources/java/lang/module/ModuleDescriptor$Version.eea
index 317961212b..0cc2269264 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/module/ModuleDescriptor$Version.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/module/ModuleDescriptor$Version.eea
@@ -6,7 +6,7 @@ super java/lang/Comparable
 
 parse
  (Ljava/lang/String;)Ljava/lang/module/ModuleDescriptor$Version;
- (Ljava/lang/String;)Ljava/lang/module/ModuleDescriptor$Version;
+ (Ljava/lang/String;)L1java/lang/module/ModuleDescriptor$Version;
 
 compareTo
  (Ljava/lang/module/ModuleDescriptor$Version;)I
diff --git a/libs/eea-java-21/src/main/resources/java/lang/module/ModuleFinder.eea b/libs/eea-java-21/src/main/resources/java/lang/module/ModuleFinder.eea
index 85d29f3133..6b2917121e 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/module/ModuleFinder.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/module/ModuleFinder.eea
@@ -2,7 +2,7 @@ class java/lang/module/ModuleFinder
 
 compose
  ([Ljava/lang/module/ModuleFinder;)Ljava/lang/module/ModuleFinder;
- ([Ljava/lang/module/ModuleFinder;)Ljava/lang/module/ModuleFinder;
+ ([Ljava/lang/module/ModuleFinder;)L1java/lang/module/ModuleFinder;
 of
  ([Ljava/nio/file/Path;)Ljava/lang/module/ModuleFinder;
  ([Ljava/nio/file/Path;)Ljava/lang/module/ModuleFinder;
diff --git a/libs/eea-java-21/src/main/resources/java/lang/reflect/ClassFileFormatVersion.eea b/libs/eea-java-21/src/main/resources/java/lang/reflect/ClassFileFormatVersion.eea
index c57b8faff3..35119e4c04 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/reflect/ClassFileFormatVersion.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/reflect/ClassFileFormatVersion.eea
@@ -16,4 +16,4 @@ valueOf
 
 runtimeVersion
  ()Ljava/lang/Runtime$Version;
- ()Ljava/lang/Runtime$Version;
+ ()L0java/lang/Runtime$Version;
diff --git a/libs/eea-java-21/src/main/resources/java/lang/reflect/Executable.eea b/libs/eea-java-21/src/main/resources/java/lang/reflect/Executable.eea
index 607cdf4b37..1387dfbc41 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/reflect/Executable.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/reflect/Executable.eea
@@ -2,7 +2,7 @@ class java/lang/reflect/Executable
 
 accessFlags
  ()Ljava/util/Set<Ljava/lang/reflect/AccessFlag;>;
- ()Ljava/util/Set<Ljava/lang/reflect/AccessFlag;>;
+ ()L1java/util/Set<Ljava/lang/reflect/AccessFlag;>; # @Inherited(java.lang.reflect.Member)
 getAnnotatedExceptionTypes
  ()[Ljava/lang/reflect/AnnotatedType;
  ()[1L1java/lang/reflect/AnnotatedType;
diff --git a/libs/eea-java-21/src/main/resources/java/lang/reflect/Field.eea b/libs/eea-java-21/src/main/resources/java/lang/reflect/Field.eea
index 2672a1c674..f20e139bf9 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/reflect/Field.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/reflect/Field.eea
@@ -2,7 +2,7 @@ class java/lang/reflect/Field
 
 accessFlags
  ()Ljava/util/Set<Ljava/lang/reflect/AccessFlag;>;
- ()Ljava/util/Set<Ljava/lang/reflect/AccessFlag;>;
+ ()L1java/util/Set<Ljava/lang/reflect/AccessFlag;>; # @Inherited(java.lang.reflect.Member)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/java/lang/reflect/Member.eea b/libs/eea-java-21/src/main/resources/java/lang/reflect/Member.eea
index 13fcaddde3..674be671a8 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/reflect/Member.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/reflect/Member.eea
@@ -2,7 +2,7 @@ class java/lang/reflect/Member
 
 accessFlags
  ()Ljava/util/Set<Ljava/lang/reflect/AccessFlag;>;
- ()Ljava/util/Set<Ljava/lang/reflect/AccessFlag;>;
+ ()L1java/util/Set<Ljava/lang/reflect/AccessFlag;>;
 getDeclaringClass
  ()Ljava/lang/Class<*>;
  ()L1java/lang/Class<*>;
diff --git a/libs/eea-java-21/src/main/resources/java/lang/runtime/SwitchBootstraps.eea b/libs/eea-java-21/src/main/resources/java/lang/runtime/SwitchBootstraps.eea
index e72325cede..dcc3659297 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/runtime/SwitchBootstraps.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/runtime/SwitchBootstraps.eea
@@ -2,7 +2,7 @@ class java/lang/runtime/SwitchBootstraps
 
 enumSwitch
  (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;
- (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;
+ (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;[Ljava/lang/Object;)L1java/lang/invoke/CallSite;
 typeSwitch
  (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;
- (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;
+ (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;[Ljava/lang/Object;)L1java/lang/invoke/CallSite;
diff --git a/libs/eea-java-21/src/main/resources/java/lang/runtime/TemplateRuntime.eea b/libs/eea-java-21/src/main/resources/java/lang/runtime/TemplateRuntime.eea
index 555fe945e4..4a5bbdf927 100644
--- a/libs/eea-java-21/src/main/resources/java/lang/runtime/TemplateRuntime.eea
+++ b/libs/eea-java-21/src/main/resources/java/lang/runtime/TemplateRuntime.eea
@@ -2,10 +2,10 @@ class java/lang/runtime/TemplateRuntime
 
 newLargeStringTemplate
  (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;
- (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;
+ (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;)L1java/lang/invoke/CallSite;
 newStringTemplate
  (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;[Ljava/lang/String;)Ljava/lang/invoke/CallSite;
- (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;[Ljava/lang/String;)Ljava/lang/invoke/CallSite;
+ (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;[Ljava/lang/String;)L1java/lang/invoke/CallSite;
 processStringTemplate
  (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodHandle;[Ljava/lang/String;)Ljava/lang/invoke/CallSite;
- (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodHandle;[Ljava/lang/String;)Ljava/lang/invoke/CallSite;
+ (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodHandle;[Ljava/lang/String;)L1java/lang/invoke/CallSite;
diff --git a/libs/eea-java-21/src/main/resources/java/net/Authenticator.eea b/libs/eea-java-21/src/main/resources/java/net/Authenticator.eea
index 3151571c0a..f978702dd4 100644
--- a/libs/eea-java-21/src/main/resources/java/net/Authenticator.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/Authenticator.eea
@@ -5,23 +5,23 @@ getDefault
  ()Ljava/net/Authenticator;
 requestPasswordAuthentication
  (Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/net/PasswordAuthentication;
- (Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/net/PasswordAuthentication;
+ (Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)L0java/net/PasswordAuthentication;
 requestPasswordAuthentication
  (Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/URL;Ljava/net/Authenticator$RequestorType;)Ljava/net/PasswordAuthentication;
- (Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/URL;Ljava/net/Authenticator$RequestorType;)Ljava/net/PasswordAuthentication;
+ (Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/URL;Ljava/net/Authenticator$RequestorType;)L0java/net/PasswordAuthentication;
 requestPasswordAuthentication
  (Ljava/net/Authenticator;Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/URL;Ljava/net/Authenticator$RequestorType;)Ljava/net/PasswordAuthentication;
- (Ljava/net/Authenticator;Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/URL;Ljava/net/Authenticator$RequestorType;)Ljava/net/PasswordAuthentication;
+ (Ljava/net/Authenticator;Ljava/lang/String;Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/URL;Ljava/net/Authenticator$RequestorType;)L0java/net/PasswordAuthentication;
 requestPasswordAuthentication
  (Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/net/PasswordAuthentication;
- (Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/net/PasswordAuthentication;
+ (Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)L0java/net/PasswordAuthentication;
 setDefault
  (Ljava/net/Authenticator;)V
  (Ljava/net/Authenticator;)V
 
 getPasswordAuthentication
  ()Ljava/net/PasswordAuthentication;
- ()Ljava/net/PasswordAuthentication;
+ ()L0java/net/PasswordAuthentication;
 getRequestingHost
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/java/net/ContentHandler.eea b/libs/eea-java-21/src/main/resources/java/net/ContentHandler.eea
index 1e1cca6b16..ed6f047606 100644
--- a/libs/eea-java-21/src/main/resources/java/net/ContentHandler.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/ContentHandler.eea
@@ -5,4 +5,4 @@ getContent
  (Ljava/net/URLConnection;)Ljava/lang/Object;
 getContent
  (Ljava/net/URLConnection;[Ljava/lang/Class;)Ljava/lang/Object;
- (Ljava/net/URLConnection;[Ljava/lang/Class;)Ljava/lang/Object;
+ (Ljava/net/URLConnection;[Ljava/lang/Class;)L0java/lang/Object;
diff --git a/libs/eea-java-21/src/main/resources/java/net/ContentHandlerFactory.eea b/libs/eea-java-21/src/main/resources/java/net/ContentHandlerFactory.eea
index c8abe6b8dd..2699ebdcc3 100644
--- a/libs/eea-java-21/src/main/resources/java/net/ContentHandlerFactory.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/ContentHandlerFactory.eea
@@ -2,4 +2,4 @@ class java/net/ContentHandlerFactory
 
 createContentHandler
  (Ljava/lang/String;)Ljava/net/ContentHandler;
- (Ljava/lang/String;)Ljava/net/ContentHandler;
+ (Ljava/lang/String;)L1java/net/ContentHandler;
diff --git a/libs/eea-java-21/src/main/resources/java/net/DatagramPacket.eea b/libs/eea-java-21/src/main/resources/java/net/DatagramPacket.eea
index 5eb8ad8f2d..ae4d558e11 100644
--- a/libs/eea-java-21/src/main/resources/java/net/DatagramPacket.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/DatagramPacket.eea
@@ -26,7 +26,7 @@ getData
  ()[B
 getSocketAddress
  ()Ljava/net/SocketAddress;
- ()Ljava/net/SocketAddress;
+ ()L1java/net/SocketAddress;
 setAddress
  (Ljava/net/InetAddress;)V
  (Ljava/net/InetAddress;)V
diff --git a/libs/eea-java-21/src/main/resources/java/net/DatagramSocket.eea b/libs/eea-java-21/src/main/resources/java/net/DatagramSocket.eea
index 28f69f342f..3616050d10 100644
--- a/libs/eea-java-21/src/main/resources/java/net/DatagramSocket.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/DatagramSocket.eea
@@ -24,22 +24,22 @@ connect
  (Ljava/net/SocketAddress;)V
 getChannel
  ()Ljava/nio/channels/DatagramChannel;
- ()Ljava/nio/channels/DatagramChannel;
+ ()L0java/nio/channels/DatagramChannel;
 getInetAddress
  ()Ljava/net/InetAddress;
  ()Ljava/net/InetAddress;
 getLocalAddress
  ()Ljava/net/InetAddress;
- ()Ljava/net/InetAddress;
+ ()L0java/net/InetAddress;
 getLocalSocketAddress
  ()Ljava/net/SocketAddress;
- ()Ljava/net/SocketAddress;
+ ()L0java/net/SocketAddress;
 getOption
  <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)TT;
  <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)TT;
 getRemoteSocketAddress
  ()Ljava/net/SocketAddress;
- ()Ljava/net/SocketAddress;
+ ()L0java/net/SocketAddress;
 joinGroup
  (Ljava/net/SocketAddress;Ljava/net/NetworkInterface;)V
  (Ljava/net/SocketAddress;Ljava/net/NetworkInterface;)V
diff --git a/libs/eea-java-21/src/main/resources/java/net/DatagramSocketImpl.eea b/libs/eea-java-21/src/main/resources/java/net/DatagramSocketImpl.eea
index 5a696d7b04..1bb5ab1665 100644
--- a/libs/eea-java-21/src/main/resources/java/net/DatagramSocketImpl.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/DatagramSocketImpl.eea
@@ -15,7 +15,7 @@ getFileDescriptor
  ()Ljava/io/FileDescriptor;
 getOption
  <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)T1T;
 join
  (Ljava/net/InetAddress;)V
  (Ljava/net/InetAddress;)V
diff --git a/libs/eea-java-21/src/main/resources/java/net/DatagramSocketImplFactory.eea b/libs/eea-java-21/src/main/resources/java/net/DatagramSocketImplFactory.eea
index fff0d4e351..9f2fbb449d 100644
--- a/libs/eea-java-21/src/main/resources/java/net/DatagramSocketImplFactory.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/DatagramSocketImplFactory.eea
@@ -2,4 +2,4 @@ class java/net/DatagramSocketImplFactory
 
 createDatagramSocketImpl
  ()Ljava/net/DatagramSocketImpl;
- ()Ljava/net/DatagramSocketImpl;
+ ()L1java/net/DatagramSocketImpl;
diff --git a/libs/eea-java-21/src/main/resources/java/net/HttpURLConnection.eea b/libs/eea-java-21/src/main/resources/java/net/HttpURLConnection.eea
index f7ed8f092c..6918f60e58 100644
--- a/libs/eea-java-21/src/main/resources/java/net/HttpURLConnection.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/HttpURLConnection.eea
@@ -12,7 +12,7 @@ responseMessage
  (Ljava/net/URL;)V
 getErrorStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L0java/io/InputStream;
 getHeaderField
  (I)Ljava/lang/String;
  (I)L0java/lang/String; # @Inherited(java.net.URLConnection)
@@ -21,7 +21,7 @@ getHeaderFieldDate
  (Ljava/lang/String;J)J
 getHeaderFieldKey
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String; # @Inherited(java.net.URLConnection)
 getPermission
  ()Ljava/security/Permission;
  ()L1java/security/Permission; # @Inherited(java.net.URLConnection)
diff --git a/libs/eea-java-21/src/main/resources/java/net/IDN.eea b/libs/eea-java-21/src/main/resources/java/net/IDN.eea
index e2bcd71ed5..65c48535e7 100644
--- a/libs/eea-java-21/src/main/resources/java/net/IDN.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/IDN.eea
@@ -5,10 +5,10 @@ toASCII
  (Ljava/lang/String;)Ljava/lang/String;
 toASCII
  (Ljava/lang/String;I)Ljava/lang/String;
- (Ljava/lang/String;I)Ljava/lang/String;
+ (Ljava/lang/String;I)L1java/lang/String;
 toUnicode
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
 toUnicode
  (Ljava/lang/String;I)Ljava/lang/String;
- (Ljava/lang/String;I)Ljava/lang/String;
+ (Ljava/lang/String;I)L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/java/net/InetSocketAddress.eea b/libs/eea-java-21/src/main/resources/java/net/InetSocketAddress.eea
index 999cdbd6cb..542c8de311 100644
--- a/libs/eea-java-21/src/main/resources/java/net/InetSocketAddress.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/InetSocketAddress.eea
@@ -2,7 +2,7 @@ class java/net/InetSocketAddress
 
 createUnresolved
  (Ljava/lang/String;I)Ljava/net/InetSocketAddress;
- (Ljava/lang/String;I)Ljava/net/InetSocketAddress;
+ (Ljava/lang/String;I)L1java/net/InetSocketAddress;
 
 <init>
  (Ljava/lang/String;I)V
diff --git a/libs/eea-java-21/src/main/resources/java/net/NetworkInterface.eea b/libs/eea-java-21/src/main/resources/java/net/NetworkInterface.eea
index 5acc228d4f..0e698978a5 100644
--- a/libs/eea-java-21/src/main/resources/java/net/NetworkInterface.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/NetworkInterface.eea
@@ -24,7 +24,7 @@ getDisplayName
  ()Ljava/lang/String;
 getHardwareAddress
  ()[B
- ()[B
+ ()[0B
 getInetAddresses
  ()Ljava/util/Enumeration<Ljava/net/InetAddress;>;
  ()Ljava/util/Enumeration<Ljava/net/InetAddress;>;
diff --git a/libs/eea-java-21/src/main/resources/java/net/ServerSocket.eea b/libs/eea-java-21/src/main/resources/java/net/ServerSocket.eea
index e7dda1c6df..836d768000 100644
--- a/libs/eea-java-21/src/main/resources/java/net/ServerSocket.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/ServerSocket.eea
@@ -21,13 +21,13 @@ bind
  (Ljava/net/SocketAddress;I)V
 getChannel
  ()Ljava/nio/channels/ServerSocketChannel;
- ()Ljava/nio/channels/ServerSocketChannel;
+ ()L0java/nio/channels/ServerSocketChannel;
 getInetAddress
  ()Ljava/net/InetAddress;
- ()Ljava/net/InetAddress;
+ ()L0java/net/InetAddress;
 getLocalSocketAddress
  ()Ljava/net/SocketAddress;
- ()Ljava/net/SocketAddress;
+ ()L0java/net/SocketAddress;
 getOption
  <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)TT;
  <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)TT;
diff --git a/libs/eea-java-21/src/main/resources/java/net/Socket.eea b/libs/eea-java-21/src/main/resources/java/net/Socket.eea
index 917fb41a76..dae3c41618 100644
--- a/libs/eea-java-21/src/main/resources/java/net/Socket.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/Socket.eea
@@ -42,7 +42,7 @@ getChannel
  ()L0java/nio/channels/SocketChannel;
 getInetAddress
  ()Ljava/net/InetAddress;
- ()Ljava/net/InetAddress;
+ ()L0java/net/InetAddress;
 getInputStream
  ()Ljava/io/InputStream;
  ()L1java/io/InputStream;
@@ -51,7 +51,7 @@ getLocalAddress
  ()L1java/net/InetAddress;
 getLocalSocketAddress
  ()Ljava/net/SocketAddress;
- ()Ljava/net/SocketAddress;
+ ()L0java/net/SocketAddress;
 getOption
  <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)TT;
  <T:Ljava/lang/Object;>(L1java/net/SocketOption<TT;>;)TT;
@@ -60,7 +60,7 @@ getOutputStream
  ()L1java/io/OutputStream;
 getRemoteSocketAddress
  ()Ljava/net/SocketAddress;
- ()Ljava/net/SocketAddress;
+ ()L0java/net/SocketAddress;
 setOption
  <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;TT;)Ljava/net/Socket;
  <T:Ljava/lang/Object;>(L1java/net/SocketOption<TT;>;TT;)L1java/net/Socket;
diff --git a/libs/eea-java-21/src/main/resources/java/net/SocketImpl.eea b/libs/eea-java-21/src/main/resources/java/net/SocketImpl.eea
index 2541a0b5ca..6fd3a2bd45 100644
--- a/libs/eea-java-21/src/main/resources/java/net/SocketImpl.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/SocketImpl.eea
@@ -33,7 +33,7 @@ getInputStream
  ()Ljava/io/InputStream;
 getOption
  <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/net/SocketOption<TT;>;)T1T;
 getOutputStream
  ()Ljava/io/OutputStream;
  ()Ljava/io/OutputStream;
diff --git a/libs/eea-java-21/src/main/resources/java/net/SocketImplFactory.eea b/libs/eea-java-21/src/main/resources/java/net/SocketImplFactory.eea
index 6cb49500ff..c6e0f746a1 100644
--- a/libs/eea-java-21/src/main/resources/java/net/SocketImplFactory.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/SocketImplFactory.eea
@@ -2,4 +2,4 @@ class java/net/SocketImplFactory
 
 createSocketImpl
  ()Ljava/net/SocketImpl;
- ()Ljava/net/SocketImpl;
+ ()L1java/net/SocketImpl;
diff --git a/libs/eea-java-21/src/main/resources/java/net/URL.eea b/libs/eea-java-21/src/main/resources/java/net/URL.eea
index 83b51f9fa6..80232c1b0e 100644
--- a/libs/eea-java-21/src/main/resources/java/net/URL.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/URL.eea
@@ -2,7 +2,7 @@ class java/net/URL
 
 of
  (Ljava/net/URI;Ljava/net/URLStreamHandler;)Ljava/net/URL;
- (Ljava/net/URI;Ljava/net/URLStreamHandler;)Ljava/net/URL;
+ (Ljava/net/URI;Ljava/net/URLStreamHandler;)L1java/net/URL;
 setURLStreamHandlerFactory
  (Ljava/net/URLStreamHandlerFactory;)V
  (Ljava/net/URLStreamHandlerFactory;)V
diff --git a/libs/eea-java-21/src/main/resources/java/net/URLClassLoader.eea b/libs/eea-java-21/src/main/resources/java/net/URLClassLoader.eea
index 718252d120..d0d7932110 100644
--- a/libs/eea-java-21/src/main/resources/java/net/URLClassLoader.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/URLClassLoader.eea
@@ -39,7 +39,7 @@ findResources
  (L0java/lang/String;)L1java/util/Enumeration<L1java/net/URL;>; # @Inherited(java.lang.ClassLoader)
 getPermissions
  (Ljava/security/CodeSource;)Ljava/security/PermissionCollection;
- (Ljava/security/CodeSource;)Ljava/security/PermissionCollection;
+ (Ljava/security/CodeSource;)L1java/security/PermissionCollection; # @Inherited(java.security.SecureClassLoader)
 getResourceAsStream
  (Ljava/lang/String;)Ljava/io/InputStream;
  (L1java/lang/String;)L0java/io/InputStream; # @Inherited(java.lang.ClassLoader)
diff --git a/libs/eea-java-21/src/main/resources/java/net/URLConnection.eea b/libs/eea-java-21/src/main/resources/java/net/URLConnection.eea
index 3e23c7918f..cba94435dd 100644
--- a/libs/eea-java-21/src/main/resources/java/net/URLConnection.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/URLConnection.eea
@@ -2,7 +2,7 @@ class java/net/URLConnection
 
 getDefaultRequestProperty
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getDefaultUseCaches
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
@@ -14,7 +14,7 @@ guessContentTypeFromName
  (Ljava/lang/String;)Ljava/lang/String;
 guessContentTypeFromStream
  (Ljava/io/InputStream;)Ljava/lang/String;
- (Ljava/io/InputStream;)Ljava/lang/String;
+ (Ljava/io/InputStream;)L0java/lang/String;
 setContentHandlerFactory
  (Ljava/net/ContentHandlerFactory;)V
  (Ljava/net/ContentHandlerFactory;)V
@@ -64,7 +64,7 @@ getHeaderFieldInt
  (Ljava/lang/String;I)I
 getHeaderFieldKey
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getHeaderFieldLong
  (Ljava/lang/String;J)J
  (Ljava/lang/String;J)J
@@ -85,7 +85,7 @@ getRequestProperties
  ()Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;
 getRequestProperty
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getURL
  ()Ljava/net/URL;
  ()L1java/net/URL;
diff --git a/libs/eea-java-21/src/main/resources/java/net/URLStreamHandler.eea b/libs/eea-java-21/src/main/resources/java/net/URLStreamHandler.eea
index 9be69df7e3..c6590f2784 100644
--- a/libs/eea-java-21/src/main/resources/java/net/URLStreamHandler.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/URLStreamHandler.eea
@@ -17,7 +17,7 @@ openConnection
  (Ljava/net/URL;)Ljava/net/URLConnection;
 openConnection
  (Ljava/net/URL;Ljava/net/Proxy;)Ljava/net/URLConnection;
- (Ljava/net/URL;Ljava/net/Proxy;)Ljava/net/URLConnection;
+ (Ljava/net/URL;Ljava/net/Proxy;)L1java/net/URLConnection;
 parseURL
  (Ljava/net/URL;Ljava/lang/String;II)V
  (Ljava/net/URL;Ljava/lang/String;II)V
@@ -32,4 +32,4 @@ setURL
  (Ljava/net/URL;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 toExternalForm
  (Ljava/net/URL;)Ljava/lang/String;
- (Ljava/net/URL;)Ljava/lang/String;
+ (Ljava/net/URL;)L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/java/net/URLStreamHandlerFactory.eea b/libs/eea-java-21/src/main/resources/java/net/URLStreamHandlerFactory.eea
index 8f3220380d..92463e2ec7 100644
--- a/libs/eea-java-21/src/main/resources/java/net/URLStreamHandlerFactory.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/URLStreamHandlerFactory.eea
@@ -2,4 +2,4 @@ class java/net/URLStreamHandlerFactory
 
 createURLStreamHandler
  (Ljava/lang/String;)Ljava/net/URLStreamHandler;
- (Ljava/lang/String;)Ljava/net/URLStreamHandler;
+ (Ljava/lang/String;)L1java/net/URLStreamHandler;
diff --git a/libs/eea-java-21/src/main/resources/java/net/UnixDomainSocketAddress.eea b/libs/eea-java-21/src/main/resources/java/net/UnixDomainSocketAddress.eea
index bcc326a02f..9e714d7924 100644
--- a/libs/eea-java-21/src/main/resources/java/net/UnixDomainSocketAddress.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/UnixDomainSocketAddress.eea
@@ -5,7 +5,7 @@ of
  (Ljava/lang/String;)Ljava/net/UnixDomainSocketAddress;
 of
  (Ljava/nio/file/Path;)Ljava/net/UnixDomainSocketAddress;
- (Ljava/nio/file/Path;)Ljava/net/UnixDomainSocketAddress;
+ (Ljava/nio/file/Path;)L1java/net/UnixDomainSocketAddress;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/net/http/HttpClient.eea b/libs/eea-java-21/src/main/resources/java/net/http/HttpClient.eea
index 4be5614068..dd04db8760 100644
--- a/libs/eea-java-21/src/main/resources/java/net/http/HttpClient.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/http/HttpClient.eea
@@ -27,7 +27,7 @@ followRedirects
  ()Ljava/net/http/HttpClient$Redirect;
 newWebSocketBuilder
  ()Ljava/net/http/WebSocket$Builder;
- ()Ljava/net/http/WebSocket$Builder;
+ ()L1java/net/http/WebSocket$Builder;
 proxy
  ()Ljava/util/Optional<Ljava/net/ProxySelector;>;
  ()Ljava/util/Optional<Ljava/net/ProxySelector;>;
diff --git a/libs/eea-java-21/src/main/resources/java/net/http/HttpRequest.eea b/libs/eea-java-21/src/main/resources/java/net/http/HttpRequest.eea
index 6cfec9af18..6e1068849e 100644
--- a/libs/eea-java-21/src/main/resources/java/net/http/HttpRequest.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/http/HttpRequest.eea
@@ -2,10 +2,10 @@ class java/net/http/HttpRequest
 
 newBuilder
  ()Ljava/net/http/HttpRequest$Builder;
- ()Ljava/net/http/HttpRequest$Builder;
+ ()L1java/net/http/HttpRequest$Builder;
 newBuilder
  (Ljava/net/URI;)Ljava/net/http/HttpRequest$Builder;
- (Ljava/net/URI;)Ljava/net/http/HttpRequest$Builder;
+ (Ljava/net/URI;)L1java/net/http/HttpRequest$Builder;
 newBuilder
  (Ljava/net/http/HttpRequest;Ljava/util/function/BiPredicate<Ljava/lang/String;Ljava/lang/String;>;)Ljava/net/http/HttpRequest$Builder;
  (Ljava/net/http/HttpRequest;Ljava/util/function/BiPredicate<Ljava/lang/String;Ljava/lang/String;>;)Ljava/net/http/HttpRequest$Builder;
diff --git a/libs/eea-java-21/src/main/resources/java/net/http/HttpResponse$BodySubscribers.eea b/libs/eea-java-21/src/main/resources/java/net/http/HttpResponse$BodySubscribers.eea
index 24e2632035..4b01d65c7d 100644
--- a/libs/eea-java-21/src/main/resources/java/net/http/HttpResponse$BodySubscribers.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/http/HttpResponse$BodySubscribers.eea
@@ -2,10 +2,10 @@ class java/net/http/HttpResponse$BodySubscribers
 
 buffering
  <T:Ljava/lang/Object;>(Ljava/net/http/HttpResponse$BodySubscriber<TT;>;I)Ljava/net/http/HttpResponse$BodySubscriber<TT;>;
- <T:Ljava/lang/Object;>(Ljava/net/http/HttpResponse$BodySubscriber<TT;>;I)Ljava/net/http/HttpResponse$BodySubscriber<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/net/http/HttpResponse$BodySubscriber<TT;>;I)L1java/net/http/HttpResponse$BodySubscriber<TT;>;
 discarding
  ()Ljava/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
- ()Ljava/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
+ ()L1java/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
 fromLineSubscriber
  (Ljava/util/concurrent/Flow$Subscriber<-Ljava/lang/String;>;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
  (Ljava/util/concurrent/Flow$Subscriber<-Ljava/lang/String;>;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
@@ -17,16 +17,16 @@ fromSubscriber
  (Ljava/util/concurrent/Flow$Subscriber<-Ljava/util/List<Ljava/nio/ByteBuffer;>;>;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
 fromSubscriber
  <S::Ljava/util/concurrent/Flow$Subscriber<-Ljava/util/List<Ljava/nio/ByteBuffer;>;>;T:Ljava/lang/Object;>(TS;Ljava/util/function/Function<-TS;+TT;>;)Ljava/net/http/HttpResponse$BodySubscriber<TT;>;
- <S::Ljava/util/concurrent/Flow$Subscriber<-Ljava/util/List<Ljava/nio/ByteBuffer;>;>;T:Ljava/lang/Object;>(TS;Ljava/util/function/Function<-TS;+TT;>;)Ljava/net/http/HttpResponse$BodySubscriber<TT;>;
+ <S::Ljava/util/concurrent/Flow$Subscriber<-Ljava/util/List<Ljava/nio/ByteBuffer;>;>;T:Ljava/lang/Object;>(TS;Ljava/util/function/Function<-TS;+TT;>;)L1java/net/http/HttpResponse$BodySubscriber<TT;>;
 mapping
  <T:Ljava/lang/Object;U:Ljava/lang/Object;>(Ljava/net/http/HttpResponse$BodySubscriber<TT;>;Ljava/util/function/Function<-TT;+TU;>;)Ljava/net/http/HttpResponse$BodySubscriber<TU;>;
- <T:Ljava/lang/Object;U:Ljava/lang/Object;>(Ljava/net/http/HttpResponse$BodySubscriber<TT;>;Ljava/util/function/Function<-TT;+TU;>;)Ljava/net/http/HttpResponse$BodySubscriber<TU;>;
+ <T:Ljava/lang/Object;U:Ljava/lang/Object;>(Ljava/net/http/HttpResponse$BodySubscriber<TT;>;Ljava/util/function/Function<-TT;+TU;>;)L1java/net/http/HttpResponse$BodySubscriber<TU;>;
 ofByteArray
  ()Ljava/net/http/HttpResponse$BodySubscriber<[B>;
- ()Ljava/net/http/HttpResponse$BodySubscriber<[B>;
+ ()L1java/net/http/HttpResponse$BodySubscriber<[B>;
 ofByteArrayConsumer
  (Ljava/util/function/Consumer<Ljava/util/Optional<[B>;>;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
- (Ljava/util/function/Consumer<Ljava/util/Optional<[B>;>;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
+ (Ljava/util/function/Consumer<Ljava/util/Optional<[B>;>;)L1java/net/http/HttpResponse$BodySubscriber<Ljava/lang/Void;>;
 ofFile
  (Ljava/nio/file/Path;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/nio/file/Path;>;
  (Ljava/nio/file/Path;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/nio/file/Path;>;
@@ -35,7 +35,7 @@ ofFile
  (Ljava/nio/file/Path;[Ljava/nio/file/OpenOption;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/nio/file/Path;>;
 ofInputStream
  ()Ljava/net/http/HttpResponse$BodySubscriber<Ljava/io/InputStream;>;
- ()Ljava/net/http/HttpResponse$BodySubscriber<Ljava/io/InputStream;>;
+ ()L1java/net/http/HttpResponse$BodySubscriber<Ljava/io/InputStream;>;
 ofLines
  (Ljava/nio/charset/Charset;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/util/stream/Stream<Ljava/lang/String;>;>;
  (Ljava/nio/charset/Charset;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/util/stream/Stream<Ljava/lang/String;>;>;
@@ -47,4 +47,4 @@ ofString
  (Ljava/nio/charset/Charset;)Ljava/net/http/HttpResponse$BodySubscriber<Ljava/lang/String;>;
 replacing
  <U:Ljava/lang/Object;>(TU;)Ljava/net/http/HttpResponse$BodySubscriber<TU;>;
- <U:Ljava/lang/Object;>(TU;)Ljava/net/http/HttpResponse$BodySubscriber<TU;>;
+ <U:Ljava/lang/Object;>(TU;)L1java/net/http/HttpResponse$BodySubscriber<TU;>;
diff --git a/libs/eea-java-21/src/main/resources/java/net/http/HttpResponse$PushPromiseHandler.eea b/libs/eea-java-21/src/main/resources/java/net/http/HttpResponse$PushPromiseHandler.eea
index 936b9a2b6c..d353e41f88 100644
--- a/libs/eea-java-21/src/main/resources/java/net/http/HttpResponse$PushPromiseHandler.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/http/HttpResponse$PushPromiseHandler.eea
@@ -4,7 +4,7 @@ class java/net/http/HttpResponse$PushPromiseHandler
 
 of
  <T:Ljava/lang/Object;>(Ljava/util/function/Function<Ljava/net/http/HttpRequest;Ljava/net/http/HttpResponse$BodyHandler<TT;>;>;Ljava/util/concurrent/ConcurrentMap<Ljava/net/http/HttpRequest;Ljava/util/concurrent/CompletableFuture<Ljava/net/http/HttpResponse<TT;>;>;>;)Ljava/net/http/HttpResponse$PushPromiseHandler<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/function/Function<Ljava/net/http/HttpRequest;Ljava/net/http/HttpResponse$BodyHandler<TT;>;>;Ljava/util/concurrent/ConcurrentMap<Ljava/net/http/HttpRequest;Ljava/util/concurrent/CompletableFuture<Ljava/net/http/HttpResponse<TT;>;>;>;)Ljava/net/http/HttpResponse$PushPromiseHandler<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/function/Function<Ljava/net/http/HttpRequest;Ljava/net/http/HttpResponse$BodyHandler<TT;>;>;Ljava/util/concurrent/ConcurrentMap<Ljava/net/http/HttpRequest;Ljava/util/concurrent/CompletableFuture<Ljava/net/http/HttpResponse<TT;>;>;>;)L1java/net/http/HttpResponse$PushPromiseHandler<TT;>;
 
 applyPushPromise
  (Ljava/net/http/HttpRequest;Ljava/net/http/HttpRequest;Ljava/util/function/Function<Ljava/net/http/HttpResponse$BodyHandler<TT;>;Ljava/util/concurrent/CompletableFuture<Ljava/net/http/HttpResponse<TT;>;>;>;)V
diff --git a/libs/eea-java-21/src/main/resources/java/net/spi/InetAddressResolver$LookupPolicy.eea b/libs/eea-java-21/src/main/resources/java/net/spi/InetAddressResolver$LookupPolicy.eea
index 5fb7266ef1..2fc9c4de21 100644
--- a/libs/eea-java-21/src/main/resources/java/net/spi/InetAddressResolver$LookupPolicy.eea
+++ b/libs/eea-java-21/src/main/resources/java/net/spi/InetAddressResolver$LookupPolicy.eea
@@ -2,4 +2,4 @@ class java/net/spi/InetAddressResolver$LookupPolicy
 
 of
  (I)Ljava/net/spi/InetAddressResolver$LookupPolicy;
- (I)Ljava/net/spi/InetAddressResolver$LookupPolicy;
+ (I)L1java/net/spi/InetAddressResolver$LookupPolicy;
diff --git a/libs/eea-java-21/src/main/resources/java/nio/channels/Channels.eea b/libs/eea-java-21/src/main/resources/java/nio/channels/Channels.eea
index 923b2d7508..56f8111780 100644
--- a/libs/eea-java-21/src/main/resources/java/nio/channels/Channels.eea
+++ b/libs/eea-java-21/src/main/resources/java/nio/channels/Channels.eea
@@ -8,16 +8,16 @@ newChannel
  (Ljava/io/OutputStream;)Ljava/nio/channels/WritableByteChannel;
 newInputStream
  (Ljava/nio/channels/AsynchronousByteChannel;)Ljava/io/InputStream;
- (Ljava/nio/channels/AsynchronousByteChannel;)Ljava/io/InputStream;
+ (Ljava/nio/channels/AsynchronousByteChannel;)L1java/io/InputStream;
 newInputStream
  (Ljava/nio/channels/ReadableByteChannel;)Ljava/io/InputStream;
- (Ljava/nio/channels/ReadableByteChannel;)Ljava/io/InputStream;
+ (Ljava/nio/channels/ReadableByteChannel;)L1java/io/InputStream;
 newOutputStream
  (Ljava/nio/channels/AsynchronousByteChannel;)Ljava/io/OutputStream;
- (Ljava/nio/channels/AsynchronousByteChannel;)Ljava/io/OutputStream;
+ (Ljava/nio/channels/AsynchronousByteChannel;)L1java/io/OutputStream;
 newOutputStream
  (Ljava/nio/channels/WritableByteChannel;)Ljava/io/OutputStream;
- (Ljava/nio/channels/WritableByteChannel;)Ljava/io/OutputStream;
+ (Ljava/nio/channels/WritableByteChannel;)L1java/io/OutputStream;
 newReader
  (Ljava/nio/channels/ReadableByteChannel;Ljava/lang/String;)Ljava/io/Reader;
  (Ljava/nio/channels/ReadableByteChannel;Ljava/lang/String;)Ljava/io/Reader;
diff --git a/libs/eea-java-21/src/main/resources/java/nio/channels/FileChannel.eea b/libs/eea-java-21/src/main/resources/java/nio/channels/FileChannel.eea
index 0bb401b038..f4a06570f7 100644
--- a/libs/eea-java-21/src/main/resources/java/nio/channels/FileChannel.eea
+++ b/libs/eea-java-21/src/main/resources/java/nio/channels/FileChannel.eea
@@ -18,7 +18,7 @@ map
  (Ljava/nio/channels/FileChannel$MapMode;JJ)Ljava/nio/MappedByteBuffer;
 map
  (Ljava/nio/channels/FileChannel$MapMode;JJLjava/lang/foreign/Arena;)Ljava/lang/foreign/MemorySegment;
- (Ljava/nio/channels/FileChannel$MapMode;JJLjava/lang/foreign/Arena;)Ljava/lang/foreign/MemorySegment;
+ (Ljava/nio/channels/FileChannel$MapMode;JJLjava/lang/foreign/Arena;)L1java/lang/foreign/MemorySegment;
 position
  (J)Ljava/nio/channels/FileChannel;
  (J)Ljava/nio/channels/FileChannel;
diff --git a/libs/eea-java-21/src/main/resources/java/nio/channels/FileLock.eea b/libs/eea-java-21/src/main/resources/java/nio/channels/FileLock.eea
index 1a65dcb231..b3d6e28504 100644
--- a/libs/eea-java-21/src/main/resources/java/nio/channels/FileLock.eea
+++ b/libs/eea-java-21/src/main/resources/java/nio/channels/FileLock.eea
@@ -11,7 +11,7 @@ acquiredBy
  ()Ljava/nio/channels/Channel;
 channel
  ()Ljava/nio/channels/FileChannel;
- ()Ljava/nio/channels/FileChannel;
+ ()L0java/nio/channels/FileChannel;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/java/nio/channels/spi/SelectorProvider.eea b/libs/eea-java-21/src/main/resources/java/nio/channels/spi/SelectorProvider.eea
index 57149bc701..b1f84c8744 100644
--- a/libs/eea-java-21/src/main/resources/java/nio/channels/spi/SelectorProvider.eea
+++ b/libs/eea-java-21/src/main/resources/java/nio/channels/spi/SelectorProvider.eea
@@ -6,7 +6,7 @@ provider
 
 inheritedChannel
  ()Ljava/nio/channels/Channel;
- ()Ljava/nio/channels/Channel;
+ ()L0java/nio/channels/Channel;
 openDatagramChannel
  ()Ljava/nio/channels/DatagramChannel;
  ()Ljava/nio/channels/DatagramChannel;
@@ -24,10 +24,10 @@ openServerSocketChannel
  ()Ljava/nio/channels/ServerSocketChannel;
 openServerSocketChannel
  (Ljava/net/ProtocolFamily;)Ljava/nio/channels/ServerSocketChannel;
- (Ljava/net/ProtocolFamily;)Ljava/nio/channels/ServerSocketChannel;
+ (Ljava/net/ProtocolFamily;)L1java/nio/channels/ServerSocketChannel;
 openSocketChannel
  ()Ljava/nio/channels/SocketChannel;
  ()Ljava/nio/channels/SocketChannel;
 openSocketChannel
  (Ljava/net/ProtocolFamily;)Ljava/nio/channels/SocketChannel;
- (Ljava/net/ProtocolFamily;)Ljava/nio/channels/SocketChannel;
+ (Ljava/net/ProtocolFamily;)L1java/nio/channels/SocketChannel;
diff --git a/libs/eea-java-21/src/main/resources/java/nio/charset/CharsetDecoder.eea b/libs/eea-java-21/src/main/resources/java/nio/charset/CharsetDecoder.eea
index 437c9ffdba..d0edf1cf5c 100644
--- a/libs/eea-java-21/src/main/resources/java/nio/charset/CharsetDecoder.eea
+++ b/libs/eea-java-21/src/main/resources/java/nio/charset/CharsetDecoder.eea
@@ -17,7 +17,7 @@ decodeLoop
  (Ljava/nio/ByteBuffer;Ljava/nio/CharBuffer;)Ljava/nio/charset/CoderResult;
 detectedCharset
  ()Ljava/nio/charset/Charset;
- ()Ljava/nio/charset/Charset;
+ ()L1java/nio/charset/Charset;
 flush
  (Ljava/nio/CharBuffer;)Ljava/nio/charset/CoderResult;
  (Ljava/nio/CharBuffer;)Ljava/nio/charset/CoderResult;
diff --git a/libs/eea-java-21/src/main/resources/java/nio/file/Files.eea b/libs/eea-java-21/src/main/resources/java/nio/file/Files.eea
index 65681ac721..98b73f8649 100644
--- a/libs/eea-java-21/src/main/resources/java/nio/file/Files.eea
+++ b/libs/eea-java-21/src/main/resources/java/nio/file/Files.eea
@@ -14,28 +14,28 @@ createDirectories
  (L1java/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createDirectory
  (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createFile
  (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createLink
  (Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;Ljava/nio/file/Path;)L1java/nio/file/Path;
 createSymbolicLink
  (Ljava/nio/file/Path;Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createTempDirectory
  (Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createTempDirectory
  (Ljava/nio/file/Path;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createTempFile
  (Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 createTempFile
  (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/file/Path;
 delete
  (Ljava/nio/file/Path;)V
  (Ljava/nio/file/Path;)V
diff --git a/libs/eea-java-21/src/main/resources/java/nio/file/attribute/AclEntry.eea b/libs/eea-java-21/src/main/resources/java/nio/file/attribute/AclEntry.eea
index ddbe0791a6..c9697f8db0 100644
--- a/libs/eea-java-21/src/main/resources/java/nio/file/attribute/AclEntry.eea
+++ b/libs/eea-java-21/src/main/resources/java/nio/file/attribute/AclEntry.eea
@@ -2,7 +2,7 @@ class java/nio/file/attribute/AclEntry
 
 newBuilder
  ()Ljava/nio/file/attribute/AclEntry$Builder;
- ()Ljava/nio/file/attribute/AclEntry$Builder;
+ ()L1java/nio/file/attribute/AclEntry$Builder;
 newBuilder
  (Ljava/nio/file/attribute/AclEntry;)Ljava/nio/file/attribute/AclEntry$Builder;
  (Ljava/nio/file/attribute/AclEntry;)Ljava/nio/file/attribute/AclEntry$Builder;
@@ -12,10 +12,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 flags
  ()Ljava/util/Set<Ljava/nio/file/attribute/AclEntryFlag;>;
- ()Ljava/util/Set<Ljava/nio/file/attribute/AclEntryFlag;>;
+ ()L1java/util/Set<Ljava/nio/file/attribute/AclEntryFlag;>;
 permissions
  ()Ljava/util/Set<Ljava/nio/file/attribute/AclEntryPermission;>;
- ()Ljava/util/Set<Ljava/nio/file/attribute/AclEntryPermission;>;
+ ()L1java/util/Set<Ljava/nio/file/attribute/AclEntryPermission;>;
 principal
  ()Ljava/nio/file/attribute/UserPrincipal;
  ()Ljava/nio/file/attribute/UserPrincipal;
diff --git a/libs/eea-java-21/src/main/resources/java/nio/file/attribute/FileTime.eea b/libs/eea-java-21/src/main/resources/java/nio/file/attribute/FileTime.eea
index 901f9872e4..22ad44270b 100644
--- a/libs/eea-java-21/src/main/resources/java/nio/file/attribute/FileTime.eea
+++ b/libs/eea-java-21/src/main/resources/java/nio/file/attribute/FileTime.eea
@@ -6,13 +6,13 @@ super java/lang/Comparable
 
 from
  (JLjava/util/concurrent/TimeUnit;)Ljava/nio/file/attribute/FileTime;
- (JLjava/util/concurrent/TimeUnit;)Ljava/nio/file/attribute/FileTime;
+ (JLjava/util/concurrent/TimeUnit;)L1java/nio/file/attribute/FileTime;
 from
  (Ljava/time/Instant;)Ljava/nio/file/attribute/FileTime;
  (Ljava/time/Instant;)Ljava/nio/file/attribute/FileTime;
 fromMillis
  (J)Ljava/nio/file/attribute/FileTime;
- (J)Ljava/nio/file/attribute/FileTime;
+ (J)L1java/nio/file/attribute/FileTime;
 
 compareTo
  (Ljava/nio/file/attribute/FileTime;)I
diff --git a/libs/eea-java-21/src/main/resources/java/nio/file/attribute/PosixFilePermissions.eea b/libs/eea-java-21/src/main/resources/java/nio/file/attribute/PosixFilePermissions.eea
index e5c13010fa..9a02f70214 100644
--- a/libs/eea-java-21/src/main/resources/java/nio/file/attribute/PosixFilePermissions.eea
+++ b/libs/eea-java-21/src/main/resources/java/nio/file/attribute/PosixFilePermissions.eea
@@ -2,10 +2,10 @@ class java/nio/file/attribute/PosixFilePermissions
 
 asFileAttribute
  (Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;)Ljava/nio/file/attribute/FileAttribute<Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;>;
- (Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;)Ljava/nio/file/attribute/FileAttribute<Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;>;
+ (Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;)L1java/nio/file/attribute/FileAttribute<Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;>;
 fromString
  (Ljava/lang/String;)Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;
  (Ljava/lang/String;)Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;
 toString
  (Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;)Ljava/lang/String;
- (Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;)Ljava/lang/String;
+ (Ljava/util/Set<Ljava/nio/file/attribute/PosixFilePermission;>;)L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/java/nio/file/spi/FileSystemProvider.eea b/libs/eea-java-21/src/main/resources/java/nio/file/spi/FileSystemProvider.eea
index 29502c7a64..6660317ff5 100644
--- a/libs/eea-java-21/src/main/resources/java/nio/file/spi/FileSystemProvider.eea
+++ b/libs/eea-java-21/src/main/resources/java/nio/file/spi/FileSystemProvider.eea
@@ -54,7 +54,7 @@ move
  (Ljava/nio/file/Path;Ljava/nio/file/Path;[Ljava/nio/file/CopyOption;)V
 newAsynchronousFileChannel
  (Ljava/nio/file/Path;Ljava/util/Set<+Ljava/nio/file/OpenOption;>;Ljava/util/concurrent/ExecutorService;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/channels/AsynchronousFileChannel;
- (Ljava/nio/file/Path;Ljava/util/Set<+Ljava/nio/file/OpenOption;>;Ljava/util/concurrent/ExecutorService;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/channels/AsynchronousFileChannel;
+ (Ljava/nio/file/Path;Ljava/util/Set<+Ljava/nio/file/OpenOption;>;Ljava/util/concurrent/ExecutorService;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/channels/AsynchronousFileChannel;
 newByteChannel
  (Ljava/nio/file/Path;Ljava/util/Set<+Ljava/nio/file/OpenOption;>;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/channels/SeekableByteChannel;
  (Ljava/nio/file/Path;Ljava/util/Set<+Ljava/nio/file/OpenOption;>;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/channels/SeekableByteChannel;
@@ -63,13 +63,13 @@ newDirectoryStream
  (Ljava/nio/file/Path;Ljava/nio/file/DirectoryStream$Filter<-Ljava/nio/file/Path;>;)Ljava/nio/file/DirectoryStream<Ljava/nio/file/Path;>;
 newFileChannel
  (Ljava/nio/file/Path;Ljava/util/Set<+Ljava/nio/file/OpenOption;>;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/channels/FileChannel;
- (Ljava/nio/file/Path;Ljava/util/Set<+Ljava/nio/file/OpenOption;>;[Ljava/nio/file/attribute/FileAttribute<*>;)Ljava/nio/channels/FileChannel;
+ (Ljava/nio/file/Path;Ljava/util/Set<+Ljava/nio/file/OpenOption;>;[Ljava/nio/file/attribute/FileAttribute<*>;)L1java/nio/channels/FileChannel;
 newFileSystem
  (Ljava/net/URI;Ljava/util/Map<Ljava/lang/String;*>;)Ljava/nio/file/FileSystem;
  (Ljava/net/URI;Ljava/util/Map<Ljava/lang/String;*>;)Ljava/nio/file/FileSystem;
 newFileSystem
  (Ljava/nio/file/Path;Ljava/util/Map<Ljava/lang/String;*>;)Ljava/nio/file/FileSystem;
- (Ljava/nio/file/Path;Ljava/util/Map<Ljava/lang/String;*>;)Ljava/nio/file/FileSystem;
+ (Ljava/nio/file/Path;Ljava/util/Map<Ljava/lang/String;*>;)L1java/nio/file/FileSystem;
 newInputStream
  (Ljava/nio/file/Path;[Ljava/nio/file/OpenOption;)Ljava/io/InputStream;
  (Ljava/nio/file/Path;[Ljava/nio/file/OpenOption;)Ljava/io/InputStream;
@@ -84,10 +84,10 @@ readAttributes
  <A::Ljava/nio/file/attribute/BasicFileAttributes;>(Ljava/nio/file/Path;Ljava/lang/Class<TA;>;[Ljava/nio/file/LinkOption;)TA;
 readAttributesIfExists
  <A::Ljava/nio/file/attribute/BasicFileAttributes;>(Ljava/nio/file/Path;Ljava/lang/Class<TA;>;[Ljava/nio/file/LinkOption;)TA;
- <A::Ljava/nio/file/attribute/BasicFileAttributes;>(Ljava/nio/file/Path;Ljava/lang/Class<TA;>;[Ljava/nio/file/LinkOption;)TA;
+ <A::Ljava/nio/file/attribute/BasicFileAttributes;>(Ljava/nio/file/Path;Ljava/lang/Class<TA;>;[Ljava/nio/file/LinkOption;)T0A;
 readSymbolicLink
  (Ljava/nio/file/Path;)Ljava/nio/file/Path;
- (Ljava/nio/file/Path;)Ljava/nio/file/Path;
+ (Ljava/nio/file/Path;)L1java/nio/file/Path;
 setAttribute
  (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/Object;[Ljava/nio/file/LinkOption;)V
  (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/Object;[Ljava/nio/file/LinkOption;)V
diff --git a/libs/eea-java-21/src/main/resources/java/rmi/MarshalledObject.eea b/libs/eea-java-21/src/main/resources/java/rmi/MarshalledObject.eea
index 4cc4f828d4..db75ee3068 100644
--- a/libs/eea-java-21/src/main/resources/java/rmi/MarshalledObject.eea
+++ b/libs/eea-java-21/src/main/resources/java/rmi/MarshalledObject.eea
@@ -10,4 +10,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 get
  ()TT;
- ()TT;
+ ()T0T;
diff --git a/libs/eea-java-21/src/main/resources/java/rmi/registry/LocateRegistry.eea b/libs/eea-java-21/src/main/resources/java/rmi/registry/LocateRegistry.eea
index e70d3d198e..38450d435c 100644
--- a/libs/eea-java-21/src/main/resources/java/rmi/registry/LocateRegistry.eea
+++ b/libs/eea-java-21/src/main/resources/java/rmi/registry/LocateRegistry.eea
@@ -2,10 +2,10 @@ class java/rmi/registry/LocateRegistry
 
 createRegistry
  (I)Ljava/rmi/registry/Registry;
- (I)Ljava/rmi/registry/Registry;
+ (I)L1java/rmi/registry/Registry;
 createRegistry
  (ILjava/rmi/server/RMIClientSocketFactory;Ljava/rmi/server/RMIServerSocketFactory;)Ljava/rmi/registry/Registry;
- (ILjava/rmi/server/RMIClientSocketFactory;Ljava/rmi/server/RMIServerSocketFactory;)Ljava/rmi/registry/Registry;
+ (ILjava/rmi/server/RMIClientSocketFactory;Ljava/rmi/server/RMIServerSocketFactory;)L1java/rmi/registry/Registry;
 getRegistry
  ()Ljava/rmi/registry/Registry;
  ()Ljava/rmi/registry/Registry;
diff --git a/libs/eea-java-21/src/main/resources/java/rmi/server/LogStream.eea b/libs/eea-java-21/src/main/resources/java/rmi/server/LogStream.eea
index aee33be4eb..389cc10db4 100644
--- a/libs/eea-java-21/src/main/resources/java/rmi/server/LogStream.eea
+++ b/libs/eea-java-21/src/main/resources/java/rmi/server/LogStream.eea
@@ -5,7 +5,7 @@ getDefaultStream
  ()Ljava/io/PrintStream;
 log
  (Ljava/lang/String;)Ljava/rmi/server/LogStream;
- (Ljava/lang/String;)Ljava/rmi/server/LogStream;
+ (Ljava/lang/String;)L1java/rmi/server/LogStream;
 parseLevel
  (Ljava/lang/String;)I
  (Ljava/lang/String;)I
diff --git a/libs/eea-java-21/src/main/resources/java/rmi/server/ObjID.eea b/libs/eea-java-21/src/main/resources/java/rmi/server/ObjID.eea
index 37a7c46095..3eac44ce47 100644
--- a/libs/eea-java-21/src/main/resources/java/rmi/server/ObjID.eea
+++ b/libs/eea-java-21/src/main/resources/java/rmi/server/ObjID.eea
@@ -2,7 +2,7 @@ class java/rmi/server/ObjID
 
 read
  (Ljava/io/ObjectInput;)Ljava/rmi/server/ObjID;
- (Ljava/io/ObjectInput;)Ljava/rmi/server/ObjID;
+ (Ljava/io/ObjectInput;)L1java/rmi/server/ObjID;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/rmi/server/RMIClientSocketFactory.eea b/libs/eea-java-21/src/main/resources/java/rmi/server/RMIClientSocketFactory.eea
index b9e5e140b4..b825c98a8b 100644
--- a/libs/eea-java-21/src/main/resources/java/rmi/server/RMIClientSocketFactory.eea
+++ b/libs/eea-java-21/src/main/resources/java/rmi/server/RMIClientSocketFactory.eea
@@ -2,4 +2,4 @@ class java/rmi/server/RMIClientSocketFactory
 
 createSocket
  (Ljava/lang/String;I)Ljava/net/Socket;
- (Ljava/lang/String;I)Ljava/net/Socket;
+ (Ljava/lang/String;I)L1java/net/Socket;
diff --git a/libs/eea-java-21/src/main/resources/java/rmi/server/RMIServerSocketFactory.eea b/libs/eea-java-21/src/main/resources/java/rmi/server/RMIServerSocketFactory.eea
index b26406fbfd..6e702238c3 100644
--- a/libs/eea-java-21/src/main/resources/java/rmi/server/RMIServerSocketFactory.eea
+++ b/libs/eea-java-21/src/main/resources/java/rmi/server/RMIServerSocketFactory.eea
@@ -2,4 +2,4 @@ class java/rmi/server/RMIServerSocketFactory
 
 createServerSocket
  (I)Ljava/net/ServerSocket;
- (I)Ljava/net/ServerSocket;
+ (I)L1java/net/ServerSocket;
diff --git a/libs/eea-java-21/src/main/resources/java/rmi/server/RMISocketFactory.eea b/libs/eea-java-21/src/main/resources/java/rmi/server/RMISocketFactory.eea
index 1af6348b96..fcafc6408d 100644
--- a/libs/eea-java-21/src/main/resources/java/rmi/server/RMISocketFactory.eea
+++ b/libs/eea-java-21/src/main/resources/java/rmi/server/RMISocketFactory.eea
@@ -18,7 +18,7 @@ setSocketFactory
 
 createServerSocket
  (I)Ljava/net/ServerSocket;
- (I)Ljava/net/ServerSocket;
+ (I)L1java/net/ServerSocket; # @Inherited(java.rmi.server.RMIServerSocketFactory)
 createSocket
  (Ljava/lang/String;I)Ljava/net/Socket;
- (Ljava/lang/String;I)Ljava/net/Socket;
+ (Ljava/lang/String;I)L1java/net/Socket; # @Inherited(java.rmi.server.RMIClientSocketFactory)
diff --git a/libs/eea-java-21/src/main/resources/java/rmi/server/UID.eea b/libs/eea-java-21/src/main/resources/java/rmi/server/UID.eea
index c49fffc5f8..3d2dcaaacb 100644
--- a/libs/eea-java-21/src/main/resources/java/rmi/server/UID.eea
+++ b/libs/eea-java-21/src/main/resources/java/rmi/server/UID.eea
@@ -2,7 +2,7 @@ class java/rmi/server/UID
 
 read
  (Ljava/io/DataInput;)Ljava/rmi/server/UID;
- (Ljava/io/DataInput;)Ljava/rmi/server/UID;
+ (Ljava/io/DataInput;)L1java/rmi/server/UID;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/security/AccessController.eea b/libs/eea-java-21/src/main/resources/java/security/AccessController.eea
index 4f0133fa11..799f3f0129 100644
--- a/libs/eea-java-21/src/main/resources/java/security/AccessController.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/AccessController.eea
@@ -5,19 +5,19 @@ checkPermission
  (Ljava/security/Permission;)V
 doPrivileged
  <T:Ljava/lang/Object;>(Ljava/security/PrivilegedAction<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/security/PrivilegedAction<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/security/PrivilegedAction<TT;>;)T1T;
 doPrivileged
  <T:Ljava/lang/Object;>(Ljava/security/PrivilegedAction<TT;>;Ljava/security/AccessControlContext;)TT;
- <T:Ljava/lang/Object;>(Ljava/security/PrivilegedAction<TT;>;Ljava/security/AccessControlContext;)TT;
+ <T:Ljava/lang/Object;>(Ljava/security/PrivilegedAction<TT;>;Ljava/security/AccessControlContext;)T1T;
 doPrivileged
  <T:Ljava/lang/Object;>(Ljava/security/PrivilegedAction<TT;>;Ljava/security/AccessControlContext;[Ljava/security/Permission;)TT;
  <T:Ljava/lang/Object;>(Ljava/security/PrivilegedAction<TT;>;Ljava/security/AccessControlContext;[Ljava/security/Permission;)TT;
 doPrivileged
  <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;)T1T;
 doPrivileged
  <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;Ljava/security/AccessControlContext;)TT;
- <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;Ljava/security/AccessControlContext;)TT;
+ <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;Ljava/security/AccessControlContext;)T1T;
 doPrivileged
  <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;Ljava/security/AccessControlContext;[Ljava/security/Permission;)TT;
  <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;Ljava/security/AccessControlContext;[Ljava/security/Permission;)TT;
diff --git a/libs/eea-java-21/src/main/resources/java/security/CodeSource.eea b/libs/eea-java-21/src/main/resources/java/security/CodeSource.eea
index 60718c2edf..0f0ee8d4a7 100644
--- a/libs/eea-java-21/src/main/resources/java/security/CodeSource.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/CodeSource.eea
@@ -11,10 +11,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getCertificates
  ()[Ljava/security/cert/Certificate;
- ()[Ljava/security/cert/Certificate;
+ ()[0Ljava/security/cert/Certificate;
 getCodeSigners
  ()[Ljava/security/CodeSigner;
- ()[Ljava/security/CodeSigner;
+ ()[0Ljava/security/CodeSigner;
 getLocation
  ()Ljava/net/URL;
  ()Ljava/net/URL;
diff --git a/libs/eea-java-21/src/main/resources/java/security/DomainLoadStoreParameter.eea b/libs/eea-java-21/src/main/resources/java/security/DomainLoadStoreParameter.eea
index 0d426ae789..12a3f2f652 100644
--- a/libs/eea-java-21/src/main/resources/java/security/DomainLoadStoreParameter.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/DomainLoadStoreParameter.eea
@@ -8,7 +8,7 @@ getConfiguration
  ()Ljava/net/URI;
 getProtectionParameter
  ()Ljava/security/KeyStore$ProtectionParameter;
- ()Ljava/security/KeyStore$ProtectionParameter;
+ ()L0java/security/KeyStore$ProtectionParameter;
 getProtectionParams
  ()Ljava/util/Map<Ljava/lang/String;Ljava/security/KeyStore$ProtectionParameter;>;
  ()Ljava/util/Map<Ljava/lang/String;Ljava/security/KeyStore$ProtectionParameter;>;
diff --git a/libs/eea-java-21/src/main/resources/java/security/DrbgParameters.eea b/libs/eea-java-21/src/main/resources/java/security/DrbgParameters.eea
index ae2734e3f0..db4494e05f 100644
--- a/libs/eea-java-21/src/main/resources/java/security/DrbgParameters.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/DrbgParameters.eea
@@ -2,10 +2,10 @@ class java/security/DrbgParameters
 
 instantiation
  (ILjava/security/DrbgParameters$Capability;[B)Ljava/security/DrbgParameters$Instantiation;
- (ILjava/security/DrbgParameters$Capability;[B)Ljava/security/DrbgParameters$Instantiation;
+ (ILjava/security/DrbgParameters$Capability;[B)L1java/security/DrbgParameters$Instantiation;
 nextBytes
  (IZ[B)Ljava/security/DrbgParameters$NextBytes;
- (IZ[B)Ljava/security/DrbgParameters$NextBytes;
+ (IZ[B)L1java/security/DrbgParameters$NextBytes;
 reseed
  (Z[B)Ljava/security/DrbgParameters$Reseed;
- (Z[B)Ljava/security/DrbgParameters$Reseed;
+ (Z[B)L1java/security/DrbgParameters$Reseed;
diff --git a/libs/eea-java-21/src/main/resources/java/security/Identity.eea b/libs/eea-java-21/src/main/resources/java/security/Identity.eea
index 59713a3e1e..d03aa641fa 100644
--- a/libs/eea-java-21/src/main/resources/java/security/Identity.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/Identity.eea
@@ -11,7 +11,7 @@ addCertificate
  (Ljava/security/Certificate;)V
 certificates
  ()[Ljava/security/Certificate;
- ()[Ljava/security/Certificate;
+ ()[1Ljava/security/Certificate;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -44,4 +44,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toString
  (Z)Ljava/lang/String;
- (Z)Ljava/lang/String;
+ (Z)L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/java/security/KeyStore$Builder.eea b/libs/eea-java-21/src/main/resources/java/security/KeyStore$Builder.eea
index cf1a20e5e8..5bc87a68b6 100644
--- a/libs/eea-java-21/src/main/resources/java/security/KeyStore$Builder.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/KeyStore$Builder.eea
@@ -5,13 +5,13 @@ newInstance
  (Ljava/io/File;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Builder;
 newInstance
  (Ljava/lang/String;Ljava/security/Provider;Ljava/io/File;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Builder;
- (Ljava/lang/String;Ljava/security/Provider;Ljava/io/File;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Builder;
+ (Ljava/lang/String;Ljava/security/Provider;Ljava/io/File;Ljava/security/KeyStore$ProtectionParameter;)L1java/security/KeyStore$Builder;
 newInstance
  (Ljava/lang/String;Ljava/security/Provider;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Builder;
- (Ljava/lang/String;Ljava/security/Provider;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Builder;
+ (Ljava/lang/String;Ljava/security/Provider;Ljava/security/KeyStore$ProtectionParameter;)L1java/security/KeyStore$Builder;
 newInstance
  (Ljava/security/KeyStore;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Builder;
- (Ljava/security/KeyStore;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Builder;
+ (Ljava/security/KeyStore;Ljava/security/KeyStore$ProtectionParameter;)L1java/security/KeyStore$Builder;
 
 getKeyStore
  ()Ljava/security/KeyStore;
diff --git a/libs/eea-java-21/src/main/resources/java/security/KeyStoreSpi.eea b/libs/eea-java-21/src/main/resources/java/security/KeyStoreSpi.eea
index 5d1077714b..76027b2e92 100644
--- a/libs/eea-java-21/src/main/resources/java/security/KeyStoreSpi.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/KeyStoreSpi.eea
@@ -29,7 +29,7 @@ engineGetCreationDate
  (Ljava/lang/String;)Ljava/util/Date;
 engineGetEntry
  (Ljava/lang/String;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Entry;
- (Ljava/lang/String;Ljava/security/KeyStore$ProtectionParameter;)Ljava/security/KeyStore$Entry;
+ (Ljava/lang/String;Ljava/security/KeyStore$ProtectionParameter;)L0java/security/KeyStore$Entry;
 engineGetKey
  (Ljava/lang/String;[C)Ljava/security/Key;
  (Ljava/lang/String;[C)Ljava/security/Key;
diff --git a/libs/eea-java-21/src/main/resources/java/security/Permissions.eea b/libs/eea-java-21/src/main/resources/java/security/Permissions.eea
index cbe0395782..375680e40c 100644
--- a/libs/eea-java-21/src/main/resources/java/security/Permissions.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/Permissions.eea
@@ -5,7 +5,7 @@ add
  (Ljava/security/Permission;)V
 elements
  ()Ljava/util/Enumeration<Ljava/security/Permission;>;
- ()Ljava/util/Enumeration<Ljava/security/Permission;>;
+ ()L1java/util/Enumeration<Ljava/security/Permission;>;
 implies
  (Ljava/security/Permission;)Z
  (Ljava/security/Permission;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/security/Policy.eea b/libs/eea-java-21/src/main/resources/java/security/Policy.eea
index c4aae6ca79..8eaf60592f 100644
--- a/libs/eea-java-21/src/main/resources/java/security/Policy.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/Policy.eea
@@ -22,19 +22,19 @@ setPolicy
 
 getParameters
  ()Ljava/security/Policy$Parameters;
- ()Ljava/security/Policy$Parameters;
+ ()L0java/security/Policy$Parameters;
 getPermissions
  (Ljava/security/CodeSource;)Ljava/security/PermissionCollection;
  (Ljava/security/CodeSource;)Ljava/security/PermissionCollection;
 getPermissions
  (Ljava/security/ProtectionDomain;)Ljava/security/PermissionCollection;
- (Ljava/security/ProtectionDomain;)Ljava/security/PermissionCollection;
+ (Ljava/security/ProtectionDomain;)L1java/security/PermissionCollection;
 getProvider
  ()Ljava/security/Provider;
- ()Ljava/security/Provider;
+ ()L0java/security/Provider;
 getType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 implies
  (Ljava/security/ProtectionDomain;Ljava/security/Permission;)Z
  (Ljava/security/ProtectionDomain;Ljava/security/Permission;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/security/Provider.eea b/libs/eea-java-21/src/main/resources/java/security/Provider.eea
index c71de0867e..b0aad14c24 100644
--- a/libs/eea-java-21/src/main/resources/java/security/Provider.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/Provider.eea
@@ -17,7 +17,7 @@ computeIfPresent
  (Ljava/lang/Object;Ljava/util/function/BiFunction<-Ljava/lang/Object;-Ljava/lang/Object;+Ljava/lang/Object;>;)Ljava/lang/Object;
 configure
  (Ljava/lang/String;)Ljava/security/Provider;
- (Ljava/lang/String;)Ljava/security/Provider;
+ (Ljava/lang/String;)L1java/security/Provider;
 elements
  ()Ljava/util/Enumeration<Ljava/lang/Object;>;
  ()L1java/util/Enumeration<L1java/lang/Object;>; # @Inherited(java.util.Properties)
diff --git a/libs/eea-java-21/src/main/resources/java/security/SecureClassLoader.eea b/libs/eea-java-21/src/main/resources/java/security/SecureClassLoader.eea
index b0c532de6b..86ee4db83e 100644
--- a/libs/eea-java-21/src/main/resources/java/security/SecureClassLoader.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/SecureClassLoader.eea
@@ -14,4 +14,4 @@ defineClass
  (Ljava/lang/String;[BIILjava/security/CodeSource;)Ljava/lang/Class<*>;
 getPermissions
  (Ljava/security/CodeSource;)Ljava/security/PermissionCollection;
- (Ljava/security/CodeSource;)Ljava/security/PermissionCollection;
+ (Ljava/security/CodeSource;)L1java/security/PermissionCollection;
diff --git a/libs/eea-java-21/src/main/resources/java/security/SecureRandomSpi.eea b/libs/eea-java-21/src/main/resources/java/security/SecureRandomSpi.eea
index 684ac17c94..3ab73a8f4e 100644
--- a/libs/eea-java-21/src/main/resources/java/security/SecureRandomSpi.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/SecureRandomSpi.eea
@@ -8,7 +8,7 @@ engineGenerateSeed
  (I)[B
 engineGetParameters
  ()Ljava/security/SecureRandomParameters;
- ()Ljava/security/SecureRandomParameters;
+ ()L0java/security/SecureRandomParameters;
 engineNextBytes
  ([B)V
  ([B)V
diff --git a/libs/eea-java-21/src/main/resources/java/security/Security.eea b/libs/eea-java-21/src/main/resources/java/security/Security.eea
index 14b588ce68..e7cd2375e6 100644
--- a/libs/eea-java-21/src/main/resources/java/security/Security.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/Security.eea
@@ -5,7 +5,7 @@ addProvider
  (Ljava/security/Provider;)I
 getAlgorithmProperty
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L0java/lang/String;
 getAlgorithms
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
@@ -23,7 +23,7 @@ getProviders
  (Ljava/lang/String;)[Ljava/security/Provider;
 getProviders
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)[Ljava/security/Provider;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)[Ljava/security/Provider;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)[0Ljava/security/Provider;
 insertProviderAt
  (Ljava/security/Provider;I)I
  (Ljava/security/Provider;I)I
diff --git a/libs/eea-java-21/src/main/resources/java/security/SignatureSpi.eea b/libs/eea-java-21/src/main/resources/java/security/SignatureSpi.eea
index 10230a10ea..ed484886c2 100644
--- a/libs/eea-java-21/src/main/resources/java/security/SignatureSpi.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/SignatureSpi.eea
@@ -12,7 +12,7 @@ engineGetParameter
  (Ljava/lang/String;)Ljava/lang/Object;
 engineGetParameters
  ()Ljava/security/AlgorithmParameters;
- ()Ljava/security/AlgorithmParameters;
+ ()L1java/security/AlgorithmParameters;
 engineInitSign
  (Ljava/security/PrivateKey;)V
  (Ljava/security/PrivateKey;)V
diff --git a/libs/eea-java-21/src/main/resources/java/security/Timestamp.eea b/libs/eea-java-21/src/main/resources/java/security/Timestamp.eea
index 318973770e..1cb24dff41 100644
--- a/libs/eea-java-21/src/main/resources/java/security/Timestamp.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/Timestamp.eea
@@ -11,7 +11,7 @@ getSignerCertPath
  ()Ljava/security/cert/CertPath;
 getTimestamp
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L1java/util/Date;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/java/security/cert/CertPathBuilderSpi.eea b/libs/eea-java-21/src/main/resources/java/security/cert/CertPathBuilderSpi.eea
index d91c1c588f..79c06ad1b9 100644
--- a/libs/eea-java-21/src/main/resources/java/security/cert/CertPathBuilderSpi.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/cert/CertPathBuilderSpi.eea
@@ -5,4 +5,4 @@ engineBuild
  (Ljava/security/cert/CertPathParameters;)Ljava/security/cert/CertPathBuilderResult;
 engineGetRevocationChecker
  ()Ljava/security/cert/CertPathChecker;
- ()Ljava/security/cert/CertPathChecker;
+ ()L1java/security/cert/CertPathChecker;
diff --git a/libs/eea-java-21/src/main/resources/java/security/cert/CertPathValidatorSpi.eea b/libs/eea-java-21/src/main/resources/java/security/cert/CertPathValidatorSpi.eea
index f70189105e..bbb08d937f 100644
--- a/libs/eea-java-21/src/main/resources/java/security/cert/CertPathValidatorSpi.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/cert/CertPathValidatorSpi.eea
@@ -2,7 +2,7 @@ class java/security/cert/CertPathValidatorSpi
 
 engineGetRevocationChecker
  ()Ljava/security/cert/CertPathChecker;
- ()Ljava/security/cert/CertPathChecker;
+ ()L1java/security/cert/CertPathChecker;
 engineValidate
  (Ljava/security/cert/CertPath;Ljava/security/cert/CertPathParameters;)Ljava/security/cert/CertPathValidatorResult;
  (Ljava/security/cert/CertPath;Ljava/security/cert/CertPathParameters;)Ljava/security/cert/CertPathValidatorResult;
diff --git a/libs/eea-java-21/src/main/resources/java/security/cert/CertStore.eea b/libs/eea-java-21/src/main/resources/java/security/cert/CertStore.eea
index a0bc052276..b12f322e3a 100644
--- a/libs/eea-java-21/src/main/resources/java/security/cert/CertStore.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/cert/CertStore.eea
@@ -2,7 +2,7 @@ class java/security/cert/CertStore
 
 getDefaultType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getInstance
  (Ljava/lang/String;Ljava/security/cert/CertStoreParameters;)Ljava/security/cert/CertStore;
  (Ljava/lang/String;Ljava/security/cert/CertStoreParameters;)Ljava/security/cert/CertStore;
diff --git a/libs/eea-java-21/src/main/resources/java/security/cert/CertificateFactorySpi.eea b/libs/eea-java-21/src/main/resources/java/security/cert/CertificateFactorySpi.eea
index 1656ddbc73..c765e55344 100644
--- a/libs/eea-java-21/src/main/resources/java/security/cert/CertificateFactorySpi.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/cert/CertificateFactorySpi.eea
@@ -8,13 +8,13 @@ engineGenerateCRLs
  (Ljava/io/InputStream;)Ljava/util/Collection<+Ljava/security/cert/CRL;>;
 engineGenerateCertPath
  (Ljava/io/InputStream;)Ljava/security/cert/CertPath;
- (Ljava/io/InputStream;)Ljava/security/cert/CertPath;
+ (Ljava/io/InputStream;)L1java/security/cert/CertPath;
 engineGenerateCertPath
  (Ljava/io/InputStream;Ljava/lang/String;)Ljava/security/cert/CertPath;
- (Ljava/io/InputStream;Ljava/lang/String;)Ljava/security/cert/CertPath;
+ (Ljava/io/InputStream;Ljava/lang/String;)L1java/security/cert/CertPath;
 engineGenerateCertPath
  (Ljava/util/List<+Ljava/security/cert/Certificate;>;)Ljava/security/cert/CertPath;
- (Ljava/util/List<+Ljava/security/cert/Certificate;>;)Ljava/security/cert/CertPath;
+ (Ljava/util/List<+Ljava/security/cert/Certificate;>;)L1java/security/cert/CertPath;
 engineGenerateCertificate
  (Ljava/io/InputStream;)Ljava/security/cert/Certificate;
  (Ljava/io/InputStream;)Ljava/security/cert/Certificate;
@@ -23,4 +23,4 @@ engineGenerateCertificates
  (Ljava/io/InputStream;)Ljava/util/Collection<+Ljava/security/cert/Certificate;>;
 engineGetCertPathEncodings
  ()Ljava/util/Iterator<Ljava/lang/String;>;
- ()Ljava/util/Iterator<Ljava/lang/String;>;
+ ()L1java/util/Iterator<Ljava/lang/String;>;
diff --git a/libs/eea-java-21/src/main/resources/java/security/cert/CertificateRevokedException.eea b/libs/eea-java-21/src/main/resources/java/security/cert/CertificateRevokedException.eea
index 8a8156da90..9bec2fe121 100644
--- a/libs/eea-java-21/src/main/resources/java/security/cert/CertificateRevokedException.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/cert/CertificateRevokedException.eea
@@ -11,7 +11,7 @@ getExtensions
  ()Ljava/util/Map<Ljava/lang/String;Ljava/security/cert/Extension;>;
 getInvalidityDate
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L0java/util/Date;
 getMessage
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(java.lang.Throwable)
diff --git a/libs/eea-java-21/src/main/resources/java/security/cert/PKIXParameters.eea b/libs/eea-java-21/src/main/resources/java/security/cert/PKIXParameters.eea
index f86fbdd92b..0e6c12d30a 100644
--- a/libs/eea-java-21/src/main/resources/java/security/cert/PKIXParameters.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/cert/PKIXParameters.eea
@@ -23,7 +23,7 @@ getCertStores
  ()Ljava/util/List<Ljava/security/cert/CertStore;>;
 getDate
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L0java/util/Date;
 getInitialPolicies
  ()Ljava/util/Set<Ljava/lang/String;>;
  ()Ljava/util/Set<Ljava/lang/String;>;
@@ -32,7 +32,7 @@ getSigProvider
  ()Ljava/lang/String;
 getTargetCertConstraints
  ()Ljava/security/cert/CertSelector;
- ()Ljava/security/cert/CertSelector;
+ ()L0java/security/cert/CertSelector;
 getTrustAnchors
  ()Ljava/util/Set<Ljava/security/cert/TrustAnchor;>;
  ()Ljava/util/Set<Ljava/security/cert/TrustAnchor;>;
diff --git a/libs/eea-java-21/src/main/resources/java/security/cert/PKIXRevocationChecker.eea b/libs/eea-java-21/src/main/resources/java/security/cert/PKIXRevocationChecker.eea
index f5aa351552..21684f2051 100644
--- a/libs/eea-java-21/src/main/resources/java/security/cert/PKIXRevocationChecker.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/cert/PKIXRevocationChecker.eea
@@ -14,7 +14,7 @@ getOcspResponderCert
  ()Ljava/security/cert/X509Certificate;
 getOcspResponses
  ()Ljava/util/Map<Ljava/security/cert/X509Certificate;[B>;
- ()Ljava/util/Map<Ljava/security/cert/X509Certificate;[B>;
+ ()L1java/util/Map<Ljava/security/cert/X509Certificate;[B>;
 getOptions
  ()Ljava/util/Set<Ljava/security/cert/PKIXRevocationChecker$Option;>;
  ()Ljava/util/Set<Ljava/security/cert/PKIXRevocationChecker$Option;>;
diff --git a/libs/eea-java-21/src/main/resources/java/security/cert/URICertStoreParameters.eea b/libs/eea-java-21/src/main/resources/java/security/cert/URICertStoreParameters.eea
index 18999e8041..2c72cdc5c4 100644
--- a/libs/eea-java-21/src/main/resources/java/security/cert/URICertStoreParameters.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/cert/URICertStoreParameters.eea
@@ -5,7 +5,7 @@ class java/security/cert/URICertStoreParameters
  (Ljava/net/URI;)V
 clone
  ()Ljava/security/cert/URICertStoreParameters;
- ()Ljava/security/cert/URICertStoreParameters;
+ ()L1java/security/cert/URICertStoreParameters;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/java/security/cert/X509CRL.eea b/libs/eea-java-21/src/main/resources/java/security/cert/X509CRL.eea
index 1fd24153a7..269b4b10ef 100644
--- a/libs/eea-java-21/src/main/resources/java/security/cert/X509CRL.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/cert/X509CRL.eea
@@ -20,7 +20,7 @@ getRevokedCertificate
  (Ljava/math/BigInteger;)Ljava/security/cert/X509CRLEntry;
 getRevokedCertificate
  (Ljava/security/cert/X509Certificate;)Ljava/security/cert/X509CRLEntry;
- (Ljava/security/cert/X509Certificate;)Ljava/security/cert/X509CRLEntry;
+ (Ljava/security/cert/X509Certificate;)L0java/security/cert/X509CRLEntry;
 getRevokedCertificates
  ()Ljava/util/Set<+Ljava/security/cert/X509CRLEntry;>;
  ()Ljava/util/Set<+Ljava/security/cert/X509CRLEntry;>;
diff --git a/libs/eea-java-21/src/main/resources/java/security/cert/X509CRLEntry.eea b/libs/eea-java-21/src/main/resources/java/security/cert/X509CRLEntry.eea
index 4dcdd40744..cc7a3a2edc 100644
--- a/libs/eea-java-21/src/main/resources/java/security/cert/X509CRLEntry.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/cert/X509CRLEntry.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getCertificateIssuer
  ()Ljavax/security/auth/x500/X500Principal;
- ()Ljavax/security/auth/x500/X500Principal;
+ ()L0javax/security/auth/x500/X500Principal;
 getEncoded
  ()[B
  ()[B
@@ -14,7 +14,7 @@ getRevocationDate
  ()Ljava/util/Date;
 getRevocationReason
  ()Ljava/security/cert/CRLReason;
- ()Ljava/security/cert/CRLReason;
+ ()L0java/security/cert/CRLReason;
 getSerialNumber
  ()Ljava/math/BigInteger;
  ()Ljava/math/BigInteger;
diff --git a/libs/eea-java-21/src/main/resources/java/security/cert/X509CRLSelector.eea b/libs/eea-java-21/src/main/resources/java/security/cert/X509CRLSelector.eea
index b90efd4a6f..1a21985dc4 100644
--- a/libs/eea-java-21/src/main/resources/java/security/cert/X509CRLSelector.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/cert/X509CRLSelector.eea
@@ -17,13 +17,13 @@ getCertificateChecking
  ()Ljava/security/cert/X509Certificate;
 getDateAndTime
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L0java/util/Date;
 getIssuerNames
  ()Ljava/util/Collection<Ljava/lang/Object;>;
- ()Ljava/util/Collection<Ljava/lang/Object;>;
+ ()L0java/util/Collection<Ljava/lang/Object;>;
 getIssuers
  ()Ljava/util/Collection<Ljavax/security/auth/x500/X500Principal;>;
- ()Ljava/util/Collection<Ljavax/security/auth/x500/X500Principal;>;
+ ()L0java/util/Collection<Ljavax/security/auth/x500/X500Principal;>;
 getMaxCRL
  ()Ljava/math/BigInteger;
  ()Ljava/math/BigInteger;
diff --git a/libs/eea-java-21/src/main/resources/java/security/cert/X509CertSelector.eea b/libs/eea-java-21/src/main/resources/java/security/cert/X509CertSelector.eea
index 84ad24e969..5226bc7dd2 100644
--- a/libs/eea-java-21/src/main/resources/java/security/cert/X509CertSelector.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/cert/X509CertSelector.eea
@@ -17,13 +17,13 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 getAuthorityKeyIdentifier
  ()[B
- ()[B
+ ()[0B
 getCertificate
  ()Ljava/security/cert/X509Certificate;
  ()Ljava/security/cert/X509Certificate;
 getCertificateValid
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L0java/util/Date;
 getExtendedKeyUsage
  ()Ljava/util/Set<Ljava/lang/String;>;
  ()Ljava/util/Set<Ljava/lang/String;>;
@@ -38,19 +38,19 @@ getIssuerAsString
  ()Ljava/lang/String;
 getKeyUsage
  ()[Z
- ()[Z
+ ()[0Z
 getNameConstraints
  ()[B
- ()[B
+ ()[0B
 getPathToNames
  ()Ljava/util/Collection<Ljava/util/List<*>;>;
- ()Ljava/util/Collection<Ljava/util/List<*>;>;
+ ()L0java/util/Collection<Ljava/util/List<*>;>;
 getPolicy
  ()Ljava/util/Set<Ljava/lang/String;>;
  ()Ljava/util/Set<Ljava/lang/String;>;
 getPrivateKeyValid
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L0java/util/Date;
 getSerialNumber
  ()Ljava/math/BigInteger;
  ()Ljava/math/BigInteger;
@@ -59,7 +59,7 @@ getSubject
  ()Ljavax/security/auth/x500/X500Principal;
 getSubjectAlternativeNames
  ()Ljava/util/Collection<Ljava/util/List<*>;>;
- ()Ljava/util/Collection<Ljava/util/List<*>;>;
+ ()L0java/util/Collection<Ljava/util/List<*>;>;
 getSubjectAsBytes
  ()[B
  ()[B
@@ -68,13 +68,13 @@ getSubjectAsString
  ()Ljava/lang/String;
 getSubjectKeyIdentifier
  ()[B
- ()[B
+ ()[0B
 getSubjectPublicKey
  ()Ljava/security/PublicKey;
  ()Ljava/security/PublicKey;
 getSubjectPublicKeyAlgID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 match
  (Ljava/security/cert/Certificate;)Z
  (Ljava/security/cert/Certificate;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/security/interfaces/RSAKey.eea b/libs/eea-java-21/src/main/resources/java/security/interfaces/RSAKey.eea
index 1c5af2c06f..315113ee92 100644
--- a/libs/eea-java-21/src/main/resources/java/security/interfaces/RSAKey.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/interfaces/RSAKey.eea
@@ -5,4 +5,4 @@ getModulus
  ()Ljava/math/BigInteger;
 getParams
  ()Ljava/security/spec/AlgorithmParameterSpec;
- ()Ljava/security/spec/AlgorithmParameterSpec;
+ ()L0java/security/spec/AlgorithmParameterSpec;
diff --git a/libs/eea-java-21/src/main/resources/java/security/spec/ECFieldF2m.eea b/libs/eea-java-21/src/main/resources/java/security/spec/ECFieldF2m.eea
index 57805fcc69..15b9a8a6de 100644
--- a/libs/eea-java-21/src/main/resources/java/security/spec/ECFieldF2m.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/spec/ECFieldF2m.eea
@@ -11,7 +11,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getMidTermsOfReductionPolynomial
  ()[I
- ()[I
+ ()[0I
 getReductionPolynomial
  ()Ljava/math/BigInteger;
  ()Ljava/math/BigInteger;
diff --git a/libs/eea-java-21/src/main/resources/java/security/spec/EllipticCurve.eea b/libs/eea-java-21/src/main/resources/java/security/spec/EllipticCurve.eea
index dce676208d..eb4facee83 100644
--- a/libs/eea-java-21/src/main/resources/java/security/spec/EllipticCurve.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/spec/EllipticCurve.eea
@@ -20,4 +20,4 @@ getField
  ()Ljava/security/spec/ECField;
 getSeed
  ()[B
- ()[B
+ ()[0B
diff --git a/libs/eea-java-21/src/main/resources/java/security/spec/PKCS8EncodedKeySpec.eea b/libs/eea-java-21/src/main/resources/java/security/spec/PKCS8EncodedKeySpec.eea
index 66dda9eba6..78980c657b 100644
--- a/libs/eea-java-21/src/main/resources/java/security/spec/PKCS8EncodedKeySpec.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/spec/PKCS8EncodedKeySpec.eea
@@ -11,4 +11,4 @@ getEncoded
  ()[B
 getFormat
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.eea b/libs/eea-java-21/src/main/resources/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.eea
index e58064e6d3..94da7d4b87 100644
--- a/libs/eea-java-21/src/main/resources/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.eea
@@ -11,7 +11,7 @@ getCrtCoefficient
  ()Ljava/math/BigInteger;
 getOtherPrimeInfo
  ()[Ljava/security/spec/RSAOtherPrimeInfo;
- ()[Ljava/security/spec/RSAOtherPrimeInfo;
+ ()[0Ljava/security/spec/RSAOtherPrimeInfo;
 getPrimeExponentP
  ()Ljava/math/BigInteger;
  ()Ljava/math/BigInteger;
diff --git a/libs/eea-java-21/src/main/resources/java/security/spec/X509EncodedKeySpec.eea b/libs/eea-java-21/src/main/resources/java/security/spec/X509EncodedKeySpec.eea
index 3b812927c4..927518d19d 100644
--- a/libs/eea-java-21/src/main/resources/java/security/spec/X509EncodedKeySpec.eea
+++ b/libs/eea-java-21/src/main/resources/java/security/spec/X509EncodedKeySpec.eea
@@ -11,4 +11,4 @@ getEncoded
  ()[B
 getFormat
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/java/sql/Connection.eea b/libs/eea-java-21/src/main/resources/java/sql/Connection.eea
index 1c96decc0f..35e3dcc29a 100644
--- a/libs/eea-java-21/src/main/resources/java/sql/Connection.eea
+++ b/libs/eea-java-21/src/main/resources/java/sql/Connection.eea
@@ -5,31 +5,31 @@ abort
  (Ljava/util/concurrent/Executor;)V
 createArrayOf
  (Ljava/lang/String;[Ljava/lang/Object;)Ljava/sql/Array;
- (Ljava/lang/String;[Ljava/lang/Object;)Ljava/sql/Array;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1java/sql/Array;
 createBlob
  ()Ljava/sql/Blob;
- ()Ljava/sql/Blob;
+ ()L1java/sql/Blob;
 createClob
  ()Ljava/sql/Clob;
- ()Ljava/sql/Clob;
+ ()L1java/sql/Clob;
 createNClob
  ()Ljava/sql/NClob;
- ()Ljava/sql/NClob;
+ ()L1java/sql/NClob;
 createSQLXML
  ()Ljava/sql/SQLXML;
- ()Ljava/sql/SQLXML;
+ ()L1java/sql/SQLXML;
 createStatement
  ()Ljava/sql/Statement;
- ()Ljava/sql/Statement;
+ ()L1java/sql/Statement;
 createStatement
  (II)Ljava/sql/Statement;
- (II)Ljava/sql/Statement;
+ (II)L1java/sql/Statement;
 createStatement
  (III)Ljava/sql/Statement;
- (III)Ljava/sql/Statement;
+ (III)L1java/sql/Statement;
 createStruct
  (Ljava/lang/String;[Ljava/lang/Object;)Ljava/sql/Struct;
- (Ljava/lang/String;[Ljava/lang/Object;)Ljava/sql/Struct;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1java/sql/Struct;
 getCatalog
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/java/sql/JDBCType.eea b/libs/eea-java-21/src/main/resources/java/sql/JDBCType.eea
index 1c2fd70909..024a70f9fc 100644
--- a/libs/eea-java-21/src/main/resources/java/sql/JDBCType.eea
+++ b/libs/eea-java-21/src/main/resources/java/sql/JDBCType.eea
@@ -13,7 +13,7 @@ getName
  ()Ljava/lang/String;
 getVendor
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getVendorTypeNumber
  ()Ljava/lang/Integer;
  ()Ljava/lang/Integer;
diff --git a/libs/eea-java-21/src/main/resources/java/sql/SQLException.eea b/libs/eea-java-21/src/main/resources/java/sql/SQLException.eea
index 7f26b22799..b19860c2cd 100644
--- a/libs/eea-java-21/src/main/resources/java/sql/SQLException.eea
+++ b/libs/eea-java-21/src/main/resources/java/sql/SQLException.eea
@@ -33,7 +33,7 @@ getSQLState
  ()Ljava/lang/String;
 iterator
  ()Ljava/util/Iterator<Ljava/lang/Throwable;>;
- ()Ljava/util/Iterator<Ljava/lang/Throwable;>;
+ ()L1java/util/Iterator<Ljava/lang/Throwable;>;
 setNextException
  (Ljava/sql/SQLException;)V
  (Ljava/sql/SQLException;)V
diff --git a/libs/eea-java-21/src/main/resources/java/sql/SQLInput.eea b/libs/eea-java-21/src/main/resources/java/sql/SQLInput.eea
index 8419254679..e61c166ed3 100644
--- a/libs/eea-java-21/src/main/resources/java/sql/SQLInput.eea
+++ b/libs/eea-java-21/src/main/resources/java/sql/SQLInput.eea
@@ -38,7 +38,7 @@ readObject
  ()L1java/lang/Object;
 readObject
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)T1T;
 readRef
  ()Ljava/sql/Ref;
  ()Ljava/sql/Ref;
diff --git a/libs/eea-java-21/src/main/resources/java/sql/Statement.eea b/libs/eea-java-21/src/main/resources/java/sql/Statement.eea
index 5ff613b2ec..602d7d1e5e 100644
--- a/libs/eea-java-21/src/main/resources/java/sql/Statement.eea
+++ b/libs/eea-java-21/src/main/resources/java/sql/Statement.eea
@@ -8,10 +8,10 @@ enquoteIdentifier
  (Ljava/lang/String;Z)Ljava/lang/String;
 enquoteLiteral
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 enquoteNCharLiteral
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 execute
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
@@ -29,7 +29,7 @@ executeBatch
  ()[I
 executeLargeBatch
  ()[J
- ()[J
+ ()[1J
 executeLargeUpdate
  (Ljava/lang/String;)J
  (Ljava/lang/String;)J
diff --git a/libs/eea-java-21/src/main/resources/java/sql/Time.eea b/libs/eea-java-21/src/main/resources/java/sql/Time.eea
index c42bf92262..f998c424d4 100644
--- a/libs/eea-java-21/src/main/resources/java/sql/Time.eea
+++ b/libs/eea-java-21/src/main/resources/java/sql/Time.eea
@@ -2,10 +2,10 @@ class java/sql/Time
 
 valueOf
  (Ljava/lang/String;)Ljava/sql/Time;
- (Ljava/lang/String;)Ljava/sql/Time;
+ (Ljava/lang/String;)L1java/sql/Time;
 valueOf
  (Ljava/time/LocalTime;)Ljava/sql/Time;
- (Ljava/time/LocalTime;)Ljava/sql/Time;
+ (Ljava/time/LocalTime;)L1java/sql/Time;
 
 toInstant
  ()Ljava/time/Instant;
diff --git a/libs/eea-java-21/src/main/resources/java/text/AttributedString.eea b/libs/eea-java-21/src/main/resources/java/text/AttributedString.eea
index 2ddcdddf34..8821d714df 100644
--- a/libs/eea-java-21/src/main/resources/java/text/AttributedString.eea
+++ b/libs/eea-java-21/src/main/resources/java/text/AttributedString.eea
@@ -32,4 +32,4 @@ getIterator
  ([Ljava/text/AttributedCharacterIterator$Attribute;)Ljava/text/AttributedCharacterIterator;
 getIterator
  ([Ljava/text/AttributedCharacterIterator$Attribute;II)Ljava/text/AttributedCharacterIterator;
- ([Ljava/text/AttributedCharacterIterator$Attribute;II)Ljava/text/AttributedCharacterIterator;
+ ([Ljava/text/AttributedCharacterIterator$Attribute;II)L1java/text/AttributedCharacterIterator;
diff --git a/libs/eea-java-21/src/main/resources/java/text/Bidi.eea b/libs/eea-java-21/src/main/resources/java/text/Bidi.eea
index 957a28160f..d2259793c7 100644
--- a/libs/eea-java-21/src/main/resources/java/text/Bidi.eea
+++ b/libs/eea-java-21/src/main/resources/java/text/Bidi.eea
@@ -18,7 +18,7 @@ requiresBidi
  ([CI[BIII)V
 createLineBidi
  (II)Ljava/text/Bidi;
- (II)Ljava/text/Bidi;
+ (II)L1java/text/Bidi;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/java/text/ChoiceFormat.eea b/libs/eea-java-21/src/main/resources/java/text/ChoiceFormat.eea
index 33f252c86c..5a126e0153 100644
--- a/libs/eea-java-21/src/main/resources/java/text/ChoiceFormat.eea
+++ b/libs/eea-java-21/src/main/resources/java/text/ChoiceFormat.eea
@@ -35,4 +35,4 @@ setChoices
  ([D[Ljava/lang/String;)V
 toPattern
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/java/text/DecimalFormat.eea b/libs/eea-java-21/src/main/resources/java/text/DecimalFormat.eea
index 8b3d27b630..37b03b405c 100644
--- a/libs/eea-java-21/src/main/resources/java/text/DecimalFormat.eea
+++ b/libs/eea-java-21/src/main/resources/java/text/DecimalFormat.eea
@@ -35,7 +35,7 @@ getCurrency
  ()L0java/util/Currency; # @Inherited(java.text.NumberFormat)
 getDecimalFormatSymbols
  ()Ljava/text/DecimalFormatSymbols;
- ()Ljava/text/DecimalFormatSymbols;
+ ()L0java/text/DecimalFormatSymbols;
 getNegativePrefix
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/java/text/MessageFormat.eea b/libs/eea-java-21/src/main/resources/java/text/MessageFormat.eea
index 2b0f32bee3..5f63a9cf62 100644
--- a/libs/eea-java-21/src/main/resources/java/text/MessageFormat.eea
+++ b/libs/eea-java-21/src/main/resources/java/text/MessageFormat.eea
@@ -42,7 +42,7 @@ parse
  (Ljava/lang/String;)[Ljava/lang/Object;
 parse
  (Ljava/lang/String;Ljava/text/ParsePosition;)[Ljava/lang/Object;
- (Ljava/lang/String;Ljava/text/ParsePosition;)[Ljava/lang/Object;
+ (Ljava/lang/String;Ljava/text/ParsePosition;)[0Ljava/lang/Object;
 parseObject
  (Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/lang/Object;
  (L1java/lang/String;L1java/text/ParsePosition;)L0java/lang/Object; # @Inherited(java.text.Format)
diff --git a/libs/eea-java-21/src/main/resources/java/text/RuleBasedCollator.eea b/libs/eea-java-21/src/main/resources/java/text/RuleBasedCollator.eea
index bf9ecaccf2..a5357752a0 100644
--- a/libs/eea-java-21/src/main/resources/java/text/RuleBasedCollator.eea
+++ b/libs/eea-java-21/src/main/resources/java/text/RuleBasedCollator.eea
@@ -14,10 +14,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.text.Collator)
 getCollationElementIterator
  (Ljava/lang/String;)Ljava/text/CollationElementIterator;
- (Ljava/lang/String;)Ljava/text/CollationElementIterator;
+ (Ljava/lang/String;)L1java/text/CollationElementIterator;
 getCollationElementIterator
  (Ljava/text/CharacterIterator;)Ljava/text/CollationElementIterator;
- (Ljava/text/CharacterIterator;)Ljava/text/CollationElementIterator;
+ (Ljava/text/CharacterIterator;)L1java/text/CollationElementIterator;
 getCollationKey
  (Ljava/lang/String;)Ljava/text/CollationKey;
  (L0java/lang/String;)L0java/text/CollationKey; # @Inherited(java.text.Collator)
diff --git a/libs/eea-java-21/src/main/resources/java/text/SimpleDateFormat.eea b/libs/eea-java-21/src/main/resources/java/text/SimpleDateFormat.eea
index 3207e33a56..ba6af320bf 100644
--- a/libs/eea-java-21/src/main/resources/java/text/SimpleDateFormat.eea
+++ b/libs/eea-java-21/src/main/resources/java/text/SimpleDateFormat.eea
@@ -35,7 +35,7 @@ getDateFormatSymbols
  ()Ljava/text/DateFormatSymbols;
 parse
  (Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/util/Date;
- (Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/util/Date;
+ (Ljava/lang/String;Ljava/text/ParsePosition;)L0java/util/Date;
 set2DigitYearStart
  (Ljava/util/Date;)V
  (Ljava/util/Date;)V
diff --git a/libs/eea-java-21/src/main/resources/java/text/spi/NumberFormatProvider.eea b/libs/eea-java-21/src/main/resources/java/text/spi/NumberFormatProvider.eea
index 6ec0687d51..4b153f14c6 100644
--- a/libs/eea-java-21/src/main/resources/java/text/spi/NumberFormatProvider.eea
+++ b/libs/eea-java-21/src/main/resources/java/text/spi/NumberFormatProvider.eea
@@ -2,7 +2,7 @@ class java/text/spi/NumberFormatProvider
 
 getCompactNumberInstance
  (Ljava/util/Locale;Ljava/text/NumberFormat$Style;)Ljava/text/NumberFormat;
- (Ljava/util/Locale;Ljava/text/NumberFormat$Style;)Ljava/text/NumberFormat;
+ (Ljava/util/Locale;Ljava/text/NumberFormat$Style;)L1java/text/NumberFormat;
 getCurrencyInstance
  (Ljava/util/Locale;)Ljava/text/NumberFormat;
  (L1java/util/Locale;)L1java/text/NumberFormat;
diff --git a/libs/eea-java-21/src/main/resources/java/time/Clock.eea b/libs/eea-java-21/src/main/resources/java/time/Clock.eea
index a5b72115ce..400c6f0055 100644
--- a/libs/eea-java-21/src/main/resources/java/time/Clock.eea
+++ b/libs/eea-java-21/src/main/resources/java/time/Clock.eea
@@ -2,7 +2,7 @@ class java/time/Clock
 
 fixed
  (Ljava/time/Instant;Ljava/time/ZoneId;)Ljava/time/Clock;
- (Ljava/time/Instant;Ljava/time/ZoneId;)Ljava/time/Clock;
+ (Ljava/time/Instant;Ljava/time/ZoneId;)L1java/time/Clock;
 offset
  (Ljava/time/Clock;Ljava/time/Duration;)Ljava/time/Clock;
  (Ljava/time/Clock;Ljava/time/Duration;)Ljava/time/Clock;
@@ -11,7 +11,7 @@ system
  (Ljava/time/ZoneId;)Ljava/time/Clock;
 systemDefaultZone
  ()Ljava/time/Clock;
- ()Ljava/time/Clock;
+ ()L1java/time/Clock;
 systemUTC
  ()Ljava/time/Clock;
  ()Ljava/time/Clock;
@@ -20,13 +20,13 @@ tick
  (Ljava/time/Clock;Ljava/time/Duration;)Ljava/time/Clock;
 tickMillis
  (Ljava/time/ZoneId;)Ljava/time/Clock;
- (Ljava/time/ZoneId;)Ljava/time/Clock;
+ (Ljava/time/ZoneId;)L1java/time/Clock;
 tickMinutes
  (Ljava/time/ZoneId;)Ljava/time/Clock;
- (Ljava/time/ZoneId;)Ljava/time/Clock;
+ (Ljava/time/ZoneId;)L1java/time/Clock;
 tickSeconds
  (Ljava/time/ZoneId;)Ljava/time/Clock;
- (Ljava/time/ZoneId;)Ljava/time/Clock;
+ (Ljava/time/ZoneId;)L1java/time/Clock;
 
 equals
  (Ljava/lang/Object;)Z
@@ -39,4 +39,4 @@ instant
  ()Ljava/time/Instant;
 withZone
  (Ljava/time/ZoneId;)Ljava/time/Clock;
- (Ljava/time/ZoneId;)Ljava/time/Clock;
+ (Ljava/time/ZoneId;)L1java/time/Clock; # @Inherited(java.time.InstantSource)
diff --git a/libs/eea-java-21/src/main/resources/java/time/InstantSource.eea b/libs/eea-java-21/src/main/resources/java/time/InstantSource.eea
index d6ac67c235..bf69e01349 100644
--- a/libs/eea-java-21/src/main/resources/java/time/InstantSource.eea
+++ b/libs/eea-java-21/src/main/resources/java/time/InstantSource.eea
@@ -18,4 +18,4 @@ instant
  ()Ljava/time/Instant;
 withZone
  (Ljava/time/ZoneId;)Ljava/time/Clock;
- (Ljava/time/ZoneId;)Ljava/time/Clock;
+ (Ljava/time/ZoneId;)L1java/time/Clock;
diff --git a/libs/eea-java-21/src/main/resources/java/time/MonthDay.eea b/libs/eea-java-21/src/main/resources/java/time/MonthDay.eea
index f193409527..7e641c24c7 100644
--- a/libs/eea-java-21/src/main/resources/java/time/MonthDay.eea
+++ b/libs/eea-java-21/src/main/resources/java/time/MonthDay.eea
@@ -21,7 +21,7 @@ of
  (II)Ljava/time/MonthDay;
 of
  (Ljava/time/Month;I)Ljava/time/MonthDay;
- (Ljava/time/Month;I)Ljava/time/MonthDay;
+ (Ljava/time/Month;I)L1java/time/MonthDay;
 parse
  (Ljava/lang/CharSequence;)Ljava/time/MonthDay;
  (Ljava/lang/CharSequence;)Ljava/time/MonthDay;
diff --git a/libs/eea-java-21/src/main/resources/java/time/OffsetTime.eea b/libs/eea-java-21/src/main/resources/java/time/OffsetTime.eea
index 5e5eca45ee..ddb59c3553 100644
--- a/libs/eea-java-21/src/main/resources/java/time/OffsetTime.eea
+++ b/libs/eea-java-21/src/main/resources/java/time/OffsetTime.eea
@@ -25,13 +25,13 @@ now
  (Ljava/time/ZoneId;)Ljava/time/OffsetTime;
 of
  (IIIILjava/time/ZoneOffset;)Ljava/time/OffsetTime;
- (IIIILjava/time/ZoneOffset;)Ljava/time/OffsetTime;
+ (IIIILjava/time/ZoneOffset;)L1java/time/OffsetTime;
 of
  (Ljava/time/LocalTime;Ljava/time/ZoneOffset;)Ljava/time/OffsetTime;
- (Ljava/time/LocalTime;Ljava/time/ZoneOffset;)Ljava/time/OffsetTime;
+ (Ljava/time/LocalTime;Ljava/time/ZoneOffset;)L1java/time/OffsetTime;
 ofInstant
  (Ljava/time/Instant;Ljava/time/ZoneId;)Ljava/time/OffsetTime;
- (Ljava/time/Instant;Ljava/time/ZoneId;)Ljava/time/OffsetTime;
+ (Ljava/time/Instant;Ljava/time/ZoneId;)L1java/time/OffsetTime;
 parse
  (Ljava/lang/CharSequence;)Ljava/time/OffsetTime;
  (Ljava/lang/CharSequence;)Ljava/time/OffsetTime;
@@ -155,7 +155,7 @@ withOffsetSameInstant
  (Ljava/time/ZoneOffset;)Ljava/time/OffsetTime;
 withOffsetSameLocal
  (Ljava/time/ZoneOffset;)Ljava/time/OffsetTime;
- (Ljava/time/ZoneOffset;)Ljava/time/OffsetTime;
+ (Ljava/time/ZoneOffset;)L1java/time/OffsetTime;
 withSecond
  (I)Ljava/time/OffsetTime;
  (I)Ljava/time/OffsetTime;
diff --git a/libs/eea-java-21/src/main/resources/java/time/Year.eea b/libs/eea-java-21/src/main/resources/java/time/Year.eea
index 7eaa87a09f..2268b92d3d 100644
--- a/libs/eea-java-21/src/main/resources/java/time/Year.eea
+++ b/libs/eea-java-21/src/main/resources/java/time/Year.eea
@@ -18,7 +18,7 @@ now
  (Ljava/time/ZoneId;)Ljava/time/Year;
 of
  (I)Ljava/time/Year;
- (I)Ljava/time/Year;
+ (I)L1java/time/Year;
 parse
  (Ljava/lang/CharSequence;)Ljava/time/Year;
  (Ljava/lang/CharSequence;)Ljava/time/Year;
diff --git a/libs/eea-java-21/src/main/resources/java/time/YearMonth.eea b/libs/eea-java-21/src/main/resources/java/time/YearMonth.eea
index 8efc62435b..d817e6089f 100644
--- a/libs/eea-java-21/src/main/resources/java/time/YearMonth.eea
+++ b/libs/eea-java-21/src/main/resources/java/time/YearMonth.eea
@@ -18,7 +18,7 @@ now
  (Ljava/time/ZoneId;)Ljava/time/YearMonth;
 of
  (II)Ljava/time/YearMonth;
- (II)Ljava/time/YearMonth;
+ (II)L1java/time/YearMonth;
 of
  (ILjava/time/Month;)Ljava/time/YearMonth;
  (ILjava/time/Month;)Ljava/time/YearMonth;
diff --git a/libs/eea-java-21/src/main/resources/java/time/chrono/AbstractChronology.eea b/libs/eea-java-21/src/main/resources/java/time/chrono/AbstractChronology.eea
index 8c3b7a42d4..32687c5e72 100644
--- a/libs/eea-java-21/src/main/resources/java/time/chrono/AbstractChronology.eea
+++ b/libs/eea-java-21/src/main/resources/java/time/chrono/AbstractChronology.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 resolveDate
  (Ljava/util/Map<Ljava/time/temporal/TemporalField;Ljava/lang/Long;>;Ljava/time/format/ResolverStyle;)Ljava/time/chrono/ChronoLocalDate;
- (Ljava/util/Map<Ljava/time/temporal/TemporalField;Ljava/lang/Long;>;Ljava/time/format/ResolverStyle;)Ljava/time/chrono/ChronoLocalDate;
+ (Ljava/util/Map<Ljava/time/temporal/TemporalField;Ljava/lang/Long;>;Ljava/time/format/ResolverStyle;)L0java/time/chrono/ChronoLocalDate;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/java/time/chrono/Chronology.eea b/libs/eea-java-21/src/main/resources/java/time/chrono/Chronology.eea
index 2db0546904..73fae0ce02 100644
--- a/libs/eea-java-21/src/main/resources/java/time/chrono/Chronology.eea
+++ b/libs/eea-java-21/src/main/resources/java/time/chrono/Chronology.eea
@@ -76,7 +76,7 @@ localDateTime
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoLocalDateTime<+Ljava/time/chrono/ChronoLocalDate;>;
 period
  (III)Ljava/time/chrono/ChronoPeriod;
- (III)Ljava/time/chrono/ChronoPeriod;
+ (III)L1java/time/chrono/ChronoPeriod;
 prolepticYear
  (Ljava/time/chrono/Era;I)I
  (Ljava/time/chrono/Era;I)I
diff --git a/libs/eea-java-21/src/main/resources/java/time/chrono/IsoChronology.eea b/libs/eea-java-21/src/main/resources/java/time/chrono/IsoChronology.eea
index ad07a2dbd0..905f7260a5 100644
--- a/libs/eea-java-21/src/main/resources/java/time/chrono/IsoChronology.eea
+++ b/libs/eea-java-21/src/main/resources/java/time/chrono/IsoChronology.eea
@@ -42,10 +42,10 @@ eras
  ()Ljava/util/List<Ljava/time/chrono/Era;>;
 getCalendarType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 localDateTime
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/LocalDateTime;
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/LocalDateTime;
diff --git a/libs/eea-java-21/src/main/resources/java/time/chrono/JapaneseChronology.eea b/libs/eea-java-21/src/main/resources/java/time/chrono/JapaneseChronology.eea
index 3b3b53fbe0..ff304f1930 100644
--- a/libs/eea-java-21/src/main/resources/java/time/chrono/JapaneseChronology.eea
+++ b/libs/eea-java-21/src/main/resources/java/time/chrono/JapaneseChronology.eea
@@ -6,7 +6,7 @@ INSTANCE
 
 date
  (III)Ljava/time/chrono/JapaneseDate;
- (III)Ljava/time/chrono/JapaneseDate;
+ (III)L1java/time/chrono/JapaneseDate;
 date
  (Ljava/time/chrono/Era;III)Ljava/time/chrono/JapaneseDate;
  (Ljava/time/chrono/Era;III)Ljava/time/chrono/JapaneseDate;
@@ -15,7 +15,7 @@ date
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/JapaneseDate;
 dateEpochDay
  (J)Ljava/time/chrono/JapaneseDate;
- (J)Ljava/time/chrono/JapaneseDate;
+ (J)L1java/time/chrono/JapaneseDate;
 dateNow
  ()Ljava/time/chrono/JapaneseDate;
  ()Ljava/time/chrono/JapaneseDate;
@@ -27,7 +27,7 @@ dateNow
  (Ljava/time/ZoneId;)Ljava/time/chrono/JapaneseDate;
 dateYearDay
  (II)Ljava/time/chrono/JapaneseDate;
- (II)Ljava/time/chrono/JapaneseDate;
+ (II)L1java/time/chrono/JapaneseDate;
 dateYearDay
  (Ljava/time/chrono/Era;II)Ljava/time/chrono/JapaneseDate;
  (Ljava/time/chrono/Era;II)Ljava/time/chrono/JapaneseDate;
@@ -39,10 +39,10 @@ eras
  ()Ljava/util/List<Ljava/time/chrono/Era;>;
 getCalendarType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 localDateTime
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoLocalDateTime<Ljava/time/chrono/JapaneseDate;>;
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoLocalDateTime<Ljava/time/chrono/JapaneseDate;>;
diff --git a/libs/eea-java-21/src/main/resources/java/time/chrono/JapaneseDate.eea b/libs/eea-java-21/src/main/resources/java/time/chrono/JapaneseDate.eea
index 4c66b80baf..4a43f031b1 100644
--- a/libs/eea-java-21/src/main/resources/java/time/chrono/JapaneseDate.eea
+++ b/libs/eea-java-21/src/main/resources/java/time/chrono/JapaneseDate.eea
@@ -12,16 +12,16 @@ now
  ()Ljava/time/chrono/JapaneseDate;
 now
  (Ljava/time/Clock;)Ljava/time/chrono/JapaneseDate;
- (Ljava/time/Clock;)Ljava/time/chrono/JapaneseDate;
+ (Ljava/time/Clock;)L1java/time/chrono/JapaneseDate;
 now
  (Ljava/time/ZoneId;)Ljava/time/chrono/JapaneseDate;
  (Ljava/time/ZoneId;)Ljava/time/chrono/JapaneseDate;
 of
  (III)Ljava/time/chrono/JapaneseDate;
- (III)Ljava/time/chrono/JapaneseDate;
+ (III)L1java/time/chrono/JapaneseDate;
 of
  (Ljava/time/chrono/JapaneseEra;III)Ljava/time/chrono/JapaneseDate;
- (Ljava/time/chrono/JapaneseEra;III)Ljava/time/chrono/JapaneseDate;
+ (Ljava/time/chrono/JapaneseEra;III)L1java/time/chrono/JapaneseDate;
 
 atTime
  (Ljava/time/LocalTime;)Ljava/time/chrono/ChronoLocalDateTime<Ljava/time/chrono/JapaneseDate;>;
diff --git a/libs/eea-java-21/src/main/resources/java/time/chrono/MinguoChronology.eea b/libs/eea-java-21/src/main/resources/java/time/chrono/MinguoChronology.eea
index b4eee86463..8de444614f 100644
--- a/libs/eea-java-21/src/main/resources/java/time/chrono/MinguoChronology.eea
+++ b/libs/eea-java-21/src/main/resources/java/time/chrono/MinguoChronology.eea
@@ -15,7 +15,7 @@ date
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/MinguoDate;
 dateEpochDay
  (J)Ljava/time/chrono/MinguoDate;
- (J)Ljava/time/chrono/MinguoDate;
+ (J)L1java/time/chrono/MinguoDate;
 dateNow
  ()Ljava/time/chrono/MinguoDate;
  ()Ljava/time/chrono/MinguoDate;
@@ -39,10 +39,10 @@ eras
  ()Ljava/util/List<Ljava/time/chrono/Era;>;
 getCalendarType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 localDateTime
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoLocalDateTime<Ljava/time/chrono/MinguoDate;>;
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoLocalDateTime<Ljava/time/chrono/MinguoDate;>;
diff --git a/libs/eea-java-21/src/main/resources/java/time/chrono/MinguoDate.eea b/libs/eea-java-21/src/main/resources/java/time/chrono/MinguoDate.eea
index 6b57859b0c..975508bfd8 100644
--- a/libs/eea-java-21/src/main/resources/java/time/chrono/MinguoDate.eea
+++ b/libs/eea-java-21/src/main/resources/java/time/chrono/MinguoDate.eea
@@ -12,7 +12,7 @@ now
  ()Ljava/time/chrono/MinguoDate;
 now
  (Ljava/time/Clock;)Ljava/time/chrono/MinguoDate;
- (Ljava/time/Clock;)Ljava/time/chrono/MinguoDate;
+ (Ljava/time/Clock;)L1java/time/chrono/MinguoDate;
 now
  (Ljava/time/ZoneId;)Ljava/time/chrono/MinguoDate;
  (Ljava/time/ZoneId;)Ljava/time/chrono/MinguoDate;
diff --git a/libs/eea-java-21/src/main/resources/java/time/chrono/ThaiBuddhistChronology.eea b/libs/eea-java-21/src/main/resources/java/time/chrono/ThaiBuddhistChronology.eea
index ef1112bec4..d56569803c 100644
--- a/libs/eea-java-21/src/main/resources/java/time/chrono/ThaiBuddhistChronology.eea
+++ b/libs/eea-java-21/src/main/resources/java/time/chrono/ThaiBuddhistChronology.eea
@@ -15,7 +15,7 @@ date
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ThaiBuddhistDate;
 dateEpochDay
  (J)Ljava/time/chrono/ThaiBuddhistDate;
- (J)Ljava/time/chrono/ThaiBuddhistDate;
+ (J)L1java/time/chrono/ThaiBuddhistDate;
 dateNow
  ()Ljava/time/chrono/ThaiBuddhistDate;
  ()Ljava/time/chrono/ThaiBuddhistDate;
@@ -39,10 +39,10 @@ eras
  ()Ljava/util/List<Ljava/time/chrono/Era;>;
 getCalendarType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 localDateTime
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoLocalDateTime<Ljava/time/chrono/ThaiBuddhistDate;>;
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoLocalDateTime<Ljava/time/chrono/ThaiBuddhistDate;>;
diff --git a/libs/eea-java-21/src/main/resources/java/time/chrono/ThaiBuddhistDate.eea b/libs/eea-java-21/src/main/resources/java/time/chrono/ThaiBuddhistDate.eea
index cb6bf1a585..7dd86bc7c9 100644
--- a/libs/eea-java-21/src/main/resources/java/time/chrono/ThaiBuddhistDate.eea
+++ b/libs/eea-java-21/src/main/resources/java/time/chrono/ThaiBuddhistDate.eea
@@ -12,7 +12,7 @@ now
  ()Ljava/time/chrono/ThaiBuddhistDate;
 now
  (Ljava/time/Clock;)Ljava/time/chrono/ThaiBuddhistDate;
- (Ljava/time/Clock;)Ljava/time/chrono/ThaiBuddhistDate;
+ (Ljava/time/Clock;)L1java/time/chrono/ThaiBuddhistDate;
 now
  (Ljava/time/ZoneId;)Ljava/time/chrono/ThaiBuddhistDate;
  (Ljava/time/ZoneId;)Ljava/time/chrono/ThaiBuddhistDate;
diff --git a/libs/eea-java-21/src/main/resources/java/time/zone/ZoneOffsetTransition.eea b/libs/eea-java-21/src/main/resources/java/time/zone/ZoneOffsetTransition.eea
index 1f9c2af08b..6162a95b44 100644
--- a/libs/eea-java-21/src/main/resources/java/time/zone/ZoneOffsetTransition.eea
+++ b/libs/eea-java-21/src/main/resources/java/time/zone/ZoneOffsetTransition.eea
@@ -6,7 +6,7 @@ super java/lang/Comparable
 
 of
  (Ljava/time/LocalDateTime;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)Ljava/time/zone/ZoneOffsetTransition;
- (Ljava/time/LocalDateTime;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)Ljava/time/zone/ZoneOffsetTransition;
+ (Ljava/time/LocalDateTime;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)L1java/time/zone/ZoneOffsetTransition;
 
 compareTo
  (Ljava/time/zone/ZoneOffsetTransition;)I
diff --git a/libs/eea-java-21/src/main/resources/java/time/zone/ZoneOffsetTransitionRule$TimeDefinition.eea b/libs/eea-java-21/src/main/resources/java/time/zone/ZoneOffsetTransitionRule$TimeDefinition.eea
index 6eb215f730..7c4d2c9efd 100644
--- a/libs/eea-java-21/src/main/resources/java/time/zone/ZoneOffsetTransitionRule$TimeDefinition.eea
+++ b/libs/eea-java-21/src/main/resources/java/time/zone/ZoneOffsetTransitionRule$TimeDefinition.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 createDateTime
  (Ljava/time/LocalDateTime;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)Ljava/time/LocalDateTime;
- (Ljava/time/LocalDateTime;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)Ljava/time/LocalDateTime;
+ (Ljava/time/LocalDateTime;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)L1java/time/LocalDateTime;
diff --git a/libs/eea-java-21/src/main/resources/java/time/zone/ZoneOffsetTransitionRule.eea b/libs/eea-java-21/src/main/resources/java/time/zone/ZoneOffsetTransitionRule.eea
index 9acb487463..bcfe4cf473 100644
--- a/libs/eea-java-21/src/main/resources/java/time/zone/ZoneOffsetTransitionRule.eea
+++ b/libs/eea-java-21/src/main/resources/java/time/zone/ZoneOffsetTransitionRule.eea
@@ -2,11 +2,11 @@ class java/time/zone/ZoneOffsetTransitionRule
 
 of
  (Ljava/time/Month;ILjava/time/DayOfWeek;Ljava/time/LocalTime;ZLjava/time/zone/ZoneOffsetTransitionRule$TimeDefinition;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)Ljava/time/zone/ZoneOffsetTransitionRule;
- (Ljava/time/Month;ILjava/time/DayOfWeek;Ljava/time/LocalTime;ZLjava/time/zone/ZoneOffsetTransitionRule$TimeDefinition;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)Ljava/time/zone/ZoneOffsetTransitionRule;
+ (Ljava/time/Month;ILjava/time/DayOfWeek;Ljava/time/LocalTime;ZLjava/time/zone/ZoneOffsetTransitionRule$TimeDefinition;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;Ljava/time/ZoneOffset;)L1java/time/zone/ZoneOffsetTransitionRule;
 
 createTransition
  (I)Ljava/time/zone/ZoneOffsetTransition;
- (I)Ljava/time/zone/ZoneOffsetTransition;
+ (I)L1java/time/zone/ZoneOffsetTransition;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/java/time/zone/ZoneRules.eea b/libs/eea-java-21/src/main/resources/java/time/zone/ZoneRules.eea
index b9212bcf70..a8b2ecf535 100644
--- a/libs/eea-java-21/src/main/resources/java/time/zone/ZoneRules.eea
+++ b/libs/eea-java-21/src/main/resources/java/time/zone/ZoneRules.eea
@@ -24,7 +24,7 @@ getStandardOffset
  (Ljava/time/Instant;)Ljava/time/ZoneOffset;
 getTransition
  (Ljava/time/LocalDateTime;)Ljava/time/zone/ZoneOffsetTransition;
- (Ljava/time/LocalDateTime;)Ljava/time/zone/ZoneOffsetTransition;
+ (Ljava/time/LocalDateTime;)L0java/time/zone/ZoneOffsetTransition;
 getTransitionRules
  ()Ljava/util/List<Ljava/time/zone/ZoneOffsetTransitionRule;>;
  ()Ljava/util/List<Ljava/time/zone/ZoneOffsetTransitionRule;>;
@@ -42,10 +42,10 @@ isValidOffset
  (Ljava/time/LocalDateTime;Ljava/time/ZoneOffset;)Z
 nextTransition
  (Ljava/time/Instant;)Ljava/time/zone/ZoneOffsetTransition;
- (Ljava/time/Instant;)Ljava/time/zone/ZoneOffsetTransition;
+ (Ljava/time/Instant;)L0java/time/zone/ZoneOffsetTransition;
 previousTransition
  (Ljava/time/Instant;)Ljava/time/zone/ZoneOffsetTransition;
- (Ljava/time/Instant;)Ljava/time/zone/ZoneOffsetTransition;
+ (Ljava/time/Instant;)L0java/time/zone/ZoneOffsetTransition;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/java/util/AbstractList.eea b/libs/eea-java-21/src/main/resources/java/util/AbstractList.eea
index ce2c58c504..e8325f21df 100644
--- a/libs/eea-java-21/src/main/resources/java/util/AbstractList.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/AbstractList.eea
@@ -41,10 +41,10 @@ listIterator
  (I)L1java/util/ListIterator<TE;>; # @Inherited(java.util.List)
 remove
  (I)TE;
- (I)TE;
+ (I)T1E;
 set
  (ITE;)TE;
- (ITE;)TE;
+ (ITE;)T1E;
 subList
  (II)Ljava/util/List<TE;>;
  (II)L1java/util/List<TE;>; # @Inherited(java.util.List)
diff --git a/libs/eea-java-21/src/main/resources/java/util/AbstractMap$SimpleImmutableEntry.eea b/libs/eea-java-21/src/main/resources/java/util/AbstractMap$SimpleImmutableEntry.eea
index 154585fbc0..de45cf7163 100644
--- a/libs/eea-java-21/src/main/resources/java/util/AbstractMap$SimpleImmutableEntry.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/AbstractMap$SimpleImmutableEntry.eea
@@ -23,7 +23,7 @@ getValue
  ()TV;
 setValue
  (TV;)TV;
- (TV;)TV;
+ (TV;)T1V;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/java/util/AbstractSequentialList.eea b/libs/eea-java-21/src/main/resources/java/util/AbstractSequentialList.eea
index f048b54e30..48e661e7c2 100644
--- a/libs/eea-java-21/src/main/resources/java/util/AbstractSequentialList.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/AbstractSequentialList.eea
@@ -23,7 +23,7 @@ listIterator
  (I)L1java/util/ListIterator<TE;>; # @Inherited(java.util.AbstractList)
 remove
  (I)TE;
- (I)TE;
+ (I)T1E; # @Inherited(java.util.AbstractList)
 set
  (ITE;)TE;
- (ITE;)TE;
+ (ITE;)T1E; # @Inherited(java.util.AbstractList)
diff --git a/libs/eea-java-21/src/main/resources/java/util/ArrayList.eea b/libs/eea-java-21/src/main/resources/java/util/ArrayList.eea
index 33f10f5732..4a2d7e4f36 100644
--- a/libs/eea-java-21/src/main/resources/java/util/ArrayList.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/ArrayList.eea
@@ -68,7 +68,7 @@ listIterator
  (I)L1java/util/ListIterator<TE;>; # @Inherited(java.util.AbstractList)
 remove
  (I)TE;
- (I)TE;
+ (I)T1E; # @Inherited(java.util.AbstractList)
 remove
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z
@@ -92,7 +92,7 @@ retainAll
  (L1java/util/Collection<*>;)Z # @Inherited(java.util.AbstractCollection)
 set
  (ITE;)TE;
- (ITE;)TE;
+ (ITE;)T1E; # @Inherited(java.util.AbstractList)
 sort
  (Ljava/util/Comparator<-TE;>;)V
  (L1java/util/Comparator<-TE;>;)V # @Inherited(java.util.List)
diff --git a/libs/eea-java-21/src/main/resources/java/util/Collections.eea b/libs/eea-java-21/src/main/resources/java/util/Collections.eea
index 61542b3320..84ebc8dbe1 100644
--- a/libs/eea-java-21/src/main/resources/java/util/Collections.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/Collections.eea
@@ -120,10 +120,10 @@ nCopies
  <T:Ljava/lang/Object;>(ITT;)L1java/util/List<TT;>;
 newSequencedSetFromMap
  <E:Ljava/lang/Object;>(Ljava/util/SequencedMap<TE;Ljava/lang/Boolean;>;)Ljava/util/SequencedSet<TE;>;
- <E:Ljava/lang/Object;>(Ljava/util/SequencedMap<TE;Ljava/lang/Boolean;>;)Ljava/util/SequencedSet<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/util/SequencedMap<TE;Ljava/lang/Boolean;>;)L1java/util/SequencedSet<TE;>;
 newSetFromMap
  <E:Ljava/lang/Object;>(Ljava/util/Map<TE;Ljava/lang/Boolean;>;)Ljava/util/Set<TE;>;
- <E:Ljava/lang/Object;>(Ljava/util/Map<TE;Ljava/lang/Boolean;>;)Ljava/util/Set<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/util/Map<TE;Ljava/lang/Boolean;>;)L1java/util/Set<TE;>;
 replaceAll
  <T:Ljava/lang/Object;>(Ljava/util/List<TT;>;TT;TT;)Z
  <T:Ljava/lang/Object;>(Ljava/util/List<TT;>;TT;TT;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/util/Enumeration.eea b/libs/eea-java-21/src/main/resources/java/util/Enumeration.eea
index e6c64cebae..5df1626885 100644
--- a/libs/eea-java-21/src/main/resources/java/util/Enumeration.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/Enumeration.eea
@@ -4,7 +4,7 @@ class java/util/Enumeration
 
 asIterator
  ()Ljava/util/Iterator<TE;>;
- ()Ljava/util/Iterator<TE;>;
+ ()L1java/util/Iterator<TE;>;
 nextElement
  ()TE;
  ()TE;
diff --git a/libs/eea-java-21/src/main/resources/java/util/FormatProcessor.eea b/libs/eea-java-21/src/main/resources/java/util/FormatProcessor.eea
index ead66a3fc5..6fe4485677 100644
--- a/libs/eea-java-21/src/main/resources/java/util/FormatProcessor.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/FormatProcessor.eea
@@ -10,11 +10,11 @@ FMT
 
 create
  (Ljava/util/Locale;)Ljava/util/FormatProcessor;
- (Ljava/util/Locale;)Ljava/util/FormatProcessor;
+ (Ljava/util/Locale;)L1java/util/FormatProcessor;
 
 linkage
  (Ljava/util/List<Ljava/lang/String;>;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/MethodHandle;
  (Ljava/util/List<Ljava/lang/String;>;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/MethodHandle;
 process
  (Ljava/lang/StringTemplate;)Ljava/lang/String;
- (Ljava/lang/StringTemplate;)Ljava/lang/String;
+ (Ljava/lang/StringTemplate;)L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/java/util/GregorianCalendar.eea b/libs/eea-java-21/src/main/resources/java/util/GregorianCalendar.eea
index d650ced547..ad84ab0c07 100644
--- a/libs/eea-java-21/src/main/resources/java/util/GregorianCalendar.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/GregorianCalendar.eea
@@ -2,7 +2,7 @@ class java/util/GregorianCalendar
 
 from
  (Ljava/time/ZonedDateTime;)Ljava/util/GregorianCalendar;
- (Ljava/time/ZonedDateTime;)Ljava/util/GregorianCalendar;
+ (Ljava/time/ZonedDateTime;)L1java/util/GregorianCalendar;
 
 <init>
  (Ljava/util/Locale;)V
@@ -24,7 +24,7 @@ getCalendarType
  ()L1java/lang/String; # @Inherited(java.util.Calendar)
 getGregorianChange
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L1java/util/Date;
 getTimeZone
  ()Ljava/util/TimeZone;
  ()L1java/util/TimeZone; # @Inherited(java.util.Calendar)
diff --git a/libs/eea-java-21/src/main/resources/java/util/HashMap.eea b/libs/eea-java-21/src/main/resources/java/util/HashMap.eea
index 43fdf33713..e97a7311c5 100644
--- a/libs/eea-java-21/src/main/resources/java/util/HashMap.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/HashMap.eea
@@ -11,7 +11,7 @@ super java/util/Map
 
 newHashMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Ljava/util/HashMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Ljava/util/HashMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)L1java/util/HashMap<TK;TV;>;
 
 <init>
  (Ljava/util/Map<+TK;+TV;>;)V
diff --git a/libs/eea-java-21/src/main/resources/java/util/HashSet.eea b/libs/eea-java-21/src/main/resources/java/util/HashSet.eea
index 54e5108721..2e60db404c 100644
--- a/libs/eea-java-21/src/main/resources/java/util/HashSet.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/HashSet.eea
@@ -11,7 +11,7 @@ super java/util/Set
 
 newHashSet
  <T:Ljava/lang/Object;>(I)Ljava/util/HashSet<TT;>;
- <T:Ljava/lang/Object;>(I)Ljava/util/HashSet<TT;>;
+ <T:Ljava/lang/Object;>(I)L1java/util/HashSet<TT;>;
 
 <init>
  (Ljava/util/Collection<+TE;>;)V
diff --git a/libs/eea-java-21/src/main/resources/java/util/HexFormat.eea b/libs/eea-java-21/src/main/resources/java/util/HexFormat.eea
index a03a1fc801..61cd8707df 100644
--- a/libs/eea-java-21/src/main/resources/java/util/HexFormat.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/HexFormat.eea
@@ -17,7 +17,7 @@ of
  ()Ljava/util/HexFormat;
 ofDelimiter
  (Ljava/lang/String;)Ljava/util/HexFormat;
- (Ljava/lang/String;)Ljava/util/HexFormat;
+ (Ljava/lang/String;)L1java/util/HexFormat;
 
 delimiter
  ()Ljava/lang/String;
@@ -30,7 +30,7 @@ formatHex
  ([B)Ljava/lang/String;
 formatHex
  ([BII)Ljava/lang/String;
- ([BII)Ljava/lang/String;
+ ([BII)L1java/lang/String;
 formatHex
  <A::Ljava/lang/Appendable;>(TA;[B)TA;
  <A::Ljava/lang/Appendable;>(TA;[B)TA;
diff --git a/libs/eea-java-21/src/main/resources/java/util/LinkedHashMap.eea b/libs/eea-java-21/src/main/resources/java/util/LinkedHashMap.eea
index f61c03fc0a..645fc27351 100644
--- a/libs/eea-java-21/src/main/resources/java/util/LinkedHashMap.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/LinkedHashMap.eea
@@ -11,7 +11,7 @@ super java/util/SequencedMap
 
 newLinkedHashMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Ljava/util/LinkedHashMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Ljava/util/LinkedHashMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)L1java/util/LinkedHashMap<TK;TV;>;
 
 <init>
  (Ljava/util/Map<+TK;+TV;>;)V
@@ -36,10 +36,10 @@ keySet
  ()L1java/util/Set<TK;>; # @Inherited(java.util.HashMap)
 putFirst
  (TK;TV;)TV;
- (TK;TV;)TV;
+ (TK;TV;)T1V; # @Inherited(java.util.SequencedMap)
 putLast
  (TK;TV;)TV;
- (TK;TV;)TV;
+ (TK;TV;)T1V; # @Inherited(java.util.SequencedMap)
 removeEldestEntry
  (Ljava/util/Map$Entry<TK;TV;>;)Z
  (L1java/util/Map$Entry<TK;TV;>;)Z
@@ -48,16 +48,16 @@ replaceAll
  (L1java/util/function/BiFunction<-TK;-TV;+TV;>;)V # @Inherited(java.util.HashMap)
 reversed
  ()Ljava/util/SequencedMap<TK;TV;>;
- ()Ljava/util/SequencedMap<TK;TV;>;
+ ()L1java/util/SequencedMap<TK;TV;>;
 sequencedEntrySet
  ()Ljava/util/SequencedSet<Ljava/util/Map$Entry<TK;TV;>;>;
- ()Ljava/util/SequencedSet<Ljava/util/Map$Entry<TK;TV;>;>;
+ ()L1java/util/SequencedSet<Ljava/util/Map$Entry<TK;TV;>;>; # @Inherited(java.util.SequencedMap)
 sequencedKeySet
  ()Ljava/util/SequencedSet<TK;>;
- ()Ljava/util/SequencedSet<TK;>;
+ ()L1java/util/SequencedSet<TK;>; # @Inherited(java.util.SequencedMap)
 sequencedValues
  ()Ljava/util/SequencedCollection<TV;>;
- ()Ljava/util/SequencedCollection<TV;>;
+ ()L1java/util/SequencedCollection<TV;>; # @Inherited(java.util.SequencedMap)
 values
  ()Ljava/util/Collection<TV;>;
  ()L1java/util/Collection<TV;>; # @Inherited(java.util.HashMap)
diff --git a/libs/eea-java-21/src/main/resources/java/util/LinkedHashSet.eea b/libs/eea-java-21/src/main/resources/java/util/LinkedHashSet.eea
index 59b5a976ec..6ad0c28c1e 100644
--- a/libs/eea-java-21/src/main/resources/java/util/LinkedHashSet.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/LinkedHashSet.eea
@@ -11,7 +11,7 @@ super java/util/SequencedSet
 
 newLinkedHashSet
  <T:Ljava/lang/Object;>(I)Ljava/util/LinkedHashSet<TT;>;
- <T:Ljava/lang/Object;>(I)Ljava/util/LinkedHashSet<TT;>;
+ <T:Ljava/lang/Object;>(I)L1java/util/LinkedHashSet<TT;>;
 
 <init>
  (Ljava/util/Collection<+TE;>;)V
@@ -36,7 +36,7 @@ removeLast
  ()TE;
 reversed
  ()Ljava/util/SequencedSet<TE;>;
- ()Ljava/util/SequencedSet<TE;>;
+ ()L1java/util/SequencedSet<TE;>;
 spliterator
  ()Ljava/util/Spliterator<TE;>;
  ()L1java/util/Spliterator<TE;>; # @Inherited(java.util.HashSet)
diff --git a/libs/eea-java-21/src/main/resources/java/util/LinkedList.eea b/libs/eea-java-21/src/main/resources/java/util/LinkedList.eea
index 38008c1edb..419f954dfe 100644
--- a/libs/eea-java-21/src/main/resources/java/util/LinkedList.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/LinkedList.eea
@@ -101,7 +101,7 @@ remove
  ()T1E; # @Inherited(java.util.Deque)
 remove
  (I)TE;
- (I)TE;
+ (I)T1E; # @Inherited(java.util.AbstractSequentialList)
 remove
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z
@@ -119,10 +119,10 @@ removeLastOccurrence
  (L0java/lang/Object;)Z
 reversed
  ()Ljava/util/LinkedList<TE;>;
- ()Ljava/util/LinkedList<TE;>;
+ ()L1java/util/LinkedList<TE;>;
 set
  (ITE;)TE;
- (ITE;)TE;
+ (ITE;)T1E; # @Inherited(java.util.AbstractSequentialList)
 spliterator
  ()Ljava/util/Spliterator<TE;>;
  ()L1java/util/Spliterator<TE;>; # @Inherited(java.util.List)
diff --git a/libs/eea-java-21/src/main/resources/java/util/Locale.eea b/libs/eea-java-21/src/main/resources/java/util/Locale.eea
index 89ada13fa3..b1b00730c1 100644
--- a/libs/eea-java-21/src/main/resources/java/util/Locale.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/Locale.eea
@@ -99,13 +99,13 @@ getDefault
  (Ljava/util/Locale$Category;)Ljava/util/Locale;
 getISOCountries
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 getISOCountries
  (Ljava/util/Locale$IsoCountryCode;)Ljava/util/Set<Ljava/lang/String;>;
  (Ljava/util/Locale$IsoCountryCode;)Ljava/util/Set<Ljava/lang/String;>;
 getISOLanguages
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 lookup
  (Ljava/util/List<Ljava/util/Locale$LanguageRange;>;Ljava/util/Collection<Ljava/util/Locale;>;)Ljava/util/Locale;
  (Ljava/util/List<Ljava/util/Locale$LanguageRange;>;Ljava/util/Collection<Ljava/util/Locale;>;)Ljava/util/Locale;
@@ -178,7 +178,7 @@ getDisplayVariant
  (Ljava/util/Locale;)Ljava/lang/String;
 getExtension
  (C)Ljava/lang/String;
- (C)Ljava/lang/String;
+ (C)L0java/lang/String;
 getExtensionKeys
  ()Ljava/util/Set<Ljava/lang/Character;>;
  ()Ljava/util/Set<Ljava/lang/Character;>;
@@ -202,7 +202,7 @@ getUnicodeLocaleKeys
  ()Ljava/util/Set<Ljava/lang/String;>;
 getUnicodeLocaleType
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getVariant
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/java/util/NavigableMap.eea b/libs/eea-java-21/src/main/resources/java/util/NavigableMap.eea
index 63b07d38b2..0ebfc951a0 100644
--- a/libs/eea-java-21/src/main/resources/java/util/NavigableMap.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/NavigableMap.eea
@@ -20,7 +20,7 @@ descendingMap
  ()Ljava/util/NavigableMap<TK;TV;>;
 firstEntry
  ()Ljava/util/Map$Entry<TK;TV;>;
- ()Ljava/util/Map$Entry<TK;TV;>;
+ ()L0java/util/Map$Entry<TK;TV;>; # @Inherited(java.util.SequencedMap)
 floorEntry
  (TK;)Ljava/util/Map$Entry<TK;TV;>;
  (TK;)Ljava/util/Map$Entry<TK;TV;>;
@@ -41,7 +41,7 @@ higherKey
  (TK;)TK;
 lastEntry
  ()Ljava/util/Map$Entry<TK;TV;>;
- ()Ljava/util/Map$Entry<TK;TV;>;
+ ()L0java/util/Map$Entry<TK;TV;>; # @Inherited(java.util.SequencedMap)
 lowerEntry
  (TK;)Ljava/util/Map$Entry<TK;TV;>;
  (TK;)Ljava/util/Map$Entry<TK;TV;>;
@@ -53,10 +53,10 @@ navigableKeySet
  ()Ljava/util/NavigableSet<TK;>;
 pollFirstEntry
  ()Ljava/util/Map$Entry<TK;TV;>;
- ()Ljava/util/Map$Entry<TK;TV;>;
+ ()L0java/util/Map$Entry<TK;TV;>; # @Inherited(java.util.SequencedMap)
 pollLastEntry
  ()Ljava/util/Map$Entry<TK;TV;>;
- ()Ljava/util/Map$Entry<TK;TV;>;
+ ()L0java/util/Map$Entry<TK;TV;>; # @Inherited(java.util.SequencedMap)
 reversed
  ()Ljava/util/NavigableMap<TK;TV;>;
  ()Ljava/util/NavigableMap<TK;TV;>;
diff --git a/libs/eea-java-21/src/main/resources/java/util/Objects.eea b/libs/eea-java-21/src/main/resources/java/util/Objects.eea
index 0d675b836e..7f6ce5d995 100644
--- a/libs/eea-java-21/src/main/resources/java/util/Objects.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/Objects.eea
@@ -38,7 +38,7 @@ requireNonNullElseGet
  <T:Ljava/lang/Object;>(T0T;L1java/util/function/Supplier<+1TT;>;)T1T;
 toIdentityString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
  (L0java/lang/Object;)L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/java/util/OptionalDouble.eea b/libs/eea-java-21/src/main/resources/java/util/OptionalDouble.eea
index 0349617271..7d6dd6e1e9 100644
--- a/libs/eea-java-21/src/main/resources/java/util/OptionalDouble.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/OptionalDouble.eea
@@ -5,7 +5,7 @@ empty
  ()Ljava/util/OptionalDouble;
 of
  (D)Ljava/util/OptionalDouble;
- (D)Ljava/util/OptionalDouble;
+ (D)L1java/util/OptionalDouble;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/util/OptionalInt.eea b/libs/eea-java-21/src/main/resources/java/util/OptionalInt.eea
index 08966f732f..01af0df917 100644
--- a/libs/eea-java-21/src/main/resources/java/util/OptionalInt.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/OptionalInt.eea
@@ -5,7 +5,7 @@ empty
  ()Ljava/util/OptionalInt;
 of
  (I)Ljava/util/OptionalInt;
- (I)Ljava/util/OptionalInt;
+ (I)L1java/util/OptionalInt;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/util/OptionalLong.eea b/libs/eea-java-21/src/main/resources/java/util/OptionalLong.eea
index 7903883b4f..3d00043d24 100644
--- a/libs/eea-java-21/src/main/resources/java/util/OptionalLong.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/OptionalLong.eea
@@ -5,7 +5,7 @@ empty
  ()Ljava/util/OptionalLong;
 of
  (J)Ljava/util/OptionalLong;
- (J)Ljava/util/OptionalLong;
+ (J)L1java/util/OptionalLong;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/util/ResourceBundle$Control.eea b/libs/eea-java-21/src/main/resources/java/util/ResourceBundle$Control.eea
index 8960df7376..9338e1b6ee 100644
--- a/libs/eea-java-21/src/main/resources/java/util/ResourceBundle$Control.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/ResourceBundle$Control.eea
@@ -19,7 +19,7 @@ getNoFallbackControl
 
 getCandidateLocales
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/util/List<Ljava/util/Locale;>;
- (Ljava/lang/String;Ljava/util/Locale;)Ljava/util/List<Ljava/util/Locale;>;
+ (Ljava/lang/String;Ljava/util/Locale;)L1java/util/List<Ljava/util/Locale;>;
 getFallbackLocale
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/util/Locale;
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/util/Locale;
@@ -34,10 +34,10 @@ needsReload
  (Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/ClassLoader;Ljava/util/ResourceBundle;J)Z
 newBundle
  (Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/ClassLoader;Z)Ljava/util/ResourceBundle;
- (Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/ClassLoader;Z)Ljava/util/ResourceBundle;
+ (Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/ClassLoader;Z)L0java/util/ResourceBundle;
 toBundleName
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
 toResourceName
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/java/util/Scanner.eea b/libs/eea-java-21/src/main/resources/java/util/Scanner.eea
index 537c2d83cb..9030e2954d 100644
--- a/libs/eea-java-21/src/main/resources/java/util/Scanner.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/Scanner.eea
@@ -60,13 +60,13 @@ findInLine
  (Ljava/lang/String;)Ljava/lang/String;
 findInLine
  (Ljava/util/regex/Pattern;)Ljava/lang/String;
- (Ljava/util/regex/Pattern;)Ljava/lang/String;
+ (Ljava/util/regex/Pattern;)L0java/lang/String;
 findWithinHorizon
  (Ljava/lang/String;I)Ljava/lang/String;
  (Ljava/lang/String;I)Ljava/lang/String;
 findWithinHorizon
  (Ljava/util/regex/Pattern;I)Ljava/lang/String;
- (Ljava/util/regex/Pattern;I)Ljava/lang/String;
+ (Ljava/util/regex/Pattern;I)L0java/lang/String;
 hasNext
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/util/SequencedMap.eea b/libs/eea-java-21/src/main/resources/java/util/SequencedMap.eea
index be94ca9f0f..2d3d906bd8 100644
--- a/libs/eea-java-21/src/main/resources/java/util/SequencedMap.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/SequencedMap.eea
@@ -8,31 +8,31 @@ super java/util/Map
 
 firstEntry
  ()Ljava/util/Map$Entry<TK;TV;>;
- ()Ljava/util/Map$Entry<TK;TV;>;
+ ()L0java/util/Map$Entry<TK;TV;>;
 lastEntry
  ()Ljava/util/Map$Entry<TK;TV;>;
- ()Ljava/util/Map$Entry<TK;TV;>;
+ ()L0java/util/Map$Entry<TK;TV;>;
 pollFirstEntry
  ()Ljava/util/Map$Entry<TK;TV;>;
- ()Ljava/util/Map$Entry<TK;TV;>;
+ ()L0java/util/Map$Entry<TK;TV;>;
 pollLastEntry
  ()Ljava/util/Map$Entry<TK;TV;>;
- ()Ljava/util/Map$Entry<TK;TV;>;
+ ()L0java/util/Map$Entry<TK;TV;>;
 putFirst
  (TK;TV;)TV;
- (TK;TV;)TV;
+ (TK;TV;)T1V;
 putLast
  (TK;TV;)TV;
- (TK;TV;)TV;
+ (TK;TV;)T1V;
 reversed
  ()Ljava/util/SequencedMap<TK;TV;>;
  ()Ljava/util/SequencedMap<TK;TV;>;
 sequencedEntrySet
  ()Ljava/util/SequencedSet<Ljava/util/Map$Entry<TK;TV;>;>;
- ()Ljava/util/SequencedSet<Ljava/util/Map$Entry<TK;TV;>;>;
+ ()L1java/util/SequencedSet<Ljava/util/Map$Entry<TK;TV;>;>;
 sequencedKeySet
  ()Ljava/util/SequencedSet<TK;>;
- ()Ljava/util/SequencedSet<TK;>;
+ ()L1java/util/SequencedSet<TK;>;
 sequencedValues
  ()Ljava/util/SequencedCollection<TV;>;
- ()Ljava/util/SequencedCollection<TV;>;
+ ()L1java/util/SequencedCollection<TV;>;
diff --git a/libs/eea-java-21/src/main/resources/java/util/ServiceLoader.eea b/libs/eea-java-21/src/main/resources/java/util/ServiceLoader.eea
index 244768ab70..96d6bfdd62 100644
--- a/libs/eea-java-21/src/main/resources/java/util/ServiceLoader.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/ServiceLoader.eea
@@ -8,23 +8,23 @@ super java/lang/Iterable
 
 load
  <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
- <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
+ <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;)L1java/util/ServiceLoader<TS;>;
 load
  <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;Ljava/lang/ClassLoader;)Ljava/util/ServiceLoader<TS;>;
- <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;Ljava/lang/ClassLoader;)Ljava/util/ServiceLoader<TS;>;
+ <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;Ljava/lang/ClassLoader;)L1java/util/ServiceLoader<TS;>;
 load
  <S:Ljava/lang/Object;>(Ljava/lang/ModuleLayer;Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
- <S:Ljava/lang/Object;>(Ljava/lang/ModuleLayer;Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
+ <S:Ljava/lang/Object;>(Ljava/lang/ModuleLayer;Ljava/lang/Class<TS;>;)L1java/util/ServiceLoader<TS;>;
 loadInstalled
  <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
- <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
+ <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;)L1java/util/ServiceLoader<TS;>;
 
 findFirst
  ()Ljava/util/Optional<TS;>;
  ()Ljava/util/Optional<TS;>;
 iterator
  ()Ljava/util/Iterator<TS;>;
- ()Ljava/util/Iterator<TS;>;
+ ()L1java/util/Iterator<TS;>;
 stream
  ()Ljava/util/stream/Stream<Ljava/util/ServiceLoader$Provider<TS;>;>;
  ()Ljava/util/stream/Stream<Ljava/util/ServiceLoader$Provider<TS;>;>;
diff --git a/libs/eea-java-21/src/main/resources/java/util/SortedMap.eea b/libs/eea-java-21/src/main/resources/java/util/SortedMap.eea
index 15f5a3541d..81e0715ecc 100644
--- a/libs/eea-java-21/src/main/resources/java/util/SortedMap.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/SortedMap.eea
@@ -26,10 +26,10 @@ lastKey
  ()TK;
 putFirst
  (TK;TV;)TV;
- (TK;TV;)TV;
+ (TK;TV;)T1V; # @Inherited(java.util.SequencedMap)
 putLast
  (TK;TV;)TV;
- (TK;TV;)TV;
+ (TK;TV;)T1V; # @Inherited(java.util.SequencedMap)
 reversed
  ()Ljava/util/SortedMap<TK;TV;>;
  ()Ljava/util/SortedMap<TK;TV;>;
diff --git a/libs/eea-java-21/src/main/resources/java/util/Spliterators$AbstractDoubleSpliterator.eea b/libs/eea-java-21/src/main/resources/java/util/Spliterators$AbstractDoubleSpliterator.eea
index 9cabd4a98c..f9cb99c2b3 100644
--- a/libs/eea-java-21/src/main/resources/java/util/Spliterators$AbstractDoubleSpliterator.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/Spliterators$AbstractDoubleSpliterator.eea
@@ -2,4 +2,4 @@ class java/util/Spliterators$AbstractDoubleSpliterator
 
 trySplit
  ()Ljava/util/Spliterator$OfDouble;
- ()Ljava/util/Spliterator$OfDouble;
+ ()L0java/util/Spliterator$OfDouble;
diff --git a/libs/eea-java-21/src/main/resources/java/util/Spliterators$AbstractIntSpliterator.eea b/libs/eea-java-21/src/main/resources/java/util/Spliterators$AbstractIntSpliterator.eea
index 8e485b0c41..48bbd46bcf 100644
--- a/libs/eea-java-21/src/main/resources/java/util/Spliterators$AbstractIntSpliterator.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/Spliterators$AbstractIntSpliterator.eea
@@ -2,4 +2,4 @@ class java/util/Spliterators$AbstractIntSpliterator
 
 trySplit
  ()Ljava/util/Spliterator$OfInt;
- ()Ljava/util/Spliterator$OfInt;
+ ()L0java/util/Spliterator$OfInt;
diff --git a/libs/eea-java-21/src/main/resources/java/util/Spliterators$AbstractLongSpliterator.eea b/libs/eea-java-21/src/main/resources/java/util/Spliterators$AbstractLongSpliterator.eea
index e539d33cf9..81ca6b482a 100644
--- a/libs/eea-java-21/src/main/resources/java/util/Spliterators$AbstractLongSpliterator.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/Spliterators$AbstractLongSpliterator.eea
@@ -2,4 +2,4 @@ class java/util/Spliterators$AbstractLongSpliterator
 
 trySplit
  ()Ljava/util/Spliterator$OfLong;
- ()Ljava/util/Spliterator$OfLong;
+ ()L0java/util/Spliterator$OfLong;
diff --git a/libs/eea-java-21/src/main/resources/java/util/SplittableRandom.eea b/libs/eea-java-21/src/main/resources/java/util/SplittableRandom.eea
index d97b2e40aa..3a67909a3f 100644
--- a/libs/eea-java-21/src/main/resources/java/util/SplittableRandom.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/SplittableRandom.eea
@@ -41,10 +41,10 @@ nextBytes
  ([B)V
 split
  ()Ljava/util/SplittableRandom;
- ()Ljava/util/SplittableRandom;
+ ()L1java/util/SplittableRandom;
 split
  (Ljava/util/random/RandomGenerator$SplittableGenerator;)Ljava/util/SplittableRandom;
- (Ljava/util/random/RandomGenerator$SplittableGenerator;)Ljava/util/SplittableRandom;
+ (Ljava/util/random/RandomGenerator$SplittableGenerator;)L1java/util/SplittableRandom;
 splits
  ()Ljava/util/stream/Stream<Ljava/util/random/RandomGenerator$SplittableGenerator;>;
  ()Ljava/util/stream/Stream<Ljava/util/random/RandomGenerator$SplittableGenerator;>;
diff --git a/libs/eea-java-21/src/main/resources/java/util/TreeMap.eea b/libs/eea-java-21/src/main/resources/java/util/TreeMap.eea
index 93b0c4150d..a5844b4b64 100644
--- a/libs/eea-java-21/src/main/resources/java/util/TreeMap.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/TreeMap.eea
@@ -56,7 +56,7 @@ entrySet
  ()L1java/util/Set<L1java/util/Map$Entry<TK;TV;>;>; # @Inherited(java.util.AbstractMap)
 firstEntry
  ()Ljava/util/Map$Entry<TK;TV;>;
- ()Ljava/util/Map$Entry<TK;TV;>;
+ ()L0java/util/Map$Entry<TK;TV;>; # @Inherited(java.util.NavigableMap)
 firstKey
  ()TK;
  ()TK;
@@ -89,7 +89,7 @@ keySet
  ()L1java/util/Set<TK;>; # @Inherited(java.util.AbstractMap)
 lastEntry
  ()Ljava/util/Map$Entry<TK;TV;>;
- ()Ljava/util/Map$Entry<TK;TV;>;
+ ()L0java/util/Map$Entry<TK;TV;>; # @Inherited(java.util.NavigableMap)
 lastKey
  ()TK;
  ()TK;
@@ -107,10 +107,10 @@ navigableKeySet
  ()Ljava/util/NavigableSet<TK;>;
 pollFirstEntry
  ()Ljava/util/Map$Entry<TK;TV;>;
- ()Ljava/util/Map$Entry<TK;TV;>;
+ ()L0java/util/Map$Entry<TK;TV;>; # @Inherited(java.util.NavigableMap)
 pollLastEntry
  ()Ljava/util/Map$Entry<TK;TV;>;
- ()Ljava/util/Map$Entry<TK;TV;>;
+ ()L0java/util/Map$Entry<TK;TV;>; # @Inherited(java.util.NavigableMap)
 put
  (TK;TV;)TV;
  (TK;TV;)T0V; # @Inherited(java.util.AbstractMap)
@@ -119,13 +119,13 @@ putAll
  (L1java/util/Map<+TK;+TV;>;)V # @Inherited(java.util.AbstractMap)
 putFirst
  (TK;TV;)TV;
- (TK;TV;)TV;
+ (TK;TV;)T1V; # @Inherited(java.util.SortedMap)
 putIfAbsent
  (TK;TV;)TV;
  (TK;TV;)T0V; # @Inherited(java.util.Map)
 putLast
  (TK;TV;)TV;
- (TK;TV;)TV;
+ (TK;TV;)T1V; # @Inherited(java.util.SortedMap)
 remove
  (Ljava/lang/Object;)TV;
  (L0java/lang/Object;)T0V; # @Inherited(java.util.AbstractMap)
diff --git a/libs/eea-java-21/src/main/resources/java/util/Vector.eea b/libs/eea-java-21/src/main/resources/java/util/Vector.eea
index 75322e68f3..4d83cbf96b 100644
--- a/libs/eea-java-21/src/main/resources/java/util/Vector.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/Vector.eea
@@ -48,7 +48,7 @@ elementAt
  (I)TE;
 elements
  ()Ljava/util/Enumeration<TE;>;
- ()Ljava/util/Enumeration<TE;>;
+ ()L1java/util/Enumeration<TE;>;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.util.AbstractList)
@@ -90,7 +90,7 @@ listIterator
  (I)L1java/util/ListIterator<TE;>; # @Inherited(java.util.AbstractList)
 remove
  (I)TE;
- (I)TE;
+ (I)T1E; # @Inherited(java.util.AbstractList)
 remove
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
@@ -111,7 +111,7 @@ retainAll
  (L1java/util/Collection<*>;)Z # @Inherited(java.util.AbstractCollection)
 set
  (ITE;)TE;
- (ITE;)TE;
+ (ITE;)T1E; # @Inherited(java.util.AbstractList)
 setElementAt
  (TE;I)V
  (TE;I)V
diff --git a/libs/eea-java-21/src/main/resources/java/util/WeakHashMap.eea b/libs/eea-java-21/src/main/resources/java/util/WeakHashMap.eea
index b6bcf42535..71ca988bc5 100644
--- a/libs/eea-java-21/src/main/resources/java/util/WeakHashMap.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/WeakHashMap.eea
@@ -11,7 +11,7 @@ super java/util/Map
 
 newWeakHashMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Ljava/util/WeakHashMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Ljava/util/WeakHashMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)L1java/util/WeakHashMap<TK;TV;>;
 
 <init>
  (Ljava/util/Map<+TK;+TV;>;)V
diff --git a/libs/eea-java-21/src/main/resources/java/util/concurrent/CompletableFuture.eea b/libs/eea-java-21/src/main/resources/java/util/concurrent/CompletableFuture.eea
index 534194ea51..12449f657a 100644
--- a/libs/eea-java-21/src/main/resources/java/util/concurrent/CompletableFuture.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/concurrent/CompletableFuture.eea
@@ -144,7 +144,7 @@ orTimeout
  (JL1java/util/concurrent/TimeUnit;)L1java/util/concurrent/CompletableFuture<TT;>;
 resultNow
  ()TT;
- ()TT;
+ ()T0T;
 runAfterBoth
  (Ljava/util/concurrent/CompletionStage<*>;Ljava/lang/Runnable;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
  (L1java/util/concurrent/CompletionStage<*>;L1java/lang/Runnable;)L1java/util/concurrent/CompletableFuture<L0java/lang/Void;>;
diff --git a/libs/eea-java-21/src/main/resources/java/util/concurrent/ConcurrentSkipListMap.eea b/libs/eea-java-21/src/main/resources/java/util/concurrent/ConcurrentSkipListMap.eea
index 0c00304906..80c5e140f0 100644
--- a/libs/eea-java-21/src/main/resources/java/util/concurrent/ConcurrentSkipListMap.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/concurrent/ConcurrentSkipListMap.eea
@@ -38,7 +38,7 @@ computeIfAbsent
  (TK;L1java/util/function/Function<-TK;+T0V;>;)TV; # @Inherited(java.util.concurrent.ConcurrentMap)
 computeIfPresent
  (TK;Ljava/util/function/BiFunction<-TK;-TV;+TV;>;)TV;
- (TK;Ljava/util/function/BiFunction<-TK;-TV;+TV;>;)TV;
+ (TK;Ljava/util/function/BiFunction<-TK;-TV;+TV;>;)T0V;
 containsKey
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.util.AbstractMap)
@@ -59,7 +59,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.util.AbstractMap)
 firstEntry
  ()Ljava/util/Map$Entry<TK;TV;>;
- ()Ljava/util/Map$Entry<TK;TV;>;
+ ()L0java/util/Map$Entry<TK;TV;>; # @Inherited(java.util.NavigableMap)
 firstKey
  ()TK;
  ()TK;
@@ -95,7 +95,7 @@ keySet
  ()Ljava/util/NavigableSet<TK;>;
 lastEntry
  ()Ljava/util/Map$Entry<TK;TV;>;
- ()Ljava/util/Map$Entry<TK;TV;>;
+ ()L0java/util/Map$Entry<TK;TV;>; # @Inherited(java.util.NavigableMap)
 lastKey
  ()TK;
  ()TK;
@@ -107,28 +107,28 @@ lowerKey
  (TK;)TK;
 merge
  (TK;TV;Ljava/util/function/BiFunction<-TV;-TV;+TV;>;)TV;
- (TK;TV;Ljava/util/function/BiFunction<-TV;-TV;+TV;>;)TV;
+ (TK;TV;Ljava/util/function/BiFunction<-TV;-TV;+TV;>;)T0V;
 navigableKeySet
  ()Ljava/util/NavigableSet<TK;>;
  ()Ljava/util/NavigableSet<TK;>;
 pollFirstEntry
  ()Ljava/util/Map$Entry<TK;TV;>;
- ()Ljava/util/Map$Entry<TK;TV;>;
+ ()L0java/util/Map$Entry<TK;TV;>; # @Inherited(java.util.NavigableMap)
 pollLastEntry
  ()Ljava/util/Map$Entry<TK;TV;>;
- ()Ljava/util/Map$Entry<TK;TV;>;
+ ()L0java/util/Map$Entry<TK;TV;>; # @Inherited(java.util.NavigableMap)
 put
  (TK;TV;)TV;
  (TK;TV;)T0V; # @Inherited(java.util.AbstractMap)
 putFirst
  (TK;TV;)TV;
- (TK;TV;)TV;
+ (TK;TV;)T1V; # @Inherited(java.util.SortedMap)
 putIfAbsent
  (TK;TV;)TV;
  (TK;TV;)T0V; # @Inherited(java.util.concurrent.ConcurrentMap)
 putLast
  (TK;TV;)TV;
- (TK;TV;)TV;
+ (TK;TV;)T1V; # @Inherited(java.util.SortedMap)
 remove
  (Ljava/lang/Object;)TV;
  (L0java/lang/Object;)T0V; # @Inherited(java.util.AbstractMap)
diff --git a/libs/eea-java-21/src/main/resources/java/util/concurrent/CopyOnWriteArrayList.eea b/libs/eea-java-21/src/main/resources/java/util/concurrent/CopyOnWriteArrayList.eea
index 4a59d59e22..f9093ee060 100644
--- a/libs/eea-java-21/src/main/resources/java/util/concurrent/CopyOnWriteArrayList.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/concurrent/CopyOnWriteArrayList.eea
@@ -107,7 +107,7 @@ retainAll
  (L1java/util/Collection<*>;)Z # @Inherited(java.util.List)
 reversed
  ()Ljava/util/List<TE;>;
- ()Ljava/util/List<TE;>;
+ ()L1java/util/List<TE;>;
 set
  (ITE;)TE;
  (ITE;)TE;
diff --git a/libs/eea-java-21/src/main/resources/java/util/concurrent/CountedCompleter.eea b/libs/eea-java-21/src/main/resources/java/util/concurrent/CountedCompleter.eea
index f0828ce3c1..5047da83fa 100644
--- a/libs/eea-java-21/src/main/resources/java/util/concurrent/CountedCompleter.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/concurrent/CountedCompleter.eea
@@ -23,7 +23,7 @@ getCompleter
  ()L1java/util/concurrent/CountedCompleter<*>;
 getRawResult
  ()TT;
- ()TT;
+ ()T0T;
 getRoot
  ()Ljava/util/concurrent/CountedCompleter<*>;
  ()L1java/util/concurrent/CountedCompleter<*>;
diff --git a/libs/eea-java-21/src/main/resources/java/util/concurrent/ForkJoinTask.eea b/libs/eea-java-21/src/main/resources/java/util/concurrent/ForkJoinTask.eea
index f7adf43216..8dda72e6e8 100644
--- a/libs/eea-java-21/src/main/resources/java/util/concurrent/ForkJoinTask.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/concurrent/ForkJoinTask.eea
@@ -17,7 +17,7 @@ adapt
  <T:Ljava/lang/Object;>(L1java/util/concurrent/Callable<+TT;>;)L1java/util/concurrent/ForkJoinTask<TT;>;
 adaptInterruptible
  <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<+TT;>;)Ljava/util/concurrent/ForkJoinTask<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<+TT;>;)Ljava/util/concurrent/ForkJoinTask<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<+TT;>;)L1java/util/concurrent/ForkJoinTask<TT;>;
 getPool
  ()Ljava/util/concurrent/ForkJoinPool;
  ()L0java/util/concurrent/ForkJoinPool;
diff --git a/libs/eea-java-21/src/main/resources/java/util/concurrent/RecursiveAction.eea b/libs/eea-java-21/src/main/resources/java/util/concurrent/RecursiveAction.eea
index 1c65fb44c9..c7ecea7aa9 100644
--- a/libs/eea-java-21/src/main/resources/java/util/concurrent/RecursiveAction.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/concurrent/RecursiveAction.eea
@@ -6,7 +6,7 @@ super java/util/concurrent/ForkJoinTask
 
 getRawResult
  ()Ljava/lang/Void;
- ()Ljava/lang/Void;
+ ()L0java/lang/Void;
 setRawResult
  (Ljava/lang/Void;)V
  (Ljava/lang/Void;)V
diff --git a/libs/eea-java-21/src/main/resources/java/util/concurrent/StructuredTaskScope$ShutdownOnSuccess.eea b/libs/eea-java-21/src/main/resources/java/util/concurrent/StructuredTaskScope$ShutdownOnSuccess.eea
index 4aea7a80eb..6e51387d39 100644
--- a/libs/eea-java-21/src/main/resources/java/util/concurrent/StructuredTaskScope$ShutdownOnSuccess.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/concurrent/StructuredTaskScope$ShutdownOnSuccess.eea
@@ -23,4 +23,4 @@ result
  ()TT;
 result
  <X:Ljava/lang/Throwable;>(Ljava/util/function/Function<Ljava/lang/Throwable;+TX;>;)TT;^TX;
- <X:Ljava/lang/Throwable;>(Ljava/util/function/Function<Ljava/lang/Throwable;+TX;>;)TT;^TX;
+ <X:Ljava/lang/Throwable;>(Ljava/util/function/Function<Ljava/lang/Throwable;+TX;>;)T0T;^TX;
diff --git a/libs/eea-java-21/src/main/resources/java/util/concurrent/StructuredTaskScope.eea b/libs/eea-java-21/src/main/resources/java/util/concurrent/StructuredTaskScope.eea
index e8efc7361b..c305dd9315 100644
--- a/libs/eea-java-21/src/main/resources/java/util/concurrent/StructuredTaskScope.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/concurrent/StructuredTaskScope.eea
@@ -7,7 +7,7 @@ class java/util/concurrent/StructuredTaskScope
  (Ljava/lang/String;Ljava/util/concurrent/ThreadFactory;)V
 fork
  <U:TT;>(Ljava/util/concurrent/Callable<+TU;>;)Ljava/util/concurrent/StructuredTaskScope$Subtask<TU;>;
- <U:TT;>(Ljava/util/concurrent/Callable<+TU;>;)Ljava/util/concurrent/StructuredTaskScope$Subtask<TU;>;
+ <U:TT;>(Ljava/util/concurrent/Callable<+TU;>;)L1java/util/concurrent/StructuredTaskScope$Subtask<TU;>;
 handleComplete
  (Ljava/util/concurrent/StructuredTaskScope$Subtask<+TT;>;)V
  (Ljava/util/concurrent/StructuredTaskScope$Subtask<+TT;>;)V
diff --git a/libs/eea-java-21/src/main/resources/java/util/concurrent/SubmissionPublisher.eea b/libs/eea-java-21/src/main/resources/java/util/concurrent/SubmissionPublisher.eea
index de1444c084..b2f3f2d0dd 100644
--- a/libs/eea-java-21/src/main/resources/java/util/concurrent/SubmissionPublisher.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/concurrent/SubmissionPublisher.eea
@@ -17,7 +17,7 @@ closeExceptionally
  (Ljava/lang/Throwable;)V
 consume
  (Ljava/util/function/Consumer<-TT;>;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
- (Ljava/util/function/Consumer<-TT;>;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
+ (Ljava/util/function/Consumer<-TT;>;)L1java/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
 getClosedException
  ()Ljava/lang/Throwable;
  ()Ljava/lang/Throwable;
@@ -26,7 +26,7 @@ getExecutor
  ()Ljava/util/concurrent/Executor;
 getSubscribers
  ()Ljava/util/List<Ljava/util/concurrent/Flow$Subscriber<-TT;>;>;
- ()Ljava/util/List<Ljava/util/concurrent/Flow$Subscriber<-TT;>;>;
+ ()L1java/util/List<Ljava/util/concurrent/Flow$Subscriber<-TT;>;>;
 isSubscribed
  (Ljava/util/concurrent/Flow$Subscriber<-TT;>;)Z
  (Ljava/util/concurrent/Flow$Subscriber<-TT;>;)Z
diff --git a/libs/eea-java-21/src/main/resources/java/util/concurrent/atomic/AtomicLongFieldUpdater.eea b/libs/eea-java-21/src/main/resources/java/util/concurrent/atomic/AtomicLongFieldUpdater.eea
index 4c611ada19..dc901dbcc1 100644
--- a/libs/eea-java-21/src/main/resources/java/util/concurrent/atomic/AtomicLongFieldUpdater.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/concurrent/atomic/AtomicLongFieldUpdater.eea
@@ -4,7 +4,7 @@ class java/util/concurrent/atomic/AtomicLongFieldUpdater
 
 newUpdater
  <U:Ljava/lang/Object;>(Ljava/lang/Class<TU;>;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicLongFieldUpdater<TU;>;
- <U:Ljava/lang/Object;>(Ljava/lang/Class<TU;>;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicLongFieldUpdater<TU;>;
+ <U:Ljava/lang/Object;>(Ljava/lang/Class<TU;>;Ljava/lang/String;)L1java/util/concurrent/atomic/AtomicLongFieldUpdater<TU;>;
 
 accumulateAndGet
  (TT;JLjava/util/function/LongBinaryOperator;)J
diff --git a/libs/eea-java-21/src/main/resources/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.eea b/libs/eea-java-21/src/main/resources/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.eea
index 0be6e7a621..50b6cb13fc 100644
--- a/libs/eea-java-21/src/main/resources/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.eea
@@ -4,7 +4,7 @@ class java/util/concurrent/atomic/AtomicReferenceFieldUpdater
 
 newUpdater
  <U:Ljava/lang/Object;W:Ljava/lang/Object;>(Ljava/lang/Class<TU;>;Ljava/lang/Class<TW;>;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater<TU;TW;>;
- <U:Ljava/lang/Object;W:Ljava/lang/Object;>(Ljava/lang/Class<TU;>;Ljava/lang/Class<TW;>;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater<TU;TW;>;
+ <U:Ljava/lang/Object;W:Ljava/lang/Object;>(Ljava/lang/Class<TU;>;Ljava/lang/Class<TW;>;Ljava/lang/String;)L1java/util/concurrent/atomic/AtomicReferenceFieldUpdater<TU;TW;>;
 
 accumulateAndGet
  (TT;TV;Ljava/util/function/BinaryOperator<TV;>;)TV;
diff --git a/libs/eea-java-21/src/main/resources/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject.eea b/libs/eea-java-21/src/main/resources/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject.eea
index c5df9f2b64..c5b20b85a0 100644
--- a/libs/eea-java-21/src/main/resources/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject.eea
@@ -11,4 +11,4 @@ awaitUntil
  (L1java/util/Date;)Z # @Inherited(java.util.concurrent.locks.Condition)
 getWaitingThreads
  ()Ljava/util/Collection<Ljava/lang/Thread;>;
- ()Ljava/util/Collection<Ljava/lang/Thread;>;
+ ()L1java/util/Collection<Ljava/lang/Thread;>;
diff --git a/libs/eea-java-21/src/main/resources/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.eea b/libs/eea-java-21/src/main/resources/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.eea
index 21f254cffa..42ec6de71f 100644
--- a/libs/eea-java-21/src/main/resources/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.eea
@@ -2,16 +2,16 @@ class java/util/concurrent/locks/AbstractQueuedLongSynchronizer
 
 getExclusiveQueuedThreads
  ()Ljava/util/Collection<Ljava/lang/Thread;>;
- ()Ljava/util/Collection<Ljava/lang/Thread;>;
+ ()L1java/util/Collection<Ljava/lang/Thread;>;
 getFirstQueuedThread
  ()Ljava/lang/Thread;
  ()Ljava/lang/Thread;
 getQueuedThreads
  ()Ljava/util/Collection<Ljava/lang/Thread;>;
- ()Ljava/util/Collection<Ljava/lang/Thread;>;
+ ()L1java/util/Collection<Ljava/lang/Thread;>;
 getSharedQueuedThreads
  ()Ljava/util/Collection<Ljava/lang/Thread;>;
- ()Ljava/util/Collection<Ljava/lang/Thread;>;
+ ()L1java/util/Collection<Ljava/lang/Thread;>;
 getWaitQueueLength
  (Ljava/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject;)I
  (L1java/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject;)I
diff --git a/libs/eea-java-21/src/main/resources/java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject.eea b/libs/eea-java-21/src/main/resources/java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject.eea
index 0f60484bbf..ac8f5b5b96 100644
--- a/libs/eea-java-21/src/main/resources/java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject.eea
@@ -11,4 +11,4 @@ awaitUntil
  (L1java/util/Date;)Z # @Inherited(java.util.concurrent.locks.Condition)
 getWaitingThreads
  ()Ljava/util/Collection<Ljava/lang/Thread;>;
- ()Ljava/util/Collection<Ljava/lang/Thread;>;
+ ()L1java/util/Collection<Ljava/lang/Thread;>;
diff --git a/libs/eea-java-21/src/main/resources/java/util/concurrent/locks/AbstractQueuedSynchronizer.eea b/libs/eea-java-21/src/main/resources/java/util/concurrent/locks/AbstractQueuedSynchronizer.eea
index 607e5aafe9..41c39d9eb5 100644
--- a/libs/eea-java-21/src/main/resources/java/util/concurrent/locks/AbstractQueuedSynchronizer.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/concurrent/locks/AbstractQueuedSynchronizer.eea
@@ -2,16 +2,16 @@ class java/util/concurrent/locks/AbstractQueuedSynchronizer
 
 getExclusiveQueuedThreads
  ()Ljava/util/Collection<Ljava/lang/Thread;>;
- ()Ljava/util/Collection<Ljava/lang/Thread;>;
+ ()L1java/util/Collection<Ljava/lang/Thread;>;
 getFirstQueuedThread
  ()Ljava/lang/Thread;
  ()Ljava/lang/Thread;
 getQueuedThreads
  ()Ljava/util/Collection<Ljava/lang/Thread;>;
- ()Ljava/util/Collection<Ljava/lang/Thread;>;
+ ()L1java/util/Collection<Ljava/lang/Thread;>;
 getSharedQueuedThreads
  ()Ljava/util/Collection<Ljava/lang/Thread;>;
- ()Ljava/util/Collection<Ljava/lang/Thread;>;
+ ()L1java/util/Collection<Ljava/lang/Thread;>;
 getWaitQueueLength
  (Ljava/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject;)I
  (L1java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject;)I
diff --git a/libs/eea-java-21/src/main/resources/java/util/prefs/AbstractPreferences.eea b/libs/eea-java-21/src/main/resources/java/util/prefs/AbstractPreferences.eea
index 8302ecdf34..c838f12a71 100644
--- a/libs/eea-java-21/src/main/resources/java/util/prefs/AbstractPreferences.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/prefs/AbstractPreferences.eea
@@ -45,7 +45,7 @@ getByteArray
  (L1java/lang/String;[B)[B # @Inherited(java.util.prefs.Preferences)
 getChild
  (Ljava/lang/String;)Ljava/util/prefs/AbstractPreferences;
- (Ljava/lang/String;)Ljava/util/prefs/AbstractPreferences;
+ (Ljava/lang/String;)L0java/util/prefs/AbstractPreferences;
 getDouble
  (Ljava/lang/String;D)D
  (L1java/lang/String;D)D # @Inherited(java.util.prefs.Preferences)
diff --git a/libs/eea-java-21/src/main/resources/java/util/random/RandomGeneratorFactory.eea b/libs/eea-java-21/src/main/resources/java/util/random/RandomGeneratorFactory.eea
index 8e1eb64d00..96dc879f88 100644
--- a/libs/eea-java-21/src/main/resources/java/util/random/RandomGeneratorFactory.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/random/RandomGeneratorFactory.eea
@@ -14,13 +14,13 @@ of
 
 create
  ()TT;
- ()TT;
+ ()T1T;
 create
  (J)TT;
- (J)TT;
+ (J)T1T;
 create
  ([B)TT;
- ([B)TT;
+ ([B)T1T;
 group
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/java/util/regex/MatchResult.eea b/libs/eea-java-21/src/main/resources/java/util/regex/MatchResult.eea
index 2d800dfee1..88fc6aff8f 100644
--- a/libs/eea-java-21/src/main/resources/java/util/regex/MatchResult.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/regex/MatchResult.eea
@@ -14,7 +14,7 @@ group
  (Ljava/lang/String;)Ljava/lang/String;
 namedGroups
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Integer;>;
- ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Integer;>;
+ ()L1java/util/Map<Ljava/lang/String;Ljava/lang/Integer;>;
 start
  (Ljava/lang/String;)I
  (Ljava/lang/String;)I
diff --git a/libs/eea-java-21/src/main/resources/java/util/regex/Matcher.eea b/libs/eea-java-21/src/main/resources/java/util/regex/Matcher.eea
index 2998e71b63..f442ca92f0 100644
--- a/libs/eea-java-21/src/main/resources/java/util/regex/Matcher.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/regex/Matcher.eea
@@ -30,7 +30,7 @@ group
  (L1java/lang/String;)L0java/lang/String;
 namedGroups
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Integer;>;
- ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Integer;>;
+ ()L1java/util/Map<Ljava/lang/String;Ljava/lang/Integer;>; # @Inherited(java.util.regex.MatchResult)
 pattern
  ()Ljava/util/regex/Pattern;
  ()L1java/util/regex/Pattern;
diff --git a/libs/eea-java-21/src/main/resources/java/util/spi/CurrencyNameProvider.eea b/libs/eea-java-21/src/main/resources/java/util/spi/CurrencyNameProvider.eea
index fa8345bfac..1bbac79254 100644
--- a/libs/eea-java-21/src/main/resources/java/util/spi/CurrencyNameProvider.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/spi/CurrencyNameProvider.eea
@@ -2,7 +2,7 @@ class java/util/spi/CurrencyNameProvider
 
 getDisplayName
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/util/Locale;)L0java/lang/String;
 getSymbol
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/java/util/spi/LocaleNameProvider.eea b/libs/eea-java-21/src/main/resources/java/util/spi/LocaleNameProvider.eea
index 3c8a30ace6..6e09f3b8fa 100644
--- a/libs/eea-java-21/src/main/resources/java/util/spi/LocaleNameProvider.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/spi/LocaleNameProvider.eea
@@ -8,13 +8,13 @@ getDisplayLanguage
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
 getDisplayScript
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/util/Locale;)L0java/lang/String;
 getDisplayUnicodeExtensionKey
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/util/Locale;)L0java/lang/String;
 getDisplayUnicodeExtensionType
  (Ljava/lang/String;Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/util/Locale;)L0java/lang/String;
 getDisplayVariant
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/java/util/spi/TimeZoneNameProvider.eea b/libs/eea-java-21/src/main/resources/java/util/spi/TimeZoneNameProvider.eea
index 52c2775bcb..e69e361e86 100644
--- a/libs/eea-java-21/src/main/resources/java/util/spi/TimeZoneNameProvider.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/spi/TimeZoneNameProvider.eea
@@ -5,4 +5,4 @@ getDisplayName
  (Ljava/lang/String;ZILjava/util/Locale;)Ljava/lang/String;
 getGenericDisplayName
  (Ljava/lang/String;ILjava/util/Locale;)Ljava/lang/String;
- (Ljava/lang/String;ILjava/util/Locale;)Ljava/lang/String;
+ (Ljava/lang/String;ILjava/util/Locale;)L0java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/java/util/stream/DoubleStream.eea b/libs/eea-java-21/src/main/resources/java/util/stream/DoubleStream.eea
index c33757e37f..4b46f90185 100644
--- a/libs/eea-java-21/src/main/resources/java/util/stream/DoubleStream.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/stream/DoubleStream.eea
@@ -6,7 +6,7 @@ super java/util/stream/BaseStream
 
 builder
  ()Ljava/util/stream/DoubleStream$Builder;
- ()Ljava/util/stream/DoubleStream$Builder;
+ ()L1java/util/stream/DoubleStream$Builder;
 concat
  (Ljava/util/stream/DoubleStream;Ljava/util/stream/DoubleStream;)Ljava/util/stream/DoubleStream;
  (Ljava/util/stream/DoubleStream;Ljava/util/stream/DoubleStream;)Ljava/util/stream/DoubleStream;
diff --git a/libs/eea-java-21/src/main/resources/java/util/stream/Node$OfPrimitive.eea b/libs/eea-java-21/src/main/resources/java/util/stream/Node$OfPrimitive.eea
index 1ef25a4a11..120d20c21d 100644
--- a/libs/eea-java-21/src/main/resources/java/util/stream/Node$OfPrimitive.eea
+++ b/libs/eea-java-21/src/main/resources/java/util/stream/Node$OfPrimitive.eea
@@ -20,7 +20,7 @@ forEach
  (TT_CONS;)V
 getChild
  (I)TT_NODE;
- (I)TT_NODE;
+ (I)T1T_NODE;
 newArray
  (I)TT_ARR;
  (I)TT_ARR;
diff --git a/libs/eea-java-21/src/main/resources/javax/accessibility/AccessibleContext.eea b/libs/eea-java-21/src/main/resources/javax/accessibility/AccessibleContext.eea
index 2856d43f67..c7aae898f3 100644
--- a/libs/eea-java-21/src/main/resources/javax/accessibility/AccessibleContext.eea
+++ b/libs/eea-java-21/src/main/resources/javax/accessibility/AccessibleContext.eea
@@ -85,22 +85,22 @@ firePropertyChange
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
  (I)Ljavax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent;
 getAccessibleDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getAccessibleEditableText
  ()Ljavax/accessibility/AccessibleEditableText;
- ()Ljavax/accessibility/AccessibleEditableText;
+ ()L0javax/accessibility/AccessibleEditableText;
 getAccessibleIcon
  ()[Ljavax/accessibility/AccessibleIcon;
- ()[Ljavax/accessibility/AccessibleIcon;
+ ()[0Ljavax/accessibility/AccessibleIcon;
 getAccessibleName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -115,19 +115,19 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleTable
  ()Ljavax/accessibility/AccessibleTable;
- ()Ljavax/accessibility/AccessibleTable;
+ ()L0javax/accessibility/AccessibleTable;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue;
 getLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
diff --git a/libs/eea-java-21/src/main/resources/javax/accessibility/AccessibleRelation.eea b/libs/eea-java-21/src/main/resources/javax/accessibility/AccessibleRelation.eea
index aab3b33d3e..16ccc38606 100644
--- a/libs/eea-java-21/src/main/resources/javax/accessibility/AccessibleRelation.eea
+++ b/libs/eea-java-21/src/main/resources/javax/accessibility/AccessibleRelation.eea
@@ -87,7 +87,7 @@ getKey
  ()Ljava/lang/String;
 getTarget
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[1Ljava/lang/Object;
 setTarget
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/accessibility/AccessibleRelationSet.eea b/libs/eea-java-21/src/main/resources/javax/accessibility/AccessibleRelationSet.eea
index 75314e9871..8e57551574 100644
--- a/libs/eea-java-21/src/main/resources/javax/accessibility/AccessibleRelationSet.eea
+++ b/libs/eea-java-21/src/main/resources/javax/accessibility/AccessibleRelationSet.eea
@@ -18,13 +18,13 @@ contains
  (Ljava/lang/String;)Z
 get
  (Ljava/lang/String;)Ljavax/accessibility/AccessibleRelation;
- (Ljava/lang/String;)Ljavax/accessibility/AccessibleRelation;
+ (Ljava/lang/String;)L0javax/accessibility/AccessibleRelation;
 remove
  (Ljavax/accessibility/AccessibleRelation;)Z
  (Ljavax/accessibility/AccessibleRelation;)Z
 toArray
  ()[Ljavax/accessibility/AccessibleRelation;
- ()[Ljavax/accessibility/AccessibleRelation;
+ ()[1Ljavax/accessibility/AccessibleRelation;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/javax/accessibility/AccessibleStateSet.eea b/libs/eea-java-21/src/main/resources/javax/accessibility/AccessibleStateSet.eea
index 33cd259e79..f38cfa85dd 100644
--- a/libs/eea-java-21/src/main/resources/javax/accessibility/AccessibleStateSet.eea
+++ b/libs/eea-java-21/src/main/resources/javax/accessibility/AccessibleStateSet.eea
@@ -21,7 +21,7 @@ remove
  (Ljavax/accessibility/AccessibleState;)Z
 toArray
  ()[Ljavax/accessibility/AccessibleState;
- ()[Ljavax/accessibility/AccessibleState;
+ ()[1Ljavax/accessibility/AccessibleState;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/javax/annotation/processing/Completions.eea b/libs/eea-java-21/src/main/resources/javax/annotation/processing/Completions.eea
index 450a3e19d5..cb428658b1 100644
--- a/libs/eea-java-21/src/main/resources/javax/annotation/processing/Completions.eea
+++ b/libs/eea-java-21/src/main/resources/javax/annotation/processing/Completions.eea
@@ -2,7 +2,7 @@ class javax/annotation/processing/Completions
 
 of
  (Ljava/lang/String;)Ljavax/annotation/processing/Completion;
- (Ljava/lang/String;)Ljavax/annotation/processing/Completion;
+ (Ljava/lang/String;)L1javax/annotation/processing/Completion;
 of
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/annotation/processing/Completion;
- (Ljava/lang/String;Ljava/lang/String;)Ljavax/annotation/processing/Completion;
+ (Ljava/lang/String;Ljava/lang/String;)L1javax/annotation/processing/Completion;
diff --git a/libs/eea-java-21/src/main/resources/javax/annotation/processing/Filer.eea b/libs/eea-java-21/src/main/resources/javax/annotation/processing/Filer.eea
index 08377233c0..7e6baa3b6a 100644
--- a/libs/eea-java-21/src/main/resources/javax/annotation/processing/Filer.eea
+++ b/libs/eea-java-21/src/main/resources/javax/annotation/processing/Filer.eea
@@ -2,13 +2,13 @@ class javax/annotation/processing/Filer
 
 createClassFile
  (Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)Ljavax/tools/JavaFileObject;
- (Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)Ljavax/tools/JavaFileObject;
+ (Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)L1javax/tools/JavaFileObject;
 createResource
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/CharSequence;Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)Ljavax/tools/FileObject;
- (Ljavax/tools/JavaFileManager$Location;Ljava/lang/CharSequence;Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)Ljavax/tools/FileObject;
+ (Ljavax/tools/JavaFileManager$Location;Ljava/lang/CharSequence;Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)L1javax/tools/FileObject;
 createSourceFile
  (Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)Ljavax/tools/JavaFileObject;
- (Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)Ljavax/tools/JavaFileObject;
+ (Ljava/lang/CharSequence;[Ljavax/lang/model/element/Element;)L1javax/tools/JavaFileObject;
 getResource
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Ljavax/tools/FileObject;
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Ljavax/tools/FileObject;
diff --git a/libs/eea-java-21/src/main/resources/javax/crypto/CipherSpi.eea b/libs/eea-java-21/src/main/resources/javax/crypto/CipherSpi.eea
index 53c0ff1c0d..63c0e4e4a1 100644
--- a/libs/eea-java-21/src/main/resources/javax/crypto/CipherSpi.eea
+++ b/libs/eea-java-21/src/main/resources/javax/crypto/CipherSpi.eea
@@ -35,7 +35,7 @@ engineSetPadding
  (Ljava/lang/String;)V
 engineUnwrap
  ([BLjava/lang/String;I)Ljava/security/Key;
- ([BLjava/lang/String;I)Ljava/security/Key;
+ ([BLjava/lang/String;I)L1java/security/Key;
 engineUpdate
  (Ljava/nio/ByteBuffer;Ljava/nio/ByteBuffer;)I
  (Ljava/nio/ByteBuffer;Ljava/nio/ByteBuffer;)I
@@ -53,4 +53,4 @@ engineUpdateAAD
  ([BII)V
 engineWrap
  (Ljava/security/Key;)[B
- (Ljava/security/Key;)[B
+ (Ljava/security/Key;)[1B
diff --git a/libs/eea-java-21/src/main/resources/javax/crypto/EncryptedPrivateKeyInfo.eea b/libs/eea-java-21/src/main/resources/javax/crypto/EncryptedPrivateKeyInfo.eea
index acc9f0bdbf..9054a16f36 100644
--- a/libs/eea-java-21/src/main/resources/javax/crypto/EncryptedPrivateKeyInfo.eea
+++ b/libs/eea-java-21/src/main/resources/javax/crypto/EncryptedPrivateKeyInfo.eea
@@ -32,4 +32,4 @@ getKeySpec
  (Ljava/security/Key;Ljava/security/Provider;)Ljava/security/spec/PKCS8EncodedKeySpec;
 getKeySpec
  (Ljavax/crypto/Cipher;)Ljava/security/spec/PKCS8EncodedKeySpec;
- (Ljavax/crypto/Cipher;)Ljava/security/spec/PKCS8EncodedKeySpec;
+ (Ljavax/crypto/Cipher;)L1java/security/spec/PKCS8EncodedKeySpec;
diff --git a/libs/eea-java-21/src/main/resources/javax/crypto/KeyAgreement.eea b/libs/eea-java-21/src/main/resources/javax/crypto/KeyAgreement.eea
index 7ff50989eb..19c19cdf32 100644
--- a/libs/eea-java-21/src/main/resources/javax/crypto/KeyAgreement.eea
+++ b/libs/eea-java-21/src/main/resources/javax/crypto/KeyAgreement.eea
@@ -2,7 +2,7 @@ class javax/crypto/KeyAgreement
 
 getInstance
  (Ljava/lang/String;)Ljavax/crypto/KeyAgreement;
- (Ljava/lang/String;)Ljavax/crypto/KeyAgreement;
+ (Ljava/lang/String;)L1javax/crypto/KeyAgreement;
 getInstance
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/crypto/KeyAgreement;
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/crypto/KeyAgreement;
diff --git a/libs/eea-java-21/src/main/resources/javax/crypto/Mac.eea b/libs/eea-java-21/src/main/resources/javax/crypto/Mac.eea
index 5e5668237d..8d10b122a9 100644
--- a/libs/eea-java-21/src/main/resources/javax/crypto/Mac.eea
+++ b/libs/eea-java-21/src/main/resources/javax/crypto/Mac.eea
@@ -2,7 +2,7 @@ class javax/crypto/Mac
 
 getInstance
  (Ljava/lang/String;)Ljavax/crypto/Mac;
- (Ljava/lang/String;)Ljavax/crypto/Mac;
+ (Ljava/lang/String;)L1javax/crypto/Mac;
 getInstance
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/crypto/Mac;
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/crypto/Mac;
diff --git a/libs/eea-java-21/src/main/resources/javax/crypto/SecretKeyFactory.eea b/libs/eea-java-21/src/main/resources/javax/crypto/SecretKeyFactory.eea
index 5ebcc758a3..c3519c029f 100644
--- a/libs/eea-java-21/src/main/resources/javax/crypto/SecretKeyFactory.eea
+++ b/libs/eea-java-21/src/main/resources/javax/crypto/SecretKeyFactory.eea
@@ -2,7 +2,7 @@ class javax/crypto/SecretKeyFactory
 
 getInstance
  (Ljava/lang/String;)Ljavax/crypto/SecretKeyFactory;
- (Ljava/lang/String;)Ljavax/crypto/SecretKeyFactory;
+ (Ljava/lang/String;)L1javax/crypto/SecretKeyFactory;
 getInstance
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/crypto/SecretKeyFactory;
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/crypto/SecretKeyFactory;
diff --git a/libs/eea-java-21/src/main/resources/javax/crypto/spec/PBEKeySpec.eea b/libs/eea-java-21/src/main/resources/javax/crypto/spec/PBEKeySpec.eea
index bd5602ac54..42108d5f56 100644
--- a/libs/eea-java-21/src/main/resources/javax/crypto/spec/PBEKeySpec.eea
+++ b/libs/eea-java-21/src/main/resources/javax/crypto/spec/PBEKeySpec.eea
@@ -14,4 +14,4 @@ getPassword
  ()[C
 getSalt
  ()[B
- ()[B
+ ()[0B
diff --git a/libs/eea-java-21/src/main/resources/javax/imageio/IIOParam.eea b/libs/eea-java-21/src/main/resources/javax/imageio/IIOParam.eea
index c347c58f86..fd56a917db 100644
--- a/libs/eea-java-21/src/main/resources/javax/imageio/IIOParam.eea
+++ b/libs/eea-java-21/src/main/resources/javax/imageio/IIOParam.eea
@@ -33,10 +33,10 @@ getDestinationType
  ()Ljavax/imageio/ImageTypeSpecifier;
 getSourceBands
  ()[I
- ()[I
+ ()[0I
 getSourceRegion
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L0java/awt/Rectangle;
 setController
  (Ljavax/imageio/IIOParamController;)V
  (Ljavax/imageio/IIOParamController;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/imageio/ImageIO.eea b/libs/eea-java-21/src/main/resources/javax/imageio/ImageIO.eea
index 80a6db1dbd..b4dea909bf 100644
--- a/libs/eea-java-21/src/main/resources/javax/imageio/ImageIO.eea
+++ b/libs/eea-java-21/src/main/resources/javax/imageio/ImageIO.eea
@@ -2,16 +2,16 @@ class javax/imageio/ImageIO
 
 createImageInputStream
  (Ljava/lang/Object;)Ljavax/imageio/stream/ImageInputStream;
- (Ljava/lang/Object;)Ljavax/imageio/stream/ImageInputStream;
+ (Ljava/lang/Object;)L0javax/imageio/stream/ImageInputStream;
 createImageOutputStream
  (Ljava/lang/Object;)Ljavax/imageio/stream/ImageOutputStream;
- (Ljava/lang/Object;)Ljavax/imageio/stream/ImageOutputStream;
+ (Ljava/lang/Object;)L0javax/imageio/stream/ImageOutputStream;
 getCacheDirectory
  ()Ljava/io/File;
  ()Ljava/io/File;
 getImageReader
  (Ljavax/imageio/ImageWriter;)Ljavax/imageio/ImageReader;
- (Ljavax/imageio/ImageWriter;)Ljavax/imageio/ImageReader;
+ (Ljavax/imageio/ImageWriter;)L0javax/imageio/ImageReader;
 getImageReaders
  (Ljava/lang/Object;)Ljava/util/Iterator<Ljavax/imageio/ImageReader;>;
  (Ljava/lang/Object;)Ljava/util/Iterator<Ljavax/imageio/ImageReader;>;
@@ -29,7 +29,7 @@ getImageTranscoders
  (Ljavax/imageio/ImageReader;Ljavax/imageio/ImageWriter;)Ljava/util/Iterator<Ljavax/imageio/ImageTranscoder;>;
 getImageWriter
  (Ljavax/imageio/ImageReader;)Ljavax/imageio/ImageWriter;
- (Ljavax/imageio/ImageReader;)Ljavax/imageio/ImageWriter;
+ (Ljavax/imageio/ImageReader;)L0javax/imageio/ImageWriter;
 getImageWriters
  (Ljavax/imageio/ImageTypeSpecifier;Ljava/lang/String;)Ljava/util/Iterator<Ljavax/imageio/ImageWriter;>;
  (Ljavax/imageio/ImageTypeSpecifier;Ljava/lang/String;)Ljava/util/Iterator<Ljavax/imageio/ImageWriter;>;
@@ -71,7 +71,7 @@ read
  (Ljava/net/URL;)Ljava/awt/image/BufferedImage;
 read
  (Ljavax/imageio/stream/ImageInputStream;)Ljava/awt/image/BufferedImage;
- (Ljavax/imageio/stream/ImageInputStream;)Ljava/awt/image/BufferedImage;
+ (Ljavax/imageio/stream/ImageInputStream;)L0java/awt/image/BufferedImage;
 setCacheDirectory
  (Ljava/io/File;)V
  (Ljava/io/File;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/imageio/ImageReadParam.eea b/libs/eea-java-21/src/main/resources/javax/imageio/ImageReadParam.eea
index 82b35aa7df..225c56e3f6 100644
--- a/libs/eea-java-21/src/main/resources/javax/imageio/ImageReadParam.eea
+++ b/libs/eea-java-21/src/main/resources/javax/imageio/ImageReadParam.eea
@@ -15,7 +15,7 @@ getDestination
  ()Ljava/awt/image/BufferedImage;
 getDestinationBands
  ()[I
- ()[I
+ ()[0I
 getSourceRenderSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
diff --git a/libs/eea-java-21/src/main/resources/javax/imageio/ImageReader.eea b/libs/eea-java-21/src/main/resources/javax/imageio/ImageReader.eea
index 063973faab..172f8840b0 100644
--- a/libs/eea-java-21/src/main/resources/javax/imageio/ImageReader.eea
+++ b/libs/eea-java-21/src/main/resources/javax/imageio/ImageReader.eea
@@ -52,10 +52,10 @@ addIIOReadWarningListener
  (L1javax/imageio/event/IIOReadWarningListener;)V
 getAvailableLocales
  ()[Ljava/util/Locale;
- ()[Ljava/util/Locale;
+ ()[0Ljava/util/Locale;
 getDefaultReadParam
  ()Ljavax/imageio/ImageReadParam;
- ()Ljavax/imageio/ImageReadParam;
+ ()L1javax/imageio/ImageReadParam;
 getFormatName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -118,7 +118,7 @@ read
  (ILjavax/imageio/ImageReadParam;)Ljava/awt/image/BufferedImage;
 readAll
  (ILjavax/imageio/ImageReadParam;)Ljavax/imageio/IIOImage;
- (ILjavax/imageio/ImageReadParam;)Ljavax/imageio/IIOImage;
+ (ILjavax/imageio/ImageReadParam;)L1javax/imageio/IIOImage;
 readAll
  (Ljava/util/Iterator<+Ljavax/imageio/ImageReadParam;>;)Ljava/util/Iterator<Ljavax/imageio/IIOImage;>;
  (Ljava/util/Iterator<+Ljavax/imageio/ImageReadParam;>;)Ljava/util/Iterator<Ljavax/imageio/IIOImage;>;
@@ -127,10 +127,10 @@ readAsRenderedImage
  (ILjavax/imageio/ImageReadParam;)Ljava/awt/image/RenderedImage;
 readRaster
  (ILjavax/imageio/ImageReadParam;)Ljava/awt/image/Raster;
- (ILjavax/imageio/ImageReadParam;)Ljava/awt/image/Raster;
+ (ILjavax/imageio/ImageReadParam;)L1java/awt/image/Raster;
 readThumbnail
  (II)Ljava/awt/image/BufferedImage;
- (II)Ljava/awt/image/BufferedImage;
+ (II)L1java/awt/image/BufferedImage;
 readTile
  (III)Ljava/awt/image/BufferedImage;
  (III)Ljava/awt/image/BufferedImage;
diff --git a/libs/eea-java-21/src/main/resources/javax/imageio/ImageTypeSpecifier.eea b/libs/eea-java-21/src/main/resources/javax/imageio/ImageTypeSpecifier.eea
index c1dd1077d2..335eb11e08 100644
--- a/libs/eea-java-21/src/main/resources/javax/imageio/ImageTypeSpecifier.eea
+++ b/libs/eea-java-21/src/main/resources/javax/imageio/ImageTypeSpecifier.eea
@@ -2,28 +2,28 @@ class javax/imageio/ImageTypeSpecifier
 
 createBanded
  (Ljava/awt/color/ColorSpace;[I[IIZZ)Ljavax/imageio/ImageTypeSpecifier;
- (Ljava/awt/color/ColorSpace;[I[IIZZ)Ljavax/imageio/ImageTypeSpecifier;
+ (Ljava/awt/color/ColorSpace;[I[IIZZ)L1javax/imageio/ImageTypeSpecifier;
 createFromBufferedImageType
  (I)Ljavax/imageio/ImageTypeSpecifier;
- (I)Ljavax/imageio/ImageTypeSpecifier;
+ (I)L1javax/imageio/ImageTypeSpecifier;
 createFromRenderedImage
  (Ljava/awt/image/RenderedImage;)Ljavax/imageio/ImageTypeSpecifier;
- (Ljava/awt/image/RenderedImage;)Ljavax/imageio/ImageTypeSpecifier;
+ (Ljava/awt/image/RenderedImage;)L1javax/imageio/ImageTypeSpecifier;
 createGrayscale
  (IIZ)Ljavax/imageio/ImageTypeSpecifier;
- (IIZ)Ljavax/imageio/ImageTypeSpecifier;
+ (IIZ)L1javax/imageio/ImageTypeSpecifier;
 createGrayscale
  (IIZZ)Ljavax/imageio/ImageTypeSpecifier;
- (IIZZ)Ljavax/imageio/ImageTypeSpecifier;
+ (IIZZ)L1javax/imageio/ImageTypeSpecifier;
 createIndexed
  ([B[B[B[BII)Ljavax/imageio/ImageTypeSpecifier;
- ([B[B[B[BII)Ljavax/imageio/ImageTypeSpecifier;
+ ([B[B[B[BII)L1javax/imageio/ImageTypeSpecifier;
 createInterleaved
  (Ljava/awt/color/ColorSpace;[IIZZ)Ljavax/imageio/ImageTypeSpecifier;
- (Ljava/awt/color/ColorSpace;[IIZZ)Ljavax/imageio/ImageTypeSpecifier;
+ (Ljava/awt/color/ColorSpace;[IIZZ)L1javax/imageio/ImageTypeSpecifier;
 createPacked
  (Ljava/awt/color/ColorSpace;IIIIIZ)Ljavax/imageio/ImageTypeSpecifier;
- (Ljava/awt/color/ColorSpace;IIIIIZ)Ljavax/imageio/ImageTypeSpecifier;
+ (Ljava/awt/color/ColorSpace;IIIIIZ)L1javax/imageio/ImageTypeSpecifier;
 
 colorModel
  Ljava/awt/image/ColorModel;
@@ -40,7 +40,7 @@ sampleModel
  (Ljava/awt/image/RenderedImage;)V
 createBufferedImage
  (II)Ljava/awt/image/BufferedImage;
- (II)Ljava/awt/image/BufferedImage;
+ (II)L1java/awt/image/BufferedImage;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/javax/imageio/ImageWriteParam.eea b/libs/eea-java-21/src/main/resources/javax/imageio/ImageWriteParam.eea
index 0530ffdef0..0a9b1107fa 100644
--- a/libs/eea-java-21/src/main/resources/javax/imageio/ImageWriteParam.eea
+++ b/libs/eea-java-21/src/main/resources/javax/imageio/ImageWriteParam.eea
@@ -18,16 +18,16 @@ preferredTileSizes
  (Ljava/util/Locale;)V
 getCompressionQualityDescriptions
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String;
 getCompressionQualityValues
  ()[F
- ()[F
+ ()[0F
 getCompressionType
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getCompressionTypes
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String;
 getLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
diff --git a/libs/eea-java-21/src/main/resources/javax/imageio/ImageWriter.eea b/libs/eea-java-21/src/main/resources/javax/imageio/ImageWriter.eea
index 939d7848b7..b385898415 100644
--- a/libs/eea-java-21/src/main/resources/javax/imageio/ImageWriter.eea
+++ b/libs/eea-java-21/src/main/resources/javax/imageio/ImageWriter.eea
@@ -48,7 +48,7 @@ getDefaultStreamMetadata
  (Ljavax/imageio/ImageWriteParam;)Ljavax/imageio/metadata/IIOMetadata;
 getDefaultWriteParam
  ()Ljavax/imageio/ImageWriteParam;
- ()Ljavax/imageio/ImageWriteParam;
+ ()L1javax/imageio/ImageWriteParam;
 getLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
@@ -63,7 +63,7 @@ getOutput
  ()Ljava/lang/Object;
 getPreferredThumbnailSizes
  (Ljavax/imageio/ImageTypeSpecifier;Ljavax/imageio/ImageWriteParam;Ljavax/imageio/metadata/IIOMetadata;Ljavax/imageio/metadata/IIOMetadata;)[Ljava/awt/Dimension;
- (Ljavax/imageio/ImageTypeSpecifier;Ljavax/imageio/ImageWriteParam;Ljavax/imageio/metadata/IIOMetadata;Ljavax/imageio/metadata/IIOMetadata;)[Ljava/awt/Dimension;
+ (Ljavax/imageio/ImageTypeSpecifier;Ljavax/imageio/ImageWriteParam;Ljavax/imageio/metadata/IIOMetadata;Ljavax/imageio/metadata/IIOMetadata;)[0Ljava/awt/Dimension;
 prepareInsertEmpty
  (ILjavax/imageio/ImageTypeSpecifier;IILjavax/imageio/metadata/IIOMetadata;Ljava/util/List<+Ljava/awt/image/BufferedImage;>;Ljavax/imageio/ImageWriteParam;)V
  (ILjavax/imageio/ImageTypeSpecifier;IILjavax/imageio/metadata/IIOMetadata;Ljava/util/List<+Ljava/awt/image/BufferedImage;>;Ljavax/imageio/ImageWriteParam;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/imageio/metadata/IIOMetadata.eea b/libs/eea-java-21/src/main/resources/javax/imageio/metadata/IIOMetadata.eea
index ea3da925ff..4c2fe4b3fd 100644
--- a/libs/eea-java-21/src/main/resources/javax/imageio/metadata/IIOMetadata.eea
+++ b/libs/eea-java-21/src/main/resources/javax/imageio/metadata/IIOMetadata.eea
@@ -33,43 +33,43 @@ getDefaultController
  ()Ljavax/imageio/metadata/IIOMetadataController;
 getExtraMetadataFormatNames
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String;
 getMetadataFormat
  (Ljava/lang/String;)Ljavax/imageio/metadata/IIOMetadataFormat;
  (Ljava/lang/String;)Ljavax/imageio/metadata/IIOMetadataFormat;
 getMetadataFormatNames
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String;
 getNativeMetadataFormatName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getStandardChromaNode
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L0javax/imageio/metadata/IIOMetadataNode;
 getStandardCompressionNode
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L0javax/imageio/metadata/IIOMetadataNode;
 getStandardDataNode
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L0javax/imageio/metadata/IIOMetadataNode;
 getStandardDimensionNode
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L0javax/imageio/metadata/IIOMetadataNode;
 getStandardDocumentNode
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L0javax/imageio/metadata/IIOMetadataNode;
 getStandardTextNode
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L0javax/imageio/metadata/IIOMetadataNode;
 getStandardTileNode
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L0javax/imageio/metadata/IIOMetadataNode;
 getStandardTransparencyNode
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L0javax/imageio/metadata/IIOMetadataNode;
 getStandardTree
  ()Ljavax/imageio/metadata/IIOMetadataNode;
- ()Ljavax/imageio/metadata/IIOMetadataNode;
+ ()L1javax/imageio/metadata/IIOMetadataNode;
 mergeTree
  (Ljava/lang/String;Lorg/w3c/dom/Node;)V
  (Ljava/lang/String;Lorg/w3c/dom/Node;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/imageio/metadata/IIOMetadataFormatImpl.eea b/libs/eea-java-21/src/main/resources/javax/imageio/metadata/IIOMetadataFormatImpl.eea
index 570c29bc8c..4f133d5d34 100644
--- a/libs/eea-java-21/src/main/resources/javax/imageio/metadata/IIOMetadataFormatImpl.eea
+++ b/libs/eea-java-21/src/main/resources/javax/imageio/metadata/IIOMetadataFormatImpl.eea
@@ -85,7 +85,7 @@ getAttributeValueType
  (Ljava/lang/String;Ljava/lang/String;)I
 getChildNames
  (Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/String;)[0Ljava/lang/String;
 getChildPolicy
  (Ljava/lang/String;)I
  (Ljava/lang/String;)I
diff --git a/libs/eea-java-21/src/main/resources/javax/imageio/metadata/IIOMetadataNode.eea b/libs/eea-java-21/src/main/resources/javax/imageio/metadata/IIOMetadataNode.eea
index 9b80865fa6..bed21003f8 100644
--- a/libs/eea-java-21/src/main/resources/javax/imageio/metadata/IIOMetadataNode.eea
+++ b/libs/eea-java-21/src/main/resources/javax/imageio/metadata/IIOMetadataNode.eea
@@ -26,7 +26,7 @@ getAttributeNodeNS
  (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/Attr;
 getAttributes
  ()Lorg/w3c/dom/NamedNodeMap;
- ()Lorg/w3c/dom/NamedNodeMap;
+ ()L1org/w3c/dom/NamedNodeMap;
 getBaseURI
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(org.w3c.dom.Node)
@@ -53,7 +53,7 @@ getLocalName
  ()L0java/lang/String; # @Inherited(org.w3c.dom.Node)
 getNamespaceURI
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getNextSibling
  ()Lorg/w3c/dom/Node;
  ()L0org/w3c/dom/Node; # @Inherited(org.w3c.dom.Node)
@@ -77,16 +77,16 @@ getPreviousSibling
  ()L0org/w3c/dom/Node; # @Inherited(org.w3c.dom.Node)
 getSchemaTypeInfo
  ()Lorg/w3c/dom/TypeInfo;
- ()Lorg/w3c/dom/TypeInfo;
+ ()L1org/w3c/dom/TypeInfo;
 getTagName
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(org.w3c.dom.Element)
 getTextContent
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getUserData
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
 getUserObject
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
@@ -113,7 +113,7 @@ isSupported
  (Ljava/lang/String;Ljava/lang/String;)Z
 item
  (I)Lorg/w3c/dom/Node;
- (I)Lorg/w3c/dom/Node;
+ (I)L0org/w3c/dom/Node;
 lookupNamespaceURI
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)L0java/lang/String; # @Inherited(org.w3c.dom.Node)
@@ -143,7 +143,7 @@ setAttributeNS
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 setAttributeNode
  (Lorg/w3c/dom/Attr;)Lorg/w3c/dom/Attr;
- (Lorg/w3c/dom/Attr;)Lorg/w3c/dom/Attr;
+ (Lorg/w3c/dom/Attr;)L0org/w3c/dom/Attr;
 setAttributeNodeNS
  (Lorg/w3c/dom/Attr;)Lorg/w3c/dom/Attr;
  (Lorg/w3c/dom/Attr;)Lorg/w3c/dom/Attr;
@@ -167,7 +167,7 @@ setTextContent
  (Ljava/lang/String;)V
 setUserData
  (Ljava/lang/String;Ljava/lang/Object;Lorg/w3c/dom/UserDataHandler;)Ljava/lang/Object;
- (Ljava/lang/String;Ljava/lang/Object;Lorg/w3c/dom/UserDataHandler;)Ljava/lang/Object;
+ (Ljava/lang/String;Ljava/lang/Object;Lorg/w3c/dom/UserDataHandler;)L1java/lang/Object;
 setUserObject
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/imageio/plugins/jpeg/JPEGImageReadParam.eea b/libs/eea-java-21/src/main/resources/javax/imageio/plugins/jpeg/JPEGImageReadParam.eea
index 71ba123e14..0e9fe601ff 100644
--- a/libs/eea-java-21/src/main/resources/javax/imageio/plugins/jpeg/JPEGImageReadParam.eea
+++ b/libs/eea-java-21/src/main/resources/javax/imageio/plugins/jpeg/JPEGImageReadParam.eea
@@ -2,13 +2,13 @@ class javax/imageio/plugins/jpeg/JPEGImageReadParam
 
 getACHuffmanTables
  ()[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
- ()[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
+ ()[0Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
 getDCHuffmanTables
  ()[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
- ()[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
+ ()[0Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
 getQTables
  ()[Ljavax/imageio/plugins/jpeg/JPEGQTable;
- ()[Ljavax/imageio/plugins/jpeg/JPEGQTable;
+ ()[0Ljavax/imageio/plugins/jpeg/JPEGQTable;
 setDecodeTables
  ([Ljavax/imageio/plugins/jpeg/JPEGQTable;[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;)V
  ([Ljavax/imageio/plugins/jpeg/JPEGQTable;[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/imageio/plugins/jpeg/JPEGImageWriteParam.eea b/libs/eea-java-21/src/main/resources/javax/imageio/plugins/jpeg/JPEGImageWriteParam.eea
index 72ed2dc8b0..14b724e756 100644
--- a/libs/eea-java-21/src/main/resources/javax/imageio/plugins/jpeg/JPEGImageWriteParam.eea
+++ b/libs/eea-java-21/src/main/resources/javax/imageio/plugins/jpeg/JPEGImageWriteParam.eea
@@ -5,19 +5,19 @@ class javax/imageio/plugins/jpeg/JPEGImageWriteParam
  (Ljava/util/Locale;)V
 getACHuffmanTables
  ()[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
- ()[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
+ ()[0Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
 getCompressionQualityDescriptions
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.imageio.ImageWriteParam)
 getCompressionQualityValues
  ()[F
- ()[F
+ ()[0F # @Inherited(javax.imageio.ImageWriteParam)
 getDCHuffmanTables
  ()[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
- ()[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
+ ()[0Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;
 getQTables
  ()[Ljavax/imageio/plugins/jpeg/JPEGQTable;
- ()[Ljavax/imageio/plugins/jpeg/JPEGQTable;
+ ()[0Ljavax/imageio/plugins/jpeg/JPEGQTable;
 setEncodeTables
  ([Ljavax/imageio/plugins/jpeg/JPEGQTable;[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;)V
  ([Ljavax/imageio/plugins/jpeg/JPEGQTable;[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;[Ljavax/imageio/plugins/jpeg/JPEGHuffmanTable;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/imageio/plugins/jpeg/JPEGQTable.eea b/libs/eea-java-21/src/main/resources/javax/imageio/plugins/jpeg/JPEGQTable.eea
index e923ecb798..793d18c003 100644
--- a/libs/eea-java-21/src/main/resources/javax/imageio/plugins/jpeg/JPEGQTable.eea
+++ b/libs/eea-java-21/src/main/resources/javax/imageio/plugins/jpeg/JPEGQTable.eea
@@ -18,7 +18,7 @@ K2Div2Chrominance
  ([I)V
 getScaledInstance
  (FZ)Ljavax/imageio/plugins/jpeg/JPEGQTable;
- (FZ)Ljavax/imageio/plugins/jpeg/JPEGQTable;
+ (FZ)L1javax/imageio/plugins/jpeg/JPEGQTable;
 getTable
  ()[I
  ()[I
diff --git a/libs/eea-java-21/src/main/resources/javax/imageio/plugins/tiff/TIFFDirectory.eea b/libs/eea-java-21/src/main/resources/javax/imageio/plugins/tiff/TIFFDirectory.eea
index 9a3eceae10..6af5cd2677 100644
--- a/libs/eea-java-21/src/main/resources/javax/imageio/plugins/tiff/TIFFDirectory.eea
+++ b/libs/eea-java-21/src/main/resources/javax/imageio/plugins/tiff/TIFFDirectory.eea
@@ -2,7 +2,7 @@ class javax/imageio/plugins/tiff/TIFFDirectory
 
 createFromMetadata
  (Ljavax/imageio/metadata/IIOMetadata;)Ljavax/imageio/plugins/tiff/TIFFDirectory;
- (Ljavax/imageio/metadata/IIOMetadata;)Ljavax/imageio/plugins/tiff/TIFFDirectory;
+ (Ljavax/imageio/metadata/IIOMetadata;)L1javax/imageio/plugins/tiff/TIFFDirectory;
 
 <init>
  ([Ljavax/imageio/plugins/tiff/TIFFTagSet;Ljavax/imageio/plugins/tiff/TIFFTag;)V
@@ -18,7 +18,7 @@ clone
  ()Ljavax/imageio/plugins/tiff/TIFFDirectory;
 getAsMetadata
  ()Ljavax/imageio/metadata/IIOMetadata;
- ()Ljavax/imageio/metadata/IIOMetadata;
+ ()L1javax/imageio/metadata/IIOMetadata;
 getParentTag
  ()Ljavax/imageio/plugins/tiff/TIFFTag;
  ()Ljavax/imageio/plugins/tiff/TIFFTag;
@@ -27,7 +27,7 @@ getTIFFField
  (I)Ljavax/imageio/plugins/tiff/TIFFField;
 getTIFFFields
  ()[Ljavax/imageio/plugins/tiff/TIFFField;
- ()[Ljavax/imageio/plugins/tiff/TIFFField;
+ ()[1Ljavax/imageio/plugins/tiff/TIFFField;
 getTag
  (I)Ljavax/imageio/plugins/tiff/TIFFTag;
  (I)Ljavax/imageio/plugins/tiff/TIFFTag;
diff --git a/libs/eea-java-21/src/main/resources/javax/imageio/plugins/tiff/TIFFField.eea b/libs/eea-java-21/src/main/resources/javax/imageio/plugins/tiff/TIFFField.eea
index 054b258a53..d262ff83e3 100644
--- a/libs/eea-java-21/src/main/resources/javax/imageio/plugins/tiff/TIFFField.eea
+++ b/libs/eea-java-21/src/main/resources/javax/imageio/plugins/tiff/TIFFField.eea
@@ -2,10 +2,10 @@ class javax/imageio/plugins/tiff/TIFFField
 
 createArrayForType
  (II)Ljava/lang/Object;
- (II)Ljava/lang/Object;
+ (II)L1java/lang/Object;
 createFromMetadataNode
  (Ljavax/imageio/plugins/tiff/TIFFTagSet;Lorg/w3c/dom/Node;)Ljavax/imageio/plugins/tiff/TIFFField;
- (Ljavax/imageio/plugins/tiff/TIFFTagSet;Lorg/w3c/dom/Node;)Ljavax/imageio/plugins/tiff/TIFFField;
+ (Ljavax/imageio/plugins/tiff/TIFFTagSet;Lorg/w3c/dom/Node;)L1javax/imageio/plugins/tiff/TIFFField;
 getTypeByName
  (Ljava/lang/String;)I
  (Ljava/lang/String;)I
@@ -48,7 +48,7 @@ getAsLongs
  ()[J
 getAsNativeNode
  ()Lorg/w3c/dom/Node;
- ()Lorg/w3c/dom/Node;
+ ()L1org/w3c/dom/Node;
 getAsRational
  (I)[J
  (I)[J
diff --git a/libs/eea-java-21/src/main/resources/javax/imageio/plugins/tiff/TIFFTag.eea b/libs/eea-java-21/src/main/resources/javax/imageio/plugins/tiff/TIFFTag.eea
index 1725fdf287..409fb8f1a3 100644
--- a/libs/eea-java-21/src/main/resources/javax/imageio/plugins/tiff/TIFFTag.eea
+++ b/libs/eea-java-21/src/main/resources/javax/imageio/plugins/tiff/TIFFTag.eea
@@ -21,10 +21,10 @@ getName
  ()Ljava/lang/String;
 getNamedValues
  ()[I
- ()[I
+ ()[1I
 getTagSet
  ()Ljavax/imageio/plugins/tiff/TIFFTagSet;
  ()Ljavax/imageio/plugins/tiff/TIFFTagSet;
 getValueName
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/imageio/spi/IIORegistry.eea b/libs/eea-java-21/src/main/resources/javax/imageio/spi/IIORegistry.eea
index 5ed8f1dbe8..35370f0254 100644
--- a/libs/eea-java-21/src/main/resources/javax/imageio/spi/IIORegistry.eea
+++ b/libs/eea-java-21/src/main/resources/javax/imageio/spi/IIORegistry.eea
@@ -2,4 +2,4 @@ class javax/imageio/spi/IIORegistry
 
 getDefaultInstance
  ()Ljavax/imageio/spi/IIORegistry;
- ()Ljavax/imageio/spi/IIORegistry;
+ ()L1javax/imageio/spi/IIORegistry;
diff --git a/libs/eea-java-21/src/main/resources/javax/imageio/spi/ImageInputStreamSpi.eea b/libs/eea-java-21/src/main/resources/javax/imageio/spi/ImageInputStreamSpi.eea
index bdb8677eaa..50f1207a4d 100644
--- a/libs/eea-java-21/src/main/resources/javax/imageio/spi/ImageInputStreamSpi.eea
+++ b/libs/eea-java-21/src/main/resources/javax/imageio/spi/ImageInputStreamSpi.eea
@@ -9,10 +9,10 @@ inputClass
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Class<*>;)V
 createInputStreamInstance
  (Ljava/lang/Object;)Ljavax/imageio/stream/ImageInputStream;
- (Ljava/lang/Object;)Ljavax/imageio/stream/ImageInputStream;
+ (Ljava/lang/Object;)L1javax/imageio/stream/ImageInputStream;
 createInputStreamInstance
  (Ljava/lang/Object;ZLjava/io/File;)Ljavax/imageio/stream/ImageInputStream;
- (Ljava/lang/Object;ZLjava/io/File;)Ljavax/imageio/stream/ImageInputStream;
+ (Ljava/lang/Object;ZLjava/io/File;)L1javax/imageio/stream/ImageInputStream;
 getInputClass
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
diff --git a/libs/eea-java-21/src/main/resources/javax/imageio/spi/ImageOutputStreamSpi.eea b/libs/eea-java-21/src/main/resources/javax/imageio/spi/ImageOutputStreamSpi.eea
index e0e3957b93..23a3557a01 100644
--- a/libs/eea-java-21/src/main/resources/javax/imageio/spi/ImageOutputStreamSpi.eea
+++ b/libs/eea-java-21/src/main/resources/javax/imageio/spi/ImageOutputStreamSpi.eea
@@ -9,10 +9,10 @@ outputClass
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Class<*>;)V
 createOutputStreamInstance
  (Ljava/lang/Object;)Ljavax/imageio/stream/ImageOutputStream;
- (Ljava/lang/Object;)Ljavax/imageio/stream/ImageOutputStream;
+ (Ljava/lang/Object;)L1javax/imageio/stream/ImageOutputStream;
 createOutputStreamInstance
  (Ljava/lang/Object;ZLjava/io/File;)Ljavax/imageio/stream/ImageOutputStream;
- (Ljava/lang/Object;ZLjava/io/File;)Ljavax/imageio/stream/ImageOutputStream;
+ (Ljava/lang/Object;ZLjava/io/File;)L1javax/imageio/stream/ImageOutputStream;
 getOutputClass
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
diff --git a/libs/eea-java-21/src/main/resources/javax/imageio/spi/ImageReaderSpi.eea b/libs/eea-java-21/src/main/resources/javax/imageio/spi/ImageReaderSpi.eea
index c8f60c8cbb..68b9f0578e 100644
--- a/libs/eea-java-21/src/main/resources/javax/imageio/spi/ImageReaderSpi.eea
+++ b/libs/eea-java-21/src/main/resources/javax/imageio/spi/ImageReaderSpi.eea
@@ -19,10 +19,10 @@ canDecodeInput
  (Ljava/lang/Object;)Z
 createReaderInstance
  ()Ljavax/imageio/ImageReader;
- ()Ljavax/imageio/ImageReader;
+ ()L1javax/imageio/ImageReader;
 createReaderInstance
  (Ljava/lang/Object;)Ljavax/imageio/ImageReader;
- (Ljava/lang/Object;)Ljavax/imageio/ImageReader;
+ (Ljava/lang/Object;)L1javax/imageio/ImageReader;
 getImageWriterSpiNames
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/imageio/spi/ImageTranscoderSpi.eea b/libs/eea-java-21/src/main/resources/javax/imageio/spi/ImageTranscoderSpi.eea
index ac15c2cd7a..d10514c15d 100644
--- a/libs/eea-java-21/src/main/resources/javax/imageio/spi/ImageTranscoderSpi.eea
+++ b/libs/eea-java-21/src/main/resources/javax/imageio/spi/ImageTranscoderSpi.eea
@@ -5,7 +5,7 @@ class javax/imageio/spi/ImageTranscoderSpi
  (Ljava/lang/String;Ljava/lang/String;)V
 createTranscoderInstance
  ()Ljavax/imageio/ImageTranscoder;
- ()Ljavax/imageio/ImageTranscoder;
+ ()L1javax/imageio/ImageTranscoder;
 getReaderServiceProviderName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/imageio/spi/ImageWriterSpi.eea b/libs/eea-java-21/src/main/resources/javax/imageio/spi/ImageWriterSpi.eea
index d9a3884876..bb7136daf8 100644
--- a/libs/eea-java-21/src/main/resources/javax/imageio/spi/ImageWriterSpi.eea
+++ b/libs/eea-java-21/src/main/resources/javax/imageio/spi/ImageWriterSpi.eea
@@ -22,10 +22,10 @@ canEncodeImage
  (Ljavax/imageio/ImageTypeSpecifier;)Z
 createWriterInstance
  ()Ljavax/imageio/ImageWriter;
- ()Ljavax/imageio/ImageWriter;
+ ()L1javax/imageio/ImageWriter;
 createWriterInstance
  (Ljava/lang/Object;)Ljavax/imageio/ImageWriter;
- (Ljava/lang/Object;)Ljavax/imageio/ImageWriter;
+ (Ljava/lang/Object;)L1javax/imageio/ImageWriter;
 getImageReaderSpiNames
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/imageio/spi/ServiceRegistry.eea b/libs/eea-java-21/src/main/resources/javax/imageio/spi/ServiceRegistry.eea
index 8d77a7663a..b45f2e88cd 100644
--- a/libs/eea-java-21/src/main/resources/javax/imageio/spi/ServiceRegistry.eea
+++ b/libs/eea-java-21/src/main/resources/javax/imageio/spi/ServiceRegistry.eea
@@ -27,10 +27,10 @@ getCategories
  ()Ljava/util/Iterator<Ljava/lang/Class<*>;>;
 getServiceProviderByClass
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)T0T;
 getServiceProviders
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljavax/imageio/spi/ServiceRegistry$Filter;Z)Ljava/util/Iterator<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljavax/imageio/spi/ServiceRegistry$Filter;Z)Ljava/util/Iterator<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljavax/imageio/spi/ServiceRegistry$Filter;Z)L1java/util/Iterator<TT;>;
 getServiceProviders
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Z)Ljava/util/Iterator<TT;>;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Z)Ljava/util/Iterator<TT;>;
diff --git a/libs/eea-java-21/src/main/resources/javax/lang/model/SourceVersion.eea b/libs/eea-java-21/src/main/resources/javax/lang/model/SourceVersion.eea
index 81bdbb87ca..758cd0343b 100644
--- a/libs/eea-java-21/src/main/resources/javax/lang/model/SourceVersion.eea
+++ b/libs/eea-java-21/src/main/resources/javax/lang/model/SourceVersion.eea
@@ -31,4 +31,4 @@ valueOf
 
 runtimeVersion
  ()Ljava/lang/Runtime$Version;
- ()Ljava/lang/Runtime$Version;
+ ()L0java/lang/Runtime$Version;
diff --git a/libs/eea-java-21/src/main/resources/javax/lang/model/element/ModuleElement$DirectiveVisitor.eea b/libs/eea-java-21/src/main/resources/javax/lang/model/element/ModuleElement$DirectiveVisitor.eea
index 0189cdee69..e8659adc82 100644
--- a/libs/eea-java-21/src/main/resources/javax/lang/model/element/ModuleElement$DirectiveVisitor.eea
+++ b/libs/eea-java-21/src/main/resources/javax/lang/model/element/ModuleElement$DirectiveVisitor.eea
@@ -22,7 +22,7 @@ visitRequires
  (Ljavax/lang/model/element/ModuleElement$RequiresDirective;TP;)TR;
 visitUnknown
  (Ljavax/lang/model/element/ModuleElement$Directive;TP;)TR;
- (Ljavax/lang/model/element/ModuleElement$Directive;TP;)TR;
+ (Ljavax/lang/model/element/ModuleElement$Directive;TP;)T1R;
 visitUses
  (Ljavax/lang/model/element/ModuleElement$UsesDirective;TP;)TR;
  (Ljavax/lang/model/element/ModuleElement$UsesDirective;TP;)TR;
diff --git a/libs/eea-java-21/src/main/resources/javax/lang/model/util/AbstractAnnotationValueVisitor6.eea b/libs/eea-java-21/src/main/resources/javax/lang/model/util/AbstractAnnotationValueVisitor6.eea
index 1ba2cd34e2..e85c4e1458 100644
--- a/libs/eea-java-21/src/main/resources/javax/lang/model/util/AbstractAnnotationValueVisitor6.eea
+++ b/libs/eea-java-21/src/main/resources/javax/lang/model/util/AbstractAnnotationValueVisitor6.eea
@@ -14,4 +14,4 @@ visit
  (Ljavax/lang/model/element/AnnotationValue;TP;)TR;
 visitUnknown
  (Ljavax/lang/model/element/AnnotationValue;TP;)TR;
- (Ljavax/lang/model/element/AnnotationValue;TP;)TR;
+ (Ljavax/lang/model/element/AnnotationValue;TP;)T1R;
diff --git a/libs/eea-java-21/src/main/resources/javax/lang/model/util/Elements.eea b/libs/eea-java-21/src/main/resources/javax/lang/model/util/Elements.eea
index 9a13f991b1..005dc0d888 100644
--- a/libs/eea-java-21/src/main/resources/javax/lang/model/util/Elements.eea
+++ b/libs/eea-java-21/src/main/resources/javax/lang/model/util/Elements.eea
@@ -29,13 +29,13 @@ getElementValuesWithDefaults
  (Ljavax/lang/model/element/AnnotationMirror;)Ljava/util/Map<+Ljavax/lang/model/element/ExecutableElement;+Ljavax/lang/model/element/AnnotationValue;>;
 getFileObjectOf
  (Ljavax/lang/model/element/Element;)Ljavax/tools/JavaFileObject;
- (Ljavax/lang/model/element/Element;)Ljavax/tools/JavaFileObject;
+ (Ljavax/lang/model/element/Element;)L1javax/tools/JavaFileObject;
 getModuleElement
  (Ljava/lang/CharSequence;)Ljavax/lang/model/element/ModuleElement;
- (Ljava/lang/CharSequence;)Ljavax/lang/model/element/ModuleElement;
+ (Ljava/lang/CharSequence;)L0javax/lang/model/element/ModuleElement;
 getModuleOf
  (Ljavax/lang/model/element/Element;)Ljavax/lang/model/element/ModuleElement;
- (Ljavax/lang/model/element/Element;)Ljavax/lang/model/element/ModuleElement;
+ (Ljavax/lang/model/element/Element;)L0javax/lang/model/element/ModuleElement;
 getName
  (Ljava/lang/CharSequence;)Ljavax/lang/model/element/Name;
  (Ljava/lang/CharSequence;)Ljavax/lang/model/element/Name;
@@ -56,7 +56,7 @@ getPackageElement
  (Ljava/lang/CharSequence;)Ljavax/lang/model/element/PackageElement;
 getPackageElement
  (Ljavax/lang/model/element/ModuleElement;Ljava/lang/CharSequence;)Ljavax/lang/model/element/PackageElement;
- (Ljavax/lang/model/element/ModuleElement;Ljava/lang/CharSequence;)Ljavax/lang/model/element/PackageElement;
+ (Ljavax/lang/model/element/ModuleElement;Ljava/lang/CharSequence;)L0javax/lang/model/element/PackageElement;
 getPackageOf
  (Ljavax/lang/model/element/Element;)Ljavax/lang/model/element/PackageElement;
  (L1javax/lang/model/element/Element;)L0javax/lang/model/element/PackageElement;
@@ -65,7 +65,7 @@ getTypeElement
  (Ljava/lang/CharSequence;)Ljavax/lang/model/element/TypeElement;
 getTypeElement
  (Ljavax/lang/model/element/ModuleElement;Ljava/lang/CharSequence;)Ljavax/lang/model/element/TypeElement;
- (Ljavax/lang/model/element/ModuleElement;Ljava/lang/CharSequence;)Ljavax/lang/model/element/TypeElement;
+ (Ljavax/lang/model/element/ModuleElement;Ljava/lang/CharSequence;)L0javax/lang/model/element/TypeElement;
 hides
  (Ljavax/lang/model/element/Element;Ljavax/lang/model/element/Element;)Z
  (Ljavax/lang/model/element/Element;Ljavax/lang/model/element/Element;)Z
@@ -95,4 +95,4 @@ printElements
  (Ljava/io/Writer;[Ljavax/lang/model/element/Element;)V
 recordComponentFor
  (Ljavax/lang/model/element/ExecutableElement;)Ljavax/lang/model/element/RecordComponentElement;
- (Ljavax/lang/model/element/ExecutableElement;)Ljavax/lang/model/element/RecordComponentElement;
+ (Ljavax/lang/model/element/ExecutableElement;)L0javax/lang/model/element/RecordComponentElement;
diff --git a/libs/eea-java-21/src/main/resources/javax/management/AttributeValueExp.eea b/libs/eea-java-21/src/main/resources/javax/management/AttributeValueExp.eea
index 2ef9478507..31153855f3 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/AttributeValueExp.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/AttributeValueExp.eea
@@ -5,10 +5,10 @@ class javax/management/AttributeValueExp
  (Ljava/lang/String;)V
 apply
  (Ljavax/management/ObjectName;)Ljavax/management/ValueExp;
- (Ljavax/management/ObjectName;)Ljavax/management/ValueExp;
+ (Ljavax/management/ObjectName;)L1javax/management/ValueExp;
 getAttribute
  (Ljavax/management/ObjectName;)Ljava/lang/Object;
- (Ljavax/management/ObjectName;)Ljava/lang/Object;
+ (Ljavax/management/ObjectName;)L0java/lang/Object;
 getAttributeName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/management/ImmutableDescriptor.eea b/libs/eea-java-21/src/main/resources/javax/management/ImmutableDescriptor.eea
index dd72371f5b..56eeba7410 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/ImmutableDescriptor.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/ImmutableDescriptor.eea
@@ -28,13 +28,13 @@ getFieldNames
  ()[Ljava/lang/String;
 getFieldValue
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 getFieldValues
  ([Ljava/lang/String;)[Ljava/lang/Object;
  ([Ljava/lang/String;)[Ljava/lang/Object;
 getFields
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 removeField
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/management/MBeanServer.eea b/libs/eea-java-21/src/main/resources/javax/management/MBeanServer.eea
index ace980f19e..8374a8319a 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/MBeanServer.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/MBeanServer.eea
@@ -8,25 +8,25 @@ addNotificationListener
  (Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/management/NotificationFilter;Ljava/lang/Object;)V
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;)L1javax/management/ObjectInstance; # @Inherited(javax.management.MBeanServerConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;)L1javax/management/ObjectInstance; # @Inherited(javax.management.MBeanServerConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)L1javax/management/ObjectInstance; # @Inherited(javax.management.MBeanServerConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)L1javax/management/ObjectInstance; # @Inherited(javax.management.MBeanServerConnection)
 deserialize
  (Ljava/lang/String;Ljavax/management/ObjectName;[B)Ljava/io/ObjectInputStream;
- (Ljava/lang/String;Ljavax/management/ObjectName;[B)Ljava/io/ObjectInputStream;
+ (Ljava/lang/String;Ljavax/management/ObjectName;[B)L1java/io/ObjectInputStream;
 deserialize
  (Ljava/lang/String;[B)Ljava/io/ObjectInputStream;
- (Ljava/lang/String;[B)Ljava/io/ObjectInputStream;
+ (Ljava/lang/String;[B)L1java/io/ObjectInputStream;
 deserialize
  (Ljavax/management/ObjectName;[B)Ljava/io/ObjectInputStream;
- (Ljavax/management/ObjectName;[B)Ljava/io/ObjectInputStream;
+ (Ljavax/management/ObjectName;[B)L1java/io/ObjectInputStream;
 getAttribute
  (Ljavax/management/ObjectName;Ljava/lang/String;)Ljava/lang/Object;
  (Ljavax/management/ObjectName;Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-java-21/src/main/resources/javax/management/MBeanServerConnection.eea b/libs/eea-java-21/src/main/resources/javax/management/MBeanServerConnection.eea
index 3e8b9137df..63f9696e18 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/MBeanServerConnection.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/MBeanServerConnection.eea
@@ -8,16 +8,16 @@ addNotificationListener
  (Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/management/NotificationFilter;Ljava/lang/Object;)V
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;)L1javax/management/ObjectInstance;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;)L1javax/management/ObjectInstance;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)L1javax/management/ObjectInstance;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;[Ljava/lang/Object;[Ljava/lang/String;)L1javax/management/ObjectInstance;
 getAttribute
  (Ljavax/management/ObjectName;Ljava/lang/String;)Ljava/lang/Object;
  (Ljavax/management/ObjectName;Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-java-21/src/main/resources/javax/management/MBeanServerDelegate.eea b/libs/eea-java-21/src/main/resources/javax/management/MBeanServerDelegate.eea
index 06779316b8..68cffe6af6 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/MBeanServerDelegate.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/MBeanServerDelegate.eea
@@ -9,10 +9,10 @@ addNotificationListener
  (Ljavax/management/NotificationListener;Ljavax/management/NotificationFilter;Ljava/lang/Object;)V
 getImplementationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getImplementationVendor
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getImplementationVersion
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -21,16 +21,16 @@ getMBeanServerId
  ()Ljava/lang/String;
 getNotificationInfo
  ()[Ljavax/management/MBeanNotificationInfo;
- ()[Ljavax/management/MBeanNotificationInfo;
+ ()[1Ljavax/management/MBeanNotificationInfo;
 getSpecificationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSpecificationVendor
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSpecificationVersion
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 removeNotificationListener
  (Ljavax/management/NotificationListener;)V
  (L1javax/management/NotificationListener;)V # @Inherited(javax.management.NotificationBroadcaster)
diff --git a/libs/eea-java-21/src/main/resources/javax/management/ObjectName.eea b/libs/eea-java-21/src/main/resources/javax/management/ObjectName.eea
index 393f5d0eae..6321ded6d2 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/ObjectName.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/ObjectName.eea
@@ -10,22 +10,22 @@ WILDCARD
 
 getInstance
  (Ljava/lang/String;)Ljavax/management/ObjectName;
- (Ljava/lang/String;)Ljavax/management/ObjectName;
+ (Ljava/lang/String;)L1javax/management/ObjectName;
 getInstance
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/management/ObjectName;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/management/ObjectName;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1javax/management/ObjectName;
 getInstance
  (Ljava/lang/String;Ljava/util/Hashtable<Ljava/lang/String;Ljava/lang/String;>;)Ljavax/management/ObjectName;
- (Ljava/lang/String;Ljava/util/Hashtable<Ljava/lang/String;Ljava/lang/String;>;)Ljavax/management/ObjectName;
+ (Ljava/lang/String;Ljava/util/Hashtable<Ljava/lang/String;Ljava/lang/String;>;)L1javax/management/ObjectName;
 getInstance
  (Ljavax/management/ObjectName;)Ljavax/management/ObjectName;
  (Ljavax/management/ObjectName;)Ljavax/management/ObjectName;
 quote
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 unquote
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 
 <init>
  (Ljava/lang/String;)V
@@ -59,10 +59,10 @@ getKeyProperty
  (Ljava/lang/String;)Ljava/lang/String;
 getKeyPropertyList
  ()Ljava/util/Hashtable<Ljava/lang/String;Ljava/lang/String;>;
- ()Ljava/util/Hashtable<Ljava/lang/String;Ljava/lang/String;>;
+ ()L1java/util/Hashtable<Ljava/lang/String;Ljava/lang/String;>;
 getKeyPropertyListString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 isPropertyValuePattern
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-java-21/src/main/resources/javax/management/Query.eea b/libs/eea-java-21/src/main/resources/javax/management/Query.eea
index cd19300a3b..f6b1f455d8 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/Query.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/Query.eea
@@ -2,22 +2,22 @@ class javax/management/Query
 
 and
  (Ljavax/management/QueryExp;Ljavax/management/QueryExp;)Ljavax/management/QueryExp;
- (Ljavax/management/QueryExp;Ljavax/management/QueryExp;)Ljavax/management/QueryExp;
+ (Ljavax/management/QueryExp;Ljavax/management/QueryExp;)L1javax/management/QueryExp;
 anySubString
  (Ljavax/management/AttributeValueExp;Ljavax/management/StringValueExp;)Ljavax/management/QueryExp;
  (Ljavax/management/AttributeValueExp;Ljavax/management/StringValueExp;)Ljavax/management/QueryExp;
 attr
  (Ljava/lang/String;)Ljavax/management/AttributeValueExp;
- (Ljava/lang/String;)Ljavax/management/AttributeValueExp;
+ (Ljava/lang/String;)L1javax/management/AttributeValueExp;
 attr
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/management/AttributeValueExp;
- (Ljava/lang/String;Ljava/lang/String;)Ljavax/management/AttributeValueExp;
+ (Ljava/lang/String;Ljava/lang/String;)L1javax/management/AttributeValueExp;
 between
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/QueryExp;
- (Ljavax/management/ValueExp;Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/QueryExp;
+ (Ljavax/management/ValueExp;Ljavax/management/ValueExp;Ljavax/management/ValueExp;)L1javax/management/QueryExp;
 classattr
  ()Ljavax/management/AttributeValueExp;
- ()Ljavax/management/AttributeValueExp;
+ ()L1javax/management/AttributeValueExp;
 div
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/ValueExp;
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/ValueExp;
@@ -35,13 +35,13 @@ gt
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/QueryExp;
 in
  (Ljavax/management/ValueExp;[Ljavax/management/ValueExp;)Ljavax/management/QueryExp;
- (Ljavax/management/ValueExp;[Ljavax/management/ValueExp;)Ljavax/management/QueryExp;
+ (Ljavax/management/ValueExp;[Ljavax/management/ValueExp;)L1javax/management/QueryExp;
 initialSubString
  (Ljavax/management/AttributeValueExp;Ljavax/management/StringValueExp;)Ljavax/management/QueryExp;
  (Ljavax/management/AttributeValueExp;Ljavax/management/StringValueExp;)Ljavax/management/QueryExp;
 isInstanceOf
  (Ljavax/management/StringValueExp;)Ljavax/management/QueryExp;
- (Ljavax/management/StringValueExp;)Ljavax/management/QueryExp;
+ (Ljavax/management/StringValueExp;)L1javax/management/QueryExp;
 leq
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/QueryExp;
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/QueryExp;
@@ -50,16 +50,16 @@ lt
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/QueryExp;
 match
  (Ljavax/management/AttributeValueExp;Ljavax/management/StringValueExp;)Ljavax/management/QueryExp;
- (Ljavax/management/AttributeValueExp;Ljavax/management/StringValueExp;)Ljavax/management/QueryExp;
+ (Ljavax/management/AttributeValueExp;Ljavax/management/StringValueExp;)L1javax/management/QueryExp;
 minus
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/ValueExp;
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/ValueExp;
 not
  (Ljavax/management/QueryExp;)Ljavax/management/QueryExp;
- (Ljavax/management/QueryExp;)Ljavax/management/QueryExp;
+ (Ljavax/management/QueryExp;)L1javax/management/QueryExp;
 or
  (Ljavax/management/QueryExp;Ljavax/management/QueryExp;)Ljavax/management/QueryExp;
- (Ljavax/management/QueryExp;Ljavax/management/QueryExp;)Ljavax/management/QueryExp;
+ (Ljavax/management/QueryExp;Ljavax/management/QueryExp;)L1javax/management/QueryExp;
 plus
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/ValueExp;
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/ValueExp;
@@ -68,7 +68,7 @@ times
  (Ljavax/management/ValueExp;Ljavax/management/ValueExp;)Ljavax/management/ValueExp;
 value
  (D)Ljavax/management/ValueExp;
- (D)Ljavax/management/ValueExp;
+ (D)L1javax/management/ValueExp;
 value
  (F)Ljavax/management/ValueExp;
  (F)Ljavax/management/ValueExp;
@@ -77,13 +77,13 @@ value
  (I)Ljavax/management/ValueExp;
 value
  (J)Ljavax/management/ValueExp;
- (J)Ljavax/management/ValueExp;
+ (J)L1javax/management/ValueExp;
 value
  (Ljava/lang/Number;)Ljavax/management/ValueExp;
- (Ljava/lang/Number;)Ljavax/management/ValueExp;
+ (Ljava/lang/Number;)L1javax/management/ValueExp;
 value
  (Ljava/lang/String;)Ljavax/management/StringValueExp;
- (Ljava/lang/String;)Ljavax/management/StringValueExp;
+ (Ljava/lang/String;)L1javax/management/StringValueExp;
 value
  (Z)Ljavax/management/ValueExp;
- (Z)Ljavax/management/ValueExp;
+ (Z)L1javax/management/ValueExp;
diff --git a/libs/eea-java-21/src/main/resources/javax/management/StandardMBean.eea b/libs/eea-java-21/src/main/resources/javax/management/StandardMBean.eea
index ee6a5a71b8..97a3168b1a 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/StandardMBean.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/StandardMBean.eea
@@ -29,7 +29,7 @@ getClassName
  (Ljavax/management/MBeanInfo;)Ljava/lang/String;
 getConstructors
  ([Ljavax/management/MBeanConstructorInfo;Ljava/lang/Object;)[Ljavax/management/MBeanConstructorInfo;
- ([Ljavax/management/MBeanConstructorInfo;Ljava/lang/Object;)[Ljavax/management/MBeanConstructorInfo;
+ ([Ljavax/management/MBeanConstructorInfo;Ljava/lang/Object;)[0Ljavax/management/MBeanConstructorInfo;
 getDescription
  (Ljavax/management/MBeanAttributeInfo;)Ljava/lang/String;
  (Ljavax/management/MBeanAttributeInfo;)Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/management/loading/MLet.eea b/libs/eea-java-21/src/main/resources/javax/management/loading/MLet.eea
index 01bfee50f3..f154266682 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/loading/MLet.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/loading/MLet.eea
@@ -38,7 +38,7 @@ getLibraryDirectory
  ()Ljava/lang/String;
 getMBeansFromURL
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/Object;>;
- (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/Object;>;
+ (Ljava/lang/String;)L1java/util/Set<Ljava/lang/Object;>;
 getMBeansFromURL
  (Ljava/net/URL;)Ljava/util/Set<Ljava/lang/Object;>;
  (Ljava/net/URL;)Ljava/util/Set<Ljava/lang/Object;>;
diff --git a/libs/eea-java-21/src/main/resources/javax/management/modelmbean/DescriptorSupport.eea b/libs/eea-java-21/src/main/resources/javax/management/modelmbean/DescriptorSupport.eea
index 68c5d4b998..c02a2b7478 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/modelmbean/DescriptorSupport.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/modelmbean/DescriptorSupport.eea
@@ -20,16 +20,16 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getFieldNames
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 getFieldValue
  (Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;)Ljava/lang/Object;
 getFieldValues
  ([Ljava/lang/String;)[Ljava/lang/Object;
- ([Ljava/lang/String;)[Ljava/lang/Object;
+ ([Ljava/lang/String;)[1Ljava/lang/Object;
 getFields
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 removeField
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
@@ -44,4 +44,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toXMLString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/management/modelmbean/ModelMBeanInfoSupport.eea b/libs/eea-java-21/src/main/resources/javax/management/modelmbean/ModelMBeanInfoSupport.eea
index fd479f4e3d..32cd11d118 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/modelmbean/ModelMBeanInfoSupport.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/modelmbean/ModelMBeanInfoSupport.eea
@@ -26,10 +26,10 @@ getDescriptor
  (Ljava/lang/String;)Ljavax/management/Descriptor;
 getDescriptor
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/management/Descriptor;
- (Ljava/lang/String;Ljava/lang/String;)Ljavax/management/Descriptor;
+ (Ljava/lang/String;Ljava/lang/String;)L0javax/management/Descriptor;
 getDescriptors
  (Ljava/lang/String;)[Ljavax/management/Descriptor;
- (Ljava/lang/String;)[Ljavax/management/Descriptor;
+ (Ljava/lang/String;)[1Ljavax/management/Descriptor;
 getMBeanDescriptor
  ()Ljavax/management/Descriptor;
  ()Ljavax/management/Descriptor;
diff --git a/libs/eea-java-21/src/main/resources/javax/management/modelmbean/RequiredModelMBean.eea b/libs/eea-java-21/src/main/resources/javax/management/modelmbean/RequiredModelMBean.eea
index 63a295a360..afcb47b9ad 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/modelmbean/RequiredModelMBean.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/modelmbean/RequiredModelMBean.eea
@@ -14,7 +14,7 @@ getAttribute
  (Ljava/lang/String;)Ljava/lang/Object;
 getAttributes
  ([Ljava/lang/String;)Ljavax/management/AttributeList;
- ([Ljava/lang/String;)Ljavax/management/AttributeList;
+ ([Ljava/lang/String;)L1javax/management/AttributeList;
 getClassLoaderRepository
  ()Ljavax/management/loading/ClassLoaderRepository;
  ()Ljavax/management/loading/ClassLoaderRepository;
@@ -23,7 +23,7 @@ getMBeanInfo
  ()Ljavax/management/MBeanInfo;
 getNotificationInfo
  ()[Ljavax/management/MBeanNotificationInfo;
- ()[Ljavax/management/MBeanNotificationInfo;
+ ()[1Ljavax/management/MBeanNotificationInfo;
 invoke
  (Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/String;)Ljava/lang/Object;
@@ -59,7 +59,7 @@ setAttribute
  (Ljavax/management/Attribute;)V
 setAttributes
  (Ljavax/management/AttributeList;)Ljavax/management/AttributeList;
- (Ljavax/management/AttributeList;)Ljavax/management/AttributeList;
+ (Ljavax/management/AttributeList;)L1javax/management/AttributeList;
 setManagedResource
  (Ljava/lang/Object;Ljava/lang/String;)V
  (Ljava/lang/Object;Ljava/lang/String;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/management/monitor/CounterMonitor.eea b/libs/eea-java-21/src/main/resources/javax/management/monitor/CounterMonitor.eea
index 7368488e56..6bae4aa0e8 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/monitor/CounterMonitor.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/monitor/CounterMonitor.eea
@@ -2,7 +2,7 @@ class javax/management/monitor/CounterMonitor
 
 getDerivedGauge
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getDerivedGauge
  (Ljavax/management/ObjectName;)Ljava/lang/Number;
  (Ljavax/management/ObjectName;)Ljava/lang/Number;
@@ -26,7 +26,7 @@ getThreshold
  ()Ljava/lang/Number;
 getThreshold
  (Ljavax/management/ObjectName;)Ljava/lang/Number;
- (Ljavax/management/ObjectName;)Ljava/lang/Number;
+ (Ljavax/management/ObjectName;)L0java/lang/Number;
 setInitThreshold
  (Ljava/lang/Number;)V
  (Ljava/lang/Number;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/management/monitor/GaugeMonitor.eea b/libs/eea-java-21/src/main/resources/javax/management/monitor/GaugeMonitor.eea
index 9a43814c34..7bcbaf5b48 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/monitor/GaugeMonitor.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/monitor/GaugeMonitor.eea
@@ -2,7 +2,7 @@ class javax/management/monitor/GaugeMonitor
 
 getDerivedGauge
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getDerivedGauge
  (Ljavax/management/ObjectName;)Ljava/lang/Number;
  (Ljavax/management/ObjectName;)Ljava/lang/Number;
diff --git a/libs/eea-java-21/src/main/resources/javax/management/monitor/Monitor.eea b/libs/eea-java-21/src/main/resources/javax/management/monitor/Monitor.eea
index 993e9e2570..8382b4d672 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/monitor/Monitor.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/monitor/Monitor.eea
@@ -21,10 +21,10 @@ getObservedAttribute
  ()Ljava/lang/String;
 getObservedObject
  ()Ljavax/management/ObjectName;
- ()Ljavax/management/ObjectName;
+ ()L0javax/management/ObjectName;
 getObservedObjects
  ()[Ljavax/management/ObjectName;
- ()[Ljavax/management/ObjectName;
+ ()[1Ljavax/management/ObjectName;
 postRegister
  (Ljava/lang/Boolean;)V
  (Ljava/lang/Boolean;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/management/monitor/StringMonitor.eea b/libs/eea-java-21/src/main/resources/javax/management/monitor/StringMonitor.eea
index acf8c770c2..3c96ff1119 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/monitor/StringMonitor.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/monitor/StringMonitor.eea
@@ -2,7 +2,7 @@ class javax/management/monitor/StringMonitor
 
 getDerivedGauge
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getDerivedGauge
  (Ljavax/management/ObjectName;)Ljava/lang/String;
  (Ljavax/management/ObjectName;)Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/management/openmbean/CompositeDataSupport.eea b/libs/eea-java-21/src/main/resources/javax/management/openmbean/CompositeDataSupport.eea
index a6bc0a2951..d86cbc6fca 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/openmbean/CompositeDataSupport.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/openmbean/CompositeDataSupport.eea
@@ -20,7 +20,7 @@ get
  (Ljava/lang/String;)Ljava/lang/Object;
 getAll
  ([Ljava/lang/String;)[Ljava/lang/Object;
- ([Ljava/lang/String;)[Ljava/lang/Object;
+ ([Ljava/lang/String;)[1Ljava/lang/Object;
 getCompositeType
  ()Ljavax/management/openmbean/CompositeType;
  ()Ljavax/management/openmbean/CompositeType;
diff --git a/libs/eea-java-21/src/main/resources/javax/management/relation/MBeanServerNotificationFilter.eea b/libs/eea-java-21/src/main/resources/javax/management/relation/MBeanServerNotificationFilter.eea
index 3d5e5fac0b..a3df2336fe 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/relation/MBeanServerNotificationFilter.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/relation/MBeanServerNotificationFilter.eea
@@ -8,10 +8,10 @@ enableObjectName
  (Ljavax/management/ObjectName;)V
 getDisabledObjectNames
  ()Ljava/util/Vector<Ljavax/management/ObjectName;>;
- ()Ljava/util/Vector<Ljavax/management/ObjectName;>;
+ ()L0java/util/Vector<Ljavax/management/ObjectName;>;
 getEnabledObjectNames
  ()Ljava/util/Vector<Ljavax/management/ObjectName;>;
- ()Ljava/util/Vector<Ljavax/management/ObjectName;>;
+ ()L0java/util/Vector<Ljavax/management/ObjectName;>;
 isNotificationEnabled
  (Ljavax/management/Notification;)Z
  (Ljavax/management/Notification;)Z
diff --git a/libs/eea-java-21/src/main/resources/javax/management/relation/RelationService.eea b/libs/eea-java-21/src/main/resources/javax/management/relation/RelationService.eea
index 93ec74b4a5..e4b5eeef97 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/relation/RelationService.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/relation/RelationService.eea
@@ -20,19 +20,19 @@ createRelationType
  (Ljava/lang/String;[Ljavax/management/relation/RoleInfo;)V
 findAssociatedMBeans
  (Ljavax/management/ObjectName;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map<Ljavax/management/ObjectName;Ljava/util/List<Ljava/lang/String;>;>;
- (Ljavax/management/ObjectName;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map<Ljavax/management/ObjectName;Ljava/util/List<Ljava/lang/String;>;>;
+ (Ljavax/management/ObjectName;Ljava/lang/String;Ljava/lang/String;)L1java/util/Map<Ljavax/management/ObjectName;Ljava/util/List<Ljava/lang/String;>;>;
 findReferencingRelations
  (Ljavax/management/ObjectName;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;
- (Ljavax/management/ObjectName;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;
+ (Ljavax/management/ObjectName;Ljava/lang/String;Ljava/lang/String;)L1java/util/Map<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;
 findRelationsOfType
  (Ljava/lang/String;)Ljava/util/List<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/List<Ljava/lang/String;>;
+ (Ljava/lang/String;)L1java/util/List<Ljava/lang/String;>;
 getAllRelationIds
  ()Ljava/util/List<Ljava/lang/String;>;
- ()Ljava/util/List<Ljava/lang/String;>;
+ ()L1java/util/List<Ljava/lang/String;>;
 getAllRelationTypeNames
  ()Ljava/util/List<Ljava/lang/String;>;
- ()Ljava/util/List<Ljava/lang/String;>;
+ ()L1java/util/List<Ljava/lang/String;>;
 getAllRoles
  (Ljava/lang/String;)Ljavax/management/relation/RoleResult;
  (Ljava/lang/String;)Ljavax/management/relation/RoleResult;
@@ -47,7 +47,7 @@ getRelationTypeName
  (Ljava/lang/String;)Ljava/lang/String;
 getRole
  (Ljava/lang/String;Ljava/lang/String;)Ljava/util/List<Ljavax/management/ObjectName;>;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/util/List<Ljavax/management/ObjectName;>;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/util/List<Ljavax/management/ObjectName;>;
 getRoleCardinality
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Integer;
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Integer;
@@ -71,7 +71,7 @@ isRelation
  (Ljavax/management/ObjectName;)Ljava/lang/String;
 isRelationMBean
  (Ljava/lang/String;)Ljavax/management/ObjectName;
- (Ljava/lang/String;)Ljavax/management/ObjectName;
+ (Ljava/lang/String;)L0javax/management/ObjectName;
 postRegister
  (Ljava/lang/Boolean;)V
  (Ljava/lang/Boolean;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/management/relation/RelationSupport.eea b/libs/eea-java-21/src/main/resources/javax/management/relation/RelationSupport.eea
index dd3350e0fa..caa6b49a8e 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/relation/RelationSupport.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/relation/RelationSupport.eea
@@ -11,7 +11,7 @@ getAllRoles
  ()Ljavax/management/relation/RoleResult;
 getReferencedMBeans
  ()Ljava/util/Map<Ljavax/management/ObjectName;Ljava/util/List<Ljava/lang/String;>;>;
- ()Ljava/util/Map<Ljavax/management/ObjectName;Ljava/util/List<Ljava/lang/String;>;>;
+ ()L1java/util/Map<Ljavax/management/ObjectName;Ljava/util/List<Ljava/lang/String;>;>;
 getRelationId
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -44,7 +44,7 @@ preRegister
  (Ljavax/management/MBeanServer;Ljavax/management/ObjectName;)Ljavax/management/ObjectName;
 retrieveAllRoles
  ()Ljavax/management/relation/RoleList;
- ()Ljavax/management/relation/RoleList;
+ ()L1javax/management/relation/RoleList;
 setRelationServiceManagementFlag
  (Ljava/lang/Boolean;)V
  (Ljava/lang/Boolean;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/management/relation/RelationTypeSupport.eea b/libs/eea-java-21/src/main/resources/javax/management/relation/RelationTypeSupport.eea
index f4dab79cc4..56712c5bf7 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/relation/RelationTypeSupport.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/relation/RelationTypeSupport.eea
@@ -17,4 +17,4 @@ getRoleInfo
  (Ljava/lang/String;)Ljavax/management/relation/RoleInfo;
 getRoleInfos
  ()Ljava/util/List<Ljavax/management/relation/RoleInfo;>;
- ()Ljava/util/List<Ljavax/management/relation/RoleInfo;>;
+ ()L1java/util/List<Ljavax/management/relation/RoleInfo;>;
diff --git a/libs/eea-java-21/src/main/resources/javax/management/relation/Role.eea b/libs/eea-java-21/src/main/resources/javax/management/relation/Role.eea
index 5e20a76f59..e3385a36ef 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/relation/Role.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/relation/Role.eea
@@ -2,7 +2,7 @@ class javax/management/relation/Role
 
 roleValueToString
  (Ljava/util/List<Ljavax/management/ObjectName;>;)Ljava/lang/String;
- (Ljava/util/List<Ljavax/management/ObjectName;>;)Ljava/lang/String;
+ (Ljava/util/List<Ljavax/management/ObjectName;>;)L1java/lang/String;
 
 <init>
  (Ljava/lang/String;Ljava/util/List<Ljavax/management/ObjectName;>;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/management/remote/rmi/RMIConnection.eea b/libs/eea-java-21/src/main/resources/javax/management/remote/rmi/RMIConnection.eea
index 1934fdb326..739f21e022 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/remote/rmi/RMIConnection.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/remote/rmi/RMIConnection.eea
@@ -8,16 +8,16 @@ addNotificationListeners
  ([Ljavax/management/ObjectName;[Ljava/rmi/MarshalledObject;[Ljavax/security/auth/Subject;)[Ljava/lang/Integer;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance;
 fetchNotifications
  (JIJ)Ljavax/management/remote/NotificationResult;
  (JIJ)Ljavax/management/remote/NotificationResult;
diff --git a/libs/eea-java-21/src/main/resources/javax/management/remote/rmi/RMIConnectionImpl.eea b/libs/eea-java-21/src/main/resources/javax/management/remote/rmi/RMIConnectionImpl.eea
index 0c18f7e290..cab2e91d94 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/remote/rmi/RMIConnectionImpl.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/remote/rmi/RMIConnectionImpl.eea
@@ -8,22 +8,22 @@ addNotificationListener
  (Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;Ljava/rmi/MarshalledObject;Ljavax/security/auth/Subject;)V
 addNotificationListeners
  ([Ljavax/management/ObjectName;[Ljava/rmi/MarshalledObject;[Ljavax/security/auth/Subject;)[Ljava/lang/Integer;
- ([Ljavax/management/ObjectName;[Ljava/rmi/MarshalledObject;[Ljavax/security/auth/Subject;)[Ljava/lang/Integer;
+ ([Ljavax/management/ObjectName;[Ljava/rmi/MarshalledObject;[Ljavax/security/auth/Subject;)[1Ljava/lang/Integer;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance; # @Inherited(javax.management.remote.rmi.RMIConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance; # @Inherited(javax.management.remote.rmi.RMIConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance; # @Inherited(javax.management.remote.rmi.RMIConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance; # @Inherited(javax.management.remote.rmi.RMIConnection)
 fetchNotifications
  (JIJ)Ljavax/management/remote/NotificationResult;
- (JIJ)Ljavax/management/remote/NotificationResult;
+ (JIJ)L0javax/management/remote/NotificationResult;
 getAttribute
  (Ljavax/management/ObjectName;Ljava/lang/String;Ljavax/security/auth/Subject;)Ljava/lang/Object;
  (Ljavax/management/ObjectName;Ljava/lang/String;Ljavax/security/auth/Subject;)Ljava/lang/Object;
diff --git a/libs/eea-java-21/src/main/resources/javax/management/remote/rmi/RMIConnectionImpl_Stub.eea b/libs/eea-java-21/src/main/resources/javax/management/remote/rmi/RMIConnectionImpl_Stub.eea
index 69225c12db..d5ae39362c 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/remote/rmi/RMIConnectionImpl_Stub.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/remote/rmi/RMIConnectionImpl_Stub.eea
@@ -11,16 +11,16 @@ addNotificationListeners
  ([Ljavax/management/ObjectName;[Ljava/rmi/MarshalledObject;[Ljavax/security/auth/Subject;)[Ljava/lang/Integer;
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance; # @Inherited(javax.management.remote.rmi.RMIConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljava/rmi/MarshalledObject;[Ljava/lang/String;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance; # @Inherited(javax.management.remote.rmi.RMIConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance; # @Inherited(javax.management.remote.rmi.RMIConnection)
 createMBean
  (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
- (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)Ljavax/management/ObjectInstance;
+ (Ljava/lang/String;Ljavax/management/ObjectName;Ljavax/security/auth/Subject;)L1javax/management/ObjectInstance; # @Inherited(javax.management.remote.rmi.RMIConnection)
 fetchNotifications
  (JIJ)Ljavax/management/remote/NotificationResult;
  (JIJ)Ljavax/management/remote/NotificationResult;
diff --git a/libs/eea-java-21/src/main/resources/javax/management/remote/rmi/RMIConnectorServer.eea b/libs/eea-java-21/src/main/resources/javax/management/remote/rmi/RMIConnectorServer.eea
index 2cfa788c4f..3407cfc1e2 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/remote/rmi/RMIConnectorServer.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/remote/rmi/RMIConnectorServer.eea
@@ -36,7 +36,7 @@ connectionOpened
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
 getAddress
  ()Ljavax/management/remote/JMXServiceURL;
- ()Ljavax/management/remote/JMXServiceURL;
+ ()L0javax/management/remote/JMXServiceURL;
 getAttributes
  ()Ljava/util/Map<Ljava/lang/String;*>;
  ()Ljava/util/Map<Ljava/lang/String;*>;
@@ -45,4 +45,4 @@ setMBeanServerForwarder
  (Ljavax/management/remote/MBeanServerForwarder;)V
 toJMXConnector
  (Ljava/util/Map<Ljava/lang/String;*>;)Ljavax/management/remote/JMXConnector;
- (Ljava/util/Map<Ljava/lang/String;*>;)Ljavax/management/remote/JMXConnector;
+ (Ljava/util/Map<Ljava/lang/String;*>;)L1javax/management/remote/JMXConnector;
diff --git a/libs/eea-java-21/src/main/resources/javax/management/remote/rmi/RMIJRMPServerImpl.eea b/libs/eea-java-21/src/main/resources/javax/management/remote/rmi/RMIJRMPServerImpl.eea
index d1b415967c..e2dc380f4c 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/remote/rmi/RMIJRMPServerImpl.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/remote/rmi/RMIJRMPServerImpl.eea
@@ -8,10 +8,10 @@ closeClient
  (Ljavax/management/remote/rmi/RMIConnection;)V
 getProtocol
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 makeClient
  (Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/remote/rmi/RMIConnection;
- (Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/remote/rmi/RMIConnection;
+ (Ljava/lang/String;Ljavax/security/auth/Subject;)L1javax/management/remote/rmi/RMIConnection;
 toStub
  ()Ljava/rmi/Remote;
  ()Ljava/rmi/Remote;
diff --git a/libs/eea-java-21/src/main/resources/javax/management/remote/rmi/RMIServerImpl.eea b/libs/eea-java-21/src/main/resources/javax/management/remote/rmi/RMIServerImpl.eea
index ee2dd03dac..77e86a2595 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/remote/rmi/RMIServerImpl.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/remote/rmi/RMIServerImpl.eea
@@ -20,7 +20,7 @@ getProtocol
  ()Ljava/lang/String;
 getVersion
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 makeClient
  (Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/remote/rmi/RMIConnection;
  (Ljava/lang/String;Ljavax/security/auth/Subject;)Ljavax/management/remote/rmi/RMIConnection;
diff --git a/libs/eea-java-21/src/main/resources/javax/management/timer/Timer.eea b/libs/eea-java-21/src/main/resources/javax/management/timer/Timer.eea
index bf43b96b85..9da1fb6637 100644
--- a/libs/eea-java-21/src/main/resources/javax/management/timer/Timer.eea
+++ b/libs/eea-java-21/src/main/resources/javax/management/timer/Timer.eea
@@ -14,34 +14,34 @@ addNotification
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;Ljava/util/Date;JJZ)Ljava/lang/Integer;
 getAllNotificationIDs
  ()Ljava/util/Vector<Ljava/lang/Integer;>;
- ()Ljava/util/Vector<Ljava/lang/Integer;>;
+ ()L1java/util/Vector<Ljava/lang/Integer;>;
 getDate
  (Ljava/lang/Integer;)Ljava/util/Date;
- (Ljava/lang/Integer;)Ljava/util/Date;
+ (Ljava/lang/Integer;)L0java/util/Date;
 getFixedRate
  (Ljava/lang/Integer;)Ljava/lang/Boolean;
- (Ljava/lang/Integer;)Ljava/lang/Boolean;
+ (Ljava/lang/Integer;)L0java/lang/Boolean;
 getNbOccurences
  (Ljava/lang/Integer;)Ljava/lang/Long;
- (Ljava/lang/Integer;)Ljava/lang/Long;
+ (Ljava/lang/Integer;)L0java/lang/Long;
 getNotificationIDs
  (Ljava/lang/String;)Ljava/util/Vector<Ljava/lang/Integer;>;
- (Ljava/lang/String;)Ljava/util/Vector<Ljava/lang/Integer;>;
+ (Ljava/lang/String;)L1java/util/Vector<Ljava/lang/Integer;>;
 getNotificationInfo
  ()[Ljavax/management/MBeanNotificationInfo;
  ()[Ljavax/management/MBeanNotificationInfo;
 getNotificationMessage
  (Ljava/lang/Integer;)Ljava/lang/String;
- (Ljava/lang/Integer;)Ljava/lang/String;
+ (Ljava/lang/Integer;)L0java/lang/String;
 getNotificationType
  (Ljava/lang/Integer;)Ljava/lang/String;
- (Ljava/lang/Integer;)Ljava/lang/String;
+ (Ljava/lang/Integer;)L0java/lang/String;
 getNotificationUserData
  (Ljava/lang/Integer;)Ljava/lang/Object;
- (Ljava/lang/Integer;)Ljava/lang/Object;
+ (Ljava/lang/Integer;)L0java/lang/Object;
 getPeriod
  (Ljava/lang/Integer;)Ljava/lang/Long;
- (Ljava/lang/Integer;)Ljava/lang/Long;
+ (Ljava/lang/Integer;)L0java/lang/Long;
 postRegister
  (Ljava/lang/Boolean;)V
  (Ljava/lang/Boolean;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/naming/CompositeName.eea b/libs/eea-java-21/src/main/resources/javax/naming/CompositeName.eea
index a353607940..7563c958b9 100644
--- a/libs/eea-java-21/src/main/resources/javax/naming/CompositeName.eea
+++ b/libs/eea-java-21/src/main/resources/javax/naming/CompositeName.eea
@@ -38,10 +38,10 @@ getAll
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
 getPrefix
  (I)Ljavax/naming/Name;
- (I)Ljavax/naming/Name;
+ (I)L1javax/naming/Name;
 getSuffix
  (I)Ljavax/naming/Name;
- (I)Ljavax/naming/Name;
+ (I)L1javax/naming/Name;
 remove
  (I)Ljava/lang/Object;
  (I)Ljava/lang/Object;
diff --git a/libs/eea-java-21/src/main/resources/javax/naming/CompoundName.eea b/libs/eea-java-21/src/main/resources/javax/naming/CompoundName.eea
index 7bc9135079..35c8ed9b25 100644
--- a/libs/eea-java-21/src/main/resources/javax/naming/CompoundName.eea
+++ b/libs/eea-java-21/src/main/resources/javax/naming/CompoundName.eea
@@ -42,10 +42,10 @@ getAll
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
 getPrefix
  (I)Ljavax/naming/Name;
- (I)Ljavax/naming/Name;
+ (I)L1javax/naming/Name;
 getSuffix
  (I)Ljavax/naming/Name;
- (I)Ljavax/naming/Name;
+ (I)L1javax/naming/Name;
 remove
  (I)Ljava/lang/Object;
  (I)Ljava/lang/Object;
diff --git a/libs/eea-java-21/src/main/resources/javax/naming/Context.eea b/libs/eea-java-21/src/main/resources/javax/naming/Context.eea
index d2f162699c..fcfc1da2e1 100644
--- a/libs/eea-java-21/src/main/resources/javax/naming/Context.eea
+++ b/libs/eea-java-21/src/main/resources/javax/naming/Context.eea
@@ -63,10 +63,10 @@ composeName
  (Ljavax/naming/Name;Ljavax/naming/Name;)Ljavax/naming/Name;
 createSubcontext
  (Ljava/lang/String;)Ljavax/naming/Context;
- (Ljava/lang/String;)Ljavax/naming/Context;
+ (Ljava/lang/String;)L1javax/naming/Context;
 createSubcontext
  (Ljavax/naming/Name;)Ljavax/naming/Context;
- (Ljavax/naming/Name;)Ljavax/naming/Context;
+ (Ljavax/naming/Name;)L1javax/naming/Context;
 destroySubcontext
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/naming/InitialContext.eea b/libs/eea-java-21/src/main/resources/javax/naming/InitialContext.eea
index f86cb3b7ce..91526ee959 100644
--- a/libs/eea-java-21/src/main/resources/javax/naming/InitialContext.eea
+++ b/libs/eea-java-21/src/main/resources/javax/naming/InitialContext.eea
@@ -34,10 +34,10 @@ composeName
  (Ljavax/naming/Name;Ljavax/naming/Name;)Ljavax/naming/Name;
 createSubcontext
  (Ljava/lang/String;)Ljavax/naming/Context;
- (Ljava/lang/String;)Ljavax/naming/Context;
+ (Ljava/lang/String;)L1javax/naming/Context; # @Inherited(javax.naming.Context)
 createSubcontext
  (Ljavax/naming/Name;)Ljavax/naming/Context;
- (Ljavax/naming/Name;)Ljavax/naming/Context;
+ (Ljavax/naming/Name;)L1javax/naming/Context; # @Inherited(javax.naming.Context)
 destroySubcontext
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/naming/LinkException.eea b/libs/eea-java-21/src/main/resources/javax/naming/LinkException.eea
index 261faab820..bb01fc325d 100644
--- a/libs/eea-java-21/src/main/resources/javax/naming/LinkException.eea
+++ b/libs/eea-java-21/src/main/resources/javax/naming/LinkException.eea
@@ -45,4 +45,4 @@ toString
  ()L1java/lang/String; # @Inherited(javax.naming.NamingException)
 toString
  (Z)Ljava/lang/String;
- (Z)Ljava/lang/String;
+ (Z)L1java/lang/String; # @Inherited(javax.naming.NamingException)
diff --git a/libs/eea-java-21/src/main/resources/javax/naming/NamingException.eea b/libs/eea-java-21/src/main/resources/javax/naming/NamingException.eea
index c89fcf5bb7..edf12903ea 100644
--- a/libs/eea-java-21/src/main/resources/javax/naming/NamingException.eea
+++ b/libs/eea-java-21/src/main/resources/javax/naming/NamingException.eea
@@ -60,4 +60,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Throwable)
 toString
  (Z)Ljava/lang/String;
- (Z)Ljava/lang/String;
+ (Z)L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/naming/Reference.eea b/libs/eea-java-21/src/main/resources/javax/naming/Reference.eea
index 86b94c0077..ceef018fd9 100644
--- a/libs/eea-java-21/src/main/resources/javax/naming/Reference.eea
+++ b/libs/eea-java-21/src/main/resources/javax/naming/Reference.eea
@@ -42,7 +42,7 @@ get
  (I)Ljavax/naming/RefAddr;
 get
  (Ljava/lang/String;)Ljavax/naming/RefAddr;
- (Ljava/lang/String;)Ljavax/naming/RefAddr;
+ (Ljava/lang/String;)L0javax/naming/RefAddr;
 getAll
  ()Ljava/util/Enumeration<Ljavax/naming/RefAddr;>;
  ()Ljava/util/Enumeration<Ljavax/naming/RefAddr;>;
diff --git a/libs/eea-java-21/src/main/resources/javax/naming/directory/BasicAttribute.eea b/libs/eea-java-21/src/main/resources/javax/naming/directory/BasicAttribute.eea
index 12036d3836..fa92249183 100644
--- a/libs/eea-java-21/src/main/resources/javax/naming/directory/BasicAttribute.eea
+++ b/libs/eea-java-21/src/main/resources/javax/naming/directory/BasicAttribute.eea
@@ -45,10 +45,10 @@ getAll
  ()Ljavax/naming/NamingEnumeration<*1>; # @Inherited(javax.naming.directory.Attribute)
 getAttributeDefinition
  ()Ljavax/naming/directory/DirContext;
- ()Ljavax/naming/directory/DirContext;
+ ()L1javax/naming/directory/DirContext;
 getAttributeSyntaxDefinition
  ()Ljavax/naming/directory/DirContext;
- ()Ljavax/naming/directory/DirContext;
+ ()L1javax/naming/directory/DirContext;
 getID
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/naming/directory/BasicAttributes.eea b/libs/eea-java-21/src/main/resources/javax/naming/directory/BasicAttributes.eea
index 537270a5b8..6ee3706779 100644
--- a/libs/eea-java-21/src/main/resources/javax/naming/directory/BasicAttributes.eea
+++ b/libs/eea-java-21/src/main/resources/javax/naming/directory/BasicAttributes.eea
@@ -17,7 +17,7 @@ get
  (L1java/lang/String;)L0javax/naming/directory/Attribute; # @Inherited(javax.naming.directory.Attributes)
 getAll
  ()Ljavax/naming/NamingEnumeration<Ljavax/naming/directory/Attribute;>;
- ()Ljavax/naming/NamingEnumeration<Ljavax/naming/directory/Attribute;>;
+ ()L1javax/naming/NamingEnumeration<Ljavax/naming/directory/Attribute;>;
 getIDs
  ()Ljavax/naming/NamingEnumeration<Ljava/lang/String;>;
  ()L1javax/naming/NamingEnumeration<Ljava/lang/String;>; # @Inherited(javax.naming.directory.Attributes)
diff --git a/libs/eea-java-21/src/main/resources/javax/naming/directory/DirContext.eea b/libs/eea-java-21/src/main/resources/javax/naming/directory/DirContext.eea
index b32f9a0ee9..48b217d591 100644
--- a/libs/eea-java-21/src/main/resources/javax/naming/directory/DirContext.eea
+++ b/libs/eea-java-21/src/main/resources/javax/naming/directory/DirContext.eea
@@ -8,10 +8,10 @@ bind
  (Ljavax/naming/Name;Ljava/lang/Object;Ljavax/naming/directory/Attributes;)V
 createSubcontext
  (Ljava/lang/String;Ljavax/naming/directory/Attributes;)Ljavax/naming/directory/DirContext;
- (Ljava/lang/String;Ljavax/naming/directory/Attributes;)Ljavax/naming/directory/DirContext;
+ (Ljava/lang/String;Ljavax/naming/directory/Attributes;)L1javax/naming/directory/DirContext;
 createSubcontext
  (Ljavax/naming/Name;Ljavax/naming/directory/Attributes;)Ljavax/naming/directory/DirContext;
- (Ljavax/naming/Name;Ljavax/naming/directory/Attributes;)Ljavax/naming/directory/DirContext;
+ (Ljavax/naming/Name;Ljavax/naming/directory/Attributes;)L1javax/naming/directory/DirContext;
 getAttributes
  (Ljava/lang/String;)Ljavax/naming/directory/Attributes;
  (Ljava/lang/String;)Ljavax/naming/directory/Attributes;
diff --git a/libs/eea-java-21/src/main/resources/javax/naming/directory/InitialDirContext.eea b/libs/eea-java-21/src/main/resources/javax/naming/directory/InitialDirContext.eea
index e79b41c0d5..7655e3fb67 100644
--- a/libs/eea-java-21/src/main/resources/javax/naming/directory/InitialDirContext.eea
+++ b/libs/eea-java-21/src/main/resources/javax/naming/directory/InitialDirContext.eea
@@ -11,10 +11,10 @@ bind
  (Ljavax/naming/Name;Ljava/lang/Object;Ljavax/naming/directory/Attributes;)V
 createSubcontext
  (Ljava/lang/String;Ljavax/naming/directory/Attributes;)Ljavax/naming/directory/DirContext;
- (Ljava/lang/String;Ljavax/naming/directory/Attributes;)Ljavax/naming/directory/DirContext;
+ (Ljava/lang/String;Ljavax/naming/directory/Attributes;)L1javax/naming/directory/DirContext; # @Inherited(javax.naming.directory.DirContext)
 createSubcontext
  (Ljavax/naming/Name;Ljavax/naming/directory/Attributes;)Ljavax/naming/directory/DirContext;
- (Ljavax/naming/Name;Ljavax/naming/directory/Attributes;)Ljavax/naming/directory/DirContext;
+ (Ljavax/naming/Name;Ljavax/naming/directory/Attributes;)L1javax/naming/directory/DirContext; # @Inherited(javax.naming.directory.DirContext)
 getAttributes
  (Ljava/lang/String;)Ljavax/naming/directory/Attributes;
  (Ljava/lang/String;)Ljavax/naming/directory/Attributes;
diff --git a/libs/eea-java-21/src/main/resources/javax/naming/ldap/ExtendedRequest.eea b/libs/eea-java-21/src/main/resources/javax/naming/ldap/ExtendedRequest.eea
index 1b404247e6..f189a4d9a4 100644
--- a/libs/eea-java-21/src/main/resources/javax/naming/ldap/ExtendedRequest.eea
+++ b/libs/eea-java-21/src/main/resources/javax/naming/ldap/ExtendedRequest.eea
@@ -2,7 +2,7 @@ class javax/naming/ldap/ExtendedRequest
 
 createExtendedResponse
  (Ljava/lang/String;[BII)Ljavax/naming/ldap/ExtendedResponse;
- (Ljava/lang/String;[BII)Ljavax/naming/ldap/ExtendedResponse;
+ (Ljava/lang/String;[BII)L1javax/naming/ldap/ExtendedResponse;
 getEncodedValue
  ()[B
  ()[B
diff --git a/libs/eea-java-21/src/main/resources/javax/naming/ldap/LdapName.eea b/libs/eea-java-21/src/main/resources/javax/naming/ldap/LdapName.eea
index 30152704e5..8c0eef185f 100644
--- a/libs/eea-java-21/src/main/resources/javax/naming/ldap/LdapName.eea
+++ b/libs/eea-java-21/src/main/resources/javax/naming/ldap/LdapName.eea
@@ -47,10 +47,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 get
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 getAll
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
- ()Ljava/util/Enumeration<Ljava/lang/String;>;
+ ()L1java/util/Enumeration<Ljava/lang/String;>;
 getPrefix
  (I)Ljavax/naming/Name;
  (I)Ljavax/naming/Name;
@@ -62,10 +62,10 @@ getRdns
  ()Ljava/util/List<Ljavax/naming/ldap/Rdn;>;
 getSuffix
  (I)Ljavax/naming/Name;
- (I)Ljavax/naming/Name;
+ (I)L0javax/naming/Name;
 remove
  (I)Ljava/lang/Object;
- (I)Ljava/lang/Object;
+ (I)L1java/lang/Object;
 startsWith
  (Ljava/util/List<Ljavax/naming/ldap/Rdn;>;)Z
  (Ljava/util/List<Ljavax/naming/ldap/Rdn;>;)Z
diff --git a/libs/eea-java-21/src/main/resources/javax/naming/ldap/PagedResultsResponseControl.eea b/libs/eea-java-21/src/main/resources/javax/naming/ldap/PagedResultsResponseControl.eea
index e9b3cd075d..b2d6097d7e 100644
--- a/libs/eea-java-21/src/main/resources/javax/naming/ldap/PagedResultsResponseControl.eea
+++ b/libs/eea-java-21/src/main/resources/javax/naming/ldap/PagedResultsResponseControl.eea
@@ -9,4 +9,4 @@ OID
  (Ljava/lang/String;Z[B)V
 getCookie
  ()[B
- ()[B
+ ()[0B
diff --git a/libs/eea-java-21/src/main/resources/javax/naming/ldap/StartTlsRequest.eea b/libs/eea-java-21/src/main/resources/javax/naming/ldap/StartTlsRequest.eea
index 25a705e506..0a65e59b66 100644
--- a/libs/eea-java-21/src/main/resources/javax/naming/ldap/StartTlsRequest.eea
+++ b/libs/eea-java-21/src/main/resources/javax/naming/ldap/StartTlsRequest.eea
@@ -6,10 +6,10 @@ OID
 
 createExtendedResponse
  (Ljava/lang/String;[BII)Ljavax/naming/ldap/ExtendedResponse;
- (Ljava/lang/String;[BII)Ljavax/naming/ldap/ExtendedResponse;
+ (Ljava/lang/String;[BII)L1javax/naming/ldap/ExtendedResponse; # @Inherited(javax.naming.ldap.ExtendedRequest)
 getEncodedValue
  ()[B
- ()[B
+ ()[0B
 getID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/naming/ldap/StartTlsResponse.eea b/libs/eea-java-21/src/main/resources/javax/naming/ldap/StartTlsResponse.eea
index 6a20714860..bcb1860c14 100644
--- a/libs/eea-java-21/src/main/resources/javax/naming/ldap/StartTlsResponse.eea
+++ b/libs/eea-java-21/src/main/resources/javax/naming/ldap/StartTlsResponse.eea
@@ -6,10 +6,10 @@ OID
 
 getEncodedValue
  ()[B
- ()[B
+ ()[0B
 getID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 negotiate
  ()Ljavax/net/ssl/SSLSession;
  ()Ljavax/net/ssl/SSLSession;
diff --git a/libs/eea-java-21/src/main/resources/javax/naming/spi/DirectoryManager.eea b/libs/eea-java-21/src/main/resources/javax/naming/spi/DirectoryManager.eea
index 552d69a54d..f7755c97d4 100644
--- a/libs/eea-java-21/src/main/resources/javax/naming/spi/DirectoryManager.eea
+++ b/libs/eea-java-21/src/main/resources/javax/naming/spi/DirectoryManager.eea
@@ -2,10 +2,10 @@ class javax/naming/spi/DirectoryManager
 
 getContinuationDirContext
  (Ljavax/naming/CannotProceedException;)Ljavax/naming/directory/DirContext;
- (Ljavax/naming/CannotProceedException;)Ljavax/naming/directory/DirContext;
+ (Ljavax/naming/CannotProceedException;)L1javax/naming/directory/DirContext;
 getObjectInstance
  (Ljava/lang/Object;Ljavax/naming/Name;Ljavax/naming/Context;Ljava/util/Hashtable<**>;Ljavax/naming/directory/Attributes;)Ljava/lang/Object;
  (Ljava/lang/Object;Ljavax/naming/Name;Ljavax/naming/Context;Ljava/util/Hashtable<**>;Ljavax/naming/directory/Attributes;)Ljava/lang/Object;
 getStateToBind
  (Ljava/lang/Object;Ljavax/naming/Name;Ljavax/naming/Context;Ljava/util/Hashtable<**>;Ljavax/naming/directory/Attributes;)Ljavax/naming/spi/DirStateFactory$Result;
- (Ljava/lang/Object;Ljavax/naming/Name;Ljavax/naming/Context;Ljava/util/Hashtable<**>;Ljavax/naming/directory/Attributes;)Ljavax/naming/spi/DirStateFactory$Result;
+ (Ljava/lang/Object;Ljavax/naming/Name;Ljavax/naming/Context;Ljava/util/Hashtable<**>;Ljavax/naming/directory/Attributes;)L1javax/naming/spi/DirStateFactory$Result;
diff --git a/libs/eea-java-21/src/main/resources/javax/naming/spi/InitialContextFactoryBuilder.eea b/libs/eea-java-21/src/main/resources/javax/naming/spi/InitialContextFactoryBuilder.eea
index 8da241c40a..22d2d30445 100644
--- a/libs/eea-java-21/src/main/resources/javax/naming/spi/InitialContextFactoryBuilder.eea
+++ b/libs/eea-java-21/src/main/resources/javax/naming/spi/InitialContextFactoryBuilder.eea
@@ -2,4 +2,4 @@ class javax/naming/spi/InitialContextFactoryBuilder
 
 createInitialContextFactory
  (Ljava/util/Hashtable<**>;)Ljavax/naming/spi/InitialContextFactory;
- (Ljava/util/Hashtable<**>;)Ljavax/naming/spi/InitialContextFactory;
+ (Ljava/util/Hashtable<**>;)L1javax/naming/spi/InitialContextFactory;
diff --git a/libs/eea-java-21/src/main/resources/javax/naming/spi/NamingManager.eea b/libs/eea-java-21/src/main/resources/javax/naming/spi/NamingManager.eea
index 681be23633..c1314c31fc 100644
--- a/libs/eea-java-21/src/main/resources/javax/naming/spi/NamingManager.eea
+++ b/libs/eea-java-21/src/main/resources/javax/naming/spi/NamingManager.eea
@@ -18,7 +18,7 @@ getStateToBind
  (Ljava/lang/Object;Ljavax/naming/Name;Ljavax/naming/Context;Ljava/util/Hashtable<**>;)Ljava/lang/Object;
 getURLContext
  (Ljava/lang/String;Ljava/util/Hashtable<**>;)Ljavax/naming/Context;
- (Ljava/lang/String;Ljava/util/Hashtable<**>;)Ljavax/naming/Context;
+ (Ljava/lang/String;Ljava/util/Hashtable<**>;)L0javax/naming/Context;
 setInitialContextFactoryBuilder
  (Ljavax/naming/spi/InitialContextFactoryBuilder;)V
  (Ljavax/naming/spi/InitialContextFactoryBuilder;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/naming/spi/ObjectFactoryBuilder.eea b/libs/eea-java-21/src/main/resources/javax/naming/spi/ObjectFactoryBuilder.eea
index a44a345470..475ae35699 100644
--- a/libs/eea-java-21/src/main/resources/javax/naming/spi/ObjectFactoryBuilder.eea
+++ b/libs/eea-java-21/src/main/resources/javax/naming/spi/ObjectFactoryBuilder.eea
@@ -2,4 +2,4 @@ class javax/naming/spi/ObjectFactoryBuilder
 
 createObjectFactory
  (Ljava/lang/Object;Ljava/util/Hashtable<**>;)Ljavax/naming/spi/ObjectFactory;
- (Ljava/lang/Object;Ljava/util/Hashtable<**>;)Ljavax/naming/spi/ObjectFactory;
+ (Ljava/lang/Object;Ljava/util/Hashtable<**>;)L1javax/naming/spi/ObjectFactory;
diff --git a/libs/eea-java-21/src/main/resources/javax/net/ServerSocketFactory.eea b/libs/eea-java-21/src/main/resources/javax/net/ServerSocketFactory.eea
index 341af7f869..f5c6c51b34 100644
--- a/libs/eea-java-21/src/main/resources/javax/net/ServerSocketFactory.eea
+++ b/libs/eea-java-21/src/main/resources/javax/net/ServerSocketFactory.eea
@@ -6,13 +6,13 @@ getDefault
 
 createServerSocket
  ()Ljava/net/ServerSocket;
- ()Ljava/net/ServerSocket;
+ ()L1java/net/ServerSocket;
 createServerSocket
  (I)Ljava/net/ServerSocket;
- (I)Ljava/net/ServerSocket;
+ (I)L1java/net/ServerSocket;
 createServerSocket
  (II)Ljava/net/ServerSocket;
- (II)Ljava/net/ServerSocket;
+ (II)L1java/net/ServerSocket;
 createServerSocket
  (IILjava/net/InetAddress;)Ljava/net/ServerSocket;
- (IILjava/net/InetAddress;)Ljava/net/ServerSocket;
+ (IILjava/net/InetAddress;)L1java/net/ServerSocket;
diff --git a/libs/eea-java-21/src/main/resources/javax/net/SocketFactory.eea b/libs/eea-java-21/src/main/resources/javax/net/SocketFactory.eea
index 3cd3910675..54db905521 100644
--- a/libs/eea-java-21/src/main/resources/javax/net/SocketFactory.eea
+++ b/libs/eea-java-21/src/main/resources/javax/net/SocketFactory.eea
@@ -6,16 +6,16 @@ getDefault
 
 createSocket
  ()Ljava/net/Socket;
- ()Ljava/net/Socket;
+ ()L1java/net/Socket;
 createSocket
  (Ljava/lang/String;I)Ljava/net/Socket;
- (Ljava/lang/String;I)Ljava/net/Socket;
+ (Ljava/lang/String;I)L1java/net/Socket;
 createSocket
  (Ljava/lang/String;ILjava/net/InetAddress;I)Ljava/net/Socket;
- (Ljava/lang/String;ILjava/net/InetAddress;I)Ljava/net/Socket;
+ (Ljava/lang/String;ILjava/net/InetAddress;I)L1java/net/Socket;
 createSocket
  (Ljava/net/InetAddress;I)Ljava/net/Socket;
- (Ljava/net/InetAddress;I)Ljava/net/Socket;
+ (Ljava/net/InetAddress;I)L1java/net/Socket;
 createSocket
  (Ljava/net/InetAddress;ILjava/net/InetAddress;I)Ljava/net/Socket;
- (Ljava/net/InetAddress;ILjava/net/InetAddress;I)Ljava/net/Socket;
+ (Ljava/net/InetAddress;ILjava/net/InetAddress;I)L1java/net/Socket;
diff --git a/libs/eea-java-21/src/main/resources/javax/net/ssl/ExtendedSSLSession.eea b/libs/eea-java-21/src/main/resources/javax/net/ssl/ExtendedSSLSession.eea
index c8f49de935..8700664eaf 100644
--- a/libs/eea-java-21/src/main/resources/javax/net/ssl/ExtendedSSLSession.eea
+++ b/libs/eea-java-21/src/main/resources/javax/net/ssl/ExtendedSSLSession.eea
@@ -8,7 +8,7 @@ getPeerSupportedSignatureAlgorithms
  ()[Ljava/lang/String;
 getRequestedServerNames
  ()Ljava/util/List<Ljavax/net/ssl/SNIServerName;>;
- ()Ljava/util/List<Ljavax/net/ssl/SNIServerName;>;
+ ()L1java/util/List<Ljavax/net/ssl/SNIServerName;>;
 getStatusResponses
  ()Ljava/util/List<[B>;
- ()Ljava/util/List<[B>;
+ ()L1java/util/List<[B>;
diff --git a/libs/eea-java-21/src/main/resources/javax/net/ssl/HttpsURLConnection.eea b/libs/eea-java-21/src/main/resources/javax/net/ssl/HttpsURLConnection.eea
index c82e64021c..2cbab8a85d 100644
--- a/libs/eea-java-21/src/main/resources/javax/net/ssl/HttpsURLConnection.eea
+++ b/libs/eea-java-21/src/main/resources/javax/net/ssl/HttpsURLConnection.eea
@@ -31,7 +31,7 @@ getLocalCertificates
  ()[Ljava/security/cert/Certificate;
 getLocalPrincipal
  ()Ljava/security/Principal;
- ()Ljava/security/Principal;
+ ()L0java/security/Principal;
 getPeerPrincipal
  ()Ljava/security/Principal;
  ()Ljava/security/Principal;
diff --git a/libs/eea-java-21/src/main/resources/javax/net/ssl/KeyManagerFactory.eea b/libs/eea-java-21/src/main/resources/javax/net/ssl/KeyManagerFactory.eea
index 907f85b544..af4a14e596 100644
--- a/libs/eea-java-21/src/main/resources/javax/net/ssl/KeyManagerFactory.eea
+++ b/libs/eea-java-21/src/main/resources/javax/net/ssl/KeyManagerFactory.eea
@@ -2,7 +2,7 @@ class javax/net/ssl/KeyManagerFactory
 
 getDefaultAlgorithm
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getInstance
  (Ljava/lang/String;)Ljavax/net/ssl/KeyManagerFactory;
  (Ljava/lang/String;)Ljavax/net/ssl/KeyManagerFactory;
diff --git a/libs/eea-java-21/src/main/resources/javax/net/ssl/SNIHostName.eea b/libs/eea-java-21/src/main/resources/javax/net/ssl/SNIHostName.eea
index ca434c7a71..8fc47d5513 100644
--- a/libs/eea-java-21/src/main/resources/javax/net/ssl/SNIHostName.eea
+++ b/libs/eea-java-21/src/main/resources/javax/net/ssl/SNIHostName.eea
@@ -2,7 +2,7 @@ class javax/net/ssl/SNIHostName
 
 createSNIMatcher
  (Ljava/lang/String;)Ljavax/net/ssl/SNIMatcher;
- (Ljava/lang/String;)Ljavax/net/ssl/SNIMatcher;
+ (Ljava/lang/String;)L1javax/net/ssl/SNIMatcher;
 
 <init>
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLContext.eea b/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLContext.eea
index 7df6dcf8a4..9bb1ab25d3 100644
--- a/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLContext.eea
+++ b/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLContext.eea
@@ -21,10 +21,10 @@ setDefault
  (Ljavax/net/ssl/SSLContextSpi;Ljava/security/Provider;Ljava/lang/String;)V
 createSSLEngine
  ()Ljavax/net/ssl/SSLEngine;
- ()Ljavax/net/ssl/SSLEngine;
+ ()L1javax/net/ssl/SSLEngine;
 createSSLEngine
  (Ljava/lang/String;I)Ljavax/net/ssl/SSLEngine;
- (Ljava/lang/String;I)Ljavax/net/ssl/SSLEngine;
+ (Ljava/lang/String;I)L1javax/net/ssl/SSLEngine;
 getClientSessionContext
  ()Ljavax/net/ssl/SSLSessionContext;
  ()Ljavax/net/ssl/SSLSessionContext;
diff --git a/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLEngine.eea b/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLEngine.eea
index ba28fd745a..2729128c45 100644
--- a/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLEngine.eea
+++ b/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLEngine.eea
@@ -5,7 +5,7 @@ class javax/net/ssl/SSLEngine
  (Ljava/lang/String;I)V
 getApplicationProtocol
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getDelegatedTask
  ()Ljava/lang/Runnable;
  ()Ljava/lang/Runnable;
@@ -17,13 +17,13 @@ getEnabledProtocols
  ()[Ljava/lang/String;
 getHandshakeApplicationProtocol
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getHandshakeApplicationProtocolSelector
  ()Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLEngine;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
- ()Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLEngine;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
+ ()L1java/util/function/BiFunction<Ljavax/net/ssl/SSLEngine;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
 getHandshakeSession
  ()Ljavax/net/ssl/SSLSession;
- ()Ljavax/net/ssl/SSLSession;
+ ()L1javax/net/ssl/SSLSession;
 getHandshakeStatus
  ()Ljavax/net/ssl/SSLEngineResult$HandshakeStatus;
  ()Ljavax/net/ssl/SSLEngineResult$HandshakeStatus;
@@ -32,7 +32,7 @@ getPeerHost
  ()Ljava/lang/String;
 getSSLParameters
  ()Ljavax/net/ssl/SSLParameters;
- ()Ljavax/net/ssl/SSLParameters;
+ ()L1javax/net/ssl/SSLParameters;
 getSession
  ()Ljavax/net/ssl/SSLSession;
  ()Ljavax/net/ssl/SSLSession;
diff --git a/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLParameters.eea b/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLParameters.eea
index 1d4e336838..4e74c53c7a 100644
--- a/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLParameters.eea
+++ b/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLParameters.eea
@@ -26,10 +26,10 @@ getProtocols
  ()[Ljava/lang/String;
 getSNIMatchers
  ()Ljava/util/Collection<Ljavax/net/ssl/SNIMatcher;>;
- ()Ljava/util/Collection<Ljavax/net/ssl/SNIMatcher;>;
+ ()L0java/util/Collection<Ljavax/net/ssl/SNIMatcher;>;
 getServerNames
  ()Ljava/util/List<Ljavax/net/ssl/SNIServerName;>;
- ()Ljava/util/List<Ljavax/net/ssl/SNIServerName;>;
+ ()L0java/util/List<Ljavax/net/ssl/SNIServerName;>;
 getSignatureSchemes
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLServerSocket.eea b/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLServerSocket.eea
index ef7465695f..16d134aad6 100644
--- a/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLServerSocket.eea
+++ b/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLServerSocket.eea
@@ -11,7 +11,7 @@ getEnabledProtocols
  ()[Ljava/lang/String;
 getSSLParameters
  ()Ljavax/net/ssl/SSLParameters;
- ()Ljavax/net/ssl/SSLParameters;
+ ()L1javax/net/ssl/SSLParameters;
 getSupportedCipherSuites
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLSession.eea b/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLSession.eea
index abdcb3ff95..bbad32201d 100644
--- a/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLSession.eea
+++ b/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLSession.eea
@@ -14,7 +14,7 @@ getLocalPrincipal
  ()Ljava/security/Principal;
 getPeerCertificateChain
  ()[Ljavax/security/cert/X509Certificate;
- ()[Ljavax/security/cert/X509Certificate;
+ ()[1Ljavax/security/cert/X509Certificate;
 getPeerCertificates
  ()[Ljava/security/cert/Certificate;
  ()[Ljava/security/cert/Certificate;
diff --git a/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLSocket.eea b/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLSocket.eea
index 394b0b49a7..982b0d12f8 100644
--- a/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLSocket.eea
+++ b/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLSocket.eea
@@ -17,7 +17,7 @@ addHandshakeCompletedListener
  (L1javax/net/ssl/HandshakeCompletedListener;)V
 getApplicationProtocol
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getEnabledCipherSuites
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
@@ -26,16 +26,16 @@ getEnabledProtocols
  ()[Ljava/lang/String;
 getHandshakeApplicationProtocol
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getHandshakeApplicationProtocolSelector
  ()Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLSocket;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
- ()Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLSocket;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
+ ()L1java/util/function/BiFunction<Ljavax/net/ssl/SSLSocket;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
 getHandshakeSession
  ()Ljavax/net/ssl/SSLSession;
- ()Ljavax/net/ssl/SSLSession;
+ ()L1javax/net/ssl/SSLSession;
 getSSLParameters
  ()Ljavax/net/ssl/SSLParameters;
- ()Ljavax/net/ssl/SSLParameters;
+ ()L1javax/net/ssl/SSLParameters;
 getSession
  ()Ljavax/net/ssl/SSLSession;
  ()Ljavax/net/ssl/SSLSession;
diff --git a/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLSocketFactory.eea b/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLSocketFactory.eea
index 1950029695..f6fd2e482a 100644
--- a/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLSocketFactory.eea
+++ b/libs/eea-java-21/src/main/resources/javax/net/ssl/SSLSocketFactory.eea
@@ -6,10 +6,10 @@ getDefault
 
 createSocket
  (Ljava/net/Socket;Ljava/io/InputStream;Z)Ljava/net/Socket;
- (Ljava/net/Socket;Ljava/io/InputStream;Z)Ljava/net/Socket;
+ (Ljava/net/Socket;Ljava/io/InputStream;Z)L1java/net/Socket;
 createSocket
  (Ljava/net/Socket;Ljava/lang/String;IZ)Ljava/net/Socket;
- (Ljava/net/Socket;Ljava/lang/String;IZ)Ljava/net/Socket;
+ (Ljava/net/Socket;Ljava/lang/String;IZ)L1java/net/Socket;
 getDefaultCipherSuites
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/net/ssl/X509ExtendedKeyManager.eea b/libs/eea-java-21/src/main/resources/javax/net/ssl/X509ExtendedKeyManager.eea
index f74f47ee83..9f341c1755 100644
--- a/libs/eea-java-21/src/main/resources/javax/net/ssl/X509ExtendedKeyManager.eea
+++ b/libs/eea-java-21/src/main/resources/javax/net/ssl/X509ExtendedKeyManager.eea
@@ -2,7 +2,7 @@ class javax/net/ssl/X509ExtendedKeyManager
 
 chooseEngineClientAlias
  ([Ljava/lang/String;[Ljava/security/Principal;Ljavax/net/ssl/SSLEngine;)Ljava/lang/String;
- ([Ljava/lang/String;[Ljava/security/Principal;Ljavax/net/ssl/SSLEngine;)Ljava/lang/String;
+ ([Ljava/lang/String;[Ljava/security/Principal;Ljavax/net/ssl/SSLEngine;)L0java/lang/String;
 chooseEngineServerAlias
  (Ljava/lang/String;[Ljava/security/Principal;Ljavax/net/ssl/SSLEngine;)Ljava/lang/String;
- (Ljava/lang/String;[Ljava/security/Principal;Ljavax/net/ssl/SSLEngine;)Ljava/lang/String;
+ (Ljava/lang/String;[Ljava/security/Principal;Ljavax/net/ssl/SSLEngine;)L0java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/MultiDocPrintService.eea b/libs/eea-java-21/src/main/resources/javax/print/MultiDocPrintService.eea
index a4a31e4695..36aa1285c3 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/MultiDocPrintService.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/MultiDocPrintService.eea
@@ -2,4 +2,4 @@ class javax/print/MultiDocPrintService
 
 createMultiDocPrintJob
  ()Ljavax/print/MultiDocPrintJob;
- ()Ljavax/print/MultiDocPrintJob;
+ ()L1javax/print/MultiDocPrintJob;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/PrintService.eea b/libs/eea-java-21/src/main/resources/javax/print/PrintService.eea
index dc5a7f1d8c..ed93cb70a7 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/PrintService.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/PrintService.eea
@@ -5,7 +5,7 @@ addPrintServiceAttributeListener
  (L1javax/print/event/PrintServiceAttributeListener;)V
 createPrintJob
  ()Ljavax/print/DocPrintJob;
- ()Ljavax/print/DocPrintJob;
+ ()L1javax/print/DocPrintJob;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/PrintServiceLookup.eea b/libs/eea-java-21/src/main/resources/javax/print/PrintServiceLookup.eea
index 6491c8f13f..8f74fbd116 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/PrintServiceLookup.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/PrintServiceLookup.eea
@@ -2,7 +2,7 @@ class javax/print/PrintServiceLookup
 
 lookupDefaultPrintService
  ()Ljavax/print/PrintService;
- ()Ljavax/print/PrintService;
+ ()L0javax/print/PrintService;
 lookupMultiDocPrintServices
  ([Ljavax/print/DocFlavor;Ljavax/print/attribute/AttributeSet;)[Ljavax/print/MultiDocPrintService;
  ([Ljavax/print/DocFlavor;Ljavax/print/attribute/AttributeSet;)[Ljavax/print/MultiDocPrintService;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/AttributeSetUtilities.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/AttributeSetUtilities.eea
index 24f843268a..28f333e405 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/AttributeSetUtilities.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/AttributeSetUtilities.eea
@@ -2,34 +2,34 @@ class javax/print/attribute/AttributeSetUtilities
 
 synchronizedView
  (Ljavax/print/attribute/AttributeSet;)Ljavax/print/attribute/AttributeSet;
- (Ljavax/print/attribute/AttributeSet;)Ljavax/print/attribute/AttributeSet;
+ (Ljavax/print/attribute/AttributeSet;)L1javax/print/attribute/AttributeSet;
 synchronizedView
  (Ljavax/print/attribute/DocAttributeSet;)Ljavax/print/attribute/DocAttributeSet;
- (Ljavax/print/attribute/DocAttributeSet;)Ljavax/print/attribute/DocAttributeSet;
+ (Ljavax/print/attribute/DocAttributeSet;)L1javax/print/attribute/DocAttributeSet;
 synchronizedView
  (Ljavax/print/attribute/PrintJobAttributeSet;)Ljavax/print/attribute/PrintJobAttributeSet;
- (Ljavax/print/attribute/PrintJobAttributeSet;)Ljavax/print/attribute/PrintJobAttributeSet;
+ (Ljavax/print/attribute/PrintJobAttributeSet;)L1javax/print/attribute/PrintJobAttributeSet;
 synchronizedView
  (Ljavax/print/attribute/PrintRequestAttributeSet;)Ljavax/print/attribute/PrintRequestAttributeSet;
- (Ljavax/print/attribute/PrintRequestAttributeSet;)Ljavax/print/attribute/PrintRequestAttributeSet;
+ (Ljavax/print/attribute/PrintRequestAttributeSet;)L1javax/print/attribute/PrintRequestAttributeSet;
 synchronizedView
  (Ljavax/print/attribute/PrintServiceAttributeSet;)Ljavax/print/attribute/PrintServiceAttributeSet;
- (Ljavax/print/attribute/PrintServiceAttributeSet;)Ljavax/print/attribute/PrintServiceAttributeSet;
+ (Ljavax/print/attribute/PrintServiceAttributeSet;)L1javax/print/attribute/PrintServiceAttributeSet;
 unmodifiableView
  (Ljavax/print/attribute/AttributeSet;)Ljavax/print/attribute/AttributeSet;
- (Ljavax/print/attribute/AttributeSet;)Ljavax/print/attribute/AttributeSet;
+ (Ljavax/print/attribute/AttributeSet;)L1javax/print/attribute/AttributeSet;
 unmodifiableView
  (Ljavax/print/attribute/DocAttributeSet;)Ljavax/print/attribute/DocAttributeSet;
- (Ljavax/print/attribute/DocAttributeSet;)Ljavax/print/attribute/DocAttributeSet;
+ (Ljavax/print/attribute/DocAttributeSet;)L1javax/print/attribute/DocAttributeSet;
 unmodifiableView
  (Ljavax/print/attribute/PrintJobAttributeSet;)Ljavax/print/attribute/PrintJobAttributeSet;
- (Ljavax/print/attribute/PrintJobAttributeSet;)Ljavax/print/attribute/PrintJobAttributeSet;
+ (Ljavax/print/attribute/PrintJobAttributeSet;)L1javax/print/attribute/PrintJobAttributeSet;
 unmodifiableView
  (Ljavax/print/attribute/PrintRequestAttributeSet;)Ljavax/print/attribute/PrintRequestAttributeSet;
- (Ljavax/print/attribute/PrintRequestAttributeSet;)Ljavax/print/attribute/PrintRequestAttributeSet;
+ (Ljavax/print/attribute/PrintRequestAttributeSet;)L1javax/print/attribute/PrintRequestAttributeSet;
 unmodifiableView
  (Ljavax/print/attribute/PrintServiceAttributeSet;)Ljavax/print/attribute/PrintServiceAttributeSet;
- (Ljavax/print/attribute/PrintServiceAttributeSet;)Ljavax/print/attribute/PrintServiceAttributeSet;
+ (Ljavax/print/attribute/PrintServiceAttributeSet;)L1javax/print/attribute/PrintServiceAttributeSet;
 verifyAttributeCategory
  (Ljava/lang/Object;Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
  (Ljava/lang/Object;Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/DateTimeSyntax.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/DateTimeSyntax.eea
index c90ad40fa5..19809d7862 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/DateTimeSyntax.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/DateTimeSyntax.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getValue
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L1java/util/Date;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/EnumSyntax.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/EnumSyntax.eea
index afc9d899bc..0fe81e3bd5 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/EnumSyntax.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/EnumSyntax.eea
@@ -5,10 +5,10 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String;
 readResolve
  ()Ljava/lang/Object;
  ()L1java/lang/Object;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/HashAttributeSet.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/HashAttributeSet.eea
index 049d58155a..f1403c0911 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/HashAttributeSet.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/HashAttributeSet.eea
@@ -47,4 +47,4 @@ remove
  (Ljavax/print/attribute/Attribute;)Z
 toArray
  ()[Ljavax/print/attribute/Attribute;
- ()[Ljavax/print/attribute/Attribute;
+ ()[1Ljavax/print/attribute/Attribute;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/ResolutionSyntax.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/ResolutionSyntax.eea
index e02d80f007..2a89154c94 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/ResolutionSyntax.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/ResolutionSyntax.eea
@@ -14,4 +14,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toString
  (ILjava/lang/String;)Ljava/lang/String;
- (ILjava/lang/String;)Ljava/lang/String;
+ (ILjava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/SetOfIntegerSyntax.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/SetOfIntegerSyntax.eea
index 950c851b39..7a11989b47 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/SetOfIntegerSyntax.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/SetOfIntegerSyntax.eea
@@ -14,7 +14,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getMembers
  ()[[I
- ()[[I
+ ()[1[I
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/Size2DSyntax.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/Size2DSyntax.eea
index 2a4dfc7dd9..38059f0905 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/Size2DSyntax.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/Size2DSyntax.eea
@@ -11,4 +11,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toString
  (ILjava/lang/String;)Ljava/lang/String;
- (ILjava/lang/String;)Ljava/lang/String;
+ (ILjava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Chromaticity.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Chromaticity.eea
index ece2e75e7a..056f20a71f 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Chromaticity.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Chromaticity.eea
@@ -9,13 +9,13 @@ MONOCHROME
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/ColorSupported.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/ColorSupported.eea
index 0335595d1f..b0562e04c2 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/ColorSupported.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/ColorSupported.eea
@@ -9,13 +9,13 @@ SUPPORTED
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Compression.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Compression.eea
index 371853820d..f1994aebcc 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Compression.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Compression.eea
@@ -15,13 +15,13 @@ NONE
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Copies.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Copies.eea
index c96479e8da..6c6fb67c80 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Copies.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Copies.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/CopiesSupported.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/CopiesSupported.eea
index 301eb3ccd1..0a4f00d59d 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/CopiesSupported.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/CopiesSupported.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.SetOfIntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/DateTimeAtCompleted.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/DateTimeAtCompleted.eea
index ce0d0d92af..3ab9bbce9e 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/DateTimeAtCompleted.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/DateTimeAtCompleted.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.DateTimeSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/DateTimeAtCreation.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/DateTimeAtCreation.eea
index 2e88f101b9..5b8d6ef94e 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/DateTimeAtCreation.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/DateTimeAtCreation.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.DateTimeSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/DateTimeAtProcessing.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/DateTimeAtProcessing.eea
index 0b2dca17d1..b42f8a3dd6 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/DateTimeAtProcessing.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/DateTimeAtProcessing.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.DateTimeSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Destination.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Destination.eea
index b96455abb4..c3a6e36089 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Destination.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Destination.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.URISyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/DialogOwner.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/DialogOwner.eea
index 5e3a9296ac..c5da43f726 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/DialogOwner.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/DialogOwner.eea
@@ -5,10 +5,10 @@ class javax/print/attribute/standard/DialogOwner
  (Ljava/awt/Window;)V
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getOwner
  ()Ljava/awt/Window;
  ()Ljava/awt/Window;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/DialogTypeSelection.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/DialogTypeSelection.eea
index 9c47e594c1..ac80ea19bc 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/DialogTypeSelection.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/DialogTypeSelection.eea
@@ -9,13 +9,13 @@ NATIVE
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/DocumentName.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/DocumentName.eea
index 8a7c11b08c..f498d5d88d 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/DocumentName.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/DocumentName.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Fidelity.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Fidelity.eea
index 63bfa40ca0..58e13fd7f9 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Fidelity.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Fidelity.eea
@@ -9,13 +9,13 @@ FIDELITY_TRUE
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Finishings.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Finishings.eea
index 1357f6fefa..a6df56577d 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Finishings.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Finishings.eea
@@ -57,13 +57,13 @@ STAPLE_TOP_RIGHT
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobHoldUntil.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobHoldUntil.eea
index 684302182e..7ddcd5aabd 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobHoldUntil.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobHoldUntil.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.DateTimeSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobImpressions.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobImpressions.eea
index d5b341e72e..1d1d87f8bf 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobImpressions.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobImpressions.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobImpressionsCompleted.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobImpressionsCompleted.eea
index 7669b7f8fe..d51e218b18 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobImpressionsCompleted.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobImpressionsCompleted.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobImpressionsSupported.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobImpressionsSupported.eea
index 9f661af3bb..62c5785181 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobImpressionsSupported.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobImpressionsSupported.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.SetOfIntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobKOctets.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobKOctets.eea
index 16cd5fad4a..53e9ce573a 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobKOctets.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobKOctets.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobKOctetsProcessed.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobKOctetsProcessed.eea
index 7653e5f930..3aadaa1456 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobKOctetsProcessed.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobKOctetsProcessed.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobKOctetsSupported.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobKOctetsSupported.eea
index 0c07f0ddfd..0a395f470e 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobKOctetsSupported.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobKOctetsSupported.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.SetOfIntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobMediaSheets.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobMediaSheets.eea
index 8fe91af3a9..5fd24899d7 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobMediaSheets.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobMediaSheets.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobMediaSheetsCompleted.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobMediaSheetsCompleted.eea
index abb63547b1..54bf7823e8 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobMediaSheetsCompleted.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobMediaSheetsCompleted.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobMediaSheetsSupported.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobMediaSheetsSupported.eea
index 44613fdb6d..3397cf5ce2 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobMediaSheetsSupported.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobMediaSheetsSupported.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.SetOfIntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobMessageFromOperator.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobMessageFromOperator.eea
index c753b8f050..f8a341b9a4 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobMessageFromOperator.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobMessageFromOperator.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobName.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobName.eea
index 4730df9237..aae5a6c33f 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobName.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobName.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobOriginatingUserName.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobOriginatingUserName.eea
index 36f04e9683..30d2e684ba 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobOriginatingUserName.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobOriginatingUserName.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobPriority.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobPriority.eea
index 95c3c301e3..6969067515 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobPriority.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobPriority.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobPrioritySupported.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobPrioritySupported.eea
index 2027309a54..541b1651f1 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobPrioritySupported.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobPrioritySupported.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobSheets.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobSheets.eea
index 5621b554b1..75a0bab3be 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobSheets.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobSheets.eea
@@ -9,13 +9,13 @@ STANDARD
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobState.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobState.eea
index 558ee0dff2..88deb16943 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobState.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobState.eea
@@ -27,13 +27,13 @@ UNKNOWN
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobStateReason.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobStateReason.eea
index 906f510643..cdc3d1b274 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobStateReason.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobStateReason.eea
@@ -90,13 +90,13 @@ UNSUPPORTED_DOCUMENT_FORMAT
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobStateReasons.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobStateReasons.eea
index 00e699d836..668bceaa94 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobStateReasons.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/JobStateReasons.eea
@@ -12,7 +12,7 @@ add
  (Ljavax/print/attribute/standard/JobStateReason;)Z
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Media.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Media.eea
index 7ee0e6e9fb..2f52fb01ea 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Media.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Media.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/MediaName.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/MediaName.eea
index a94eb9bdf9..79f5466e3a 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/MediaName.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/MediaName.eea
@@ -15,7 +15,7 @@ NA_LETTER_WHITE
 
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/MediaPrintableArea.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/MediaPrintableArea.eea
index 7808504e83..80b2279a2f 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/MediaPrintableArea.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/MediaPrintableArea.eea
@@ -5,10 +5,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getPrintableArea
  (I)[F
  (I)[F
@@ -17,4 +17,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toString
  (ILjava/lang/String;)Ljava/lang/String;
- (ILjava/lang/String;)Ljava/lang/String;
+ (ILjava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/MediaSize.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/MediaSize.eea
index a8b2ec813f..0bc89b5a6f 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/MediaSize.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/MediaSize.eea
@@ -18,10 +18,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.Size2DSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getMediaSizeName
  ()Ljavax/print/attribute/standard/MediaSizeName;
  ()Ljavax/print/attribute/standard/MediaSizeName;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/MediaSizeName.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/MediaSizeName.eea
index bc04b1d935..a43b54f659 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/MediaSizeName.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/MediaSizeName.eea
@@ -222,7 +222,7 @@ TABLOID
 
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/MediaTray.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/MediaTray.eea
index a1fce5504e..6a49a7edf0 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/MediaTray.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/MediaTray.eea
@@ -27,7 +27,7 @@ TOP
 
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/MultipleDocumentHandling.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/MultipleDocumentHandling.eea
index 87f191bb1a..77806f0d72 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/MultipleDocumentHandling.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/MultipleDocumentHandling.eea
@@ -15,13 +15,13 @@ SINGLE_DOCUMENT_NEW_SHEET
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/NumberOfDocuments.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/NumberOfDocuments.eea
index ec744ccf05..b58a2a5134 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/NumberOfDocuments.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/NumberOfDocuments.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/NumberOfInterveningJobs.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/NumberOfInterveningJobs.eea
index 9eddbd3469..8a1bba31f0 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/NumberOfInterveningJobs.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/NumberOfInterveningJobs.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/NumberUp.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/NumberUp.eea
index 5230d0baa2..ebdffeeedb 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/NumberUp.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/NumberUp.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/NumberUpSupported.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/NumberUpSupported.eea
index b7148124c6..61e0a19562 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/NumberUpSupported.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/NumberUpSupported.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.SetOfIntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/OrientationRequested.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/OrientationRequested.eea
index 84c61fcb58..527ecc75df 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/OrientationRequested.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/OrientationRequested.eea
@@ -15,13 +15,13 @@ REVERSE_PORTRAIT
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/OutputDeviceAssigned.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/OutputDeviceAssigned.eea
index 7ad6f83386..f2807ffb05 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/OutputDeviceAssigned.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/OutputDeviceAssigned.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PDLOverrideSupported.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PDLOverrideSupported.eea
index fb46726f95..33ce7d848d 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PDLOverrideSupported.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PDLOverrideSupported.eea
@@ -9,13 +9,13 @@ NOT_ATTEMPTED
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PageRanges.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PageRanges.eea
index e8a282b87e..5816b8bbcd 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PageRanges.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PageRanges.eea
@@ -11,7 +11,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.SetOfIntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PagesPerMinute.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PagesPerMinute.eea
index 6296b0aed5..98ddb139ee 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PagesPerMinute.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PagesPerMinute.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PagesPerMinuteColor.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PagesPerMinuteColor.eea
index ea57e3c253..f6bcbaaef4 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PagesPerMinuteColor.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PagesPerMinuteColor.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PresentationDirection.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PresentationDirection.eea
index e3bba3927f..38b662d9ac 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PresentationDirection.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PresentationDirection.eea
@@ -27,13 +27,13 @@ TOTOP_TORIGHT
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrintQuality.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrintQuality.eea
index 60463a40c0..2f67ff884f 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrintQuality.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrintQuality.eea
@@ -12,13 +12,13 @@ NORMAL
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterInfo.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterInfo.eea
index e51f12d4a2..683b06a222 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterInfo.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterInfo.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterIsAcceptingJobs.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterIsAcceptingJobs.eea
index 83600beadf..10db744523 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterIsAcceptingJobs.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterIsAcceptingJobs.eea
@@ -9,13 +9,13 @@ NOT_ACCEPTING_JOBS
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterLocation.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterLocation.eea
index cdfd09dcaf..ac43413df4 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterLocation.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterLocation.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterMakeAndModel.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterMakeAndModel.eea
index 508bf9bd2d..6559769aed 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterMakeAndModel.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterMakeAndModel.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterMessageFromOperator.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterMessageFromOperator.eea
index 6b0de09a26..99ea77d02d 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterMessageFromOperator.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterMessageFromOperator.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterMoreInfo.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterMoreInfo.eea
index 5282bfd1c0..2541162cce 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterMoreInfo.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterMoreInfo.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.URISyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterMoreInfoManufacturer.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterMoreInfoManufacturer.eea
index 67ebfb5ad1..ac42bb1df9 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterMoreInfoManufacturer.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterMoreInfoManufacturer.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.URISyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterName.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterName.eea
index cdafa23ddc..fba2430e3d 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterName.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterName.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterResolution.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterResolution.eea
index 4288fc72c3..723c48db14 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterResolution.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterResolution.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.ResolutionSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterState.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterState.eea
index 38e723a7d3..0717401881 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterState.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterState.eea
@@ -15,13 +15,13 @@ UNKNOWN
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterStateReason.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterStateReason.eea
index f8f85299fb..bbe76cc038 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterStateReason.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterStateReason.eea
@@ -102,13 +102,13 @@ TONER_LOW
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterStateReasons.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterStateReasons.eea
index ce13c3cfbb..9815c55eaf 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterStateReasons.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterStateReasons.eea
@@ -9,13 +9,13 @@ super java/util/HashMap
  (Ljava/util/Map<Ljavax/print/attribute/standard/PrinterStateReason;Ljavax/print/attribute/standard/Severity;>;)V
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 printerStateReasonSet
  (Ljavax/print/attribute/standard/Severity;)Ljava/util/Set<Ljavax/print/attribute/standard/PrinterStateReason;>;
- (Ljavax/print/attribute/standard/Severity;)Ljava/util/Set<Ljavax/print/attribute/standard/PrinterStateReason;>;
+ (Ljavax/print/attribute/standard/Severity;)L1java/util/Set<Ljavax/print/attribute/standard/PrinterStateReason;>;
 put
  (Ljavax/print/attribute/standard/PrinterStateReason;Ljavax/print/attribute/standard/Severity;)Ljavax/print/attribute/standard/Severity;
  (Ljavax/print/attribute/standard/PrinterStateReason;Ljavax/print/attribute/standard/Severity;)Ljavax/print/attribute/standard/Severity;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterURI.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterURI.eea
index feece3a3d8..60ba1832df 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterURI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/PrinterURI.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.URISyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/QueuedJobCount.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/QueuedJobCount.eea
index 435db8ce98..6c0d66db37 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/QueuedJobCount.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/QueuedJobCount.eea
@@ -5,7 +5,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.IntegerSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/ReferenceUriSchemesSupported.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/ReferenceUriSchemesSupported.eea
index 3f98d45c1d..2d48afad86 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/ReferenceUriSchemesSupported.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/ReferenceUriSchemesSupported.eea
@@ -27,13 +27,13 @@ WAIS
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/RequestingUserName.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/RequestingUserName.eea
index 8c3007f3db..b7d66724b9 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/RequestingUserName.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/RequestingUserName.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.print.attribute.TextSyntax)
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Severity.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Severity.eea
index 7880b0cc64..2b19f132fd 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Severity.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Severity.eea
@@ -12,13 +12,13 @@ WARNING
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/SheetCollate.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/SheetCollate.eea
index 3c5ab1ecbf..71283fc7ba 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/SheetCollate.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/SheetCollate.eea
@@ -9,13 +9,13 @@ UNCOLLATED
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Sides.eea b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Sides.eea
index 2de437c6f3..24d0c4d756 100644
--- a/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Sides.eea
+++ b/libs/eea-java-21/src/main/resources/javax/print/attribute/standard/Sides.eea
@@ -18,13 +18,13 @@ TWO_SIDED_SHORT_EDGE
 
 getCategory
  ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
- ()Ljava/lang/Class<+Ljavax/print/attribute/Attribute;>;
+ ()L1java/lang/Class<+Ljavax/print/attribute/Attribute;>;
 getEnumValueTable
  ()[Ljavax/print/attribute/EnumSyntax;
- ()[Ljavax/print/attribute/EnumSyntax;
+ ()[0Ljavax/print/attribute/EnumSyntax; # @Inherited(javax.print.attribute.EnumSyntax)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getStringTable
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(javax.print.attribute.EnumSyntax)
diff --git a/libs/eea-java-21/src/main/resources/javax/rmi/ssl/SslRMIClientSocketFactory.eea b/libs/eea-java-21/src/main/resources/javax/rmi/ssl/SslRMIClientSocketFactory.eea
index ff5f6d43aa..bb56c0bd67 100644
--- a/libs/eea-java-21/src/main/resources/javax/rmi/ssl/SslRMIClientSocketFactory.eea
+++ b/libs/eea-java-21/src/main/resources/javax/rmi/ssl/SslRMIClientSocketFactory.eea
@@ -2,7 +2,7 @@ class javax/rmi/ssl/SslRMIClientSocketFactory
 
 createSocket
  (Ljava/lang/String;I)Ljava/net/Socket;
- (Ljava/lang/String;I)Ljava/net/Socket;
+ (Ljava/lang/String;I)L1java/net/Socket; # @Inherited(java.rmi.server.RMIClientSocketFactory)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/javax/rmi/ssl/SslRMIServerSocketFactory.eea b/libs/eea-java-21/src/main/resources/javax/rmi/ssl/SslRMIServerSocketFactory.eea
index cbf28fc3ec..e2f721b0da 100644
--- a/libs/eea-java-21/src/main/resources/javax/rmi/ssl/SslRMIServerSocketFactory.eea
+++ b/libs/eea-java-21/src/main/resources/javax/rmi/ssl/SslRMIServerSocketFactory.eea
@@ -8,7 +8,7 @@ class javax/rmi/ssl/SslRMIServerSocketFactory
  ([Ljava/lang/String;[Ljava/lang/String;Z)V
 createServerSocket
  (I)Ljava/net/ServerSocket;
- (I)Ljava/net/ServerSocket;
+ (I)L1java/net/ServerSocket; # @Inherited(java.rmi.server.RMIServerSocketFactory)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/javax/script/AbstractScriptEngine.eea b/libs/eea-java-21/src/main/resources/javax/script/AbstractScriptEngine.eea
index 65cb167748..158d3b3ff3 100644
--- a/libs/eea-java-21/src/main/resources/javax/script/AbstractScriptEngine.eea
+++ b/libs/eea-java-21/src/main/resources/javax/script/AbstractScriptEngine.eea
@@ -21,7 +21,7 @@ eval
  (Ljava/lang/String;Ljavax/script/Bindings;)Ljava/lang/Object;
 get
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 getBindings
  (I)Ljavax/script/Bindings;
  (I)Ljavax/script/Bindings;
diff --git a/libs/eea-java-21/src/main/resources/javax/script/ScriptEngine.eea b/libs/eea-java-21/src/main/resources/javax/script/ScriptEngine.eea
index 38e8ba1381..6998a349d8 100644
--- a/libs/eea-java-21/src/main/resources/javax/script/ScriptEngine.eea
+++ b/libs/eea-java-21/src/main/resources/javax/script/ScriptEngine.eea
@@ -24,7 +24,7 @@ NAME
 
 createBindings
  ()Ljavax/script/Bindings;
- ()Ljavax/script/Bindings;
+ ()L1javax/script/Bindings;
 eval
  (Ljava/io/Reader;)Ljava/lang/Object;
  (Ljava/io/Reader;)Ljava/lang/Object;
diff --git a/libs/eea-java-21/src/main/resources/javax/script/ScriptEngineManager.eea b/libs/eea-java-21/src/main/resources/javax/script/ScriptEngineManager.eea
index 25204936d4..34b4ff977e 100644
--- a/libs/eea-java-21/src/main/resources/javax/script/ScriptEngineManager.eea
+++ b/libs/eea-java-21/src/main/resources/javax/script/ScriptEngineManager.eea
@@ -11,13 +11,13 @@ getBindings
  ()Ljavax/script/Bindings;
 getEngineByExtension
  (Ljava/lang/String;)Ljavax/script/ScriptEngine;
- (Ljava/lang/String;)Ljavax/script/ScriptEngine;
+ (Ljava/lang/String;)L0javax/script/ScriptEngine;
 getEngineByMimeType
  (Ljava/lang/String;)Ljavax/script/ScriptEngine;
- (Ljava/lang/String;)Ljavax/script/ScriptEngine;
+ (Ljava/lang/String;)L0javax/script/ScriptEngine;
 getEngineByName
  (Ljava/lang/String;)Ljavax/script/ScriptEngine;
- (Ljava/lang/String;)Ljavax/script/ScriptEngine;
+ (Ljava/lang/String;)L0javax/script/ScriptEngine;
 getEngineFactories
  ()Ljava/util/List<Ljavax/script/ScriptEngineFactory;>;
  ()Ljava/util/List<Ljavax/script/ScriptEngineFactory;>;
diff --git a/libs/eea-java-21/src/main/resources/javax/script/SimpleScriptContext.eea b/libs/eea-java-21/src/main/resources/javax/script/SimpleScriptContext.eea
index 3c946be517..724d5259e0 100644
--- a/libs/eea-java-21/src/main/resources/javax/script/SimpleScriptContext.eea
+++ b/libs/eea-java-21/src/main/resources/javax/script/SimpleScriptContext.eea
@@ -18,10 +18,10 @@ writer
 
 getAttribute
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 getAttribute
  (Ljava/lang/String;I)Ljava/lang/Object;
- (Ljava/lang/String;I)Ljava/lang/Object;
+ (Ljava/lang/String;I)L0java/lang/Object;
 getAttributesScope
  (Ljava/lang/String;)I
  (Ljava/lang/String;)I
@@ -42,7 +42,7 @@ getWriter
  ()Ljava/io/Writer;
 removeAttribute
  (Ljava/lang/String;I)Ljava/lang/Object;
- (Ljava/lang/String;I)Ljava/lang/Object;
+ (Ljava/lang/String;I)L0java/lang/Object;
 setAttribute
  (Ljava/lang/String;Ljava/lang/Object;I)V
  (Ljava/lang/String;Ljava/lang/Object;I)V
diff --git a/libs/eea-java-21/src/main/resources/javax/security/auth/SubjectDomainCombiner.eea b/libs/eea-java-21/src/main/resources/javax/security/auth/SubjectDomainCombiner.eea
index a64fff6a5a..3a1b39078c 100644
--- a/libs/eea-java-21/src/main/resources/javax/security/auth/SubjectDomainCombiner.eea
+++ b/libs/eea-java-21/src/main/resources/javax/security/auth/SubjectDomainCombiner.eea
@@ -5,7 +5,7 @@ class javax/security/auth/SubjectDomainCombiner
  (Ljavax/security/auth/Subject;)V
 combine
  ([Ljava/security/ProtectionDomain;[Ljava/security/ProtectionDomain;)[Ljava/security/ProtectionDomain;
- ([Ljava/security/ProtectionDomain;[Ljava/security/ProtectionDomain;)[Ljava/security/ProtectionDomain;
+ ([Ljava/security/ProtectionDomain;[Ljava/security/ProtectionDomain;)[0Ljava/security/ProtectionDomain;
 getSubject
  ()Ljavax/security/auth/Subject;
  ()Ljavax/security/auth/Subject;
diff --git a/libs/eea-java-21/src/main/resources/javax/security/auth/kerberos/KeyTab.eea b/libs/eea-java-21/src/main/resources/javax/security/auth/kerberos/KeyTab.eea
index 190a0a4672..2ef7cabbee 100644
--- a/libs/eea-java-21/src/main/resources/javax/security/auth/kerberos/KeyTab.eea
+++ b/libs/eea-java-21/src/main/resources/javax/security/auth/kerberos/KeyTab.eea
@@ -24,7 +24,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getKeys
  (Ljavax/security/auth/kerberos/KerberosPrincipal;)[Ljavax/security/auth/kerberos/KerberosKey;
- (Ljavax/security/auth/kerberos/KerberosPrincipal;)[Ljavax/security/auth/kerberos/KerberosKey;
+ (Ljavax/security/auth/kerberos/KerberosPrincipal;)[1Ljavax/security/auth/kerberos/KerberosKey;
 getPrincipal
  ()Ljavax/security/auth/kerberos/KerberosPrincipal;
  ()Ljavax/security/auth/kerberos/KerberosPrincipal;
diff --git a/libs/eea-java-21/src/main/resources/javax/security/auth/login/Configuration.eea b/libs/eea-java-21/src/main/resources/javax/security/auth/login/Configuration.eea
index a672cd6da1..02a870fe84 100644
--- a/libs/eea-java-21/src/main/resources/javax/security/auth/login/Configuration.eea
+++ b/libs/eea-java-21/src/main/resources/javax/security/auth/login/Configuration.eea
@@ -21,10 +21,10 @@ getAppConfigurationEntry
  (Ljava/lang/String;)[Ljavax/security/auth/login/AppConfigurationEntry;
 getParameters
  ()Ljavax/security/auth/login/Configuration$Parameters;
- ()Ljavax/security/auth/login/Configuration$Parameters;
+ ()L0javax/security/auth/login/Configuration$Parameters;
 getProvider
  ()Ljava/security/Provider;
- ()Ljava/security/Provider;
+ ()L0java/security/Provider;
 getType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/security/auth/login/LoginContext.eea b/libs/eea-java-21/src/main/resources/javax/security/auth/login/LoginContext.eea
index 774f33905d..e7eb82cc68 100644
--- a/libs/eea-java-21/src/main/resources/javax/security/auth/login/LoginContext.eea
+++ b/libs/eea-java-21/src/main/resources/javax/security/auth/login/LoginContext.eea
@@ -17,4 +17,4 @@ class javax/security/auth/login/LoginContext
  (Ljava/lang/String;Ljavax/security/auth/callback/CallbackHandler;)V
 getSubject
  ()Ljavax/security/auth/Subject;
- ()Ljavax/security/auth/Subject;
+ ()L0javax/security/auth/Subject;
diff --git a/libs/eea-java-21/src/main/resources/javax/security/sasl/AuthorizeCallback.eea b/libs/eea-java-21/src/main/resources/javax/security/sasl/AuthorizeCallback.eea
index 4a75b410de..a637ae62f6 100644
--- a/libs/eea-java-21/src/main/resources/javax/security/sasl/AuthorizeCallback.eea
+++ b/libs/eea-java-21/src/main/resources/javax/security/sasl/AuthorizeCallback.eea
@@ -11,7 +11,7 @@ getAuthorizationID
  ()Ljava/lang/String;
 getAuthorizedID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 setAuthorizedID
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/security/sasl/Sasl.eea b/libs/eea-java-21/src/main/resources/javax/security/sasl/Sasl.eea
index 7c579f59db..6cda647cf6 100644
--- a/libs/eea-java-21/src/main/resources/javax/security/sasl/Sasl.eea
+++ b/libs/eea-java-21/src/main/resources/javax/security/sasl/Sasl.eea
@@ -45,13 +45,13 @@ STRENGTH
 
 createSaslClient
  ([Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)Ljavax/security/sasl/SaslClient;
- ([Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)Ljavax/security/sasl/SaslClient;
+ ([Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)L0javax/security/sasl/SaslClient;
 createSaslServer
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)Ljavax/security/sasl/SaslServer;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)Ljavax/security/sasl/SaslServer;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)L0javax/security/sasl/SaslServer;
 getSaslClientFactories
  ()Ljava/util/Enumeration<Ljavax/security/sasl/SaslClientFactory;>;
- ()Ljava/util/Enumeration<Ljavax/security/sasl/SaslClientFactory;>;
+ ()L1java/util/Enumeration<Ljavax/security/sasl/SaslClientFactory;>;
 getSaslServerFactories
  ()Ljava/util/Enumeration<Ljavax/security/sasl/SaslServerFactory;>;
- ()Ljava/util/Enumeration<Ljavax/security/sasl/SaslServerFactory;>;
+ ()L1java/util/Enumeration<Ljavax/security/sasl/SaslServerFactory;>;
diff --git a/libs/eea-java-21/src/main/resources/javax/security/sasl/SaslClientFactory.eea b/libs/eea-java-21/src/main/resources/javax/security/sasl/SaslClientFactory.eea
index 0588a46e61..9056eefd25 100644
--- a/libs/eea-java-21/src/main/resources/javax/security/sasl/SaslClientFactory.eea
+++ b/libs/eea-java-21/src/main/resources/javax/security/sasl/SaslClientFactory.eea
@@ -2,7 +2,7 @@ class javax/security/sasl/SaslClientFactory
 
 createSaslClient
  ([Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)Ljavax/security/sasl/SaslClient;
- ([Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)Ljavax/security/sasl/SaslClient;
+ ([Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)L1javax/security/sasl/SaslClient;
 getMechanismNames
  (Ljava/util/Map<Ljava/lang/String;*>;)[Ljava/lang/String;
  (Ljava/util/Map<Ljava/lang/String;*>;)[Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/security/sasl/SaslServerFactory.eea b/libs/eea-java-21/src/main/resources/javax/security/sasl/SaslServerFactory.eea
index a6e9516b4f..8eafe44ddb 100644
--- a/libs/eea-java-21/src/main/resources/javax/security/sasl/SaslServerFactory.eea
+++ b/libs/eea-java-21/src/main/resources/javax/security/sasl/SaslServerFactory.eea
@@ -2,7 +2,7 @@ class javax/security/sasl/SaslServerFactory
 
 createSaslServer
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)Ljavax/security/sasl/SaslServer;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)Ljavax/security/sasl/SaslServer;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Ljavax/security/auth/callback/CallbackHandler;)L1javax/security/sasl/SaslServer;
 getMechanismNames
  (Ljava/util/Map<Ljava/lang/String;*>;)[Ljava/lang/String;
  (Ljava/util/Map<Ljava/lang/String;*>;)[Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/smartcardio/ATR.eea b/libs/eea-java-21/src/main/resources/javax/smartcardio/ATR.eea
index 92b5056a4f..098c6d024b 100644
--- a/libs/eea-java-21/src/main/resources/javax/smartcardio/ATR.eea
+++ b/libs/eea-java-21/src/main/resources/javax/smartcardio/ATR.eea
@@ -11,7 +11,7 @@ getBytes
  ()[B
 getHistoricalBytes
  ()[B
- ()[B
+ ()[1B
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/javax/smartcardio/CardTerminals.eea b/libs/eea-java-21/src/main/resources/javax/smartcardio/CardTerminals.eea
index a172837297..f4dcf47be4 100644
--- a/libs/eea-java-21/src/main/resources/javax/smartcardio/CardTerminals.eea
+++ b/libs/eea-java-21/src/main/resources/javax/smartcardio/CardTerminals.eea
@@ -2,7 +2,7 @@ class javax/smartcardio/CardTerminals
 
 getTerminal
  (Ljava/lang/String;)Ljavax/smartcardio/CardTerminal;
- (Ljava/lang/String;)Ljavax/smartcardio/CardTerminal;
+ (Ljava/lang/String;)L0javax/smartcardio/CardTerminal;
 list
  ()Ljava/util/List<Ljavax/smartcardio/CardTerminal;>;
  ()Ljava/util/List<Ljavax/smartcardio/CardTerminal;>;
diff --git a/libs/eea-java-21/src/main/resources/javax/smartcardio/CommandAPDU.eea b/libs/eea-java-21/src/main/resources/javax/smartcardio/CommandAPDU.eea
index b8e7e11a64..629737293c 100644
--- a/libs/eea-java-21/src/main/resources/javax/smartcardio/CommandAPDU.eea
+++ b/libs/eea-java-21/src/main/resources/javax/smartcardio/CommandAPDU.eea
@@ -29,7 +29,7 @@ getBytes
  ()[B
 getData
  ()[B
- ()[B
+ ()[1B
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/javax/smartcardio/ResponseAPDU.eea b/libs/eea-java-21/src/main/resources/javax/smartcardio/ResponseAPDU.eea
index ab740be1f8..792dd25bde 100644
--- a/libs/eea-java-21/src/main/resources/javax/smartcardio/ResponseAPDU.eea
+++ b/libs/eea-java-21/src/main/resources/javax/smartcardio/ResponseAPDU.eea
@@ -11,7 +11,7 @@ getBytes
  ()[B
 getData
  ()[B
- ()[B
+ ()[1B
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/javax/sound/midi/MetaMessage.eea b/libs/eea-java-21/src/main/resources/javax/sound/midi/MetaMessage.eea
index 50fdf1926f..f2b47417d5 100644
--- a/libs/eea-java-21/src/main/resources/javax/sound/midi/MetaMessage.eea
+++ b/libs/eea-java-21/src/main/resources/javax/sound/midi/MetaMessage.eea
@@ -11,7 +11,7 @@ clone
  ()L1java/lang/Object; # @Inherited(javax.sound.midi.MidiMessage)
 getData
  ()[B
- ()[B
+ ()[1B
 setMessage
  (I[BI)V
  (I[BI)V
diff --git a/libs/eea-java-21/src/main/resources/javax/sound/midi/MidiFileFormat.eea b/libs/eea-java-21/src/main/resources/javax/sound/midi/MidiFileFormat.eea
index df1cd1bbbf..528d0480bf 100644
--- a/libs/eea-java-21/src/main/resources/javax/sound/midi/MidiFileFormat.eea
+++ b/libs/eea-java-21/src/main/resources/javax/sound/midi/MidiFileFormat.eea
@@ -5,7 +5,7 @@ class javax/sound/midi/MidiFileFormat
  (IFIIJLjava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)V
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 properties
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
diff --git a/libs/eea-java-21/src/main/resources/javax/sound/midi/MidiMessage.eea b/libs/eea-java-21/src/main/resources/javax/sound/midi/MidiMessage.eea
index 2b3d0cb666..0ff6d91b9d 100644
--- a/libs/eea-java-21/src/main/resources/javax/sound/midi/MidiMessage.eea
+++ b/libs/eea-java-21/src/main/resources/javax/sound/midi/MidiMessage.eea
@@ -12,7 +12,7 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 getMessage
  ()[B
- ()[B
+ ()[1B
 setMessage
  ([BI)V
  ([BI)V
diff --git a/libs/eea-java-21/src/main/resources/javax/sound/midi/MidiSystem.eea b/libs/eea-java-21/src/main/resources/javax/sound/midi/MidiSystem.eea
index 114f898b2c..867b2b5aa3 100644
--- a/libs/eea-java-21/src/main/resources/javax/sound/midi/MidiSystem.eea
+++ b/libs/eea-java-21/src/main/resources/javax/sound/midi/MidiSystem.eea
@@ -17,13 +17,13 @@ getMidiFileFormat
  (Ljava/net/URL;)Ljavax/sound/midi/MidiFileFormat;
 getMidiFileTypes
  ()[I
- ()[I
+ ()[1I
 getMidiFileTypes
  (Ljavax/sound/midi/Sequence;)[I
- (Ljavax/sound/midi/Sequence;)[I
+ (Ljavax/sound/midi/Sequence;)[1I
 getReceiver
  ()Ljavax/sound/midi/Receiver;
- ()Ljavax/sound/midi/Receiver;
+ ()L1javax/sound/midi/Receiver;
 getSequence
  (Ljava/io/File;)Ljavax/sound/midi/Sequence;
  (Ljava/io/File;)Ljavax/sound/midi/Sequence;
@@ -53,7 +53,7 @@ getSynthesizer
  ()Ljavax/sound/midi/Synthesizer;
 getTransmitter
  ()Ljavax/sound/midi/Transmitter;
- ()Ljavax/sound/midi/Transmitter;
+ ()L1javax/sound/midi/Transmitter;
 isFileTypeSupported
  (ILjavax/sound/midi/Sequence;)Z
  (ILjavax/sound/midi/Sequence;)Z
diff --git a/libs/eea-java-21/src/main/resources/javax/sound/midi/Sequence.eea b/libs/eea-java-21/src/main/resources/javax/sound/midi/Sequence.eea
index 655518ac55..508c9fd749 100644
--- a/libs/eea-java-21/src/main/resources/javax/sound/midi/Sequence.eea
+++ b/libs/eea-java-21/src/main/resources/javax/sound/midi/Sequence.eea
@@ -6,13 +6,13 @@ tracks
 
 createTrack
  ()Ljavax/sound/midi/Track;
- ()Ljavax/sound/midi/Track;
+ ()L1javax/sound/midi/Track;
 deleteTrack
  (Ljavax/sound/midi/Track;)Z
  (Ljavax/sound/midi/Track;)Z
 getPatchList
  ()[Ljavax/sound/midi/Patch;
- ()[Ljavax/sound/midi/Patch;
+ ()[1Ljavax/sound/midi/Patch;
 getTracks
  ()[Ljavax/sound/midi/Track;
  ()[Ljavax/sound/midi/Track;
diff --git a/libs/eea-java-21/src/main/resources/javax/sound/midi/SysexMessage.eea b/libs/eea-java-21/src/main/resources/javax/sound/midi/SysexMessage.eea
index 211d500dc8..d2d9c2280c 100644
--- a/libs/eea-java-21/src/main/resources/javax/sound/midi/SysexMessage.eea
+++ b/libs/eea-java-21/src/main/resources/javax/sound/midi/SysexMessage.eea
@@ -14,7 +14,7 @@ clone
  ()L1java/lang/Object; # @Inherited(javax.sound.midi.MidiMessage)
 getData
  ()[B
- ()[B
+ ()[1B
 setMessage
  (I[BI)V
  (I[BI)V
diff --git a/libs/eea-java-21/src/main/resources/javax/sound/sampled/AudioFileFormat.eea b/libs/eea-java-21/src/main/resources/javax/sound/sampled/AudioFileFormat.eea
index 2ffe727b38..8dd6f8d194 100644
--- a/libs/eea-java-21/src/main/resources/javax/sound/sampled/AudioFileFormat.eea
+++ b/libs/eea-java-21/src/main/resources/javax/sound/sampled/AudioFileFormat.eea
@@ -14,7 +14,7 @@ getFormat
  ()Ljavax/sound/sampled/AudioFormat;
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 getType
  ()Ljavax/sound/sampled/AudioFileFormat$Type;
  ()Ljavax/sound/sampled/AudioFileFormat$Type;
diff --git a/libs/eea-java-21/src/main/resources/javax/sound/sampled/AudioFormat.eea b/libs/eea-java-21/src/main/resources/javax/sound/sampled/AudioFormat.eea
index 1fe3ec0a2a..048eed1a0c 100644
--- a/libs/eea-java-21/src/main/resources/javax/sound/sampled/AudioFormat.eea
+++ b/libs/eea-java-21/src/main/resources/javax/sound/sampled/AudioFormat.eea
@@ -15,7 +15,7 @@ getEncoding
  ()Ljavax/sound/sampled/AudioFormat$Encoding;
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 matches
  (Ljavax/sound/sampled/AudioFormat;)Z
  (Ljavax/sound/sampled/AudioFormat;)Z
diff --git a/libs/eea-java-21/src/main/resources/javax/sound/sampled/AudioSystem.eea b/libs/eea-java-21/src/main/resources/javax/sound/sampled/AudioSystem.eea
index f8434db162..f64cc1f5b9 100644
--- a/libs/eea-java-21/src/main/resources/javax/sound/sampled/AudioSystem.eea
+++ b/libs/eea-java-21/src/main/resources/javax/sound/sampled/AudioSystem.eea
@@ -53,7 +53,7 @@ getSourceDataLine
  (Ljavax/sound/sampled/AudioFormat;Ljavax/sound/sampled/Mixer$Info;)Ljavax/sound/sampled/SourceDataLine;
 getSourceLineInfo
  (Ljavax/sound/sampled/Line$Info;)[Ljavax/sound/sampled/Line$Info;
- (Ljavax/sound/sampled/Line$Info;)[Ljavax/sound/sampled/Line$Info;
+ (Ljavax/sound/sampled/Line$Info;)[1Ljavax/sound/sampled/Line$Info;
 getTargetDataLine
  (Ljavax/sound/sampled/AudioFormat;)Ljavax/sound/sampled/TargetDataLine;
  (Ljavax/sound/sampled/AudioFormat;)Ljavax/sound/sampled/TargetDataLine;
@@ -71,7 +71,7 @@ getTargetFormats
  (Ljavax/sound/sampled/AudioFormat$Encoding;Ljavax/sound/sampled/AudioFormat;)[Ljavax/sound/sampled/AudioFormat;
 getTargetLineInfo
  (Ljavax/sound/sampled/Line$Info;)[Ljavax/sound/sampled/Line$Info;
- (Ljavax/sound/sampled/Line$Info;)[Ljavax/sound/sampled/Line$Info;
+ (Ljavax/sound/sampled/Line$Info;)[1Ljavax/sound/sampled/Line$Info;
 isConversionSupported
  (Ljavax/sound/sampled/AudioFormat$Encoding;Ljavax/sound/sampled/AudioFormat;)Z
  (Ljavax/sound/sampled/AudioFormat$Encoding;Ljavax/sound/sampled/AudioFormat;)Z
diff --git a/libs/eea-java-21/src/main/resources/javax/sql/CommonDataSource.eea b/libs/eea-java-21/src/main/resources/javax/sql/CommonDataSource.eea
index 691fef6e3a..c84ab28454 100644
--- a/libs/eea-java-21/src/main/resources/javax/sql/CommonDataSource.eea
+++ b/libs/eea-java-21/src/main/resources/javax/sql/CommonDataSource.eea
@@ -2,7 +2,7 @@ class javax/sql/CommonDataSource
 
 createShardingKeyBuilder
  ()Ljava/sql/ShardingKeyBuilder;
- ()Ljava/sql/ShardingKeyBuilder;
+ ()L1java/sql/ShardingKeyBuilder;
 getLogWriter
  ()Ljava/io/PrintWriter;
  ()Ljava/io/PrintWriter;
diff --git a/libs/eea-java-21/src/main/resources/javax/sql/ConnectionPoolDataSource.eea b/libs/eea-java-21/src/main/resources/javax/sql/ConnectionPoolDataSource.eea
index 18b6caa217..2d392caa73 100644
--- a/libs/eea-java-21/src/main/resources/javax/sql/ConnectionPoolDataSource.eea
+++ b/libs/eea-java-21/src/main/resources/javax/sql/ConnectionPoolDataSource.eea
@@ -2,7 +2,7 @@ class javax/sql/ConnectionPoolDataSource
 
 createPooledConnectionBuilder
  ()Ljavax/sql/PooledConnectionBuilder;
- ()Ljavax/sql/PooledConnectionBuilder;
+ ()L1javax/sql/PooledConnectionBuilder;
 getLogWriter
  ()Ljava/io/PrintWriter;
  ()Ljava/io/PrintWriter;
diff --git a/libs/eea-java-21/src/main/resources/javax/sql/DataSource.eea b/libs/eea-java-21/src/main/resources/javax/sql/DataSource.eea
index 8b8bba6455..ce951da69a 100644
--- a/libs/eea-java-21/src/main/resources/javax/sql/DataSource.eea
+++ b/libs/eea-java-21/src/main/resources/javax/sql/DataSource.eea
@@ -2,7 +2,7 @@ class javax/sql/DataSource
 
 createConnectionBuilder
  ()Ljava/sql/ConnectionBuilder;
- ()Ljava/sql/ConnectionBuilder;
+ ()L1java/sql/ConnectionBuilder;
 getConnection
  ()Ljava/sql/Connection;
  ()Ljava/sql/Connection;
diff --git a/libs/eea-java-21/src/main/resources/javax/sql/XADataSource.eea b/libs/eea-java-21/src/main/resources/javax/sql/XADataSource.eea
index b8c2cf45b2..5f9e8cdae3 100644
--- a/libs/eea-java-21/src/main/resources/javax/sql/XADataSource.eea
+++ b/libs/eea-java-21/src/main/resources/javax/sql/XADataSource.eea
@@ -2,7 +2,7 @@ class javax/sql/XADataSource
 
 createXAConnectionBuilder
  ()Ljavax/sql/XAConnectionBuilder;
- ()Ljavax/sql/XAConnectionBuilder;
+ ()L1javax/sql/XAConnectionBuilder;
 getLogWriter
  ()Ljava/io/PrintWriter;
  ()Ljava/io/PrintWriter;
diff --git a/libs/eea-java-21/src/main/resources/javax/sql/rowset/BaseRowSet.eea b/libs/eea-java-21/src/main/resources/javax/sql/rowset/BaseRowSet.eea
index b96312bcce..4bafcd3edb 100644
--- a/libs/eea-java-21/src/main/resources/javax/sql/rowset/BaseRowSet.eea
+++ b/libs/eea-java-21/src/main/resources/javax/sql/rowset/BaseRowSet.eea
@@ -24,7 +24,7 @@ getDataSourceName
  ()Ljava/lang/String;
 getParams
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[1Ljava/lang/Object;
 getPassword
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/sql/rowset/CachedRowSet.eea b/libs/eea-java-21/src/main/resources/javax/sql/rowset/CachedRowSet.eea
index 0be2c46399..70181ef07f 100644
--- a/libs/eea-java-21/src/main/resources/javax/sql/rowset/CachedRowSet.eea
+++ b/libs/eea-java-21/src/main/resources/javax/sql/rowset/CachedRowSet.eea
@@ -8,16 +8,16 @@ columnUpdated
  (Ljava/lang/String;)Z
 createCopy
  ()Ljavax/sql/rowset/CachedRowSet;
- ()Ljavax/sql/rowset/CachedRowSet;
+ ()L1javax/sql/rowset/CachedRowSet;
 createCopyNoConstraints
  ()Ljavax/sql/rowset/CachedRowSet;
- ()Ljavax/sql/rowset/CachedRowSet;
+ ()L1javax/sql/rowset/CachedRowSet;
 createCopySchema
  ()Ljavax/sql/rowset/CachedRowSet;
- ()Ljavax/sql/rowset/CachedRowSet;
+ ()L1javax/sql/rowset/CachedRowSet;
 createShared
  ()Ljavax/sql/RowSet;
- ()Ljavax/sql/RowSet;
+ ()L1javax/sql/RowSet;
 execute
  (Ljava/sql/Connection;)V
  (Ljava/sql/Connection;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/sql/rowset/RowSetFactory.eea b/libs/eea-java-21/src/main/resources/javax/sql/rowset/RowSetFactory.eea
index cdb0554304..6285cf5fae 100644
--- a/libs/eea-java-21/src/main/resources/javax/sql/rowset/RowSetFactory.eea
+++ b/libs/eea-java-21/src/main/resources/javax/sql/rowset/RowSetFactory.eea
@@ -2,16 +2,16 @@ class javax/sql/rowset/RowSetFactory
 
 createCachedRowSet
  ()Ljavax/sql/rowset/CachedRowSet;
- ()Ljavax/sql/rowset/CachedRowSet;
+ ()L1javax/sql/rowset/CachedRowSet;
 createFilteredRowSet
  ()Ljavax/sql/rowset/FilteredRowSet;
- ()Ljavax/sql/rowset/FilteredRowSet;
+ ()L1javax/sql/rowset/FilteredRowSet;
 createJdbcRowSet
  ()Ljavax/sql/rowset/JdbcRowSet;
- ()Ljavax/sql/rowset/JdbcRowSet;
+ ()L1javax/sql/rowset/JdbcRowSet;
 createJoinRowSet
  ()Ljavax/sql/rowset/JoinRowSet;
- ()Ljavax/sql/rowset/JoinRowSet;
+ ()L1javax/sql/rowset/JoinRowSet;
 createWebRowSet
  ()Ljavax/sql/rowset/WebRowSet;
- ()Ljavax/sql/rowset/WebRowSet;
+ ()L1javax/sql/rowset/WebRowSet;
diff --git a/libs/eea-java-21/src/main/resources/javax/sql/rowset/serial/SerialArray.eea b/libs/eea-java-21/src/main/resources/javax/sql/rowset/serial/SerialArray.eea
index 7a4ac8a501..1d97e965d2 100644
--- a/libs/eea-java-21/src/main/resources/javax/sql/rowset/serial/SerialArray.eea
+++ b/libs/eea-java-21/src/main/resources/javax/sql/rowset/serial/SerialArray.eea
@@ -14,28 +14,28 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getArray
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 getArray
  (JI)Ljava/lang/Object;
- (JI)Ljava/lang/Object;
+ (JI)L1java/lang/Object;
 getArray
  (JILjava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)Ljava/lang/Object;
- (JILjava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)Ljava/lang/Object;
+ (JILjava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)L1java/lang/Object;
 getArray
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)Ljava/lang/Object;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)Ljava/lang/Object;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)L1java/lang/Object;
 getBaseTypeName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getResultSet
  ()Ljava/sql/ResultSet;
- ()Ljava/sql/ResultSet;
+ ()L1java/sql/ResultSet;
 getResultSet
  (JI)Ljava/sql/ResultSet;
- (JI)Ljava/sql/ResultSet;
+ (JI)L1java/sql/ResultSet;
 getResultSet
  (JILjava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)Ljava/sql/ResultSet;
- (JILjava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)Ljava/sql/ResultSet;
+ (JILjava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)L1java/sql/ResultSet;
 getResultSet
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)Ljava/sql/ResultSet;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)Ljava/sql/ResultSet;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Class<*>;>;)L1java/sql/ResultSet;
diff --git a/libs/eea-java-21/src/main/resources/javax/sql/rowset/serial/SerialBlob.eea b/libs/eea-java-21/src/main/resources/javax/sql/rowset/serial/SerialBlob.eea
index b9ba114359..6f9ee8d06f 100644
--- a/libs/eea-java-21/src/main/resources/javax/sql/rowset/serial/SerialBlob.eea
+++ b/libs/eea-java-21/src/main/resources/javax/sql/rowset/serial/SerialBlob.eea
@@ -14,13 +14,13 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getBinaryStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
 getBinaryStream
  (JJ)Ljava/io/InputStream;
  (JJ)Ljava/io/InputStream;
 getBytes
  (JI)[B
- (JI)[B
+ (JI)[1B
 position
  (Ljava/sql/Blob;J)J
  (Ljava/sql/Blob;J)J
diff --git a/libs/eea-java-21/src/main/resources/javax/sql/rowset/serial/SerialClob.eea b/libs/eea-java-21/src/main/resources/javax/sql/rowset/serial/SerialClob.eea
index 0b9446639e..69ad54e202 100644
--- a/libs/eea-java-21/src/main/resources/javax/sql/rowset/serial/SerialClob.eea
+++ b/libs/eea-java-21/src/main/resources/javax/sql/rowset/serial/SerialClob.eea
@@ -17,7 +17,7 @@ getAsciiStream
  ()Ljava/io/InputStream;
 getCharacterStream
  ()Ljava/io/Reader;
- ()Ljava/io/Reader;
+ ()L1java/io/Reader;
 getCharacterStream
  (JJ)Ljava/io/Reader;
  (JJ)Ljava/io/Reader;
diff --git a/libs/eea-java-21/src/main/resources/javax/sql/rowset/serial/SerialDatalink.eea b/libs/eea-java-21/src/main/resources/javax/sql/rowset/serial/SerialDatalink.eea
index a7da873da9..d49895c716 100644
--- a/libs/eea-java-21/src/main/resources/javax/sql/rowset/serial/SerialDatalink.eea
+++ b/libs/eea-java-21/src/main/resources/javax/sql/rowset/serial/SerialDatalink.eea
@@ -11,4 +11,4 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getDatalink
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L1java/net/URL;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/AbstractAction.eea b/libs/eea-java-21/src/main/resources/javax/swing/AbstractAction.eea
index 7e04354285..7a01eb80ac 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/AbstractAction.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/AbstractAction.eea
@@ -21,13 +21,13 @@ firePropertyChange
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 getKeys
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 getPropertyChangeListeners
  ()[Ljava/beans/PropertyChangeListener;
  ()[Ljava/beans/PropertyChangeListener;
 getValue
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 putValue
  (Ljava/lang/String;Ljava/lang/Object;)V
  (Ljava/lang/String;Ljava/lang/Object;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/AbstractButton$AccessibleAbstractButton.eea b/libs/eea-java-21/src/main/resources/javax/swing/AbstractButton$AccessibleAbstractButton.eea
index 54aed2c3f3..b5ca9ef6af 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/AbstractButton$AccessibleAbstractButton.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/AbstractButton$AccessibleAbstractButton.eea
@@ -5,16 +5,16 @@ class javax/swing/AbstractButton$AccessibleAbstractButton
  (Ljavax/swing/AbstractButton;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleIcon
  ()[Ljavax/accessibility/AccessibleIcon;
- ()[Ljavax/accessibility/AccessibleIcon;
+ ()[0Ljavax/accessibility/AccessibleIcon; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleKeyBinding
  ()Ljavax/accessibility/AccessibleKeyBinding;
- ()Ljavax/accessibility/AccessibleKeyBinding;
+ ()L0javax/accessibility/AccessibleKeyBinding; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -26,25 +26,25 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getAfterIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getAtIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getBeforeIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getCharacterAttribute
  (I)Ljavax/swing/text/AttributeSet;
- (I)Ljavax/swing/text/AttributeSet;
+ (I)L0javax/swing/text/AttributeSet;
 getCharacterBounds
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L0java/awt/Rectangle;
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
@@ -59,10 +59,10 @@ getMinimumAccessibleValue
  ()Ljava/lang/Number;
 getSelectedText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getTitledBorderText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getToolTipText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/AbstractButton.eea b/libs/eea-java-21/src/main/resources/javax/swing/AbstractButton.eea
index c1e1b2c430..cce0d15535 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/AbstractButton.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/AbstractButton.eea
@@ -100,16 +100,16 @@ configurePropertiesFromAction
  (Ljavax/swing/Action;)V
 createActionListener
  ()Ljava/awt/event/ActionListener;
- ()Ljava/awt/event/ActionListener;
+ ()L1java/awt/event/ActionListener;
 createActionPropertyChangeListener
  (Ljavax/swing/Action;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/Action;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/Action;)L1java/beans/PropertyChangeListener;
 createChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 createItemListener
  ()Ljava/awt/event/ItemListener;
- ()Ljava/awt/event/ItemListener;
+ ()L1java/awt/event/ItemListener;
 fireActionPerformed
  (Ljava/awt/event/ActionEvent;)V
  (Ljava/awt/event/ActionEvent;)V
@@ -163,7 +163,7 @@ getSelectedIcon
  ()Ljavax/swing/Icon;
 getSelectedObjects
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 getText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -181,7 +181,7 @@ paintBorder
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 removeActionListener
  (Ljava/awt/event/ActionListener;)V
  (L1java/awt/event/ActionListener;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/ActionMap.eea b/libs/eea-java-21/src/main/resources/javax/swing/ActionMap.eea
index b25d837676..61ab9043ff 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/ActionMap.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/ActionMap.eea
@@ -11,7 +11,7 @@ getParent
  ()Ljavax/swing/ActionMap;
 keys
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 put
  (Ljava/lang/Object;Ljavax/swing/Action;)V
  (Ljava/lang/Object;Ljavax/swing/Action;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/BorderFactory.eea b/libs/eea-java-21/src/main/resources/javax/swing/BorderFactory.eea
index 64d9017b67..965a859c9a 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/BorderFactory.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/BorderFactory.eea
@@ -2,103 +2,103 @@ class javax/swing/BorderFactory
 
 createBevelBorder
  (I)Ljavax/swing/border/Border;
- (I)Ljavax/swing/border/Border;
+ (I)L1javax/swing/border/Border;
 createBevelBorder
  (ILjava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
- (ILjava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
+ (ILjava/awt/Color;Ljava/awt/Color;)L1javax/swing/border/Border;
 createBevelBorder
  (ILjava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
- (ILjava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
+ (ILjava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;)L1javax/swing/border/Border;
 createCompoundBorder
  ()Ljavax/swing/border/CompoundBorder;
- ()Ljavax/swing/border/CompoundBorder;
+ ()L1javax/swing/border/CompoundBorder;
 createCompoundBorder
  (Ljavax/swing/border/Border;Ljavax/swing/border/Border;)Ljavax/swing/border/CompoundBorder;
- (Ljavax/swing/border/Border;Ljavax/swing/border/Border;)Ljavax/swing/border/CompoundBorder;
+ (Ljavax/swing/border/Border;Ljavax/swing/border/Border;)L1javax/swing/border/CompoundBorder;
 createDashedBorder
  (Ljava/awt/Paint;)Ljavax/swing/border/Border;
- (Ljava/awt/Paint;)Ljavax/swing/border/Border;
+ (Ljava/awt/Paint;)L1javax/swing/border/Border;
 createDashedBorder
  (Ljava/awt/Paint;FF)Ljavax/swing/border/Border;
- (Ljava/awt/Paint;FF)Ljavax/swing/border/Border;
+ (Ljava/awt/Paint;FF)L1javax/swing/border/Border;
 createDashedBorder
  (Ljava/awt/Paint;FFFZ)Ljavax/swing/border/Border;
- (Ljava/awt/Paint;FFFZ)Ljavax/swing/border/Border;
+ (Ljava/awt/Paint;FFFZ)L1javax/swing/border/Border;
 createEmptyBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createEmptyBorder
  (IIII)Ljavax/swing/border/Border;
- (IIII)Ljavax/swing/border/Border;
+ (IIII)L1javax/swing/border/Border;
 createEtchedBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createEtchedBorder
  (I)Ljavax/swing/border/Border;
- (I)Ljavax/swing/border/Border;
+ (I)L1javax/swing/border/Border;
 createEtchedBorder
  (ILjava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
- (ILjava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
+ (ILjava/awt/Color;Ljava/awt/Color;)L1javax/swing/border/Border;
 createEtchedBorder
  (Ljava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
- (Ljava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
+ (Ljava/awt/Color;Ljava/awt/Color;)L1javax/swing/border/Border;
 createLineBorder
  (Ljava/awt/Color;)Ljavax/swing/border/Border;
- (Ljava/awt/Color;)Ljavax/swing/border/Border;
+ (Ljava/awt/Color;)L1javax/swing/border/Border;
 createLineBorder
  (Ljava/awt/Color;I)Ljavax/swing/border/Border;
- (Ljava/awt/Color;I)Ljavax/swing/border/Border;
+ (Ljava/awt/Color;I)L1javax/swing/border/Border;
 createLineBorder
  (Ljava/awt/Color;IZ)Ljavax/swing/border/Border;
- (Ljava/awt/Color;IZ)Ljavax/swing/border/Border;
+ (Ljava/awt/Color;IZ)L1javax/swing/border/Border;
 createLoweredBevelBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createLoweredSoftBevelBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createMatteBorder
  (IIIILjava/awt/Color;)Ljavax/swing/border/MatteBorder;
- (IIIILjava/awt/Color;)Ljavax/swing/border/MatteBorder;
+ (IIIILjava/awt/Color;)L1javax/swing/border/MatteBorder;
 createMatteBorder
  (IIIILjavax/swing/Icon;)Ljavax/swing/border/MatteBorder;
- (IIIILjavax/swing/Icon;)Ljavax/swing/border/MatteBorder;
+ (IIIILjavax/swing/Icon;)L1javax/swing/border/MatteBorder;
 createRaisedBevelBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createRaisedSoftBevelBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createSoftBevelBorder
  (I)Ljavax/swing/border/Border;
- (I)Ljavax/swing/border/Border;
+ (I)L0javax/swing/border/Border;
 createSoftBevelBorder
  (ILjava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
- (ILjava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
+ (ILjava/awt/Color;Ljava/awt/Color;)L1javax/swing/border/Border;
 createSoftBevelBorder
  (ILjava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
- (ILjava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;)Ljavax/swing/border/Border;
+ (ILjava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;)L1javax/swing/border/Border;
 createStrokeBorder
  (Ljava/awt/BasicStroke;)Ljavax/swing/border/Border;
- (Ljava/awt/BasicStroke;)Ljavax/swing/border/Border;
+ (Ljava/awt/BasicStroke;)L1javax/swing/border/Border;
 createStrokeBorder
  (Ljava/awt/BasicStroke;Ljava/awt/Paint;)Ljavax/swing/border/Border;
- (Ljava/awt/BasicStroke;Ljava/awt/Paint;)Ljavax/swing/border/Border;
+ (Ljava/awt/BasicStroke;Ljava/awt/Paint;)L1javax/swing/border/Border;
 createTitledBorder
  (Ljava/lang/String;)Ljavax/swing/border/TitledBorder;
- (Ljava/lang/String;)Ljavax/swing/border/TitledBorder;
+ (Ljava/lang/String;)L1javax/swing/border/TitledBorder;
 createTitledBorder
  (Ljavax/swing/border/Border;)Ljavax/swing/border/TitledBorder;
- (Ljavax/swing/border/Border;)Ljavax/swing/border/TitledBorder;
+ (Ljavax/swing/border/Border;)L1javax/swing/border/TitledBorder;
 createTitledBorder
  (Ljavax/swing/border/Border;Ljava/lang/String;)Ljavax/swing/border/TitledBorder;
- (Ljavax/swing/border/Border;Ljava/lang/String;)Ljavax/swing/border/TitledBorder;
+ (Ljavax/swing/border/Border;Ljava/lang/String;)L1javax/swing/border/TitledBorder;
 createTitledBorder
  (Ljavax/swing/border/Border;Ljava/lang/String;II)Ljavax/swing/border/TitledBorder;
- (Ljavax/swing/border/Border;Ljava/lang/String;II)Ljavax/swing/border/TitledBorder;
+ (Ljavax/swing/border/Border;Ljava/lang/String;II)L1javax/swing/border/TitledBorder;
 createTitledBorder
  (Ljavax/swing/border/Border;Ljava/lang/String;IILjava/awt/Font;)Ljavax/swing/border/TitledBorder;
- (Ljavax/swing/border/Border;Ljava/lang/String;IILjava/awt/Font;)Ljavax/swing/border/TitledBorder;
+ (Ljavax/swing/border/Border;Ljava/lang/String;IILjava/awt/Font;)L1javax/swing/border/TitledBorder;
 createTitledBorder
  (Ljavax/swing/border/Border;Ljava/lang/String;IILjava/awt/Font;Ljava/awt/Color;)Ljavax/swing/border/TitledBorder;
- (Ljavax/swing/border/Border;Ljava/lang/String;IILjava/awt/Font;Ljava/awt/Color;)Ljavax/swing/border/TitledBorder;
+ (Ljavax/swing/border/Border;Ljava/lang/String;IILjava/awt/Font;Ljava/awt/Color;)L1javax/swing/border/TitledBorder;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/Box.eea b/libs/eea-java-21/src/main/resources/javax/swing/Box.eea
index 8a729e67b3..bfe7e28a9a 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/Box.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/Box.eea
@@ -2,28 +2,28 @@ class javax/swing/Box
 
 createGlue
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component;
 createHorizontalBox
  ()Ljavax/swing/Box;
- ()Ljavax/swing/Box;
+ ()L1javax/swing/Box;
 createHorizontalGlue
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component;
 createHorizontalStrut
  (I)Ljava/awt/Component;
- (I)Ljava/awt/Component;
+ (I)L1java/awt/Component;
 createRigidArea
  (Ljava/awt/Dimension;)Ljava/awt/Component;
- (Ljava/awt/Dimension;)Ljava/awt/Component;
+ (Ljava/awt/Dimension;)L1java/awt/Component;
 createVerticalBox
  ()Ljavax/swing/Box;
- ()Ljavax/swing/Box;
+ ()L1javax/swing/Box;
 createVerticalGlue
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component;
 createVerticalStrut
  (I)Ljava/awt/Component;
- (I)Ljava/awt/Component;
+ (I)L1java/awt/Component;
 
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/ButtonModel.eea b/libs/eea-java-21/src/main/resources/javax/swing/ButtonModel.eea
index 35682cac51..a01364f96f 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/ButtonModel.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/ButtonModel.eea
@@ -14,7 +14,7 @@ getActionCommand
  ()Ljava/lang/String;
 getGroup
  ()Ljavax/swing/ButtonGroup;
- ()Ljavax/swing/ButtonGroup;
+ ()L0javax/swing/ButtonGroup;
 removeActionListener
  (Ljava/awt/event/ActionListener;)V
  (L1java/awt/event/ActionListener;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/DebugGraphics.eea b/libs/eea-java-21/src/main/resources/javax/swing/DebugGraphics.eea
index 43e7b1a7a2..b9d0e23680 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/DebugGraphics.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/DebugGraphics.eea
@@ -21,10 +21,10 @@ setLogStream
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
 create
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L1java/awt/Graphics; # @Inherited(java.awt.Graphics)
 create
  (IIII)Ljava/awt/Graphics;
- (IIII)Ljava/awt/Graphics;
+ (IIII)L1java/awt/Graphics; # @Overrides(java.awt.Graphics)
 drawBytes
  ([BIIII)V
  ([BIIII)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/DefaultButtonModel.eea b/libs/eea-java-21/src/main/resources/javax/swing/DefaultButtonModel.eea
index c2fc90c8f8..1a4b24d929 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/DefaultButtonModel.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/DefaultButtonModel.eea
@@ -39,7 +39,7 @@ getChangeListeners
  ()[Ljavax/swing/event/ChangeListener;
 getGroup
  ()Ljavax/swing/ButtonGroup;
- ()Ljavax/swing/ButtonGroup;
+ ()L0javax/swing/ButtonGroup; # @Inherited(javax.swing.ButtonModel)
 getItemListeners
  ()[Ljava/awt/event/ItemListener;
  ()[Ljava/awt/event/ItemListener;
@@ -48,7 +48,7 @@ getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
 getSelectedObjects
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 removeActionListener
  (Ljava/awt/event/ActionListener;)V
  (L1java/awt/event/ActionListener;)V # @Inherited(javax.swing.ButtonModel)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/DefaultFocusManager.eea b/libs/eea-java-21/src/main/resources/javax/swing/DefaultFocusManager.eea
index 341f067023..d6b4d73698 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/DefaultFocusManager.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/DefaultFocusManager.eea
@@ -5,13 +5,13 @@ compareTabOrder
  (Ljava/awt/Component;Ljava/awt/Component;)Z
 getComponentAfter
  (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Container;Ljava/awt/Component;)L0java/awt/Component;
 getComponentBefore
  (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Container;Ljava/awt/Component;)L0java/awt/Component;
 getFirstComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
- (Ljava/awt/Container;)Ljava/awt/Component;
+ (Ljava/awt/Container;)L0java/awt/Component;
 getLastComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
- (Ljava/awt/Container;)Ljava/awt/Component;
+ (Ljava/awt/Container;)L0java/awt/Component;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/DefaultListModel.eea b/libs/eea-java-21/src/main/resources/javax/swing/DefaultListModel.eea
index 2d54a32aca..4f923d34b3 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/DefaultListModel.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/DefaultListModel.eea
@@ -71,7 +71,7 @@ setElementAt
  (TE;I)V
 toArray
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[1Ljava/lang/Object;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/DefaultRowSorter$ModelWrapper.eea b/libs/eea-java-21/src/main/resources/javax/swing/DefaultRowSorter$ModelWrapper.eea
index 004dba7572..72f250c4c9 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/DefaultRowSorter$ModelWrapper.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/DefaultRowSorter$ModelWrapper.eea
@@ -10,7 +10,7 @@ getModel
  ()TM;
 getStringValueAt
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L1java/lang/String;
 getValueAt
  (II)Ljava/lang/Object;
  (II)Ljava/lang/Object;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/DefaultRowSorter.eea b/libs/eea-java-21/src/main/resources/javax/swing/DefaultRowSorter.eea
index d7c56f6763..763b5fbc5a 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/DefaultRowSorter.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/DefaultRowSorter.eea
@@ -8,7 +8,7 @@ super javax/swing/RowSorter
 
 getComparator
  (I)Ljava/util/Comparator<*>;
- (I)Ljava/util/Comparator<*>;
+ (I)L0java/util/Comparator<*>;
 getModel
  ()TM;
  ()TM;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/GrayFilter.eea b/libs/eea-java-21/src/main/resources/javax/swing/GrayFilter.eea
index 63a98701b0..96dc8f0129 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/GrayFilter.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/GrayFilter.eea
@@ -2,4 +2,4 @@ class javax/swing/GrayFilter
 
 createDisabledImage
  (Ljava/awt/Image;)Ljava/awt/Image;
- (Ljava/awt/Image;)Ljava/awt/Image;
+ (Ljava/awt/Image;)L1java/awt/Image;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/GroupLayout.eea b/libs/eea-java-21/src/main/resources/javax/swing/GroupLayout.eea
index 492f6c3227..b324c8c229 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/GroupLayout.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/GroupLayout.eea
@@ -11,19 +11,19 @@ addLayoutComponent
  (Ljava/lang/String;Ljava/awt/Component;)V
 createBaselineGroup
  (ZZ)Ljavax/swing/GroupLayout$ParallelGroup;
- (ZZ)Ljavax/swing/GroupLayout$ParallelGroup;
+ (ZZ)L1javax/swing/GroupLayout$ParallelGroup;
 createParallelGroup
  ()Ljavax/swing/GroupLayout$ParallelGroup;
- ()Ljavax/swing/GroupLayout$ParallelGroup;
+ ()L1javax/swing/GroupLayout$ParallelGroup;
 createParallelGroup
  (Ljavax/swing/GroupLayout$Alignment;)Ljavax/swing/GroupLayout$ParallelGroup;
- (Ljavax/swing/GroupLayout$Alignment;)Ljavax/swing/GroupLayout$ParallelGroup;
+ (Ljavax/swing/GroupLayout$Alignment;)L1javax/swing/GroupLayout$ParallelGroup;
 createParallelGroup
  (Ljavax/swing/GroupLayout$Alignment;Z)Ljavax/swing/GroupLayout$ParallelGroup;
- (Ljavax/swing/GroupLayout$Alignment;Z)Ljavax/swing/GroupLayout$ParallelGroup;
+ (Ljavax/swing/GroupLayout$Alignment;Z)L1javax/swing/GroupLayout$ParallelGroup;
 createSequentialGroup
  ()Ljavax/swing/GroupLayout$SequentialGroup;
- ()Ljavax/swing/GroupLayout$SequentialGroup;
+ ()L1javax/swing/GroupLayout$SequentialGroup;
 getLayoutAlignmentX
  (Ljava/awt/Container;)F
  (Ljava/awt/Container;)F
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/ImageIcon$AccessibleImageIcon.eea b/libs/eea-java-21/src/main/resources/javax/swing/ImageIcon$AccessibleImageIcon.eea
index 55271646c1..b9d2e10984 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/ImageIcon$AccessibleImageIcon.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/ImageIcon$AccessibleImageIcon.eea
@@ -5,22 +5,22 @@ class javax/swing/ImageIcon$AccessibleImageIcon
  (Ljavax/swing/ImageIcon;)V
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleIconDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getAccessibleParent
  ()Ljavax/accessibility/Accessible;
- ()Ljavax/accessibility/Accessible;
+ ()L0javax/accessibility/Accessible;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
- ()Ljavax/accessibility/AccessibleStateSet;
+ ()L0javax/accessibility/AccessibleStateSet;
 getLocale
  ()Ljava/util/Locale;
- ()Ljava/util/Locale;
+ ()L0java/util/Locale;
 setAccessibleIconDescription
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/InputMap.eea b/libs/eea-java-21/src/main/resources/javax/swing/InputMap.eea
index b5f99fb884..2181c98970 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/InputMap.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/InputMap.eea
@@ -5,13 +5,13 @@ allKeys
  ()[Ljavax/swing/KeyStroke;
 get
  (Ljavax/swing/KeyStroke;)Ljava/lang/Object;
- (Ljavax/swing/KeyStroke;)Ljava/lang/Object;
+ (Ljavax/swing/KeyStroke;)L0java/lang/Object;
 getParent
  ()Ljavax/swing/InputMap;
  ()Ljavax/swing/InputMap;
 keys
  ()[Ljavax/swing/KeyStroke;
- ()[Ljavax/swing/KeyStroke;
+ ()[0Ljavax/swing/KeyStroke;
 put
  (Ljavax/swing/KeyStroke;Ljava/lang/Object;)V
  (Ljavax/swing/KeyStroke;Ljava/lang/Object;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JApplet.eea b/libs/eea-java-21/src/main/resources/javax/swing/JApplet.eea
index 99bb993e37..149f7a42f3 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JApplet.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JApplet.eea
@@ -12,7 +12,7 @@ addImpl
  (Ljava/awt/Component;Ljava/lang/Object;I)V
 createRootPane
  ()Ljavax/swing/JRootPane;
- ()Ljavax/swing/JRootPane;
+ ()L1javax/swing/JRootPane;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -24,7 +24,7 @@ getGlassPane
  ()Ljava/awt/Component;
 getGraphics
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L0java/awt/Graphics; # @Inherited(java.awt.Component)
 getJMenuBar
  ()Ljavax/swing/JMenuBar;
  ()Ljavax/swing/JMenuBar;
@@ -39,7 +39,7 @@ getTransferHandler
  ()Ljavax/swing/TransferHandler;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Container)
 remove
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JButton.eea b/libs/eea-java-21/src/main/resources/javax/swing/JButton.eea
index e8d6cecacf..afddb49906 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JButton.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JButton.eea
@@ -17,7 +17,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.AbstractButton)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JCheckBox.eea b/libs/eea-java-21/src/main/resources/javax/swing/JCheckBox.eea
index ac6d08518e..b3479bc839 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JCheckBox.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JCheckBox.eea
@@ -30,7 +30,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JToggleButton)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JToggleButton)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JCheckBoxMenuItem.eea b/libs/eea-java-21/src/main/resources/javax/swing/JCheckBoxMenuItem.eea
index 7a924cf2f8..bf60117298 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JCheckBoxMenuItem.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JCheckBoxMenuItem.eea
@@ -23,10 +23,10 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getSelectedObjects
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object; # @Inherited(javax.swing.AbstractButton)
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JMenuItem)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JMenuItem)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JColorChooser.eea b/libs/eea-java-21/src/main/resources/javax/swing/JColorChooser.eea
index bc7eae5b2a..ec0ccb2d70 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JColorChooser.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JColorChooser.eea
@@ -12,7 +12,7 @@ SELECTION_MODEL_PROPERTY
 
 createDialog
  (Ljava/awt/Component;Ljava/lang/String;ZLjavax/swing/JColorChooser;Ljava/awt/event/ActionListener;Ljava/awt/event/ActionListener;)Ljavax/swing/JDialog;
- (Ljava/awt/Component;Ljava/lang/String;ZLjavax/swing/JColorChooser;Ljava/awt/event/ActionListener;Ljava/awt/event/ActionListener;)Ljavax/swing/JDialog;
+ (Ljava/awt/Component;Ljava/lang/String;ZLjavax/swing/JColorChooser;Ljava/awt/event/ActionListener;Ljava/awt/event/ActionListener;)L1javax/swing/JDialog;
 showDialog
  (Ljava/awt/Component;Ljava/lang/String;Ljava/awt/Color;)Ljava/awt/Color;
  (Ljava/awt/Component;Ljava/lang/String;Ljava/awt/Color;)Ljava/awt/Color;
@@ -53,10 +53,10 @@ getUI
  ()Ljavax/swing/plaf/ColorChooserUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 removeChooserPanel
  (Ljavax/swing/colorchooser/AbstractColorChooserPanel;)Ljavax/swing/colorchooser/AbstractColorChooserPanel;
  (Ljavax/swing/colorchooser/AbstractColorChooserPanel;)Ljavax/swing/colorchooser/AbstractColorChooserPanel;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JComboBox$AccessibleJComboBox.eea b/libs/eea-java-21/src/main/resources/javax/swing/JComboBox$AccessibleJComboBox.eea
index b47e0b7d53..01c77c174b 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JComboBox$AccessibleJComboBox.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JComboBox$AccessibleJComboBox.eea
@@ -5,22 +5,22 @@ class javax/swing/JComboBox$AccessibleJComboBox
  (Ljavax/swing/JComboBox;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
- ()Ljavax/accessibility/AccessibleStateSet;
+ ()L1javax/accessibility/AccessibleStateSet;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JComboBox.eea b/libs/eea-java-21/src/main/resources/javax/swing/JComboBox.eea
index 04fea573a9..de808b48d2 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JComboBox.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JComboBox.eea
@@ -59,10 +59,10 @@ contentsChanged
  (L1javax/swing/event/ListDataEvent;)V # @Inherited(javax.swing.event.ListDataListener)
 createActionPropertyChangeListener
  (Ljavax/swing/Action;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/Action;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/Action;)L1java/beans/PropertyChangeListener;
 createDefaultKeySelectionManager
  ()Ljavax/swing/JComboBox$KeySelectionManager;
- ()Ljavax/swing/JComboBox$KeySelectionManager;
+ ()L1javax/swing/JComboBox$KeySelectionManager;
 fireItemStateChanged
  (Ljava/awt/event/ItemEvent;)V
  (Ljava/awt/event/ItemEvent;)V
@@ -107,13 +107,13 @@ getSelectedItem
  ()Ljava/lang/Object;
 getSelectedObjects
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[1Ljava/lang/Object;
 getUI
  ()Ljavax/swing/plaf/ComboBoxUI;
  ()Ljavax/swing/plaf/ComboBoxUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 insertItemAt
  (TE;I)V
  (TE;I)V
@@ -125,7 +125,7 @@ intervalRemoved
  (L1javax/swing/event/ListDataEvent;)V # @Inherited(javax.swing.event.ListDataListener)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 processKeyBinding
  (Ljavax/swing/KeyStroke;Ljava/awt/event/KeyEvent;IZ)Z
  (Ljavax/swing/KeyStroke;Ljava/awt/event/KeyEvent;IZ)Z
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JComponent$AccessibleJComponent.eea b/libs/eea-java-21/src/main/resources/javax/swing/JComponent$AccessibleJComponent.eea
index 3a1238f2ed..b914c34eae 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JComponent$AccessibleJComponent.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JComponent$AccessibleJComponent.eea
@@ -12,13 +12,13 @@ addPropertyChangeListener
  (L1java/beans/PropertyChangeListener;)V # @Inherited(java.awt.Container$AccessibleAWTContainer)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(java.awt.Container$AccessibleAWTContainer)
 getAccessibleDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getAccessibleKeyBinding
  ()Ljavax/accessibility/AccessibleKeyBinding;
- ()Ljavax/accessibility/AccessibleKeyBinding;
+ ()L0javax/accessibility/AccessibleKeyBinding;
 getAccessibleName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -30,10 +30,10 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getBorderTitle
  (Ljavax/swing/border/Border;)Ljava/lang/String;
- (Ljavax/swing/border/Border;)Ljava/lang/String;
+ (Ljavax/swing/border/Border;)L0java/lang/String;
 getTitledBorderText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getToolTipText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JComponent.eea b/libs/eea-java-21/src/main/resources/javax/swing/JComponent.eea
index 4826b5fd3f..57efd656a3 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JComponent.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JComponent.eea
@@ -32,7 +32,7 @@ computeVisibleRect
  (Ljava/awt/Rectangle;)V
 createToolTip
  ()Ljavax/swing/JToolTip;
- ()Ljavax/swing/JToolTip;
+ ()L1javax/swing/JToolTip;
 firePropertyChange
  (Ljava/lang/String;CC)V
  (Ljava/lang/String;CC)V
@@ -47,7 +47,7 @@ fireVetoableChange
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 getActionForKeyStroke
  (Ljavax/swing/KeyStroke;)Ljava/awt/event/ActionListener;
- (Ljavax/swing/KeyStroke;)Ljava/awt/event/ActionListener;
+ (Ljavax/swing/KeyStroke;)L0java/awt/event/ActionListener;
 getActionMap
  ()Ljavax/swing/ActionMap;
  ()Ljavax/swing/ActionMap;
@@ -65,13 +65,13 @@ getBounds
  (Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
 getClientProperty
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L0java/lang/Object;
 getComponentGraphics
  (Ljava/awt/Graphics;)Ljava/awt/Graphics;
- (Ljava/awt/Graphics;)Ljava/awt/Graphics;
+ (Ljava/awt/Graphics;)L1java/awt/Graphics;
 getComponentPopupMenu
  ()Ljavax/swing/JPopupMenu;
- ()Ljavax/swing/JPopupMenu;
+ ()L0javax/swing/JPopupMenu;
 getConditionForKeyStroke
  (Ljavax/swing/KeyStroke;)I
  (Ljavax/swing/KeyStroke;)I
@@ -80,7 +80,7 @@ getFontMetrics
  (Ljava/awt/Font;)Ljava/awt/FontMetrics;
 getGraphics
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L0java/awt/Graphics; # @Inherited(java.awt.Component)
 getInputMap
  ()Ljavax/swing/InputMap;
  ()Ljavax/swing/InputMap;
@@ -113,13 +113,13 @@ getNextFocusableComponent
  ()Ljava/awt/Component;
 getPopupLocation
  (Ljava/awt/event/MouseEvent;)Ljava/awt/Point;
- (Ljava/awt/event/MouseEvent;)Ljava/awt/Point;
+ (Ljava/awt/event/MouseEvent;)L0java/awt/Point;
 getPreferredSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
 getRegisteredKeyStrokes
  ()[Ljavax/swing/KeyStroke;
- ()[Ljavax/swing/KeyStroke;
+ ()[1Ljavax/swing/KeyStroke;
 getRootPane
  ()Ljavax/swing/JRootPane;
  ()Ljavax/swing/JRootPane;
@@ -128,7 +128,7 @@ getSize
  (Ljava/awt/Dimension;)Ljava/awt/Dimension;
 getToolTipLocation
  (Ljava/awt/event/MouseEvent;)Ljava/awt/Point;
- (Ljava/awt/event/MouseEvent;)Ljava/awt/Point;
+ (Ljava/awt/event/MouseEvent;)L0java/awt/Point;
 getToolTipText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -137,7 +137,7 @@ getToolTipText
  (L1java/awt/event/MouseEvent;)Ljava/lang/String;
 getTopLevelAncestor
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L0java/awt/Container;
 getTransferHandler
  ()Ljavax/swing/TransferHandler;
  ()Ljavax/swing/TransferHandler;
@@ -146,13 +146,13 @@ getUI
  ()Ljavax/swing/plaf/ComponentUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getVetoableChangeListeners
  ()[Ljava/beans/VetoableChangeListener;
  ()[Ljava/beans/VetoableChangeListener;
 getVisibleRect
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L1java/awt/Rectangle;
 paint
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
@@ -170,7 +170,7 @@ paintImmediately
  (Ljava/awt/Rectangle;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Container)
 print
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JDesktopPane.eea b/libs/eea-java-21/src/main/resources/javax/swing/JDesktopPane.eea
index 48c92f8629..e2821a1a10 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JDesktopPane.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JDesktopPane.eea
@@ -23,16 +23,16 @@ getUI
  ()Ljavax/swing/plaf/DesktopPaneUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JLayeredPane)
 remove
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
 selectFrame
  (Z)Ljavax/swing/JInternalFrame;
- (Z)Ljavax/swing/JInternalFrame;
+ (Z)L0javax/swing/JInternalFrame;
 setComponentZOrder
  (Ljava/awt/Component;I)V
  (Ljava/awt/Component;I)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JDialog.eea b/libs/eea-java-21/src/main/resources/javax/swing/JDialog.eea
index 88eb273a07..49e970ea95 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JDialog.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JDialog.eea
@@ -57,7 +57,7 @@ addImpl
  (Ljava/awt/Component;Ljava/lang/Object;I)V
 createRootPane
  ()Ljavax/swing/JRootPane;
- ()Ljavax/swing/JRootPane;
+ ()L1javax/swing/JRootPane;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -69,7 +69,7 @@ getGlassPane
  ()Ljava/awt/Component;
 getGraphics
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L0java/awt/Graphics; # @Inherited(java.awt.Component)
 getJMenuBar
  ()Ljavax/swing/JMenuBar;
  ()Ljavax/swing/JMenuBar;
@@ -84,7 +84,7 @@ getTransferHandler
  ()Ljavax/swing/TransferHandler;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Dialog)
 processWindowEvent
  (Ljava/awt/event/WindowEvent;)V
  (Ljava/awt/event/WindowEvent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JEditorPane$AccessibleJEditorPaneHTML.eea b/libs/eea-java-21/src/main/resources/javax/swing/JEditorPane$AccessibleJEditorPaneHTML.eea
index 195f02fdc6..862f2d72f9 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JEditorPane$AccessibleJEditorPaneHTML.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JEditorPane$AccessibleJEditorPaneHTML.eea
@@ -5,10 +5,10 @@ class javax/swing/JEditorPane$AccessibleJEditorPaneHTML
  (Ljavax/swing/JEditorPane;)V
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Container$AccessibleAWTContainer)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L1javax/accessibility/AccessibleText; # @Overrides(javax.swing.text.JTextComponent$AccessibleJTextComponent)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink.eea b/libs/eea-java-21/src/main/resources/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink.eea
index 7b021a01e2..2fde0e9c34 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink.eea
@@ -8,7 +8,7 @@ getAccessibleActionAnchor
  (I)Ljava/lang/Object;
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleActionObject
  (I)Ljava/lang/Object;
- (I)Ljava/lang/Object;
+ (I)L0java/lang/Object;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport.eea b/libs/eea-java-21/src/main/resources/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport.eea
index 5992e31388..8c64fa5426 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport.eea
@@ -5,7 +5,7 @@ class javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport
  (Ljavax/swing/JEditorPane;)V
 getLink
  (I)Ljavax/accessibility/AccessibleHyperlink;
- (I)Ljavax/accessibility/AccessibleHyperlink;
+ (I)L0javax/accessibility/AccessibleHyperlink;
 getLinkText
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JEditorPane.eea b/libs/eea-java-21/src/main/resources/javax/swing/JEditorPane.eea
index 75c2cec41c..c1644780e7 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JEditorPane.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JEditorPane.eea
@@ -9,7 +9,7 @@ W3C_LENGTH_UNITS
 
 createEditorKitForContentType
  (Ljava/lang/String;)Ljavax/swing/text/EditorKit;
- (Ljava/lang/String;)Ljavax/swing/text/EditorKit;
+ (Ljava/lang/String;)L0javax/swing/text/EditorKit;
 getEditorKitClassNameForContentType
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
@@ -34,7 +34,7 @@ addHyperlinkListener
  (L1javax/swing/event/HyperlinkListener;)V
 createDefaultEditorKit
  ()Ljavax/swing/text/EditorKit;
- ()Ljavax/swing/text/EditorKit;
+ ()L1javax/swing/text/EditorKit;
 fireHyperlinkUpdate
  (Ljavax/swing/event/HyperlinkEvent;)V
  (Ljavax/swing/event/HyperlinkEvent;)V
@@ -43,7 +43,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getEditorKit
  ()Ljavax/swing/text/EditorKit;
  ()Ljavax/swing/text/EditorKit;
@@ -58,19 +58,19 @@ getPage
  ()Ljava/net/URL;
 getPreferredSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 getStream
  (Ljava/net/URL;)Ljava/io/InputStream;
  (Ljava/net/URL;)Ljava/io/InputStream;
 getText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(javax.swing.text.JTextComponent)
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.text.JTextComponent)
 read
  (Ljava/io/InputStream;Ljava/lang/Object;)V
  (Ljava/io/InputStream;Ljava/lang/Object;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JFileChooser.eea b/libs/eea-java-21/src/main/resources/javax/swing/JFileChooser.eea
index 43392b156d..6295a82e94 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JFileChooser.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JFileChooser.eea
@@ -91,7 +91,7 @@ addChoosableFileFilter
  (Ljavax/swing/filechooser/FileFilter;)V
 createDialog
  (Ljava/awt/Component;)Ljavax/swing/JDialog;
- (Ljava/awt/Component;)Ljavax/swing/JDialog;
+ (Ljava/awt/Component;)L1javax/swing/JDialog;
 ensureFileIsVisible
  (Ljava/io/File;)V
  (Ljava/io/File;)V
@@ -118,7 +118,7 @@ getApproveButtonToolTipText
  ()Ljava/lang/String;
 getChoosableFileFilters
  ()[Ljavax/swing/filechooser/FileFilter;
- ()[Ljavax/swing/filechooser/FileFilter;
+ ()[1Ljavax/swing/filechooser/FileFilter;
 getCurrentDirectory
  ()Ljava/io/File;
  ()Ljava/io/File;
@@ -157,13 +157,13 @@ getUI
  ()Ljavax/swing/plaf/FileChooserUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 isTraversable
  (Ljava/io/File;)Z
  (Ljava/io/File;)Z
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 removeActionListener
  (Ljava/awt/event/ActionListener;)V
  (L1java/awt/event/ActionListener;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JFormattedTextField$AbstractFormatter.eea b/libs/eea-java-21/src/main/resources/javax/swing/JFormattedTextField$AbstractFormatter.eea
index 486c22e6e6..1f0ba6df4d 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JFormattedTextField$AbstractFormatter.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JFormattedTextField$AbstractFormatter.eea
@@ -5,16 +5,16 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 getActions
  ()[Ljavax/swing/Action;
- ()[Ljavax/swing/Action;
+ ()[0Ljavax/swing/Action;
 getDocumentFilter
  ()Ljavax/swing/text/DocumentFilter;
- ()Ljavax/swing/text/DocumentFilter;
+ ()L0javax/swing/text/DocumentFilter;
 getFormattedTextField
  ()Ljavax/swing/JFormattedTextField;
  ()Ljavax/swing/JFormattedTextField;
 getNavigationFilter
  ()Ljavax/swing/text/NavigationFilter;
- ()Ljavax/swing/text/NavigationFilter;
+ ()L0javax/swing/text/NavigationFilter;
 install
  (Ljavax/swing/JFormattedTextField;)V
  (Ljavax/swing/JFormattedTextField;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JFormattedTextField.eea b/libs/eea-java-21/src/main/resources/javax/swing/JFormattedTextField.eea
index 79133323d9..96e0e3337b 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JFormattedTextField.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JFormattedTextField.eea
@@ -26,7 +26,7 @@ getFormatterFactory
  ()Ljavax/swing/JFormattedTextField$AbstractFormatterFactory;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JTextField)
 getValue
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JFrame.eea b/libs/eea-java-21/src/main/resources/javax/swing/JFrame.eea
index c1425d7d7b..641333f1f7 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JFrame.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JFrame.eea
@@ -21,7 +21,7 @@ addImpl
  (Ljava/awt/Component;Ljava/lang/Object;I)V
 createRootPane
  ()Ljavax/swing/JRootPane;
- ()Ljavax/swing/JRootPane;
+ ()L1javax/swing/JRootPane;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -33,7 +33,7 @@ getGlassPane
  ()Ljava/awt/Component;
 getGraphics
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L0java/awt/Graphics; # @Inherited(java.awt.Component)
 getJMenuBar
  ()Ljavax/swing/JMenuBar;
  ()Ljavax/swing/JMenuBar;
@@ -48,7 +48,7 @@ getTransferHandler
  ()Ljavax/swing/TransferHandler;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Frame)
 processWindowEvent
  (Ljava/awt/event/WindowEvent;)V
  (Ljava/awt/event/WindowEvent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JInternalFrame$AccessibleJInternalFrame.eea b/libs/eea-java-21/src/main/resources/javax/swing/JInternalFrame$AccessibleJInternalFrame.eea
index aacb561c56..7c91b97281 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JInternalFrame$AccessibleJInternalFrame.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JInternalFrame$AccessibleJInternalFrame.eea
@@ -11,7 +11,7 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon.eea b/libs/eea-java-21/src/main/resources/javax/swing/JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon.eea
index 6d7313279f..44797eaf4d 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon.eea
@@ -8,16 +8,16 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getMaximumAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getMinimumAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 setCurrentAccessibleValue
  (Ljava/lang/Number;)Z
  (Ljava/lang/Number;)Z
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JInternalFrame$JDesktopIcon.eea b/libs/eea-java-21/src/main/resources/javax/swing/JInternalFrame$JDesktopIcon.eea
index 94d19ac689..c33e9a7aa4 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JInternalFrame$JDesktopIcon.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JInternalFrame$JDesktopIcon.eea
@@ -8,7 +8,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getDesktopPane
  ()Ljavax/swing/JDesktopPane;
- ()Ljavax/swing/JDesktopPane;
+ ()L0javax/swing/JDesktopPane;
 getInternalFrame
  ()Ljavax/swing/JInternalFrame;
  ()Ljavax/swing/JInternalFrame;
@@ -17,7 +17,7 @@ getUI
  ()Ljavax/swing/plaf/DesktopIconUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setInternalFrame
  (Ljavax/swing/JInternalFrame;)V
  (Ljavax/swing/JInternalFrame;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JInternalFrame.eea b/libs/eea-java-21/src/main/resources/javax/swing/JInternalFrame.eea
index 90840b4bf7..6c78808ec6 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JInternalFrame.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JInternalFrame.eea
@@ -70,7 +70,7 @@ addInternalFrameListener
  (L1javax/swing/event/InternalFrameListener;)V
 createRootPane
  ()Ljavax/swing/JRootPane;
- ()Ljavax/swing/JRootPane;
+ ()L1javax/swing/JRootPane;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -85,10 +85,10 @@ getDesktopPane
  ()Ljavax/swing/JDesktopPane;
 getFocusCycleRootAncestor
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L0java/awt/Container;
 getFocusOwner
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 getFrameIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
@@ -127,16 +127,16 @@ getUI
  ()Ljavax/swing/plaf/InternalFrameUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 getWarningString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 paintComponent
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 remove
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JLabel$AccessibleJLabel.eea b/libs/eea-java-21/src/main/resources/javax/swing/JLabel$AccessibleJLabel.eea
index ad4150119e..f5075dacdf 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JLabel$AccessibleJLabel.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JLabel$AccessibleJLabel.eea
@@ -5,10 +5,10 @@ class javax/swing/JLabel$AccessibleJLabel
  (Ljavax/swing/JLabel;)V
 getAccessibleIcon
  ()[Ljavax/accessibility/AccessibleIcon;
- ()[Ljavax/accessibility/AccessibleIcon;
+ ()[0Ljavax/accessibility/AccessibleIcon; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleKeyBinding
  ()Ljavax/accessibility/AccessibleKeyBinding;
- ()Ljavax/accessibility/AccessibleKeyBinding;
+ ()L0javax/accessibility/AccessibleKeyBinding; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -20,31 +20,31 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAfterIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getAtIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getBeforeIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getCharacterAttribute
  (I)Ljavax/swing/text/AttributeSet;
- (I)Ljavax/swing/text/AttributeSet;
+ (I)L0javax/swing/text/AttributeSet;
 getCharacterBounds
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L0java/awt/Rectangle;
 getIndexAtPoint
  (Ljava/awt/Point;)I
  (Ljava/awt/Point;)I
 getSelectedText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getTitledBorderText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getToolTipText
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JLabel.eea b/libs/eea-java-21/src/main/resources/javax/swing/JLabel.eea
index 536410d089..83de700c3b 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JLabel.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JLabel.eea
@@ -45,13 +45,13 @@ getUI
  ()Ljavax/swing/plaf/LabelUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 imageUpdate
  (Ljava/awt/Image;IIIII)Z
  (Ljava/awt/Image;IIIII)Z
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setDisabledIcon
  (Ljavax/swing/Icon;)V
  (Ljavax/swing/Icon;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JLayer.eea b/libs/eea-java-21/src/main/resources/javax/swing/JLayer.eea
index 1def87d320..2efefe68c0 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JLayer.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JLayer.eea
@@ -13,13 +13,13 @@ addImpl
  (Ljava/awt/Component;Ljava/lang/Object;I)V
 createGlassPane
  ()Ljavax/swing/JPanel;
- ()Ljavax/swing/JPanel;
+ ()L1javax/swing/JPanel;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
 getBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L0javax/swing/border/Border;
 getGlassPane
  ()Ljavax/swing/JPanel;
  ()Ljavax/swing/JPanel;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JLayeredPane.eea b/libs/eea-java-21/src/main/resources/javax/swing/JLayeredPane.eea
index 0fb6d4334b..be14fae683 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JLayeredPane.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JLayeredPane.eea
@@ -43,7 +43,7 @@ getComponentToLayer
  ()Ljava/util/Hashtable<Ljava/awt/Component;Ljava/lang/Integer;>;
 getComponentsInLayer
  (I)[Ljava/awt/Component;
- (I)[Ljava/awt/Component;
+ (I)[1Ljava/awt/Component;
 getIndexOf
  (Ljava/awt/Component;)I
  (Ljava/awt/Component;)I
@@ -67,7 +67,7 @@ paint
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setLayer
  (Ljava/awt/Component;I)V
  (Ljava/awt/Component;I)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JList$AccessibleJList$AccessibleJListChild.eea b/libs/eea-java-21/src/main/resources/javax/swing/JList$AccessibleJList$AccessibleJListChild.eea
index 30ba58c67c..4f1d7b218a 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JList$AccessibleJList$AccessibleJListChild.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JList$AccessibleJList$AccessibleJListChild.eea
@@ -14,76 +14,76 @@ contains
  (Ljava/awt/Point;)Z
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
 getAccessibleDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getAccessibleIcon
  ()[Ljavax/accessibility/AccessibleIcon;
- ()[Ljavax/accessibility/AccessibleIcon;
+ ()[0Ljavax/accessibility/AccessibleIcon; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
- ()Ljavax/accessibility/AccessibleRole;
+ ()L0javax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
- ()Ljavax/accessibility/AccessibleStateSet;
+ ()L1javax/accessibility/AccessibleStateSet;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getBounds
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L0java/awt/Rectangle;
 getCursor
  ()Ljava/awt/Cursor;
- ()Ljava/awt/Cursor;
+ ()L0java/awt/Cursor;
 getFont
  ()Ljava/awt/Font;
- ()Ljava/awt/Font;
+ ()L0java/awt/Font;
 getFontMetrics
  (Ljava/awt/Font;)Ljava/awt/FontMetrics;
- (Ljava/awt/Font;)Ljava/awt/FontMetrics;
+ (Ljava/awt/Font;)L0java/awt/FontMetrics;
 getForeground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getLocale
  ()Ljava/util/Locale;
- ()Ljava/util/Locale;
+ ()L0java/util/Locale;
 getLocation
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getLocationOnScreen
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L0java/awt/Dimension;
 removeFocusListener
  (Ljava/awt/event/FocusListener;)V
  (L1java/awt/event/FocusListener;)V # @Inherited(javax.accessibility.AccessibleComponent)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JList$AccessibleJList.eea b/libs/eea-java-21/src/main/resources/javax/swing/JList$AccessibleJList.eea
index 59471d6bf5..059c24e184 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JList$AccessibleJList.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JList$AccessibleJList.eea
@@ -8,19 +8,19 @@ contentsChanged
  (L1javax/swing/event/ListDataEvent;)V # @Inherited(javax.swing.event.ListDataListener)
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Container$AccessibleAWTContainer)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
  ()Ljavax/accessibility/AccessibleStateSet;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JList.eea b/libs/eea-java-21/src/main/resources/javax/swing/JList.eea
index f6c8c404a1..ec69fee525 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JList.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JList.eea
@@ -16,13 +16,13 @@ addListSelectionListener
  (L1javax/swing/event/ListSelectionListener;)V
 createSelectionModel
  ()Ljavax/swing/ListSelectionModel;
- ()Ljavax/swing/ListSelectionModel;
+ ()L1javax/swing/ListSelectionModel;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
 getCellBounds
  (II)Ljava/awt/Rectangle;
- (II)Ljava/awt/Rectangle;
+ (II)L0java/awt/Rectangle;
 getCellRenderer
  ()Ljavax/swing/ListCellRenderer<-TE;>;
  ()Ljavax/swing/ListCellRenderer<-TE;>;
@@ -61,7 +61,7 @@ getSelectedValue
  ()TE;
 getSelectedValues
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[1Ljava/lang/Object;
 getSelectedValuesList
  ()Ljava/util/List<TE;>;
  ()Ljava/util/List<TE;>;
@@ -82,16 +82,16 @@ getUI
  ()Ljavax/swing/plaf/ListUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 indexToLocation
  (I)Ljava/awt/Point;
- (I)Ljava/awt/Point;
+ (I)L0java/awt/Point;
 locationToIndex
  (Ljava/awt/Point;)I
  (Ljava/awt/Point;)I
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 removeListSelectionListener
  (Ljavax/swing/event/ListSelectionListener;)V
  (L1javax/swing/event/ListSelectionListener;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JMenu$AccessibleJMenu.eea b/libs/eea-java-21/src/main/resources/javax/swing/JMenu$AccessibleJMenu.eea
index 8dd847c638..bfc7357bc4 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JMenu$AccessibleJMenu.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JMenu$AccessibleJMenu.eea
@@ -5,13 +5,13 @@ class javax/swing/JMenu$AccessibleJMenu
  (Ljavax/swing/JMenu;)V
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JMenu.eea b/libs/eea-java-21/src/main/resources/javax/swing/JMenu.eea
index bb085a02c5..5d9809882a 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JMenu.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JMenu.eea
@@ -36,13 +36,13 @@ applyComponentOrientation
  (Ljava/awt/ComponentOrientation;)V
 createActionChangeListener
  (Ljavax/swing/JMenuItem;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JMenuItem;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JMenuItem;)L1java/beans/PropertyChangeListener;
 createActionComponent
  (Ljavax/swing/Action;)Ljavax/swing/JMenuItem;
- (Ljavax/swing/Action;)Ljavax/swing/JMenuItem;
+ (Ljavax/swing/Action;)L1javax/swing/JMenuItem;
 createWinListener
  (Ljavax/swing/JPopupMenu;)Ljavax/swing/JMenu$WinListener;
- (Ljavax/swing/JPopupMenu;)Ljavax/swing/JMenu$WinListener;
+ (Ljavax/swing/JPopupMenu;)L1javax/swing/JMenu$WinListener;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -51,10 +51,10 @@ getComponent
  ()Ljava/awt/Component;
 getItem
  (I)Ljavax/swing/JMenuItem;
- (I)Ljavax/swing/JMenuItem;
+ (I)L0javax/swing/JMenuItem;
 getMenuComponent
  (I)Ljava/awt/Component;
- (I)Ljava/awt/Component;
+ (I)L0java/awt/Component;
 getMenuComponents
  ()[Ljava/awt/Component;
  ()[Ljava/awt/Component;
@@ -66,19 +66,19 @@ getPopupMenu
  ()Ljavax/swing/JPopupMenu;
 getPopupMenuOrigin
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L1java/awt/Point;
 getSubElements
  ()[Ljavax/swing/MenuElement;
- ()[Ljavax/swing/MenuElement;
+ ()[1Ljavax/swing/MenuElement; # @Inherited(javax.swing.JMenuItem)
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JMenuItem)
 insert
  (Ljava/lang/String;I)V
  (Ljava/lang/String;I)V
 insert
  (Ljavax/swing/Action;I)Ljavax/swing/JMenuItem;
- (Ljavax/swing/Action;I)Ljavax/swing/JMenuItem;
+ (Ljavax/swing/Action;I)L1javax/swing/JMenuItem;
 insert
  (Ljavax/swing/JMenuItem;I)Ljavax/swing/JMenuItem;
  (Ljavax/swing/JMenuItem;I)Ljavax/swing/JMenuItem;
@@ -87,7 +87,7 @@ isMenuComponent
  (Ljava/awt/Component;)Z
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JMenuItem)
 processKeyEvent
  (Ljava/awt/event/KeyEvent;)V
  (Ljava/awt/event/KeyEvent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JMenuBar$AccessibleJMenuBar.eea b/libs/eea-java-21/src/main/resources/javax/swing/JMenuBar$AccessibleJMenuBar.eea
index 9821e3ea56..4c46e234ac 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JMenuBar$AccessibleJMenuBar.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JMenuBar$AccessibleJMenuBar.eea
@@ -8,10 +8,10 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
  ()Ljavax/accessibility/AccessibleStateSet;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JMenuBar.eea b/libs/eea-java-21/src/main/resources/javax/swing/JMenuBar.eea
index 2f51e53d12..1b302c0fcc 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JMenuBar.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JMenuBar.eea
@@ -11,37 +11,37 @@ getComponent
  ()Ljava/awt/Component;
 getComponentAtIndex
  (I)Ljava/awt/Component;
- (I)Ljava/awt/Component;
+ (I)L0java/awt/Component;
 getComponentIndex
  (Ljava/awt/Component;)I
  (Ljava/awt/Component;)I
 getHelpMenu
  ()Ljavax/swing/JMenu;
- ()Ljavax/swing/JMenu;
+ ()L1javax/swing/JMenu;
 getMargin
  ()Ljava/awt/Insets;
  ()Ljava/awt/Insets;
 getMenu
  (I)Ljavax/swing/JMenu;
- (I)Ljavax/swing/JMenu;
+ (I)L0javax/swing/JMenu;
 getSelectionModel
  ()Ljavax/swing/SingleSelectionModel;
  ()Ljavax/swing/SingleSelectionModel;
 getSubElements
  ()[Ljavax/swing/MenuElement;
- ()[Ljavax/swing/MenuElement;
+ ()[1Ljavax/swing/MenuElement;
 getUI
  ()Ljavax/swing/plaf/MenuBarUI;
  ()Ljavax/swing/plaf/MenuBarUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paintBorder
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 processKeyBinding
  (Ljavax/swing/KeyStroke;Ljava/awt/event/KeyEvent;IZ)Z
  (Ljavax/swing/KeyStroke;Ljava/awt/event/KeyEvent;IZ)Z
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JMenuItem.eea b/libs/eea-java-21/src/main/resources/javax/swing/JMenuItem.eea
index 1c2956607a..60dab4e319 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JMenuItem.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JMenuItem.eea
@@ -65,16 +65,16 @@ getMenuKeyListeners
  ()[Ljavax/swing/event/MenuKeyListener;
 getSubElements
  ()[Ljavax/swing/MenuElement;
- ()[Ljavax/swing/MenuElement;
+ ()[1Ljavax/swing/MenuElement;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 init
  (Ljava/lang/String;Ljavax/swing/Icon;)V
  (Ljava/lang/String;Ljavax/swing/Icon;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.AbstractButton)
 processKeyEvent
  (Ljava/awt/event/KeyEvent;[Ljavax/swing/MenuElement;Ljavax/swing/MenuSelectionManager;)V
  (Ljava/awt/event/KeyEvent;[Ljavax/swing/MenuElement;Ljavax/swing/MenuSelectionManager;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JOptionPane.eea b/libs/eea-java-21/src/main/resources/javax/swing/JOptionPane.eea
index b38d621d41..7819fe3a57 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JOptionPane.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JOptionPane.eea
@@ -72,7 +72,7 @@ showInputDialog
  (Ljava/awt/Component;Ljava/lang/Object;Ljava/lang/String;I)Ljava/lang/String;
 showInputDialog
  (Ljava/awt/Component;Ljava/lang/Object;Ljava/lang/String;ILjavax/swing/Icon;[Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/awt/Component;Ljava/lang/Object;Ljava/lang/String;ILjavax/swing/Icon;[Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/awt/Component;Ljava/lang/Object;Ljava/lang/String;ILjavax/swing/Icon;[Ljava/lang/Object;Ljava/lang/Object;)L0java/lang/Object;
 showInputDialog
  (Ljava/lang/Object;)Ljava/lang/String;
  (Ljava/lang/Object;)Ljava/lang/String;
@@ -99,7 +99,7 @@ showInternalInputDialog
  (Ljava/awt/Component;Ljava/lang/Object;Ljava/lang/String;I)Ljava/lang/String;
 showInternalInputDialog
  (Ljava/awt/Component;Ljava/lang/Object;Ljava/lang/String;ILjavax/swing/Icon;[Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/awt/Component;Ljava/lang/Object;Ljava/lang/String;ILjavax/swing/Icon;[Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/awt/Component;Ljava/lang/Object;Ljava/lang/String;ILjavax/swing/Icon;[Ljava/lang/Object;Ljava/lang/Object;)L0java/lang/Object;
 showInternalMessageDialog
  (Ljava/awt/Component;Ljava/lang/Object;)V
  (Ljava/awt/Component;Ljava/lang/Object;)V
@@ -170,13 +170,13 @@ value
  (Ljava/lang/Object;IILjavax/swing/Icon;[Ljava/lang/Object;Ljava/lang/Object;)V
 createDialog
  (Ljava/awt/Component;Ljava/lang/String;)Ljavax/swing/JDialog;
- (Ljava/awt/Component;Ljava/lang/String;)Ljavax/swing/JDialog;
+ (Ljava/awt/Component;Ljava/lang/String;)L1javax/swing/JDialog;
 createDialog
  (Ljava/lang/String;)Ljavax/swing/JDialog;
- (Ljava/lang/String;)Ljavax/swing/JDialog;
+ (Ljava/lang/String;)L1javax/swing/JDialog;
 createInternalFrame
  (Ljava/awt/Component;Ljava/lang/String;)Ljavax/swing/JInternalFrame;
- (Ljava/awt/Component;Ljava/lang/String;)Ljavax/swing/JInternalFrame;
+ (Ljava/awt/Component;Ljava/lang/String;)L1javax/swing/JInternalFrame;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -206,13 +206,13 @@ getUI
  ()Ljavax/swing/plaf/OptionPaneUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 getValue
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setIcon
  (Ljavax/swing/Icon;)V
  (Ljavax/swing/Icon;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JPanel.eea b/libs/eea-java-21/src/main/resources/javax/swing/JPanel.eea
index ae1e89e511..050023edcc 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JPanel.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JPanel.eea
@@ -14,10 +14,10 @@ getUI
  ()Ljavax/swing/plaf/PanelUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setUI
  (Ljavax/swing/plaf/PanelUI;)V
  (Ljavax/swing/plaf/PanelUI;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JPasswordField$AccessibleJPasswordField.eea b/libs/eea-java-21/src/main/resources/javax/swing/JPasswordField$AccessibleJPasswordField.eea
index b757e265ad..be24a30900 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JPasswordField$AccessibleJPasswordField.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JPasswordField$AccessibleJPasswordField.eea
@@ -8,25 +8,25 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.swing.text.JTextComponent$AccessibleJTextComponent)
 getAfterIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getAtIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getBeforeIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getTextRange
  (II)Ljava/lang/String;
  (II)Ljava/lang/String;
 getTextSequenceAfter
  (II)Ljavax/accessibility/AccessibleTextSequence;
- (II)Ljavax/accessibility/AccessibleTextSequence;
+ (II)L0javax/accessibility/AccessibleTextSequence;
 getTextSequenceAt
  (II)Ljavax/accessibility/AccessibleTextSequence;
- (II)Ljavax/accessibility/AccessibleTextSequence;
+ (II)L0javax/accessibility/AccessibleTextSequence;
 getTextSequenceBefore
  (II)Ljavax/accessibility/AccessibleTextSequence;
- (II)Ljavax/accessibility/AccessibleTextSequence;
+ (II)L0javax/accessibility/AccessibleTextSequence;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JPasswordField.eea b/libs/eea-java-21/src/main/resources/javax/swing/JPasswordField.eea
index 82992090b7..47f6678fc0 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JPasswordField.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JPasswordField.eea
@@ -14,19 +14,19 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getPassword
  ()[C
- ()[C
+ ()[0C
 getText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(javax.swing.text.JTextComponent)
 getText
  (II)Ljava/lang/String;
  (II)Ljava/lang/String;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JTextField)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JTextField)
 setText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JPopupMenu$Separator.eea b/libs/eea-java-21/src/main/resources/javax/swing/JPopupMenu$Separator.eea
index 61f1ce3966..1c4c0143aa 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JPopupMenu$Separator.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JPopupMenu$Separator.eea
@@ -2,4 +2,4 @@ class javax/swing/JPopupMenu$Separator
 
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JSeparator)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JPopupMenu.eea b/libs/eea-java-21/src/main/resources/javax/swing/JPopupMenu.eea
index b9aff19e9c..b07f1d4d4e 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JPopupMenu.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JPopupMenu.eea
@@ -20,10 +20,10 @@ addPopupMenuListener
  (L1javax/swing/event/PopupMenuListener;)V
 createActionChangeListener
  (Ljavax/swing/JMenuItem;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JMenuItem;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JMenuItem;)L1java/beans/PropertyChangeListener;
 createActionComponent
  (Ljavax/swing/Action;)Ljavax/swing/JMenuItem;
- (Ljavax/swing/Action;)Ljavax/swing/JMenuItem;
+ (Ljavax/swing/Action;)L1javax/swing/JMenuItem;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -56,13 +56,13 @@ getSelectionModel
  ()Ljavax/swing/SingleSelectionModel;
 getSubElements
  ()[Ljavax/swing/MenuElement;
- ()[Ljavax/swing/MenuElement;
+ ()[1Ljavax/swing/MenuElement;
 getUI
  ()Ljavax/swing/plaf/PopupMenuUI;
  ()Ljavax/swing/plaf/PopupMenuUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 insert
  (Ljava/awt/Component;I)V
  (Ljava/awt/Component;I)V
@@ -77,7 +77,7 @@ paintBorder
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 processFocusEvent
  (Ljava/awt/event/FocusEvent;)V
  (Ljava/awt/event/FocusEvent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JProgressBar$AccessibleJProgressBar.eea b/libs/eea-java-21/src/main/resources/javax/swing/JProgressBar$AccessibleJProgressBar.eea
index a1463ab534..25b25d2c76 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JProgressBar$AccessibleJProgressBar.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JProgressBar$AccessibleJProgressBar.eea
@@ -11,7 +11,7 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JProgressBar.eea b/libs/eea-java-21/src/main/resources/javax/swing/JProgressBar.eea
index 1c76b91704..d1b23afb41 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JProgressBar.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JProgressBar.eea
@@ -21,7 +21,7 @@ addChangeListener
  (L1javax/swing/event/ChangeListener;)V
 createChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -39,13 +39,13 @@ getUI
  ()Ljavax/swing/plaf/ProgressBarUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paintBorder
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 removeChangeListener
  (Ljavax/swing/event/ChangeListener;)V
  (L1javax/swing/event/ChangeListener;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JRadioButton.eea b/libs/eea-java-21/src/main/resources/javax/swing/JRadioButton.eea
index dcad81dcf2..24a0990a0b 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JRadioButton.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JRadioButton.eea
@@ -26,7 +26,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JToggleButton)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JToggleButton)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JRadioButtonMenuItem.eea b/libs/eea-java-21/src/main/resources/javax/swing/JRadioButtonMenuItem.eea
index bded2dc026..4a0e44138d 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JRadioButtonMenuItem.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JRadioButtonMenuItem.eea
@@ -26,7 +26,7 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JMenuItem)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JMenuItem)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JRootPane$AccessibleJRootPane.eea b/libs/eea-java-21/src/main/resources/javax/swing/JRootPane$AccessibleJRootPane.eea
index 3dcf5d32a1..d6175ea49c 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JRootPane$AccessibleJRootPane.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JRootPane$AccessibleJRootPane.eea
@@ -5,7 +5,7 @@ class javax/swing/JRootPane$AccessibleJRootPane
  (Ljavax/swing/JRootPane;)V
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JRootPane.eea b/libs/eea-java-21/src/main/resources/javax/swing/JRootPane.eea
index 8afd097c4e..4f46d2ff8f 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JRootPane.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JRootPane.eea
@@ -21,16 +21,16 @@ addImpl
  (Ljava/awt/Component;Ljava/lang/Object;I)V
 createContentPane
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L1java/awt/Container;
 createGlassPane
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component;
 createLayeredPane
  ()Ljavax/swing/JLayeredPane;
- ()Ljavax/swing/JLayeredPane;
+ ()L1javax/swing/JLayeredPane;
 createRootLayout
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -57,10 +57,10 @@ getUI
  ()Ljavax/swing/plaf/RootPaneUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setContentPane
  (Ljava/awt/Container;)V
  (Ljava/awt/Container;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JScrollBar$AccessibleJScrollBar.eea b/libs/eea-java-21/src/main/resources/javax/swing/JScrollBar$AccessibleJScrollBar.eea
index 84ada54923..39cc640545 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JScrollBar$AccessibleJScrollBar.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JScrollBar$AccessibleJScrollBar.eea
@@ -11,7 +11,7 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JScrollBar.eea b/libs/eea-java-21/src/main/resources/javax/swing/JScrollBar.eea
index 2ea7d18ba5..65e3cab27f 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JScrollBar.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JScrollBar.eea
@@ -15,7 +15,7 @@ getAdjustmentListeners
  ()[Ljava/awt/event/AdjustmentListener;
 getMaximumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 getMinimumSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
@@ -27,10 +27,10 @@ getUI
  ()Ljavax/swing/plaf/ScrollBarUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 removeAdjustmentListener
  (Ljava/awt/event/AdjustmentListener;)V
  (L1java/awt/event/AdjustmentListener;)V # @Inherited(java.awt.Adjustable)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JScrollPane.eea b/libs/eea-java-21/src/main/resources/javax/swing/JScrollPane.eea
index 01a161b91b..4a929df02f 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JScrollPane.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JScrollPane.eea
@@ -36,13 +36,13 @@ viewport
  (Ljava/awt/Component;II)V
 createHorizontalScrollBar
  ()Ljavax/swing/JScrollBar;
- ()Ljavax/swing/JScrollBar;
+ ()L1javax/swing/JScrollBar;
 createVerticalScrollBar
  ()Ljavax/swing/JScrollBar;
- ()Ljavax/swing/JScrollBar;
+ ()L1javax/swing/JScrollBar;
 createViewport
  ()Ljavax/swing/JViewport;
- ()Ljavax/swing/JViewport;
+ ()L1javax/swing/JViewport;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -51,7 +51,7 @@ getColumnHeader
  ()Ljavax/swing/JViewport;
 getCorner
  (Ljava/lang/String;)Ljava/awt/Component;
- (Ljava/lang/String;)Ljava/awt/Component;
+ (Ljava/lang/String;)L0java/awt/Component;
 getHorizontalScrollBar
  ()Ljavax/swing/JScrollBar;
  ()Ljavax/swing/JScrollBar;
@@ -63,7 +63,7 @@ getUI
  ()Ljavax/swing/plaf/ScrollPaneUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 getVerticalScrollBar
  ()Ljavax/swing/JScrollBar;
  ()Ljavax/swing/JScrollBar;
@@ -75,10 +75,10 @@ getViewportBorder
  ()Ljavax/swing/border/Border;
 getViewportBorderBounds
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L1java/awt/Rectangle;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setColumnHeader
  (Ljavax/swing/JViewport;)V
  (Ljavax/swing/JViewport;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JSeparator.eea b/libs/eea-java-21/src/main/resources/javax/swing/JSeparator.eea
index d7a79a25cc..02c803d8a0 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JSeparator.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JSeparator.eea
@@ -8,10 +8,10 @@ getUI
  ()Ljavax/swing/plaf/SeparatorUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setUI
  (Ljavax/swing/plaf/SeparatorUI;)V
  (Ljavax/swing/plaf/SeparatorUI;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JSlider$AccessibleJSlider.eea b/libs/eea-java-21/src/main/resources/javax/swing/JSlider$AccessibleJSlider.eea
index a6e6ea29cb..44e38bc0c4 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JSlider$AccessibleJSlider.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JSlider$AccessibleJSlider.eea
@@ -5,10 +5,10 @@ class javax/swing/JSlider$AccessibleJSlider
  (Ljavax/swing/JSlider;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
@@ -17,7 +17,7 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JSlider.eea b/libs/eea-java-21/src/main/resources/javax/swing/JSlider.eea
index 486f55cbf7..6d05310de6 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JSlider.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JSlider.eea
@@ -18,13 +18,13 @@ addChangeListener
  (L1javax/swing/event/ChangeListener;)V
 createChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 createStandardLabels
  (I)Ljava/util/Hashtable<Ljava/lang/Integer;Ljavax/swing/JComponent;>;
- (I)Ljava/util/Hashtable<Ljava/lang/Integer;Ljavax/swing/JComponent;>;
+ (I)L1java/util/Hashtable<Ljava/lang/Integer;Ljavax/swing/JComponent;>;
 createStandardLabels
  (II)Ljava/util/Hashtable<Ljava/lang/Integer;Ljavax/swing/JComponent;>;
- (II)Ljava/util/Hashtable<Ljava/lang/Integer;Ljavax/swing/JComponent;>;
+ (II)L1java/util/Hashtable<Ljava/lang/Integer;Ljavax/swing/JComponent;>;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -42,13 +42,13 @@ getUI
  ()Ljavax/swing/plaf/SliderUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 imageUpdate
  (Ljava/awt/Image;IIIII)Z
  (Ljava/awt/Image;IIIII)Z
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 removeChangeListener
  (Ljavax/swing/event/ChangeListener;)V
  (L1javax/swing/event/ChangeListener;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JSpinner$AccessibleJSpinner.eea b/libs/eea-java-21/src/main/resources/javax/swing/JSpinner$AccessibleJSpinner.eea
index ed3ba1e3c6..d51eae8f64 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JSpinner$AccessibleJSpinner.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JSpinner$AccessibleJSpinner.eea
@@ -5,55 +5,55 @@ class javax/swing/JSpinner$AccessibleJSpinner
  (Ljavax/swing/JSpinner;)V
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getAfterIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getAtIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getBeforeIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getCharacterAttribute
  (I)Ljavax/swing/text/AttributeSet;
- (I)Ljavax/swing/text/AttributeSet;
+ (I)L0javax/swing/text/AttributeSet;
 getCharacterBounds
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L0java/awt/Rectangle;
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getIndexAtPoint
  (Ljava/awt/Point;)I
  (Ljava/awt/Point;)I
 getMaximumAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getMinimumAccessibleValue
  ()Ljava/lang/Number;
- ()Ljava/lang/Number;
+ ()L0java/lang/Number;
 getSelectedText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getTextRange
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 insertTextAtIndex
  (ILjava/lang/String;)V
  (ILjava/lang/String;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JSpinner$DefaultEditor.eea b/libs/eea-java-21/src/main/resources/javax/swing/JSpinner$DefaultEditor.eea
index 4d6c719102..2bdc2466b5 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JSpinner$DefaultEditor.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JSpinner$DefaultEditor.eea
@@ -14,7 +14,7 @@ getBaselineResizeBehavior
  ()Ljava/awt/Component$BaselineResizeBehavior;
 getSpinner
  ()Ljavax/swing/JSpinner;
- ()Ljavax/swing/JSpinner;
+ ()L0javax/swing/JSpinner;
 getTextField
  ()Ljavax/swing/JFormattedTextField;
  ()Ljavax/swing/JFormattedTextField;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JSpinner.eea b/libs/eea-java-21/src/main/resources/javax/swing/JSpinner.eea
index 6702726d90..687101f703 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JSpinner.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JSpinner.eea
@@ -8,7 +8,7 @@ addChangeListener
  (L1javax/swing/event/ChangeListener;)V
 createEditor
  (Ljavax/swing/SpinnerModel;)Ljavax/swing/JComponent;
- (Ljavax/swing/SpinnerModel;)Ljavax/swing/JComponent;
+ (Ljavax/swing/SpinnerModel;)L1javax/swing/JComponent;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -32,7 +32,7 @@ getUI
  ()Ljavax/swing/plaf/SpinnerUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 getValue
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JSplitPane$AccessibleJSplitPane.eea b/libs/eea-java-21/src/main/resources/javax/swing/JSplitPane$AccessibleJSplitPane.eea
index a61c69d732..cb0d8db817 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JSplitPane$AccessibleJSplitPane.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JSplitPane$AccessibleJSplitPane.eea
@@ -11,7 +11,7 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getCurrentAccessibleValue
  ()Ljava/lang/Number;
  ()Ljava/lang/Number;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JSplitPane.eea b/libs/eea-java-21/src/main/resources/javax/swing/JSplitPane.eea
index fc00f78cf7..8d8de52525 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JSplitPane.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JSplitPane.eea
@@ -73,13 +73,13 @@ getUI
  ()Ljavax/swing/plaf/SplitPaneUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paintChildren
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 remove
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JTabbedPane$AccessibleJTabbedPane.eea b/libs/eea-java-21/src/main/resources/javax/swing/JTabbedPane$AccessibleJTabbedPane.eea
index 3591d3364a..56fec36568 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JTabbedPane$AccessibleJTabbedPane.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JTabbedPane$AccessibleJTabbedPane.eea
@@ -5,10 +5,10 @@ class javax/swing/JTabbedPane$AccessibleJTabbedPane
  (Ljavax/swing/JTabbedPane;)V
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Container$AccessibleAWTContainer)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -17,10 +17,10 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 stateChanged
  (Ljavax/swing/event/ChangeEvent;)V
  (L1javax/swing/event/ChangeEvent;)V # @Inherited(javax.swing.event.ChangeListener)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JTabbedPane.eea b/libs/eea-java-21/src/main/resources/javax/swing/JTabbedPane.eea
index 4f128f9bef..f21878a031 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JTabbedPane.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JTabbedPane.eea
@@ -39,7 +39,7 @@ addTab
  (Ljava/lang/String;Ljavax/swing/Icon;Ljava/awt/Component;Ljava/lang/String;)V
 createChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -48,7 +48,7 @@ getBackgroundAt
  (I)Ljava/awt/Color;
 getBoundsAt
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L0java/awt/Rectangle;
 getChangeListeners
  ()[Ljavax/swing/event/ChangeListener;
  ()[Ljavax/swing/event/ChangeListener;
@@ -69,7 +69,7 @@ getModel
  ()Ljavax/swing/SingleSelectionModel;
 getSelectedComponent
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 getTabComponentAt
  (I)Ljava/awt/Component;
  (I)Ljava/awt/Component;
@@ -87,7 +87,7 @@ getUI
  ()Ljavax/swing/plaf/TabbedPaneUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 indexOfComponent
  (Ljava/awt/Component;)I
  (Ljava/awt/Component;)I
@@ -105,7 +105,7 @@ insertTab
  (Ljava/lang/String;Ljavax/swing/Icon;Ljava/awt/Component;Ljava/lang/String;I)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 remove
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JTable$AccessibleJTable$AccessibleJTableCell.eea b/libs/eea-java-21/src/main/resources/javax/swing/JTable$AccessibleJTable$AccessibleJTableCell.eea
index 2adc51c6a6..144cb2bad9 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JTable$AccessibleJTable$AccessibleJTableCell.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JTable$AccessibleJTable$AccessibleJTableCell.eea
@@ -14,16 +14,16 @@ contains
  (Ljava/awt/Point;)Z
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -41,52 +41,52 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
- ()Ljavax/accessibility/AccessibleStateSet;
+ ()L1javax/accessibility/AccessibleStateSet;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getBounds
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L0java/awt/Rectangle;
 getCurrentAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
- ()Ljavax/accessibility/AccessibleContext;
+ ()L0javax/accessibility/AccessibleContext;
 getCurrentComponent
  ()Ljava/awt/Component;
  ()Ljava/awt/Component;
 getCursor
  ()Ljava/awt/Cursor;
- ()Ljava/awt/Cursor;
+ ()L0java/awt/Cursor;
 getFont
  ()Ljava/awt/Font;
- ()Ljava/awt/Font;
+ ()L0java/awt/Font;
 getFontMetrics
  (Ljava/awt/Font;)Ljava/awt/FontMetrics;
- (Ljava/awt/Font;)Ljava/awt/FontMetrics;
+ (Ljava/awt/Font;)L0java/awt/FontMetrics;
 getForeground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getLocale
  ()Ljava/util/Locale;
- ()Ljava/util/Locale;
+ ()L0java/util/Locale;
 getLocation
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getLocationOnScreen
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L0java/awt/Dimension;
 removeFocusListener
  (Ljava/awt/event/FocusListener;)V
  (L1java/awt/event/FocusListener;)V # @Inherited(javax.accessibility.AccessibleComponent)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JTable$AccessibleJTable.eea b/libs/eea-java-21/src/main/resources/javax/swing/JTable$AccessibleJTable.eea
index 38665382ec..27ebd18971 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JTable$AccessibleJTable.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JTable$AccessibleJTable.eea
@@ -29,40 +29,40 @@ getAccessibleAt
  (II)Ljavax/accessibility/Accessible;
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Container$AccessibleAWTContainer)
 getAccessibleCaption
  ()Ljavax/accessibility/Accessible;
  ()Ljavax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleColumnDescription
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleColumnHeader
  ()Ljavax/accessibility/AccessibleTable;
- ()Ljavax/accessibility/AccessibleTable;
+ ()L1javax/accessibility/AccessibleTable;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleRowDescription
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleRowHeader
  ()Ljavax/accessibility/AccessibleTable;
- ()Ljavax/accessibility/AccessibleTable;
+ ()L0javax/accessibility/AccessibleTable;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleSummary
  ()Ljavax/accessibility/Accessible;
  ()Ljavax/accessibility/Accessible;
 getAccessibleTable
  ()Ljavax/accessibility/AccessibleTable;
- ()Ljavax/accessibility/AccessibleTable;
+ ()L0javax/accessibility/AccessibleTable; # @Inherited(javax.accessibility.AccessibleContext)
 getSelectedAccessibleColumns
  ()[I
  ()[I
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JTable.eea b/libs/eea-java-21/src/main/resources/javax/swing/JTable.eea
index 5032bf2454..4211e96807 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JTable.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JTable.eea
@@ -2,7 +2,7 @@ class javax/swing/JTable
 
 createScrollPaneForTable
  (Ljavax/swing/JTable;)Ljavax/swing/JScrollPane;
- (Ljavax/swing/JTable;)Ljavax/swing/JScrollPane;
+ (Ljavax/swing/JTable;)L1javax/swing/JScrollPane;
 
 cellEditor
  Ljavax/swing/table/TableCellEditor;
@@ -79,16 +79,16 @@ columnSelectionChanged
  (L1javax/swing/event/ListSelectionEvent;)V # @Inherited(javax.swing.event.TableColumnModelListener)
 createDefaultColumnModel
  ()Ljavax/swing/table/TableColumnModel;
- ()Ljavax/swing/table/TableColumnModel;
+ ()L1javax/swing/table/TableColumnModel;
 createDefaultDataModel
  ()Ljavax/swing/table/TableModel;
- ()Ljavax/swing/table/TableModel;
+ ()L1javax/swing/table/TableModel;
 createDefaultSelectionModel
  ()Ljavax/swing/ListSelectionModel;
- ()Ljavax/swing/ListSelectionModel;
+ ()L1javax/swing/ListSelectionModel;
 createDefaultTableHeader
  ()Ljavax/swing/table/JTableHeader;
- ()Ljavax/swing/table/JTableHeader;
+ ()L1javax/swing/table/JTableHeader;
 editCellAt
  (IILjava/util/EventObject;)Z
  (IILjava/util/EventObject;)Z
@@ -109,7 +109,7 @@ getCellEditor
  (II)Ljavax/swing/table/TableCellEditor;
 getCellRect
  (IIZ)Ljava/awt/Rectangle;
- (IIZ)Ljava/awt/Rectangle;
+ (IIZ)L1java/awt/Rectangle;
 getCellRenderer
  (II)Ljavax/swing/table/TableCellRenderer;
  (II)Ljavax/swing/table/TableCellRenderer;
@@ -145,7 +145,7 @@ getGridColor
  ()Ljava/awt/Color;
 getIntercellSpacing
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 getModel
  ()Ljavax/swing/table/TableModel;
  ()Ljavax/swing/table/TableModel;
@@ -154,10 +154,10 @@ getPreferredScrollableViewportSize
  ()Ljava/awt/Dimension;
 getPrintable
  (Ljavax/swing/JTable$PrintMode;Ljava/text/MessageFormat;Ljava/text/MessageFormat;)Ljava/awt/print/Printable;
- (Ljavax/swing/JTable$PrintMode;Ljava/text/MessageFormat;Ljava/text/MessageFormat;)Ljava/awt/print/Printable;
+ (Ljavax/swing/JTable$PrintMode;Ljava/text/MessageFormat;Ljava/text/MessageFormat;)L1java/awt/print/Printable;
 getRowSorter
  ()Ljavax/swing/RowSorter<+Ljavax/swing/table/TableModel;>;
- ()Ljavax/swing/RowSorter<+Ljavax/swing/table/TableModel;>;
+ ()L0javax/swing/RowSorter<+Ljavax/swing/table/TableModel;>;
 getScrollableBlockIncrement
  (Ljava/awt/Rectangle;II)I
  (Ljava/awt/Rectangle;II)I
@@ -190,13 +190,13 @@ getUI
  ()Ljavax/swing/plaf/TableUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 getValueAt
  (II)Ljava/lang/Object;
  (II)Ljava/lang/Object;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 prepareEditor
  (Ljavax/swing/table/TableCellEditor;II)Ljava/awt/Component;
  (Ljavax/swing/table/TableCellEditor;II)Ljava/awt/Component;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JTextArea.eea b/libs/eea-java-21/src/main/resources/javax/swing/JTextArea.eea
index a1f31fb0dc..5f2eba6d3e 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JTextArea.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JTextArea.eea
@@ -17,7 +17,7 @@ append
  (Ljava/lang/String;)V
 createDefaultModel
  ()Ljavax/swing/text/Document;
- ()Ljavax/swing/text/Document;
+ ()L1javax/swing/text/Document;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -32,13 +32,13 @@ getScrollableUnitIncrement
  (Ljava/awt/Rectangle;II)I
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 insert
  (Ljava/lang/String;I)V
  (Ljava/lang/String;I)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.text.JTextComponent)
 replaceRange
  (Ljava/lang/String;II)V
  (Ljava/lang/String;II)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JTextField.eea b/libs/eea-java-21/src/main/resources/javax/swing/JTextField.eea
index 41693bf4d7..eae1c83fe9 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JTextField.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JTextField.eea
@@ -24,10 +24,10 @@ configurePropertiesFromAction
  (Ljavax/swing/Action;)V
 createActionPropertyChangeListener
  (Ljavax/swing/Action;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/Action;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/Action;)L1java/beans/PropertyChangeListener;
 createDefaultModel
  ()Ljavax/swing/text/Document;
- ()Ljavax/swing/text/Document;
+ ()L1javax/swing/text/Document;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -48,10 +48,10 @@ getPreferredSize
  ()Ljava/awt/Dimension;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.text.JTextComponent)
 removeActionListener
  (Ljava/awt/event/ActionListener;)V
  (L1java/awt/event/ActionListener;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JTextPane.eea b/libs/eea-java-21/src/main/resources/javax/swing/JTextPane.eea
index b30ef66e9f..363e37dc11 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JTextPane.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JTextPane.eea
@@ -8,10 +8,10 @@ addStyle
  (Ljava/lang/String;Ljavax/swing/text/Style;)Ljavax/swing/text/Style;
 createDefaultEditorKit
  ()Ljavax/swing/text/EditorKit;
- ()Ljavax/swing/text/EditorKit;
+ ()L1javax/swing/text/EditorKit; # @Inherited(javax.swing.JEditorPane)
 getCharacterAttributes
  ()Ljavax/swing/text/AttributeSet;
- ()Ljavax/swing/text/AttributeSet;
+ ()L0javax/swing/text/AttributeSet;
 getInputAttributes
  ()Ljavax/swing/text/MutableAttributeSet;
  ()Ljavax/swing/text/MutableAttributeSet;
@@ -20,7 +20,7 @@ getLogicalStyle
  ()Ljavax/swing/text/Style;
 getParagraphAttributes
  ()Ljavax/swing/text/AttributeSet;
- ()Ljavax/swing/text/AttributeSet;
+ ()L0javax/swing/text/AttributeSet;
 getStyle
  (Ljava/lang/String;)Ljavax/swing/text/Style;
  (Ljava/lang/String;)Ljavax/swing/text/Style;
@@ -32,7 +32,7 @@ getStyledEditorKit
  ()Ljavax/swing/text/StyledEditorKit;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JEditorPane)
 insertComponent
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
@@ -41,7 +41,7 @@ insertIcon
  (Ljavax/swing/Icon;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JEditorPane)
 removeStyle
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JToggleButton.eea b/libs/eea-java-21/src/main/resources/javax/swing/JToggleButton.eea
index d3067bc546..50f0b8e14f 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JToggleButton.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JToggleButton.eea
@@ -26,10 +26,10 @@ getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.AbstractButton)
 requestFocus
  (Ljava/awt/event/FocusEvent$Cause;)V
  (Ljava/awt/event/FocusEvent$Cause;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JToolBar$Separator.eea b/libs/eea-java-21/src/main/resources/javax/swing/JToolBar$Separator.eea
index 2aaab805bd..1c90fe49be 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JToolBar$Separator.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JToolBar$Separator.eea
@@ -17,7 +17,7 @@ getSeparatorSize
  ()Ljava/awt/Dimension;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JSeparator)
 setSeparatorSize
  (Ljava/awt/Dimension;)V
  (Ljava/awt/Dimension;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JToolBar.eea b/libs/eea-java-21/src/main/resources/javax/swing/JToolBar.eea
index 85f0d38390..c6084c241e 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JToolBar.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JToolBar.eea
@@ -17,16 +17,16 @@ addSeparator
  (Ljava/awt/Dimension;)V
 createActionChangeListener
  (Ljavax/swing/JButton;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JButton;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JButton;)L0java/beans/PropertyChangeListener;
 createActionComponent
  (Ljavax/swing/Action;)Ljavax/swing/JButton;
- (Ljavax/swing/Action;)Ljavax/swing/JButton;
+ (Ljavax/swing/Action;)L1javax/swing/JButton;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
 getComponentAtIndex
  (I)Ljava/awt/Component;
- (I)Ljava/awt/Component;
+ (I)L0java/awt/Component;
 getComponentIndex
  (Ljava/awt/Component;)I
  (Ljava/awt/Component;)I
@@ -38,13 +38,13 @@ getUI
  ()Ljavax/swing/plaf/ToolBarUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paintBorder
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setLayout
  (Ljava/awt/LayoutManager;)V
  (Ljava/awt/LayoutManager;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JToolTip.eea b/libs/eea-java-21/src/main/resources/javax/swing/JToolTip.eea
index 5020b9b41f..598a803095 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JToolTip.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JToolTip.eea
@@ -14,10 +14,10 @@ getUI
  ()Ljavax/swing/plaf/ToolTipUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setComponent
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JTree$AccessibleJTree$AccessibleJTreeNode.eea b/libs/eea-java-21/src/main/resources/javax/swing/JTree$AccessibleJTree$AccessibleJTreeNode.eea
index 24f3a5936d..51c489de8f 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JTree$AccessibleJTree$AccessibleJTreeNode.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JTree$AccessibleJTree$AccessibleJTreeNode.eea
@@ -14,19 +14,19 @@ contains
  (Ljava/awt/Point;)Z
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -35,7 +35,7 @@ getAccessibleDescription
  ()Ljava/lang/String;
 getAccessibleName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getAccessibleParent
  ()Ljavax/accessibility/Accessible;
  ()Ljavax/accessibility/Accessible;
@@ -44,49 +44,49 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
- ()Ljavax/accessibility/AccessibleStateSet;
+ ()L1javax/accessibility/AccessibleStateSet;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getBounds
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L0java/awt/Rectangle;
 getCursor
  ()Ljava/awt/Cursor;
- ()Ljava/awt/Cursor;
+ ()L0java/awt/Cursor;
 getFont
  ()Ljava/awt/Font;
- ()Ljava/awt/Font;
+ ()L0java/awt/Font;
 getFontMetrics
  (Ljava/awt/Font;)Ljava/awt/FontMetrics;
- (Ljava/awt/Font;)Ljava/awt/FontMetrics;
+ (Ljava/awt/Font;)L0java/awt/FontMetrics;
 getForeground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
 getLocation
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getLocationInJTree
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getLocationOnScreen
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JTree$AccessibleJTree.eea b/libs/eea-java-21/src/main/resources/javax/swing/JTree$AccessibleJTree.eea
index fc882fad1c..d35e42fd0f 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JTree$AccessibleJTree.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JTree$AccessibleJTree.eea
@@ -5,19 +5,19 @@ class javax/swing/JTree$AccessibleJTree
  (Ljavax/swing/JTree;)V
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Container$AccessibleAWTContainer)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleSelection
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 treeCollapsed
  (Ljavax/swing/event/TreeExpansionEvent;)V
  (L1javax/swing/event/TreeExpansionEvent;)V # @Inherited(javax.swing.event.TreeExpansionListener)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JTree.eea b/libs/eea-java-21/src/main/resources/javax/swing/JTree.eea
index 930a563eb1..6224a4ec64 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JTree.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JTree.eea
@@ -51,10 +51,10 @@ VISIBLE_ROW_COUNT_PROPERTY
 
 createTreeModel
  (Ljava/lang/Object;)Ljavax/swing/tree/TreeModel;
- (Ljava/lang/Object;)Ljavax/swing/tree/TreeModel;
+ (Ljava/lang/Object;)L1javax/swing/tree/TreeModel;
 getDefaultTreeModel
  ()Ljavax/swing/tree/TreeModel;
- ()Ljavax/swing/tree/TreeModel;
+ ()L1javax/swing/tree/TreeModel;
 
 cellEditor
  Ljavax/swing/tree/TreeCellEditor;
@@ -116,10 +116,10 @@ collapsePath
  (Ljavax/swing/tree/TreePath;)V
 convertValueToText
  (Ljava/lang/Object;ZZZIZ)Ljava/lang/String;
- (Ljava/lang/Object;ZZZIZ)Ljava/lang/String;
+ (Ljava/lang/Object;ZZZIZ)L1java/lang/String;
 createTreeModelListener
  ()Ljavax/swing/event/TreeModelListener;
- ()Ljavax/swing/event/TreeModelListener;
+ ()L1javax/swing/event/TreeModelListener;
 expandPath
  (Ljavax/swing/tree/TreePath;)V
  (Ljavax/swing/tree/TreePath;)V
@@ -152,7 +152,7 @@ getCellRenderer
  ()Ljavax/swing/tree/TreeCellRenderer;
 getClosestPathForLocation
  (II)Ljavax/swing/tree/TreePath;
- (II)Ljavax/swing/tree/TreePath;
+ (II)L0javax/swing/tree/TreePath;
 getDescendantToggledPaths
  (Ljavax/swing/tree/TreePath;)Ljava/util/Enumeration<Ljavax/swing/tree/TreePath;>;
  (Ljavax/swing/tree/TreePath;)Ljava/util/Enumeration<Ljavax/swing/tree/TreePath;>;
@@ -164,13 +164,13 @@ getDropMode
  ()Ljavax/swing/DropMode;
 getEditingPath
  ()Ljavax/swing/tree/TreePath;
- ()Ljavax/swing/tree/TreePath;
+ ()L0javax/swing/tree/TreePath;
 getExpandedDescendants
  (Ljavax/swing/tree/TreePath;)Ljava/util/Enumeration<Ljavax/swing/tree/TreePath;>;
- (Ljavax/swing/tree/TreePath;)Ljava/util/Enumeration<Ljavax/swing/tree/TreePath;>;
+ (Ljavax/swing/tree/TreePath;)L0java/util/Enumeration<Ljavax/swing/tree/TreePath;>;
 getLastSelectedPathComponent
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getLeadSelectionPath
  ()Ljavax/swing/tree/TreePath;
  ()Ljavax/swing/tree/TreePath;
@@ -179,22 +179,22 @@ getModel
  ()Ljavax/swing/tree/TreeModel;
 getNextMatch
  (Ljava/lang/String;ILjavax/swing/text/Position$Bias;)Ljavax/swing/tree/TreePath;
- (Ljava/lang/String;ILjavax/swing/text/Position$Bias;)Ljavax/swing/tree/TreePath;
+ (Ljava/lang/String;ILjavax/swing/text/Position$Bias;)L0javax/swing/tree/TreePath;
 getPathBetweenRows
  (II)[Ljavax/swing/tree/TreePath;
- (II)[Ljavax/swing/tree/TreePath;
+ (II)[1Ljavax/swing/tree/TreePath;
 getPathBounds
  (Ljavax/swing/tree/TreePath;)Ljava/awt/Rectangle;
- (Ljavax/swing/tree/TreePath;)Ljava/awt/Rectangle;
+ (Ljavax/swing/tree/TreePath;)L0java/awt/Rectangle;
 getPathForLocation
  (II)Ljavax/swing/tree/TreePath;
- (II)Ljavax/swing/tree/TreePath;
+ (II)L0javax/swing/tree/TreePath;
 getPathForRow
  (I)Ljavax/swing/tree/TreePath;
- (I)Ljavax/swing/tree/TreePath;
+ (I)L0javax/swing/tree/TreePath;
 getPreferredScrollableViewportSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 getRowBounds
  (I)Ljava/awt/Rectangle;
  (I)Ljava/awt/Rectangle;
@@ -215,7 +215,7 @@ getSelectionPath
  ()Ljavax/swing/tree/TreePath;
 getSelectionPaths
  ()[Ljavax/swing/tree/TreePath;
- ()[Ljavax/swing/tree/TreePath;
+ ()[0Ljavax/swing/tree/TreePath;
 getSelectionRows
  ()[I
  ()[I
@@ -236,7 +236,7 @@ getUI
  ()Ljavax/swing/plaf/TreeUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 hasBeenExpanded
  (Ljavax/swing/tree/TreePath;)Z
  (Ljavax/swing/tree/TreePath;)Z
@@ -260,7 +260,7 @@ makeVisible
  (Ljavax/swing/tree/TreePath;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 removeDescendantSelectedPaths
  (Ljavax/swing/tree/TreePath;Z)Z
  (Ljavax/swing/tree/TreePath;Z)Z
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JViewport.eea b/libs/eea-java-21/src/main/resources/javax/swing/JViewport.eea
index 4cba46c6e5..f5511b7b83 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JViewport.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JViewport.eea
@@ -18,10 +18,10 @@ computeBlit
  (IILjava/awt/Point;Ljava/awt/Point;Ljava/awt/Dimension;Ljava/awt/Rectangle;)Z
 createLayoutManager
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 createViewListener
  ()Ljavax/swing/JViewport$ViewListener;
- ()Ljavax/swing/JViewport$ViewListener;
+ ()L1javax/swing/JViewport$ViewListener;
 firePropertyChange
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
@@ -45,16 +45,16 @@ getUI
  ()Ljavax/swing/plaf/ViewportUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 getView
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 getViewPosition
  ()Ljava/awt/Point;
  ()Ljava/awt/Point;
 getViewRect
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L1java/awt/Rectangle;
 getViewSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
@@ -63,7 +63,7 @@ paint
  (Ljava/awt/Graphics;)V
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 remove
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
@@ -93,7 +93,7 @@ setViewSize
  (Ljava/awt/Dimension;)V
 toViewCoordinates
  (Ljava/awt/Dimension;)Ljava/awt/Dimension;
- (Ljava/awt/Dimension;)Ljava/awt/Dimension;
+ (Ljava/awt/Dimension;)L1java/awt/Dimension;
 toViewCoordinates
  (Ljava/awt/Point;)Ljava/awt/Point;
- (Ljava/awt/Point;)Ljava/awt/Point;
+ (Ljava/awt/Point;)L1java/awt/Point;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/JWindow.eea b/libs/eea-java-21/src/main/resources/javax/swing/JWindow.eea
index 850a362eed..d14e6ff235 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/JWindow.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/JWindow.eea
@@ -24,7 +24,7 @@ addImpl
  (Ljava/awt/Component;Ljava/lang/Object;I)V
 createRootPane
  ()Ljavax/swing/JRootPane;
- ()Ljavax/swing/JRootPane;
+ ()L1javax/swing/JRootPane;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -36,7 +36,7 @@ getGlassPane
  ()Ljava/awt/Component;
 getGraphics
  ()Ljava/awt/Graphics;
- ()Ljava/awt/Graphics;
+ ()L0java/awt/Graphics; # @Inherited(java.awt.Component)
 getLayeredPane
  ()Ljavax/swing/JLayeredPane;
  ()Ljavax/swing/JLayeredPane;
@@ -48,7 +48,7 @@ getTransferHandler
  ()Ljavax/swing/TransferHandler;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.Container)
 remove
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/KeyStroke.eea b/libs/eea-java-21/src/main/resources/javax/swing/KeyStroke.eea
index 8f5627cef8..3390a7ce70 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/KeyStroke.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/KeyStroke.eea
@@ -17,7 +17,7 @@ getKeyStroke
  (Ljava/lang/Character;I)Ljavax/swing/KeyStroke;
 getKeyStroke
  (Ljava/lang/String;)Ljavax/swing/KeyStroke;
- (Ljava/lang/String;)Ljavax/swing/KeyStroke;
+ (Ljava/lang/String;)L0javax/swing/KeyStroke;
 getKeyStrokeForEvent
  (Ljava/awt/event/KeyEvent;)Ljavax/swing/KeyStroke;
  (Ljava/awt/event/KeyEvent;)Ljavax/swing/KeyStroke;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/LayoutFocusTraversalPolicy.eea b/libs/eea-java-21/src/main/resources/javax/swing/LayoutFocusTraversalPolicy.eea
index 94137a8a96..974b78a36b 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/LayoutFocusTraversalPolicy.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/LayoutFocusTraversalPolicy.eea
@@ -5,13 +5,13 @@ accept
  (Ljava/awt/Component;)Z
 getComponentAfter
  (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Container;Ljava/awt/Component;)L0java/awt/Component; # @Inherited(javax.swing.SortingFocusTraversalPolicy)
 getComponentBefore
  (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Container;Ljava/awt/Component;)L0java/awt/Component; # @Inherited(javax.swing.SortingFocusTraversalPolicy)
 getFirstComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
- (Ljava/awt/Container;)Ljava/awt/Component;
+ (Ljava/awt/Container;)L0java/awt/Component; # @Inherited(javax.swing.SortingFocusTraversalPolicy)
 getLastComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
- (Ljava/awt/Container;)Ljava/awt/Component;
+ (Ljava/awt/Container;)L0java/awt/Component; # @Inherited(javax.swing.SortingFocusTraversalPolicy)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/ListSelectionModel.eea b/libs/eea-java-21/src/main/resources/javax/swing/ListSelectionModel.eea
index 69f6f8565d..edf251abab 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/ListSelectionModel.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/ListSelectionModel.eea
@@ -5,7 +5,7 @@ addListSelectionListener
  (L1javax/swing/event/ListSelectionListener;)V
 getSelectedIndices
  ()[I
- ()[I
+ ()[1I
 removeListSelectionListener
  (Ljavax/swing/event/ListSelectionListener;)V
  (L1javax/swing/event/ListSelectionListener;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/LookAndFeel.eea b/libs/eea-java-21/src/main/resources/javax/swing/LookAndFeel.eea
index c9eae53a9e..335d25ca93 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/LookAndFeel.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/LookAndFeel.eea
@@ -20,29 +20,29 @@ loadKeyBindings
  (Ljavax/swing/InputMap;[Ljava/lang/Object;)V
 makeComponentInputMap
  (Ljavax/swing/JComponent;[Ljava/lang/Object;)Ljavax/swing/ComponentInputMap;
- (Ljavax/swing/JComponent;[Ljava/lang/Object;)Ljavax/swing/ComponentInputMap;
+ (Ljavax/swing/JComponent;[Ljava/lang/Object;)L1javax/swing/ComponentInputMap;
 makeIcon
  (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/Object;
 makeInputMap
  ([Ljava/lang/Object;)Ljavax/swing/InputMap;
- ([Ljava/lang/Object;)Ljavax/swing/InputMap;
+ ([Ljava/lang/Object;)L1javax/swing/InputMap;
 makeKeyBindings
  ([Ljava/lang/Object;)[Ljavax/swing/text/JTextComponent$KeyBinding;
- ([Ljava/lang/Object;)[Ljavax/swing/text/JTextComponent$KeyBinding;
+ ([Ljava/lang/Object;)[1Ljavax/swing/text/JTextComponent$KeyBinding;
 uninstallBorder
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
 
 getDefaults
  ()Ljavax/swing/UIDefaults;
- ()Ljavax/swing/UIDefaults;
+ ()L0javax/swing/UIDefaults;
 getDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getDisabledIcon
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
- (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
+ (Ljavax/swing/JComponent;Ljavax/swing/Icon;)L0javax/swing/Icon;
 getDisabledSelectedIcon
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/MenuSelectionManager.eea b/libs/eea-java-21/src/main/resources/javax/swing/MenuSelectionManager.eea
index debe8e4d8f..72690debfa 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/MenuSelectionManager.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/MenuSelectionManager.eea
@@ -16,13 +16,13 @@ addChangeListener
  (L1javax/swing/event/ChangeListener;)V
 componentForPoint
  (Ljava/awt/Component;Ljava/awt/Point;)Ljava/awt/Component;
- (Ljava/awt/Component;Ljava/awt/Point;)Ljava/awt/Component;
+ (Ljava/awt/Component;Ljava/awt/Point;)L0java/awt/Component;
 getChangeListeners
  ()[Ljavax/swing/event/ChangeListener;
  ()[Ljavax/swing/event/ChangeListener;
 getSelectedPath
  ()[Ljavax/swing/MenuElement;
- ()[Ljavax/swing/MenuElement;
+ ()[1Ljavax/swing/MenuElement;
 isComponentPartOfCurrentMenu
  (Ljava/awt/Component;)Z
  (Ljava/awt/Component;)Z
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/PopupFactory.eea b/libs/eea-java-21/src/main/resources/javax/swing/PopupFactory.eea
index fd93a34928..4a8d5524e8 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/PopupFactory.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/PopupFactory.eea
@@ -2,7 +2,7 @@ class javax/swing/PopupFactory
 
 getSharedInstance
  ()Ljavax/swing/PopupFactory;
- ()Ljavax/swing/PopupFactory;
+ ()L1javax/swing/PopupFactory;
 setSharedInstance
  (Ljavax/swing/PopupFactory;)V
  (Ljavax/swing/PopupFactory;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/ProgressMonitor$AccessibleProgressMonitor.eea b/libs/eea-java-21/src/main/resources/javax/swing/ProgressMonitor$AccessibleProgressMonitor.eea
index 709d8db368..e233e3f65d 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/ProgressMonitor$AccessibleProgressMonitor.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/ProgressMonitor$AccessibleProgressMonitor.eea
@@ -5,16 +5,16 @@ class javax/swing/ProgressMonitor$AccessibleProgressMonitor
  (Ljavax/swing/ProgressMonitor;)V
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getAccessibleName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getAccessibleParent
  ()Ljavax/accessibility/Accessible;
  ()Ljavax/accessibility/Accessible;
@@ -23,37 +23,37 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
- ()Ljavax/accessibility/AccessibleStateSet;
+ ()L0javax/accessibility/AccessibleStateSet;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getAfterIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getAtIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getBeforeIndex
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L0java/lang/String;
 getCharacterAttribute
  (I)Ljavax/swing/text/AttributeSet;
- (I)Ljavax/swing/text/AttributeSet;
+ (I)L0javax/swing/text/AttributeSet;
 getCharacterBounds
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L0java/awt/Rectangle;
 getIndexAtPoint
  (Ljava/awt/Point;)I
  (Ljava/awt/Point;)I
 getLocale
  ()Ljava/util/Locale;
- ()Ljava/util/Locale;
+ ()L0java/util/Locale;
 getSelectedText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 propertyChange
  (Ljava/beans/PropertyChangeEvent;)V
  (L1java/beans/PropertyChangeEvent;)V # @Inherited(java.beans.PropertyChangeListener)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/RepaintManager.eea b/libs/eea-java-21/src/main/resources/javax/swing/RepaintManager.eea
index feea78b23b..9ab5a254ee 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/RepaintManager.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/RepaintManager.eea
@@ -33,7 +33,7 @@ getOffscreenBuffer
  (Ljava/awt/Component;II)Ljava/awt/Image;
 getVolatileOffscreenBuffer
  (Ljava/awt/Component;II)Ljava/awt/Image;
- (Ljava/awt/Component;II)Ljava/awt/Image;
+ (Ljava/awt/Component;II)L0java/awt/Image;
 isCompletelyDirty
  (Ljavax/swing/JComponent;)Z
  (Ljavax/swing/JComponent;)Z
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/RowFilter$Entry.eea b/libs/eea-java-21/src/main/resources/javax/swing/RowFilter$Entry.eea
index 5ea7f95119..d63141e7e1 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/RowFilter$Entry.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/RowFilter$Entry.eea
@@ -10,7 +10,7 @@ getModel
  ()TM;
 getStringValue
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 getValue
  (I)Ljava/lang/Object;
  (I)Ljava/lang/Object;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/RowFilter.eea b/libs/eea-java-21/src/main/resources/javax/swing/RowFilter.eea
index b990daffe6..eb02429eab 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/RowFilter.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/RowFilter.eea
@@ -4,22 +4,22 @@ class javax/swing/RowFilter
 
 andFilter
  <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljavax/swing/RowFilter<-TM;-TI;>;>;)Ljavax/swing/RowFilter<TM;TI;>;
- <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljavax/swing/RowFilter<-TM;-TI;>;>;)Ljavax/swing/RowFilter<TM;TI;>;
+ <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljavax/swing/RowFilter<-TM;-TI;>;>;)L1javax/swing/RowFilter<TM;TI;>;
 dateFilter
  <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter$ComparisonType;Ljava/util/Date;[I)Ljavax/swing/RowFilter<TM;TI;>;
- <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter$ComparisonType;Ljava/util/Date;[I)Ljavax/swing/RowFilter<TM;TI;>;
+ <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter$ComparisonType;Ljava/util/Date;[I)L1javax/swing/RowFilter<TM;TI;>;
 notFilter
  <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter<TM;TI;>;)Ljavax/swing/RowFilter<TM;TI;>;
- <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter<TM;TI;>;)Ljavax/swing/RowFilter<TM;TI;>;
+ <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter<TM;TI;>;)L1javax/swing/RowFilter<TM;TI;>;
 numberFilter
  <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter$ComparisonType;Ljava/lang/Number;[I)Ljavax/swing/RowFilter<TM;TI;>;
- <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter$ComparisonType;Ljava/lang/Number;[I)Ljavax/swing/RowFilter<TM;TI;>;
+ <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljavax/swing/RowFilter$ComparisonType;Ljava/lang/Number;[I)L1javax/swing/RowFilter<TM;TI;>;
 orFilter
  <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljavax/swing/RowFilter<-TM;-TI;>;>;)Ljavax/swing/RowFilter<TM;TI;>;
- <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljavax/swing/RowFilter<-TM;-TI;>;>;)Ljavax/swing/RowFilter<TM;TI;>;
+ <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/Iterable<+Ljavax/swing/RowFilter<-TM;-TI;>;>;)L1javax/swing/RowFilter<TM;TI;>;
 regexFilter
  <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/String;[I)Ljavax/swing/RowFilter<TM;TI;>;
- <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/String;[I)Ljavax/swing/RowFilter<TM;TI;>;
+ <M:Ljava/lang/Object;I:Ljava/lang/Object;>(Ljava/lang/String;[I)L1javax/swing/RowFilter<TM;TI;>;
 
 include
  (Ljavax/swing/RowFilter$Entry<+TM;+TI;>;)Z
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/ScrollPaneLayout.eea b/libs/eea-java-21/src/main/resources/javax/swing/ScrollPaneLayout.eea
index 08c9409e3d..2f0cf8a94b 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/ScrollPaneLayout.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/ScrollPaneLayout.eea
@@ -39,7 +39,7 @@ getColumnHeader
  ()Ljavax/swing/JViewport;
 getCorner
  (Ljava/lang/String;)Ljava/awt/Component;
- (Ljava/lang/String;)Ljava/awt/Component;
+ (Ljava/lang/String;)L0java/awt/Component;
 getHorizontalScrollBar
  ()Ljavax/swing/JScrollBar;
  ()Ljavax/swing/JScrollBar;
@@ -60,10 +60,10 @@ layoutContainer
  (Ljava/awt/Container;)V
 minimumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
- (Ljava/awt/Container;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;)L1java/awt/Dimension;
 preferredLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
- (Ljava/awt/Container;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;)L1java/awt/Dimension;
 removeLayoutComponent
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/SizeRequirements.eea b/libs/eea-java-21/src/main/resources/javax/swing/SizeRequirements.eea
index efc47c9e40..9cc63af5b6 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/SizeRequirements.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/SizeRequirements.eea
@@ -2,7 +2,7 @@ class javax/swing/SizeRequirements
 
 adjustSizes
  (I[Ljavax/swing/SizeRequirements;)[I
- (I[Ljavax/swing/SizeRequirements;)[I
+ (I[Ljavax/swing/SizeRequirements;)[1I
 calculateAlignedPositions
  (ILjavax/swing/SizeRequirements;[Ljavax/swing/SizeRequirements;[I[I)V
  (ILjavax/swing/SizeRequirements;[Ljavax/swing/SizeRequirements;[I[I)V
@@ -17,10 +17,10 @@ calculateTiledPositions
  (ILjavax/swing/SizeRequirements;[Ljavax/swing/SizeRequirements;[I[IZ)V
 getAlignedSizeRequirements
  ([Ljavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- ([Ljavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ ([Ljavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements;
 getTiledSizeRequirements
  ([Ljavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- ([Ljavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ ([Ljavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements;
 
 toString
  ()Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/SizeSequence.eea b/libs/eea-java-21/src/main/resources/javax/swing/SizeSequence.eea
index 07e12d3271..8a47044011 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/SizeSequence.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/SizeSequence.eea
@@ -5,7 +5,7 @@ class javax/swing/SizeSequence
  ([I)V
 getSizes
  ()[I
- ()[I
+ ()[1I
 setSizes
  ([I)V
  ([I)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/SortingFocusTraversalPolicy.eea b/libs/eea-java-21/src/main/resources/javax/swing/SortingFocusTraversalPolicy.eea
index 868b3c0e68..c56cb5cb57 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/SortingFocusTraversalPolicy.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/SortingFocusTraversalPolicy.eea
@@ -11,19 +11,19 @@ getComparator
  ()Ljava/util/Comparator<-Ljava/awt/Component;>;
 getComponentAfter
  (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Container;Ljava/awt/Component;)L0java/awt/Component;
 getComponentBefore
  (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Container;Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Container;Ljava/awt/Component;)L0java/awt/Component;
 getDefaultComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
  (Ljava/awt/Container;)Ljava/awt/Component;
 getFirstComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
- (Ljava/awt/Container;)Ljava/awt/Component;
+ (Ljava/awt/Container;)L0java/awt/Component;
 getLastComponent
  (Ljava/awt/Container;)Ljava/awt/Component;
- (Ljava/awt/Container;)Ljava/awt/Component;
+ (Ljava/awt/Container;)L0java/awt/Component;
 setComparator
  (Ljava/util/Comparator<-Ljava/awt/Component;>;)V
  (Ljava/util/Comparator<-Ljava/awt/Component;>;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/SpinnerDateModel.eea b/libs/eea-java-21/src/main/resources/javax/swing/SpinnerDateModel.eea
index 7a98c40134..ebc61eee62 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/SpinnerDateModel.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/SpinnerDateModel.eea
@@ -11,10 +11,10 @@ getEnd
  ()Ljava/lang/Comparable<Ljava/util/Date;>;
 getNextValue
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getPreviousValue
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getStart
  ()Ljava/lang/Comparable<Ljava/util/Date;>;
  ()Ljava/lang/Comparable<Ljava/util/Date;>;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/Spring.eea b/libs/eea-java-21/src/main/resources/javax/swing/Spring.eea
index a4cbc7e607..ca37da6da9 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/Spring.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/Spring.eea
@@ -5,22 +5,22 @@ constant
  (I)Ljavax/swing/Spring;
 constant
  (III)Ljavax/swing/Spring;
- (III)Ljavax/swing/Spring;
+ (III)L1javax/swing/Spring;
 height
  (Ljava/awt/Component;)Ljavax/swing/Spring;
- (Ljava/awt/Component;)Ljavax/swing/Spring;
+ (Ljava/awt/Component;)L1javax/swing/Spring;
 max
  (Ljavax/swing/Spring;Ljavax/swing/Spring;)Ljavax/swing/Spring;
- (Ljavax/swing/Spring;Ljavax/swing/Spring;)Ljavax/swing/Spring;
+ (Ljavax/swing/Spring;Ljavax/swing/Spring;)L1javax/swing/Spring;
 minus
  (Ljavax/swing/Spring;)Ljavax/swing/Spring;
- (Ljavax/swing/Spring;)Ljavax/swing/Spring;
+ (Ljavax/swing/Spring;)L1javax/swing/Spring;
 scale
  (Ljavax/swing/Spring;F)Ljavax/swing/Spring;
- (Ljavax/swing/Spring;F)Ljavax/swing/Spring;
+ (Ljavax/swing/Spring;F)L1javax/swing/Spring;
 sum
  (Ljavax/swing/Spring;Ljavax/swing/Spring;)Ljavax/swing/Spring;
- (Ljavax/swing/Spring;Ljavax/swing/Spring;)Ljavax/swing/Spring;
+ (Ljavax/swing/Spring;Ljavax/swing/Spring;)L1javax/swing/Spring;
 width
  (Ljava/awt/Component;)Ljavax/swing/Spring;
- (Ljava/awt/Component;)Ljavax/swing/Spring;
+ (Ljava/awt/Component;)L1javax/swing/Spring;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/SpringLayout$Constraints.eea b/libs/eea-java-21/src/main/resources/javax/swing/SpringLayout$Constraints.eea
index 09ca6c38ac..b1869bf161 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/SpringLayout$Constraints.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/SpringLayout$Constraints.eea
@@ -11,7 +11,7 @@ class javax/swing/SpringLayout$Constraints
  (Ljavax/swing/Spring;Ljavax/swing/Spring;Ljavax/swing/Spring;Ljavax/swing/Spring;)V
 getConstraint
  (Ljava/lang/String;)Ljavax/swing/Spring;
- (Ljava/lang/String;)Ljavax/swing/Spring;
+ (Ljava/lang/String;)L0javax/swing/Spring;
 getHeight
  ()Ljavax/swing/Spring;
  ()Ljavax/swing/Spring;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/SpringLayout.eea b/libs/eea-java-21/src/main/resources/javax/swing/SpringLayout.eea
index 271d992296..a8581d7b11 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/SpringLayout.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/SpringLayout.eea
@@ -36,7 +36,7 @@ addLayoutComponent
  (Ljava/lang/String;Ljava/awt/Component;)V
 getConstraint
  (Ljava/lang/String;Ljava/awt/Component;)Ljavax/swing/Spring;
- (Ljava/lang/String;Ljava/awt/Component;)Ljavax/swing/Spring;
+ (Ljava/lang/String;Ljava/awt/Component;)L1javax/swing/Spring;
 getConstraints
  (Ljava/awt/Component;)Ljavax/swing/SpringLayout$Constraints;
  (Ljava/awt/Component;)Ljavax/swing/SpringLayout$Constraints;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/SwingUtilities.eea b/libs/eea-java-21/src/main/resources/javax/swing/SwingUtilities.eea
index 24d295cfd4..7c80a81f5e 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/SwingUtilities.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/SwingUtilities.eea
@@ -2,10 +2,10 @@ class javax/swing/SwingUtilities
 
 calculateInnerArea
  (Ljavax/swing/JComponent;Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
- (Ljavax/swing/JComponent;Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
+ (Ljavax/swing/JComponent;Ljava/awt/Rectangle;)Ljava/awt/Rectangle; # @PolyNull
 computeDifference
  (Ljava/awt/Rectangle;Ljava/awt/Rectangle;)[Ljava/awt/Rectangle;
- (Ljava/awt/Rectangle;Ljava/awt/Rectangle;)[Ljava/awt/Rectangle;
+ (Ljava/awt/Rectangle;Ljava/awt/Rectangle;)[1Ljava/awt/Rectangle;
 computeIntersection
  (IIIILjava/awt/Rectangle;)Ljava/awt/Rectangle;
  (IIIILjava/awt/Rectangle;)Ljava/awt/Rectangle;
@@ -35,10 +35,10 @@ convertRectangle
  (Ljava/awt/Component;Ljava/awt/Rectangle;Ljava/awt/Component;)Ljava/awt/Rectangle;
 findFocusOwner
  (Ljava/awt/Component;)Ljava/awt/Component;
- (Ljava/awt/Component;)Ljava/awt/Component;
+ (Ljava/awt/Component;)L0java/awt/Component;
 getAccessibleAt
  (Ljava/awt/Component;Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Component;Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Component;Ljava/awt/Point;)L0javax/accessibility/Accessible;
 getAccessibleChild
  (Ljava/awt/Component;I)Ljavax/accessibility/Accessible;
  (Ljava/awt/Component;I)Ljavax/accessibility/Accessible;
@@ -59,22 +59,22 @@ getAncestorOfClass
  (Ljava/lang/Class<*>;Ljava/awt/Component;)Ljava/awt/Container;
 getDeepestComponentAt
  (Ljava/awt/Component;II)Ljava/awt/Component;
- (Ljava/awt/Component;II)Ljava/awt/Component;
+ (Ljava/awt/Component;II)L0java/awt/Component;
 getLocalBounds
  (Ljava/awt/Component;)Ljava/awt/Rectangle;
- (Ljava/awt/Component;)Ljava/awt/Rectangle;
+ (Ljava/awt/Component;)L1java/awt/Rectangle;
 getRoot
  (Ljava/awt/Component;)Ljava/awt/Component;
  (Ljava/awt/Component;)Ljava/awt/Component;
 getRootPane
  (Ljava/awt/Component;)Ljavax/swing/JRootPane;
- (Ljava/awt/Component;)Ljavax/swing/JRootPane;
+ (Ljava/awt/Component;)L0javax/swing/JRootPane;
 getUIActionMap
  (Ljavax/swing/JComponent;)Ljavax/swing/ActionMap;
- (Ljavax/swing/JComponent;)Ljavax/swing/ActionMap;
+ (Ljavax/swing/JComponent;)L0javax/swing/ActionMap;
 getUIInputMap
  (Ljavax/swing/JComponent;I)Ljavax/swing/InputMap;
- (Ljavax/swing/JComponent;I)Ljavax/swing/InputMap;
+ (Ljavax/swing/JComponent;I)L0javax/swing/InputMap;
 getUnwrappedParent
  (Ljava/awt/Component;)Ljava/awt/Container;
  (Ljava/awt/Component;)Ljava/awt/Container;
@@ -83,7 +83,7 @@ getUnwrappedView
  (Ljavax/swing/JViewport;)Ljava/awt/Component;
 getWindowAncestor
  (Ljava/awt/Component;)Ljava/awt/Window;
- (Ljava/awt/Component;)Ljava/awt/Window;
+ (Ljava/awt/Component;)L0java/awt/Window;
 invokeAndWait
  (Ljava/lang/Runnable;)V
  (Ljava/lang/Runnable;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/TransferHandler$DropLocation.eea b/libs/eea-java-21/src/main/resources/javax/swing/TransferHandler$DropLocation.eea
index 915cc809d7..e611b8e8a2 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/TransferHandler$DropLocation.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/TransferHandler$DropLocation.eea
@@ -5,7 +5,7 @@ class javax/swing/TransferHandler$DropLocation
  (Ljava/awt/Point;)V
 getDropPoint
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L1java/awt/Point;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/TransferHandler.eea b/libs/eea-java-21/src/main/resources/javax/swing/TransferHandler.eea
index c8da40fd90..4aaa9cc005 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/TransferHandler.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/TransferHandler.eea
@@ -21,7 +21,7 @@ canImport
  (Ljavax/swing/TransferHandler$TransferSupport;)Z
 createTransferable
  (Ljavax/swing/JComponent;)Ljava/awt/datatransfer/Transferable;
- (Ljavax/swing/JComponent;)Ljava/awt/datatransfer/Transferable;
+ (Ljavax/swing/JComponent;)L0java/awt/datatransfer/Transferable;
 exportAsDrag
  (Ljavax/swing/JComponent;Ljava/awt/event/InputEvent;I)V
  (Ljavax/swing/JComponent;Ljava/awt/event/InputEvent;I)V
@@ -42,7 +42,7 @@ getSourceActions
  (Ljavax/swing/JComponent;)I
 getVisualRepresentation
  (Ljava/awt/datatransfer/Transferable;)Ljavax/swing/Icon;
- (Ljava/awt/datatransfer/Transferable;)Ljavax/swing/Icon;
+ (Ljava/awt/datatransfer/Transferable;)L0javax/swing/Icon;
 importData
  (Ljavax/swing/JComponent;Ljava/awt/datatransfer/Transferable;)Z
  (Ljavax/swing/JComponent;Ljava/awt/datatransfer/Transferable;)Z
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/UIDefaults$ActiveValue.eea b/libs/eea-java-21/src/main/resources/javax/swing/UIDefaults$ActiveValue.eea
index ceb6b3e0f1..9103d3dc69 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/UIDefaults$ActiveValue.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/UIDefaults$ActiveValue.eea
@@ -2,4 +2,4 @@ class javax/swing/UIDefaults$ActiveValue
 
 createValue
  (Ljavax/swing/UIDefaults;)Ljava/lang/Object;
- (Ljavax/swing/UIDefaults;)Ljava/lang/Object;
+ (Ljavax/swing/UIDefaults;)L1java/lang/Object;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/UIDefaults$LazyInputMap.eea b/libs/eea-java-21/src/main/resources/javax/swing/UIDefaults$LazyInputMap.eea
index fc1afc290b..bda6d0e916 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/UIDefaults$LazyInputMap.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/UIDefaults$LazyInputMap.eea
@@ -5,4 +5,4 @@ class javax/swing/UIDefaults$LazyInputMap
  ([Ljava/lang/Object;)V
 createValue
  (Ljavax/swing/UIDefaults;)Ljava/lang/Object;
- (Ljavax/swing/UIDefaults;)Ljava/lang/Object;
+ (Ljavax/swing/UIDefaults;)L0java/lang/Object; # @Overrides(javax.swing.UIDefaults$LazyValue)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/UIDefaults$LazyValue.eea b/libs/eea-java-21/src/main/resources/javax/swing/UIDefaults$LazyValue.eea
index 97e6142ed9..c8d2d890e1 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/UIDefaults$LazyValue.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/UIDefaults$LazyValue.eea
@@ -2,4 +2,4 @@ class javax/swing/UIDefaults$LazyValue
 
 createValue
  (Ljavax/swing/UIDefaults;)Ljava/lang/Object;
- (Ljavax/swing/UIDefaults;)Ljava/lang/Object;
+ (Ljavax/swing/UIDefaults;)L1java/lang/Object;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/UIDefaults$ProxyLazyValue.eea b/libs/eea-java-21/src/main/resources/javax/swing/UIDefaults$ProxyLazyValue.eea
index 920514e82b..1bd4d2005e 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/UIDefaults$ProxyLazyValue.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/UIDefaults$ProxyLazyValue.eea
@@ -14,4 +14,4 @@ class javax/swing/UIDefaults$ProxyLazyValue
  (Ljava/lang/String;[Ljava/lang/Object;)V
 createValue
  (Ljavax/swing/UIDefaults;)Ljava/lang/Object;
- (Ljavax/swing/UIDefaults;)Ljava/lang/Object;
+ (Ljavax/swing/UIDefaults;)L1java/lang/Object; # @Inherited(javax.swing.UIDefaults$LazyValue)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/UIDefaults.eea b/libs/eea-java-21/src/main/resources/javax/swing/UIDefaults.eea
index c6ec5d4901..cd7855bb85 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/UIDefaults.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/UIDefaults.eea
@@ -30,43 +30,43 @@ getBoolean
  (Ljava/lang/Object;Ljava/util/Locale;)Z
 getBorder
  (Ljava/lang/Object;)Ljavax/swing/border/Border;
- (Ljava/lang/Object;)Ljavax/swing/border/Border;
+ (Ljava/lang/Object;)L0javax/swing/border/Border;
 getBorder
  (Ljava/lang/Object;Ljava/util/Locale;)Ljavax/swing/border/Border;
- (Ljava/lang/Object;Ljava/util/Locale;)Ljavax/swing/border/Border;
+ (Ljava/lang/Object;Ljava/util/Locale;)L0javax/swing/border/Border;
 getColor
  (Ljava/lang/Object;)Ljava/awt/Color;
- (Ljava/lang/Object;)Ljava/awt/Color;
+ (Ljava/lang/Object;)L0java/awt/Color;
 getColor
  (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Color;
- (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Color;
+ (Ljava/lang/Object;Ljava/util/Locale;)L0java/awt/Color;
 getDefaultLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
 getDimension
  (Ljava/lang/Object;)Ljava/awt/Dimension;
- (Ljava/lang/Object;)Ljava/awt/Dimension;
+ (Ljava/lang/Object;)L0java/awt/Dimension;
 getDimension
  (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Dimension;
- (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Dimension;
+ (Ljava/lang/Object;Ljava/util/Locale;)L0java/awt/Dimension;
 getFont
  (Ljava/lang/Object;)Ljava/awt/Font;
- (Ljava/lang/Object;)Ljava/awt/Font;
+ (Ljava/lang/Object;)L0java/awt/Font;
 getFont
  (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Font;
- (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Font;
+ (Ljava/lang/Object;Ljava/util/Locale;)L0java/awt/Font;
 getIcon
  (Ljava/lang/Object;)Ljavax/swing/Icon;
- (Ljava/lang/Object;)Ljavax/swing/Icon;
+ (Ljava/lang/Object;)L0javax/swing/Icon;
 getIcon
  (Ljava/lang/Object;Ljava/util/Locale;)Ljavax/swing/Icon;
- (Ljava/lang/Object;Ljava/util/Locale;)Ljavax/swing/Icon;
+ (Ljava/lang/Object;Ljava/util/Locale;)L0javax/swing/Icon;
 getInsets
  (Ljava/lang/Object;)Ljava/awt/Insets;
- (Ljava/lang/Object;)Ljava/awt/Insets;
+ (Ljava/lang/Object;)L0java/awt/Insets;
 getInsets
  (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Insets;
- (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Insets;
+ (Ljava/lang/Object;Ljava/util/Locale;)L0java/awt/Insets;
 getInt
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
@@ -78,10 +78,10 @@ getPropertyChangeListeners
  ()[Ljava/beans/PropertyChangeListener;
 getString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L0java/lang/String;
 getString
  (Ljava/lang/Object;Ljava/util/Locale;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/util/Locale;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/util/Locale;)L0java/lang/String;
 getUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
@@ -90,7 +90,7 @@ getUIClass
  (Ljava/lang/String;)Ljava/lang/Class<+Ljavax/swing/plaf/ComponentUI;>;
 getUIClass
  (Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/Class<+Ljavax/swing/plaf/ComponentUI;>;
- (Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/Class<+Ljavax/swing/plaf/ComponentUI;>;
+ (Ljava/lang/String;Ljava/lang/ClassLoader;)L0java/lang/Class<+Ljavax/swing/plaf/ComponentUI;>;
 getUIError
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/UIManager.eea b/libs/eea-java-21/src/main/resources/javax/swing/UIManager.eea
index c18a7c0655..cb31296cc5 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/UIManager.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/UIManager.eea
@@ -8,7 +8,7 @@ addPropertyChangeListener
  (Ljava/beans/PropertyChangeListener;)V
 createLookAndFeel
  (Ljava/lang/String;)Ljavax/swing/LookAndFeel;
- (Ljava/lang/String;)Ljavax/swing/LookAndFeel;
+ (Ljava/lang/String;)L1javax/swing/LookAndFeel;
 get
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
@@ -17,7 +17,7 @@ get
  (Ljava/lang/Object;Ljava/util/Locale;)Ljava/lang/Object;
 getAuxiliaryLookAndFeels
  ()[Ljavax/swing/LookAndFeel;
- ()[Ljavax/swing/LookAndFeel;
+ ()[0Ljavax/swing/LookAndFeel;
 getBoolean
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
@@ -68,7 +68,7 @@ getInsets
  (Ljava/lang/Object;Ljava/util/Locale;)Ljava/awt/Insets;
 getInstalledLookAndFeels
  ()[Ljavax/swing/UIManager$LookAndFeelInfo;
- ()[Ljavax/swing/UIManager$LookAndFeelInfo;
+ ()[1Ljavax/swing/UIManager$LookAndFeelInfo;
 getInt
  (Ljava/lang/Object;)I
  (Ljava/lang/Object;)I
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/border/LineBorder.eea b/libs/eea-java-21/src/main/resources/javax/swing/border/LineBorder.eea
index e63839ce90..2999935825 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/border/LineBorder.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/border/LineBorder.eea
@@ -2,10 +2,10 @@ class javax/swing/border/LineBorder
 
 createBlackLineBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createGrayLineBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 
 lineColor
  Ljava/awt/Color;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/colorchooser/AbstractColorChooserPanel.eea b/libs/eea-java-21/src/main/resources/javax/swing/colorchooser/AbstractColorChooserPanel.eea
index 45fcff27d9..95f3376866 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/colorchooser/AbstractColorChooserPanel.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/colorchooser/AbstractColorChooserPanel.eea
@@ -6,10 +6,10 @@ TRANSPARENCY_ENABLED_PROPERTY
 
 getColorFromModel
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getColorSelectionModel
  ()Ljavax/swing/colorchooser/ColorSelectionModel;
- ()Ljavax/swing/colorchooser/ColorSelectionModel;
+ ()L0javax/swing/colorchooser/ColorSelectionModel;
 getDisplayName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/colorchooser/ColorChooserComponentFactory.eea b/libs/eea-java-21/src/main/resources/javax/swing/colorchooser/ColorChooserComponentFactory.eea
index 2fc68eac49..b911590d3c 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/colorchooser/ColorChooserComponentFactory.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/colorchooser/ColorChooserComponentFactory.eea
@@ -5,4 +5,4 @@ getDefaultChooserPanels
  ()[Ljavax/swing/colorchooser/AbstractColorChooserPanel;
 getPreviewPanel
  ()Ljavax/swing/JComponent;
- ()Ljavax/swing/JComponent;
+ ()L1javax/swing/JComponent;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/event/InternalFrameEvent.eea b/libs/eea-java-21/src/main/resources/javax/swing/event/InternalFrameEvent.eea
index 702583f747..076e037813 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/event/InternalFrameEvent.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/event/InternalFrameEvent.eea
@@ -5,7 +5,7 @@ class javax/swing/event/InternalFrameEvent
  (Ljavax/swing/JInternalFrame;I)V
 getInternalFrame
  ()Ljavax/swing/JInternalFrame;
- ()Ljavax/swing/JInternalFrame;
+ ()L0javax/swing/JInternalFrame;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(java.awt.AWTEvent)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/event/TreeModelEvent.eea b/libs/eea-java-21/src/main/resources/javax/swing/event/TreeModelEvent.eea
index 0774b7d0df..13d51e07af 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/event/TreeModelEvent.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/event/TreeModelEvent.eea
@@ -24,13 +24,13 @@ path
  (Ljava/lang/Object;[Ljava/lang/Object;[I[Ljava/lang/Object;)V
 getChildIndices
  ()[I
- ()[I
+ ()[0I
 getChildren
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 getPath
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 getTreePath
  ()Ljavax/swing/tree/TreePath;
  ()Ljavax/swing/tree/TreePath;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/event/TreeSelectionEvent.eea b/libs/eea-java-21/src/main/resources/javax/swing/event/TreeSelectionEvent.eea
index 7841f15cda..f4557e6e00 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/event/TreeSelectionEvent.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/event/TreeSelectionEvent.eea
@@ -33,7 +33,7 @@ getPath
  ()Ljavax/swing/tree/TreePath;
 getPaths
  ()[Ljavax/swing/tree/TreePath;
- ()[Ljavax/swing/tree/TreePath;
+ ()[1Ljavax/swing/tree/TreePath;
 isAddedPath
  (Ljavax/swing/tree/TreePath;)Z
  (Ljavax/swing/tree/TreePath;)Z
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/filechooser/FileNameExtensionFilter.eea b/libs/eea-java-21/src/main/resources/javax/swing/filechooser/FileNameExtensionFilter.eea
index 54f8b9fbbb..58ace28edb 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/filechooser/FileNameExtensionFilter.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/filechooser/FileNameExtensionFilter.eea
@@ -11,7 +11,7 @@ getDescription
  ()Ljava/lang/String;
 getExtensions
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/filechooser/FileSystemView.eea b/libs/eea-java-21/src/main/resources/javax/swing/filechooser/FileSystemView.eea
index dd0e595550..25fad9f30c 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/filechooser/FileSystemView.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/filechooser/FileSystemView.eea
@@ -6,16 +6,16 @@ getFileSystemView
 
 createFileObject
  (Ljava/io/File;Ljava/lang/String;)Ljava/io/File;
- (Ljava/io/File;Ljava/lang/String;)Ljava/io/File;
+ (Ljava/io/File;Ljava/lang/String;)L1java/io/File;
 createFileObject
  (Ljava/lang/String;)Ljava/io/File;
- (Ljava/lang/String;)Ljava/io/File;
+ (Ljava/lang/String;)L1java/io/File;
 createFileSystemRoot
  (Ljava/io/File;)Ljava/io/File;
- (Ljava/io/File;)Ljava/io/File;
+ (Ljava/io/File;)L1java/io/File;
 createNewFolder
  (Ljava/io/File;)Ljava/io/File;
- (Ljava/io/File;)Ljava/io/File;
+ (Ljava/io/File;)L1java/io/File;
 getChild
  (Ljava/io/File;Ljava/lang/String;)Ljava/io/File;
  (Ljava/io/File;Ljava/lang/String;)Ljava/io/File;
@@ -36,25 +36,25 @@ getHomeDirectory
  ()Ljava/io/File;
 getLinkLocation
  (Ljava/io/File;)Ljava/io/File;
- (Ljava/io/File;)Ljava/io/File;
+ (Ljava/io/File;)L0java/io/File;
 getParentDirectory
  (Ljava/io/File;)Ljava/io/File;
- (Ljava/io/File;)Ljava/io/File;
+ (Ljava/io/File;)L0java/io/File;
 getRoots
  ()[Ljava/io/File;
  ()[Ljava/io/File;
 getSystemDisplayName
  (Ljava/io/File;)Ljava/lang/String;
- (Ljava/io/File;)Ljava/lang/String;
+ (Ljava/io/File;)L0java/lang/String;
 getSystemIcon
  (Ljava/io/File;)Ljavax/swing/Icon;
- (Ljava/io/File;)Ljavax/swing/Icon;
+ (Ljava/io/File;)L0javax/swing/Icon;
 getSystemIcon
  (Ljava/io/File;II)Ljavax/swing/Icon;
- (Ljava/io/File;II)Ljavax/swing/Icon;
+ (Ljava/io/File;II)L0javax/swing/Icon;
 getSystemTypeDescription
  (Ljava/io/File;)Ljava/lang/String;
- (Ljava/io/File;)Ljava/lang/String;
+ (Ljava/io/File;)L0java/lang/String;
 isComputerNode
  (Ljava/io/File;)Z
  (Ljava/io/File;)Z
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/filechooser/FileView.eea b/libs/eea-java-21/src/main/resources/javax/swing/filechooser/FileView.eea
index e0ef4fa52b..0a4ff11d4e 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/filechooser/FileView.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/filechooser/FileView.eea
@@ -2,16 +2,16 @@ class javax/swing/filechooser/FileView
 
 getDescription
  (Ljava/io/File;)Ljava/lang/String;
- (Ljava/io/File;)Ljava/lang/String;
+ (Ljava/io/File;)L0java/lang/String;
 getIcon
  (Ljava/io/File;)Ljavax/swing/Icon;
- (Ljava/io/File;)Ljavax/swing/Icon;
+ (Ljava/io/File;)L0javax/swing/Icon;
 getName
  (Ljava/io/File;)Ljava/lang/String;
- (Ljava/io/File;)Ljava/lang/String;
+ (Ljava/io/File;)L0java/lang/String;
 getTypeDescription
  (Ljava/io/File;)Ljava/lang/String;
- (Ljava/io/File;)Ljava/lang/String;
+ (Ljava/io/File;)L0java/lang/String;
 isTraversable
  (Ljava/io/File;)Ljava/lang/Boolean;
- (Ljava/io/File;)Ljava/lang/Boolean;
+ (Ljava/io/File;)L0java/lang/Boolean;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/ComponentUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/ComponentUI.eea
index 5ec7973883..a2c548e098 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/ComponentUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/ComponentUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/ComponentUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 contains
  (Ljavax/swing/JComponent;II)Z
@@ -27,7 +27,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/FileChooserUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/FileChooserUI.eea
index 9ac7e7c5f4..e81cb87d1c 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/FileChooserUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/FileChooserUI.eea
@@ -11,7 +11,7 @@ getApproveButtonText
  (Ljavax/swing/JFileChooser;)Ljava/lang/String;
 getDefaultButton
  (Ljavax/swing/JFileChooser;)Ljavax/swing/JButton;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/JButton;
+ (Ljavax/swing/JFileChooser;)L0javax/swing/JButton;
 getDialogTitle
  (Ljavax/swing/JFileChooser;)Ljava/lang/String;
  (Ljavax/swing/JFileChooser;)Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/LayerUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/LayerUI.eea
index a6f539c648..e62749b44b 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/LayerUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/LayerUI.eea
@@ -34,7 +34,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getPropertyChangeListeners
  ()[Ljava/beans/PropertyChangeListener;
  ()[Ljava/beans/PropertyChangeListener;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/TextUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/TextUI.eea
index b98043b16e..65625e8751 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/TextUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/TextUI.eea
@@ -17,7 +17,7 @@ getRootView
  (Ljavax/swing/text/JTextComponent;)Ljavax/swing/text/View;
 getToolTipText
  (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)Ljava/lang/String;
- (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)Ljava/lang/String;
+ (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)L0java/lang/String;
 getToolTipText2D
  (Ljavax/swing/text/JTextComponent;Ljava/awt/geom/Point2D;)Ljava/lang/String;
  (Ljavax/swing/text/JTextComponent;Ljava/awt/geom/Point2D;)Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicArrowButton.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicArrowButton.eea
index 7bb20a0fe2..c82518b61d 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicArrowButton.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicArrowButton.eea
@@ -5,7 +5,7 @@ class javax/swing/plaf/basic/BasicArrowButton
  (ILjava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;)V
 getMaximumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 getMinimumSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicBorders.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicBorders.eea
index cbf229d0b2..e1058e82c2 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicBorders.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicBorders.eea
@@ -2,28 +2,28 @@ class javax/swing/plaf/basic/BasicBorders
 
 getButtonBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 getInternalFrameBorder
  ()Ljavax/swing/border/Border;
  ()Ljavax/swing/border/Border;
 getMenuBarBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 getProgressBarBorder
  ()Ljavax/swing/border/Border;
  ()Ljavax/swing/border/Border;
 getRadioButtonBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 getSplitPaneBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 getSplitPaneDividerBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 getTextFieldBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 getToggleButtonBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicButtonUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicButtonUI.eea
index 74aa3a4a21..0222c61576 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicButtonUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicButtonUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createButtonListener
  (Ljavax/swing/AbstractButton;)Ljavax/swing/plaf/basic/BasicButtonListener;
- (Ljavax/swing/AbstractButton;)Ljavax/swing/plaf/basic/BasicButtonListener;
+ (Ljavax/swing/AbstractButton;)L1javax/swing/plaf/basic/BasicButtonListener;
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -24,10 +24,10 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 installDefaults
  (Ljavax/swing/AbstractButton;)V
  (Ljavax/swing/AbstractButton;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.eea
index 9d9f5bc39c..2fa21504bb 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicCheckBoxMenuItemUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 processMouseEvent
  (Ljavax/swing/JMenuItem;Ljava/awt/event/MouseEvent;[Ljavax/swing/MenuElement;Ljavax/swing/MenuSelectionManager;)V
  (Ljavax/swing/JMenuItem;Ljava/awt/event/MouseEvent;[Ljavax/swing/MenuElement;Ljavax/swing/MenuSelectionManager;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicCheckBoxUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicCheckBoxUI.eea
index 5fbe295d12..9b7771641d 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicCheckBoxUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicCheckBoxUI.eea
@@ -2,8 +2,8 @@ class javax/swing/plaf/basic/BasicCheckBoxUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicRadioButtonUI)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicColorChooserUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicColorChooserUI.eea
index 3f06af60a4..0e0f345fc1 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicColorChooserUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicColorChooserUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicColorChooserUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 chooser
  Ljavax/swing/JColorChooser;
@@ -19,10 +19,10 @@ propertyChangeListener
 
 createDefaultChoosers
  ()[Ljavax/swing/colorchooser/AbstractColorChooserPanel;
- ()[Ljavax/swing/colorchooser/AbstractColorChooserPanel;
+ ()[1Ljavax/swing/colorchooser/AbstractColorChooserPanel;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicComboBoxEditor.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicComboBoxEditor.eea
index a6bce29431..a5c1729bf3 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicComboBoxEditor.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicComboBoxEditor.eea
@@ -9,7 +9,7 @@ addActionListener
  (L1java/awt/event/ActionListener;)V # @Inherited(javax.swing.ComboBoxEditor)
 createEditorComponent
  ()Ljavax/swing/JTextField;
- ()Ljavax/swing/JTextField;
+ ()L1javax/swing/JTextField;
 focusGained
  (Ljava/awt/event/FocusEvent;)V
  (L1java/awt/event/FocusEvent;)V # @Inherited(java.awt.event.FocusListener)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicComboBoxUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicComboBoxUI.eea
index 29a0806539..8b16633987 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicComboBoxUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicComboBoxUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicComboBoxUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 arrowButton
  Ljavax/swing/JButton;
@@ -55,37 +55,37 @@ propertyChangeListener
 
 createArrowButton
  ()Ljavax/swing/JButton;
- ()Ljavax/swing/JButton;
+ ()L1javax/swing/JButton;
 createEditor
  ()Ljavax/swing/ComboBoxEditor;
- ()Ljavax/swing/ComboBoxEditor;
+ ()L1javax/swing/ComboBoxEditor;
 createFocusListener
  ()Ljava/awt/event/FocusListener;
- ()Ljava/awt/event/FocusListener;
+ ()L1java/awt/event/FocusListener;
 createItemListener
  ()Ljava/awt/event/ItemListener;
- ()Ljava/awt/event/ItemListener;
+ ()L0java/awt/event/ItemListener;
 createKeyListener
  ()Ljava/awt/event/KeyListener;
- ()Ljava/awt/event/KeyListener;
+ ()L1java/awt/event/KeyListener;
 createLayoutManager
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 createListDataListener
  ()Ljavax/swing/event/ListDataListener;
- ()Ljavax/swing/event/ListDataListener;
+ ()L1javax/swing/event/ListDataListener;
 createPopup
  ()Ljavax/swing/plaf/basic/ComboPopup;
- ()Ljavax/swing/plaf/basic/ComboPopup;
+ ()L1javax/swing/plaf/basic/ComboPopup;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createRenderer
  ()Ljavax/swing/ListCellRenderer<Ljava/lang/Object;>;
- ()Ljavax/swing/ListCellRenderer<Ljava/lang/Object;>;
+ ()L1javax/swing/ListCellRenderer<Ljava/lang/Object;>;
 getAccessibleChild
  (Ljavax/swing/JComponent;I)Ljavax/accessibility/Accessible;
- (Ljavax/swing/JComponent;I)Ljavax/accessibility/Accessible;
+ (Ljavax/swing/JComponent;I)L0javax/accessibility/Accessible;
 getAccessibleChildrenCount
  (Ljavax/swing/JComponent;)I
  (Ljavax/swing/JComponent;)I
@@ -109,10 +109,10 @@ getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getSizeForComponent
  (Ljava/awt/Component;)Ljava/awt/Dimension;
  (Ljava/awt/Component;)Ljava/awt/Dimension;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicComboPopup.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicComboPopup.eea
index 21ba9d998b..dcfc6120a4 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicComboPopup.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicComboPopup.eea
@@ -45,43 +45,43 @@ scroller
  (Ljavax/swing/JComboBox<Ljava/lang/Object;>;)V
 computePopupBounds
  (IIII)Ljava/awt/Rectangle;
- (IIII)Ljava/awt/Rectangle;
+ (IIII)L1java/awt/Rectangle;
 convertMouseEvent
  (Ljava/awt/event/MouseEvent;)Ljava/awt/event/MouseEvent;
  (Ljava/awt/event/MouseEvent;)Ljava/awt/event/MouseEvent;
 createItemListener
  ()Ljava/awt/event/ItemListener;
- ()Ljava/awt/event/ItemListener;
+ ()L1java/awt/event/ItemListener;
 createKeyListener
  ()Ljava/awt/event/KeyListener;
- ()Ljava/awt/event/KeyListener;
+ ()L0java/awt/event/KeyListener;
 createList
  ()Ljavax/swing/JList<Ljava/lang/Object;>;
- ()Ljavax/swing/JList<Ljava/lang/Object;>;
+ ()L1javax/swing/JList<Ljava/lang/Object;>;
 createListDataListener
  ()Ljavax/swing/event/ListDataListener;
- ()Ljavax/swing/event/ListDataListener;
+ ()L0javax/swing/event/ListDataListener;
 createListMouseListener
  ()Ljava/awt/event/MouseListener;
- ()Ljava/awt/event/MouseListener;
+ ()L1java/awt/event/MouseListener;
 createListMouseMotionListener
  ()Ljava/awt/event/MouseMotionListener;
- ()Ljava/awt/event/MouseMotionListener;
+ ()L1java/awt/event/MouseMotionListener;
 createListSelectionListener
  ()Ljavax/swing/event/ListSelectionListener;
- ()Ljavax/swing/event/ListSelectionListener;
+ ()L0javax/swing/event/ListSelectionListener;
 createMouseListener
  ()Ljava/awt/event/MouseListener;
- ()Ljava/awt/event/MouseListener;
+ ()L1java/awt/event/MouseListener;
 createMouseMotionListener
  ()Ljava/awt/event/MouseMotionListener;
- ()Ljava/awt/event/MouseMotionListener;
+ ()L1java/awt/event/MouseMotionListener;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createScroller
  ()Ljavax/swing/JScrollPane;
- ()Ljavax/swing/JScrollPane;
+ ()L1javax/swing/JScrollPane;
 delegateFocus
  (Ljava/awt/event/MouseEvent;)V
  (Ljava/awt/event/MouseEvent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicDesktopIconUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicDesktopIconUI.eea
index 9f6065482b..3b26068ec0 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicDesktopIconUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicDesktopIconUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicDesktopIconUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 desktopIcon
  Ljavax/swing/JInternalFrame$JDesktopIcon;
@@ -16,7 +16,7 @@ iconPane
 
 createMouseInputListener
  ()Ljavax/swing/event/MouseInputListener;
- ()Ljavax/swing/event/MouseInputListener;
+ ()L1javax/swing/event/MouseInputListener;
 getInsets
  (Ljavax/swing/JComponent;)Ljava/awt/Insets;
  (Ljavax/swing/JComponent;)Ljava/awt/Insets;
@@ -25,10 +25,10 @@ getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicDesktopPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicDesktopPaneUI.eea
index 025812e960..827e084006 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicDesktopPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicDesktopPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicDesktopPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 closeKey
  Ljavax/swing/KeyStroke;
@@ -28,16 +28,16 @@ navigateKey2
 
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicEditorPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicEditorPaneUI.eea
index 22580148cb..54169ae3bc 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicEditorPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicEditorPaneUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/basic/BasicEditorPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getEditorKit
  (Ljavax/swing/text/JTextComponent;)Ljavax/swing/text/EditorKit;
  (Ljavax/swing/text/JTextComponent;)Ljavax/swing/text/EditorKit;
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.eea
index 96534ee69f..717dc1c230 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.eea
@@ -15,16 +15,16 @@ getCachedIcon
  (Ljava/io/File;)Ljavax/swing/Icon;
 getDescription
  (Ljava/io/File;)Ljava/lang/String;
- (Ljava/io/File;)Ljava/lang/String;
+ (Ljava/io/File;)L0java/lang/String; # @Inherited(javax.swing.filechooser.FileView)
 getIcon
  (Ljava/io/File;)Ljavax/swing/Icon;
- (Ljava/io/File;)Ljavax/swing/Icon;
+ (Ljava/io/File;)L0javax/swing/Icon; # @Inherited(javax.swing.filechooser.FileView)
 getName
  (Ljava/io/File;)Ljava/lang/String;
- (Ljava/io/File;)Ljava/lang/String;
+ (Ljava/io/File;)L0java/lang/String; # @Inherited(javax.swing.filechooser.FileView)
 getTypeDescription
  (Ljava/io/File;)Ljava/lang/String;
- (Ljava/io/File;)Ljava/lang/String;
+ (Ljava/io/File;)L0java/lang/String; # @Inherited(javax.swing.filechooser.FileView)
 isHidden
  (Ljava/io/File;)Ljava/lang/Boolean;
  (Ljava/io/File;)Ljava/lang/Boolean;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicFileChooserUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicFileChooserUI.eea
index cfe6c34187..27a39da817 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicFileChooserUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicFileChooserUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicFileChooserUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 cancelButtonText
  Ljava/lang/String;
@@ -79,13 +79,13 @@ viewMenuIcon
  (Ljavax/swing/JFileChooser;)V
 createDoubleClickListener
  (Ljavax/swing/JFileChooser;Ljavax/swing/JList<*>;)Ljava/awt/event/MouseListener;
- (Ljavax/swing/JFileChooser;Ljavax/swing/JList<*>;)Ljava/awt/event/MouseListener;
+ (Ljavax/swing/JFileChooser;Ljavax/swing/JList<*>;)L1java/awt/event/MouseListener;
 createListSelectionListener
  (Ljavax/swing/JFileChooser;)Ljavax/swing/event/ListSelectionListener;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/event/ListSelectionListener;
+ (Ljavax/swing/JFileChooser;)L1javax/swing/event/ListSelectionListener;
 createPropertyChangeListener
  (Ljavax/swing/JFileChooser;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JFileChooser;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JFileChooser;)L0java/beans/PropertyChangeListener;
 ensureFileIsVisible
  (Ljavax/swing/JFileChooser;Ljava/io/File;)V
  (Ljavax/swing/JFileChooser;Ljava/io/File;)V
@@ -97,16 +97,16 @@ getAccessoryPanel
  ()Ljavax/swing/JPanel;
 getApproveButton
  (Ljavax/swing/JFileChooser;)Ljavax/swing/JButton;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/JButton;
+ (Ljavax/swing/JFileChooser;)L0javax/swing/JButton;
 getApproveButtonMnemonic
  (Ljavax/swing/JFileChooser;)I
  (Ljavax/swing/JFileChooser;)I
 getApproveButtonText
  (Ljavax/swing/JFileChooser;)Ljava/lang/String;
- (Ljavax/swing/JFileChooser;)Ljava/lang/String;
+ (Ljavax/swing/JFileChooser;)L0java/lang/String;
 getApproveButtonToolTipText
  (Ljavax/swing/JFileChooser;)Ljava/lang/String;
- (Ljavax/swing/JFileChooser;)Ljava/lang/String;
+ (Ljavax/swing/JFileChooser;)L0java/lang/String;
 getApproveSelectionAction
  ()Ljavax/swing/Action;
  ()Ljavax/swing/Action;
@@ -118,7 +118,7 @@ getChangeToParentDirectoryAction
  ()Ljavax/swing/Action;
 getDefaultButton
  (Ljavax/swing/JFileChooser;)Ljavax/swing/JButton;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/JButton;
+ (Ljavax/swing/JFileChooser;)L0javax/swing/JButton; # @Inherited(javax.swing.plaf.FileChooserUI)
 getDialogTitle
  (Ljavax/swing/JFileChooser;)Ljava/lang/String;
  (Ljavax/swing/JFileChooser;)Ljava/lang/String;
@@ -127,13 +127,13 @@ getDirectory
  ()Ljava/io/File;
 getDirectoryName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getFileChooser
  ()Ljavax/swing/JFileChooser;
  ()Ljavax/swing/JFileChooser;
 getFileName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getFileView
  (Ljavax/swing/JFileChooser;)Ljavax/swing/filechooser/FileView;
  (Ljavax/swing/JFileChooser;)Ljavax/swing/filechooser/FileView;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicFormattedTextFieldUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicFormattedTextFieldUI.eea
index 345fdb8dd6..bb83c69302 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicFormattedTextFieldUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicFormattedTextFieldUI.eea
@@ -2,8 +2,8 @@ class javax/swing/plaf/basic/BasicFormattedTextFieldUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicTextFieldUI)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicGraphicsUtils.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicGraphicsUtils.eea
index 5e1ca5785e..9da2bd8bd0 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicGraphicsUtils.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicGraphicsUtils.eea
@@ -38,7 +38,7 @@ getGrooveInsets
  ()Ljava/awt/Insets;
 getPreferredButtonSize
  (Ljavax/swing/AbstractButton;I)Ljava/awt/Dimension;
- (Ljavax/swing/AbstractButton;I)Ljava/awt/Dimension;
+ (Ljavax/swing/AbstractButton;I)L0java/awt/Dimension;
 getStringWidth
  (Ljavax/swing/JComponent;Ljava/awt/FontMetrics;Ljava/lang/String;)F
  (Ljavax/swing/JComponent;Ljava/awt/FontMetrics;Ljava/lang/String;)F
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicHTML.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicHTML.eea
index 1303b07efc..b7be4a6dd9 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicHTML.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicHTML.eea
@@ -9,7 +9,7 @@ propertyKey
 
 createHTMLView
  (Ljavax/swing/JComponent;Ljava/lang/String;)Ljavax/swing/text/View;
- (Ljavax/swing/JComponent;Ljava/lang/String;)Ljavax/swing/text/View;
+ (Ljavax/swing/JComponent;Ljava/lang/String;)L1javax/swing/text/View;
 getHTMLBaseline
  (Ljavax/swing/text/View;II)I
  (Ljavax/swing/text/View;II)I
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicIconFactory.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicIconFactory.eea
index 958ff17940..504f9378d9 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicIconFactory.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicIconFactory.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicIconFactory
 
 createEmptyFrameIcon
  ()Ljavax/swing/Icon;
- ()Ljavax/swing/Icon;
+ ()L1javax/swing/Icon;
 getCheckBoxIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicInternalFrameTitlePane.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicInternalFrameTitlePane.eea
index 61225d556f..991a88c435 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicInternalFrameTitlePane.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicInternalFrameTitlePane.eea
@@ -91,16 +91,16 @@ addSystemMenuItems
  (Ljavax/swing/JMenu;)V
 createLayout
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createSystemMenu
  ()Ljavax/swing/JMenu;
- ()Ljavax/swing/JMenu;
+ ()L1javax/swing/JMenu;
 createSystemMenuBar
  ()Ljavax/swing/JMenuBar;
- ()Ljavax/swing/JMenuBar;
+ ()L1javax/swing/JMenuBar;
 getTitle
  (Ljava/lang/String;Ljava/awt/FontMetrics;I)Ljava/lang/String;
  (Ljava/lang/String;Ljava/awt/FontMetrics;I)Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicInternalFrameUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicInternalFrameUI.eea
index 5a61c7b11a..7bc50d3cf0 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicInternalFrameUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicInternalFrameUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicInternalFrameUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 borderListener
  Ljavax/swing/event/MouseInputAdapter;
@@ -52,34 +52,34 @@ closeFrame
  (Ljavax/swing/JInternalFrame;)V
 createBorderListener
  (Ljavax/swing/JInternalFrame;)Ljavax/swing/event/MouseInputAdapter;
- (Ljavax/swing/JInternalFrame;)Ljavax/swing/event/MouseInputAdapter;
+ (Ljavax/swing/JInternalFrame;)L1javax/swing/event/MouseInputAdapter;
 createComponentListener
  ()Ljava/awt/event/ComponentListener;
- ()Ljava/awt/event/ComponentListener;
+ ()L1java/awt/event/ComponentListener;
 createDesktopManager
  ()Ljavax/swing/DesktopManager;
- ()Ljavax/swing/DesktopManager;
+ ()L1javax/swing/DesktopManager;
 createEastPane
  (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
- (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
+ (Ljavax/swing/JInternalFrame;)L0javax/swing/JComponent;
 createGlassPaneDispatcher
  ()Ljavax/swing/event/MouseInputListener;
- ()Ljavax/swing/event/MouseInputListener;
+ ()L0javax/swing/event/MouseInputListener;
 createLayoutManager
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 createNorthPane
  (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
- (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
+ (Ljavax/swing/JInternalFrame;)L1javax/swing/JComponent;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createSouthPane
  (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
- (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
+ (Ljavax/swing/JInternalFrame;)L0javax/swing/JComponent;
 createWestPane
  (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
- (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
+ (Ljavax/swing/JInternalFrame;)L0javax/swing/JComponent;
 deactivateFrame
  (Ljavax/swing/JInternalFrame;)V
  (Ljavax/swing/JInternalFrame;)V
@@ -97,7 +97,7 @@ getEastPane
  ()Ljavax/swing/JComponent;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
@@ -106,7 +106,7 @@ getNorthPane
  ()Ljavax/swing/JComponent;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getSouthPane
  ()Ljavax/swing/JComponent;
  ()Ljavax/swing/JComponent;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicLabelUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicLabelUI.eea
index 3c1a431d4c..7734c1a4b6 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicLabelUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicLabelUI.eea
@@ -6,7 +6,7 @@ labelUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getBaseline
  (Ljavax/swing/JComponent;II)I
@@ -22,7 +22,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installComponents
  (Ljavax/swing/JLabel;)V
  (Ljavax/swing/JLabel;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicListUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicListUI.eea
index b22d88812e..cfbe388764 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicListUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicListUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicListUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 cellHeights
  [I
@@ -31,19 +31,19 @@ rendererPane
 
 createFocusListener
  ()Ljava/awt/event/FocusListener;
- ()Ljava/awt/event/FocusListener;
+ ()L1java/awt/event/FocusListener;
 createListDataListener
  ()Ljavax/swing/event/ListDataListener;
- ()Ljavax/swing/event/ListDataListener;
+ ()L1javax/swing/event/ListDataListener;
 createListSelectionListener
  ()Ljavax/swing/event/ListSelectionListener;
- ()Ljavax/swing/event/ListSelectionListener;
+ ()L1javax/swing/event/ListSelectionListener;
 createMouseInputListener
  ()Ljavax/swing/event/MouseInputListener;
- ()Ljavax/swing/event/MouseInputListener;
+ ()L1javax/swing/event/MouseInputListener;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -52,13 +52,13 @@ getBaselineResizeBehavior
  (Ljavax/swing/JComponent;)Ljava/awt/Component$BaselineResizeBehavior;
 getCellBounds
  (Ljavax/swing/JList<*>;II)Ljava/awt/Rectangle;
- (Ljavax/swing/JList<*>;II)Ljava/awt/Rectangle;
+ (Ljavax/swing/JList<*>;II)L0java/awt/Rectangle;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 indexToLocation
  (Ljavax/swing/JList<*>;I)Ljava/awt/Point;
- (Ljavax/swing/JList<*>;I)Ljava/awt/Point;
+ (Ljavax/swing/JList<*>;I)L0java/awt/Point;
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicLookAndFeel.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicLookAndFeel.eea
index 34bcd75e87..00340aafe8 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicLookAndFeel.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicLookAndFeel.eea
@@ -2,13 +2,13 @@ class javax/swing/plaf/basic/BasicLookAndFeel
 
 createAudioAction
  (Ljava/lang/Object;)Ljavax/swing/Action;
- (Ljava/lang/Object;)Ljavax/swing/Action;
+ (Ljava/lang/Object;)L0javax/swing/Action;
 getAudioActionMap
  ()Ljavax/swing/ActionMap;
- ()Ljavax/swing/ActionMap;
+ ()L1javax/swing/ActionMap;
 getDefaults
  ()Ljavax/swing/UIDefaults;
- ()Ljavax/swing/UIDefaults;
+ ()L0javax/swing/UIDefaults; # @Inherited(javax.swing.LookAndFeel)
 initClassDefaults
  (Ljavax/swing/UIDefaults;)V
  (Ljavax/swing/UIDefaults;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicMenuBarUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicMenuBarUI.eea
index f438ccead3..49806e056f 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicMenuBarUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicMenuBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicMenuBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 changeListener
  Ljavax/swing/event/ChangeListener;
@@ -16,16 +16,16 @@ menuBar
 
 createChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 createContainerListener
  ()Ljava/awt/event/ContainerListener;
- ()Ljava/awt/event/ContainerListener;
+ ()L1java/awt/event/ContainerListener;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicMenuItemUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicMenuItemUI.eea
index 65327d4bbb..9b25907c91 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicMenuItemUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicMenuItemUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicMenuItemUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 acceleratorDelimiter
  Ljava/lang/String;
@@ -49,16 +49,16 @@ selectionForeground
 
 createMenuDragMouseListener
  (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuDragMouseListener;
- (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuDragMouseListener;
+ (Ljavax/swing/JComponent;)L1javax/swing/event/MenuDragMouseListener;
 createMenuKeyListener
  (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuKeyListener;
- (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuKeyListener;
+ (Ljavax/swing/JComponent;)L0javax/swing/event/MenuKeyListener;
 createMouseInputListener
  (Ljavax/swing/JComponent;)Ljavax/swing/event/MouseInputListener;
- (Ljavax/swing/JComponent;)Ljavax/swing/event/MouseInputListener;
+ (Ljavax/swing/JComponent;)L1javax/swing/event/MouseInputListener;
 createPropertyChangeListener
  (Ljavax/swing/JComponent;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JComponent;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JComponent;)L1java/beans/PropertyChangeListener;
 doClick
  (Ljavax/swing/MenuSelectionManager;)V
  (Ljavax/swing/MenuSelectionManager;)V
@@ -70,16 +70,16 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPath
  ()[Ljavax/swing/MenuElement;
- ()[Ljavax/swing/MenuElement;
+ ()[1Ljavax/swing/MenuElement;
 getPreferredMenuItemSize
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)L1java/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 installComponents
  (Ljavax/swing/JMenuItem;)V
  (Ljavax/swing/JMenuItem;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicMenuUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicMenuUI.eea
index 427aafc68a..71b67ee792 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicMenuUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicMenuUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicMenuUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 changeListener
  Ljavax/swing/event/ChangeListener;
@@ -13,31 +13,31 @@ menuListener
 
 createChangeListener
  (Ljavax/swing/JComponent;)Ljavax/swing/event/ChangeListener;
- (Ljavax/swing/JComponent;)Ljavax/swing/event/ChangeListener;
+ (Ljavax/swing/JComponent;)L0javax/swing/event/ChangeListener;
 createMenuDragMouseListener
  (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuDragMouseListener;
- (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuDragMouseListener;
+ (Ljavax/swing/JComponent;)L1javax/swing/event/MenuDragMouseListener; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 createMenuKeyListener
  (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuKeyListener;
- (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuKeyListener;
+ (Ljavax/swing/JComponent;)L1javax/swing/event/MenuKeyListener; # @Overrides(javax.swing.plaf.basic.BasicMenuItemUI)
 createMenuListener
  (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuListener;
- (Ljavax/swing/JComponent;)Ljavax/swing/event/MenuListener;
+ (Ljavax/swing/JComponent;)L0javax/swing/event/MenuListener;
 createMouseInputListener
  (Ljavax/swing/JComponent;)Ljavax/swing/event/MouseInputListener;
- (Ljavax/swing/JComponent;)Ljavax/swing/event/MouseInputListener;
+ (Ljavax/swing/JComponent;)L1javax/swing/event/MouseInputListener; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 createPropertyChangeListener
  (Ljavax/swing/JComponent;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JComponent;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JComponent;)L1java/beans/PropertyChangeListener; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 setupPostTimer
  (Ljavax/swing/JMenu;)V
  (Ljavax/swing/JMenu;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicOptionPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicOptionPaneUI.eea
index ededf1a60d..e349eab7df 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicOptionPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicOptionPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicOptionPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 initialFocusComponent
  Ljava/awt/Component;
@@ -37,40 +37,40 @@ containsCustomComponents
  (Ljavax/swing/JOptionPane;)Z
 createButtonActionListener
  (I)Ljava/awt/event/ActionListener;
- (I)Ljava/awt/event/ActionListener;
+ (I)L1java/awt/event/ActionListener;
 createButtonArea
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L1java/awt/Container;
 createLayoutManager
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 createMessageArea
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L1java/awt/Container;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createSeparator
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L0java/awt/Container;
 getButtons
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[0Ljava/lang/Object;
 getIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
 getIconForType
  (I)Ljavax/swing/Icon;
- (I)Ljavax/swing/Icon;
+ (I)L0javax/swing/Icon;
 getMessage
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getMinimumOptionPaneSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicPanelUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicPanelUI.eea
index 04039e1a98..23f3aa3873 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicPanelUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicPanelUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicPanelUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getBaseline
  (Ljavax/swing/JComponent;II)I
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicPasswordFieldUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicPasswordFieldUI.eea
index 2aa8e1f416..7e339d5fac 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicPasswordFieldUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicPasswordFieldUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicPasswordFieldUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 create
  (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
+ (Ljavax/swing/text/Element;)L1javax/swing/text/View; # @Inherited(javax.swing.plaf.basic.BasicTextFieldUI)
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicTextFieldUI)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.eea
index 155f5cba47..219fdcf82e 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicPopupMenuSeparatorUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicSeparatorUI)
 paint
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicPopupMenuUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicPopupMenuUI.eea
index be8ccead39..4020267896 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicPopupMenuUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicPopupMenuUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicPopupMenuUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 popupMenu
  Ljavax/swing/JPopupMenu;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicProgressBarUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicProgressBarUI.eea
index 2655975986..14997c7a20 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicProgressBarUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicProgressBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicProgressBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 boxRect
  Ljava/awt/Rectangle;
@@ -25,7 +25,7 @@ getBaselineResizeBehavior
  (Ljavax/swing/JComponent;)Ljava/awt/Component$BaselineResizeBehavior;
 getBox
  (Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
- (Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
+ (Ljava/awt/Rectangle;)L0java/awt/Rectangle;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
@@ -40,7 +40,7 @@ getPreferredInnerVertical
  ()Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Overrides(javax.swing.plaf.ComponentUI)
 getSelectionBackground
  ()Ljava/awt/Color;
  ()Ljava/awt/Color;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.eea
index cadaa38d8c..2c13e86b34 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicRadioButtonMenuItemUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 processMouseEvent
  (Ljavax/swing/JMenuItem;Ljava/awt/event/MouseEvent;[Ljavax/swing/MenuElement;Ljavax/swing/MenuSelectionManager;)V
  (Ljavax/swing/JMenuItem;Ljava/awt/event/MouseEvent;[Ljavax/swing/MenuElement;Ljavax/swing/MenuSelectionManager;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicRadioButtonUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicRadioButtonUI.eea
index 5a4abe7bee..57b58ed465 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicRadioButtonUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicRadioButtonUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicRadioButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 icon
  Ljavax/swing/Icon;
@@ -13,10 +13,10 @@ getDefaultIcon
  ()Ljavax/swing/Icon;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicButtonUI)
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicToggleButtonUI)
 installDefaults
  (Ljavax/swing/AbstractButton;)V
  (Ljavax/swing/AbstractButton;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicRootPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicRootPaneUI.eea
index 17e9eca72a..f1d7d7c844 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicRootPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicRootPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicRootPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 installComponents
  (Ljavax/swing/JRootPane;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicScrollBarUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicScrollBarUI.eea
index 7f8df9a274..4647ddab0f 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicScrollBarUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicScrollBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicScrollBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 buttonListener
  Ljavax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener;
@@ -67,28 +67,28 @@ addLayoutComponent
  (Ljava/lang/String;Ljava/awt/Component;)V
 createArrowButtonListener
  ()Ljavax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener;
- ()Ljavax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener;
+ ()L1javax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener;
 createDecreaseButton
  (I)Ljavax/swing/JButton;
- (I)Ljavax/swing/JButton;
+ (I)L1javax/swing/JButton;
 createIncreaseButton
  (I)Ljavax/swing/JButton;
- (I)Ljavax/swing/JButton;
+ (I)L1javax/swing/JButton;
 createModelListener
  ()Ljavax/swing/plaf/basic/BasicScrollBarUI$ModelListener;
- ()Ljavax/swing/plaf/basic/BasicScrollBarUI$ModelListener;
+ ()L1javax/swing/plaf/basic/BasicScrollBarUI$ModelListener;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createScrollListener
  ()Ljavax/swing/plaf/basic/BasicScrollBarUI$ScrollListener;
- ()Ljavax/swing/plaf/basic/BasicScrollBarUI$ScrollListener;
+ ()L1javax/swing/plaf/basic/BasicScrollBarUI$ScrollListener;
 createTrackListener
  ()Ljavax/swing/plaf/basic/BasicScrollBarUI$TrackListener;
- ()Ljavax/swing/plaf/basic/BasicScrollBarUI$TrackListener;
+ ()L1javax/swing/plaf/basic/BasicScrollBarUI$TrackListener;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getMaximumThumbSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
@@ -97,7 +97,7 @@ getMinimumThumbSize
  ()Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Overrides(javax.swing.plaf.ComponentUI)
 getThumbBounds
  ()Ljava/awt/Rectangle;
  ()Ljava/awt/Rectangle;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicScrollPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicScrollPaneUI.eea
index ba95b93096..e9c3d8a4f8 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicScrollPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicScrollPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicScrollPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 hsbChangeListener
  Ljavax/swing/event/ChangeListener;
@@ -22,19 +22,19 @@ vsbChangeListener
 
 createHSBChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 createMouseWheelListener
  ()Ljava/awt/event/MouseWheelListener;
- ()Ljava/awt/event/MouseWheelListener;
+ ()L1java/awt/event/MouseWheelListener;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createVSBChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 createViewportChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicSeparatorUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicSeparatorUI.eea
index b11d53122a..ef912e03e3 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicSeparatorUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicSeparatorUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicSeparatorUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 highlight
  Ljava/awt/Color;
@@ -13,13 +13,13 @@ shadow
 
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installDefaults
  (Ljavax/swing/JSeparator;)V
  (Ljavax/swing/JSeparator;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicSliderUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicSliderUI.eea
index 2deac5dc8f..9d3a8cd10c 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicSliderUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicSliderUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicSliderUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 changeListener
  Ljavax/swing/event/ChangeListener;
@@ -58,22 +58,22 @@ trackRect
  (Ljavax/swing/JSlider;)V
 createChangeListener
  (Ljavax/swing/JSlider;)Ljavax/swing/event/ChangeListener;
- (Ljavax/swing/JSlider;)Ljavax/swing/event/ChangeListener;
+ (Ljavax/swing/JSlider;)L1javax/swing/event/ChangeListener;
 createComponentListener
  (Ljavax/swing/JSlider;)Ljava/awt/event/ComponentListener;
- (Ljavax/swing/JSlider;)Ljava/awt/event/ComponentListener;
+ (Ljavax/swing/JSlider;)L1java/awt/event/ComponentListener;
 createFocusListener
  (Ljavax/swing/JSlider;)Ljava/awt/event/FocusListener;
- (Ljavax/swing/JSlider;)Ljava/awt/event/FocusListener;
+ (Ljavax/swing/JSlider;)L1java/awt/event/FocusListener;
 createPropertyChangeListener
  (Ljavax/swing/JSlider;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JSlider;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JSlider;)L1java/beans/PropertyChangeListener;
 createScrollListener
  (Ljavax/swing/JSlider;)Ljavax/swing/plaf/basic/BasicSliderUI$ScrollListener;
- (Ljavax/swing/JSlider;)Ljavax/swing/plaf/basic/BasicSliderUI$ScrollListener;
+ (Ljavax/swing/JSlider;)L1javax/swing/plaf/basic/BasicSliderUI$ScrollListener;
 createTrackListener
  (Ljavax/swing/JSlider;)Ljavax/swing/plaf/basic/BasicSliderUI$TrackListener;
- (Ljavax/swing/JSlider;)Ljavax/swing/plaf/basic/BasicSliderUI$TrackListener;
+ (Ljavax/swing/JSlider;)L1javax/swing/plaf/basic/BasicSliderUI$TrackListener;
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -85,19 +85,19 @@ getFocusColor
  ()Ljava/awt/Color;
 getHighestValue
  ()Ljava/lang/Integer;
- ()Ljava/lang/Integer;
+ ()L0java/lang/Integer;
 getHighestValueLabel
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 getHighlightColor
  ()Ljava/awt/Color;
  ()Ljava/awt/Color;
 getLowestValue
  ()Ljava/lang/Integer;
- ()Ljava/lang/Integer;
+ ()L0java/lang/Integer;
 getLowestValueLabel
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L0java/awt/Component;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
@@ -106,7 +106,7 @@ getMinimumHorizontalSize
  ()Ljava/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getMinimumVerticalSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
@@ -115,7 +115,7 @@ getPreferredHorizontalSize
  ()Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Overrides(javax.swing.plaf.ComponentUI)
 getPreferredVerticalSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
@@ -124,7 +124,7 @@ getShadowColor
  ()Ljava/awt/Color;
 getThumbSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 installDefaults
  (Ljavax/swing/JSlider;)V
  (Ljavax/swing/JSlider;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicSpinnerUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicSpinnerUI.eea
index 43b73e0304..b72b0dc06b 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicSpinnerUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicSpinnerUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicSpinnerUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 spinner
  Ljavax/swing/JSpinner;
@@ -10,19 +10,19 @@ spinner
 
 createEditor
  ()Ljavax/swing/JComponent;
- ()Ljavax/swing/JComponent;
+ ()L1javax/swing/JComponent;
 createLayout
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 createNextButton
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component;
 createPreviousButton
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneDivider.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneDivider.eea
index ced2adc462..efa6351974 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneDivider.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneDivider.eea
@@ -27,10 +27,10 @@ splitPaneUI
  (Ljavax/swing/plaf/basic/BasicSplitPaneUI;)V
 createLeftOneTouchButton
  ()Ljavax/swing/JButton;
- ()Ljavax/swing/JButton;
+ ()L1javax/swing/JButton;
 createRightOneTouchButton
  ()Ljavax/swing/JButton;
- ()Ljavax/swing/JButton;
+ ()L1javax/swing/JButton;
 getBasicSplitPaneUI
  ()Ljavax/swing/plaf/basic/BasicSplitPaneUI;
  ()Ljavax/swing/plaf/basic/BasicSplitPaneUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.eea
index f62efec6c4..f385dfbbed 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.eea
@@ -33,7 +33,7 @@ getSizeOfComponent
  (Ljava/awt/Component;)I
 getSizes
  ()[I
- ()[I
+ ()[1I
 invalidateLayout
  (Ljava/awt/Container;)V
  (Ljava/awt/Container;)V
@@ -42,13 +42,13 @@ layoutContainer
  (Ljava/awt/Container;)V
 maximumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
- (Ljava/awt/Container;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;)L1java/awt/Dimension;
 minimumLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
- (Ljava/awt/Container;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;)L1java/awt/Dimension;
 preferredLayoutSize
  (Ljava/awt/Container;)Ljava/awt/Dimension;
- (Ljava/awt/Container;)Ljava/awt/Dimension;
+ (Ljava/awt/Container;)L1java/awt/Dimension;
 removeLayoutComponent
  (Ljava/awt/Component;)V
  (Ljava/awt/Component;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneUI.eea
index a408ac5ec0..886cee9302 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicSplitPaneUI.eea
@@ -6,7 +6,7 @@ NON_CONTINUOUS_DIVIDER
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 divider
  Ljavax/swing/plaf/basic/BasicSplitPaneDivider;
@@ -65,31 +65,31 @@ upKey
 
 createDefaultDivider
  ()Ljavax/swing/plaf/basic/BasicSplitPaneDivider;
- ()Ljavax/swing/plaf/basic/BasicSplitPaneDivider;
+ ()L1javax/swing/plaf/basic/BasicSplitPaneDivider;
 createDefaultNonContinuousLayoutDivider
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component;
 createFocusListener
  ()Ljava/awt/event/FocusListener;
- ()Ljava/awt/event/FocusListener;
+ ()L1java/awt/event/FocusListener;
 createKeyboardDownRightListener
  ()Ljava/awt/event/ActionListener;
- ()Ljava/awt/event/ActionListener;
+ ()L1java/awt/event/ActionListener;
 createKeyboardEndListener
  ()Ljava/awt/event/ActionListener;
- ()Ljava/awt/event/ActionListener;
+ ()L1java/awt/event/ActionListener;
 createKeyboardHomeListener
  ()Ljava/awt/event/ActionListener;
- ()Ljava/awt/event/ActionListener;
+ ()L1java/awt/event/ActionListener;
 createKeyboardResizeToggleListener
  ()Ljava/awt/event/ActionListener;
- ()Ljava/awt/event/ActionListener;
+ ()L1java/awt/event/ActionListener;
 createKeyboardUpLeftListener
  ()Ljava/awt/event/ActionListener;
- ()Ljava/awt/event/ActionListener;
+ ()L1java/awt/event/ActionListener;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 finishedPaintingChildren
  (Ljavax/swing/JSplitPane;Ljava/awt/Graphics;)V
  (Ljavax/swing/JSplitPane;Ljava/awt/Graphics;)V
@@ -101,7 +101,7 @@ getDividerLocation
  (Ljavax/swing/JSplitPane;)I
 getInsets
  (Ljavax/swing/JComponent;)Ljava/awt/Insets;
- (Ljavax/swing/JComponent;)Ljava/awt/Insets;
+ (Ljavax/swing/JComponent;)L0java/awt/Insets;
 getMaximumDividerLocation
  (Ljavax/swing/JSplitPane;)I
  (Ljavax/swing/JSplitPane;)I
@@ -119,7 +119,7 @@ getNonContinuousLayoutDivider
  ()Ljava/awt/Component;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getSplitPane
  ()Ljavax/swing/JSplitPane;
  ()Ljavax/swing/JSplitPane;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTabbedPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTabbedPaneUI.eea
index 1852d9c65a..46e9870fb8 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTabbedPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTabbedPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicTabbedPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 rotateInsets
  (Ljava/awt/Insets;Ljava/awt/Insets;I)V
  (Ljava/awt/Insets;Ljava/awt/Insets;I)V
@@ -76,22 +76,22 @@ calculateTabWidth
  (IILjava/awt/FontMetrics;)I
 createChangeListener
  ()Ljavax/swing/event/ChangeListener;
- ()Ljavax/swing/event/ChangeListener;
+ ()L1javax/swing/event/ChangeListener;
 createFocusListener
  ()Ljava/awt/event/FocusListener;
- ()Ljava/awt/event/FocusListener;
+ ()L1java/awt/event/FocusListener;
 createLayoutManager
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 createMouseListener
  ()Ljava/awt/event/MouseListener;
- ()Ljava/awt/event/MouseListener;
+ ()L1java/awt/event/MouseListener;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createScrollButton
  (I)Ljavax/swing/JButton;
- (I)Ljavax/swing/JButton;
+ (I)L1javax/swing/JButton;
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -109,10 +109,10 @@ getIconForTab
  (I)Ljavax/swing/Icon;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getSelectedTabPadInsets
  (I)Ljava/awt/Insets;
  (I)Ljava/awt/Insets;
@@ -133,7 +133,7 @@ getTabRunCount
  (Ljavax/swing/JTabbedPane;)I
 getTextViewForTab
  (I)Ljavax/swing/text/View;
- (I)Ljavax/swing/text/View;
+ (I)L0javax/swing/text/View;
 getVisibleComponent
  ()Ljava/awt/Component;
  ()Ljava/awt/Component;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTableHeaderUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTableHeaderUI.eea
index 37de27cf5b..05912a45f4 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTableHeaderUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTableHeaderUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicTableHeaderUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 header
  Ljavax/swing/table/JTableHeader;
@@ -16,7 +16,7 @@ rendererPane
 
 createMouseInputListener
  ()Ljavax/swing/event/MouseInputListener;
- ()Ljavax/swing/event/MouseInputListener;
+ ()L1javax/swing/event/MouseInputListener;
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -28,7 +28,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTableUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTableUI.eea
index 45527ccb57..b86b7952df 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTableUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTableUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicTableUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 focusListener
  Ljava/awt/event/FocusListener;
@@ -22,13 +22,13 @@ table
 
 createFocusListener
  ()Ljava/awt/event/FocusListener;
- ()Ljava/awt/event/FocusListener;
+ ()L1java/awt/event/FocusListener;
 createKeyListener
  ()Ljava/awt/event/KeyListener;
- ()Ljava/awt/event/KeyListener;
+ ()L0java/awt/event/KeyListener;
 createMouseInputListener
  ()Ljavax/swing/event/MouseInputListener;
- ()Ljavax/swing/event/MouseInputListener;
+ ()L1javax/swing/event/MouseInputListener;
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -43,7 +43,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTextAreaUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTextAreaUI.eea
index 3a44e4bb5e..4bdc980a48 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTextAreaUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTextAreaUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicTextAreaUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 create
  (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
+ (Ljavax/swing/text/Element;)L0javax/swing/text/View; # @Inherited(javax.swing.plaf.basic.BasicTextUI)
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -15,13 +15,13 @@ getBaselineResizeBehavior
  (Ljavax/swing/JComponent;)Ljava/awt/Component$BaselineResizeBehavior;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicTextUI)
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicTextUI)
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 propertyChange
  (Ljava/beans/PropertyChangeEvent;)V
  (Ljava/beans/PropertyChangeEvent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTextFieldUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTextFieldUI.eea
index 7a58a1f961..14ec6a1d60 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTextFieldUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTextFieldUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicTextFieldUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 create
  (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
+ (Ljavax/swing/text/Element;)L1javax/swing/text/View; # @Overrides(javax.swing.plaf.basic.BasicTextUI)
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -15,4 +15,4 @@ getBaselineResizeBehavior
  (Ljavax/swing/JComponent;)Ljava/awt/Component$BaselineResizeBehavior;
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTextPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTextPaneUI.eea
index 35b2aede01..75b15b84d4 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTextPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTextPaneUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicTextPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicEditorPaneUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTextUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTextUI.eea
index 89fafe25cb..879823d8bc 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTextUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTextUI.eea
@@ -2,19 +2,19 @@ class javax/swing/plaf/basic/BasicTextUI
 
 create
  (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
+ (Ljavax/swing/text/Element;)L0javax/swing/text/View; # @Overrides(javax.swing.text.ViewFactory)
 create
  (Ljavax/swing/text/Element;II)Ljavax/swing/text/View;
- (Ljavax/swing/text/Element;II)Ljavax/swing/text/View;
+ (Ljavax/swing/text/Element;II)L0javax/swing/text/View;
 createCaret
  ()Ljavax/swing/text/Caret;
- ()Ljavax/swing/text/Caret;
+ ()L1javax/swing/text/Caret;
 createHighlighter
  ()Ljavax/swing/text/Highlighter;
- ()Ljavax/swing/text/Highlighter;
+ ()L1javax/swing/text/Highlighter;
 createKeymap
  ()Ljavax/swing/text/Keymap;
- ()Ljavax/swing/text/Keymap;
+ ()L1javax/swing/text/Keymap;
 damageRange
  (Ljavax/swing/text/JTextComponent;II)V
  (Ljavax/swing/text/JTextComponent;II)V
@@ -32,16 +32,16 @@ getKeymapName
  ()Ljava/lang/String;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getNextVisualPositionFrom
  (Ljavax/swing/text/JTextComponent;ILjavax/swing/text/Position$Bias;I[Ljavax/swing/text/Position$Bias;)I
  (Ljavax/swing/text/JTextComponent;ILjavax/swing/text/Position$Bias;I[Ljavax/swing/text/Position$Bias;)I
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getPropertyPrefix
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -50,10 +50,10 @@ getRootView
  (Ljavax/swing/text/JTextComponent;)Ljavax/swing/text/View;
 getToolTipText
  (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)Ljava/lang/String;
- (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)Ljava/lang/String;
+ (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)L0java/lang/String; # @Inherited(javax.swing.plaf.TextUI)
 getVisibleEditorRect
  ()Ljava/awt/Rectangle;
- ()Ljava/awt/Rectangle;
+ ()L0java/awt/Rectangle;
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicToggleButtonUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicToggleButtonUI.eea
index f473527bf4..aa6a557dba 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicToggleButtonUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicToggleButtonUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicToggleButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicButtonUI)
 paint
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicToolBarSeparatorUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicToolBarSeparatorUI.eea
index a059db702a..aea46f22cb 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicToolBarSeparatorUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicToolBarSeparatorUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/basic/BasicToolBarSeparatorUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicSeparatorUI)
 installDefaults
  (Ljavax/swing/JSeparator;)V
  (Ljavax/swing/JSeparator;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicToolBarUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicToolBarUI.eea
index eb7c2e55d4..43c55a6481 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicToolBarUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicToolBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicToolBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 constraintBeforeFloating
  Ljava/lang/String;
@@ -55,34 +55,34 @@ canDock
  (Ljava/awt/Component;Ljava/awt/Point;)Z
 createDockingListener
  ()Ljavax/swing/event/MouseInputListener;
- ()Ljavax/swing/event/MouseInputListener;
+ ()L1javax/swing/event/MouseInputListener;
 createDragWindow
  (Ljavax/swing/JToolBar;)Ljavax/swing/plaf/basic/BasicToolBarUI$DragWindow;
- (Ljavax/swing/JToolBar;)Ljavax/swing/plaf/basic/BasicToolBarUI$DragWindow;
+ (Ljavax/swing/JToolBar;)L1javax/swing/plaf/basic/BasicToolBarUI$DragWindow;
 createFloatingFrame
  (Ljavax/swing/JToolBar;)Ljavax/swing/JFrame;
- (Ljavax/swing/JToolBar;)Ljavax/swing/JFrame;
+ (Ljavax/swing/JToolBar;)L1javax/swing/JFrame;
 createFloatingWindow
  (Ljavax/swing/JToolBar;)Ljavax/swing/RootPaneContainer;
- (Ljavax/swing/JToolBar;)Ljavax/swing/RootPaneContainer;
+ (Ljavax/swing/JToolBar;)L1javax/swing/RootPaneContainer;
 createFrameListener
  ()Ljava/awt/event/WindowListener;
- ()Ljava/awt/event/WindowListener;
+ ()L1java/awt/event/WindowListener;
 createNonRolloverBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createPropertyListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createRolloverBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border;
 createToolBarContListener
  ()Ljava/awt/event/ContainerListener;
- ()Ljava/awt/event/ContainerListener;
+ ()L1java/awt/event/ContainerListener;
 createToolBarFocusListener
  ()Ljava/awt/event/FocusListener;
- ()Ljava/awt/event/FocusListener;
+ ()L1java/awt/event/FocusListener;
 dragTo
  (Ljava/awt/Point;Ljava/awt/Point;)V
  (Ljava/awt/Point;Ljava/awt/Point;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicToolTipUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicToolTipUI.eea
index 096fc33316..cf5eab2cf0 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicToolTipUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicToolTipUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicToolTipUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
@@ -12,7 +12,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installDefaults
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.eea
index 26ac4d5e03..e0ad91758e 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.eea
@@ -18,4 +18,4 @@ componentMoved
  (L1java/awt/event/ComponentEvent;)V # @Inherited(java.awt.event.ComponentAdapter)
 getScrollPane
  ()Ljavax/swing/JScrollPane;
- ()Ljavax/swing/JScrollPane;
+ ()L0javax/swing/JScrollPane;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.eea
index cefe0eb340..9158381754 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.eea
@@ -5,4 +5,4 @@ class javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler
  (Ljavax/swing/plaf/basic/BasicTreeUI;)V
 getNodeDimensions
  (Ljava/lang/Object;IIZLjava/awt/Rectangle;)Ljava/awt/Rectangle;
- (Ljava/lang/Object;IIZLjava/awt/Rectangle;)Ljava/awt/Rectangle;
+ (Ljava/lang/Object;IIZLjava/awt/Rectangle;)L0java/awt/Rectangle;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTreeUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTreeUI.eea
index 2cf437ab21..a845f99e54 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTreeUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicTreeUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicTreeUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 cellEditor
  Ljavax/swing/tree/TreeCellEditor;
@@ -58,49 +58,49 @@ checkForClickInExpandControl
  (Ljavax/swing/tree/TreePath;II)V
 createCellEditorListener
  ()Ljavax/swing/event/CellEditorListener;
- ()Ljavax/swing/event/CellEditorListener;
+ ()L1javax/swing/event/CellEditorListener;
 createCellRendererPane
  ()Ljavax/swing/CellRendererPane;
- ()Ljavax/swing/CellRendererPane;
+ ()L1javax/swing/CellRendererPane;
 createComponentListener
  ()Ljava/awt/event/ComponentListener;
- ()Ljava/awt/event/ComponentListener;
+ ()L1java/awt/event/ComponentListener;
 createDefaultCellEditor
  ()Ljavax/swing/tree/TreeCellEditor;
- ()Ljavax/swing/tree/TreeCellEditor;
+ ()L1javax/swing/tree/TreeCellEditor;
 createDefaultCellRenderer
  ()Ljavax/swing/tree/TreeCellRenderer;
- ()Ljavax/swing/tree/TreeCellRenderer;
+ ()L1javax/swing/tree/TreeCellRenderer;
 createFocusListener
  ()Ljava/awt/event/FocusListener;
- ()Ljava/awt/event/FocusListener;
+ ()L1java/awt/event/FocusListener;
 createKeyListener
  ()Ljava/awt/event/KeyListener;
- ()Ljava/awt/event/KeyListener;
+ ()L1java/awt/event/KeyListener;
 createLayoutCache
  ()Ljavax/swing/tree/AbstractLayoutCache;
- ()Ljavax/swing/tree/AbstractLayoutCache;
+ ()L1javax/swing/tree/AbstractLayoutCache;
 createMouseListener
  ()Ljava/awt/event/MouseListener;
- ()Ljava/awt/event/MouseListener;
+ ()L1java/awt/event/MouseListener;
 createNodeDimensions
  ()Ljavax/swing/tree/AbstractLayoutCache$NodeDimensions;
- ()Ljavax/swing/tree/AbstractLayoutCache$NodeDimensions;
+ ()L1javax/swing/tree/AbstractLayoutCache$NodeDimensions;
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createSelectionModelPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 createTreeExpansionListener
  ()Ljavax/swing/event/TreeExpansionListener;
- ()Ljavax/swing/event/TreeExpansionListener;
+ ()L1javax/swing/event/TreeExpansionListener;
 createTreeModelListener
  ()Ljavax/swing/event/TreeModelListener;
- ()Ljavax/swing/event/TreeModelListener;
+ ()L1javax/swing/event/TreeModelListener;
 createTreeSelectionListener
  ()Ljavax/swing/event/TreeSelectionListener;
- ()Ljavax/swing/event/TreeSelectionListener;
+ ()L1javax/swing/event/TreeSelectionListener;
 drawCentered
  (Ljava/awt/Component;Ljava/awt/Graphics;Ljavax/swing/Icon;II)V
  (Ljava/awt/Component;Ljava/awt/Graphics;Ljavax/swing/Icon;II)V
@@ -118,13 +118,13 @@ getBaselineResizeBehavior
  (Ljavax/swing/JComponent;)Ljava/awt/Component$BaselineResizeBehavior;
 getCellEditor
  ()Ljavax/swing/tree/TreeCellEditor;
- ()Ljavax/swing/tree/TreeCellEditor;
+ ()L0javax/swing/tree/TreeCellEditor;
 getCellRenderer
  ()Ljavax/swing/tree/TreeCellRenderer;
  ()Ljavax/swing/tree/TreeCellRenderer;
 getClosestPathForLocation
  (Ljavax/swing/JTree;II)Ljavax/swing/tree/TreePath;
- (Ljavax/swing/JTree;II)Ljavax/swing/tree/TreePath;
+ (Ljavax/swing/JTree;II)L0javax/swing/tree/TreePath;
 getCollapsedIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
@@ -142,7 +142,7 @@ getHashColor
  ()Ljava/awt/Color;
 getLastChildPath
  (Ljavax/swing/tree/TreePath;)Ljavax/swing/tree/TreePath;
- (Ljavax/swing/tree/TreePath;)Ljavax/swing/tree/TreePath;
+ (Ljavax/swing/tree/TreePath;)L0javax/swing/tree/TreePath;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
@@ -154,16 +154,16 @@ getModel
  ()Ljavax/swing/tree/TreeModel;
 getPathBounds
  (Ljavax/swing/JTree;Ljavax/swing/tree/TreePath;)Ljava/awt/Rectangle;
- (Ljavax/swing/JTree;Ljavax/swing/tree/TreePath;)Ljava/awt/Rectangle;
+ (Ljavax/swing/JTree;Ljavax/swing/tree/TreePath;)L0java/awt/Rectangle;
 getPathForRow
  (Ljavax/swing/JTree;I)Ljavax/swing/tree/TreePath;
- (Ljavax/swing/JTree;I)Ljavax/swing/tree/TreePath;
+ (Ljavax/swing/JTree;I)L0javax/swing/tree/TreePath;
 getPreferredMinSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L0java/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getPreferredSize
  (Ljavax/swing/JComponent;Z)Ljava/awt/Dimension;
  (Ljavax/swing/JComponent;Z)Ljava/awt/Dimension;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicViewportUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicViewportUI.eea
index 13aed978c2..f34f32f064 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicViewportUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/basic/BasicViewportUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/basic/BasicViewportUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 installDefaults
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/DefaultMetalTheme.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/DefaultMetalTheme.eea
index 8d887da924..7b1faac3f5 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/DefaultMetalTheme.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/DefaultMetalTheme.eea
@@ -8,7 +8,7 @@ getMenuTextFont
  ()Ljavax/swing/plaf/FontUIResource;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getPrimary1
  ()Ljavax/swing/plaf/ColorUIResource;
  ()Ljavax/swing/plaf/ColorUIResource;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalButtonUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalButtonUI.eea
index 7c8ac6fa05..8f4bece189 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalButtonUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalButtonUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 disabledTextColor
  Ljava/awt/Color;
@@ -16,7 +16,7 @@ selectColor
 
 createButtonListener
  (Ljavax/swing/AbstractButton;)Ljavax/swing/plaf/basic/BasicButtonListener;
- (Ljavax/swing/AbstractButton;)Ljavax/swing/plaf/basic/BasicButtonListener;
+ (Ljavax/swing/AbstractButton;)L1javax/swing/plaf/basic/BasicButtonListener; # @Inherited(javax.swing.plaf.basic.BasicButtonUI)
 getDisabledTextColor
  ()Ljava/awt/Color;
  ()Ljava/awt/Color;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalCheckBoxUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalCheckBoxUI.eea
index b324cd3e8b..2888a1d7aa 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalCheckBoxUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalCheckBoxUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/metal/MetalCheckBoxUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicRadioButtonUI)
 installDefaults
  (Ljavax/swing/AbstractButton;)V
  (Ljavax/swing/AbstractButton;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalComboBoxButton.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalComboBoxButton.eea
index e2dcd29b1c..a8b7d40d60 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalComboBoxButton.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalComboBoxButton.eea
@@ -27,7 +27,7 @@ getComboIcon
  ()Ljavax/swing/Icon;
 getMinimumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension;
 paintComponent
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalComboBoxUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalComboBoxUI.eea
index 751bcd2578..39551827b1 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalComboBoxUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalComboBoxUI.eea
@@ -2,23 +2,23 @@ class javax/swing/plaf/metal/MetalComboBoxUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createArrowButton
  ()Ljavax/swing/JButton;
- ()Ljavax/swing/JButton;
+ ()L1javax/swing/JButton; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 createEditor
  ()Ljavax/swing/ComboBoxEditor;
- ()Ljavax/swing/ComboBoxEditor;
+ ()L1javax/swing/ComboBoxEditor; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 createLayoutManager
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 createPopup
  ()Ljavax/swing/plaf/basic/ComboPopup;
- ()Ljavax/swing/plaf/basic/ComboPopup;
+ ()L1javax/swing/plaf/basic/ComboPopup; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 editablePropertyChanged
  (Ljava/beans/PropertyChangeEvent;)V
  (Ljava/beans/PropertyChangeEvent;)V
@@ -27,7 +27,7 @@ getBaseline
  (Ljavax/swing/JComponent;II)I
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 layoutComboBox
  (Ljava/awt/Container;Ljavax/swing/plaf/metal/MetalComboBoxUI$MetalComboBoxLayoutManager;)V
  (Ljava/awt/Container;Ljavax/swing/plaf/metal/MetalComboBoxUI$MetalComboBoxLayoutManager;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalDesktopIconUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalDesktopIconUI.eea
index 2646c213da..90e5044900 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalDesktopIconUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalDesktopIconUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/metal/MetalDesktopIconUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicDesktopIconUI)
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicDesktopIconUI)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.eea
index 65baf419f3..9afc97ed24 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.eea
@@ -16,7 +16,7 @@ filters
  (Ljavax/swing/plaf/metal/MetalFileChooserUI;)V
 getElementAt
  (I)Ljava/lang/Object;
- (I)Ljava/lang/Object;
+ (I)L0java/lang/Object;
 getSelectedItem
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalFileChooserUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalFileChooserUI.eea
index 987871bbad..2a5f7831d9 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalFileChooserUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalFileChooserUI.eea
@@ -2,35 +2,35 @@ class javax/swing/plaf/metal/MetalFileChooserUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 <init>
  (Ljavax/swing/JFileChooser;)V
  (Ljavax/swing/JFileChooser;)V
 createActionMap
  ()Ljavax/swing/ActionMap;
- ()Ljavax/swing/ActionMap;
+ ()L1javax/swing/ActionMap;
 createDetailsView
  (Ljavax/swing/JFileChooser;)Ljavax/swing/JPanel;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/JPanel;
+ (Ljavax/swing/JFileChooser;)L1javax/swing/JPanel;
 createDirectoryComboBoxModel
  (Ljavax/swing/JFileChooser;)Ljavax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxModel;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxModel;
+ (Ljavax/swing/JFileChooser;)L1javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxModel;
 createFilterComboBoxModel
  ()Ljavax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel;
- ()Ljavax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel;
+ ()L1javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel;
 createFilterComboBoxRenderer
  ()Ljavax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxRenderer;
- ()Ljavax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxRenderer;
+ ()L1javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxRenderer;
 createList
  (Ljavax/swing/JFileChooser;)Ljavax/swing/JPanel;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/JPanel;
+ (Ljavax/swing/JFileChooser;)L1javax/swing/JPanel;
 createListSelectionListener
  (Ljavax/swing/JFileChooser;)Ljavax/swing/event/ListSelectionListener;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/event/ListSelectionListener;
+ (Ljavax/swing/JFileChooser;)L1javax/swing/event/ListSelectionListener; # @Inherited(javax.swing.plaf.basic.BasicFileChooserUI)
 createPropertyChangeListener
  (Ljavax/swing/JFileChooser;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JFileChooser;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JFileChooser;)L1java/beans/PropertyChangeListener; # @Overrides(javax.swing.plaf.basic.BasicFileChooserUI)
 ensureFileIsVisible
  (Ljavax/swing/JFileChooser;Ljava/io/File;)V
  (Ljavax/swing/JFileChooser;Ljava/io/File;)V
@@ -39,7 +39,7 @@ getActionMap
  ()Ljavax/swing/ActionMap;
 getApproveButton
  (Ljavax/swing/JFileChooser;)Ljavax/swing/JButton;
- (Ljavax/swing/JFileChooser;)Ljavax/swing/JButton;
+ (Ljavax/swing/JFileChooser;)L0javax/swing/JButton; # @Inherited(javax.swing.plaf.basic.BasicFileChooserUI)
 getBottomPanel
  ()Ljavax/swing/JPanel;
  ()Ljavax/swing/JPanel;
@@ -48,19 +48,19 @@ getButtonPanel
  ()Ljavax/swing/JPanel;
 getDirectoryName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicFileChooserUI)
 getFileName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicFileChooserUI)
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installComponents
  (Ljavax/swing/JFileChooser;)V
  (Ljavax/swing/JFileChooser;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalIconFactory.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalIconFactory.eea
index 97f52da3ea..12d847f9d6 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalIconFactory.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalIconFactory.eea
@@ -26,19 +26,19 @@ getHorizontalSliderThumbIcon
  ()Ljavax/swing/Icon;
 getInternalFrameAltMaximizeIcon
  (I)Ljavax/swing/Icon;
- (I)Ljavax/swing/Icon;
+ (I)L1javax/swing/Icon;
 getInternalFrameCloseIcon
  (I)Ljavax/swing/Icon;
- (I)Ljavax/swing/Icon;
+ (I)L1javax/swing/Icon;
 getInternalFrameDefaultMenuIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
 getInternalFrameMaximizeIcon
  (I)Ljavax/swing/Icon;
- (I)Ljavax/swing/Icon;
+ (I)L1javax/swing/Icon;
 getInternalFrameMinimizeIcon
  (I)Ljavax/swing/Icon;
- (I)Ljavax/swing/Icon;
+ (I)L1javax/swing/Icon;
 getMenuArrowIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
@@ -47,7 +47,7 @@ getMenuItemArrowIcon
  ()Ljavax/swing/Icon;
 getMenuItemCheckIcon
  ()Ljavax/swing/Icon;
- ()Ljavax/swing/Icon;
+ ()L0javax/swing/Icon;
 getRadioButtonIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
@@ -59,19 +59,19 @@ getTreeComputerIcon
  ()Ljavax/swing/Icon;
 getTreeControlIcon
  (Z)Ljavax/swing/Icon;
- (Z)Ljavax/swing/Icon;
+ (Z)L1javax/swing/Icon;
 getTreeFloppyDriveIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
 getTreeFolderIcon
  ()Ljavax/swing/Icon;
- ()Ljavax/swing/Icon;
+ ()L1javax/swing/Icon;
 getTreeHardDriveIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
 getTreeLeafIcon
  ()Ljavax/swing/Icon;
- ()Ljavax/swing/Icon;
+ ()L1javax/swing/Icon;
 getVerticalSliderThumbIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalInternalFrameTitlePane.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalInternalFrameTitlePane.eea
index 9c49a7ab43..6168ec50e6 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalInternalFrameTitlePane.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalInternalFrameTitlePane.eea
@@ -12,10 +12,10 @@ addSystemMenuItems
  (Ljavax/swing/JMenu;)V
 createLayout
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager; # @Inherited(javax.swing.plaf.basic.BasicInternalFrameTitlePane)
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener; # @Inherited(javax.swing.plaf.basic.BasicInternalFrameTitlePane)
 paintComponent
  (Ljava/awt/Graphics;)V
  (Ljava/awt/Graphics;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalInternalFrameUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalInternalFrameUI.eea
index fd85399a99..71d6d9970b 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalInternalFrameUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalInternalFrameUI.eea
@@ -6,17 +6,17 @@ IS_PALETTE
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 <init>
  (Ljavax/swing/JInternalFrame;)V
  (Ljavax/swing/JInternalFrame;)V
 createBorderListener
  (Ljavax/swing/JInternalFrame;)Ljavax/swing/event/MouseInputAdapter;
- (Ljavax/swing/JInternalFrame;)Ljavax/swing/event/MouseInputAdapter;
+ (Ljavax/swing/JInternalFrame;)L1javax/swing/event/MouseInputAdapter; # @Inherited(javax.swing.plaf.basic.BasicInternalFrameUI)
 createNorthPane
  (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
- (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
+ (Ljavax/swing/JInternalFrame;)L1javax/swing/JComponent; # @Inherited(javax.swing.plaf.basic.BasicInternalFrameUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalLabelUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalLabelUI.eea
index 9db9a15dd3..edd54f07dd 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalLabelUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalLabelUI.eea
@@ -6,7 +6,7 @@ metalLabelUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 paintDisabledText
  (Ljavax/swing/JLabel;Ljava/awt/Graphics;Ljava/lang/String;II)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalLookAndFeel.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalLookAndFeel.eea
index 63042babfc..078de14fdf 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalLookAndFeel.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalLookAndFeel.eea
@@ -35,7 +35,7 @@ getControlTextFont
  ()Ljavax/swing/plaf/FontUIResource;
 getCurrentTheme
  ()Ljavax/swing/plaf/metal/MetalTheme;
- ()Ljavax/swing/plaf/metal/MetalTheme;
+ ()L1javax/swing/plaf/metal/MetalTheme;
 getDesktopColor
  ()Ljavax/swing/plaf/ColorUIResource;
  ()Ljavax/swing/plaf/ColorUIResource;
@@ -135,25 +135,25 @@ setCurrentTheme
 
 getDefaults
  ()Ljavax/swing/UIDefaults;
- ()Ljavax/swing/UIDefaults;
+ ()L0javax/swing/UIDefaults; # @Inherited(javax.swing.plaf.basic.BasicLookAndFeel)
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getDisabledIcon
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
- (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
+ (Ljavax/swing/JComponent;Ljavax/swing/Icon;)L0javax/swing/Icon; # @Inherited(javax.swing.LookAndFeel)
 getDisabledSelectedIcon
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
 getID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getLayoutStyle
  ()Ljavax/swing/LayoutStyle;
  ()Ljavax/swing/LayoutStyle;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 initClassDefaults
  (Ljavax/swing/UIDefaults;)V
  (Ljavax/swing/UIDefaults;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalMenuBarUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalMenuBarUI.eea
index 6662f30197..e430ec3daf 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalMenuBarUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalMenuBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalMenuBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 installUI
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.eea
index 48ddd1cf73..0549ca0411 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/metal/MetalPopupMenuSeparatorUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.metal.MetalSeparatorUI)
 paint
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalProgressBarUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalProgressBarUI.eea
index 07cd53085f..2ce6cc3464 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalProgressBarUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalProgressBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalProgressBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 paintDeterminate
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalRadioButtonUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalRadioButtonUI.eea
index 8ae61adab9..b20a88505d 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalRadioButtonUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalRadioButtonUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalRadioButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 disabledTextColor
  Ljava/awt/Color;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalRootPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalRootPaneUI.eea
index c5cceaf996..2d4b1b58a9 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalRootPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalRootPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalRootPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 installUI
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalScrollBarUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalScrollBarUI.eea
index 217a8c66a0..920f41cd51 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalScrollBarUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalScrollBarUI.eea
@@ -6,7 +6,7 @@ FREE_STANDING_PROP
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 decreaseButton
  Ljavax/swing/plaf/metal/MetalScrollButton;
@@ -17,19 +17,19 @@ increaseButton
 
 createDecreaseButton
  (I)Ljavax/swing/JButton;
- (I)Ljavax/swing/JButton;
+ (I)L1javax/swing/JButton; # @Inherited(javax.swing.plaf.basic.BasicScrollBarUI)
 createIncreaseButton
  (I)Ljavax/swing/JButton;
- (I)Ljavax/swing/JButton;
+ (I)L1javax/swing/JButton; # @Inherited(javax.swing.plaf.basic.BasicScrollBarUI)
 createPropertyChangeListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener; # @Inherited(javax.swing.plaf.basic.BasicScrollBarUI)
 getMinimumThumbSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicScrollBarUI)
 paintThumb
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;Ljava/awt/Rectangle;)V
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;Ljava/awt/Rectangle;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalScrollButton.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalScrollButton.eea
index fc6d212975..51cc224969 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalScrollButton.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalScrollButton.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalScrollButton
 
 getMaximumSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicArrowButton)
 getMinimumSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalScrollPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalScrollPaneUI.eea
index 36379a64be..29647c61b7 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalScrollPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalScrollPaneUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/metal/MetalScrollPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createScrollBarSwapListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L1java/beans/PropertyChangeListener;
 installListeners
  (Ljavax/swing/JScrollPane;)V
  (Ljavax/swing/JScrollPane;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalSeparatorUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalSeparatorUI.eea
index e0a86cc148..66a9bb6b31 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalSeparatorUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalSeparatorUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/metal/MetalSeparatorUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicSeparatorUI)
 installDefaults
  (Ljavax/swing/JSeparator;)V
  (Ljavax/swing/JSeparator;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalSliderUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalSliderUI.eea
index bb7464ad18..821a4421b7 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalSliderUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalSliderUI.eea
@@ -18,7 +18,7 @@ vertThumbIcon
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 SLIDER_FILL
  Ljava/lang/String;
@@ -26,10 +26,10 @@ SLIDER_FILL
 
 createPropertyChangeListener
  (Ljavax/swing/JSlider;)Ljava/beans/PropertyChangeListener;
- (Ljavax/swing/JSlider;)Ljava/beans/PropertyChangeListener;
+ (Ljavax/swing/JSlider;)L1java/beans/PropertyChangeListener; # @Inherited(javax.swing.plaf.basic.BasicSliderUI)
 getThumbSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicSliderUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalSplitPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalSplitPaneUI.eea
index 4f3b06b28a..7b62877d09 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalSplitPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalSplitPaneUI.eea
@@ -2,8 +2,8 @@ class javax/swing/plaf/metal/MetalSplitPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createDefaultDivider
  ()Ljavax/swing/plaf/basic/BasicSplitPaneDivider;
- ()Ljavax/swing/plaf/basic/BasicSplitPaneDivider;
+ ()L1javax/swing/plaf/basic/BasicSplitPaneDivider; # @Inherited(javax.swing.plaf.basic.BasicSplitPaneUI)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalTabbedPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalTabbedPaneUI.eea
index aa4a11899d..021cb05aab 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalTabbedPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalTabbedPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalTabbedPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 selectColor
  Ljava/awt/Color;
@@ -16,7 +16,7 @@ tabAreaBackground
 
 createLayoutManager
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager; # @Inherited(javax.swing.plaf.basic.BasicTabbedPaneUI)
 getColorForGap
  (III)Ljava/awt/Color;
  (III)Ljava/awt/Color;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalTextFieldUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalTextFieldUI.eea
index c6667e587c..d820bf7970 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalTextFieldUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalTextFieldUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalTextFieldUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 propertyChange
  (Ljava/beans/PropertyChangeEvent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalToggleButtonUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalToggleButtonUI.eea
index 0fc321c9f8..f05d29c1a1 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalToggleButtonUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalToggleButtonUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalToggleButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 disabledTextColor
  Ljava/awt/Color;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalToolBarUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalToolBarUI.eea
index 50e6469634..6a1771247a 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalToolBarUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalToolBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalToolBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 contListener
  Ljava/awt/event/ContainerListener;
@@ -13,19 +13,19 @@ rolloverListener
 
 createContainerListener
  ()Ljava/awt/event/ContainerListener;
- ()Ljava/awt/event/ContainerListener;
+ ()L0java/awt/event/ContainerListener;
 createDockingListener
  ()Ljavax/swing/event/MouseInputListener;
- ()Ljavax/swing/event/MouseInputListener;
+ ()L1javax/swing/event/MouseInputListener; # @Inherited(javax.swing.plaf.basic.BasicToolBarUI)
 createNonRolloverBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border; # @Inherited(javax.swing.plaf.basic.BasicToolBarUI)
 createRolloverBorder
  ()Ljavax/swing/border/Border;
- ()Ljavax/swing/border/Border;
+ ()L1javax/swing/border/Border; # @Inherited(javax.swing.plaf.basic.BasicToolBarUI)
 createRolloverListener
  ()Ljava/beans/PropertyChangeListener;
- ()Ljava/beans/PropertyChangeListener;
+ ()L0java/beans/PropertyChangeListener;
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalToolTipUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalToolTipUI.eea
index 4bfbe5f7d1..1519f9002e 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalToolTipUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalToolTipUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/metal/MetalToolTipUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getAcceleratorString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicToolTipUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalTreeUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalTreeUI.eea
index 3abf6f5630..67fce33b1d 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalTreeUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/MetalTreeUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/metal/MetalTreeUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 decodeLineStyle
  (Ljava/lang/Object;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/OceanTheme.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/OceanTheme.eea
index b6461d7fc8..5e35c71969 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/OceanTheme.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/metal/OceanTheme.eea
@@ -20,7 +20,7 @@ getMenuDisabledForeground
  ()Ljavax/swing/plaf/ColorUIResource;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.metal.DefaultMetalTheme)
 getPrimary1
  ()Ljavax/swing/plaf/ColorUIResource;
  ()Ljavax/swing/plaf/ColorUIResource;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiButtonUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiButtonUI.eea
index 8d23cd5b47..4035fc2605 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiButtonUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiButtonUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiColorChooserUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiColorChooserUI.eea
index 12eb56922c..0c91cc49d7 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiColorChooserUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiColorChooserUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiColorChooserUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiComboBoxUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiComboBoxUI.eea
index 9b912cb014..69ed6c3809 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiComboBoxUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiComboBoxUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiComboBoxUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiDesktopIconUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiDesktopIconUI.eea
index eae8c6978f..53cf07f51d 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiDesktopIconUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiDesktopIconUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiDesktopIconUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiDesktopPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiDesktopPaneUI.eea
index cfe93faa41..ab2df60304 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiDesktopPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiDesktopPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiDesktopPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiFileChooserUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiFileChooserUI.eea
index 3b7996dbc3..75dc321e9f 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiFileChooserUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiFileChooserUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiFileChooserUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -40,7 +40,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiInternalFrameUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiInternalFrameUI.eea
index d01883b96c..f179b0e0ce 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiInternalFrameUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiInternalFrameUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiInternalFrameUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiLabelUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiLabelUI.eea
index 3cf7cc4f13..ad4c53c249 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiLabelUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiLabelUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiLabelUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiListUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiListUI.eea
index c68e328dc5..d1a04074d2 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiListUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiListUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiListUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -28,7 +28,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiLookAndFeel.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiLookAndFeel.eea
index a860046de6..0e6a5364ab 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiLookAndFeel.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiLookAndFeel.eea
@@ -2,20 +2,20 @@ class javax/swing/plaf/multi/MultiLookAndFeel
 
 createUIs
  (Ljavax/swing/plaf/ComponentUI;Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/plaf/ComponentUI;Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/plaf/ComponentUI;Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;Ljavax/swing/JComponent;)L0javax/swing/plaf/ComponentUI;
 uisToArray
  (Ljava/util/Vector<+Ljavax/swing/plaf/ComponentUI;>;)[Ljavax/swing/plaf/ComponentUI;
- (Ljava/util/Vector<+Ljavax/swing/plaf/ComponentUI;>;)[Ljavax/swing/plaf/ComponentUI;
+ (Ljava/util/Vector<+Ljavax/swing/plaf/ComponentUI;>;)[0Ljavax/swing/plaf/ComponentUI;
 
 getDefaults
  ()Ljavax/swing/UIDefaults;
- ()Ljavax/swing/UIDefaults;
+ ()L0javax/swing/UIDefaults; # @Inherited(javax.swing.LookAndFeel)
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiMenuBarUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiMenuBarUI.eea
index 8ed26fb170..8858dd6b6d 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiMenuBarUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiMenuBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiMenuBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiMenuItemUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiMenuItemUI.eea
index b878857acb..732ffa8c35 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiMenuItemUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiMenuItemUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiMenuItemUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiOptionPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiOptionPaneUI.eea
index 500f4c5223..5186eefbae 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiOptionPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiOptionPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiOptionPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -28,7 +28,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiPanelUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiPanelUI.eea
index f2922b3030..b1ad12dd78 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiPanelUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiPanelUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiPanelUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiPopupMenuUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiPopupMenuUI.eea
index 52fcd8ceb2..66171dd2af 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiPopupMenuUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiPopupMenuUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiPopupMenuUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -28,7 +28,7 @@ getPopup
  (Ljavax/swing/JPopupMenu;II)Ljavax/swing/Popup;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiProgressBarUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiProgressBarUI.eea
index 99784cbb72..18bbc6caa7 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiProgressBarUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiProgressBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiProgressBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiRootPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiRootPaneUI.eea
index 13853e43b8..c265966556 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiRootPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiRootPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiRootPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiScrollBarUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiScrollBarUI.eea
index 0b5a7aa180..a88e4e09e7 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiScrollBarUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiScrollBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiScrollBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiScrollPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiScrollPaneUI.eea
index e6857dbd9c..e23070ebe2 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiScrollPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiScrollPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiScrollPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiSeparatorUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiSeparatorUI.eea
index 50cd2c102a..ca2676d523 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiSeparatorUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiSeparatorUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiSeparatorUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiSliderUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiSliderUI.eea
index 65d9715206..6a4ccc3cc7 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiSliderUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiSliderUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiSliderUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiSpinnerUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiSpinnerUI.eea
index c512f9a1b8..1391dd9ae8 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiSpinnerUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiSpinnerUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiSpinnerUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiSplitPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiSplitPaneUI.eea
index d742467cc7..b15b72012c 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiSplitPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiSplitPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiSplitPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -37,7 +37,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiTabbedPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiTabbedPaneUI.eea
index e6d36244f8..e17b63906a 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiTabbedPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiTabbedPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiTabbedPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getTabBounds
  (Ljavax/swing/JTabbedPane;I)Ljava/awt/Rectangle;
  (Ljavax/swing/JTabbedPane;I)Ljava/awt/Rectangle;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiTableHeaderUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiTableHeaderUI.eea
index 00d73d248e..55ff7b1d6d 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiTableHeaderUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiTableHeaderUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiTableHeaderUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiTableUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiTableUI.eea
index aeaa395c29..475a20408f 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiTableUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiTableUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiTableUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiTextUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiTextUI.eea
index 9851880229..94d07f605c 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiTextUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiTextUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiTextUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -37,13 +37,13 @@ getNextVisualPositionFrom
  (Ljavax/swing/text/JTextComponent;ILjavax/swing/text/Position$Bias;I[Ljavax/swing/text/Position$Bias;)I
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getRootView
  (Ljavax/swing/text/JTextComponent;)Ljavax/swing/text/View;
  (Ljavax/swing/text/JTextComponent;)Ljavax/swing/text/View;
 getToolTipText
  (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)Ljava/lang/String;
- (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)Ljava/lang/String;
+ (Ljavax/swing/text/JTextComponent;Ljava/awt/Point;)L0java/lang/String; # @Inherited(javax.swing.plaf.TextUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiToolBarUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiToolBarUI.eea
index 4aca1c2465..3e8908adc1 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiToolBarUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiToolBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiToolBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiToolTipUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiToolTipUI.eea
index f80290027b..6cb9d80ea6 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiToolTipUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiToolTipUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiToolTipUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiTreeUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiTreeUI.eea
index 126eb5242a..658ebb1213 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiTreeUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiTreeUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiTreeUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -40,7 +40,7 @@ getPathForRow
  (Ljavax/swing/JTree;I)Ljavax/swing/tree/TreePath;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getRowCount
  (Ljavax/swing/JTree;)I
  (Ljavax/swing/JTree;)I
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiViewportUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiViewportUI.eea
index f805494697..41db22b4e6 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiViewportUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/multi/MultiViewportUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/multi/MultiViewportUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 uis
  Ljava/util/Vector<Ljavax/swing/plaf/ComponentUI;>;
@@ -25,7 +25,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 getUIs
  ()[Ljavax/swing/plaf/ComponentUI;
  ()[Ljavax/swing/plaf/ComponentUI;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/nimbus/AbstractRegionPainter.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/nimbus/AbstractRegionPainter.eea
index 5bf758a0ec..6796d20ea4 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/nimbus/AbstractRegionPainter.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/nimbus/AbstractRegionPainter.eea
@@ -9,16 +9,16 @@ configureGraphics
  (Ljava/awt/Graphics2D;)V
 decodeColor
  (Ljava/awt/Color;Ljava/awt/Color;F)Ljava/awt/Color;
- (Ljava/awt/Color;Ljava/awt/Color;F)Ljava/awt/Color;
+ (Ljava/awt/Color;Ljava/awt/Color;F)L1java/awt/Color;
 decodeColor
  (Ljava/lang/String;FFFI)Ljava/awt/Color;
  (Ljava/lang/String;FFFI)Ljava/awt/Color;
 decodeGradient
  (FFFF[F[Ljava/awt/Color;)Ljava/awt/LinearGradientPaint;
- (FFFF[F[Ljava/awt/Color;)Ljava/awt/LinearGradientPaint;
+ (FFFF[F[Ljava/awt/Color;)L1java/awt/LinearGradientPaint;
 decodeRadialGradient
  (FFF[F[Ljava/awt/Color;)Ljava/awt/RadialGradientPaint;
- (FFF[F[Ljava/awt/Color;)Ljava/awt/RadialGradientPaint;
+ (FFF[F[Ljava/awt/Color;)L1java/awt/RadialGradientPaint;
 doPaint
  (Ljava/awt/Graphics2D;Ljavax/swing/JComponent;II[Ljava/lang/Object;)V
  (Ljava/awt/Graphics2D;Ljavax/swing/JComponent;II[Ljava/lang/Object;)V
@@ -27,7 +27,7 @@ getComponentColor
  (Ljavax/swing/JComponent;Ljava/lang/String;Ljava/awt/Color;FFI)Ljava/awt/Color;
 getExtendedCacheKeys
  (Ljavax/swing/JComponent;)[Ljava/lang/Object;
- (Ljavax/swing/JComponent;)[Ljava/lang/Object;
+ (Ljavax/swing/JComponent;)[0Ljava/lang/Object;
 getPaintContext
  ()Ljavax/swing/plaf/nimbus/AbstractRegionPainter$PaintContext;
  ()Ljavax/swing/plaf/nimbus/AbstractRegionPainter$PaintContext;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/nimbus/Effect$ArrayCache.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/nimbus/Effect$ArrayCache.eea
index ae37bb0a11..a9d4d0b1b7 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/nimbus/Effect$ArrayCache.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/nimbus/Effect$ArrayCache.eea
@@ -2,13 +2,13 @@ class javax/swing/plaf/nimbus/Effect$ArrayCache
 
 getTmpByteArray1
  (I)[B
- (I)[B
+ (I)[1B
 getTmpByteArray2
  (I)[B
- (I)[B
+ (I)[1B
 getTmpByteArray3
  (I)[B
- (I)[B
+ (I)[1B
 getTmpIntArray
  (I)[I
- (I)[I
+ (I)[1I
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/nimbus/NimbusLookAndFeel.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/nimbus/NimbusLookAndFeel.eea
index 73477b1301..62a9362e6b 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/nimbus/NimbusLookAndFeel.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/nimbus/NimbusLookAndFeel.eea
@@ -6,28 +6,28 @@ getStyle
 
 getDefaults
  ()Ljavax/swing/UIDefaults;
- ()Ljavax/swing/UIDefaults;
+ ()L0javax/swing/UIDefaults; # @Inherited(javax.swing.plaf.synth.SynthLookAndFeel)
 getDerivedColor
  (Ljava/awt/Color;Ljava/awt/Color;F)Ljava/awt/Color;
  (Ljava/awt/Color;Ljava/awt/Color;F)Ljava/awt/Color;
 getDerivedColor
  (Ljava/awt/Color;Ljava/awt/Color;FZ)Ljava/awt/Color;
- (Ljava/awt/Color;Ljava/awt/Color;FZ)Ljava/awt/Color;
+ (Ljava/awt/Color;Ljava/awt/Color;FZ)L1java/awt/Color;
 getDerivedColor
  (Ljava/lang/String;FFFIZ)Ljava/awt/Color;
  (Ljava/lang/String;FFFIZ)Ljava/awt/Color;
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.synth.SynthLookAndFeel)
 getDisabledIcon
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
- (Ljavax/swing/JComponent;Ljavax/swing/Icon;)Ljavax/swing/Icon;
+ (Ljavax/swing/JComponent;Ljavax/swing/Icon;)L0javax/swing/Icon; # @Inherited(javax.swing.LookAndFeel)
 getID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.synth.SynthLookAndFeel)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.synth.SynthLookAndFeel)
 register
  (Ljavax/swing/plaf/synth/Region;Ljava/lang/String;)V
  (Ljavax/swing/plaf/synth/Region;Ljava/lang/String;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/nimbus/NimbusStyle.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/nimbus/NimbusStyle.eea
index 35a02e7e92..95b97430bd 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/nimbus/NimbusStyle.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/nimbus/NimbusStyle.eea
@@ -33,7 +33,7 @@ getInsets
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Insets;)Ljava/awt/Insets;
 getPainter
  (Ljavax/swing/plaf/synth/SynthContext;)Ljavax/swing/plaf/synth/SynthPainter;
- (Ljavax/swing/plaf/synth/SynthContext;)Ljavax/swing/plaf/synth/SynthPainter;
+ (Ljavax/swing/plaf/synth/SynthContext;)L0javax/swing/plaf/synth/SynthPainter; # @Inherited(javax.swing.plaf.synth.SynthStyle)
 installDefaults
  (Ljavax/swing/plaf/synth/SynthContext;)V
  (Ljavax/swing/plaf/synth/SynthContext;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthButtonUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthButtonUI.eea
index 0f7e619408..79a6ca2246 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthButtonUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthButtonUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getBaseline
  (Ljavax/swing/JComponent;II)I
@@ -18,13 +18,13 @@ getIcon
  (Ljavax/swing/AbstractButton;)Ljavax/swing/Icon;
 getMaximumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicButtonUI)
 getSizingIcon
  (Ljavax/swing/AbstractButton;)Ljavax/swing/Icon;
  (Ljavax/swing/AbstractButton;)Ljavax/swing/Icon;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthCheckBoxMenuItemUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthCheckBoxMenuItemUI.eea
index 13863d5a52..5bf11a1ba8 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthCheckBoxMenuItemUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthCheckBoxMenuItemUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthCheckBoxMenuItemUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 paintBorder
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthCheckBoxUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthCheckBoxUI.eea
index 43256ee9da..25d4ab440e 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthCheckBoxUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthCheckBoxUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthCheckBoxUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.synth.SynthRadioButtonUI)
 paintBorder
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthColorChooserUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthColorChooserUI.eea
index 930107c0ea..4d7e504294 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthColorChooserUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthColorChooserUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthColorChooserUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createDefaultChoosers
  ()[Ljavax/swing/colorchooser/AbstractColorChooserPanel;
- ()[Ljavax/swing/colorchooser/AbstractColorChooserPanel;
+ ()[1Ljavax/swing/colorchooser/AbstractColorChooserPanel; # @Inherited(javax.swing.plaf.basic.BasicColorChooserUI)
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthComboBoxUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthComboBoxUI.eea
index d348b82ba4..301cb1a276 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthComboBoxUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthComboBoxUI.eea
@@ -2,20 +2,20 @@ class javax/swing/plaf/synth/SynthComboBoxUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createArrowButton
  ()Ljavax/swing/JButton;
- ()Ljavax/swing/JButton;
+ ()L1javax/swing/JButton; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 createEditor
  ()Ljavax/swing/ComboBoxEditor;
- ()Ljavax/swing/ComboBoxEditor;
+ ()L1javax/swing/ComboBoxEditor; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 createPopup
  ()Ljavax/swing/plaf/basic/ComboPopup;
- ()Ljavax/swing/plaf/basic/ComboPopup;
+ ()L1javax/swing/plaf/basic/ComboPopup; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 createRenderer
  ()Ljavax/swing/ListCellRenderer<Ljava/lang/Object;>;
- ()Ljavax/swing/ListCellRenderer<Ljava/lang/Object;>;
+ ()L1javax/swing/ListCellRenderer<Ljava/lang/Object;>; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
@@ -24,7 +24,7 @@ getDefaultSize
  ()Ljava/awt/Dimension;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicComboBoxUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthDesktopIconUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthDesktopIconUI.eea
index 3a8c9a94a8..7b74777892 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthDesktopIconUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthDesktopIconUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthDesktopIconUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthDesktopPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthDesktopPaneUI.eea
index f0bb2115c2..4088f732b3 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthDesktopPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthDesktopPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthDesktopPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthEditorPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthEditorPaneUI.eea
index 52d9cb8998..5a2829e0bd 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthEditorPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthEditorPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthEditorPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthFormattedTextFieldUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthFormattedTextFieldUI.eea
index d6cac5c726..8fa27c7c41 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthFormattedTextFieldUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthFormattedTextFieldUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthFormattedTextFieldUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicTextFieldUI)
 paintBorder
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthInternalFrameUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthInternalFrameUI.eea
index 1318315f94..af797619a0 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthInternalFrameUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthInternalFrameUI.eea
@@ -2,17 +2,17 @@ class javax/swing/plaf/synth/SynthInternalFrameUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 <init>
  (Ljavax/swing/JInternalFrame;)V
  (Ljavax/swing/JInternalFrame;)V
 createComponentListener
  ()Ljava/awt/event/ComponentListener;
- ()Ljava/awt/event/ComponentListener;
+ ()L1java/awt/event/ComponentListener; # @Inherited(javax.swing.plaf.basic.BasicInternalFrameUI)
 createNorthPane
  (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
- (Ljavax/swing/JInternalFrame;)Ljavax/swing/JComponent;
+ (Ljavax/swing/JInternalFrame;)L1javax/swing/JComponent; # @Inherited(javax.swing.plaf.basic.BasicInternalFrameUI)
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthLabelUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthLabelUI.eea
index 14fc3e07b9..6066056159 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthLabelUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthLabelUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthLabelUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getBaseline
  (Ljavax/swing/JComponent;II)I
@@ -18,7 +18,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicLabelUI)
 installDefaults
  (Ljavax/swing/JLabel;)V
  (Ljavax/swing/JLabel;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthListUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthListUI.eea
index 80e6c8936c..40b6775af8 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthListUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthListUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthListUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthLookAndFeel.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthLookAndFeel.eea
index ccfc63d27a..69f5dee2f7 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthLookAndFeel.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthLookAndFeel.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthLookAndFeel
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L0javax/swing/plaf/ComponentUI;
 getRegion
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/Region;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/Region;
@@ -21,16 +21,16 @@ updateStyles
 
 getDefaults
  ()Ljavax/swing/UIDefaults;
- ()Ljavax/swing/UIDefaults;
+ ()L0javax/swing/UIDefaults; # @Inherited(javax.swing.plaf.basic.BasicLookAndFeel)
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 load
  (Ljava/io/InputStream;Ljava/lang/Class<*>;)V
  (Ljava/io/InputStream;Ljava/lang/Class<*>;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthMenuBarUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthMenuBarUI.eea
index ca810b05eb..611268698e 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthMenuBarUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthMenuBarUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthMenuBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthMenuItemUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthMenuItemUI.eea
index 3c6e57c8de..37eed0d473 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthMenuItemUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthMenuItemUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthMenuItemUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
 getPreferredMenuItemSize
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 paint
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthMenuUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthMenuUI.eea
index cfe1553f3e..d759b5595d 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthMenuUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthMenuUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthMenuUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
 getPreferredMenuItemSize
  (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;Ljavax/swing/Icon;Ljavax/swing/Icon;I)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 paint
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthOptionPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthOptionPaneUI.eea
index c595451a2f..b55486707d 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthOptionPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthOptionPaneUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthOptionPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createMessageArea
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L1java/awt/Container; # @Inherited(javax.swing.plaf.basic.BasicOptionPaneUI)
 createSeparator
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L1java/awt/Container; # @Overrides(javax.swing.plaf.basic.BasicOptionPaneUI)
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthPanelUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthPanelUI.eea
index 4f69c52c6e..e08b44736a 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthPanelUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthPanelUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthPanelUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthPasswordFieldUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthPasswordFieldUI.eea
index d6e03cf4d9..121895da30 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthPasswordFieldUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthPasswordFieldUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthPasswordFieldUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 create
  (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
+ (Ljavax/swing/text/Element;)L1javax/swing/text/View; # @Inherited(javax.swing.plaf.basic.BasicTextFieldUI)
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicTextFieldUI)
 paintBorder
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthPopupMenuUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthPopupMenuUI.eea
index 62496d1194..5f0e53dd82 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthPopupMenuUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthPopupMenuUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthPopupMenuUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthProgressBarUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthProgressBarUI.eea
index 0230b78c06..390c441a85 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthProgressBarUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthProgressBarUI.eea
@@ -2,20 +2,20 @@ class javax/swing/plaf/synth/SynthProgressBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
 getBox
  (Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
- (Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
+ (Ljava/awt/Rectangle;)L0java/awt/Rectangle; # @Inherited(javax.swing.plaf.basic.BasicProgressBarUI)
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicProgressBarUI)
 paint
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthRadioButtonMenuItemUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthRadioButtonMenuItemUI.eea
index c52d8f870c..e1e0f42c41 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthRadioButtonMenuItemUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthRadioButtonMenuItemUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthRadioButtonMenuItemUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicMenuItemUI)
 paintBorder
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthRadioButtonUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthRadioButtonUI.eea
index f9df39367d..5f90f782fd 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthRadioButtonUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthRadioButtonUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthRadioButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.synth.SynthToggleButtonUI)
 getSizingIcon
  (Ljavax/swing/AbstractButton;)Ljavax/swing/Icon;
  (Ljavax/swing/AbstractButton;)Ljavax/swing/Icon;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthRootPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthRootPaneUI.eea
index 62cceb050f..6d9b0a2429 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthRootPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthRootPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthRootPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthScrollBarUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthScrollBarUI.eea
index 5f087af27a..1e74a8f116 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthScrollBarUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthScrollBarUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthScrollBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createDecreaseButton
  (I)Ljavax/swing/JButton;
- (I)Ljavax/swing/JButton;
+ (I)L1javax/swing/JButton; # @Inherited(javax.swing.plaf.basic.BasicScrollBarUI)
 createIncreaseButton
  (I)Ljavax/swing/JButton;
- (I)Ljavax/swing/JButton;
+ (I)L1javax/swing/JButton; # @Inherited(javax.swing.plaf.basic.BasicScrollBarUI)
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
@@ -18,7 +18,7 @@ getMinimumThumbSize
  ()Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicScrollBarUI)
 paint
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
  (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthScrollPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthScrollPaneUI.eea
index 2a803fda26..27598c3111 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthScrollPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthScrollPaneUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthScrollPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthSeparatorUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthSeparatorUI.eea
index 619ac54379..9509575f33 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthSeparatorUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthSeparatorUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthSeparatorUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
@@ -15,7 +15,7 @@ getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.ComponentUI)
 installDefaults
  (Ljavax/swing/JSeparator;)V
  (Ljavax/swing/JSeparator;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthSliderUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthSliderUI.eea
index a080130d27..02e35c78c4 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthSliderUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthSliderUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthSliderUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 <init>
  (Ljavax/swing/JSlider;)V
  (Ljavax/swing/JSlider;)V
 createTrackListener
  (Ljavax/swing/JSlider;)Ljavax/swing/plaf/basic/BasicSliderUI$TrackListener;
- (Ljavax/swing/JSlider;)Ljavax/swing/plaf/basic/BasicSliderUI$TrackListener;
+ (Ljavax/swing/JSlider;)L1javax/swing/plaf/basic/BasicSliderUI$TrackListener; # @Inherited(javax.swing.plaf.basic.BasicSliderUI)
 getBaseline
  (Ljavax/swing/JComponent;II)I
  (Ljavax/swing/JComponent;II)I
@@ -18,13 +18,13 @@ getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
 getMinimumSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicSliderUI)
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicSliderUI)
 getThumbSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L1java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicSliderUI)
 installDefaults
  (Ljavax/swing/JSlider;)V
  (Ljavax/swing/JSlider;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthSpinnerUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthSpinnerUI.eea
index 5113517dc7..270d2398e9 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthSpinnerUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthSpinnerUI.eea
@@ -2,20 +2,20 @@ class javax/swing/plaf/synth/SynthSpinnerUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createEditor
  ()Ljavax/swing/JComponent;
- ()Ljavax/swing/JComponent;
+ ()L1javax/swing/JComponent; # @Inherited(javax.swing.plaf.basic.BasicSpinnerUI)
 createLayout
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager; # @Inherited(javax.swing.plaf.basic.BasicSpinnerUI)
 createNextButton
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component; # @Inherited(javax.swing.plaf.basic.BasicSpinnerUI)
 createPreviousButton
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component; # @Inherited(javax.swing.plaf.basic.BasicSpinnerUI)
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthSplitPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthSplitPaneUI.eea
index c34a0d292d..da18ccd164 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthSplitPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthSplitPaneUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthSplitPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createDefaultDivider
  ()Ljavax/swing/plaf/basic/BasicSplitPaneDivider;
- ()Ljavax/swing/plaf/basic/BasicSplitPaneDivider;
+ ()L1javax/swing/plaf/basic/BasicSplitPaneDivider; # @Inherited(javax.swing.plaf.basic.BasicSplitPaneUI)
 createDefaultNonContinuousLayoutDivider
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component; # @Inherited(javax.swing.plaf.basic.BasicSplitPaneUI)
 finishedPaintingChildren
  (Ljavax/swing/JSplitPane;Ljava/awt/Graphics;)V
  (Ljavax/swing/JSplitPane;Ljava/awt/Graphics;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthStyle.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthStyle.eea
index e5b5ff029b..70108f11bd 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthStyle.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthStyle.eea
@@ -23,7 +23,7 @@ getGraphicsUtils
  (Ljavax/swing/plaf/synth/SynthContext;)Ljavax/swing/plaf/synth/SynthGraphicsUtils;
 getIcon
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/lang/Object;)Ljavax/swing/Icon;
- (Ljavax/swing/plaf/synth/SynthContext;Ljava/lang/Object;)Ljavax/swing/Icon;
+ (Ljavax/swing/plaf/synth/SynthContext;Ljava/lang/Object;)L0javax/swing/Icon;
 getInsets
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Insets;)Ljava/awt/Insets;
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Insets;)Ljava/awt/Insets;
@@ -32,7 +32,7 @@ getInt
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/lang/Object;I)I
 getPainter
  (Ljavax/swing/plaf/synth/SynthContext;)Ljavax/swing/plaf/synth/SynthPainter;
- (Ljavax/swing/plaf/synth/SynthContext;)Ljavax/swing/plaf/synth/SynthPainter;
+ (Ljavax/swing/plaf/synth/SynthContext;)L0javax/swing/plaf/synth/SynthPainter;
 getString
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTabbedPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTabbedPaneUI.eea
index 5dc54ee22b..eabe6bd64f 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTabbedPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTabbedPaneUI.eea
@@ -2,20 +2,20 @@ class javax/swing/plaf/synth/SynthTabbedPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 calculateTabWidth
  (IILjava/awt/FontMetrics;)I
  (IILjava/awt/FontMetrics;)I
 createLayoutManager
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager; # @Inherited(javax.swing.plaf.basic.BasicTabbedPaneUI)
 createMouseListener
  ()Ljava/awt/event/MouseListener;
- ()Ljava/awt/event/MouseListener;
+ ()L1java/awt/event/MouseListener; # @Inherited(javax.swing.plaf.basic.BasicTabbedPaneUI)
 createScrollButton
  (I)Ljavax/swing/JButton;
- (I)Ljavax/swing/JButton;
+ (I)L1javax/swing/JButton; # @Inherited(javax.swing.plaf.basic.BasicTabbedPaneUI)
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTableHeaderUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTableHeaderUI.eea
index 6840d816c7..5e585d20dd 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTableHeaderUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTableHeaderUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthTableHeaderUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTableUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTableUI.eea
index ca494b36c2..1bb650ca25 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTableUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTableUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthTableUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTextAreaUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTextAreaUI.eea
index d8346d2f40..2460f80cae 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTextAreaUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTextAreaUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthTextAreaUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTextFieldUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTextFieldUI.eea
index 58d46559d2..0e2f00d0be 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTextFieldUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTextFieldUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthTextFieldUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTextPaneUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTextPaneUI.eea
index 8b7beca1fe..57799bc37d 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTextPaneUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTextPaneUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthTextPaneUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicEditorPaneUI)
 installUI
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthToggleButtonUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthToggleButtonUI.eea
index 99b78f0cba..0257d7026d 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthToggleButtonUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthToggleButtonUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthToggleButtonUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getPropertyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.plaf.basic.BasicButtonUI)
 paintBorder
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
  (Ljavax/swing/plaf/synth/SynthContext;Ljava/awt/Graphics;IIII)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthToolBarUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthToolBarUI.eea
index 6691c6c46e..06b6831bee 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthToolBarUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthToolBarUI.eea
@@ -2,11 +2,11 @@ class javax/swing/plaf/synth/SynthToolBarUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createLayout
  ()Ljava/awt/LayoutManager;
- ()Ljava/awt/LayoutManager;
+ ()L1java/awt/LayoutManager;
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthToolTipUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthToolTipUI.eea
index e7810ec558..d219541e31 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthToolTipUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthToolTipUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthToolTipUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
 getPreferredSize
  (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
- (Ljavax/swing/JComponent;)Ljava/awt/Dimension;
+ (Ljavax/swing/JComponent;)L0java/awt/Dimension; # @Inherited(javax.swing.plaf.basic.BasicToolTipUI)
 installDefaults
  (Ljavax/swing/JComponent;)V
  (Ljavax/swing/JComponent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTreeUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTreeUI.eea
index e87eb4d148..2e8ae95c94 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTreeUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthTreeUI.eea
@@ -2,14 +2,14 @@ class javax/swing/plaf/synth/SynthTreeUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 createDefaultCellEditor
  ()Ljavax/swing/tree/TreeCellEditor;
- ()Ljavax/swing/tree/TreeCellEditor;
+ ()L1javax/swing/tree/TreeCellEditor; # @Inherited(javax.swing.plaf.basic.BasicTreeUI)
 createDefaultCellRenderer
  ()Ljavax/swing/tree/TreeCellRenderer;
- ()Ljavax/swing/tree/TreeCellRenderer;
+ ()L1javax/swing/tree/TreeCellRenderer; # @Inherited(javax.swing.plaf.basic.BasicTreeUI)
 drawCentered
  (Ljava/awt/Component;Ljava/awt/Graphics;Ljavax/swing/Icon;II)V
  (Ljava/awt/Component;Ljava/awt/Graphics;Ljavax/swing/Icon;II)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthViewportUI.eea b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthViewportUI.eea
index b0a3eddfb4..2913e58d5d 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthViewportUI.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/plaf/synth/SynthViewportUI.eea
@@ -2,7 +2,7 @@ class javax/swing/plaf/synth/SynthViewportUI
 
 createUI
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
- (Ljavax/swing/JComponent;)Ljavax/swing/plaf/ComponentUI;
+ (Ljavax/swing/JComponent;)L1javax/swing/plaf/ComponentUI;
 
 getContext
  (Ljavax/swing/JComponent;)Ljavax/swing/plaf/synth/SynthContext;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/table/AbstractTableModel.eea b/libs/eea-java-21/src/main/resources/javax/swing/table/AbstractTableModel.eea
index 7626800919..89d6a7f2a7 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/table/AbstractTableModel.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/table/AbstractTableModel.eea
@@ -15,10 +15,10 @@ fireTableChanged
  (Ljavax/swing/event/TableModelEvent;)V
 getColumnClass
  (I)Ljava/lang/Class<*>;
- (I)Ljava/lang/Class<*>;
+ (I)L1java/lang/Class<*>;
 getColumnName
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/table/DefaultTableColumnModel.eea b/libs/eea-java-21/src/main/resources/javax/swing/table/DefaultTableColumnModel.eea
index b3c6bc0d56..1f30be1e03 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/table/DefaultTableColumnModel.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/table/DefaultTableColumnModel.eea
@@ -21,7 +21,7 @@ addColumnModelListener
  (L1javax/swing/event/TableColumnModelListener;)V # @Inherited(javax.swing.table.TableColumnModel)
 createSelectionModel
  ()Ljavax/swing/ListSelectionModel;
- ()Ljavax/swing/ListSelectionModel;
+ ()L1javax/swing/ListSelectionModel;
 fireColumnAdded
  (Ljavax/swing/event/TableColumnModelEvent;)V
  (Ljavax/swing/event/TableColumnModelEvent;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/table/DefaultTableModel.eea b/libs/eea-java-21/src/main/resources/javax/swing/table/DefaultTableModel.eea
index 673a511d28..ebf8d1cc4d 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/table/DefaultTableModel.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/table/DefaultTableModel.eea
@@ -43,7 +43,7 @@ addRow
  ([Ljava/lang/Object;)V
 getColumnName
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String; # @Inherited(javax.swing.table.AbstractTableModel)
 getDataVector
  ()Ljava/util/Vector<Ljava/util/Vector;>;
  ()Ljava/util/Vector<Ljava/util/Vector;>;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/table/JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry.eea b/libs/eea-java-21/src/main/resources/javax/swing/table/JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry.eea
index 153db759a4..f28fafa531 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/table/JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/table/JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry.eea
@@ -14,16 +14,16 @@ contains
  (Ljava/awt/Point;)Z
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -38,43 +38,43 @@ getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleSelection
  ()Ljavax/accessibility/AccessibleSelection;
- ()Ljavax/accessibility/AccessibleSelection;
+ ()L0javax/accessibility/AccessibleSelection; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleValue
  ()Ljavax/accessibility/AccessibleValue;
- ()Ljavax/accessibility/AccessibleValue;
+ ()L0javax/accessibility/AccessibleValue; # @Inherited(javax.accessibility.AccessibleContext)
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getBounds
  ()Ljava/awt/Rectangle;
  ()Ljava/awt/Rectangle;
 getCursor
  ()Ljava/awt/Cursor;
- ()Ljava/awt/Cursor;
+ ()L0java/awt/Cursor;
 getFont
  ()Ljava/awt/Font;
- ()Ljava/awt/Font;
+ ()L0java/awt/Font;
 getFontMetrics
  (Ljava/awt/Font;)Ljava/awt/FontMetrics;
- (Ljava/awt/Font;)Ljava/awt/FontMetrics;
+ (Ljava/awt/Font;)L0java/awt/FontMetrics;
 getForeground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getLocale
  ()Ljava/util/Locale;
- ()Ljava/util/Locale;
+ ()L0java/util/Locale;
 getLocation
  ()Ljava/awt/Point;
  ()Ljava/awt/Point;
 getLocationOnScreen
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/table/JTableHeader$AccessibleJTableHeader.eea b/libs/eea-java-21/src/main/resources/javax/swing/table/JTableHeader$AccessibleJTableHeader.eea
index 6b83f5f593..39fd58d35d 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/table/JTableHeader$AccessibleJTableHeader.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/table/JTableHeader$AccessibleJTableHeader.eea
@@ -5,10 +5,10 @@ class javax/swing/table/JTableHeader$AccessibleJTableHeader
  (Ljavax/swing/table/JTableHeader;)V
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible; # @Inherited(java.awt.Container$AccessibleAWTContainer)
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.JComponent$AccessibleJComponent)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/table/JTableHeader.eea b/libs/eea-java-21/src/main/resources/javax/swing/table/JTableHeader.eea
index 00faccaad7..7f835c55c0 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/table/JTableHeader.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/table/JTableHeader.eea
@@ -36,10 +36,10 @@ columnSelectionChanged
  (L1javax/swing/event/ListSelectionEvent;)V # @Inherited(javax.swing.event.TableColumnModelListener)
 createDefaultColumnModel
  ()Ljavax/swing/table/TableColumnModel;
- ()Ljavax/swing/table/TableColumnModel;
+ ()L1javax/swing/table/TableColumnModel;
 createDefaultRenderer
  ()Ljavax/swing/table/TableCellRenderer;
- ()Ljavax/swing/table/TableCellRenderer;
+ ()L1javax/swing/table/TableCellRenderer;
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
@@ -54,7 +54,7 @@ getDraggedColumn
  ()Ljavax/swing/table/TableColumn;
 getHeaderRect
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L1java/awt/Rectangle;
 getPreferredSize
  ()Ljava/awt/Dimension;
  ()Ljava/awt/Dimension;
@@ -72,10 +72,10 @@ getUI
  ()Ljavax/swing/plaf/TableHeaderUI;
 getUIClassID
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 setColumnModel
  (Ljavax/swing/table/TableColumnModel;)V
  (Ljavax/swing/table/TableColumnModel;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/table/TableColumn.eea b/libs/eea-java-21/src/main/resources/javax/swing/table/TableColumn.eea
index d039b4490b..7babb780b0 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/table/TableColumn.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/table/TableColumn.eea
@@ -37,7 +37,7 @@ addPropertyChangeListener
  (L1java/beans/PropertyChangeListener;)V
 createDefaultHeaderRenderer
  ()Ljavax/swing/table/TableCellRenderer;
- ()Ljavax/swing/table/TableCellRenderer;
+ ()L1javax/swing/table/TableCellRenderer;
 getCellEditor
  ()Ljavax/swing/table/TableCellEditor;
  ()Ljavax/swing/table/TableCellEditor;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/table/TableRowSorter.eea b/libs/eea-java-21/src/main/resources/javax/swing/table/TableRowSorter.eea
index d1ba4ed4f9..d54722b725 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/table/TableRowSorter.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/table/TableRowSorter.eea
@@ -11,7 +11,7 @@ super javax/swing/DefaultRowSorter
  (TM;)V
 getComparator
  (I)Ljava/util/Comparator<*>;
- (I)Ljava/util/Comparator<*>;
+ (I)L0java/util/Comparator<*>; # @Inherited(javax.swing.DefaultRowSorter)
 getStringConverter
  ()Ljavax/swing/table/TableStringConverter;
  ()Ljavax/swing/table/TableStringConverter;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/AbstractDocument$AbstractElement.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/AbstractDocument$AbstractElement.eea
index 37267eff50..523a8b7a1f 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/AbstractDocument$AbstractElement.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/AbstractDocument$AbstractElement.eea
@@ -47,7 +47,7 @@ getIndex
  (L1javax/swing/tree/TreeNode;)I # @Inherited(javax.swing.tree.TreeNode)
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getParent
  ()Ljavax/swing/tree/TreeNode;
  ()Ljavax/swing/tree/TreeNode;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/AbstractDocument$BranchElement.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/AbstractDocument$BranchElement.eea
index ec0937d6ab..c4ec8a3fd6 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/AbstractDocument$BranchElement.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/AbstractDocument$BranchElement.eea
@@ -5,16 +5,16 @@ class javax/swing/text/AbstractDocument$BranchElement
  (Ljavax/swing/text/AbstractDocument;Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;)V
 children
  ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
- ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
+ ()L0java/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
 getElement
  (I)Ljavax/swing/text/Element;
- (I)Ljavax/swing/text/Element;
+ (I)L0javax/swing/text/Element;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(javax.swing.text.AbstractDocument$AbstractElement)
 positionToElement
  (I)Ljavax/swing/text/Element;
- (I)Ljavax/swing/text/Element;
+ (I)L0javax/swing/text/Element;
 replace
  (II[Ljavax/swing/text/Element;)V
  (II[Ljavax/swing/text/Element;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/AbstractDocument$Content.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/AbstractDocument$Content.eea
index b5ddc678be..295a16e4ff 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/AbstractDocument$Content.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/AbstractDocument$Content.eea
@@ -2,7 +2,7 @@ class javax/swing/text/AbstractDocument$Content
 
 createPosition
  (I)Ljavax/swing/text/Position;
- (I)Ljavax/swing/text/Position;
+ (I)L1javax/swing/text/Position;
 getChars
  (IILjavax/swing/text/Segment;)V
  (IILjavax/swing/text/Segment;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/AbstractDocument$DefaultDocumentEvent.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/AbstractDocument$DefaultDocumentEvent.eea
index ae7af3a842..2452bfa427 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/AbstractDocument$DefaultDocumentEvent.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/AbstractDocument$DefaultDocumentEvent.eea
@@ -8,22 +8,22 @@ addEdit
  (Ljavax/swing/undo/UndoableEdit;)Z
 getChange
  (Ljavax/swing/text/Element;)Ljavax/swing/event/DocumentEvent$ElementChange;
- (Ljavax/swing/text/Element;)Ljavax/swing/event/DocumentEvent$ElementChange;
+ (Ljavax/swing/text/Element;)L0javax/swing/event/DocumentEvent$ElementChange;
 getDocument
  ()Ljavax/swing/text/Document;
  ()Ljavax/swing/text/Document;
 getPresentationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.undo.CompoundEdit)
 getRedoPresentationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getType
  ()Ljavax/swing/event/DocumentEvent$EventType;
  ()Ljavax/swing/event/DocumentEvent$EventType;
 getUndoPresentationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(javax.swing.undo.CompoundEdit)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/AbstractDocument$LeafElement.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/AbstractDocument$LeafElement.eea
index 9631e11111..dbee07aebd 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/AbstractDocument$LeafElement.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/AbstractDocument$LeafElement.eea
@@ -5,13 +5,13 @@ class javax/swing/text/AbstractDocument$LeafElement
  (Ljavax/swing/text/AbstractDocument;Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;II)V
 children
  ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
- ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
+ ()L0java/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
 getElement
  (I)Ljavax/swing/text/Element;
- (I)Ljavax/swing/text/Element;
+ (I)L0javax/swing/text/Element;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(javax.swing.text.AbstractDocument$AbstractElement)
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/AbstractDocument.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/AbstractDocument.eea
index 762afba625..405a91a58e 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/AbstractDocument.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/AbstractDocument.eea
@@ -37,13 +37,13 @@ addUndoableEditListener
  (L1javax/swing/event/UndoableEditListener;)V # @Inherited(javax.swing.text.Document)
 createBranchElement
  (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/Element;
- (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/Element;
+ (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;)L1javax/swing/text/Element;
 createLeafElement
  (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;II)Ljavax/swing/text/Element;
- (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;II)Ljavax/swing/text/Element;
+ (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;II)L1javax/swing/text/Element;
 createPosition
  (I)Ljavax/swing/text/Position;
- (I)Ljavax/swing/text/Position;
+ (I)L1javax/swing/text/Position; # @Inherited(javax.swing.text.Document)
 dump
  (Ljava/io/PrintStream;)V
  (Ljava/io/PrintStream;)V
@@ -85,7 +85,7 @@ getDocumentProperties
  ()Ljava/util/Dictionary<Ljava/lang/Object;Ljava/lang/Object;>;
 getEndPosition
  ()Ljavax/swing/text/Position;
- ()Ljavax/swing/text/Position;
+ ()L0javax/swing/text/Position;
 getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
@@ -97,10 +97,10 @@ getProperty
  (Ljava/lang/Object;)Ljava/lang/Object;
 getRootElements
  ()[Ljavax/swing/text/Element;
- ()[Ljavax/swing/text/Element;
+ ()[1Ljavax/swing/text/Element;
 getStartPosition
  ()Ljavax/swing/text/Position;
- ()Ljavax/swing/text/Position;
+ ()L0javax/swing/text/Position;
 getText
  (II)Ljava/lang/String;
  (II)Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/AsyncBoxView.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/AsyncBoxView.eea
index 4ddfdf83b7..d1074e83ab 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/AsyncBoxView.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/AsyncBoxView.eea
@@ -9,10 +9,10 @@ locator
  (Ljavax/swing/text/Element;I)V
 createChildState
  (Ljavax/swing/text/View;)Ljavax/swing/text/AsyncBoxView$ChildState;
- (Ljavax/swing/text/View;)Ljavax/swing/text/AsyncBoxView$ChildState;
+ (Ljavax/swing/text/View;)L1javax/swing/text/AsyncBoxView$ChildState;
 getChildAllocation
  (ILjava/awt/Shape;)Ljava/awt/Shape;
- (ILjava/awt/Shape;)Ljava/awt/Shape;
+ (ILjava/awt/Shape;)L0java/awt/Shape; # @Inherited(javax.swing.text.View)
 getChildState
  (I)Ljavax/swing/text/AsyncBoxView$ChildState;
  (I)Ljavax/swing/text/AsyncBoxView$ChildState;
@@ -24,7 +24,7 @@ getNextVisualPositionFrom
  (ILjavax/swing/text/Position$Bias;Ljava/awt/Shape;I[Ljavax/swing/text/Position$Bias;)I
 getView
  (I)Ljavax/swing/text/View;
- (I)Ljavax/swing/text/View;
+ (I)L0javax/swing/text/View; # @Inherited(javax.swing.text.View)
 getViewIndex
  (ILjavax/swing/text/Position$Bias;)I
  (ILjavax/swing/text/Position$Bias;)I
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/BoxView.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/BoxView.eea
index ca85158431..d839cb27b2 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/BoxView.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/BoxView.eea
@@ -8,13 +8,13 @@ baselineLayout
  (II[I[I)V
 baselineRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements;
 calculateMajorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements;
 calculateMinorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements;
 childAllocation
  (ILjava/awt/Rectangle;)V
  (ILjava/awt/Rectangle;)V
@@ -26,7 +26,7 @@ forwardUpdate
  (Ljavax/swing/event/DocumentEvent$ElementChange;Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
 getChildAllocation
  (ILjava/awt/Shape;)Ljava/awt/Shape;
- (ILjava/awt/Shape;)Ljava/awt/Shape;
+ (ILjava/awt/Shape;)L0java/awt/Shape; # @Inherited(javax.swing.text.CompositeView)
 getViewAtPoint
  (IILjava/awt/Rectangle;)Ljavax/swing/text/View;
  (IILjava/awt/Rectangle;)Ljavax/swing/text/View;
@@ -44,7 +44,7 @@ layoutMinorAxis
  (II[I[I)V
 modelToView
  (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)Ljava/awt/Shape;
- (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)Ljava/awt/Shape;
+ (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)L0java/awt/Shape; # @Inherited(javax.swing.text.CompositeView)
 paint
  (Ljava/awt/Graphics;Ljava/awt/Shape;)V
  (Ljava/awt/Graphics;Ljava/awt/Shape;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/ComponentView.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/ComponentView.eea
index b3be9e825d..985ffeab27 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/ComponentView.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/ComponentView.eea
@@ -5,7 +5,7 @@ class javax/swing/text/ComponentView
  (Ljavax/swing/text/Element;)V
 createComponent
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component;
 getComponent
  ()Ljava/awt/Component;
  ()Ljava/awt/Component;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/CompositeView.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/CompositeView.eea
index 9dcae1f9ff..923c986b58 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/CompositeView.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/CompositeView.eea
@@ -11,10 +11,10 @@ flipEastAndWestAtEnds
  (ILjavax/swing/text/Position$Bias;)Z
 getChildAllocation
  (ILjava/awt/Shape;)Ljava/awt/Shape;
- (ILjava/awt/Shape;)Ljava/awt/Shape;
+ (ILjava/awt/Shape;)L0java/awt/Shape; # @Inherited(javax.swing.text.View)
 getInsideAllocation
  (Ljava/awt/Shape;)Ljava/awt/Rectangle;
- (Ljava/awt/Shape;)Ljava/awt/Rectangle;
+ (Ljava/awt/Shape;)L0java/awt/Rectangle;
 getNextEastWestVisualPositionFrom
  (ILjavax/swing/text/Position$Bias;Ljava/awt/Shape;I[Ljavax/swing/text/Position$Bias;)I
  (ILjavax/swing/text/Position$Bias;Ljava/awt/Shape;I[Ljavax/swing/text/Position$Bias;)I
@@ -26,13 +26,13 @@ getNextVisualPositionFrom
  (ILjavax/swing/text/Position$Bias;Ljava/awt/Shape;I[Ljavax/swing/text/Position$Bias;)I
 getView
  (I)Ljavax/swing/text/View;
- (I)Ljavax/swing/text/View;
+ (I)L0javax/swing/text/View; # @Inherited(javax.swing.text.View)
 getViewAtPoint
  (IILjava/awt/Rectangle;)Ljavax/swing/text/View;
  (IILjava/awt/Rectangle;)Ljavax/swing/text/View;
 getViewAtPosition
  (ILjava/awt/Rectangle;)Ljavax/swing/text/View;
- (ILjava/awt/Rectangle;)Ljavax/swing/text/View;
+ (ILjava/awt/Rectangle;)L0javax/swing/text/View;
 getViewIndex
  (ILjavax/swing/text/Position$Bias;)I
  (ILjavax/swing/text/Position$Bias;)I
@@ -47,7 +47,7 @@ loadChildren
  (Ljavax/swing/text/ViewFactory;)V
 modelToView
  (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)Ljava/awt/Shape;
- (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)Ljava/awt/Shape;
+ (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)L0java/awt/Shape;
 modelToView
  (ILjavax/swing/text/Position$Bias;ILjavax/swing/text/Position$Bias;Ljava/awt/Shape;)Ljava/awt/Shape;
  (ILjavax/swing/text/Position$Bias;ILjavax/swing/text/Position$Bias;Ljava/awt/Shape;)Ljava/awt/Shape;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/DefaultEditorKit.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/DefaultEditorKit.eea
index 502d99ebb0..a95a50c2e2 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/DefaultEditorKit.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/DefaultEditorKit.eea
@@ -156,19 +156,19 @@ writableAction
 
 createCaret
  ()Ljavax/swing/text/Caret;
- ()Ljavax/swing/text/Caret;
+ ()L0javax/swing/text/Caret; # @Overrides(javax.swing.text.EditorKit)
 createDefaultDocument
  ()Ljavax/swing/text/Document;
- ()Ljavax/swing/text/Document;
+ ()L1javax/swing/text/Document; # @Inherited(javax.swing.text.EditorKit)
 getActions
  ()[Ljavax/swing/Action;
  ()[Ljavax/swing/Action;
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getViewFactory
  ()Ljavax/swing/text/ViewFactory;
- ()Ljavax/swing/text/ViewFactory;
+ ()L0javax/swing/text/ViewFactory;
 read
  (Ljava/io/InputStream;Ljavax/swing/text/Document;I)V
  (Ljava/io/InputStream;Ljavax/swing/text/Document;I)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/DefaultFormatter.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/DefaultFormatter.eea
index c1b3df5551..a04ae24151 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/DefaultFormatter.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/DefaultFormatter.eea
@@ -5,10 +5,10 @@ clone
  ()L1java/lang/Object; # @Inherited(javax.swing.JFormattedTextField$AbstractFormatter)
 getDocumentFilter
  ()Ljavax/swing/text/DocumentFilter;
- ()Ljavax/swing/text/DocumentFilter;
+ ()L0javax/swing/text/DocumentFilter; # @Inherited(javax.swing.JFormattedTextField$AbstractFormatter)
 getNavigationFilter
  ()Ljavax/swing/text/NavigationFilter;
- ()Ljavax/swing/text/NavigationFilter;
+ ()L0javax/swing/text/NavigationFilter; # @Inherited(javax.swing.JFormattedTextField$AbstractFormatter)
 getValueClass
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
@@ -23,4 +23,4 @@ stringToValue
  (Ljava/lang/String;)Ljava/lang/Object;
 valueToString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/DefaultHighlighter$DefaultHighlightPainter.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/DefaultHighlighter$DefaultHighlightPainter.eea
index 7d9849c288..b21f54f8bc 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/DefaultHighlighter$DefaultHighlightPainter.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/DefaultHighlighter$DefaultHighlightPainter.eea
@@ -11,4 +11,4 @@ paint
  (Ljava/awt/Graphics;IILjava/awt/Shape;Ljavax/swing/text/JTextComponent;)V
 paintLayer
  (Ljava/awt/Graphics;IILjava/awt/Shape;Ljavax/swing/text/JTextComponent;Ljavax/swing/text/View;)Ljava/awt/Shape;
- (Ljava/awt/Graphics;IILjava/awt/Shape;Ljavax/swing/text/JTextComponent;Ljavax/swing/text/View;)Ljava/awt/Shape;
+ (Ljava/awt/Graphics;IILjava/awt/Shape;Ljavax/swing/text/JTextComponent;Ljavax/swing/text/View;)L0java/awt/Shape;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/DefaultHighlighter.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/DefaultHighlighter.eea
index fb9630e22e..5bb51d87f5 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/DefaultHighlighter.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/DefaultHighlighter.eea
@@ -6,7 +6,7 @@ DefaultPainter
 
 addHighlight
  (IILjavax/swing/text/Highlighter$HighlightPainter;)Ljava/lang/Object;
- (IILjavax/swing/text/Highlighter$HighlightPainter;)Ljava/lang/Object;
+ (IILjavax/swing/text/Highlighter$HighlightPainter;)L1java/lang/Object;
 changeHighlight
  (Ljava/lang/Object;II)V
  (Ljava/lang/Object;II)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/DefaultStyledDocument$SectionElement.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/DefaultStyledDocument$SectionElement.eea
index 6e13a61691..75f90ae78b 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/DefaultStyledDocument$SectionElement.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/DefaultStyledDocument$SectionElement.eea
@@ -5,4 +5,4 @@ class javax/swing/text/DefaultStyledDocument$SectionElement
  (Ljavax/swing/text/DefaultStyledDocument;)V
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.text.AbstractDocument$BranchElement)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/DefaultStyledDocument.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/DefaultStyledDocument.eea
index 540216bd5d..375d2f54f7 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/DefaultStyledDocument.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/DefaultStyledDocument.eea
@@ -21,7 +21,7 @@ create
  ([Ljavax/swing/text/DefaultStyledDocument$ElementSpec;)V
 createDefaultRoot
  ()Ljavax/swing/text/AbstractDocument$AbstractElement;
- ()Ljavax/swing/text/AbstractDocument$AbstractElement;
+ ()L1javax/swing/text/AbstractDocument$AbstractElement;
 getBackground
  (Ljavax/swing/text/AttributeSet;)Ljava/awt/Color;
  (Ljavax/swing/text/AttributeSet;)Ljava/awt/Color;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/Document.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/Document.eea
index c42dc008cb..312def38e9 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/Document.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/Document.eea
@@ -15,7 +15,7 @@ addUndoableEditListener
  (L1javax/swing/event/UndoableEditListener;)V
 createPosition
  (I)Ljavax/swing/text/Position;
- (I)Ljavax/swing/text/Position;
+ (I)L1javax/swing/text/Position;
 getDefaultRootElement
  ()Ljavax/swing/text/Element;
  ()Ljavax/swing/text/Element;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/EditorKit.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/EditorKit.eea
index c5e44fb446..bc252fdfb7 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/EditorKit.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/EditorKit.eea
@@ -5,10 +5,10 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 createCaret
  ()Ljavax/swing/text/Caret;
- ()Ljavax/swing/text/Caret;
+ ()L1javax/swing/text/Caret;
 createDefaultDocument
  ()Ljavax/swing/text/Document;
- ()Ljavax/swing/text/Document;
+ ()L1javax/swing/text/Document;
 deinstall
  (Ljavax/swing/JEditorPane;)V
  (Ljavax/swing/JEditorPane;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/ElementIterator.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/ElementIterator.eea
index fd767a3e97..7dba1bc245 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/ElementIterator.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/ElementIterator.eea
@@ -11,13 +11,13 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 current
  ()Ljavax/swing/text/Element;
- ()Ljavax/swing/text/Element;
+ ()L0javax/swing/text/Element;
 first
  ()Ljavax/swing/text/Element;
- ()Ljavax/swing/text/Element;
+ ()L0javax/swing/text/Element;
 next
  ()Ljavax/swing/text/Element;
- ()Ljavax/swing/text/Element;
+ ()L0javax/swing/text/Element;
 previous
  ()Ljavax/swing/text/Element;
- ()Ljavax/swing/text/Element;
+ ()L0javax/swing/text/Element;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/FieldView.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/FieldView.eea
index 7652db99ea..2e2ecae5a9 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/FieldView.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/FieldView.eea
@@ -5,7 +5,7 @@ class javax/swing/text/FieldView
  (Ljavax/swing/text/Element;)V
 adjustAllocation
  (Ljava/awt/Shape;)Ljava/awt/Shape;
- (Ljava/awt/Shape;)Ljava/awt/Shape;
+ (Ljava/awt/Shape;)L0java/awt/Shape;
 getFontMetrics
  ()Ljava/awt/FontMetrics;
  ()Ljava/awt/FontMetrics;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/FlowView$FlowStrategy.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/FlowView$FlowStrategy.eea
index 4802aa146c..0304477407 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/FlowView$FlowStrategy.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/FlowView$FlowStrategy.eea
@@ -8,7 +8,7 @@ changedUpdate
  (Ljavax/swing/text/FlowView;Ljavax/swing/event/DocumentEvent;Ljava/awt/Rectangle;)V
 createView
  (Ljavax/swing/text/FlowView;III)Ljavax/swing/text/View;
- (Ljavax/swing/text/FlowView;III)Ljavax/swing/text/View;
+ (Ljavax/swing/text/FlowView;III)L1javax/swing/text/View;
 getLogicalView
  (Ljavax/swing/text/FlowView;)Ljavax/swing/text/View;
  (Ljavax/swing/text/FlowView;)Ljavax/swing/text/View;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/FlowView.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/FlowView.eea
index fd35fc0a2f..22eff76e4f 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/FlowView.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/FlowView.eea
@@ -12,13 +12,13 @@ strategy
  (Ljavax/swing/text/Element;I)V
 calculateMinorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.BoxView)
 changedUpdate
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
 createRow
  ()Ljavax/swing/text/View;
- ()Ljavax/swing/text/View;
+ ()L1javax/swing/text/View;
 insertUpdate
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/GapContent.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/GapContent.eea
index 6d52002ddf..329824007c 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/GapContent.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/GapContent.eea
@@ -2,10 +2,10 @@ class javax/swing/text/GapContent
 
 allocateArray
  (I)Ljava/lang/Object;
- (I)Ljava/lang/Object;
+ (I)L1java/lang/Object;
 createPosition
  (I)Ljavax/swing/text/Position;
- (I)Ljavax/swing/text/Position;
+ (I)L1javax/swing/text/Position; # @Inherited(javax.swing.text.AbstractDocument$Content)
 getChars
  (IILjavax/swing/text/Segment;)V
  (IILjavax/swing/text/Segment;)V
@@ -17,10 +17,10 @@ getString
  (II)Ljava/lang/String;
 insertString
  (ILjava/lang/String;)Ljavax/swing/undo/UndoableEdit;
- (ILjava/lang/String;)Ljavax/swing/undo/UndoableEdit;
+ (ILjava/lang/String;)L1javax/swing/undo/UndoableEdit;
 remove
  (II)Ljavax/swing/undo/UndoableEdit;
- (II)Ljavax/swing/undo/UndoableEdit;
+ (II)L1javax/swing/undo/UndoableEdit;
 updateUndoPositions
  (Ljava/util/Vector;II)V
  (Ljava/util/Vector;II)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/GlyphView.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/GlyphView.eea
index 0dda4565fe..32c6b8806b 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/GlyphView.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/GlyphView.eea
@@ -14,16 +14,16 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 createFragment
  (II)Ljavax/swing/text/View;
- (II)Ljavax/swing/text/View;
+ (II)L1javax/swing/text/View; # @Inherited(javax.swing.text.View)
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getFont
  ()Ljava/awt/Font;
- ()Ljava/awt/Font;
+ ()L0java/awt/Font;
 getForeground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color;
 getGlyphPainter
  ()Ljavax/swing/text/GlyphView$GlyphPainter;
  ()Ljavax/swing/text/GlyphView$GlyphPainter;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/InternationalFormatter.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/InternationalFormatter.eea
index 191d8d4672..7e56644bd6 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/InternationalFormatter.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/InternationalFormatter.eea
@@ -8,7 +8,7 @@ clone
  ()L1java/lang/Object; # @Inherited(javax.swing.text.DefaultFormatter)
 getActions
  ()[Ljavax/swing/Action;
- ()[Ljavax/swing/Action;
+ ()[0Ljavax/swing/Action; # @Inherited(javax.swing.JFormattedTextField$AbstractFormatter)
 getFields
  (I)[Ljava/text/Format$Field;
  (I)[Ljava/text/Format$Field;
@@ -38,4 +38,4 @@ stringToValue
  (Ljava/lang/String;)Ljava/lang/Object;
 valueToString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(javax.swing.text.DefaultFormatter)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/JTextComponent$AccessibleJTextComponent.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/JTextComponent$AccessibleJTextComponent.eea
index 0c70690fb0..c9ae3526d1 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/JTextComponent$AccessibleJTextComponent.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/JTextComponent$AccessibleJTextComponent.eea
@@ -11,13 +11,13 @@ changedUpdate
  (L1javax/swing/event/DocumentEvent;)V # @Inherited(javax.swing.event.DocumentListener)
 getAccessibleAction
  ()Ljavax/accessibility/AccessibleAction;
- ()Ljavax/accessibility/AccessibleAction;
+ ()L0javax/accessibility/AccessibleAction; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleActionDescription
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleEditableText
  ()Ljavax/accessibility/AccessibleEditableText;
- ()Ljavax/accessibility/AccessibleEditableText;
+ ()L0javax/accessibility/AccessibleEditableText; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
@@ -26,7 +26,7 @@ getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAfterIndex
  (II)Ljava/lang/String;
  (II)Ljava/lang/String;
@@ -41,7 +41,7 @@ getCharacterAttribute
  (I)Ljavax/swing/text/AttributeSet;
 getCharacterBounds
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L0java/awt/Rectangle;
 getIndexAtPoint
  (Ljava/awt/Point;)I
  (Ljava/awt/Point;)I
@@ -50,7 +50,7 @@ getSelectedText
  ()Ljava/lang/String;
 getTextBounds
  (II)Ljava/awt/Rectangle;
- (II)Ljava/awt/Rectangle;
+ (II)L0java/awt/Rectangle;
 getTextRange
  (II)Ljava/lang/String;
  (II)Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/JTextComponent.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/JTextComponent.eea
index 01f5a50d28..1af33dc600 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/JTextComponent.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/JTextComponent.eea
@@ -9,7 +9,7 @@ FOCUS_ACCELERATOR_KEY
 
 addKeymap
  (Ljava/lang/String;Ljavax/swing/text/Keymap;)Ljavax/swing/text/Keymap;
- (Ljava/lang/String;Ljavax/swing/text/Keymap;)Ljavax/swing/text/Keymap;
+ (Ljava/lang/String;Ljavax/swing/text/Keymap;)L1javax/swing/text/Keymap;
 getKeymap
  (Ljava/lang/String;)Ljavax/swing/text/Keymap;
  (Ljava/lang/String;)Ljavax/swing/text/Keymap;
@@ -61,7 +61,7 @@ getHighlighter
  ()Ljavax/swing/text/Highlighter;
 getInputMethodRequests
  ()Ljava/awt/im/InputMethodRequests;
- ()Ljava/awt/im/InputMethodRequests;
+ ()L0java/awt/im/InputMethodRequests; # @Inherited(java.awt.Component)
 getKeymap
  ()Ljavax/swing/text/Keymap;
  ()Ljavax/swing/text/Keymap;
@@ -94,7 +94,7 @@ getSelectionColor
  ()Ljava/awt/Color;
 getText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getText
  (II)Ljava/lang/String;
  (II)Ljava/lang/String;
@@ -112,7 +112,7 @@ modelToView2D
  (I)Ljava/awt/geom/Rectangle2D;
 paramString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.JComponent)
 print
  (Ljava/text/MessageFormat;Ljava/text/MessageFormat;)Z
  (Ljava/text/MessageFormat;Ljava/text/MessageFormat;)Z
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/LabelView.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/LabelView.eea
index d717bb4410..306b2a6e94 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/LabelView.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/LabelView.eea
@@ -8,16 +8,16 @@ changedUpdate
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
 getBackground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color; # @Inherited(javax.swing.text.GlyphView)
 getFont
  ()Ljava/awt/Font;
- ()Ljava/awt/Font;
+ ()L0java/awt/Font; # @Inherited(javax.swing.text.GlyphView)
 getFontMetrics
  ()Ljava/awt/FontMetrics;
  ()Ljava/awt/FontMetrics;
 getForeground
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L0java/awt/Color; # @Inherited(javax.swing.text.GlyphView)
 setBackground
  (Ljava/awt/Color;)V
  (Ljava/awt/Color;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/LayoutQueue.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/LayoutQueue.eea
index 756cbc7e72..cf430ad96e 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/LayoutQueue.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/LayoutQueue.eea
@@ -12,4 +12,4 @@ addTask
  (Ljava/lang/Runnable;)V
 waitForWork
  ()Ljava/lang/Runnable;
- ()Ljava/lang/Runnable;
+ ()L0java/lang/Runnable;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/MaskFormatter.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/MaskFormatter.eea
index ce7cb146ad..a16f4643c1 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/MaskFormatter.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/MaskFormatter.eea
@@ -35,4 +35,4 @@ stringToValue
  (Ljava/lang/String;)Ljava/lang/Object;
 valueToString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(javax.swing.text.DefaultFormatter)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/ParagraphView.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/ParagraphView.eea
index 8a53f00df9..907ecdb299 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/ParagraphView.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/ParagraphView.eea
@@ -8,13 +8,13 @@ breakView
  (IFLjava/awt/Shape;)Ljavax/swing/text/View;
 calculateMinorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.FlowView)
 changedUpdate
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
 createRow
  ()Ljavax/swing/text/View;
- ()Ljavax/swing/text/View;
+ ()L1javax/swing/text/View; # @Inherited(javax.swing.text.FlowView)
 findOffsetToCharactersInString
  ([CI)I
  ([CI)I
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/PasswordView.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/PasswordView.eea
index d5f21bf789..830c7f5b43 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/PasswordView.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/PasswordView.eea
@@ -23,7 +23,7 @@ drawUnselectedText
  (Ljava/awt/Graphics;IIII)I
 modelToView
  (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)Ljava/awt/Shape;
- (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)Ljava/awt/Shape;
+ (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)L0java/awt/Shape;
 viewToModel
  (FFLjava/awt/Shape;[Ljavax/swing/text/Position$Bias;)I
  (FFLjava/awt/Shape;[Ljavax/swing/text/Position$Bias;)I
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/PlainDocument.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/PlainDocument.eea
index 5361c59181..13dc85433e 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/PlainDocument.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/PlainDocument.eea
@@ -12,7 +12,7 @@ tabSizeAttribute
  (Ljavax/swing/text/AbstractDocument$Content;)V
 createDefaultRoot
  ()Ljavax/swing/text/AbstractDocument$AbstractElement;
- ()Ljavax/swing/text/AbstractDocument$AbstractElement;
+ ()L1javax/swing/text/AbstractDocument$AbstractElement;
 getDefaultRootElement
  ()Ljavax/swing/text/Element;
  ()Ljavax/swing/text/Element;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/StringContent.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/StringContent.eea
index 0752f9a92f..7edbe4975e 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/StringContent.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/StringContent.eea
@@ -2,7 +2,7 @@ class javax/swing/text/StringContent
 
 createPosition
  (I)Ljavax/swing/text/Position;
- (I)Ljavax/swing/text/Position;
+ (I)L1javax/swing/text/Position; # @Inherited(javax.swing.text.AbstractDocument$Content)
 getChars
  (IILjavax/swing/text/Segment;)V
  (IILjavax/swing/text/Segment;)V
@@ -11,13 +11,13 @@ getPositionsInRange
  (Ljava/util/Vector;II)Ljava/util/Vector;
 getString
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L1java/lang/String;
 insertString
  (ILjava/lang/String;)Ljavax/swing/undo/UndoableEdit;
- (ILjava/lang/String;)Ljavax/swing/undo/UndoableEdit;
+ (ILjava/lang/String;)L1javax/swing/undo/UndoableEdit;
 remove
  (II)Ljavax/swing/undo/UndoableEdit;
- (II)Ljavax/swing/undo/UndoableEdit;
+ (II)L1javax/swing/undo/UndoableEdit;
 updateUndoPositions
  (Ljava/util/Vector;)V
  (Ljava/util/Vector;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/StyleConstants.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/StyleConstants.eea
index a09325940c..8b8527f543 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/StyleConstants.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/StyleConstants.eea
@@ -108,7 +108,7 @@ getFirstLineIndent
  (Ljavax/swing/text/AttributeSet;)F
 getFontFamily
  (Ljavax/swing/text/AttributeSet;)Ljava/lang/String;
- (Ljavax/swing/text/AttributeSet;)Ljava/lang/String;
+ (Ljavax/swing/text/AttributeSet;)L1java/lang/String;
 getFontSize
  (Ljavax/swing/text/AttributeSet;)I
  (Ljavax/swing/text/AttributeSet;)I
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/StyleContext$NamedStyle.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/StyleContext$NamedStyle.eea
index aab00b1304..34571e1337 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/StyleContext$NamedStyle.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/StyleContext$NamedStyle.eea
@@ -33,7 +33,7 @@ containsAttributes
  (Ljavax/swing/text/AttributeSet;)Z
 copyAttributes
  ()Ljavax/swing/text/AttributeSet;
- ()Ljavax/swing/text/AttributeSet;
+ ()L1javax/swing/text/AttributeSet;
 getAttribute
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
@@ -48,7 +48,7 @@ getListeners
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)[TT;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getResolveParent
  ()Ljavax/swing/text/AttributeSet;
  ()Ljavax/swing/text/AttributeSet;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/StyleContext$SmallAttributeSet.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/StyleContext$SmallAttributeSet.eea
index 59d2d7710a..b29fe82e36 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/StyleContext$SmallAttributeSet.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/StyleContext$SmallAttributeSet.eea
@@ -26,7 +26,7 @@ getAttribute
  (Ljava/lang/Object;)Ljava/lang/Object;
 getAttributeNames
  ()Ljava/util/Enumeration<*>;
- ()Ljava/util/Enumeration<*>;
+ ()L1java/util/Enumeration<*>;
 getResolveParent
  ()Ljavax/swing/text/AttributeSet;
  ()Ljavax/swing/text/AttributeSet;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/StyleContext.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/StyleContext.eea
index 948b3ea0a8..b29875ad05 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/StyleContext.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/StyleContext.eea
@@ -12,7 +12,7 @@ getStaticAttribute
  (Ljava/lang/Object;)Ljava/lang/Object;
 getStaticAttributeKey
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object;
 readAttributeSet
  (Ljava/io/ObjectInputStream;Ljavax/swing/text/MutableAttributeSet;)V
  (Ljava/io/ObjectInputStream;Ljavax/swing/text/MutableAttributeSet;)V
@@ -34,13 +34,13 @@ addChangeListener
  (L1javax/swing/event/ChangeListener;)V
 addStyle
  (Ljava/lang/String;Ljavax/swing/text/Style;)Ljavax/swing/text/Style;
- (Ljava/lang/String;Ljavax/swing/text/Style;)Ljavax/swing/text/Style;
+ (Ljava/lang/String;Ljavax/swing/text/Style;)L1javax/swing/text/Style;
 createLargeAttributeSet
  (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/MutableAttributeSet;
- (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/MutableAttributeSet;
+ (Ljavax/swing/text/AttributeSet;)L1javax/swing/text/MutableAttributeSet;
 createSmallAttributeSet
  (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/StyleContext$SmallAttributeSet;
- (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/StyleContext$SmallAttributeSet;
+ (Ljavax/swing/text/AttributeSet;)L1javax/swing/text/StyleContext$SmallAttributeSet;
 getBackground
  (Ljavax/swing/text/AttributeSet;)Ljava/awt/Color;
  (Ljavax/swing/text/AttributeSet;)Ljava/awt/Color;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/StyledEditorKit$StyledTextAction.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/StyledEditorKit$StyledTextAction.eea
index 9962de143e..864d5776b3 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/StyledEditorKit$StyledTextAction.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/StyledEditorKit$StyledTextAction.eea
@@ -5,7 +5,7 @@ class javax/swing/text/StyledEditorKit$StyledTextAction
  (Ljava/lang/String;)V
 getEditor
  (Ljava/awt/event/ActionEvent;)Ljavax/swing/JEditorPane;
- (Ljava/awt/event/ActionEvent;)Ljavax/swing/JEditorPane;
+ (Ljava/awt/event/ActionEvent;)L0javax/swing/JEditorPane;
 getStyledDocument
  (Ljavax/swing/JEditorPane;)Ljavax/swing/text/StyledDocument;
  (Ljavax/swing/JEditorPane;)Ljavax/swing/text/StyledDocument;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/StyledEditorKit.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/StyledEditorKit.eea
index 73be9f8967..f4bdd9f41a 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/StyledEditorKit.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/StyledEditorKit.eea
@@ -5,7 +5,7 @@ clone
  ()L1java/lang/Object; # @Inherited(javax.swing.text.EditorKit)
 createDefaultDocument
  ()Ljavax/swing/text/Document;
- ()Ljavax/swing/text/Document;
+ ()L1javax/swing/text/Document; # @Inherited(javax.swing.text.DefaultEditorKit)
 createInputAttributes
  (Ljavax/swing/text/Element;Ljavax/swing/text/MutableAttributeSet;)V
  (Ljavax/swing/text/Element;Ljavax/swing/text/MutableAttributeSet;)V
@@ -23,7 +23,7 @@ getInputAttributes
  ()Ljavax/swing/text/MutableAttributeSet;
 getViewFactory
  ()Ljavax/swing/text/ViewFactory;
- ()Ljavax/swing/text/ViewFactory;
+ ()L0javax/swing/text/ViewFactory; # @Inherited(javax.swing.text.DefaultEditorKit)
 install
  (Ljavax/swing/JEditorPane;)V
  (Ljavax/swing/JEditorPane;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/TableView$TableRow.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/TableView$TableRow.eea
index 89206865f2..31bc1801da 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/TableView$TableRow.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/TableView$TableRow.eea
@@ -5,10 +5,10 @@ class javax/swing/text/TableView$TableRow
  (Ljavax/swing/text/TableView;Ljavax/swing/text/Element;)V
 calculateMajorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.BoxView)
 getViewAtPosition
  (ILjava/awt/Rectangle;)Ljavax/swing/text/View;
- (ILjava/awt/Rectangle;)Ljavax/swing/text/View;
+ (ILjava/awt/Rectangle;)L0javax/swing/text/View; # @Inherited(javax.swing.text.CompositeView)
 layoutMajorAxis
  (II[I[I)V
  (II[I[I)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/TableView.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/TableView.eea
index a00db35d7d..53894df1cf 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/TableView.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/TableView.eea
@@ -5,19 +5,19 @@ class javax/swing/text/TableView
  (Ljavax/swing/text/Element;)V
 calculateMinorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.BoxView)
 createTableCell
  (Ljavax/swing/text/Element;)Ljavax/swing/text/TableView$TableCell;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/TableView$TableCell;
+ (Ljavax/swing/text/Element;)L1javax/swing/text/TableView$TableCell;
 createTableRow
  (Ljavax/swing/text/Element;)Ljavax/swing/text/TableView$TableRow;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/TableView$TableRow;
+ (Ljavax/swing/text/Element;)L1javax/swing/text/TableView$TableRow;
 forwardUpdate
  (Ljavax/swing/event/DocumentEvent$ElementChange;Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
  (Ljavax/swing/event/DocumentEvent$ElementChange;Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
 getViewAtPosition
  (ILjava/awt/Rectangle;)Ljavax/swing/text/View;
- (ILjava/awt/Rectangle;)Ljavax/swing/text/View;
+ (ILjava/awt/Rectangle;)L0javax/swing/text/View; # @Inherited(javax.swing.text.CompositeView)
 layoutColumns
  (I[I[I[Ljavax/swing/SizeRequirements;)V
  (I[I[I[Ljavax/swing/SizeRequirements;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/TextAction.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/TextAction.eea
index 42d8f3512e..6f4335d297 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/TextAction.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/TextAction.eea
@@ -2,7 +2,7 @@ class javax/swing/text/TextAction
 
 augmentList
  ([Ljavax/swing/Action;[Ljavax/swing/Action;)[Ljavax/swing/Action;
- ([Ljavax/swing/Action;[Ljavax/swing/Action;)[Ljavax/swing/Action;
+ ([Ljavax/swing/Action;[Ljavax/swing/Action;)[1Ljavax/swing/Action;
 
 <init>
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/Utilities.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/Utilities.eea
index 407ada25b3..57e413f5d4 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/Utilities.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/Utilities.eea
@@ -17,7 +17,7 @@ getNextWord
  (Ljavax/swing/text/JTextComponent;I)I
 getParagraphElement
  (Ljavax/swing/text/JTextComponent;I)Ljavax/swing/text/Element;
- (Ljavax/swing/text/JTextComponent;I)Ljavax/swing/text/Element;
+ (Ljavax/swing/text/JTextComponent;I)L0javax/swing/text/Element;
 getPositionAbove
  (Ljavax/swing/text/JTextComponent;IF)I
  (Ljavax/swing/text/JTextComponent;IF)I
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/View.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/View.eea
index 7c70fcdee3..d11440bd38 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/View.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/View.eea
@@ -14,7 +14,7 @@ changedUpdate
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
 createFragment
  (II)Ljavax/swing/text/View;
- (II)Ljavax/swing/text/View;
+ (II)L1javax/swing/text/View;
 forwardUpdate
  (Ljavax/swing/event/DocumentEvent$ElementChange;Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
  (Ljavax/swing/event/DocumentEvent$ElementChange;Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
@@ -26,10 +26,10 @@ getAttributes
  ()Ljavax/swing/text/AttributeSet;
 getChildAllocation
  (ILjava/awt/Shape;)Ljava/awt/Shape;
- (ILjava/awt/Shape;)Ljava/awt/Shape;
+ (ILjava/awt/Shape;)L0java/awt/Shape;
 getContainer
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L0java/awt/Container;
 getDocument
  ()Ljavax/swing/text/Document;
  ()Ljavax/swing/text/Document;
@@ -47,13 +47,13 @@ getParent
  ()Ljavax/swing/text/View;
 getToolTipText
  (FFLjava/awt/Shape;)Ljava/lang/String;
- (FFLjava/awt/Shape;)Ljava/lang/String;
+ (FFLjava/awt/Shape;)L0java/lang/String;
 getView
  (I)Ljavax/swing/text/View;
- (I)Ljavax/swing/text/View;
+ (I)L0javax/swing/text/View;
 getViewFactory
  ()Ljavax/swing/text/ViewFactory;
- ()Ljavax/swing/text/ViewFactory;
+ ()L0javax/swing/text/ViewFactory;
 getViewIndex
  (FFLjava/awt/Shape;)I
  (FFLjava/awt/Shape;)I
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/ViewFactory.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/ViewFactory.eea
index 1cd710833c..24b5e5fc14 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/ViewFactory.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/ViewFactory.eea
@@ -2,4 +2,4 @@ class javax/swing/text/ViewFactory
 
 create
  (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
+ (Ljavax/swing/text/Element;)L1javax/swing/text/View;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/ZoneView.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/ZoneView.eea
index 84648791a1..0625b177cc 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/ZoneView.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/ZoneView.eea
@@ -5,7 +5,7 @@ class javax/swing/text/ZoneView
  (Ljavax/swing/text/Element;I)V
 createZone
  (II)Ljavax/swing/text/View;
- (II)Ljavax/swing/text/View;
+ (II)L1javax/swing/text/View;
 insertUpdate
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/AccessibleHTML$HTMLAccessibleContext.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/AccessibleHTML$HTMLAccessibleContext.eea
index ddda910170..76338e9c63 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/AccessibleHTML$HTMLAccessibleContext.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/AccessibleHTML$HTMLAccessibleContext.eea
@@ -15,19 +15,19 @@ contains
  (Ljava/awt/Point;)Z
 getAccessibleAt
  (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
- (Ljava/awt/Point;)Ljavax/accessibility/Accessible;
+ (Ljava/awt/Point;)L0javax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleComponent
  ()Ljavax/accessibility/AccessibleComponent;
- ()Ljavax/accessibility/AccessibleComponent;
+ ()L0javax/accessibility/AccessibleComponent; # @Inherited(javax.accessibility.AccessibleContext)
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
  ()Ljavax/accessibility/AccessibleContext;
 getAccessibleStateSet
  ()Ljavax/accessibility/AccessibleStateSet;
- ()Ljavax/accessibility/AccessibleStateSet;
+ ()L1javax/accessibility/AccessibleStateSet;
 getBackground
  ()Ljava/awt/Color;
  ()Ljava/awt/Color;
@@ -51,13 +51,13 @@ getLocale
  ()Ljava/util/Locale;
 getLocation
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getLocationOnScreen
  ()Ljava/awt/Point;
- ()Ljava/awt/Point;
+ ()L0java/awt/Point;
 getSize
  ()Ljava/awt/Dimension;
- ()Ljava/awt/Dimension;
+ ()L0java/awt/Dimension;
 removeFocusListener
  (Ljava/awt/event/FocusListener;)V
  (L1java/awt/event/FocusListener;)V # @Inherited(javax.accessibility.AccessibleComponent)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/AccessibleHTML$IconElementInfo$IconAccessibleContext.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/AccessibleHTML$IconElementInfo$IconAccessibleContext.eea
index fadb848190..80c9102581 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/AccessibleHTML$IconElementInfo$IconAccessibleContext.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/AccessibleHTML$IconElementInfo$IconAccessibleContext.eea
@@ -8,7 +8,7 @@ getAccessibleDescription
  ()Ljava/lang/String;
 getAccessibleIcon
  ()[Ljavax/accessibility/AccessibleIcon;
- ()[Ljavax/accessibility/AccessibleIcon;
+ ()[1Ljavax/accessibility/AccessibleIcon; # @Overrides(javax.accessibility.AccessibleContext)
 getAccessibleIconDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/AccessibleHTML$TableElementInfo$TableAccessibleContext$AccessibleHeadersTable.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/AccessibleHTML$TableElementInfo$TableAccessibleContext$AccessibleHeadersTable.eea
index bb89cf1e81..ba7e0a88e4 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/AccessibleHTML$TableElementInfo$TableAccessibleContext$AccessibleHeadersTable.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/AccessibleHTML$TableElementInfo$TableAccessibleContext$AccessibleHeadersTable.eea
@@ -8,31 +8,31 @@ addHeader
  (Ljavax/swing/text/html/AccessibleHTML$TableElementInfo$TableCellElementInfo;I)V
 getAccessibleAt
  (II)Ljavax/accessibility/Accessible;
- (II)Ljavax/accessibility/Accessible;
+ (II)L0javax/accessibility/Accessible;
 getAccessibleCaption
  ()Ljavax/accessibility/Accessible;
- ()Ljavax/accessibility/Accessible;
+ ()L0javax/accessibility/Accessible;
 getAccessibleColumnDescription
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleColumnHeader
  ()Ljavax/accessibility/AccessibleTable;
- ()Ljavax/accessibility/AccessibleTable;
+ ()L0javax/accessibility/AccessibleTable;
 getAccessibleRowDescription
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleRowHeader
  ()Ljavax/accessibility/AccessibleTable;
- ()Ljavax/accessibility/AccessibleTable;
+ ()L0javax/accessibility/AccessibleTable;
 getAccessibleSummary
  ()Ljavax/accessibility/Accessible;
- ()Ljavax/accessibility/Accessible;
+ ()L0javax/accessibility/Accessible;
 getSelectedAccessibleColumns
  ()[I
- ()[I
+ ()[1I
 getSelectedAccessibleRows
  ()[I
- ()[I
+ ()[1I
 setAccessibleCaption
  (Ljavax/accessibility/Accessible;)V
  (Ljavax/accessibility/Accessible;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/AccessibleHTML$TableElementInfo$TableAccessibleContext.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/AccessibleHTML$TableElementInfo$TableAccessibleContext.eea
index b7f83f0bf6..e22775a37b 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/AccessibleHTML$TableElementInfo$TableAccessibleContext.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/AccessibleHTML$TableElementInfo$TableAccessibleContext.eea
@@ -8,52 +8,52 @@ addRowHeader
  (Ljavax/swing/text/html/AccessibleHTML$TableElementInfo$TableCellElementInfo;I)V
 getAccessibleAt
  (II)Ljavax/accessibility/Accessible;
- (II)Ljavax/accessibility/Accessible;
+ (II)L0javax/accessibility/Accessible;
 getAccessibleCaption
  ()Ljavax/accessibility/Accessible;
- ()Ljavax/accessibility/Accessible;
+ ()L0javax/accessibility/Accessible;
 getAccessibleChild
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible; # @Inherited(javax.swing.text.html.AccessibleHTML$HTMLAccessibleContext)
 getAccessibleColumnDescription
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleColumnHeader
  ()Ljavax/accessibility/AccessibleTable;
- ()Ljavax/accessibility/AccessibleTable;
+ ()L0javax/accessibility/AccessibleTable;
 getAccessibleColumnHeader
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getAccessibleName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleRowDescription
  (I)Ljavax/accessibility/Accessible;
- (I)Ljavax/accessibility/Accessible;
+ (I)L0javax/accessibility/Accessible;
 getAccessibleRowHeader
  ()Ljavax/accessibility/AccessibleTable;
  ()Ljavax/accessibility/AccessibleTable;
 getAccessibleRowHeader
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getAccessibleSummary
  ()Ljavax/accessibility/Accessible;
- ()Ljavax/accessibility/Accessible;
+ ()L0javax/accessibility/Accessible;
 getAccessibleTable
  ()Ljavax/accessibility/AccessibleTable;
- ()Ljavax/accessibility/AccessibleTable;
+ ()L0javax/accessibility/AccessibleTable; # @Inherited(javax.accessibility.AccessibleContext)
 getSelectedAccessibleColumns
  ()[I
- ()[I
+ ()[1I
 getSelectedAccessibleRows
  ()[I
- ()[I
+ ()[1I
 setAccessibleCaption
  (Ljavax/accessibility/Accessible;)V
  (Ljavax/accessibility/Accessible;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/AccessibleHTML$TextElementInfo$TextAccessibleContext.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/AccessibleHTML$TextElementInfo$TextAccessibleContext.eea
index 81e1259119..dff38663b5 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/AccessibleHTML$TextElementInfo$TextAccessibleContext.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/AccessibleHTML$TextElementInfo$TextAccessibleContext.eea
@@ -8,13 +8,13 @@ getAccessibleDescription
  ()Ljava/lang/String;
 getAccessibleName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getAccessibleRole
  ()Ljavax/accessibility/AccessibleRole;
  ()Ljavax/accessibility/AccessibleRole;
 getAccessibleText
  ()Ljavax/accessibility/AccessibleText;
- ()Ljavax/accessibility/AccessibleText;
+ ()L0javax/accessibility/AccessibleText; # @Inherited(javax.accessibility.AccessibleContext)
 getAfterIndex
  (II)Ljava/lang/String;
  (II)Ljava/lang/String;
@@ -26,10 +26,10 @@ getBeforeIndex
  (II)Ljava/lang/String;
 getCharacterAttribute
  (I)Ljavax/swing/text/AttributeSet;
- (I)Ljavax/swing/text/AttributeSet;
+ (I)L0javax/swing/text/AttributeSet;
 getCharacterBounds
  (I)Ljava/awt/Rectangle;
- (I)Ljava/awt/Rectangle;
+ (I)L0java/awt/Rectangle;
 getIndexAtPoint
  (Ljava/awt/Point;)I
  (Ljava/awt/Point;)I
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/BlockView.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/BlockView.eea
index fea3280a6f..574dd7a75a 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/BlockView.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/BlockView.eea
@@ -5,10 +5,10 @@ class javax/swing/text/html/BlockView
  (Ljavax/swing/text/Element;I)V
 calculateMajorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.BoxView)
 calculateMinorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.BoxView)
 changedUpdate
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/CSS.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/CSS.eea
index 779e06cb3d..7174e0d1aa 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/CSS.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/CSS.eea
@@ -2,7 +2,7 @@ class javax/swing/text/html/CSS
 
 getAllAttributeKeys
  ()[Ljavax/swing/text/html/CSS$Attribute;
- ()[Ljavax/swing/text/html/CSS$Attribute;
+ ()[1Ljavax/swing/text/html/CSS$Attribute;
 getAttribute
  (Ljava/lang/String;)Ljavax/swing/text/html/CSS$Attribute;
  (Ljava/lang/String;)Ljavax/swing/text/html/CSS$Attribute;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/FormView.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/FormView.eea
index 88b6a00a26..8164be3bc5 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/FormView.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/FormView.eea
@@ -15,7 +15,7 @@ actionPerformed
  (L1java/awt/event/ActionEvent;)V # @Inherited(java.awt.event.ActionListener)
 createComponent
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component; # @Inherited(javax.swing.text.ComponentView)
 imageSubmit
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/HTML.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/HTML.eea
index dee3934459..f5662806f1 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/HTML.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/HTML.eea
@@ -6,13 +6,13 @@ NULL_ATTRIBUTE_VALUE
 
 getAllAttributeKeys
  ()[Ljavax/swing/text/html/HTML$Attribute;
- ()[Ljavax/swing/text/html/HTML$Attribute;
+ ()[1Ljavax/swing/text/html/HTML$Attribute;
 getAllTags
  ()[Ljavax/swing/text/html/HTML$Tag;
- ()[Ljavax/swing/text/html/HTML$Tag;
+ ()[1Ljavax/swing/text/html/HTML$Tag;
 getAttributeKey
  (Ljava/lang/String;)Ljavax/swing/text/html/HTML$Attribute;
- (Ljava/lang/String;)Ljavax/swing/text/html/HTML$Attribute;
+ (Ljava/lang/String;)L0javax/swing/text/html/HTML$Attribute;
 getIntegerAttributeValue
  (Ljavax/swing/text/AttributeSet;Ljavax/swing/text/html/HTML$Attribute;I)I
  (Ljavax/swing/text/AttributeSet;Ljavax/swing/text/html/HTML$Attribute;I)I
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/HTMLDocument$BlockElement.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/HTMLDocument$BlockElement.eea
index 5cdf2ba233..e100ec133c 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/HTMLDocument$BlockElement.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/HTMLDocument$BlockElement.eea
@@ -5,7 +5,7 @@ class javax/swing/text/html/HTMLDocument$BlockElement
  (Ljavax/swing/text/html/HTMLDocument;Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;)V
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.text.AbstractDocument$BranchElement)
 getResolveParent
  ()Ljavax/swing/text/AttributeSet;
- ()Ljavax/swing/text/AttributeSet;
+ ()L0javax/swing/text/AttributeSet;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/HTMLDocument$RunElement.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/HTMLDocument$RunElement.eea
index 34b4d06888..6f02fa9ffd 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/HTMLDocument$RunElement.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/HTMLDocument$RunElement.eea
@@ -5,7 +5,7 @@ class javax/swing/text/html/HTMLDocument$RunElement
  (Ljavax/swing/text/html/HTMLDocument;Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;II)V
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.text.AbstractDocument$LeafElement)
 getResolveParent
  ()Ljavax/swing/text/AttributeSet;
- ()Ljavax/swing/text/AttributeSet;
+ ()L0javax/swing/text/AttributeSet;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/HTMLDocument.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/HTMLDocument.eea
index e242d908df..080fde65ba 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/HTMLDocument.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/HTMLDocument.eea
@@ -15,13 +15,13 @@ create
  ([Ljavax/swing/text/DefaultStyledDocument$ElementSpec;)V
 createBranchElement
  (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/Element;
- (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/Element;
+ (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;)L1javax/swing/text/Element; # @Inherited(javax.swing.text.AbstractDocument)
 createDefaultRoot
  ()Ljavax/swing/text/AbstractDocument$AbstractElement;
- ()Ljavax/swing/text/AbstractDocument$AbstractElement;
+ ()L1javax/swing/text/AbstractDocument$AbstractElement; # @Inherited(javax.swing.text.DefaultStyledDocument)
 createLeafElement
  (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;II)Ljavax/swing/text/Element;
- (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;II)Ljavax/swing/text/Element;
+ (Ljavax/swing/text/Element;Ljavax/swing/text/AttributeSet;II)L1javax/swing/text/Element; # @Inherited(javax.swing.text.AbstractDocument)
 fireChangedUpdate
  (Ljavax/swing/event/DocumentEvent;)V
  (Ljavax/swing/event/DocumentEvent;)V
@@ -39,13 +39,13 @@ getElement
  (Ljavax/swing/text/Element;Ljava/lang/Object;Ljava/lang/Object;)Ljavax/swing/text/Element;
 getIterator
  (Ljavax/swing/text/html/HTML$Tag;)Ljavax/swing/text/html/HTMLDocument$Iterator;
- (Ljavax/swing/text/html/HTML$Tag;)Ljavax/swing/text/html/HTMLDocument$Iterator;
+ (Ljavax/swing/text/html/HTML$Tag;)L0javax/swing/text/html/HTMLDocument$Iterator;
 getParser
  ()Ljavax/swing/text/html/HTMLEditorKit$Parser;
  ()Ljavax/swing/text/html/HTMLEditorKit$Parser;
 getReader
  (I)Ljavax/swing/text/html/HTMLEditorKit$ParserCallback;
- (I)Ljavax/swing/text/html/HTMLEditorKit$ParserCallback;
+ (I)L1javax/swing/text/html/HTMLEditorKit$ParserCallback;
 getReader
  (IIILjavax/swing/text/html/HTML$Tag;)Ljavax/swing/text/html/HTMLEditorKit$ParserCallback;
  (IIILjavax/swing/text/html/HTML$Tag;)Ljavax/swing/text/html/HTMLEditorKit$ParserCallback;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/HTMLEditorKit$HTMLFactory.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/HTMLEditorKit$HTMLFactory.eea
index 1bafecc05e..ade9c0a4e8 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/HTMLEditorKit$HTMLFactory.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/HTMLEditorKit$HTMLFactory.eea
@@ -2,4 +2,4 @@ class javax/swing/text/html/HTMLEditorKit$HTMLFactory
 
 create
  (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
- (Ljavax/swing/text/Element;)Ljavax/swing/text/View;
+ (Ljavax/swing/text/Element;)L1javax/swing/text/View; # @Inherited(javax.swing.text.ViewFactory)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/HTMLEditorKit.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/HTMLEditorKit.eea
index 5ff7133f0d..3f70a13929 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/HTMLEditorKit.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/HTMLEditorKit.eea
@@ -45,7 +45,7 @@ clone
  ()L1java/lang/Object; # @Inherited(javax.swing.text.StyledEditorKit)
 createDefaultDocument
  ()Ljavax/swing/text/Document;
- ()Ljavax/swing/text/Document;
+ ()L1javax/swing/text/Document; # @Inherited(javax.swing.text.StyledEditorKit)
 createInputAttributes
  (Ljavax/swing/text/Element;Ljavax/swing/text/MutableAttributeSet;)V
  (Ljavax/swing/text/Element;Ljavax/swing/text/MutableAttributeSet;)V
@@ -54,13 +54,13 @@ deinstall
  (Ljavax/swing/JEditorPane;)V
 getAccessibleContext
  ()Ljavax/accessibility/AccessibleContext;
- ()Ljavax/accessibility/AccessibleContext;
+ ()L0javax/accessibility/AccessibleContext;
 getActions
  ()[Ljavax/swing/Action;
  ()[Ljavax/swing/Action;
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.text.DefaultEditorKit)
 getDefaultCursor
  ()Ljava/awt/Cursor;
  ()Ljava/awt/Cursor;
@@ -75,10 +75,10 @@ getParser
  ()Ljavax/swing/text/html/HTMLEditorKit$Parser;
 getStyleSheet
  ()Ljavax/swing/text/html/StyleSheet;
- ()Ljavax/swing/text/html/StyleSheet;
+ ()L1javax/swing/text/html/StyleSheet;
 getViewFactory
  ()Ljavax/swing/text/ViewFactory;
- ()Ljavax/swing/text/ViewFactory;
+ ()L0javax/swing/text/ViewFactory; # @Inherited(javax.swing.text.StyledEditorKit)
 insertHTML
  (Ljavax/swing/text/html/HTMLDocument;ILjava/lang/String;IILjavax/swing/text/html/HTML$Tag;)V
  (Ljavax/swing/text/html/HTMLDocument;ILjava/lang/String;IILjavax/swing/text/html/HTML$Tag;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/ImageView.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/ImageView.eea
index ec0b987cac..9317c516fd 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/ImageView.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/ImageView.eea
@@ -17,7 +17,7 @@ getImage
  ()Ljava/awt/Image;
 getImageURL
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L0java/net/URL;
 getLoadingImageIcon
  ()Ljavax/swing/Icon;
  ()Ljavax/swing/Icon;
@@ -29,10 +29,10 @@ getStyleSheet
  ()Ljavax/swing/text/html/StyleSheet;
 getToolTipText
  (FFLjava/awt/Shape;)Ljava/lang/String;
- (FFLjava/awt/Shape;)Ljava/lang/String;
+ (FFLjava/awt/Shape;)L0java/lang/String; # @Inherited(javax.swing.text.View)
 modelToView
  (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)Ljava/awt/Shape;
- (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)Ljava/awt/Shape;
+ (ILjava/awt/Shape;Ljavax/swing/text/Position$Bias;)L0java/awt/Shape;
 paint
  (Ljava/awt/Graphics;Ljava/awt/Shape;)V
  (Ljava/awt/Graphics;Ljava/awt/Shape;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/ObjectView.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/ObjectView.eea
index c866e95a2c..b66d5ff681 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/ObjectView.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/ObjectView.eea
@@ -5,4 +5,4 @@ class javax/swing/text/html/ObjectView
  (Ljavax/swing/text/Element;)V
 createComponent
  ()Ljava/awt/Component;
- ()Ljava/awt/Component;
+ ()L1java/awt/Component; # @Inherited(javax.swing.text.ComponentView)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/ParagraphView.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/ParagraphView.eea
index ce3f592638..1178a6cadc 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/ParagraphView.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/ParagraphView.eea
@@ -5,7 +5,7 @@ class javax/swing/text/html/ParagraphView
  (Ljavax/swing/text/Element;)V
 calculateMinorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.ParagraphView)
 getAttributes
  ()Ljavax/swing/text/AttributeSet;
  ()Ljavax/swing/text/AttributeSet;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/StyleSheet.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/StyleSheet.eea
index 1ab3dfab2b..119b0d3371 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/StyleSheet.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/StyleSheet.eea
@@ -20,10 +20,10 @@ addStyleSheet
  (Ljavax/swing/text/html/StyleSheet;)V
 createLargeAttributeSet
  (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/MutableAttributeSet;
- (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/MutableAttributeSet;
+ (Ljavax/swing/text/AttributeSet;)L1javax/swing/text/MutableAttributeSet; # @Inherited(javax.swing.text.StyleContext)
 createSmallAttributeSet
  (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/StyleContext$SmallAttributeSet;
- (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/StyleContext$SmallAttributeSet;
+ (Ljavax/swing/text/AttributeSet;)L1javax/swing/text/StyleContext$SmallAttributeSet; # @Inherited(javax.swing.text.StyleContext)
 getBackground
  (Ljavax/swing/text/AttributeSet;)Ljava/awt/Color;
  (Ljavax/swing/text/AttributeSet;)Ljava/awt/Color;
@@ -32,7 +32,7 @@ getBase
  ()Ljava/net/URL;
 getBoxPainter
  (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/html/StyleSheet$BoxPainter;
- (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/html/StyleSheet$BoxPainter;
+ (Ljavax/swing/text/AttributeSet;)L1javax/swing/text/html/StyleSheet$BoxPainter;
 getDeclaration
  (Ljava/lang/String;)Ljavax/swing/text/AttributeSet;
  (Ljava/lang/String;)Ljavax/swing/text/AttributeSet;
@@ -44,22 +44,22 @@ getForeground
  (Ljavax/swing/text/AttributeSet;)Ljava/awt/Color;
 getListPainter
  (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/html/StyleSheet$ListPainter;
- (Ljavax/swing/text/AttributeSet;)Ljavax/swing/text/html/StyleSheet$ListPainter;
+ (Ljavax/swing/text/AttributeSet;)L1javax/swing/text/html/StyleSheet$ListPainter;
 getPointSize
  (Ljava/lang/String;)F
  (Ljava/lang/String;)F
 getRule
  (Ljava/lang/String;)Ljavax/swing/text/Style;
- (Ljava/lang/String;)Ljavax/swing/text/Style;
+ (Ljava/lang/String;)L0javax/swing/text/Style;
 getRule
  (Ljavax/swing/text/html/HTML$Tag;Ljavax/swing/text/Element;)Ljavax/swing/text/Style;
  (Ljavax/swing/text/html/HTML$Tag;Ljavax/swing/text/Element;)Ljavax/swing/text/Style;
 getStyleSheets
  ()[Ljavax/swing/text/html/StyleSheet;
- ()[Ljavax/swing/text/html/StyleSheet;
+ ()[0Ljavax/swing/text/html/StyleSheet;
 getViewAttributes
  (Ljavax/swing/text/View;)Ljavax/swing/text/AttributeSet;
- (Ljavax/swing/text/View;)Ljavax/swing/text/AttributeSet;
+ (Ljavax/swing/text/View;)L1javax/swing/text/AttributeSet;
 importStyleSheet
  (Ljava/net/URL;)V
  (Ljava/net/URL;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/TableView$RowView.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/TableView$RowView.eea
index 97026d3150..ee648bf7fb 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/TableView$RowView.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/TableView$RowView.eea
@@ -5,10 +5,10 @@ class javax/swing/text/html/TableView$RowView
  (Ljavax/swing/text/html/TableView;Ljavax/swing/text/Element;)V
 calculateMajorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.BoxView)
 calculateMinorAxisRequirements
  (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
- (ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;
+ (ILjavax/swing/SizeRequirements;)L1javax/swing/SizeRequirements; # @Inherited(javax.swing.text.BoxView)
 changedUpdate
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
  (Ljavax/swing/event/DocumentEvent;Ljava/awt/Shape;Ljavax/swing/text/ViewFactory;)V
@@ -20,7 +20,7 @@ getStyleSheet
  ()Ljavax/swing/text/html/StyleSheet;
 getViewAtPosition
  (ILjava/awt/Rectangle;)Ljavax/swing/text/View;
- (ILjava/awt/Rectangle;)Ljavax/swing/text/View;
+ (ILjava/awt/Rectangle;)L0javax/swing/text/View; # @Inherited(javax.swing.text.CompositeView)
 layoutMajorAxis
  (II[I[I)V
  (II[I[I)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/AttributeList.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/AttributeList.eea
index 54e1611eb9..e99866f038 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/AttributeList.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/AttributeList.eea
@@ -37,7 +37,7 @@ getValue
  ()Ljava/lang/String;
 getValues
  ()Ljava/util/Enumeration<*>;
- ()Ljava/util/Enumeration<*>;
+ ()L0java/util/Enumeration<*>;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/ContentModel.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/ContentModel.eea
index 89dcf577a8..c92e63b31e 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/ContentModel.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/ContentModel.eea
@@ -18,7 +18,7 @@ next
  (Ljavax/swing/text/html/parser/Element;)V
 first
  ()Ljavax/swing/text/html/parser/Element;
- ()Ljavax/swing/text/html/parser/Element;
+ ()L0javax/swing/text/html/parser/Element;
 first
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/DTD.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/DTD.eea
index 73ef37ed5f..f53d1809a3 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/DTD.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/DTD.eea
@@ -2,7 +2,7 @@ class javax/swing/text/html/parser/DTD
 
 getDTD
  (Ljava/lang/String;)Ljavax/swing/text/html/parser/DTD;
- (Ljava/lang/String;)Ljavax/swing/text/html/parser/DTD;
+ (Ljava/lang/String;)L1javax/swing/text/html/parser/DTD;
 putDTDHash
  (Ljava/lang/String;Ljavax/swing/text/html/parser/DTD;)V
  (Ljava/lang/String;Ljavax/swing/text/html/parser/DTD;)V
@@ -58,10 +58,10 @@ title
  (Ljava/lang/String;)V
 defAttributeList
  (Ljava/lang/String;IILjava/lang/String;Ljava/lang/String;Ljavax/swing/text/html/parser/AttributeList;)Ljavax/swing/text/html/parser/AttributeList;
- (Ljava/lang/String;IILjava/lang/String;Ljava/lang/String;Ljavax/swing/text/html/parser/AttributeList;)Ljavax/swing/text/html/parser/AttributeList;
+ (Ljava/lang/String;IILjava/lang/String;Ljava/lang/String;Ljavax/swing/text/html/parser/AttributeList;)L1javax/swing/text/html/parser/AttributeList;
 defContentModel
  (ILjava/lang/Object;Ljavax/swing/text/html/parser/ContentModel;)Ljavax/swing/text/html/parser/ContentModel;
- (ILjava/lang/Object;Ljavax/swing/text/html/parser/ContentModel;)Ljavax/swing/text/html/parser/ContentModel;
+ (ILjava/lang/Object;Ljavax/swing/text/html/parser/ContentModel;)L1javax/swing/text/html/parser/ContentModel;
 defElement
  (Ljava/lang/String;IZZLjavax/swing/text/html/parser/ContentModel;[Ljava/lang/String;[Ljava/lang/String;Ljavax/swing/text/html/parser/AttributeList;)Ljavax/swing/text/html/parser/Element;
  (Ljava/lang/String;IZZLjavax/swing/text/html/parser/ContentModel;[Ljava/lang/String;[Ljava/lang/String;Ljavax/swing/text/html/parser/AttributeList;)Ljavax/swing/text/html/parser/Element;
@@ -79,13 +79,13 @@ defineElement
  (Ljava/lang/String;IZZLjavax/swing/text/html/parser/ContentModel;Ljava/util/BitSet;Ljava/util/BitSet;Ljavax/swing/text/html/parser/AttributeList;)Ljavax/swing/text/html/parser/Element;
 defineEntity
  (Ljava/lang/String;I[C)Ljavax/swing/text/html/parser/Entity;
- (Ljava/lang/String;I[C)Ljavax/swing/text/html/parser/Entity;
+ (Ljava/lang/String;I[C)L1javax/swing/text/html/parser/Entity;
 getElement
  (I)Ljavax/swing/text/html/parser/Element;
  (I)Ljavax/swing/text/html/parser/Element;
 getElement
  (Ljava/lang/String;)Ljavax/swing/text/html/parser/Element;
- (Ljava/lang/String;)Ljavax/swing/text/html/parser/Element;
+ (Ljava/lang/String;)L1javax/swing/text/html/parser/Element;
 getEntity
  (I)Ljavax/swing/text/html/parser/Entity;
  (I)Ljavax/swing/text/html/parser/Entity;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/Element.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/Element.eea
index 8590071939..aa2fa88f5e 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/Element.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/Element.eea
@@ -25,10 +25,10 @@ name
 
 getAttribute
  (Ljava/lang/String;)Ljavax/swing/text/html/parser/AttributeList;
- (Ljava/lang/String;)Ljavax/swing/text/html/parser/AttributeList;
+ (Ljava/lang/String;)L0javax/swing/text/html/parser/AttributeList;
 getAttributeByValue
  (Ljava/lang/String;)Ljavax/swing/text/html/parser/AttributeList;
- (Ljava/lang/String;)Ljavax/swing/text/html/parser/AttributeList;
+ (Ljava/lang/String;)L0javax/swing/text/html/parser/AttributeList;
 getAttributes
  ()Ljavax/swing/text/html/parser/AttributeList;
  ()Ljavax/swing/text/html/parser/AttributeList;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/Entity.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/Entity.eea
index 1a43501bdc..cf2d68a99b 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/Entity.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/Entity.eea
@@ -22,4 +22,4 @@ getName
  ()Ljava/lang/String;
 getString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/Parser.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/Parser.eea
index 1b1a07657e..8b291a0e2d 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/Parser.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/Parser.eea
@@ -48,7 +48,7 @@ makeTag
  (Ljavax/swing/text/html/parser/Element;)Ljavax/swing/text/html/parser/TagElement;
 makeTag
  (Ljavax/swing/text/html/parser/Element;Z)Ljavax/swing/text/html/parser/TagElement;
- (Ljavax/swing/text/html/parser/Element;Z)Ljavax/swing/text/html/parser/TagElement;
+ (Ljavax/swing/text/html/parser/Element;Z)L1javax/swing/text/html/parser/TagElement;
 markFirstTime
  (Ljavax/swing/text/html/parser/Element;)V
  (Ljavax/swing/text/html/parser/Element;)V
@@ -57,7 +57,7 @@ parse
  (Ljava/io/Reader;)V
 parseDTDMarkup
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 parseMarkupDeclarations
  (Ljava/lang/StringBuffer;)Z
  (Ljava/lang/StringBuffer;)Z
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/ParserDelegator.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/ParserDelegator.eea
index b310038faa..b46d9d95d0 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/ParserDelegator.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/html/parser/ParserDelegator.eea
@@ -2,7 +2,7 @@ class javax/swing/text/html/parser/ParserDelegator
 
 createDTD
  (Ljavax/swing/text/html/parser/DTD;Ljava/lang/String;)Ljavax/swing/text/html/parser/DTD;
- (Ljavax/swing/text/html/parser/DTD;Ljava/lang/String;)Ljavax/swing/text/html/parser/DTD;
+ (Ljavax/swing/text/html/parser/DTD;Ljava/lang/String;)L1javax/swing/text/html/parser/DTD;
 
 parse
  (Ljava/io/Reader;Ljavax/swing/text/html/HTMLEditorKit$ParserCallback;Z)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/text/rtf/RTFEditorKit.eea b/libs/eea-java-21/src/main/resources/javax/swing/text/rtf/RTFEditorKit.eea
index f45a9617fa..8f83af82a9 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/text/rtf/RTFEditorKit.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/text/rtf/RTFEditorKit.eea
@@ -2,7 +2,7 @@ class javax/swing/text/rtf/RTFEditorKit
 
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.text.DefaultEditorKit)
 read
  (Ljava/io/InputStream;Ljavax/swing/text/Document;I)V
  (Ljava/io/InputStream;Ljavax/swing/text/Document;I)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/tree/AbstractLayoutCache.eea b/libs/eea-java-21/src/main/resources/javax/swing/tree/AbstractLayoutCache.eea
index 24a9d1a1b2..9e584778ea 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/tree/AbstractLayoutCache.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/tree/AbstractLayoutCache.eea
@@ -24,7 +24,7 @@ getNodeDimensions
  ()Ljavax/swing/tree/AbstractLayoutCache$NodeDimensions;
 getNodeDimensions
  (Ljava/lang/Object;IIZLjava/awt/Rectangle;)Ljava/awt/Rectangle;
- (Ljava/lang/Object;IIZLjava/awt/Rectangle;)Ljava/awt/Rectangle;
+ (Ljava/lang/Object;IIZLjava/awt/Rectangle;)L0java/awt/Rectangle;
 getPathClosestTo
  (II)Ljavax/swing/tree/TreePath;
  (II)Ljavax/swing/tree/TreePath;
@@ -39,7 +39,7 @@ getRowForPath
  (Ljavax/swing/tree/TreePath;)I
 getRowsForPaths
  ([Ljavax/swing/tree/TreePath;)[I
- ([Ljavax/swing/tree/TreePath;)[I
+ ([Ljavax/swing/tree/TreePath;)[I # @PolyNull
 getSelectionModel
  ()Ljavax/swing/tree/TreeSelectionModel;
  ()Ljavax/swing/tree/TreeSelectionModel;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/tree/DefaultMutableTreeNode.eea b/libs/eea-java-21/src/main/resources/javax/swing/tree/DefaultMutableTreeNode.eea
index e53cb425a9..20bf4b9836 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/tree/DefaultMutableTreeNode.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/tree/DefaultMutableTreeNode.eea
@@ -25,7 +25,7 @@ add
  (Ljavax/swing/tree/MutableTreeNode;)V
 breadthFirstEnumeration
  ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
- ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
+ ()L1java/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
 children
  ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
  ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
@@ -37,13 +37,13 @@ depthFirstEnumeration
  ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
 getChildAfter
  (Ljavax/swing/tree/TreeNode;)Ljavax/swing/tree/TreeNode;
- (Ljavax/swing/tree/TreeNode;)Ljavax/swing/tree/TreeNode;
+ (Ljavax/swing/tree/TreeNode;)L0javax/swing/tree/TreeNode;
 getChildAt
  (I)Ljavax/swing/tree/TreeNode;
  (I)Ljavax/swing/tree/TreeNode;
 getChildBefore
  (Ljavax/swing/tree/TreeNode;)Ljavax/swing/tree/TreeNode;
- (Ljavax/swing/tree/TreeNode;)Ljavax/swing/tree/TreeNode;
+ (Ljavax/swing/tree/TreeNode;)L0javax/swing/tree/TreeNode;
 getFirstChild
  ()Ljavax/swing/tree/TreeNode;
  ()Ljavax/swing/tree/TreeNode;
@@ -61,10 +61,10 @@ getLastLeaf
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
 getNextLeaf
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
- ()Ljavax/swing/tree/DefaultMutableTreeNode;
+ ()L0javax/swing/tree/DefaultMutableTreeNode;
 getNextNode
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
- ()Ljavax/swing/tree/DefaultMutableTreeNode;
+ ()L0javax/swing/tree/DefaultMutableTreeNode;
 getNextSibling
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
@@ -76,13 +76,13 @@ getPath
  ()[Ljavax/swing/tree/TreeNode;
 getPathToRoot
  (Ljavax/swing/tree/TreeNode;I)[Ljavax/swing/tree/TreeNode;
- (Ljavax/swing/tree/TreeNode;I)[Ljavax/swing/tree/TreeNode;
+ (Ljavax/swing/tree/TreeNode;I)[0Ljavax/swing/tree/TreeNode;
 getPreviousLeaf
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
- ()Ljavax/swing/tree/DefaultMutableTreeNode;
+ ()L0javax/swing/tree/DefaultMutableTreeNode;
 getPreviousNode
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
- ()Ljavax/swing/tree/DefaultMutableTreeNode;
+ ()L0javax/swing/tree/DefaultMutableTreeNode;
 getPreviousSibling
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
  ()Ljavax/swing/tree/DefaultMutableTreeNode;
@@ -91,13 +91,13 @@ getRoot
  ()Ljavax/swing/tree/TreeNode;
 getSharedAncestor
  (Ljavax/swing/tree/DefaultMutableTreeNode;)Ljavax/swing/tree/TreeNode;
- (Ljavax/swing/tree/DefaultMutableTreeNode;)Ljavax/swing/tree/TreeNode;
+ (Ljavax/swing/tree/DefaultMutableTreeNode;)L0javax/swing/tree/TreeNode;
 getUserObject
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
 getUserObjectPath
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[1Ljava/lang/Object;
 insert
  (Ljavax/swing/tree/MutableTreeNode;I)V
  (Ljavax/swing/tree/MutableTreeNode;I)V
@@ -118,13 +118,13 @@ isNodeSibling
  (Ljavax/swing/tree/TreeNode;)Z
 pathFromAncestorEnumeration
  (Ljavax/swing/tree/TreeNode;)Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
- (Ljavax/swing/tree/TreeNode;)Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
+ (Ljavax/swing/tree/TreeNode;)L1java/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
 postorderEnumeration
  ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
- ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
+ ()L1java/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
 preorderEnumeration
  ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
- ()Ljava/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
+ ()L1java/util/Enumeration<Ljavax/swing/tree/TreeNode;>;
 remove
  (Ljavax/swing/tree/MutableTreeNode;)V
  (Ljavax/swing/tree/MutableTreeNode;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/tree/DefaultTreeCellEditor.eea b/libs/eea-java-21/src/main/resources/javax/swing/tree/DefaultTreeCellEditor.eea
index e4ec8ceb20..81cef5e884 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/tree/DefaultTreeCellEditor.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/tree/DefaultTreeCellEditor.eea
@@ -48,10 +48,10 @@ canEditImmediately
  (Ljava/util/EventObject;)Z
 createContainer
  ()Ljava/awt/Container;
- ()Ljava/awt/Container;
+ ()L1java/awt/Container;
 createTreeCellEditor
  ()Ljavax/swing/tree/TreeCellEditor;
- ()Ljavax/swing/tree/TreeCellEditor;
+ ()L1javax/swing/tree/TreeCellEditor;
 determineOffset
  (Ljavax/swing/JTree;Ljava/lang/Object;ZZZI)V
  (Ljavax/swing/JTree;Ljava/lang/Object;ZZZI)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/tree/DefaultTreeModel.eea b/libs/eea-java-21/src/main/resources/javax/swing/tree/DefaultTreeModel.eea
index 6ff14ee4c1..51e5425857 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/tree/DefaultTreeModel.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/tree/DefaultTreeModel.eea
@@ -45,7 +45,7 @@ getPathToRoot
  (Ljavax/swing/tree/TreeNode;)[Ljavax/swing/tree/TreeNode;
 getPathToRoot
  (Ljavax/swing/tree/TreeNode;I)[Ljavax/swing/tree/TreeNode;
- (Ljavax/swing/tree/TreeNode;I)[Ljavax/swing/tree/TreeNode;
+ (Ljavax/swing/tree/TreeNode;I)[0Ljavax/swing/tree/TreeNode;
 getRoot
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/tree/DefaultTreeSelectionModel.eea b/libs/eea-java-21/src/main/resources/javax/swing/tree/DefaultTreeSelectionModel.eea
index f61770361c..98c8fc41a5 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/tree/DefaultTreeSelectionModel.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/tree/DefaultTreeSelectionModel.eea
@@ -64,13 +64,13 @@ getRowMapper
  ()Ljavax/swing/tree/RowMapper;
 getSelectionPath
  ()Ljavax/swing/tree/TreePath;
- ()Ljavax/swing/tree/TreePath;
+ ()L0javax/swing/tree/TreePath;
 getSelectionPaths
  ()[Ljavax/swing/tree/TreePath;
- ()[Ljavax/swing/tree/TreePath;
+ ()[1Ljavax/swing/tree/TreePath;
 getSelectionRows
  ()[I
- ()[I
+ ()[1I
 getTreeSelectionListeners
  ()[Ljavax/swing/event/TreeSelectionListener;
  ()[Ljavax/swing/event/TreeSelectionListener;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/tree/FixedHeightLayoutCache.eea b/libs/eea-java-21/src/main/resources/javax/swing/tree/FixedHeightLayoutCache.eea
index 85b2b881f6..778ab74267 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/tree/FixedHeightLayoutCache.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/tree/FixedHeightLayoutCache.eea
@@ -2,16 +2,16 @@ class javax/swing/tree/FixedHeightLayoutCache
 
 getBounds
  (Ljavax/swing/tree/TreePath;Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
- (Ljavax/swing/tree/TreePath;Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
+ (Ljavax/swing/tree/TreePath;Ljava/awt/Rectangle;)L0java/awt/Rectangle;
 getExpandedState
  (Ljavax/swing/tree/TreePath;)Z
  (Ljavax/swing/tree/TreePath;)Z
 getPathClosestTo
  (II)Ljavax/swing/tree/TreePath;
- (II)Ljavax/swing/tree/TreePath;
+ (II)L0javax/swing/tree/TreePath;
 getPathForRow
  (I)Ljavax/swing/tree/TreePath;
- (I)Ljavax/swing/tree/TreePath;
+ (I)L0javax/swing/tree/TreePath;
 getRowForPath
  (Ljavax/swing/tree/TreePath;)I
  (Ljavax/swing/tree/TreePath;)I
@@ -20,7 +20,7 @@ getVisibleChildCount
  (Ljavax/swing/tree/TreePath;)I
 getVisiblePathsFrom
  (Ljavax/swing/tree/TreePath;)Ljava/util/Enumeration<Ljavax/swing/tree/TreePath;>;
- (Ljavax/swing/tree/TreePath;)Ljava/util/Enumeration<Ljavax/swing/tree/TreePath;>;
+ (Ljavax/swing/tree/TreePath;)L0java/util/Enumeration<Ljavax/swing/tree/TreePath;>;
 invalidatePathBounds
  (Ljavax/swing/tree/TreePath;)V
  (Ljavax/swing/tree/TreePath;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/tree/TreePath.eea b/libs/eea-java-21/src/main/resources/javax/swing/tree/TreePath.eea
index fb9d151197..88b86f83cf 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/tree/TreePath.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/tree/TreePath.eea
@@ -23,7 +23,7 @@ getParentPath
  ()Ljavax/swing/tree/TreePath;
 getPath
  ()[Ljava/lang/Object;
- ()[Ljava/lang/Object;
+ ()[1Ljava/lang/Object;
 getPathComponent
  (I)Ljava/lang/Object;
  (I)Ljava/lang/Object;
@@ -32,7 +32,7 @@ isDescendant
  (Ljavax/swing/tree/TreePath;)Z
 pathByAddingChild
  (Ljava/lang/Object;)Ljavax/swing/tree/TreePath;
- (Ljava/lang/Object;)Ljavax/swing/tree/TreePath;
+ (Ljava/lang/Object;)L1javax/swing/tree/TreePath;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/tree/VariableHeightLayoutCache.eea b/libs/eea-java-21/src/main/resources/javax/swing/tree/VariableHeightLayoutCache.eea
index 0c7ebf33ff..a8f7b0ac88 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/tree/VariableHeightLayoutCache.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/tree/VariableHeightLayoutCache.eea
@@ -2,16 +2,16 @@ class javax/swing/tree/VariableHeightLayoutCache
 
 getBounds
  (Ljavax/swing/tree/TreePath;Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
- (Ljavax/swing/tree/TreePath;Ljava/awt/Rectangle;)Ljava/awt/Rectangle;
+ (Ljavax/swing/tree/TreePath;Ljava/awt/Rectangle;)L0java/awt/Rectangle;
 getExpandedState
  (Ljavax/swing/tree/TreePath;)Z
  (Ljavax/swing/tree/TreePath;)Z
 getPathClosestTo
  (II)Ljavax/swing/tree/TreePath;
- (II)Ljavax/swing/tree/TreePath;
+ (II)L0javax/swing/tree/TreePath;
 getPathForRow
  (I)Ljavax/swing/tree/TreePath;
- (I)Ljavax/swing/tree/TreePath;
+ (I)L0javax/swing/tree/TreePath;
 getPreferredWidth
  (Ljava/awt/Rectangle;)I
  (Ljava/awt/Rectangle;)I
@@ -23,7 +23,7 @@ getVisibleChildCount
  (Ljavax/swing/tree/TreePath;)I
 getVisiblePathsFrom
  (Ljavax/swing/tree/TreePath;)Ljava/util/Enumeration<Ljavax/swing/tree/TreePath;>;
- (Ljavax/swing/tree/TreePath;)Ljava/util/Enumeration<Ljavax/swing/tree/TreePath;>;
+ (Ljavax/swing/tree/TreePath;)L0java/util/Enumeration<Ljavax/swing/tree/TreePath;>;
 invalidatePathBounds
  (Ljavax/swing/tree/TreePath;)V
  (Ljavax/swing/tree/TreePath;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/undo/AbstractUndoableEdit.eea b/libs/eea-java-21/src/main/resources/javax/swing/undo/AbstractUndoableEdit.eea
index f4dc75513b..61f7013a6a 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/undo/AbstractUndoableEdit.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/undo/AbstractUndoableEdit.eea
@@ -12,7 +12,7 @@ addEdit
  (Ljavax/swing/undo/UndoableEdit;)Z
 getPresentationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getRedoPresentationName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/undo/CompoundEdit.eea b/libs/eea-java-21/src/main/resources/javax/swing/undo/CompoundEdit.eea
index a1eb0144e1..f253090e1c 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/undo/CompoundEdit.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/undo/CompoundEdit.eea
@@ -9,7 +9,7 @@ addEdit
  (Ljavax/swing/undo/UndoableEdit;)Z
 getPresentationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.undo.AbstractUndoableEdit)
 getRedoPresentationName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -18,7 +18,7 @@ getUndoPresentationName
  ()Ljava/lang/String;
 lastEdit
  ()Ljavax/swing/undo/UndoableEdit;
- ()Ljavax/swing/undo/UndoableEdit;
+ ()L0javax/swing/undo/UndoableEdit;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(javax.swing.undo.AbstractUndoableEdit)
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/undo/StateEdit.eea b/libs/eea-java-21/src/main/resources/javax/swing/undo/StateEdit.eea
index d306f4d53f..8736a7920d 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/undo/StateEdit.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/undo/StateEdit.eea
@@ -25,7 +25,7 @@ undoRedoName
  (Ljavax/swing/undo/StateEditable;Ljava/lang/String;)V
 getPresentationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(javax.swing.undo.AbstractUndoableEdit)
 init
  (Ljavax/swing/undo/StateEditable;Ljava/lang/String;)V
  (Ljavax/swing/undo/StateEditable;Ljava/lang/String;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/undo/UndoManager.eea b/libs/eea-java-21/src/main/resources/javax/swing/undo/UndoManager.eea
index 215f924e78..a32cf35d53 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/undo/UndoManager.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/undo/UndoManager.eea
@@ -5,10 +5,10 @@ addEdit
  (Ljavax/swing/undo/UndoableEdit;)Z
 editToBeRedone
  ()Ljavax/swing/undo/UndoableEdit;
- ()Ljavax/swing/undo/UndoableEdit;
+ ()L0javax/swing/undo/UndoableEdit;
 editToBeUndone
  ()Ljavax/swing/undo/UndoableEdit;
- ()Ljavax/swing/undo/UndoableEdit;
+ ()L0javax/swing/undo/UndoableEdit;
 getRedoPresentationName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/javax/swing/undo/UndoableEditSupport.eea b/libs/eea-java-21/src/main/resources/javax/swing/undo/UndoableEditSupport.eea
index 986e5864e4..4002a4a243 100644
--- a/libs/eea-java-21/src/main/resources/javax/swing/undo/UndoableEditSupport.eea
+++ b/libs/eea-java-21/src/main/resources/javax/swing/undo/UndoableEditSupport.eea
@@ -21,7 +21,7 @@ addUndoableEditListener
  (L1javax/swing/event/UndoableEditListener;)V
 createCompoundEdit
  ()Ljavax/swing/undo/CompoundEdit;
- ()Ljavax/swing/undo/CompoundEdit;
+ ()L1javax/swing/undo/CompoundEdit;
 getUndoableEditListeners
  ()[Ljavax/swing/event/UndoableEditListener;
  ()[Ljavax/swing/event/UndoableEditListener;
diff --git a/libs/eea-java-21/src/main/resources/javax/tools/ForwardingJavaFileManager.eea b/libs/eea-java-21/src/main/resources/javax/tools/ForwardingJavaFileManager.eea
index a5539ac81a..3dd49fcad0 100644
--- a/libs/eea-java-21/src/main/resources/javax/tools/ForwardingJavaFileManager.eea
+++ b/libs/eea-java-21/src/main/resources/javax/tools/ForwardingJavaFileManager.eea
@@ -35,13 +35,13 @@ getJavaFileForOutputForOriginatingFiles
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;Ljavax/tools/JavaFileObject$Kind;[Ljavax/tools/FileObject;)Ljavax/tools/JavaFileObject;
 getLocationForModule
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;)Ljavax/tools/JavaFileManager$Location;
- (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;)Ljavax/tools/JavaFileManager$Location;
+ (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;)L1javax/tools/JavaFileManager$Location; # @Inherited(javax.tools.JavaFileManager)
 getLocationForModule
  (Ljavax/tools/JavaFileManager$Location;Ljavax/tools/JavaFileObject;)Ljavax/tools/JavaFileManager$Location;
- (Ljavax/tools/JavaFileManager$Location;Ljavax/tools/JavaFileObject;)Ljavax/tools/JavaFileManager$Location;
+ (Ljavax/tools/JavaFileManager$Location;Ljavax/tools/JavaFileObject;)L1javax/tools/JavaFileManager$Location; # @Inherited(javax.tools.JavaFileManager)
 getServiceLoader
  <S:Ljava/lang/Object;>(Ljavax/tools/JavaFileManager$Location;Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
- <S:Ljava/lang/Object;>(Ljavax/tools/JavaFileManager$Location;Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
+ <S:Ljava/lang/Object;>(Ljavax/tools/JavaFileManager$Location;Ljava/lang/Class<TS;>;)L1java/util/ServiceLoader<TS;>; # @Inherited(javax.tools.JavaFileManager)
 handleOption
  (Ljava/lang/String;Ljava/util/Iterator<Ljava/lang/String;>;)Z
  (Ljava/lang/String;Ljava/util/Iterator<Ljava/lang/String;>;)Z
@@ -53,7 +53,7 @@ inferBinaryName
  (Ljavax/tools/JavaFileManager$Location;Ljavax/tools/JavaFileObject;)Ljava/lang/String;
 inferModuleName
  (Ljavax/tools/JavaFileManager$Location;)Ljava/lang/String;
- (Ljavax/tools/JavaFileManager$Location;)Ljava/lang/String;
+ (Ljavax/tools/JavaFileManager$Location;)L1java/lang/String; # @Inherited(javax.tools.JavaFileManager)
 isSameFile
  (Ljavax/tools/FileObject;Ljavax/tools/FileObject;)Z
  (Ljavax/tools/FileObject;Ljavax/tools/FileObject;)Z
@@ -65,4 +65,4 @@ list
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;Ljava/util/Set<Ljavax/tools/JavaFileObject$Kind;>;Z)Ljava/lang/Iterable<Ljavax/tools/JavaFileObject;>;
 listLocationsForModules
  (Ljavax/tools/JavaFileManager$Location;)Ljava/lang/Iterable<Ljava/util/Set<Ljavax/tools/JavaFileManager$Location;>;>;
- (Ljavax/tools/JavaFileManager$Location;)Ljava/lang/Iterable<Ljava/util/Set<Ljavax/tools/JavaFileManager$Location;>;>;
+ (Ljavax/tools/JavaFileManager$Location;)L1java/lang/Iterable<Ljava/util/Set<Ljavax/tools/JavaFileManager$Location;>;>; # @Inherited(javax.tools.JavaFileManager)
diff --git a/libs/eea-java-21/src/main/resources/javax/tools/JavaFileManager.eea b/libs/eea-java-21/src/main/resources/javax/tools/JavaFileManager.eea
index 06677c7987..35e48df477 100644
--- a/libs/eea-java-21/src/main/resources/javax/tools/JavaFileManager.eea
+++ b/libs/eea-java-21/src/main/resources/javax/tools/JavaFileManager.eea
@@ -26,13 +26,13 @@ getJavaFileForOutputForOriginatingFiles
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;Ljavax/tools/JavaFileObject$Kind;[Ljavax/tools/FileObject;)Ljavax/tools/JavaFileObject;
 getLocationForModule
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;)Ljavax/tools/JavaFileManager$Location;
- (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;)Ljavax/tools/JavaFileManager$Location;
+ (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;)L1javax/tools/JavaFileManager$Location;
 getLocationForModule
  (Ljavax/tools/JavaFileManager$Location;Ljavax/tools/JavaFileObject;)Ljavax/tools/JavaFileManager$Location;
- (Ljavax/tools/JavaFileManager$Location;Ljavax/tools/JavaFileObject;)Ljavax/tools/JavaFileManager$Location;
+ (Ljavax/tools/JavaFileManager$Location;Ljavax/tools/JavaFileObject;)L1javax/tools/JavaFileManager$Location;
 getServiceLoader
  <S:Ljava/lang/Object;>(Ljavax/tools/JavaFileManager$Location;Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
- <S:Ljava/lang/Object;>(Ljavax/tools/JavaFileManager$Location;Ljava/lang/Class<TS;>;)Ljava/util/ServiceLoader<TS;>;
+ <S:Ljava/lang/Object;>(Ljavax/tools/JavaFileManager$Location;Ljava/lang/Class<TS;>;)L1java/util/ServiceLoader<TS;>;
 handleOption
  (Ljava/lang/String;Ljava/util/Iterator<Ljava/lang/String;>;)Z
  (Ljava/lang/String;Ljava/util/Iterator<Ljava/lang/String;>;)Z
@@ -44,7 +44,7 @@ inferBinaryName
  (Ljavax/tools/JavaFileManager$Location;Ljavax/tools/JavaFileObject;)Ljava/lang/String;
 inferModuleName
  (Ljavax/tools/JavaFileManager$Location;)Ljava/lang/String;
- (Ljavax/tools/JavaFileManager$Location;)Ljava/lang/String;
+ (Ljavax/tools/JavaFileManager$Location;)L1java/lang/String;
 isSameFile
  (Ljavax/tools/FileObject;Ljavax/tools/FileObject;)Z
  (Ljavax/tools/FileObject;Ljavax/tools/FileObject;)Z
@@ -53,4 +53,4 @@ list
  (Ljavax/tools/JavaFileManager$Location;Ljava/lang/String;Ljava/util/Set<Ljavax/tools/JavaFileObject$Kind;>;Z)Ljava/lang/Iterable<Ljavax/tools/JavaFileObject;>;
 listLocationsForModules
  (Ljavax/tools/JavaFileManager$Location;)Ljava/lang/Iterable<Ljava/util/Set<Ljavax/tools/JavaFileManager$Location;>;>;
- (Ljavax/tools/JavaFileManager$Location;)Ljava/lang/Iterable<Ljava/util/Set<Ljavax/tools/JavaFileManager$Location;>;>;
+ (Ljavax/tools/JavaFileManager$Location;)L1java/lang/Iterable<Ljava/util/Set<Ljavax/tools/JavaFileManager$Location;>;>;
diff --git a/libs/eea-java-21/src/main/resources/javax/tools/SimpleJavaFileObject.eea b/libs/eea-java-21/src/main/resources/javax/tools/SimpleJavaFileObject.eea
index 623fc92f89..b128217582 100644
--- a/libs/eea-java-21/src/main/resources/javax/tools/SimpleJavaFileObject.eea
+++ b/libs/eea-java-21/src/main/resources/javax/tools/SimpleJavaFileObject.eea
@@ -12,10 +12,10 @@ uri
  (Ljava/net/URI;Ljavax/tools/JavaFileObject$Kind;)V
 getAccessLevel
  ()Ljavax/lang/model/element/Modifier;
- ()Ljavax/lang/model/element/Modifier;
+ ()L0javax/lang/model/element/Modifier;
 getCharContent
  (Z)Ljava/lang/CharSequence;
- (Z)Ljava/lang/CharSequence;
+ (Z)L1java/lang/CharSequence;
 getKind
  ()Ljavax/tools/JavaFileObject$Kind;
  ()Ljavax/tools/JavaFileObject$Kind;
@@ -24,7 +24,7 @@ getName
  ()Ljava/lang/String;
 getNestingKind
  ()Ljavax/lang/model/element/NestingKind;
- ()Ljavax/lang/model/element/NestingKind;
+ ()L0javax/lang/model/element/NestingKind;
 isNameCompatible
  (Ljava/lang/String;Ljavax/tools/JavaFileObject$Kind;)Z
  (Ljava/lang/String;Ljavax/tools/JavaFileObject$Kind;)Z
@@ -36,7 +36,7 @@ openOutputStream
  ()L1java/io/OutputStream; # @Inherited(javax.tools.FileObject)
 openReader
  (Z)Ljava/io/Reader;
- (Z)Ljava/io/Reader;
+ (Z)L1java/io/Reader;
 openWriter
  ()Ljava/io/Writer;
  ()L1java/io/Writer; # @Inherited(javax.tools.FileObject)
diff --git a/libs/eea-java-21/src/main/resources/javax/tools/StandardJavaFileManager.eea b/libs/eea-java-21/src/main/resources/javax/tools/StandardJavaFileManager.eea
index 9dba40b49b..2c109ddf8d 100644
--- a/libs/eea-java-21/src/main/resources/javax/tools/StandardJavaFileManager.eea
+++ b/libs/eea-java-21/src/main/resources/javax/tools/StandardJavaFileManager.eea
@@ -2,7 +2,7 @@ class javax/tools/StandardJavaFileManager
 
 asPath
  (Ljavax/tools/FileObject;)Ljava/nio/file/Path;
- (Ljavax/tools/FileObject;)Ljava/nio/file/Path;
+ (Ljavax/tools/FileObject;)L1java/nio/file/Path;
 getJavaFileObjects
  ([Ljava/io/File;)Ljava/lang/Iterable<+Ljavax/tools/JavaFileObject;>;
  ([Ljava/io/File;)Ljava/lang/Iterable<+Ljavax/tools/JavaFileObject;>;
diff --git a/libs/eea-java-21/src/main/resources/javax/tools/Tool.eea b/libs/eea-java-21/src/main/resources/javax/tools/Tool.eea
index 1e7dfab261..cc81fcd861 100644
--- a/libs/eea-java-21/src/main/resources/javax/tools/Tool.eea
+++ b/libs/eea-java-21/src/main/resources/javax/tools/Tool.eea
@@ -5,7 +5,7 @@ getSourceVersions
  ()Ljava/util/Set<Ljavax/lang/model/SourceVersion;>;
 name
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 run
  (Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/io/OutputStream;[Ljava/lang/String;)I
  (Ljava/io/InputStream;Ljava/io/OutputStream;Ljava/io/OutputStream;[Ljava/lang/String;)I
diff --git a/libs/eea-java-21/src/main/resources/javax/tools/ToolProvider.eea b/libs/eea-java-21/src/main/resources/javax/tools/ToolProvider.eea
index 03296df3c9..a1132393e0 100644
--- a/libs/eea-java-21/src/main/resources/javax/tools/ToolProvider.eea
+++ b/libs/eea-java-21/src/main/resources/javax/tools/ToolProvider.eea
@@ -8,4 +8,4 @@ getSystemJavaCompiler
  ()Ljavax/tools/JavaCompiler;
 getSystemToolClassLoader
  ()Ljava/lang/ClassLoader;
- ()Ljava/lang/ClassLoader;
+ ()L0java/lang/ClassLoader;
diff --git a/libs/eea-java-21/src/main/resources/javax/xml/catalog/CatalogFeatures.eea b/libs/eea-java-21/src/main/resources/javax/xml/catalog/CatalogFeatures.eea
index 32f8cf4486..ede3b59a03 100644
--- a/libs/eea-java-21/src/main/resources/javax/xml/catalog/CatalogFeatures.eea
+++ b/libs/eea-java-21/src/main/resources/javax/xml/catalog/CatalogFeatures.eea
@@ -2,7 +2,7 @@ class javax/xml/catalog/CatalogFeatures
 
 builder
  ()Ljavax/xml/catalog/CatalogFeatures$Builder;
- ()Ljavax/xml/catalog/CatalogFeatures$Builder;
+ ()L1javax/xml/catalog/CatalogFeatures$Builder;
 defaults
  ()Ljavax/xml/catalog/CatalogFeatures;
  ()Ljavax/xml/catalog/CatalogFeatures;
diff --git a/libs/eea-java-21/src/main/resources/javax/xml/catalog/CatalogManager.eea b/libs/eea-java-21/src/main/resources/javax/xml/catalog/CatalogManager.eea
index be92fd5a79..3f891bea06 100644
--- a/libs/eea-java-21/src/main/resources/javax/xml/catalog/CatalogManager.eea
+++ b/libs/eea-java-21/src/main/resources/javax/xml/catalog/CatalogManager.eea
@@ -2,10 +2,10 @@ class javax/xml/catalog/CatalogManager
 
 catalog
  (Ljavax/xml/catalog/CatalogFeatures;[Ljava/net/URI;)Ljavax/xml/catalog/Catalog;
- (Ljavax/xml/catalog/CatalogFeatures;[Ljava/net/URI;)Ljavax/xml/catalog/Catalog;
+ (Ljavax/xml/catalog/CatalogFeatures;[Ljava/net/URI;)L1javax/xml/catalog/Catalog;
 catalogResolver
  (Ljavax/xml/catalog/Catalog;)Ljavax/xml/catalog/CatalogResolver;
- (Ljavax/xml/catalog/Catalog;)Ljavax/xml/catalog/CatalogResolver;
+ (Ljavax/xml/catalog/Catalog;)L1javax/xml/catalog/CatalogResolver;
 catalogResolver
  (Ljavax/xml/catalog/CatalogFeatures;[Ljava/net/URI;)Ljavax/xml/catalog/CatalogResolver;
- (Ljavax/xml/catalog/CatalogFeatures;[Ljava/net/URI;)Ljavax/xml/catalog/CatalogResolver;
+ (Ljavax/xml/catalog/CatalogFeatures;[Ljava/net/URI;)L1javax/xml/catalog/CatalogResolver;
diff --git a/libs/eea-java-21/src/main/resources/javax/xml/catalog/GroupEntry$ResolveType.eea b/libs/eea-java-21/src/main/resources/javax/xml/catalog/GroupEntry$ResolveType.eea
index 6703a6de7a..db6bdcd020 100644
--- a/libs/eea-java-21/src/main/resources/javax/xml/catalog/GroupEntry$ResolveType.eea
+++ b/libs/eea-java-21/src/main/resources/javax/xml/catalog/GroupEntry$ResolveType.eea
@@ -6,7 +6,7 @@ super java/lang/Enum
 
 getType
  (Ljava/lang/String;)Ljavax/xml/catalog/GroupEntry$ResolveType;
- (Ljava/lang/String;)Ljavax/xml/catalog/GroupEntry$ResolveType;
+ (Ljava/lang/String;)L0javax/xml/catalog/GroupEntry$ResolveType;
 
 isType
  (Ljava/lang/String;)Z
diff --git a/libs/eea-java-21/src/main/resources/javax/xml/crypto/KeySelector.eea b/libs/eea-java-21/src/main/resources/javax/xml/crypto/KeySelector.eea
index ad0a2e4698..a2308507cf 100644
--- a/libs/eea-java-21/src/main/resources/javax/xml/crypto/KeySelector.eea
+++ b/libs/eea-java-21/src/main/resources/javax/xml/crypto/KeySelector.eea
@@ -2,7 +2,7 @@ class javax/xml/crypto/KeySelector
 
 singletonKeySelector
  (Ljava/security/Key;)Ljavax/xml/crypto/KeySelector;
- (Ljava/security/Key;)Ljavax/xml/crypto/KeySelector;
+ (Ljava/security/Key;)L1javax/xml/crypto/KeySelector;
 
 select
  (Ljavax/xml/crypto/dsig/keyinfo/KeyInfo;Ljavax/xml/crypto/KeySelector$Purpose;Ljavax/xml/crypto/AlgorithmMethod;Ljavax/xml/crypto/XMLCryptoContext;)Ljavax/xml/crypto/KeySelectorResult;
diff --git a/libs/eea-java-21/src/main/resources/javax/xml/datatype/DatatypeFactory.eea b/libs/eea-java-21/src/main/resources/javax/xml/datatype/DatatypeFactory.eea
index e7ba0eda22..0d25933fa1 100644
--- a/libs/eea-java-21/src/main/resources/javax/xml/datatype/DatatypeFactory.eea
+++ b/libs/eea-java-21/src/main/resources/javax/xml/datatype/DatatypeFactory.eea
@@ -9,7 +9,7 @@ DATATYPEFACTORY_PROPERTY
 
 newDefaultInstance
  ()Ljavax/xml/datatype/DatatypeFactory;
- ()Ljavax/xml/datatype/DatatypeFactory;
+ ()L1javax/xml/datatype/DatatypeFactory;
 newInstance
  ()Ljavax/xml/datatype/DatatypeFactory;
  ()Ljavax/xml/datatype/DatatypeFactory;
diff --git a/libs/eea-java-21/src/main/resources/javax/xml/parsers/DocumentBuilderFactory.eea b/libs/eea-java-21/src/main/resources/javax/xml/parsers/DocumentBuilderFactory.eea
index ab2cf64f48..54efea612e 100644
--- a/libs/eea-java-21/src/main/resources/javax/xml/parsers/DocumentBuilderFactory.eea
+++ b/libs/eea-java-21/src/main/resources/javax/xml/parsers/DocumentBuilderFactory.eea
@@ -2,7 +2,7 @@ class javax/xml/parsers/DocumentBuilderFactory
 
 newDefaultInstance
  ()Ljavax/xml/parsers/DocumentBuilderFactory;
- ()Ljavax/xml/parsers/DocumentBuilderFactory;
+ ()L1javax/xml/parsers/DocumentBuilderFactory;
 newDefaultNSInstance
  ()Ljavax/xml/parsers/DocumentBuilderFactory;
  ()Ljavax/xml/parsers/DocumentBuilderFactory;
@@ -27,7 +27,7 @@ getFeature
  (Ljava/lang/String;)Z
 getSchema
  ()Ljavax/xml/validation/Schema;
- ()Ljavax/xml/validation/Schema;
+ ()L1javax/xml/validation/Schema;
 newDocumentBuilder
  ()Ljavax/xml/parsers/DocumentBuilder;
  ()Ljavax/xml/parsers/DocumentBuilder;
diff --git a/libs/eea-java-21/src/main/resources/javax/xml/parsers/SAXParser.eea b/libs/eea-java-21/src/main/resources/javax/xml/parsers/SAXParser.eea
index 94dbf9ee2a..e5409c4f1e 100644
--- a/libs/eea-java-21/src/main/resources/javax/xml/parsers/SAXParser.eea
+++ b/libs/eea-java-21/src/main/resources/javax/xml/parsers/SAXParser.eea
@@ -8,7 +8,7 @@ getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
 getSchema
  ()Ljavax/xml/validation/Schema;
- ()Ljavax/xml/validation/Schema;
+ ()L1javax/xml/validation/Schema;
 getXMLReader
  ()Lorg/xml/sax/XMLReader;
  ()Lorg/xml/sax/XMLReader;
diff --git a/libs/eea-java-21/src/main/resources/javax/xml/parsers/SAXParserFactory.eea b/libs/eea-java-21/src/main/resources/javax/xml/parsers/SAXParserFactory.eea
index 91e8095cde..7d488a979f 100644
--- a/libs/eea-java-21/src/main/resources/javax/xml/parsers/SAXParserFactory.eea
+++ b/libs/eea-java-21/src/main/resources/javax/xml/parsers/SAXParserFactory.eea
@@ -2,7 +2,7 @@ class javax/xml/parsers/SAXParserFactory
 
 newDefaultInstance
  ()Ljavax/xml/parsers/SAXParserFactory;
- ()Ljavax/xml/parsers/SAXParserFactory;
+ ()L1javax/xml/parsers/SAXParserFactory;
 newDefaultNSInstance
  ()Ljavax/xml/parsers/SAXParserFactory;
  ()Ljavax/xml/parsers/SAXParserFactory;
@@ -24,7 +24,7 @@ getFeature
  (Ljava/lang/String;)Z
 getSchema
  ()Ljavax/xml/validation/Schema;
- ()Ljavax/xml/validation/Schema;
+ ()L1javax/xml/validation/Schema;
 newSAXParser
  ()Ljavax/xml/parsers/SAXParser;
  ()Ljavax/xml/parsers/SAXParser;
diff --git a/libs/eea-java-21/src/main/resources/javax/xml/stream/XMLEventFactory.eea b/libs/eea-java-21/src/main/resources/javax/xml/stream/XMLEventFactory.eea
index 74c77201ff..8949981382 100644
--- a/libs/eea-java-21/src/main/resources/javax/xml/stream/XMLEventFactory.eea
+++ b/libs/eea-java-21/src/main/resources/javax/xml/stream/XMLEventFactory.eea
@@ -2,7 +2,7 @@ class javax/xml/stream/XMLEventFactory
 
 newDefaultFactory
  ()Ljavax/xml/stream/XMLEventFactory;
- ()Ljavax/xml/stream/XMLEventFactory;
+ ()L1javax/xml/stream/XMLEventFactory;
 newFactory
  ()Ljavax/xml/stream/XMLEventFactory;
  ()Ljavax/xml/stream/XMLEventFactory;
@@ -18,79 +18,79 @@ newInstance
 
 createAttribute
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/Attribute;
- (Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/Attribute;
+ (Ljava/lang/String;Ljava/lang/String;)L1javax/xml/stream/events/Attribute;
 createAttribute
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/Attribute;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/Attribute;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1javax/xml/stream/events/Attribute;
 createAttribute
  (Ljavax/xml/namespace/QName;Ljava/lang/String;)Ljavax/xml/stream/events/Attribute;
- (Ljavax/xml/namespace/QName;Ljava/lang/String;)Ljavax/xml/stream/events/Attribute;
+ (Ljavax/xml/namespace/QName;Ljava/lang/String;)L1javax/xml/stream/events/Attribute;
 createCData
  (Ljava/lang/String;)Ljavax/xml/stream/events/Characters;
- (Ljava/lang/String;)Ljavax/xml/stream/events/Characters;
+ (Ljava/lang/String;)L1javax/xml/stream/events/Characters;
 createCharacters
  (Ljava/lang/String;)Ljavax/xml/stream/events/Characters;
- (Ljava/lang/String;)Ljavax/xml/stream/events/Characters;
+ (Ljava/lang/String;)L1javax/xml/stream/events/Characters;
 createComment
  (Ljava/lang/String;)Ljavax/xml/stream/events/Comment;
- (Ljava/lang/String;)Ljavax/xml/stream/events/Comment;
+ (Ljava/lang/String;)L1javax/xml/stream/events/Comment;
 createDTD
  (Ljava/lang/String;)Ljavax/xml/stream/events/DTD;
- (Ljava/lang/String;)Ljavax/xml/stream/events/DTD;
+ (Ljava/lang/String;)L1javax/xml/stream/events/DTD;
 createEndDocument
  ()Ljavax/xml/stream/events/EndDocument;
- ()Ljavax/xml/stream/events/EndDocument;
+ ()L1javax/xml/stream/events/EndDocument;
 createEndElement
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/EndElement;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/EndElement;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1javax/xml/stream/events/EndElement;
 createEndElement
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)Ljavax/xml/stream/events/EndElement;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)Ljavax/xml/stream/events/EndElement;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)L1javax/xml/stream/events/EndElement;
 createEndElement
  (Ljavax/xml/namespace/QName;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)Ljavax/xml/stream/events/EndElement;
- (Ljavax/xml/namespace/QName;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)Ljavax/xml/stream/events/EndElement;
+ (Ljavax/xml/namespace/QName;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)L1javax/xml/stream/events/EndElement;
 createEntityReference
  (Ljava/lang/String;Ljavax/xml/stream/events/EntityDeclaration;)Ljavax/xml/stream/events/EntityReference;
- (Ljava/lang/String;Ljavax/xml/stream/events/EntityDeclaration;)Ljavax/xml/stream/events/EntityReference;
+ (Ljava/lang/String;Ljavax/xml/stream/events/EntityDeclaration;)L1javax/xml/stream/events/EntityReference;
 createIgnorableSpace
  (Ljava/lang/String;)Ljavax/xml/stream/events/Characters;
- (Ljava/lang/String;)Ljavax/xml/stream/events/Characters;
+ (Ljava/lang/String;)L1javax/xml/stream/events/Characters;
 createNamespace
  (Ljava/lang/String;)Ljavax/xml/stream/events/Namespace;
- (Ljava/lang/String;)Ljavax/xml/stream/events/Namespace;
+ (Ljava/lang/String;)L1javax/xml/stream/events/Namespace;
 createNamespace
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/Namespace;
- (Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/Namespace;
+ (Ljava/lang/String;Ljava/lang/String;)L1javax/xml/stream/events/Namespace;
 createProcessingInstruction
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/ProcessingInstruction;
- (Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/ProcessingInstruction;
+ (Ljava/lang/String;Ljava/lang/String;)L1javax/xml/stream/events/ProcessingInstruction;
 createSpace
  (Ljava/lang/String;)Ljavax/xml/stream/events/Characters;
- (Ljava/lang/String;)Ljavax/xml/stream/events/Characters;
+ (Ljava/lang/String;)L1javax/xml/stream/events/Characters;
 createStartDocument
  ()Ljavax/xml/stream/events/StartDocument;
- ()Ljavax/xml/stream/events/StartDocument;
+ ()L1javax/xml/stream/events/StartDocument;
 createStartDocument
  (Ljava/lang/String;)Ljavax/xml/stream/events/StartDocument;
- (Ljava/lang/String;)Ljavax/xml/stream/events/StartDocument;
+ (Ljava/lang/String;)L1javax/xml/stream/events/StartDocument;
 createStartDocument
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/StartDocument;
- (Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/StartDocument;
+ (Ljava/lang/String;Ljava/lang/String;)L1javax/xml/stream/events/StartDocument;
 createStartDocument
  (Ljava/lang/String;Ljava/lang/String;Z)Ljavax/xml/stream/events/StartDocument;
- (Ljava/lang/String;Ljava/lang/String;Z)Ljavax/xml/stream/events/StartDocument;
+ (Ljava/lang/String;Ljava/lang/String;Z)L1javax/xml/stream/events/StartDocument;
 createStartElement
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/StartElement;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/stream/events/StartElement;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1javax/xml/stream/events/StartElement;
 createStartElement
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)Ljavax/xml/stream/events/StartElement;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)Ljavax/xml/stream/events/StartElement;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)L1javax/xml/stream/events/StartElement;
 createStartElement
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;Ljavax/xml/namespace/NamespaceContext;)Ljavax/xml/stream/events/StartElement;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;Ljavax/xml/namespace/NamespaceContext;)Ljavax/xml/stream/events/StartElement;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;Ljavax/xml/namespace/NamespaceContext;)L1javax/xml/stream/events/StartElement;
 createStartElement
  (Ljavax/xml/namespace/QName;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)Ljavax/xml/stream/events/StartElement;
- (Ljavax/xml/namespace/QName;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)Ljavax/xml/stream/events/StartElement;
+ (Ljavax/xml/namespace/QName;Ljava/util/Iterator<+Ljavax/xml/stream/events/Attribute;>;Ljava/util/Iterator<+Ljavax/xml/stream/events/Namespace;>;)L1javax/xml/stream/events/StartElement;
 setLocation
  (Ljavax/xml/stream/Location;)V
  (Ljavax/xml/stream/Location;)V
diff --git a/libs/eea-java-21/src/main/resources/javax/xml/transform/TransformerException.eea b/libs/eea-java-21/src/main/resources/javax/xml/transform/TransformerException.eea
index 398cd55bba..a24d9cb1c9 100644
--- a/libs/eea-java-21/src/main/resources/javax/xml/transform/TransformerException.eea
+++ b/libs/eea-java-21/src/main/resources/javax/xml/transform/TransformerException.eea
@@ -23,13 +23,13 @@ getException
  ()Ljava/lang/Throwable;
 getLocationAsString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getLocator
  ()Ljavax/xml/transform/SourceLocator;
  ()Ljavax/xml/transform/SourceLocator;
 getMessageAndLocation
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 initCause
  (Ljava/lang/Throwable;)Ljava/lang/Throwable;
  (L0java/lang/Throwable;)Ljava/lang/Throwable; # @Inherited(java.lang.Throwable)
diff --git a/libs/eea-java-21/src/main/resources/javax/xml/transform/TransformerFactory.eea b/libs/eea-java-21/src/main/resources/javax/xml/transform/TransformerFactory.eea
index d02b833a77..025dc3b713 100644
--- a/libs/eea-java-21/src/main/resources/javax/xml/transform/TransformerFactory.eea
+++ b/libs/eea-java-21/src/main/resources/javax/xml/transform/TransformerFactory.eea
@@ -2,7 +2,7 @@ class javax/xml/transform/TransformerFactory
 
 newDefaultInstance
  ()Ljavax/xml/transform/TransformerFactory;
- ()Ljavax/xml/transform/TransformerFactory;
+ ()L1javax/xml/transform/TransformerFactory;
 newInstance
  ()Ljavax/xml/transform/TransformerFactory;
  ()Ljavax/xml/transform/TransformerFactory;
diff --git a/libs/eea-java-21/src/main/resources/javax/xml/transform/sax/SAXSource.eea b/libs/eea-java-21/src/main/resources/javax/xml/transform/sax/SAXSource.eea
index ac2247dbea..b1ad8085ac 100644
--- a/libs/eea-java-21/src/main/resources/javax/xml/transform/sax/SAXSource.eea
+++ b/libs/eea-java-21/src/main/resources/javax/xml/transform/sax/SAXSource.eea
@@ -6,7 +6,7 @@ FEATURE
 
 sourceToInputSource
  (Ljavax/xml/transform/Source;)Lorg/xml/sax/InputSource;
- (Ljavax/xml/transform/Source;)Lorg/xml/sax/InputSource;
+ (Ljavax/xml/transform/Source;)L0org/xml/sax/InputSource;
 
 <init>
  (Lorg/xml/sax/InputSource;)V
@@ -19,7 +19,7 @@ getInputSource
  ()Lorg/xml/sax/InputSource;
 getSystemId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getXMLReader
  ()Lorg/xml/sax/XMLReader;
  ()Lorg/xml/sax/XMLReader;
diff --git a/libs/eea-java-21/src/main/resources/javax/xml/transform/stax/StAXResult.eea b/libs/eea-java-21/src/main/resources/javax/xml/transform/stax/StAXResult.eea
index 7398cc8321..e3f984b5c5 100644
--- a/libs/eea-java-21/src/main/resources/javax/xml/transform/stax/StAXResult.eea
+++ b/libs/eea-java-21/src/main/resources/javax/xml/transform/stax/StAXResult.eea
@@ -12,7 +12,7 @@ FEATURE
  (Ljavax/xml/stream/XMLStreamWriter;)V
 getSystemId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getXMLEventWriter
  ()Ljavax/xml/stream/XMLEventWriter;
  ()Ljavax/xml/stream/XMLEventWriter;
diff --git a/libs/eea-java-21/src/main/resources/javax/xml/validation/SchemaFactory.eea b/libs/eea-java-21/src/main/resources/javax/xml/validation/SchemaFactory.eea
index c02b3ef9e4..506ba99df2 100644
--- a/libs/eea-java-21/src/main/resources/javax/xml/validation/SchemaFactory.eea
+++ b/libs/eea-java-21/src/main/resources/javax/xml/validation/SchemaFactory.eea
@@ -2,7 +2,7 @@ class javax/xml/validation/SchemaFactory
 
 newDefaultInstance
  ()Ljavax/xml/validation/SchemaFactory;
- ()Ljavax/xml/validation/SchemaFactory;
+ ()L1javax/xml/validation/SchemaFactory;
 newInstance
  (Ljava/lang/String;)Ljavax/xml/validation/SchemaFactory;
  (Ljava/lang/String;)Ljavax/xml/validation/SchemaFactory;
@@ -18,7 +18,7 @@ getFeature
  (Ljava/lang/String;)Z
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
 getResourceResolver
  ()Lorg/w3c/dom/ls/LSResourceResolver;
  ()Lorg/w3c/dom/ls/LSResourceResolver;
diff --git a/libs/eea-java-21/src/main/resources/javax/xml/validation/Validator.eea b/libs/eea-java-21/src/main/resources/javax/xml/validation/Validator.eea
index a9aeac0e57..df88c55570 100644
--- a/libs/eea-java-21/src/main/resources/javax/xml/validation/Validator.eea
+++ b/libs/eea-java-21/src/main/resources/javax/xml/validation/Validator.eea
@@ -8,7 +8,7 @@ getFeature
  (Ljava/lang/String;)Z
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
 getResourceResolver
  ()Lorg/w3c/dom/ls/LSResourceResolver;
  ()Lorg/w3c/dom/ls/LSResourceResolver;
diff --git a/libs/eea-java-21/src/main/resources/javax/xml/validation/ValidatorHandler.eea b/libs/eea-java-21/src/main/resources/javax/xml/validation/ValidatorHandler.eea
index 1e74745dbf..994007f425 100644
--- a/libs/eea-java-21/src/main/resources/javax/xml/validation/ValidatorHandler.eea
+++ b/libs/eea-java-21/src/main/resources/javax/xml/validation/ValidatorHandler.eea
@@ -11,7 +11,7 @@ getFeature
  (Ljava/lang/String;)Z
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
 getResourceResolver
  ()Lorg/w3c/dom/ls/LSResourceResolver;
  ()Lorg/w3c/dom/ls/LSResourceResolver;
diff --git a/libs/eea-java-21/src/main/resources/javax/xml/xpath/XPathEvaluationResult$XPathResultType.eea b/libs/eea-java-21/src/main/resources/javax/xml/xpath/XPathEvaluationResult$XPathResultType.eea
index 09707c699e..433b6ea250 100644
--- a/libs/eea-java-21/src/main/resources/javax/xml/xpath/XPathEvaluationResult$XPathResultType.eea
+++ b/libs/eea-java-21/src/main/resources/javax/xml/xpath/XPathEvaluationResult$XPathResultType.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 getQNameType
  (Ljava/lang/Class<*>;)Ljavax/xml/namespace/QName;
- (Ljava/lang/Class<*>;)Ljavax/xml/namespace/QName;
+ (Ljava/lang/Class<*>;)L0javax/xml/namespace/QName;
diff --git a/libs/eea-java-21/src/main/resources/javax/xml/xpath/XPathFactory.eea b/libs/eea-java-21/src/main/resources/javax/xml/xpath/XPathFactory.eea
index 29a4627864..e4572a19ad 100644
--- a/libs/eea-java-21/src/main/resources/javax/xml/xpath/XPathFactory.eea
+++ b/libs/eea-java-21/src/main/resources/javax/xml/xpath/XPathFactory.eea
@@ -9,7 +9,7 @@ DEFAULT_PROPERTY_NAME
 
 newDefaultInstance
  ()Ljavax/xml/xpath/XPathFactory;
- ()Ljavax/xml/xpath/XPathFactory;
+ ()L1javax/xml/xpath/XPathFactory;
 newInstance
  ()Ljavax/xml/xpath/XPathFactory;
  ()Ljavax/xml/xpath/XPathFactory;
@@ -25,7 +25,7 @@ getFeature
  (Ljava/lang/String;)Z
 getProperty
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 isObjectModelSupported
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-java-21/src/main/resources/org/w3c/dom/DOMImplementation.eea b/libs/eea-java-21/src/main/resources/org/w3c/dom/DOMImplementation.eea
index 89d4f76c1c..c0c6bca360 100644
--- a/libs/eea-java-21/src/main/resources/org/w3c/dom/DOMImplementation.eea
+++ b/libs/eea-java-21/src/main/resources/org/w3c/dom/DOMImplementation.eea
@@ -2,10 +2,10 @@ class org/w3c/dom/DOMImplementation
 
 createDocument
  (Ljava/lang/String;Ljava/lang/String;Lorg/w3c/dom/DocumentType;)Lorg/w3c/dom/Document;
- (Ljava/lang/String;Ljava/lang/String;Lorg/w3c/dom/DocumentType;)Lorg/w3c/dom/Document;
+ (Ljava/lang/String;Ljava/lang/String;Lorg/w3c/dom/DocumentType;)L1org/w3c/dom/Document;
 createDocumentType
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/DocumentType;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/DocumentType;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1org/w3c/dom/DocumentType;
 getFeature
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-java-21/src/main/resources/org/w3c/dom/Document.eea b/libs/eea-java-21/src/main/resources/org/w3c/dom/Document.eea
index 9f5649458b..e6ece56fad 100644
--- a/libs/eea-java-21/src/main/resources/org/w3c/dom/Document.eea
+++ b/libs/eea-java-21/src/main/resources/org/w3c/dom/Document.eea
@@ -29,7 +29,7 @@ createEntityReference
  (Ljava/lang/String;)L1org/w3c/dom/EntityReference;
 createProcessingInstruction
  (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/ProcessingInstruction;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/ProcessingInstruction;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/w3c/dom/ProcessingInstruction;
 createTextNode
  (Ljava/lang/String;)Lorg/w3c/dom/Text;
  (Ljava/lang/String;)L1org/w3c/dom/Text;
diff --git a/libs/eea-java-21/src/main/resources/org/w3c/dom/bootstrap/DOMImplementationRegistry.eea b/libs/eea-java-21/src/main/resources/org/w3c/dom/bootstrap/DOMImplementationRegistry.eea
index 79370b4eca..a646afbe91 100644
--- a/libs/eea-java-21/src/main/resources/org/w3c/dom/bootstrap/DOMImplementationRegistry.eea
+++ b/libs/eea-java-21/src/main/resources/org/w3c/dom/bootstrap/DOMImplementationRegistry.eea
@@ -6,14 +6,14 @@ PROPERTY
 
 newInstance
  ()Lorg/w3c/dom/bootstrap/DOMImplementationRegistry;
- ()Lorg/w3c/dom/bootstrap/DOMImplementationRegistry;
+ ()L1org/w3c/dom/bootstrap/DOMImplementationRegistry;
 
 addSource
  (Lorg/w3c/dom/DOMImplementationSource;)V
  (Lorg/w3c/dom/DOMImplementationSource;)V
 getDOMImplementation
  (Ljava/lang/String;)Lorg/w3c/dom/DOMImplementation;
- (Ljava/lang/String;)Lorg/w3c/dom/DOMImplementation;
+ (Ljava/lang/String;)L0org/w3c/dom/DOMImplementation;
 getDOMImplementationList
  (Ljava/lang/String;)Lorg/w3c/dom/DOMImplementationList;
- (Ljava/lang/String;)Lorg/w3c/dom/DOMImplementationList;
+ (Ljava/lang/String;)L1org/w3c/dom/DOMImplementationList;
diff --git a/libs/eea-java-21/src/main/resources/org/w3c/dom/css/DOMImplementationCSS.eea b/libs/eea-java-21/src/main/resources/org/w3c/dom/css/DOMImplementationCSS.eea
index 941911f546..b3ebf8d903 100644
--- a/libs/eea-java-21/src/main/resources/org/w3c/dom/css/DOMImplementationCSS.eea
+++ b/libs/eea-java-21/src/main/resources/org/w3c/dom/css/DOMImplementationCSS.eea
@@ -2,4 +2,4 @@ class org/w3c/dom/css/DOMImplementationCSS
 
 createCSSStyleSheet
  (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/css/CSSStyleSheet;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/css/CSSStyleSheet;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/w3c/dom/css/CSSStyleSheet;
diff --git a/libs/eea-java-21/src/main/resources/org/w3c/dom/events/DocumentEvent.eea b/libs/eea-java-21/src/main/resources/org/w3c/dom/events/DocumentEvent.eea
index 9cfe09a367..bba3043acf 100644
--- a/libs/eea-java-21/src/main/resources/org/w3c/dom/events/DocumentEvent.eea
+++ b/libs/eea-java-21/src/main/resources/org/w3c/dom/events/DocumentEvent.eea
@@ -2,4 +2,4 @@ class org/w3c/dom/events/DocumentEvent
 
 createEvent
  (Ljava/lang/String;)Lorg/w3c/dom/events/Event;
- (Ljava/lang/String;)Lorg/w3c/dom/events/Event;
+ (Ljava/lang/String;)L1org/w3c/dom/events/Event;
diff --git a/libs/eea-java-21/src/main/resources/org/w3c/dom/html/HTMLDOMImplementation.eea b/libs/eea-java-21/src/main/resources/org/w3c/dom/html/HTMLDOMImplementation.eea
index 9cd2452263..d57a172db4 100644
--- a/libs/eea-java-21/src/main/resources/org/w3c/dom/html/HTMLDOMImplementation.eea
+++ b/libs/eea-java-21/src/main/resources/org/w3c/dom/html/HTMLDOMImplementation.eea
@@ -2,4 +2,4 @@ class org/w3c/dom/html/HTMLDOMImplementation
 
 createHTMLDocument
  (Ljava/lang/String;)Lorg/w3c/dom/html/HTMLDocument;
- (Ljava/lang/String;)Lorg/w3c/dom/html/HTMLDocument;
+ (Ljava/lang/String;)L1org/w3c/dom/html/HTMLDocument;
diff --git a/libs/eea-java-21/src/main/resources/org/w3c/dom/html/HTMLTableElement.eea b/libs/eea-java-21/src/main/resources/org/w3c/dom/html/HTMLTableElement.eea
index d948e121cf..a628fbd14e 100644
--- a/libs/eea-java-21/src/main/resources/org/w3c/dom/html/HTMLTableElement.eea
+++ b/libs/eea-java-21/src/main/resources/org/w3c/dom/html/HTMLTableElement.eea
@@ -2,13 +2,13 @@ class org/w3c/dom/html/HTMLTableElement
 
 createCaption
  ()Lorg/w3c/dom/html/HTMLElement;
- ()Lorg/w3c/dom/html/HTMLElement;
+ ()L1org/w3c/dom/html/HTMLElement;
 createTFoot
  ()Lorg/w3c/dom/html/HTMLElement;
- ()Lorg/w3c/dom/html/HTMLElement;
+ ()L1org/w3c/dom/html/HTMLElement;
 createTHead
  ()Lorg/w3c/dom/html/HTMLElement;
- ()Lorg/w3c/dom/html/HTMLElement;
+ ()L1org/w3c/dom/html/HTMLElement;
 getAlign
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/org/w3c/dom/ls/DOMImplementationLS.eea b/libs/eea-java-21/src/main/resources/org/w3c/dom/ls/DOMImplementationLS.eea
index b3a339ba7a..d113174c70 100644
--- a/libs/eea-java-21/src/main/resources/org/w3c/dom/ls/DOMImplementationLS.eea
+++ b/libs/eea-java-21/src/main/resources/org/w3c/dom/ls/DOMImplementationLS.eea
@@ -2,13 +2,13 @@ class org/w3c/dom/ls/DOMImplementationLS
 
 createLSInput
  ()Lorg/w3c/dom/ls/LSInput;
- ()Lorg/w3c/dom/ls/LSInput;
+ ()L1org/w3c/dom/ls/LSInput;
 createLSOutput
  ()Lorg/w3c/dom/ls/LSOutput;
- ()Lorg/w3c/dom/ls/LSOutput;
+ ()L1org/w3c/dom/ls/LSOutput;
 createLSParser
  (SLjava/lang/String;)Lorg/w3c/dom/ls/LSParser;
- (SLjava/lang/String;)Lorg/w3c/dom/ls/LSParser;
+ (SLjava/lang/String;)L1org/w3c/dom/ls/LSParser;
 createLSSerializer
  ()Lorg/w3c/dom/ls/LSSerializer;
- ()Lorg/w3c/dom/ls/LSSerializer;
+ ()L1org/w3c/dom/ls/LSSerializer;
diff --git a/libs/eea-java-21/src/main/resources/org/w3c/dom/ranges/DocumentRange.eea b/libs/eea-java-21/src/main/resources/org/w3c/dom/ranges/DocumentRange.eea
index 863aea84ae..32ebcee572 100644
--- a/libs/eea-java-21/src/main/resources/org/w3c/dom/ranges/DocumentRange.eea
+++ b/libs/eea-java-21/src/main/resources/org/w3c/dom/ranges/DocumentRange.eea
@@ -2,4 +2,4 @@ class org/w3c/dom/ranges/DocumentRange
 
 createRange
  ()Lorg/w3c/dom/ranges/Range;
- ()Lorg/w3c/dom/ranges/Range;
+ ()L1org/w3c/dom/ranges/Range;
diff --git a/libs/eea-java-21/src/main/resources/org/w3c/dom/traversal/DocumentTraversal.eea b/libs/eea-java-21/src/main/resources/org/w3c/dom/traversal/DocumentTraversal.eea
index 5f149e5966..21eaa603f5 100644
--- a/libs/eea-java-21/src/main/resources/org/w3c/dom/traversal/DocumentTraversal.eea
+++ b/libs/eea-java-21/src/main/resources/org/w3c/dom/traversal/DocumentTraversal.eea
@@ -2,7 +2,7 @@ class org/w3c/dom/traversal/DocumentTraversal
 
 createNodeIterator
  (Lorg/w3c/dom/Node;ILorg/w3c/dom/traversal/NodeFilter;Z)Lorg/w3c/dom/traversal/NodeIterator;
- (Lorg/w3c/dom/Node;ILorg/w3c/dom/traversal/NodeFilter;Z)Lorg/w3c/dom/traversal/NodeIterator;
+ (Lorg/w3c/dom/Node;ILorg/w3c/dom/traversal/NodeFilter;Z)L1org/w3c/dom/traversal/NodeIterator;
 createTreeWalker
  (Lorg/w3c/dom/Node;ILorg/w3c/dom/traversal/NodeFilter;Z)Lorg/w3c/dom/traversal/TreeWalker;
- (Lorg/w3c/dom/Node;ILorg/w3c/dom/traversal/NodeFilter;Z)Lorg/w3c/dom/traversal/TreeWalker;
+ (Lorg/w3c/dom/Node;ILorg/w3c/dom/traversal/NodeFilter;Z)L1org/w3c/dom/traversal/TreeWalker;
diff --git a/libs/eea-java-21/src/main/resources/org/w3c/dom/xpath/XPathEvaluator.eea b/libs/eea-java-21/src/main/resources/org/w3c/dom/xpath/XPathEvaluator.eea
index 423a4fda29..cb38c5b162 100644
--- a/libs/eea-java-21/src/main/resources/org/w3c/dom/xpath/XPathEvaluator.eea
+++ b/libs/eea-java-21/src/main/resources/org/w3c/dom/xpath/XPathEvaluator.eea
@@ -2,10 +2,10 @@ class org/w3c/dom/xpath/XPathEvaluator
 
 createExpression
  (Ljava/lang/String;Lorg/w3c/dom/xpath/XPathNSResolver;)Lorg/w3c/dom/xpath/XPathExpression;
- (Ljava/lang/String;Lorg/w3c/dom/xpath/XPathNSResolver;)Lorg/w3c/dom/xpath/XPathExpression;
+ (Ljava/lang/String;Lorg/w3c/dom/xpath/XPathNSResolver;)L1org/w3c/dom/xpath/XPathExpression;
 createNSResolver
  (Lorg/w3c/dom/Node;)Lorg/w3c/dom/xpath/XPathNSResolver;
- (Lorg/w3c/dom/Node;)Lorg/w3c/dom/xpath/XPathNSResolver;
+ (Lorg/w3c/dom/Node;)L1org/w3c/dom/xpath/XPathNSResolver;
 evaluate
  (Ljava/lang/String;Lorg/w3c/dom/Node;Lorg/w3c/dom/xpath/XPathNSResolver;SLjava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/String;Lorg/w3c/dom/Node;Lorg/w3c/dom/xpath/XPathNSResolver;SLjava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-java-21/src/main/resources/org/xml/sax/ext/DefaultHandler2.eea b/libs/eea-java-21/src/main/resources/org/xml/sax/ext/DefaultHandler2.eea
index 83cb1f46c5..53f60346f6 100644
--- a/libs/eea-java-21/src/main/resources/org/xml/sax/ext/DefaultHandler2.eea
+++ b/libs/eea-java-21/src/main/resources/org/xml/sax/ext/DefaultHandler2.eea
@@ -17,7 +17,7 @@ externalEntityDecl
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 getExternalSubset
  (Ljava/lang/String;Ljava/lang/String;)Lorg/xml/sax/InputSource;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/xml/sax/InputSource;
+ (Ljava/lang/String;Ljava/lang/String;)L0org/xml/sax/InputSource;
 internalEntityDecl
  (Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;)V
@@ -26,7 +26,7 @@ resolveEntity
  (L0java/lang/String;L0java/lang/String;)L0org/xml/sax/InputSource; # @Inherited(org.xml.sax.helpers.DefaultHandler)
 resolveEntity
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/xml/sax/InputSource;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/xml/sax/InputSource;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L0org/xml/sax/InputSource;
 startDTD
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-java-21/src/main/resources/org/xml/sax/helpers/AttributeListImpl.eea b/libs/eea-java-21/src/main/resources/org/xml/sax/helpers/AttributeListImpl.eea
index 8eb72058d0..65f82e8c58 100644
--- a/libs/eea-java-21/src/main/resources/org/xml/sax/helpers/AttributeListImpl.eea
+++ b/libs/eea-java-21/src/main/resources/org/xml/sax/helpers/AttributeListImpl.eea
@@ -8,16 +8,16 @@ addAttribute
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 getName
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getType
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getType
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
 getValue
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getValue
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/org/xml/sax/helpers/AttributesImpl.eea b/libs/eea-java-21/src/main/resources/org/xml/sax/helpers/AttributesImpl.eea
index 64dce0d3f0..bb31fecc9b 100644
--- a/libs/eea-java-21/src/main/resources/org/xml/sax/helpers/AttributesImpl.eea
+++ b/libs/eea-java-21/src/main/resources/org/xml/sax/helpers/AttributesImpl.eea
@@ -14,31 +14,31 @@ getIndex
  (Ljava/lang/String;Ljava/lang/String;)I
 getLocalName
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getQName
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getType
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getType
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getType
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L0java/lang/String;
 getURI
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getValue
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L0java/lang/String;
 getValue
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getValue
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L0java/lang/String;
 setAttribute
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-java-21/src/main/resources/org/xml/sax/helpers/NamespaceSupport.eea b/libs/eea-java-21/src/main/resources/org/xml/sax/helpers/NamespaceSupport.eea
index ee4f732ec7..be8dec00d3 100644
--- a/libs/eea-java-21/src/main/resources/org/xml/sax/helpers/NamespaceSupport.eea
+++ b/libs/eea-java-21/src/main/resources/org/xml/sax/helpers/NamespaceSupport.eea
@@ -27,4 +27,4 @@ getURI
  (Ljava/lang/String;)Ljava/lang/String;
 processName
  (Ljava/lang/String;[Ljava/lang/String;Z)[Ljava/lang/String;
- (Ljava/lang/String;[Ljava/lang/String;Z)[Ljava/lang/String;
+ (Ljava/lang/String;[Ljava/lang/String;Z)[0Ljava/lang/String;
diff --git a/libs/eea-java-21/src/main/resources/org/xml/sax/helpers/ParserAdapter.eea b/libs/eea-java-21/src/main/resources/org/xml/sax/helpers/ParserAdapter.eea
index 87ebae1114..0a162dd55d 100644
--- a/libs/eea-java-21/src/main/resources/org/xml/sax/helpers/ParserAdapter.eea
+++ b/libs/eea-java-21/src/main/resources/org/xml/sax/helpers/ParserAdapter.eea
@@ -26,7 +26,7 @@ getFeature
  (Ljava/lang/String;)Z
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
 ignorableWhitespace
  ([CII)V
  ([1CII)V # @Inherited(org.xml.sax.DocumentHandler)
diff --git a/libs/eea-java-21/src/main/resources/org/xml/sax/helpers/XMLReaderFactory.eea b/libs/eea-java-21/src/main/resources/org/xml/sax/helpers/XMLReaderFactory.eea
index 244b5634dc..1e20a51753 100644
--- a/libs/eea-java-21/src/main/resources/org/xml/sax/helpers/XMLReaderFactory.eea
+++ b/libs/eea-java-21/src/main/resources/org/xml/sax/helpers/XMLReaderFactory.eea
@@ -2,7 +2,7 @@ class org/xml/sax/helpers/XMLReaderFactory
 
 createXMLReader
  ()Lorg/xml/sax/XMLReader;
- ()Lorg/xml/sax/XMLReader;
+ ()L1org/xml/sax/XMLReader;
 createXMLReader
  (Ljava/lang/String;)Lorg/xml/sax/XMLReader;
- (Ljava/lang/String;)Lorg/xml/sax/XMLReader;
+ (Ljava/lang/String;)L1org/xml/sax/XMLReader;
diff --git a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/Authenticator.eea b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/Authenticator.eea
index 58e840f5da..0cff559f69 100644
--- a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/Authenticator.eea
+++ b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/Authenticator.eea
@@ -5,7 +5,7 @@ getDefaultUserName
  ()Ljava/lang/String;
 getPasswordAuthentication
  ()Ljavax/mail/PasswordAuthentication;
- ()Ljavax/mail/PasswordAuthentication;
+ ()L0javax/mail/PasswordAuthentication;
 getRequestingPrompt
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/FetchProfile.eea b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/FetchProfile.eea
index 6650c954b4..779d068a7c 100644
--- a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/FetchProfile.eea
+++ b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/FetchProfile.eea
@@ -14,7 +14,7 @@ contains
  (Ljavax/mail/FetchProfile$Item;)Z
 getHeaderNames
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 getItems
  ()[Ljavax/mail/FetchProfile$Item;
- ()[Ljavax/mail/FetchProfile$Item;
+ ()[1Ljavax/mail/FetchProfile$Item;
diff --git a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/Flags.eea b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/Flags.eea
index 85af4ea637..aa79adcbec 100644
--- a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/Flags.eea
+++ b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/Flags.eea
@@ -35,10 +35,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getSystemFlags
  ()[Ljavax/mail/Flags$Flag;
- ()[Ljavax/mail/Flags$Flag;
+ ()[1Ljavax/mail/Flags$Flag;
 getUserFlags
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 remove
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/Folder.eea b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/Folder.eea
index 884b5f9ce3..40df0ced18 100644
--- a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/Folder.eea
+++ b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/Folder.eea
@@ -42,13 +42,13 @@ getMessage
  (I)Ljavax/mail/Message;
 getMessages
  ()[Ljavax/mail/Message;
- ()[Ljavax/mail/Message;
+ ()[1Ljavax/mail/Message;
 getMessages
  (II)[Ljavax/mail/Message;
- (II)[Ljavax/mail/Message;
+ (II)[1Ljavax/mail/Message;
 getMessages
  ([I)[Ljavax/mail/Message;
- ([I)[Ljavax/mail/Message;
+ ([I)[1Ljavax/mail/Message;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -63,7 +63,7 @@ getStore
  ()Ljavax/mail/Store;
 getURLName
  ()Ljavax/mail/URLName;
- ()Ljavax/mail/URLName;
+ ()L1javax/mail/URLName;
 list
  ()[Ljavax/mail/Folder;
  ()[Ljavax/mail/Folder;
diff --git a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/MessageContext.eea b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/MessageContext.eea
index da0893cd77..24eaa429e8 100644
--- a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/MessageContext.eea
+++ b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/MessageContext.eea
@@ -5,10 +5,10 @@ class javax/mail/MessageContext
  (Ljavax/mail/Part;)V
 getMessage
  ()Ljavax/mail/Message;
- ()Ljavax/mail/Message;
+ ()L0javax/mail/Message;
 getPart
  ()Ljavax/mail/Part;
  ()Ljavax/mail/Part;
 getSession
  ()Ljavax/mail/Session;
- ()Ljavax/mail/Session;
+ ()L0javax/mail/Session;
diff --git a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/Session.eea b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/Session.eea
index cb7f3b06cc..18192bdf8f 100644
--- a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/Session.eea
+++ b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/Session.eea
@@ -8,10 +8,10 @@ getDefaultInstance
  (Ljava/util/Properties;Ljavax/mail/Authenticator;)Ljavax/mail/Session;
 getInstance
  (Ljava/util/Properties;)Ljavax/mail/Session;
- (Ljava/util/Properties;)Ljavax/mail/Session;
+ (Ljava/util/Properties;)L1javax/mail/Session;
 getInstance
  (Ljava/util/Properties;Ljavax/mail/Authenticator;)Ljavax/mail/Session;
- (Ljava/util/Properties;Ljavax/mail/Authenticator;)Ljavax/mail/Session;
+ (Ljava/util/Properties;Ljavax/mail/Authenticator;)L1javax/mail/Session;
 
 addProvider
  (Ljavax/mail/Provider;)V
@@ -36,7 +36,7 @@ getProvider
  (Ljava/lang/String;)Ljavax/mail/Provider;
 getProviders
  ()[Ljavax/mail/Provider;
- ()[Ljavax/mail/Provider;
+ ()[1Ljavax/mail/Provider;
 getStore
  ()Ljavax/mail/Store;
  ()Ljavax/mail/Store;
@@ -66,7 +66,7 @@ getTransport
  (Ljavax/mail/URLName;)Ljavax/mail/Transport;
 requestPasswordAuthentication
  (Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/mail/PasswordAuthentication;
- (Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljavax/mail/PasswordAuthentication;
+ (Ljava/net/InetAddress;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)L0javax/mail/PasswordAuthentication;
 setDebugOut
  (Ljava/io/PrintStream;)V
  (Ljava/io/PrintStream;)V
diff --git a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/Store.eea b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/Store.eea
index c7553bfdbf..d73685b21a 100644
--- a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/Store.eea
+++ b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/Store.eea
@@ -23,10 +23,10 @@ getPersonalNamespaces
  ()[Ljavax/mail/Folder;
 getSharedNamespaces
  ()[Ljavax/mail/Folder;
- ()[Ljavax/mail/Folder;
+ ()[1Ljavax/mail/Folder;
 getUserNamespaces
  (Ljava/lang/String;)[Ljavax/mail/Folder;
- (Ljava/lang/String;)[Ljavax/mail/Folder;
+ (Ljava/lang/String;)[1Ljavax/mail/Folder;
 notifyFolderListeners
  (ILjavax/mail/Folder;)V
  (ILjavax/mail/Folder;)V
diff --git a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/URLName.eea b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/URLName.eea
index 649fdc8fdf..d59266a01a 100644
--- a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/URLName.eea
+++ b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/URLName.eea
@@ -33,7 +33,7 @@ getRef
  ()Ljava/lang/String;
 getURL
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L1java/net/URL;
 getUsername
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/ContentDisposition.eea b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/ContentDisposition.eea
index fb04457b30..fc80fe6ab2 100644
--- a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/ContentDisposition.eea
+++ b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/ContentDisposition.eea
@@ -11,7 +11,7 @@ getDisposition
  ()Ljava/lang/String;
 getParameter
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getParameterList
  ()Ljavax/mail/internet/ParameterList;
  ()Ljavax/mail/internet/ParameterList;
diff --git a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/ContentType.eea b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/ContentType.eea
index 5457159ec4..76498cad83 100644
--- a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/ContentType.eea
+++ b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/ContentType.eea
@@ -8,10 +8,10 @@ class javax/mail/internet/ContentType
  (Ljava/lang/String;Ljava/lang/String;Ljavax/mail/internet/ParameterList;)V
 getBaseType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getParameter
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getParameterList
  ()Ljavax/mail/internet/ParameterList;
  ()Ljavax/mail/internet/ParameterList;
diff --git a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/HeaderTokenizer.eea b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/HeaderTokenizer.eea
index 8bacd908f7..2f4616d10b 100644
--- a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/HeaderTokenizer.eea
+++ b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/HeaderTokenizer.eea
@@ -18,7 +18,7 @@ RFC822
  (Ljava/lang/String;Ljava/lang/String;Z)V
 getRemainder
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 next
  ()Ljavax/mail/internet/HeaderTokenizer$Token;
  ()Ljavax/mail/internet/HeaderTokenizer$Token;
diff --git a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/InternetAddress.eea b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/InternetAddress.eea
index 466d81d191..2cf87819cc 100644
--- a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/InternetAddress.eea
+++ b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/InternetAddress.eea
@@ -2,7 +2,7 @@ class javax/mail/internet/InternetAddress
 
 getLocalAddress
  (Ljavax/mail/Session;)Ljavax/mail/internet/InternetAddress;
- (Ljavax/mail/Session;)Ljavax/mail/internet/InternetAddress;
+ (Ljavax/mail/Session;)L0javax/mail/internet/InternetAddress;
 parse
  (Ljava/lang/String;)[Ljavax/mail/internet/InternetAddress;
  (Ljava/lang/String;)[Ljavax/mail/internet/InternetAddress;
@@ -17,13 +17,13 @@ toString
  ([Ljavax/mail/Address;)Ljava/lang/String;
 toString
  ([Ljavax/mail/Address;I)Ljava/lang/String;
- ([Ljavax/mail/Address;I)Ljava/lang/String;
+ ([Ljavax/mail/Address;I)L0java/lang/String;
 toUnicodeString
  ([Ljavax/mail/Address;)Ljava/lang/String;
  ([Ljavax/mail/Address;)Ljava/lang/String;
 toUnicodeString
  ([Ljavax/mail/Address;I)Ljava/lang/String;
- ([Ljavax/mail/Address;I)Ljava/lang/String;
+ ([Ljavax/mail/Address;I)L0java/lang/String;
 
 address
  Ljava/lang/String;
@@ -58,13 +58,13 @@ getAddress
  ()Ljava/lang/String;
 getGroup
  (Z)[Ljavax/mail/internet/InternetAddress;
- (Z)[Ljavax/mail/internet/InternetAddress;
+ (Z)[0Ljavax/mail/internet/InternetAddress;
 getPersonal
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 setAddress
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/InternetHeaders.eea b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/InternetHeaders.eea
index e020323706..d8ae9ecc05 100644
--- a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/InternetHeaders.eea
+++ b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/InternetHeaders.eea
@@ -24,10 +24,10 @@ getAllHeaders
  ()Ljava/util/Enumeration<Ljavax/mail/Header;>;
 getHeader
  (Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/String;)[0Ljava/lang/String;
 getHeader
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L0java/lang/String;
 getMatchingHeaderLines
  ([Ljava/lang/String;)Ljava/util/Enumeration<Ljava/lang/String;>;
  ([Ljava/lang/String;)Ljava/util/Enumeration<Ljava/lang/String;>;
diff --git a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/MailDateFormat.eea b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/MailDateFormat.eea
index 159ec2ca7c..96f954d6b9 100644
--- a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/MailDateFormat.eea
+++ b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/MailDateFormat.eea
@@ -14,10 +14,10 @@ format
  (Ljava/util/Date;Ljava/lang/StringBuffer;Ljava/text/FieldPosition;)Ljava/lang/StringBuffer;
 get2DigitYearStart
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L1java/util/Date;
 parse
  (Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/util/Date;
- (Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/util/Date;
+ (Ljava/lang/String;Ljava/text/ParsePosition;)L0java/util/Date; # @Inherited(java.text.SimpleDateFormat)
 set2DigitYearStart
  (Ljava/util/Date;)V
  (Ljava/util/Date;)V
diff --git a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/MimeBodyPart.eea b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/MimeBodyPart.eea
index 4e2ed9db49..8ec9eb48f7 100644
--- a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/MimeBodyPart.eea
+++ b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/MimeBodyPart.eea
@@ -63,7 +63,7 @@ getContentStream
  ()Ljava/io/InputStream;
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getDataHandler
  ()Ljavax/activation/DataHandler;
  ()Ljavax/activation/DataHandler;
diff --git a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/MimeMessage.eea b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/MimeMessage.eea
index 7d01a24b7a..656495714c 100644
--- a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/MimeMessage.eea
+++ b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/MimeMessage.eea
@@ -54,10 +54,10 @@ addRecipients
  (Ljavax/mail/Message$RecipientType;[Ljavax/mail/Address;)V
 createInternetHeaders
  (Ljava/io/InputStream;)Ljavax/mail/internet/InternetHeaders;
- (Ljava/io/InputStream;)Ljavax/mail/internet/InternetHeaders;
+ (Ljava/io/InputStream;)L1javax/mail/internet/InternetHeaders;
 createMimeMessage
  (Ljavax/mail/Session;)Ljavax/mail/internet/MimeMessage;
- (Ljavax/mail/Session;)Ljavax/mail/internet/MimeMessage;
+ (Ljavax/mail/Session;)L1javax/mail/internet/MimeMessage;
 getAllHeaderLines
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
@@ -135,7 +135,7 @@ getRawInputStream
  ()Ljava/io/InputStream;
 getReceivedDate
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L0java/util/Date;
 getRecipients
  (Ljavax/mail/Message$RecipientType;)[Ljavax/mail/Address;
  (Ljavax/mail/Message$RecipientType;)[Ljavax/mail/Address;
@@ -144,13 +144,13 @@ getReplyTo
  ()[Ljavax/mail/Address;
 getSender
  ()Ljavax/mail/Address;
- ()Ljavax/mail/Address;
+ ()L0javax/mail/Address;
 getSentDate
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L0java/util/Date;
 getSubject
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 isMimeType
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/MimeMultipart.eea b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/MimeMultipart.eea
index f15415b973..d802df6a2e 100644
--- a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/MimeMultipart.eea
+++ b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/MimeMultipart.eea
@@ -27,19 +27,19 @@ addBodyPart
  (Ljavax/mail/BodyPart;I)V
 createInternetHeaders
  (Ljava/io/InputStream;)Ljavax/mail/internet/InternetHeaders;
- (Ljava/io/InputStream;)Ljavax/mail/internet/InternetHeaders;
+ (Ljava/io/InputStream;)L1javax/mail/internet/InternetHeaders;
 createMimeBodyPart
  (Ljava/io/InputStream;)Ljavax/mail/internet/MimeBodyPart;
- (Ljava/io/InputStream;)Ljavax/mail/internet/MimeBodyPart;
+ (Ljava/io/InputStream;)L1javax/mail/internet/MimeBodyPart;
 createMimeBodyPart
  (Ljavax/mail/internet/InternetHeaders;[B)Ljavax/mail/internet/MimeBodyPart;
- (Ljavax/mail/internet/InternetHeaders;[B)Ljavax/mail/internet/MimeBodyPart;
+ (Ljavax/mail/internet/InternetHeaders;[B)L1javax/mail/internet/MimeBodyPart;
 getBodyPart
  (I)Ljavax/mail/BodyPart;
  (I)Ljavax/mail/BodyPart;
 getBodyPart
  (Ljava/lang/String;)Ljavax/mail/BodyPart;
- (Ljava/lang/String;)Ljavax/mail/BodyPart;
+ (Ljava/lang/String;)L0javax/mail/BodyPart;
 getPreamble
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/MimePartDataSource.eea b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/MimePartDataSource.eea
index b69284a3b0..7cbdd5ef91 100644
--- a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/MimePartDataSource.eea
+++ b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/MimePartDataSource.eea
@@ -21,4 +21,4 @@ getName
  ()Ljava/lang/String;
 getOutputStream
  ()Ljava/io/OutputStream;
- ()Ljava/io/OutputStream;
+ ()L1java/io/OutputStream;
diff --git a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/MimeUtility.eea b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/MimeUtility.eea
index bd6d29ac2b..a439596b46 100644
--- a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/MimeUtility.eea
+++ b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/MimeUtility.eea
@@ -8,7 +8,7 @@ decodeText
  (Ljava/lang/String;)Ljava/lang/String;
 decodeWord
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 encode
  (Ljava/io/OutputStream;Ljava/lang/String;)Ljava/io/OutputStream;
  (Ljava/io/OutputStream;Ljava/lang/String;)Ljava/io/OutputStream;
@@ -41,7 +41,7 @@ getEncoding
  (Ljavax/activation/DataSource;)Ljava/lang/String;
 javaCharset
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 mimeCharset
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/NewsAddress.eea b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/NewsAddress.eea
index ef5e478b1d..35faf85dac 100644
--- a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/NewsAddress.eea
+++ b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/NewsAddress.eea
@@ -5,7 +5,7 @@ parse
  (Ljava/lang/String;)[Ljavax/mail/internet/NewsAddress;
 toString
  ([Ljavax/mail/Address;)Ljava/lang/String;
- ([Ljavax/mail/Address;)Ljava/lang/String;
+ ([Ljavax/mail/Address;)L0java/lang/String;
 
 host
  Ljava/lang/String;
@@ -31,7 +31,7 @@ getNewsgroup
  ()Ljava/lang/String;
 getType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 setHost
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/ParameterList.eea b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/ParameterList.eea
index faa2b678f2..063e453dba 100644
--- a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/ParameterList.eea
+++ b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/internet/ParameterList.eea
@@ -8,7 +8,7 @@ get
  (Ljava/lang/String;)Ljava/lang/String;
 getNames
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
- ()Ljava/util/Enumeration<Ljava/lang/String;>;
+ ()L1java/util/Enumeration<Ljava/lang/String;>;
 remove
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
@@ -23,4 +23,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toString
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
diff --git a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/search/DateTerm.eea b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/search/DateTerm.eea
index bfa55373e2..1bf3a8c1e2 100644
--- a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/search/DateTerm.eea
+++ b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/search/DateTerm.eea
@@ -12,7 +12,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(javax.mail.search.ComparisonTerm)
 getDate
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L1java/util/Date;
 match
  (Ljava/util/Date;)Z
  (Ljava/util/Date;)Z
diff --git a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/util/ByteArrayDataSource.eea b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/util/ByteArrayDataSource.eea
index d690e59448..418c3e4ad4 100644
--- a/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/util/ByteArrayDataSource.eea
+++ b/libs/eea-javax-mail-api-1/src/main/resources/javax/mail/util/ByteArrayDataSource.eea
@@ -20,7 +20,7 @@ getName
  ()Ljava/lang/String;
 getOutputStream
  ()Ljava/io/OutputStream;
- ()Ljava/io/OutputStream;
+ ()L1java/io/OutputStream;
 setName
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/ActionResponse.eea b/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/ActionResponse.eea
index aed940001f..03ff36f7e6 100644
--- a/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/ActionResponse.eea
+++ b/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/ActionResponse.eea
@@ -2,7 +2,7 @@ class javax/portlet/ActionResponse
 
 createRedirectURL
  (Ljavax/portlet/MimeResponse$Copy;)Ljavax/portlet/RenderURL;
- (Ljavax/portlet/MimeResponse$Copy;)Ljavax/portlet/RenderURL;
+ (Ljavax/portlet/MimeResponse$Copy;)L1javax/portlet/RenderURL;
 sendRedirect
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/GenericPortlet.eea b/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/GenericPortlet.eea
index 2f06d27f3e..cc8f320bb1 100644
--- a/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/GenericPortlet.eea
+++ b/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/GenericPortlet.eea
@@ -42,7 +42,7 @@ getInitParameterNames
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
 getNextPossiblePortletModes
  (Ljavax/portlet/RenderRequest;)Ljava/util/Collection<Ljavax/portlet/PortletMode;>;
- (Ljavax/portlet/RenderRequest;)Ljava/util/Collection<Ljavax/portlet/PortletMode;>;
+ (Ljavax/portlet/RenderRequest;)L0java/util/Collection<Ljavax/portlet/PortletMode;>;
 getPortletConfig
  ()Ljavax/portlet/PortletConfig;
  ()Ljavax/portlet/PortletConfig;
diff --git a/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/MimeResponse.eea b/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/MimeResponse.eea
index 37810d6043..10dee740c8 100644
--- a/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/MimeResponse.eea
+++ b/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/MimeResponse.eea
@@ -27,19 +27,19 @@ USE_CACHED_CONTENT
 
 createActionURL
  (Ljavax/portlet/MimeResponse$Copy;)Ljavax/portlet/ActionURL;
- (Ljavax/portlet/MimeResponse$Copy;)Ljavax/portlet/ActionURL;
+ (Ljavax/portlet/MimeResponse$Copy;)L1javax/portlet/ActionURL;
 createActionURL
  <T::Ljavax/portlet/PortletURL;:Ljavax/portlet/ActionURL;>()TT;
- <T::Ljavax/portlet/PortletURL;:Ljavax/portlet/ActionURL;>()TT;
+ <T::Ljavax/portlet/PortletURL;:Ljavax/portlet/ActionURL;>()T1T;
 createRenderURL
  (Ljavax/portlet/MimeResponse$Copy;)Ljavax/portlet/RenderURL;
- (Ljavax/portlet/MimeResponse$Copy;)Ljavax/portlet/RenderURL;
+ (Ljavax/portlet/MimeResponse$Copy;)L1javax/portlet/RenderURL;
 createRenderURL
  <T::Ljavax/portlet/PortletURL;:Ljavax/portlet/RenderURL;>()TT;
- <T::Ljavax/portlet/PortletURL;:Ljavax/portlet/RenderURL;>()TT;
+ <T::Ljavax/portlet/PortletURL;:Ljavax/portlet/RenderURL;>()T1T;
 createResourceURL
  ()Ljavax/portlet/ResourceURL;
- ()Ljavax/portlet/ResourceURL;
+ ()L1javax/portlet/ResourceURL;
 getCacheControl
  ()Ljavax/portlet/CacheControl;
  ()Ljavax/portlet/CacheControl;
diff --git a/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/PortletAsyncContext.eea b/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/PortletAsyncContext.eea
index 496d748380..a762fc13d5 100644
--- a/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/PortletAsyncContext.eea
+++ b/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/PortletAsyncContext.eea
@@ -8,7 +8,7 @@ addListener
  (Ljavax/portlet/PortletAsyncListener;Ljavax/portlet/ResourceRequest;Ljavax/portlet/ResourceResponse;)V
 createPortletAsyncListener
  <T::Ljavax/portlet/PortletAsyncListener;>(Ljava/lang/Class<TT;>;)TT;
- <T::Ljavax/portlet/PortletAsyncListener;>(Ljava/lang/Class<TT;>;)TT;
+ <T::Ljavax/portlet/PortletAsyncListener;>(Ljava/lang/Class<TT;>;)T1T;
 dispatch
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/PortletResponse.eea b/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/PortletResponse.eea
index 40004eb9ed..f0704942a1 100644
--- a/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/PortletResponse.eea
+++ b/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/PortletResponse.eea
@@ -11,7 +11,7 @@ addProperty
  (Ljavax/servlet/http/Cookie;)V
 createElement
  (Ljava/lang/String;)Lorg/w3c/dom/Element;
- (Ljava/lang/String;)Lorg/w3c/dom/Element;
+ (Ljava/lang/String;)L1org/w3c/dom/Element;
 encodeURL
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/ResourceResponse.eea b/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/ResourceResponse.eea
index f09b53cf66..136ea4a831 100644
--- a/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/ResourceResponse.eea
+++ b/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/ResourceResponse.eea
@@ -6,19 +6,19 @@ HTTP_STATUS_CODE
 
 createActionURL
  (Ljavax/portlet/MimeResponse$Copy;)Ljavax/portlet/ActionURL;
- (Ljavax/portlet/MimeResponse$Copy;)Ljavax/portlet/ActionURL;
+ (Ljavax/portlet/MimeResponse$Copy;)L1javax/portlet/ActionURL; # @Inherited(javax.portlet.MimeResponse)
 createActionURL
  <T::Ljavax/portlet/PortletURL;:Ljavax/portlet/ActionURL;>()TT;
- <T::Ljavax/portlet/PortletURL;:Ljavax/portlet/ActionURL;>()TT;
+ <T::Ljavax/portlet/PortletURL;:Ljavax/portlet/ActionURL;>()T1T; # @Inherited(javax.portlet.MimeResponse)
 createRenderURL
  (Ljavax/portlet/MimeResponse$Copy;)Ljavax/portlet/RenderURL;
- (Ljavax/portlet/MimeResponse$Copy;)Ljavax/portlet/RenderURL;
+ (Ljavax/portlet/MimeResponse$Copy;)L1javax/portlet/RenderURL; # @Inherited(javax.portlet.MimeResponse)
 createRenderURL
  <T::Ljavax/portlet/PortletURL;:Ljavax/portlet/RenderURL;>()TT;
- <T::Ljavax/portlet/PortletURL;:Ljavax/portlet/RenderURL;>()TT;
+ <T::Ljavax/portlet/PortletURL;:Ljavax/portlet/RenderURL;>()T1T; # @Inherited(javax.portlet.MimeResponse)
 createResourceURL
  ()Ljavax/portlet/ResourceURL;
- ()Ljavax/portlet/ResourceURL;
+ ()L1javax/portlet/ResourceURL; # @Inherited(javax.portlet.MimeResponse)
 setCharacterEncoding
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/filter/ActionResponseWrapper.eea b/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/filter/ActionResponseWrapper.eea
index 829bd1331b..effe8274f3 100644
--- a/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/filter/ActionResponseWrapper.eea
+++ b/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/filter/ActionResponseWrapper.eea
@@ -5,7 +5,7 @@ class javax/portlet/filter/ActionResponseWrapper
  (Ljavax/portlet/ActionResponse;)V
 createRedirectURL
  (Ljavax/portlet/MimeResponse$Copy;)Ljavax/portlet/RenderURL;
- (Ljavax/portlet/MimeResponse$Copy;)Ljavax/portlet/RenderURL;
+ (Ljavax/portlet/MimeResponse$Copy;)L1javax/portlet/RenderURL; # @Inherited(javax.portlet.ActionResponse)
 getResponse
  ()Ljavax/portlet/ActionResponse;
  ()Ljavax/portlet/ActionResponse;
diff --git a/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/filter/MimeResponseWrapper.eea b/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/filter/MimeResponseWrapper.eea
index 4b7eb2df75..daa4bb4903 100644
--- a/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/filter/MimeResponseWrapper.eea
+++ b/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/filter/MimeResponseWrapper.eea
@@ -5,19 +5,19 @@ class javax/portlet/filter/MimeResponseWrapper
  (Ljavax/portlet/MimeResponse;)V
 createActionURL
  (Ljavax/portlet/MimeResponse$Copy;)Ljavax/portlet/ActionURL;
- (Ljavax/portlet/MimeResponse$Copy;)Ljavax/portlet/ActionURL;
+ (Ljavax/portlet/MimeResponse$Copy;)L1javax/portlet/ActionURL; # @Inherited(javax.portlet.MimeResponse)
 createActionURL
  <T::Ljavax/portlet/PortletURL;:Ljavax/portlet/ActionURL;>()TT;
- <T::Ljavax/portlet/PortletURL;:Ljavax/portlet/ActionURL;>()TT;
+ <T::Ljavax/portlet/PortletURL;:Ljavax/portlet/ActionURL;>()T1T; # @Inherited(javax.portlet.MimeResponse)
 createRenderURL
  (Ljavax/portlet/MimeResponse$Copy;)Ljavax/portlet/RenderURL;
- (Ljavax/portlet/MimeResponse$Copy;)Ljavax/portlet/RenderURL;
+ (Ljavax/portlet/MimeResponse$Copy;)L1javax/portlet/RenderURL; # @Inherited(javax.portlet.MimeResponse)
 createRenderURL
  <T::Ljavax/portlet/PortletURL;:Ljavax/portlet/RenderURL;>()TT;
- <T::Ljavax/portlet/PortletURL;:Ljavax/portlet/RenderURL;>()TT;
+ <T::Ljavax/portlet/PortletURL;:Ljavax/portlet/RenderURL;>()T1T; # @Inherited(javax.portlet.MimeResponse)
 createResourceURL
  ()Ljavax/portlet/ResourceURL;
- ()Ljavax/portlet/ResourceURL;
+ ()L1javax/portlet/ResourceURL; # @Inherited(javax.portlet.MimeResponse)
 getCacheControl
  ()Ljavax/portlet/CacheControl;
  ()Ljavax/portlet/CacheControl;
diff --git a/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/filter/PortletAsyncContextWrapper.eea b/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/filter/PortletAsyncContextWrapper.eea
index 3dede91978..0dc188747b 100644
--- a/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/filter/PortletAsyncContextWrapper.eea
+++ b/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/filter/PortletAsyncContextWrapper.eea
@@ -11,7 +11,7 @@ addListener
  (Ljavax/portlet/PortletAsyncListener;Ljavax/portlet/ResourceRequest;Ljavax/portlet/ResourceResponse;)V
 createPortletAsyncListener
  <T::Ljavax/portlet/PortletAsyncListener;>(Ljava/lang/Class<TT;>;)TT;
- <T::Ljavax/portlet/PortletAsyncListener;>(Ljava/lang/Class<TT;>;)TT;
+ <T::Ljavax/portlet/PortletAsyncListener;>(Ljava/lang/Class<TT;>;)T1T; # @Inherited(javax.portlet.PortletAsyncContext)
 dispatch
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/filter/PortletResponseWrapper.eea b/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/filter/PortletResponseWrapper.eea
index 1b3206ae0e..938ca79e99 100644
--- a/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/filter/PortletResponseWrapper.eea
+++ b/libs/eea-javax-portlet-api-3/src/main/resources/javax/portlet/filter/PortletResponseWrapper.eea
@@ -14,7 +14,7 @@ addProperty
  (Ljavax/servlet/http/Cookie;)V
 createElement
  (Ljava/lang/String;)Lorg/w3c/dom/Element;
- (Ljava/lang/String;)Lorg/w3c/dom/Element;
+ (Ljava/lang/String;)L1org/w3c/dom/Element; # @Inherited(javax.portlet.PortletResponse)
 encodeURL
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-javax-servlet-api-4/src/main/resources/javax/servlet/AsyncContext.eea b/libs/eea-javax-servlet-api-4/src/main/resources/javax/servlet/AsyncContext.eea
index 3cf2fc717e..83874aafde 100644
--- a/libs/eea-javax-servlet-api-4/src/main/resources/javax/servlet/AsyncContext.eea
+++ b/libs/eea-javax-servlet-api-4/src/main/resources/javax/servlet/AsyncContext.eea
@@ -27,7 +27,7 @@ addListener
  (Ljavax/servlet/AsyncListener;Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V
 createListener
  <T::Ljavax/servlet/AsyncListener;>(Ljava/lang/Class<TT;>;)TT;
- <T::Ljavax/servlet/AsyncListener;>(Ljava/lang/Class<TT;>;)TT;
+ <T::Ljavax/servlet/AsyncListener;>(Ljava/lang/Class<TT;>;)T1T;
 dispatch
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-javax-servlet-api-4/src/main/resources/javax/servlet/http/HttpServletRequest.eea b/libs/eea-javax-servlet-api-4/src/main/resources/javax/servlet/http/HttpServletRequest.eea
index b907150b6c..127622515e 100644
--- a/libs/eea-javax-servlet-api-4/src/main/resources/javax/servlet/http/HttpServletRequest.eea
+++ b/libs/eea-javax-servlet-api-4/src/main/resources/javax/servlet/http/HttpServletRequest.eea
@@ -42,7 +42,7 @@ getHeaders
  (L1java/lang/String;)L0java/util/Enumeration<Ljava/lang/String;>;
 getHttpServletMapping
  ()Ljavax/servlet/http/HttpServletMapping;
- ()Ljavax/servlet/http/HttpServletMapping;
+ ()L1javax/servlet/http/HttpServletMapping;
 getIntHeader
  (Ljava/lang/String;)I
  (L1java/lang/String;)I
@@ -99,7 +99,7 @@ login
  (L1java/lang/String;L1java/lang/String;)V
 newPushBuilder
  ()Ljavax/servlet/http/PushBuilder;
- ()Ljavax/servlet/http/PushBuilder;
+ ()L0javax/servlet/http/PushBuilder;
 upgrade
  <T::Ljavax/servlet/http/HttpUpgradeHandler;>(Ljava/lang/Class<TT;>;)TT;
  <T::Ljavax/servlet/http/HttpUpgradeHandler;>(L1java/lang/Class<TT;>;)T1T;
diff --git a/libs/eea-javax-servlet-api-4/src/main/resources/javax/servlet/http/HttpServletRequestWrapper.eea b/libs/eea-javax-servlet-api-4/src/main/resources/javax/servlet/http/HttpServletRequestWrapper.eea
index cdd8192528..3ce1f5087c 100644
--- a/libs/eea-javax-servlet-api-4/src/main/resources/javax/servlet/http/HttpServletRequestWrapper.eea
+++ b/libs/eea-javax-servlet-api-4/src/main/resources/javax/servlet/http/HttpServletRequestWrapper.eea
@@ -32,7 +32,7 @@ getHeaders
  (L1java/lang/String;)L0java/util/Enumeration<Ljava/lang/String;>; # @Inherited(javax.servlet.http.HttpServletRequest)
 getHttpServletMapping
  ()Ljavax/servlet/http/HttpServletMapping;
- ()Ljavax/servlet/http/HttpServletMapping;
+ ()L1javax/servlet/http/HttpServletMapping; # @Inherited(javax.servlet.http.HttpServletRequest)
 getIntHeader
  (Ljava/lang/String;)I
  (L1java/lang/String;)I # @Inherited(javax.servlet.http.HttpServletRequest)
@@ -89,7 +89,7 @@ login
  (L1java/lang/String;L1java/lang/String;)V # @Inherited(javax.servlet.http.HttpServletRequest)
 newPushBuilder
  ()Ljavax/servlet/http/PushBuilder;
- ()Ljavax/servlet/http/PushBuilder;
+ ()L0javax/servlet/http/PushBuilder; # @Inherited(javax.servlet.http.HttpServletRequest)
 upgrade
  <T::Ljavax/servlet/http/HttpUpgradeHandler;>(Ljava/lang/Class<TT;>;)TT;
  <T::Ljavax/servlet/http/HttpUpgradeHandler;>(L1java/lang/Class<TT;>;)T1T; # @Inherited(javax.servlet.http.HttpServletRequest)
diff --git a/libs/eea-javax-servlet-api-4/src/main/resources/javax/servlet/http/HttpServletResponse.eea b/libs/eea-javax-servlet-api-4/src/main/resources/javax/servlet/http/HttpServletResponse.eea
index a4c5ecc626..8d3597cb9c 100644
--- a/libs/eea-javax-servlet-api-4/src/main/resources/javax/servlet/http/HttpServletResponse.eea
+++ b/libs/eea-javax-servlet-api-4/src/main/resources/javax/servlet/http/HttpServletResponse.eea
@@ -38,7 +38,7 @@ getHeaders
  (L1java/lang/String;)L1java/util/Collection<Ljava/lang/String;>;
 getTrailerFields
  ()Ljava/util/function/Supplier<Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;>;
- ()Ljava/util/function/Supplier<Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;>;
+ ()L0java/util/function/Supplier<Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;>;
 sendError
  (ILjava/lang/String;)V
  (IL0java/lang/String;)V
diff --git a/libs/eea-javax-servlet-api-4/src/main/resources/javax/servlet/http/HttpServletResponseWrapper.eea b/libs/eea-javax-servlet-api-4/src/main/resources/javax/servlet/http/HttpServletResponseWrapper.eea
index 25f11c0ec5..451245da06 100644
--- a/libs/eea-javax-servlet-api-4/src/main/resources/javax/servlet/http/HttpServletResponseWrapper.eea
+++ b/libs/eea-javax-servlet-api-4/src/main/resources/javax/servlet/http/HttpServletResponseWrapper.eea
@@ -41,7 +41,7 @@ getHeaders
  (L1java/lang/String;)L1java/util/Collection<Ljava/lang/String;>; # @Inherited(javax.servlet.http.HttpServletResponse)
 getTrailerFields
  ()Ljava/util/function/Supplier<Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;>;
- ()Ljava/util/function/Supplier<Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;>;
+ ()L0java/util/function/Supplier<Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;>; # @Inherited(javax.servlet.http.HttpServletResponse)
 sendError
  (ILjava/lang/String;)V
  (IL0java/lang/String;)V # @Inherited(javax.servlet.http.HttpServletResponse)
diff --git a/libs/eea-javax-servlet-api-4/src/main/resources/javax/servlet/http/HttpUtils.eea b/libs/eea-javax-servlet-api-4/src/main/resources/javax/servlet/http/HttpUtils.eea
index 7c45ecbbcd..d611f54cd5 100644
--- a/libs/eea-javax-servlet-api-4/src/main/resources/javax/servlet/http/HttpUtils.eea
+++ b/libs/eea-javax-servlet-api-4/src/main/resources/javax/servlet/http/HttpUtils.eea
@@ -2,10 +2,10 @@ class javax/servlet/http/HttpUtils
 
 getRequestURL
  (Ljavax/servlet/http/HttpServletRequest;)Ljava/lang/StringBuffer;
- (Ljavax/servlet/http/HttpServletRequest;)Ljava/lang/StringBuffer;
+ (Ljavax/servlet/http/HttpServletRequest;)L1java/lang/StringBuffer;
 parsePostData
  (ILjavax/servlet/ServletInputStream;)Ljava/util/Hashtable<Ljava/lang/String;[Ljava/lang/String;>;
  (ILjavax/servlet/ServletInputStream;)Ljava/util/Hashtable<Ljava/lang/String;[Ljava/lang/String;>;
 parseQueryString
  (Ljava/lang/String;)Ljava/util/Hashtable<Ljava/lang/String;[Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/Hashtable<Ljava/lang/String;[Ljava/lang/String;>;
+ (Ljava/lang/String;)L1java/util/Hashtable<Ljava/lang/String;[Ljava/lang/String;>;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/CodeWriter.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/CodeWriter.eea
index 30a90cd3a3..67a7216d1e 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/CodeWriter.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/CodeWriter.eea
@@ -9,4 +9,4 @@ openBinary
  (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)Ljava/io/OutputStream;
 openSource
  (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)Ljava/io/Writer;
- (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)Ljava/io/Writer;
+ (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)L1java/io/Writer;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JAnnotationArrayMember.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JAnnotationArrayMember.eea
index d456a0e7a0..430d922750 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JAnnotationArrayMember.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JAnnotationArrayMember.eea
@@ -2,7 +2,7 @@ class com/sun/codemodel/JAnnotationArrayMember
 
 annotate
  (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JAnnotationUse;
- (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JAnnotationUse;
+ (Lcom/sun/codemodel/JClass;)L1com/sun/codemodel/JAnnotationUse;
 annotate
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lcom/sun/codemodel/JAnnotationUse;
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lcom/sun/codemodel/JAnnotationUse;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JAnnotationUse.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JAnnotationUse.eea
index e947c238af..6e0379a8ee 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JAnnotationUse.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JAnnotationUse.eea
@@ -2,10 +2,10 @@ class com/sun/codemodel/JAnnotationUse
 
 annotate
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lcom/sun/codemodel/JAnnotationUse;
- (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lcom/sun/codemodel/JAnnotationUse;
+ (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)L1com/sun/codemodel/JAnnotationUse;
 annotationParam
  (Ljava/lang/String;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lcom/sun/codemodel/JAnnotationUse;
- (Ljava/lang/String;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lcom/sun/codemodel/JAnnotationUse;
+ (Ljava/lang/String;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)L1com/sun/codemodel/JAnnotationUse;
 generate
  (Lcom/sun/codemodel/JFormatter;)V
  (Lcom/sun/codemodel/JFormatter;)V
@@ -62,4 +62,4 @@ param
  (Ljava/lang/String;Z)Lcom/sun/codemodel/JAnnotationUse;
 paramArray
  (Ljava/lang/String;)Lcom/sun/codemodel/JAnnotationArrayMember;
- (Ljava/lang/String;)Lcom/sun/codemodel/JAnnotationArrayMember;
+ (Ljava/lang/String;)L1com/sun/codemodel/JAnnotationArrayMember;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JBlock.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JBlock.eea
index 3041c6efd4..4cd86a0f15 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JBlock.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JBlock.eea
@@ -44,7 +44,7 @@ block
  ()Lcom/sun/codemodel/JBlock;
 decl
  (ILcom/sun/codemodel/JType;Ljava/lang/String;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JVar;
- (ILcom/sun/codemodel/JType;Ljava/lang/String;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JVar;
+ (ILcom/sun/codemodel/JType;Ljava/lang/String;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JVar;
 decl
  (Lcom/sun/codemodel/JType;Ljava/lang/String;)Lcom/sun/codemodel/JVar;
  (Lcom/sun/codemodel/JType;Ljava/lang/String;)Lcom/sun/codemodel/JVar;
@@ -53,7 +53,7 @@ decl
  (Lcom/sun/codemodel/JType;Ljava/lang/String;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JVar;
 directStatement
  (Ljava/lang/String;)Lcom/sun/codemodel/JStatement;
- (Ljava/lang/String;)Lcom/sun/codemodel/JStatement;
+ (Ljava/lang/String;)L1com/sun/codemodel/JStatement;
 forEach
  (Lcom/sun/codemodel/JType;Ljava/lang/String;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JForEach;
  (Lcom/sun/codemodel/JType;Ljava/lang/String;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JForEach;
@@ -68,7 +68,7 @@ invoke
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JMethod;)Lcom/sun/codemodel/JInvocation;
 invoke
  (Lcom/sun/codemodel/JExpression;Ljava/lang/String;)Lcom/sun/codemodel/JInvocation;
- (Lcom/sun/codemodel/JExpression;Ljava/lang/String;)Lcom/sun/codemodel/JInvocation;
+ (Lcom/sun/codemodel/JExpression;Ljava/lang/String;)L1com/sun/codemodel/JInvocation;
 invoke
  (Lcom/sun/codemodel/JMethod;)Lcom/sun/codemodel/JInvocation;
  (Lcom/sun/codemodel/JMethod;)Lcom/sun/codemodel/JInvocation;
@@ -77,7 +77,7 @@ invoke
  (Ljava/lang/String;)Lcom/sun/codemodel/JInvocation;
 label
  (Ljava/lang/String;)Lcom/sun/codemodel/JLabel;
- (Ljava/lang/String;)Lcom/sun/codemodel/JLabel;
+ (Ljava/lang/String;)L1com/sun/codemodel/JLabel;
 state
  (Lcom/sun/codemodel/JFormatter;)V
  (Lcom/sun/codemodel/JFormatter;)V
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JClass.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JClass.eea
index 0d7f94deab..e8bf93a377 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JClass.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JClass.eea
@@ -33,13 +33,13 @@ generate
  (Lcom/sun/codemodel/JFormatter;)V
 getBaseClass
  (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JClass;
- (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JClass;
+ (Lcom/sun/codemodel/JClass;)L0com/sun/codemodel/JClass;
 getBaseClass
  (Ljava/lang/Class<*>;)Lcom/sun/codemodel/JClass;
  (Ljava/lang/Class<*>;)Lcom/sun/codemodel/JClass;
 getPrimitiveType
  ()Lcom/sun/codemodel/JPrimitiveType;
- ()Lcom/sun/codemodel/JPrimitiveType;
+ ()L0com/sun/codemodel/JPrimitiveType;
 getTypeParameters
  ()Ljava/util/List<Lcom/sun/codemodel/JClass;>;
  ()Ljava/util/List<Lcom/sun/codemodel/JClass;>;
@@ -51,7 +51,7 @@ name
  ()Ljava/lang/String;
 narrow
  (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JClass;
- (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JClass;
+ (Lcom/sun/codemodel/JClass;)L1com/sun/codemodel/JClass;
 narrow
  (Lcom/sun/codemodel/JType;)Lcom/sun/codemodel/JClass;
  (Lcom/sun/codemodel/JType;)Lcom/sun/codemodel/JClass;
@@ -60,31 +60,31 @@ narrow
  (Ljava/lang/Class<*>;)Lcom/sun/codemodel/JClass;
 narrow
  (Ljava/util/List<+Lcom/sun/codemodel/JClass;>;)Lcom/sun/codemodel/JClass;
- (Ljava/util/List<+Lcom/sun/codemodel/JClass;>;)Lcom/sun/codemodel/JClass;
+ (Ljava/util/List<+Lcom/sun/codemodel/JClass;>;)L1com/sun/codemodel/JClass;
 narrow
  ([Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JClass;
- ([Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JClass;
+ ([Lcom/sun/codemodel/JClass;)L1com/sun/codemodel/JClass;
 narrow
  ([Ljava/lang/Class<*>;)Lcom/sun/codemodel/JClass;
  ([Ljava/lang/Class<*>;)Lcom/sun/codemodel/JClass;
 outer
  ()Lcom/sun/codemodel/JClass;
- ()Lcom/sun/codemodel/JClass;
+ ()L0com/sun/codemodel/JClass;
 owner
  ()Lcom/sun/codemodel/JCodeModel;
  ()Lcom/sun/codemodel/JCodeModel;
 staticInvoke
  (Lcom/sun/codemodel/JMethod;)Lcom/sun/codemodel/JInvocation;
- (Lcom/sun/codemodel/JMethod;)Lcom/sun/codemodel/JInvocation;
+ (Lcom/sun/codemodel/JMethod;)L1com/sun/codemodel/JInvocation;
 staticInvoke
  (Ljava/lang/String;)Lcom/sun/codemodel/JInvocation;
- (Ljava/lang/String;)Lcom/sun/codemodel/JInvocation;
+ (Ljava/lang/String;)L1com/sun/codemodel/JInvocation;
 staticRef
  (Lcom/sun/codemodel/JVar;)Lcom/sun/codemodel/JFieldRef;
- (Lcom/sun/codemodel/JVar;)Lcom/sun/codemodel/JFieldRef;
+ (Lcom/sun/codemodel/JVar;)L1com/sun/codemodel/JFieldRef;
 staticRef
  (Ljava/lang/String;)Lcom/sun/codemodel/JFieldRef;
- (Ljava/lang/String;)Lcom/sun/codemodel/JFieldRef;
+ (Ljava/lang/String;)L1com/sun/codemodel/JFieldRef;
 substituteParams
  ([Lcom/sun/codemodel/JTypeVar;Ljava/util/List<Lcom/sun/codemodel/JClass;>;)Lcom/sun/codemodel/JClass;
  ([Lcom/sun/codemodel/JTypeVar;Ljava/util/List<Lcom/sun/codemodel/JClass;>;)Lcom/sun/codemodel/JClass;
@@ -99,4 +99,4 @@ unboxify
  ()Lcom/sun/codemodel/JType;
 wildcard
  ()Lcom/sun/codemodel/JClass;
- ()Lcom/sun/codemodel/JClass;
+ ()L1com/sun/codemodel/JClass;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JCodeModel.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JCodeModel.eea
index 98eafd3ad4..d4efd0140d 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JCodeModel.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JCodeModel.eea
@@ -58,7 +58,7 @@ _moduleInfo
  (Ljava/lang/String;)Lcom/sun/codemodel/JModule;
 _package
  (Ljava/lang/String;)Lcom/sun/codemodel/JPackage;
- (Ljava/lang/String;)Lcom/sun/codemodel/JPackage;
+ (Ljava/lang/String;)L1com/sun/codemodel/JPackage;
 _prepareModuleInfo
  (Ljava/lang/String;[Ljava/lang/String;)V
  (Ljava/lang/String;[Ljava/lang/String;)V
@@ -73,7 +73,7 @@ addClassNameReplacer
  (Ljava/lang/String;Ljava/lang/String;)V
 anonymousClass
  (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JDefinedClass;
- (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JDefinedClass;
+ (Lcom/sun/codemodel/JClass;)L1com/sun/codemodel/JDefinedClass;
 anonymousClass
  (Ljava/lang/Class<*>;)Lcom/sun/codemodel/JDefinedClass;
  (Ljava/lang/Class<*>;)Lcom/sun/codemodel/JDefinedClass;
@@ -100,10 +100,10 @@ classNameReplacer
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
 directClass
  (Ljava/lang/String;)Lcom/sun/codemodel/JClass;
- (Ljava/lang/String;)Lcom/sun/codemodel/JClass;
+ (Ljava/lang/String;)L1com/sun/codemodel/JClass;
 newAnonymousClass
  (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JDefinedClass;
- (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JDefinedClass;
+ (Lcom/sun/codemodel/JClass;)L1com/sun/codemodel/JDefinedClass;
 packages
  ()Ljava/util/Iterator<Lcom/sun/codemodel/JPackage;>;
  ()Ljava/util/Iterator<Lcom/sun/codemodel/JPackage;>;
@@ -112,7 +112,7 @@ parseType
  (Ljava/lang/String;)Lcom/sun/codemodel/JType;
 ref
  (Ljava/lang/Class<*>;)Lcom/sun/codemodel/JClass;
- (Ljava/lang/Class<*>;)Lcom/sun/codemodel/JClass;
+ (Ljava/lang/Class<*>;)L1com/sun/codemodel/JClass;
 ref
  (Ljava/lang/String;)Lcom/sun/codemodel/JClass;
  (Ljava/lang/String;)Lcom/sun/codemodel/JClass;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JDefinedClass.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JDefinedClass.eea
index b9ca1f8e40..cde0037999 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JDefinedClass.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JDefinedClass.eea
@@ -12,7 +12,7 @@ _class
  (ILjava/lang/String;)Lcom/sun/codemodel/JDefinedClass;
 _class
  (ILjava/lang/String;Lcom/sun/codemodel/ClassType;)Lcom/sun/codemodel/JDefinedClass;
- (ILjava/lang/String;Lcom/sun/codemodel/ClassType;)Lcom/sun/codemodel/JDefinedClass;
+ (ILjava/lang/String;Lcom/sun/codemodel/ClassType;)L1com/sun/codemodel/JDefinedClass;
 _class
  (ILjava/lang/String;Z)Lcom/sun/codemodel/JDefinedClass;
  (ILjava/lang/String;Z)Lcom/sun/codemodel/JDefinedClass;
@@ -54,7 +54,7 @@ _package
  ()Lcom/sun/codemodel/JPackage;
 annotate
  (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JAnnotationUse;
- (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JAnnotationUse;
+ (Lcom/sun/codemodel/JClass;)L1com/sun/codemodel/JAnnotationUse;
 annotate
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lcom/sun/codemodel/JAnnotationUse;
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lcom/sun/codemodel/JAnnotationUse;
@@ -72,7 +72,7 @@ classes
  ()Ljava/util/Iterator<Lcom/sun/codemodel/JDefinedClass;>;
 constructor
  (I)Lcom/sun/codemodel/JMethod;
- (I)Lcom/sun/codemodel/JMethod;
+ (I)L1com/sun/codemodel/JMethod;
 constructors
  ()Ljava/util/Iterator<Lcom/sun/codemodel/JMethod;>;
  ()Ljava/util/Iterator<Lcom/sun/codemodel/JMethod;>;
@@ -87,7 +87,7 @@ direct
  (Ljava/lang/String;)V
 enumConstant
  (Ljava/lang/String;)Lcom/sun/codemodel/JEnumConstant;
- (Ljava/lang/String;)Lcom/sun/codemodel/JEnumConstant;
+ (Ljava/lang/String;)L1com/sun/codemodel/JEnumConstant;
 enumConstants
  ()Ljava/util/Map<Ljava/lang/String;Lcom/sun/codemodel/JEnumConstant;>;
  ()Ljava/util/Map<Ljava/lang/String;Lcom/sun/codemodel/JEnumConstant;>;
@@ -96,7 +96,7 @@ field
  (ILcom/sun/codemodel/JType;Ljava/lang/String;)Lcom/sun/codemodel/JFieldVar;
 field
  (ILcom/sun/codemodel/JType;Ljava/lang/String;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JFieldVar;
- (ILcom/sun/codemodel/JType;Ljava/lang/String;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JFieldVar;
+ (ILcom/sun/codemodel/JType;Ljava/lang/String;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JFieldVar;
 field
  (ILjava/lang/Class<*>;Ljava/lang/String;)Lcom/sun/codemodel/JFieldVar;
  (ILjava/lang/Class<*>;Ljava/lang/String;)Lcom/sun/codemodel/JFieldVar;
@@ -123,10 +123,10 @@ getClassType
  ()Lcom/sun/codemodel/ClassType;
 getConstructor
  ([Lcom/sun/codemodel/JType;)Lcom/sun/codemodel/JMethod;
- ([Lcom/sun/codemodel/JType;)Lcom/sun/codemodel/JMethod;
+ ([Lcom/sun/codemodel/JType;)L0com/sun/codemodel/JMethod;
 getMethod
  (Ljava/lang/String;[Lcom/sun/codemodel/JType;)Lcom/sun/codemodel/JMethod;
- (Ljava/lang/String;[Lcom/sun/codemodel/JType;)Lcom/sun/codemodel/JMethod;
+ (Ljava/lang/String;[Lcom/sun/codemodel/JType;)L0com/sun/codemodel/JMethod;
 getPackage
  ()Lcom/sun/codemodel/JPackage;
  ()L1com/sun/codemodel/JPackage;
@@ -144,7 +144,7 @@ listClasses
  ()[Lcom/sun/codemodel/JClass;
 method
  (ILcom/sun/codemodel/JType;Ljava/lang/String;)Lcom/sun/codemodel/JMethod;
- (ILcom/sun/codemodel/JType;Ljava/lang/String;)Lcom/sun/codemodel/JMethod;
+ (ILcom/sun/codemodel/JType;Ljava/lang/String;)L1com/sun/codemodel/JMethod;
 method
  (ILjava/lang/Class<*>;Ljava/lang/String;)Lcom/sun/codemodel/JMethod;
  (ILjava/lang/Class<*>;Ljava/lang/String;)Lcom/sun/codemodel/JMethod;
@@ -159,7 +159,7 @@ name
  ()L1java/lang/String;
 outer
  ()Lcom/sun/codemodel/JClass;
- ()L0com/sun/codemodel/JClass;
+ ()L0com/sun/codemodel/JClass; # @Inherited(com.sun.codemodel.JClass)
 parentContainer
  ()Lcom/sun/codemodel/JClassContainer;
  ()Lcom/sun/codemodel/JClassContainer;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JDocComment.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JDocComment.eea
index c4267cf8f1..928ae13a47 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JDocComment.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JDocComment.eea
@@ -11,13 +11,13 @@ addParam
  (Lcom/sun/codemodel/JVar;)Lcom/sun/codemodel/JCommentPart;
 addParam
  (Ljava/lang/String;)Lcom/sun/codemodel/JCommentPart;
- (Ljava/lang/String;)Lcom/sun/codemodel/JCommentPart;
+ (Ljava/lang/String;)L1com/sun/codemodel/JCommentPart;
 addReturn
  ()Lcom/sun/codemodel/JCommentPart;
  ()Lcom/sun/codemodel/JCommentPart;
 addThrows
  (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JCommentPart;
- (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JCommentPart;
+ (Lcom/sun/codemodel/JClass;)L1com/sun/codemodel/JCommentPart;
 addThrows
  (Ljava/lang/Class<+Ljava/lang/Throwable;>;)Lcom/sun/codemodel/JCommentPart;
  (Ljava/lang/Class<+Ljava/lang/Throwable;>;)Lcom/sun/codemodel/JCommentPart;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JEnumConstant.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JEnumConstant.eea
index 3440530831..1a5ac8ecf0 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JEnumConstant.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JEnumConstant.eea
@@ -2,7 +2,7 @@ class com/sun/codemodel/JEnumConstant
 
 annotate
  (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JAnnotationUse;
- (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JAnnotationUse;
+ (Lcom/sun/codemodel/JClass;)L1com/sun/codemodel/JAnnotationUse;
 annotate
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lcom/sun/codemodel/JAnnotationUse;
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lcom/sun/codemodel/JAnnotationUse;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JExpr.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JExpr.eea
index d1b40d83d5..73f3a4b5a6 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JExpr.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JExpr.eea
@@ -9,10 +9,10 @@ TRUE
 
 _new
  (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JInvocation;
- (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JInvocation;
+ (Lcom/sun/codemodel/JClass;)L1com/sun/codemodel/JInvocation;
 _new
  (Lcom/sun/codemodel/JType;)Lcom/sun/codemodel/JInvocation;
- (Lcom/sun/codemodel/JType;)Lcom/sun/codemodel/JInvocation;
+ (Lcom/sun/codemodel/JType;)L1com/sun/codemodel/JInvocation;
 _null
  ()Lcom/sun/codemodel/JExpression;
  ()Lcom/sun/codemodel/JExpression;
@@ -24,34 +24,34 @@ _this
  ()Lcom/sun/codemodel/JExpression;
 assign
  (Lcom/sun/codemodel/JAssignmentTarget;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JAssignmentTarget;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JAssignmentTarget;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JExpression;
 assignPlus
  (Lcom/sun/codemodel/JAssignmentTarget;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JAssignmentTarget;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JAssignmentTarget;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JExpression;
 cast
  (Lcom/sun/codemodel/JType;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JCast;
- (Lcom/sun/codemodel/JType;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JCast;
+ (Lcom/sun/codemodel/JType;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JCast;
 component
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JArrayCompRef;
- (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JArrayCompRef;
+ (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JArrayCompRef;
 direct
  (Ljava/lang/String;)Lcom/sun/codemodel/JExpression;
- (Ljava/lang/String;)Lcom/sun/codemodel/JExpression;
+ (Ljava/lang/String;)L1com/sun/codemodel/JExpression;
 dotclass
  (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JClass;)L1com/sun/codemodel/JExpression;
 invoke
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JMethod;)Lcom/sun/codemodel/JInvocation;
- (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JMethod;)Lcom/sun/codemodel/JInvocation;
+ (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JMethod;)L1com/sun/codemodel/JInvocation;
 invoke
  (Lcom/sun/codemodel/JExpression;Ljava/lang/String;)Lcom/sun/codemodel/JInvocation;
- (Lcom/sun/codemodel/JExpression;Ljava/lang/String;)Lcom/sun/codemodel/JInvocation;
+ (Lcom/sun/codemodel/JExpression;Ljava/lang/String;)L1com/sun/codemodel/JInvocation;
 invoke
  (Lcom/sun/codemodel/JMethod;)Lcom/sun/codemodel/JInvocation;
- (Lcom/sun/codemodel/JMethod;)Lcom/sun/codemodel/JInvocation;
+ (Lcom/sun/codemodel/JMethod;)L1com/sun/codemodel/JInvocation;
 invoke
  (Ljava/lang/String;)Lcom/sun/codemodel/JInvocation;
- (Ljava/lang/String;)Lcom/sun/codemodel/JInvocation;
+ (Ljava/lang/String;)L1com/sun/codemodel/JInvocation;
 lit
  (C)Lcom/sun/codemodel/JExpression;
  (C)Lcom/sun/codemodel/JExpression;
@@ -63,13 +63,13 @@ lit
  (F)Lcom/sun/codemodel/JExpression;
 lit
  (I)Lcom/sun/codemodel/JExpression;
- (I)Lcom/sun/codemodel/JExpression;
+ (I)L1com/sun/codemodel/JExpression;
 lit
  (J)Lcom/sun/codemodel/JExpression;
  (J)Lcom/sun/codemodel/JExpression;
 lit
  (Ljava/lang/String;)Lcom/sun/codemodel/JExpression;
- (Ljava/lang/String;)Lcom/sun/codemodel/JExpression;
+ (Ljava/lang/String;)L1com/sun/codemodel/JExpression;
 lit
  (Z)Lcom/sun/codemodel/JExpression;
  (Z)Lcom/sun/codemodel/JExpression;
@@ -81,19 +81,19 @@ newArray
  (Lcom/sun/codemodel/JType;I)Lcom/sun/codemodel/JArray;
 newArray
  (Lcom/sun/codemodel/JType;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JArray;
- (Lcom/sun/codemodel/JType;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JArray;
+ (Lcom/sun/codemodel/JType;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JArray;
 quotify
  (CLjava/lang/String;)Ljava/lang/String;
- (CLjava/lang/String;)Ljava/lang/String;
+ (CLjava/lang/String;)L1java/lang/String;
 ref
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JVar;)Lcom/sun/codemodel/JFieldRef;
- (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JVar;)Lcom/sun/codemodel/JFieldRef;
+ (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JVar;)L1com/sun/codemodel/JFieldRef;
 ref
  (Lcom/sun/codemodel/JExpression;Ljava/lang/String;)Lcom/sun/codemodel/JFieldRef;
- (Lcom/sun/codemodel/JExpression;Ljava/lang/String;)Lcom/sun/codemodel/JFieldRef;
+ (Lcom/sun/codemodel/JExpression;Ljava/lang/String;)L1com/sun/codemodel/JFieldRef;
 ref
  (Ljava/lang/String;)Lcom/sun/codemodel/JFieldRef;
- (Ljava/lang/String;)Lcom/sun/codemodel/JFieldRef;
+ (Ljava/lang/String;)L1com/sun/codemodel/JFieldRef;
 refthis
  (Ljava/lang/String;)Lcom/sun/codemodel/JFieldRef;
  (Ljava/lang/String;)Lcom/sun/codemodel/JFieldRef;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JForLoop.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JForLoop.eea
index ea5da58629..42453cd4ee 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JForLoop.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JForLoop.eea
@@ -5,7 +5,7 @@ body
  ()Lcom/sun/codemodel/JBlock;
 init
  (ILcom/sun/codemodel/JType;Ljava/lang/String;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JVar;
- (ILcom/sun/codemodel/JType;Ljava/lang/String;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JVar;
+ (ILcom/sun/codemodel/JType;Ljava/lang/String;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JVar;
 init
  (Lcom/sun/codemodel/JType;Ljava/lang/String;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JVar;
  (Lcom/sun/codemodel/JType;Ljava/lang/String;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JVar;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JMethod.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JMethod.eea
index 96f1ef0292..fc1c55b72d 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JMethod.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JMethod.eea
@@ -8,7 +8,7 @@ _throws
  (Ljava/lang/Class<+Ljava/lang/Throwable;>;)Lcom/sun/codemodel/JMethod;
 annotate
  (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JAnnotationUse;
- (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JAnnotationUse;
+ (Lcom/sun/codemodel/JClass;)L1com/sun/codemodel/JAnnotationUse;
 annotate
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lcom/sun/codemodel/JAnnotationUse;
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lcom/sun/codemodel/JAnnotationUse;
@@ -35,7 +35,7 @@ javadoc
  ()Lcom/sun/codemodel/JDocComment;
 listParamTypes
  ()[Lcom/sun/codemodel/JType;
- ()[Lcom/sun/codemodel/JType;
+ ()[1Lcom/sun/codemodel/JType;
 listParams
  ()[Lcom/sun/codemodel/JVar;
  ()[Lcom/sun/codemodel/JVar;
@@ -44,7 +44,7 @@ listVarParam
  ()Lcom/sun/codemodel/JVar;
 listVarParamType
  ()Lcom/sun/codemodel/JType;
- ()Lcom/sun/codemodel/JType;
+ ()L0com/sun/codemodel/JType;
 mods
  ()Lcom/sun/codemodel/JMods;
  ()Lcom/sun/codemodel/JMods;
@@ -59,7 +59,7 @@ owner
  ()Lcom/sun/codemodel/JCodeModel;
 param
  (ILcom/sun/codemodel/JType;Ljava/lang/String;)Lcom/sun/codemodel/JVar;
- (ILcom/sun/codemodel/JType;Ljava/lang/String;)Lcom/sun/codemodel/JVar;
+ (ILcom/sun/codemodel/JType;Ljava/lang/String;)L1com/sun/codemodel/JVar;
 param
  (ILjava/lang/Class<*>;Ljava/lang/String;)Lcom/sun/codemodel/JVar;
  (ILjava/lang/Class<*>;Ljava/lang/String;)Lcom/sun/codemodel/JVar;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JNullType.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JNullType.eea
index da481401de..da7f9ce2ed 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JNullType.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JNullType.eea
@@ -2,7 +2,7 @@ class com/sun/codemodel/JNullType
 
 _extends
  ()Lcom/sun/codemodel/JClass;
- ()Lcom/sun/codemodel/JClass;
+ ()L0com/sun/codemodel/JClass;
 _implements
  ()Ljava/util/Iterator<Lcom/sun/codemodel/JClass;>;
  ()Ljava/util/Iterator<Lcom/sun/codemodel/JClass;>;
@@ -11,10 +11,10 @@ _package
  ()Lcom/sun/codemodel/JPackage;
 fullName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 name
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 substituteParams
  ([Lcom/sun/codemodel/JTypeVar;Ljava/util/List<Lcom/sun/codemodel/JClass;>;)Lcom/sun/codemodel/JClass;
  ([Lcom/sun/codemodel/JTypeVar;Ljava/util/List<Lcom/sun/codemodel/JClass;>;)Lcom/sun/codemodel/JClass;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JOp.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JOp.eea
index 2a2b20f3f7..1ebdf9abd0 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JOp.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JOp.eea
@@ -2,79 +2,79 @@ class com/sun/codemodel/JOp
 
 _instanceof
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JType;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JType;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JType;)L1com/sun/codemodel/JExpression;
 band
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JExpression;
 bor
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JExpression;
 cand
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
 complement
  (Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JExpression;
 cond
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JExpression;
 cor
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
 decr
  (Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JExpression;
 div
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JExpression;
 eq
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JExpression;
 gt
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JExpression;
 gte
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JExpression;
 incr
  (Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JExpression;
 lt
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JExpression;
 lte
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JExpression;
 minus
  (Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JExpression;
 minus
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JExpression;
 mod
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JExpression;
 mul
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JExpression;
 ne
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JExpression;
 not
  (Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
  (Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
 plus
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JExpression;
 shl
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JExpression;
 shr
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JExpression;
 shrz
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JExpression;
 xor
  (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/codemodel/JExpression;Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JExpression;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JPackage.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JPackage.eea
index 535c86d669..8a0453a5b7 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JPackage.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JPackage.eea
@@ -12,7 +12,7 @@ _class
  (ILjava/lang/String;)Lcom/sun/codemodel/JDefinedClass;
 _class
  (ILjava/lang/String;Lcom/sun/codemodel/ClassType;)Lcom/sun/codemodel/JDefinedClass;
- (ILjava/lang/String;Lcom/sun/codemodel/ClassType;)Lcom/sun/codemodel/JDefinedClass;
+ (ILjava/lang/String;Lcom/sun/codemodel/ClassType;)L1com/sun/codemodel/JDefinedClass;
 _class
  (ILjava/lang/String;Z)Lcom/sun/codemodel/JDefinedClass;
  (ILjava/lang/String;Z)Lcom/sun/codemodel/JDefinedClass;
@@ -36,7 +36,7 @@ addResourceFile
  (Lcom/sun/codemodel/JResourceFile;)Lcom/sun/codemodel/JResourceFile;
 annotate
  (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JAnnotationUse;
- (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JAnnotationUse;
+ (Lcom/sun/codemodel/JClass;)L1com/sun/codemodel/JAnnotationUse;
 annotate
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lcom/sun/codemodel/JAnnotationUse;
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lcom/sun/codemodel/JAnnotationUse;
@@ -78,7 +78,7 @@ owner
  ()Lcom/sun/codemodel/JCodeModel;
 parent
  ()Lcom/sun/codemodel/JPackage;
- ()Lcom/sun/codemodel/JPackage;
+ ()L0com/sun/codemodel/JPackage;
 parentContainer
  ()Lcom/sun/codemodel/JClassContainer;
  ()Lcom/sun/codemodel/JClassContainer;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JSwitch.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JSwitch.eea
index 49fccda1b3..5f7d9bf547 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JSwitch.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JSwitch.eea
@@ -2,7 +2,7 @@ class com/sun/codemodel/JSwitch
 
 _case
  (Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JCase;
- (Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JCase;
+ (Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JCase;
 _default
  ()Lcom/sun/codemodel/JCase;
  ()Lcom/sun/codemodel/JCase;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JTryBlock.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JTryBlock.eea
index cfbf5d9c37..d74545740e 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JTryBlock.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JTryBlock.eea
@@ -2,7 +2,7 @@ class com/sun/codemodel/JTryBlock
 
 _catch
  (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JCatchBlock;
- (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JCatchBlock;
+ (Lcom/sun/codemodel/JClass;)L1com/sun/codemodel/JCatchBlock;
 _finally
  ()Lcom/sun/codemodel/JBlock;
  ()Lcom/sun/codemodel/JBlock;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JType.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JType.eea
index 7b8f633bc2..035cba4aca 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JType.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JType.eea
@@ -22,7 +22,7 @@ compareTo
  (L1com/sun/codemodel/JType;)I
 elementType
  ()Lcom/sun/codemodel/JType;
- ()Lcom/sun/codemodel/JType;
+ ()L1com/sun/codemodel/JType;
 erasure
  ()Lcom/sun/codemodel/JType;
  ()Lcom/sun/codemodel/JType;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JTypeVar.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JTypeVar.eea
index 1820830398..06e46ad15f 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JTypeVar.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JTypeVar.eea
@@ -8,7 +8,7 @@ _implements
  ()Ljava/util/Iterator<Lcom/sun/codemodel/JClass;>;
 _package
  ()Lcom/sun/codemodel/JPackage;
- ()Lcom/sun/codemodel/JPackage;
+ ()L0com/sun/codemodel/JPackage;
 bound
  ()Lcom/sun/codemodel/JClass;
  ()Lcom/sun/codemodel/JClass;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JVar.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JVar.eea
index 6862d4e821..87b6392410 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JVar.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/JVar.eea
@@ -5,7 +5,7 @@ annotate
  (Lcom/sun/codemodel/JAnnotationUse;)V
 annotate
  (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JAnnotationUse;
- (Lcom/sun/codemodel/JClass;)Lcom/sun/codemodel/JAnnotationUse;
+ (Lcom/sun/codemodel/JClass;)L1com/sun/codemodel/JAnnotationUse;
 annotate
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lcom/sun/codemodel/JAnnotationUse;
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lcom/sun/codemodel/JAnnotationUse;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/util/EncoderFactory.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/util/EncoderFactory.eea
index 1862cd47cf..5e3b3f3794 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/util/EncoderFactory.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/util/EncoderFactory.eea
@@ -2,4 +2,4 @@ class com/sun/codemodel/util/EncoderFactory
 
 createEncoder
  (Ljava/lang/String;)Ljava/nio/charset/CharsetEncoder;
- (Ljava/lang/String;)Ljava/nio/charset/CharsetEncoder;
+ (Ljava/lang/String;)L1java/nio/charset/CharsetEncoder;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/FileCodeWriter.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/FileCodeWriter.eea
index 385d415928..b8f88adfc2 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/FileCodeWriter.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/FileCodeWriter.eea
@@ -14,7 +14,7 @@ class com/sun/codemodel/writer/FileCodeWriter
  (Ljava/io/File;ZLjava/lang/String;)V
 getFile
  (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)Ljava/io/File;
- (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)Ljava/io/File;
+ (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)L1java/io/File;
 openBinary
  (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)Ljava/io/OutputStream;
- (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)Ljava/io/OutputStream;
+ (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)L1java/io/OutputStream;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/FilterCodeWriter.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/FilterCodeWriter.eea
index 1c06c9183f..286955e714 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/FilterCodeWriter.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/FilterCodeWriter.eea
@@ -12,4 +12,4 @@ openBinary
  (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)Ljava/io/OutputStream;
 openSource
  (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)Ljava/io/Writer;
- (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)Ljava/io/Writer;
+ (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)L1java/io/Writer; # @Inherited(com.sun.codemodel.CodeWriter)
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/LicenseCodeWriter.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/LicenseCodeWriter.eea
index 224bee1cb8..cdca95b1cc 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/LicenseCodeWriter.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/LicenseCodeWriter.eea
@@ -5,4 +5,4 @@ class com/sun/codemodel/writer/LicenseCodeWriter
  (Lcom/sun/codemodel/CodeWriter;Ljava/io/File;Ljava/lang/String;)V
 openSource
  (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)Ljava/io/Writer;
- (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)Ljava/io/Writer;
+ (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)L1java/io/Writer; # @Inherited(com.sun.codemodel.writer.FilterCodeWriter)
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/OutputStreamCodeWriter.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/OutputStreamCodeWriter.eea
index efe74029a7..439b2ebae4 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/OutputStreamCodeWriter.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/OutputStreamCodeWriter.eea
@@ -5,4 +5,4 @@ class com/sun/codemodel/writer/OutputStreamCodeWriter
  (Ljava/io/OutputStream;Ljava/lang/String;)V
 openBinary
  (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)Ljava/io/OutputStream;
- (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)Ljava/io/OutputStream;
+ (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)L1java/io/OutputStream;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/ProgressCodeWriter.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/ProgressCodeWriter.eea
index 0adfd179c0..ba28dc06e9 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/ProgressCodeWriter.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/ProgressCodeWriter.eea
@@ -8,4 +8,4 @@ openBinary
  (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)Ljava/io/OutputStream;
 openSource
  (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)Ljava/io/Writer;
- (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)Ljava/io/Writer;
+ (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)L1java/io/Writer; # @Inherited(com.sun.codemodel.writer.FilterCodeWriter)
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/PrologCodeWriter.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/PrologCodeWriter.eea
index 3cc9429ec9..fce78f7c9b 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/PrologCodeWriter.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/PrologCodeWriter.eea
@@ -5,4 +5,4 @@ class com/sun/codemodel/writer/PrologCodeWriter
  (Lcom/sun/codemodel/CodeWriter;Ljava/lang/String;)V
 openSource
  (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)Ljava/io/Writer;
- (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)Ljava/io/Writer;
+ (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)L1java/io/Writer; # @Inherited(com.sun.codemodel.writer.FilterCodeWriter)
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/SingleStreamCodeWriter.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/SingleStreamCodeWriter.eea
index 39533d5aa0..fc391b73c6 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/SingleStreamCodeWriter.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/codemodel/writer/SingleStreamCodeWriter.eea
@@ -5,4 +5,4 @@ class com/sun/codemodel/writer/SingleStreamCodeWriter
  (Ljava/io/OutputStream;)V
 openBinary
  (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)Ljava/io/OutputStream;
- (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)Ljava/io/OutputStream;
+ (Lcom/sun/codemodel/JPackage;Ljava/lang/String;)L1java/io/OutputStream;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/ModelLoader.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/ModelLoader.eea
index 3465b16e35..f710db1a95 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/ModelLoader.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/ModelLoader.eea
@@ -12,16 +12,16 @@ annotateXMLSchema
  (Lcom/sun/xml/xsom/XSSchemaSet;)Lcom/sun/tools/xjc/model/Model;
 buildDOMForest
  (Lcom/sun/tools/xjc/reader/internalizer/InternalizationLogic;)Lcom/sun/tools/xjc/reader/internalizer/DOMForest;
- (Lcom/sun/tools/xjc/reader/internalizer/InternalizationLogic;)Lcom/sun/tools/xjc/reader/internalizer/DOMForest;
+ (Lcom/sun/tools/xjc/reader/internalizer/InternalizationLogic;)L1com/sun/tools/xjc/reader/internalizer/DOMForest;
 createXSOM
  (Lcom/sun/tools/xjc/reader/internalizer/DOMForest;Lcom/sun/tools/xjc/reader/internalizer/SCDBasedBindingSet;)Lcom/sun/xml/xsom/XSSchemaSet;
- (Lcom/sun/tools/xjc/reader/internalizer/DOMForest;Lcom/sun/tools/xjc/reader/internalizer/SCDBasedBindingSet;)Lcom/sun/xml/xsom/XSSchemaSet;
+ (Lcom/sun/tools/xjc/reader/internalizer/DOMForest;Lcom/sun/tools/xjc/reader/internalizer/SCDBasedBindingSet;)L1com/sun/xml/xsom/XSSchemaSet;
 createXSOMParser
  (Lcom/sun/tools/xjc/reader/internalizer/DOMForest;)Lcom/sun/xml/xsom/parser/XSOMParser;
- (Lcom/sun/tools/xjc/reader/internalizer/DOMForest;)Lcom/sun/xml/xsom/parser/XSOMParser;
+ (Lcom/sun/tools/xjc/reader/internalizer/DOMForest;)L1com/sun/xml/xsom/parser/XSOMParser;
 createXSOMParser
  (Lcom/sun/xml/xsom/parser/XMLParser;)Lcom/sun/xml/xsom/parser/XSOMParser;
- (Lcom/sun/xml/xsom/parser/XMLParser;)Lcom/sun/xml/xsom/parser/XSOMParser;
+ (Lcom/sun/xml/xsom/parser/XMLParser;)L1com/sun/xml/xsom/parser/XSOMParser;
 loadXMLSchema
  ()Lcom/sun/xml/xsom/XSSchemaSet;
- ()Lcom/sun/xml/xsom/XSSchemaSet;
+ ()L0com/sun/xml/xsom/XSSchemaSet;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/Options.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/Options.eea
index 40caab170c..7f7660045c 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/Options.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/Options.eea
@@ -5,7 +5,7 @@ getBuildID
  ()Ljava/lang/String;
 normalizeSystemId
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 
 activePlugins
  Ljava/util/List<Lcom/sun/tools/xjc/Plugin;>;
@@ -67,10 +67,10 @@ addGrammarRecursive
  (Ljava/io/File;)V
 createCodeWriter
  ()Lcom/sun/codemodel/CodeWriter;
- ()Lcom/sun/codemodel/CodeWriter;
+ ()L1com/sun/codemodel/CodeWriter;
 createCodeWriter
  (Lcom/sun/codemodel/CodeWriter;)Lcom/sun/codemodel/CodeWriter;
- (Lcom/sun/codemodel/CodeWriter;)Lcom/sun/codemodel/CodeWriter;
+ (Lcom/sun/codemodel/CodeWriter;)L1com/sun/codemodel/CodeWriter;
 getAllPlugins
  ()Ljava/util/List<Lcom/sun/tools/xjc/Plugin;>;
  ()Ljava/util/List<Lcom/sun/tools/xjc/Plugin;>;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/XJCBase.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/XJCBase.eea
index 0d7ae8dfd8..b2f61a9bf3 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/XJCBase.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/XJCBase.eea
@@ -21,13 +21,13 @@ addConfiguredXMLCatalog
  (Lorg/apache/tools/ant/types/XMLCatalog;)V
 createArg
  ()Lorg/apache/tools/ant/types/Commandline$Argument;
- ()Lorg/apache/tools/ant/types/Commandline$Argument;
+ ()L1org/apache/tools/ant/types/Commandline$Argument;
 createClasspath
  ()Lorg/apache/tools/ant/types/Path;
- ()Lorg/apache/tools/ant/types/Path;
+ ()L1org/apache/tools/ant/types/Path;
 createJvmarg
  ()Lorg/apache/tools/ant/types/Commandline$Argument;
- ()Lorg/apache/tools/ant/types/Commandline$Argument;
+ ()L1org/apache/tools/ant/types/Commandline$Argument;
 getAddexports
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/XJCFacade.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/XJCFacade.eea
index 02a46db426..bed35751aa 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/XJCFacade.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/XJCFacade.eea
@@ -5,4 +5,4 @@ main
  ([Ljava/lang/String;)V
 parseVersion
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/XJCTask.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/XJCTask.eea
index 5f3c589ccb..ae7ed8bdd5 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/XJCTask.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/XJCTask.eea
@@ -2,10 +2,10 @@ class com/sun/tools/xjc/XJCTask
 
 createClassLoader
  ()Ljava/lang/ClassLoader;
- ()Ljava/lang/ClassLoader;
+ ()L1java/lang/ClassLoader;
 getCoreClassName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 setSource
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/addon/accessors/PluginImpl.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/addon/accessors/PluginImpl.eea
index 50a3bf22f9..31ca5fe70c 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/addon/accessors/PluginImpl.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/addon/accessors/PluginImpl.eea
@@ -2,10 +2,10 @@ class com/sun/tools/xjc/addon/accessors/PluginImpl
 
 getOptionName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getUsage
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 parseArgument
  (Lcom/sun/tools/xjc/Options;[Ljava/lang/String;I)I
  (Lcom/sun/tools/xjc/Options;[Ljava/lang/String;I)I
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/addon/at_generated/PluginImpl.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/addon/at_generated/PluginImpl.eea
index 09b8c28e35..f46c7df182 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/addon/at_generated/PluginImpl.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/addon/at_generated/PluginImpl.eea
@@ -2,10 +2,10 @@ class com/sun/tools/xjc/addon/at_generated/PluginImpl
 
 getOptionName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getUsage
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 parseArgument
  (Lcom/sun/tools/xjc/Options;[Ljava/lang/String;I)I
  (Lcom/sun/tools/xjc/Options;[Ljava/lang/String;I)I
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/addon/code_injector/PluginImpl.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/addon/code_injector/PluginImpl.eea
index 2759f42f65..ab803f3134 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/addon/code_injector/PluginImpl.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/addon/code_injector/PluginImpl.eea
@@ -5,10 +5,10 @@ getCustomizationURIs
  ()L1java/util/List<L1java/lang/String;>; # @Inherited(com.sun.tools.xjc.Plugin)
 getOptionName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getUsage
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 isCustomizationTagName
  (Ljava/lang/String;Ljava/lang/String;)Z
  (L1java/lang/String;L1java/lang/String;)Z # @Inherited(com.sun.tools.xjc.Plugin)
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/addon/episode/PluginImpl.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/addon/episode/PluginImpl.eea
index 8e087edccf..20abe62b92 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/addon/episode/PluginImpl.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/addon/episode/PluginImpl.eea
@@ -2,10 +2,10 @@ class com/sun/tools/xjc/addon/episode/PluginImpl
 
 getOptionName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getUsage
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 parseArgument
  (Lcom/sun/tools/xjc/Options;[Ljava/lang/String;I)I
  (Lcom/sun/tools/xjc/Options;[Ljava/lang/String;I)I
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/addon/locator/SourceLocationAddOn.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/addon/locator/SourceLocationAddOn.eea
index 1aa95a6a6b..1dfd3ea998 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/addon/locator/SourceLocationAddOn.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/addon/locator/SourceLocationAddOn.eea
@@ -2,10 +2,10 @@ class com/sun/tools/xjc/addon/locator/SourceLocationAddOn
 
 getOptionName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getUsage
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 parseArgument
  (Lcom/sun/tools/xjc/Options;[Ljava/lang/String;I)I
  (Lcom/sun/tools/xjc/Options;[Ljava/lang/String;I)I
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/addon/sync/SynchronizedMethodAddOn.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/addon/sync/SynchronizedMethodAddOn.eea
index 7fd93e9fd0..c443b8f4aa 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/addon/sync/SynchronizedMethodAddOn.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/addon/sync/SynchronizedMethodAddOn.eea
@@ -2,10 +2,10 @@ class com/sun/tools/xjc/addon/sync/SynchronizedMethodAddOn
 
 getOptionName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getUsage
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 parseArgument
  (Lcom/sun/tools/xjc/Options;[Ljava/lang/String;I)I
  (Lcom/sun/tools/xjc/Options;[Ljava/lang/String;I)I
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/api/SpecVersion.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/api/SpecVersion.eea
index 5192800f98..e00c0efa71 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/api/SpecVersion.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/api/SpecVersion.eea
@@ -6,7 +6,7 @@ super java/lang/Enum
 
 parse
  (Ljava/lang/String;)Lcom/sun/tools/xjc/api/SpecVersion;
- (Ljava/lang/String;)Lcom/sun/tools/xjc/api/SpecVersion;
+ (Ljava/lang/String;)L0com/sun/tools/xjc/api/SpecVersion;
 
 getVersion
  ()Ljava/lang/String;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/api/XJC.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/api/XJC.eea
index 8564be1d52..e7a0ed9338 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/api/XJC.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/api/XJC.eea
@@ -2,7 +2,7 @@ class com/sun/tools/xjc/api/XJC
 
 createSchemaCompiler
  ()Lcom/sun/tools/xjc/api/SchemaCompiler;
- ()Lcom/sun/tools/xjc/api/SchemaCompiler;
+ ()L1com/sun/tools/xjc/api/SchemaCompiler;
 getDefaultPackageName
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/api/impl/s2j/ElementAdapter$FieldAccessorImpl.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/api/impl/s2j/ElementAdapter$FieldAccessorImpl.eea
index 80109a876c..dd9cf43190 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/api/impl/s2j/ElementAdapter$FieldAccessorImpl.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/api/impl/s2j/ElementAdapter$FieldAccessorImpl.eea
@@ -5,7 +5,7 @@ class com/sun/tools/xjc/api/impl/s2j/ElementAdapter$FieldAccessorImpl
  (Lcom/sun/tools/xjc/api/impl/s2j/ElementAdapter;Lcom/sun/codemodel/JExpression;)V
 createJAXBElement
  (Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JInvocation;
- (Lcom/sun/codemodel/JExpression;)Lcom/sun/codemodel/JInvocation;
+ (Lcom/sun/codemodel/JExpression;)L1com/sun/codemodel/JInvocation;
 getPropertyInfo
  ()Lcom/sun/tools/xjc/model/CPropertyInfo;
  ()Lcom/sun/tools/xjc/model/CPropertyInfo;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/api/impl/s2j/PropertyImpl.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/api/impl/s2j/PropertyImpl.eea
index dd889fc5dd..082301a1df 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/api/impl/s2j/PropertyImpl.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/api/impl/s2j/PropertyImpl.eea
@@ -21,7 +21,7 @@ name
  ()Ljava/lang/String;
 rawName
  ()Ljavax/xml/namespace/QName;
- ()Ljavax/xml/namespace/QName;
+ ()L0javax/xml/namespace/QName;
 type
  ()Lcom/sun/codemodel/JType;
  ()Lcom/sun/codemodel/JType;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/api/impl/s2j/SchemaCompilerImpl.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/api/impl/s2j/SchemaCompilerImpl.eea
index 3ef4164ea1..4668fb8c96 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/api/impl/s2j/SchemaCompilerImpl.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/api/impl/s2j/SchemaCompilerImpl.eea
@@ -9,7 +9,7 @@ opts
 
 bind
  ()Lcom/sun/tools/xjc/api/impl/s2j/JAXBModelImpl;
- ()Lcom/sun/tools/xjc/api/impl/s2j/JAXBModelImpl;
+ ()L0com/sun/tools/xjc/api/impl/s2j/JAXBModelImpl;
 error
  (Lorg/xml/sax/SAXParseException;)V
  (Lorg/xml/sax/SAXParseException;)V
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/generator/bean/BeanGenerator.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/generator/bean/BeanGenerator.eea
index 3de3362252..3ad06edfbb 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/generator/bean/BeanGenerator.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/generator/bean/BeanGenerator.eea
@@ -2,7 +2,7 @@ class com/sun/tools/xjc/generator/bean/BeanGenerator
 
 generate
  (Lcom/sun/tools/xjc/model/Model;Lcom/sun/tools/xjc/ErrorReceiver;)Lcom/sun/tools/xjc/outline/Outline;
- (Lcom/sun/tools/xjc/model/Model;Lcom/sun/tools/xjc/ErrorReceiver;)Lcom/sun/tools/xjc/outline/Outline;
+ (Lcom/sun/tools/xjc/model/Model;Lcom/sun/tools/xjc/ErrorReceiver;)L0com/sun/tools/xjc/outline/Outline;
 
 addRuntime
  (Ljava/lang/Class<*>;)Lcom/sun/codemodel/JClass;
@@ -33,7 +33,7 @@ getContainer
  (Lcom/sun/tools/xjc/model/CClassInfoParent;Lcom/sun/tools/xjc/outline/Aspect;)Lcom/sun/codemodel/JClassContainer;
 getElement
  (Lcom/sun/tools/xjc/model/CElementInfo;)Lcom/sun/tools/xjc/outline/ElementOutline;
- (Lcom/sun/tools/xjc/model/CElementInfo;)Lcom/sun/tools/xjc/outline/ElementOutline;
+ (Lcom/sun/tools/xjc/model/CElementInfo;)L1com/sun/tools/xjc/outline/ElementOutline;
 getEnum
  (Lcom/sun/tools/xjc/model/CEnumLeafInfo;)Lcom/sun/tools/xjc/outline/EnumOutline;
  (Lcom/sun/tools/xjc/model/CEnumLeafInfo;)Lcom/sun/tools/xjc/outline/EnumOutline;
@@ -51,10 +51,10 @@ getModel
  ()L1com/sun/tools/xjc/model/Model; # @Inherited(com.sun.tools.xjc.outline.Outline)
 getPackageContext
  (Lcom/sun/codemodel/JPackage;)Lcom/sun/tools/xjc/generator/bean/PackageOutlineImpl;
- (Lcom/sun/codemodel/JPackage;)Lcom/sun/tools/xjc/generator/bean/PackageOutlineImpl;
+ (Lcom/sun/codemodel/JPackage;)L1com/sun/tools/xjc/generator/bean/PackageOutlineImpl;
 getUsedPackages
  (Lcom/sun/tools/xjc/outline/Aspect;)[Lcom/sun/codemodel/JPackage;
  (Lcom/sun/tools/xjc/outline/Aspect;)[Lcom/sun/codemodel/JPackage;
 resolve
  (Lcom/sun/tools/xjc/model/CTypeRef;Lcom/sun/tools/xjc/outline/Aspect;)Lcom/sun/codemodel/JType;
- (Lcom/sun/tools/xjc/model/CTypeRef;Lcom/sun/tools/xjc/outline/Aspect;)Lcom/sun/codemodel/JType;
+ (Lcom/sun/tools/xjc/model/CTypeRef;Lcom/sun/tools/xjc/outline/Aspect;)L0com/sun/codemodel/JType;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/generator/bean/ClassOutlineImpl.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/generator/bean/ClassOutlineImpl.eea
index 1e52614c2e..78c4617967 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/generator/bean/ClassOutlineImpl.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/generator/bean/ClassOutlineImpl.eea
@@ -5,7 +5,7 @@ _package
  ()Lcom/sun/tools/xjc/generator/bean/PackageOutlineImpl;
 createMethodWriter
  ()Lcom/sun/tools/xjc/generator/bean/MethodWriter;
- ()Lcom/sun/tools/xjc/generator/bean/MethodWriter;
+ ()L1com/sun/tools/xjc/generator/bean/MethodWriter;
 parent
  ()Lcom/sun/tools/xjc/generator/bean/BeanGenerator;
  ()Lcom/sun/tools/xjc/generator/bean/BeanGenerator;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/generator/bean/ImplStructureStrategy.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/generator/bean/ImplStructureStrategy.eea
index fa7e708c81..562f1549d5 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/generator/bean/ImplStructureStrategy.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/generator/bean/ImplStructureStrategy.eea
@@ -9,10 +9,10 @@ _extends
  (Lcom/sun/tools/xjc/generator/bean/ClassOutlineImpl;Lcom/sun/tools/xjc/generator/bean/ClassOutlineImpl;)V
 createClasses
  (Lcom/sun/tools/xjc/outline/Outline;Lcom/sun/tools/xjc/model/CClassInfo;)Lcom/sun/tools/xjc/generator/bean/ImplStructureStrategy$Result;
- (Lcom/sun/tools/xjc/outline/Outline;Lcom/sun/tools/xjc/model/CClassInfo;)Lcom/sun/tools/xjc/generator/bean/ImplStructureStrategy$Result;
+ (Lcom/sun/tools/xjc/outline/Outline;Lcom/sun/tools/xjc/model/CClassInfo;)L1com/sun/tools/xjc/generator/bean/ImplStructureStrategy$Result;
 createMethodWriter
  (Lcom/sun/tools/xjc/generator/bean/ClassOutlineImpl;)Lcom/sun/tools/xjc/generator/bean/MethodWriter;
- (Lcom/sun/tools/xjc/generator/bean/ClassOutlineImpl;)Lcom/sun/tools/xjc/generator/bean/MethodWriter;
+ (Lcom/sun/tools/xjc/generator/bean/ClassOutlineImpl;)L1com/sun/tools/xjc/generator/bean/MethodWriter;
 getPackage
  (Lcom/sun/codemodel/JPackage;Lcom/sun/tools/xjc/outline/Aspect;)Lcom/sun/codemodel/JPackage;
  (Lcom/sun/codemodel/JPackage;Lcom/sun/tools/xjc/outline/Aspect;)Lcom/sun/codemodel/JPackage;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/generator/bean/field/FieldRendererFactory.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/generator/bean/field/FieldRendererFactory.eea
index 9d999a0849..7f4a686d64 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/generator/bean/field/FieldRendererFactory.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/generator/bean/field/FieldRendererFactory.eea
@@ -5,7 +5,7 @@ getArray
  ()Lcom/sun/tools/xjc/generator/bean/field/FieldRenderer;
 getConst
  (Lcom/sun/tools/xjc/generator/bean/field/FieldRenderer;)Lcom/sun/tools/xjc/generator/bean/field/FieldRenderer;
- (Lcom/sun/tools/xjc/generator/bean/field/FieldRenderer;)Lcom/sun/tools/xjc/generator/bean/field/FieldRenderer;
+ (Lcom/sun/tools/xjc/generator/bean/field/FieldRenderer;)L1com/sun/tools/xjc/generator/bean/field/FieldRenderer;
 getContentList
  (Lcom/sun/codemodel/JClass;)Lcom/sun/tools/xjc/generator/bean/field/FieldRenderer;
  (Lcom/sun/codemodel/JClass;)Lcom/sun/tools/xjc/generator/bean/field/FieldRenderer;
@@ -17,7 +17,7 @@ getDummyList
  (Lcom/sun/codemodel/JClass;)Lcom/sun/tools/xjc/generator/bean/field/FieldRenderer;
 getList
  (Lcom/sun/codemodel/JClass;)Lcom/sun/tools/xjc/generator/bean/field/FieldRenderer;
- (Lcom/sun/codemodel/JClass;)Lcom/sun/tools/xjc/generator/bean/field/FieldRenderer;
+ (Lcom/sun/codemodel/JClass;)L1com/sun/tools/xjc/generator/bean/field/FieldRenderer;
 getRequiredUnboxed
  ()Lcom/sun/tools/xjc/generator/bean/field/FieldRenderer;
  ()Lcom/sun/tools/xjc/generator/bean/field/FieldRenderer;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/generator/bean/field/UntypedListFieldRenderer.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/generator/bean/field/UntypedListFieldRenderer.eea
index 2fdf99413a..fbcd422fcb 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/generator/bean/field/UntypedListFieldRenderer.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/generator/bean/field/UntypedListFieldRenderer.eea
@@ -8,4 +8,4 @@ class com/sun/tools/xjc/generator/bean/field/UntypedListFieldRenderer
  (Lcom/sun/codemodel/JClass;ZZ)V
 generate
  (Lcom/sun/tools/xjc/generator/bean/ClassOutlineImpl;Lcom/sun/tools/xjc/model/CPropertyInfo;)Lcom/sun/tools/xjc/outline/FieldOutline;
- (Lcom/sun/tools/xjc/generator/bean/ClassOutlineImpl;Lcom/sun/tools/xjc/model/CPropertyInfo;)Lcom/sun/tools/xjc/outline/FieldOutline;
+ (Lcom/sun/tools/xjc/generator/bean/ClassOutlineImpl;Lcom/sun/tools/xjc/model/CPropertyInfo;)L1com/sun/tools/xjc/outline/FieldOutline;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/generator/util/LazyBlockReference.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/generator/util/LazyBlockReference.eea
index 5cc8e8c908..371e7c08d4 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/generator/util/LazyBlockReference.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/generator/util/LazyBlockReference.eea
@@ -2,7 +2,7 @@ class com/sun/tools/xjc/generator/util/LazyBlockReference
 
 create
  ()Lcom/sun/codemodel/JBlock;
- ()Lcom/sun/codemodel/JBlock;
+ ()L1com/sun/codemodel/JBlock;
 get
  (Z)Lcom/sun/codemodel/JBlock;
  (Z)Lcom/sun/codemodel/JBlock;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CArrayInfo.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CArrayInfo.eea
index bb277c9c08..b9aa03fd30 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CArrayInfo.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CArrayInfo.eea
@@ -9,7 +9,7 @@ super org/glassfish/jaxb/core/v2/model/core/ArrayInfo
  (Lcom/sun/tools/xjc/model/Model;Lcom/sun/tools/xjc/model/CNonElement;Lcom/sun/xml/xsom/XSComponent;Lcom/sun/tools/xjc/model/CCustomizations;)V
 fullName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getInfo
  ()Lcom/sun/tools/xjc/model/CNonElement;
  ()Lcom/sun/tools/xjc/model/CNonElement;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CBuiltinLeafInfo.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CBuiltinLeafInfo.eea
index 51ae4c99cd..2aea0b5c0f 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CBuiltinLeafInfo.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CBuiltinLeafInfo.eea
@@ -88,16 +88,16 @@ XML_SOURCE
 
 asElement
  ()Lorg/glassfish/jaxb/core/v2/model/core/Element<Lcom/sun/tools/xjc/model/nav/NType;Lcom/sun/tools/xjc/model/nav/NClass;>;
- ()Lorg/glassfish/jaxb/core/v2/model/core/Element<Lcom/sun/tools/xjc/model/nav/NType;Lcom/sun/tools/xjc/model/nav/NClass;>;
+ ()L0org/glassfish/jaxb/core/v2/model/core/Element<Lcom/sun/tools/xjc/model/nav/NType;Lcom/sun/tools/xjc/model/nav/NClass;>;
 getAdapterUse
  ()Lcom/sun/tools/xjc/model/CAdapter;
- ()Lcom/sun/tools/xjc/model/CAdapter;
+ ()L0com/sun/tools/xjc/model/CAdapter;
 getElementName
  ()Ljavax/xml/namespace/QName;
- ()Ljavax/xml/namespace/QName;
+ ()L0javax/xml/namespace/QName;
 getExpectedMimeType
  ()Ljakarta/activation/MimeType;
- ()Ljakarta/activation/MimeType;
+ ()L0jakarta/activation/MimeType;
 getInfo
  ()Lcom/sun/tools/xjc/model/CNonElement;
  ()Lcom/sun/tools/xjc/model/CNonElement;
@@ -109,7 +109,7 @@ getLocator
  ()Lorg/xml/sax/Locator;
 getSchemaComponent
  ()Lcom/sun/xml/xsom/XSComponent;
- ()Lcom/sun/xml/xsom/XSComponent;
+ ()L1com/sun/xml/xsom/XSComponent;
 getType
  ()Lcom/sun/tools/xjc/model/nav/NType;
  ()Lcom/sun/tools/xjc/model/nav/NType;
@@ -121,7 +121,7 @@ getTypeNames
  ()[Ljavax/xml/namespace/QName;
 getUpstream
  ()Lorg/glassfish/jaxb/core/v2/model/annotation/Locatable;
- ()Lorg/glassfish/jaxb/core/v2/model/annotation/Locatable;
+ ()L0org/glassfish/jaxb/core/v2/model/annotation/Locatable;
 idUse
  ()Lorg/glassfish/jaxb/core/v2/model/core/ID;
  ()Lorg/glassfish/jaxb/core/v2/model/core/ID;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CClassInfo.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CClassInfo.eea
index 9af7bef337..14f5a05662 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CClassInfo.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CClassInfo.eea
@@ -37,13 +37,13 @@ addProperty
  (Lcom/sun/tools/xjc/model/CPropertyInfo;)V
 asElement
  ()Lorg/glassfish/jaxb/core/v2/model/core/Element<Lcom/sun/tools/xjc/model/nav/NType;Lcom/sun/tools/xjc/model/nav/NClass;>;
- ()Lorg/glassfish/jaxb/core/v2/model/core/Element<Lcom/sun/tools/xjc/model/nav/NType;Lcom/sun/tools/xjc/model/nav/NClass;>;
+ ()L0org/glassfish/jaxb/core/v2/model/core/Element<Lcom/sun/tools/xjc/model/nav/NType;Lcom/sun/tools/xjc/model/nav/NClass;>;
 fullName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getBaseClass
  ()Lcom/sun/tools/xjc/model/CClassInfo;
- ()Lcom/sun/tools/xjc/model/CClassInfo;
+ ()L0com/sun/tools/xjc/model/CClassInfo;
 getClazz
  ()Lcom/sun/tools/xjc/model/nav/NClass;
  ()Lcom/sun/tools/xjc/model/nav/NClass;
@@ -67,13 +67,13 @@ getProperties
  ()Ljava/util/List<Lcom/sun/tools/xjc/model/CPropertyInfo;>;
 getProperty
  (Ljava/lang/String;)Lcom/sun/tools/xjc/model/CPropertyInfo;
- (Ljava/lang/String;)Lcom/sun/tools/xjc/model/CPropertyInfo;
+ (Ljava/lang/String;)L0com/sun/tools/xjc/model/CPropertyInfo;
 getRefBaseClass
  ()Lcom/sun/tools/xjc/model/CClassRef;
- ()Lcom/sun/tools/xjc/model/CClassRef;
+ ()L0com/sun/tools/xjc/model/CClassRef;
 getScope
  ()Lcom/sun/tools/xjc/model/CClassInfo;
- ()Lcom/sun/tools/xjc/model/CClassInfo;
+ ()L0com/sun/tools/xjc/model/CClassInfo;
 getSqueezedName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -91,7 +91,7 @@ getUserSpecifiedImplClass
  ()Ljava/lang/String;
 listSubclasses
  ()Ljava/util/Iterator<Lcom/sun/tools/xjc/model/CClassInfo;>;
- ()Ljava/util/Iterator<Lcom/sun/tools/xjc/model/CClassInfo;>;
+ ()L1java/util/Iterator<Lcom/sun/tools/xjc/model/CClassInfo;>;
 parent
  ()Lcom/sun/tools/xjc/model/CClassInfoParent;
  ()Lcom/sun/tools/xjc/model/CClassInfoParent;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CClassRef.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CClassRef.eea
index 6debf9cae4..67b075d55f 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CClassRef.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CClassRef.eea
@@ -11,22 +11,22 @@ fullName
  ()Ljava/lang/String;
 getElementName
  ()Ljavax/xml/namespace/QName;
- ()Ljavax/xml/namespace/QName;
+ ()L0javax/xml/namespace/QName;
 getInfo
  ()Lcom/sun/tools/xjc/model/CNonElement;
  ()Lcom/sun/tools/xjc/model/CNonElement;
 getScope
  ()Lcom/sun/tools/xjc/model/CClassInfo;
- ()Lcom/sun/tools/xjc/model/CClassInfo;
+ ()L0com/sun/tools/xjc/model/CClassInfo;
 getSubstitutionHead
  ()Lcom/sun/tools/xjc/model/CElement;
- ()Lcom/sun/tools/xjc/model/CElement;
+ ()L0com/sun/tools/xjc/model/CElement;
 getType
  ()Lcom/sun/tools/xjc/model/nav/NType;
  ()Lcom/sun/tools/xjc/model/nav/NType;
 getTypeName
  ()Ljavax/xml/namespace/QName;
- ()Ljavax/xml/namespace/QName;
+ ()L0javax/xml/namespace/QName;
 toType
  (Lcom/sun/tools/xjc/outline/Outline;Lcom/sun/tools/xjc/outline/Aspect;)Lcom/sun/codemodel/JClass;
  (Lcom/sun/tools/xjc/outline/Outline;Lcom/sun/tools/xjc/outline/Aspect;)Lcom/sun/codemodel/JClass;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CCustomizations.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CCustomizations.eea
index c7f04456fa..d500cb04b7 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CCustomizations.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CCustomizations.eea
@@ -20,10 +20,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.util.ArrayList)
 find
  (Ljava/lang/String;)Lcom/sun/tools/xjc/model/CPluginCustomization;
- (Ljava/lang/String;)Lcom/sun/tools/xjc/model/CPluginCustomization;
+ (Ljava/lang/String;)L0com/sun/tools/xjc/model/CPluginCustomization;
 find
  (Ljava/lang/String;Ljava/lang/String;)Lcom/sun/tools/xjc/model/CPluginCustomization;
- (Ljava/lang/String;Ljava/lang/String;)Lcom/sun/tools/xjc/model/CPluginCustomization;
+ (Ljava/lang/String;Ljava/lang/String;)L0com/sun/tools/xjc/model/CPluginCustomization;
 getOwner
  ()Lcom/sun/tools/xjc/model/CCustomizable;
  ()Lcom/sun/tools/xjc/model/CCustomizable;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CDefaultValue.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CDefaultValue.eea
index c3557f63cf..026d0c46c0 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CDefaultValue.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CDefaultValue.eea
@@ -2,7 +2,7 @@ class com/sun/tools/xjc/model/CDefaultValue
 
 create
  (Lcom/sun/tools/xjc/model/TypeUse;Lcom/sun/xml/xsom/XmlString;)Lcom/sun/tools/xjc/model/CDefaultValue;
- (Lcom/sun/tools/xjc/model/TypeUse;Lcom/sun/xml/xsom/XmlString;)Lcom/sun/tools/xjc/model/CDefaultValue;
+ (Lcom/sun/tools/xjc/model/TypeUse;Lcom/sun/xml/xsom/XmlString;)L1com/sun/tools/xjc/model/CDefaultValue;
 
 compute
  (Lcom/sun/tools/xjc/outline/Outline;)Lcom/sun/codemodel/JExpression;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CElementInfo.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CElementInfo.eea
index c9a39fc559..346e527437 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CElementInfo.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CElementInfo.eea
@@ -43,7 +43,7 @@ getProperty
  ()Lcom/sun/tools/xjc/model/CElementPropertyInfo;
 getScope
  ()Lcom/sun/tools/xjc/model/CClassInfo;
- ()Lcom/sun/tools/xjc/model/CClassInfo;
+ ()L0com/sun/tools/xjc/model/CClassInfo;
 getSqueezedName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CElementPropertyInfo.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CElementPropertyInfo.eea
index 6e04f8dc5f..4357d73488 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CElementPropertyInfo.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CElementPropertyInfo.eea
@@ -15,7 +15,7 @@ accept
  <V:Ljava/lang/Object;>(Lcom/sun/tools/xjc/model/CPropertyVisitor<TV;>;)TV;
 collectElementNames
  (Ljava/util/Map<Ljavax/xml/namespace/QName;Lcom/sun/tools/xjc/model/CPropertyInfo;>;)Ljavax/xml/namespace/QName;
- (Ljava/util/Map<Ljavax/xml/namespace/QName;Lcom/sun/tools/xjc/model/CPropertyInfo;>;)Ljavax/xml/namespace/QName;
+ (Ljava/util/Map<Ljavax/xml/namespace/QName;Lcom/sun/tools/xjc/model/CPropertyInfo;>;)L0javax/xml/namespace/QName; # @Inherited(com.sun.tools.xjc.model.CPropertyInfo)
 getAdapter
  ()Lcom/sun/tools/xjc/model/CAdapter;
  ()Lcom/sun/tools/xjc/model/CAdapter;
@@ -24,13 +24,13 @@ getExpectedMimeType
  ()Ljakarta/activation/MimeType;
 getSchemaType
  ()Ljavax/xml/namespace/QName;
- ()Ljavax/xml/namespace/QName;
+ ()L0javax/xml/namespace/QName;
 getTypes
  ()Ljava/util/List<Lcom/sun/tools/xjc/model/CTypeRef;>;
  ()Ljava/util/List<Lcom/sun/tools/xjc/model/CTypeRef;>;
 getXmlName
  ()Ljavax/xml/namespace/QName;
- ()Ljavax/xml/namespace/QName;
+ ()L0javax/xml/namespace/QName;
 id
  ()Lorg/glassfish/jaxb/core/v2/model/core/ID;
  ()Lorg/glassfish/jaxb/core/v2/model/core/ID;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CEnumLeafInfo.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CEnumLeafInfo.eea
index 8a00be1b4b..7e6ed2b297 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CEnumLeafInfo.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CEnumLeafInfo.eea
@@ -28,16 +28,16 @@ shortName
  (Lcom/sun/tools/xjc/model/Model;Ljavax/xml/namespace/QName;Lcom/sun/tools/xjc/model/CClassInfoParent;Ljava/lang/String;Lcom/sun/tools/xjc/model/CNonElement;Ljava/util/Collection<Lcom/sun/tools/xjc/model/CEnumConstant;>;Lcom/sun/xml/xsom/XSComponent;Lcom/sun/tools/xjc/model/CCustomizations;Lorg/xml/sax/Locator;)V
 asElement
  ()Lorg/glassfish/jaxb/core/v2/model/core/Element<Lcom/sun/tools/xjc/model/nav/NType;Lcom/sun/tools/xjc/model/nav/NClass;>;
- ()Lorg/glassfish/jaxb/core/v2/model/core/Element<Lcom/sun/tools/xjc/model/nav/NType;Lcom/sun/tools/xjc/model/nav/NClass;>;
+ ()L0org/glassfish/jaxb/core/v2/model/core/Element<Lcom/sun/tools/xjc/model/nav/NType;Lcom/sun/tools/xjc/model/nav/NClass;>;
 createConstant
  (Lcom/sun/tools/xjc/outline/Outline;Lcom/sun/xml/xsom/XmlString;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/tools/xjc/outline/Outline;Lcom/sun/xml/xsom/XmlString;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/tools/xjc/outline/Outline;Lcom/sun/xml/xsom/XmlString;)L0com/sun/codemodel/JExpression; # @Overrides(com.sun.tools.xjc.model.TypeUse)
 fullName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getAdapterUse
  ()Lcom/sun/tools/xjc/model/CAdapter;
- ()Lcom/sun/tools/xjc/model/CAdapter;
+ ()L0com/sun/tools/xjc/model/CAdapter;
 getBaseType
  ()Lorg/glassfish/jaxb/core/v2/model/core/NonElement<Lcom/sun/tools/xjc/model/nav/NType;Lcom/sun/tools/xjc/model/nav/NClass;>;
  ()Lorg/glassfish/jaxb/core/v2/model/core/NonElement<Lcom/sun/tools/xjc/model/nav/NType;Lcom/sun/tools/xjc/model/nav/NClass;>;
@@ -52,16 +52,16 @@ getCustomizations
  ()Lcom/sun/tools/xjc/model/CCustomizations;
 getElementName
  ()Ljavax/xml/namespace/QName;
- ()Ljavax/xml/namespace/QName;
+ ()L0javax/xml/namespace/QName;
 getExpectedMimeType
  ()Ljakarta/activation/MimeType;
- ()Ljakarta/activation/MimeType;
+ ()L0jakarta/activation/MimeType;
 getInfo
  ()Lcom/sun/tools/xjc/model/CNonElement;
  ()Lcom/sun/tools/xjc/model/CNonElement;
 getLocation
  ()Lorg/glassfish/jaxb/core/v2/runtime/Location;
- ()Lorg/glassfish/jaxb/core/v2/runtime/Location;
+ ()L1org/glassfish/jaxb/core/v2/runtime/Location;
 getLocator
  ()Lorg/xml/sax/Locator;
  ()Lorg/xml/sax/Locator;
@@ -76,7 +76,7 @@ getTypeName
  ()Ljavax/xml/namespace/QName;
 getUpstream
  ()Lorg/glassfish/jaxb/core/v2/model/annotation/Locatable;
- ()Lorg/glassfish/jaxb/core/v2/model/annotation/Locatable;
+ ()L1org/glassfish/jaxb/core/v2/model/annotation/Locatable;
 idUse
  ()Lorg/glassfish/jaxb/core/v2/model/core/ID;
  ()Lorg/glassfish/jaxb/core/v2/model/core/ID;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CPropertyInfo.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CPropertyInfo.eea
index c6dc2de501..1412c2f399 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CPropertyInfo.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CPropertyInfo.eea
@@ -35,10 +35,10 @@ accept
  <V:Ljava/lang/Object;>(Lcom/sun/tools/xjc/model/CPropertyVisitor<TV;>;)TV;
 collectElementNames
  (Ljava/util/Map<Ljavax/xml/namespace/QName;Lcom/sun/tools/xjc/model/CPropertyInfo;>;)Ljavax/xml/namespace/QName;
- (Ljava/util/Map<Ljavax/xml/namespace/QName;Lcom/sun/tools/xjc/model/CPropertyInfo;>;)Ljavax/xml/namespace/QName;
+ (Ljava/util/Map<Ljavax/xml/namespace/QName;Lcom/sun/tools/xjc/model/CPropertyInfo;>;)L0javax/xml/namespace/QName;
 displayName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getAdapter
  ()Lcom/sun/tools/xjc/model/CAdapter;
  ()Lcom/sun/tools/xjc/model/CAdapter;
@@ -65,7 +65,7 @@ parent
  ()Lcom/sun/tools/xjc/model/CTypeInfo;
 readAnnotation
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
- <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
+ <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)T1A;
 ref
  ()Ljava/util/Collection<+Lcom/sun/tools/xjc/model/CTypeInfo;>;
  ()Ljava/util/Collection<+Lcom/sun/tools/xjc/model/CTypeInfo;>;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CReferencePropertyInfo.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CReferencePropertyInfo.eea
index 8b2be6d480..96e3ec3c94 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CReferencePropertyInfo.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CReferencePropertyInfo.eea
@@ -15,28 +15,28 @@ accept
  <V:Ljava/lang/Object;>(Lcom/sun/tools/xjc/model/CPropertyVisitor<TV;>;)TV;
 collectElementNames
  (Ljava/util/Map<Ljavax/xml/namespace/QName;Lcom/sun/tools/xjc/model/CPropertyInfo;>;)Ljavax/xml/namespace/QName;
- (Ljava/util/Map<Ljavax/xml/namespace/QName;Lcom/sun/tools/xjc/model/CPropertyInfo;>;)Ljavax/xml/namespace/QName;
+ (Ljava/util/Map<Ljavax/xml/namespace/QName;Lcom/sun/tools/xjc/model/CPropertyInfo;>;)L0javax/xml/namespace/QName; # @Inherited(com.sun.tools.xjc.model.CPropertyInfo)
 getAdapter
  ()Lcom/sun/tools/xjc/model/CAdapter;
- ()Lcom/sun/tools/xjc/model/CAdapter;
+ ()L0com/sun/tools/xjc/model/CAdapter;
 getDOMHandler
  ()Lcom/sun/tools/xjc/model/nav/NClass;
- ()Lcom/sun/tools/xjc/model/nav/NClass;
+ ()L0com/sun/tools/xjc/model/nav/NClass;
 getElements
  ()Ljava/util/Set<Lcom/sun/tools/xjc/model/CElement;>;
  ()Ljava/util/Set<Lcom/sun/tools/xjc/model/CElement;>;
 getExpectedMimeType
  ()Ljakarta/activation/MimeType;
- ()Ljakarta/activation/MimeType;
+ ()L0jakarta/activation/MimeType;
 getSchemaType
  ()Ljavax/xml/namespace/QName;
- ()Ljavax/xml/namespace/QName;
+ ()L0javax/xml/namespace/QName;
 getWildcard
  ()Lorg/glassfish/jaxb/core/v2/model/core/WildcardMode;
  ()Lorg/glassfish/jaxb/core/v2/model/core/WildcardMode;
 getXmlName
  ()Ljavax/xml/namespace/QName;
- ()Ljavax/xml/namespace/QName;
+ ()L0javax/xml/namespace/QName;
 id
  ()Lorg/glassfish/jaxb/core/v2/model/core/ID;
  ()Lorg/glassfish/jaxb/core/v2/model/core/ID;
@@ -45,7 +45,7 @@ kind
  ()Lorg/glassfish/jaxb/core/v2/model/core/PropertyKind;
 ref
  ()Ljava/util/Set<+Lcom/sun/tools/xjc/model/CTypeInfo;>;
- ()Ljava/util/Set<+Lcom/sun/tools/xjc/model/CTypeInfo;>;
+ ()L1java/util/Set<+Lcom/sun/tools/xjc/model/CTypeInfo;>;
 setWildcard
  (Lorg/glassfish/jaxb/core/v2/model/core/WildcardMode;)V
  (Lorg/glassfish/jaxb/core/v2/model/core/WildcardMode;)V
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CTypeRef.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CTypeRef.eea
index 728abda0bd..5ff9272872 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CTypeRef.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/CTypeRef.eea
@@ -6,7 +6,7 @@ super org/glassfish/jaxb/core/v2/model/core/TypeRef
 
 getSimpleTypeName
  (Lcom/sun/xml/xsom/XSElementDecl;)Ljavax/xml/namespace/QName;
- (Lcom/sun/xml/xsom/XSElementDecl;)Ljavax/xml/namespace/QName;
+ (Lcom/sun/xml/xsom/XSElementDecl;)L0javax/xml/namespace/QName;
 
 defaultValue
  Lcom/sun/xml/xsom/XmlString;
@@ -20,10 +20,10 @@ defaultValue
  (Lcom/sun/tools/xjc/model/CNonElement;Ljavax/xml/namespace/QName;Ljavax/xml/namespace/QName;ZLcom/sun/xml/xsom/XmlString;)V
 getDefaultValue
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getSource
  ()Lorg/glassfish/jaxb/core/v2/model/core/PropertyInfo<Lcom/sun/tools/xjc/model/nav/NType;Lcom/sun/tools/xjc/model/nav/NClass;>;
- ()Lorg/glassfish/jaxb/core/v2/model/core/PropertyInfo<Lcom/sun/tools/xjc/model/nav/NType;Lcom/sun/tools/xjc/model/nav/NClass;>;
+ ()L1org/glassfish/jaxb/core/v2/model/core/PropertyInfo<Lcom/sun/tools/xjc/model/nav/NType;Lcom/sun/tools/xjc/model/nav/NClass;>;
 getTagName
  ()Ljavax/xml/namespace/QName;
  ()Ljavax/xml/namespace/QName;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/Model.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/Model.eea
index dade5d9abc..3566f61dae 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/Model.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/Model.eea
@@ -43,7 +43,7 @@ builtins
  ()Ljava/util/Map<Lcom/sun/tools/xjc/model/nav/NType;+Lcom/sun/tools/xjc/model/CBuiltinLeafInfo;>;
 createTopLevelBindings
  ()Ljava/util/Map<Ljavax/xml/namespace/QName;Lcom/sun/tools/xjc/model/CClassInfo;>;
- ()Ljava/util/Map<Ljavax/xml/namespace/QName;Lcom/sun/tools/xjc/model/CClassInfo;>;
+ ()L1java/util/Map<Ljavax/xml/namespace/QName;Lcom/sun/tools/xjc/model/CClassInfo;>;
 dump
  (Ljavax/xml/transform/Result;)V
  (Ljavax/xml/transform/Result;)V
@@ -52,7 +52,7 @@ enums
  ()Ljava/util/Map<Lcom/sun/tools/xjc/model/nav/NClass;Lcom/sun/tools/xjc/model/CEnumLeafInfo;>;
 generateCode
  (Lcom/sun/tools/xjc/Options;Lcom/sun/tools/xjc/ErrorReceiver;)Lcom/sun/tools/xjc/outline/Outline;
- (Lcom/sun/tools/xjc/Options;Lcom/sun/tools/xjc/ErrorReceiver;)Lcom/sun/tools/xjc/outline/Outline;
+ (Lcom/sun/tools/xjc/Options;Lcom/sun/tools/xjc/ErrorReceiver;)L0com/sun/tools/xjc/outline/Outline;
 getAllElements
  ()Ljava/lang/Iterable<+Lcom/sun/tools/xjc/model/CElementInfo;>;
  ()Ljava/lang/Iterable<+Lcom/sun/tools/xjc/model/CElementInfo;>;
@@ -61,7 +61,7 @@ getAnyTypeInfo
  ()Lcom/sun/tools/xjc/model/CBuiltinLeafInfo;
 getAttributeFormDefault
  (Ljava/lang/String;)Ljakarta/xml/bind/annotation/XmlNsForm;
- (Ljava/lang/String;)Ljakarta/xml/bind/annotation/XmlNsForm;
+ (Ljava/lang/String;)L1jakarta/xml/bind/annotation/XmlNsForm;
 getClassInfo
  (Lcom/sun/tools/xjc/model/nav/NClass;)Lcom/sun/tools/xjc/model/CClassInfo;
  (Lcom/sun/tools/xjc/model/nav/NClass;)Lcom/sun/tools/xjc/model/CClassInfo;
@@ -70,7 +70,7 @@ getCustomizations
  ()Lcom/sun/tools/xjc/model/CCustomizations;
 getElementFormDefault
  (Ljava/lang/String;)Ljakarta/xml/bind/annotation/XmlNsForm;
- (Ljava/lang/String;)Ljakarta/xml/bind/annotation/XmlNsForm;
+ (Ljava/lang/String;)L1jakarta/xml/bind/annotation/XmlNsForm;
 getElementInfo
  (Lcom/sun/tools/xjc/model/nav/NClass;Ljavax/xml/namespace/QName;)Lcom/sun/tools/xjc/model/CElementInfo;
  (Lcom/sun/tools/xjc/model/nav/NClass;Ljavax/xml/namespace/QName;)Lcom/sun/tools/xjc/model/CElementInfo;
@@ -79,7 +79,7 @@ getElementMappings
  (Lcom/sun/tools/xjc/model/nav/NClass;)Ljava/util/Map<Ljavax/xml/namespace/QName;Lcom/sun/tools/xjc/model/CElementInfo;>;
 getLocator
  ()Lorg/xml/sax/Locator;
- ()Lorg/xml/sax/Locator;
+ ()L1org/xml/sax/Locator;
 getNameConverter
  ()Lorg/glassfish/jaxb/core/api/impl/NameConverter;
  ()Lorg/glassfish/jaxb/core/api/impl/NameConverter;
@@ -88,16 +88,16 @@ getNavigator
  ()Lorg/glassfish/jaxb/core/v2/model/nav/Navigator<Lcom/sun/tools/xjc/model/nav/NType;Lcom/sun/tools/xjc/model/nav/NClass;Ljava/lang/Void;Ljava/lang/Void;>;
 getPackage
  (Lcom/sun/codemodel/JPackage;)Lcom/sun/tools/xjc/model/CClassInfoParent$Package;
- (Lcom/sun/codemodel/JPackage;)Lcom/sun/tools/xjc/model/CClassInfoParent$Package;
+ (Lcom/sun/codemodel/JPackage;)L1com/sun/tools/xjc/model/CClassInfoParent$Package;
 getSchemaComponent
  ()Lcom/sun/xml/xsom/XSComponent;
- ()Lcom/sun/xml/xsom/XSComponent;
+ ()L0com/sun/xml/xsom/XSComponent;
 getSchemaLocations
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
 getSymbolSpace
  (Ljava/lang/String;)Lcom/sun/tools/xjc/model/SymbolSpace;
- (Ljava/lang/String;)Lcom/sun/tools/xjc/model/SymbolSpace;
+ (Ljava/lang/String;)L1com/sun/tools/xjc/model/SymbolSpace;
 getTypeInfo
  (Lcom/sun/tools/xjc/model/nav/NType;)Lcom/sun/tools/xjc/model/CNonElement;
  (Lcom/sun/tools/xjc/model/nav/NType;)Lcom/sun/tools/xjc/model/CNonElement;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/Multiplicity.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/Multiplicity.eea
index b4df7ba370..e20b411318 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/Multiplicity.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/Multiplicity.eea
@@ -21,10 +21,10 @@ choice
  (Lcom/sun/tools/xjc/model/Multiplicity;Lcom/sun/tools/xjc/model/Multiplicity;)Lcom/sun/tools/xjc/model/Multiplicity;
 create
  (ILjava/lang/Integer;)Lcom/sun/tools/xjc/model/Multiplicity;
- (ILjava/lang/Integer;)Lcom/sun/tools/xjc/model/Multiplicity;
+ (ILjava/lang/Integer;)L1com/sun/tools/xjc/model/Multiplicity;
 create
  (Ljava/math/BigInteger;Ljava/math/BigInteger;)Lcom/sun/tools/xjc/model/Multiplicity;
- (Ljava/math/BigInteger;Ljava/math/BigInteger;)Lcom/sun/tools/xjc/model/Multiplicity;
+ (Ljava/math/BigInteger;Ljava/math/BigInteger;)L1com/sun/tools/xjc/model/Multiplicity;
 group
  (Lcom/sun/tools/xjc/model/Multiplicity;Lcom/sun/tools/xjc/model/Multiplicity;)Lcom/sun/tools/xjc/model/Multiplicity;
  (Lcom/sun/tools/xjc/model/Multiplicity;Lcom/sun/tools/xjc/model/Multiplicity;)Lcom/sun/tools/xjc/model/Multiplicity;
@@ -47,7 +47,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getMaxString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 includes
  (Lcom/sun/tools/xjc/model/Multiplicity;)Z
  (Lcom/sun/tools/xjc/model/Multiplicity;)Z
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/TypeUse.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/TypeUse.eea
index 18ea2fa055..6c5585f8fe 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/TypeUse.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/TypeUse.eea
@@ -2,7 +2,7 @@ class com/sun/tools/xjc/model/TypeUse
 
 createConstant
  (Lcom/sun/tools/xjc/outline/Outline;Lcom/sun/xml/xsom/XmlString;)Lcom/sun/codemodel/JExpression;
- (Lcom/sun/tools/xjc/outline/Outline;Lcom/sun/xml/xsom/XmlString;)Lcom/sun/codemodel/JExpression;
+ (Lcom/sun/tools/xjc/outline/Outline;Lcom/sun/xml/xsom/XmlString;)L1com/sun/codemodel/JExpression;
 getAdapterUse
  ()Lcom/sun/tools/xjc/model/CAdapter;
  ()Lcom/sun/tools/xjc/model/CAdapter;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/TypeUseFactory.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/TypeUseFactory.eea
index ea192e87ef..541d12a709 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/TypeUseFactory.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/TypeUseFactory.eea
@@ -2,7 +2,7 @@ class com/sun/tools/xjc/model/TypeUseFactory
 
 adapt
  (Lcom/sun/tools/xjc/model/TypeUse;Lcom/sun/tools/xjc/model/CAdapter;)Lcom/sun/tools/xjc/model/TypeUse;
- (Lcom/sun/tools/xjc/model/TypeUse;Lcom/sun/tools/xjc/model/CAdapter;)Lcom/sun/tools/xjc/model/TypeUse;
+ (Lcom/sun/tools/xjc/model/TypeUse;Lcom/sun/tools/xjc/model/CAdapter;)L1com/sun/tools/xjc/model/TypeUse;
 adapt
  (Lcom/sun/tools/xjc/model/TypeUse;Ljava/lang/Class<+Ljakarta/xml/bind/annotation/adapters/XmlAdapter;>;Z)Lcom/sun/tools/xjc/model/TypeUse;
  (Lcom/sun/tools/xjc/model/TypeUse;Ljava/lang/Class<+Ljakarta/xml/bind/annotation/adapters/XmlAdapter;>;Z)Lcom/sun/tools/xjc/model/TypeUse;
@@ -11,7 +11,7 @@ makeCollection
  (Lcom/sun/tools/xjc/model/TypeUse;)Lcom/sun/tools/xjc/model/TypeUse;
 makeID
  (Lcom/sun/tools/xjc/model/TypeUse;Lorg/glassfish/jaxb/core/v2/model/core/ID;)Lcom/sun/tools/xjc/model/TypeUse;
- (Lcom/sun/tools/xjc/model/TypeUse;Lorg/glassfish/jaxb/core/v2/model/core/ID;)Lcom/sun/tools/xjc/model/TypeUse;
+ (Lcom/sun/tools/xjc/model/TypeUse;Lorg/glassfish/jaxb/core/v2/model/core/ID;)L1com/sun/tools/xjc/model/TypeUse;
 makeMimeTyped
  (Lcom/sun/tools/xjc/model/TypeUse;Ljakarta/activation/MimeType;)Lcom/sun/tools/xjc/model/TypeUse;
- (Lcom/sun/tools/xjc/model/TypeUse;Ljakarta/activation/MimeType;)Lcom/sun/tools/xjc/model/TypeUse;
+ (Lcom/sun/tools/xjc/model/TypeUse;Ljakarta/activation/MimeType;)L1com/sun/tools/xjc/model/TypeUse;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/nav/NavigatorImpl.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/nav/NavigatorImpl.eea
index b911278a51..086dd0133f 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/nav/NavigatorImpl.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/model/nav/NavigatorImpl.eea
@@ -10,20 +10,20 @@ theInstance
 
 create
  (Ljava/lang/Class;)Lcom/sun/tools/xjc/model/nav/NClass;
- (Ljava/lang/Class;)Lcom/sun/tools/xjc/model/nav/NClass;
+ (Ljava/lang/Class;)Lcom/sun/tools/xjc/model/nav/NClass; # @PolyNull
 create
  (Ljava/lang/reflect/Type;)Lcom/sun/tools/xjc/model/nav/NType;
- (Ljava/lang/reflect/Type;)Lcom/sun/tools/xjc/model/nav/NType;
+ (Ljava/lang/reflect/Type;)L1com/sun/tools/xjc/model/nav/NType;
 createParameterizedType
  (Lcom/sun/tools/xjc/model/nav/NClass;[Lcom/sun/tools/xjc/model/nav/NType;)Lcom/sun/tools/xjc/model/nav/NType;
- (Lcom/sun/tools/xjc/model/nav/NClass;[Lcom/sun/tools/xjc/model/nav/NType;)Lcom/sun/tools/xjc/model/nav/NType;
+ (Lcom/sun/tools/xjc/model/nav/NClass;[Lcom/sun/tools/xjc/model/nav/NType;)L1com/sun/tools/xjc/model/nav/NType;
 createParameterizedType
  (Ljava/lang/Class;[Lcom/sun/tools/xjc/model/nav/NType;)Lcom/sun/tools/xjc/model/nav/NType;
- (Ljava/lang/Class;[Lcom/sun/tools/xjc/model/nav/NType;)Lcom/sun/tools/xjc/model/nav/NType;
+ (Ljava/lang/Class;[Lcom/sun/tools/xjc/model/nav/NType;)L1com/sun/tools/xjc/model/nav/NType;
 
 asDecl
  (Lcom/sun/tools/xjc/model/nav/NType;)Lcom/sun/tools/xjc/model/nav/NClass;
- (Lcom/sun/tools/xjc/model/nav/NType;)Lcom/sun/tools/xjc/model/nav/NClass;
+ (Lcom/sun/tools/xjc/model/nav/NType;)L0com/sun/tools/xjc/model/nav/NClass;
 asDecl
  (Ljava/lang/Class;)Lcom/sun/tools/xjc/model/nav/NClass;
  (Ljava/lang/Class;)Lcom/sun/tools/xjc/model/nav/NClass;
@@ -32,67 +32,67 @@ erasure
  <T:Ljava/lang/Object;>(Lcom/sun/tools/xjc/model/nav/NType;)Lcom/sun/tools/xjc/model/nav/NType;
 getBaseClass
  (Lcom/sun/tools/xjc/model/nav/NType;Lcom/sun/tools/xjc/model/nav/NClass;)Lcom/sun/tools/xjc/model/nav/NType;
- (Lcom/sun/tools/xjc/model/nav/NType;Lcom/sun/tools/xjc/model/nav/NClass;)Lcom/sun/tools/xjc/model/nav/NType;
+ (Lcom/sun/tools/xjc/model/nav/NType;Lcom/sun/tools/xjc/model/nav/NClass;)L0com/sun/tools/xjc/model/nav/NType;
 getClassLocation
  (Lcom/sun/tools/xjc/model/nav/NClass;)Lorg/glassfish/jaxb/core/v2/runtime/Location;
- (Lcom/sun/tools/xjc/model/nav/NClass;)Lorg/glassfish/jaxb/core/v2/runtime/Location;
+ (Lcom/sun/tools/xjc/model/nav/NClass;)L1org/glassfish/jaxb/core/v2/runtime/Location;
 getClassName
  (Lcom/sun/tools/xjc/model/nav/NClass;)Ljava/lang/String;
- (Lcom/sun/tools/xjc/model/nav/NClass;)Ljava/lang/String;
+ (Lcom/sun/tools/xjc/model/nav/NClass;)L1java/lang/String;
 getClassShortName
  (Lcom/sun/tools/xjc/model/nav/NClass;)Ljava/lang/String;
- (Lcom/sun/tools/xjc/model/nav/NClass;)Ljava/lang/String;
+ (Lcom/sun/tools/xjc/model/nav/NClass;)L1java/lang/String;
 getComponentType
  (Lcom/sun/tools/xjc/model/nav/NType;)Lcom/sun/tools/xjc/model/nav/NType;
- (Lcom/sun/tools/xjc/model/nav/NType;)Lcom/sun/tools/xjc/model/nav/NType;
+ (Lcom/sun/tools/xjc/model/nav/NType;)L1com/sun/tools/xjc/model/nav/NType;
 getDeclaredField
  (Lcom/sun/tools/xjc/model/nav/NClass;Ljava/lang/String;)Ljava/lang/Void;
- (Lcom/sun/tools/xjc/model/nav/NClass;Ljava/lang/String;)Ljava/lang/Void;
+ (Lcom/sun/tools/xjc/model/nav/NClass;Ljava/lang/String;)L1java/lang/Void;
 getDeclaredFields
  (Lcom/sun/tools/xjc/model/nav/NClass;)Ljava/util/Collection<+Ljava/lang/Void;>;
- (Lcom/sun/tools/xjc/model/nav/NClass;)Ljava/util/Collection<+Ljava/lang/Void;>;
+ (Lcom/sun/tools/xjc/model/nav/NClass;)L1java/util/Collection<+Ljava/lang/Void;>;
 getDeclaredMethods
  (Lcom/sun/tools/xjc/model/nav/NClass;)Ljava/util/Collection<+Ljava/lang/Void;>;
- (Lcom/sun/tools/xjc/model/nav/NClass;)Ljava/util/Collection<+Ljava/lang/Void;>;
+ (Lcom/sun/tools/xjc/model/nav/NClass;)L1java/util/Collection<+Ljava/lang/Void;>;
 getDeclaringClassForField
  (Ljava/lang/Void;)Lcom/sun/tools/xjc/model/nav/NClass;
- (Ljava/lang/Void;)Lcom/sun/tools/xjc/model/nav/NClass;
+ (Ljava/lang/Void;)L1com/sun/tools/xjc/model/nav/NClass;
 getDeclaringClassForMethod
  (Ljava/lang/Void;)Lcom/sun/tools/xjc/model/nav/NClass;
- (Ljava/lang/Void;)Lcom/sun/tools/xjc/model/nav/NClass;
+ (Ljava/lang/Void;)L1com/sun/tools/xjc/model/nav/NClass;
 getEnumConstants
  (Lcom/sun/tools/xjc/model/nav/NClass;)[Ljava/lang/Void;
- (Lcom/sun/tools/xjc/model/nav/NClass;)[Ljava/lang/Void;
+ (Lcom/sun/tools/xjc/model/nav/NClass;)[1Ljava/lang/Void;
 getFieldLocation
  (Ljava/lang/Void;)Lorg/glassfish/jaxb/core/v2/runtime/Location;
- (Ljava/lang/Void;)Lorg/glassfish/jaxb/core/v2/runtime/Location;
+ (Ljava/lang/Void;)L1org/glassfish/jaxb/core/v2/runtime/Location;
 getFieldName
  (Ljava/lang/Void;)Ljava/lang/String;
- (Ljava/lang/Void;)Ljava/lang/String;
+ (Ljava/lang/Void;)L1java/lang/String;
 getFieldType
  (Ljava/lang/Void;)Lcom/sun/tools/xjc/model/nav/NType;
- (Ljava/lang/Void;)Lcom/sun/tools/xjc/model/nav/NType;
+ (Ljava/lang/Void;)L1com/sun/tools/xjc/model/nav/NType;
 getMethodLocation
  (Ljava/lang/Void;)Lorg/glassfish/jaxb/core/v2/runtime/Location;
- (Ljava/lang/Void;)Lorg/glassfish/jaxb/core/v2/runtime/Location;
+ (Ljava/lang/Void;)L1org/glassfish/jaxb/core/v2/runtime/Location;
 getMethodName
  (Ljava/lang/Void;)Ljava/lang/String;
- (Ljava/lang/Void;)Ljava/lang/String;
+ (Ljava/lang/Void;)L1java/lang/String;
 getMethodParameters
  (Ljava/lang/Void;)[Lcom/sun/tools/xjc/model/nav/NType;
- (Ljava/lang/Void;)[Lcom/sun/tools/xjc/model/nav/NType;
+ (Ljava/lang/Void;)[1Lcom/sun/tools/xjc/model/nav/NType;
 getPackageName
  (Lcom/sun/tools/xjc/model/nav/NClass;)Ljava/lang/String;
- (Lcom/sun/tools/xjc/model/nav/NClass;)Ljava/lang/String;
+ (Lcom/sun/tools/xjc/model/nav/NClass;)L1java/lang/String;
 getPrimitive
  (Ljava/lang/Class;)Lcom/sun/tools/xjc/model/nav/NType;
  (Ljava/lang/Class;)Lcom/sun/tools/xjc/model/nav/NType;
 getReturnType
  (Ljava/lang/Void;)Lcom/sun/tools/xjc/model/nav/NType;
- (Ljava/lang/Void;)Lcom/sun/tools/xjc/model/nav/NType;
+ (Ljava/lang/Void;)L1com/sun/tools/xjc/model/nav/NType;
 getSuperClass
  (Lcom/sun/tools/xjc/model/nav/NClass;)Lcom/sun/tools/xjc/model/nav/NClass;
- (Lcom/sun/tools/xjc/model/nav/NClass;)Lcom/sun/tools/xjc/model/nav/NClass;
+ (Lcom/sun/tools/xjc/model/nav/NClass;)L1com/sun/tools/xjc/model/nav/NClass;
 getTypeArgument
  (Lcom/sun/tools/xjc/model/nav/NType;I)Lcom/sun/tools/xjc/model/nav/NType;
  (Lcom/sun/tools/xjc/model/nav/NType;I)Lcom/sun/tools/xjc/model/nav/NType;
@@ -164,10 +164,10 @@ isTransient
  (Ljava/lang/Void;)Z
 loadObjectFactory
  (Lcom/sun/tools/xjc/model/nav/NClass;Ljava/lang/String;)Lcom/sun/tools/xjc/model/nav/NClass;
- (Lcom/sun/tools/xjc/model/nav/NClass;Ljava/lang/String;)Lcom/sun/tools/xjc/model/nav/NClass;
+ (Lcom/sun/tools/xjc/model/nav/NClass;Ljava/lang/String;)L1com/sun/tools/xjc/model/nav/NClass;
 ref
  (Lcom/sun/codemodel/JClass;)Lcom/sun/tools/xjc/model/nav/NClass;
- (Lcom/sun/codemodel/JClass;)Lcom/sun/tools/xjc/model/nav/NClass;
+ (Lcom/sun/codemodel/JClass;)Lcom/sun/tools/xjc/model/nav/NClass; # @PolyNull
 ref
  (Ljava/lang/Class;)Lcom/sun/tools/xjc/model/nav/NClass;
  (Ljava/lang/Class;)Lcom/sun/tools/xjc/model/nav/NClass;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/outline/ClassOutline.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/outline/ClassOutline.eea
index 58b6109b54..61ed607c01 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/outline/ClassOutline.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/outline/ClassOutline.eea
@@ -21,13 +21,13 @@ _package
  ()Lcom/sun/tools/xjc/outline/PackageOutline;
 getDeclaredFields
  ()[Lcom/sun/tools/xjc/outline/FieldOutline;
- ()[Lcom/sun/tools/xjc/outline/FieldOutline;
+ ()[1Lcom/sun/tools/xjc/outline/FieldOutline;
 getImplClass
  ()Lcom/sun/codemodel/JDefinedClass;
  ()Lcom/sun/codemodel/JDefinedClass;
 getSuperClass
  ()Lcom/sun/tools/xjc/outline/ClassOutline;
- ()Lcom/sun/tools/xjc/outline/ClassOutline;
+ ()L0com/sun/tools/xjc/outline/ClassOutline;
 getTarget
  ()Lcom/sun/tools/xjc/model/CCustomizable;
  ()Lcom/sun/tools/xjc/model/CCustomizable;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/AbstractExtensionBindingChecker.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/AbstractExtensionBindingChecker.eea
index 36afa26bb8..d01e704344 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/AbstractExtensionBindingChecker.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/AbstractExtensionBindingChecker.eea
@@ -21,7 +21,7 @@ endPrefixMapping
  (L1java/lang/String;)V # @Inherited(org.xml.sax.helpers.XMLFilterImpl)
 error
  (Ljava/lang/String;)Lorg/xml/sax/SAXParseException;
- (Ljava/lang/String;)Lorg/xml/sax/SAXParseException;
+ (Ljava/lang/String;)L1org/xml/sax/SAXParseException;
 isRecognizableExtension
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/RawTypeSet$Ref.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/RawTypeSet$Ref.eea
index c56004ac76..6bfdf4482d 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/RawTypeSet$Ref.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/RawTypeSet$Ref.eea
@@ -5,7 +5,7 @@ canBeType
  (Lcom/sun/tools/xjc/reader/RawTypeSet;)Lcom/sun/tools/xjc/reader/RawTypeSet$Mode;
 getExpectedMimeType
  ()Ljakarta/activation/MimeType;
- ()Ljakarta/activation/MimeType;
+ ()L0jakarta/activation/MimeType;
 id
  ()Lorg/glassfish/jaxb/core/v2/model/core/ID;
  ()Lorg/glassfish/jaxb/core/v2/model/core/ID;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/RawTypeSet.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/RawTypeSet.eea
index fd6a818663..8829ee488f 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/RawTypeSet.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/RawTypeSet.eea
@@ -24,7 +24,7 @@ getCollectionMode
  ()Lcom/sun/tools/xjc/model/CElementPropertyInfo$CollectionMode;
 getExpectedMimeType
  ()Ljakarta/activation/MimeType;
- ()Ljakarta/activation/MimeType;
+ ()L0jakarta/activation/MimeType;
 id
  ()Lorg/glassfish/jaxb/core/v2/model/core/ID;
  ()Lorg/glassfish/jaxb/core/v2/model/core/ID;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/Util.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/Util.eea
index cf0d4c66d2..c64768ee18 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/Util.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/Util.eea
@@ -2,10 +2,10 @@ class com/sun/tools/xjc/reader/Util
 
 escapeSpace
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 getFileOrURL
  (Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;)Ljava/lang/Object;
 getInputSource
  (Ljava/lang/String;)Lorg/xml/sax/InputSource;
- (Ljava/lang/String;)Lorg/xml/sax/InputSource;
+ (Ljava/lang/String;)L1org/xml/sax/InputSource;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/dtd/TDTDReader.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/dtd/TDTDReader.eea
index 38b9415bcf..4f4c57bf99 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/dtd/TDTDReader.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/dtd/TDTDReader.eea
@@ -2,7 +2,7 @@ class com/sun/tools/xjc/reader/dtd/TDTDReader
 
 parse
  (Lorg/xml/sax/InputSource;Lorg/xml/sax/InputSource;Lcom/sun/tools/xjc/ErrorReceiver;Lcom/sun/tools/xjc/Options;)Lcom/sun/tools/xjc/model/Model;
- (Lorg/xml/sax/InputSource;Lorg/xml/sax/InputSource;Lcom/sun/tools/xjc/ErrorReceiver;Lcom/sun/tools/xjc/Options;)Lcom/sun/tools/xjc/model/Model;
+ (Lorg/xml/sax/InputSource;Lorg/xml/sax/InputSource;Lcom/sun/tools/xjc/ErrorReceiver;Lcom/sun/tools/xjc/Options;)L0com/sun/tools/xjc/model/Model;
 
 <init>
  (Lcom/sun/tools/xjc/ErrorReceiver;Lcom/sun/tools/xjc/Options;Lorg/xml/sax/InputSource;)V
@@ -15,7 +15,7 @@ childElement
  (Ljava/lang/String;S)V
 createAttribute
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;SLjava/lang/String;)Lcom/sun/tools/xjc/model/CPropertyInfo;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;SLjava/lang/String;)Lcom/sun/tools/xjc/model/CPropertyInfo;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;SLjava/lang/String;)L1com/sun/tools/xjc/model/CPropertyInfo;
 endContentModel
  (Ljava/lang/String;S)V
  (Ljava/lang/String;S)V
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/dtd/bindinfo/BIAttribute.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/dtd/bindinfo/BIAttribute.eea
index 7fb218d1a4..855c3bafd4 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/dtd/bindinfo/BIAttribute.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/dtd/bindinfo/BIAttribute.eea
@@ -2,13 +2,13 @@ class com/sun/tools/xjc/reader/dtd/bindinfo/BIAttribute
 
 getConversion
  ()Lcom/sun/tools/xjc/reader/dtd/bindinfo/BIConversion;
- ()Lcom/sun/tools/xjc/reader/dtd/bindinfo/BIConversion;
+ ()L0com/sun/tools/xjc/reader/dtd/bindinfo/BIConversion;
 getPropertyName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getRealization
  ()Lcom/sun/tools/xjc/generator/bean/field/FieldRenderer;
- ()Lcom/sun/tools/xjc/generator/bean/field/FieldRenderer;
+ ()L0com/sun/tools/xjc/generator/bean/field/FieldRenderer;
 name
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/dtd/bindinfo/BIContent.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/dtd/bindinfo/BIContent.eea
index 97c9974344..78ebe80c2a 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/dtd/bindinfo/BIContent.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/dtd/bindinfo/BIContent.eea
@@ -12,7 +12,7 @@ getPropertyName
  ()Ljava/lang/String;
 getRealization
  ()Lcom/sun/tools/xjc/generator/bean/field/FieldRenderer;
- ()Lcom/sun/tools/xjc/generator/bean/field/FieldRenderer;
+ ()L0com/sun/tools/xjc/generator/bean/field/FieldRenderer;
 getType
  ()Lcom/sun/codemodel/JClass;
- ()Lcom/sun/codemodel/JClass;
+ ()L0com/sun/codemodel/JClass;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/dtd/bindinfo/BIElement.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/dtd/bindinfo/BIElement.eea
index 4a14ab77d0..2eb54b67e4 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/dtd/bindinfo/BIElement.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/dtd/bindinfo/BIElement.eea
@@ -21,7 +21,7 @@ getContents
  ()Ljava/util/List<Lcom/sun/tools/xjc/reader/dtd/bindinfo/BIContent;>;
 getConversion
  ()Lcom/sun/tools/xjc/reader/dtd/bindinfo/BIConversion;
- ()Lcom/sun/tools/xjc/reader/dtd/bindinfo/BIConversion;
+ ()L0com/sun/tools/xjc/reader/dtd/bindinfo/BIConversion;
 getLocation
  ()Lorg/xml/sax/Locator;
  ()Lorg/xml/sax/Locator;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/dtd/bindinfo/BindInfo.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/dtd/bindinfo/BindInfo.eea
index ed06c7908f..313a26ff1f 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/dtd/bindinfo/BindInfo.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/dtd/bindinfo/BindInfo.eea
@@ -21,13 +21,13 @@ elements
  ()Ljava/util/Collection<Lcom/sun/tools/xjc/reader/dtd/bindinfo/BIElement;>;
 getSerialVersionUID
  ()Ljava/lang/Long;
- ()Ljava/lang/Long;
+ ()L0java/lang/Long;
 getSuperClass
  ()Lcom/sun/codemodel/JClass;
- ()Lcom/sun/codemodel/JClass;
+ ()L0com/sun/codemodel/JClass;
 getSuperInterface
  ()Lcom/sun/codemodel/JClass;
- ()Lcom/sun/codemodel/JClass;
+ ()L0com/sun/codemodel/JClass;
 getTargetPackage
  ()Lcom/sun/codemodel/JPackage;
  ()Lcom/sun/codemodel/JPackage;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/dtd/bindinfo/DOMUtil.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/dtd/bindinfo/DOMUtil.eea
index 7390d0f94f..7ee9c28b32 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/dtd/bindinfo/DOMUtil.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/dtd/bindinfo/DOMUtil.eea
@@ -2,16 +2,16 @@ class com/sun/tools/xjc/reader/dtd/bindinfo/DOMUtil
 
 getAttribute
  (Lorg/w3c/dom/Element;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Lorg/w3c/dom/Element;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Lorg/w3c/dom/Element;Ljava/lang/String;Ljava/lang/String;)L0java/lang/String;
 getChildElements
  (Lorg/w3c/dom/Element;)Ljava/util/List<Lorg/w3c/dom/Element;>;
- (Lorg/w3c/dom/Element;)Ljava/util/List<Lorg/w3c/dom/Element;>;
+ (Lorg/w3c/dom/Element;)L1java/util/List<Lorg/w3c/dom/Element;>;
 getChildElements
  (Lorg/w3c/dom/Element;Ljava/lang/String;)Ljava/util/List<Lorg/w3c/dom/Element;>;
- (Lorg/w3c/dom/Element;Ljava/lang/String;)Ljava/util/List<Lorg/w3c/dom/Element;>;
+ (Lorg/w3c/dom/Element;Ljava/lang/String;)L1java/util/List<Lorg/w3c/dom/Element;>;
 getElement
  (Lorg/w3c/dom/Element;Ljava/lang/String;)Lorg/w3c/dom/Element;
  (Lorg/w3c/dom/Element;Ljava/lang/String;)Lorg/w3c/dom/Element;
 getElement
  (Lorg/w3c/dom/Element;Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/Element;
- (Lorg/w3c/dom/Element;Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/Element;
+ (Lorg/w3c/dom/Element;Ljava/lang/String;Ljava/lang/String;)L0org/w3c/dom/Element;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/internalizer/DOMForest.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/internalizer/DOMForest.eea
index 7dfc7dcaab..23a6cf97a1 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/internalizer/DOMForest.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/internalizer/DOMForest.eea
@@ -21,10 +21,10 @@ checkSchemaCorrectness
  (Lcom/sun/tools/xjc/ErrorReceiver;)Z
 createParser
  ()Lcom/sun/xml/xsom/parser/XMLParser;
- ()Lcom/sun/xml/xsom/parser/XMLParser;
+ ()L1com/sun/xml/xsom/parser/XMLParser;
 createSAXSource
  (Ljava/lang/String;)Ljavax/xml/transform/sax/SAXSource;
- (Ljava/lang/String;)Ljavax/xml/transform/sax/SAXSource;
+ (Ljava/lang/String;)L1javax/xml/transform/sax/SAXSource;
 dump
  (Ljava/io/OutputStream;)V
  (Ljava/io/OutputStream;)V
@@ -42,13 +42,13 @@ getOneDocument
  ()Lorg/w3c/dom/Document;
 getParserHandler
  (Ljava/lang/String;Z)Lcom/sun/tools/xjc/reader/internalizer/DOMForest$Handler;
- (Ljava/lang/String;Z)Lcom/sun/tools/xjc/reader/internalizer/DOMForest$Handler;
+ (Ljava/lang/String;Z)L1com/sun/tools/xjc/reader/internalizer/DOMForest$Handler;
 getRootDocuments
  ()Ljava/util/Set<Ljava/lang/String;>;
  ()Ljava/util/Set<Ljava/lang/String;>;
 getSystemId
  (Lorg/w3c/dom/Document;)Ljava/lang/String;
- (Lorg/w3c/dom/Document;)Ljava/lang/String;
+ (Lorg/w3c/dom/Document;)L0java/lang/String;
 listDocuments
  ()[Lorg/w3c/dom/Document;
  ()[Lorg/w3c/dom/Document;
@@ -60,7 +60,7 @@ parse
  (Ljava/lang/String;Ljavax/xml/stream/XMLStreamReader;Z)Lorg/w3c/dom/Document;
 parse
  (Ljava/lang/String;Lorg/xml/sax/InputSource;Z)Lorg/w3c/dom/Document;
- (Ljava/lang/String;Lorg/xml/sax/InputSource;Z)Lorg/w3c/dom/Document;
+ (Ljava/lang/String;Lorg/xml/sax/InputSource;Z)L0org/w3c/dom/Document;
 parse
  (Ljava/lang/String;Z)Lorg/w3c/dom/Document;
  (Ljava/lang/String;Z)Lorg/w3c/dom/Document;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/internalizer/InternalizationLogic.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/internalizer/InternalizationLogic.eea
index 1a36024000..8dce9b83a0 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/internalizer/InternalizationLogic.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/internalizer/InternalizationLogic.eea
@@ -5,7 +5,7 @@ checkIfValidTargetNode
  (Lcom/sun/tools/xjc/reader/internalizer/DOMForest;Lorg/w3c/dom/Element;Lorg/w3c/dom/Element;)Z
 createExternalReferenceFinder
  (Lcom/sun/tools/xjc/reader/internalizer/DOMForest;)Lorg/xml/sax/helpers/XMLFilterImpl;
- (Lcom/sun/tools/xjc/reader/internalizer/DOMForest;)Lorg/xml/sax/helpers/XMLFilterImpl;
+ (Lcom/sun/tools/xjc/reader/internalizer/DOMForest;)L1org/xml/sax/helpers/XMLFilterImpl;
 refineTarget
  (Lorg/w3c/dom/Element;)Lorg/w3c/dom/Element;
  (Lorg/w3c/dom/Element;)Lorg/w3c/dom/Element;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/relaxng/RELAXNGInternalizationLogic.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/relaxng/RELAXNGInternalizationLogic.eea
index 355a677a42..c75bfe5838 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/relaxng/RELAXNGInternalizationLogic.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/relaxng/RELAXNGInternalizationLogic.eea
@@ -5,7 +5,7 @@ checkIfValidTargetNode
  (Lcom/sun/tools/xjc/reader/internalizer/DOMForest;Lorg/w3c/dom/Element;Lorg/w3c/dom/Element;)Z
 createExternalReferenceFinder
  (Lcom/sun/tools/xjc/reader/internalizer/DOMForest;)Lorg/xml/sax/helpers/XMLFilterImpl;
- (Lcom/sun/tools/xjc/reader/internalizer/DOMForest;)Lorg/xml/sax/helpers/XMLFilterImpl;
+ (Lcom/sun/tools/xjc/reader/internalizer/DOMForest;)L1org/xml/sax/helpers/XMLFilterImpl; # @Inherited(com.sun.tools.xjc.reader.internalizer.InternalizationLogic)
 refineTarget
  (Lorg/w3c/dom/Element;)Lorg/w3c/dom/Element;
  (Lorg/w3c/dom/Element;)Lorg/w3c/dom/Element;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/relaxng/RawTypeSetBuilder.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/relaxng/RawTypeSetBuilder.eea
index 38ab89629a..f31628d4e2 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/relaxng/RawTypeSetBuilder.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/relaxng/RawTypeSetBuilder.eea
@@ -9,10 +9,10 @@ build
  (Lcom/sun/tools/xjc/reader/relaxng/RELAXNGCompiler;Lcom/sun/tools/xjc/model/Multiplicity;)V
 onAttribute
  (Lcom/sun/tools/rngom/digested/DAttributePattern;)Ljava/lang/Void;
- (Lcom/sun/tools/rngom/digested/DAttributePattern;)Ljava/lang/Void;
+ (Lcom/sun/tools/rngom/digested/DAttributePattern;)L0java/lang/Void;
 onElement
  (Lcom/sun/tools/rngom/digested/DElementPattern;)Ljava/lang/Void;
- (Lcom/sun/tools/rngom/digested/DElementPattern;)Ljava/lang/Void;
+ (Lcom/sun/tools/rngom/digested/DElementPattern;)L0java/lang/Void;
 onOneOrMore
  (Lcom/sun/tools/rngom/digested/DOneOrMorePattern;)Ljava/lang/Void;
  (Lcom/sun/tools/rngom/digested/DOneOrMorePattern;)Ljava/lang/Void;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/BGMBuilder.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/BGMBuilder.eea
index 94e474be60..882d43385b 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/BGMBuilder.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/BGMBuilder.eea
@@ -2,10 +2,10 @@ class com/sun/tools/xjc/reader/xmlschema/BGMBuilder
 
 build
  (Lcom/sun/xml/xsom/XSSchemaSet;Lcom/sun/codemodel/JCodeModel;Lcom/sun/tools/xjc/ErrorReceiver;Lcom/sun/tools/xjc/Options;)Lcom/sun/tools/xjc/model/Model;
- (Lcom/sun/xml/xsom/XSSchemaSet;Lcom/sun/codemodel/JCodeModel;Lcom/sun/tools/xjc/ErrorReceiver;Lcom/sun/tools/xjc/Options;)Lcom/sun/tools/xjc/model/Model;
+ (Lcom/sun/xml/xsom/XSSchemaSet;Lcom/sun/codemodel/JCodeModel;Lcom/sun/tools/xjc/ErrorReceiver;Lcom/sun/tools/xjc/Options;)L0com/sun/tools/xjc/model/Model;
 getName
  (Lcom/sun/xml/xsom/XSDeclaration;)Ljavax/xml/namespace/QName;
- (Lcom/sun/xml/xsom/XSDeclaration;)Ljavax/xml/namespace/QName;
+ (Lcom/sun/xml/xsom/XSDeclaration;)L0javax/xml/namespace/QName;
 
 defaultPackage1
  Ljava/lang/String;
@@ -31,7 +31,7 @@ getBindInfo
  (Lcom/sun/xml/xsom/XSComponent;)Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/BindInfo;
 getDocumentation
  (Lcom/sun/xml/xsom/XSComponent;)Ljava/lang/String;
- (Lcom/sun/xml/xsom/XSComponent;)Ljava/lang/String;
+ (Lcom/sun/xml/xsom/XSComponent;)L0java/lang/String;
 getGlobalBinding
  ()Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/BIGlobalBinding;
  ()Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/BIGlobalBinding;
@@ -40,7 +40,7 @@ getIdentityTransformer
  ()Ljavax/xml/transform/Transformer;
 getLocalDomCustomization
  (Lcom/sun/xml/xsom/XSParticle;)Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/BIDom;
- (Lcom/sun/xml/xsom/XSParticle;)Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/BIDom;
+ (Lcom/sun/xml/xsom/XSParticle;)L0com/sun/tools/xjc/reader/xmlschema/bindinfo/BIDom;
 getNameConverter
  ()Lorg/glassfish/jaxb/core/api/impl/NameConverter;
  ()Lorg/glassfish/jaxb/core/api/impl/NameConverter;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/ExpressionBuilder.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/ExpressionBuilder.eea
index c94683f6b7..944c9a8661 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/ExpressionBuilder.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/ExpressionBuilder.eea
@@ -6,20 +6,20 @@ super com/sun/xml/xsom/visitor/XSTermFunction
 
 createTree
  (Lcom/sun/xml/xsom/XSParticle;)Lcom/sun/tools/xjc/reader/gbind/Expression;
- (Lcom/sun/xml/xsom/XSParticle;)Lcom/sun/tools/xjc/reader/gbind/Expression;
+ (Lcom/sun/xml/xsom/XSParticle;)L1com/sun/tools/xjc/reader/gbind/Expression;
 
 elementDecl
  (Lcom/sun/xml/xsom/XSElementDecl;)Lcom/sun/tools/xjc/reader/gbind/Element;
- (Lcom/sun/xml/xsom/XSElementDecl;)Lcom/sun/tools/xjc/reader/gbind/Element;
+ (Lcom/sun/xml/xsom/XSElementDecl;)L1com/sun/tools/xjc/reader/gbind/Element;
 modelGroup
  (Lcom/sun/xml/xsom/XSModelGroup;)Lcom/sun/tools/xjc/reader/gbind/Expression;
- (Lcom/sun/xml/xsom/XSModelGroup;)Lcom/sun/tools/xjc/reader/gbind/Expression;
+ (Lcom/sun/xml/xsom/XSModelGroup;)L1com/sun/tools/xjc/reader/gbind/Expression;
 modelGroupDecl
  (Lcom/sun/xml/xsom/XSModelGroupDecl;)Lcom/sun/tools/xjc/reader/gbind/Expression;
  (Lcom/sun/xml/xsom/XSModelGroupDecl;)Lcom/sun/tools/xjc/reader/gbind/Expression;
 particle
  (Lcom/sun/xml/xsom/XSParticle;)Lcom/sun/tools/xjc/reader/gbind/Expression;
- (Lcom/sun/xml/xsom/XSParticle;)Lcom/sun/tools/xjc/reader/gbind/Expression;
+ (Lcom/sun/xml/xsom/XSParticle;)L1com/sun/tools/xjc/reader/gbind/Expression;
 wildcard
  (Lcom/sun/xml/xsom/XSWildcard;)Lcom/sun/tools/xjc/reader/gbind/Expression;
  (Lcom/sun/xml/xsom/XSWildcard;)Lcom/sun/tools/xjc/reader/gbind/Expression;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/ParticleBinder.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/ParticleBinder.eea
index 483b48deb1..f4cbb2c3a1 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/ParticleBinder.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/ParticleBinder.eea
@@ -33,7 +33,7 @@ getLocalPropCustomization
  (Lcom/sun/xml/xsom/XSParticle;)Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/BIProperty;
 getSpecDefaultName
  (Lcom/sun/xml/xsom/XSModelGroup;Z)Ljava/lang/String;
- (Lcom/sun/xml/xsom/XSModelGroup;Z)Ljava/lang/String;
+ (Lcom/sun/xml/xsom/XSModelGroup;Z)L1java/lang/String;
 makeJavaName
  (Lcom/sun/xml/xsom/XSParticle;Ljava/lang/String;)Ljava/lang/String;
  (Lcom/sun/xml/xsom/XSParticle;Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/RawTypeSetBuilder$CElementInfoRef.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/RawTypeSetBuilder$CElementInfoRef.eea
index 1af0003270..4e83dae0af 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/RawTypeSetBuilder$CElementInfoRef.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/RawTypeSetBuilder$CElementInfoRef.eea
@@ -12,7 +12,7 @@ canBeType
  (Lcom/sun/tools/xjc/reader/RawTypeSet;)Lcom/sun/tools/xjc/reader/RawTypeSet$Mode;
 getExpectedMimeType
  ()Ljakarta/activation/MimeType;
- ()Ljakarta/activation/MimeType;
+ ()L0jakarta/activation/MimeType; # @Inherited(com.sun.tools.xjc.reader.RawTypeSet$Ref)
 id
  ()Lorg/glassfish/jaxb/core/v2/model/core/ID;
  ()Lorg/glassfish/jaxb/core/v2/model/core/ID;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/RawTypeSetBuilder$WildcardRef.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/RawTypeSetBuilder$WildcardRef.eea
index 39578f555f..51e6077e07 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/RawTypeSetBuilder$WildcardRef.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/RawTypeSetBuilder$WildcardRef.eea
@@ -11,4 +11,4 @@ toElementRef
  (Lcom/sun/tools/xjc/model/CReferencePropertyInfo;)V
 toTypeRef
  (Lcom/sun/tools/xjc/model/CElementPropertyInfo;)Lcom/sun/tools/xjc/model/CTypeRef;
- (Lcom/sun/tools/xjc/model/CElementPropertyInfo;)Lcom/sun/tools/xjc/model/CTypeRef;
+ (Lcom/sun/tools/xjc/model/CElementPropertyInfo;)L1com/sun/tools/xjc/model/CTypeRef;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/RawTypeSetBuilder$XmlTypeRef.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/RawTypeSetBuilder$XmlTypeRef.eea
index 06660dc568..3a43356073 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/RawTypeSetBuilder$XmlTypeRef.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/RawTypeSetBuilder$XmlTypeRef.eea
@@ -8,7 +8,7 @@ canBeType
  (Lcom/sun/tools/xjc/reader/RawTypeSet;)Lcom/sun/tools/xjc/reader/RawTypeSet$Mode;
 getExpectedMimeType
  ()Ljakarta/activation/MimeType;
- ()Ljakarta/activation/MimeType;
+ ()L0jakarta/activation/MimeType; # @Inherited(com.sun.tools.xjc.reader.RawTypeSet$Ref)
 id
  ()Lorg/glassfish/jaxb/core/v2/model/core/ID;
  ()Lorg/glassfish/jaxb/core/v2/model/core/ID;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/RawTypeSetBuilder.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/RawTypeSetBuilder.eea
index f45cf5bf3c..9a754d71b7 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/RawTypeSetBuilder.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/RawTypeSetBuilder.eea
@@ -2,7 +2,7 @@ class com/sun/tools/xjc/reader/xmlschema/RawTypeSetBuilder
 
 build
  (Lcom/sun/xml/xsom/XSParticle;Z)Lcom/sun/tools/xjc/reader/RawTypeSet;
- (Lcom/sun/xml/xsom/XSParticle;Z)Lcom/sun/tools/xjc/reader/RawTypeSet;
+ (Lcom/sun/xml/xsom/XSParticle;Z)L1com/sun/tools/xjc/reader/RawTypeSet;
 
 builder
  Lcom/sun/tools/xjc/reader/xmlschema/BGMBuilder;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/WildcardNameClassBuilder.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/WildcardNameClassBuilder.eea
index 77f238ce20..2bbe15f546 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/WildcardNameClassBuilder.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/WildcardNameClassBuilder.eea
@@ -13,7 +13,7 @@ any
  (Lcom/sun/xml/xsom/XSWildcard$Any;)Lcom/sun/tools/rngom/nc/NameClass;
 other
  (Lcom/sun/xml/xsom/XSWildcard$Other;)Lcom/sun/tools/rngom/nc/NameClass;
- (Lcom/sun/xml/xsom/XSWildcard$Other;)Lcom/sun/tools/rngom/nc/NameClass;
+ (Lcom/sun/xml/xsom/XSWildcard$Other;)L1com/sun/tools/rngom/nc/NameClass;
 union
  (Lcom/sun/xml/xsom/XSWildcard$Union;)Lcom/sun/tools/rngom/nc/NameClass;
- (Lcom/sun/xml/xsom/XSWildcard$Union;)Lcom/sun/tools/rngom/nc/NameClass;
+ (Lcom/sun/xml/xsom/XSWildcard$Union;)L1com/sun/tools/rngom/nc/NameClass;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.eea
index 35e5b5ffd4..65d203c997 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.eea
@@ -5,4 +5,4 @@ class com/sun/tools/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl
  (Lcom/sun/tools/xjc/Options;)V
 create
  ()Lcom/sun/xml/xsom/parser/AnnotationParser;
- ()Lcom/sun/xml/xsom/parser/AnnotationParser;
+ ()L1com/sun/xml/xsom/parser/AnnotationParser;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/bindinfo/BIClass.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/bindinfo/BIClass.eea
index ff809eea34..6ceec772aa 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/bindinfo/BIClass.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/bindinfo/BIClass.eea
@@ -6,7 +6,7 @@ NAME
 
 getClassName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getExistingClassRef
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.eea
index 418aeee297..9e118a3a53 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.eea
@@ -40,10 +40,10 @@ getSerializable
  ()Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/BISerializable;
 getSuperClass
  ()Lcom/sun/codemodel/JDefinedClass;
- ()Lcom/sun/codemodel/JDefinedClass;
+ ()L0com/sun/codemodel/JDefinedClass;
 getSuperInterface
  ()Lcom/sun/codemodel/JDefinedClass;
- ()Lcom/sun/codemodel/JDefinedClass;
+ ()L0com/sun/codemodel/JDefinedClass;
 isEqual
  (Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/BIGlobalBinding;)Z
  (Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/BIGlobalBinding;)Z
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/bindinfo/BIProperty.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/bindinfo/BIProperty.eea
index b8a6961841..8d1101747d 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/bindinfo/BIProperty.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/bindinfo/BIProperty.eea
@@ -13,37 +13,37 @@ getCustomization
  (Lorg/xml/sax/Locator;Ljava/lang/String;Ljava/lang/String;Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/BIProperty$BaseTypeBean;Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute;Ljava/lang/Boolean;Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode;Ljava/lang/Boolean;)V
 createAttributeProperty
  (Lcom/sun/xml/xsom/XSAttributeUse;Lcom/sun/tools/xjc/model/TypeUse;)Lcom/sun/tools/xjc/model/CAttributePropertyInfo;
- (Lcom/sun/xml/xsom/XSAttributeUse;Lcom/sun/tools/xjc/model/TypeUse;)Lcom/sun/tools/xjc/model/CAttributePropertyInfo;
+ (Lcom/sun/xml/xsom/XSAttributeUse;Lcom/sun/tools/xjc/model/TypeUse;)L1com/sun/tools/xjc/model/CAttributePropertyInfo;
 createContentExtendedMixedReferenceProperty
  (Ljava/lang/String;Lcom/sun/xml/xsom/XSComponent;Lcom/sun/tools/xjc/reader/RawTypeSet;)Lcom/sun/tools/xjc/model/CReferencePropertyInfo;
- (Ljava/lang/String;Lcom/sun/xml/xsom/XSComponent;Lcom/sun/tools/xjc/reader/RawTypeSet;)Lcom/sun/tools/xjc/model/CReferencePropertyInfo;
+ (Ljava/lang/String;Lcom/sun/xml/xsom/XSComponent;Lcom/sun/tools/xjc/reader/RawTypeSet;)L1com/sun/tools/xjc/model/CReferencePropertyInfo;
 createDummyExtendedMixedReferenceProperty
  (Ljava/lang/String;Lcom/sun/xml/xsom/XSComponent;Lcom/sun/tools/xjc/reader/RawTypeSet;)Lcom/sun/tools/xjc/model/CReferencePropertyInfo;
- (Ljava/lang/String;Lcom/sun/xml/xsom/XSComponent;Lcom/sun/tools/xjc/reader/RawTypeSet;)Lcom/sun/tools/xjc/model/CReferencePropertyInfo;
+ (Ljava/lang/String;Lcom/sun/xml/xsom/XSComponent;Lcom/sun/tools/xjc/reader/RawTypeSet;)L1com/sun/tools/xjc/model/CReferencePropertyInfo;
 createElementOrReferenceProperty
  (Ljava/lang/String;ZLcom/sun/xml/xsom/XSParticle;Lcom/sun/tools/xjc/reader/RawTypeSet;)Lcom/sun/tools/xjc/model/CPropertyInfo;
- (Ljava/lang/String;ZLcom/sun/xml/xsom/XSParticle;Lcom/sun/tools/xjc/reader/RawTypeSet;)Lcom/sun/tools/xjc/model/CPropertyInfo;
+ (Ljava/lang/String;ZLcom/sun/xml/xsom/XSParticle;Lcom/sun/tools/xjc/reader/RawTypeSet;)L1com/sun/tools/xjc/model/CPropertyInfo;
 createElementProperty
  (Ljava/lang/String;ZLcom/sun/xml/xsom/XSParticle;Lcom/sun/tools/xjc/reader/RawTypeSet;)Lcom/sun/tools/xjc/model/CElementPropertyInfo;
- (Ljava/lang/String;ZLcom/sun/xml/xsom/XSParticle;Lcom/sun/tools/xjc/reader/RawTypeSet;)Lcom/sun/tools/xjc/model/CElementPropertyInfo;
+ (Ljava/lang/String;ZLcom/sun/xml/xsom/XSParticle;Lcom/sun/tools/xjc/reader/RawTypeSet;)L1com/sun/tools/xjc/model/CElementPropertyInfo;
 createReferenceProperty
  (Ljava/lang/String;ZLcom/sun/xml/xsom/XSComponent;Lcom/sun/tools/xjc/reader/RawTypeSet;ZZZZ)Lcom/sun/tools/xjc/model/CReferencePropertyInfo;
- (Ljava/lang/String;ZLcom/sun/xml/xsom/XSComponent;Lcom/sun/tools/xjc/reader/RawTypeSet;ZZZZ)Lcom/sun/tools/xjc/model/CReferencePropertyInfo;
+ (Ljava/lang/String;ZLcom/sun/xml/xsom/XSComponent;Lcom/sun/tools/xjc/reader/RawTypeSet;ZZZZ)L1com/sun/tools/xjc/model/CReferencePropertyInfo;
 createValueProperty
  (Ljava/lang/String;ZLcom/sun/xml/xsom/XSComponent;Lcom/sun/tools/xjc/model/TypeUse;Ljavax/xml/namespace/QName;)Lcom/sun/tools/xjc/model/CValuePropertyInfo;
- (Ljava/lang/String;ZLcom/sun/xml/xsom/XSComponent;Lcom/sun/tools/xjc/model/TypeUse;Ljavax/xml/namespace/QName;)Lcom/sun/tools/xjc/model/CValuePropertyInfo;
+ (Ljava/lang/String;ZLcom/sun/xml/xsom/XSComponent;Lcom/sun/tools/xjc/model/TypeUse;Ljavax/xml/namespace/QName;)L1com/sun/tools/xjc/model/CValuePropertyInfo;
 getBaseType
  ()Lcom/sun/codemodel/JType;
- ()Lcom/sun/codemodel/JType;
+ ()L0com/sun/codemodel/JType;
 getChildren
  ()Ljava/util/Collection<Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/BIDeclaration;>;
  ()Ljava/util/Collection<Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/BIDeclaration;>;
 getConv
  ()Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/BIConversion;
- ()Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/BIConversion;
+ ()L0com/sun/tools/xjc/reader/xmlschema/bindinfo/BIConversion;
 getDefault
  ()Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/BIProperty;
- ()Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/BIProperty;
+ ()L0com/sun/tools/xjc/reader/xmlschema/bindinfo/BIProperty;
 getJavadoc
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -55,7 +55,7 @@ getOptionalPropertyMode
  ()Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode;
 getPropertyName
  (Z)Ljava/lang/String;
- (Z)Ljava/lang/String;
+ (Z)L0java/lang/String;
 setParent
  (Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/BindInfo;)V
  (Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/BindInfo;)V
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/bindinfo/BISchemaBinding$NamingRule.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/bindinfo/BISchemaBinding$NamingRule.eea
index 2258ef02d8..2265d4c534 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/bindinfo/BISchemaBinding$NamingRule.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/bindinfo/BISchemaBinding$NamingRule.eea
@@ -5,4 +5,4 @@ class com/sun/tools/xjc/reader/xmlschema/bindinfo/BISchemaBinding$NamingRule
  (Ljava/lang/String;Ljava/lang/String;)V
 mangle
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/bindinfo/BindInfo.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/bindinfo/BindInfo.eea
index bf3a30a584..cb16dd7012 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/bindinfo/BindInfo.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/bindinfo/BindInfo.eea
@@ -29,7 +29,7 @@ get
  (I)Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/BIDeclaration;
 get
  <T::Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/BIDeclaration;>(Ljava/lang/Class<TT;>;)TT;
- <T::Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/BIDeclaration;>(Ljava/lang/Class<TT;>;)TT;
+ <T::Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/BIDeclaration;>(Ljava/lang/Class<TT;>;)T0T;
 getBuilder
  ()Lcom/sun/tools/xjc/reader/xmlschema/BGMBuilder;
  ()Lcom/sun/tools/xjc/reader/xmlschema/BGMBuilder;
@@ -38,7 +38,7 @@ getDecls
  ()[Lcom/sun/tools/xjc/reader/xmlschema/bindinfo/BIDeclaration;
 getDocumentation
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getOwner
  ()Lcom/sun/xml/xsom/XSComponent;
  ()Lcom/sun/xml/xsom/XSComponent;
@@ -53,4 +53,4 @@ setOwner
  (Lcom/sun/tools/xjc/reader/xmlschema/BGMBuilder;Lcom/sun/xml/xsom/XSComponent;)V
 toCustomizationList
  ()Lcom/sun/tools/xjc/model/CCustomizations;
- ()Lcom/sun/tools/xjc/model/CCustomizations;
+ ()L1com/sun/tools/xjc/model/CCustomizations;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/parser/LSInputSAXWrapper.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/parser/LSInputSAXWrapper.eea
index e2e29b796c..770d8b6ff0 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/parser/LSInputSAXWrapper.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/parser/LSInputSAXWrapper.eea
@@ -5,7 +5,7 @@ class com/sun/tools/xjc/reader/xmlschema/parser/LSInputSAXWrapper
  (Lorg/xml/sax/InputSource;)V
 getBaseURI
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getByteStream
  ()Ljava/io/InputStream;
  ()Ljava/io/InputStream;
@@ -20,7 +20,7 @@ getPublicId
  ()Ljava/lang/String;
 getStringData
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getSystemId
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.eea
index 9e830d69e3..8435d127f5 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.eea
@@ -5,7 +5,7 @@ checkIfValidTargetNode
  (Lcom/sun/tools/xjc/reader/internalizer/DOMForest;Lorg/w3c/dom/Element;Lorg/w3c/dom/Element;)Z
 createExternalReferenceFinder
  (Lcom/sun/tools/xjc/reader/internalizer/DOMForest;)Lorg/xml/sax/helpers/XMLFilterImpl;
- (Lcom/sun/tools/xjc/reader/internalizer/DOMForest;)Lorg/xml/sax/helpers/XMLFilterImpl;
+ (Lcom/sun/tools/xjc/reader/internalizer/DOMForest;)L1org/xml/sax/helpers/XMLFilterImpl; # @Inherited(com.sun.tools.xjc.reader.internalizer.InternalizationLogic)
 refineTarget
  (Lorg/w3c/dom/Element;)Lorg/w3c/dom/Element;
  (Lorg/w3c/dom/Element;)Lorg/w3c/dom/Element;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/runtime/JAXBContextFactory.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/runtime/JAXBContextFactory.eea
index 5cfea659ed..2fc3e82859 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/runtime/JAXBContextFactory.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/runtime/JAXBContextFactory.eea
@@ -2,7 +2,7 @@ class com/sun/tools/xjc/runtime/JAXBContextFactory
 
 createContext
  (Ljava/lang/String;Ljava/lang/ClassLoader;Ljava/util/Map<Ljava/lang/String;*>;)Ljakarta/xml/bind/JAXBContext;
- (Ljava/lang/String;Ljava/lang/ClassLoader;Ljava/util/Map<Ljava/lang/String;*>;)Ljakarta/xml/bind/JAXBContext;
+ (Ljava/lang/String;Ljava/lang/ClassLoader;Ljava/util/Map<Ljava/lang/String;*>;)L1jakarta/xml/bind/JAXBContext;
 createContext
  ([Ljava/lang/Class<*>;Ljava/util/Map<Ljava/lang/String;*>;)Ljakarta/xml/bind/JAXBContext;
- ([Ljava/lang/Class<*>;Ljava/util/Map<Ljava/lang/String;*>;)Ljakarta/xml/bind/JAXBContext;
+ ([Ljava/lang/Class<*>;Ljava/util/Map<Ljava/lang/String;*>;)L1jakarta/xml/bind/JAXBContext;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/runtime/ZeroOneBooleanAdapter.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/runtime/ZeroOneBooleanAdapter.eea
index a6eb338553..9274e081af 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/runtime/ZeroOneBooleanAdapter.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/runtime/ZeroOneBooleanAdapter.eea
@@ -6,7 +6,7 @@ super jakarta/xml/bind/annotation/adapters/XmlAdapter
 
 marshal
  (Ljava/lang/Boolean;)Ljava/lang/String;
- (Ljava/lang/Boolean;)Ljava/lang/String;
+ (Ljava/lang/Boolean;)Ljava/lang/String; # @PolyNull
 unmarshal
  (Ljava/lang/String;)Ljava/lang/Boolean;
  (Ljava/lang/String;)Ljava/lang/Boolean;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/util/CodeModelClassFactory.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/util/CodeModelClassFactory.eea
index 4a9e615c72..1327eba9c6 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/util/CodeModelClassFactory.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/util/CodeModelClassFactory.eea
@@ -5,19 +5,19 @@ class com/sun/tools/xjc/util/CodeModelClassFactory
  (Lcom/sun/tools/xjc/ErrorReceiver;)V
 createClass
  (Lcom/sun/codemodel/JClassContainer;ILjava/lang/String;Lorg/xml/sax/Locator;)Lcom/sun/codemodel/JDefinedClass;
- (Lcom/sun/codemodel/JClassContainer;ILjava/lang/String;Lorg/xml/sax/Locator;)Lcom/sun/codemodel/JDefinedClass;
+ (Lcom/sun/codemodel/JClassContainer;ILjava/lang/String;Lorg/xml/sax/Locator;)L1com/sun/codemodel/JDefinedClass;
 createClass
  (Lcom/sun/codemodel/JClassContainer;ILjava/lang/String;Lorg/xml/sax/Locator;Lcom/sun/codemodel/ClassType;)Lcom/sun/codemodel/JDefinedClass;
- (Lcom/sun/codemodel/JClassContainer;ILjava/lang/String;Lorg/xml/sax/Locator;Lcom/sun/codemodel/ClassType;)Lcom/sun/codemodel/JDefinedClass;
+ (Lcom/sun/codemodel/JClassContainer;ILjava/lang/String;Lorg/xml/sax/Locator;Lcom/sun/codemodel/ClassType;)L1com/sun/codemodel/JDefinedClass;
 createClass
  (Lcom/sun/codemodel/JClassContainer;Ljava/lang/String;Lorg/xml/sax/Locator;)Lcom/sun/codemodel/JDefinedClass;
- (Lcom/sun/codemodel/JClassContainer;Ljava/lang/String;Lorg/xml/sax/Locator;)Lcom/sun/codemodel/JDefinedClass;
+ (Lcom/sun/codemodel/JClassContainer;Ljava/lang/String;Lorg/xml/sax/Locator;)L1com/sun/codemodel/JDefinedClass;
 createClass
  (Lcom/sun/codemodel/JClassContainer;Ljava/lang/String;Lorg/xml/sax/Locator;Lcom/sun/codemodel/ClassType;)Lcom/sun/codemodel/JDefinedClass;
- (Lcom/sun/codemodel/JClassContainer;Ljava/lang/String;Lorg/xml/sax/Locator;Lcom/sun/codemodel/ClassType;)Lcom/sun/codemodel/JDefinedClass;
+ (Lcom/sun/codemodel/JClassContainer;Ljava/lang/String;Lorg/xml/sax/Locator;Lcom/sun/codemodel/ClassType;)L1com/sun/codemodel/JDefinedClass;
 createInterface
  (Lcom/sun/codemodel/JClassContainer;ILjava/lang/String;Lorg/xml/sax/Locator;)Lcom/sun/codemodel/JDefinedClass;
- (Lcom/sun/codemodel/JClassContainer;ILjava/lang/String;Lorg/xml/sax/Locator;)Lcom/sun/codemodel/JDefinedClass;
+ (Lcom/sun/codemodel/JClassContainer;ILjava/lang/String;Lorg/xml/sax/Locator;)L1com/sun/codemodel/JDefinedClass;
 createInterface
  (Lcom/sun/codemodel/JClassContainer;Ljava/lang/String;Lorg/xml/sax/Locator;)Lcom/sun/codemodel/JDefinedClass;
- (Lcom/sun/codemodel/JClassContainer;Ljava/lang/String;Lorg/xml/sax/Locator;)Lcom/sun/codemodel/JDefinedClass;
+ (Lcom/sun/codemodel/JClassContainer;Ljava/lang/String;Lorg/xml/sax/Locator;)L1com/sun/codemodel/JDefinedClass;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/util/DOMUtils.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/util/DOMUtils.eea
index 9d2af85c65..feb6a6d2f9 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/util/DOMUtils.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/util/DOMUtils.eea
@@ -8,19 +8,19 @@ getChildElements
  (Lorg/w3c/dom/Element;Ljava/lang/String;Ljava/lang/String;)[Lorg/w3c/dom/Element;
 getElement
  (Lorg/w3c/dom/Document;Ljava/lang/String;)Lorg/w3c/dom/Element;
- (Lorg/w3c/dom/Document;Ljava/lang/String;)Lorg/w3c/dom/Element;
+ (Lorg/w3c/dom/Document;Ljava/lang/String;)L0org/w3c/dom/Element;
 getElement
  (Lorg/w3c/dom/Document;Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/Element;
- (Lorg/w3c/dom/Document;Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/Element;
+ (Lorg/w3c/dom/Document;Ljava/lang/String;Ljava/lang/String;)L0org/w3c/dom/Element;
 getElement
  (Lorg/w3c/dom/Document;Ljavax/xml/namespace/QName;)Lorg/w3c/dom/Element;
- (Lorg/w3c/dom/Document;Ljavax/xml/namespace/QName;)Lorg/w3c/dom/Element;
+ (Lorg/w3c/dom/Document;Ljavax/xml/namespace/QName;)L0org/w3c/dom/Element;
 getElementText
  (Lorg/w3c/dom/Element;)Ljava/lang/String;
  (Lorg/w3c/dom/Element;)Ljava/lang/String;
 getElements
  (Lorg/w3c/dom/NodeList;)[Lorg/w3c/dom/Element;
- (Lorg/w3c/dom/NodeList;)[Lorg/w3c/dom/Element;
+ (Lorg/w3c/dom/NodeList;)[1Lorg/w3c/dom/Element;
 getFirstChildElement
  (Lorg/w3c/dom/Element;Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/Element;
- (Lorg/w3c/dom/Element;Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/Element;
+ (Lorg/w3c/dom/Element;Ljava/lang/String;Ljava/lang/String;)L0org/w3c/dom/Element;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/util/ForkContentHandler.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/util/ForkContentHandler.eea
index c75cf8c007..e915163ccb 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/util/ForkContentHandler.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/util/ForkContentHandler.eea
@@ -2,7 +2,7 @@ class com/sun/tools/xjc/util/ForkContentHandler
 
 create
  ([Lorg/xml/sax/ContentHandler;)Lorg/xml/sax/ContentHandler;
- ([Lorg/xml/sax/ContentHandler;)Lorg/xml/sax/ContentHandler;
+ ([Lorg/xml/sax/ContentHandler;)L1org/xml/sax/ContentHandler;
 
 <init>
  (Lorg/xml/sax/ContentHandler;Lorg/xml/sax/ContentHandler;)V
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/util/MimeTypeRange.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/util/MimeTypeRange.eea
index 559be464aa..3968da05dc 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/util/MimeTypeRange.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/util/MimeTypeRange.eea
@@ -12,7 +12,7 @@ merge
  (Ljava/util/Collection<Lcom/sun/tools/xjc/util/MimeTypeRange;>;)Lcom/sun/tools/xjc/util/MimeTypeRange;
 parseRanges
  (Ljava/lang/String;)Ljava/util/List<Lcom/sun/tools/xjc/util/MimeTypeRange;>;
- (Ljava/lang/String;)Ljava/util/List<Lcom/sun/tools/xjc/util/MimeTypeRange;>;
+ (Ljava/lang/String;)L1java/util/List<Lcom/sun/tools/xjc/util/MimeTypeRange;>;
 
 majorType
  Ljava/lang/String;
@@ -29,7 +29,7 @@ subType
  (Ljava/lang/String;)V
 toMimeType
  ()Ljakarta/activation/MimeType;
- ()Ljakarta/activation/MimeType;
+ ()L1jakarta/activation/MimeType;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/util/ReadOnlyAdapter.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/util/ReadOnlyAdapter.eea
index f946f9449d..a475a70ea8 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/util/ReadOnlyAdapter.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/util/ReadOnlyAdapter.eea
@@ -8,4 +8,4 @@ super jakarta/xml/bind/annotation/adapters/XmlAdapter
 
 marshal
  (TInMemory;)TOnTheWire;
- (TInMemory;)TOnTheWire;
+ (TInMemory;)T0OnTheWire;
diff --git a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/util/Util.eea b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/util/Util.eea
index 82ee0422c1..e987030675 100644
--- a/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/util/Util.eea
+++ b/libs/eea-jaxb-4/src/main/resources/com/sun/tools/xjc/util/Util.eea
@@ -8,4 +8,4 @@ getSystemProperty
  (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/String;
 getSystemProperty
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
diff --git a/libs/eea-jaxb-4/src/main/resources/jakarta/xml/bind/JAXBContext.eea b/libs/eea-jaxb-4/src/main/resources/jakarta/xml/bind/JAXBContext.eea
index 9fe1d06f3d..a752bb2813 100644
--- a/libs/eea-jaxb-4/src/main/resources/jakarta/xml/bind/JAXBContext.eea
+++ b/libs/eea-jaxb-4/src/main/resources/jakarta/xml/bind/JAXBContext.eea
@@ -22,19 +22,19 @@ newInstance
 
 createBinder
  ()Ljakarta/xml/bind/Binder<Lorg/w3c/dom/Node;>;
- ()Ljakarta/xml/bind/Binder<Lorg/w3c/dom/Node;>;
+ ()L1jakarta/xml/bind/Binder<Lorg/w3c/dom/Node;>;
 createBinder
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Ljakarta/xml/bind/Binder<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Ljakarta/xml/bind/Binder<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1jakarta/xml/bind/Binder<TT;>;
 createJAXBIntrospector
  ()Ljakarta/xml/bind/JAXBIntrospector;
- ()Ljakarta/xml/bind/JAXBIntrospector;
+ ()L1jakarta/xml/bind/JAXBIntrospector;
 createMarshaller
  ()Ljakarta/xml/bind/Marshaller;
- ()Ljakarta/xml/bind/Marshaller;
+ ()L1jakarta/xml/bind/Marshaller;
 createUnmarshaller
  ()Ljakarta/xml/bind/Unmarshaller;
- ()Ljakarta/xml/bind/Unmarshaller;
+ ()L1jakarta/xml/bind/Unmarshaller;
 generateSchema
  (Ljakarta/xml/bind/SchemaOutputResolver;)V
  (Ljakarta/xml/bind/SchemaOutputResolver;)V
diff --git a/libs/eea-jaxb-4/src/main/resources/jakarta/xml/bind/JAXBContextFactory.eea b/libs/eea-jaxb-4/src/main/resources/jakarta/xml/bind/JAXBContextFactory.eea
index 2374370ac0..26e758d4dc 100644
--- a/libs/eea-jaxb-4/src/main/resources/jakarta/xml/bind/JAXBContextFactory.eea
+++ b/libs/eea-jaxb-4/src/main/resources/jakarta/xml/bind/JAXBContextFactory.eea
@@ -2,7 +2,7 @@ class jakarta/xml/bind/JAXBContextFactory
 
 createContext
  (Ljava/lang/String;Ljava/lang/ClassLoader;Ljava/util/Map<Ljava/lang/String;*>;)Ljakarta/xml/bind/JAXBContext;
- (Ljava/lang/String;Ljava/lang/ClassLoader;Ljava/util/Map<Ljava/lang/String;*>;)Ljakarta/xml/bind/JAXBContext;
+ (Ljava/lang/String;Ljava/lang/ClassLoader;Ljava/util/Map<Ljava/lang/String;*>;)L1jakarta/xml/bind/JAXBContext;
 createContext
  ([Ljava/lang/Class<*>;Ljava/util/Map<Ljava/lang/String;*>;)Ljakarta/xml/bind/JAXBContext;
- ([Ljava/lang/Class<*>;Ljava/util/Map<Ljava/lang/String;*>;)Ljakarta/xml/bind/JAXBContext;
+ ([Ljava/lang/Class<*>;Ljava/util/Map<Ljava/lang/String;*>;)L1jakarta/xml/bind/JAXBContext;
diff --git a/libs/eea-jaxb-4/src/main/resources/jakarta/xml/bind/annotation/DomHandler.eea b/libs/eea-jaxb-4/src/main/resources/jakarta/xml/bind/annotation/DomHandler.eea
index e19569e781..4f1e95d817 100644
--- a/libs/eea-jaxb-4/src/main/resources/jakarta/xml/bind/annotation/DomHandler.eea
+++ b/libs/eea-jaxb-4/src/main/resources/jakarta/xml/bind/annotation/DomHandler.eea
@@ -4,7 +4,7 @@ class jakarta/xml/bind/annotation/DomHandler
 
 createUnmarshaller
  (Ljakarta/xml/bind/ValidationEventHandler;)TResultT;
- (Ljakarta/xml/bind/ValidationEventHandler;)TResultT;
+ (Ljakarta/xml/bind/ValidationEventHandler;)T1ResultT;
 getElement
  (TResultT;)TElementT;
  (TResultT;)TElementT;
diff --git a/libs/eea-jaxb-4/src/main/resources/jakarta/xml/bind/annotation/W3CDomHandler.eea b/libs/eea-jaxb-4/src/main/resources/jakarta/xml/bind/annotation/W3CDomHandler.eea
index 52db86f5f4..1137224276 100644
--- a/libs/eea-jaxb-4/src/main/resources/jakarta/xml/bind/annotation/W3CDomHandler.eea
+++ b/libs/eea-jaxb-4/src/main/resources/jakarta/xml/bind/annotation/W3CDomHandler.eea
@@ -9,7 +9,7 @@ super jakarta/xml/bind/annotation/DomHandler
  (Ljavax/xml/parsers/DocumentBuilder;)V
 createUnmarshaller
  (Ljakarta/xml/bind/ValidationEventHandler;)Ljavax/xml/transform/dom/DOMResult;
- (Ljakarta/xml/bind/ValidationEventHandler;)Ljavax/xml/transform/dom/DOMResult;
+ (Ljakarta/xml/bind/ValidationEventHandler;)L1javax/xml/transform/dom/DOMResult;
 getBuilder
  ()Ljavax/xml/parsers/DocumentBuilder;
  ()Ljavax/xml/parsers/DocumentBuilder;
@@ -18,7 +18,7 @@ getElement
  (Ljavax/xml/transform/dom/DOMResult;)Lorg/w3c/dom/Element;
 marshal
  (Lorg/w3c/dom/Element;Ljakarta/xml/bind/ValidationEventHandler;)Ljavax/xml/transform/Source;
- (Lorg/w3c/dom/Element;Ljakarta/xml/bind/ValidationEventHandler;)Ljavax/xml/transform/Source;
+ (Lorg/w3c/dom/Element;Ljakarta/xml/bind/ValidationEventHandler;)L1javax/xml/transform/Source;
 setBuilder
  (Ljavax/xml/parsers/DocumentBuilder;)V
  (Ljavax/xml/parsers/DocumentBuilder;)V
diff --git a/libs/eea-jaxb-4/src/main/resources/jakarta/xml/bind/helpers/AbstractMarshallerImpl.eea b/libs/eea-jaxb-4/src/main/resources/jakarta/xml/bind/helpers/AbstractMarshallerImpl.eea
index 506f5e4364..c8653f0353 100644
--- a/libs/eea-jaxb-4/src/main/resources/jakarta/xml/bind/helpers/AbstractMarshallerImpl.eea
+++ b/libs/eea-jaxb-4/src/main/resources/jakarta/xml/bind/helpers/AbstractMarshallerImpl.eea
@@ -2,10 +2,10 @@ class jakarta/xml/bind/helpers/AbstractMarshallerImpl
 
 getAdapter
  <A:Ljakarta/xml/bind/annotation/adapters/XmlAdapter<**>;>(Ljava/lang/Class<TA;>;)TA;
- <A:Ljakarta/xml/bind/annotation/adapters/XmlAdapter<**>;>(Ljava/lang/Class<TA;>;)TA;
+ <A:Ljakarta/xml/bind/annotation/adapters/XmlAdapter<**>;>(Ljava/lang/Class<TA;>;)T1A;
 getAttachmentMarshaller
  ()Ljakarta/xml/bind/attachment/AttachmentMarshaller;
- ()Ljakarta/xml/bind/attachment/AttachmentMarshaller;
+ ()L1jakarta/xml/bind/attachment/AttachmentMarshaller;
 getEncoding
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -17,19 +17,19 @@ getJavaEncoding
  (Ljava/lang/String;)Ljava/lang/String;
 getListener
  ()Ljakarta/xml/bind/Marshaller$Listener;
- ()Ljakarta/xml/bind/Marshaller$Listener;
+ ()L1jakarta/xml/bind/Marshaller$Listener;
 getNoNSSchemaLocation
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getNode
  (Ljava/lang/Object;)Lorg/w3c/dom/Node;
- (Ljava/lang/Object;)Lorg/w3c/dom/Node;
+ (Ljava/lang/Object;)L1org/w3c/dom/Node;
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;)Ljava/lang/Object;
 getSchema
  ()Ljavax/xml/validation/Schema;
- ()Ljavax/xml/validation/Schema;
+ ()L1javax/xml/validation/Schema;
 getSchemaLocation
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-jaxb-4/src/main/resources/jakarta/xml/bind/helpers/AbstractUnmarshallerImpl.eea b/libs/eea-jaxb-4/src/main/resources/jakarta/xml/bind/helpers/AbstractUnmarshallerImpl.eea
index 5db4ad37a3..d476e7c343 100644
--- a/libs/eea-jaxb-4/src/main/resources/jakarta/xml/bind/helpers/AbstractUnmarshallerImpl.eea
+++ b/libs/eea-jaxb-4/src/main/resources/jakarta/xml/bind/helpers/AbstractUnmarshallerImpl.eea
@@ -2,25 +2,25 @@ class jakarta/xml/bind/helpers/AbstractUnmarshallerImpl
 
 createUnmarshalException
  (Lorg/xml/sax/SAXException;)Ljakarta/xml/bind/UnmarshalException;
- (Lorg/xml/sax/SAXException;)Ljakarta/xml/bind/UnmarshalException;
+ (Lorg/xml/sax/SAXException;)L1jakarta/xml/bind/UnmarshalException;
 getAdapter
  <A:Ljakarta/xml/bind/annotation/adapters/XmlAdapter<**>;>(Ljava/lang/Class<TA;>;)TA;
- <A:Ljakarta/xml/bind/annotation/adapters/XmlAdapter<**>;>(Ljava/lang/Class<TA;>;)TA;
+ <A:Ljakarta/xml/bind/annotation/adapters/XmlAdapter<**>;>(Ljava/lang/Class<TA;>;)T1A;
 getAttachmentUnmarshaller
  ()Ljakarta/xml/bind/attachment/AttachmentUnmarshaller;
- ()Ljakarta/xml/bind/attachment/AttachmentUnmarshaller;
+ ()L1jakarta/xml/bind/attachment/AttachmentUnmarshaller;
 getEventHandler
  ()Ljakarta/xml/bind/ValidationEventHandler;
  ()Ljakarta/xml/bind/ValidationEventHandler;
 getListener
  ()Ljakarta/xml/bind/Unmarshaller$Listener;
- ()Ljakarta/xml/bind/Unmarshaller$Listener;
+ ()L1jakarta/xml/bind/Unmarshaller$Listener;
 getProperty
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
 getSchema
  ()Ljavax/xml/validation/Schema;
- ()Ljavax/xml/validation/Schema;
+ ()L1javax/xml/validation/Schema;
 getXMLReader
  ()Lorg/xml/sax/XMLReader;
  ()Lorg/xml/sax/XMLReader;
@@ -59,10 +59,10 @@ unmarshal
  (Ljava/net/URL;)Ljava/lang/Object;
 unmarshal
  (Ljavax/xml/stream/XMLEventReader;)Ljava/lang/Object;
- (Ljavax/xml/stream/XMLEventReader;)Ljava/lang/Object;
+ (Ljavax/xml/stream/XMLEventReader;)L1java/lang/Object;
 unmarshal
  (Ljavax/xml/stream/XMLStreamReader;)Ljava/lang/Object;
- (Ljavax/xml/stream/XMLStreamReader;)Ljava/lang/Object;
+ (Ljavax/xml/stream/XMLStreamReader;)L1java/lang/Object;
 unmarshal
  (Ljavax/xml/transform/Source;)Ljava/lang/Object;
  (Ljavax/xml/transform/Source;)Ljava/lang/Object;
@@ -74,13 +74,13 @@ unmarshal
  (Lorg/xml/sax/XMLReader;Lorg/xml/sax/InputSource;)Ljava/lang/Object;
 unmarshal
  <T:Ljava/lang/Object;>(Ljavax/xml/stream/XMLEventReader;Ljava/lang/Class<TT;>;)Ljakarta/xml/bind/JAXBElement<TT;>;
- <T:Ljava/lang/Object;>(Ljavax/xml/stream/XMLEventReader;Ljava/lang/Class<TT;>;)Ljakarta/xml/bind/JAXBElement<TT;>;
+ <T:Ljava/lang/Object;>(Ljavax/xml/stream/XMLEventReader;Ljava/lang/Class<TT;>;)L1jakarta/xml/bind/JAXBElement<TT;>;
 unmarshal
  <T:Ljava/lang/Object;>(Ljavax/xml/stream/XMLStreamReader;Ljava/lang/Class<TT;>;)Ljakarta/xml/bind/JAXBElement<TT;>;
- <T:Ljava/lang/Object;>(Ljavax/xml/stream/XMLStreamReader;Ljava/lang/Class<TT;>;)Ljakarta/xml/bind/JAXBElement<TT;>;
+ <T:Ljava/lang/Object;>(Ljavax/xml/stream/XMLStreamReader;Ljava/lang/Class<TT;>;)L1jakarta/xml/bind/JAXBElement<TT;>;
 unmarshal
  <T:Ljava/lang/Object;>(Ljavax/xml/transform/Source;Ljava/lang/Class<TT;>;)Ljakarta/xml/bind/JAXBElement<TT;>;
- <T:Ljava/lang/Object;>(Ljavax/xml/transform/Source;Ljava/lang/Class<TT;>;)Ljakarta/xml/bind/JAXBElement<TT;>;
+ <T:Ljava/lang/Object;>(Ljavax/xml/transform/Source;Ljava/lang/Class<TT;>;)L1jakarta/xml/bind/JAXBElement<TT;>;
 unmarshal
  <T:Ljava/lang/Object;>(Lorg/w3c/dom/Node;Ljava/lang/Class<TT;>;)Ljakarta/xml/bind/JAXBElement<TT;>;
- <T:Ljava/lang/Object;>(Lorg/w3c/dom/Node;Ljava/lang/Class<TT;>;)Ljakarta/xml/bind/JAXBElement<TT;>;
+ <T:Ljava/lang/Object;>(Lorg/w3c/dom/Node;Ljava/lang/Class<TT;>;)L1jakarta/xml/bind/JAXBElement<TT;>;
diff --git a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/AssertionFailureBuilder.eea b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/AssertionFailureBuilder.eea
index 3efc56dfc8..4ac018f49a 100644
--- a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/AssertionFailureBuilder.eea
+++ b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/AssertionFailureBuilder.eea
@@ -2,7 +2,7 @@ class org/junit/jupiter/api/AssertionFailureBuilder
 
 assertionFailure
  ()Lorg/junit/jupiter/api/AssertionFailureBuilder;
- ()Lorg/junit/jupiter/api/AssertionFailureBuilder;
+ ()L1org/junit/jupiter/api/AssertionFailureBuilder;
 
 actual
  (Ljava/lang/Object;)Lorg/junit/jupiter/api/AssertionFailureBuilder;
diff --git a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/Assertions$TimeoutFailureFactory.eea b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/Assertions$TimeoutFailureFactory.eea
index 9a3bceb421..e2f2bed085 100644
--- a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/Assertions$TimeoutFailureFactory.eea
+++ b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/Assertions$TimeoutFailureFactory.eea
@@ -4,4 +4,4 @@ class org/junit/jupiter/api/Assertions$TimeoutFailureFactory
 
 createTimeoutFailure
  (Ljava/time/Duration;Ljava/util/function/Supplier<Ljava/lang/String;>;Ljava/lang/Throwable;)TT;
- (Ljava/time/Duration;Ljava/util/function/Supplier<Ljava/lang/String;>;Ljava/lang/Throwable;)TT;
+ (Ljava/time/Duration;Ljava/util/function/Supplier<Ljava/lang/String;>;Ljava/lang/Throwable;)T1T;
diff --git a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/Assertions.eea b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/Assertions.eea
index df53deda9e..7cbf5be97f 100644
--- a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/Assertions.eea
+++ b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/Assertions.eea
@@ -800,7 +800,7 @@ assertTrue
  (ZL0java/util/function/Supplier<L0java/lang/String;>;)V
 fail
  <V:Ljava/lang/Object;>()TV;
- <V:Ljava/lang/Object;>()TV;
+ <V:Ljava/lang/Object;>()T0V;
 fail
  <V:Ljava/lang/Object;>(Ljava/lang/String;)TV;
  <V:Ljava/lang/Object;>(L0java/lang/String;)TV;
diff --git a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/Assumptions.eea b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/Assumptions.eea
index 5b01bd0af9..afbad130bf 100644
--- a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/Assumptions.eea
+++ b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/Assumptions.eea
@@ -2,13 +2,13 @@ class org/junit/jupiter/api/Assumptions
 
 abort
  <V:Ljava/lang/Object;>()TV;
- <V:Ljava/lang/Object;>()TV;
+ <V:Ljava/lang/Object;>()T1V;
 abort
  <V:Ljava/lang/Object;>(Ljava/lang/String;)TV;
- <V:Ljava/lang/Object;>(Ljava/lang/String;)TV;
+ <V:Ljava/lang/Object;>(Ljava/lang/String;)T1V;
 abort
  <V:Ljava/lang/Object;>(Ljava/util/function/Supplier<Ljava/lang/String;>;)TV;
- <V:Ljava/lang/Object;>(Ljava/util/function/Supplier<Ljava/lang/String;>;)TV;
+ <V:Ljava/lang/Object;>(Ljava/util/function/Supplier<Ljava/lang/String;>;)T1V;
 assumeFalse
  (Ljava/util/function/BooleanSupplier;)V
  (Ljava/util/function/BooleanSupplier;)V
diff --git a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DisplayNameGenerator$IndicativeSentences.eea b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DisplayNameGenerator$IndicativeSentences.eea
index 72ed01524f..5339017b18 100644
--- a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DisplayNameGenerator$IndicativeSentences.eea
+++ b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DisplayNameGenerator$IndicativeSentences.eea
@@ -5,7 +5,7 @@ generateDisplayNameForClass
  (Ljava/lang/Class<*>;)Ljava/lang/String;
 generateDisplayNameForMethod
  (Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)Ljava/lang/String;
- (Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)L1java/lang/String;
 generateDisplayNameForNestedClass
  (Ljava/lang/Class<*>;)Ljava/lang/String;
  (Ljava/lang/Class<*>;)Ljava/lang/String;
diff --git a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DisplayNameGenerator$ReplaceUnderscores.eea b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DisplayNameGenerator$ReplaceUnderscores.eea
index 23ff1fc893..d727d7f0de 100644
--- a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DisplayNameGenerator$ReplaceUnderscores.eea
+++ b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DisplayNameGenerator$ReplaceUnderscores.eea
@@ -5,7 +5,7 @@ generateDisplayNameForClass
  (Ljava/lang/Class<*>;)Ljava/lang/String;
 generateDisplayNameForMethod
  (Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)Ljava/lang/String;
- (Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)L1java/lang/String; # @Inherited(org.junit.jupiter.api.DisplayNameGenerator$Simple)
 generateDisplayNameForNestedClass
  (Ljava/lang/Class<*>;)Ljava/lang/String;
  (Ljava/lang/Class<*>;)Ljava/lang/String;
diff --git a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DisplayNameGenerator$Simple.eea b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DisplayNameGenerator$Simple.eea
index 7458170b0e..834f5b85e3 100644
--- a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DisplayNameGenerator$Simple.eea
+++ b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DisplayNameGenerator$Simple.eea
@@ -2,4 +2,4 @@ class org/junit/jupiter/api/DisplayNameGenerator$Simple
 
 generateDisplayNameForMethod
  (Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)Ljava/lang/String;
- (Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)L1java/lang/String; # @Inherited(org.junit.jupiter.api.DisplayNameGenerator$Standard)
diff --git a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DisplayNameGenerator$Standard.eea b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DisplayNameGenerator$Standard.eea
index 2f76eb19ce..d6f2f934b3 100644
--- a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DisplayNameGenerator$Standard.eea
+++ b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DisplayNameGenerator$Standard.eea
@@ -5,7 +5,7 @@ generateDisplayNameForClass
  (Ljava/lang/Class<*>;)Ljava/lang/String;
 generateDisplayNameForMethod
  (Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)Ljava/lang/String;
- (Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)L1java/lang/String;
 generateDisplayNameForNestedClass
  (Ljava/lang/Class<*>;)Ljava/lang/String;
  (Ljava/lang/Class<*>;)Ljava/lang/String;
diff --git a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DisplayNameGenerator.eea b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DisplayNameGenerator.eea
index d62e584b0c..df888ee203 100644
--- a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DisplayNameGenerator.eea
+++ b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DisplayNameGenerator.eea
@@ -9,7 +9,7 @@ getDisplayNameGenerator
  (Ljava/lang/Class<*>;)Lorg/junit/jupiter/api/DisplayNameGenerator;
 parameterTypesAsString
  (Ljava/lang/reflect/Method;)Ljava/lang/String;
- (Ljava/lang/reflect/Method;)Ljava/lang/String;
+ (Ljava/lang/reflect/Method;)L1java/lang/String;
 
 generateDisplayNameForClass
  (Ljava/lang/Class<*>;)Ljava/lang/String;
diff --git a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DynamicContainer.eea b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DynamicContainer.eea
index 4ad747aa09..3ad98c8f6d 100644
--- a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DynamicContainer.eea
+++ b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DynamicContainer.eea
@@ -5,7 +5,7 @@ dynamicContainer
  (Ljava/lang/String;Ljava/lang/Iterable<+Lorg/junit/jupiter/api/DynamicNode;>;)Lorg/junit/jupiter/api/DynamicContainer;
 dynamicContainer
  (Ljava/lang/String;Ljava/net/URI;Ljava/util/stream/Stream<+Lorg/junit/jupiter/api/DynamicNode;>;)Lorg/junit/jupiter/api/DynamicContainer;
- (Ljava/lang/String;Ljava/net/URI;Ljava/util/stream/Stream<+Lorg/junit/jupiter/api/DynamicNode;>;)Lorg/junit/jupiter/api/DynamicContainer;
+ (Ljava/lang/String;Ljava/net/URI;Ljava/util/stream/Stream<+Lorg/junit/jupiter/api/DynamicNode;>;)L1org/junit/jupiter/api/DynamicContainer;
 dynamicContainer
  (Ljava/lang/String;Ljava/util/stream/Stream<+Lorg/junit/jupiter/api/DynamicNode;>;)Lorg/junit/jupiter/api/DynamicContainer;
  (Ljava/lang/String;Ljava/util/stream/Stream<+Lorg/junit/jupiter/api/DynamicNode;>;)Lorg/junit/jupiter/api/DynamicContainer;
diff --git a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DynamicTest.eea b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DynamicTest.eea
index 2474690cfc..809702a169 100644
--- a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DynamicTest.eea
+++ b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/DynamicTest.eea
@@ -2,10 +2,10 @@ class org/junit/jupiter/api/DynamicTest
 
 dynamicTest
  (Ljava/lang/String;Ljava/net/URI;Lorg/junit/jupiter/api/function/Executable;)Lorg/junit/jupiter/api/DynamicTest;
- (Ljava/lang/String;Ljava/net/URI;Lorg/junit/jupiter/api/function/Executable;)Lorg/junit/jupiter/api/DynamicTest;
+ (Ljava/lang/String;Ljava/net/URI;Lorg/junit/jupiter/api/function/Executable;)L1org/junit/jupiter/api/DynamicTest;
 dynamicTest
  (Ljava/lang/String;Lorg/junit/jupiter/api/function/Executable;)Lorg/junit/jupiter/api/DynamicTest;
- (Ljava/lang/String;Lorg/junit/jupiter/api/function/Executable;)Lorg/junit/jupiter/api/DynamicTest;
+ (Ljava/lang/String;Lorg/junit/jupiter/api/function/Executable;)L1org/junit/jupiter/api/DynamicTest;
 stream
  <T::Lorg/junit/jupiter/api/Named<TE;>;E::Lorg/junit/jupiter/api/function/Executable;>(Ljava/util/Iterator<+TT;>;)Ljava/util/stream/Stream<Lorg/junit/jupiter/api/DynamicTest;>;
  <T::Lorg/junit/jupiter/api/Named<TE;>;E::Lorg/junit/jupiter/api/function/Executable;>(Ljava/util/Iterator<+TT;>;)Ljava/util/stream/Stream<Lorg/junit/jupiter/api/DynamicTest;>;
diff --git a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/Named.eea b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/Named.eea
index 93e8622a86..638933d4d1 100644
--- a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/Named.eea
+++ b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/Named.eea
@@ -7,7 +7,7 @@ named
  <T:Ljava/lang/Object;>(Ljava/lang/String;TT;)Lorg/junit/jupiter/api/Named<TT;>;
 of
  <T:Ljava/lang/Object;>(Ljava/lang/String;TT;)Lorg/junit/jupiter/api/Named<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/String;TT;)Lorg/junit/jupiter/api/Named<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/String;TT;)L1org/junit/jupiter/api/Named<TT;>;
 
 getName
  ()Ljava/lang/String;
diff --git a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/NamedExecutable.eea b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/NamedExecutable.eea
index 90905beaca..43439571d0 100644
--- a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/NamedExecutable.eea
+++ b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/NamedExecutable.eea
@@ -6,7 +6,7 @@ super org/junit/jupiter/api/Named
 
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getPayload
  ()Lorg/junit/jupiter/api/function/Executable;
  ()Lorg/junit/jupiter/api/function/Executable;
diff --git a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/extension/ExtensionContext$Namespace.eea b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/extension/ExtensionContext$Namespace.eea
index afc25c0894..0217767818 100644
--- a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/extension/ExtensionContext$Namespace.eea
+++ b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/extension/ExtensionContext$Namespace.eea
@@ -6,11 +6,11 @@ GLOBAL
 
 create
  ([Ljava/lang/Object;)Lorg/junit/jupiter/api/extension/ExtensionContext$Namespace;
- ([Ljava/lang/Object;)Lorg/junit/jupiter/api/extension/ExtensionContext$Namespace;
+ ([Ljava/lang/Object;)L1org/junit/jupiter/api/extension/ExtensionContext$Namespace;
 
 append
  ([Ljava/lang/Object;)Lorg/junit/jupiter/api/extension/ExtensionContext$Namespace;
- ([Ljava/lang/Object;)Lorg/junit/jupiter/api/extension/ExtensionContext$Namespace;
+ ([Ljava/lang/Object;)L1org/junit/jupiter/api/extension/ExtensionContext$Namespace;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/extension/TestInstanceFactory.eea b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/extension/TestInstanceFactory.eea
index 4d42b289bf..78602e353d 100644
--- a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/extension/TestInstanceFactory.eea
+++ b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/extension/TestInstanceFactory.eea
@@ -2,4 +2,4 @@ class org/junit/jupiter/api/extension/TestInstanceFactory
 
 createTestInstance
  (Lorg/junit/jupiter/api/extension/TestInstanceFactoryContext;Lorg/junit/jupiter/api/extension/ExtensionContext;)Ljava/lang/Object;
- (Lorg/junit/jupiter/api/extension/TestInstanceFactoryContext;Lorg/junit/jupiter/api/extension/ExtensionContext;)Ljava/lang/Object;
+ (Lorg/junit/jupiter/api/extension/TestInstanceFactoryContext;Lorg/junit/jupiter/api/extension/ExtensionContext;)L1java/lang/Object;
diff --git a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/extension/TestTemplateInvocationContext.eea b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/extension/TestTemplateInvocationContext.eea
index fde4823178..6338055d04 100644
--- a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/extension/TestTemplateInvocationContext.eea
+++ b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/extension/TestTemplateInvocationContext.eea
@@ -5,4 +5,4 @@ getAdditionalExtensions
  ()Ljava/util/List<Lorg/junit/jupiter/api/extension/Extension;>;
 getDisplayName
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
diff --git a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/io/TempDirFactory$Standard.eea b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/io/TempDirFactory$Standard.eea
index 97cb840c2d..acb3f23c03 100644
--- a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/io/TempDirFactory$Standard.eea
+++ b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/io/TempDirFactory$Standard.eea
@@ -6,4 +6,4 @@ INSTANCE
 
 createTempDirectory
  (Lorg/junit/jupiter/api/extension/AnnotatedElementContext;Lorg/junit/jupiter/api/extension/ExtensionContext;)Ljava/nio/file/Path;
- (Lorg/junit/jupiter/api/extension/AnnotatedElementContext;Lorg/junit/jupiter/api/extension/ExtensionContext;)Ljava/nio/file/Path;
+ (Lorg/junit/jupiter/api/extension/AnnotatedElementContext;Lorg/junit/jupiter/api/extension/ExtensionContext;)L1java/nio/file/Path; # @Inherited(org.junit.jupiter.api.io.TempDirFactory)
diff --git a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/io/TempDirFactory.eea b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/io/TempDirFactory.eea
index 1966f36216..040f344a91 100644
--- a/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/io/TempDirFactory.eea
+++ b/libs/eea-junit-5/src/main/resources/org/junit/jupiter/api/io/TempDirFactory.eea
@@ -2,4 +2,4 @@ class org/junit/jupiter/api/io/TempDirFactory
 
 createTempDirectory
  (Lorg/junit/jupiter/api/extension/AnnotatedElementContext;Lorg/junit/jupiter/api/extension/ExtensionContext;)Ljava/nio/file/Path;
- (Lorg/junit/jupiter/api/extension/AnnotatedElementContext;Lorg/junit/jupiter/api/extension/ExtensionContext;)Ljava/nio/file/Path;
+ (Lorg/junit/jupiter/api/extension/AnnotatedElementContext;Lorg/junit/jupiter/api/extension/ExtensionContext;)L1java/nio/file/Path;
diff --git a/libs/eea-osgi-core-8/src/main/resources/org/osgi/framework/BundleContext.eea b/libs/eea-osgi-core-8/src/main/resources/org/osgi/framework/BundleContext.eea
index c81de336c8..f256a87e76 100644
--- a/libs/eea-osgi-core-8/src/main/resources/org/osgi/framework/BundleContext.eea
+++ b/libs/eea-osgi-core-8/src/main/resources/org/osgi/framework/BundleContext.eea
@@ -14,7 +14,7 @@ addServiceListener
  (Lorg/osgi/framework/ServiceListener;Ljava/lang/String;)V
 createFilter
  (Ljava/lang/String;)Lorg/osgi/framework/Filter;
- (Ljava/lang/String;)Lorg/osgi/framework/Filter;
+ (Ljava/lang/String;)L1org/osgi/framework/Filter;
 getAllServiceReferences
  (Ljava/lang/String;Ljava/lang/String;)[Lorg/osgi/framework/ServiceReference<*>;
  (Ljava/lang/String;Ljava/lang/String;)[Lorg/osgi/framework/ServiceReference<*>;
diff --git a/libs/eea-osgi-core-8/src/main/resources/org/osgi/service/condpermadmin/ConditionInfo.eea b/libs/eea-osgi-core-8/src/main/resources/org/osgi/service/condpermadmin/ConditionInfo.eea
index 591f4225be..aa1456c9eb 100644
--- a/libs/eea-osgi-core-8/src/main/resources/org/osgi/service/condpermadmin/ConditionInfo.eea
+++ b/libs/eea-osgi-core-8/src/main/resources/org/osgi/service/condpermadmin/ConditionInfo.eea
@@ -14,7 +14,7 @@ getArgs
  ()[Ljava/lang/String;
 getEncoded
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getType
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-osgi-core-8/src/main/resources/org/osgi/service/permissionadmin/PermissionInfo.eea b/libs/eea-osgi-core-8/src/main/resources/org/osgi/service/permissionadmin/PermissionInfo.eea
index 80cf636728..17052ea4ee 100644
--- a/libs/eea-osgi-core-8/src/main/resources/org/osgi/service/permissionadmin/PermissionInfo.eea
+++ b/libs/eea-osgi-core-8/src/main/resources/org/osgi/service/permissionadmin/PermissionInfo.eea
@@ -14,7 +14,7 @@ getActions
  ()Ljava/lang/String;
 getEncoded
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-osgi-core-8/src/main/resources/org/osgi/service/resolver/ResolveContext.eea b/libs/eea-osgi-core-8/src/main/resources/org/osgi/service/resolver/ResolveContext.eea
index d2b133ea8f..a6912e5acb 100644
--- a/libs/eea-osgi-core-8/src/main/resources/org/osgi/service/resolver/ResolveContext.eea
+++ b/libs/eea-osgi-core-8/src/main/resources/org/osgi/service/resolver/ResolveContext.eea
@@ -14,7 +14,7 @@ getOptionalResources
  ()Ljava/util/Collection<Lorg/osgi/resource/Resource;>;
 getSubstitutionWires
  (Lorg/osgi/resource/Wiring;)Ljava/util/List<Lorg/osgi/resource/Wire;>;
- (Lorg/osgi/resource/Wiring;)Ljava/util/List<Lorg/osgi/resource/Wire;>;
+ (Lorg/osgi/resource/Wiring;)L1java/util/List<Lorg/osgi/resource/Wire;>;
 getWirings
  ()Ljava/util/Map<Lorg/osgi/resource/Resource;Lorg/osgi/resource/Wiring;>;
  ()Ljava/util/Map<Lorg/osgi/resource/Resource;Lorg/osgi/resource/Wiring;>;
diff --git a/libs/eea-osgi-core-8/src/main/resources/org/osgi/service/url/AbstractURLStreamHandlerService.eea b/libs/eea-osgi-core-8/src/main/resources/org/osgi/service/url/AbstractURLStreamHandlerService.eea
index 55556ab20a..53b66c9657 100644
--- a/libs/eea-osgi-core-8/src/main/resources/org/osgi/service/url/AbstractURLStreamHandlerService.eea
+++ b/libs/eea-osgi-core-8/src/main/resources/org/osgi/service/url/AbstractURLStreamHandlerService.eea
@@ -33,4 +33,4 @@ setURL
  (Ljava/net/URL;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 toExternalForm
  (Ljava/net/URL;)Ljava/lang/String;
- (Ljava/net/URL;)Ljava/lang/String;
+ (Ljava/net/URL;)L1java/lang/String; # @Inherited(java.net.URLStreamHandler)
diff --git a/libs/eea-osgi-core-8/src/main/resources/org/osgi/util/tracker/BundleTracker.eea b/libs/eea-osgi-core-8/src/main/resources/org/osgi/util/tracker/BundleTracker.eea
index 740615212e..d02c3df809 100644
--- a/libs/eea-osgi-core-8/src/main/resources/org/osgi/util/tracker/BundleTracker.eea
+++ b/libs/eea-osgi-core-8/src/main/resources/org/osgi/util/tracker/BundleTracker.eea
@@ -18,10 +18,10 @@ addingBundle
  (Lorg/osgi/framework/Bundle;Lorg/osgi/framework/BundleEvent;)TT;
 getBundles
  ()[Lorg/osgi/framework/Bundle;
- ()[Lorg/osgi/framework/Bundle;
+ ()[0Lorg/osgi/framework/Bundle;
 getObject
  (Lorg/osgi/framework/Bundle;)TT;
- (Lorg/osgi/framework/Bundle;)TT;
+ (Lorg/osgi/framework/Bundle;)T0T;
 getTracked
  ()Ljava/util/Map<Lorg/osgi/framework/Bundle;TT;>;
  ()Ljava/util/Map<Lorg/osgi/framework/Bundle;TT;>;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/CalendarIntervalScheduleBuilder.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/CalendarIntervalScheduleBuilder.eea
index 5e244e86f0..808bb7123e 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/CalendarIntervalScheduleBuilder.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/CalendarIntervalScheduleBuilder.eea
@@ -6,7 +6,7 @@ super org/quartz/ScheduleBuilder
 
 calendarIntervalSchedule
  ()Lorg/quartz/CalendarIntervalScheduleBuilder;
- ()Lorg/quartz/CalendarIntervalScheduleBuilder;
+ ()L1org/quartz/CalendarIntervalScheduleBuilder;
 
 build
  ()Lorg/quartz/spi/MutableTrigger;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/CronExpression.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/CronExpression.eea
index 70548fba24..641b5adbc6 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/CronExpression.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/CronExpression.eea
@@ -68,16 +68,16 @@ getDayOfWeekNumber
  (Ljava/lang/String;)I
 getExpressionSetSummary
  (Ljava/util/ArrayList<Ljava/lang/Integer;>;)Ljava/lang/String;
- (Ljava/util/ArrayList<Ljava/lang/Integer;>;)Ljava/lang/String;
+ (Ljava/util/ArrayList<Ljava/lang/Integer;>;)L1java/lang/String;
 getExpressionSetSummary
  (Ljava/util/Set<Ljava/lang/Integer;>;)Ljava/lang/String;
- (Ljava/util/Set<Ljava/lang/Integer;>;)Ljava/lang/String;
+ (Ljava/util/Set<Ljava/lang/Integer;>;)L1java/lang/String;
 getExpressionSummary
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getFinalFireTime
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L0java/util/Date;
 getMonthNumber
  (Ljava/lang/String;)I
  (Ljava/lang/String;)I
@@ -92,16 +92,16 @@ getNumericValue
  (Ljava/lang/String;I)I
 getTimeAfter
  (Ljava/util/Date;)Ljava/util/Date;
- (Ljava/util/Date;)Ljava/util/Date;
+ (Ljava/util/Date;)L0java/util/Date;
 getTimeBefore
  (Ljava/util/Date;)Ljava/util/Date;
- (Ljava/util/Date;)Ljava/util/Date;
+ (Ljava/util/Date;)L0java/util/Date;
 getTimeZone
  ()Ljava/util/TimeZone;
  ()Ljava/util/TimeZone;
 getValue
  (ILjava/lang/String;I)Lorg/quartz/ValueSet;
- (ILjava/lang/String;I)Lorg/quartz/ValueSet;
+ (ILjava/lang/String;I)L1org/quartz/ValueSet;
 isSatisfiedBy
  (Ljava/util/Date;)Z
  (Ljava/util/Date;)Z
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/CronScheduleBuilder.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/CronScheduleBuilder.eea
index ae6d5a8a22..893a393a4e 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/CronScheduleBuilder.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/CronScheduleBuilder.eea
@@ -12,7 +12,7 @@ cronSchedule
  (Ljava/lang/String;)Lorg/quartz/CronScheduleBuilder;
 cronSchedule
  (Lorg/quartz/CronExpression;)Lorg/quartz/CronScheduleBuilder;
- (Lorg/quartz/CronExpression;)Lorg/quartz/CronScheduleBuilder;
+ (Lorg/quartz/CronExpression;)L1org/quartz/CronScheduleBuilder;
 cronScheduleNonvalidatedExpression
  (Ljava/lang/String;)Lorg/quartz/CronScheduleBuilder;
  (Ljava/lang/String;)Lorg/quartz/CronScheduleBuilder;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/DailyTimeIntervalScheduleBuilder.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/DailyTimeIntervalScheduleBuilder.eea
index 2e1fdcbbe1..125f9fb60a 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/DailyTimeIntervalScheduleBuilder.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/DailyTimeIntervalScheduleBuilder.eea
@@ -16,7 +16,7 @@ SATURDAY_AND_SUNDAY
 
 dailyTimeIntervalSchedule
  ()Lorg/quartz/DailyTimeIntervalScheduleBuilder;
- ()Lorg/quartz/DailyTimeIntervalScheduleBuilder;
+ ()L1org/quartz/DailyTimeIntervalScheduleBuilder;
 
 build
  ()Lorg/quartz/spi/MutableTrigger;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/DateBuilder.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/DateBuilder.eea
index 40b45c631a..58b2335b0f 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/DateBuilder.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/DateBuilder.eea
@@ -41,16 +41,16 @@ futureDate
  (ILorg/quartz/DateBuilder$IntervalUnit;)Ljava/util/Date;
 newDate
  ()Lorg/quartz/DateBuilder;
- ()Lorg/quartz/DateBuilder;
+ ()L1org/quartz/DateBuilder;
 newDateInLocale
  (Ljava/util/Locale;)Lorg/quartz/DateBuilder;
- (Ljava/util/Locale;)Lorg/quartz/DateBuilder;
+ (Ljava/util/Locale;)L1org/quartz/DateBuilder;
 newDateInTimeZoneAndLocale
  (Ljava/util/TimeZone;Ljava/util/Locale;)Lorg/quartz/DateBuilder;
- (Ljava/util/TimeZone;Ljava/util/Locale;)Lorg/quartz/DateBuilder;
+ (Ljava/util/TimeZone;Ljava/util/Locale;)L1org/quartz/DateBuilder;
 newDateInTimezone
  (Ljava/util/TimeZone;)Lorg/quartz/DateBuilder;
- (Ljava/util/TimeZone;)Lorg/quartz/DateBuilder;
+ (Ljava/util/TimeZone;)L1org/quartz/DateBuilder;
 nextGivenMinuteDate
  (Ljava/util/Date;I)Ljava/util/Date;
  (Ljava/util/Date;I)Ljava/util/Date;
@@ -65,7 +65,7 @@ tomorrowAt
  (III)Ljava/util/Date;
 translateTime
  (Ljava/util/Date;Ljava/util/TimeZone;Ljava/util/TimeZone;)Ljava/util/Date;
- (Ljava/util/Date;Ljava/util/TimeZone;Ljava/util/TimeZone;)Ljava/util/Date;
+ (Ljava/util/Date;Ljava/util/TimeZone;Ljava/util/TimeZone;)L1java/util/Date;
 
 atHourMinuteAndSecond
  (III)Lorg/quartz/DateBuilder;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/JobDataMap.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/JobDataMap.eea
index b8442a850f..a354350692 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/JobDataMap.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/JobDataMap.eea
@@ -20,7 +20,7 @@ getCharacterFromString
  (Ljava/lang/String;)Ljava/lang/Character;
 getDoubleFromString
  (Ljava/lang/String;)Ljava/lang/Double;
- (Ljava/lang/String;)Ljava/lang/Double;
+ (Ljava/lang/String;)L1java/lang/Double;
 getDoubleValue
  (Ljava/lang/String;)D
  (Ljava/lang/String;)D
@@ -29,7 +29,7 @@ getDoubleValueFromString
  (Ljava/lang/String;)D
 getFloatFromString
  (Ljava/lang/String;)Ljava/lang/Float;
- (Ljava/lang/String;)Ljava/lang/Float;
+ (Ljava/lang/String;)L1java/lang/Float;
 getFloatValue
  (Ljava/lang/String;)F
  (Ljava/lang/String;)F
@@ -44,10 +44,10 @@ getIntValue
  (Ljava/lang/String;)I
 getIntegerFromString
  (Ljava/lang/String;)Ljava/lang/Integer;
- (Ljava/lang/String;)Ljava/lang/Integer;
+ (Ljava/lang/String;)L1java/lang/Integer;
 getLongFromString
  (Ljava/lang/String;)Ljava/lang/Long;
- (Ljava/lang/String;)Ljava/lang/Long;
+ (Ljava/lang/String;)L1java/lang/Long;
 getLongValue
  (Ljava/lang/String;)J
  (Ljava/lang/String;)J
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/JobKey.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/JobKey.eea
index f3deb69b8c..98570459e2 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/JobKey.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/JobKey.eea
@@ -6,10 +6,10 @@ super org/quartz/utils/Key
 
 jobKey
  (Ljava/lang/String;)Lorg/quartz/JobKey;
- (Ljava/lang/String;)Lorg/quartz/JobKey;
+ (Ljava/lang/String;)L1org/quartz/JobKey;
 jobKey
  (Ljava/lang/String;Ljava/lang/String;)Lorg/quartz/JobKey;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/quartz/JobKey;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/quartz/JobKey;
 
 <init>
  (Ljava/lang/String;)V
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/SchedulerMetaData.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/SchedulerMetaData.eea
index 5e434ba1b2..4ca490e6ef 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/SchedulerMetaData.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/SchedulerMetaData.eea
@@ -20,7 +20,7 @@ getSchedulerName
  ()Ljava/lang/String;
 getSummary
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getThreadPoolClass
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/SimpleScheduleBuilder.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/SimpleScheduleBuilder.eea
index ce5727c515..a04a17f0ea 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/SimpleScheduleBuilder.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/SimpleScheduleBuilder.eea
@@ -42,7 +42,7 @@ repeatSecondlyForever
  (I)Lorg/quartz/SimpleScheduleBuilder;
 simpleSchedule
  ()Lorg/quartz/SimpleScheduleBuilder;
- ()Lorg/quartz/SimpleScheduleBuilder;
+ ()L1org/quartz/SimpleScheduleBuilder;
 
 build
  ()Lorg/quartz/spi/MutableTrigger;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/TimeOfDay.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/TimeOfDay.eea
index 6df99a9c61..d67703391c 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/TimeOfDay.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/TimeOfDay.eea
@@ -14,10 +14,10 @@ hourAndMinuteFromDate
  (Ljava/util/Date;Ljava/util/TimeZone;)Lorg/quartz/TimeOfDay;
 hourAndMinuteOfDay
  (II)Lorg/quartz/TimeOfDay;
- (II)Lorg/quartz/TimeOfDay;
+ (II)L1org/quartz/TimeOfDay;
 hourMinuteAndSecondOfDay
  (III)Lorg/quartz/TimeOfDay;
- (III)Lorg/quartz/TimeOfDay;
+ (III)L1org/quartz/TimeOfDay;
 
 before
  (Lorg/quartz/TimeOfDay;)Z
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/TriggerBuilder.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/TriggerBuilder.eea
index 482a084bf6..6c6659c197 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/TriggerBuilder.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/TriggerBuilder.eea
@@ -4,7 +4,7 @@ class org/quartz/TriggerBuilder
 
 newTrigger
  ()Lorg/quartz/TriggerBuilder<Lorg/quartz/Trigger;>;
- ()Lorg/quartz/TriggerBuilder<Lorg/quartz/Trigger;>;
+ ()L1org/quartz/TriggerBuilder<Lorg/quartz/Trigger;>;
 
 build
  ()TT;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/TriggerKey.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/TriggerKey.eea
index df37959c43..0f8eba5d02 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/TriggerKey.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/TriggerKey.eea
@@ -6,10 +6,10 @@ super org/quartz/utils/Key
 
 triggerKey
  (Ljava/lang/String;)Lorg/quartz/TriggerKey;
- (Ljava/lang/String;)Lorg/quartz/TriggerKey;
+ (Ljava/lang/String;)L1org/quartz/TriggerKey;
 triggerKey
  (Ljava/lang/String;Ljava/lang/String;)Lorg/quartz/TriggerKey;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/quartz/TriggerKey;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/quartz/TriggerKey;
 
 <init>
  (Ljava/lang/String;)V
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/TriggerUtils.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/TriggerUtils.eea
index fa2275498f..03745233d9 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/TriggerUtils.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/TriggerUtils.eea
@@ -2,7 +2,7 @@ class org/quartz/TriggerUtils
 
 computeEndTimeToAllowParticularNumberOfFirings
  (Lorg/quartz/spi/OperableTrigger;Lorg/quartz/Calendar;I)Ljava/util/Date;
- (Lorg/quartz/spi/OperableTrigger;Lorg/quartz/Calendar;I)Ljava/util/Date;
+ (Lorg/quartz/spi/OperableTrigger;Lorg/quartz/Calendar;I)L0java/util/Date;
 computeFireTimes
  (Lorg/quartz/spi/OperableTrigger;Lorg/quartz/Calendar;I)Ljava/util/List<Ljava/util/Date;>;
  (Lorg/quartz/spi/OperableTrigger;Lorg/quartz/Calendar;I)Ljava/util/List<Ljava/util/Date;>;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/core/JobRunShellFactory.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/core/JobRunShellFactory.eea
index 630e799428..765c8e3c8b 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/core/JobRunShellFactory.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/core/JobRunShellFactory.eea
@@ -2,7 +2,7 @@ class org/quartz/core/JobRunShellFactory
 
 createJobRunShell
  (Lorg/quartz/spi/TriggerFiredBundle;)Lorg/quartz/core/JobRunShell;
- (Lorg/quartz/spi/TriggerFiredBundle;)Lorg/quartz/core/JobRunShell;
+ (Lorg/quartz/spi/TriggerFiredBundle;)L1org/quartz/core/JobRunShell;
 initialize
  (Lorg/quartz/Scheduler;)V
  (Lorg/quartz/Scheduler;)V
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/core/QuartzScheduler.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/core/QuartzScheduler.eea
index bac4f52975..622c0816d9 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/core/QuartzScheduler.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/core/QuartzScheduler.eea
@@ -132,7 +132,7 @@ getTriggersOfJob
  (Lorg/quartz/JobKey;)Ljava/util/List<+Lorg/quartz/Trigger;>;
 getVersion
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 interrupt
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
@@ -231,7 +231,7 @@ removeinternalTriggerListener
  (Ljava/lang/String;)Z
 rescheduleJob
  (Lorg/quartz/TriggerKey;Lorg/quartz/Trigger;)Ljava/util/Date;
- (Lorg/quartz/TriggerKey;Lorg/quartz/Trigger;)Ljava/util/Date;
+ (Lorg/quartz/TriggerKey;Lorg/quartz/Trigger;)L0java/util/Date;
 resetTriggerFromErrorState
  (Lorg/quartz/TriggerKey;)V
  (Lorg/quartz/TriggerKey;)V
@@ -249,7 +249,7 @@ resumeTriggers
  (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)V
 runningSince
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L0java/util/Date;
 scheduleJob
  (Lorg/quartz/JobDetail;Ljava/util/Set<+Lorg/quartz/Trigger;>;Z)V
  (Lorg/quartz/JobDetail;Ljava/util/Set<+Lorg/quartz/Trigger;>;Z)V
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/core/QuartzSchedulerMBeanImpl.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/core/QuartzSchedulerMBeanImpl.eea
index bbd79ea15e..427c8baf4d 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/core/QuartzSchedulerMBeanImpl.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/core/QuartzSchedulerMBeanImpl.eea
@@ -45,7 +45,7 @@ getJobGroupNames
  ()Ljava/util/List<Ljava/lang/String;>;
 getJobNames
  (Ljava/lang/String;)Ljava/util/List<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/List<Ljava/lang/String;>;
+ (Ljava/lang/String;)L1java/util/List<Ljava/lang/String;>;
 getJobStoreClassName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -60,7 +60,7 @@ getPausedTriggerGroups
  ()Ljava/util/Set<Ljava/lang/String;>;
 getPerformanceMetrics
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Long;>;
- ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Long;>;
+ ()L1java/util/Map<Ljava/lang/String;Ljava/lang/Long;>;
 getSchedulerInstanceId
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -78,7 +78,7 @@ getTriggerGroupNames
  ()Ljava/util/List<Ljava/lang/String;>;
 getTriggerNames
  (Ljava/lang/String;)Ljava/util/List<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/List<Ljava/lang/String;>;
+ (Ljava/lang/String;)L1java/util/List<Ljava/lang/String;>;
 getTriggerState
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/core/QuartzSchedulerResources.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/core/QuartzSchedulerResources.eea
index 1ae0ac9650..e9eadada9e 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/core/QuartzSchedulerResources.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/core/QuartzSchedulerResources.eea
@@ -12,10 +12,10 @@ CREATE_REGISTRY_NEVER
 
 generateJMXObjectName
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 getUniqueIdentifier
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 
 addSchedulerPlugin
  (Lorg/quartz/spi/SchedulerPlugin;)V
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/core/jmx/CronTriggerSupport.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/core/jmx/CronTriggerSupport.eea
index 80fd19eecb..08eb13798c 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/core/jmx/CronTriggerSupport.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/core/jmx/CronTriggerSupport.eea
@@ -11,13 +11,13 @@ getItemTypes
  ()[Ljavax/management/openmbean/OpenType;
 newTrigger
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/quartz/spi/OperableTrigger;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/quartz/spi/OperableTrigger;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1org/quartz/spi/OperableTrigger;
 newTrigger
  (Ljavax/management/openmbean/CompositeData;)Lorg/quartz/spi/OperableTrigger;
- (Ljavax/management/openmbean/CompositeData;)Lorg/quartz/spi/OperableTrigger;
+ (Ljavax/management/openmbean/CompositeData;)L1org/quartz/spi/OperableTrigger;
 toCompositeData
  (Lorg/quartz/CronTrigger;)Ljavax/management/openmbean/CompositeData;
  (Lorg/quartz/CronTrigger;)Ljavax/management/openmbean/CompositeData;
 toTabularData
  (Ljava/util/List<+Lorg/quartz/CronTrigger;>;)Ljavax/management/openmbean/TabularData;
- (Ljava/util/List<+Lorg/quartz/CronTrigger;>;)Ljavax/management/openmbean/TabularData;
+ (Ljava/util/List<+Lorg/quartz/CronTrigger;>;)L1javax/management/openmbean/TabularData;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/core/jmx/JobDataMapSupport.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/core/jmx/JobDataMapSupport.eea
index b4ae454787..5bfce1d969 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/core/jmx/JobDataMapSupport.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/core/jmx/JobDataMapSupport.eea
@@ -6,13 +6,13 @@ TABULAR_TYPE
 
 newJobDataMap
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/quartz/JobDataMap;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/quartz/JobDataMap;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1org/quartz/JobDataMap;
 newJobDataMap
  (Ljavax/management/openmbean/TabularData;)Lorg/quartz/JobDataMap;
- (Ljavax/management/openmbean/TabularData;)Lorg/quartz/JobDataMap;
+ (Ljavax/management/openmbean/TabularData;)L1org/quartz/JobDataMap;
 toCompositeData
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/management/openmbean/CompositeData;
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/management/openmbean/CompositeData;
 toTabularData
  (Lorg/quartz/JobDataMap;)Ljavax/management/openmbean/TabularData;
- (Lorg/quartz/JobDataMap;)Ljavax/management/openmbean/TabularData;
+ (Lorg/quartz/JobDataMap;)L1javax/management/openmbean/TabularData;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/core/jmx/JobDetailSupport.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/core/jmx/JobDetailSupport.eea
index 5ebbaa1777..57513b3c28 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/core/jmx/JobDetailSupport.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/core/jmx/JobDetailSupport.eea
@@ -2,13 +2,13 @@ class org/quartz/core/jmx/JobDetailSupport
 
 newJobDetail
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/quartz/JobDetail;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/quartz/JobDetail;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1org/quartz/JobDetail;
 newJobDetail
  (Ljavax/management/openmbean/CompositeData;)Lorg/quartz/JobDetail;
- (Ljavax/management/openmbean/CompositeData;)Lorg/quartz/JobDetail;
+ (Ljavax/management/openmbean/CompositeData;)L1org/quartz/JobDetail;
 toCompositeData
  (Lorg/quartz/JobDetail;)Ljavax/management/openmbean/CompositeData;
  (Lorg/quartz/JobDetail;)Ljavax/management/openmbean/CompositeData;
 toTabularData
  ([Lorg/quartz/JobDetail;)Ljavax/management/openmbean/TabularData;
- ([Lorg/quartz/JobDetail;)Ljavax/management/openmbean/TabularData;
+ ([Lorg/quartz/JobDetail;)L1javax/management/openmbean/TabularData;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/core/jmx/JobExecutionContextSupport.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/core/jmx/JobExecutionContextSupport.eea
index fc99b68822..e9f168ed74 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/core/jmx/JobExecutionContextSupport.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/core/jmx/JobExecutionContextSupport.eea
@@ -5,4 +5,4 @@ toCompositeData
  (Lorg/quartz/JobExecutionContext;)Ljavax/management/openmbean/CompositeData;
 toTabularData
  (Ljava/util/List<Lorg/quartz/JobExecutionContext;>;)Ljavax/management/openmbean/TabularData;
- (Ljava/util/List<Lorg/quartz/JobExecutionContext;>;)Ljavax/management/openmbean/TabularData;
+ (Ljava/util/List<Lorg/quartz/JobExecutionContext;>;)L1javax/management/openmbean/TabularData;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/core/jmx/SimpleTriggerSupport.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/core/jmx/SimpleTriggerSupport.eea
index b5e681d6cd..1fd707e125 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/core/jmx/SimpleTriggerSupport.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/core/jmx/SimpleTriggerSupport.eea
@@ -11,13 +11,13 @@ getItemTypes
  ()[Ljavax/management/openmbean/OpenType;
 newTrigger
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/quartz/spi/OperableTrigger;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/quartz/spi/OperableTrigger;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1org/quartz/spi/OperableTrigger;
 newTrigger
  (Ljavax/management/openmbean/CompositeData;)Lorg/quartz/spi/OperableTrigger;
- (Ljavax/management/openmbean/CompositeData;)Lorg/quartz/spi/OperableTrigger;
+ (Ljavax/management/openmbean/CompositeData;)L1org/quartz/spi/OperableTrigger;
 toCompositeData
  (Lorg/quartz/SimpleTrigger;)Ljavax/management/openmbean/CompositeData;
  (Lorg/quartz/SimpleTrigger;)Ljavax/management/openmbean/CompositeData;
 toTabularData
  (Ljava/util/List<+Lorg/quartz/SimpleTrigger;>;)Ljavax/management/openmbean/TabularData;
- (Ljava/util/List<+Lorg/quartz/SimpleTrigger;>;)Ljavax/management/openmbean/TabularData;
+ (Ljava/util/List<+Lorg/quartz/SimpleTrigger;>;)L1javax/management/openmbean/TabularData;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/core/jmx/TriggerSupport.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/core/jmx/TriggerSupport.eea
index 26ef87a631..595a578c2b 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/core/jmx/TriggerSupport.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/core/jmx/TriggerSupport.eea
@@ -26,10 +26,10 @@ toCompositeData
  (Lorg/quartz/Trigger;)Ljavax/management/openmbean/CompositeData;
 toCompositeList
  (Ljava/util/List<+Lorg/quartz/Trigger;>;)Ljava/util/List<Ljavax/management/openmbean/CompositeData;>;
- (Ljava/util/List<+Lorg/quartz/Trigger;>;)Ljava/util/List<Ljavax/management/openmbean/CompositeData;>;
+ (Ljava/util/List<+Lorg/quartz/Trigger;>;)L1java/util/List<Ljavax/management/openmbean/CompositeData;>;
 toTabularData
  (Ljava/util/List<+Lorg/quartz/Trigger;>;)Ljavax/management/openmbean/TabularData;
- (Ljava/util/List<+Lorg/quartz/Trigger;>;)Ljavax/management/openmbean/TabularData;
+ (Ljava/util/List<+Lorg/quartz/Trigger;>;)L1javax/management/openmbean/TabularData;
 
 getIndexNames
  ()[Ljava/lang/String;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/ee/jmx/jboss/JBoss4RMIRemoteMBeanScheduler.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/ee/jmx/jboss/JBoss4RMIRemoteMBeanScheduler.eea
index eb01b7dc30..98870fd14e 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/ee/jmx/jboss/JBoss4RMIRemoteMBeanScheduler.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/ee/jmx/jboss/JBoss4RMIRemoteMBeanScheduler.eea
@@ -8,7 +8,7 @@ getAttributes
  ([Ljava/lang/String;)Ljavax/management/AttributeList;
 getContextProperties
  ()Ljava/util/Properties;
- ()Ljava/util/Properties;
+ ()L1java/util/Properties;
 invoke
  (Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/ee/jmx/jboss/QuartzService.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/ee/jmx/jboss/QuartzService.eea
index 7f8e209754..31f1d1d1ce 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/ee/jmx/jboss/QuartzService.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/ee/jmx/jboss/QuartzService.eea
@@ -5,10 +5,10 @@ getJndiName
  ()Ljava/lang/String;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getProperties
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getPropertiesFile
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/ee/jta/JTAAnnotationAwareJobRunShellFactory.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/ee/jta/JTAAnnotationAwareJobRunShellFactory.eea
index e1195877f7..1e031db0eb 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/ee/jta/JTAAnnotationAwareJobRunShellFactory.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/ee/jta/JTAAnnotationAwareJobRunShellFactory.eea
@@ -2,7 +2,7 @@ class org/quartz/ee/jta/JTAAnnotationAwareJobRunShellFactory
 
 createJobRunShell
  (Lorg/quartz/spi/TriggerFiredBundle;)Lorg/quartz/core/JobRunShell;
- (Lorg/quartz/spi/TriggerFiredBundle;)Lorg/quartz/core/JobRunShell;
+ (Lorg/quartz/spi/TriggerFiredBundle;)L1org/quartz/core/JobRunShell; # @Inherited(org.quartz.core.JobRunShellFactory)
 initialize
  (Lorg/quartz/Scheduler;)V
  (Lorg/quartz/Scheduler;)V
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/ee/jta/JTAJobRunShellFactory.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/ee/jta/JTAJobRunShellFactory.eea
index 5ce8230a79..b16460312d 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/ee/jta/JTAJobRunShellFactory.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/ee/jta/JTAJobRunShellFactory.eea
@@ -2,7 +2,7 @@ class org/quartz/ee/jta/JTAJobRunShellFactory
 
 createJobRunShell
  (Lorg/quartz/spi/TriggerFiredBundle;)Lorg/quartz/core/JobRunShell;
- (Lorg/quartz/spi/TriggerFiredBundle;)Lorg/quartz/core/JobRunShell;
+ (Lorg/quartz/spi/TriggerFiredBundle;)L1org/quartz/core/JobRunShell; # @Inherited(org.quartz.core.JobRunShellFactory)
 initialize
  (Lorg/quartz/Scheduler;)V
  (Lorg/quartz/Scheduler;)V
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/ee/jta/UserTransactionHelper.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/ee/jta/UserTransactionHelper.eea
index 98425b0817..de42983a12 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/ee/jta/UserTransactionHelper.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/ee/jta/UserTransactionHelper.eea
@@ -9,7 +9,7 @@ getUserTxLocation
  ()Ljava/lang/String;
 lookupUserTransaction
  ()Ljavax/transaction/UserTransaction;
- ()Ljavax/transaction/UserTransaction;
+ ()L1javax/transaction/UserTransaction;
 returnUserTransaction
  (Ljavax/transaction/UserTransaction;)V
  (Ljavax/transaction/UserTransaction;)V
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/ee/servlet/QuartzInitializerListener.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/ee/servlet/QuartzInitializerListener.eea
index 6baecd7a49..0b2b67591f 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/ee/servlet/QuartzInitializerListener.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/ee/servlet/QuartzInitializerListener.eea
@@ -12,4 +12,4 @@ contextInitialized
  (Ljavax/servlet/ServletContextEvent;)V
 getSchedulerFactory
  (Ljava/lang/String;)Lorg/quartz/impl/StdSchedulerFactory;
- (Ljava/lang/String;)Lorg/quartz/impl/StdSchedulerFactory;
+ (Ljava/lang/String;)L1org/quartz/impl/StdSchedulerFactory;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/ee/servlet/QuartzInitializerServlet.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/ee/servlet/QuartzInitializerServlet.eea
index c7149f4344..acac920e88 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/ee/servlet/QuartzInitializerServlet.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/ee/servlet/QuartzInitializerServlet.eea
@@ -12,7 +12,7 @@ doPost
  (Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V
 getSchedulerFactory
  (Ljava/lang/String;)Lorg/quartz/impl/StdSchedulerFactory;
- (Ljava/lang/String;)Lorg/quartz/impl/StdSchedulerFactory;
+ (Ljava/lang/String;)L1org/quartz/impl/StdSchedulerFactory;
 init
  (Ljavax/servlet/ServletConfig;)V
  (Ljavax/servlet/ServletConfig;)V
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/JobDetailImpl.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/JobDetailImpl.eea
index e204f4ce26..47c9bd9d96 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/JobDetailImpl.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/JobDetailImpl.eea
@@ -20,7 +20,7 @@ getDescription
  ()Ljava/lang/String;
 getFullName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getGroup
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -35,7 +35,7 @@ getJobDataMap
  ()Lorg/quartz/JobDataMap;
 getKey
  ()Lorg/quartz/JobKey;
- ()Lorg/quartz/JobKey;
+ ()L0org/quartz/JobKey;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/RemoteMBeanScheduler.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/RemoteMBeanScheduler.eea
index c91b3919dd..6f8b42f627 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/RemoteMBeanScheduler.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/RemoteMBeanScheduler.eea
@@ -32,16 +32,16 @@ getAttributes
  ([Ljava/lang/String;)Ljavax/management/AttributeList;
 getCalendar
  (Ljava/lang/String;)Lorg/quartz/Calendar;
- (Ljava/lang/String;)Lorg/quartz/Calendar;
+ (Ljava/lang/String;)L1org/quartz/Calendar;
 getCalendarNames
  ()Ljava/util/List<Ljava/lang/String;>;
  ()Ljava/util/List<Ljava/lang/String;>;
 getContext
  ()Lorg/quartz/SchedulerContext;
- ()Lorg/quartz/SchedulerContext;
+ ()L1org/quartz/SchedulerContext;
 getCurrentlyExecutingJobs
  ()Ljava/util/List<Lorg/quartz/JobExecutionContext;>;
- ()Ljava/util/List<Lorg/quartz/JobExecutionContext;>;
+ ()L1java/util/List<Lorg/quartz/JobExecutionContext;>;
 getJobDetail
  (Lorg/quartz/JobKey;)Lorg/quartz/JobDetail;
  (Lorg/quartz/JobKey;)Lorg/quartz/JobDetail;
@@ -50,10 +50,10 @@ getJobGroupNames
  ()Ljava/util/List<Ljava/lang/String;>;
 getJobKeys
  (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/JobKey;>;)Ljava/util/Set<Lorg/quartz/JobKey;>;
- (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/JobKey;>;)Ljava/util/Set<Lorg/quartz/JobKey;>;
+ (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/JobKey;>;)L1java/util/Set<Lorg/quartz/JobKey;>;
 getListenerManager
  ()Lorg/quartz/ListenerManager;
- ()Lorg/quartz/ListenerManager;
+ ()L1org/quartz/ListenerManager;
 getMetaData
  ()Lorg/quartz/SchedulerMetaData;
  ()Lorg/quartz/SchedulerMetaData;
@@ -71,19 +71,19 @@ getSchedulerObjectName
  ()Ljavax/management/ObjectName;
 getTrigger
  (Lorg/quartz/TriggerKey;)Lorg/quartz/Trigger;
- (Lorg/quartz/TriggerKey;)Lorg/quartz/Trigger;
+ (Lorg/quartz/TriggerKey;)L1org/quartz/Trigger;
 getTriggerGroupNames
  ()Ljava/util/List<Ljava/lang/String;>;
  ()Ljava/util/List<Ljava/lang/String;>;
 getTriggerKeys
  (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)Ljava/util/Set<Lorg/quartz/TriggerKey;>;
- (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)Ljava/util/Set<Lorg/quartz/TriggerKey;>;
+ (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)L1java/util/Set<Lorg/quartz/TriggerKey;>;
 getTriggerState
  (Lorg/quartz/TriggerKey;)Lorg/quartz/Trigger$TriggerState;
  (Lorg/quartz/TriggerKey;)Lorg/quartz/Trigger$TriggerState;
 getTriggersOfJob
  (Lorg/quartz/JobKey;)Ljava/util/List<Lorg/quartz/Trigger;>;
- (Lorg/quartz/JobKey;)Ljava/util/List<Lorg/quartz/Trigger;>;
+ (Lorg/quartz/JobKey;)L1java/util/List<Lorg/quartz/Trigger;>;
 interrupt
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
@@ -107,7 +107,7 @@ pauseTriggers
  (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)V
 rescheduleJob
  (Lorg/quartz/TriggerKey;Lorg/quartz/Trigger;)Ljava/util/Date;
- (Lorg/quartz/TriggerKey;Lorg/quartz/Trigger;)Ljava/util/Date;
+ (Lorg/quartz/TriggerKey;Lorg/quartz/Trigger;)L1java/util/Date;
 resetTriggerFromErrorState
  (Lorg/quartz/TriggerKey;)V
  (Lorg/quartz/TriggerKey;)V
@@ -128,10 +128,10 @@ scheduleJob
  (Lorg/quartz/JobDetail;Ljava/util/Set<+Lorg/quartz/Trigger;>;Z)V
 scheduleJob
  (Lorg/quartz/JobDetail;Lorg/quartz/Trigger;)Ljava/util/Date;
- (Lorg/quartz/JobDetail;Lorg/quartz/Trigger;)Ljava/util/Date;
+ (Lorg/quartz/JobDetail;Lorg/quartz/Trigger;)L1java/util/Date;
 scheduleJob
  (Lorg/quartz/Trigger;)Ljava/util/Date;
- (Lorg/quartz/Trigger;)Ljava/util/Date;
+ (Lorg/quartz/Trigger;)L1java/util/Date;
 scheduleJobs
  (Ljava/util/Map<Lorg/quartz/JobDetail;Ljava/util/Set<+Lorg/quartz/Trigger;>;>;Z)V
  (Ljava/util/Map<Lorg/quartz/JobDetail;Ljava/util/Set<+Lorg/quartz/Trigger;>;>;Z)V
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/RemoteScheduler.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/RemoteScheduler.eea
index cac7f80575..d187f0d014 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/RemoteScheduler.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/RemoteScheduler.eea
@@ -50,7 +50,7 @@ getJobKeys
  (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/JobKey;>;)Ljava/util/Set<Lorg/quartz/JobKey;>;
 getListenerManager
  ()Lorg/quartz/ListenerManager;
- ()Lorg/quartz/ListenerManager;
+ ()L1org/quartz/ListenerManager;
 getMetaData
  ()Lorg/quartz/SchedulerMetaData;
  ()Lorg/quartz/SchedulerMetaData;
@@ -89,7 +89,7 @@ interrupt
  (Lorg/quartz/JobKey;)Z
 invalidateHandleCreateException
  (Ljava/lang/String;Ljava/lang/Exception;)Lorg/quartz/SchedulerException;
- (Ljava/lang/String;Ljava/lang/Exception;)Lorg/quartz/SchedulerException;
+ (Ljava/lang/String;Ljava/lang/Exception;)L1org/quartz/SchedulerException;
 pauseJob
  (Lorg/quartz/JobKey;)V
  (Lorg/quartz/JobKey;)V
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/StdJobRunShellFactory.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/StdJobRunShellFactory.eea
index d04133f2fc..79f9d34c50 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/StdJobRunShellFactory.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/StdJobRunShellFactory.eea
@@ -2,7 +2,7 @@ class org/quartz/impl/StdJobRunShellFactory
 
 createJobRunShell
  (Lorg/quartz/spi/TriggerFiredBundle;)Lorg/quartz/core/JobRunShell;
- (Lorg/quartz/spi/TriggerFiredBundle;)Lorg/quartz/core/JobRunShell;
+ (Lorg/quartz/spi/TriggerFiredBundle;)L1org/quartz/core/JobRunShell; # @Inherited(org.quartz.core.JobRunShellFactory)
 initialize
  (Lorg/quartz/Scheduler;)V
  (Lorg/quartz/Scheduler;)V
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/StdScheduler.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/StdScheduler.eea
index 86f013f07d..e21d78690a 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/StdScheduler.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/StdScheduler.eea
@@ -53,7 +53,7 @@ getListenerManager
  ()Lorg/quartz/ListenerManager;
 getMetaData
  ()Lorg/quartz/SchedulerMetaData;
- ()Lorg/quartz/SchedulerMetaData;
+ ()L1org/quartz/SchedulerMetaData;
 getPausedTriggerGroups
  ()Ljava/util/Set<Ljava/lang/String;>;
  ()Ljava/util/Set<Ljava/lang/String;>;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/StdSchedulerFactory.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/StdSchedulerFactory.eea
index 1f271b720c..8a02c49a6f 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/StdSchedulerFactory.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/StdSchedulerFactory.eea
@@ -232,4 +232,4 @@ initialize
  (Ljava/util/Properties;)V
 instantiate
  (Lorg/quartz/core/QuartzSchedulerResources;Lorg/quartz/core/QuartzScheduler;)Lorg/quartz/Scheduler;
- (Lorg/quartz/core/QuartzSchedulerResources;Lorg/quartz/core/QuartzScheduler;)Lorg/quartz/Scheduler;
+ (Lorg/quartz/core/QuartzSchedulerResources;Lorg/quartz/core/QuartzScheduler;)L1org/quartz/Scheduler;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/calendar/BaseCalendar.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/calendar/BaseCalendar.eea
index 1b75ce9671..858811bdcd 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/calendar/BaseCalendar.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/calendar/BaseCalendar.eea
@@ -14,10 +14,10 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 createJavaCalendar
  ()Ljava/util/Calendar;
- ()Ljava/util/Calendar;
+ ()L1java/util/Calendar;
 createJavaCalendar
  (J)Ljava/util/Calendar;
- (J)Ljava/util/Calendar;
+ (J)L1java/util/Calendar;
 getBaseCalendar
  ()Lorg/quartz/Calendar;
  ()Lorg/quartz/Calendar;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/CUBRIDDelegate.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/CUBRIDDelegate.eea
index f61c61dccd..1c15a71fbe 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/CUBRIDDelegate.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/CUBRIDDelegate.eea
@@ -2,7 +2,7 @@ class org/quartz/impl/jdbcjobstore/CUBRIDDelegate
 
 getJobDataFromBlob
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/sql/ResultSet;Ljava/lang/String;)L0java/lang/Object; # @Inherited(org.quartz.impl.jdbcjobstore.StdJDBCDelegate)
 getObjectFromBlob
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/CacheDelegate.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/CacheDelegate.eea
index f1f64c53e5..2c17a2b1ec 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/CacheDelegate.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/CacheDelegate.eea
@@ -2,10 +2,10 @@ class org/quartz/impl/jdbcjobstore/CacheDelegate
 
 getJobDataFromBlob
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/sql/ResultSet;Ljava/lang/String;)L0java/lang/Object; # @Inherited(org.quartz.impl.jdbcjobstore.StdJDBCDelegate)
 getObjectFromBlob
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/sql/ResultSet;Ljava/lang/String;)L0java/lang/Object;
 setBytes
  (Ljava/sql/PreparedStatement;ILjava/io/ByteArrayOutputStream;)V
  (Ljava/sql/PreparedStatement;ILjava/io/ByteArrayOutputStream;)V
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/CalendarIntervalTriggerPersistenceDelegate.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/CalendarIntervalTriggerPersistenceDelegate.eea
index 0224751ea9..aeb0c1c66e 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/CalendarIntervalTriggerPersistenceDelegate.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/CalendarIntervalTriggerPersistenceDelegate.eea
@@ -5,10 +5,10 @@ canHandleTriggerType
  (Lorg/quartz/spi/OperableTrigger;)Z
 getHandledTriggerTypeDiscriminator
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getTriggerProperties
  (Lorg/quartz/spi/OperableTrigger;)Lorg/quartz/impl/jdbcjobstore/SimplePropertiesTriggerProperties;
- (Lorg/quartz/spi/OperableTrigger;)Lorg/quartz/impl/jdbcjobstore/SimplePropertiesTriggerProperties;
+ (Lorg/quartz/spi/OperableTrigger;)L1org/quartz/impl/jdbcjobstore/SimplePropertiesTriggerProperties;
 getTriggerPropertyBundle
  (Lorg/quartz/impl/jdbcjobstore/SimplePropertiesTriggerProperties;)Lorg/quartz/impl/jdbcjobstore/TriggerPersistenceDelegate$TriggerPropertyBundle;
- (Lorg/quartz/impl/jdbcjobstore/SimplePropertiesTriggerProperties;)Lorg/quartz/impl/jdbcjobstore/TriggerPersistenceDelegate$TriggerPropertyBundle;
+ (Lorg/quartz/impl/jdbcjobstore/SimplePropertiesTriggerProperties;)L1org/quartz/impl/jdbcjobstore/TriggerPersistenceDelegate$TriggerPropertyBundle;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/CronTriggerPersistenceDelegate.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/CronTriggerPersistenceDelegate.eea
index d997693208..ce12e287b0 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/CronTriggerPersistenceDelegate.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/CronTriggerPersistenceDelegate.eea
@@ -15,7 +15,7 @@ deleteExtendedTriggerProperties
  (Ljava/sql/Connection;Lorg/quartz/TriggerKey;)I
 getHandledTriggerTypeDiscriminator
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 initialize
  (Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;)V
@@ -24,7 +24,7 @@ insertExtendedTriggerProperties
  (Ljava/sql/Connection;Lorg/quartz/spi/OperableTrigger;Ljava/lang/String;Lorg/quartz/JobDetail;)I
 loadExtendedTriggerProperties
  (Ljava/sql/Connection;Lorg/quartz/TriggerKey;)Lorg/quartz/impl/jdbcjobstore/TriggerPersistenceDelegate$TriggerPropertyBundle;
- (Ljava/sql/Connection;Lorg/quartz/TriggerKey;)Lorg/quartz/impl/jdbcjobstore/TriggerPersistenceDelegate$TriggerPropertyBundle;
+ (Ljava/sql/Connection;Lorg/quartz/TriggerKey;)L1org/quartz/impl/jdbcjobstore/TriggerPersistenceDelegate$TriggerPropertyBundle;
 updateExtendedTriggerProperties
  (Ljava/sql/Connection;Lorg/quartz/spi/OperableTrigger;Ljava/lang/String;Lorg/quartz/JobDetail;)I
  (Ljava/sql/Connection;Lorg/quartz/spi/OperableTrigger;Ljava/lang/String;Lorg/quartz/JobDetail;)I
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/DailyTimeIntervalTriggerPersistenceDelegate.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/DailyTimeIntervalTriggerPersistenceDelegate.eea
index cf85cf4097..8dbf5025bb 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/DailyTimeIntervalTriggerPersistenceDelegate.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/DailyTimeIntervalTriggerPersistenceDelegate.eea
@@ -5,10 +5,10 @@ canHandleTriggerType
  (Lorg/quartz/spi/OperableTrigger;)Z
 getHandledTriggerTypeDiscriminator
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getTriggerProperties
  (Lorg/quartz/spi/OperableTrigger;)Lorg/quartz/impl/jdbcjobstore/SimplePropertiesTriggerProperties;
- (Lorg/quartz/spi/OperableTrigger;)Lorg/quartz/impl/jdbcjobstore/SimplePropertiesTriggerProperties;
+ (Lorg/quartz/spi/OperableTrigger;)L1org/quartz/impl/jdbcjobstore/SimplePropertiesTriggerProperties;
 getTriggerPropertyBundle
  (Lorg/quartz/impl/jdbcjobstore/SimplePropertiesTriggerProperties;)Lorg/quartz/impl/jdbcjobstore/TriggerPersistenceDelegate$TriggerPropertyBundle;
- (Lorg/quartz/impl/jdbcjobstore/SimplePropertiesTriggerProperties;)Lorg/quartz/impl/jdbcjobstore/TriggerPersistenceDelegate$TriggerPropertyBundle;
+ (Lorg/quartz/impl/jdbcjobstore/SimplePropertiesTriggerProperties;)L1org/quartz/impl/jdbcjobstore/TriggerPersistenceDelegate$TriggerPropertyBundle;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/HSQLDBDelegate.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/HSQLDBDelegate.eea
index fab4e61517..8ae5f2831d 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/HSQLDBDelegate.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/HSQLDBDelegate.eea
@@ -2,7 +2,7 @@ class org/quartz/impl/jdbcjobstore/HSQLDBDelegate
 
 getJobDataFromBlob
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/sql/ResultSet;Ljava/lang/String;)L0java/lang/Object; # @Inherited(org.quartz.impl.jdbcjobstore.StdJDBCDelegate)
 getObjectFromBlob
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/sql/ResultSet;Ljava/lang/String;)L0java/lang/Object;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/JobStoreSupport$VoidTransactionCallback.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/JobStoreSupport$VoidTransactionCallback.eea
index 84c8e7ba0e..ea3546980e 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/JobStoreSupport$VoidTransactionCallback.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/JobStoreSupport$VoidTransactionCallback.eea
@@ -9,4 +9,4 @@ super org/quartz/impl/jdbcjobstore/JobStoreSupport$TransactionCallback
  (Lorg/quartz/impl/jdbcjobstore/JobStoreSupport;)V
 execute
  (Ljava/sql/Connection;)Ljava/lang/Void;
- (Ljava/sql/Connection;)Ljava/lang/Void;
+ (Ljava/sql/Connection;)L0java/lang/Void;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/JobStoreSupport.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/JobStoreSupport.eea
index 2c0608b689..1a294327ab 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/JobStoreSupport.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/JobStoreSupport.eea
@@ -37,7 +37,7 @@ tablePrefix
 
 acquireNextTrigger
  (Ljava/sql/Connection;JIJ)Ljava/util/List<Lorg/quartz/spi/OperableTrigger;>;
- (Ljava/sql/Connection;JIJ)Ljava/util/List<Lorg/quartz/spi/OperableTrigger;>;
+ (Ljava/sql/Connection;JIJ)L1java/util/List<Lorg/quartz/spi/OperableTrigger;>;
 acquireNextTriggers
  (JIJ)Ljava/util/List<Lorg/quartz/spi/OperableTrigger;>;
  (JIJ)Ljava/util/List<Lorg/quartz/spi/OperableTrigger;>;
@@ -97,7 +97,7 @@ executeWithoutLock
  <T:Ljava/lang/Object;>(Lorg/quartz/impl/jdbcjobstore/JobStoreSupport$TransactionCallback<TT;>;)TT;
 findFailedInstances
  (Ljava/sql/Connection;)Ljava/util/List<Lorg/quartz/impl/jdbcjobstore/SchedulerStateRecord;>;
- (Ljava/sql/Connection;)Ljava/util/List<Lorg/quartz/impl/jdbcjobstore/SchedulerStateRecord;>;
+ (Ljava/sql/Connection;)L1java/util/List<Lorg/quartz/impl/jdbcjobstore/SchedulerStateRecord;>;
 getAttributeRestoringConnection
  (Ljava/sql/Connection;)Ljava/sql/Connection;
  (Ljava/sql/Connection;)Ljava/sql/Connection;
@@ -127,7 +127,7 @@ getDriverDelegateInitString
  ()Ljava/lang/String;
 getFiredTriggerRecordId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getInstanceId
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -229,7 +229,7 @@ pauseTrigger
  (Lorg/quartz/TriggerKey;)V
 pauseTriggerGroup
  (Ljava/sql/Connection;Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)Ljava/util/Set<Ljava/lang/String;>;
- (Ljava/sql/Connection;Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)Ljava/util/Set<Ljava/lang/String;>;
+ (Ljava/sql/Connection;Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)L1java/util/Set<Ljava/lang/String;>;
 pauseTriggers
  (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)Ljava/util/Set<Ljava/lang/String;>;
  (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)Ljava/util/Set<Ljava/lang/String;>;
@@ -298,7 +298,7 @@ resumeTrigger
  (Lorg/quartz/TriggerKey;)V
 resumeTriggerGroup
  (Ljava/sql/Connection;Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)Ljava/util/Set<Ljava/lang/String;>;
- (Ljava/sql/Connection;Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)Ljava/util/Set<Ljava/lang/String;>;
+ (Ljava/sql/Connection;Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)L1java/util/Set<Ljava/lang/String;>;
 resumeTriggers
  (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)Ljava/util/Set<Ljava/lang/String;>;
  (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)Ljava/util/Set<Ljava/lang/String;>;
@@ -385,7 +385,7 @@ triggerExists
  (Ljava/sql/Connection;Lorg/quartz/TriggerKey;)Z
 triggerFired
  (Ljava/sql/Connection;Lorg/quartz/spi/OperableTrigger;)Lorg/quartz/spi/TriggerFiredBundle;
- (Ljava/sql/Connection;Lorg/quartz/spi/OperableTrigger;)Lorg/quartz/spi/TriggerFiredBundle;
+ (Ljava/sql/Connection;Lorg/quartz/spi/OperableTrigger;)L0org/quartz/spi/TriggerFiredBundle;
 triggeredJobComplete
  (Ljava/sql/Connection;Lorg/quartz/spi/OperableTrigger;Lorg/quartz/JobDetail;Lorg/quartz/Trigger$CompletedExecutionInstruction;)V
  (Ljava/sql/Connection;Lorg/quartz/spi/OperableTrigger;Lorg/quartz/JobDetail;Lorg/quartz/Trigger$CompletedExecutionInstruction;)V
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/MSSQLDelegate.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/MSSQLDelegate.eea
index f7bedf3fbf..2e0f8ec7fa 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/MSSQLDelegate.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/MSSQLDelegate.eea
@@ -2,7 +2,7 @@ class org/quartz/impl/jdbcjobstore/MSSQLDelegate
 
 getJobDataFromBlob
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/sql/ResultSet;Ljava/lang/String;)L0java/lang/Object; # @Inherited(org.quartz.impl.jdbcjobstore.StdJDBCDelegate)
 getObjectFromBlob
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/sql/ResultSet;Ljava/lang/String;)L0java/lang/Object;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/PointbaseDelegate.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/PointbaseDelegate.eea
index 3338444a51..acfcda7c60 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/PointbaseDelegate.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/PointbaseDelegate.eea
@@ -2,7 +2,7 @@ class org/quartz/impl/jdbcjobstore/PointbaseDelegate
 
 getJobDataFromBlob
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/sql/ResultSet;Ljava/lang/String;)L0java/lang/Object; # @Inherited(org.quartz.impl.jdbcjobstore.StdJDBCDelegate)
 getObjectFromBlob
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/PostgreSQLDelegate.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/PostgreSQLDelegate.eea
index 7ea91b21ab..c803c80b8b 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/PostgreSQLDelegate.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/PostgreSQLDelegate.eea
@@ -2,7 +2,7 @@ class org/quartz/impl/jdbcjobstore/PostgreSQLDelegate
 
 getJobDataFromBlob
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/sql/ResultSet;Ljava/lang/String;)L0java/lang/Object; # @Inherited(org.quartz.impl.jdbcjobstore.StdJDBCDelegate)
 getObjectFromBlob
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/SimpleTriggerPersistenceDelegate.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/SimpleTriggerPersistenceDelegate.eea
index 901d1bf2e4..955892d66f 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/SimpleTriggerPersistenceDelegate.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/SimpleTriggerPersistenceDelegate.eea
@@ -15,7 +15,7 @@ deleteExtendedTriggerProperties
  (Ljava/sql/Connection;Lorg/quartz/TriggerKey;)I
 getHandledTriggerTypeDiscriminator
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 initialize
  (Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;)V
@@ -24,7 +24,7 @@ insertExtendedTriggerProperties
  (Ljava/sql/Connection;Lorg/quartz/spi/OperableTrigger;Ljava/lang/String;Lorg/quartz/JobDetail;)I
 loadExtendedTriggerProperties
  (Ljava/sql/Connection;Lorg/quartz/TriggerKey;)Lorg/quartz/impl/jdbcjobstore/TriggerPersistenceDelegate$TriggerPropertyBundle;
- (Ljava/sql/Connection;Lorg/quartz/TriggerKey;)Lorg/quartz/impl/jdbcjobstore/TriggerPersistenceDelegate$TriggerPropertyBundle;
+ (Ljava/sql/Connection;Lorg/quartz/TriggerKey;)L1org/quartz/impl/jdbcjobstore/TriggerPersistenceDelegate$TriggerPropertyBundle;
 updateExtendedTriggerProperties
  (Ljava/sql/Connection;Lorg/quartz/spi/OperableTrigger;Ljava/lang/String;Lorg/quartz/JobDetail;)I
  (Ljava/sql/Connection;Lorg/quartz/spi/OperableTrigger;Ljava/lang/String;Lorg/quartz/JobDetail;)I
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/StdJDBCDelegate.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/StdJDBCDelegate.eea
index 4216ab7002..fb33c163ed 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/StdJDBCDelegate.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/StdJDBCDelegate.eea
@@ -40,10 +40,10 @@ clearData
  (Ljava/sql/Connection;)V
 convertFromProperty
  (Ljava/util/Properties;)Ljava/util/Map<**>;
- (Ljava/util/Properties;)Ljava/util/Map<**>;
+ (Ljava/util/Properties;)L1java/util/Map<**>;
 convertToProperty
  (Ljava/util/Map<**>;)Ljava/util/Properties;
- (Ljava/util/Map<**>;)Ljava/util/Properties;
+ (Ljava/util/Map<**>;)L1java/util/Properties;
 countMisfiredTriggersInState
  (Ljava/sql/Connection;Ljava/lang/String;J)I
  (Ljava/sql/Connection;Ljava/lang/String;J)I
@@ -85,10 +85,10 @@ deleteTriggerExtension
  (Ljava/sql/Connection;Lorg/quartz/TriggerKey;)V
 findTriggerPersistenceDelegate
  (Ljava/lang/String;)Lorg/quartz/impl/jdbcjobstore/TriggerPersistenceDelegate;
- (Ljava/lang/String;)Lorg/quartz/impl/jdbcjobstore/TriggerPersistenceDelegate;
+ (Ljava/lang/String;)L0org/quartz/impl/jdbcjobstore/TriggerPersistenceDelegate;
 findTriggerPersistenceDelegate
  (Lorg/quartz/spi/OperableTrigger;)Lorg/quartz/impl/jdbcjobstore/TriggerPersistenceDelegate;
- (Lorg/quartz/spi/OperableTrigger;)Lorg/quartz/impl/jdbcjobstore/TriggerPersistenceDelegate;
+ (Lorg/quartz/spi/OperableTrigger;)L0org/quartz/impl/jdbcjobstore/TriggerPersistenceDelegate;
 getBoolean
  (Ljava/sql/ResultSet;I)Z
  (Ljava/sql/ResultSet;I)Z
@@ -97,10 +97,10 @@ getBoolean
  (Ljava/sql/ResultSet;Ljava/lang/String;)Z
 getJobDataFromBlob
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/sql/ResultSet;Ljava/lang/String;)L0java/lang/Object;
 getKeyOfNonSerializableValue
  (Ljava/util/Map<**>;)Ljava/lang/Object;
- (Ljava/util/Map<**>;)Ljava/lang/Object;
+ (Ljava/util/Map<**>;)L0java/lang/Object;
 getObjectFromBlob
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
@@ -157,22 +157,22 @@ selectCalendar
  (Ljava/sql/Connection;Ljava/lang/String;)Lorg/quartz/Calendar;
 selectCalendars
  (Ljava/sql/Connection;)Ljava/util/List<Ljava/lang/String;>;
- (Ljava/sql/Connection;)Ljava/util/List<Ljava/lang/String;>;
+ (Ljava/sql/Connection;)L1java/util/List<Ljava/lang/String;>;
 selectFiredTriggerInstanceNames
  (Ljava/sql/Connection;)Ljava/util/Set<Ljava/lang/String;>;
- (Ljava/sql/Connection;)Ljava/util/Set<Ljava/lang/String;>;
+ (Ljava/sql/Connection;)L1java/util/Set<Ljava/lang/String;>;
 selectFiredTriggerRecords
  (Ljava/sql/Connection;Ljava/lang/String;Ljava/lang/String;)Ljava/util/List<Lorg/quartz/impl/jdbcjobstore/FiredTriggerRecord;>;
- (Ljava/sql/Connection;Ljava/lang/String;Ljava/lang/String;)Ljava/util/List<Lorg/quartz/impl/jdbcjobstore/FiredTriggerRecord;>;
+ (Ljava/sql/Connection;Ljava/lang/String;Ljava/lang/String;)L1java/util/List<Lorg/quartz/impl/jdbcjobstore/FiredTriggerRecord;>;
 selectFiredTriggerRecordsByJob
  (Ljava/sql/Connection;Ljava/lang/String;Ljava/lang/String;)Ljava/util/List<Lorg/quartz/impl/jdbcjobstore/FiredTriggerRecord;>;
- (Ljava/sql/Connection;Ljava/lang/String;Ljava/lang/String;)Ljava/util/List<Lorg/quartz/impl/jdbcjobstore/FiredTriggerRecord;>;
+ (Ljava/sql/Connection;Ljava/lang/String;Ljava/lang/String;)L1java/util/List<Lorg/quartz/impl/jdbcjobstore/FiredTriggerRecord;>;
 selectInstancesFiredTriggerRecords
  (Ljava/sql/Connection;Ljava/lang/String;)Ljava/util/List<Lorg/quartz/impl/jdbcjobstore/FiredTriggerRecord;>;
- (Ljava/sql/Connection;Ljava/lang/String;)Ljava/util/List<Lorg/quartz/impl/jdbcjobstore/FiredTriggerRecord;>;
+ (Ljava/sql/Connection;Ljava/lang/String;)L1java/util/List<Lorg/quartz/impl/jdbcjobstore/FiredTriggerRecord;>;
 selectJobDetail
  (Ljava/sql/Connection;Lorg/quartz/JobKey;Lorg/quartz/spi/ClassLoadHelper;)Lorg/quartz/JobDetail;
- (Ljava/sql/Connection;Lorg/quartz/JobKey;Lorg/quartz/spi/ClassLoadHelper;)Lorg/quartz/JobDetail;
+ (Ljava/sql/Connection;Lorg/quartz/JobKey;Lorg/quartz/spi/ClassLoadHelper;)L1org/quartz/JobDetail;
 selectJobExecutionCount
  (Ljava/sql/Connection;Lorg/quartz/JobKey;)I
  (Ljava/sql/Connection;Lorg/quartz/JobKey;)I
@@ -181,22 +181,22 @@ selectJobForTrigger
  (Ljava/sql/Connection;Lorg/quartz/spi/ClassLoadHelper;Lorg/quartz/TriggerKey;)Lorg/quartz/JobDetail;
 selectJobForTrigger
  (Ljava/sql/Connection;Lorg/quartz/spi/ClassLoadHelper;Lorg/quartz/TriggerKey;Z)Lorg/quartz/JobDetail;
- (Ljava/sql/Connection;Lorg/quartz/spi/ClassLoadHelper;Lorg/quartz/TriggerKey;Z)Lorg/quartz/JobDetail;
+ (Ljava/sql/Connection;Lorg/quartz/spi/ClassLoadHelper;Lorg/quartz/TriggerKey;Z)L0org/quartz/JobDetail;
 selectJobGroups
  (Ljava/sql/Connection;)Ljava/util/List<Ljava/lang/String;>;
- (Ljava/sql/Connection;)Ljava/util/List<Ljava/lang/String;>;
+ (Ljava/sql/Connection;)L1java/util/List<Ljava/lang/String;>;
 selectJobsInGroup
  (Ljava/sql/Connection;Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/JobKey;>;)Ljava/util/Set<Lorg/quartz/JobKey;>;
- (Ljava/sql/Connection;Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/JobKey;>;)Ljava/util/Set<Lorg/quartz/JobKey;>;
+ (Ljava/sql/Connection;Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/JobKey;>;)L1java/util/Set<Lorg/quartz/JobKey;>;
 selectMisfiredTriggers
  (Ljava/sql/Connection;J)Ljava/util/List<Lorg/quartz/TriggerKey;>;
- (Ljava/sql/Connection;J)Ljava/util/List<Lorg/quartz/TriggerKey;>;
+ (Ljava/sql/Connection;J)L1java/util/List<Lorg/quartz/TriggerKey;>;
 selectMisfiredTriggersInGroupInState
  (Ljava/sql/Connection;Ljava/lang/String;Ljava/lang/String;J)Ljava/util/List<Lorg/quartz/TriggerKey;>;
- (Ljava/sql/Connection;Ljava/lang/String;Ljava/lang/String;J)Ljava/util/List<Lorg/quartz/TriggerKey;>;
+ (Ljava/sql/Connection;Ljava/lang/String;Ljava/lang/String;J)L1java/util/List<Lorg/quartz/TriggerKey;>;
 selectMisfiredTriggersInState
  (Ljava/sql/Connection;Ljava/lang/String;J)Ljava/util/List<Lorg/quartz/TriggerKey;>;
- (Ljava/sql/Connection;Ljava/lang/String;J)Ljava/util/List<Lorg/quartz/TriggerKey;>;
+ (Ljava/sql/Connection;Ljava/lang/String;J)L1java/util/List<Lorg/quartz/TriggerKey;>;
 selectNextFireTime
  (Ljava/sql/Connection;)J
  (Ljava/sql/Connection;)J
@@ -214,61 +214,61 @@ selectNumTriggersForJob
  (Ljava/sql/Connection;Lorg/quartz/JobKey;)I
 selectPausedTriggerGroups
  (Ljava/sql/Connection;)Ljava/util/Set<Ljava/lang/String;>;
- (Ljava/sql/Connection;)Ljava/util/Set<Ljava/lang/String;>;
+ (Ljava/sql/Connection;)L1java/util/Set<Ljava/lang/String;>;
 selectSchedulerStateRecords
  (Ljava/sql/Connection;Ljava/lang/String;)Ljava/util/List<Lorg/quartz/impl/jdbcjobstore/SchedulerStateRecord;>;
- (Ljava/sql/Connection;Ljava/lang/String;)Ljava/util/List<Lorg/quartz/impl/jdbcjobstore/SchedulerStateRecord;>;
+ (Ljava/sql/Connection;Ljava/lang/String;)L1java/util/List<Lorg/quartz/impl/jdbcjobstore/SchedulerStateRecord;>;
 selectTrigger
  (Ljava/sql/Connection;Lorg/quartz/TriggerKey;)Lorg/quartz/spi/OperableTrigger;
- (Ljava/sql/Connection;Lorg/quartz/TriggerKey;)Lorg/quartz/spi/OperableTrigger;
+ (Ljava/sql/Connection;Lorg/quartz/TriggerKey;)L0org/quartz/spi/OperableTrigger;
 selectTriggerForFireTime
  (Ljava/sql/Connection;J)Lorg/quartz/TriggerKey;
- (Ljava/sql/Connection;J)Lorg/quartz/TriggerKey;
+ (Ljava/sql/Connection;J)L0org/quartz/TriggerKey;
 selectTriggerGroups
  (Ljava/sql/Connection;)Ljava/util/List<Ljava/lang/String;>;
- (Ljava/sql/Connection;)Ljava/util/List<Ljava/lang/String;>;
+ (Ljava/sql/Connection;)L1java/util/List<Ljava/lang/String;>;
 selectTriggerGroups
  (Ljava/sql/Connection;Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)Ljava/util/List<Ljava/lang/String;>;
- (Ljava/sql/Connection;Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)Ljava/util/List<Ljava/lang/String;>;
+ (Ljava/sql/Connection;Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)L1java/util/List<Ljava/lang/String;>;
 selectTriggerJobDataMap
  (Ljava/sql/Connection;Ljava/lang/String;Ljava/lang/String;)Lorg/quartz/JobDataMap;
- (Ljava/sql/Connection;Ljava/lang/String;Ljava/lang/String;)Lorg/quartz/JobDataMap;
+ (Ljava/sql/Connection;Ljava/lang/String;Ljava/lang/String;)L1org/quartz/JobDataMap;
 selectTriggerKeysForJob
  (Ljava/sql/Connection;Lorg/quartz/JobKey;)Ljava/util/List<Lorg/quartz/TriggerKey;>;
- (Ljava/sql/Connection;Lorg/quartz/JobKey;)Ljava/util/List<Lorg/quartz/TriggerKey;>;
+ (Ljava/sql/Connection;Lorg/quartz/JobKey;)L1java/util/List<Lorg/quartz/TriggerKey;>;
 selectTriggerState
  (Ljava/sql/Connection;Lorg/quartz/TriggerKey;)Ljava/lang/String;
  (Ljava/sql/Connection;Lorg/quartz/TriggerKey;)Ljava/lang/String;
 selectTriggerStatus
  (Ljava/sql/Connection;Lorg/quartz/TriggerKey;)Lorg/quartz/impl/jdbcjobstore/TriggerStatus;
- (Ljava/sql/Connection;Lorg/quartz/TriggerKey;)Lorg/quartz/impl/jdbcjobstore/TriggerStatus;
+ (Ljava/sql/Connection;Lorg/quartz/TriggerKey;)L1org/quartz/impl/jdbcjobstore/TriggerStatus;
 selectTriggerToAcquire
  (Ljava/sql/Connection;JJ)Ljava/util/List<Lorg/quartz/TriggerKey;>;
  (Ljava/sql/Connection;JJ)Ljava/util/List<Lorg/quartz/TriggerKey;>;
 selectTriggerToAcquire
  (Ljava/sql/Connection;JJI)Ljava/util/List<Lorg/quartz/TriggerKey;>;
- (Ljava/sql/Connection;JJI)Ljava/util/List<Lorg/quartz/TriggerKey;>;
+ (Ljava/sql/Connection;JJI)L1java/util/List<Lorg/quartz/TriggerKey;>;
 selectTriggersForCalendar
  (Ljava/sql/Connection;Ljava/lang/String;)Ljava/util/List<Lorg/quartz/spi/OperableTrigger;>;
- (Ljava/sql/Connection;Ljava/lang/String;)Ljava/util/List<Lorg/quartz/spi/OperableTrigger;>;
+ (Ljava/sql/Connection;Ljava/lang/String;)L1java/util/List<Lorg/quartz/spi/OperableTrigger;>;
 selectTriggersForJob
  (Ljava/sql/Connection;Lorg/quartz/JobKey;)Ljava/util/List<Lorg/quartz/spi/OperableTrigger;>;
- (Ljava/sql/Connection;Lorg/quartz/JobKey;)Ljava/util/List<Lorg/quartz/spi/OperableTrigger;>;
+ (Ljava/sql/Connection;Lorg/quartz/JobKey;)L1java/util/List<Lorg/quartz/spi/OperableTrigger;>;
 selectTriggersForRecoveringJobs
  (Ljava/sql/Connection;)Ljava/util/List<Lorg/quartz/spi/OperableTrigger;>;
- (Ljava/sql/Connection;)Ljava/util/List<Lorg/quartz/spi/OperableTrigger;>;
+ (Ljava/sql/Connection;)L1java/util/List<Lorg/quartz/spi/OperableTrigger;>;
 selectTriggersInGroup
  (Ljava/sql/Connection;Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)Ljava/util/Set<Lorg/quartz/TriggerKey;>;
- (Ljava/sql/Connection;Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)Ljava/util/Set<Lorg/quartz/TriggerKey;>;
+ (Ljava/sql/Connection;Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)L1java/util/Set<Lorg/quartz/TriggerKey;>;
 selectTriggersInState
  (Ljava/sql/Connection;Ljava/lang/String;)Ljava/util/List<Lorg/quartz/TriggerKey;>;
- (Ljava/sql/Connection;Ljava/lang/String;)Ljava/util/List<Lorg/quartz/TriggerKey;>;
+ (Ljava/sql/Connection;Ljava/lang/String;)L1java/util/List<Lorg/quartz/TriggerKey;>;
 serializeJobData
  (Lorg/quartz/JobDataMap;)Ljava/io/ByteArrayOutputStream;
  (Lorg/quartz/JobDataMap;)Ljava/io/ByteArrayOutputStream;
 serializeObject
  (Ljava/lang/Object;)Ljava/io/ByteArrayOutputStream;
- (Ljava/lang/Object;)Ljava/io/ByteArrayOutputStream;
+ (Ljava/lang/Object;)L1java/io/ByteArrayOutputStream;
 setBoolean
  (Ljava/sql/PreparedStatement;IZ)V
  (Ljava/sql/PreparedStatement;IZ)V
@@ -280,7 +280,7 @@ toSqlEqualsClause
  (Lorg/quartz/impl/matchers/GroupMatcher<*>;)Ljava/lang/String;
 toSqlLikeClause
  (Lorg/quartz/impl/matchers/GroupMatcher<*>;)Ljava/lang/String;
- (Lorg/quartz/impl/matchers/GroupMatcher<*>;)Ljava/lang/String;
+ (Lorg/quartz/impl/matchers/GroupMatcher<*>;)L1java/lang/String;
 triggerExists
  (Ljava/sql/Connection;Lorg/quartz/TriggerKey;)Z
  (Ljava/sql/Connection;Lorg/quartz/TriggerKey;)Z
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/SybaseDelegate.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/SybaseDelegate.eea
index 0de63aaf7d..bebdb2e01c 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/SybaseDelegate.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/SybaseDelegate.eea
@@ -2,10 +2,10 @@ class org/quartz/impl/jdbcjobstore/SybaseDelegate
 
 getJobDataFromBlob
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/sql/ResultSet;Ljava/lang/String;)L0java/lang/Object; # @Inherited(org.quartz.impl.jdbcjobstore.StdJDBCDelegate)
 getObjectFromBlob
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/sql/ResultSet;Ljava/lang/String;)L0java/lang/Object;
 setBytes
  (Ljava/sql/PreparedStatement;ILjava/io/ByteArrayOutputStream;)V
  (Ljava/sql/PreparedStatement;ILjava/io/ByteArrayOutputStream;)V
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/WebLogicDelegate.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/WebLogicDelegate.eea
index 565bd27800..62181f6fbe 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/WebLogicDelegate.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/WebLogicDelegate.eea
@@ -2,7 +2,7 @@ class org/quartz/impl/jdbcjobstore/WebLogicDelegate
 
 getJobDataFromBlob
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/sql/ResultSet;Ljava/lang/String;)L0java/lang/Object; # @Inherited(org.quartz.impl.jdbcjobstore.StdJDBCDelegate)
 getObjectFromBlob
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/oracle/OracleDelegate.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/oracle/OracleDelegate.eea
index 5c8092aed1..b36dd6fc0f 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/oracle/OracleDelegate.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/jdbcjobstore/oracle/OracleDelegate.eea
@@ -36,7 +36,7 @@ UPDATE_ORACLE_TRIGGER_JOB_DETAIL_EMPTY_BLOB
 
 getJobDataFromBlob
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/sql/ResultSet;Ljava/lang/String;)L0java/lang/Object; # @Inherited(org.quartz.impl.jdbcjobstore.StdJDBCDelegate)
 getObjectFromBlob
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/sql/ResultSet;Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/AndMatcher.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/AndMatcher.eea
index 1ab1c5c5a8..7980501974 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/AndMatcher.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/AndMatcher.eea
@@ -8,7 +8,7 @@ super org/quartz/Matcher
 
 and
  <U:Lorg/quartz/utils/Key<*>;>(Lorg/quartz/Matcher<TU;>;Lorg/quartz/Matcher<TU;>;)Lorg/quartz/impl/matchers/AndMatcher<TU;>;
- <U:Lorg/quartz/utils/Key<*>;>(Lorg/quartz/Matcher<TU;>;Lorg/quartz/Matcher<TU;>;)Lorg/quartz/impl/matchers/AndMatcher<TU;>;
+ <U:Lorg/quartz/utils/Key<*>;>(Lorg/quartz/Matcher<TU;>;Lorg/quartz/Matcher<TU;>;)L1org/quartz/impl/matchers/AndMatcher<TU;>;
 
 leftOperand
  Lorg/quartz/Matcher<TT;>;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/EverythingMatcher.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/EverythingMatcher.eea
index b076bd28f6..954c80f350 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/EverythingMatcher.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/EverythingMatcher.eea
@@ -8,10 +8,10 @@ super org/quartz/Matcher
 
 allJobs
  ()Lorg/quartz/impl/matchers/EverythingMatcher<Lorg/quartz/JobKey;>;
- ()Lorg/quartz/impl/matchers/EverythingMatcher<Lorg/quartz/JobKey;>;
+ ()L1org/quartz/impl/matchers/EverythingMatcher<Lorg/quartz/JobKey;>;
 allTriggers
  ()Lorg/quartz/impl/matchers/EverythingMatcher<Lorg/quartz/TriggerKey;>;
- ()Lorg/quartz/impl/matchers/EverythingMatcher<Lorg/quartz/TriggerKey;>;
+ ()L1org/quartz/impl/matchers/EverythingMatcher<Lorg/quartz/TriggerKey;>;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/GroupMatcher.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/GroupMatcher.eea
index 52b5eb341f..bb98a554c5 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/GroupMatcher.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/GroupMatcher.eea
@@ -8,7 +8,7 @@ super org/quartz/impl/matchers/StringMatcher
 
 anyGroup
  <T:Lorg/quartz/utils/Key<TT;>;>()Lorg/quartz/impl/matchers/GroupMatcher<TT;>;
- <T:Lorg/quartz/utils/Key<TT;>;>()Lorg/quartz/impl/matchers/GroupMatcher<TT;>;
+ <T:Lorg/quartz/utils/Key<TT;>;>()L1org/quartz/impl/matchers/GroupMatcher<TT;>;
 anyJobGroup
  ()Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/JobKey;>;
  ()Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/JobKey;>;
@@ -17,16 +17,16 @@ anyTriggerGroup
  ()Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;
 groupContains
  <T:Lorg/quartz/utils/Key<TT;>;>(Ljava/lang/String;)Lorg/quartz/impl/matchers/GroupMatcher<TT;>;
- <T:Lorg/quartz/utils/Key<TT;>;>(Ljava/lang/String;)Lorg/quartz/impl/matchers/GroupMatcher<TT;>;
+ <T:Lorg/quartz/utils/Key<TT;>;>(Ljava/lang/String;)L1org/quartz/impl/matchers/GroupMatcher<TT;>;
 groupEndsWith
  <T:Lorg/quartz/utils/Key<TT;>;>(Ljava/lang/String;)Lorg/quartz/impl/matchers/GroupMatcher<TT;>;
- <T:Lorg/quartz/utils/Key<TT;>;>(Ljava/lang/String;)Lorg/quartz/impl/matchers/GroupMatcher<TT;>;
+ <T:Lorg/quartz/utils/Key<TT;>;>(Ljava/lang/String;)L1org/quartz/impl/matchers/GroupMatcher<TT;>;
 groupEquals
  <T:Lorg/quartz/utils/Key<TT;>;>(Ljava/lang/String;)Lorg/quartz/impl/matchers/GroupMatcher<TT;>;
- <T:Lorg/quartz/utils/Key<TT;>;>(Ljava/lang/String;)Lorg/quartz/impl/matchers/GroupMatcher<TT;>;
+ <T:Lorg/quartz/utils/Key<TT;>;>(Ljava/lang/String;)L1org/quartz/impl/matchers/GroupMatcher<TT;>;
 groupStartsWith
  <T:Lorg/quartz/utils/Key<TT;>;>(Ljava/lang/String;)Lorg/quartz/impl/matchers/GroupMatcher<TT;>;
- <T:Lorg/quartz/utils/Key<TT;>;>(Ljava/lang/String;)Lorg/quartz/impl/matchers/GroupMatcher<TT;>;
+ <T:Lorg/quartz/utils/Key<TT;>;>(Ljava/lang/String;)L1org/quartz/impl/matchers/GroupMatcher<TT;>;
 jobGroupContains
  (Ljava/lang/String;)Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/JobKey;>;
  (Ljava/lang/String;)Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/JobKey;>;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/KeyMatcher.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/KeyMatcher.eea
index fd58f4ca4d..c1d9e45ab9 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/KeyMatcher.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/KeyMatcher.eea
@@ -8,7 +8,7 @@ super org/quartz/Matcher
 
 keyEquals
  <U:Lorg/quartz/utils/Key<*>;>(TU;)Lorg/quartz/impl/matchers/KeyMatcher<TU;>;
- <U:Lorg/quartz/utils/Key<*>;>(TU;)Lorg/quartz/impl/matchers/KeyMatcher<TU;>;
+ <U:Lorg/quartz/utils/Key<*>;>(TU;)L1org/quartz/impl/matchers/KeyMatcher<TU;>;
 
 compareTo
  TT;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/NameMatcher.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/NameMatcher.eea
index 34b74ab642..62b84d13bc 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/NameMatcher.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/NameMatcher.eea
@@ -20,16 +20,16 @@ jobNameStartsWith
  (Ljava/lang/String;)Lorg/quartz/impl/matchers/NameMatcher<Lorg/quartz/JobKey;>;
 nameContains
  <U:Lorg/quartz/utils/Key<*>;>(Ljava/lang/String;)Lorg/quartz/impl/matchers/NameMatcher<TU;>;
- <U:Lorg/quartz/utils/Key<*>;>(Ljava/lang/String;)Lorg/quartz/impl/matchers/NameMatcher<TU;>;
+ <U:Lorg/quartz/utils/Key<*>;>(Ljava/lang/String;)L1org/quartz/impl/matchers/NameMatcher<TU;>;
 nameEndsWith
  <U:Lorg/quartz/utils/Key<*>;>(Ljava/lang/String;)Lorg/quartz/impl/matchers/NameMatcher<TU;>;
- <U:Lorg/quartz/utils/Key<*>;>(Ljava/lang/String;)Lorg/quartz/impl/matchers/NameMatcher<TU;>;
+ <U:Lorg/quartz/utils/Key<*>;>(Ljava/lang/String;)L1org/quartz/impl/matchers/NameMatcher<TU;>;
 nameEquals
  <T:Lorg/quartz/utils/Key<*>;>(Ljava/lang/String;)Lorg/quartz/impl/matchers/NameMatcher<TT;>;
- <T:Lorg/quartz/utils/Key<*>;>(Ljava/lang/String;)Lorg/quartz/impl/matchers/NameMatcher<TT;>;
+ <T:Lorg/quartz/utils/Key<*>;>(Ljava/lang/String;)L1org/quartz/impl/matchers/NameMatcher<TT;>;
 nameStartsWith
  <U:Lorg/quartz/utils/Key<*>;>(Ljava/lang/String;)Lorg/quartz/impl/matchers/NameMatcher<TU;>;
- <U:Lorg/quartz/utils/Key<*>;>(Ljava/lang/String;)Lorg/quartz/impl/matchers/NameMatcher<TU;>;
+ <U:Lorg/quartz/utils/Key<*>;>(Ljava/lang/String;)L1org/quartz/impl/matchers/NameMatcher<TU;>;
 triggerNameContains
  (Ljava/lang/String;)Lorg/quartz/impl/matchers/NameMatcher<Lorg/quartz/TriggerKey;>;
  (Ljava/lang/String;)Lorg/quartz/impl/matchers/NameMatcher<Lorg/quartz/TriggerKey;>;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/NotMatcher.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/NotMatcher.eea
index 0d4e42646d..8aa50d9849 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/NotMatcher.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/NotMatcher.eea
@@ -8,7 +8,7 @@ super org/quartz/Matcher
 
 not
  <U:Lorg/quartz/utils/Key<*>;>(Lorg/quartz/Matcher<TU;>;)Lorg/quartz/impl/matchers/NotMatcher<TU;>;
- <U:Lorg/quartz/utils/Key<*>;>(Lorg/quartz/Matcher<TU;>;)Lorg/quartz/impl/matchers/NotMatcher<TU;>;
+ <U:Lorg/quartz/utils/Key<*>;>(Lorg/quartz/Matcher<TU;>;)L1org/quartz/impl/matchers/NotMatcher<TU;>;
 
 operand
  Lorg/quartz/Matcher<TT;>;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/OrMatcher.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/OrMatcher.eea
index dea2f1bbc7..a757b6369e 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/OrMatcher.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/matchers/OrMatcher.eea
@@ -8,7 +8,7 @@ super org/quartz/Matcher
 
 or
  <U:Lorg/quartz/utils/Key<*>;>(Lorg/quartz/Matcher<TU;>;Lorg/quartz/Matcher<TU;>;)Lorg/quartz/impl/matchers/OrMatcher<TU;>;
- <U:Lorg/quartz/utils/Key<*>;>(Lorg/quartz/Matcher<TU;>;Lorg/quartz/Matcher<TU;>;)Lorg/quartz/impl/matchers/OrMatcher<TU;>;
+ <U:Lorg/quartz/utils/Key<*>;>(Lorg/quartz/Matcher<TU;>;Lorg/quartz/Matcher<TU;>;)L1org/quartz/impl/matchers/OrMatcher<TU;>;
 
 leftOperand
  Lorg/quartz/Matcher<TT;>;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/triggers/AbstractTrigger.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/triggers/AbstractTrigger.eea
index 75df373827..0e9c572a09 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/triggers/AbstractTrigger.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/triggers/AbstractTrigger.eea
@@ -46,10 +46,10 @@ getFireTimeAfter
  (Ljava/util/Date;)Ljava/util/Date;
 getFullJobName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getFullName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getGroup
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -61,13 +61,13 @@ getJobGroup
  ()Ljava/lang/String;
 getJobKey
  ()Lorg/quartz/JobKey;
- ()Lorg/quartz/JobKey;
+ ()L0org/quartz/JobKey;
 getJobName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getKey
  ()Lorg/quartz/TriggerKey;
- ()Lorg/quartz/TriggerKey;
+ ()L0org/quartz/TriggerKey;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/triggers/CalendarIntervalTriggerImpl.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/triggers/CalendarIntervalTriggerImpl.eea
index d2f59be1a8..f7ed2cc240 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/triggers/CalendarIntervalTriggerImpl.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/triggers/CalendarIntervalTriggerImpl.eea
@@ -21,19 +21,19 @@ super org/quartz/impl/triggers/AbstractTrigger
  (Ljava/lang/String;Lorg/quartz/DateBuilder$IntervalUnit;I)V
 computeFirstFireTime
  (Lorg/quartz/Calendar;)Ljava/util/Date;
- (Lorg/quartz/Calendar;)Ljava/util/Date;
+ (Lorg/quartz/Calendar;)L0java/util/Date;
 getEndTime
  ()Ljava/util/Date;
  ()Ljava/util/Date;
 getFinalFireTime
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L0java/util/Date;
 getFireTimeAfter
  (Ljava/util/Date;)Ljava/util/Date;
  (Ljava/util/Date;)Ljava/util/Date;
 getFireTimeAfter
  (Ljava/util/Date;Z)Ljava/util/Date;
- (Ljava/util/Date;Z)Ljava/util/Date;
+ (Ljava/util/Date;Z)L0java/util/Date;
 getNextFireTime
  ()Ljava/util/Date;
  ()Ljava/util/Date;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/triggers/CronTriggerImpl.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/triggers/CronTriggerImpl.eea
index dc553da4ff..6b9c18f0a7 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/triggers/CronTriggerImpl.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/triggers/CronTriggerImpl.eea
@@ -45,10 +45,10 @@ getExpressionSummary
  ()Ljava/lang/String;
 getFinalFireTime
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L0java/util/Date;
 getFireTimeAfter
  (Ljava/util/Date;)Ljava/util/Date;
- (Ljava/util/Date;)Ljava/util/Date;
+ (Ljava/util/Date;)L0java/util/Date;
 getNextFireTime
  ()Ljava/util/Date;
  ()Ljava/util/Date;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/triggers/DailyTimeIntervalTriggerImpl.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/triggers/DailyTimeIntervalTriggerImpl.eea
index fc9dd05a6f..32385f772f 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/triggers/DailyTimeIntervalTriggerImpl.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/triggers/DailyTimeIntervalTriggerImpl.eea
@@ -21,7 +21,7 @@ super org/quartz/impl/triggers/AbstractTrigger
  (Ljava/lang/String;Lorg/quartz/TimeOfDay;Lorg/quartz/TimeOfDay;Lorg/quartz/DateBuilder$IntervalUnit;I)V
 computeFirstFireTime
  (Lorg/quartz/Calendar;)Ljava/util/Date;
- (Lorg/quartz/Calendar;)Ljava/util/Date;
+ (Lorg/quartz/Calendar;)L0java/util/Date;
 getDaysOfWeek
  ()Ljava/util/Set<Ljava/lang/Integer;>;
  ()Ljava/util/Set<Ljava/lang/Integer;>;
@@ -33,10 +33,10 @@ getEndTimeOfDay
  ()Lorg/quartz/TimeOfDay;
 getFinalFireTime
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L0java/util/Date;
 getFireTimeAfter
  (Ljava/util/Date;)Ljava/util/Date;
- (Ljava/util/Date;)Ljava/util/Date;
+ (Ljava/util/Date;)L0java/util/Date;
 getNextFireTime
  ()Ljava/util/Date;
  ()Ljava/util/Date;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/triggers/SimpleTriggerImpl.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/triggers/SimpleTriggerImpl.eea
index 2b6642586d..52de3a5865 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/impl/triggers/SimpleTriggerImpl.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/impl/triggers/SimpleTriggerImpl.eea
@@ -33,7 +33,7 @@ super org/quartz/impl/triggers/AbstractTrigger
  (Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;IJ)V
 computeFirstFireTime
  (Lorg/quartz/Calendar;)Ljava/util/Date;
- (Lorg/quartz/Calendar;)Ljava/util/Date;
+ (Lorg/quartz/Calendar;)L0java/util/Date;
 computeNumTimesFiredBetween
  (Ljava/util/Date;Ljava/util/Date;)I
  (Ljava/util/Date;Ljava/util/Date;)I
@@ -45,10 +45,10 @@ getFinalFireTime
  ()Ljava/util/Date;
 getFireTimeAfter
  (Ljava/util/Date;)Ljava/util/Date;
- (Ljava/util/Date;)Ljava/util/Date;
+ (Ljava/util/Date;)L0java/util/Date;
 getFireTimeBefore
  (Ljava/util/Date;)Ljava/util/Date;
- (Ljava/util/Date;)Ljava/util/Date;
+ (Ljava/util/Date;)L0java/util/Date;
 getNextFireTime
  ()Ljava/util/Date;
  ()Ljava/util/Date;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/management/ManagementRESTServiceConfiguration.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/management/ManagementRESTServiceConfiguration.eea
index 5d0b53907f..0a36981650 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/management/ManagementRESTServiceConfiguration.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/management/ManagementRESTServiceConfiguration.eea
@@ -9,7 +9,7 @@ getBind
  ()Ljava/lang/String;
 getHost
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getSecurityServiceLocation
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/simpl/RAMJobStore.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/simpl/RAMJobStore.eea
index 6d2c74ad20..0bfbe4f8c0 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/simpl/RAMJobStore.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/simpl/RAMJobStore.eea
@@ -57,34 +57,34 @@ getFiredTriggerRecordId
  ()Ljava/lang/String;
 getJobGroupNames
  ()Ljava/util/List<Ljava/lang/String;>;
- ()Ljava/util/List<Ljava/lang/String;>;
+ ()L1java/util/List<Ljava/lang/String;>;
 getJobKeys
  (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/JobKey;>;)Ljava/util/Set<Lorg/quartz/JobKey;>;
- (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/JobKey;>;)Ljava/util/Set<Lorg/quartz/JobKey;>;
+ (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/JobKey;>;)L1java/util/Set<Lorg/quartz/JobKey;>;
 getLog
  ()Lorg/slf4j/Logger;
  ()Lorg/slf4j/Logger;
 getPausedTriggerGroups
  ()Ljava/util/Set<Ljava/lang/String;>;
- ()Ljava/util/Set<Ljava/lang/String;>;
+ ()L1java/util/Set<Ljava/lang/String;>;
 getTriggerGroupNames
  ()Ljava/util/List<Ljava/lang/String;>;
- ()Ljava/util/List<Ljava/lang/String;>;
+ ()L1java/util/List<Ljava/lang/String;>;
 getTriggerKeys
  (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)Ljava/util/Set<Lorg/quartz/TriggerKey;>;
- (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)Ljava/util/Set<Lorg/quartz/TriggerKey;>;
+ (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)L1java/util/Set<Lorg/quartz/TriggerKey;>;
 getTriggerState
  (Lorg/quartz/TriggerKey;)Lorg/quartz/Trigger$TriggerState;
  (Lorg/quartz/TriggerKey;)Lorg/quartz/Trigger$TriggerState;
 getTriggerWrappersForCalendar
  (Ljava/lang/String;)Ljava/util/ArrayList<Lorg/quartz/simpl/TriggerWrapper;>;
- (Ljava/lang/String;)Ljava/util/ArrayList<Lorg/quartz/simpl/TriggerWrapper;>;
+ (Ljava/lang/String;)L1java/util/ArrayList<Lorg/quartz/simpl/TriggerWrapper;>;
 getTriggerWrappersForJob
  (Lorg/quartz/JobKey;)Ljava/util/ArrayList<Lorg/quartz/simpl/TriggerWrapper;>;
- (Lorg/quartz/JobKey;)Ljava/util/ArrayList<Lorg/quartz/simpl/TriggerWrapper;>;
+ (Lorg/quartz/JobKey;)L1java/util/ArrayList<Lorg/quartz/simpl/TriggerWrapper;>;
 getTriggersForJob
  (Lorg/quartz/JobKey;)Ljava/util/List<Lorg/quartz/spi/OperableTrigger;>;
- (Lorg/quartz/JobKey;)Ljava/util/List<Lorg/quartz/spi/OperableTrigger;>;
+ (Lorg/quartz/JobKey;)L1java/util/List<Lorg/quartz/spi/OperableTrigger;>;
 initialize
  (Lorg/quartz/spi/ClassLoadHelper;Lorg/quartz/spi/SchedulerSignaler;)V
  (Lorg/quartz/spi/ClassLoadHelper;Lorg/quartz/spi/SchedulerSignaler;)V
@@ -93,16 +93,16 @@ pauseJob
  (Lorg/quartz/JobKey;)V
 pauseJobs
  (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/JobKey;>;)Ljava/util/List<Ljava/lang/String;>;
- (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/JobKey;>;)Ljava/util/List<Ljava/lang/String;>;
+ (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/JobKey;>;)L1java/util/List<Ljava/lang/String;>;
 pauseTrigger
  (Lorg/quartz/TriggerKey;)V
  (Lorg/quartz/TriggerKey;)V
 pauseTriggers
  (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)Ljava/util/List<Ljava/lang/String;>;
- (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)Ljava/util/List<Ljava/lang/String;>;
+ (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)L1java/util/List<Ljava/lang/String;>;
 peekTriggers
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 releaseAcquiredTrigger
  (Lorg/quartz/spi/OperableTrigger;)V
  (Lorg/quartz/spi/OperableTrigger;)V
@@ -132,13 +132,13 @@ resumeJob
  (Lorg/quartz/JobKey;)V
 resumeJobs
  (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/JobKey;>;)Ljava/util/Collection<Ljava/lang/String;>;
- (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/JobKey;>;)Ljava/util/Collection<Ljava/lang/String;>;
+ (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/JobKey;>;)L1java/util/Collection<Ljava/lang/String;>;
 resumeTrigger
  (Lorg/quartz/TriggerKey;)V
  (Lorg/quartz/TriggerKey;)V
 resumeTriggers
  (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)Ljava/util/List<Ljava/lang/String;>;
- (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)Ljava/util/List<Ljava/lang/String;>;
+ (Lorg/quartz/impl/matchers/GroupMatcher<Lorg/quartz/TriggerKey;>;)L1java/util/List<Ljava/lang/String;>;
 retrieveCalendar
  (Ljava/lang/String;)Lorg/quartz/Calendar;
  (Ljava/lang/String;)Lorg/quartz/Calendar;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/simpl/SimpleInstanceIdGenerator.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/simpl/SimpleInstanceIdGenerator.eea
index e373e7680c..811fdcd070 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/simpl/SimpleInstanceIdGenerator.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/simpl/SimpleInstanceIdGenerator.eea
@@ -2,4 +2,4 @@ class org/quartz/simpl/SimpleInstanceIdGenerator
 
 generateInstanceId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/simpl/SimpleThreadPool.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/simpl/SimpleThreadPool.eea
index c2cc5f5088..eac13930fb 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/simpl/SimpleThreadPool.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/simpl/SimpleThreadPool.eea
@@ -5,7 +5,7 @@ clearFromBusyWorkersList
  (Lorg/quartz/simpl/SimpleThreadPool$WorkerThread;)V
 createWorkerThreads
  (I)Ljava/util/List<Lorg/quartz/simpl/SimpleThreadPool$WorkerThread;>;
- (I)Ljava/util/List<Lorg/quartz/simpl/SimpleThreadPool$WorkerThread;>;
+ (I)L1java/util/List<Lorg/quartz/simpl/SimpleThreadPool$WorkerThread;>;
 getLog
  ()Lorg/slf4j/Logger;
  ()Lorg/slf4j/Logger;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/simpl/SimpleTimeBroker.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/simpl/SimpleTimeBroker.eea
index a5c7ed221b..6cb74c1248 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/simpl/SimpleTimeBroker.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/simpl/SimpleTimeBroker.eea
@@ -2,4 +2,4 @@ class org/quartz/simpl/SimpleTimeBroker
 
 getCurrentTime
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L1java/util/Date;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/simpl/SystemPropertyInstanceIdGenerator.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/simpl/SystemPropertyInstanceIdGenerator.eea
index 187e21975a..a845800588 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/simpl/SystemPropertyInstanceIdGenerator.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/simpl/SystemPropertyInstanceIdGenerator.eea
@@ -6,7 +6,7 @@ SYSTEM_PROPERTY
 
 generateInstanceId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getPostpend
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/utils/CircularLossyQueue.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/utils/CircularLossyQueue.eea
index 86eef2c73e..7b8275a914 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/utils/CircularLossyQueue.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/utils/CircularLossyQueue.eea
@@ -4,7 +4,7 @@ class org/quartz/utils/CircularLossyQueue
 
 peek
  ()TT;
- ()TT;
+ ()T0T;
 push
  (TT;)V
  (TT;)V
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/utils/ClassUtils.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/utils/ClassUtils.eea
index e901103354..248d6cddf2 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/utils/ClassUtils.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/utils/ClassUtils.eea
@@ -2,7 +2,7 @@ class org/quartz/utils/ClassUtils
 
 getAnnotation
  <T::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<*>;Ljava/lang/Class<TT;>;)TT;
- <T::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<*>;Ljava/lang/Class<TT;>;)TT;
+ <T::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<*>;Ljava/lang/Class<TT;>;)T0T;
 isAnnotationPresent
  (Ljava/lang/Class<*>;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Z
  (Ljava/lang/Class<*>;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Z
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/utils/Key.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/utils/Key.eea
index 24d68f8efa..4d9f458b9d 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/utils/Key.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/utils/Key.eea
@@ -12,7 +12,7 @@ DEFAULT_GROUP
 
 createUniqueName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 
 <init>
  (Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/utils/PropertiesParser.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/utils/PropertiesParser.eea
index 0a6be4ec3a..c7daef8389 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/utils/PropertiesParser.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/utils/PropertiesParser.eea
@@ -59,7 +59,7 @@ getPropertyGroup
  (Ljava/lang/String;Z)Ljava/util/Properties;
 getPropertyGroup
  (Ljava/lang/String;Z[Ljava/lang/String;)Ljava/util/Properties;
- (Ljava/lang/String;Z[Ljava/lang/String;)Ljava/util/Properties;
+ (Ljava/lang/String;Z[Ljava/lang/String;)L1java/util/Properties;
 getPropertyGroups
  (Ljava/lang/String;)[Ljava/lang/String;
  (Ljava/lang/String;)[Ljava/lang/String;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/utils/counter/CounterConfig.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/utils/counter/CounterConfig.eea
index 228318e4ba..cc4c17602a 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/utils/counter/CounterConfig.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/utils/counter/CounterConfig.eea
@@ -2,4 +2,4 @@ class org/quartz/utils/counter/CounterConfig
 
 createCounter
  ()Lorg/quartz/utils/counter/Counter;
- ()Lorg/quartz/utils/counter/Counter;
+ ()L1org/quartz/utils/counter/Counter;
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/utils/counter/CounterManager.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/utils/counter/CounterManager.eea
index 987a34617c..619425cff1 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/utils/counter/CounterManager.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/utils/counter/CounterManager.eea
@@ -2,7 +2,7 @@ class org/quartz/utils/counter/CounterManager
 
 createCounter
  (Lorg/quartz/utils/counter/CounterConfig;)Lorg/quartz/utils/counter/Counter;
- (Lorg/quartz/utils/counter/CounterConfig;)Lorg/quartz/utils/counter/Counter;
+ (Lorg/quartz/utils/counter/CounterConfig;)L1org/quartz/utils/counter/Counter;
 shutdownCounter
  (Lorg/quartz/utils/counter/Counter;)V
  (Lorg/quartz/utils/counter/Counter;)V
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/utils/counter/CounterManagerImpl.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/utils/counter/CounterManagerImpl.eea
index 7f773e966d..3cea0419c0 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/utils/counter/CounterManagerImpl.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/utils/counter/CounterManagerImpl.eea
@@ -5,7 +5,7 @@ class org/quartz/utils/counter/CounterManagerImpl
  (Ljava/util/Timer;)V
 createCounter
  (Lorg/quartz/utils/counter/CounterConfig;)Lorg/quartz/utils/counter/Counter;
- (Lorg/quartz/utils/counter/CounterConfig;)Lorg/quartz/utils/counter/Counter;
+ (Lorg/quartz/utils/counter/CounterConfig;)L1org/quartz/utils/counter/Counter; # @Inherited(org.quartz.utils.counter.CounterManager)
 shutdownCounter
  (Lorg/quartz/utils/counter/Counter;)V
  (Lorg/quartz/utils/counter/Counter;)V
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/utils/counter/sampled/SampledCounterConfig.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/utils/counter/sampled/SampledCounterConfig.eea
index 4fa3123c9d..efcf87a69e 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/utils/counter/sampled/SampledCounterConfig.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/utils/counter/sampled/SampledCounterConfig.eea
@@ -2,4 +2,4 @@ class org/quartz/utils/counter/sampled/SampledCounterConfig
 
 createCounter
  ()Lorg/quartz/utils/counter/Counter;
- ()Lorg/quartz/utils/counter/Counter;
+ ()L1org/quartz/utils/counter/Counter; # @Inherited(org.quartz.utils.counter.CounterConfig)
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/utils/counter/sampled/SampledRateCounterConfig.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/utils/counter/sampled/SampledRateCounterConfig.eea
index e29c69abd8..db61eb8847 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/utils/counter/sampled/SampledRateCounterConfig.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/utils/counter/sampled/SampledRateCounterConfig.eea
@@ -2,4 +2,4 @@ class org/quartz/utils/counter/sampled/SampledRateCounterConfig
 
 createCounter
  ()Lorg/quartz/utils/counter/Counter;
- ()Lorg/quartz/utils/counter/Counter;
+ ()L1org/quartz/utils/counter/Counter; # @Inherited(org.quartz.utils.counter.sampled.SampledCounterConfig)
diff --git a/libs/eea-quartz-2/src/main/resources/org/quartz/xml/XMLSchedulingDataProcessor.eea b/libs/eea-quartz-2/src/main/resources/org/quartz/xml/XMLSchedulingDataProcessor.eea
index c0837ab0f0..d8798a6968 100644
--- a/libs/eea-quartz-2/src/main/resources/org/quartz/xml/XMLSchedulingDataProcessor.eea
+++ b/libs/eea-quartz-2/src/main/resources/org/quartz/xml/XMLSchedulingDataProcessor.eea
@@ -76,7 +76,7 @@ fatalError
  (Lorg/xml/sax/SAXParseException;)V
 getBoolean
  (Ljavax/xml/xpath/XPath;Ljava/lang/String;Lorg/w3c/dom/Document;)Ljava/lang/Boolean;
- (Ljavax/xml/xpath/XPath;Ljava/lang/String;Lorg/w3c/dom/Document;)Ljava/lang/Boolean;
+ (Ljavax/xml/xpath/XPath;Ljava/lang/String;Lorg/w3c/dom/Document;)L0java/lang/Boolean;
 getInputStream
  (Ljava/lang/String;)Ljava/io/InputStream;
  (Ljava/lang/String;)Ljava/io/InputStream;
@@ -97,7 +97,7 @@ getTriggerGroupsToNeverDelete
  ()Ljava/util/List<Ljava/lang/String;>;
 getTrimmedToNullString
  (Ljavax/xml/xpath/XPath;Ljava/lang/String;Lorg/w3c/dom/Node;)Ljava/lang/String;
- (Ljavax/xml/xpath/XPath;Ljava/lang/String;Lorg/w3c/dom/Node;)Ljava/lang/String;
+ (Ljavax/xml/xpath/XPath;Ljava/lang/String;Lorg/w3c/dom/Node;)L0java/lang/String;
 getURL
  (Ljava/lang/String;)Ljava/net/URL;
  (Ljava/lang/String;)Ljava/net/URL;
@@ -130,7 +130,7 @@ removeTriggerGroupToNeverDelete
  (Ljava/lang/String;)Z
 resolveSchemaSource
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 scheduleJobs
  (Lorg/quartz/Scheduler;)V
  (Lorg/quartz/Scheduler;)V
diff --git a/libs/eea-slf4j-1/src/main/resources/org/slf4j/MDC.eea b/libs/eea-slf4j-1/src/main/resources/org/slf4j/MDC.eea
index ee57a869d9..0c18ecf381 100644
--- a/libs/eea-slf4j-1/src/main/resources/org/slf4j/MDC.eea
+++ b/libs/eea-slf4j-1/src/main/resources/org/slf4j/MDC.eea
@@ -14,7 +14,7 @@ put
  (Ljava/lang/String;Ljava/lang/String;)V
 putCloseable
  (Ljava/lang/String;Ljava/lang/String;)Lorg/slf4j/MDC$MDCCloseable;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/slf4j/MDC$MDCCloseable;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/slf4j/MDC$MDCCloseable;
 remove
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-slf4j-1/src/main/resources/org/slf4j/helpers/BasicMDCAdapter.eea b/libs/eea-slf4j-1/src/main/resources/org/slf4j/helpers/BasicMDCAdapter.eea
index 388fa09146..5352956ab3 100644
--- a/libs/eea-slf4j-1/src/main/resources/org/slf4j/helpers/BasicMDCAdapter.eea
+++ b/libs/eea-slf4j-1/src/main/resources/org/slf4j/helpers/BasicMDCAdapter.eea
@@ -2,13 +2,13 @@ class org/slf4j/helpers/BasicMDCAdapter
 
 get
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getCopyOfContextMap
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
- ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
+ ()L0java/util/Map<Ljava/lang/String;Ljava/lang/String;>;
 getKeys
  ()Ljava/util/Set<Ljava/lang/String;>;
- ()Ljava/util/Set<Ljava/lang/String;>;
+ ()L0java/util/Set<Ljava/lang/String;>;
 put
  (Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-slf4j-1/src/main/resources/org/slf4j/helpers/MessageFormatter.eea b/libs/eea-slf4j-1/src/main/resources/org/slf4j/helpers/MessageFormatter.eea
index ca46979955..867937ad4a 100644
--- a/libs/eea-slf4j-1/src/main/resources/org/slf4j/helpers/MessageFormatter.eea
+++ b/libs/eea-slf4j-1/src/main/resources/org/slf4j/helpers/MessageFormatter.eea
@@ -5,7 +5,7 @@ arrayFormat
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/slf4j/helpers/FormattingTuple;
 arrayFormat
  (Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/Throwable;)Lorg/slf4j/helpers/FormattingTuple;
- (Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/Throwable;)Lorg/slf4j/helpers/FormattingTuple;
+ (Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/Throwable;)L1org/slf4j/helpers/FormattingTuple;
 format
  (Ljava/lang/String;Ljava/lang/Object;)Lorg/slf4j/helpers/FormattingTuple;
  (Ljava/lang/String;Ljava/lang/Object;)Lorg/slf4j/helpers/FormattingTuple;
@@ -14,7 +14,7 @@ format
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)Lorg/slf4j/helpers/FormattingTuple;
 getThrowableCandidate
  ([Ljava/lang/Object;)Ljava/lang/Throwable;
- ([Ljava/lang/Object;)Ljava/lang/Throwable;
+ ([Ljava/lang/Object;)L0java/lang/Throwable;
 trimmedCopy
  ([Ljava/lang/Object;)[Ljava/lang/Object;
- ([Ljava/lang/Object;)[Ljava/lang/Object;
+ ([Ljava/lang/Object;)[1Ljava/lang/Object;
diff --git a/libs/eea-slf4j-1/src/main/resources/org/slf4j/helpers/NOPMDCAdapter.eea b/libs/eea-slf4j-1/src/main/resources/org/slf4j/helpers/NOPMDCAdapter.eea
index 53110117f5..b87caf9209 100644
--- a/libs/eea-slf4j-1/src/main/resources/org/slf4j/helpers/NOPMDCAdapter.eea
+++ b/libs/eea-slf4j-1/src/main/resources/org/slf4j/helpers/NOPMDCAdapter.eea
@@ -2,10 +2,10 @@ class org/slf4j/helpers/NOPMDCAdapter
 
 get
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getCopyOfContextMap
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
- ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
+ ()L0java/util/Map<Ljava/lang/String;Ljava/lang/String;>;
 put
  (Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-slf4j-1/src/main/resources/org/slf4j/helpers/SubstituteLoggerFactory.eea b/libs/eea-slf4j-1/src/main/resources/org/slf4j/helpers/SubstituteLoggerFactory.eea
index 9f03eee289..812a73d273 100644
--- a/libs/eea-slf4j-1/src/main/resources/org/slf4j/helpers/SubstituteLoggerFactory.eea
+++ b/libs/eea-slf4j-1/src/main/resources/org/slf4j/helpers/SubstituteLoggerFactory.eea
@@ -8,7 +8,7 @@ getLogger
  (L0java/lang/String;)L1org/slf4j/Logger; # @Inherited(org.slf4j.ILoggerFactory)
 getLoggerNames
  ()Ljava/util/List<Ljava/lang/String;>;
- ()Ljava/util/List<Ljava/lang/String;>;
+ ()L1java/util/List<Ljava/lang/String;>;
 getLoggers
  ()Ljava/util/List<Lorg/slf4j/helpers/SubstituteLogger;>;
- ()Ljava/util/List<Lorg/slf4j/helpers/SubstituteLogger;>;
+ ()L1java/util/List<Lorg/slf4j/helpers/SubstituteLogger;>;
diff --git a/libs/eea-slf4j-1/src/main/resources/org/slf4j/helpers/Util.eea b/libs/eea-slf4j-1/src/main/resources/org/slf4j/helpers/Util.eea
index f334f9b3b4..ddffb7a981 100644
--- a/libs/eea-slf4j-1/src/main/resources/org/slf4j/helpers/Util.eea
+++ b/libs/eea-slf4j-1/src/main/resources/org/slf4j/helpers/Util.eea
@@ -2,7 +2,7 @@ class org/slf4j/helpers/Util
 
 getCallingClass
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L0java/lang/Class<*>;
 report
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-slf4j-2/src/main/resources/org/slf4j/MDC.eea b/libs/eea-slf4j-2/src/main/resources/org/slf4j/MDC.eea
index 03ef2517d7..408c10b406 100644
--- a/libs/eea-slf4j-2/src/main/resources/org/slf4j/MDC.eea
+++ b/libs/eea-slf4j-2/src/main/resources/org/slf4j/MDC.eea
@@ -20,7 +20,7 @@ put
  (Ljava/lang/String;Ljava/lang/String;)V
 putCloseable
  (Ljava/lang/String;Ljava/lang/String;)Lorg/slf4j/MDC$MDCCloseable;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/slf4j/MDC$MDCCloseable;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/slf4j/MDC$MDCCloseable;
 remove
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-slf4j-2/src/main/resources/org/slf4j/event/DefaultLoggingEvent.eea b/libs/eea-slf4j-2/src/main/resources/org/slf4j/event/DefaultLoggingEvent.eea
index c2510cdbd2..20edf5f268 100644
--- a/libs/eea-slf4j-2/src/main/resources/org/slf4j/event/DefaultLoggingEvent.eea
+++ b/libs/eea-slf4j-2/src/main/resources/org/slf4j/event/DefaultLoggingEvent.eea
@@ -23,7 +23,7 @@ getArguments
  ()Ljava/util/List<Ljava/lang/Object;>;
 getCallerBoundary
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(org.slf4j.event.LoggingEvent)
 getKeyValuePairs
  ()Ljava/util/List<Lorg/slf4j/event/KeyValuePair;>;
  ()Ljava/util/List<Lorg/slf4j/event/KeyValuePair;>;
diff --git a/libs/eea-slf4j-2/src/main/resources/org/slf4j/event/EventRecordingLogger.eea b/libs/eea-slf4j-2/src/main/resources/org/slf4j/event/EventRecordingLogger.eea
index 4777cd4f8d..de410c5002 100644
--- a/libs/eea-slf4j-2/src/main/resources/org/slf4j/event/EventRecordingLogger.eea
+++ b/libs/eea-slf4j-2/src/main/resources/org/slf4j/event/EventRecordingLogger.eea
@@ -5,7 +5,7 @@ class org/slf4j/event/EventRecordingLogger
  (Lorg/slf4j/helpers/SubstituteLogger;Ljava/util/Queue<Lorg/slf4j/event/SubstituteLoggingEvent;>;)V
 getFullyQualifiedCallerName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getName
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(org.slf4j.helpers.AbstractLogger)
diff --git a/libs/eea-slf4j-2/src/main/resources/org/slf4j/event/LoggingEvent.eea b/libs/eea-slf4j-2/src/main/resources/org/slf4j/event/LoggingEvent.eea
index 8b5481cd40..0934f87493 100644
--- a/libs/eea-slf4j-2/src/main/resources/org/slf4j/event/LoggingEvent.eea
+++ b/libs/eea-slf4j-2/src/main/resources/org/slf4j/event/LoggingEvent.eea
@@ -8,7 +8,7 @@ getArguments
  ()Ljava/util/List<Ljava/lang/Object;>;
 getCallerBoundary
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getKeyValuePairs
  ()Ljava/util/List<Lorg/slf4j/event/KeyValuePair;>;
  ()Ljava/util/List<Lorg/slf4j/event/KeyValuePair;>;
diff --git a/libs/eea-slf4j-2/src/main/resources/org/slf4j/event/SubstituteLoggingEvent.eea b/libs/eea-slf4j-2/src/main/resources/org/slf4j/event/SubstituteLoggingEvent.eea
index ce9757a9c9..7fb073d2ea 100644
--- a/libs/eea-slf4j-2/src/main/resources/org/slf4j/event/SubstituteLoggingEvent.eea
+++ b/libs/eea-slf4j-2/src/main/resources/org/slf4j/event/SubstituteLoggingEvent.eea
@@ -8,7 +8,7 @@ getArgumentArray
  ()[0Ljava/lang/Object; # @Inherited(org.slf4j.event.LoggingEvent)
 getArguments
  ()Ljava/util/List<Ljava/lang/Object;>;
- ()Ljava/util/List<Ljava/lang/Object;>;
+ ()L0java/util/List<Ljava/lang/Object;>;
 getKeyValuePairs
  ()Ljava/util/List<Lorg/slf4j/event/KeyValuePair;>;
  ()Ljava/util/List<Lorg/slf4j/event/KeyValuePair;>;
diff --git a/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/BasicMDCAdapter.eea b/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/BasicMDCAdapter.eea
index 5d32e6985e..d5b2d2677c 100644
--- a/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/BasicMDCAdapter.eea
+++ b/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/BasicMDCAdapter.eea
@@ -5,16 +5,16 @@ clearDequeByKey
  (Ljava/lang/String;)V
 get
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getCopyOfContextMap
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
- ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
+ ()L0java/util/Map<Ljava/lang/String;Ljava/lang/String;>;
 getCopyOfDequeByKey
  (Ljava/lang/String;)Ljava/util/Deque<Ljava/lang/String;>;
  (Ljava/lang/String;)Ljava/util/Deque<Ljava/lang/String;>;
 getKeys
  ()Ljava/util/Set<Ljava/lang/String;>;
- ()Ljava/util/Set<Ljava/lang/String;>;
+ ()L0java/util/Set<Ljava/lang/String;>;
 popByKey
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/MessageFormatter.eea b/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/MessageFormatter.eea
index 676e7c2876..a290028c25 100644
--- a/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/MessageFormatter.eea
+++ b/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/MessageFormatter.eea
@@ -5,7 +5,7 @@ arrayFormat
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/slf4j/helpers/FormattingTuple;
 arrayFormat
  (Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/Throwable;)Lorg/slf4j/helpers/FormattingTuple;
- (Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/Throwable;)Lorg/slf4j/helpers/FormattingTuple;
+ (Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/Throwable;)L1org/slf4j/helpers/FormattingTuple;
 basicArrayFormat
  (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
  (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
@@ -20,7 +20,7 @@ format
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)Lorg/slf4j/helpers/FormattingTuple;
 getThrowableCandidate
  ([Ljava/lang/Object;)Ljava/lang/Throwable;
- ([Ljava/lang/Object;)Ljava/lang/Throwable;
+ ([Ljava/lang/Object;)L0java/lang/Throwable;
 trimmedCopy
  ([Ljava/lang/Object;)[Ljava/lang/Object;
- ([Ljava/lang/Object;)[Ljava/lang/Object;
+ ([Ljava/lang/Object;)[1Ljava/lang/Object;
diff --git a/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/NOPMDCAdapter.eea b/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/NOPMDCAdapter.eea
index 9b8db38860..72b702d546 100644
--- a/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/NOPMDCAdapter.eea
+++ b/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/NOPMDCAdapter.eea
@@ -5,16 +5,16 @@ clearDequeByKey
  (Ljava/lang/String;)V
 get
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getCopyOfContextMap
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
- ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
+ ()L0java/util/Map<Ljava/lang/String;Ljava/lang/String;>;
 getCopyOfDequeByKey
  (Ljava/lang/String;)Ljava/util/Deque<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/Deque<Ljava/lang/String;>;
+ (Ljava/lang/String;)L0java/util/Deque<Ljava/lang/String;>;
 popByKey
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 pushByKey
  (Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/NormalizedParameters.eea b/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/NormalizedParameters.eea
index 37c8624ea3..aaa52057a8 100644
--- a/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/NormalizedParameters.eea
+++ b/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/NormalizedParameters.eea
@@ -2,16 +2,16 @@ class org/slf4j/helpers/NormalizedParameters
 
 getThrowableCandidate
  ([Ljava/lang/Object;)Ljava/lang/Throwable;
- ([Ljava/lang/Object;)Ljava/lang/Throwable;
+ ([Ljava/lang/Object;)L0java/lang/Throwable;
 normalize
  (Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/Throwable;)Lorg/slf4j/helpers/NormalizedParameters;
- (Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/Throwable;)Lorg/slf4j/helpers/NormalizedParameters;
+ (Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/Throwable;)L1org/slf4j/helpers/NormalizedParameters;
 normalize
  (Lorg/slf4j/event/LoggingEvent;)Lorg/slf4j/helpers/NormalizedParameters;
  (Lorg/slf4j/event/LoggingEvent;)Lorg/slf4j/helpers/NormalizedParameters;
 trimmedCopy
  ([Ljava/lang/Object;)[Ljava/lang/Object;
- ([Ljava/lang/Object;)[Ljava/lang/Object;
+ ([Ljava/lang/Object;)[1Ljava/lang/Object;
 
 <init>
  (Ljava/lang/String;[Ljava/lang/Object;)V
diff --git a/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/SubstituteLoggerFactory.eea b/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/SubstituteLoggerFactory.eea
index 9f03eee289..812a73d273 100644
--- a/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/SubstituteLoggerFactory.eea
+++ b/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/SubstituteLoggerFactory.eea
@@ -8,7 +8,7 @@ getLogger
  (L0java/lang/String;)L1org/slf4j/Logger; # @Inherited(org.slf4j.ILoggerFactory)
 getLoggerNames
  ()Ljava/util/List<Ljava/lang/String;>;
- ()Ljava/util/List<Ljava/lang/String;>;
+ ()L1java/util/List<Ljava/lang/String;>;
 getLoggers
  ()Ljava/util/List<Lorg/slf4j/helpers/SubstituteLogger;>;
- ()Ljava/util/List<Lorg/slf4j/helpers/SubstituteLogger;>;
+ ()L1java/util/List<Lorg/slf4j/helpers/SubstituteLogger;>;
diff --git a/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/SubstituteServiceProvider.eea b/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/SubstituteServiceProvider.eea
index d44f5badb9..cfeff265d9 100644
--- a/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/SubstituteServiceProvider.eea
+++ b/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/SubstituteServiceProvider.eea
@@ -11,7 +11,7 @@ getMarkerFactory
  ()Lorg/slf4j/IMarkerFactory;
 getRequestedApiVersion
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSubstituteLoggerFactory
  ()Lorg/slf4j/helpers/SubstituteLoggerFactory;
  ()Lorg/slf4j/helpers/SubstituteLoggerFactory;
diff --git a/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/ThreadLocalMapOfStacks.eea b/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/ThreadLocalMapOfStacks.eea
index 56a5057216..6b68dcc887 100644
--- a/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/ThreadLocalMapOfStacks.eea
+++ b/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/ThreadLocalMapOfStacks.eea
@@ -5,10 +5,10 @@ clearDequeByKey
  (Ljava/lang/String;)V
 getCopyOfDequeByKey
  (Ljava/lang/String;)Ljava/util/Deque<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/Deque<Ljava/lang/String;>;
+ (Ljava/lang/String;)L0java/util/Deque<Ljava/lang/String;>;
 popByKey
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 pushByKey
  (Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/Util.eea b/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/Util.eea
index f334f9b3b4..ddffb7a981 100644
--- a/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/Util.eea
+++ b/libs/eea-slf4j-2/src/main/resources/org/slf4j/helpers/Util.eea
@@ -2,7 +2,7 @@ class org/slf4j/helpers/Util
 
 getCallingClass
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L0java/lang/Class<*>;
 report
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/DumperOptions$ScalarStyle.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/DumperOptions$ScalarStyle.eea
index 6b7e61f5e5..1bf174e17d 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/DumperOptions$ScalarStyle.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/DumperOptions$ScalarStyle.eea
@@ -6,7 +6,7 @@ super java/lang/Enum
 
 createStyle
  (Ljava/lang/Character;)Lorg/yaml/snakeyaml/DumperOptions$ScalarStyle;
- (Ljava/lang/Character;)Lorg/yaml/snakeyaml/DumperOptions$ScalarStyle;
+ (Ljava/lang/Character;)L1org/yaml/snakeyaml/DumperOptions$ScalarStyle;
 
 getChar
  ()Ljava/lang/Character;
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/DumperOptions$Version.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/DumperOptions$Version.eea
index 5c53f2ac0e..60ed598977 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/DumperOptions$Version.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/DumperOptions$Version.eea
@@ -6,7 +6,7 @@ super java/lang/Enum
 
 getRepresentation
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Enum)
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/TypeDescription.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/TypeDescription.eea
index 3dc247be27..fac7c115f2 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/TypeDescription.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/TypeDescription.eea
@@ -33,7 +33,7 @@ finalizeConstruction
  (Ljava/lang/Object;)Ljava/lang/Object;
 getProperties
  ()Ljava/util/Set<Lorg/yaml/snakeyaml/introspector/Property;>;
- ()Ljava/util/Set<Lorg/yaml/snakeyaml/introspector/Property;>;
+ ()L0java/util/Set<Lorg/yaml/snakeyaml/introspector/Property;>;
 getProperty
  (Ljava/lang/String;)Lorg/yaml/snakeyaml/introspector/Property;
  (Ljava/lang/String;)Lorg/yaml/snakeyaml/introspector/Property;
@@ -45,10 +45,10 @@ getType
  ()Ljava/lang/Class<+Ljava/lang/Object;>;
 newInstance
  (Ljava/lang/String;Lorg/yaml/snakeyaml/nodes/Node;)Ljava/lang/Object;
- (Ljava/lang/String;Lorg/yaml/snakeyaml/nodes/Node;)Ljava/lang/Object;
+ (Ljava/lang/String;Lorg/yaml/snakeyaml/nodes/Node;)L0java/lang/Object;
 newInstance
  (Lorg/yaml/snakeyaml/nodes/Node;)Ljava/lang/Object;
- (Lorg/yaml/snakeyaml/nodes/Node;)Ljava/lang/Object;
+ (Lorg/yaml/snakeyaml/nodes/Node;)L0java/lang/Object;
 putListPropertyType
  (Ljava/lang/String;Ljava/lang/Class<+Ljava/lang/Object;>;)V
  (Ljava/lang/String;Ljava/lang/Class<+Ljava/lang/Object;>;)V
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/Yaml.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/Yaml.eea
index a12db8d20a..fecb988dc7 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/Yaml.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/Yaml.eea
@@ -63,7 +63,7 @@ compose
  (Ljava/io/Reader;)Lorg/yaml/snakeyaml/nodes/Node;
 composeAll
  (Ljava/io/Reader;)Ljava/lang/Iterable<Lorg/yaml/snakeyaml/nodes/Node;>;
- (Ljava/io/Reader;)Ljava/lang/Iterable<Lorg/yaml/snakeyaml/nodes/Node;>;
+ (Ljava/io/Reader;)L1java/lang/Iterable<Lorg/yaml/snakeyaml/nodes/Node;>;
 dump
  (Ljava/lang/Object;)Ljava/lang/String;
  (Ljava/lang/Object;)L1java/lang/String;
@@ -72,13 +72,13 @@ dump
  (Ljava/lang/Object;Ljava/io/Writer;)V
 dumpAll
  (Ljava/util/Iterator<+Ljava/lang/Object;>;)Ljava/lang/String;
- (Ljava/util/Iterator<+Ljava/lang/Object;>;)Ljava/lang/String;
+ (Ljava/util/Iterator<+Ljava/lang/Object;>;)L1java/lang/String;
 dumpAll
  (Ljava/util/Iterator<+Ljava/lang/Object;>;Ljava/io/Writer;)V
  (Ljava/util/Iterator<+Ljava/lang/Object;>;Ljava/io/Writer;)V
 dumpAs
  (Ljava/lang/Object;Lorg/yaml/snakeyaml/nodes/Tag;Lorg/yaml/snakeyaml/DumperOptions$FlowStyle;)Ljava/lang/String;
- (Ljava/lang/Object;Lorg/yaml/snakeyaml/nodes/Tag;Lorg/yaml/snakeyaml/DumperOptions$FlowStyle;)Ljava/lang/String;
+ (Ljava/lang/Object;Lorg/yaml/snakeyaml/nodes/Tag;Lorg/yaml/snakeyaml/DumperOptions$FlowStyle;)L1java/lang/String;
 dumpAsMap
  (Ljava/lang/Object;)Ljava/lang/String;
  (Ljava/lang/Object;)Ljava/lang/String;
@@ -99,7 +99,7 @@ loadAll
  (Ljava/io/InputStream;)Ljava/lang/Iterable<Ljava/lang/Object;>;
 loadAll
  (Ljava/io/Reader;)Ljava/lang/Iterable<Ljava/lang/Object;>;
- (Ljava/io/Reader;)Ljava/lang/Iterable<Ljava/lang/Object;>;
+ (Ljava/io/Reader;)L1java/lang/Iterable<Ljava/lang/Object;>;
 loadAll
  (Ljava/lang/String;)Ljava/lang/Iterable<Ljava/lang/Object;>;
  (Ljava/lang/String;)Ljava/lang/Iterable<Ljava/lang/Object;>;
@@ -114,7 +114,7 @@ loadAs
  <T:Ljava/lang/Object;>(Ljava/lang/String;Ljava/lang/Class<-TT;>;)TT;
 parse
  (Ljava/io/Reader;)Ljava/lang/Iterable<Lorg/yaml/snakeyaml/events/Event;>;
- (Ljava/io/Reader;)Ljava/lang/Iterable<Lorg/yaml/snakeyaml/events/Event;>;
+ (Ljava/io/Reader;)L1java/lang/Iterable<Lorg/yaml/snakeyaml/events/Event;>;
 represent
  (Ljava/lang/Object;)Lorg/yaml/snakeyaml/nodes/Node;
  (Ljava/lang/Object;)Lorg/yaml/snakeyaml/nodes/Node;
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/comments/CommentEventsCollector.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/comments/CommentEventsCollector.eea
index b8687b208e..411dd247c9 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/comments/CommentEventsCollector.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/comments/CommentEventsCollector.eea
@@ -11,7 +11,7 @@ collectEvents
  ()Lorg/yaml/snakeyaml/comments/CommentEventsCollector;
 collectEvents
  (Lorg/yaml/snakeyaml/events/Event;)Lorg/yaml/snakeyaml/events/Event;
- (Lorg/yaml/snakeyaml/events/Event;)Lorg/yaml/snakeyaml/events/Event;
+ (Lorg/yaml/snakeyaml/events/Event;)L0org/yaml/snakeyaml/events/Event;
 collectEventsAndPoll
  (Lorg/yaml/snakeyaml/events/Event;)Lorg/yaml/snakeyaml/events/Event;
  (Lorg/yaml/snakeyaml/events/Event;)Lorg/yaml/snakeyaml/events/Event;
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/composer/Composer.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/composer/Composer.eea
index b0df8af264..4611e7c277 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/composer/Composer.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/composer/Composer.eea
@@ -18,13 +18,13 @@ composeMappingChildren
  (Ljava/util/List<Lorg/yaml/snakeyaml/nodes/NodeTuple;>;Lorg/yaml/snakeyaml/nodes/MappingNode;)V
 composeMappingNode
  (Ljava/lang/String;)Lorg/yaml/snakeyaml/nodes/Node;
- (Ljava/lang/String;)Lorg/yaml/snakeyaml/nodes/Node;
+ (Ljava/lang/String;)L1org/yaml/snakeyaml/nodes/Node;
 composeScalarNode
  (Ljava/lang/String;Ljava/util/List<Lorg/yaml/snakeyaml/comments/CommentLine;>;)Lorg/yaml/snakeyaml/nodes/Node;
- (Ljava/lang/String;Ljava/util/List<Lorg/yaml/snakeyaml/comments/CommentLine;>;)Lorg/yaml/snakeyaml/nodes/Node;
+ (Ljava/lang/String;Ljava/util/List<Lorg/yaml/snakeyaml/comments/CommentLine;>;)L1org/yaml/snakeyaml/nodes/Node;
 composeSequenceNode
  (Ljava/lang/String;)Lorg/yaml/snakeyaml/nodes/Node;
- (Ljava/lang/String;)Lorg/yaml/snakeyaml/nodes/Node;
+ (Ljava/lang/String;)L1org/yaml/snakeyaml/nodes/Node;
 composeValueNode
  (Lorg/yaml/snakeyaml/nodes/MappingNode;)Lorg/yaml/snakeyaml/nodes/Node;
  (Lorg/yaml/snakeyaml/nodes/MappingNode;)Lorg/yaml/snakeyaml/nodes/Node;
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/constructor/BaseConstructor.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/constructor/BaseConstructor.eea
index db944c78d0..2dddee5cb3 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/constructor/BaseConstructor.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/constructor/BaseConstructor.eea
@@ -76,16 +76,16 @@ constructSet2ndStep
  (Lorg/yaml/snakeyaml/nodes/MappingNode;Ljava/util/Set<Ljava/lang/Object;>;)V
 createArray
  (Ljava/lang/Class<*>;I)Ljava/lang/Object;
- (Ljava/lang/Class<*>;I)Ljava/lang/Object;
+ (Ljava/lang/Class<*>;I)L1java/lang/Object;
 createDefaultList
  (I)Ljava/util/List<Ljava/lang/Object;>;
- (I)Ljava/util/List<Ljava/lang/Object;>;
+ (I)L1java/util/List<Ljava/lang/Object;>;
 createDefaultMap
  (I)Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
- (I)Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
+ (I)L1java/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
 createDefaultSet
  (I)Ljava/util/Set<Ljava/lang/Object;>;
- (I)Ljava/util/Set<Ljava/lang/Object;>;
+ (I)L1java/util/Set<Ljava/lang/Object;>;
 finalizeConstruction
  (Lorg/yaml/snakeyaml/nodes/Node;Ljava/lang/Object;)Ljava/lang/Object;
  (Lorg/yaml/snakeyaml/nodes/Node;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/constructor/SafeConstructor$ConstructUndefined.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/constructor/SafeConstructor$ConstructUndefined.eea
index f66bdfe0d0..7932cede2d 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/constructor/SafeConstructor$ConstructUndefined.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/constructor/SafeConstructor$ConstructUndefined.eea
@@ -2,4 +2,4 @@ class org/yaml/snakeyaml/constructor/SafeConstructor$ConstructUndefined
 
 construct
  (Lorg/yaml/snakeyaml/nodes/Node;)Ljava/lang/Object;
- (Lorg/yaml/snakeyaml/nodes/Node;)Ljava/lang/Object;
+ (Lorg/yaml/snakeyaml/nodes/Node;)L1java/lang/Object;
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/constructor/SafeConstructor$ConstructYamlNull.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/constructor/SafeConstructor$ConstructYamlNull.eea
index 837d31ed05..16bbe8ab2c 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/constructor/SafeConstructor$ConstructYamlNull.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/constructor/SafeConstructor$ConstructYamlNull.eea
@@ -5,4 +5,4 @@ class org/yaml/snakeyaml/constructor/SafeConstructor$ConstructYamlNull
  (Lorg/yaml/snakeyaml/constructor/SafeConstructor;)V
 construct
  (Lorg/yaml/snakeyaml/nodes/Node;)Ljava/lang/Object;
- (Lorg/yaml/snakeyaml/nodes/Node;)Ljava/lang/Object;
+ (Lorg/yaml/snakeyaml/nodes/Node;)L0java/lang/Object;
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/constructor/SafeConstructor$ConstructYamlOmap.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/constructor/SafeConstructor$ConstructYamlOmap.eea
index e5403a379e..40bb1fe647 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/constructor/SafeConstructor$ConstructYamlOmap.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/constructor/SafeConstructor$ConstructYamlOmap.eea
@@ -5,4 +5,4 @@ class org/yaml/snakeyaml/constructor/SafeConstructor$ConstructYamlOmap
  (Lorg/yaml/snakeyaml/constructor/SafeConstructor;)V
 construct
  (Lorg/yaml/snakeyaml/nodes/Node;)Ljava/lang/Object;
- (Lorg/yaml/snakeyaml/nodes/Node;)Ljava/lang/Object;
+ (Lorg/yaml/snakeyaml/nodes/Node;)L1java/lang/Object;
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/constructor/SafeConstructor$ConstructYamlPairs.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/constructor/SafeConstructor$ConstructYamlPairs.eea
index 2a5bf68b4e..adf70d6648 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/constructor/SafeConstructor$ConstructYamlPairs.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/constructor/SafeConstructor$ConstructYamlPairs.eea
@@ -5,4 +5,4 @@ class org/yaml/snakeyaml/constructor/SafeConstructor$ConstructYamlPairs
  (Lorg/yaml/snakeyaml/constructor/SafeConstructor;)V
 construct
  (Lorg/yaml/snakeyaml/nodes/Node;)Ljava/lang/Object;
- (Lorg/yaml/snakeyaml/nodes/Node;)Ljava/lang/Object;
+ (Lorg/yaml/snakeyaml/nodes/Node;)L1java/lang/Object;
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/constructor/SafeConstructor.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/constructor/SafeConstructor.eea
index 21703c8002..8fa453ba25 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/constructor/SafeConstructor.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/constructor/SafeConstructor.eea
@@ -6,7 +6,7 @@ undefinedConstructor
 
 createLongOrBigInteger
  (Ljava/lang/String;I)Ljava/lang/Number;
- (Ljava/lang/String;I)Ljava/lang/Number;
+ (Ljava/lang/String;I)L1java/lang/Number;
 
 <init>
  (Lorg/yaml/snakeyaml/LoaderOptions;)V
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/error/Mark.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/error/Mark.eea
index 807af150ac..c1ca4771db 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/error/Mark.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/error/Mark.eea
@@ -17,7 +17,7 @@ get_snippet
  ()Ljava/lang/String;
 get_snippet
  (II)Ljava/lang/String;
- (II)Ljava/lang/String;
+ (II)L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/events/CollectionStartEvent.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/events/CollectionStartEvent.eea
index 99bf4cc02a..0e7ed9419d 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/events/CollectionStartEvent.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/events/CollectionStartEvent.eea
@@ -5,7 +5,7 @@ class org/yaml/snakeyaml/events/CollectionStartEvent
  (Ljava/lang/String;Ljava/lang/String;ZLorg/yaml/snakeyaml/error/Mark;Lorg/yaml/snakeyaml/error/Mark;Lorg/yaml/snakeyaml/DumperOptions$FlowStyle;)V
 getArguments
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.yaml.snakeyaml.events.NodeEvent)
 getFlowStyle
  ()Lorg/yaml/snakeyaml/DumperOptions$FlowStyle;
  ()Lorg/yaml/snakeyaml/DumperOptions$FlowStyle;
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/events/CommentEvent.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/events/CommentEvent.eea
index 46b4c4a1b7..6ba50ffe8a 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/events/CommentEvent.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/events/CommentEvent.eea
@@ -5,7 +5,7 @@ class org/yaml/snakeyaml/events/CommentEvent
  (Lorg/yaml/snakeyaml/comments/CommentType;Ljava/lang/String;Lorg/yaml/snakeyaml/error/Mark;Lorg/yaml/snakeyaml/error/Mark;)V
 getArguments
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.yaml.snakeyaml.events.Event)
 getCommentType
  ()Lorg/yaml/snakeyaml/comments/CommentType;
  ()Lorg/yaml/snakeyaml/comments/CommentType;
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/events/Event.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/events/Event.eea
index 595ad3a4ae..90631f281b 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/events/Event.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/events/Event.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getArguments
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getEndMark
  ()Lorg/yaml/snakeyaml/error/Mark;
  ()Lorg/yaml/snakeyaml/error/Mark;
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/events/NodeEvent.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/events/NodeEvent.eea
index 992bdbfead..962ff0fbe7 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/events/NodeEvent.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/events/NodeEvent.eea
@@ -8,4 +8,4 @@ getAnchor
  ()Ljava/lang/String;
 getArguments
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.yaml.snakeyaml.events.Event)
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/events/ScalarEvent.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/events/ScalarEvent.eea
index 8a73299c96..4ea1251a8d 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/events/ScalarEvent.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/events/ScalarEvent.eea
@@ -5,7 +5,7 @@ class org/yaml/snakeyaml/events/ScalarEvent
  (Ljava/lang/String;Ljava/lang/String;Lorg/yaml/snakeyaml/events/ImplicitTuple;Ljava/lang/String;Lorg/yaml/snakeyaml/error/Mark;Lorg/yaml/snakeyaml/error/Mark;Lorg/yaml/snakeyaml/DumperOptions$ScalarStyle;)V
 getArguments
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.yaml.snakeyaml.events.NodeEvent)
 getEventId
  ()Lorg/yaml/snakeyaml/events/Event$ID;
  ()Lorg/yaml/snakeyaml/events/Event$ID;
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/extensions/compactnotation/CompactConstructor.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/extensions/compactnotation/CompactConstructor.eea
index fa6137369a..ea8f52c9cc 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/extensions/compactnotation/CompactConstructor.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/extensions/compactnotation/CompactConstructor.eea
@@ -11,13 +11,13 @@ constructCompactFormat
  (Lorg/yaml/snakeyaml/nodes/ScalarNode;Lorg/yaml/snakeyaml/extensions/compactnotation/CompactData;)Ljava/lang/Object;
 createCompactConstruct
  ()Lorg/yaml/snakeyaml/constructor/Construct;
- ()Lorg/yaml/snakeyaml/constructor/Construct;
+ ()L1org/yaml/snakeyaml/constructor/Construct;
 createInstance
  (Lorg/yaml/snakeyaml/nodes/ScalarNode;Lorg/yaml/snakeyaml/extensions/compactnotation/CompactData;)Ljava/lang/Object;
- (Lorg/yaml/snakeyaml/nodes/ScalarNode;Lorg/yaml/snakeyaml/extensions/compactnotation/CompactData;)Ljava/lang/Object;
+ (Lorg/yaml/snakeyaml/nodes/ScalarNode;Lorg/yaml/snakeyaml/extensions/compactnotation/CompactData;)L1java/lang/Object;
 getCompactData
  (Ljava/lang/String;)Lorg/yaml/snakeyaml/extensions/compactnotation/CompactData;
- (Ljava/lang/String;)Lorg/yaml/snakeyaml/extensions/compactnotation/CompactData;
+ (Ljava/lang/String;)L0org/yaml/snakeyaml/extensions/compactnotation/CompactData;
 getConstructor
  (Lorg/yaml/snakeyaml/nodes/Node;)Lorg/yaml/snakeyaml/constructor/Construct;
  (Lorg/yaml/snakeyaml/nodes/Node;)Lorg/yaml/snakeyaml/constructor/Construct;
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/external/biz/base64Coder/Base64Coder.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/external/biz/base64Coder/Base64Coder.eea
index 601271c6fa..0ac4a78e9a 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/external/biz/base64Coder/Base64Coder.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/external/biz/base64Coder/Base64Coder.eea
@@ -8,13 +8,13 @@ decode
  ([C)[B
 decode
  ([CII)[B
- ([CII)[B
+ ([CII)[1B
 decodeLines
  (Ljava/lang/String;)[B
  (Ljava/lang/String;)[B
 decodeString
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 encode
  ([B)[C
  ([B)[C
@@ -23,13 +23,13 @@ encode
  ([BI)[C
 encode
  ([BII)[C
- ([BII)[C
+ ([BII)[1C
 encodeLines
  ([B)Ljava/lang/String;
  ([B)Ljava/lang/String;
 encodeLines
  ([BIIILjava/lang/String;)Ljava/lang/String;
- ([BIIILjava/lang/String;)Ljava/lang/String;
+ ([BIIILjava/lang/String;)L1java/lang/String;
 encodeString
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/PercentEscaper.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/PercentEscaper.eea
index 0dddb0f37f..74f203e3d3 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/PercentEscaper.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/PercentEscaper.eea
@@ -15,7 +15,7 @@ SAFEQUERYSTRINGCHARS_URLENCODER
  (Ljava/lang/String;Z)V
 escape
  (I)[C
- (I)[C
+ (I)[0C
 escape
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/UnicodeEscaper.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/UnicodeEscaper.eea
index d22afca75f..7ab48b7f67 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/UnicodeEscaper.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/UnicodeEscaper.eea
@@ -9,7 +9,7 @@ escape
  (I)[C
 escape
  (Ljava/lang/Appendable;)Ljava/lang/Appendable;
- (Ljava/lang/Appendable;)Ljava/lang/Appendable;
+ (Ljava/lang/Appendable;)L1java/lang/Appendable;
 escape
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/internal/Logger.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/internal/Logger.eea
index ead4b43342..b66bc369d5 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/internal/Logger.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/internal/Logger.eea
@@ -2,7 +2,7 @@ class org/yaml/snakeyaml/internal/Logger
 
 getLogger
  (Ljava/lang/String;)Lorg/yaml/snakeyaml/internal/Logger;
- (Ljava/lang/String;)Lorg/yaml/snakeyaml/internal/Logger;
+ (Ljava/lang/String;)L1org/yaml/snakeyaml/internal/Logger;
 
 isLoggable
  (Lorg/yaml/snakeyaml/internal/Logger$Level;)Z
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/introspector/MissingProperty.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/introspector/MissingProperty.eea
index 9d1f811234..61cb87e585 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/introspector/MissingProperty.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/introspector/MissingProperty.eea
@@ -8,7 +8,7 @@ get
  (Ljava/lang/Object;)Ljava/lang/Object;
 getActualTypeArguments
  ()[Ljava/lang/Class<*>;
- ()[Ljava/lang/Class<*>;
+ ()[1Ljava/lang/Class<*>;
 getAnnotation
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
  <A::Ljava/lang/annotation/Annotation;>(L1java/lang/Class<TA;>;)T0A; # @Inherited(org.yaml.snakeyaml.introspector.Property)
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/introspector/PropertyUtils.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/introspector/PropertyUtils.eea
index aff153de5e..dd3f5efa1b 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/introspector/PropertyUtils.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/introspector/PropertyUtils.eea
@@ -2,7 +2,7 @@ class org/yaml/snakeyaml/introspector/PropertyUtils
 
 createPropertySet
  (Ljava/lang/Class<+Ljava/lang/Object;>;Lorg/yaml/snakeyaml/introspector/BeanAccess;)Ljava/util/Set<Lorg/yaml/snakeyaml/introspector/Property;>;
- (Ljava/lang/Class<+Ljava/lang/Object;>;Lorg/yaml/snakeyaml/introspector/BeanAccess;)Ljava/util/Set<Lorg/yaml/snakeyaml/introspector/Property;>;
+ (Ljava/lang/Class<+Ljava/lang/Object;>;Lorg/yaml/snakeyaml/introspector/BeanAccess;)L1java/util/Set<Lorg/yaml/snakeyaml/introspector/Property;>;
 getProperties
  (Ljava/lang/Class<+Ljava/lang/Object;>;)Ljava/util/Set<Lorg/yaml/snakeyaml/introspector/Property;>;
  (Ljava/lang/Class<+Ljava/lang/Object;>;)Ljava/util/Set<Lorg/yaml/snakeyaml/introspector/Property;>;
@@ -17,7 +17,7 @@ getProperty
  (Ljava/lang/Class<+Ljava/lang/Object;>;Ljava/lang/String;)Lorg/yaml/snakeyaml/introspector/Property;
 getProperty
  (Ljava/lang/Class<+Ljava/lang/Object;>;Ljava/lang/String;Lorg/yaml/snakeyaml/introspector/BeanAccess;)Lorg/yaml/snakeyaml/introspector/Property;
- (Ljava/lang/Class<+Ljava/lang/Object;>;Ljava/lang/String;Lorg/yaml/snakeyaml/introspector/BeanAccess;)Lorg/yaml/snakeyaml/introspector/Property;
+ (Ljava/lang/Class<+Ljava/lang/Object;>;Ljava/lang/String;Lorg/yaml/snakeyaml/introspector/BeanAccess;)L1org/yaml/snakeyaml/introspector/Property;
 setBeanAccess
  (Lorg/yaml/snakeyaml/introspector/BeanAccess;)V
  (Lorg/yaml/snakeyaml/introspector/BeanAccess;)V
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/representer/BaseRepresenter.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/representer/BaseRepresenter.eea
index 068082e32b..2bc6cd1138 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/representer/BaseRepresenter.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/representer/BaseRepresenter.eea
@@ -39,16 +39,16 @@ representData
  (Ljava/lang/Object;)Lorg/yaml/snakeyaml/nodes/Node;
 representMapping
  (Lorg/yaml/snakeyaml/nodes/Tag;Ljava/util/Map<**>;Lorg/yaml/snakeyaml/DumperOptions$FlowStyle;)Lorg/yaml/snakeyaml/nodes/Node;
- (Lorg/yaml/snakeyaml/nodes/Tag;Ljava/util/Map<**>;Lorg/yaml/snakeyaml/DumperOptions$FlowStyle;)Lorg/yaml/snakeyaml/nodes/Node;
+ (Lorg/yaml/snakeyaml/nodes/Tag;Ljava/util/Map<**>;Lorg/yaml/snakeyaml/DumperOptions$FlowStyle;)L1org/yaml/snakeyaml/nodes/Node;
 representScalar
  (Lorg/yaml/snakeyaml/nodes/Tag;Ljava/lang/String;)Lorg/yaml/snakeyaml/nodes/Node;
  (Lorg/yaml/snakeyaml/nodes/Tag;Ljava/lang/String;)Lorg/yaml/snakeyaml/nodes/Node;
 representScalar
  (Lorg/yaml/snakeyaml/nodes/Tag;Ljava/lang/String;Lorg/yaml/snakeyaml/DumperOptions$ScalarStyle;)Lorg/yaml/snakeyaml/nodes/Node;
- (Lorg/yaml/snakeyaml/nodes/Tag;Ljava/lang/String;Lorg/yaml/snakeyaml/DumperOptions$ScalarStyle;)Lorg/yaml/snakeyaml/nodes/Node;
+ (Lorg/yaml/snakeyaml/nodes/Tag;Ljava/lang/String;Lorg/yaml/snakeyaml/DumperOptions$ScalarStyle;)L1org/yaml/snakeyaml/nodes/Node;
 representSequence
  (Lorg/yaml/snakeyaml/nodes/Tag;Ljava/lang/Iterable<*>;Lorg/yaml/snakeyaml/DumperOptions$FlowStyle;)Lorg/yaml/snakeyaml/nodes/Node;
- (Lorg/yaml/snakeyaml/nodes/Tag;Ljava/lang/Iterable<*>;Lorg/yaml/snakeyaml/DumperOptions$FlowStyle;)Lorg/yaml/snakeyaml/nodes/Node;
+ (Lorg/yaml/snakeyaml/nodes/Tag;Ljava/lang/Iterable<*>;Lorg/yaml/snakeyaml/DumperOptions$FlowStyle;)L1org/yaml/snakeyaml/nodes/Node;
 setDefaultFlowStyle
  (Lorg/yaml/snakeyaml/DumperOptions$FlowStyle;)V
  (Lorg/yaml/snakeyaml/DumperOptions$FlowStyle;)V
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/util/ArrayUtils.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/util/ArrayUtils.eea
index 9d3d707e72..544285e88c 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/util/ArrayUtils.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/util/ArrayUtils.eea
@@ -2,7 +2,7 @@ class org/yaml/snakeyaml/util/ArrayUtils
 
 toUnmodifiableCompositeList
  <E:Ljava/lang/Object;>([TE;[TE;)Ljava/util/List<TE;>;
- <E:Ljava/lang/Object;>([TE;[TE;)Ljava/util/List<TE;>;
+ <E:Ljava/lang/Object;>([TE;[TE;)L1java/util/List<TE;>;
 toUnmodifiableList
  <E:Ljava/lang/Object;>([TE;)Ljava/util/List<TE;>;
- <E:Ljava/lang/Object;>([TE;)Ljava/util/List<TE;>;
+ <E:Ljava/lang/Object;>([TE;)L1java/util/List<TE;>;
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/util/MergeUtils.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/util/MergeUtils.eea
index ebf4cfa839..08055e8a6b 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/util/MergeUtils.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/util/MergeUtils.eea
@@ -5,4 +5,4 @@ asMappingNode
  (Lorg/yaml/snakeyaml/nodes/Node;)Lorg/yaml/snakeyaml/nodes/MappingNode;
 flatten
  (Lorg/yaml/snakeyaml/nodes/MappingNode;)Ljava/util/List<Lorg/yaml/snakeyaml/nodes/NodeTuple;>;
- (Lorg/yaml/snakeyaml/nodes/MappingNode;)Ljava/util/List<Lorg/yaml/snakeyaml/nodes/NodeTuple;>;
+ (Lorg/yaml/snakeyaml/nodes/MappingNode;)L1java/util/List<Lorg/yaml/snakeyaml/nodes/NodeTuple;>;
diff --git a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/util/UriEncoder.eea b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/util/UriEncoder.eea
index 3ae32f415a..f64cb26ea5 100644
--- a/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/util/UriEncoder.eea
+++ b/libs/eea-snakeyaml-2/src/main/resources/org/yaml/snakeyaml/util/UriEncoder.eea
@@ -5,7 +5,7 @@ decode
  (Ljava/lang/String;)Ljava/lang/String;
 decode
  (Ljava/nio/ByteBuffer;)Ljava/lang/String;
- (Ljava/nio/ByteBuffer;)Ljava/lang/String;
+ (Ljava/nio/ByteBuffer;)L1java/lang/String;
 encode
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/aspectj/AbstractAspectJAdvice.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/aspectj/AbstractAspectJAdvice.eea
index 53602404d9..b14cead3bf 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/aspectj/AbstractAspectJAdvice.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/aspectj/AbstractAspectJAdvice.eea
@@ -6,7 +6,7 @@ JOIN_POINT_KEY
 
 currentJoinPoint
  ()Lorg/aspectj/lang/JoinPoint;
- ()Lorg/aspectj/lang/JoinPoint;
+ ()L1org/aspectj/lang/JoinPoint;
 
 aspectJAdviceMethod
  Ljava/lang/reflect/Method;
@@ -17,13 +17,13 @@ aspectJAdviceMethod
  (Ljava/lang/reflect/Method;Lorg/springframework/aop/aspectj/AspectJExpressionPointcut;Lorg/springframework/aop/aspectj/AspectInstanceFactory;)V
 argBinding
  (Lorg/aspectj/lang/JoinPoint;Lorg/aspectj/weaver/tools/JoinPointMatch;Ljava/lang/Object;Ljava/lang/Throwable;)[Ljava/lang/Object;
- (Lorg/aspectj/lang/JoinPoint;Lorg/aspectj/weaver/tools/JoinPointMatch;Ljava/lang/Object;Ljava/lang/Throwable;)[Ljava/lang/Object;
+ (Lorg/aspectj/lang/JoinPoint;Lorg/aspectj/weaver/tools/JoinPointMatch;Ljava/lang/Object;Ljava/lang/Throwable;)[1Ljava/lang/Object;
 buildSafePointcut
  ()Lorg/springframework/aop/Pointcut;
- ()Lorg/springframework/aop/Pointcut;
+ ()L1org/springframework/aop/Pointcut;
 createParameterNameDiscoverer
  ()Lorg/springframework/core/ParameterNameDiscoverer;
- ()Lorg/springframework/core/ParameterNameDiscoverer;
+ ()L1org/springframework/core/ParameterNameDiscoverer;
 getAspectClassLoader
  ()Ljava/lang/ClassLoader;
  ()L0java/lang/ClassLoader;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/aspectj/AspectJAroundAdvice.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/aspectj/AspectJAroundAdvice.eea
index 2c6359699c..1cf0fdd2fc 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/aspectj/AspectJAroundAdvice.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/aspectj/AspectJAroundAdvice.eea
@@ -8,4 +8,4 @@ invoke
  (Lorg/aopalliance/intercept/MethodInvocation;)L0java/lang/Object;
 lazyGetProceedingJoinPoint
  (Lorg/springframework/aop/ProxyMethodInvocation;)Lorg/aspectj/lang/ProceedingJoinPoint;
- (Lorg/springframework/aop/ProxyMethodInvocation;)Lorg/aspectj/lang/ProceedingJoinPoint;
+ (Lorg/springframework/aop/ProxyMethodInvocation;)L1org/aspectj/lang/ProceedingJoinPoint;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.eea
index b2846de43b..b0916bc811 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.eea
@@ -8,7 +8,7 @@ getArgs
  ()[Ljava/lang/Object;
 getKind
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSignature
  ()Lorg/aspectj/lang/Signature;
  ()Lorg/aspectj/lang/Signature;
@@ -35,10 +35,10 @@ set$AroundClosure
  (Lorg/aspectj/runtime/internal/AroundClosure;)V
 toLongString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toShortString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.eea
index 53e71e6ecf..6f1e3de641 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.eea
@@ -11,4 +11,4 @@ getAdvisor
  (Ljava/lang/reflect/Method;Lorg/springframework/aop/aspectj/annotation/MetadataAwareAspectInstanceFactory;ILjava/lang/String;)L0org/springframework/aop/Advisor; # @Inherited(org.springframework.aop.aspectj.annotation.AspectJAdvisorFactory)
 getAdvisors
  (Lorg/springframework/aop/aspectj/annotation/MetadataAwareAspectInstanceFactory;)Ljava/util/List<Lorg/springframework/aop/Advisor;>;
- (Lorg/springframework/aop/aspectj/annotation/MetadataAwareAspectInstanceFactory;)Ljava/util/List<Lorg/springframework/aop/Advisor;>;
+ (Lorg/springframework/aop/aspectj/annotation/MetadataAwareAspectInstanceFactory;)L1java/util/List<Lorg/springframework/aop/Advisor;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.eea
index 94fcd2ab42..2571ce8735 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.eea
@@ -2,10 +2,10 @@ class org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDeco
 
 createInterceptorDefinition
  (Lorg/w3c/dom/Node;)Lorg/springframework/beans/factory/config/BeanDefinition;
- (Lorg/w3c/dom/Node;)Lorg/springframework/beans/factory/config/BeanDefinition;
+ (Lorg/w3c/dom/Node;)L1org/springframework/beans/factory/config/BeanDefinition;
 decorate
  (Lorg/w3c/dom/Node;Lorg/springframework/beans/factory/config/BeanDefinitionHolder;Lorg/springframework/beans/factory/xml/ParserContext;)Lorg/springframework/beans/factory/config/BeanDefinitionHolder;
- (Lorg/w3c/dom/Node;Lorg/springframework/beans/factory/config/BeanDefinitionHolder;Lorg/springframework/beans/factory/xml/ParserContext;)Lorg/springframework/beans/factory/config/BeanDefinitionHolder;
+ (Lorg/w3c/dom/Node;Lorg/springframework/beans/factory/config/BeanDefinitionHolder;Lorg/springframework/beans/factory/xml/ParserContext;)L1org/springframework/beans/factory/config/BeanDefinitionHolder;
 getInterceptorNameSuffix
  (Lorg/springframework/beans/factory/config/BeanDefinition;)Ljava/lang/String;
- (Lorg/springframework/beans/factory/config/BeanDefinition;)Ljava/lang/String;
+ (Lorg/springframework/beans/factory/config/BeanDefinition;)L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/config/AdvisorComponentDefinition.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/config/AdvisorComponentDefinition.eea
index c1cd5c1b6f..fc81d8a9e0 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/config/AdvisorComponentDefinition.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/config/AdvisorComponentDefinition.eea
@@ -8,10 +8,10 @@ class org/springframework/aop/config/AdvisorComponentDefinition
  (Ljava/lang/String;Lorg/springframework/beans/factory/config/BeanDefinition;Lorg/springframework/beans/factory/config/BeanDefinition;)V
 getBeanDefinitions
  ()[Lorg/springframework/beans/factory/config/BeanDefinition;
- ()[Lorg/springframework/beans/factory/config/BeanDefinition;
+ ()[1Lorg/springframework/beans/factory/config/BeanDefinition; # @Inherited(org.springframework.beans.factory.parsing.AbstractComponentDefinition)
 getBeanReferences
  ()[Lorg/springframework/beans/factory/config/BeanReference;
- ()[Lorg/springframework/beans/factory/config/BeanReference;
+ ()[1Lorg/springframework/beans/factory/config/BeanReference; # @Inherited(org.springframework.beans.factory.parsing.AbstractComponentDefinition)
 getDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/config/AspectComponentDefinition.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/config/AspectComponentDefinition.eea
index 536f7b25a0..f780fffcba 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/config/AspectComponentDefinition.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/config/AspectComponentDefinition.eea
@@ -5,7 +5,7 @@ class org/springframework/aop/config/AspectComponentDefinition
  (Ljava/lang/String;[Lorg/springframework/beans/factory/config/BeanDefinition;[Lorg/springframework/beans/factory/config/BeanReference;Ljava/lang/Object;)V
 getBeanDefinitions
  ()[Lorg/springframework/beans/factory/config/BeanDefinition;
- ()[Lorg/springframework/beans/factory/config/BeanDefinition;
+ ()[1Lorg/springframework/beans/factory/config/BeanDefinition; # @Inherited(org.springframework.beans.factory.parsing.AbstractComponentDefinition)
 getBeanReferences
  ()[Lorg/springframework/beans/factory/config/BeanReference;
- ()[Lorg/springframework/beans/factory/config/BeanReference;
+ ()[1Lorg/springframework/beans/factory/config/BeanReference; # @Inherited(org.springframework.beans.factory.parsing.AbstractComponentDefinition)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/config/MethodLocatingFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/config/MethodLocatingFactoryBean.eea
index 9c58aa668b..135374f083 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/config/MethodLocatingFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/config/MethodLocatingFactoryBean.eea
@@ -9,7 +9,7 @@ getObject
  ()L0java/lang/reflect/Method;
 getObjectType
  ()Ljava/lang/Class<Ljava/lang/reflect/Method;>;
- ()Ljava/lang/Class<Ljava/lang/reflect/Method;>;
+ ()L1java/lang/Class<Ljava/lang/reflect/Method;>;
 setBeanFactory
  (Lorg/springframework/beans/factory/BeanFactory;)V
  (Lorg/springframework/beans/factory/BeanFactory;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/config/PointcutComponentDefinition.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/config/PointcutComponentDefinition.eea
index 64789327dc..246809dae2 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/config/PointcutComponentDefinition.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/config/PointcutComponentDefinition.eea
@@ -5,7 +5,7 @@ class org/springframework/aop/config/PointcutComponentDefinition
  (Ljava/lang/String;Lorg/springframework/beans/factory/config/BeanDefinition;Ljava/lang/String;)V
 getBeanDefinitions
  ()[Lorg/springframework/beans/factory/config/BeanDefinition;
- ()[Lorg/springframework/beans/factory/config/BeanDefinition;
+ ()[1Lorg/springframework/beans/factory/config/BeanDefinition; # @Inherited(org.springframework.beans.factory.parsing.AbstractComponentDefinition)
 getDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.eea
index 56a0b4e2b4..264aff8a65 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.eea
@@ -21,4 +21,4 @@ postProcessBeforeInitialization
  (Ljava/lang/Object;Ljava/lang/String;)L0java/lang/Object; # @Inherited(org.springframework.beans.factory.config.BeanPostProcessor)
 prepareProxyFactory
  (Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/aop/framework/ProxyFactory;
- (Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/aop/framework/ProxyFactory;
+ (Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/aop/framework/ProxyFactory;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.eea
index d896c074be..1d4729c83b 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.eea
@@ -6,10 +6,10 @@ super org/springframework/beans/factory/FactoryBean
 
 createMainInterceptor
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 createTargetSource
  (Ljava/lang/Object;)Lorg/springframework/aop/TargetSource;
- (Ljava/lang/Object;)Lorg/springframework/aop/TargetSource;
+ (Ljava/lang/Object;)L1org/springframework/aop/TargetSource;
 getObject
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/AdvisedSupport.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/AdvisedSupport.eea
index 2de4415897..cb91b232ff 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/AdvisedSupport.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/AdvisedSupport.eea
@@ -99,7 +99,7 @@ setTargetSource
  (Lorg/springframework/aop/TargetSource;)V
 toProxyConfigString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(org.springframework.aop.framework.ProxyConfig)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/AopProxyFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/AopProxyFactory.eea
index 1ba7e63697..6e4f73c7c8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/AopProxyFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/AopProxyFactory.eea
@@ -2,4 +2,4 @@ class org/springframework/aop/framework/AopProxyFactory
 
 createAopProxy
  (Lorg/springframework/aop/framework/AdvisedSupport;)Lorg/springframework/aop/framework/AopProxy;
- (Lorg/springframework/aop/framework/AdvisedSupport;)Lorg/springframework/aop/framework/AopProxy;
+ (Lorg/springframework/aop/framework/AdvisedSupport;)L1org/springframework/aop/framework/AopProxy;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/DefaultAopProxyFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/DefaultAopProxyFactory.eea
index 2c200873b8..0f5209a06d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/DefaultAopProxyFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/DefaultAopProxyFactory.eea
@@ -2,4 +2,4 @@ class org/springframework/aop/framework/DefaultAopProxyFactory
 
 createAopProxy
  (Lorg/springframework/aop/framework/AdvisedSupport;)Lorg/springframework/aop/framework/AopProxy;
- (Lorg/springframework/aop/framework/AdvisedSupport;)Lorg/springframework/aop/framework/AopProxy;
+ (Lorg/springframework/aop/framework/AdvisedSupport;)L1org/springframework/aop/framework/AopProxy; # @Inherited(org.springframework.aop.framework.AopProxyFactory)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/ProxyCreatorSupport.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/ProxyCreatorSupport.eea
index afaac91bcb..86de242459 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/ProxyCreatorSupport.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/ProxyCreatorSupport.eea
@@ -8,7 +8,7 @@ addListener
  (L1org/springframework/aop/framework/AdvisedSupportListener;)V
 createAopProxy
  ()Lorg/springframework/aop/framework/AopProxy;
- ()Lorg/springframework/aop/framework/AopProxy;
+ ()L1org/springframework/aop/framework/AopProxy;
 getAopProxyFactory
  ()Lorg/springframework/aop/framework/AopProxyFactory;
  ()Lorg/springframework/aop/framework/AopProxyFactory;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/ProxyFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/ProxyFactoryBean.eea
index d646c9e454..be0ce73106 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/ProxyFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/ProxyFactoryBean.eea
@@ -14,7 +14,7 @@ logger
 
 createCompositeInterface
  ([Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
- ([Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
+ ([Ljava/lang/Class<*>;)L1java/lang/Class<*>;
 getObject
  ()Ljava/lang/Object;
  ()L0java/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.eea
index 17f7357b10..b86f28be33 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.eea
@@ -13,10 +13,10 @@ logger
 
 buildAdvisors
  (Ljava/lang/String;[Ljava/lang/Object;)[Lorg/springframework/aop/Advisor;
- (Ljava/lang/String;[Ljava/lang/Object;)[Lorg/springframework/aop/Advisor;
+ (Ljava/lang/String;[Ljava/lang/Object;)[1Lorg/springframework/aop/Advisor;
 createProxy
  (Ljava/lang/Class<*>;Ljava/lang/String;[Ljava/lang/Object;Lorg/springframework/aop/TargetSource;)Ljava/lang/Object;
- (Ljava/lang/Class<*>;Ljava/lang/String;[Ljava/lang/Object;Lorg/springframework/aop/TargetSource;)Ljava/lang/Object;
+ (Ljava/lang/Class<*>;Ljava/lang/String;[Ljava/lang/Object;Lorg/springframework/aop/TargetSource;)L1java/lang/Object;
 customizeProxyFactory
  (Lorg/springframework/aop/framework/ProxyFactory;)V
  (Lorg/springframework/aop/framework/ProxyFactory;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/autoproxy/AbstractBeanFactoryAwareAdvisingPostProcessor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/autoproxy/AbstractBeanFactoryAwareAdvisingPostProcessor.eea
index c15a2d8d95..af98b7a34e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/autoproxy/AbstractBeanFactoryAwareAdvisingPostProcessor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/autoproxy/AbstractBeanFactoryAwareAdvisingPostProcessor.eea
@@ -5,7 +5,7 @@ isEligible
  (Ljava/lang/Object;Ljava/lang/String;)Z
 prepareProxyFactory
  (Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/aop/framework/ProxyFactory;
- (Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/aop/framework/ProxyFactory;
+ (Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/aop/framework/ProxyFactory; # @Inherited(org.springframework.aop.framework.AbstractAdvisingBeanPostProcessor)
 setBeanFactory
  (Lorg/springframework/beans/factory/BeanFactory;)V
  (Lorg/springframework/beans/factory/BeanFactory;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/autoproxy/BeanFactoryAdvisorRetrievalHelper.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/autoproxy/BeanFactoryAdvisorRetrievalHelper.eea
index 32e8b7c0ea..ae038f682a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/autoproxy/BeanFactoryAdvisorRetrievalHelper.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/framework/autoproxy/BeanFactoryAdvisorRetrievalHelper.eea
@@ -5,7 +5,7 @@ class org/springframework/aop/framework/autoproxy/BeanFactoryAdvisorRetrievalHel
  (Lorg/springframework/beans/factory/config/ConfigurableListableBeanFactory;)V
 findAdvisorBeans
  ()Ljava/util/List<Lorg/springframework/aop/Advisor;>;
- ()Ljava/util/List<Lorg/springframework/aop/Advisor;>;
+ ()L1java/util/List<Lorg/springframework/aop/Advisor;>;
 isEligibleBean
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.eea
index 0b6d1c5115..764ad709b7 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.eea
@@ -2,7 +2,7 @@ class org/springframework/aop/interceptor/AbstractMonitoringInterceptor
 
 createInvocationTraceName
  (Lorg/aopalliance/intercept/MethodInvocation;)Ljava/lang/String;
- (Lorg/aopalliance/intercept/MethodInvocation;)Ljava/lang/String;
+ (Lorg/aopalliance/intercept/MethodInvocation;)L1java/lang/String;
 getPrefix
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/interceptor/CustomizableTraceInterceptor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/interceptor/CustomizableTraceInterceptor.eea
index a0ca2555b6..4cab75b341 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/interceptor/CustomizableTraceInterceptor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/interceptor/CustomizableTraceInterceptor.eea
@@ -30,7 +30,7 @@ invokeUnderTrace
  (Lorg/aopalliance/intercept/MethodInvocation;Lorg/apache/commons/logging/Log;)L0java/lang/Object; # @Inherited(org.springframework.aop.interceptor.AbstractTraceInterceptor)
 replacePlaceholders
  (Ljava/lang/String;Lorg/aopalliance/intercept/MethodInvocation;Ljava/lang/Object;Ljava/lang/Throwable;J)Ljava/lang/String;
- (Ljava/lang/String;Lorg/aopalliance/intercept/MethodInvocation;Ljava/lang/Object;Ljava/lang/Throwable;J)Ljava/lang/String;
+ (Ljava/lang/String;Lorg/aopalliance/intercept/MethodInvocation;Ljava/lang/Object;Ljava/lang/Throwable;J)L1java/lang/String;
 setEnterMessage
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/interceptor/DebugInterceptor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/interceptor/DebugInterceptor.eea
index 3a4ddee2b1..06fe959efe 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/interceptor/DebugInterceptor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/interceptor/DebugInterceptor.eea
@@ -2,7 +2,7 @@ class org/springframework/aop/interceptor/DebugInterceptor
 
 getInvocationDescription
  (Lorg/aopalliance/intercept/MethodInvocation;)Ljava/lang/String;
- (Lorg/aopalliance/intercept/MethodInvocation;)Ljava/lang/String;
+ (Lorg/aopalliance/intercept/MethodInvocation;)L1java/lang/String; # @Inherited(org.springframework.aop.interceptor.SimpleTraceInterceptor)
 invoke
  (Lorg/aopalliance/intercept/MethodInvocation;)Ljava/lang/Object;
  (Lorg/aopalliance/intercept/MethodInvocation;)L0java/lang/Object; # @Inherited(org.springframework.aop.interceptor.AbstractTraceInterceptor)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.eea
index 89623e2780..9d989a215c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.eea
@@ -2,10 +2,10 @@ class org/springframework/aop/interceptor/ExposeBeanNameAdvisors
 
 createAdvisorIntroducingNamedBean
  (Ljava/lang/String;)Lorg/springframework/aop/Advisor;
- (Ljava/lang/String;)Lorg/springframework/aop/Advisor;
+ (Ljava/lang/String;)L1org/springframework/aop/Advisor;
 createAdvisorWithoutIntroduction
  (Ljava/lang/String;)Lorg/springframework/aop/Advisor;
- (Ljava/lang/String;)Lorg/springframework/aop/Advisor;
+ (Ljava/lang/String;)L1org/springframework/aop/Advisor;
 getBeanName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/interceptor/SimpleTraceInterceptor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/interceptor/SimpleTraceInterceptor.eea
index 34f43e5c9b..5bbb4ffcc2 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/interceptor/SimpleTraceInterceptor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/interceptor/SimpleTraceInterceptor.eea
@@ -2,7 +2,7 @@ class org/springframework/aop/interceptor/SimpleTraceInterceptor
 
 getInvocationDescription
  (Lorg/aopalliance/intercept/MethodInvocation;)Ljava/lang/String;
- (Lorg/aopalliance/intercept/MethodInvocation;)Ljava/lang/String;
+ (Lorg/aopalliance/intercept/MethodInvocation;)L1java/lang/String;
 invokeUnderTrace
  (Lorg/aopalliance/intercept/MethodInvocation;Lorg/apache/commons/logging/Log;)Ljava/lang/Object;
  (Lorg/aopalliance/intercept/MethodInvocation;Lorg/apache/commons/logging/Log;)L0java/lang/Object; # @Inherited(org.springframework.aop.interceptor.AbstractTraceInterceptor)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/scope/ScopedProxyUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/scope/ScopedProxyUtils.eea
index af68380106..3d82e94d68 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/scope/ScopedProxyUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/scope/ScopedProxyUtils.eea
@@ -2,13 +2,13 @@ class org/springframework/aop/scope/ScopedProxyUtils
 
 createScopedProxy
  (Lorg/springframework/beans/factory/config/BeanDefinitionHolder;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;Z)Lorg/springframework/beans/factory/config/BeanDefinitionHolder;
- (Lorg/springframework/beans/factory/config/BeanDefinitionHolder;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;Z)Lorg/springframework/beans/factory/config/BeanDefinitionHolder;
+ (Lorg/springframework/beans/factory/config/BeanDefinitionHolder;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;Z)L1org/springframework/beans/factory/config/BeanDefinitionHolder;
 getOriginalBeanName
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
 getTargetBeanName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 isScopedTarget
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/support/ClassFilters.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/support/ClassFilters.eea
index 8067451f63..4f9e1f494d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/support/ClassFilters.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/support/ClassFilters.eea
@@ -5,10 +5,10 @@ intersection
  (Lorg/springframework/aop/ClassFilter;Lorg/springframework/aop/ClassFilter;)Lorg/springframework/aop/ClassFilter;
 intersection
  ([Lorg/springframework/aop/ClassFilter;)Lorg/springframework/aop/ClassFilter;
- ([Lorg/springframework/aop/ClassFilter;)Lorg/springframework/aop/ClassFilter;
+ ([Lorg/springframework/aop/ClassFilter;)L1org/springframework/aop/ClassFilter;
 union
  (Lorg/springframework/aop/ClassFilter;Lorg/springframework/aop/ClassFilter;)Lorg/springframework/aop/ClassFilter;
  (Lorg/springframework/aop/ClassFilter;Lorg/springframework/aop/ClassFilter;)Lorg/springframework/aop/ClassFilter;
 union
  ([Lorg/springframework/aop/ClassFilter;)Lorg/springframework/aop/ClassFilter;
- ([Lorg/springframework/aop/ClassFilter;)Lorg/springframework/aop/ClassFilter;
+ ([Lorg/springframework/aop/ClassFilter;)L1org/springframework/aop/ClassFilter;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/support/MethodMatchers.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/support/MethodMatchers.eea
index 9b70ee1c67..fc21e4eb5c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/support/MethodMatchers.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/support/MethodMatchers.eea
@@ -2,10 +2,10 @@ class org/springframework/aop/support/MethodMatchers
 
 intersection
  (Lorg/springframework/aop/MethodMatcher;Lorg/springframework/aop/MethodMatcher;)Lorg/springframework/aop/MethodMatcher;
- (Lorg/springframework/aop/MethodMatcher;Lorg/springframework/aop/MethodMatcher;)Lorg/springframework/aop/MethodMatcher;
+ (Lorg/springframework/aop/MethodMatcher;Lorg/springframework/aop/MethodMatcher;)L1org/springframework/aop/MethodMatcher;
 matches
  (Lorg/springframework/aop/MethodMatcher;Ljava/lang/reflect/Method;Ljava/lang/Class<*>;Z)Z
  (Lorg/springframework/aop/MethodMatcher;Ljava/lang/reflect/Method;Ljava/lang/Class<*>;Z)Z
 union
  (Lorg/springframework/aop/MethodMatcher;Lorg/springframework/aop/MethodMatcher;)Lorg/springframework/aop/MethodMatcher;
- (Lorg/springframework/aop/MethodMatcher;Lorg/springframework/aop/MethodMatcher;)Lorg/springframework/aop/MethodMatcher;
+ (Lorg/springframework/aop/MethodMatcher;Lorg/springframework/aop/MethodMatcher;)L1org/springframework/aop/MethodMatcher;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/support/RegexpMethodPointcutAdvisor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/support/RegexpMethodPointcutAdvisor.eea
index 3fbeae416c..a538ca3c25 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/support/RegexpMethodPointcutAdvisor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/support/RegexpMethodPointcutAdvisor.eea
@@ -11,7 +11,7 @@ class org/springframework/aop/support/RegexpMethodPointcutAdvisor
  ([Ljava/lang/String;Lorg/aopalliance/aop/Advice;)V
 createPointcut
  ()Lorg/springframework/aop/support/AbstractRegexpMethodPointcut;
- ()Lorg/springframework/aop/support/AbstractRegexpMethodPointcut;
+ ()L1org/springframework/aop/support/AbstractRegexpMethodPointcut;
 getPointcut
  ()Lorg/springframework/aop/Pointcut;
  ()Lorg/springframework/aop/Pointcut;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.eea b/libs/eea-spring-5/src/main/resources/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.eea
index 6942de481e..7c6defa0d6 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.eea
@@ -2,10 +2,10 @@ class org/springframework/aop/support/annotation/AnnotationMatchingPointcut
 
 forClassAnnotation
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lorg/springframework/aop/support/annotation/AnnotationMatchingPointcut;
- (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lorg/springframework/aop/support/annotation/AnnotationMatchingPointcut;
+ (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)L1org/springframework/aop/support/annotation/AnnotationMatchingPointcut;
 forMethodAnnotation
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lorg/springframework/aop/support/annotation/AnnotationMatchingPointcut;
- (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lorg/springframework/aop/support/annotation/AnnotationMatchingPointcut;
+ (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)L1org/springframework/aop/support/annotation/AnnotationMatchingPointcut;
 
 <init>
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/asm/AnnotationVisitor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/asm/AnnotationVisitor.eea
index f115772e7b..a28d7850db 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/asm/AnnotationVisitor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/asm/AnnotationVisitor.eea
@@ -15,10 +15,10 @@ visit
  (Ljava/lang/String;Ljava/lang/Object;)V
 visitAnnotation
  (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;Ljava/lang/String;)L0org/springframework/asm/AnnotationVisitor;
 visitArray
  (Ljava/lang/String;)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;)L0org/springframework/asm/AnnotationVisitor;
 visitEnum
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/asm/Attribute.eea b/libs/eea-spring-5/src/main/resources/org/springframework/asm/Attribute.eea
index c32f790b27..1aa25518b7 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/asm/Attribute.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/asm/Attribute.eea
@@ -9,10 +9,10 @@ type
  (Ljava/lang/String;)V
 getLabels
  ()[Lorg/springframework/asm/Label;
- ()[Lorg/springframework/asm/Label;
+ ()[1Lorg/springframework/asm/Label;
 read
  (Lorg/springframework/asm/ClassReader;II[CI[Lorg/springframework/asm/Label;)Lorg/springframework/asm/Attribute;
- (Lorg/springframework/asm/ClassReader;II[CI[Lorg/springframework/asm/Label;)Lorg/springframework/asm/Attribute;
+ (Lorg/springframework/asm/ClassReader;II[CI[Lorg/springframework/asm/Label;)L1org/springframework/asm/Attribute;
 write
  (Lorg/springframework/asm/ClassWriter;[BIII)Lorg/springframework/asm/ByteVector;
- (Lorg/springframework/asm/ClassWriter;[BIII)Lorg/springframework/asm/ByteVector;
+ (Lorg/springframework/asm/ClassWriter;[BIII)L1org/springframework/asm/ByteVector;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/asm/ClassReader.eea b/libs/eea-spring-5/src/main/resources/org/springframework/asm/ClassReader.eea
index f895fa30cb..19520fb213 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/asm/ClassReader.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/asm/ClassReader.eea
@@ -27,7 +27,7 @@ getClassName
  ()Ljava/lang/String;
 getInterfaces
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 getSuperName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -48,4 +48,4 @@ readPackage
  (I[C)Ljava/lang/String;
 readUTF8
  (I[C)Ljava/lang/String;
- (I[C)Ljava/lang/String;
+ (I[C)L0java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/asm/ClassVisitor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/asm/ClassVisitor.eea
index ba2123d05a..6bc8bb7d89 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/asm/ClassVisitor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/asm/ClassVisitor.eea
@@ -15,22 +15,22 @@ visit
  (IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 visitAnnotation
  (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
 visitAttribute
  (Lorg/springframework/asm/Attribute;)V
  (Lorg/springframework/asm/Attribute;)V
 visitField
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/asm/FieldVisitor;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/asm/FieldVisitor;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)L0org/springframework/asm/FieldVisitor;
 visitInnerClass
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
 visitMethod
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)L0org/springframework/asm/MethodVisitor;
 visitModule
  (Ljava/lang/String;ILjava/lang/String;)Lorg/springframework/asm/ModuleVisitor;
- (Ljava/lang/String;ILjava/lang/String;)Lorg/springframework/asm/ModuleVisitor;
+ (Ljava/lang/String;ILjava/lang/String;)L0org/springframework/asm/ModuleVisitor;
 visitNestHost
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
@@ -45,10 +45,10 @@ visitPermittedSubclass
  (Ljava/lang/String;)V
 visitRecordComponent
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/asm/RecordComponentVisitor;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/asm/RecordComponentVisitor;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L0org/springframework/asm/RecordComponentVisitor;
 visitSource
  (Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;)V
 visitTypeAnnotation
  (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/asm/ClassWriter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/asm/ClassWriter.eea
index 6b6229b7a5..c1859ad87e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/asm/ClassWriter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/asm/ClassWriter.eea
@@ -56,22 +56,22 @@ visit
  (IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 visitAnnotation
  (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
 visitAttribute
  (Lorg/springframework/asm/Attribute;)V
  (Lorg/springframework/asm/Attribute;)V
 visitField
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/asm/FieldVisitor;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/asm/FieldVisitor;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)L0org/springframework/asm/FieldVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
 visitInnerClass
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
 visitMethod
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)L0org/springframework/asm/MethodVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
 visitModule
  (Ljava/lang/String;ILjava/lang/String;)Lorg/springframework/asm/ModuleVisitor;
- (Ljava/lang/String;ILjava/lang/String;)Lorg/springframework/asm/ModuleVisitor;
+ (Ljava/lang/String;ILjava/lang/String;)L0org/springframework/asm/ModuleVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
 visitNestHost
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
@@ -86,10 +86,10 @@ visitPermittedSubclass
  (Ljava/lang/String;)V
 visitRecordComponent
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/asm/RecordComponentVisitor;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/asm/RecordComponentVisitor;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L0org/springframework/asm/RecordComponentVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
 visitSource
  (Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;)V
 visitTypeAnnotation
  (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/asm/FieldVisitor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/asm/FieldVisitor.eea
index dc00c927a9..0a869c6539 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/asm/FieldVisitor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/asm/FieldVisitor.eea
@@ -12,10 +12,10 @@ getDelegate
  ()Lorg/springframework/asm/FieldVisitor;
 visitAnnotation
  (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
 visitAttribute
  (Lorg/springframework/asm/Attribute;)V
  (Lorg/springframework/asm/Attribute;)V
 visitTypeAnnotation
  (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/asm/MethodVisitor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/asm/MethodVisitor.eea
index 0aa9610711..a0925a24c0 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/asm/MethodVisitor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/asm/MethodVisitor.eea
@@ -12,10 +12,10 @@ getDelegate
  ()Lorg/springframework/asm/MethodVisitor;
 visitAnnotation
  (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
 visitAnnotationDefault
  ()Lorg/springframework/asm/AnnotationVisitor;
- ()Lorg/springframework/asm/AnnotationVisitor;
+ ()L0org/springframework/asm/AnnotationVisitor;
 visitAttribute
  (Lorg/springframework/asm/Attribute;)V
  (Lorg/springframework/asm/Attribute;)V
@@ -27,7 +27,7 @@ visitFrame
  (II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 visitInsnAnnotation
  (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
 visitInvokeDynamicInsn
  (Ljava/lang/String;Ljava/lang/String;Lorg/springframework/asm/Handle;[Ljava/lang/Object;)V
  (Ljava/lang/String;Ljava/lang/String;Lorg/springframework/asm/Handle;[Ljava/lang/Object;)V
@@ -48,7 +48,7 @@ visitLocalVariable
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lorg/springframework/asm/Label;Lorg/springframework/asm/Label;I)V
 visitLocalVariableAnnotation
  (ILorg/springframework/asm/TypePath;[Lorg/springframework/asm/Label;[Lorg/springframework/asm/Label;[ILjava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;[Lorg/springframework/asm/Label;[Lorg/springframework/asm/Label;[ILjava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;[Lorg/springframework/asm/Label;[Lorg/springframework/asm/Label;[ILjava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
 visitLookupSwitchInsn
  (Lorg/springframework/asm/Label;[I[Lorg/springframework/asm/Label;)V
  (Lorg/springframework/asm/Label;[I[Lorg/springframework/asm/Label;)V
@@ -66,19 +66,19 @@ visitParameter
  (Ljava/lang/String;I)V
 visitParameterAnnotation
  (ILjava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILjava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILjava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
 visitTableSwitchInsn
  (IILorg/springframework/asm/Label;[Lorg/springframework/asm/Label;)V
  (IILorg/springframework/asm/Label;[Lorg/springframework/asm/Label;)V
 visitTryCatchAnnotation
  (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
 visitTryCatchBlock
  (Lorg/springframework/asm/Label;Lorg/springframework/asm/Label;Lorg/springframework/asm/Label;Ljava/lang/String;)V
  (Lorg/springframework/asm/Label;Lorg/springframework/asm/Label;Lorg/springframework/asm/Label;Ljava/lang/String;)V
 visitTypeAnnotation
  (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
 visitTypeInsn
  (ILjava/lang/String;)V
  (ILjava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/asm/RecordComponentVisitor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/asm/RecordComponentVisitor.eea
index 9184cc5561..b6c9bde247 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/asm/RecordComponentVisitor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/asm/RecordComponentVisitor.eea
@@ -12,10 +12,10 @@ getDelegate
  ()Lorg/springframework/asm/RecordComponentVisitor;
 visitAnnotation
  (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
 visitAttribute
  (Lorg/springframework/asm/Attribute;)V
  (Lorg/springframework/asm/Attribute;)V
 visitTypeAnnotation
  (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/asm/Type.eea b/libs/eea-spring-5/src/main/resources/org/springframework/asm/Type.eea
index 5baa370819..9078b21aba 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/asm/Type.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/asm/Type.eea
@@ -30,28 +30,28 @@ VOID_TYPE
 
 getArgumentTypes
  (Ljava/lang/String;)[Lorg/springframework/asm/Type;
- (Ljava/lang/String;)[Lorg/springframework/asm/Type;
+ (Ljava/lang/String;)[1Lorg/springframework/asm/Type;
 getArgumentTypes
  (Ljava/lang/reflect/Method;)[Lorg/springframework/asm/Type;
- (Ljava/lang/reflect/Method;)[Lorg/springframework/asm/Type;
+ (Ljava/lang/reflect/Method;)[1Lorg/springframework/asm/Type;
 getArgumentsAndReturnSizes
  (Ljava/lang/String;)I
  (Ljava/lang/String;)I
 getConstructorDescriptor
  (Ljava/lang/reflect/Constructor<*>;)Ljava/lang/String;
- (Ljava/lang/reflect/Constructor<*>;)Ljava/lang/String;
+ (Ljava/lang/reflect/Constructor<*>;)L1java/lang/String;
 getDescriptor
  (Ljava/lang/Class<*>;)Ljava/lang/String;
- (Ljava/lang/Class<*>;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;)L1java/lang/String;
 getInternalName
  (Ljava/lang/Class<*>;)Ljava/lang/String;
  (Ljava/lang/Class<*>;)Ljava/lang/String;
 getMethodDescriptor
  (Ljava/lang/reflect/Method;)Ljava/lang/String;
- (Ljava/lang/reflect/Method;)Ljava/lang/String;
+ (Ljava/lang/reflect/Method;)L1java/lang/String;
 getMethodDescriptor
  (Lorg/springframework/asm/Type;[Lorg/springframework/asm/Type;)Ljava/lang/String;
- (Lorg/springframework/asm/Type;[Lorg/springframework/asm/Type;)Ljava/lang/String;
+ (Lorg/springframework/asm/Type;[Lorg/springframework/asm/Type;)L1java/lang/String;
 getMethodType
  (Ljava/lang/String;)Lorg/springframework/asm/Type;
  (Ljava/lang/String;)Lorg/springframework/asm/Type;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/asm/TypePath.eea b/libs/eea-spring-5/src/main/resources/org/springframework/asm/TypePath.eea
index b83daf2199..0195227d48 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/asm/TypePath.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/asm/TypePath.eea
@@ -2,7 +2,7 @@ class org/springframework/asm/TypePath
 
 fromString
  (Ljava/lang/String;)Lorg/springframework/asm/TypePath;
- (Ljava/lang/String;)Lorg/springframework/asm/TypePath;
+ (Ljava/lang/String;)L0org/springframework/asm/TypePath;
 
 toString
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/AbstractNestablePropertyAccessor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/AbstractNestablePropertyAccessor.eea
index a8f2712f83..90f6a9f334 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/AbstractNestablePropertyAccessor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/AbstractNestablePropertyAccessor.eea
@@ -17,7 +17,7 @@ convertForProperty
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lorg/springframework/core/convert/TypeDescriptor;)L0java/lang/Object;
 createNotWritablePropertyException
  (Ljava/lang/String;)Lorg/springframework/beans/NotWritablePropertyException;
- (Ljava/lang/String;)Lorg/springframework/beans/NotWritablePropertyException;
+ (Ljava/lang/String;)L1org/springframework/beans/NotWritablePropertyException;
 getFinalPath
  (Lorg/springframework/beans/AbstractNestablePropertyAccessor;Ljava/lang/String;)Ljava/lang/String;
  (Lorg/springframework/beans/AbstractNestablePropertyAccessor;Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/BeanWrapperImpl.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/BeanWrapperImpl.eea
index 0cb9bd8bf5..04dfb99a79 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/BeanWrapperImpl.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/BeanWrapperImpl.eea
@@ -14,7 +14,7 @@ convertForProperty
  (Ljava/lang/Object;Ljava/lang/String;)L0java/lang/Object;
 createNotWritablePropertyException
  (Ljava/lang/String;)Lorg/springframework/beans/NotWritablePropertyException;
- (Ljava/lang/String;)Lorg/springframework/beans/NotWritablePropertyException;
+ (Ljava/lang/String;)L1org/springframework/beans/NotWritablePropertyException; # @Inherited(org.springframework.beans.AbstractNestablePropertyAccessor)
 getLocalPropertyHandler
  (Ljava/lang/String;)Lorg/springframework/beans/BeanWrapperImpl$BeanPropertyHandler;
  (Ljava/lang/String;)L0org/springframework/beans/BeanWrapperImpl$BeanPropertyHandler;
@@ -29,7 +29,7 @@ getSecurityContext
  ()L0java/security/AccessControlContext;
 newNestedPropertyAccessor
  (Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/beans/BeanWrapperImpl;
- (Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/beans/BeanWrapperImpl;
+ (Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/beans/BeanWrapperImpl;
 setBeanInstance
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/DirectFieldAccessor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/DirectFieldAccessor.eea
index 6a29d2842c..3bb628ea53 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/DirectFieldAccessor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/DirectFieldAccessor.eea
@@ -8,10 +8,10 @@ class org/springframework/beans/DirectFieldAccessor
  (Ljava/lang/Object;Ljava/lang/String;Lorg/springframework/beans/DirectFieldAccessor;)V
 createNotWritablePropertyException
  (Ljava/lang/String;)Lorg/springframework/beans/NotWritablePropertyException;
- (Ljava/lang/String;)Lorg/springframework/beans/NotWritablePropertyException;
+ (Ljava/lang/String;)L1org/springframework/beans/NotWritablePropertyException; # @Inherited(org.springframework.beans.AbstractNestablePropertyAccessor)
 getLocalPropertyHandler
  (Ljava/lang/String;)Lorg/springframework/beans/DirectFieldAccessor$FieldPropertyHandler;
  (Ljava/lang/String;)L0org/springframework/beans/DirectFieldAccessor$FieldPropertyHandler;
 newNestedPropertyAccessor
  (Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/beans/DirectFieldAccessor;
- (Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/beans/DirectFieldAccessor;
+ (Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/beans/DirectFieldAccessor;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/MethodInvocationException.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/MethodInvocationException.eea
index fe8ca640b3..c8b505ac95 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/MethodInvocationException.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/MethodInvocationException.eea
@@ -9,4 +9,4 @@ ERROR_CODE
  (Ljava/beans/PropertyChangeEvent;Ljava/lang/Throwable;)V
 getErrorCode
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/MutablePropertyValues.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/MutablePropertyValues.eea
index f01555a3f6..32091c545f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/MutablePropertyValues.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/MutablePropertyValues.eea
@@ -26,7 +26,7 @@ addPropertyValues
  (Lorg/springframework/beans/PropertyValues;)Lorg/springframework/beans/MutablePropertyValues;
 changesSince
  (Lorg/springframework/beans/PropertyValues;)Lorg/springframework/beans/PropertyValues;
- (Lorg/springframework/beans/PropertyValues;)Lorg/springframework/beans/PropertyValues;
+ (Lorg/springframework/beans/PropertyValues;)L1org/springframework/beans/PropertyValues;
 clearProcessedProperty
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/PropertyAccessorFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/PropertyAccessorFactory.eea
index c1d924531d..2d94cad9df 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/PropertyAccessorFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/PropertyAccessorFactory.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/PropertyAccessorFactory
 
 forBeanPropertyAccess
  (Ljava/lang/Object;)Lorg/springframework/beans/BeanWrapper;
- (Ljava/lang/Object;)Lorg/springframework/beans/BeanWrapper;
+ (Ljava/lang/Object;)L1org/springframework/beans/BeanWrapper;
 forDirectFieldAccess
  (Ljava/lang/Object;)Lorg/springframework/beans/ConfigurablePropertyAccessor;
- (Ljava/lang/Object;)Lorg/springframework/beans/ConfigurablePropertyAccessor;
+ (Ljava/lang/Object;)L1org/springframework/beans/ConfigurablePropertyAccessor;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/PropertyAccessorUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/PropertyAccessorUtils.eea
index 29108918a7..7206017fc4 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/PropertyAccessorUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/PropertyAccessorUtils.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/PropertyAccessorUtils
 
 canonicalPropertyName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 canonicalPropertyNames
  ([Ljava/lang/String;)[Ljava/lang/String;
  ([Ljava/lang/String;)[0Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/PropertyMatches.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/PropertyMatches.eea
index c950cf2e68..46a4f3fdf0 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/PropertyMatches.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/PropertyMatches.eea
@@ -5,13 +5,13 @@ forField
  (Ljava/lang/String;Ljava/lang/Class<*>;)Lorg/springframework/beans/PropertyMatches;
 forField
  (Ljava/lang/String;Ljava/lang/Class<*>;I)Lorg/springframework/beans/PropertyMatches;
- (Ljava/lang/String;Ljava/lang/Class<*>;I)Lorg/springframework/beans/PropertyMatches;
+ (Ljava/lang/String;Ljava/lang/Class<*>;I)L1org/springframework/beans/PropertyMatches;
 forProperty
  (Ljava/lang/String;Ljava/lang/Class<*>;)Lorg/springframework/beans/PropertyMatches;
  (Ljava/lang/String;Ljava/lang/Class<*>;)Lorg/springframework/beans/PropertyMatches;
 forProperty
  (Ljava/lang/String;Ljava/lang/Class<*>;I)Lorg/springframework/beans/PropertyMatches;
- (Ljava/lang/String;Ljava/lang/Class<*>;I)Lorg/springframework/beans/PropertyMatches;
+ (Ljava/lang/String;Ljava/lang/Class<*>;I)L1org/springframework/beans/PropertyMatches;
 
 appendHintMessage
  (Ljava/lang/StringBuilder;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/TypeMismatchException.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/TypeMismatchException.eea
index ee9e8159f3..70d4b75ad5 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/TypeMismatchException.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/TypeMismatchException.eea
@@ -18,7 +18,7 @@ ERROR_CODE
  (Ljava/lang/Object;Ljava/lang/Class<*>;Ljava/lang/Throwable;)V
 getErrorCode
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getPropertyName
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(org.springframework.beans.PropertyAccessException)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/ObjectProvider.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/ObjectProvider.eea
index 460b222094..c2202c46e1 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/ObjectProvider.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/ObjectProvider.eea
@@ -35,7 +35,7 @@ iterator
  ()L1java/util/Iterator<TT;>; # @Inherited(java.lang.Iterable)
 orderedStream
  ()Ljava/util/stream/Stream<TT;>;
- ()Ljava/util/stream/Stream<TT;>;
+ ()L1java/util/stream/Stream<TT;>;
 stream
  ()Ljava/util/stream/Stream<TT;>;
- ()Ljava/util/stream/Stream<TT;>;
+ ()L1java/util/stream/Stream<TT;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/annotation/InjectionMetadata.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/annotation/InjectionMetadata.eea
index c5ece7af6c..de9c729e29 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/annotation/InjectionMetadata.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/annotation/InjectionMetadata.eea
@@ -6,7 +6,7 @@ EMPTY
 
 forElements
  (Ljava/util/Collection<Lorg/springframework/beans/factory/annotation/InjectionMetadata$InjectedElement;>;Ljava/lang/Class<*>;)Lorg/springframework/beans/factory/annotation/InjectionMetadata;
- (Ljava/util/Collection<Lorg/springframework/beans/factory/annotation/InjectionMetadata$InjectedElement;>;Ljava/lang/Class<*>;)Lorg/springframework/beans/factory/annotation/InjectionMetadata;
+ (Ljava/util/Collection<Lorg/springframework/beans/factory/annotation/InjectionMetadata$InjectedElement;>;Ljava/lang/Class<*>;)L1org/springframework/beans/factory/annotation/InjectionMetadata;
 needsRefresh
  (Lorg/springframework/beans/factory/annotation/InjectionMetadata;Ljava/lang/Class<*>;)Z
  (Lorg/springframework/beans/factory/annotation/InjectionMetadata;Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/AbstractFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/AbstractFactoryBean.eea
index f69f49443c..bed6304cad 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/AbstractFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/AbstractFactoryBean.eea
@@ -12,7 +12,7 @@ logger
 
 createInstance
  ()TT;
- ()TT;
+ ()T1T;
 destroyInstance
  (TT;)V
  (TT;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/AutowireCapableBeanFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/AutowireCapableBeanFactory.eea
index 4cbe9ffc1c..bca4f75e5d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/AutowireCapableBeanFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/AutowireCapableBeanFactory.eea
@@ -27,10 +27,10 @@ configureBean
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 createBean
  (Ljava/lang/Class<*>;IZ)Ljava/lang/Object;
- (Ljava/lang/Class<*>;IZ)Ljava/lang/Object;
+ (Ljava/lang/Class<*>;IZ)L1java/lang/Object;
 createBean
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)T1T;
 destroyBean
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/BeanDefinitionHolder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/BeanDefinitionHolder.eea
index 65dce1c3f1..48b434d938 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/BeanDefinitionHolder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/BeanDefinitionHolder.eea
@@ -23,10 +23,10 @@ getBeanName
  ()Ljava/lang/String;
 getLongDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getShortDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSource
  ()Ljava/lang/Object;
  ()L0java/lang/Object; # @Inherited(org.springframework.beans.BeanMetadataElement)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/DependencyDescriptor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/DependencyDescriptor.eea
index f999b40ec0..58eba8a7d3 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/DependencyDescriptor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/DependencyDescriptor.eea
@@ -20,7 +20,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(org.springframework.beans.factory.InjectionPoint)
 forFallbackMatch
  ()Lorg/springframework/beans/factory/config/DependencyDescriptor;
- ()Lorg/springframework/beans/factory/config/DependencyDescriptor;
+ ()L1org/springframework/beans/factory/config/DependencyDescriptor;
 getDependencyName
  ()Ljava/lang/String;
  ()L0java/lang/String;
@@ -32,7 +32,7 @@ getResolvableType
  ()Lorg/springframework/core/ResolvableType;
 getTypeDescriptor
  ()Lorg/springframework/core/convert/TypeDescriptor;
- ()Lorg/springframework/core/convert/TypeDescriptor;
+ ()L1org/springframework/core/convert/TypeDescriptor;
 initParameterNameDiscovery
  (Lorg/springframework/core/ParameterNameDiscoverer;)V
  (Lorg/springframework/core/ParameterNameDiscoverer;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/ListFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/ListFactoryBean.eea
index 81d098d95d..9d1e549775 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/ListFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/ListFactoryBean.eea
@@ -6,10 +6,10 @@ super org/springframework/beans/factory/config/AbstractFactoryBean
 
 createInstance
  ()Ljava/util/List<Ljava/lang/Object;>;
- ()Ljava/util/List<Ljava/lang/Object;>;
+ ()L1java/util/List<Ljava/lang/Object;>;
 getObjectType
  ()Ljava/lang/Class<Ljava/util/List;>;
- ()Ljava/lang/Class<Ljava/util/List;>;
+ ()L1java/lang/Class<Ljava/util/List;>;
 setSourceList
  (Ljava/util/List<*>;)V
  (Ljava/util/List<*>;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/MapFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/MapFactoryBean.eea
index f51f515fa2..95efc091d1 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/MapFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/MapFactoryBean.eea
@@ -6,10 +6,10 @@ super org/springframework/beans/factory/config/AbstractFactoryBean
 
 createInstance
  ()Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
- ()Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
+ ()L1java/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
 getObjectType
  ()Ljava/lang/Class<Ljava/util/Map;>;
- ()Ljava/lang/Class<Ljava/util/Map;>;
+ ()L1java/lang/Class<Ljava/util/Map;>;
 setSourceMap
  (Ljava/util/Map<**>;)V
  (Ljava/util/Map<**>;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/MethodInvokingBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/MethodInvokingBean.eea
index 9b40af53f8..dc36a58023 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/MethodInvokingBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/MethodInvokingBean.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/factory/config/MethodInvokingBean
 
 getDefaultTypeConverter
  ()Lorg/springframework/beans/TypeConverter;
- ()Lorg/springframework/beans/TypeConverter;
+ ()L1org/springframework/beans/TypeConverter; # @Inherited(org.springframework.beans.support.ArgumentConvertingMethodInvoker)
 invokeWithTargetException
  ()Ljava/lang/Object;
  ()L0java/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.eea
index fb322f63f8..49a8ef648a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.eea
@@ -6,7 +6,7 @@ super org/springframework/beans/factory/config/AbstractFactoryBean
 
 createInstance
  ()Lorg/springframework/beans/factory/ObjectFactory<Ljava/lang/Object;>;
- ()Lorg/springframework/beans/factory/ObjectFactory<Ljava/lang/Object;>;
+ ()L1org/springframework/beans/factory/ObjectFactory<Ljava/lang/Object;>;
 getObjectType
  ()Ljava/lang/Class<*>;
  ()L0java/lang/Class<*>; # @Inherited(org.springframework.beans.factory.config.AbstractFactoryBean)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/PropertiesFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/PropertiesFactoryBean.eea
index 67dd62595f..ba863dec78 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/PropertiesFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/PropertiesFactoryBean.eea
@@ -6,10 +6,10 @@ super org/springframework/beans/factory/FactoryBean
 
 createProperties
  ()Ljava/util/Properties;
- ()Ljava/util/Properties;
+ ()L1java/util/Properties;
 getObject
  ()Ljava/util/Properties;
  ()L0java/util/Properties;
 getObjectType
  ()Ljava/lang/Class<Ljava/util/Properties;>;
- ()Ljava/lang/Class<Ljava/util/Properties;>;
+ ()L1java/lang/Class<Ljava/util/Properties;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.eea
index ef77aa8c12..43149a6f07 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.eea
@@ -6,7 +6,7 @@ super org/springframework/beans/factory/config/AbstractFactoryBean
 
 createInstance
  ()Ljavax/inject/Provider<Ljava/lang/Object;>;
- ()Ljavax/inject/Provider<Ljava/lang/Object;>;
+ ()L1javax/inject/Provider<Ljava/lang/Object;>;
 getObjectType
  ()Ljava/lang/Class<*>;
  ()L0java/lang/Class<*>; # @Inherited(org.springframework.beans.factory.config.AbstractFactoryBean)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.eea
index f650a57fa3..4db67c6053 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.eea
@@ -6,7 +6,7 @@ super org/springframework/beans/factory/FactoryBean
 
 createServiceLocatorException
  (Ljava/lang/reflect/Constructor<Ljava/lang/Exception;>;Lorg/springframework/beans/BeansException;)Ljava/lang/Exception;
- (Ljava/lang/reflect/Constructor<Ljava/lang/Exception;>;Lorg/springframework/beans/BeansException;)Ljava/lang/Exception;
+ (Ljava/lang/reflect/Constructor<Ljava/lang/Exception;>;Lorg/springframework/beans/BeansException;)L1java/lang/Exception;
 determineServiceLocatorExceptionConstructor
  (Ljava/lang/Class<+Ljava/lang/Exception;>;)Ljava/lang/reflect/Constructor<Ljava/lang/Exception;>;
  (Ljava/lang/Class<+Ljava/lang/Exception;>;)Ljava/lang/reflect/Constructor<Ljava/lang/Exception;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/SetFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/SetFactoryBean.eea
index 5c7549350a..a5e5d7698e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/SetFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/SetFactoryBean.eea
@@ -6,10 +6,10 @@ super org/springframework/beans/factory/config/AbstractFactoryBean
 
 createInstance
  ()Ljava/util/Set<Ljava/lang/Object;>;
- ()Ljava/util/Set<Ljava/lang/Object;>;
+ ()L1java/util/Set<Ljava/lang/Object;>;
 getObjectType
  ()Ljava/lang/Class<Ljava/util/Set;>;
- ()Ljava/lang/Class<Ljava/util/Set;>;
+ ()L1java/lang/Class<Ljava/util/Set;>;
 setSourceSet
  (Ljava/util/Set<*>;)V
  (Ljava/util/Set<*>;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/YamlMapFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/YamlMapFactoryBean.eea
index 2f5f1cce3d..d6ed1b8c8d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/YamlMapFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/YamlMapFactoryBean.eea
@@ -6,7 +6,7 @@ super org/springframework/beans/factory/FactoryBean
 
 createMap
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ ()L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 getObject
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
  ()L0java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/YamlProcessor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/YamlProcessor.eea
index b9d1081a5b..c2b192d0e7 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/YamlProcessor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/YamlProcessor.eea
@@ -2,10 +2,10 @@ class org/springframework/beans/factory/config/YamlProcessor
 
 createYaml
  ()Lorg/yaml/snakeyaml/Yaml;
- ()Lorg/yaml/snakeyaml/Yaml;
+ ()L1org/yaml/snakeyaml/Yaml;
 getFlattenedMap
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 process
  (Lorg/springframework/beans/factory/config/YamlProcessor$MatchCallback;)V
  (Lorg/springframework/beans/factory/config/YamlProcessor$MatchCallback;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/YamlPropertiesFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/YamlPropertiesFactoryBean.eea
index 4816d74c6e..f4c4cb22e4 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/YamlPropertiesFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/config/YamlPropertiesFactoryBean.eea
@@ -6,7 +6,7 @@ super org/springframework/beans/factory/FactoryBean
 
 createProperties
  ()Ljava/util/Properties;
- ()Ljava/util/Properties;
+ ()L1java/util/Properties;
 getObject
  ()Ljava/util/Properties;
  ()L0java/util/Properties;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.eea
index 55089bf7b5..2fc19e10ad 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.eea
@@ -11,7 +11,7 @@ applyPropertyToBeanDefinition
  (Ljava/lang/String;Ljava/lang/Object;)V
 bean
  (Ljava/lang/Class<*>;)Lorg/springframework/beans/factory/support/GenericBeanDefinition;
- (Ljava/lang/Class<*>;)Lorg/springframework/beans/factory/support/GenericBeanDefinition;
+ (Ljava/lang/Class<*>;)L1org/springframework/beans/factory/support/GenericBeanDefinition;
 bean
  (Ljava/lang/Class<*>;[Ljava/lang/Object;)Lorg/springframework/beans/factory/support/AbstractBeanDefinition;
  (Ljava/lang/Class<*>;[Ljava/lang/Object;)Lorg/springframework/beans/factory/support/AbstractBeanDefinition;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/parsing/AbstractComponentDefinition.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/parsing/AbstractComponentDefinition.eea
index 7b8127382f..04640d9b64 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/parsing/AbstractComponentDefinition.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/parsing/AbstractComponentDefinition.eea
@@ -2,16 +2,16 @@ class org/springframework/beans/factory/parsing/AbstractComponentDefinition
 
 getBeanDefinitions
  ()[Lorg/springframework/beans/factory/config/BeanDefinition;
- ()[Lorg/springframework/beans/factory/config/BeanDefinition;
+ ()[1Lorg/springframework/beans/factory/config/BeanDefinition;
 getBeanReferences
  ()[Lorg/springframework/beans/factory/config/BeanReference;
- ()[Lorg/springframework/beans/factory/config/BeanReference;
+ ()[1Lorg/springframework/beans/factory/config/BeanReference;
 getDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getInnerBeanDefinitions
  ()[Lorg/springframework/beans/factory/config/BeanDefinition;
- ()[Lorg/springframework/beans/factory/config/BeanDefinition;
+ ()[1Lorg/springframework/beans/factory/config/BeanDefinition;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/parsing/ParseState.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/parsing/ParseState.eea
index e09b791f6b..b1a54ab492 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/parsing/ParseState.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/parsing/ParseState.eea
@@ -8,7 +8,7 @@ push
  (Lorg/springframework/beans/factory/parsing/ParseState$Entry;)V
 snapshot
  ()Lorg/springframework/beans/factory/parsing/ParseState;
- ()Lorg/springframework/beans/factory/parsing/ParseState;
+ ()L1org/springframework/beans/factory/parsing/ParseState;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/serviceloader/AbstractServiceLoaderBasedFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/serviceloader/AbstractServiceLoaderBasedFactoryBean.eea
index 9a1f8de518..30e23a56ac 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/serviceloader/AbstractServiceLoaderBasedFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/serviceloader/AbstractServiceLoaderBasedFactoryBean.eea
@@ -6,7 +6,7 @@ super org/springframework/beans/factory/config/AbstractFactoryBean
 
 createInstance
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 getObjectToExpose
  (Ljava/util/ServiceLoader<*>;)Ljava/lang/Object;
  (Ljava/util/ServiceLoader<*>;)Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/serviceloader/ServiceListFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/serviceloader/ServiceListFactoryBean.eea
index e71a7f755f..1e16c97a54 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/serviceloader/ServiceListFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/serviceloader/ServiceListFactoryBean.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/factory/serviceloader/ServiceListFactoryBean
 
 getObjectToExpose
  (Ljava/util/ServiceLoader<*>;)Ljava/lang/Object;
- (Ljava/util/ServiceLoader<*>;)Ljava/lang/Object;
+ (Ljava/util/ServiceLoader<*>;)L1java/lang/Object;
 getObjectType
  ()Ljava/lang/Class<*>;
  ()L0java/lang/Class<*>; # @Inherited(org.springframework.beans.factory.config.AbstractFactoryBean)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.eea
index 27da6d99be..bcfbdfbbfd 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.eea
@@ -50,16 +50,16 @@ copyConfigurationFrom
  (Lorg/springframework/beans/factory/config/ConfigurableBeanFactory;)V
 createBean
  (Ljava/lang/Class<*>;IZ)Ljava/lang/Object;
- (Ljava/lang/Class<*>;IZ)Ljava/lang/Object;
+ (Ljava/lang/Class<*>;IZ)L1java/lang/Object; # @Inherited(org.springframework.beans.factory.config.AutowireCapableBeanFactory)
 createBean
  (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Object;)L1java/lang/Object; # @Inherited(org.springframework.beans.factory.support.AbstractBeanFactory)
 createBean
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)T1T; # @Inherited(org.springframework.beans.factory.config.AutowireCapableBeanFactory)
 createBeanInstance
  (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Object;)Lorg/springframework/beans/BeanWrapper;
- (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Object;)Lorg/springframework/beans/BeanWrapper;
+ (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Object;)L1org/springframework/beans/BeanWrapper;
 destroyBean
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
@@ -113,7 +113,7 @@ initializeBean
  (Ljava/lang/String;Ljava/lang/Object;Lorg/springframework/beans/factory/support/RootBeanDefinition;)Ljava/lang/Object;
 instantiateBean
  (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;)Lorg/springframework/beans/BeanWrapper;
- (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;)Lorg/springframework/beans/BeanWrapper;
+ (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;)L1org/springframework/beans/BeanWrapper;
 instantiateUsingFactoryMethod
  (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Object;)Lorg/springframework/beans/BeanWrapper;
  (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Object;)Lorg/springframework/beans/BeanWrapper;
@@ -128,7 +128,7 @@ isExcludedFromDependencyCheck
  (Ljava/beans/PropertyDescriptor;)Z
 obtainFromSupplier
  (Ljava/util/function/Supplier<*>;Ljava/lang/String;)Lorg/springframework/beans/BeanWrapper;
- (Ljava/util/function/Supplier<*>;Ljava/lang/String;)Lorg/springframework/beans/BeanWrapper;
+ (Ljava/util/function/Supplier<*>;Ljava/lang/String;)L1org/springframework/beans/BeanWrapper;
 populateBean
  (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;Lorg/springframework/beans/BeanWrapper;)V
  (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;Lorg/springframework/beans/BeanWrapper;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/AbstractBeanDefinition.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/AbstractBeanDefinition.eea
index b4fbefbfce..d009111c2f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/AbstractBeanDefinition.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/AbstractBeanDefinition.eea
@@ -78,7 +78,7 @@ getQualifier
  (Ljava/lang/String;)L0org/springframework/beans/factory/support/AutowireCandidateQualifier;
 getQualifiers
  ()Ljava/util/Set<Lorg/springframework/beans/factory/support/AutowireCandidateQualifier;>;
- ()Ljava/util/Set<Lorg/springframework/beans/factory/support/AutowireCandidateQualifier;>;
+ ()L1java/util/Set<Lorg/springframework/beans/factory/support/AutowireCandidateQualifier;>;
 getResolvableType
  ()Lorg/springframework/core/ResolvableType;
  ()Lorg/springframework/core/ResolvableType;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/AbstractBeanFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/AbstractBeanFactory.eea
index 253a04da07..1625593bf2 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/AbstractBeanFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/AbstractBeanFactory.eea
@@ -47,7 +47,7 @@ copyRegisteredEditorsTo
  (Lorg/springframework/beans/PropertyEditorRegistry;)V
 createBean
  (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Object;)L1java/lang/Object;
 destroyBean
  (Ljava/lang/String;Ljava/lang/Object;)V
  (Ljava/lang/String;Ljava/lang/Object;)V
@@ -191,7 +191,7 @@ markBeanAsCreated
  (Ljava/lang/String;)V
 originalBeanName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 predictBeanType
  (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
  (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Class<*>;)L0java/lang/Class<*>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/BeanDefinitionBuilder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/BeanDefinitionBuilder.eea
index 9418242d63..8d0251cdff 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/BeanDefinitionBuilder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/BeanDefinitionBuilder.eea
@@ -2,37 +2,37 @@ class org/springframework/beans/factory/support/BeanDefinitionBuilder
 
 childBeanDefinition
  (Ljava/lang/String;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
- (Ljava/lang/String;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
+ (Ljava/lang/String;)L1org/springframework/beans/factory/support/BeanDefinitionBuilder;
 genericBeanDefinition
  ()Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
- ()Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
+ ()L1org/springframework/beans/factory/support/BeanDefinitionBuilder;
 genericBeanDefinition
  (Ljava/lang/Class<*>;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
- (Ljava/lang/Class<*>;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
+ (Ljava/lang/Class<*>;)L1org/springframework/beans/factory/support/BeanDefinitionBuilder;
 genericBeanDefinition
  (Ljava/lang/String;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
- (Ljava/lang/String;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
+ (Ljava/lang/String;)L1org/springframework/beans/factory/support/BeanDefinitionBuilder;
 genericBeanDefinition
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/util/function/Supplier<TT;>;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/util/function/Supplier<TT;>;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/util/function/Supplier<TT;>;)L1org/springframework/beans/factory/support/BeanDefinitionBuilder;
 rootBeanDefinition
  (Ljava/lang/Class<*>;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
  (Ljava/lang/Class<*>;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
 rootBeanDefinition
  (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
- (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
+ (Ljava/lang/Class<*>;Ljava/lang/String;)L1org/springframework/beans/factory/support/BeanDefinitionBuilder;
 rootBeanDefinition
  (Ljava/lang/String;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
  (Ljava/lang/String;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
 rootBeanDefinition
  (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/springframework/beans/factory/support/BeanDefinitionBuilder;
 rootBeanDefinition
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/util/function/Supplier<TT;>;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/util/function/Supplier<TT;>;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
 rootBeanDefinition
  <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;Ljava/util/function/Supplier<TT;>;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
- <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;Ljava/util/function/Supplier<TT;>;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
+ <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;Ljava/util/function/Supplier<TT;>;)L1org/springframework/beans/factory/support/BeanDefinitionBuilder;
 
 addAutowiredProperty
  (Ljava/lang/String;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.eea
index 417f30da89..a2e961a1ed 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.eea
@@ -6,7 +6,7 @@ GENERATED_BEAN_NAME_SEPARATOR
 
 createBeanDefinition
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/ClassLoader;)Lorg/springframework/beans/factory/support/AbstractBeanDefinition;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/ClassLoader;)Lorg/springframework/beans/factory/support/AbstractBeanDefinition;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/ClassLoader;)L1org/springframework/beans/factory/support/AbstractBeanDefinition;
 generateBeanName
  (Lorg/springframework/beans/factory/config/BeanDefinition;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)Ljava/lang/String;
  (Lorg/springframework/beans/factory/config/BeanDefinition;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)Ljava/lang/String;
@@ -21,4 +21,4 @@ registerWithGeneratedName
  (Lorg/springframework/beans/factory/support/AbstractBeanDefinition;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)Ljava/lang/String;
 uniqueBeanName
  (Ljava/lang/String;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)Ljava/lang/String;
- (Ljava/lang/String;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)Ljava/lang/String;
+ (Ljava/lang/String;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.eea
index 5d703e2517..6ab973f34d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/factory/support/CglibSubclassingInstantiationStr
 
 instantiateWithMethodInjection
  (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;)Ljava/lang/Object;
- (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;)Ljava/lang/Object;
+ (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;)L1java/lang/Object; # @Inherited(org.springframework.beans.factory.support.SimpleInstantiationStrategy)
 instantiateWithMethodInjection
  (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;Ljava/lang/reflect/Constructor<*>;[Ljava/lang/Object;)Ljava/lang/Object;
- (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;Ljava/lang/reflect/Constructor<*>;[Ljava/lang/Object;)Ljava/lang/Object;
+ (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;Ljava/lang/reflect/Constructor<*>;[Ljava/lang/Object;)L1java/lang/Object; # @Inherited(org.springframework.beans.factory.support.SimpleInstantiationStrategy)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/ChildBeanDefinition.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/ChildBeanDefinition.eea
index 6bce9c6bd6..ae68217d52 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/ChildBeanDefinition.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/ChildBeanDefinition.eea
@@ -20,7 +20,7 @@ class org/springframework/beans/factory/support/ChildBeanDefinition
  (Lorg/springframework/beans/factory/support/ChildBeanDefinition;)V
 cloneBeanDefinition
  ()Lorg/springframework/beans/factory/support/AbstractBeanDefinition;
- ()Lorg/springframework/beans/factory/support/AbstractBeanDefinition;
+ ()L1org/springframework/beans/factory/support/AbstractBeanDefinition;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(org.springframework.beans.factory.support.AbstractBeanDefinition)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/DefaultListableBeanFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/DefaultListableBeanFactory.eea
index f1f0350c6a..547821819a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/DefaultListableBeanFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/DefaultListableBeanFactory.eea
@@ -71,7 +71,7 @@ getBeanNamesForType
  (Lorg/springframework/core/ResolvableType;ZZ)[L1java/lang/String; # @Inherited(org.springframework.beans.factory.ListableBeanFactory)
 getBeanNamesIterator
  ()Ljava/util/Iterator<Ljava/lang/String;>;
- ()Ljava/util/Iterator<Ljava/lang/String;>;
+ ()L1java/util/Iterator<Ljava/lang/String;>;
 getBeanProvider
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/beans/factory/ObjectProvider<TT;>;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/beans/factory/ObjectProvider<TT;>;
@@ -83,7 +83,7 @@ getBeanProvider
  <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;)Lorg/springframework/beans/factory/ObjectProvider<TT;>;
 getBeanProvider
  <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;Z)Lorg/springframework/beans/factory/ObjectProvider<TT;>;
- <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;Z)Lorg/springframework/beans/factory/ObjectProvider<TT;>;
+ <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;Z)L1org/springframework/beans/factory/ObjectProvider<TT;>;
 getBeansOfType
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Ljava/util/Map<Ljava/lang/String;TT;>;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1java/util/Map<L1java/lang/String;TT;>; # @Inherited(org.springframework.beans.factory.ListableBeanFactory)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/GenericBeanDefinition.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/GenericBeanDefinition.eea
index 3b834383cc..2b76047edb 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/GenericBeanDefinition.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/GenericBeanDefinition.eea
@@ -5,7 +5,7 @@ class org/springframework/beans/factory/support/GenericBeanDefinition
  (Lorg/springframework/beans/factory/config/BeanDefinition;)V
 cloneBeanDefinition
  ()Lorg/springframework/beans/factory/support/AbstractBeanDefinition;
- ()Lorg/springframework/beans/factory/support/AbstractBeanDefinition;
+ ()L1org/springframework/beans/factory/support/AbstractBeanDefinition;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(org.springframework.beans.factory.support.AbstractBeanDefinition)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/ManagedList.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/ManagedList.eea
index 258a253926..fb514e2cac 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/ManagedList.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/ManagedList.eea
@@ -8,7 +8,7 @@ super java/util/ArrayList
 
 of
  <E:Ljava/lang/Object;>([TE;)Lorg/springframework/beans/factory/support/ManagedList<TE;>;
- <E:Ljava/lang/Object;>([TE;)Lorg/springframework/beans/factory/support/ManagedList<TE;>;
+ <E:Ljava/lang/Object;>([TE;)L1org/springframework/beans/factory/support/ManagedList<TE;>;
 
 getElementTypeName
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/ManagedMap.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/ManagedMap.eea
index d3c4c97696..b0a7d87881 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/ManagedMap.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/ManagedMap.eea
@@ -8,7 +8,7 @@ super java/util/LinkedHashMap
 
 ofEntries
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>([Ljava/util/Map$Entry<+TK;+TV;>;)Lorg/springframework/beans/factory/support/ManagedMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>([Ljava/util/Map$Entry<+TK;+TV;>;)Lorg/springframework/beans/factory/support/ManagedMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>([Ljava/util/Map$Entry<+TK;+TV;>;)L1org/springframework/beans/factory/support/ManagedMap<TK;TV;>;
 
 getKeyTypeName
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/ManagedSet.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/ManagedSet.eea
index a186d5c4d8..89890040fa 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/ManagedSet.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/ManagedSet.eea
@@ -8,7 +8,7 @@ super java/util/LinkedHashSet
 
 of
  <E:Ljava/lang/Object;>([TE;)Lorg/springframework/beans/factory/support/ManagedSet<TE;>;
- <E:Ljava/lang/Object;>([TE;)Lorg/springframework/beans/factory/support/ManagedSet<TE;>;
+ <E:Ljava/lang/Object;>([TE;)L1org/springframework/beans/factory/support/ManagedSet<TE;>;
 
 getElementTypeName
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/RootBeanDefinition.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/RootBeanDefinition.eea
index 300b2c4121..8c413b300a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/RootBeanDefinition.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/RootBeanDefinition.eea
@@ -26,7 +26,7 @@ class org/springframework/beans/factory/support/RootBeanDefinition
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/util/function/Supplier<TT;>;)V
 cloneBeanDefinition
  ()Lorg/springframework/beans/factory/support/RootBeanDefinition;
- ()Lorg/springframework/beans/factory/support/RootBeanDefinition;
+ ()L1org/springframework/beans/factory/support/RootBeanDefinition;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(org.springframework.beans.factory.support.AbstractBeanDefinition)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/SimpleInstantiationStrategy.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/SimpleInstantiationStrategy.eea
index 904ddb5a52..3bb7f36e7d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/SimpleInstantiationStrategy.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/SimpleInstantiationStrategy.eea
@@ -9,13 +9,13 @@ instantiate
  (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;)Ljava/lang/Object;
 instantiate
  (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;Ljava/lang/Object;Ljava/lang/reflect/Method;[Ljava/lang/Object;)Ljava/lang/Object;
- (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;Ljava/lang/Object;Ljava/lang/reflect/Method;[Ljava/lang/Object;)Ljava/lang/Object;
+ (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;Ljava/lang/Object;Ljava/lang/reflect/Method;[Ljava/lang/Object;)L1java/lang/Object;
 instantiate
  (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;Ljava/lang/reflect/Constructor<*>;[Ljava/lang/Object;)Ljava/lang/Object;
  (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;Ljava/lang/reflect/Constructor<*>;[Ljava/lang/Object;)Ljava/lang/Object;
 instantiateWithMethodInjection
  (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;)Ljava/lang/Object;
- (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;)Ljava/lang/Object;
+ (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;)L1java/lang/Object;
 instantiateWithMethodInjection
  (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;Ljava/lang/reflect/Constructor<*>;[Ljava/lang/Object;)Ljava/lang/Object;
- (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;Ljava/lang/reflect/Constructor<*>;[Ljava/lang/Object;)Ljava/lang/Object;
+ (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;Ljava/lang/reflect/Constructor<*>;[Ljava/lang/Object;)L1java/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/StaticListableBeanFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/StaticListableBeanFactory.eea
index cf20e44bf1..6faf0c8ce2 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/StaticListableBeanFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/support/StaticListableBeanFactory.eea
@@ -20,7 +20,7 @@ findAnnotationOnBean
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/String;Ljava/lang/Class<TA;>;Z)T0A; # @Inherited(org.springframework.beans.factory.ListableBeanFactory)
 getAliases
  (Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/String;)[1Ljava/lang/String;
 getBean
  (Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;)Ljava/lang/Object;
@@ -65,7 +65,7 @@ getBeanProvider
  <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;)Lorg/springframework/beans/factory/ObjectProvider<TT;>;
 getBeanProvider
  <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;Z)Lorg/springframework/beans/factory/ObjectProvider<TT;>;
- <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;Z)Lorg/springframework/beans/factory/ObjectProvider<TT;>;
+ <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;Z)L1org/springframework/beans/factory/ObjectProvider<TT;>;
 getBeansOfType
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Ljava/util/Map<Ljava/lang/String;TT;>;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1java/util/Map<L1java/lang/String;TT;>; # @Inherited(org.springframework.beans.factory.ListableBeanFactory)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.eea
index 08d16f03b7..a0b878dbb4 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.eea
@@ -211,7 +211,7 @@ logger
  (Lorg/springframework/beans/factory/xml/XmlReaderContext;)V
 buildTypedStringValue
  (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/beans/factory/config/TypedStringValue;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/beans/factory/config/TypedStringValue;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/springframework/beans/factory/config/TypedStringValue;
 buildTypedStringValueForMap
  (Ljava/lang/String;Ljava/lang/String;Lorg/w3c/dom/Element;)Ljava/lang/Object;
  (Ljava/lang/String;Ljava/lang/String;Lorg/w3c/dom/Element;)Ljava/lang/Object;
@@ -220,7 +220,7 @@ checkNameUniqueness
  (Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;Lorg/w3c/dom/Element;)V
 createBeanDefinition
  (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/beans/factory/support/AbstractBeanDefinition;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/beans/factory/support/AbstractBeanDefinition;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/springframework/beans/factory/support/AbstractBeanDefinition;
 decorateBeanDefinitionIfRequired
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinitionHolder;)Lorg/springframework/beans/factory/config/BeanDefinitionHolder;
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinitionHolder;)Lorg/springframework/beans/factory/config/BeanDefinitionHolder;
@@ -250,7 +250,7 @@ getAutowireMode
  (Ljava/lang/String;)I
 getBeanDefinitionDefaults
  ()Lorg/springframework/beans/factory/support/BeanDefinitionDefaults;
- ()Lorg/springframework/beans/factory/support/BeanDefinitionDefaults;
+ ()L1org/springframework/beans/factory/support/BeanDefinitionDefaults;
 getDefaults
  ()Lorg/springframework/beans/factory/xml/DocumentDefaultsDefinition;
  ()Lorg/springframework/beans/factory/xml/DocumentDefaultsDefinition;
@@ -280,7 +280,7 @@ nodeNameEquals
  (Lorg/w3c/dom/Node;Ljava/lang/String;)Z
 parseArrayElement
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;)Ljava/lang/Object;
- (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;)Ljava/lang/Object;
+ (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;)L1java/lang/Object;
 parseBeanDefinitionAttributes
  (Lorg/w3c/dom/Element;Ljava/lang/String;Lorg/springframework/beans/factory/config/BeanDefinition;Lorg/springframework/beans/factory/support/AbstractBeanDefinition;)Lorg/springframework/beans/factory/support/AbstractBeanDefinition;
  (Lorg/w3c/dom/Element;Ljava/lang/String;Lorg/springframework/beans/factory/config/BeanDefinition;Lorg/springframework/beans/factory/support/AbstractBeanDefinition;)Lorg/springframework/beans/factory/support/AbstractBeanDefinition;
@@ -316,13 +316,13 @@ parseKeyElement
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;Ljava/lang/String;)L0java/lang/Object;
 parseListElement
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;)Ljava/util/List<Ljava/lang/Object;>;
- (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;)Ljava/util/List<Ljava/lang/Object;>;
+ (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;)L1java/util/List<Ljava/lang/Object;>;
 parseLookupOverrideSubElements
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/support/MethodOverrides;)V
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/support/MethodOverrides;)V
 parseMapElement
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;)Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
- (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;)Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
+ (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;)L1java/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
 parseMergeAttribute
  (Lorg/w3c/dom/Element;)Z
  (Lorg/w3c/dom/Element;)Z
@@ -346,7 +346,7 @@ parsePropertyValue
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;Ljava/lang/String;)L0java/lang/Object;
 parsePropsElement
  (Lorg/w3c/dom/Element;)Ljava/util/Properties;
- (Lorg/w3c/dom/Element;)Ljava/util/Properties;
+ (Lorg/w3c/dom/Element;)L1java/util/Properties;
 parseQualifierElement
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/support/AbstractBeanDefinition;)V
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/support/AbstractBeanDefinition;)V
@@ -358,7 +358,7 @@ parseReplacedMethodSubElements
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/support/MethodOverrides;)V
 parseSetElement
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;)Ljava/util/Set<Ljava/lang/Object;>;
- (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;)Ljava/util/Set<Ljava/lang/Object;>;
+ (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;)L1java/util/Set<Ljava/lang/Object;>;
 parseValueElement
  (Lorg/w3c/dom/Element;Ljava/lang/String;)Ljava/lang/Object;
  (Lorg/w3c/dom/Element;Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.eea
index 499b23f66f..6460bf9518 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.eea
@@ -31,7 +31,7 @@ logger
 
 createDelegate
  (Lorg/springframework/beans/factory/xml/XmlReaderContext;Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/xml/BeanDefinitionParserDelegate;)Lorg/springframework/beans/factory/xml/BeanDefinitionParserDelegate;
- (Lorg/springframework/beans/factory/xml/XmlReaderContext;Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/xml/BeanDefinitionParserDelegate;)Lorg/springframework/beans/factory/xml/BeanDefinitionParserDelegate;
+ (Lorg/springframework/beans/factory/xml/XmlReaderContext;Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/xml/BeanDefinitionParserDelegate;)L1org/springframework/beans/factory/xml/BeanDefinitionParserDelegate;
 doRegisterBeanDefinitions
  (Lorg/w3c/dom/Element;)V
  (Lorg/w3c/dom/Element;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/xml/DefaultDocumentLoader.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/xml/DefaultDocumentLoader.eea
index 985d3485b6..6cc5e5520e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/xml/DefaultDocumentLoader.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/xml/DefaultDocumentLoader.eea
@@ -2,10 +2,10 @@ class org/springframework/beans/factory/xml/DefaultDocumentLoader
 
 createDocumentBuilder
  (Ljavax/xml/parsers/DocumentBuilderFactory;Lorg/xml/sax/EntityResolver;Lorg/xml/sax/ErrorHandler;)Ljavax/xml/parsers/DocumentBuilder;
- (Ljavax/xml/parsers/DocumentBuilderFactory;Lorg/xml/sax/EntityResolver;Lorg/xml/sax/ErrorHandler;)Ljavax/xml/parsers/DocumentBuilder;
+ (Ljavax/xml/parsers/DocumentBuilderFactory;Lorg/xml/sax/EntityResolver;Lorg/xml/sax/ErrorHandler;)L1javax/xml/parsers/DocumentBuilder;
 createDocumentBuilderFactory
  (IZ)Ljavax/xml/parsers/DocumentBuilderFactory;
- (IZ)Ljavax/xml/parsers/DocumentBuilderFactory;
+ (IZ)L1javax/xml/parsers/DocumentBuilderFactory;
 loadDocument
  (Lorg/xml/sax/InputSource;Lorg/xml/sax/EntityResolver;Lorg/xml/sax/ErrorHandler;IZ)Lorg/w3c/dom/Document;
  (Lorg/xml/sax/InputSource;Lorg/xml/sax/EntityResolver;Lorg/xml/sax/ErrorHandler;IZ)Lorg/w3c/dom/Document;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.eea
index 2c50a12fb8..708f1658e2 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.eea
@@ -5,13 +5,13 @@ class org/springframework/beans/factory/xml/XmlBeanDefinitionReader
  (Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)V
 createBeanDefinitionDocumentReader
  ()Lorg/springframework/beans/factory/xml/BeanDefinitionDocumentReader;
- ()Lorg/springframework/beans/factory/xml/BeanDefinitionDocumentReader;
+ ()L1org/springframework/beans/factory/xml/BeanDefinitionDocumentReader;
 createDefaultNamespaceHandlerResolver
  ()Lorg/springframework/beans/factory/xml/NamespaceHandlerResolver;
- ()Lorg/springframework/beans/factory/xml/NamespaceHandlerResolver;
+ ()L1org/springframework/beans/factory/xml/NamespaceHandlerResolver;
 createReaderContext
  (Lorg/springframework/core/io/Resource;)Lorg/springframework/beans/factory/xml/XmlReaderContext;
- (Lorg/springframework/core/io/Resource;)Lorg/springframework/beans/factory/xml/XmlReaderContext;
+ (Lorg/springframework/core/io/Resource;)L1org/springframework/beans/factory/xml/XmlReaderContext;
 detectValidationMode
  (Lorg/springframework/core/io/Resource;)I
  (Lorg/springframework/core/io/Resource;)I
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/ByteArrayPropertyEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/ByteArrayPropertyEditor.eea
index 5b0511afa4..517b297c46 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/ByteArrayPropertyEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/ByteArrayPropertyEditor.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/propertyeditors/ByteArrayPropertyEditor
 
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CharArrayPropertyEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CharArrayPropertyEditor.eea
index f69d28eeb2..674276c4ab 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CharArrayPropertyEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CharArrayPropertyEditor.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/propertyeditors/CharArrayPropertyEditor
 
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CharacterEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CharacterEditor.eea
index 611980ee68..00dc1bc763 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CharacterEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CharacterEditor.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/propertyeditors/CharacterEditor
 
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CharsetEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CharsetEditor.eea
index 62db858689..44f6160170 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CharsetEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CharsetEditor.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/propertyeditors/CharsetEditor
 
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/ClassArrayEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/ClassArrayEditor.eea
index 0d55d49a2f..921d682839 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/ClassArrayEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/ClassArrayEditor.eea
@@ -5,7 +5,7 @@ class org/springframework/beans/propertyeditors/ClassArrayEditor
  (Ljava/lang/ClassLoader;)V
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/ClassEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/ClassEditor.eea
index 6fd541f16c..552fdb32e5 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/ClassEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/ClassEditor.eea
@@ -5,7 +5,7 @@ class org/springframework/beans/propertyeditors/ClassEditor
  (Ljava/lang/ClassLoader;)V
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CurrencyEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CurrencyEditor.eea
index ce7dbed5e1..3d6215240a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CurrencyEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CurrencyEditor.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/propertyeditors/CurrencyEditor
 
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CustomBooleanEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CustomBooleanEditor.eea
index 792b402a67..8ee522dac0 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CustomBooleanEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CustomBooleanEditor.eea
@@ -30,7 +30,7 @@ VALUE_YES
  (Ljava/lang/String;Ljava/lang/String;Z)V
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CustomCollectionEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CustomCollectionEditor.eea
index 322ec908b1..f69b76abec 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CustomCollectionEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CustomCollectionEditor.eea
@@ -11,10 +11,10 @@ convertElement
  (Ljava/lang/Object;)Ljava/lang/Object;
 createCollection
  (Ljava/lang/Class<+Ljava/util/Collection;>;I)Ljava/util/Collection<Ljava/lang/Object;>;
- (Ljava/lang/Class<+Ljava/util/Collection;>;I)Ljava/util/Collection<Ljava/lang/Object;>;
+ (Ljava/lang/Class<+Ljava/util/Collection;>;I)L1java/util/Collection<Ljava/lang/Object;>;
 getAsText
  ()Ljava/lang/String;
- ()L0java/lang/String;
+ ()L0java/lang/String; # @Inherited(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CustomDateEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CustomDateEditor.eea
index 36a07be5a7..027dcc97c9 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CustomDateEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CustomDateEditor.eea
@@ -8,7 +8,7 @@ class org/springframework/beans/propertyeditors/CustomDateEditor
  (Ljava/text/DateFormat;ZI)V
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CustomMapEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CustomMapEditor.eea
index 23982d94b5..9022315261 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CustomMapEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CustomMapEditor.eea
@@ -14,10 +14,10 @@ convertValue
  (Ljava/lang/Object;)Ljava/lang/Object;
 createMap
  (Ljava/lang/Class<+Ljava/util/Map;>;I)Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
- (Ljava/lang/Class<+Ljava/util/Map;>;I)Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
+ (Ljava/lang/Class<+Ljava/util/Map;>;I)L1java/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
 getAsText
  ()Ljava/lang/String;
- ()L0java/lang/String;
+ ()L0java/lang/String; # @Inherited(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CustomNumberEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CustomNumberEditor.eea
index 958e775802..160d2e65a0 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CustomNumberEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/CustomNumberEditor.eea
@@ -8,7 +8,7 @@ class org/springframework/beans/propertyeditors/CustomNumberEditor
  (Ljava/lang/Class<+Ljava/lang/Number;>;Z)V
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/FileEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/FileEditor.eea
index f6c239396b..2ea11e9ebb 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/FileEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/FileEditor.eea
@@ -5,7 +5,7 @@ class org/springframework/beans/propertyeditors/FileEditor
  (Lorg/springframework/core/io/ResourceEditor;)V
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/InputSourceEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/InputSourceEditor.eea
index 28d79f78f6..f60e39d7b9 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/InputSourceEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/InputSourceEditor.eea
@@ -5,7 +5,7 @@ class org/springframework/beans/propertyeditors/InputSourceEditor
  (Lorg/springframework/core/io/ResourceEditor;)V
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/InputStreamEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/InputStreamEditor.eea
index 593cc622ca..6aa6024a5a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/InputStreamEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/InputStreamEditor.eea
@@ -5,7 +5,7 @@ class org/springframework/beans/propertyeditors/InputStreamEditor
  (Lorg/springframework/core/io/ResourceEditor;)V
 getAsText
  ()Ljava/lang/String;
- ()L0java/lang/String;
+ ()L0java/lang/String; # @Inherited(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/LocaleEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/LocaleEditor.eea
index 1546ba85b5..68d32f0733 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/LocaleEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/LocaleEditor.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/propertyeditors/LocaleEditor
 
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/PathEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/PathEditor.eea
index cb2dd9690f..9651de65a3 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/PathEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/PathEditor.eea
@@ -5,7 +5,7 @@ class org/springframework/beans/propertyeditors/PathEditor
  (Lorg/springframework/core/io/ResourceEditor;)V
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/PatternEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/PatternEditor.eea
index d20bcbc970..a9ed09a814 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/PatternEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/PatternEditor.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/propertyeditors/PatternEditor
 
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/ReaderEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/ReaderEditor.eea
index 2f97669bcd..15a3f4ad80 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/ReaderEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/ReaderEditor.eea
@@ -5,7 +5,7 @@ class org/springframework/beans/propertyeditors/ReaderEditor
  (Lorg/springframework/core/io/ResourceEditor;)V
 getAsText
  ()Ljava/lang/String;
- ()L0java/lang/String;
+ ()L0java/lang/String; # @Inherited(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.eea
index 5fbe255389..bd731818fb 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.eea
@@ -21,7 +21,7 @@ DEFAULT_SEPARATOR
  (Ljava/lang/String;ZZ)V
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/StringTrimmerEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/StringTrimmerEditor.eea
index bd07ac06e3..f0887d963e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/StringTrimmerEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/StringTrimmerEditor.eea
@@ -5,7 +5,7 @@ class org/springframework/beans/propertyeditors/StringTrimmerEditor
  (Ljava/lang/String;Z)V
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/TimeZoneEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/TimeZoneEditor.eea
index fec565a4b5..6e650515ae 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/TimeZoneEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/TimeZoneEditor.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/propertyeditors/TimeZoneEditor
 
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/URIEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/URIEditor.eea
index 348b868e47..3441cdc0cc 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/URIEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/URIEditor.eea
@@ -8,10 +8,10 @@ class org/springframework/beans/propertyeditors/URIEditor
  (Ljava/lang/ClassLoader;Z)V
 createURI
  (Ljava/lang/String;)Ljava/net/URI;
- (Ljava/lang/String;)Ljava/net/URI;
+ (Ljava/lang/String;)L1java/net/URI;
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/URLEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/URLEditor.eea
index 16620fd7cc..5b621d9040 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/URLEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/URLEditor.eea
@@ -5,7 +5,7 @@ class org/springframework/beans/propertyeditors/URLEditor
  (Lorg/springframework/core/io/ResourceEditor;)V
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/UUIDEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/UUIDEditor.eea
index e4398cac4f..d8f391ef20 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/UUIDEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/UUIDEditor.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/propertyeditors/UUIDEditor
 
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/ZoneIdEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/ZoneIdEditor.eea
index ae14eb0b4a..1cbea2fd5b 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/ZoneIdEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/propertyeditors/ZoneIdEditor.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/propertyeditors/ZoneIdEditor
 
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/support/ArgumentConvertingMethodInvoker.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/support/ArgumentConvertingMethodInvoker.eea
index 2c136aae63..c1275ea160 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/support/ArgumentConvertingMethodInvoker.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/support/ArgumentConvertingMethodInvoker.eea
@@ -8,7 +8,7 @@ findMatchingMethod
  ()L0java/lang/reflect/Method; # @Inherited(org.springframework.util.MethodInvoker)
 getDefaultTypeConverter
  ()Lorg/springframework/beans/TypeConverter;
- ()Lorg/springframework/beans/TypeConverter;
+ ()L1org/springframework/beans/TypeConverter;
 getTypeConverter
  ()Lorg/springframework/beans/TypeConverter;
  ()L0org/springframework/beans/TypeConverter;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/beans/support/PagedListHolder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/beans/support/PagedListHolder.eea
index 645804eb3d..9c7378eba1 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/beans/support/PagedListHolder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/beans/support/PagedListHolder.eea
@@ -10,7 +10,7 @@ class org/springframework/beans/support/PagedListHolder
  (Ljava/util/List<TE;>;Lorg/springframework/beans/support/SortDefinition;)V
 copySortDefinition
  (Lorg/springframework/beans/support/SortDefinition;)Lorg/springframework/beans/support/SortDefinition;
- (Lorg/springframework/beans/support/SortDefinition;)Lorg/springframework/beans/support/SortDefinition;
+ (Lorg/springframework/beans/support/SortDefinition;)L1org/springframework/beans/support/SortDefinition;
 doSort
  (Ljava/util/List<TE;>;Lorg/springframework/beans/support/SortDefinition;)V
  (Ljava/util/List<TE;>;Lorg/springframework/beans/support/SortDefinition;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cache/annotation/ProxyCachingConfiguration.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cache/annotation/ProxyCachingConfiguration.eea
index 84d8cefccf..63e3635de7 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cache/annotation/ProxyCachingConfiguration.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cache/annotation/ProxyCachingConfiguration.eea
@@ -2,10 +2,10 @@ class org/springframework/cache/annotation/ProxyCachingConfiguration
 
 cacheAdvisor
  (Lorg/springframework/cache/interceptor/CacheOperationSource;Lorg/springframework/cache/interceptor/CacheInterceptor;)Lorg/springframework/cache/interceptor/BeanFactoryCacheOperationSourceAdvisor;
- (Lorg/springframework/cache/interceptor/CacheOperationSource;Lorg/springframework/cache/interceptor/CacheInterceptor;)Lorg/springframework/cache/interceptor/BeanFactoryCacheOperationSourceAdvisor;
+ (Lorg/springframework/cache/interceptor/CacheOperationSource;Lorg/springframework/cache/interceptor/CacheInterceptor;)L1org/springframework/cache/interceptor/BeanFactoryCacheOperationSourceAdvisor;
 cacheInterceptor
  (Lorg/springframework/cache/interceptor/CacheOperationSource;)Lorg/springframework/cache/interceptor/CacheInterceptor;
- (Lorg/springframework/cache/interceptor/CacheOperationSource;)Lorg/springframework/cache/interceptor/CacheInterceptor;
+ (Lorg/springframework/cache/interceptor/CacheOperationSource;)L1org/springframework/cache/interceptor/CacheInterceptor;
 cacheOperationSource
  ()Lorg/springframework/cache/interceptor/CacheOperationSource;
- ()Lorg/springframework/cache/interceptor/CacheOperationSource;
+ ()L1org/springframework/cache/interceptor/CacheOperationSource;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cache/concurrent/ConcurrentMapCacheManager.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cache/concurrent/ConcurrentMapCacheManager.eea
index c5a20b8d81..280b42d122 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cache/concurrent/ConcurrentMapCacheManager.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cache/concurrent/ConcurrentMapCacheManager.eea
@@ -5,7 +5,7 @@ class org/springframework/cache/concurrent/ConcurrentMapCacheManager
  ([Ljava/lang/String;)V
 createConcurrentMapCache
  (Ljava/lang/String;)Lorg/springframework/cache/Cache;
- (Ljava/lang/String;)Lorg/springframework/cache/Cache;
+ (Ljava/lang/String;)L1org/springframework/cache/Cache;
 getCache
  (Ljava/lang/String;)Lorg/springframework/cache/Cache;
  (Ljava/lang/String;)L0org/springframework/cache/Cache; # @Inherited(org.springframework.cache.CacheManager)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.eea
index 278f8ccf26..4abfa16b34 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.eea
@@ -12,7 +12,7 @@ findCacheOperations
  (Ljava/lang/reflect/Method;)L0java/util/Collection<Lorg/springframework/cache/interceptor/CacheOperation;>;
 getCacheKey
  (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Ljava/lang/Object;
- (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Ljava/lang/Object;
+ (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)L1java/lang/Object;
 getCacheOperations
  (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Ljava/util/Collection<Lorg/springframework/cache/interceptor/CacheOperation;>;
  (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)L0java/util/Collection<Lorg/springframework/cache/interceptor/CacheOperation;>; # @Inherited(org.springframework.cache.interceptor.CacheOperationSource)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/CacheAspectSupport.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/CacheAspectSupport.eea
index dbe6704b79..de74ecc084 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/CacheAspectSupport.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/CacheAspectSupport.eea
@@ -15,7 +15,7 @@ getBean
  <T:Ljava/lang/Object;>(Ljava/lang/String;Ljava/lang/Class<TT;>;)TT;
 getCacheOperationMetadata
  (Lorg/springframework/cache/interceptor/CacheOperation;Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Lorg/springframework/cache/interceptor/CacheAspectSupport$CacheOperationMetadata;
- (Lorg/springframework/cache/interceptor/CacheOperation;Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Lorg/springframework/cache/interceptor/CacheAspectSupport$CacheOperationMetadata;
+ (Lorg/springframework/cache/interceptor/CacheOperation;Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)L1org/springframework/cache/interceptor/CacheAspectSupport$CacheOperationMetadata;
 getCacheOperationSource
  ()Lorg/springframework/cache/interceptor/CacheOperationSource;
  ()L0org/springframework/cache/interceptor/CacheOperationSource;
@@ -30,7 +30,7 @@ getKeyGenerator
  ()Lorg/springframework/cache/interceptor/KeyGenerator;
 getOperationContext
  (Lorg/springframework/cache/interceptor/CacheOperation;Ljava/lang/reflect/Method;[Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Class<*>;)Lorg/springframework/cache/interceptor/CacheAspectSupport$CacheOperationContext;
- (Lorg/springframework/cache/interceptor/CacheOperation;Ljava/lang/reflect/Method;[Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Class<*>;)Lorg/springframework/cache/interceptor/CacheAspectSupport$CacheOperationContext;
+ (Lorg/springframework/cache/interceptor/CacheOperation;Ljava/lang/reflect/Method;[Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Class<*>;)L1org/springframework/cache/interceptor/CacheAspectSupport$CacheOperationContext;
 invokeOperation
  (Lorg/springframework/cache/interceptor/CacheOperationInvoker;)Ljava/lang/Object;
  (Lorg/springframework/cache/interceptor/CacheOperationInvoker;)L0java/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/CacheEvictOperation$Builder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/CacheEvictOperation$Builder.eea
index 2e1932c145..bf9e67d292 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/CacheEvictOperation$Builder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/CacheEvictOperation$Builder.eea
@@ -5,4 +5,4 @@ build
  ()L1org/springframework/cache/interceptor/CacheEvictOperation;
 getOperationDescription
  ()Ljava/lang/StringBuilder;
- ()Ljava/lang/StringBuilder;
+ ()L1java/lang/StringBuilder; # @Inherited(org.springframework.cache.interceptor.CacheOperation$Builder)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/CacheOperation$Builder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/CacheOperation$Builder.eea
index 9cf35b4edb..7bf220164a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/CacheOperation$Builder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/CacheOperation$Builder.eea
@@ -20,7 +20,7 @@ getKeyGenerator
  ()Ljava/lang/String;
 getOperationDescription
  ()Ljava/lang/StringBuilder;
- ()Ljava/lang/StringBuilder;
+ ()L1java/lang/StringBuilder;
 setCacheManager
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/CacheProxyFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/CacheProxyFactoryBean.eea
index 455175b8b5..3ad0e8e236 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/CacheProxyFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/CacheProxyFactoryBean.eea
@@ -2,7 +2,7 @@ class org/springframework/cache/interceptor/CacheProxyFactoryBean
 
 createMainInterceptor
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object; # @Inherited(org.springframework.aop.framework.AbstractSingletonProxyFactoryBean)
 setBeanFactory
  (Lorg/springframework/beans/factory/BeanFactory;)V
  (Lorg/springframework/beans/factory/BeanFactory;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/CachePutOperation$Builder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/CachePutOperation$Builder.eea
index 59bb123c63..29678bbfa4 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/CachePutOperation$Builder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/CachePutOperation$Builder.eea
@@ -5,7 +5,7 @@ build
  ()L1org/springframework/cache/interceptor/CachePutOperation;
 getOperationDescription
  ()Ljava/lang/StringBuilder;
- ()Ljava/lang/StringBuilder;
+ ()L1java/lang/StringBuilder; # @Inherited(org.springframework.cache.interceptor.CacheOperation$Builder)
 setUnless
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/CacheableOperation$Builder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/CacheableOperation$Builder.eea
index 36daa6f2c4..6e53f11512 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/CacheableOperation$Builder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cache/interceptor/CacheableOperation$Builder.eea
@@ -5,7 +5,7 @@ build
  ()L1org/springframework/cache/interceptor/CacheableOperation;
 getOperationDescription
  ()Ljava/lang/StringBuilder;
- ()Ljava/lang/StringBuilder;
+ ()L1java/lang/StringBuilder; # @Inherited(org.springframework.cache.interceptor.CacheOperation$Builder)
 setUnless
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BeanCopier$Generator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BeanCopier$Generator.eea
index 1642a7b546..3e69d4b26c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BeanCopier$Generator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BeanCopier$Generator.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/beans/BeanCopier$Generator
 
 create
  ()Lorg/springframework/cglib/beans/BeanCopier;
- ()Lorg/springframework/cglib/beans/BeanCopier;
+ ()L1org/springframework/cglib/beans/BeanCopier;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -14,7 +14,7 @@ getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain; # @Inherited(org.springframework.cglib.core.AbstractClassGenerator)
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BeanCopier.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BeanCopier.eea
index dd56ac267d..51ec9006f9 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BeanCopier.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BeanCopier.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/beans/BeanCopier
 
 create
  (Ljava/lang/Class;Ljava/lang/Class;Z)Lorg/springframework/cglib/beans/BeanCopier;
- (Ljava/lang/Class;Ljava/lang/Class;Z)Lorg/springframework/cglib/beans/BeanCopier;
+ (Ljava/lang/Class;Ljava/lang/Class;Z)L1org/springframework/cglib/beans/BeanCopier;
 
 copy
  (Ljava/lang/Object;Ljava/lang/Object;Lorg/springframework/cglib/core/Converter;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BeanGenerator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BeanGenerator.eea
index 8047e9aaad..33bb1005b7 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BeanGenerator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BeanGenerator.eea
@@ -15,10 +15,10 @@ addProperty
  (Ljava/lang/String;Ljava/lang/Class;)V
 create
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 createClass
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -27,10 +27,10 @@ generateClass
  (Lorg/springframework/asm/ClassVisitor;)V
 getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
- ()Ljava/lang/ClassLoader;
+ ()L0java/lang/ClassLoader;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain; # @Inherited(org.springframework.cglib.core.AbstractClassGenerator)
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BeanMap$Generator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BeanMap$Generator.eea
index cf5e00b9e1..3b4a0d6af0 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BeanMap$Generator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BeanMap$Generator.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/beans/BeanMap$Generator
 
 create
  ()Lorg/springframework/cglib/beans/BeanMap;
- ()Lorg/springframework/cglib/beans/BeanMap;
+ ()L1org/springframework/cglib/beans/BeanMap;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -14,7 +14,7 @@ getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain; # @Inherited(org.springframework.cglib.core.AbstractClassGenerator)
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BeanMap.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BeanMap.eea
index 3377d9f26d..b576a6acab 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BeanMap.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BeanMap.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/beans/BeanMap
 
 create
  (Ljava/lang/Object;)Lorg/springframework/cglib/beans/BeanMap;
- (Ljava/lang/Object;)Lorg/springframework/cglib/beans/BeanMap;
+ (Ljava/lang/Object;)L1org/springframework/cglib/beans/BeanMap;
 
 bean
  Ljava/lang/Object;
@@ -49,7 +49,7 @@ putAll
  (Ljava/util/Map;)V
 remove
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object;
 setBean
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BulkBean$Generator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BulkBean$Generator.eea
index b72bf32930..ce6e3e8f12 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BulkBean$Generator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BulkBean$Generator.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/beans/BulkBean$Generator
 
 create
  ()Lorg/springframework/cglib/beans/BulkBean;
- ()Lorg/springframework/cglib/beans/BulkBean;
+ ()L1org/springframework/cglib/beans/BulkBean;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -14,7 +14,7 @@ getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain; # @Inherited(org.springframework.cglib.core.AbstractClassGenerator)
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BulkBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BulkBean.eea
index 49eb273a2c..f05c54c460 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BulkBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/BulkBean.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/beans/BulkBean
 
 create
  (Ljava/lang/Class;[Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/Class;)Lorg/springframework/cglib/beans/BulkBean;
- (Ljava/lang/Class;[Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/Class;)Lorg/springframework/cglib/beans/BulkBean;
+ (Ljava/lang/Class;[Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/Class;)L1org/springframework/cglib/beans/BulkBean;
 
 getters
  [Ljava/lang/String;
@@ -25,7 +25,7 @@ getPropertyTypes
  ()[Ljava/lang/Class;
 getPropertyValues
  (Ljava/lang/Object;)[Ljava/lang/Object;
- (Ljava/lang/Object;)[Ljava/lang/Object;
+ (Ljava/lang/Object;)[1Ljava/lang/Object;
 getPropertyValues
  (Ljava/lang/Object;[Ljava/lang/Object;)V
  (Ljava/lang/Object;[Ljava/lang/Object;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/ImmutableBean$Generator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/ImmutableBean$Generator.eea
index cc0bfda7cf..d074cf40c1 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/ImmutableBean$Generator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/ImmutableBean$Generator.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/beans/ImmutableBean$Generator
 
 create
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -14,7 +14,7 @@ getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain; # @Inherited(org.springframework.cglib.core.AbstractClassGenerator)
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/ImmutableBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/ImmutableBean.eea
index ea9e76beec..8e8098ba80 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/ImmutableBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/beans/ImmutableBean.eea
@@ -2,4 +2,4 @@ class org/springframework/cglib/beans/ImmutableBean
 
 create
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/AbstractClassGenerator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/AbstractClassGenerator.eea
index 927ef6de3f..8bc0a4d2c2 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/AbstractClassGenerator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/AbstractClassGenerator.eea
@@ -11,7 +11,7 @@ getCurrent
  (Lorg/springframework/cglib/core/AbstractClassGenerator$Source;)V
 create
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -32,7 +32,7 @@ getNamingPolicy
  ()Lorg/springframework/cglib/core/NamingPolicy;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain;
 getStrategy
  ()Lorg/springframework/cglib/core/GeneratorStrategy;
  ()Lorg/springframework/cglib/core/GeneratorStrategy;
@@ -59,4 +59,4 @@ unwrapCachedValue
  (TT;)Ljava/lang/Object;
 wrapCachedClass
  (Ljava/lang/Class;)TT;
- (Ljava/lang/Class;)TT;
+ (Ljava/lang/Class;)T1T;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/ClassEmitter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/ClassEmitter.eea
index 074a54b779..f4311a2aa0 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/ClassEmitter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/ClassEmitter.eea
@@ -35,7 +35,7 @@ visit
  (IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 visitField
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/asm/FieldVisitor;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/asm/FieldVisitor;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)L0org/springframework/asm/FieldVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
 visitMethod
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)L0org/springframework/asm/MethodVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/ClassesKey.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/ClassesKey.eea
index 5443dec58b..494fdfb177 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/ClassesKey.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/ClassesKey.eea
@@ -2,4 +2,4 @@ class org/springframework/cglib/core/ClassesKey
 
 create
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/CodeEmitter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/CodeEmitter.eea
index 9b49eca4c7..346d8620b9 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/CodeEmitter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/CodeEmitter.eea
@@ -11,7 +11,7 @@ array_store
  (Lorg/springframework/asm/Type;)V
 begin_block
  ()Lorg/springframework/cglib/core/Block;
- ()Lorg/springframework/cglib/core/Block;
+ ()L1org/springframework/cglib/core/Block;
 box
  (Lorg/springframework/asm/Type;)V
  (Lorg/springframework/asm/Type;)V
@@ -107,13 +107,13 @@ load_local
  (Lorg/springframework/cglib/core/Local;)V
 make_label
  ()Lorg/springframework/asm/Label;
- ()Lorg/springframework/asm/Label;
+ ()L1org/springframework/asm/Label;
 make_local
  ()Lorg/springframework/cglib/core/Local;
  ()Lorg/springframework/cglib/core/Local;
 make_local
  (Lorg/springframework/asm/Type;)Lorg/springframework/cglib/core/Local;
- (Lorg/springframework/asm/Type;)Lorg/springframework/cglib/core/Local;
+ (Lorg/springframework/asm/Type;)L1org/springframework/cglib/core/Local;
 mark
  (Lorg/springframework/asm/Label;)V
  (Lorg/springframework/asm/Label;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/CollectionUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/CollectionUtils.eea
index 27a76da717..077645bd0f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/CollectionUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/CollectionUtils.eea
@@ -2,16 +2,16 @@ class org/springframework/cglib/core/CollectionUtils
 
 bucket
  (Ljava/util/Collection;Lorg/springframework/cglib/core/Transformer;)Ljava/util/Map;
- (Ljava/util/Collection;Lorg/springframework/cglib/core/Transformer;)Ljava/util/Map;
+ (Ljava/util/Collection;Lorg/springframework/cglib/core/Transformer;)L1java/util/Map;
 filter
  (Ljava/util/Collection;Lorg/springframework/cglib/core/Predicate;)Ljava/util/Collection;
  (Ljava/util/Collection;Lorg/springframework/cglib/core/Predicate;)Ljava/util/Collection;
 getIndexMap
  (Ljava/util/List;)Ljava/util/Map;
- (Ljava/util/List;)Ljava/util/Map;
+ (Ljava/util/List;)L1java/util/Map;
 reverse
  (Ljava/util/Map;Ljava/util/Map;)V
  (Ljava/util/Map;Ljava/util/Map;)V
 transform
  (Ljava/util/Collection;Lorg/springframework/cglib/core/Transformer;)Ljava/util/List;
- (Ljava/util/Collection;Lorg/springframework/cglib/core/Transformer;)Ljava/util/List;
+ (Ljava/util/Collection;Lorg/springframework/cglib/core/Transformer;)L1java/util/List;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/DefaultGeneratorStrategy.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/DefaultGeneratorStrategy.eea
index d7c0e34389..4a8d905b01 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/DefaultGeneratorStrategy.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/DefaultGeneratorStrategy.eea
@@ -12,7 +12,7 @@ getClassVisitor
  ()Lorg/springframework/cglib/core/DebuggingClassWriter;
 getClassWriter
  ()Lorg/springframework/asm/ClassWriter;
- ()Lorg/springframework/asm/ClassWriter;
+ ()L1org/springframework/asm/ClassWriter;
 transform
  (Lorg/springframework/cglib/core/ClassGenerator;)Lorg/springframework/cglib/core/ClassGenerator;
  (Lorg/springframework/cglib/core/ClassGenerator;)Lorg/springframework/cglib/core/ClassGenerator;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/DefaultNamingPolicy.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/DefaultNamingPolicy.eea
index 8907e07f88..87f3e5c0d3 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/DefaultNamingPolicy.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/DefaultNamingPolicy.eea
@@ -9,7 +9,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getClassName
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;Lorg/springframework/cglib/core/Predicate;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;Lorg/springframework/cglib/core/Predicate;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;Lorg/springframework/cglib/core/Predicate;)L1java/lang/String;
 getTag
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/KeyFactory$Generator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/KeyFactory$Generator.eea
index 2fae100ed4..ad0d54d03d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/KeyFactory$Generator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/KeyFactory$Generator.eea
@@ -5,7 +5,7 @@ addCustomizer
  (Lorg/springframework/cglib/core/KeyFactoryCustomizer;)V
 create
  ()Lorg/springframework/cglib/core/KeyFactory;
- ()Lorg/springframework/cglib/core/KeyFactory;
+ ()L1org/springframework/cglib/core/KeyFactory;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -20,7 +20,7 @@ getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain; # @Inherited(org.springframework.cglib.core.AbstractClassGenerator)
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/KeyFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/KeyFactory.eea
index 7a41cceb8b..67c3f229a0 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/KeyFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/KeyFactory.eea
@@ -15,16 +15,16 @@ STORE_CLASS_AS_STRING
 
 create
  (Ljava/lang/Class;)Lorg/springframework/cglib/core/KeyFactory;
- (Ljava/lang/Class;)Lorg/springframework/cglib/core/KeyFactory;
+ (Ljava/lang/Class;)L1org/springframework/cglib/core/KeyFactory;
 create
  (Ljava/lang/Class;Lorg/springframework/cglib/core/Customizer;)Lorg/springframework/cglib/core/KeyFactory;
- (Ljava/lang/Class;Lorg/springframework/cglib/core/Customizer;)Lorg/springframework/cglib/core/KeyFactory;
+ (Ljava/lang/Class;Lorg/springframework/cglib/core/Customizer;)L1org/springframework/cglib/core/KeyFactory;
 create
  (Ljava/lang/Class;Lorg/springframework/cglib/core/KeyFactoryCustomizer;Ljava/util/List<Lorg/springframework/cglib/core/KeyFactoryCustomizer;>;)Lorg/springframework/cglib/core/KeyFactory;
- (Ljava/lang/Class;Lorg/springframework/cglib/core/KeyFactoryCustomizer;Ljava/util/List<Lorg/springframework/cglib/core/KeyFactoryCustomizer;>;)Lorg/springframework/cglib/core/KeyFactory;
+ (Ljava/lang/Class;Lorg/springframework/cglib/core/KeyFactoryCustomizer;Ljava/util/List<Lorg/springframework/cglib/core/KeyFactoryCustomizer;>;)L1org/springframework/cglib/core/KeyFactory;
 create
  (Ljava/lang/ClassLoader;Ljava/lang/Class;Lorg/springframework/cglib/core/Customizer;)Lorg/springframework/cglib/core/KeyFactory;
- (Ljava/lang/ClassLoader;Ljava/lang/Class;Lorg/springframework/cglib/core/Customizer;)Lorg/springframework/cglib/core/KeyFactory;
+ (Ljava/lang/ClassLoader;Ljava/lang/Class;Lorg/springframework/cglib/core/Customizer;)L1org/springframework/cglib/core/KeyFactory;
 create
  (Ljava/lang/ClassLoader;Ljava/lang/Class;Lorg/springframework/cglib/core/KeyFactoryCustomizer;Ljava/util/List<Lorg/springframework/cglib/core/KeyFactoryCustomizer;>;)Lorg/springframework/cglib/core/KeyFactory;
- (Ljava/lang/ClassLoader;Ljava/lang/Class;Lorg/springframework/cglib/core/KeyFactoryCustomizer;Ljava/util/List<Lorg/springframework/cglib/core/KeyFactoryCustomizer;>;)Lorg/springframework/cglib/core/KeyFactory;
+ (Ljava/lang/ClassLoader;Ljava/lang/Class;Lorg/springframework/cglib/core/KeyFactoryCustomizer;Ljava/util/List<Lorg/springframework/cglib/core/KeyFactoryCustomizer;>;)L1org/springframework/cglib/core/KeyFactory;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/MethodWrapper.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/MethodWrapper.eea
index bb26dfb998..5030cd2a8a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/MethodWrapper.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/MethodWrapper.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/core/MethodWrapper
 
 create
  (Ljava/lang/reflect/Method;)Ljava/lang/Object;
- (Ljava/lang/reflect/Method;)Ljava/lang/Object;
+ (Ljava/lang/reflect/Method;)L1java/lang/Object;
 createSet
  (Ljava/util/Collection;)Ljava/util/Set;
- (Ljava/util/Collection;)Ljava/util/Set;
+ (Ljava/util/Collection;)L1java/util/Set;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/ReflectUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/ReflectUtils.eea
index bab41508cc..b94bc573aa 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/ReflectUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/ReflectUtils.eea
@@ -35,7 +35,7 @@ findMethod
  (Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/reflect/Method;
 findMethods
  ([Ljava/lang/String;[Ljava/lang/reflect/Method;)[Ljava/lang/reflect/Method;
- ([Ljava/lang/String;[Ljava/lang/reflect/Method;)[Ljava/lang/reflect/Method;
+ ([Ljava/lang/String;[Ljava/lang/reflect/Method;)[1Ljava/lang/reflect/Method;
 findNewInstance
  (Ljava/lang/Class;)Ljava/lang/reflect/Method;
  (Ljava/lang/Class;)Ljava/lang/reflect/Method;
@@ -53,10 +53,10 @@ getBeanSetters
  (Ljava/lang/Class;)[Ljava/beans/PropertyDescriptor;
 getClassInfo
  (Ljava/lang/Class;)Lorg/springframework/cglib/core/ClassInfo;
- (Ljava/lang/Class;)Lorg/springframework/cglib/core/ClassInfo;
+ (Ljava/lang/Class;)L1org/springframework/cglib/core/ClassInfo;
 getClasses
  ([Ljava/lang/Object;)[Ljava/lang/Class;
- ([Ljava/lang/Object;)[Ljava/lang/Class;
+ ([Ljava/lang/Object;)[1Ljava/lang/Class;
 getConstructor
  (Ljava/lang/Class;[Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
  (Ljava/lang/Class;[Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
@@ -68,10 +68,10 @@ getMethodInfo
  (Ljava/lang/reflect/Member;)Lorg/springframework/cglib/core/MethodInfo;
 getMethodInfo
  (Ljava/lang/reflect/Member;I)Lorg/springframework/cglib/core/MethodInfo;
- (Ljava/lang/reflect/Member;I)Lorg/springframework/cglib/core/MethodInfo;
+ (Ljava/lang/reflect/Member;I)L1org/springframework/cglib/core/MethodInfo;
 getNames
  ([Ljava/lang/Class;)[Ljava/lang/String;
- ([Ljava/lang/Class;)[Ljava/lang/String;
+ ([Ljava/lang/Class;)[Ljava/lang/String; # @PolyNull
 getPropertyMethods
  ([Ljava/beans/PropertyDescriptor;ZZ)[Ljava/lang/reflect/Method;
  ([Ljava/beans/PropertyDescriptor;ZZ)[Ljava/lang/reflect/Method;
@@ -80,7 +80,7 @@ getProtectionDomain
  (Ljava/lang/Class;)Ljava/security/ProtectionDomain;
 getSignature
  (Ljava/lang/reflect/Member;)Lorg/springframework/cglib/core/Signature;
- (Ljava/lang/reflect/Member;)Lorg/springframework/cglib/core/Signature;
+ (Ljava/lang/reflect/Member;)L1org/springframework/cglib/core/Signature;
 newInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/SpringNamingPolicy.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/SpringNamingPolicy.eea
index 31da579e63..14bf94ac11 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/SpringNamingPolicy.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/SpringNamingPolicy.eea
@@ -6,4 +6,4 @@ INSTANCE
 
 getTag
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.cglib.core.DefaultNamingPolicy)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/TypeUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/TypeUtils.eea
index 4cf4d692de..e050f0d213 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/TypeUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/core/TypeUtils.eea
@@ -8,19 +8,19 @@ add
  ([Lorg/springframework/asm/Type;Lorg/springframework/asm/Type;)[Lorg/springframework/asm/Type;
 add
  ([Lorg/springframework/asm/Type;[Lorg/springframework/asm/Type;)[Lorg/springframework/asm/Type;
- ([Lorg/springframework/asm/Type;[Lorg/springframework/asm/Type;)[Lorg/springframework/asm/Type;
+ ([Lorg/springframework/asm/Type;[Lorg/springframework/asm/Type;)[1Lorg/springframework/asm/Type;
 emulateClassGetName
  (Lorg/springframework/asm/Type;)Ljava/lang/String;
  (Lorg/springframework/asm/Type;)Ljava/lang/String;
 escapeType
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 fromInternalName
  (Ljava/lang/String;)Lorg/springframework/asm/Type;
  (Ljava/lang/String;)Lorg/springframework/asm/Type;
 fromInternalNames
  ([Ljava/lang/String;)[Lorg/springframework/asm/Type;
- ([Ljava/lang/String;)[Lorg/springframework/asm/Type;
+ ([Ljava/lang/String;)[Lorg/springframework/asm/Type; # @PolyNull
 getBoxedType
  (Lorg/springframework/asm/Type;)Lorg/springframework/asm/Type;
  (Lorg/springframework/asm/Type;)Lorg/springframework/asm/Type;
@@ -44,7 +44,7 @@ getType
  (Ljava/lang/String;)Lorg/springframework/asm/Type;
 getTypes
  ([Ljava/lang/Class;)[Lorg/springframework/asm/Type;
- ([Ljava/lang/Class;)[Lorg/springframework/asm/Type;
+ ([Ljava/lang/Class;)[Lorg/springframework/asm/Type; # @PolyNull
 getUnboxedType
  (Lorg/springframework/asm/Type;)Lorg/springframework/asm/Type;
  (Lorg/springframework/asm/Type;)Lorg/springframework/asm/Type;
@@ -62,19 +62,19 @@ parseConstructor
  (Ljava/lang/String;)Lorg/springframework/cglib/core/Signature;
 parseConstructor
  ([Lorg/springframework/asm/Type;)Lorg/springframework/cglib/core/Signature;
- ([Lorg/springframework/asm/Type;)Lorg/springframework/cglib/core/Signature;
+ ([Lorg/springframework/asm/Type;)L1org/springframework/cglib/core/Signature;
 parseSignature
  (Ljava/lang/String;)Lorg/springframework/cglib/core/Signature;
- (Ljava/lang/String;)Lorg/springframework/cglib/core/Signature;
+ (Ljava/lang/String;)L1org/springframework/cglib/core/Signature;
 parseType
  (Ljava/lang/String;)Lorg/springframework/asm/Type;
  (Ljava/lang/String;)Lorg/springframework/asm/Type;
 parseTypes
  (Ljava/lang/String;)[Lorg/springframework/asm/Type;
- (Ljava/lang/String;)[Lorg/springframework/asm/Type;
+ (Ljava/lang/String;)[1Lorg/springframework/asm/Type;
 toInternalNames
  ([Lorg/springframework/asm/Type;)[Ljava/lang/String;
- ([Lorg/springframework/asm/Type;)[Ljava/lang/String;
+ ([Lorg/springframework/asm/Type;)[Ljava/lang/String; # @PolyNull
 upperFirst
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/proxy/Enhancer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/proxy/Enhancer.eea
index 2c415997ba..c66e72bb67 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/proxy/Enhancer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/proxy/Enhancer.eea
@@ -2,13 +2,13 @@ class org/springframework/cglib/proxy/Enhancer
 
 create
  (Ljava/lang/Class;Lorg/springframework/cglib/proxy/Callback;)Ljava/lang/Object;
- (Ljava/lang/Class;Lorg/springframework/cglib/proxy/Callback;)Ljava/lang/Object;
+ (Ljava/lang/Class;Lorg/springframework/cglib/proxy/Callback;)L1java/lang/Object;
 create
  (Ljava/lang/Class;[Ljava/lang/Class;Lorg/springframework/cglib/proxy/Callback;)Ljava/lang/Object;
- (Ljava/lang/Class;[Ljava/lang/Class;Lorg/springframework/cglib/proxy/Callback;)Ljava/lang/Object;
+ (Ljava/lang/Class;[Ljava/lang/Class;Lorg/springframework/cglib/proxy/Callback;)L1java/lang/Object;
 create
  (Ljava/lang/Class;[Ljava/lang/Class;Lorg/springframework/cglib/proxy/CallbackFilter;[Lorg/springframework/cglib/proxy/Callback;)Ljava/lang/Object;
- (Ljava/lang/Class;[Ljava/lang/Class;Lorg/springframework/cglib/proxy/CallbackFilter;[Lorg/springframework/cglib/proxy/Callback;)Ljava/lang/Object;
+ (Ljava/lang/Class;[Ljava/lang/Class;Lorg/springframework/cglib/proxy/CallbackFilter;[Lorg/springframework/cglib/proxy/Callback;)L1java/lang/Object;
 getMethods
  (Ljava/lang/Class;[Ljava/lang/Class;Ljava/util/List;)V
  (Ljava/lang/Class;[Ljava/lang/Class;Ljava/util/List;)V
@@ -24,13 +24,13 @@ registerStaticCallbacks
 
 create
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 create
  ([Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Class;[Ljava/lang/Object;)L1java/lang/Object;
 createClass
  ()Ljava/lang/Class;
- ()Ljava/lang/Class;
+ ()L1java/lang/Class;
 filterConstructors
  (Ljava/lang/Class;Ljava/util/List;)V
  (Ljava/lang/Class;Ljava/util/List;)V
@@ -45,10 +45,10 @@ generateClass
  (Lorg/springframework/asm/ClassVisitor;)V
 getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
- ()Ljava/lang/ClassLoader;
+ ()L0java/lang/ClassLoader;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain; # @Inherited(org.springframework.cglib.core.AbstractClassGenerator)
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
@@ -81,4 +81,4 @@ unwrapCachedValue
  (Ljava/lang/Object;)Ljava/lang/Object;
 wrapCachedClass
  (Ljava/lang/Class;)Ljava/lang/Object;
- (Ljava/lang/Class;)Ljava/lang/Object;
+ (Ljava/lang/Class;)L1java/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/proxy/InterfaceMaker.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/proxy/InterfaceMaker.eea
index 54a664b753..1ece311319 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/proxy/InterfaceMaker.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/proxy/InterfaceMaker.eea
@@ -11,7 +11,7 @@ add
  (Lorg/springframework/cglib/core/Signature;[Lorg/springframework/asm/Type;)V
 create
  ()Ljava/lang/Class;
- ()Ljava/lang/Class;
+ ()L1java/lang/Class;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -20,7 +20,7 @@ generateClass
  (Lorg/springframework/asm/ClassVisitor;)V
 getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
- ()Ljava/lang/ClassLoader;
+ ()L0java/lang/ClassLoader;
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/proxy/MethodProxy.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/proxy/MethodProxy.eea
index 391c100fe1..890b2232b6 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/proxy/MethodProxy.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/proxy/MethodProxy.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/proxy/MethodProxy
 
 create
  (Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/cglib/proxy/MethodProxy;
- (Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/cglib/proxy/MethodProxy;
+ (Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1org/springframework/cglib/proxy/MethodProxy;
 find
  (Ljava/lang/Class;Lorg/springframework/cglib/core/Signature;)Lorg/springframework/cglib/proxy/MethodProxy;
  (Ljava/lang/Class;Lorg/springframework/cglib/core/Signature;)Lorg/springframework/cglib/proxy/MethodProxy;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/proxy/Mixin$Generator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/proxy/Mixin$Generator.eea
index ee23f2d61a..7d8e1c42c9 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/proxy/Mixin$Generator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/proxy/Mixin$Generator.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/proxy/Mixin$Generator
 
 create
  ()Lorg/springframework/cglib/proxy/Mixin;
- ()Lorg/springframework/cglib/proxy/Mixin;
+ ()L1org/springframework/cglib/proxy/Mixin;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -14,7 +14,7 @@ getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain; # @Inherited(org.springframework.cglib.core.AbstractClassGenerator)
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/proxy/Mixin.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/proxy/Mixin.eea
index 0b21c9fa2e..9e82941f2a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/proxy/Mixin.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/proxy/Mixin.eea
@@ -2,16 +2,16 @@ class org/springframework/cglib/proxy/Mixin
 
 create
  ([Ljava/lang/Class;[Ljava/lang/Object;)Lorg/springframework/cglib/proxy/Mixin;
- ([Ljava/lang/Class;[Ljava/lang/Object;)Lorg/springframework/cglib/proxy/Mixin;
+ ([Ljava/lang/Class;[Ljava/lang/Object;)L1org/springframework/cglib/proxy/Mixin;
 create
  ([Ljava/lang/Object;)Lorg/springframework/cglib/proxy/Mixin;
- ([Ljava/lang/Object;)Lorg/springframework/cglib/proxy/Mixin;
+ ([Ljava/lang/Object;)L1org/springframework/cglib/proxy/Mixin;
 createBean
  (Ljava/lang/ClassLoader;[Ljava/lang/Object;)Lorg/springframework/cglib/proxy/Mixin;
- (Ljava/lang/ClassLoader;[Ljava/lang/Object;)Lorg/springframework/cglib/proxy/Mixin;
+ (Ljava/lang/ClassLoader;[Ljava/lang/Object;)L1org/springframework/cglib/proxy/Mixin;
 createBean
  ([Ljava/lang/Object;)Lorg/springframework/cglib/proxy/Mixin;
- ([Ljava/lang/Object;)Lorg/springframework/cglib/proxy/Mixin;
+ ([Ljava/lang/Object;)L1org/springframework/cglib/proxy/Mixin;
 getClasses
  ([Ljava/lang/Object;)[Ljava/lang/Class;
  ([Ljava/lang/Object;)[Ljava/lang/Class;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/ConstructorDelegate$Generator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/ConstructorDelegate$Generator.eea
index b1e831e60f..543feb570f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/ConstructorDelegate$Generator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/ConstructorDelegate$Generator.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/reflect/ConstructorDelegate$Generator
 
 create
  ()Lorg/springframework/cglib/reflect/ConstructorDelegate;
- ()Lorg/springframework/cglib/reflect/ConstructorDelegate;
+ ()L1org/springframework/cglib/reflect/ConstructorDelegate;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -14,7 +14,7 @@ getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain; # @Inherited(org.springframework.cglib.core.AbstractClassGenerator)
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/ConstructorDelegate.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/ConstructorDelegate.eea
index 3ef60535cf..a64f14c306 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/ConstructorDelegate.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/ConstructorDelegate.eea
@@ -2,4 +2,4 @@ class org/springframework/cglib/reflect/ConstructorDelegate
 
 create
  (Ljava/lang/Class;Ljava/lang/Class;)Lorg/springframework/cglib/reflect/ConstructorDelegate;
- (Ljava/lang/Class;Ljava/lang/Class;)Lorg/springframework/cglib/reflect/ConstructorDelegate;
+ (Ljava/lang/Class;Ljava/lang/Class;)L1org/springframework/cglib/reflect/ConstructorDelegate;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/FastClass$Generator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/FastClass$Generator.eea
index 7bb4b8d2bd..76f6261e1c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/FastClass$Generator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/FastClass$Generator.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/reflect/FastClass$Generator
 
 create
  ()Lorg/springframework/cglib/reflect/FastClass;
- ()Lorg/springframework/cglib/reflect/FastClass;
+ ()L1org/springframework/cglib/reflect/FastClass;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -14,7 +14,7 @@ getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain; # @Inherited(org.springframework.cglib.core.AbstractClassGenerator)
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/FastClass.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/FastClass.eea
index c1f071c72b..c0e712ac43 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/FastClass.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/FastClass.eea
@@ -2,13 +2,13 @@ class org/springframework/cglib/reflect/FastClass
 
 create
  (Ljava/lang/Class;)Lorg/springframework/cglib/reflect/FastClass;
- (Ljava/lang/Class;)Lorg/springframework/cglib/reflect/FastClass;
+ (Ljava/lang/Class;)L1org/springframework/cglib/reflect/FastClass;
 create
  (Ljava/lang/ClassLoader;Ljava/lang/Class;)Lorg/springframework/cglib/reflect/FastClass;
- (Ljava/lang/ClassLoader;Ljava/lang/Class;)Lorg/springframework/cglib/reflect/FastClass;
+ (Ljava/lang/ClassLoader;Ljava/lang/Class;)L1org/springframework/cglib/reflect/FastClass;
 getSignatureWithoutReturnType
  (Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/String;
- (Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/String;
+ (Ljava/lang/String;[Ljava/lang/Class;)L1java/lang/String;
 
 <init>
  (Ljava/lang/Class;)V
@@ -18,7 +18,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getConstructor
  (Ljava/lang/reflect/Constructor;)Lorg/springframework/cglib/reflect/FastConstructor;
- (Ljava/lang/reflect/Constructor;)Lorg/springframework/cglib/reflect/FastConstructor;
+ (Ljava/lang/reflect/Constructor;)L1org/springframework/cglib/reflect/FastConstructor;
 getConstructor
  ([Ljava/lang/Class;)Lorg/springframework/cglib/reflect/FastConstructor;
  ([Ljava/lang/Class;)Lorg/springframework/cglib/reflect/FastConstructor;
@@ -39,7 +39,7 @@ getMethod
  (Ljava/lang/String;[Ljava/lang/Class;)Lorg/springframework/cglib/reflect/FastMethod;
 getMethod
  (Ljava/lang/reflect/Method;)Lorg/springframework/cglib/reflect/FastMethod;
- (Ljava/lang/reflect/Method;)Lorg/springframework/cglib/reflect/FastMethod;
+ (Ljava/lang/reflect/Method;)L1org/springframework/cglib/reflect/FastMethod;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/MethodDelegate$Generator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/MethodDelegate$Generator.eea
index 524de6a88e..647c678afa 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/MethodDelegate$Generator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/MethodDelegate$Generator.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/reflect/MethodDelegate$Generator
 
 create
  ()Lorg/springframework/cglib/reflect/MethodDelegate;
- ()Lorg/springframework/cglib/reflect/MethodDelegate;
+ ()L1org/springframework/cglib/reflect/MethodDelegate;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -14,7 +14,7 @@ getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain; # @Inherited(org.springframework.cglib.core.AbstractClassGenerator)
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/MethodDelegate.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/MethodDelegate.eea
index a5bfa0e8e2..e1cdaf5748 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/MethodDelegate.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/MethodDelegate.eea
@@ -2,10 +2,10 @@ class org/springframework/cglib/reflect/MethodDelegate
 
 create
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Class;)Lorg/springframework/cglib/reflect/MethodDelegate;
- (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Class;)Lorg/springframework/cglib/reflect/MethodDelegate;
+ (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Class;)L1org/springframework/cglib/reflect/MethodDelegate;
 createStatic
  (Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Class;)Lorg/springframework/cglib/reflect/MethodDelegate;
- (Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Class;)Lorg/springframework/cglib/reflect/MethodDelegate;
+ (Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Class;)L1org/springframework/cglib/reflect/MethodDelegate;
 
 eqMethod
  Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/MulticastDelegate$Generator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/MulticastDelegate$Generator.eea
index 45fc3f04c1..50bb43db48 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/MulticastDelegate$Generator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/MulticastDelegate$Generator.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/reflect/MulticastDelegate$Generator
 
 create
  ()Lorg/springframework/cglib/reflect/MulticastDelegate;
- ()Lorg/springframework/cglib/reflect/MulticastDelegate;
+ ()L1org/springframework/cglib/reflect/MulticastDelegate;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -14,7 +14,7 @@ getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain; # @Inherited(org.springframework.cglib.core.AbstractClassGenerator)
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/MulticastDelegate.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/MulticastDelegate.eea
index b2fe51f4ae..0578410314 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/MulticastDelegate.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/reflect/MulticastDelegate.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/reflect/MulticastDelegate
 
 create
  (Ljava/lang/Class;)Lorg/springframework/cglib/reflect/MulticastDelegate;
- (Ljava/lang/Class;)Lorg/springframework/cglib/reflect/MulticastDelegate;
+ (Ljava/lang/Class;)L1org/springframework/cglib/reflect/MulticastDelegate;
 
 targets
  [Ljava/lang/Object;
@@ -16,7 +16,7 @@ addHelper
  (Ljava/lang/Object;)Lorg/springframework/cglib/reflect/MulticastDelegate;
 getTargets
  ()Ljava/util/List;
- ()Ljava/util/List;
+ ()L1java/util/List;
 newInstance
  ()Lorg/springframework/cglib/reflect/MulticastDelegate;
  ()Lorg/springframework/cglib/reflect/MulticastDelegate;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/AbstractClassFilterTransformer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/AbstractClassFilterTransformer.eea
index 6ed30b5857..9c8f5a5bd2 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/AbstractClassFilterTransformer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/AbstractClassFilterTransformer.eea
@@ -14,19 +14,19 @@ visit
  (IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 visitAnnotation
  (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
 visitAttribute
  (Lorg/springframework/asm/Attribute;)V
  (Lorg/springframework/asm/Attribute;)V
 visitField
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/asm/FieldVisitor;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/asm/FieldVisitor;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)L0org/springframework/asm/FieldVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
 visitInnerClass
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
 visitMethod
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)L0org/springframework/asm/MethodVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
 visitOuterClass
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/AbstractClassLoader.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/AbstractClassLoader.eea
index 44f5cff31c..e3a10eecc2 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/AbstractClassLoader.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/AbstractClassLoader.eea
@@ -5,10 +5,10 @@ class org/springframework/cglib/transform/AbstractClassLoader
  (Ljava/lang/ClassLoader;Ljava/lang/ClassLoader;Lorg/springframework/cglib/transform/ClassFilter;)V
 attributes
  ()[Lorg/springframework/asm/Attribute;
- ()[Lorg/springframework/asm/Attribute;
+ ()[0Lorg/springframework/asm/Attribute;
 getGenerator
  (Lorg/springframework/asm/ClassReader;)Lorg/springframework/cglib/core/ClassGenerator;
- (Lorg/springframework/asm/ClassReader;)Lorg/springframework/cglib/core/ClassGenerator;
+ (Lorg/springframework/asm/ClassReader;)L1org/springframework/cglib/core/ClassGenerator;
 loadClass
  (Ljava/lang/String;)Ljava/lang/Class;
  (Ljava/lang/String;)Ljava/lang/Class;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/AbstractTransformTask.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/AbstractTransformTask.eea
index 29dcbafaaf..a421bf450f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/AbstractTransformTask.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/AbstractTransformTask.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/transform/AbstractTransformTask
 
 attributes
  ()[Lorg/springframework/asm/Attribute;
- ()[Lorg/springframework/asm/Attribute;
+ ()[0Lorg/springframework/asm/Attribute;
 getClassTransformer
  ([Ljava/lang/String;)Lorg/springframework/cglib/transform/ClassTransformer;
  ([Ljava/lang/String;)Lorg/springframework/cglib/transform/ClassTransformer;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/AnnotationVisitorTee.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/AnnotationVisitorTee.eea
index 445d9371fc..148aad6aa4 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/AnnotationVisitorTee.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/AnnotationVisitorTee.eea
@@ -12,10 +12,10 @@ visit
  (Ljava/lang/String;Ljava/lang/Object;)V
 visitAnnotation
  (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;Ljava/lang/String;)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.AnnotationVisitor)
 visitArray
  (Ljava/lang/String;)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.AnnotationVisitor)
 visitEnum
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/ClassTransformerChain.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/ClassTransformerChain.eea
index c93e6fc6ee..ad9da5d1bb 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/ClassTransformerChain.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/ClassTransformerChain.eea
@@ -11,4 +11,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 visitMethod
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)L0org/springframework/asm/MethodVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/ClassVisitorTee.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/ClassVisitorTee.eea
index e6fc189638..da476fbc56 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/ClassVisitorTee.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/ClassVisitorTee.eea
@@ -8,19 +8,19 @@ visit
  (IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 visitAnnotation
  (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
 visitAttribute
  (Lorg/springframework/asm/Attribute;)V
  (Lorg/springframework/asm/Attribute;)V
 visitField
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/asm/FieldVisitor;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/asm/FieldVisitor;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)L0org/springframework/asm/FieldVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
 visitInnerClass
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
 visitMethod
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)L0org/springframework/asm/MethodVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
 visitOuterClass
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
@@ -29,4 +29,4 @@ visitSource
  (Ljava/lang/String;Ljava/lang/String;)V
 visitTypeAnnotation
  (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/FieldVisitorTee.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/FieldVisitorTee.eea
index 461a978719..b4f0c57761 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/FieldVisitorTee.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/FieldVisitorTee.eea
@@ -5,10 +5,10 @@ class org/springframework/cglib/transform/FieldVisitorTee
  (Lorg/springframework/asm/FieldVisitor;Lorg/springframework/asm/FieldVisitor;)V
 visitAnnotation
  (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.FieldVisitor)
 visitAttribute
  (Lorg/springframework/asm/Attribute;)V
  (Lorg/springframework/asm/Attribute;)V
 visitTypeAnnotation
  (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.FieldVisitor)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/MethodFilterTransformer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/MethodFilterTransformer.eea
index f8cb540cf7..1d1c3a0db5 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/MethodFilterTransformer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/MethodFilterTransformer.eea
@@ -8,4 +8,4 @@ setTarget
  (Lorg/springframework/asm/ClassVisitor;)V
 visitMethod
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)L0org/springframework/asm/MethodVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/MethodVisitorTee.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/MethodVisitorTee.eea
index 429ff249e3..48ab4e4c70 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/MethodVisitorTee.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/MethodVisitorTee.eea
@@ -5,10 +5,10 @@ class org/springframework/cglib/transform/MethodVisitorTee
  (Lorg/springframework/asm/MethodVisitor;Lorg/springframework/asm/MethodVisitor;)V
 visitAnnotation
  (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.MethodVisitor)
 visitAnnotationDefault
  ()Lorg/springframework/asm/AnnotationVisitor;
- ()Lorg/springframework/asm/AnnotationVisitor;
+ ()L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.MethodVisitor)
 visitAttribute
  (Lorg/springframework/asm/Attribute;)V
  (Lorg/springframework/asm/Attribute;)V
@@ -20,7 +20,7 @@ visitFrame
  (II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 visitInsnAnnotation
  (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.MethodVisitor)
 visitInvokeDynamicInsn
  (Ljava/lang/String;Ljava/lang/String;Lorg/springframework/asm/Handle;[Ljava/lang/Object;)V
  (Ljava/lang/String;Ljava/lang/String;Lorg/springframework/asm/Handle;[Ljava/lang/Object;)V
@@ -41,7 +41,7 @@ visitLocalVariable
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lorg/springframework/asm/Label;Lorg/springframework/asm/Label;I)V
 visitLocalVariableAnnotation
  (ILorg/springframework/asm/TypePath;[Lorg/springframework/asm/Label;[Lorg/springframework/asm/Label;[ILjava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;[Lorg/springframework/asm/Label;[Lorg/springframework/asm/Label;[ILjava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;[Lorg/springframework/asm/Label;[Lorg/springframework/asm/Label;[ILjava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.MethodVisitor)
 visitLookupSwitchInsn
  (Lorg/springframework/asm/Label;[I[Lorg/springframework/asm/Label;)V
  (Lorg/springframework/asm/Label;[I[Lorg/springframework/asm/Label;)V
@@ -59,19 +59,19 @@ visitParameter
  (Ljava/lang/String;I)V
 visitParameterAnnotation
  (ILjava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILjava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILjava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.MethodVisitor)
 visitTableSwitchInsn
  (IILorg/springframework/asm/Label;[Lorg/springframework/asm/Label;)V
  (IILorg/springframework/asm/Label;[Lorg/springframework/asm/Label;)V
 visitTryCatchAnnotation
  (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.MethodVisitor)
 visitTryCatchBlock
  (Lorg/springframework/asm/Label;Lorg/springframework/asm/Label;Lorg/springframework/asm/Label;Ljava/lang/String;)V
  (Lorg/springframework/asm/Label;Lorg/springframework/asm/Label;Lorg/springframework/asm/Label;Ljava/lang/String;)V
 visitTypeAnnotation
  (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.MethodVisitor)
 visitTypeInsn
  (ILjava/lang/String;)V
  (ILjava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/TransformingClassLoader.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/TransformingClassLoader.eea
index ed04bd16a7..c68d135f5a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/TransformingClassLoader.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/TransformingClassLoader.eea
@@ -5,4 +5,4 @@ class org/springframework/cglib/transform/TransformingClassLoader
  (Ljava/lang/ClassLoader;Lorg/springframework/cglib/transform/ClassFilter;Lorg/springframework/cglib/transform/ClassTransformerFactory;)V
 getGenerator
  (Lorg/springframework/asm/ClassReader;)Lorg/springframework/cglib/core/ClassGenerator;
- (Lorg/springframework/asm/ClassReader;)Lorg/springframework/cglib/core/ClassGenerator;
+ (Lorg/springframework/asm/ClassReader;)L1org/springframework/cglib/core/ClassGenerator; # @Inherited(org.springframework.cglib.transform.AbstractClassLoader)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/impl/InterceptFieldTransformer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/impl/InterceptFieldTransformer.eea
index d8aa7e9a3c..997272dfe3 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/impl/InterceptFieldTransformer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/impl/InterceptFieldTransformer.eea
@@ -8,7 +8,7 @@ begin_class
  (IILjava/lang/String;Lorg/springframework/asm/Type;[Lorg/springframework/asm/Type;Ljava/lang/String;)V
 begin_method
  (ILorg/springframework/cglib/core/Signature;[Lorg/springframework/asm/Type;)Lorg/springframework/cglib/core/CodeEmitter;
- (ILorg/springframework/cglib/core/Signature;[Lorg/springframework/asm/Type;)Lorg/springframework/cglib/core/CodeEmitter;
+ (ILorg/springframework/cglib/core/Signature;[Lorg/springframework/asm/Type;)L1org/springframework/cglib/core/CodeEmitter;
 declare_field
  (ILjava/lang/String;Lorg/springframework/asm/Type;Ljava/lang/Object;)V
  (ILjava/lang/String;Lorg/springframework/asm/Type;Ljava/lang/Object;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/impl/UndeclaredThrowableStrategy.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/impl/UndeclaredThrowableStrategy.eea
index 3f201897ad..61960f00a1 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/impl/UndeclaredThrowableStrategy.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/transform/impl/UndeclaredThrowableStrategy.eea
@@ -5,4 +5,4 @@ class org/springframework/cglib/transform/impl/UndeclaredThrowableStrategy
  (Ljava/lang/Class;)V
 transform
  (Lorg/springframework/cglib/core/ClassGenerator;)Lorg/springframework/cglib/core/ClassGenerator;
- (Lorg/springframework/cglib/core/ClassGenerator;)Lorg/springframework/cglib/core/ClassGenerator;
+ (Lorg/springframework/cglib/core/ClassGenerator;)L1org/springframework/cglib/core/ClassGenerator;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/util/ParallelSorter$Generator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/util/ParallelSorter$Generator.eea
index 5c2e40c23a..69d1cf8afb 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/util/ParallelSorter$Generator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/util/ParallelSorter$Generator.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/util/ParallelSorter$Generator
 
 create
  ()Lorg/springframework/cglib/util/ParallelSorter;
- ()Lorg/springframework/cglib/util/ParallelSorter;
+ ()L1org/springframework/cglib/util/ParallelSorter;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -11,7 +11,7 @@ generateClass
  (Lorg/springframework/asm/ClassVisitor;)V
 getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
- ()Ljava/lang/ClassLoader;
+ ()L0java/lang/ClassLoader;
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/util/ParallelSorter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/util/ParallelSorter.eea
index f2a33abed6..ebd3adf4db 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/util/ParallelSorter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/util/ParallelSorter.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/util/ParallelSorter
 
 create
  ([Ljava/lang/Object;)Lorg/springframework/cglib/util/ParallelSorter;
- ([Ljava/lang/Object;)Lorg/springframework/cglib/util/ParallelSorter;
+ ([Ljava/lang/Object;)L1org/springframework/cglib/util/ParallelSorter;
 
 a
  [Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/util/StringSwitcher$Generator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/util/StringSwitcher$Generator.eea
index 7803cd8482..ed1d34bc8e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/util/StringSwitcher$Generator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/util/StringSwitcher$Generator.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/util/StringSwitcher$Generator
 
 create
  ()Lorg/springframework/cglib/util/StringSwitcher;
- ()Lorg/springframework/cglib/util/StringSwitcher;
+ ()L1org/springframework/cglib/util/StringSwitcher;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/util/StringSwitcher.eea b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/util/StringSwitcher.eea
index bdd0782923..fd42eb85c3 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/cglib/util/StringSwitcher.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/cglib/util/StringSwitcher.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/util/StringSwitcher
 
 create
  ([Ljava/lang/String;[IZ)Lorg/springframework/cglib/util/StringSwitcher;
- ([Ljava/lang/String;[IZ)Lorg/springframework/cglib/util/StringSwitcher;
+ ([Ljava/lang/String;[IZ)L1org/springframework/cglib/util/StringSwitcher;
 
 intValue
  (Ljava/lang/String;)I
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/AdviceModeImportSelector.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/AdviceModeImportSelector.eea
index d92af486f8..3f25023da8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/AdviceModeImportSelector.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/AdviceModeImportSelector.eea
@@ -8,7 +8,7 @@ DEFAULT_ADVICE_MODE_ATTRIBUTE_NAME
 
 getAdviceModeAttributeName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 selectImports
  (Lorg/springframework/context/annotation/AdviceMode;)[Ljava/lang/String;
  (Lorg/springframework/context/annotation/AdviceMode;)[0Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/AnnotationScopeMetadataResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/AnnotationScopeMetadataResolver.eea
index 10002d9abd..451182e1c4 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/AnnotationScopeMetadataResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/AnnotationScopeMetadataResolver.eea
@@ -9,7 +9,7 @@ scopeAnnotationType
  (Lorg/springframework/context/annotation/ScopedProxyMode;)V
 resolveScopeMetadata
  (Lorg/springframework/beans/factory/config/BeanDefinition;)Lorg/springframework/context/annotation/ScopeMetadata;
- (Lorg/springframework/beans/factory/config/BeanDefinition;)Lorg/springframework/context/annotation/ScopeMetadata;
+ (Lorg/springframework/beans/factory/config/BeanDefinition;)L1org/springframework/context/annotation/ScopeMetadata;
 setScopeAnnotationType
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)V
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.eea
index 06cf3b798b..cb31d56b7b 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.eea
@@ -17,7 +17,7 @@ checkCandidate
  (Ljava/lang/String;Lorg/springframework/beans/factory/config/BeanDefinition;)Z
 doScan
  ([Ljava/lang/String;)Ljava/util/Set<Lorg/springframework/beans/factory/config/BeanDefinitionHolder;>;
- ([Ljava/lang/String;)Ljava/util/Set<Lorg/springframework/beans/factory/config/BeanDefinitionHolder;>;
+ ([Ljava/lang/String;)L1java/util/Set<Lorg/springframework/beans/factory/config/BeanDefinitionHolder;>;
 getBeanDefinitionDefaults
  ()Lorg/springframework/beans/factory/support/BeanDefinitionDefaults;
  ()Lorg/springframework/beans/factory/support/BeanDefinitionDefaults;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.eea
index d4b96c6610..0d74d6ab86 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.eea
@@ -5,10 +5,10 @@ configureScanner
  (Lorg/springframework/beans/factory/xml/ParserContext;Lorg/w3c/dom/Element;)Lorg/springframework/context/annotation/ClassPathBeanDefinitionScanner;
 createScanner
  (Lorg/springframework/beans/factory/xml/XmlReaderContext;Z)Lorg/springframework/context/annotation/ClassPathBeanDefinitionScanner;
- (Lorg/springframework/beans/factory/xml/XmlReaderContext;Z)Lorg/springframework/context/annotation/ClassPathBeanDefinitionScanner;
+ (Lorg/springframework/beans/factory/xml/XmlReaderContext;Z)L1org/springframework/context/annotation/ClassPathBeanDefinitionScanner;
 createTypeFilter
  (Lorg/w3c/dom/Element;Ljava/lang/ClassLoader;Lorg/springframework/beans/factory/xml/ParserContext;)Lorg/springframework/core/type/filter/TypeFilter;
- (Lorg/w3c/dom/Element;Ljava/lang/ClassLoader;Lorg/springframework/beans/factory/xml/ParserContext;)Lorg/springframework/core/type/filter/TypeFilter;
+ (Lorg/w3c/dom/Element;Ljava/lang/ClassLoader;Lorg/springframework/beans/factory/xml/ParserContext;)L1org/springframework/core/type/filter/TypeFilter;
 parse
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/xml/ParserContext;)Lorg/springframework/beans/factory/config/BeanDefinition;
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/xml/ParserContext;)L0org/springframework/beans/factory/config/BeanDefinition; # @Inherited(org.springframework.beans.factory.xml.BeanDefinitionParser)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.eea
index beb3cebf4e..3f34772fdb 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.eea
@@ -8,7 +8,7 @@ registerScope
  (Ljava/lang/String;Ljava/lang/String;)V
 resolveScopeMetadata
  (Lorg/springframework/beans/factory/config/BeanDefinition;)Lorg/springframework/context/annotation/ScopeMetadata;
- (Lorg/springframework/beans/factory/config/BeanDefinition;)Lorg/springframework/context/annotation/ScopeMetadata;
+ (Lorg/springframework/beans/factory/config/BeanDefinition;)L1org/springframework/context/annotation/ScopeMetadata;
 resolveScopeName
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)L0java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/LoadTimeWeavingConfiguration.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/LoadTimeWeavingConfiguration.eea
index b3771558ed..550f93091e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/LoadTimeWeavingConfiguration.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/LoadTimeWeavingConfiguration.eea
@@ -2,7 +2,7 @@ class org/springframework/context/annotation/LoadTimeWeavingConfiguration
 
 loadTimeWeaver
  ()Lorg/springframework/instrument/classloading/LoadTimeWeaver;
- ()Lorg/springframework/instrument/classloading/LoadTimeWeaver;
+ ()L1org/springframework/instrument/classloading/LoadTimeWeaver;
 setBeanClassLoader
  (Ljava/lang/ClassLoader;)V
  (Ljava/lang/ClassLoader;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/MBeanExportConfiguration.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/MBeanExportConfiguration.eea
index 8804030f9e..a49af658a9 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/MBeanExportConfiguration.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/MBeanExportConfiguration.eea
@@ -2,7 +2,7 @@ class org/springframework/context/annotation/MBeanExportConfiguration
 
 mbeanExporter
  ()Lorg/springframework/jmx/export/annotation/AnnotationMBeanExporter;
- ()Lorg/springframework/jmx/export/annotation/AnnotationMBeanExporter;
+ ()L1org/springframework/jmx/export/annotation/AnnotationMBeanExporter;
 setBeanFactory
  (Lorg/springframework/beans/factory/BeanFactory;)V
  (Lorg/springframework/beans/factory/BeanFactory;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/TypeFilterUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/TypeFilterUtils.eea
index 9406237415..259a8c6544 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/TypeFilterUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/annotation/TypeFilterUtils.eea
@@ -2,4 +2,4 @@ class org/springframework/context/annotation/TypeFilterUtils
 
 createTypeFiltersFor
  (Lorg/springframework/core/annotation/AnnotationAttributes;Lorg/springframework/core/env/Environment;Lorg/springframework/core/io/ResourceLoader;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)Ljava/util/List<Lorg/springframework/core/type/filter/TypeFilter;>;
- (Lorg/springframework/core/annotation/AnnotationAttributes;Lorg/springframework/core/env/Environment;Lorg/springframework/core/io/ResourceLoader;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)Ljava/util/List<Lorg/springframework/core/type/filter/TypeFilter;>;
+ (Lorg/springframework/core/annotation/AnnotationAttributes;Lorg/springframework/core/env/Environment;Lorg/springframework/core/io/ResourceLoader;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)L1java/util/List<Lorg/springframework/core/type/filter/TypeFilter;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/event/ApplicationListenerMethodAdapter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/event/ApplicationListenerMethodAdapter.eea
index e9b2067759..a34feb7e8b 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/event/ApplicationListenerMethodAdapter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/event/ApplicationListenerMethodAdapter.eea
@@ -15,13 +15,13 @@ getCondition
  ()L0java/lang/String;
 getDefaultListenerId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getDetailedErrorMessage
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;)L1java/lang/String;
 getListenerId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.context.event.SmartApplicationListener)
 getTargetBean
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/event/DefaultEventListenerFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/event/DefaultEventListenerFactory.eea
index e485405d9c..af4a70e575 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/event/DefaultEventListenerFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/event/DefaultEventListenerFactory.eea
@@ -2,7 +2,7 @@ class org/springframework/context/event/DefaultEventListenerFactory
 
 createApplicationListener
  (Ljava/lang/String;Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)Lorg/springframework/context/ApplicationListener<*>;
- (Ljava/lang/String;Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)Lorg/springframework/context/ApplicationListener<*>;
+ (Ljava/lang/String;Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)L1org/springframework/context/ApplicationListener<*>; # @Inherited(org.springframework.context.event.EventListenerFactory)
 supportsMethod
  (Ljava/lang/reflect/Method;)Z
  (Ljava/lang/reflect/Method;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/event/EventListenerFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/event/EventListenerFactory.eea
index d51f1c3ad4..8587a5f2c0 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/event/EventListenerFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/event/EventListenerFactory.eea
@@ -2,7 +2,7 @@ class org/springframework/context/event/EventListenerFactory
 
 createApplicationListener
  (Ljava/lang/String;Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)Lorg/springframework/context/ApplicationListener<*>;
- (Ljava/lang/String;Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)Lorg/springframework/context/ApplicationListener<*>;
+ (Ljava/lang/String;Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)L1org/springframework/context/ApplicationListener<*>;
 supportsMethod
  (Ljava/lang/reflect/Method;)Z
  (Ljava/lang/reflect/Method;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/event/GenericApplicationListenerAdapter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/event/GenericApplicationListenerAdapter.eea
index 81f7ff1eba..dfcab1b2e8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/event/GenericApplicationListenerAdapter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/event/GenericApplicationListenerAdapter.eea
@@ -5,7 +5,7 @@ class org/springframework/context/event/GenericApplicationListenerAdapter
  (Lorg/springframework/context/ApplicationListener<*>;)V
 getListenerId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.context.event.SmartApplicationListener)
 onApplicationEvent
  (Lorg/springframework/context/ApplicationEvent;)V
  (Lorg/springframework/context/ApplicationEvent;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/event/SmartApplicationListener.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/event/SmartApplicationListener.eea
index 7732a6303a..943fea8673 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/event/SmartApplicationListener.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/event/SmartApplicationListener.eea
@@ -6,7 +6,7 @@ super org/springframework/context/ApplicationListener
 
 getListenerId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 supportsEventType
  (Ljava/lang/Class<+Lorg/springframework/context/ApplicationEvent;>;)Z
  (Ljava/lang/Class<+Lorg/springframework/context/ApplicationEvent;>;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/event/SourceFilteringListener.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/event/SourceFilteringListener.eea
index d864b2db0b..21063ec25a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/event/SourceFilteringListener.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/event/SourceFilteringListener.eea
@@ -8,7 +8,7 @@ class org/springframework/context/event/SourceFilteringListener
  (Ljava/lang/Object;Lorg/springframework/context/ApplicationListener<*>;)V
 getListenerId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.context.event.SmartApplicationListener)
 onApplicationEvent
  (Lorg/springframework/context/ApplicationEvent;)V
  (Lorg/springframework/context/ApplicationEvent;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/expression/BeanExpressionContextAccessor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/expression/BeanExpressionContextAccessor.eea
index 8eba75b4cf..bd1e1fccaa 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/expression/BeanExpressionContextAccessor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/expression/BeanExpressionContextAccessor.eea
@@ -11,7 +11,7 @@ getSpecificTargetClasses
  ()[0Ljava/lang/Class<*>; # @Inherited(org.springframework.expression.PropertyAccessor)
 read
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/expression/TypedValue;
 write
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/expression/BeanFactoryAccessor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/expression/BeanFactoryAccessor.eea
index 48e412f13c..8970757d32 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/expression/BeanFactoryAccessor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/expression/BeanFactoryAccessor.eea
@@ -11,7 +11,7 @@ getSpecificTargetClasses
  ()[0Ljava/lang/Class<*>; # @Inherited(org.springframework.expression.PropertyAccessor)
 read
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/expression/TypedValue;
 write
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/expression/EnvironmentAccessor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/expression/EnvironmentAccessor.eea
index ccd87e39ca..6a81e54413 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/expression/EnvironmentAccessor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/expression/EnvironmentAccessor.eea
@@ -11,7 +11,7 @@ getSpecificTargetClasses
  ()[0Ljava/lang/Class<*>; # @Inherited(org.springframework.expression.PropertyAccessor)
 read
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/expression/TypedValue;
 write
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/expression/MapAccessor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/expression/MapAccessor.eea
index 5d0daaca98..3d2b51bd55 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/expression/MapAccessor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/expression/MapAccessor.eea
@@ -11,13 +11,13 @@ generateCode
  (Ljava/lang/String;Lorg/springframework/asm/MethodVisitor;Lorg/springframework/expression/spel/CodeFlow;)V
 getPropertyType
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L1java/lang/Class<*>;
 getSpecificTargetClasses
  ()[Ljava/lang/Class<*>;
  ()[0Ljava/lang/Class<*>; # @Inherited(org.springframework.expression.PropertyAccessor)
 read
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/expression/TypedValue;
 write
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/AbstractApplicationContext.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/AbstractApplicationContext.eea
index b278a565d3..cc32dc1659 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/AbstractApplicationContext.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/AbstractApplicationContext.eea
@@ -37,7 +37,7 @@ containsLocalBean
  (Ljava/lang/String;)Z
 createEnvironment
  ()Lorg/springframework/core/env/ConfigurableEnvironment;
- ()Lorg/springframework/core/env/ConfigurableEnvironment;
+ ()L1org/springframework/core/env/ConfigurableEnvironment;
 findAnnotationOnBean
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/String;Ljava/lang/Class<TA;>;)TA;
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/String;Ljava/lang/Class<TA;>;)T0A; # @Inherited(org.springframework.beans.factory.ListableBeanFactory)
@@ -55,7 +55,7 @@ getApplicationListeners
  ()Ljava/util/Collection<Lorg/springframework/context/ApplicationListener<*>;>;
 getApplicationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getApplicationStartup
  ()Lorg/springframework/core/metrics/ApplicationStartup;
  ()Lorg/springframework/core/metrics/ApplicationStartup;
@@ -154,7 +154,7 @@ getParentBeanFactory
  ()L0org/springframework/beans/factory/BeanFactory; # @Inherited(org.springframework.beans.factory.HierarchicalBeanFactory)
 getResourcePatternResolver
  ()Lorg/springframework/core/io/support/ResourcePatternResolver;
- ()Lorg/springframework/core/io/support/ResourcePatternResolver;
+ ()L1org/springframework/core/io/support/ResourcePatternResolver;
 getResources
  (Ljava/lang/String;)[Lorg/springframework/core/io/Resource;
  (Ljava/lang/String;)[Lorg/springframework/core/io/Resource;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/AbstractMessageSource.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/AbstractMessageSource.eea
index e4a1e2720a..8e5a6243b3 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/AbstractMessageSource.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/AbstractMessageSource.eea
@@ -29,7 +29,7 @@ getParentMessageSource
  ()L0org/springframework/context/MessageSource; # @Inherited(org.springframework.context.HierarchicalMessageSource)
 resolveArguments
  ([Ljava/lang/Object;Ljava/util/Locale;)[Ljava/lang/Object;
- ([Ljava/lang/Object;Ljava/util/Locale;)[Ljava/lang/Object;
+ ([Ljava/lang/Object;Ljava/util/Locale;)[1Ljava/lang/Object; # @Inherited(org.springframework.context.support.MessageSourceSupport)
 resolveCode
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/text/MessageFormat;
  (Ljava/lang/String;Ljava/util/Locale;)L0java/text/MessageFormat;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/AbstractRefreshableApplicationContext.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/AbstractRefreshableApplicationContext.eea
index 4a0fd09766..851e999e36 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/AbstractRefreshableApplicationContext.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/AbstractRefreshableApplicationContext.eea
@@ -8,7 +8,7 @@ cancelRefresh
  (Lorg/springframework/beans/BeansException;)V
 createBeanFactory
  ()Lorg/springframework/beans/factory/support/DefaultListableBeanFactory;
- ()Lorg/springframework/beans/factory/support/DefaultListableBeanFactory;
+ ()L1org/springframework/beans/factory/support/DefaultListableBeanFactory;
 customizeBeanFactory
  (Lorg/springframework/beans/factory/support/DefaultListableBeanFactory;)V
  (Lorg/springframework/beans/factory/support/DefaultListableBeanFactory;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/ApplicationObjectSupport.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/ApplicationObjectSupport.eea
index a49e51249a..6e3f603eae 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/ApplicationObjectSupport.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/ApplicationObjectSupport.eea
@@ -18,7 +18,7 @@ obtainApplicationContext
  ()Lorg/springframework/context/ApplicationContext;
 requiredContextClass
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L1java/lang/Class<*>;
 setApplicationContext
  (Lorg/springframework/context/ApplicationContext;)V
  (Lorg/springframework/context/ApplicationContext;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/ConversionServiceFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/ConversionServiceFactoryBean.eea
index 77d10057c0..366169469f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/ConversionServiceFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/ConversionServiceFactoryBean.eea
@@ -6,13 +6,13 @@ super org/springframework/beans/factory/FactoryBean
 
 createConversionService
  ()Lorg/springframework/core/convert/support/GenericConversionService;
- ()Lorg/springframework/core/convert/support/GenericConversionService;
+ ()L1org/springframework/core/convert/support/GenericConversionService;
 getObject
  ()Lorg/springframework/core/convert/ConversionService;
  ()L0org/springframework/core/convert/ConversionService;
 getObjectType
  ()Ljava/lang/Class<+Lorg/springframework/core/convert/ConversionService;>;
- ()Ljava/lang/Class<+Lorg/springframework/core/convert/ConversionService;>;
+ ()L1java/lang/Class<+Lorg/springframework/core/convert/ConversionService;>;
 setConverters
  (Ljava/util/Set<*>;)V
  (Ljava/util/Set<*>;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/DefaultLifecycleProcessor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/DefaultLifecycleProcessor.eea
index 24c546fed8..1ac2c8e2c8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/DefaultLifecycleProcessor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/DefaultLifecycleProcessor.eea
@@ -2,7 +2,7 @@ class org/springframework/context/support/DefaultLifecycleProcessor
 
 getLifecycleBeans
  ()Ljava/util/Map<Ljava/lang/String;Lorg/springframework/context/Lifecycle;>;
- ()Ljava/util/Map<Ljava/lang/String;Lorg/springframework/context/Lifecycle;>;
+ ()L1java/util/Map<Ljava/lang/String;Lorg/springframework/context/Lifecycle;>;
 getPhase
  (Lorg/springframework/context/Lifecycle;)I
  (Lorg/springframework/context/Lifecycle;)I
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/DefaultMessageSourceResolvable.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/DefaultMessageSourceResolvable.eea
index d2944e2ccc..7fd34883a3 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/DefaultMessageSourceResolvable.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/DefaultMessageSourceResolvable.eea
@@ -35,7 +35,7 @@ getDefaultMessage
  ()L0java/lang/String; # @Inherited(org.springframework.context.MessageSourceResolvable)
 resolvableToString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/FileSystemXmlApplicationContext.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/FileSystemXmlApplicationContext.eea
index 10bb16880c..c3b690043b 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/FileSystemXmlApplicationContext.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/FileSystemXmlApplicationContext.eea
@@ -20,4 +20,4 @@ class org/springframework/context/support/FileSystemXmlApplicationContext
  ([Ljava/lang/String;ZLorg/springframework/context/ApplicationContext;)V
 getResourceByPath
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.DefaultResourceLoader)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/LiveBeansView.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/LiveBeansView.eea
index 48134f7d7d..d81d50bb14 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/LiveBeansView.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/LiveBeansView.eea
@@ -12,7 +12,7 @@ findApplicationContexts
  ()Ljava/util/Set<Lorg/springframework/context/ConfigurableApplicationContext;>;
 generateJson
  (Ljava/util/Set<Lorg/springframework/context/ConfigurableApplicationContext;>;)Ljava/lang/String;
- (Ljava/util/Set<Lorg/springframework/context/ConfigurableApplicationContext;>;)Ljava/lang/String;
+ (Ljava/util/Set<Lorg/springframework/context/ConfigurableApplicationContext;>;)L1java/lang/String;
 getEscapedResourceDescription
  (Lorg/springframework/beans/factory/config/BeanDefinition;)Ljava/lang/String;
  (Lorg/springframework/beans/factory/config/BeanDefinition;)L0java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/MessageSourceAccessor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/MessageSourceAccessor.eea
index 82112ff668..68e3b9f807 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/MessageSourceAccessor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/MessageSourceAccessor.eea
@@ -14,10 +14,10 @@ getMessage
  (Ljava/lang/String;)Ljava/lang/String;
 getMessage
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 getMessage
  (Ljava/lang/String;Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/util/Locale;)L1java/lang/String;
 getMessage
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
@@ -26,10 +26,10 @@ getMessage
  (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 getMessage
  (Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/String;)L1java/lang/String;
 getMessage
  (Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
- (Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
+ (Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/String;Ljava/util/Locale;)L1java/lang/String;
 getMessage
  (Ljava/lang/String;[Ljava/lang/Object;Ljava/util/Locale;)Ljava/lang/String;
  (Ljava/lang/String;[Ljava/lang/Object;Ljava/util/Locale;)Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/MessageSourceSupport.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/MessageSourceSupport.eea
index cd36eb501f..f23d16b9d4 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/MessageSourceSupport.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/MessageSourceSupport.eea
@@ -6,7 +6,7 @@ logger
 
 createMessageFormat
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/text/MessageFormat;
- (Ljava/lang/String;Ljava/util/Locale;)Ljava/text/MessageFormat;
+ (Ljava/lang/String;Ljava/util/Locale;)L1java/text/MessageFormat;
 formatMessage
  (Ljava/lang/String;[Ljava/lang/Object;Ljava/util/Locale;)Ljava/lang/String;
  (Ljava/lang/String;[Ljava/lang/Object;Ljava/util/Locale;)Ljava/lang/String;
@@ -15,4 +15,4 @@ renderDefaultMessage
  (Ljava/lang/String;[Ljava/lang/Object;Ljava/util/Locale;)Ljava/lang/String;
 resolveArguments
  ([Ljava/lang/Object;Ljava/util/Locale;)[Ljava/lang/Object;
- ([Ljava/lang/Object;Ljava/util/Locale;)[Ljava/lang/Object;
+ ([Ljava/lang/Object;Ljava/util/Locale;)[1Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/ReloadableResourceBundleMessageSource.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/ReloadableResourceBundleMessageSource.eea
index e11b7f82f0..23efe096df 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/ReloadableResourceBundleMessageSource.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/ReloadableResourceBundleMessageSource.eea
@@ -17,7 +17,7 @@ loadProperties
  (Lorg/springframework/core/io/Resource;Ljava/lang/String;)Ljava/util/Properties;
 newProperties
  ()Ljava/util/Properties;
- ()Ljava/util/Properties;
+ ()L1java/util/Properties;
 refreshProperties
  (Ljava/lang/String;Lorg/springframework/context/support/ReloadableResourceBundleMessageSource$PropertiesHolder;)Lorg/springframework/context/support/ReloadableResourceBundleMessageSource$PropertiesHolder;
  (Ljava/lang/String;Lorg/springframework/context/support/ReloadableResourceBundleMessageSource$PropertiesHolder;)Lorg/springframework/context/support/ReloadableResourceBundleMessageSource$PropertiesHolder;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/ResourceBundleMessageSource.eea b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/ResourceBundleMessageSource.eea
index 62ca37bc59..cf2e8d1210 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/context/support/ResourceBundleMessageSource.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/context/support/ResourceBundleMessageSource.eea
@@ -17,10 +17,10 @@ getStringOrNull
  (Ljava/util/ResourceBundle;Ljava/lang/String;)L0java/lang/String;
 loadBundle
  (Ljava/io/InputStream;)Ljava/util/ResourceBundle;
- (Ljava/io/InputStream;)Ljava/util/ResourceBundle;
+ (Ljava/io/InputStream;)L1java/util/ResourceBundle;
 loadBundle
  (Ljava/io/Reader;)Ljava/util/ResourceBundle;
- (Ljava/io/Reader;)Ljava/util/ResourceBundle;
+ (Ljava/io/Reader;)L1java/util/ResourceBundle;
 resolveCode
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/text/MessageFormat;
  (Ljava/lang/String;Ljava/util/Locale;)L0java/text/MessageFormat; # @Inherited(org.springframework.context.support.AbstractMessageSource)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/CollectionFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/CollectionFactory.eea
index caa9f4805c..bee9b5f910 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/CollectionFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/CollectionFactory.eea
@@ -2,31 +2,31 @@ class org/springframework/core/CollectionFactory
 
 createApproximateCollection
  <E:Ljava/lang/Object;>(Ljava/lang/Object;I)Ljava/util/Collection<TE;>;
- <E:Ljava/lang/Object;>(Ljava/lang/Object;I)Ljava/util/Collection<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/lang/Object;I)L1java/util/Collection<TE;>;
 createApproximateMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Object;I)Ljava/util/Map<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Object;I)Ljava/util/Map<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Object;I)L1java/util/Map<TK;TV;>;
 createCollection
  <E:Ljava/lang/Object;>(Ljava/lang/Class<*>;I)Ljava/util/Collection<TE;>;
- <E:Ljava/lang/Object;>(Ljava/lang/Class<*>;I)Ljava/util/Collection<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/lang/Class<*>;I)L1java/util/Collection<TE;>;
 createCollection
  <E:Ljava/lang/Object;>(Ljava/lang/Class<*>;Ljava/lang/Class<*>;I)Ljava/util/Collection<TE;>;
- <E:Ljava/lang/Object;>(Ljava/lang/Class<*>;Ljava/lang/Class<*>;I)Ljava/util/Collection<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/lang/Class<*>;Ljava/lang/Class<*>;I)L1java/util/Collection<TE;>;
 createMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Class<*>;I)Ljava/util/Map<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Class<*>;I)Ljava/util/Map<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Class<*>;I)L1java/util/Map<TK;TV;>;
 createMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Class<*>;Ljava/lang/Class<*>;I)Ljava/util/Map<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Class<*>;Ljava/lang/Class<*>;I)Ljava/util/Map<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Class<*>;Ljava/lang/Class<*>;I)L1java/util/Map<TK;TV;>;
 createSortedProperties
  (Ljava/util/Properties;Z)Ljava/util/Properties;
- (Ljava/util/Properties;Z)Ljava/util/Properties;
+ (Ljava/util/Properties;Z)L1java/util/Properties;
 createSortedProperties
  (Z)Ljava/util/Properties;
- (Z)Ljava/util/Properties;
+ (Z)L1java/util/Properties;
 createStringAdaptingProperties
  ()Ljava/util/Properties;
- ()Ljava/util/Properties;
+ ()L1java/util/Properties;
 isApproximableCollectionType
  (Ljava/lang/Class<*>;)Z
  (Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/ConfigurableObjectInputStream.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/ConfigurableObjectInputStream.eea
index 09493a03d1..37f32ef274 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/ConfigurableObjectInputStream.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/ConfigurableObjectInputStream.eea
@@ -14,7 +14,7 @@ resolveClass
  (Ljava/io/ObjectStreamClass;)Ljava/lang/Class<*>;
 resolveFallbackIfPossible
  (Ljava/lang/String;Ljava/lang/ClassNotFoundException;)Ljava/lang/Class<*>;
- (Ljava/lang/String;Ljava/lang/ClassNotFoundException;)Ljava/lang/Class<*>;
+ (Ljava/lang/String;Ljava/lang/ClassNotFoundException;)L1java/lang/Class<*>;
 resolveProxyClass
  ([Ljava/lang/String;)Ljava/lang/Class<*>;
  ([Ljava/lang/String;)Ljava/lang/Class<*>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/Constants.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/Constants.eea
index 014e3a7eb7..4ce47b7085 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/Constants.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/Constants.eea
@@ -11,7 +11,7 @@ asObject
  (Ljava/lang/String;)Ljava/lang/Object;
 asString
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 getClassName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -20,25 +20,25 @@ getFieldCache
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 getNames
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
+ (Ljava/lang/String;)L1java/util/Set<Ljava/lang/String;>;
 getNamesForProperty
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
 getNamesForSuffix
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
+ (Ljava/lang/String;)L1java/util/Set<Ljava/lang/String;>;
 getValues
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/Object;>;
- (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/Object;>;
+ (Ljava/lang/String;)L1java/util/Set<Ljava/lang/Object;>;
 getValuesForProperty
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/Object;>;
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/Object;>;
 getValuesForSuffix
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/Object;>;
- (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/Object;>;
+ (Ljava/lang/String;)L1java/util/Set<Ljava/lang/Object;>;
 propertyToConstantNamePrefix
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 toCode
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/Conventions.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/Conventions.eea
index aad91b66b6..9408a7897a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/Conventions.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/Conventions.eea
@@ -5,13 +5,13 @@ attributeNameToPropertyName
  (Ljava/lang/String;)Ljava/lang/String;
 getQualifiedAttributeName
  (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;Ljava/lang/String;)L1java/lang/String;
 getVariableName
  (Ljava/lang/Object;)Ljava/lang/String;
  (Ljava/lang/Object;)Ljava/lang/String;
 getVariableNameForParameter
  (Lorg/springframework/core/MethodParameter;)Ljava/lang/String;
- (Lorg/springframework/core/MethodParameter;)Ljava/lang/String;
+ (Lorg/springframework/core/MethodParameter;)L1java/lang/String;
 getVariableNameForReturnType
  (Ljava/lang/reflect/Method;)Ljava/lang/String;
  (Ljava/lang/reflect/Method;)Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/GenericTypeResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/GenericTypeResolver.eea
index 49f768ca9c..13c0333329 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/GenericTypeResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/GenericTypeResolver.eea
@@ -2,7 +2,7 @@ class org/springframework/core/GenericTypeResolver
 
 getTypeVariableMap
  (Ljava/lang/Class<*>;)Ljava/util/Map<Ljava/lang/reflect/TypeVariable;Ljava/lang/reflect/Type;>;
- (Ljava/lang/Class<*>;)Ljava/util/Map<Ljava/lang/reflect/TypeVariable;Ljava/lang/reflect/Type;>;
+ (Ljava/lang/Class<*>;)L1java/util/Map<Ljava/lang/reflect/TypeVariable;Ljava/lang/reflect/Type;>;
 resolveParameterType
  (Lorg/springframework/core/MethodParameter;Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
  (Lorg/springframework/core/MethodParameter;Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/MethodIntrospector.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/MethodIntrospector.eea
index b5c3253bec..f27a3519a8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/MethodIntrospector.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/MethodIntrospector.eea
@@ -8,4 +8,4 @@ selectMethods
  (Ljava/lang/Class<*>;Lorg/springframework/util/ReflectionUtils$MethodFilter;)Ljava/util/Set<Ljava/lang/reflect/Method;>;
 selectMethods
  <T:Ljava/lang/Object;>(Ljava/lang/Class<*>;Lorg/springframework/core/MethodIntrospector$MetadataLookup<TT;>;)Ljava/util/Map<Ljava/lang/reflect/Method;TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<*>;Lorg/springframework/core/MethodIntrospector$MetadataLookup<TT;>;)Ljava/util/Map<Ljava/lang/reflect/Method;TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<*>;Lorg/springframework/core/MethodIntrospector$MetadataLookup<TT;>;)L1java/util/Map<Ljava/lang/reflect/Method;TT;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/MethodParameter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/MethodParameter.eea
index 4a6943fcf6..cd37236e56 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/MethodParameter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/MethodParameter.eea
@@ -5,7 +5,7 @@ findParameterIndex
  (Ljava/lang/reflect/Parameter;)I
 forExecutable
  (Ljava/lang/reflect/Executable;I)Lorg/springframework/core/MethodParameter;
- (Ljava/lang/reflect/Executable;I)Lorg/springframework/core/MethodParameter;
+ (Ljava/lang/reflect/Executable;I)L1org/springframework/core/MethodParameter;
 forMethodOrConstructor
  (Ljava/lang/Object;I)Lorg/springframework/core/MethodParameter;
  (Ljava/lang/Object;I)Lorg/springframework/core/MethodParameter;
@@ -36,7 +36,7 @@ adaptAnnotationArray
  ([Ljava/lang/annotation/Annotation;)[Ljava/lang/annotation/Annotation;
 clone
  ()Lorg/springframework/core/MethodParameter;
- ()Lorg/springframework/core/MethodParameter;
+ ()L1org/springframework/core/MethodParameter;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/ParameterizedTypeReference.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/ParameterizedTypeReference.eea
index 60f827903a..b817b7fca5 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/ParameterizedTypeReference.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/ParameterizedTypeReference.eea
@@ -4,7 +4,7 @@ class org/springframework/core/ParameterizedTypeReference
 
 forType
  <T:Ljava/lang/Object;>(Ljava/lang/reflect/Type;)Lorg/springframework/core/ParameterizedTypeReference<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/reflect/Type;)Lorg/springframework/core/ParameterizedTypeReference<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/reflect/Type;)L1org/springframework/core/ParameterizedTypeReference<TT;>;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/ReactiveAdapterRegistry.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/ReactiveAdapterRegistry.eea
index 8e40de3107..bfb14f4997 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/ReactiveAdapterRegistry.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/ReactiveAdapterRegistry.eea
@@ -2,7 +2,7 @@ class org/springframework/core/ReactiveAdapterRegistry
 
 getSharedInstance
  ()Lorg/springframework/core/ReactiveAdapterRegistry;
- ()Lorg/springframework/core/ReactiveAdapterRegistry;
+ ()L1org/springframework/core/ReactiveAdapterRegistry;
 
 getAdapter
  (Ljava/lang/Class<*>;)Lorg/springframework/core/ReactiveAdapter;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/ResolvableType.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/ResolvableType.eea
index c2db0e8e5b..65de9c1186 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/ResolvableType.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/ResolvableType.eea
@@ -6,10 +6,10 @@ NONE
 
 forArrayComponent
  (Lorg/springframework/core/ResolvableType;)Lorg/springframework/core/ResolvableType;
- (Lorg/springframework/core/ResolvableType;)Lorg/springframework/core/ResolvableType;
+ (Lorg/springframework/core/ResolvableType;)L1org/springframework/core/ResolvableType;
 forClass
  (Ljava/lang/Class<*>;)Lorg/springframework/core/ResolvableType;
- (Ljava/lang/Class<*>;)Lorg/springframework/core/ResolvableType;
+ (Ljava/lang/Class<*>;)L1org/springframework/core/ResolvableType;
 forClass
  (Ljava/lang/Class<*>;Ljava/lang/Class<*>;)Lorg/springframework/core/ResolvableType;
  (Ljava/lang/Class<*>;Ljava/lang/Class<*>;)Lorg/springframework/core/ResolvableType;
@@ -66,7 +66,7 @@ forMethodReturnType
  (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Lorg/springframework/core/ResolvableType;
 forRawClass
  (Ljava/lang/Class<*>;)Lorg/springframework/core/ResolvableType;
- (Ljava/lang/Class<*>;)Lorg/springframework/core/ResolvableType;
+ (Ljava/lang/Class<*>;)L1org/springframework/core/ResolvableType;
 forType
  (Ljava/lang/reflect/Type;)Lorg/springframework/core/ResolvableType;
  (Ljava/lang/reflect/Type;)Lorg/springframework/core/ResolvableType;
@@ -139,10 +139,10 @@ resolveGeneric
  ([I)L0java/lang/Class<*>;
 resolveGenerics
  ()[Ljava/lang/Class<*>;
- ()[Ljava/lang/Class<*>;
+ ()[1Ljava/lang/Class<*>;
 resolveGenerics
  (Ljava/lang/Class<*>;)[Ljava/lang/Class<*>;
- (Ljava/lang/Class<*>;)[Ljava/lang/Class<*>;
+ (Ljava/lang/Class<*>;)[1Ljava/lang/Class<*>;
 toClass
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/SmartClassLoader.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/SmartClassLoader.eea
index 262ff5dbfa..01fc4fe18f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/SmartClassLoader.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/SmartClassLoader.eea
@@ -8,4 +8,4 @@ isClassReloadable
  (Ljava/lang/Class<*>;)Z
 publicDefineClass
  (Ljava/lang/String;[BLjava/security/ProtectionDomain;)Ljava/lang/Class<*>;
- (Ljava/lang/String;[BLjava/security/ProtectionDomain;)Ljava/lang/Class<*>;
+ (Ljava/lang/String;[BLjava/security/ProtectionDomain;)L1java/lang/Class<*>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/annotation/AnnotatedElementUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/annotation/AnnotatedElementUtils.eea
index 825ef8d06c..0b6022630c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/annotation/AnnotatedElementUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/annotation/AnnotatedElementUtils.eea
@@ -23,7 +23,7 @@ findMergedRepeatableAnnotations
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/reflect/AnnotatedElement;Ljava/lang/Class<TA;>;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Ljava/util/Set<TA;>;
 forAnnotations
  ([Ljava/lang/annotation/Annotation;)Ljava/lang/reflect/AnnotatedElement;
- ([Ljava/lang/annotation/Annotation;)Ljava/lang/reflect/AnnotatedElement;
+ ([Ljava/lang/annotation/Annotation;)L1java/lang/reflect/AnnotatedElement;
 getAllAnnotationAttributes
  (Ljava/lang/reflect/AnnotatedElement;Ljava/lang/String;)Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/Object;>;
  (Ljava/lang/reflect/AnnotatedElement;Ljava/lang/String;)L0org/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/Object;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/annotation/AnnotationFilter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/annotation/AnnotationFilter.eea
index 1365d803d5..8a1da542dc 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/annotation/AnnotationFilter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/annotation/AnnotationFilter.eea
@@ -15,7 +15,7 @@ PLAIN
 
 packages
  ([Ljava/lang/String;)Lorg/springframework/core/annotation/AnnotationFilter;
- ([Ljava/lang/String;)Lorg/springframework/core/annotation/AnnotationFilter;
+ ([Ljava/lang/String;)L1org/springframework/core/annotation/AnnotationFilter;
 
 matches
  (Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/annotation/MergedAnnotationPredicates.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/annotation/MergedAnnotationPredicates.eea
index ee26b877d2..986ceaf885 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/annotation/MergedAnnotationPredicates.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/annotation/MergedAnnotationPredicates.eea
@@ -2,7 +2,7 @@ class org/springframework/core/annotation/MergedAnnotationPredicates
 
 firstRunOf
  <A::Ljava/lang/annotation/Annotation;>(Ljava/util/function/Function<-Lorg/springframework/core/annotation/MergedAnnotation<TA;>;*>;)Ljava/util/function/Predicate<Lorg/springframework/core/annotation/MergedAnnotation<TA;>;>;
- <A::Ljava/lang/annotation/Annotation;>(Ljava/util/function/Function<-Lorg/springframework/core/annotation/MergedAnnotation<TA;>;*>;)Ljava/util/function/Predicate<Lorg/springframework/core/annotation/MergedAnnotation<TA;>;>;
+ <A::Ljava/lang/annotation/Annotation;>(Ljava/util/function/Function<-Lorg/springframework/core/annotation/MergedAnnotation<TA;>;*>;)L1java/util/function/Predicate<Lorg/springframework/core/annotation/MergedAnnotation<TA;>;>;
 typeIn
  <A::Ljava/lang/annotation/Annotation;>(Ljava/util/Collection<*>;)Ljava/util/function/Predicate<Lorg/springframework/core/annotation/MergedAnnotation<+TA;>;>;
  <A::Ljava/lang/annotation/Annotation;>(Ljava/util/Collection<*>;)Ljava/util/function/Predicate<Lorg/springframework/core/annotation/MergedAnnotation<+TA;>;>;
@@ -14,4 +14,4 @@ typeIn
  <A::Ljava/lang/annotation/Annotation;>([Ljava/lang/String;)Ljava/util/function/Predicate<Lorg/springframework/core/annotation/MergedAnnotation<+TA;>;>;
 unique
  <A::Ljava/lang/annotation/Annotation;K:Ljava/lang/Object;>(Ljava/util/function/Function<-Lorg/springframework/core/annotation/MergedAnnotation<TA;>;TK;>;)Ljava/util/function/Predicate<Lorg/springframework/core/annotation/MergedAnnotation<TA;>;>;
- <A::Ljava/lang/annotation/Annotation;K:Ljava/lang/Object;>(Ljava/util/function/Function<-Lorg/springframework/core/annotation/MergedAnnotation<TA;>;TK;>;)Ljava/util/function/Predicate<Lorg/springframework/core/annotation/MergedAnnotation<TA;>;>;
+ <A::Ljava/lang/annotation/Annotation;K:Ljava/lang/Object;>(Ljava/util/function/Function<-Lorg/springframework/core/annotation/MergedAnnotation<TA;>;TK;>;)L1java/util/function/Predicate<Lorg/springframework/core/annotation/MergedAnnotation<TA;>;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/annotation/RepeatableContainers.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/annotation/RepeatableContainers.eea
index 7ad1ce2b2a..a15327f971 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/annotation/RepeatableContainers.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/annotation/RepeatableContainers.eea
@@ -5,14 +5,14 @@ none
  ()Lorg/springframework/core/annotation/RepeatableContainers;
 of
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lorg/springframework/core/annotation/RepeatableContainers;
- (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lorg/springframework/core/annotation/RepeatableContainers;
+ (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)L1org/springframework/core/annotation/RepeatableContainers;
 standardRepeatables
  ()Lorg/springframework/core/annotation/RepeatableContainers;
  ()Lorg/springframework/core/annotation/RepeatableContainers;
 
 and
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lorg/springframework/core/annotation/RepeatableContainers;
- (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lorg/springframework/core/annotation/RepeatableContainers;
+ (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)L1org/springframework/core/annotation/RepeatableContainers;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/annotation/SynthesizingMethodParameter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/annotation/SynthesizingMethodParameter.eea
index c427c25d76..03c243f1de 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/annotation/SynthesizingMethodParameter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/annotation/SynthesizingMethodParameter.eea
@@ -2,7 +2,7 @@ class org/springframework/core/annotation/SynthesizingMethodParameter
 
 forExecutable
  (Ljava/lang/reflect/Executable;I)Lorg/springframework/core/annotation/SynthesizingMethodParameter;
- (Ljava/lang/reflect/Executable;I)Lorg/springframework/core/annotation/SynthesizingMethodParameter;
+ (Ljava/lang/reflect/Executable;I)L1org/springframework/core/annotation/SynthesizingMethodParameter;
 forParameter
  (Ljava/lang/reflect/Parameter;)Lorg/springframework/core/annotation/SynthesizingMethodParameter;
  (Ljava/lang/reflect/Parameter;)Lorg/springframework/core/annotation/SynthesizingMethodParameter;
@@ -30,4 +30,4 @@ adaptAnnotationArray
  ([Ljava/lang/annotation/Annotation;)[Ljava/lang/annotation/Annotation;
 clone
  ()Lorg/springframework/core/annotation/SynthesizingMethodParameter;
- ()Lorg/springframework/core/annotation/SynthesizingMethodParameter;
+ ()L1org/springframework/core/annotation/SynthesizingMethodParameter;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/AbstractDataBufferDecoder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/AbstractDataBufferDecoder.eea
index 474387f47a..25febd10d7 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/AbstractDataBufferDecoder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/AbstractDataBufferDecoder.eea
@@ -17,4 +17,4 @@ decodeDataBuffer
  (Lorg/springframework/core/io/buffer/DataBuffer;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)T0T;
 decodeToMono
  (Lorg/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lreactor/core/publisher/Mono<TT;>;
- (Lorg/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lreactor/core/publisher/Mono<TT;>;
+ (Lorg/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1reactor/core/publisher/Mono<TT;>; # @Inherited(org.springframework.core.codec.AbstractDecoder)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/AbstractDecoder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/AbstractDecoder.eea
index c9cdaaee15..6d743a9292 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/AbstractDecoder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/AbstractDecoder.eea
@@ -18,7 +18,7 @@ canDecode
  (Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;)Z
 decodeToMono
  (Lorg/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lreactor/core/publisher/Mono<TT;>;
- (Lorg/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lreactor/core/publisher/Mono<TT;>;
+ (Lorg/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1reactor/core/publisher/Mono<TT;>;
 getDecodableMimeTypes
  ()Ljava/util/List<Lorg/springframework/util/MimeType;>;
  ()Ljava/util/List<Lorg/springframework/util/MimeType;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/ByteArrayDecoder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/ByteArrayDecoder.eea
index 7fcedfb2c5..6ff871ac79 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/ByteArrayDecoder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/ByteArrayDecoder.eea
@@ -9,4 +9,4 @@ canDecode
  (Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;)Z
 decode
  (Lorg/springframework/core/io/buffer/DataBuffer;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)[B
- (Lorg/springframework/core/io/buffer/DataBuffer;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)[B
+ (Lorg/springframework/core/io/buffer/DataBuffer;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)[1B
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/Encoder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/Encoder.eea
index 6a3690abab..844ee9bd56 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/Encoder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/Encoder.eea
@@ -10,7 +10,7 @@ encode
  (Lorg/reactivestreams/Publisher<+TT;>;Lorg/springframework/core/io/buffer/DataBufferFactory;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lreactor/core/publisher/Flux<Lorg/springframework/core/io/buffer/DataBuffer;>;
 encodeValue
  (TT;Lorg/springframework/core/io/buffer/DataBufferFactory;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/springframework/core/io/buffer/DataBuffer;
- (TT;Lorg/springframework/core/io/buffer/DataBufferFactory;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/springframework/core/io/buffer/DataBuffer;
+ (TT;Lorg/springframework/core/io/buffer/DataBufferFactory;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1org/springframework/core/io/buffer/DataBuffer;
 getEncodableMimeTypes
  ()Ljava/util/List<Lorg/springframework/util/MimeType;>;
  ()Ljava/util/List<Lorg/springframework/util/MimeType;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/Hints.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/Hints.eea
index 67ce6d1cb9..74f4b35a06 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/Hints.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/Hints.eea
@@ -12,7 +12,7 @@ from
  (Ljava/lang/String;Ljava/lang/Object;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 getLogPrefix
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Ljava/lang/String;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Ljava/lang/String;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1java/lang/String;
 getRequiredHint
  <T:Ljava/lang/Object;>(Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Ljava/lang/String;)TT;
  <T:Ljava/lang/Object;>(Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Ljava/lang/String;)TT;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/ResourceDecoder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/ResourceDecoder.eea
index 37a9db4352..cdb92a697f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/ResourceDecoder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/ResourceDecoder.eea
@@ -16,4 +16,4 @@ decode
  (Lorg/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lreactor/core/publisher/Flux<Lorg/springframework/core/io/Resource;>;
 decode
  (Lorg/springframework/core/io/buffer/DataBuffer;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/springframework/core/io/Resource;
- (Lorg/springframework/core/io/buffer/DataBuffer;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/springframework/core/io/Resource;
+ (Lorg/springframework/core/io/buffer/DataBuffer;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1org/springframework/core/io/Resource;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/StringDecoder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/StringDecoder.eea
index 3341e1766c..1ed5e8c501 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/StringDecoder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/codec/StringDecoder.eea
@@ -38,7 +38,7 @@ decode
  (Lorg/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lreactor/core/publisher/Flux<Ljava/lang/String;>;
 decode
  (Lorg/springframework/core/io/buffer/DataBuffer;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Ljava/lang/String;
- (Lorg/springframework/core/io/buffer/DataBuffer;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Ljava/lang/String;
+ (Lorg/springframework/core/io/buffer/DataBuffer;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1java/lang/String;
 getDefaultCharset
  ()Ljava/nio/charset/Charset;
  ()Ljava/nio/charset/Charset;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/convert/TypeDescriptor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/convert/TypeDescriptor.eea
index 52fac977be..d957e5e8da 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/convert/TypeDescriptor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/convert/TypeDescriptor.eea
@@ -23,7 +23,7 @@ nested
  (Lorg/springframework/core/convert/Property;I)L0org/springframework/core/convert/TypeDescriptor;
 valueOf
  (Ljava/lang/Class<*>;)Lorg/springframework/core/convert/TypeDescriptor;
- (Ljava/lang/Class<*>;)Lorg/springframework/core/convert/TypeDescriptor;
+ (Ljava/lang/Class<*>;)L1org/springframework/core/convert/TypeDescriptor;
 
 <init>
  (Ljava/lang/reflect/Field;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/convert/support/ConvertingPropertyEditorAdapter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/convert/support/ConvertingPropertyEditorAdapter.eea
index 13bb975d02..373a1bb719 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/convert/support/ConvertingPropertyEditorAdapter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/convert/support/ConvertingPropertyEditorAdapter.eea
@@ -5,7 +5,7 @@ class org/springframework/core/convert/support/ConvertingPropertyEditorAdapter
  (Lorg/springframework/core/convert/ConversionService;Lorg/springframework/core/convert/TypeDescriptor;)V
 getAsText
  ()Ljava/lang/String;
- ()L0java/lang/String;
+ ()L0java/lang/String; # @Inherited(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/convert/support/DefaultConversionService.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/convert/support/DefaultConversionService.eea
index bf4283719c..225c717bc2 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/convert/support/DefaultConversionService.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/convert/support/DefaultConversionService.eea
@@ -8,4 +8,4 @@ addDefaultConverters
  (Lorg/springframework/core/convert/converter/ConverterRegistry;)V
 getSharedInstance
  ()Lorg/springframework/core/convert/ConversionService;
- ()Lorg/springframework/core/convert/ConversionService;
+ ()L1org/springframework/core/convert/ConversionService;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/env/AbstractEnvironment.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/env/AbstractEnvironment.eea
index d155a519e0..598d53bc4f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/env/AbstractEnvironment.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/env/AbstractEnvironment.eea
@@ -34,7 +34,7 @@ containsProperty
  (Ljava/lang/String;)Z
 createPropertyResolver
  (Lorg/springframework/core/env/MutablePropertySources;)Lorg/springframework/core/env/ConfigurablePropertyResolver;
- (Lorg/springframework/core/env/MutablePropertySources;)Lorg/springframework/core/env/ConfigurablePropertyResolver;
+ (Lorg/springframework/core/env/MutablePropertySources;)L1org/springframework/core/env/ConfigurablePropertyResolver;
 customizePropertySources
  (Lorg/springframework/core/env/MutablePropertySources;)V
  (Lorg/springframework/core/env/MutablePropertySources;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/env/AbstractPropertyResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/env/AbstractPropertyResolver.eea
index 0146e40105..c3de468978 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/env/AbstractPropertyResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/env/AbstractPropertyResolver.eea
@@ -12,7 +12,7 @@ convertValueIfNecessary
  <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;)T0T;
 getConversionService
  ()Lorg/springframework/core/convert/support/ConfigurableConversionService;
- ()Lorg/springframework/core/convert/support/ConfigurableConversionService;
+ ()L1org/springframework/core/convert/support/ConfigurableConversionService;
 getProperty
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)L0java/lang/String; # @Inherited(org.springframework.core.env.PropertyResolver)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/env/PropertySource.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/env/PropertySource.eea
index a5e9153a4c..cff69cc644 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/env/PropertySource.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/env/PropertySource.eea
@@ -4,7 +4,7 @@ class org/springframework/core/env/PropertySource
 
 named
  (Ljava/lang/String;)Lorg/springframework/core/env/PropertySource<*>;
- (Ljava/lang/String;)Lorg/springframework/core/env/PropertySource<*>;
+ (Ljava/lang/String;)L1org/springframework/core/env/PropertySource<*>;
 
 logger
  Lorg/apache/commons/logging/Log;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/AbstractFileResolvingResource.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/AbstractFileResolvingResource.eea
index e1f924b8e0..bf356e818e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/AbstractFileResolvingResource.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/AbstractFileResolvingResource.eea
@@ -8,7 +8,7 @@ customizeConnection
  (Ljava/net/URLConnection;)V
 getFile
  ()Ljava/io/File;
- ()Ljava/io/File;
+ ()L1java/io/File; # @Inherited(org.springframework.core.io.AbstractResource)
 getFile
  (Ljava/net/URI;)Ljava/io/File;
  (Ljava/net/URI;)Ljava/io/File;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/AbstractResource.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/AbstractResource.eea
index c8cf00e047..8e99ae267f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/AbstractResource.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/AbstractResource.eea
@@ -2,13 +2,13 @@ class org/springframework/core/io/AbstractResource
 
 createRelative
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.Resource)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getFile
  ()Ljava/io/File;
- ()Ljava/io/File;
+ ()L1java/io/File;
 getFileForLastModifiedCheck
  ()Ljava/io/File;
  ()Ljava/io/File;
@@ -20,7 +20,7 @@ getURI
  ()Ljava/net/URI;
 getURL
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L1java/net/URL;
 readableChannel
  ()Ljava/nio/channels/ReadableByteChannel;
  ()Ljava/nio/channels/ReadableByteChannel;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/ByteArrayResource.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/ByteArrayResource.eea
index 82a21527e1..32ec8d62d9 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/ByteArrayResource.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/ByteArrayResource.eea
@@ -14,7 +14,7 @@ getByteArray
  ()[B
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getInputStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/ClassPathResource.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/ClassPathResource.eea
index 7641dc0e41..8b379b0419 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/ClassPathResource.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/ClassPathResource.eea
@@ -14,7 +14,7 @@ class org/springframework/core/io/ClassPathResource
  (Ljava/lang/String;Ljava/lang/ClassLoader;Ljava/lang/Class<*>;)V
 createRelative
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.AbstractResource)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(org.springframework.core.io.AbstractResource)
@@ -23,7 +23,7 @@ getClassLoader
  ()L0java/lang/ClassLoader;
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getFilename
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(org.springframework.core.io.AbstractResource)
@@ -35,7 +35,7 @@ getPath
  ()Ljava/lang/String;
 getURL
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L1java/net/URL; # @Inherited(org.springframework.core.io.AbstractResource)
 resolveURL
  ()Ljava/net/URL;
  ()L0java/net/URL;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/ClassRelativeResourceLoader.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/ClassRelativeResourceLoader.eea
index 5501645c47..5ee9c3ca41 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/ClassRelativeResourceLoader.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/ClassRelativeResourceLoader.eea
@@ -5,4 +5,4 @@ class org/springframework/core/io/ClassRelativeResourceLoader
  (Ljava/lang/Class<*>;)V
 getResourceByPath
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.DefaultResourceLoader)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/DefaultResourceLoader$ClassPathContextResource.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/DefaultResourceLoader$ClassPathContextResource.eea
index 4354e2bdf1..0074fa4dee 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/DefaultResourceLoader$ClassPathContextResource.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/DefaultResourceLoader$ClassPathContextResource.eea
@@ -5,7 +5,7 @@ class org/springframework/core/io/DefaultResourceLoader$ClassPathContextResource
  (Ljava/lang/String;Ljava/lang/ClassLoader;)V
 createRelative
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.ClassPathResource)
 getPathWithinContext
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/DefaultResourceLoader.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/DefaultResourceLoader.eea
index d43800e47a..1e951c1aee 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/DefaultResourceLoader.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/DefaultResourceLoader.eea
@@ -17,7 +17,7 @@ getResource
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
 getResourceByPath
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource;
 getResourceCache
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Ljava/util/Map<Lorg/springframework/core/io/Resource;TT;>;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Ljava/util/Map<Lorg/springframework/core/io/Resource;TT;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/DescriptiveResource.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/DescriptiveResource.eea
index c442315796..0640cf3a8f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/DescriptiveResource.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/DescriptiveResource.eea
@@ -11,4 +11,4 @@ getDescription
  ()Ljava/lang/String;
 getInputStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/FileSystemResource.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/FileSystemResource.eea
index 7ee0453d90..a061ce65c0 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/FileSystemResource.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/FileSystemResource.eea
@@ -14,16 +14,16 @@ class org/springframework/core/io/FileSystemResource
  (Ljava/nio/file/Path;)V
 createRelative
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.AbstractResource)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(org.springframework.core.io.AbstractResource)
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getFile
  ()Ljava/io/File;
- ()Ljava/io/File;
+ ()L1java/io/File; # @Inherited(org.springframework.core.io.AbstractResource)
 getFilename
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(org.springframework.core.io.AbstractResource)
@@ -41,7 +41,7 @@ getURI
  ()Ljava/net/URI;
 getURL
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L1java/net/URL; # @Inherited(org.springframework.core.io.AbstractResource)
 readableChannel
  ()Ljava/nio/channels/ReadableByteChannel;
  ()Ljava/nio/channels/ReadableByteChannel;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/FileSystemResourceLoader.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/FileSystemResourceLoader.eea
index 69e3780e8b..ba4b54490e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/FileSystemResourceLoader.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/FileSystemResourceLoader.eea
@@ -2,4 +2,4 @@ class org/springframework/core/io/FileSystemResourceLoader
 
 getResourceByPath
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.DefaultResourceLoader)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/FileUrlResource.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/FileUrlResource.eea
index 6c3d7a2a25..4c5fc91f9b 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/FileUrlResource.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/FileUrlResource.eea
@@ -8,10 +8,10 @@ class org/springframework/core/io/FileUrlResource
  (Ljava/net/URL;)V
 createRelative
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.UrlResource)
 getFile
  ()Ljava/io/File;
- ()Ljava/io/File;
+ ()L1java/io/File; # @Inherited(org.springframework.core.io.UrlResource)
 getOutputStream
  ()Ljava/io/OutputStream;
  ()Ljava/io/OutputStream;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/InputStreamResource.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/InputStreamResource.eea
index e9536cf73c..cc53ae5784 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/InputStreamResource.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/InputStreamResource.eea
@@ -11,7 +11,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(org.springframework.core.io.AbstractResource)
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getInputStream
  ()Ljava/io/InputStream;
  ()Ljava/io/InputStream;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/PathResource.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/PathResource.eea
index 1a67e10e9d..0808aab5af 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/PathResource.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/PathResource.eea
@@ -11,16 +11,16 @@ class org/springframework/core/io/PathResource
  (Ljava/nio/file/Path;)V
 createRelative
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.AbstractResource)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(org.springframework.core.io.AbstractResource)
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getFile
  ()Ljava/io/File;
- ()Ljava/io/File;
+ ()L1java/io/File; # @Inherited(org.springframework.core.io.AbstractResource)
 getFilename
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(org.springframework.core.io.AbstractResource)
@@ -32,13 +32,13 @@ getOutputStream
  ()Ljava/io/OutputStream;
 getPath
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getURI
  ()Ljava/net/URI;
  ()Ljava/net/URI;
 getURL
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L1java/net/URL; # @Inherited(org.springframework.core.io.AbstractResource)
 readableChannel
  ()Ljava/nio/channels/ReadableByteChannel;
  ()Ljava/nio/channels/ReadableByteChannel;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/Resource.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/Resource.eea
index ec44cca889..44ea6a8923 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/Resource.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/Resource.eea
@@ -2,7 +2,7 @@ class org/springframework/core/io/Resource
 
 createRelative
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource;
 getDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/ResourceEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/ResourceEditor.eea
index 07e6d53e29..7226987456 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/ResourceEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/ResourceEditor.eea
@@ -8,7 +8,7 @@ class org/springframework/core/io/ResourceEditor
  (Lorg/springframework/core/io/ResourceLoader;Lorg/springframework/core/env/PropertyResolver;Z)V
 getAsText
  ()Ljava/lang/String;
- ()L0java/lang/String;
+ ()L0java/lang/String; # @Inherited(java.beans.PropertyEditorSupport)
 resolvePath
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/UrlResource.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/UrlResource.eea
index 24fe8fe223..5296568455 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/UrlResource.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/UrlResource.eea
@@ -17,19 +17,19 @@ class org/springframework/core/io/UrlResource
  (Ljava/net/URL;)V
 createRelative
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.AbstractResource)
 createRelativeURL
  (Ljava/lang/String;)Ljava/net/URL;
- (Ljava/lang/String;)Ljava/net/URL;
+ (Ljava/lang/String;)L1java/net/URL;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(org.springframework.core.io.AbstractResource)
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getFile
  ()Ljava/io/File;
- ()Ljava/io/File;
+ ()L1java/io/File; # @Inherited(org.springframework.core.io.AbstractFileResolvingResource)
 getFilename
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(org.springframework.core.io.AbstractResource)
@@ -41,4 +41,4 @@ getURI
  ()Ljava/net/URI;
 getURL
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L1java/net/URL; # @Inherited(org.springframework.core.io.AbstractResource)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/VfsResource.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/VfsResource.eea
index 37e631623b..ee3f7877ce 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/VfsResource.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/VfsResource.eea
@@ -5,16 +5,16 @@ class org/springframework/core/io/VfsResource
  (Ljava/lang/Object;)V
 createRelative
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.AbstractResource)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(org.springframework.core.io.AbstractResource)
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getFile
  ()Ljava/io/File;
- ()Ljava/io/File;
+ ()L1java/io/File; # @Inherited(org.springframework.core.io.AbstractResource)
 getFilename
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(org.springframework.core.io.AbstractResource)
@@ -26,4 +26,4 @@ getURI
  ()Ljava/net/URI;
 getURL
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L1java/net/URL; # @Inherited(org.springframework.core.io.AbstractResource)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/buffer/DataBufferUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/buffer/DataBufferUtils.eea
index 33e4fab3ea..2d35de395f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/buffer/DataBufferUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/buffer/DataBufferUtils.eea
@@ -11,7 +11,7 @@ matcher
  ([B)Lorg/springframework/core/io/buffer/DataBufferUtils$Matcher;
 matcher
  ([[B)Lorg/springframework/core/io/buffer/DataBufferUtils$Matcher;
- ([[B)Lorg/springframework/core/io/buffer/DataBufferUtils$Matcher;
+ ([[B)L1org/springframework/core/io/buffer/DataBufferUtils$Matcher;
 read
  (Ljava/nio/file/Path;Lorg/springframework/core/io/buffer/DataBufferFactory;I[Ljava/nio/file/OpenOption;)Lreactor/core/publisher/Flux<Lorg/springframework/core/io/buffer/DataBuffer;>;
  (Ljava/nio/file/Path;Lorg/springframework/core/io/buffer/DataBufferFactory;I[Ljava/nio/file/OpenOption;)Lreactor/core/publisher/Flux<Lorg/springframework/core/io/buffer/DataBuffer;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/buffer/DefaultDataBuffer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/buffer/DefaultDataBuffer.eea
index ee6a7e7a1d..7941d34774 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/buffer/DefaultDataBuffer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/buffer/DefaultDataBuffer.eea
@@ -8,13 +8,13 @@ asByteBuffer
  (II)Ljava/nio/ByteBuffer;
 asInputStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
 asInputStream
  (Z)Ljava/io/InputStream;
- (Z)Ljava/io/InputStream;
+ (Z)L1java/io/InputStream;
 asOutputStream
  ()Ljava/io/OutputStream;
- ()Ljava/io/OutputStream;
+ ()L1java/io/OutputStream;
 capacity
  (I)Lorg/springframework/core/io/buffer/DefaultDataBuffer;
  (I)Lorg/springframework/core/io/buffer/DefaultDataBuffer;
@@ -47,13 +47,13 @@ readPosition
  (I)Lorg/springframework/core/io/buffer/DefaultDataBuffer;
 slice
  (II)Lorg/springframework/core/io/buffer/DefaultDataBuffer;
- (II)Lorg/springframework/core/io/buffer/DefaultDataBuffer;
+ (II)L1org/springframework/core/io/buffer/DefaultDataBuffer;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toString
  (IILjava/nio/charset/Charset;)Ljava/lang/String;
- (IILjava/nio/charset/Charset;)Ljava/lang/String;
+ (IILjava/nio/charset/Charset;)L1java/lang/String;
 write
  (B)Lorg/springframework/core/io/buffer/DefaultDataBuffer;
  (B)Lorg/springframework/core/io/buffer/DefaultDataBuffer;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/buffer/LimitedDataBufferList.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/buffer/LimitedDataBufferList.eea
index 0ef2efdca4..9c6751913e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/buffer/LimitedDataBufferList.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/buffer/LimitedDataBufferList.eea
@@ -18,7 +18,7 @@ addAll
  (Ljava/util/Collection<+Lorg/springframework/core/io/buffer/DataBuffer;>;)Z
 remove
  (I)Lorg/springframework/core/io/buffer/DataBuffer;
- (I)Lorg/springframework/core/io/buffer/DataBuffer;
+ (I)L1org/springframework/core/io/buffer/DataBuffer;
 remove
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.util.ArrayList)
@@ -30,4 +30,4 @@ removeIf
  (Ljava/util/function/Predicate<-Lorg/springframework/core/io/buffer/DataBuffer;>;)Z
 set
  (ILorg/springframework/core/io/buffer/DataBuffer;)Lorg/springframework/core/io/buffer/DataBuffer;
- (ILorg/springframework/core/io/buffer/DataBuffer;)Lorg/springframework/core/io/buffer/DataBuffer;
+ (ILorg/springframework/core/io/buffer/DataBuffer;)L1org/springframework/core/io/buffer/DataBuffer;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/buffer/NettyDataBuffer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/buffer/NettyDataBuffer.eea
index 92b707abdf..c0ca4d3c09 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/buffer/NettyDataBuffer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/buffer/NettyDataBuffer.eea
@@ -8,13 +8,13 @@ asByteBuffer
  (II)Ljava/nio/ByteBuffer;
 asInputStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
 asInputStream
  (Z)Ljava/io/InputStream;
- (Z)Ljava/io/InputStream;
+ (Z)L1java/io/InputStream;
 asOutputStream
  ()Ljava/io/OutputStream;
- ()Ljava/io/OutputStream;
+ ()L1java/io/OutputStream;
 capacity
  (I)Lorg/springframework/core/io/buffer/NettyDataBuffer;
  (I)Lorg/springframework/core/io/buffer/NettyDataBuffer;
@@ -50,10 +50,10 @@ retain
  ()Lorg/springframework/core/io/buffer/PooledDataBuffer;
 retainedSlice
  (II)Lorg/springframework/core/io/buffer/NettyDataBuffer;
- (II)Lorg/springframework/core/io/buffer/NettyDataBuffer;
+ (II)L1org/springframework/core/io/buffer/NettyDataBuffer;
 slice
  (II)Lorg/springframework/core/io/buffer/NettyDataBuffer;
- (II)Lorg/springframework/core/io/buffer/NettyDataBuffer;
+ (II)L1org/springframework/core/io/buffer/NettyDataBuffer;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/buffer/NettyDataBufferFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/buffer/NettyDataBufferFactory.eea
index 3648abc2ca..39d8f93426 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/buffer/NettyDataBufferFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/buffer/NettyDataBufferFactory.eea
@@ -9,10 +9,10 @@ toByteBuf
  (Lio/netty/buffer/ByteBufAllocator;)V
 allocateBuffer
  ()Lorg/springframework/core/io/buffer/NettyDataBuffer;
- ()Lorg/springframework/core/io/buffer/NettyDataBuffer;
+ ()L1org/springframework/core/io/buffer/NettyDataBuffer;
 allocateBuffer
  (I)Lorg/springframework/core/io/buffer/NettyDataBuffer;
- (I)Lorg/springframework/core/io/buffer/NettyDataBuffer;
+ (I)L1org/springframework/core/io/buffer/NettyDataBuffer;
 getByteBufAllocator
  ()Lio/netty/buffer/ByteBufAllocator;
  ()Lio/netty/buffer/ByteBufAllocator;
@@ -24,10 +24,10 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 wrap
  (Lio/netty/buffer/ByteBuf;)Lorg/springframework/core/io/buffer/NettyDataBuffer;
- (Lio/netty/buffer/ByteBuf;)Lorg/springframework/core/io/buffer/NettyDataBuffer;
+ (Lio/netty/buffer/ByteBuf;)L1org/springframework/core/io/buffer/NettyDataBuffer;
 wrap
  (Ljava/nio/ByteBuffer;)Lorg/springframework/core/io/buffer/NettyDataBuffer;
- (Ljava/nio/ByteBuffer;)Lorg/springframework/core/io/buffer/NettyDataBuffer;
+ (Ljava/nio/ByteBuffer;)L1org/springframework/core/io/buffer/NettyDataBuffer;
 wrap
  ([B)Lorg/springframework/core/io/buffer/DataBuffer;
- ([B)Lorg/springframework/core/io/buffer/DataBuffer;
+ ([B)L1org/springframework/core/io/buffer/DataBuffer;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/support/DefaultPropertySourceFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/support/DefaultPropertySourceFactory.eea
index 68f88780e0..2dbd81478d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/support/DefaultPropertySourceFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/support/DefaultPropertySourceFactory.eea
@@ -2,4 +2,4 @@ class org/springframework/core/io/support/DefaultPropertySourceFactory
 
 createPropertySource
  (Ljava/lang/String;Lorg/springframework/core/io/support/EncodedResource;)Lorg/springframework/core/env/PropertySource<*>;
- (Ljava/lang/String;Lorg/springframework/core/io/support/EncodedResource;)Lorg/springframework/core/env/PropertySource<*>;
+ (Ljava/lang/String;Lorg/springframework/core/io/support/EncodedResource;)L1org/springframework/core/env/PropertySource<*>; # @Inherited(org.springframework.core.io.support.PropertySourceFactory)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/support/PathMatchingResourcePatternResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/support/PathMatchingResourcePatternResolver.eea
index e6a86c2423..324d83cbdc 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/support/PathMatchingResourcePatternResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/support/PathMatchingResourcePatternResolver.eea
@@ -14,7 +14,7 @@ addClassPathManifestEntries
  (Ljava/util/Set<Lorg/springframework/core/io/Resource;>;)V
 convertClassLoaderURL
  (Ljava/net/URL;)Lorg/springframework/core/io/Resource;
- (Ljava/net/URL;)Lorg/springframework/core/io/Resource;
+ (Ljava/net/URL;)L1org/springframework/core/io/Resource;
 determineRootDir
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
@@ -23,7 +23,7 @@ doFindAllClassPathResources
  (Ljava/lang/String;)Ljava/util/Set<Lorg/springframework/core/io/Resource;>;
 doFindMatchingFileSystemResources
  (Ljava/io/File;Ljava/lang/String;)Ljava/util/Set<Lorg/springframework/core/io/Resource;>;
- (Ljava/io/File;Ljava/lang/String;)Ljava/util/Set<Lorg/springframework/core/io/Resource;>;
+ (Ljava/io/File;Ljava/lang/String;)L1java/util/Set<Lorg/springframework/core/io/Resource;>;
 doFindPathMatchingFileResources
  (Lorg/springframework/core/io/Resource;Ljava/lang/String;)Ljava/util/Set<Lorg/springframework/core/io/Resource;>;
  (Lorg/springframework/core/io/Resource;Ljava/lang/String;)Ljava/util/Set<Lorg/springframework/core/io/Resource;>;
@@ -44,7 +44,7 @@ getClassLoader
  ()L0java/lang/ClassLoader; # @Inherited(org.springframework.core.io.ResourceLoader)
 getJarFile
  (Ljava/lang/String;)Ljava/util/jar/JarFile;
- (Ljava/lang/String;)Ljava/util/jar/JarFile;
+ (Ljava/lang/String;)L1java/util/jar/JarFile;
 getPathMatcher
  ()Lorg/springframework/util/PathMatcher;
  ()Lorg/springframework/util/PathMatcher;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/support/PropertiesLoaderSupport.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/support/PropertiesLoaderSupport.eea
index 296f931be1..e98915f0e3 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/support/PropertiesLoaderSupport.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/support/PropertiesLoaderSupport.eea
@@ -12,7 +12,7 @@ loadProperties
  (Ljava/util/Properties;)V
 mergeProperties
  ()Ljava/util/Properties;
- ()Ljava/util/Properties;
+ ()L1java/util/Properties;
 setFileEncoding
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/support/PropertiesLoaderUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/support/PropertiesLoaderUtils.eea
index 280b1b7b92..3f5e3c12e8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/support/PropertiesLoaderUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/support/PropertiesLoaderUtils.eea
@@ -11,10 +11,10 @@ loadAllProperties
  (Ljava/lang/String;)Ljava/util/Properties;
 loadAllProperties
  (Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/util/Properties;
- (Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/util/Properties;
+ (Ljava/lang/String;Ljava/lang/ClassLoader;)L1java/util/Properties;
 loadProperties
  (Lorg/springframework/core/io/Resource;)Ljava/util/Properties;
- (Lorg/springframework/core/io/Resource;)Ljava/util/Properties;
+ (Lorg/springframework/core/io/Resource;)L1java/util/Properties;
 loadProperties
  (Lorg/springframework/core/io/support/EncodedResource;)Ljava/util/Properties;
- (Lorg/springframework/core/io/support/EncodedResource;)Ljava/util/Properties;
+ (Lorg/springframework/core/io/support/EncodedResource;)L1java/util/Properties;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/support/PropertySourceFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/support/PropertySourceFactory.eea
index 0552af6a43..e46ac11ab5 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/support/PropertySourceFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/support/PropertySourceFactory.eea
@@ -2,4 +2,4 @@ class org/springframework/core/io/support/PropertySourceFactory
 
 createPropertySource
  (Ljava/lang/String;Lorg/springframework/core/io/support/EncodedResource;)Lorg/springframework/core/env/PropertySource<*>;
- (Ljava/lang/String;Lorg/springframework/core/io/support/EncodedResource;)Lorg/springframework/core/env/PropertySource<*>;
+ (Ljava/lang/String;Lorg/springframework/core/io/support/EncodedResource;)L1org/springframework/core/env/PropertySource<*>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/support/SpringFactoriesLoader.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/support/SpringFactoriesLoader.eea
index 8d25414805..257eed3447 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/io/support/SpringFactoriesLoader.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/io/support/SpringFactoriesLoader.eea
@@ -6,7 +6,7 @@ FACTORIES_RESOURCE_LOCATION
 
 loadFactories
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/ClassLoader;)Ljava/util/List<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/ClassLoader;)Ljava/util/List<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/ClassLoader;)L1java/util/List<TT;>;
 loadFactoryNames
  (Ljava/lang/Class<*>;Ljava/lang/ClassLoader;)Ljava/util/List<Ljava/lang/String;>;
  (Ljava/lang/Class<*>;Ljava/lang/ClassLoader;)Ljava/util/List<Ljava/lang/String;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/log/LogDelegateFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/log/LogDelegateFactory.eea
index 3623caf53e..ee5c1bd02d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/log/LogDelegateFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/log/LogDelegateFactory.eea
@@ -2,7 +2,7 @@ class org/springframework/core/log/LogDelegateFactory
 
 getCompositeLog
  (Lorg/apache/commons/logging/Log;Lorg/apache/commons/logging/Log;[Lorg/apache/commons/logging/Log;)Lorg/apache/commons/logging/Log;
- (Lorg/apache/commons/logging/Log;Lorg/apache/commons/logging/Log;[Lorg/apache/commons/logging/Log;)Lorg/apache/commons/logging/Log;
+ (Lorg/apache/commons/logging/Log;Lorg/apache/commons/logging/Log;[Lorg/apache/commons/logging/Log;)L1org/apache/commons/logging/Log;
 getHiddenLog
  (Ljava/lang/Class<*>;)Lorg/apache/commons/logging/Log;
  (Ljava/lang/Class<*>;)Lorg/apache/commons/logging/Log;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/log/LogFormatUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/log/LogFormatUtils.eea
index 5d9aa75e4e..43503c70ed 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/log/LogFormatUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/log/LogFormatUtils.eea
@@ -2,7 +2,7 @@ class org/springframework/core/log/LogFormatUtils
 
 formatValue
  (Ljava/lang/Object;IZ)Ljava/lang/String;
- (Ljava/lang/Object;IZ)Ljava/lang/String;
+ (Ljava/lang/Object;IZ)L1java/lang/String;
 formatValue
  (Ljava/lang/Object;Z)Ljava/lang/String;
  (Ljava/lang/Object;Z)Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/log/LogMessage.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/log/LogMessage.eea
index 34edda9040..f193af516a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/log/LogMessage.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/log/LogMessage.eea
@@ -2,22 +2,22 @@ class org/springframework/core/log/LogMessage
 
 format
  (Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/core/log/LogMessage;
- (Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/core/log/LogMessage;
+ (Ljava/lang/String;Ljava/lang/Object;)L1org/springframework/core/log/LogMessage;
 format
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)Lorg/springframework/core/log/LogMessage;
- (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)Lorg/springframework/core/log/LogMessage;
+ (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)L1org/springframework/core/log/LogMessage;
 format
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lorg/springframework/core/log/LogMessage;
- (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lorg/springframework/core/log/LogMessage;
+ (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)L1org/springframework/core/log/LogMessage;
 format
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lorg/springframework/core/log/LogMessage;
- (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lorg/springframework/core/log/LogMessage;
+ (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)L1org/springframework/core/log/LogMessage;
 format
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/core/log/LogMessage;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/core/log/LogMessage;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/core/log/LogMessage;
 of
  (Ljava/util/function/Supplier<+Ljava/lang/CharSequence;>;)Lorg/springframework/core/log/LogMessage;
- (Ljava/util/function/Supplier<+Ljava/lang/CharSequence;>;)Lorg/springframework/core/log/LogMessage;
+ (Ljava/util/function/Supplier<+Ljava/lang/CharSequence;>;)L1org/springframework/core/log/LogMessage;
 
 subSequence
  (II)Ljava/lang/CharSequence;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/metrics/jfr/FlightRecorderApplicationStartup.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/metrics/jfr/FlightRecorderApplicationStartup.eea
index 62f41bbc8e..6c8ae3b6ae 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/metrics/jfr/FlightRecorderApplicationStartup.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/metrics/jfr/FlightRecorderApplicationStartup.eea
@@ -2,4 +2,4 @@ class org/springframework/core/metrics/jfr/FlightRecorderApplicationStartup
 
 start
  (Ljava/lang/String;)Lorg/springframework/core/metrics/StartupStep;
- (Ljava/lang/String;)Lorg/springframework/core/metrics/StartupStep;
+ (Ljava/lang/String;)L1org/springframework/core/metrics/StartupStep;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/task/SimpleAsyncTaskExecutor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/task/SimpleAsyncTaskExecutor.eea
index 60faa43abc..48c151803e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/task/SimpleAsyncTaskExecutor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/task/SimpleAsyncTaskExecutor.eea
@@ -26,13 +26,13 @@ setThreadFactory
  (Ljava/util/concurrent/ThreadFactory;)V
 submit
  (Ljava/lang/Runnable;)Ljava/util/concurrent/Future<*>;
- (Ljava/lang/Runnable;)Ljava/util/concurrent/Future<*>;
+ (Ljava/lang/Runnable;)L1java/util/concurrent/Future<*>;
 submit
  <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Ljava/util/concurrent/Future<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Ljava/util/concurrent/Future<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)L1java/util/concurrent/Future<TT;>;
 submitListenable
  (Ljava/lang/Runnable;)Lorg/springframework/util/concurrent/ListenableFuture<*>;
- (Ljava/lang/Runnable;)Lorg/springframework/util/concurrent/ListenableFuture<*>;
+ (Ljava/lang/Runnable;)L1org/springframework/util/concurrent/ListenableFuture<*>;
 submitListenable
  <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Lorg/springframework/util/concurrent/ListenableFuture<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Lorg/springframework/util/concurrent/ListenableFuture<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)L1org/springframework/util/concurrent/ListenableFuture<TT;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/task/support/TaskExecutorAdapter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/task/support/TaskExecutorAdapter.eea
index 86f405f96c..b34d1a1f24 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/task/support/TaskExecutorAdapter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/task/support/TaskExecutorAdapter.eea
@@ -23,7 +23,7 @@ submit
  <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Ljava/util/concurrent/Future<TT;>;
 submitListenable
  (Ljava/lang/Runnable;)Lorg/springframework/util/concurrent/ListenableFuture<*>;
- (Ljava/lang/Runnable;)Lorg/springframework/util/concurrent/ListenableFuture<*>;
+ (Ljava/lang/Runnable;)L1org/springframework/util/concurrent/ListenableFuture<*>;
 submitListenable
  <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Lorg/springframework/util/concurrent/ListenableFuture<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Lorg/springframework/util/concurrent/ListenableFuture<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)L1org/springframework/util/concurrent/ListenableFuture<TT;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/type/StandardClassMetadata.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/type/StandardClassMetadata.eea
index 3f2a210e9a..2ae5c2fb39 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/type/StandardClassMetadata.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/type/StandardClassMetadata.eea
@@ -14,7 +14,7 @@ getEnclosingClassName
  ()L0java/lang/String; # @Inherited(org.springframework.core.type.ClassMetadata)
 getInterfaceNames
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 getIntrospectedClass
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.eea
index a651972dc7..51f983d30e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.eea
@@ -33,7 +33,7 @@ getAnnotationTypes
  ()Ljava/util/Set<Ljava/lang/String;>;
 getAnnotations
  ()Lorg/springframework/core/annotation/MergedAnnotations;
- ()Lorg/springframework/core/annotation/MergedAnnotations;
+ ()L1org/springframework/core/annotation/MergedAnnotations;
 getMetaAnnotationTypes
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
@@ -51,7 +51,7 @@ isAnnotated
  (Ljava/lang/String;)Z
 visitAnnotation
  (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
 visitMethod
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)L0org/springframework/asm/MethodVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/type/classreading/CachingMetadataReaderFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/type/classreading/CachingMetadataReaderFactory.eea
index 03585b0794..a5e226b47f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/type/classreading/CachingMetadataReaderFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/type/classreading/CachingMetadataReaderFactory.eea
@@ -8,4 +8,4 @@ class org/springframework/core/type/classreading/CachingMetadataReaderFactory
  (Lorg/springframework/core/io/ResourceLoader;)V
 getMetadataReader
  (Lorg/springframework/core/io/Resource;)Lorg/springframework/core/type/classreading/MetadataReader;
- (Lorg/springframework/core/io/Resource;)Lorg/springframework/core/type/classreading/MetadataReader;
+ (Lorg/springframework/core/io/Resource;)L1org/springframework/core/type/classreading/MetadataReader; # @Inherited(org.springframework.core.type.classreading.SimpleMetadataReaderFactory)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.eea
index eae7a5ece4..17ce1a1b3f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.eea
@@ -33,7 +33,7 @@ getAnnotationAttributes
  (Ljava/lang/String;Z)L0org/springframework/core/annotation/AnnotationAttributes;
 getAnnotations
  ()Lorg/springframework/core/annotation/MergedAnnotations;
- ()Lorg/springframework/core/annotation/MergedAnnotations;
+ ()L1org/springframework/core/annotation/MergedAnnotations;
 getDeclaringClassName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -48,4 +48,4 @@ isAnnotated
  (Ljava/lang/String;)Z
 visitAnnotation
  (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.MethodVisitor)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.eea
index 9cfe9d9cd5..5083de139f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.eea
@@ -11,7 +11,7 @@ getMetadataReader
  (Ljava/lang/String;)Lorg/springframework/core/type/classreading/MetadataReader;
 getMetadataReader
  (Lorg/springframework/core/io/Resource;)Lorg/springframework/core/type/classreading/MetadataReader;
- (Lorg/springframework/core/io/Resource;)Lorg/springframework/core/type/classreading/MetadataReader;
+ (Lorg/springframework/core/io/Resource;)L1org/springframework/core/type/classreading/MetadataReader;
 getResourceLoader
  ()Lorg/springframework/core/io/ResourceLoader;
  ()Lorg/springframework/core/io/ResourceLoader;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.eea
index 3811813407..5f62988343 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.eea
@@ -8,7 +8,7 @@ class org/springframework/dao/support/PersistenceExceptionTranslationInterceptor
  (Lorg/springframework/dao/support/PersistenceExceptionTranslator;)V
 detectPersistenceExceptionTranslators
  (Lorg/springframework/beans/factory/ListableBeanFactory;)Lorg/springframework/dao/support/PersistenceExceptionTranslator;
- (Lorg/springframework/beans/factory/ListableBeanFactory;)Lorg/springframework/dao/support/PersistenceExceptionTranslator;
+ (Lorg/springframework/beans/factory/ListableBeanFactory;)L1org/springframework/dao/support/PersistenceExceptionTranslator;
 invoke
  (Lorg/aopalliance/intercept/MethodInvocation;)Ljava/lang/Object;
  (Lorg/aopalliance/intercept/MethodInvocation;)L0java/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.eea
index fabe276309..46c389aff0 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.eea
@@ -2,7 +2,7 @@ class org/springframework/ejb/access/AbstractSlsbInvokerInterceptor
 
 create
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 getCreateMethod
  (Ljava/lang/Object;)Ljava/lang/reflect/Method;
  (Ljava/lang/Object;)L0java/lang/reflect/Method;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/common/CompositeStringExpression.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/common/CompositeStringExpression.eea
index 7f6a107c51..41731b764f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/common/CompositeStringExpression.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/common/CompositeStringExpression.eea
@@ -11,16 +11,16 @@ getExpressions
  ()[Lorg/springframework/expression/Expression;
 getValue
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getValue
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
 getValue
  (Lorg/springframework/expression/EvaluationContext;)Ljava/lang/String;
- (Lorg/springframework/expression/EvaluationContext;)Ljava/lang/String;
+ (Lorg/springframework/expression/EvaluationContext;)L1java/lang/String;
 getValue
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;)Ljava/lang/String;
- (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;)Ljava/lang/String;
+ (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;)L1java/lang/String;
 getValue
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)T0T; # @Inherited(org.springframework.expression.Expression)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/CodeFlow.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/CodeFlow.eea
index 23e2d08b4f..10e0b234be 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/CodeFlow.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/CodeFlow.eea
@@ -8,10 +8,10 @@ arrayCodeFor
  (Ljava/lang/String;)I
 createSignatureDescriptor
  (Ljava/lang/reflect/Constructor<*>;)Ljava/lang/String;
- (Ljava/lang/reflect/Constructor<*>;)Ljava/lang/String;
+ (Ljava/lang/reflect/Constructor<*>;)L1java/lang/String;
 createSignatureDescriptor
  (Ljava/lang/reflect/Method;)Ljava/lang/String;
- (Ljava/lang/reflect/Method;)Ljava/lang/String;
+ (Ljava/lang/reflect/Method;)L1java/lang/String;
 insertAnyNecessaryTypeConversionBytecodes
  (Lorg/springframework/asm/MethodVisitor;CLjava/lang/String;)V
  (Lorg/springframework/asm/MethodVisitor;CLjava/lang/String;)V
@@ -65,7 +65,7 @@ isReferenceTypeArray
  (Ljava/lang/String;)Z
 toBoxedDescriptor
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 toDescriptor
  (Ljava/lang/Class<*>;)Ljava/lang/String;
  (Ljava/lang/Class<*>;)Ljava/lang/String;
@@ -74,10 +74,10 @@ toDescriptorFromObject
  (Ljava/lang/Object;)Ljava/lang/String;
 toDescriptors
  ([Ljava/lang/Class<*>;)[Ljava/lang/String;
- ([Ljava/lang/Class<*>;)[Ljava/lang/String;
+ ([Ljava/lang/Class<*>;)[1Ljava/lang/String;
 toJvmDescriptor
  (Ljava/lang/Class<*>;)Ljava/lang/String;
- (Ljava/lang/Class<*>;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;)L1java/lang/String;
 toParamDescriptors
  (Ljava/lang/reflect/Constructor<*>;)[Ljava/lang/String;
  (Ljava/lang/reflect/Constructor<*>;)[Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ExpressionState.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ExpressionState.eea
index 5842b86319..2b02867a6f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ExpressionState.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ExpressionState.eea
@@ -62,7 +62,7 @@ lookupVariable
  (Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
 operate
  (Lorg/springframework/expression/Operation;Ljava/lang/Object;Ljava/lang/Object;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/Operation;Ljava/lang/Object;Ljava/lang/Object;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/Operation;Ljava/lang/Object;Ljava/lang/Object;)L1org/springframework/expression/TypedValue;
 pushActiveContextObject
  (Lorg/springframework/expression/TypedValue;)V
  (Lorg/springframework/expression/TypedValue;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/SpelMessage.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/SpelMessage.eea
index 46cd5f4978..378037c073 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/SpelMessage.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/SpelMessage.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 formatMessage
  ([Ljava/lang/Object;)Ljava/lang/String;
- ([Ljava/lang/Object;)Ljava/lang/String;
+ ([Ljava/lang/Object;)L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Assign.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Assign.eea
index 148f299532..e24107b54d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Assign.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Assign.eea
@@ -8,4 +8,4 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/BeanReference.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/BeanReference.eea
index ba27ab1be7..2a9d1daf52 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/BeanReference.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/BeanReference.eea
@@ -5,7 +5,7 @@ class org/springframework/expression/spel/ast/BeanReference
  (IILjava/lang/String;)V
 getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/spel/ExpressionState;)L1org/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/CompoundExpression.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/CompoundExpression.eea
index 976ee1adc3..57f051b17a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/CompoundExpression.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/CompoundExpression.eea
@@ -11,13 +11,13 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 getValueRef
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
- (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
+ (Lorg/springframework/expression/spel/ExpressionState;)L1org/springframework/expression/spel/ast/ValueRef; # @Inherited(org.springframework.expression.spel.ast.SpelNodeImpl)
 isWritable
  (Lorg/springframework/expression/spel/ExpressionState;)Z
  (Lorg/springframework/expression/spel/ExpressionState;)Z
 setValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)L1org/springframework/expression/TypedValue; # @Inherited(org.springframework.expression.spel.ast.SpelNodeImpl)
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/ConstructorReference.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/ConstructorReference.eea
index 066a0fe6f4..1874fda1e7 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/ConstructorReference.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/ConstructorReference.eea
@@ -14,4 +14,4 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Elvis.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Elvis.eea
index d570a682cf..b28b168d2e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Elvis.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Elvis.eea
@@ -11,4 +11,4 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/FunctionReference.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/FunctionReference.eea
index 6b7ce42c16..646f208f27 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/FunctionReference.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/FunctionReference.eea
@@ -11,4 +11,4 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Identifier.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Identifier.eea
index e2399bf63f..761fbd8483 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Identifier.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Identifier.eea
@@ -8,4 +8,4 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Indexer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Indexer.eea
index f5fed5aa68..90bb8dc47c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Indexer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Indexer.eea
@@ -11,13 +11,13 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 getValueRef
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
- (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
+ (Lorg/springframework/expression/spel/ExpressionState;)L1org/springframework/expression/spel/ast/ValueRef; # @Inherited(org.springframework.expression.spel.ast.SpelNodeImpl)
 isWritable
  (Lorg/springframework/expression/spel/ExpressionState;)Z
  (Lorg/springframework/expression/spel/ExpressionState;)Z
 setValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)L1org/springframework/expression/TypedValue; # @Inherited(org.springframework.expression.spel.ast.SpelNodeImpl)
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/InlineList.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/InlineList.eea
index 5abfca6f3e..773a085c65 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/InlineList.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/InlineList.eea
@@ -14,4 +14,4 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/InlineMap.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/InlineMap.eea
index aae449e556..c2dd750666 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/InlineMap.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/InlineMap.eea
@@ -11,4 +11,4 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Literal.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Literal.eea
index ca4065a848..8cf6415c2e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Literal.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Literal.eea
@@ -2,13 +2,13 @@ class org/springframework/expression/spel/ast/Literal
 
 getIntLiteral
  (Ljava/lang/String;III)Lorg/springframework/expression/spel/ast/Literal;
- (Ljava/lang/String;III)Lorg/springframework/expression/spel/ast/Literal;
+ (Ljava/lang/String;III)L1org/springframework/expression/spel/ast/Literal;
 getLongLiteral
  (Ljava/lang/String;III)Lorg/springframework/expression/spel/ast/Literal;
- (Ljava/lang/String;III)Lorg/springframework/expression/spel/ast/Literal;
+ (Ljava/lang/String;III)L1org/springframework/expression/spel/ast/Literal;
 getRealLiteral
  (Ljava/lang/String;IIZ)Lorg/springframework/expression/spel/ast/Literal;
- (Ljava/lang/String;IIZ)Lorg/springframework/expression/spel/ast/Literal;
+ (Ljava/lang/String;IIZ)L1org/springframework/expression/spel/ast/Literal;
 
 <init>
  (Ljava/lang/String;II)V
@@ -27,4 +27,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/MethodReference.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/MethodReference.eea
index 911f445ab9..eebfe0aa66 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/MethodReference.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/MethodReference.eea
@@ -14,7 +14,7 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 getValueRef
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
- (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
+ (Lorg/springframework/expression/spel/ExpressionState;)L1org/springframework/expression/spel/ast/ValueRef; # @Inherited(org.springframework.expression.spel.ast.SpelNodeImpl)
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/OpDec.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/OpDec.eea
index 9cc474e60f..4faf0a535e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/OpDec.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/OpDec.eea
@@ -5,10 +5,10 @@ class org/springframework/expression/spel/ast/OpDec
  (IIZ[Lorg/springframework/expression/spel/ast/SpelNodeImpl;)V
 getRightOperand
  ()Lorg/springframework/expression/spel/ast/SpelNodeImpl;
- ()Lorg/springframework/expression/spel/ast/SpelNodeImpl;
+ ()L1org/springframework/expression/spel/ast/SpelNodeImpl;
 getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.expression.spel.ast.Operator)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/OpInc.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/OpInc.eea
index ddd57f3286..dd0e5a3e86 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/OpInc.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/OpInc.eea
@@ -5,10 +5,10 @@ class org/springframework/expression/spel/ast/OpInc
  (IIZ[Lorg/springframework/expression/spel/ast/SpelNodeImpl;)V
 getRightOperand
  ()Lorg/springframework/expression/spel/ast/SpelNodeImpl;
- ()Lorg/springframework/expression/spel/ast/SpelNodeImpl;
+ ()L1org/springframework/expression/spel/ast/SpelNodeImpl;
 getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.expression.spel.ast.Operator)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/OpMinus.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/OpMinus.eea
index 513fc8c373..bed17c22d4 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/OpMinus.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/OpMinus.eea
@@ -14,4 +14,4 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.expression.spel.ast.Operator)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/OpPlus.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/OpPlus.eea
index e4b36ad573..031a313303 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/OpPlus.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/OpPlus.eea
@@ -14,4 +14,4 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.expression.spel.ast.Operator)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Operator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Operator.eea
index cea2c1d147..16164ce2a7 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Operator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Operator.eea
@@ -28,4 +28,4 @@ getRightOperand
  ()Lorg/springframework/expression/spel/ast/SpelNodeImpl;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/OperatorNot.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/OperatorNot.eea
index 11a79e662b..aa395a671e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/OperatorNot.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/OperatorNot.eea
@@ -11,4 +11,4 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/support/BooleanTypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Projection.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Projection.eea
index 77e6a159e0..c0d38e3bc3 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Projection.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Projection.eea
@@ -8,7 +8,7 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 getValueRef
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
- (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
+ (Lorg/springframework/expression/spel/ExpressionState;)L1org/springframework/expression/spel/ast/ValueRef; # @Inherited(org.springframework.expression.spel.ast.SpelNodeImpl)
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/PropertyOrFieldReference.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/PropertyOrFieldReference.eea
index 54355a84e0..cbbc25990a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/PropertyOrFieldReference.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/PropertyOrFieldReference.eea
@@ -14,7 +14,7 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 getValueRef
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
- (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
+ (Lorg/springframework/expression/spel/ExpressionState;)L1org/springframework/expression/spel/ast/ValueRef; # @Inherited(org.springframework.expression.spel.ast.SpelNodeImpl)
 isWritable
  (Lorg/springframework/expression/spel/ExpressionState;)Z
  (Lorg/springframework/expression/spel/ExpressionState;)Z
@@ -23,7 +23,7 @@ isWritableProperty
  (Ljava/lang/String;Lorg/springframework/expression/TypedValue;Lorg/springframework/expression/EvaluationContext;)Z
 setValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)L1org/springframework/expression/TypedValue; # @Inherited(org.springframework.expression.spel.ast.SpelNodeImpl)
 toStringAST
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/QualifiedIdentifier.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/QualifiedIdentifier.eea
index eae29444c9..f6ea9dfa8c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/QualifiedIdentifier.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/QualifiedIdentifier.eea
@@ -8,4 +8,4 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Selection.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Selection.eea
index 251528810d..2373a68ec4 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Selection.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Selection.eea
@@ -8,7 +8,7 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 getValueRef
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
- (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
+ (Lorg/springframework/expression/spel/ExpressionState;)L1org/springframework/expression/spel/ast/ValueRef; # @Inherited(org.springframework.expression.spel.ast.SpelNodeImpl)
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/SpelNodeImpl.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/SpelNodeImpl.eea
index e233574b7a..0c39624ea7 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/SpelNodeImpl.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/SpelNodeImpl.eea
@@ -43,7 +43,7 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 getValueRef
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
- (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
+ (Lorg/springframework/expression/spel/ExpressionState;)L1org/springframework/expression/spel/ast/ValueRef;
 isWritable
  (Lorg/springframework/expression/spel/ExpressionState;)Z
  (Lorg/springframework/expression/spel/ExpressionState;)Z
@@ -55,4 +55,4 @@ setValue
  (Lorg/springframework/expression/spel/ExpressionState;Ljava/lang/Object;)V
 setValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)L1org/springframework/expression/TypedValue;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Ternary.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Ternary.eea
index ff84ff5fda..f7134c7f0c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Ternary.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/Ternary.eea
@@ -11,4 +11,4 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/TypeReference.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/TypeReference.eea
index 098d517542..b73daac1d2 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/TypeReference.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/TypeReference.eea
@@ -11,7 +11,7 @@ generateCode
  (Lorg/springframework/asm/MethodVisitor;Lorg/springframework/expression/spel/CodeFlow;)V
 getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/spel/ExpressionState;)L1org/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/VariableReference.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/VariableReference.eea
index 6c35081092..27bea95a61 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/VariableReference.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/ast/VariableReference.eea
@@ -11,13 +11,13 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 getValueRef
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
- (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
+ (Lorg/springframework/expression/spel/ExpressionState;)L1org/springframework/expression/spel/ast/ValueRef; # @Inherited(org.springframework.expression.spel.ast.SpelNodeImpl)
 isWritable
  (Lorg/springframework/expression/spel/ExpressionState;)Z
  (Lorg/springframework/expression/spel/ExpressionState;)Z
 setValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)L1org/springframework/expression/TypedValue; # @Inherited(org.springframework.expression.spel.ast.SpelNodeImpl)
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/standard/SpelCompiler.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/standard/SpelCompiler.eea
index f606c38e9e..60ddf8a7bf 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/standard/SpelCompiler.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/standard/SpelCompiler.eea
@@ -5,7 +5,7 @@ compile
  (Lorg/springframework/expression/Expression;)Z
 getCompiler
  (Ljava/lang/ClassLoader;)Lorg/springframework/expression/spel/standard/SpelCompiler;
- (Ljava/lang/ClassLoader;)Lorg/springframework/expression/spel/standard/SpelCompiler;
+ (Ljava/lang/ClassLoader;)L1org/springframework/expression/spel/standard/SpelCompiler;
 revertToInterpreted
  (Lorg/springframework/expression/Expression;)V
  (Lorg/springframework/expression/Expression;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/support/DataBindingMethodResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/support/DataBindingMethodResolver.eea
index 07a61558d8..b6cde4f797 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/support/DataBindingMethodResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/support/DataBindingMethodResolver.eea
@@ -2,7 +2,7 @@ class org/springframework/expression/spel/support/DataBindingMethodResolver
 
 forInstanceMethodInvocation
  ()Lorg/springframework/expression/spel/support/DataBindingMethodResolver;
- ()Lorg/springframework/expression/spel/support/DataBindingMethodResolver;
+ ()L1org/springframework/expression/spel/support/DataBindingMethodResolver;
 
 isCandidateForInvocation
  (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/support/ReflectiveConstructorExecutor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/support/ReflectiveConstructorExecutor.eea
index a99684e82e..745ee2df51 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/support/ReflectiveConstructorExecutor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/support/ReflectiveConstructorExecutor.eea
@@ -5,7 +5,7 @@ class org/springframework/expression/spel/support/ReflectiveConstructorExecutor
  (Ljava/lang/reflect/Constructor<*>;)V
 execute
  (Lorg/springframework/expression/EvaluationContext;[Ljava/lang/Object;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/EvaluationContext;[Ljava/lang/Object;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/EvaluationContext;[Ljava/lang/Object;)L1org/springframework/expression/TypedValue;
 getConstructor
  ()Ljava/lang/reflect/Constructor<*>;
  ()Ljava/lang/reflect/Constructor<*>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/support/ReflectivePropertyAccessor$OptimalPropertyAccessor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/support/ReflectivePropertyAccessor$OptimalPropertyAccessor.eea
index 98d9a04fa8..e1cf8571dc 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/support/ReflectivePropertyAccessor$OptimalPropertyAccessor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/support/ReflectivePropertyAccessor$OptimalPropertyAccessor.eea
@@ -21,7 +21,7 @@ getSpecificTargetClasses
  ()[0Ljava/lang/Class<*>; # @Inherited(org.springframework.expression.PropertyAccessor)
 read
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/expression/TypedValue;
 write
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/support/ReflectivePropertyAccessor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/support/ReflectivePropertyAccessor.eea
index e29e6e21e8..dad388929b 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/support/ReflectivePropertyAccessor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/support/ReflectivePropertyAccessor.eea
@@ -8,7 +8,7 @@ canWrite
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Z
 createOptimalAccessor
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/PropertyAccessor;
- (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/PropertyAccessor;
+ (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/expression/PropertyAccessor;
 findField
  (Ljava/lang/String;Ljava/lang/Class<*>;Z)Ljava/lang/reflect/Field;
  (Ljava/lang/String;Ljava/lang/Class<*>;Z)L0java/lang/reflect/Field;
@@ -35,7 +35,7 @@ isCandidateForProperty
  (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Z
 read
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/expression/TypedValue;
 write
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/support/SimpleEvaluationContext.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/support/SimpleEvaluationContext.eea
index 4ad4f4771b..79991568f8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/support/SimpleEvaluationContext.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/support/SimpleEvaluationContext.eea
@@ -2,7 +2,7 @@ class org/springframework/expression/spel/support/SimpleEvaluationContext
 
 forPropertyAccessors
  ([Lorg/springframework/expression/PropertyAccessor;)Lorg/springframework/expression/spel/support/SimpleEvaluationContext$Builder;
- ([Lorg/springframework/expression/PropertyAccessor;)Lorg/springframework/expression/spel/support/SimpleEvaluationContext$Builder;
+ ([Lorg/springframework/expression/PropertyAccessor;)L1org/springframework/expression/spel/support/SimpleEvaluationContext$Builder;
 forReadOnlyDataBinding
  ()Lorg/springframework/expression/spel/support/SimpleEvaluationContext$Builder;
  ()Lorg/springframework/expression/spel/support/SimpleEvaluationContext$Builder;
@@ -12,7 +12,7 @@ forReadWriteDataBinding
 
 assignVariable
  (Ljava/lang/String;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)Lorg/springframework/expression/TypedValue;
- (Ljava/lang/String;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)Lorg/springframework/expression/TypedValue;
+ (Ljava/lang/String;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)L1org/springframework/expression/TypedValue;
 getBeanResolver
  ()Lorg/springframework/expression/BeanResolver;
  ()L0org/springframework/expression/BeanResolver; # @Inherited(org.springframework.expression.EvaluationContext)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/support/StandardOperatorOverloader.eea b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/support/StandardOperatorOverloader.eea
index 82c3b53169..5ead5c6b80 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/support/StandardOperatorOverloader.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/expression/spel/support/StandardOperatorOverloader.eea
@@ -2,7 +2,7 @@ class org/springframework/expression/spel/support/StandardOperatorOverloader
 
 operate
  (Lorg/springframework/expression/Operation;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- (Lorg/springframework/expression/Operation;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lorg/springframework/expression/Operation;Ljava/lang/Object;Ljava/lang/Object;)L1java/lang/Object;
 overridesOperation
  (Lorg/springframework/expression/Operation;Ljava/lang/Object;Ljava/lang/Object;)Z
  (Lorg/springframework/expression/Operation;Ljava/lang/Object;Ljava/lang/Object;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/format/datetime/DateTimeFormatAnnotationFormatterFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/format/datetime/DateTimeFormatAnnotationFormatterFactory.eea
index 08010cd05b..5cfeea1f09 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/format/datetime/DateTimeFormatAnnotationFormatterFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/format/datetime/DateTimeFormatAnnotationFormatterFactory.eea
@@ -9,7 +9,7 @@ getFieldTypes
  ()Ljava/util/Set<Ljava/lang/Class<*>;>;
 getFormatter
  (Lorg/springframework/format/annotation/DateTimeFormat;Ljava/lang/Class<*>;)Lorg/springframework/format/Formatter<Ljava/util/Date;>;
- (Lorg/springframework/format/annotation/DateTimeFormat;Ljava/lang/Class<*>;)Lorg/springframework/format/Formatter<Ljava/util/Date;>;
+ (Lorg/springframework/format/annotation/DateTimeFormat;Ljava/lang/Class<*>;)L1org/springframework/format/Formatter<Ljava/util/Date;>;
 getParser
  (Lorg/springframework/format/annotation/DateTimeFormat;Ljava/lang/Class<*>;)Lorg/springframework/format/Parser<*>;
  (Lorg/springframework/format/annotation/DateTimeFormat;Ljava/lang/Class<*>;)Lorg/springframework/format/Parser<*>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/format/datetime/joda/DateTimeFormatterFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/format/datetime/joda/DateTimeFormatterFactory.eea
index e091ebbc4f..abb3235951 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/format/datetime/joda/DateTimeFormatterFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/format/datetime/joda/DateTimeFormatterFactory.eea
@@ -5,10 +5,10 @@ class org/springframework/format/datetime/joda/DateTimeFormatterFactory
  (Ljava/lang/String;)V
 createDateTimeFormatter
  ()Lorg/joda/time/format/DateTimeFormatter;
- ()Lorg/joda/time/format/DateTimeFormatter;
+ ()L1org/joda/time/format/DateTimeFormatter;
 createDateTimeFormatter
  (Lorg/joda/time/format/DateTimeFormatter;)Lorg/joda/time/format/DateTimeFormatter;
- (Lorg/joda/time/format/DateTimeFormatter;)Lorg/joda/time/format/DateTimeFormatter;
+ (Lorg/joda/time/format/DateTimeFormatter;)L1org/joda/time/format/DateTimeFormatter;
 setIso
  (Lorg/springframework/format/annotation/DateTimeFormat$ISO;)V
  (Lorg/springframework/format/annotation/DateTimeFormat$ISO;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/format/datetime/joda/JodaDateTimeFormatAnnotationFormatterFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/format/datetime/joda/JodaDateTimeFormatAnnotationFormatterFactory.eea
index a3e4431fc8..7710d1efe4 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/format/datetime/joda/JodaDateTimeFormatAnnotationFormatterFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/format/datetime/joda/JodaDateTimeFormatAnnotationFormatterFactory.eea
@@ -12,7 +12,7 @@ getFormatter
  (Lorg/springframework/format/annotation/DateTimeFormat;Ljava/lang/Class<*>;)Lorg/joda/time/format/DateTimeFormatter;
 getParser
  (Lorg/springframework/format/annotation/DateTimeFormat;Ljava/lang/Class<*>;)Lorg/springframework/format/Parser<*>;
- (Lorg/springframework/format/annotation/DateTimeFormat;Ljava/lang/Class<*>;)Lorg/springframework/format/Parser<*>;
+ (Lorg/springframework/format/annotation/DateTimeFormat;Ljava/lang/Class<*>;)L1org/springframework/format/Parser<*>;
 getPrinter
  (Lorg/springframework/format/annotation/DateTimeFormat;Ljava/lang/Class<*>;)Lorg/springframework/format/Printer<*>;
- (Lorg/springframework/format/annotation/DateTimeFormat;Ljava/lang/Class<*>;)Lorg/springframework/format/Printer<*>;
+ (Lorg/springframework/format/annotation/DateTimeFormat;Ljava/lang/Class<*>;)L1org/springframework/format/Printer<*>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/format/datetime/standard/DateTimeFormatterFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/format/datetime/standard/DateTimeFormatterFactory.eea
index b6e97530b8..c99323a40b 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/format/datetime/standard/DateTimeFormatterFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/format/datetime/standard/DateTimeFormatterFactory.eea
@@ -5,10 +5,10 @@ class org/springframework/format/datetime/standard/DateTimeFormatterFactory
  (Ljava/lang/String;)V
 createDateTimeFormatter
  ()Ljava/time/format/DateTimeFormatter;
- ()Ljava/time/format/DateTimeFormatter;
+ ()L1java/time/format/DateTimeFormatter;
 createDateTimeFormatter
  (Ljava/time/format/DateTimeFormatter;)Ljava/time/format/DateTimeFormatter;
- (Ljava/time/format/DateTimeFormatter;)Ljava/time/format/DateTimeFormatter;
+ (Ljava/time/format/DateTimeFormatter;)L1java/time/format/DateTimeFormatter;
 setDateStyle
  (Ljava/time/format/FormatStyle;)V
  (Ljava/time/format/FormatStyle;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/format/datetime/standard/InstantFormatter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/format/datetime/standard/InstantFormatter.eea
index faea0399f0..5e2b354fb8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/format/datetime/standard/InstantFormatter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/format/datetime/standard/InstantFormatter.eea
@@ -9,4 +9,4 @@ parse
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/time/Instant;
 print
  (Ljava/time/Instant;Ljava/util/Locale;)Ljava/lang/String;
- (Ljava/time/Instant;Ljava/util/Locale;)Ljava/lang/String;
+ (Ljava/time/Instant;Ljava/util/Locale;)L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/format/datetime/standard/Jsr310DateTimeFormatAnnotationFormatterFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/format/datetime/standard/Jsr310DateTimeFormatAnnotationFormatterFactory.eea
index c514774fad..f1b2aaae18 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/format/datetime/standard/Jsr310DateTimeFormatAnnotationFormatterFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/format/datetime/standard/Jsr310DateTimeFormatAnnotationFormatterFactory.eea
@@ -15,4 +15,4 @@ getParser
  (Lorg/springframework/format/annotation/DateTimeFormat;Ljava/lang/Class<*>;)Lorg/springframework/format/Parser<*>;
 getPrinter
  (Lorg/springframework/format/annotation/DateTimeFormat;Ljava/lang/Class<*>;)Lorg/springframework/format/Printer<*>;
- (Lorg/springframework/format/annotation/DateTimeFormat;Ljava/lang/Class<*>;)Lorg/springframework/format/Printer<*>;
+ (Lorg/springframework/format/annotation/DateTimeFormat;Ljava/lang/Class<*>;)L1org/springframework/format/Printer<*>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/format/support/FormatterPropertyEditorAdapter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/format/support/FormatterPropertyEditorAdapter.eea
index d81adb3907..fe5410caea 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/format/support/FormatterPropertyEditorAdapter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/format/support/FormatterPropertyEditorAdapter.eea
@@ -5,7 +5,7 @@ class org/springframework/format/support/FormatterPropertyEditorAdapter
  (Lorg/springframework/format/Formatter<*>;)V
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 getFieldType
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/format/support/FormattingConversionServiceFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/format/support/FormattingConversionServiceFactoryBean.eea
index eddaa7e201..5c0754542e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/format/support/FormattingConversionServiceFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/format/support/FormattingConversionServiceFactoryBean.eea
@@ -9,7 +9,7 @@ getObject
  ()L0org/springframework/format/support/FormattingConversionService;
 getObjectType
  ()Ljava/lang/Class<+Lorg/springframework/format/support/FormattingConversionService;>;
- ()Ljava/lang/Class<+Lorg/springframework/format/support/FormattingConversionService;>;
+ ()L1java/lang/Class<+Lorg/springframework/format/support/FormattingConversionService;>;
 setConverters
  (Ljava/util/Set<*>;)V
  (Ljava/util/Set<*>;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/CacheControl.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/CacheControl.eea
index 822754ce4e..841a013f27 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/CacheControl.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/CacheControl.eea
@@ -2,19 +2,19 @@ class org/springframework/http/CacheControl
 
 empty
  ()Lorg/springframework/http/CacheControl;
- ()Lorg/springframework/http/CacheControl;
+ ()L1org/springframework/http/CacheControl;
 maxAge
  (JLjava/util/concurrent/TimeUnit;)Lorg/springframework/http/CacheControl;
  (JLjava/util/concurrent/TimeUnit;)Lorg/springframework/http/CacheControl;
 maxAge
  (Ljava/time/Duration;)Lorg/springframework/http/CacheControl;
- (Ljava/time/Duration;)Lorg/springframework/http/CacheControl;
+ (Ljava/time/Duration;)L1org/springframework/http/CacheControl;
 noCache
  ()Lorg/springframework/http/CacheControl;
- ()Lorg/springframework/http/CacheControl;
+ ()L1org/springframework/http/CacheControl;
 noStore
  ()Lorg/springframework/http/CacheControl;
- ()Lorg/springframework/http/CacheControl;
+ ()L1org/springframework/http/CacheControl;
 
 cachePrivate
  ()Lorg/springframework/http/CacheControl;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/ContentDisposition.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/ContentDisposition.eea
index 62f4f4f78d..d6dcb64ad1 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/ContentDisposition.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/ContentDisposition.eea
@@ -5,10 +5,10 @@ attachment
  ()Lorg/springframework/http/ContentDisposition$Builder;
 builder
  (Ljava/lang/String;)Lorg/springframework/http/ContentDisposition$Builder;
- (Ljava/lang/String;)Lorg/springframework/http/ContentDisposition$Builder;
+ (Ljava/lang/String;)L1org/springframework/http/ContentDisposition$Builder;
 empty
  ()Lorg/springframework/http/ContentDisposition;
- ()Lorg/springframework/http/ContentDisposition;
+ ()L1org/springframework/http/ContentDisposition;
 formData
  ()Lorg/springframework/http/ContentDisposition$Builder;
  ()Lorg/springframework/http/ContentDisposition$Builder;
@@ -17,7 +17,7 @@ inline
  ()Lorg/springframework/http/ContentDisposition$Builder;
 parse
  (Ljava/lang/String;)Lorg/springframework/http/ContentDisposition;
- (Ljava/lang/String;)Lorg/springframework/http/ContentDisposition;
+ (Ljava/lang/String;)L1org/springframework/http/ContentDisposition;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/ETag.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/ETag.eea
index bb74d20553..a915faa0e3 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/ETag.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/ETag.eea
@@ -2,14 +2,14 @@ class org/springframework/http/ETag
 
 parse
  (Ljava/lang/String;)Ljava/util/List<Lorg/springframework/http/ETag;>;
- (Ljava/lang/String;)Ljava/util/List<Lorg/springframework/http/ETag;>;
+ (Ljava/lang/String;)L1java/util/List<Lorg/springframework/http/ETag;>;
 
 <init>
  (Ljava/lang/String;Z)V
  (Ljava/lang/String;Z)V
 formattedTag
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 tag
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/HttpHeaders.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/HttpHeaders.eea
index 1d0c6a1dd0..0caa1b8a5d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/HttpHeaders.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/HttpHeaders.eea
@@ -193,16 +193,16 @@ WWW_AUTHENTICATE
 
 encodeBasicAuth
  (Ljava/lang/String;Ljava/lang/String;Ljava/nio/charset/Charset;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;Ljava/nio/charset/Charset;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/nio/charset/Charset;)L1java/lang/String;
 formatHeaders
  (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;)Ljava/lang/String;
  (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;)Ljava/lang/String;
 readOnlyHttpHeaders
  (Lorg/springframework/http/HttpHeaders;)Lorg/springframework/http/HttpHeaders;
- (Lorg/springframework/http/HttpHeaders;)Lorg/springframework/http/HttpHeaders;
+ (Lorg/springframework/http/HttpHeaders;)L1org/springframework/http/HttpHeaders;
 readOnlyHttpHeaders
  (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;)Lorg/springframework/http/HttpHeaders;
- (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;)Lorg/springframework/http/HttpHeaders;
+ (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;)L1org/springframework/http/HttpHeaders;
 writableHttpHeaders
  (Lorg/springframework/http/HttpHeaders;)Lorg/springframework/http/HttpHeaders;
  (Lorg/springframework/http/HttpHeaders;)Lorg/springframework/http/HttpHeaders;
@@ -254,7 +254,7 @@ getAccessControlAllowHeaders
  ()Ljava/util/List<Ljava/lang/String;>;
 getAccessControlAllowMethods
  ()Ljava/util/List<Lorg/springframework/http/HttpMethod;>;
- ()Ljava/util/List<Lorg/springframework/http/HttpMethod;>;
+ ()L1java/util/List<Lorg/springframework/http/HttpMethod;>;
 getAccessControlAllowOrigin
  ()Ljava/lang/String;
  ()L0java/lang/String;
@@ -506,7 +506,7 @@ setZonedDateTime
  (Ljava/lang/String;Ljava/time/ZonedDateTime;)V
 toCommaDelimitedString
  (Ljava/util/List<Ljava/lang/String;>;)Ljava/lang/String;
- (Ljava/util/List<Ljava/lang/String;>;)Ljava/lang/String;
+ (Ljava/util/List<Ljava/lang/String;>;)L1java/lang/String;
 toSingleValueMap
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/HttpRange.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/HttpRange.eea
index 737fc26685..d7e6f31bb4 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/HttpRange.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/HttpRange.eea
@@ -2,13 +2,13 @@ class org/springframework/http/HttpRange
 
 createByteRange
  (J)Lorg/springframework/http/HttpRange;
- (J)Lorg/springframework/http/HttpRange;
+ (J)L1org/springframework/http/HttpRange;
 createByteRange
  (JJ)Lorg/springframework/http/HttpRange;
- (JJ)Lorg/springframework/http/HttpRange;
+ (JJ)L1org/springframework/http/HttpRange;
 createSuffixRange
  (J)Lorg/springframework/http/HttpRange;
- (J)Lorg/springframework/http/HttpRange;
+ (J)L1org/springframework/http/HttpRange;
 parseRanges
  (Ljava/lang/String;)Ljava/util/List<Lorg/springframework/http/HttpRange;>;
  (Ljava/lang/String;)Ljava/util/List<Lorg/springframework/http/HttpRange;>;
@@ -17,7 +17,7 @@ toResourceRegions
  (Ljava/util/List<Lorg/springframework/http/HttpRange;>;Lorg/springframework/core/io/Resource;)Ljava/util/List<Lorg/springframework/core/io/support/ResourceRegion;>;
 toString
  (Ljava/util/Collection<Lorg/springframework/http/HttpRange;>;)Ljava/lang/String;
- (Ljava/util/Collection<Lorg/springframework/http/HttpRange;>;)Ljava/lang/String;
+ (Ljava/util/Collection<Lorg/springframework/http/HttpRange;>;)L1java/lang/String;
 
 toResourceRegion
  (Lorg/springframework/core/io/Resource;)Lorg/springframework/core/io/support/ResourceRegion;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/MediaType.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/MediaType.eea
index aba0f3cd5b..4b2750f8a0 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/MediaType.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/MediaType.eea
@@ -180,10 +180,10 @@ asMediaType
  (Lorg/springframework/util/MimeType;)Lorg/springframework/http/MediaType;
 asMediaTypes
  (Ljava/util/List<Lorg/springframework/util/MimeType;>;)Ljava/util/List<Lorg/springframework/http/MediaType;>;
- (Ljava/util/List<Lorg/springframework/util/MimeType;>;)Ljava/util/List<Lorg/springframework/http/MediaType;>;
+ (Ljava/util/List<Lorg/springframework/util/MimeType;>;)L1java/util/List<Lorg/springframework/http/MediaType;>;
 parseMediaType
  (Ljava/lang/String;)Lorg/springframework/http/MediaType;
- (Ljava/lang/String;)Lorg/springframework/http/MediaType;
+ (Ljava/lang/String;)L1org/springframework/http/MediaType;
 parseMediaTypes
  (Ljava/lang/String;)Ljava/util/List<Lorg/springframework/http/MediaType;>;
  (Ljava/lang/String;)Ljava/util/List<Lorg/springframework/http/MediaType;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/MediaTypeEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/MediaTypeEditor.eea
index fb773e58b7..7e4c210306 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/MediaTypeEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/MediaTypeEditor.eea
@@ -2,7 +2,7 @@ class org/springframework/http/MediaTypeEditor
 
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/RequestEntity.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/RequestEntity.eea
index d0d375e039..e87cdfb2bd 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/RequestEntity.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/RequestEntity.eea
@@ -26,13 +26,13 @@ head
  (Ljava/net/URI;)Lorg/springframework/http/RequestEntity$HeadersBuilder<*>;
 method
  (Lorg/springframework/http/HttpMethod;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)Lorg/springframework/http/RequestEntity$BodyBuilder;
- (Lorg/springframework/http/HttpMethod;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)Lorg/springframework/http/RequestEntity$BodyBuilder;
+ (Lorg/springframework/http/HttpMethod;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)L1org/springframework/http/RequestEntity$BodyBuilder;
 method
  (Lorg/springframework/http/HttpMethod;Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/http/RequestEntity$BodyBuilder;
- (Lorg/springframework/http/HttpMethod;Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/http/RequestEntity$BodyBuilder;
+ (Lorg/springframework/http/HttpMethod;Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/http/RequestEntity$BodyBuilder;
 method
  (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)Lorg/springframework/http/RequestEntity$BodyBuilder;
- (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)Lorg/springframework/http/RequestEntity$BodyBuilder;
+ (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)L1org/springframework/http/RequestEntity$BodyBuilder;
 options
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/http/RequestEntity$HeadersBuilder<*>;
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/http/RequestEntity$HeadersBuilder<*>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/ResponseEntity.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/ResponseEntity.eea
index 500339b34f..c287d5e675 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/ResponseEntity.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/ResponseEntity.eea
@@ -14,7 +14,7 @@ badRequest
  ()Lorg/springframework/http/ResponseEntity$BodyBuilder;
 created
  (Ljava/net/URI;)Lorg/springframework/http/ResponseEntity$BodyBuilder;
- (Ljava/net/URI;)Lorg/springframework/http/ResponseEntity$BodyBuilder;
+ (Ljava/net/URI;)L1org/springframework/http/ResponseEntity$BodyBuilder;
 internalServerError
  ()Lorg/springframework/http/ResponseEntity$BodyBuilder;
  ()Lorg/springframework/http/ResponseEntity$BodyBuilder;
@@ -35,10 +35,10 @@ ok
  <T:Ljava/lang/Object;>(TT;)Lorg/springframework/http/ResponseEntity<TT;>;
 status
  (I)Lorg/springframework/http/ResponseEntity$BodyBuilder;
- (I)Lorg/springframework/http/ResponseEntity$BodyBuilder;
+ (I)L1org/springframework/http/ResponseEntity$BodyBuilder;
 status
  (Lorg/springframework/http/HttpStatus;)Lorg/springframework/http/ResponseEntity$BodyBuilder;
- (Lorg/springframework/http/HttpStatus;)Lorg/springframework/http/ResponseEntity$BodyBuilder;
+ (Lorg/springframework/http/HttpStatus;)L1org/springframework/http/ResponseEntity$BodyBuilder;
 unprocessableEntity
  ()Lorg/springframework/http/ResponseEntity$BodyBuilder;
  ()Lorg/springframework/http/ResponseEntity$BodyBuilder;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/AbstractClientHttpRequestFactoryWrapper.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/AbstractClientHttpRequestFactoryWrapper.eea
index b648a0c2c5..583f055f71 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/AbstractClientHttpRequestFactoryWrapper.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/AbstractClientHttpRequestFactoryWrapper.eea
@@ -5,7 +5,7 @@ class org/springframework/http/client/AbstractClientHttpRequestFactoryWrapper
  (Lorg/springframework/http/client/ClientHttpRequestFactory;)V
 createRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/ClientHttpRequest; # @Inherited(org.springframework.http.client.ClientHttpRequestFactory)
 createRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;Lorg/springframework/http/client/ClientHttpRequestFactory;)Lorg/springframework/http/client/ClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;Lorg/springframework/http/client/ClientHttpRequestFactory;)Lorg/springframework/http/client/ClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;Lorg/springframework/http/client/ClientHttpRequestFactory;)L1org/springframework/http/client/ClientHttpRequest;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/AsyncClientHttpRequestFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/AsyncClientHttpRequestFactory.eea
index 6d0f05df4a..ad1f5a0ad7 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/AsyncClientHttpRequestFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/AsyncClientHttpRequestFactory.eea
@@ -2,4 +2,4 @@ class org/springframework/http/client/AsyncClientHttpRequestFactory
 
 createAsyncRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/AsyncClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/AsyncClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/AsyncClientHttpRequest;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/BufferingClientHttpRequestFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/BufferingClientHttpRequestFactory.eea
index 8e97cbd90a..cfcedf270f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/BufferingClientHttpRequestFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/BufferingClientHttpRequestFactory.eea
@@ -5,7 +5,7 @@ class org/springframework/http/client/BufferingClientHttpRequestFactory
  (Lorg/springframework/http/client/ClientHttpRequestFactory;)V
 createRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;Lorg/springframework/http/client/ClientHttpRequestFactory;)Lorg/springframework/http/client/ClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;Lorg/springframework/http/client/ClientHttpRequestFactory;)Lorg/springframework/http/client/ClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;Lorg/springframework/http/client/ClientHttpRequestFactory;)L1org/springframework/http/client/ClientHttpRequest; # @Inherited(org.springframework.http.client.AbstractClientHttpRequestFactoryWrapper)
 shouldBuffer
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Z
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/ClientHttpRequestFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/ClientHttpRequestFactory.eea
index 878ea82aee..2ff8f1a5a8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/ClientHttpRequestFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/ClientHttpRequestFactory.eea
@@ -2,4 +2,4 @@ class org/springframework/http/client/ClientHttpRequestFactory
 
 createRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/ClientHttpRequest;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/HttpComponentsAsyncClientHttpRequestFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/HttpComponentsAsyncClientHttpRequestFactory.eea
index 7c65b02fa7..c40b1f8fa3 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/HttpComponentsAsyncClientHttpRequestFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/HttpComponentsAsyncClientHttpRequestFactory.eea
@@ -14,7 +14,7 @@ class org/springframework/http/client/HttpComponentsAsyncClientHttpRequestFactor
  (Lorg/apache/http/nio/client/HttpAsyncClient;)V
 createAsyncRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/AsyncClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/AsyncClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/AsyncClientHttpRequest; # @Inherited(org.springframework.http.client.AsyncClientHttpRequestFactory)
 getAsyncClient
  ()Lorg/apache/http/nio/client/HttpAsyncClient;
  ()Lorg/apache/http/nio/client/HttpAsyncClient;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.eea
index fce7fdec20..ffd29d2381 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.eea
@@ -8,10 +8,10 @@ createHttpContext
  (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)L0org/apache/http/protocol/HttpContext;
 createHttpUriRequest
  (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)Lorg/apache/http/client/methods/HttpUriRequest;
- (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)Lorg/apache/http/client/methods/HttpUriRequest;
+ (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)L1org/apache/http/client/methods/HttpUriRequest;
 createRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/ClientHttpRequest; # @Inherited(org.springframework.http.client.ClientHttpRequestFactory)
 createRequestConfig
  (Ljava/lang/Object;)Lorg/apache/http/client/config/RequestConfig;
  (Ljava/lang/Object;)L0org/apache/http/client/config/RequestConfig;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/InterceptingAsyncClientHttpRequestFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/InterceptingAsyncClientHttpRequestFactory.eea
index c33bbce371..64086dff37 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/InterceptingAsyncClientHttpRequestFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/InterceptingAsyncClientHttpRequestFactory.eea
@@ -5,4 +5,4 @@ class org/springframework/http/client/InterceptingAsyncClientHttpRequestFactory
  (Lorg/springframework/http/client/AsyncClientHttpRequestFactory;Ljava/util/List<Lorg/springframework/http/client/AsyncClientHttpRequestInterceptor;>;)V
 createAsyncRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/AsyncClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/AsyncClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/AsyncClientHttpRequest; # @Inherited(org.springframework.http.client.AsyncClientHttpRequestFactory)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/InterceptingClientHttpRequestFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/InterceptingClientHttpRequestFactory.eea
index 30a4094c9c..b00af6a007 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/InterceptingClientHttpRequestFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/InterceptingClientHttpRequestFactory.eea
@@ -5,4 +5,4 @@ class org/springframework/http/client/InterceptingClientHttpRequestFactory
  (Lorg/springframework/http/client/ClientHttpRequestFactory;Ljava/util/List<Lorg/springframework/http/client/ClientHttpRequestInterceptor;>;)V
 createRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;Lorg/springframework/http/client/ClientHttpRequestFactory;)Lorg/springframework/http/client/ClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;Lorg/springframework/http/client/ClientHttpRequestFactory;)Lorg/springframework/http/client/ClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;Lorg/springframework/http/client/ClientHttpRequestFactory;)L1org/springframework/http/client/ClientHttpRequest; # @Inherited(org.springframework.http.client.AbstractClientHttpRequestFactoryWrapper)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/MultipartBodyBuilder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/MultipartBodyBuilder.eea
index da294dae27..0407ca9971 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/MultipartBodyBuilder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/MultipartBodyBuilder.eea
@@ -2,10 +2,10 @@ class org/springframework/http/client/MultipartBodyBuilder
 
 asyncPart
  <T:Ljava/lang/Object;P::Lorg/reactivestreams/Publisher<TT;>;>(Ljava/lang/String;TP;Ljava/lang/Class<TT;>;)Lorg/springframework/http/client/MultipartBodyBuilder$PartBuilder;
- <T:Ljava/lang/Object;P::Lorg/reactivestreams/Publisher<TT;>;>(Ljava/lang/String;TP;Ljava/lang/Class<TT;>;)Lorg/springframework/http/client/MultipartBodyBuilder$PartBuilder;
+ <T:Ljava/lang/Object;P::Lorg/reactivestreams/Publisher<TT;>;>(Ljava/lang/String;TP;Ljava/lang/Class<TT;>;)L1org/springframework/http/client/MultipartBodyBuilder$PartBuilder;
 asyncPart
  <T:Ljava/lang/Object;P::Lorg/reactivestreams/Publisher<TT;>;>(Ljava/lang/String;TP;Lorg/springframework/core/ParameterizedTypeReference<TT;>;)Lorg/springframework/http/client/MultipartBodyBuilder$PartBuilder;
- <T:Ljava/lang/Object;P::Lorg/reactivestreams/Publisher<TT;>;>(Ljava/lang/String;TP;Lorg/springframework/core/ParameterizedTypeReference<TT;>;)Lorg/springframework/http/client/MultipartBodyBuilder$PartBuilder;
+ <T:Ljava/lang/Object;P::Lorg/reactivestreams/Publisher<TT;>;>(Ljava/lang/String;TP;Lorg/springframework/core/ParameterizedTypeReference<TT;>;)L1org/springframework/http/client/MultipartBodyBuilder$PartBuilder;
 build
  ()Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Lorg/springframework/http/HttpEntity<*>;>;
  ()L1org/springframework/util/MultiValueMap<Ljava/lang/String;Lorg/springframework/http/HttpEntity<*>;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/Netty4ClientHttpRequestFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/Netty4ClientHttpRequestFactory.eea
index 110a2fc65a..7f213f026a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/Netty4ClientHttpRequestFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/Netty4ClientHttpRequestFactory.eea
@@ -8,10 +8,10 @@ configureChannel
  (Lio/netty/channel/socket/SocketChannelConfig;)V
 createAsyncRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/AsyncClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/AsyncClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/AsyncClientHttpRequest; # @Inherited(org.springframework.http.client.AsyncClientHttpRequestFactory)
 createRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/ClientHttpRequest; # @Inherited(org.springframework.http.client.ClientHttpRequestFactory)
 setSslContext
  (Lio/netty/handler/ssl/SslContext;)V
  (Lio/netty/handler/ssl/SslContext;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/OkHttp3ClientHttpRequestFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/OkHttp3ClientHttpRequestFactory.eea
index b2cb5eb234..9cea19a698 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/OkHttp3ClientHttpRequestFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/OkHttp3ClientHttpRequestFactory.eea
@@ -5,7 +5,7 @@ class org/springframework/http/client/OkHttp3ClientHttpRequestFactory
  (Lokhttp3/OkHttpClient;)V
 createAsyncRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/AsyncClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/AsyncClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/AsyncClientHttpRequest; # @Inherited(org.springframework.http.client.AsyncClientHttpRequestFactory)
 createRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/ClientHttpRequest; # @Inherited(org.springframework.http.client.ClientHttpRequestFactory)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/SimpleClientHttpRequestFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/SimpleClientHttpRequestFactory.eea
index 5c2437ed82..310c3f8710 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/SimpleClientHttpRequestFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/SimpleClientHttpRequestFactory.eea
@@ -2,10 +2,10 @@ class org/springframework/http/client/SimpleClientHttpRequestFactory
 
 createAsyncRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/AsyncClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/AsyncClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/AsyncClientHttpRequest; # @Inherited(org.springframework.http.client.AsyncClientHttpRequestFactory)
 createRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/ClientHttpRequest; # @Inherited(org.springframework.http.client.ClientHttpRequestFactory)
 openConnection
  (Ljava/net/URL;Ljava/net/Proxy;)Ljava/net/HttpURLConnection;
  (Ljava/net/URL;Ljava/net/Proxy;)Ljava/net/HttpURLConnection;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/support/AsyncHttpAccessor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/support/AsyncHttpAccessor.eea
index f8db9fd55c..b9d9e3bda9 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/support/AsyncHttpAccessor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/support/AsyncHttpAccessor.eea
@@ -6,7 +6,7 @@ logger
 
 createAsyncRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/AsyncClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/AsyncClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/AsyncClientHttpRequest;
 getAsyncRequestFactory
  ()Lorg/springframework/http/client/AsyncClientHttpRequestFactory;
  ()Lorg/springframework/http/client/AsyncClientHttpRequestFactory;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/support/HttpAccessor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/support/HttpAccessor.eea
index 183e573ba0..8102de3f39 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/client/support/HttpAccessor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/client/support/HttpAccessor.eea
@@ -6,7 +6,7 @@ logger
 
 createRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/ClientHttpRequest;
 getClientHttpRequestInitializers
  ()Ljava/util/List<Lorg/springframework/http/client/ClientHttpRequestInitializer;>;
  ()Ljava/util/List<Lorg/springframework/http/client/ClientHttpRequestInitializer;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/ClientCodecConfigurer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/ClientCodecConfigurer.eea
index dd86729eae..974eb2bc21 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/ClientCodecConfigurer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/ClientCodecConfigurer.eea
@@ -2,7 +2,7 @@ class org/springframework/http/codec/ClientCodecConfigurer
 
 create
  ()Lorg/springframework/http/codec/ClientCodecConfigurer;
- ()Lorg/springframework/http/codec/ClientCodecConfigurer;
+ ()L1org/springframework/http/codec/ClientCodecConfigurer;
 
 clone
  ()Lorg/springframework/http/codec/ClientCodecConfigurer;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/FormHttpMessageWriter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/FormHttpMessageWriter.eea
index b08bf44cb0..38e5c3c9c7 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/FormHttpMessageWriter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/FormHttpMessageWriter.eea
@@ -22,7 +22,7 @@ getWritableMediaTypes
  ()Ljava/util/List<Lorg/springframework/http/MediaType;>;
 serializeForm
  (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;Ljava/nio/charset/Charset;)Ljava/lang/String;
- (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;Ljava/nio/charset/Charset;)Ljava/lang/String;
+ (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;Ljava/nio/charset/Charset;)L1java/lang/String;
 setDefaultCharset
  (Ljava/nio/charset/Charset;)V
  (Ljava/nio/charset/Charset;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/ServerCodecConfigurer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/ServerCodecConfigurer.eea
index 00e419e463..50902dd8ec 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/ServerCodecConfigurer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/ServerCodecConfigurer.eea
@@ -2,7 +2,7 @@ class org/springframework/http/codec/ServerCodecConfigurer
 
 create
  ()Lorg/springframework/http/codec/ServerCodecConfigurer;
- ()Lorg/springframework/http/codec/ServerCodecConfigurer;
+ ()L1org/springframework/http/codec/ServerCodecConfigurer;
 
 clone
  ()Lorg/springframework/http/codec/ServerCodecConfigurer;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/ServerSentEvent.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/ServerSentEvent.eea
index 06b8e4a991..3a861e7456 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/ServerSentEvent.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/ServerSentEvent.eea
@@ -4,10 +4,10 @@ class org/springframework/http/codec/ServerSentEvent
 
 builder
  <T:Ljava/lang/Object;>()Lorg/springframework/http/codec/ServerSentEvent$Builder<TT;>;
- <T:Ljava/lang/Object;>()Lorg/springframework/http/codec/ServerSentEvent$Builder<TT;>;
+ <T:Ljava/lang/Object;>()L1org/springframework/http/codec/ServerSentEvent$Builder<TT;>;
 builder
  <T:Ljava/lang/Object;>(TT;)Lorg/springframework/http/codec/ServerSentEvent$Builder<TT;>;
- <T:Ljava/lang/Object;>(TT;)Lorg/springframework/http/codec/ServerSentEvent$Builder<TT;>;
+ <T:Ljava/lang/Object;>(TT;)L1org/springframework/http/codec/ServerSentEvent$Builder<TT;>;
 
 comment
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/cbor/Jackson2CborDecoder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/cbor/Jackson2CborDecoder.eea
index 10d118a1e6..1256d7050e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/cbor/Jackson2CborDecoder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/cbor/Jackson2CborDecoder.eea
@@ -5,4 +5,4 @@ class org/springframework/http/codec/cbor/Jackson2CborDecoder
  (Lcom/fasterxml/jackson/databind/ObjectMapper;[Lorg/springframework/util/MimeType;)V
 decode
  (Lorg/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lreactor/core/publisher/Flux<Ljava/lang/Object;>;
- (Lorg/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lreactor/core/publisher/Flux<Ljava/lang/Object;>;
+ (Lorg/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1reactor/core/publisher/Flux<Ljava/lang/Object;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/cbor/Jackson2CborEncoder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/cbor/Jackson2CborEncoder.eea
index 3ba96cb3c8..0bcc3027eb 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/cbor/Jackson2CborEncoder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/cbor/Jackson2CborEncoder.eea
@@ -5,4 +5,4 @@ class org/springframework/http/codec/cbor/Jackson2CborEncoder
  (Lcom/fasterxml/jackson/databind/ObjectMapper;[Lorg/springframework/util/MimeType;)V
 encode
  (Lorg/reactivestreams/Publisher<*>;Lorg/springframework/core/io/buffer/DataBufferFactory;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lreactor/core/publisher/Flux<Lorg/springframework/core/io/buffer/DataBuffer;>;
- (Lorg/reactivestreams/Publisher<*>;Lorg/springframework/core/io/buffer/DataBufferFactory;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lreactor/core/publisher/Flux<Lorg/springframework/core/io/buffer/DataBuffer;>;
+ (Lorg/reactivestreams/Publisher<*>;Lorg/springframework/core/io/buffer/DataBufferFactory;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1reactor/core/publisher/Flux<Lorg/springframework/core/io/buffer/DataBuffer;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/json/Jackson2CodecSupport.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/json/Jackson2CodecSupport.eea
index 97d157abcb..c6a9918dbd 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/json/Jackson2CodecSupport.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/json/Jackson2CodecSupport.eea
@@ -25,7 +25,7 @@ getMimeTypes
  ()Ljava/util/List<Lorg/springframework/util/MimeType;>;
 getMimeTypes
  (Lorg/springframework/core/ResolvableType;)Ljava/util/List<Lorg/springframework/util/MimeType;>;
- (Lorg/springframework/core/ResolvableType;)Ljava/util/List<Lorg/springframework/util/MimeType;>;
+ (Lorg/springframework/core/ResolvableType;)L1java/util/List<Lorg/springframework/util/MimeType;>;
 getObjectMapper
  ()Lcom/fasterxml/jackson/databind/ObjectMapper;
  ()Lcom/fasterxml/jackson/databind/ObjectMapper;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/multipart/MultipartParser$BodyToken.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/multipart/MultipartParser$BodyToken.eea
index 52fc41bc69..c9842f4d80 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/multipart/MultipartParser$BodyToken.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/multipart/MultipartParser$BodyToken.eea
@@ -8,4 +8,4 @@ buffer
  ()Lorg/springframework/core/io/buffer/DataBuffer;
 headers
  ()Lorg/springframework/http/HttpHeaders;
- ()Lorg/springframework/http/HttpHeaders;
+ ()L1org/springframework/http/HttpHeaders;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/multipart/MultipartParser$HeadersToken.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/multipart/MultipartParser$HeadersToken.eea
index 3b0dbf0d94..2f5a97378c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/multipart/MultipartParser$HeadersToken.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/multipart/MultipartParser$HeadersToken.eea
@@ -5,7 +5,7 @@ class org/springframework/http/codec/multipart/MultipartParser$HeadersToken
  (Lorg/springframework/http/HttpHeaders;)V
 buffer
  ()Lorg/springframework/core/io/buffer/DataBuffer;
- ()Lorg/springframework/core/io/buffer/DataBuffer;
+ ()L1org/springframework/core/io/buffer/DataBuffer;
 headers
  ()Lorg/springframework/http/HttpHeaders;
  ()Lorg/springframework/http/HttpHeaders;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/multipart/MultipartWriterSupport.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/multipart/MultipartWriterSupport.eea
index 0fac312b3a..ac2884ba44 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/multipart/MultipartWriterSupport.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/multipart/MultipartWriterSupport.eea
@@ -30,7 +30,7 @@ getCharset
  ()Ljava/nio/charset/Charset;
 getMultipartMediaType
  (Lorg/springframework/http/MediaType;[B)Lorg/springframework/http/MediaType;
- (Lorg/springframework/http/MediaType;[B)Lorg/springframework/http/MediaType;
+ (Lorg/springframework/http/MediaType;[B)L1org/springframework/http/MediaType;
 getWritableMediaTypes
  ()Ljava/util/List<Lorg/springframework/http/MediaType;>;
  ()Ljava/util/List<Lorg/springframework/http/MediaType;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/support/DefaultClientCodecConfigurer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/support/DefaultClientCodecConfigurer.eea
index c58bc9b50b..77b1d4253e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/support/DefaultClientCodecConfigurer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/support/DefaultClientCodecConfigurer.eea
@@ -2,10 +2,10 @@ class org/springframework/http/codec/support/DefaultClientCodecConfigurer
 
 clone
  ()Lorg/springframework/http/codec/support/DefaultClientCodecConfigurer;
- ()Lorg/springframework/http/codec/support/DefaultClientCodecConfigurer;
+ ()L1org/springframework/http/codec/support/DefaultClientCodecConfigurer;
 cloneDefaultCodecs
  ()Lorg/springframework/http/codec/support/BaseDefaultCodecs;
- ()Lorg/springframework/http/codec/support/BaseDefaultCodecs;
+ ()L1org/springframework/http/codec/support/BaseDefaultCodecs;
 defaultCodecs
  ()Lorg/springframework/http/codec/ClientCodecConfigurer$ClientDefaultCodecs;
  ()Lorg/springframework/http/codec/ClientCodecConfigurer$ClientDefaultCodecs;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/support/DefaultServerCodecConfigurer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/support/DefaultServerCodecConfigurer.eea
index cfa20b34cc..38be02e28c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/support/DefaultServerCodecConfigurer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/codec/support/DefaultServerCodecConfigurer.eea
@@ -2,10 +2,10 @@ class org/springframework/http/codec/support/DefaultServerCodecConfigurer
 
 clone
  ()Lorg/springframework/http/codec/support/DefaultServerCodecConfigurer;
- ()Lorg/springframework/http/codec/support/DefaultServerCodecConfigurer;
+ ()L1org/springframework/http/codec/support/DefaultServerCodecConfigurer;
 cloneDefaultCodecs
  ()Lorg/springframework/http/codec/support/BaseDefaultCodecs;
- ()Lorg/springframework/http/codec/support/BaseDefaultCodecs;
+ ()L1org/springframework/http/codec/support/BaseDefaultCodecs;
 defaultCodecs
  ()Lorg/springframework/http/codec/ServerCodecConfigurer$ServerDefaultCodecs;
  ()Lorg/springframework/http/codec/ServerCodecConfigurer$ServerDefaultCodecs;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/FormHttpMessageConverter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/FormHttpMessageConverter.eea
index 7972890623..feca374526 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/FormHttpMessageConverter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/FormHttpMessageConverter.eea
@@ -31,7 +31,7 @@ getFormContentType
  (Lorg/springframework/http/MediaType;)Lorg/springframework/http/MediaType;
 getHttpEntity
  (Ljava/lang/Object;)Lorg/springframework/http/HttpEntity<*>;
- (Ljava/lang/Object;)Lorg/springframework/http/HttpEntity<*>;
+ (Ljava/lang/Object;)L1org/springframework/http/HttpEntity<*>;
 getPartConverters
  ()Ljava/util/List<Lorg/springframework/http/converter/HttpMessageConverter<*>;>;
  ()Ljava/util/List<Lorg/springframework/http/converter/HttpMessageConverter<*>;>;
@@ -43,7 +43,7 @@ read
  (Ljava/lang/Class<+Lorg/springframework/util/MultiValueMap<Ljava/lang/String;*>;>;Lorg/springframework/http/HttpInputMessage;)Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
 serializeForm
  (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/Object;>;Ljava/nio/charset/Charset;)Ljava/lang/String;
- (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/Object;>;Ljava/nio/charset/Charset;)Ljava/lang/String;
+ (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/Object;>;Ljava/nio/charset/Charset;)L1java/lang/String;
 setCharset
  (Ljava/nio/charset/Charset;)V
  (Ljava/nio/charset/Charset;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/ResourceHttpMessageConverter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/ResourceHttpMessageConverter.eea
index ea7352656d..0c1673f4fb 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/ResourceHttpMessageConverter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/ResourceHttpMessageConverter.eea
@@ -12,7 +12,7 @@ getDefaultContentType
  (Lorg/springframework/core/io/Resource;)Lorg/springframework/http/MediaType;
 readInternal
  (Ljava/lang/Class<+Lorg/springframework/core/io/Resource;>;Lorg/springframework/http/HttpInputMessage;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/Class<+Lorg/springframework/core/io/Resource;>;Lorg/springframework/http/HttpInputMessage;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/Class<+Lorg/springframework/core/io/Resource;>;Lorg/springframework/http/HttpInputMessage;)L1org/springframework/core/io/Resource;
 supports
  (Ljava/lang/Class<*>;)Z
  (Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/ResourceRegionHttpMessageConverter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/ResourceRegionHttpMessageConverter.eea
index e39fa5a3f2..e6f205a34c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/ResourceRegionHttpMessageConverter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/ResourceRegionHttpMessageConverter.eea
@@ -21,10 +21,10 @@ getDefaultContentType
  (Ljava/lang/Object;)Lorg/springframework/http/MediaType;
 read
  (Ljava/lang/reflect/Type;Ljava/lang/Class<*>;Lorg/springframework/http/HttpInputMessage;)Ljava/lang/Object;
- (Ljava/lang/reflect/Type;Ljava/lang/Class<*>;Lorg/springframework/http/HttpInputMessage;)Ljava/lang/Object;
+ (Ljava/lang/reflect/Type;Ljava/lang/Class<*>;Lorg/springframework/http/HttpInputMessage;)L1java/lang/Object;
 readInternal
  (Ljava/lang/Class<*>;Lorg/springframework/http/HttpInputMessage;)Lorg/springframework/core/io/support/ResourceRegion;
- (Ljava/lang/Class<*>;Lorg/springframework/http/HttpInputMessage;)Lorg/springframework/core/io/support/ResourceRegion;
+ (Ljava/lang/Class<*>;Lorg/springframework/http/HttpInputMessage;)L1org/springframework/core/io/support/ResourceRegion;
 writeInternal
  (Ljava/lang/Object;Ljava/lang/reflect/Type;Lorg/springframework/http/HttpOutputMessage;)V
  (Ljava/lang/Object;Ljava/lang/reflect/Type;Lorg/springframework/http/HttpOutputMessage;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/StringHttpMessageConverter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/StringHttpMessageConverter.eea
index 96985b4a6c..3e91584be6 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/StringHttpMessageConverter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/StringHttpMessageConverter.eea
@@ -16,7 +16,7 @@ addDefaultHeaders
  (Lorg/springframework/http/HttpHeaders;Ljava/lang/String;Lorg/springframework/http/MediaType;)V
 getAcceptedCharsets
  ()Ljava/util/List<Ljava/nio/charset/Charset;>;
- ()Ljava/util/List<Ljava/nio/charset/Charset;>;
+ ()L1java/util/List<Ljava/nio/charset/Charset;>;
 getContentLength
  (Ljava/lang/String;Lorg/springframework/http/MediaType;)Ljava/lang/Long;
  (Ljava/lang/String;Lorg/springframework/http/MediaType;)Ljava/lang/Long;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.eea
index a28322044f..b22a7aa061 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.eea
@@ -53,7 +53,7 @@ getObjectMappersForType
  (Ljava/lang/Class<*>;)L0java/util/Map<Lorg/springframework/http/MediaType;Lcom/fasterxml/jackson/databind/ObjectMapper;>;
 getSupportedMediaTypes
  (Ljava/lang/Class<*>;)Ljava/util/List<Lorg/springframework/http/MediaType;>;
- (Ljava/lang/Class<*>;)Ljava/util/List<Lorg/springframework/http/MediaType;>;
+ (Ljava/lang/Class<*>;)L1java/util/List<Lorg/springframework/http/MediaType;>;
 logWarningIfNecessary
  (Ljava/lang/reflect/Type;Ljava/lang/Throwable;)V
  (Ljava/lang/reflect/Type;Ljava/lang/Throwable;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/json/GsonBuilderUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/json/GsonBuilderUtils.eea
index c6d808b7a7..ce4f9f308e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/json/GsonBuilderUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/json/GsonBuilderUtils.eea
@@ -2,4 +2,4 @@ class org/springframework/http/converter/json/GsonBuilderUtils
 
 gsonBuilderWithBase64EncodedByteArrays
  ()Lcom/google/gson/GsonBuilder;
- ()Lcom/google/gson/GsonBuilder;
+ ()L1com/google/gson/GsonBuilder;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.eea
index 8b71b771b6..3eec61cdad 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.eea
@@ -5,7 +5,7 @@ cbor
  ()Lorg/springframework/http/converter/json/Jackson2ObjectMapperBuilder;
 json
  ()Lorg/springframework/http/converter/json/Jackson2ObjectMapperBuilder;
- ()Lorg/springframework/http/converter/json/Jackson2ObjectMapperBuilder;
+ ()L1org/springframework/http/converter/json/Jackson2ObjectMapperBuilder;
 smile
  ()Lorg/springframework/http/converter/json/Jackson2ObjectMapperBuilder;
  ()Lorg/springframework/http/converter/json/Jackson2ObjectMapperBuilder;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/xml/AbstractJaxb2HttpMessageConverter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/xml/AbstractJaxb2HttpMessageConverter.eea
index a9e0a06371..72595b3008 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/xml/AbstractJaxb2HttpMessageConverter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/xml/AbstractJaxb2HttpMessageConverter.eea
@@ -8,10 +8,10 @@ super org/springframework/http/converter/xml/AbstractXmlHttpMessageConverter
 
 createMarshaller
  (Ljava/lang/Class<*>;)Ljavax/xml/bind/Marshaller;
- (Ljava/lang/Class<*>;)Ljavax/xml/bind/Marshaller;
+ (Ljava/lang/Class<*>;)L1javax/xml/bind/Marshaller;
 createUnmarshaller
  (Ljava/lang/Class<*>;)Ljavax/xml/bind/Unmarshaller;
- (Ljava/lang/Class<*>;)Ljavax/xml/bind/Unmarshaller;
+ (Ljava/lang/Class<*>;)L1javax/xml/bind/Unmarshaller;
 customizeMarshaller
  (Ljavax/xml/bind/Marshaller;)V
  (Ljavax/xml/bind/Marshaller;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.eea
index 9c1f0abc0a..9b36a76a3b 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.eea
@@ -23,16 +23,16 @@ canWrite
  (Ljava/lang/reflect/Type;Ljava/lang/Class<*>;Lorg/springframework/http/MediaType;)Z
 createCollection
  (Ljava/lang/Class<*>;)TT;
- (Ljava/lang/Class<*>;)TT;
+ (Ljava/lang/Class<*>;)T1T;
 createXmlInputFactory
  ()Ljavax/xml/stream/XMLInputFactory;
- ()Ljavax/xml/stream/XMLInputFactory;
+ ()L1javax/xml/stream/XMLInputFactory;
 read
  (Ljava/lang/reflect/Type;Ljava/lang/Class<*>;Lorg/springframework/http/HttpInputMessage;)TT;
  (Ljava/lang/reflect/Type;Ljava/lang/Class<*>;Lorg/springframework/http/HttpInputMessage;)TT;
 readFromSource
  (Ljava/lang/Class<+TT;>;Lorg/springframework/http/HttpHeaders;Ljavax/xml/transform/Source;)TT;
- (Ljava/lang/Class<+TT;>;Lorg/springframework/http/HttpHeaders;Ljavax/xml/transform/Source;)TT;
+ (Ljava/lang/Class<+TT;>;Lorg/springframework/http/HttpHeaders;Ljavax/xml/transform/Source;)T1T;
 supports
  (Ljava/lang/Class<*>;)Z
  (Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/server/PathContainer$Options.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/server/PathContainer$Options.eea
index 9969eaded8..3af94f8e2f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/server/PathContainer$Options.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/server/PathContainer$Options.eea
@@ -9,4 +9,4 @@ MESSAGE_ROUTE
 
 create
  (CZ)Lorg/springframework/http/server/PathContainer$Options;
- (CZ)Lorg/springframework/http/server/PathContainer$Options;
+ (CZ)L1org/springframework/http/server/PathContainer$Options;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/server/RequestPath.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/server/RequestPath.eea
index b20d3c593c..96adaa3dcd 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/server/RequestPath.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/server/RequestPath.eea
@@ -2,7 +2,7 @@ class org/springframework/http/server/RequestPath
 
 parse
  (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/http/server/RequestPath;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/http/server/RequestPath;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/springframework/http/server/RequestPath;
 parse
  (Ljava/net/URI;Ljava/lang/String;)Lorg/springframework/http/server/RequestPath;
  (Ljava/net/URI;Ljava/lang/String;)Lorg/springframework/http/server/RequestPath;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/AbstractListenerServerHttpResponse.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/AbstractListenerServerHttpResponse.eea
index c70c43dd71..0bf26899ed 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/AbstractListenerServerHttpResponse.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/AbstractListenerServerHttpResponse.eea
@@ -8,7 +8,7 @@ class org/springframework/http/server/reactive/AbstractListenerServerHttpRespons
  (Lorg/springframework/core/io/buffer/DataBufferFactory;Lorg/springframework/http/HttpHeaders;)V
 createBodyFlushProcessor
  ()Lorg/reactivestreams/Processor<-Lorg/reactivestreams/Publisher<+Lorg/springframework/core/io/buffer/DataBuffer;>;Ljava/lang/Void;>;
- ()Lorg/reactivestreams/Processor<-Lorg/reactivestreams/Publisher<+Lorg/springframework/core/io/buffer/DataBuffer;>;Ljava/lang/Void;>;
+ ()L1org/reactivestreams/Processor<-Lorg/reactivestreams/Publisher<+Lorg/springframework/core/io/buffer/DataBuffer;>;Ljava/lang/Void;>;
 writeAndFlushWithInternal
  (Lorg/reactivestreams/Publisher<+Lorg/reactivestreams/Publisher<+Lorg/springframework/core/io/buffer/DataBuffer;>;>;)Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
  (Lorg/reactivestreams/Publisher<+Lorg/reactivestreams/Publisher<+Lorg/springframework/core/io/buffer/DataBuffer;>;>;)Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/AbstractListenerWriteFlushProcessor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/AbstractListenerWriteFlushProcessor.eea
index 45140af86f..a45f420c0f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/AbstractListenerWriteFlushProcessor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/AbstractListenerWriteFlushProcessor.eea
@@ -15,7 +15,7 @@ rsWriteFlushLogger
  (Ljava/lang/String;)V
 createWriteProcessor
  ()Lorg/reactivestreams/Processor<-TT;Ljava/lang/Void;>;
- ()Lorg/reactivestreams/Processor<-TT;Ljava/lang/Void;>;
+ ()L1org/reactivestreams/Processor<-TT;Ljava/lang/Void;>;
 flushingFailed
  (Ljava/lang/Throwable;)V
  (Ljava/lang/Throwable;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/AbstractServerHttpRequest.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/AbstractServerHttpRequest.eea
index eb7d7a77b4..300f2310ec 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/AbstractServerHttpRequest.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/AbstractServerHttpRequest.eea
@@ -41,7 +41,7 @@ initLogPrefix
  ()Ljava/lang/String;
 initQueryParams
  ()Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
- ()Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
+ ()L1org/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
 initSslInfo
  ()Lorg/springframework/http/server/reactive/SslInfo;
  ()L0org/springframework/http/server/reactive/SslInfo;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.eea
index eecefe8bcc..5bb461f8e1 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.eea
@@ -5,7 +5,7 @@ class org/springframework/http/server/reactive/JettyHttpHandlerAdapter
  (Lorg/springframework/http/server/reactive/HttpHandler;)V
 createRequest
  (Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/AsyncContext;)Lorg/springframework/http/server/reactive/ServletServerHttpRequest;
- (Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/AsyncContext;)Lorg/springframework/http/server/reactive/ServletServerHttpRequest;
+ (Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/AsyncContext;)L1org/springframework/http/server/reactive/ServletServerHttpRequest; # @Inherited(org.springframework.http.server.reactive.ServletHttpHandlerAdapter)
 createResponse
  (Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/AsyncContext;Lorg/springframework/http/server/reactive/ServletServerHttpRequest;)Lorg/springframework/http/server/reactive/ServletServerHttpResponse;
- (Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/AsyncContext;Lorg/springframework/http/server/reactive/ServletServerHttpRequest;)Lorg/springframework/http/server/reactive/ServletServerHttpResponse;
+ (Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/AsyncContext;Lorg/springframework/http/server/reactive/ServletServerHttpRequest;)L1org/springframework/http/server/reactive/ServletServerHttpResponse; # @Inherited(org.springframework.http.server.reactive.ServletHttpHandlerAdapter)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/ServerHttpRequest.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/ServerHttpRequest.eea
index 40e1afbb2a..2cc5f733c6 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/ServerHttpRequest.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/ServerHttpRequest.eea
@@ -23,4 +23,4 @@ getSslInfo
  ()L0org/springframework/http/server/reactive/SslInfo;
 mutate
  ()Lorg/springframework/http/server/reactive/ServerHttpRequest$Builder;
- ()Lorg/springframework/http/server/reactive/ServerHttpRequest$Builder;
+ ()L1org/springframework/http/server/reactive/ServerHttpRequest$Builder;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.eea
index fcdd4b2fdc..f78aae503e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.eea
@@ -5,10 +5,10 @@ class org/springframework/http/server/reactive/ServletHttpHandlerAdapter
  (Lorg/springframework/http/server/reactive/HttpHandler;)V
 createRequest
  (Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/AsyncContext;)Lorg/springframework/http/server/reactive/ServletServerHttpRequest;
- (Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/AsyncContext;)Lorg/springframework/http/server/reactive/ServletServerHttpRequest;
+ (Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/AsyncContext;)L1org/springframework/http/server/reactive/ServletServerHttpRequest;
 createResponse
  (Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/AsyncContext;Lorg/springframework/http/server/reactive/ServletServerHttpRequest;)Lorg/springframework/http/server/reactive/ServletServerHttpResponse;
- (Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/AsyncContext;Lorg/springframework/http/server/reactive/ServletServerHttpRequest;)Lorg/springframework/http/server/reactive/ServletServerHttpResponse;
+ (Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/AsyncContext;Lorg/springframework/http/server/reactive/ServletServerHttpRequest;)L1org/springframework/http/server/reactive/ServletServerHttpResponse;
 getDataBufferFactory
  ()Lorg/springframework/core/io/buffer/DataBufferFactory;
  ()Lorg/springframework/core/io/buffer/DataBufferFactory;
@@ -17,7 +17,7 @@ getServletConfig
  ()L0javax/servlet/ServletConfig;
 getServletInfo
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getServletPath
  ()Ljava/lang/String;
  ()L0java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.eea
index ec2cbbe24b..3579e95377 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.eea
@@ -5,7 +5,7 @@ class org/springframework/http/server/reactive/TomcatHttpHandlerAdapter
  (Lorg/springframework/http/server/reactive/HttpHandler;)V
 createRequest
  (Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/AsyncContext;)Lorg/springframework/http/server/reactive/ServletServerHttpRequest;
- (Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/AsyncContext;)Lorg/springframework/http/server/reactive/ServletServerHttpRequest;
+ (Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/AsyncContext;)L1org/springframework/http/server/reactive/ServletServerHttpRequest; # @Inherited(org.springframework.http.server.reactive.ServletHttpHandlerAdapter)
 createResponse
  (Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/AsyncContext;Lorg/springframework/http/server/reactive/ServletServerHttpRequest;)Lorg/springframework/http/server/reactive/ServletServerHttpResponse;
- (Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/AsyncContext;Lorg/springframework/http/server/reactive/ServletServerHttpRequest;)Lorg/springframework/http/server/reactive/ServletServerHttpResponse;
+ (Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/AsyncContext;Lorg/springframework/http/server/reactive/ServletServerHttpRequest;)L1org/springframework/http/server/reactive/ServletServerHttpResponse; # @Inherited(org.springframework.http.server.reactive.ServletHttpHandlerAdapter)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.eea
index 5ac9eee274..18a1af650a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.eea
@@ -11,4 +11,4 @@ getInstrumentableClassLoader
  ()Ljava/lang/ClassLoader;
 getThrowawayClassLoader
  ()Ljava/lang/ClassLoader;
- ()Ljava/lang/ClassLoader;
+ ()L1java/lang/ClassLoader;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.eea
index 52eadee2d2..2393ad7d7c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.eea
@@ -11,4 +11,4 @@ getInstrumentableClassLoader
  ()Ljava/lang/ClassLoader;
 getThrowawayClassLoader
  ()Ljava/lang/ClassLoader;
- ()Ljava/lang/ClassLoader;
+ ()L1java/lang/ClassLoader;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.eea
index f3e8d98fbf..87e21bf97b 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.eea
@@ -11,4 +11,4 @@ getInstrumentableClassLoader
  ()Ljava/lang/ClassLoader;
 getThrowawayClassLoader
  ()Ljava/lang/ClassLoader;
- ()Ljava/lang/ClassLoader;
+ ()L1java/lang/ClassLoader;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.eea
index dfdd01b714..a9f716860d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.eea
@@ -11,4 +11,4 @@ getInstrumentableClassLoader
  ()Ljava/lang/ClassLoader;
 getThrowawayClassLoader
  ()Ljava/lang/ClassLoader;
- ()Ljava/lang/ClassLoader;
+ ()L1java/lang/ClassLoader;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/connection/CciLocalTransactionManager.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/connection/CciLocalTransactionManager.eea
index 88b51e0c61..6227d87063 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/connection/CciLocalTransactionManager.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/connection/CciLocalTransactionManager.eea
@@ -14,7 +14,7 @@ doCommit
  (Lorg/springframework/transaction/support/DefaultTransactionStatus;)V
 doGetTransaction
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 doResume
  (Ljava/lang/Object;Ljava/lang/Object;)V
  (Ljava/lang/Object;Ljava/lang/Object;)V
@@ -26,7 +26,7 @@ doSetRollbackOnly
  (Lorg/springframework/transaction/support/DefaultTransactionStatus;)V
 doSuspend
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object; # @Inherited(org.springframework.transaction.support.AbstractPlatformTransactionManager)
 getConnectionFactory
  ()Ljavax/resource/cci/ConnectionFactory;
  ()L0javax/resource/cci/ConnectionFactory;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/connection/NotSupportedRecordFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/connection/NotSupportedRecordFactory.eea
index 47c4077bde..ed83c20d2c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/connection/NotSupportedRecordFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/connection/NotSupportedRecordFactory.eea
@@ -2,7 +2,7 @@ class org/springframework/jca/cci/connection/NotSupportedRecordFactory
 
 createIndexedRecord
  (Ljava/lang/String;)Ljavax/resource/cci/IndexedRecord;
- (Ljava/lang/String;)Ljavax/resource/cci/IndexedRecord;
+ (Ljava/lang/String;)L1javax/resource/cci/IndexedRecord;
 createMappedRecord
  (Ljava/lang/String;)Ljavax/resource/cci/MappedRecord;
- (Ljava/lang/String;)Ljavax/resource/cci/MappedRecord;
+ (Ljava/lang/String;)L1javax/resource/cci/MappedRecord;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/connection/SingleConnectionFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/connection/SingleConnectionFactory.eea
index 87b3702353..da53cc31ab 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/connection/SingleConnectionFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/connection/SingleConnectionFactory.eea
@@ -24,7 +24,7 @@ getConnection
  ()Ljavax/resource/cci/Connection;
 getConnection
  (Ljavax/resource/cci/ConnectionSpec;)Ljavax/resource/cci/Connection;
- (Ljavax/resource/cci/ConnectionSpec;)Ljavax/resource/cci/Connection;
+ (Ljavax/resource/cci/ConnectionSpec;)L1javax/resource/cci/Connection;
 prepareConnection
  (Ljavax/resource/cci/Connection;)V
  (Ljavax/resource/cci/Connection;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/core/CciTemplate.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/core/CciTemplate.eea
index 5c7824a543..72d7b2c8b1 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/core/CciTemplate.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/core/CciTemplate.eea
@@ -8,13 +8,13 @@ class org/springframework/jca/cci/core/CciTemplate
  (Ljavax/resource/cci/ConnectionFactory;Ljavax/resource/cci/ConnectionSpec;)V
 createIndexedRecord
  (Ljava/lang/String;)Ljavax/resource/cci/IndexedRecord;
- (Ljava/lang/String;)Ljavax/resource/cci/IndexedRecord;
+ (Ljava/lang/String;)L1javax/resource/cci/IndexedRecord;
 createMappedRecord
  (Ljava/lang/String;)Ljavax/resource/cci/MappedRecord;
- (Ljava/lang/String;)Ljavax/resource/cci/MappedRecord;
+ (Ljava/lang/String;)L1javax/resource/cci/MappedRecord;
 createRecord
  (Lorg/springframework/jca/cci/core/RecordCreator;)Ljavax/resource/cci/Record;
- (Lorg/springframework/jca/cci/core/RecordCreator;)Ljavax/resource/cci/Record;
+ (Lorg/springframework/jca/cci/core/RecordCreator;)L1javax/resource/cci/Record;
 doExecute
  <T:Ljava/lang/Object;>(Ljavax/resource/cci/InteractionSpec;Ljavax/resource/cci/Record;Ljavax/resource/cci/Record;Lorg/springframework/jca/cci/core/RecordExtractor<TT;>;)TT;
  <T:Ljava/lang/Object;>(Ljavax/resource/cci/InteractionSpec;Ljavax/resource/cci/Record;Ljavax/resource/cci/Record;Lorg/springframework/jca/cci/core/RecordExtractor<TT;>;)T0T;
@@ -47,7 +47,7 @@ getConnectionSpec
  ()L0javax/resource/cci/ConnectionSpec;
 getDerivedTemplate
  (Ljavax/resource/cci/ConnectionSpec;)Lorg/springframework/jca/cci/core/CciTemplate;
- (Ljavax/resource/cci/ConnectionSpec;)Lorg/springframework/jca/cci/core/CciTemplate;
+ (Ljavax/resource/cci/ConnectionSpec;)L1org/springframework/jca/cci/core/CciTemplate;
 getOutputRecordCreator
  ()Lorg/springframework/jca/cci/core/RecordCreator;
  ()L0org/springframework/jca/cci/core/RecordCreator;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/core/RecordCreator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/core/RecordCreator.eea
index 4aacb05107..4c95d70abd 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/core/RecordCreator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/core/RecordCreator.eea
@@ -2,4 +2,4 @@ class org/springframework/jca/cci/core/RecordCreator
 
 createRecord
  (Ljavax/resource/cci/RecordFactory;)Ljavax/resource/cci/Record;
- (Ljavax/resource/cci/RecordFactory;)Ljavax/resource/cci/Record;
+ (Ljavax/resource/cci/RecordFactory;)L1javax/resource/cci/Record;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/core/support/CciDaoSupport.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/core/support/CciDaoSupport.eea
index 8cc479c50a..95027be3fa 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/core/support/CciDaoSupport.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/core/support/CciDaoSupport.eea
@@ -2,7 +2,7 @@ class org/springframework/jca/cci/core/support/CciDaoSupport
 
 createCciTemplate
  (Ljavax/resource/cci/ConnectionFactory;)Lorg/springframework/jca/cci/core/CciTemplate;
- (Ljavax/resource/cci/ConnectionFactory;)Lorg/springframework/jca/cci/core/CciTemplate;
+ (Ljavax/resource/cci/ConnectionFactory;)L1org/springframework/jca/cci/core/CciTemplate;
 getCciTemplate
  ()Lorg/springframework/jca/cci/core/CciTemplate;
  ()L0org/springframework/jca/cci/core/CciTemplate;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/object/MappingCommAreaOperation.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/object/MappingCommAreaOperation.eea
index c87ba54ed7..68908e4835 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/object/MappingCommAreaOperation.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/object/MappingCommAreaOperation.eea
@@ -8,7 +8,7 @@ bytesToObject
  ([B)Ljava/lang/Object;
 createInputRecord
  (Ljavax/resource/cci/RecordFactory;Ljava/lang/Object;)Ljavax/resource/cci/Record;
- (Ljavax/resource/cci/RecordFactory;Ljava/lang/Object;)Ljavax/resource/cci/Record;
+ (Ljavax/resource/cci/RecordFactory;Ljava/lang/Object;)L1javax/resource/cci/Record; # @Inherited(org.springframework.jca.cci.object.MappingRecordOperation)
 extractOutputData
  (Ljavax/resource/cci/Record;)Ljava/lang/Object;
  (Ljavax/resource/cci/Record;)Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/object/MappingRecordOperation$RecordCreatorImpl.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/object/MappingRecordOperation$RecordCreatorImpl.eea
index 771ea207b1..0316b70b19 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/object/MappingRecordOperation$RecordCreatorImpl.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/object/MappingRecordOperation$RecordCreatorImpl.eea
@@ -5,4 +5,4 @@ class org/springframework/jca/cci/object/MappingRecordOperation$RecordCreatorImp
  (Lorg/springframework/jca/cci/object/MappingRecordOperation;Ljava/lang/Object;)V
 createRecord
  (Ljavax/resource/cci/RecordFactory;)Ljavax/resource/cci/Record;
- (Ljavax/resource/cci/RecordFactory;)Ljavax/resource/cci/Record;
+ (Ljavax/resource/cci/RecordFactory;)L1javax/resource/cci/Record; # @Inherited(org.springframework.jca.cci.core.RecordCreator)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/object/MappingRecordOperation.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/object/MappingRecordOperation.eea
index 916055915c..6ec66c84de 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/object/MappingRecordOperation.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jca/cci/object/MappingRecordOperation.eea
@@ -5,7 +5,7 @@ class org/springframework/jca/cci/object/MappingRecordOperation
  (Ljavax/resource/cci/ConnectionFactory;Ljavax/resource/cci/InteractionSpec;)V
 createInputRecord
  (Ljavax/resource/cci/RecordFactory;Ljava/lang/Object;)Ljavax/resource/cci/Record;
- (Ljavax/resource/cci/RecordFactory;Ljava/lang/Object;)Ljavax/resource/cci/Record;
+ (Ljavax/resource/cci/RecordFactory;Ljava/lang/Object;)L1javax/resource/cci/Record;
 execute
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)L0java/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jca/context/SpringContextResourceAdapter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jca/context/SpringContextResourceAdapter.eea
index dd4f5782be..48c07a5d98 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jca/context/SpringContextResourceAdapter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jca/context/SpringContextResourceAdapter.eea
@@ -13,10 +13,10 @@ logger
 
 createApplicationContext
  (Ljavax/resource/spi/BootstrapContext;)Lorg/springframework/context/ConfigurableApplicationContext;
- (Ljavax/resource/spi/BootstrapContext;)Lorg/springframework/context/ConfigurableApplicationContext;
+ (Ljavax/resource/spi/BootstrapContext;)L1org/springframework/context/ConfigurableApplicationContext;
 createEnvironment
  ()Lorg/springframework/core/env/ConfigurableEnvironment;
- ()Lorg/springframework/core/env/ConfigurableEnvironment;
+ ()L1org/springframework/core/env/ConfigurableEnvironment;
 endpointActivation
  (Ljavax/resource/spi/endpoint/MessageEndpointFactory;Ljavax/resource/spi/ActivationSpec;)V
  (Ljavax/resource/spi/endpoint/MessageEndpointFactory;Ljavax/resource/spi/ActivationSpec;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.eea
index ddec090564..ba9d0954ad 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.eea
@@ -6,13 +6,13 @@ logger
 
 createEndpoint
  (Ljavax/transaction/xa/XAResource;)Ljavax/resource/spi/endpoint/MessageEndpoint;
- (Ljavax/transaction/xa/XAResource;)Ljavax/resource/spi/endpoint/MessageEndpoint;
+ (Ljavax/transaction/xa/XAResource;)L1javax/resource/spi/endpoint/MessageEndpoint;
 createEndpoint
  (Ljavax/transaction/xa/XAResource;J)Ljavax/resource/spi/endpoint/MessageEndpoint;
- (Ljavax/transaction/xa/XAResource;J)Ljavax/resource/spi/endpoint/MessageEndpoint;
+ (Ljavax/transaction/xa/XAResource;J)L1javax/resource/spi/endpoint/MessageEndpoint;
 createEndpointInternal
  ()Lorg/springframework/jca/endpoint/AbstractMessageEndpointFactory$AbstractMessageEndpoint;
- ()Lorg/springframework/jca/endpoint/AbstractMessageEndpointFactory$AbstractMessageEndpoint;
+ ()L1org/springframework/jca/endpoint/AbstractMessageEndpointFactory$AbstractMessageEndpoint;
 getActivationName
  ()Ljava/lang/String;
  ()L0java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jca/endpoint/GenericMessageEndpointFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jca/endpoint/GenericMessageEndpointFactory.eea
index 835dbacfa9..c0885c6e3d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jca/endpoint/GenericMessageEndpointFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jca/endpoint/GenericMessageEndpointFactory.eea
@@ -2,10 +2,10 @@ class org/springframework/jca/endpoint/GenericMessageEndpointFactory
 
 createEndpoint
  (Ljavax/transaction/xa/XAResource;)Ljavax/resource/spi/endpoint/MessageEndpoint;
- (Ljavax/transaction/xa/XAResource;)Ljavax/resource/spi/endpoint/MessageEndpoint;
+ (Ljavax/transaction/xa/XAResource;)L1javax/resource/spi/endpoint/MessageEndpoint; # @Inherited(org.springframework.jca.endpoint.AbstractMessageEndpointFactory)
 createEndpointInternal
  ()Lorg/springframework/jca/endpoint/AbstractMessageEndpointFactory$AbstractMessageEndpoint;
- ()Lorg/springframework/jca/endpoint/AbstractMessageEndpointFactory$AbstractMessageEndpoint;
+ ()L1org/springframework/jca/endpoint/AbstractMessageEndpointFactory$AbstractMessageEndpoint; # @Inherited(org.springframework.jca.endpoint.AbstractMessageEndpointFactory)
 getMessageListener
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jca/support/ResourceAdapterFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jca/support/ResourceAdapterFactoryBean.eea
index d5b0c9f780..7bbfe86a36 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jca/support/ResourceAdapterFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jca/support/ResourceAdapterFactoryBean.eea
@@ -9,7 +9,7 @@ getObject
  ()L0javax/resource/spi/ResourceAdapter;
 getObjectType
  ()Ljava/lang/Class<+Ljavax/resource/spi/ResourceAdapter;>;
- ()Ljava/lang/Class<+Ljavax/resource/spi/ResourceAdapter;>;
+ ()L1java/lang/Class<+Ljavax/resource/spi/ResourceAdapter;>;
 setBootstrapContext
  (Ljavax/resource/spi/BootstrapContext;)V
  (Ljavax/resource/spi/BootstrapContext;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jca/support/SimpleBootstrapContext.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jca/support/SimpleBootstrapContext.eea
index 52ce5166fe..f2dd773a62 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jca/support/SimpleBootstrapContext.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jca/support/SimpleBootstrapContext.eea
@@ -11,7 +11,7 @@ class org/springframework/jca/support/SimpleBootstrapContext
  (Ljavax/resource/spi/work/WorkManager;Ljavax/resource/spi/XATerminator;Ljavax/transaction/TransactionSynchronizationRegistry;)V
 createTimer
  ()Ljava/util/Timer;
- ()Ljava/util/Timer;
+ ()L1java/util/Timer;
 getTransactionSynchronizationRegistry
  ()Ljavax/transaction/TransactionSynchronizationRegistry;
  ()L0javax/transaction/TransactionSynchronizationRegistry;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jca/work/WorkManagerTaskExecutor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jca/work/WorkManagerTaskExecutor.eea
index 037b60a9a4..401a178000 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jca/work/WorkManagerTaskExecutor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jca/work/WorkManagerTaskExecutor.eea
@@ -17,7 +17,7 @@ execute
  (Ljava/lang/Runnable;J)V
 getDefaultWorkManager
  ()Ljavax/resource/spi/work/WorkManager;
- ()Ljavax/resource/spi/work/WorkManager;
+ ()L1javax/resource/spi/work/WorkManager;
 scheduleWork
  (Ljavax/resource/spi/work/Work;)V
  (Ljavax/resource/spi/work/Work;)V
@@ -47,13 +47,13 @@ startWork
  (Ljavax/resource/spi/work/Work;JLjavax/resource/spi/work/ExecutionContext;Ljavax/resource/spi/work/WorkListener;)J
 submit
  (Ljava/lang/Runnable;)Ljava/util/concurrent/Future<*>;
- (Ljava/lang/Runnable;)Ljava/util/concurrent/Future<*>;
+ (Ljava/lang/Runnable;)L1java/util/concurrent/Future<*>;
 submit
  <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Ljava/util/concurrent/Future<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Ljava/util/concurrent/Future<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)L1java/util/concurrent/Future<TT;>;
 submitListenable
  (Ljava/lang/Runnable;)Lorg/springframework/util/concurrent/ListenableFuture<*>;
- (Ljava/lang/Runnable;)Lorg/springframework/util/concurrent/ListenableFuture<*>;
+ (Ljava/lang/Runnable;)L1org/springframework/util/concurrent/ListenableFuture<*>;
 submitListenable
  <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Lorg/springframework/util/concurrent/ListenableFuture<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Lorg/springframework/util/concurrent/ListenableFuture<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)L1org/springframework/util/concurrent/ListenableFuture<TT;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/config/SortedResourcesFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/config/SortedResourcesFactoryBean.eea
index 7f84992a4c..22119a8dca 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/config/SortedResourcesFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/config/SortedResourcesFactoryBean.eea
@@ -12,10 +12,10 @@ super org/springframework/beans/factory/config/AbstractFactoryBean
  (Lorg/springframework/core/io/ResourceLoader;Ljava/util/List<Ljava/lang/String;>;)V
 createInstance
  ()[Lorg/springframework/core/io/Resource;
- ()[Lorg/springframework/core/io/Resource;
+ ()[1Lorg/springframework/core/io/Resource;
 getObjectType
  ()Ljava/lang/Class<+[Lorg/springframework/core/io/Resource;>;
- ()Ljava/lang/Class<+[Lorg/springframework/core/io/Resource;>;
+ ()L1java/lang/Class<+[Lorg/springframework/core/io/Resource;>;
 setResourceLoader
  (Lorg/springframework/core/io/ResourceLoader;)V
  (Lorg/springframework/core/io/ResourceLoader;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/BeanPropertyRowMapper.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/BeanPropertyRowMapper.eea
index 5b9d030f53..b98a050020 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/BeanPropertyRowMapper.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/BeanPropertyRowMapper.eea
@@ -8,7 +8,7 @@ super org/springframework/jdbc/core/RowMapper
 
 newInstance
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/jdbc/core/BeanPropertyRowMapper<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/jdbc/core/BeanPropertyRowMapper<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1org/springframework/jdbc/core/BeanPropertyRowMapper<TT;>;
 newInstance
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Lorg/springframework/core/convert/ConversionService;)Lorg/springframework/jdbc/core/BeanPropertyRowMapper<TT;>;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Lorg/springframework/core/convert/ConversionService;)Lorg/springframework/jdbc/core/BeanPropertyRowMapper<TT;>;
@@ -61,4 +61,4 @@ suppressProperty
  (Ljava/lang/String;)V
 underscoreName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/CallableStatementCreator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/CallableStatementCreator.eea
index b1e3cb2d9d..a0d8bc5f93 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/CallableStatementCreator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/CallableStatementCreator.eea
@@ -2,4 +2,4 @@ class org/springframework/jdbc/core/CallableStatementCreator
 
 createCallableStatement
  (Ljava/sql/Connection;)Ljava/sql/CallableStatement;
- (Ljava/sql/Connection;)Ljava/sql/CallableStatement;
+ (Ljava/sql/Connection;)L1java/sql/CallableStatement;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/CallableStatementCreatorFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/CallableStatementCreatorFactory.eea
index a91f3c90a6..dba5683f21 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/CallableStatementCreatorFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/CallableStatementCreatorFactory.eea
@@ -17,4 +17,4 @@ newCallableStatementCreator
  (Ljava/util/Map<Ljava/lang/String;*>;)Lorg/springframework/jdbc/core/CallableStatementCreator;
 newCallableStatementCreator
  (Lorg/springframework/jdbc/core/ParameterMapper;)Lorg/springframework/jdbc/core/CallableStatementCreator;
- (Lorg/springframework/jdbc/core/ParameterMapper;)Lorg/springframework/jdbc/core/CallableStatementCreator;
+ (Lorg/springframework/jdbc/core/ParameterMapper;)L1org/springframework/jdbc/core/CallableStatementCreator;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/ColumnMapRowMapper.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/ColumnMapRowMapper.eea
index 9c360f405b..2b3e4f0a80 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/ColumnMapRowMapper.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/ColumnMapRowMapper.eea
@@ -6,7 +6,7 @@ super org/springframework/jdbc/core/RowMapper
 
 createColumnMap
  (I)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- (I)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ (I)L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 getColumnKey
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/DataClassRowMapper.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/DataClassRowMapper.eea
index 585189bb71..fbe5892ea9 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/DataClassRowMapper.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/DataClassRowMapper.eea
@@ -8,7 +8,7 @@ super org/springframework/jdbc/core/BeanPropertyRowMapper
 
 newInstance
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/jdbc/core/DataClassRowMapper<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/jdbc/core/DataClassRowMapper<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1org/springframework/jdbc/core/DataClassRowMapper<TT;>;
 newInstance
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Lorg/springframework/core/convert/ConversionService;)Lorg/springframework/jdbc/core/DataClassRowMapper<TT;>;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Lorg/springframework/core/convert/ConversionService;)Lorg/springframework/jdbc/core/DataClassRowMapper<TT;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/JdbcTemplate.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/JdbcTemplate.eea
index f9b50866a1..c86196aa7a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/JdbcTemplate.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/JdbcTemplate.eea
@@ -29,10 +29,10 @@ call
  (Lorg/springframework/jdbc/core/CallableStatementCreator;Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 createConnectionProxy
  (Ljava/sql/Connection;)Ljava/sql/Connection;
- (Ljava/sql/Connection;)Ljava/sql/Connection;
+ (Ljava/sql/Connection;)L1java/sql/Connection;
 createResultsMap
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ ()L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 execute
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
@@ -62,10 +62,10 @@ extractReturnedResults
  (Ljava/sql/CallableStatement;Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;I)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 getColumnMapRowMapper
  ()Lorg/springframework/jdbc/core/RowMapper<Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;>;
- ()Lorg/springframework/jdbc/core/RowMapper<Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;>;
+ ()L1org/springframework/jdbc/core/RowMapper<Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;>;
 getSingleColumnRowMapper
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/jdbc/core/RowMapper<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/jdbc/core/RowMapper<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1org/springframework/jdbc/core/RowMapper<TT;>;
 handleWarnings
  (Ljava/sql/SQLWarning;)V
  (Ljava/sql/SQLWarning;)V
@@ -77,10 +77,10 @@ handleWarnings
  (Ljava/sql/Statement;Ljava/sql/SQLException;)V
 newArgPreparedStatementSetter
  ([Ljava/lang/Object;)Lorg/springframework/jdbc/core/PreparedStatementSetter;
- ([Ljava/lang/Object;)Lorg/springframework/jdbc/core/PreparedStatementSetter;
+ ([Ljava/lang/Object;)L1org/springframework/jdbc/core/PreparedStatementSetter;
 newArgTypePreparedStatementSetter
  ([Ljava/lang/Object;[I)Lorg/springframework/jdbc/core/PreparedStatementSetter;
- ([Ljava/lang/Object;[I)Lorg/springframework/jdbc/core/PreparedStatementSetter;
+ ([Ljava/lang/Object;[I)L1org/springframework/jdbc/core/PreparedStatementSetter;
 processResultSet
  (Ljava/sql/ResultSet;Lorg/springframework/jdbc/core/ResultSetSupportingSqlParameter;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
  (Ljava/sql/ResultSet;Lorg/springframework/jdbc/core/ResultSetSupportingSqlParameter;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
@@ -221,7 +221,7 @@ queryForStream
  <T:Ljava/lang/Object;>(Lorg/springframework/jdbc/core/PreparedStatementCreator;Lorg/springframework/jdbc/core/RowMapper<TT;>;)Ljava/util/stream/Stream<TT;>;
 translateException
  (Ljava/lang/String;Ljava/lang/String;Ljava/sql/SQLException;)Lorg/springframework/dao/DataAccessException;
- (Ljava/lang/String;Ljava/lang/String;Ljava/sql/SQLException;)Lorg/springframework/dao/DataAccessException;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/sql/SQLException;)L1org/springframework/dao/DataAccessException;
 update
  (Ljava/lang/String;)I
  (Ljava/lang/String;)I
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/ParameterMapper.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/ParameterMapper.eea
index 1c9e266887..58b69fae36 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/ParameterMapper.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/ParameterMapper.eea
@@ -2,4 +2,4 @@ class org/springframework/jdbc/core/ParameterMapper
 
 createMap
  (Ljava/sql/Connection;)Ljava/util/Map<Ljava/lang/String;*>;
- (Ljava/sql/Connection;)Ljava/util/Map<Ljava/lang/String;*>;
+ (Ljava/sql/Connection;)L1java/util/Map<Ljava/lang/String;*>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/PreparedStatementCreator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/PreparedStatementCreator.eea
index 64916a6c4b..7d0675f604 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/PreparedStatementCreator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/PreparedStatementCreator.eea
@@ -2,4 +2,4 @@ class org/springframework/jdbc/core/PreparedStatementCreator
 
 createPreparedStatement
  (Ljava/sql/Connection;)Ljava/sql/PreparedStatement;
- (Ljava/sql/Connection;)Ljava/sql/PreparedStatement;
+ (Ljava/sql/Connection;)L1java/sql/PreparedStatement;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/RowMapperResultSetExtractor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/RowMapperResultSetExtractor.eea
index d99faed171..76124168ca 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/RowMapperResultSetExtractor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/RowMapperResultSetExtractor.eea
@@ -14,4 +14,4 @@ super org/springframework/jdbc/core/ResultSetExtractor
  (Lorg/springframework/jdbc/core/RowMapper<TT;>;I)V
 extractData
  (Ljava/sql/ResultSet;)Ljava/util/List<TT;>;
- (Ljava/sql/ResultSet;)Ljava/util/List<TT;>;
+ (Ljava/sql/ResultSet;)L1java/util/List<TT;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/SingleColumnRowMapper.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/SingleColumnRowMapper.eea
index f947dc3a99..2faed8e146 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/SingleColumnRowMapper.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/SingleColumnRowMapper.eea
@@ -8,7 +8,7 @@ super org/springframework/jdbc/core/RowMapper
 
 newInstance
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/jdbc/core/SingleColumnRowMapper<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/jdbc/core/SingleColumnRowMapper<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1org/springframework/jdbc/core/SingleColumnRowMapper<TT;>;
 newInstance
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Lorg/springframework/core/convert/ConversionService;)Lorg/springframework/jdbc/core/SingleColumnRowMapper<TT;>;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Lorg/springframework/core/convert/ConversionService;)Lorg/springframework/jdbc/core/SingleColumnRowMapper<TT;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/SqlRowSetResultSetExtractor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/SqlRowSetResultSetExtractor.eea
index bfd9c27a89..7725204f4b 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/SqlRowSetResultSetExtractor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/SqlRowSetResultSetExtractor.eea
@@ -6,7 +6,7 @@ super org/springframework/jdbc/core/ResultSetExtractor
 
 createSqlRowSet
  (Ljava/sql/ResultSet;)Lorg/springframework/jdbc/support/rowset/SqlRowSet;
- (Ljava/sql/ResultSet;)Lorg/springframework/jdbc/support/rowset/SqlRowSet;
+ (Ljava/sql/ResultSet;)L1org/springframework/jdbc/support/rowset/SqlRowSet;
 extractData
  (Ljava/sql/ResultSet;)Lorg/springframework/jdbc/support/rowset/SqlRowSet;
  (Ljava/sql/ResultSet;)Lorg/springframework/jdbc/support/rowset/SqlRowSet;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/CallMetaDataContext.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/CallMetaDataContext.eea
index 7e9c5f1b32..aec185a609 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/CallMetaDataContext.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/CallMetaDataContext.eea
@@ -6,13 +6,13 @@ logger
 
 createCallString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 createParameterBinding
  (Lorg/springframework/jdbc/core/SqlParameter;)Ljava/lang/String;
- (Lorg/springframework/jdbc/core/SqlParameter;)Ljava/lang/String;
+ (Lorg/springframework/jdbc/core/SqlParameter;)L1java/lang/String;
 createReturnResultSetParameter
  (Ljava/lang/String;Lorg/springframework/jdbc/core/RowMapper<*>;)Lorg/springframework/jdbc/core/SqlParameter;
- (Ljava/lang/String;Lorg/springframework/jdbc/core/RowMapper<*>;)Lorg/springframework/jdbc/core/SqlParameter;
+ (Ljava/lang/String;Lorg/springframework/jdbc/core/RowMapper<*>;)L1org/springframework/jdbc/core/SqlParameter;
 getCallParameters
  ()Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;
  ()Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;
@@ -21,7 +21,7 @@ getCatalogName
  ()L0java/lang/String;
 getFunctionReturnName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getLimitedInParameterNames
  ()Ljava/util/Set<Ljava/lang/String;>;
  ()Ljava/util/Set<Ljava/lang/String;>;
@@ -54,7 +54,7 @@ processParameters
  (Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;)V
 reconcileParameters
  (Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;)Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;
- (Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;)Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;
+ (Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;)L1java/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;
 setCatalogName
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/CallMetaDataProvider.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/CallMetaDataProvider.eea
index 291ce14aef..302dda24a0 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/CallMetaDataProvider.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/CallMetaDataProvider.eea
@@ -8,13 +8,13 @@ catalogNameToUse
  (Ljava/lang/String;)L0java/lang/String;
 createDefaultInOutParameter
  (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
- (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
+ (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)L1org/springframework/jdbc/core/SqlParameter;
 createDefaultInParameter
  (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
- (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
+ (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)L1org/springframework/jdbc/core/SqlParameter;
 createDefaultOutParameter
  (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
- (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
+ (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)L1org/springframework/jdbc/core/SqlParameter;
 getCallParameterMetaData
  ()Ljava/util/List<Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;>;
  ()Ljava/util/List<Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.eea
index bb6ff51c93..579b380301 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.eea
@@ -9,4 +9,4 @@ supportedDatabaseProductsForProcedures
 
 createMetaDataProvider
  (Ljavax/sql/DataSource;Lorg/springframework/jdbc/core/metadata/CallMetaDataContext;)Lorg/springframework/jdbc/core/metadata/CallMetaDataProvider;
- (Ljavax/sql/DataSource;Lorg/springframework/jdbc/core/metadata/CallMetaDataContext;)Lorg/springframework/jdbc/core/metadata/CallMetaDataProvider;
+ (Ljavax/sql/DataSource;Lorg/springframework/jdbc/core/metadata/CallMetaDataContext;)L1org/springframework/jdbc/core/metadata/CallMetaDataProvider;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.eea
index 89090fedcc..7107cf2113 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.eea
@@ -15,13 +15,13 @@ catalogNameToUse
  (Ljava/lang/String;)L0java/lang/String; # @Inherited(org.springframework.jdbc.core.metadata.CallMetaDataProvider)
 createDefaultInOutParameter
  (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
- (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
+ (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)L1org/springframework/jdbc/core/SqlParameter; # @Inherited(org.springframework.jdbc.core.metadata.CallMetaDataProvider)
 createDefaultInParameter
  (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
- (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
+ (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)L1org/springframework/jdbc/core/SqlParameter; # @Inherited(org.springframework.jdbc.core.metadata.CallMetaDataProvider)
 createDefaultOutParameter
  (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
- (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
+ (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)L1org/springframework/jdbc/core/SqlParameter; # @Inherited(org.springframework.jdbc.core.metadata.CallMetaDataProvider)
 getCallParameterMetaData
  ()Ljava/util/List<Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;>;
  ()Ljava/util/List<Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider.eea
index d8e61c1497..53bf7e3b5c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider.eea
@@ -5,7 +5,7 @@ class org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider
  (Ljava/sql/DatabaseMetaData;)V
 createDefaultOutParameter
  (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
- (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
+ (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)L1org/springframework/jdbc/core/SqlParameter; # @Inherited(org.springframework.jdbc.core.metadata.GenericCallMetaDataProvider)
 metaDataCatalogNameToUse
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)L0java/lang/String; # @Inherited(org.springframework.jdbc.core.metadata.GenericCallMetaDataProvider)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/PostgresCallMetaDataProvider.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/PostgresCallMetaDataProvider.eea
index 45e31a4b8f..8ffdf575f4 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/PostgresCallMetaDataProvider.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/PostgresCallMetaDataProvider.eea
@@ -8,7 +8,7 @@ byPassReturnParameter
  (Ljava/lang/String;)Z
 createDefaultOutParameter
  (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
- (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
+ (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)L1org/springframework/jdbc/core/SqlParameter; # @Inherited(org.springframework.jdbc.core.metadata.GenericCallMetaDataProvider)
 metaDataSchemaNameToUse
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)L0java/lang/String; # @Inherited(org.springframework.jdbc.core.metadata.GenericCallMetaDataProvider)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/TableMetaDataContext.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/TableMetaDataContext.eea
index 9dcb47b6a2..b5f1f1a8f2 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/TableMetaDataContext.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/TableMetaDataContext.eea
@@ -6,10 +6,10 @@ logger
 
 createInsertString
  ([Ljava/lang/String;)Ljava/lang/String;
- ([Ljava/lang/String;)Ljava/lang/String;
+ ([Ljava/lang/String;)L1java/lang/String;
 createInsertTypes
  ()[I
- ()[I
+ ()[1I
 getCatalogName
  ()Ljava/lang/String;
  ()L0java/lang/String;
@@ -30,16 +30,16 @@ getTableName
  ()L0java/lang/String;
 matchInParameterValuesWithInsertColumns
  (Ljava/util/Map<Ljava/lang/String;*>;)Ljava/util/List<Ljava/lang/Object;>;
- (Ljava/util/Map<Ljava/lang/String;*>;)Ljava/util/List<Ljava/lang/Object;>;
+ (Ljava/util/Map<Ljava/lang/String;*>;)L1java/util/List<Ljava/lang/Object;>;
 matchInParameterValuesWithInsertColumns
  (Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)Ljava/util/List<Ljava/lang/Object;>;
- (Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)Ljava/util/List<Ljava/lang/Object;>;
+ (Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)L1java/util/List<Ljava/lang/Object;>;
 processMetaData
  (Ljavax/sql/DataSource;Ljava/util/List<Ljava/lang/String;>;[Ljava/lang/String;)V
  (Ljavax/sql/DataSource;Ljava/util/List<Ljava/lang/String;>;[Ljava/lang/String;)V
 reconcileColumnsToUse
  (Ljava/util/List<Ljava/lang/String;>;[Ljava/lang/String;)Ljava/util/List<Ljava/lang/String;>;
- (Ljava/util/List<Ljava/lang/String;>;[Ljava/lang/String;)Ljava/util/List<Ljava/lang/String;>;
+ (Ljava/util/List<Ljava/lang/String;>;[Ljava/lang/String;)L1java/util/List<Ljava/lang/String;>;
 setCatalogName
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/TableMetaDataProviderFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/TableMetaDataProviderFactory.eea
index 07afe2f27c..ba18064e20 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/TableMetaDataProviderFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/metadata/TableMetaDataProviderFactory.eea
@@ -2,4 +2,4 @@ class org/springframework/jdbc/core/metadata/TableMetaDataProviderFactory
 
 createMetaDataProvider
  (Ljavax/sql/DataSource;Lorg/springframework/jdbc/core/metadata/TableMetaDataContext;)Lorg/springframework/jdbc/core/metadata/TableMetaDataProvider;
- (Ljavax/sql/DataSource;Lorg/springframework/jdbc/core/metadata/TableMetaDataContext;)Lorg/springframework/jdbc/core/metadata/TableMetaDataProvider;
+ (Ljavax/sql/DataSource;Lorg/springframework/jdbc/core/metadata/TableMetaDataContext;)L1org/springframework/jdbc/core/metadata/TableMetaDataProvider;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.eea
index aba935e51e..64bfbf3ade 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.eea
@@ -38,7 +38,7 @@ getPreparedStatementCreator
  (Ljava/lang/String;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;Ljava/util/function/Consumer<Lorg/springframework/jdbc/core/PreparedStatementCreatorFactory;>;)Lorg/springframework/jdbc/core/PreparedStatementCreator;
 getPreparedStatementCreatorFactory
  (Lorg/springframework/jdbc/core/namedparam/ParsedSql;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)Lorg/springframework/jdbc/core/PreparedStatementCreatorFactory;
- (Lorg/springframework/jdbc/core/namedparam/ParsedSql;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)Lorg/springframework/jdbc/core/PreparedStatementCreatorFactory;
+ (Lorg/springframework/jdbc/core/namedparam/ParsedSql;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)L1org/springframework/jdbc/core/PreparedStatementCreatorFactory;
 query
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Lorg/springframework/jdbc/core/RowCallbackHandler;)V
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Lorg/springframework/jdbc/core/RowCallbackHandler;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/namedparam/NamedParameterUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/namedparam/NamedParameterUtils.eea
index ebb41f9cc3..5b4d097a10 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/namedparam/NamedParameterUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/namedparam/NamedParameterUtils.eea
@@ -2,19 +2,19 @@ class org/springframework/jdbc/core/namedparam/NamedParameterUtils
 
 buildSqlParameterList
  (Lorg/springframework/jdbc/core/namedparam/ParsedSql;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;
- (Lorg/springframework/jdbc/core/namedparam/ParsedSql;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;
+ (Lorg/springframework/jdbc/core/namedparam/ParsedSql;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)L1java/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;
 buildSqlTypeArray
  (Lorg/springframework/jdbc/core/namedparam/ParsedSql;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)[I
- (Lorg/springframework/jdbc/core/namedparam/ParsedSql;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)[I
+ (Lorg/springframework/jdbc/core/namedparam/ParsedSql;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)[1I
 buildValueArray
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)[Ljava/lang/Object;
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)[Ljava/lang/Object;
 buildValueArray
  (Lorg/springframework/jdbc/core/namedparam/ParsedSql;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;)[Ljava/lang/Object;
- (Lorg/springframework/jdbc/core/namedparam/ParsedSql;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;)[Ljava/lang/Object;
+ (Lorg/springframework/jdbc/core/namedparam/ParsedSql;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;)[1Ljava/lang/Object;
 parseSqlStatement
  (Ljava/lang/String;)Lorg/springframework/jdbc/core/namedparam/ParsedSql;
- (Ljava/lang/String;)Lorg/springframework/jdbc/core/namedparam/ParsedSql;
+ (Ljava/lang/String;)L1org/springframework/jdbc/core/namedparam/ParsedSql;
 parseSqlStatementIntoString
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.eea
index 1d40ac49e3..d517f46b65 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.eea
@@ -2,16 +2,16 @@ class org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils
 
 createBatch
  (Ljava/util/Collection<*>;)[Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;
- (Ljava/util/Collection<*>;)[Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;
+ (Ljava/util/Collection<*>;)[1Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;
 createBatch
  ([Ljava/lang/Object;)[Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;
- ([Ljava/lang/Object;)[Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;
+ ([Ljava/lang/Object;)[1Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;
 createBatch
  ([Ljava/util/Map<Ljava/lang/String;*>;)[Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;
- ([Ljava/util/Map<Ljava/lang/String;*>;)[Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;
+ ([Ljava/util/Map<Ljava/lang/String;*>;)[1Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;
 extractCaseInsensitiveParameterNames
  (Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
- (Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
+ (Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)L1java/util/Map<Ljava/lang/String;Ljava/lang/String;>;
 getTypedValue
  (Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;Ljava/lang/String;)Ljava/lang/Object;
  (Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;Ljava/lang/String;)L0java/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/support/AbstractSqlTypeValue.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/support/AbstractSqlTypeValue.eea
index 19466bd1de..4023c3bf99 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/support/AbstractSqlTypeValue.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/support/AbstractSqlTypeValue.eea
@@ -2,7 +2,7 @@ class org/springframework/jdbc/core/support/AbstractSqlTypeValue
 
 createTypeValue
  (Ljava/sql/Connection;ILjava/lang/String;)Ljava/lang/Object;
- (Ljava/sql/Connection;ILjava/lang/String;)Ljava/lang/Object;
+ (Ljava/sql/Connection;ILjava/lang/String;)L1java/lang/Object;
 setTypeValue
  (Ljava/sql/PreparedStatement;IILjava/lang/String;)V
  (Ljava/sql/PreparedStatement;IILjava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/support/JdbcDaoSupport.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/support/JdbcDaoSupport.eea
index 1487a7ac40..add9ea180f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/support/JdbcDaoSupport.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/core/support/JdbcDaoSupport.eea
@@ -2,7 +2,7 @@ class org/springframework/jdbc/core/support/JdbcDaoSupport
 
 createJdbcTemplate
  (Ljavax/sql/DataSource;)Lorg/springframework/jdbc/core/JdbcTemplate;
- (Ljavax/sql/DataSource;)Lorg/springframework/jdbc/core/JdbcTemplate;
+ (Ljavax/sql/DataSource;)L1org/springframework/jdbc/core/JdbcTemplate;
 getConnection
  ()Ljava/sql/Connection;
  ()Ljava/sql/Connection;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/AbstractDataSource.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/AbstractDataSource.eea
index 410f4729b7..b6c74fc238 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/AbstractDataSource.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/AbstractDataSource.eea
@@ -6,7 +6,7 @@ logger
 
 getLogWriter
  ()Ljava/io/PrintWriter;
- ()Ljava/io/PrintWriter;
+ ()L1java/io/PrintWriter;
 getParentLogger
  ()Ljava/util/logging/Logger;
  ()Ljava/util/logging/Logger;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/ConnectionHolder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/ConnectionHolder.eea
index b4b0587795..a5e05c1072 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/ConnectionHolder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/ConnectionHolder.eea
@@ -15,7 +15,7 @@ SAVEPOINT_NAME_PREFIX
  (Lorg/springframework/jdbc/datasource/ConnectionHandle;)V
 createSavepoint
  ()Ljava/sql/Savepoint;
- ()Ljava/sql/Savepoint;
+ ()L1java/sql/Savepoint;
 getConnection
  ()Ljava/sql/Connection;
  ()Ljava/sql/Connection;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/DataSourceTransactionManager.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/DataSourceTransactionManager.eea
index 2803ff8319..59e7420e31 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/DataSourceTransactionManager.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/DataSourceTransactionManager.eea
@@ -14,7 +14,7 @@ doCommit
  (Lorg/springframework/transaction/support/DefaultTransactionStatus;)V
 doGetTransaction
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 doResume
  (Ljava/lang/Object;Ljava/lang/Object;)V
  (Ljava/lang/Object;Ljava/lang/Object;)V
@@ -26,7 +26,7 @@ doSetRollbackOnly
  (Lorg/springframework/transaction/support/DefaultTransactionStatus;)V
 doSuspend
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object; # @Inherited(org.springframework.transaction.support.AbstractPlatformTransactionManager)
 getDataSource
  ()Ljavax/sql/DataSource;
  ()L0javax/sql/DataSource;
@@ -47,4 +47,4 @@ setDataSource
  (Ljavax/sql/DataSource;)V
 translateException
  (Ljava/lang/String;Ljava/sql/SQLException;)Ljava/lang/RuntimeException;
- (Ljava/lang/String;Ljava/sql/SQLException;)Ljava/lang/RuntimeException;
+ (Ljava/lang/String;Ljava/sql/SQLException;)L1java/lang/RuntimeException;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/JdbcTransactionObjectSupport.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/JdbcTransactionObjectSupport.eea
index 40f51ad3fe..d51092ab7d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/JdbcTransactionObjectSupport.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/JdbcTransactionObjectSupport.eea
@@ -2,7 +2,7 @@ class org/springframework/jdbc/datasource/JdbcTransactionObjectSupport
 
 createSavepoint
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object; # @Inherited(org.springframework.transaction.SavepointManager)
 getConnectionHolder
  ()Lorg/springframework/jdbc/datasource/ConnectionHolder;
  ()Lorg/springframework/jdbc/datasource/ConnectionHolder;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.eea
index 4e8631db8d..e1f1610b4e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.eea
@@ -6,7 +6,7 @@ logger
 
 createConnectionSpec
  (Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;)L1java/lang/Object;
 doGetConnection
  (Ljava/lang/String;Ljava/lang/String;)Ljava/sql/Connection;
  (Ljava/lang/String;Ljava/lang/String;)Ljava/sql/Connection;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.eea
index af79409e96..8f3e8b263a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.eea
@@ -9,7 +9,7 @@ getDataSource
  ()L0javax/sql/DataSource;
 getDatabase
  ()Lorg/springframework/jdbc/datasource/embedded/EmbeddedDatabase;
- ()Lorg/springframework/jdbc/datasource/embedded/EmbeddedDatabase;
+ ()L1org/springframework/jdbc/datasource/embedded/EmbeddedDatabase;
 setDataSourceFactory
  (Lorg/springframework/jdbc/datasource/embedded/DataSourceFactory;)V
  (Lorg/springframework/jdbc/datasource/embedded/DataSourceFactory;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBean.eea
index a14ad78cfe..4df2f26e28 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBean.eea
@@ -9,7 +9,7 @@ getObject
  ()L0javax/sql/DataSource;
 getObjectType
  ()Ljava/lang/Class<+Ljavax/sql/DataSource;>;
- ()Ljava/lang/Class<+Ljavax/sql/DataSource;>;
+ ()L1java/lang/Class<+Ljavax/sql/DataSource;>;
 setDatabaseCleaner
  (Lorg/springframework/jdbc/datasource/init/DatabasePopulator;)V
  (Lorg/springframework/jdbc/datasource/init/DatabasePopulator;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/embedded/OutputStreamFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/embedded/OutputStreamFactory.eea
index 4a01992a5a..da7c6dfb22 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/embedded/OutputStreamFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/embedded/OutputStreamFactory.eea
@@ -2,4 +2,4 @@ class org/springframework/jdbc/datasource/embedded/OutputStreamFactory
 
 getNoopOutputStream
  ()Ljava/io/OutputStream;
- ()Ljava/io/OutputStream;
+ ()L1java/io/OutputStream;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/init/ScriptUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/init/ScriptUtils.eea
index 02dfee4df1..42a0be6805 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/init/ScriptUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/datasource/init/ScriptUtils.eea
@@ -42,7 +42,7 @@ readScript
  (Ljava/io/LineNumberReader;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 readScript
  (Ljava/io/LineNumberReader;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/io/LineNumberReader;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/io/LineNumberReader;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 splitSqlScript
  (Ljava/lang/String;CLjava/util/List<Ljava/lang/String;>;)V
  (Ljava/lang/String;CLjava/util/List<Ljava/lang/String;>;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/object/BatchSqlUpdate.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/object/BatchSqlUpdate.eea
index cd416d2887..c1cd9340ba 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/object/BatchSqlUpdate.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/object/BatchSqlUpdate.eea
@@ -14,7 +14,7 @@ flush
  ()[I
 getRowsAffected
  ()[I
- ()[I
+ ()[1I
 update
  ([Ljava/lang/Object;)I
  ([Ljava/lang/Object;)I
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/object/MappingSqlQueryWithParameters.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/object/MappingSqlQueryWithParameters.eea
index 760a3f1cd1..ab77c7773b 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/object/MappingSqlQueryWithParameters.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/object/MappingSqlQueryWithParameters.eea
@@ -14,4 +14,4 @@ mapRow
  (Ljava/sql/ResultSet;I[Ljava/lang/Object;Ljava/util/Map<**>;)T0T;
 newRowMapper
  ([Ljava/lang/Object;Ljava/util/Map<**>;)Lorg/springframework/jdbc/core/RowMapper<TT;>;
- ([Ljava/lang/Object;Ljava/util/Map<**>;)Lorg/springframework/jdbc/core/RowMapper<TT;>;
+ ([Ljava/lang/Object;Ljava/util/Map<**>;)L1org/springframework/jdbc/core/RowMapper<TT;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/object/UpdatableSqlQuery.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/object/UpdatableSqlQuery.eea
index 8c316c1ead..681f7ec4b2 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/object/UpdatableSqlQuery.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/object/UpdatableSqlQuery.eea
@@ -11,7 +11,7 @@ super org/springframework/jdbc/object/SqlQuery
  (Ljavax/sql/DataSource;Ljava/lang/String;)V
 newRowMapper
  ([Ljava/lang/Object;Ljava/util/Map<**>;)Lorg/springframework/jdbc/core/RowMapper<TT;>;
- ([Ljava/lang/Object;Ljava/util/Map<**>;)Lorg/springframework/jdbc/core/RowMapper<TT;>;
+ ([Ljava/lang/Object;Ljava/util/Map<**>;)L1org/springframework/jdbc/core/RowMapper<TT;>;
 updateRow
  (Ljava/sql/ResultSet;ILjava/util/Map<**>;)TT;
  (Ljava/sql/ResultSet;ILjava/util/Map<**>;)TT;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.eea
index a91b0d3afd..6e0e26ca6c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.eea
@@ -6,7 +6,7 @@ logger
 
 buildMessage
  (Ljava/lang/String;Ljava/lang/String;Ljava/sql/SQLException;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;Ljava/sql/SQLException;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/sql/SQLException;)L1java/lang/String;
 doTranslate
  (Ljava/lang/String;Ljava/lang/String;Ljava/sql/SQLException;)Lorg/springframework/dao/DataAccessException;
  (Ljava/lang/String;Ljava/lang/String;Ljava/sql/SQLException;)L0org/springframework/dao/DataAccessException;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/JdbcTransactionManager.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/JdbcTransactionManager.eea
index ff7401d0a7..fe79f718e3 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/JdbcTransactionManager.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/JdbcTransactionManager.eea
@@ -14,4 +14,4 @@ setExceptionTranslator
  (Lorg/springframework/jdbc/support/SQLExceptionTranslator;)V
 translateException
  (Ljava/lang/String;Ljava/sql/SQLException;)Ljava/lang/RuntimeException;
- (Ljava/lang/String;Ljava/sql/SQLException;)Ljava/lang/RuntimeException;
+ (Ljava/lang/String;Ljava/sql/SQLException;)L1java/lang/RuntimeException; # @Inherited(org.springframework.jdbc.datasource.DataSourceTransactionManager)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/JdbcUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/JdbcUtils.eea
index 45e74d3199..2c8091d02b 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/JdbcUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/JdbcUtils.eea
@@ -14,7 +14,7 @@ commonDatabaseName
  (Ljava/lang/String;)L0java/lang/String;
 convertUnderscoreNameToPropertyName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 extractDatabaseMetaData
  <T:Ljava/lang/Object;>(Ljavax/sql/DataSource;Ljava/lang/String;)TT;
  <T:Ljava/lang/Object;>(Ljavax/sql/DataSource;Ljava/lang/String;)TT;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/SQLErrorCodesFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/SQLErrorCodesFactory.eea
index 1dfaaf15e4..f2aadcbbea 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/SQLErrorCodesFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/SQLErrorCodesFactory.eea
@@ -16,7 +16,7 @@ getErrorCodes
  (Ljava/lang/String;)Lorg/springframework/jdbc/support/SQLErrorCodes;
 getErrorCodes
  (Ljavax/sql/DataSource;)Lorg/springframework/jdbc/support/SQLErrorCodes;
- (Ljavax/sql/DataSource;)Lorg/springframework/jdbc/support/SQLErrorCodes;
+ (Ljavax/sql/DataSource;)L1org/springframework/jdbc/support/SQLErrorCodes;
 loadResource
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
  (Ljava/lang/String;)L0org/springframework/core/io/Resource;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.eea
index 5751925d8a..bf6b7c9664 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.eea
@@ -11,7 +11,7 @@ getIncrementerName
  ()Ljava/lang/String;
 nextStringValue
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 setDataSource
  (Ljavax/sql/DataSource;)V
  (Ljavax/sql/DataSource;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/AbstractIdentityColumnMaxValueIncrementer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/AbstractIdentityColumnMaxValueIncrementer.eea
index 315bae2e13..1a6914e90e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/AbstractIdentityColumnMaxValueIncrementer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/AbstractIdentityColumnMaxValueIncrementer.eea
@@ -5,7 +5,7 @@ class org/springframework/jdbc/support/incrementer/AbstractIdentityColumnMaxValu
  (Ljavax/sql/DataSource;Ljava/lang/String;Ljava/lang/String;)V
 getDeleteStatement
  ([J)Ljava/lang/String;
- ([J)Ljava/lang/String;
+ ([J)L1java/lang/String;
 getIdentityStatement
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/DB2MainframeSequenceMaxValueIncrementer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/DB2MainframeSequenceMaxValueIncrementer.eea
index ae4faa9cb9..e1f990a06d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/DB2MainframeSequenceMaxValueIncrementer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/DB2MainframeSequenceMaxValueIncrementer.eea
@@ -5,4 +5,4 @@ class org/springframework/jdbc/support/incrementer/DB2MainframeSequenceMaxValueI
  (Ljavax/sql/DataSource;Ljava/lang/String;)V
 getSequenceQuery
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/Db2LuwMaxValueIncrementer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/Db2LuwMaxValueIncrementer.eea
index 79d79420e3..1bda9a5595 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/Db2LuwMaxValueIncrementer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/Db2LuwMaxValueIncrementer.eea
@@ -5,4 +5,4 @@ class org/springframework/jdbc/support/incrementer/Db2LuwMaxValueIncrementer
  (Ljavax/sql/DataSource;Ljava/lang/String;)V
 getSequenceQuery
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/Db2MainframeMaxValueIncrementer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/Db2MainframeMaxValueIncrementer.eea
index d8a3a5e822..047bcf4e86 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/Db2MainframeMaxValueIncrementer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/Db2MainframeMaxValueIncrementer.eea
@@ -5,4 +5,4 @@ class org/springframework/jdbc/support/incrementer/Db2MainframeMaxValueIncrement
  (Ljavax/sql/DataSource;Ljava/lang/String;)V
 getSequenceQuery
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/DerbyMaxValueIncrementer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/DerbyMaxValueIncrementer.eea
index e64ed10cec..4b195f20cb 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/DerbyMaxValueIncrementer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/DerbyMaxValueIncrementer.eea
@@ -11,10 +11,10 @@ getDummyName
  ()Ljava/lang/String;
 getIdentityStatement
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getIncrementStatement
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 setDummyName
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer.eea
index 595f6edd30..9345563f9e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer.eea
@@ -5,4 +5,4 @@ class org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer
  (Ljavax/sql/DataSource;Ljava/lang/String;)V
 getSequenceQuery
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/HanaSequenceMaxValueIncrementer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/HanaSequenceMaxValueIncrementer.eea
index da1bd9b260..e0f4db5bf3 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/HanaSequenceMaxValueIncrementer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/HanaSequenceMaxValueIncrementer.eea
@@ -5,4 +5,4 @@ class org/springframework/jdbc/support/incrementer/HanaSequenceMaxValueIncrement
  (Ljavax/sql/DataSource;Ljava/lang/String;)V
 getSequenceQuery
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/HsqlMaxValueIncrementer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/HsqlMaxValueIncrementer.eea
index 1d56fc4118..aaad7234aa 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/HsqlMaxValueIncrementer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/HsqlMaxValueIncrementer.eea
@@ -5,7 +5,7 @@ class org/springframework/jdbc/support/incrementer/HsqlMaxValueIncrementer
  (Ljavax/sql/DataSource;Ljava/lang/String;Ljava/lang/String;)V
 getIdentityStatement
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getIncrementStatement
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/HsqlSequenceMaxValueIncrementer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/HsqlSequenceMaxValueIncrementer.eea
index 32e223f4f8..88405b4f18 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/HsqlSequenceMaxValueIncrementer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/HsqlSequenceMaxValueIncrementer.eea
@@ -5,4 +5,4 @@ class org/springframework/jdbc/support/incrementer/HsqlSequenceMaxValueIncrement
  (Ljavax/sql/DataSource;Ljava/lang/String;)V
 getSequenceQuery
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/OracleSequenceMaxValueIncrementer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/OracleSequenceMaxValueIncrementer.eea
index f446669cf1..1128f44cc6 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/OracleSequenceMaxValueIncrementer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/OracleSequenceMaxValueIncrementer.eea
@@ -5,4 +5,4 @@ class org/springframework/jdbc/support/incrementer/OracleSequenceMaxValueIncreme
  (Ljavax/sql/DataSource;Ljava/lang/String;)V
 getSequenceQuery
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/PostgresSequenceMaxValueIncrementer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/PostgresSequenceMaxValueIncrementer.eea
index 4f43cc0322..eae67d384f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/PostgresSequenceMaxValueIncrementer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/PostgresSequenceMaxValueIncrementer.eea
@@ -5,4 +5,4 @@ class org/springframework/jdbc/support/incrementer/PostgresSequenceMaxValueIncre
  (Ljavax/sql/DataSource;Ljava/lang/String;)V
 getSequenceQuery
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/SqlServerMaxValueIncrementer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/SqlServerMaxValueIncrementer.eea
index 060e07f2a8..3f16931907 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/SqlServerMaxValueIncrementer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/SqlServerMaxValueIncrementer.eea
@@ -5,7 +5,7 @@ class org/springframework/jdbc/support/incrementer/SqlServerMaxValueIncrementer
  (Ljavax/sql/DataSource;Ljava/lang/String;Ljava/lang/String;)V
 getIdentityStatement
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getIncrementStatement
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncrementer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncrementer.eea
index 495998da23..22c2a155ff 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncrementer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncrementer.eea
@@ -5,4 +5,4 @@ class org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncreme
  (Ljavax/sql/DataSource;Ljava/lang/String;Ljava/lang/String;)V
 getIncrementStatement
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.jdbc.support.incrementer.SybaseMaxValueIncrementer)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer.eea
index cc9df47240..939bf2d890 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer.eea
@@ -5,7 +5,7 @@ class org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer
  (Ljavax/sql/DataSource;Ljava/lang/String;Ljava/lang/String;)V
 getIdentityStatement
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getIncrementStatement
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/lob/DefaultLobHandler.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/lob/DefaultLobHandler.eea
index 3b3abe0e4d..92ef79ea5e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/lob/DefaultLobHandler.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/lob/DefaultLobHandler.eea
@@ -21,4 +21,4 @@ getClobAsString
  (Ljava/sql/ResultSet;I)L0java/lang/String; # @Inherited(org.springframework.jdbc.support.lob.LobHandler)
 getLobCreator
  ()Lorg/springframework/jdbc/support/lob/LobCreator;
- ()Lorg/springframework/jdbc/support/lob/LobCreator;
+ ()L1org/springframework/jdbc/support/lob/LobCreator;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.eea
index 8ab9053b85..dc0d665c40 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.eea
@@ -26,16 +26,16 @@ getXmlAsString
  (Ljava/sql/ResultSet;Ljava/lang/String;)L0java/lang/String; # @Inherited(org.springframework.jdbc.support.xml.SqlXmlHandler)
 newSqlXmlValue
  (Ljava/lang/Class<+Ljavax/xml/transform/Result;>;Lorg/springframework/jdbc/support/xml/XmlResultProvider;)Lorg/springframework/jdbc/support/xml/SqlXmlValue;
- (Ljava/lang/Class<+Ljavax/xml/transform/Result;>;Lorg/springframework/jdbc/support/xml/XmlResultProvider;)Lorg/springframework/jdbc/support/xml/SqlXmlValue;
+ (Ljava/lang/Class<+Ljavax/xml/transform/Result;>;Lorg/springframework/jdbc/support/xml/XmlResultProvider;)L1org/springframework/jdbc/support/xml/SqlXmlValue;
 newSqlXmlValue
  (Ljava/lang/String;)Lorg/springframework/jdbc/support/xml/SqlXmlValue;
- (Ljava/lang/String;)Lorg/springframework/jdbc/support/xml/SqlXmlValue;
+ (Ljava/lang/String;)L1org/springframework/jdbc/support/xml/SqlXmlValue;
 newSqlXmlValue
  (Lorg/springframework/jdbc/support/xml/XmlBinaryStreamProvider;)Lorg/springframework/jdbc/support/xml/SqlXmlValue;
- (Lorg/springframework/jdbc/support/xml/XmlBinaryStreamProvider;)Lorg/springframework/jdbc/support/xml/SqlXmlValue;
+ (Lorg/springframework/jdbc/support/xml/XmlBinaryStreamProvider;)L1org/springframework/jdbc/support/xml/SqlXmlValue;
 newSqlXmlValue
  (Lorg/springframework/jdbc/support/xml/XmlCharacterStreamProvider;)Lorg/springframework/jdbc/support/xml/SqlXmlValue;
- (Lorg/springframework/jdbc/support/xml/XmlCharacterStreamProvider;)Lorg/springframework/jdbc/support/xml/SqlXmlValue;
+ (Lorg/springframework/jdbc/support/xml/XmlCharacterStreamProvider;)L1org/springframework/jdbc/support/xml/SqlXmlValue;
 newSqlXmlValue
  (Lorg/w3c/dom/Document;)Lorg/springframework/jdbc/support/xml/SqlXmlValue;
- (Lorg/w3c/dom/Document;)Lorg/springframework/jdbc/support/xml/SqlXmlValue;
+ (Lorg/w3c/dom/Document;)L1org/springframework/jdbc/support/xml/SqlXmlValue;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/MBeanExporter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/MBeanExporter.eea
index 4df1ebd44f..e3efe10481 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/MBeanExporter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/MBeanExporter.eea
@@ -8,10 +8,10 @@ addExcludedBean
  (Ljava/lang/String;)V
 createAndConfigureMBean
  (Ljava/lang/Object;Ljava/lang/String;)Ljavax/management/modelmbean/ModelMBean;
- (Ljava/lang/Object;Ljava/lang/String;)Ljavax/management/modelmbean/ModelMBean;
+ (Ljava/lang/Object;Ljava/lang/String;)L1javax/management/modelmbean/ModelMBean;
 createModelMBean
  ()Ljavax/management/modelmbean/ModelMBean;
- ()Ljavax/management/modelmbean/ModelMBean;
+ ()L1javax/management/modelmbean/ModelMBean;
 getObjectName
  (Ljava/lang/Object;Ljava/lang/String;)Ljavax/management/ObjectName;
  (Ljava/lang/Object;Ljava/lang/String;)Ljavax/management/ObjectName;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/SpringModelMBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/SpringModelMBean.eea
index fb443c624b..8739ff6ec8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/SpringModelMBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/SpringModelMBean.eea
@@ -8,7 +8,7 @@ getAttribute
  (Ljava/lang/String;)Ljava/lang/Object;
 getAttributes
  ([Ljava/lang/String;)Ljavax/management/AttributeList;
- ([Ljava/lang/String;)Ljavax/management/AttributeList;
+ ([Ljava/lang/String;)L1javax/management/AttributeList; # @Inherited(javax.management.modelmbean.RequiredModelMBean)
 invoke
  (Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/String;)Ljava/lang/Object;
@@ -17,7 +17,7 @@ setAttribute
  (Ljavax/management/Attribute;)V
 setAttributes
  (Ljavax/management/AttributeList;)Ljavax/management/AttributeList;
- (Ljavax/management/AttributeList;)Ljavax/management/AttributeList;
+ (Ljavax/management/AttributeList;)L1javax/management/AttributeList; # @Inherited(javax.management.modelmbean.RequiredModelMBean)
 setManagedResource
  (Ljava/lang/Object;Ljava/lang/String;)V
  (Ljava/lang/Object;Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.eea
index 02a31ce32f..0c34ad4a03 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.eea
@@ -2,7 +2,7 @@ class org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAsse
 
 getNotificationInfo
  (Ljava/lang/Object;Ljava/lang/String;)[Ljavax/management/modelmbean/ModelMBeanNotificationInfo;
- (Ljava/lang/Object;Ljava/lang/String;)[Ljavax/management/modelmbean/ModelMBeanNotificationInfo;
+ (Ljava/lang/Object;Ljava/lang/String;)[1Ljavax/management/modelmbean/ModelMBeanNotificationInfo; # @Inherited(org.springframework.jmx.export.assembler.AbstractMBeanInfoAssembler)
 setNotificationInfoMappings
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)V
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.eea
index 997a6337a4..8ed69a340d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.eea
@@ -17,16 +17,16 @@ getClassToExpose
  (Ljava/lang/Object;)Ljava/lang/Class<*>;
 getConstructorInfo
  (Ljava/lang/Object;Ljava/lang/String;)[Ljavax/management/modelmbean/ModelMBeanConstructorInfo;
- (Ljava/lang/Object;Ljava/lang/String;)[Ljavax/management/modelmbean/ModelMBeanConstructorInfo;
+ (Ljava/lang/Object;Ljava/lang/String;)[1Ljavax/management/modelmbean/ModelMBeanConstructorInfo;
 getDescription
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
 getMBeanInfo
  (Ljava/lang/Object;Ljava/lang/String;)Ljavax/management/modelmbean/ModelMBeanInfo;
- (Ljava/lang/Object;Ljava/lang/String;)Ljavax/management/modelmbean/ModelMBeanInfo;
+ (Ljava/lang/Object;Ljava/lang/String;)L1javax/management/modelmbean/ModelMBeanInfo;
 getNotificationInfo
  (Ljava/lang/Object;Ljava/lang/String;)[Ljavax/management/modelmbean/ModelMBeanNotificationInfo;
- (Ljava/lang/Object;Ljava/lang/String;)[Ljavax/management/modelmbean/ModelMBeanNotificationInfo;
+ (Ljava/lang/Object;Ljava/lang/String;)[1Ljavax/management/modelmbean/ModelMBeanNotificationInfo;
 getOperationInfo
  (Ljava/lang/Object;Ljava/lang/String;)[Ljavax/management/modelmbean/ModelMBeanOperationInfo;
  (Ljava/lang/Object;Ljava/lang/String;)[Ljavax/management/modelmbean/ModelMBeanOperationInfo;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.eea
index e2d98e31d3..45b59f00eb 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.eea
@@ -69,7 +69,7 @@ applyDefaultCurrencyTimeLimit
  (Ljavax/management/Descriptor;)V
 createModelMBeanOperationInfo
  (Ljava/lang/reflect/Method;Ljava/lang/String;Ljava/lang/String;)Ljavax/management/modelmbean/ModelMBeanOperationInfo;
- (Ljava/lang/reflect/Method;Ljava/lang/String;Ljava/lang/String;)Ljavax/management/modelmbean/ModelMBeanOperationInfo;
+ (Ljava/lang/reflect/Method;Ljava/lang/String;Ljava/lang/String;)L1javax/management/modelmbean/ModelMBeanOperationInfo;
 getAttributeDescription
  (Ljava/beans/PropertyDescriptor;Ljava/lang/String;)Ljava/lang/String;
  (Ljava/beans/PropertyDescriptor;Ljava/lang/String;)Ljava/lang/String;
@@ -90,7 +90,7 @@ getOperationInfo
  (Ljava/lang/Object;Ljava/lang/String;)[Ljavax/management/modelmbean/ModelMBeanOperationInfo;
 getOperationParameters
  (Ljava/lang/reflect/Method;Ljava/lang/String;)[Ljavax/management/MBeanParameterInfo;
- (Ljava/lang/reflect/Method;Ljava/lang/String;)[Ljavax/management/MBeanParameterInfo;
+ (Ljava/lang/reflect/Method;Ljava/lang/String;)[1Ljavax/management/MBeanParameterInfo;
 getParameterNameDiscoverer
  ()Lorg/springframework/core/ParameterNameDiscoverer;
  ()L0org/springframework/core/ParameterNameDiscoverer;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.eea
index a3f800e9cc..93da21d9ec 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.eea
@@ -11,16 +11,16 @@ getAttributeDescription
  (Ljava/beans/PropertyDescriptor;Ljava/lang/String;)Ljava/lang/String;
 getDescription
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;)L1java/lang/String;
 getNotificationInfo
  (Ljava/lang/Object;Ljava/lang/String;)[Ljavax/management/modelmbean/ModelMBeanNotificationInfo;
- (Ljava/lang/Object;Ljava/lang/String;)[Ljavax/management/modelmbean/ModelMBeanNotificationInfo;
+ (Ljava/lang/Object;Ljava/lang/String;)[1Ljavax/management/modelmbean/ModelMBeanNotificationInfo; # @Inherited(org.springframework.jmx.export.assembler.AbstractMBeanInfoAssembler)
 getOperationDescription
  (Ljava/lang/reflect/Method;Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/reflect/Method;Ljava/lang/String;)Ljava/lang/String;
 getOperationParameters
  (Ljava/lang/reflect/Method;Ljava/lang/String;)[Ljavax/management/MBeanParameterInfo;
- (Ljava/lang/reflect/Method;Ljava/lang/String;)[Ljavax/management/MBeanParameterInfo;
+ (Ljava/lang/reflect/Method;Ljava/lang/String;)[1Ljavax/management/MBeanParameterInfo; # @Inherited(org.springframework.jmx.export.assembler.AbstractReflectiveMBeanInfoAssembler)
 includeBean
  (Ljava/lang/Class<*>;Ljava/lang/String;)Z
  (Ljava/lang/Class<*>;Ljava/lang/String;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/metadata/JmxMetadataUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/metadata/JmxMetadataUtils.eea
index 9158aa55f6..855432e5bb 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/metadata/JmxMetadataUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jmx/export/metadata/JmxMetadataUtils.eea
@@ -2,4 +2,4 @@ class org/springframework/jmx/export/metadata/JmxMetadataUtils
 
 convertToModelMBeanNotificationInfo
  (Lorg/springframework/jmx/export/metadata/ManagedNotification;)Ljavax/management/modelmbean/ModelMBeanNotificationInfo;
- (Lorg/springframework/jmx/export/metadata/ManagedNotification;)Ljavax/management/modelmbean/ModelMBeanNotificationInfo;
+ (Lorg/springframework/jmx/export/metadata/ManagedNotification;)L1javax/management/modelmbean/ModelMBeanNotificationInfo;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jmx/support/ConnectorServerFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jmx/support/ConnectorServerFactoryBean.eea
index 71af230897..aebf22bdc9 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jmx/support/ConnectorServerFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jmx/support/ConnectorServerFactoryBean.eea
@@ -13,7 +13,7 @@ getObject
  ()L0javax/management/remote/JMXConnectorServer;
 getObjectType
  ()Ljava/lang/Class<+Ljavax/management/remote/JMXConnectorServer;>;
- ()Ljava/lang/Class<+Ljavax/management/remote/JMXConnectorServer;>;
+ ()L1java/lang/Class<+Ljavax/management/remote/JMXConnectorServer;>;
 setEnvironment
  (Ljava/util/Properties;)V
  (Ljava/util/Properties;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jmx/support/JmxUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jmx/support/JmxUtils.eea
index 5a83dba053..077f22b2dc 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jmx/support/JmxUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jmx/support/JmxUtils.eea
@@ -24,7 +24,7 @@ getMXBeanInterface
  (Ljava/lang/Class<*>;)L0java/lang/Class<*>;
 getMethodSignature
  (Ljava/lang/reflect/Method;)[Ljava/lang/String;
- (Ljava/lang/reflect/Method;)[Ljava/lang/String;
+ (Ljava/lang/reflect/Method;)[1Ljava/lang/String;
 isMBean
  (Ljava/lang/Class<*>;)Z
  (Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.eea
index 376d7f8636..d0e344680e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.eea
@@ -9,7 +9,7 @@ getObject
  ()L0javax/management/MBeanServerConnection;
 getObjectType
  ()Ljava/lang/Class<+Ljavax/management/MBeanServerConnection;>;
- ()Ljava/lang/Class<+Ljavax/management/MBeanServerConnection;>;
+ ()L1java/lang/Class<+Ljavax/management/MBeanServerConnection;>;
 setBeanClassLoader
  (Ljava/lang/ClassLoader;)V
  (Ljava/lang/ClassLoader;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jmx/support/MBeanServerFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jmx/support/MBeanServerFactoryBean.eea
index 85b13cd9f4..3ee2c39dd2 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jmx/support/MBeanServerFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jmx/support/MBeanServerFactoryBean.eea
@@ -10,13 +10,13 @@ logger
 
 createMBeanServer
  (Ljava/lang/String;Z)Ljavax/management/MBeanServer;
- (Ljava/lang/String;Z)Ljavax/management/MBeanServer;
+ (Ljava/lang/String;Z)L1javax/management/MBeanServer;
 getObject
  ()Ljavax/management/MBeanServer;
  ()L0javax/management/MBeanServer;
 getObjectType
  ()Ljava/lang/Class<+Ljavax/management/MBeanServer;>;
- ()Ljava/lang/Class<+Ljavax/management/MBeanServer;>;
+ ()L1java/lang/Class<+Ljavax/management/MBeanServer;>;
 locateMBeanServer
  (Ljava/lang/String;)Ljavax/management/MBeanServer;
  (Ljava/lang/String;)Ljavax/management/MBeanServer;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.eea
index f73e1cfa2c..94f9de871e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.eea
@@ -9,4 +9,4 @@ getObject
  ()L0javax/management/MBeanServer;
 getObjectType
  ()Ljava/lang/Class<+Ljavax/management/MBeanServer;>;
- ()Ljava/lang/Class<+Ljavax/management/MBeanServer;>;
+ ()L1java/lang/Class<+Ljavax/management/MBeanServer;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jndi/JndiLocatorDelegate.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jndi/JndiLocatorDelegate.eea
index 38d98ae075..d4bcbab747 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jndi/JndiLocatorDelegate.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jndi/JndiLocatorDelegate.eea
@@ -6,7 +6,7 @@ IGNORE_JNDI_PROPERTY_NAME
 
 createDefaultResourceRefLocator
  ()Lorg/springframework/jndi/JndiLocatorDelegate;
- ()Lorg/springframework/jndi/JndiLocatorDelegate;
+ ()L1org/springframework/jndi/JndiLocatorDelegate;
 
 lookup
  (Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jndi/JndiLocatorSupport.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jndi/JndiLocatorSupport.eea
index 15f0e5850e..b445889265 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jndi/JndiLocatorSupport.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jndi/JndiLocatorSupport.eea
@@ -6,7 +6,7 @@ CONTAINER_PREFIX
 
 convertJndiName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 lookup
  (Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jndi/JndiObjectFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jndi/JndiObjectFactoryBean.eea
index a8a96b2fd5..d7cdbe9b74 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jndi/JndiObjectFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jndi/JndiObjectFactoryBean.eea
@@ -6,7 +6,7 @@ super org/springframework/beans/factory/FactoryBean
 
 createCompositeInterface
  ([Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
- ([Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
+ ([Ljava/lang/Class<*>;)L1java/lang/Class<*>;
 getObject
  ()Ljava/lang/Object;
  ()L0java/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jndi/JndiTemplate.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jndi/JndiTemplate.eea
index 1dc94a67ab..47ab9d54bb 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jndi/JndiTemplate.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jndi/JndiTemplate.eea
@@ -12,7 +12,7 @@ bind
  (Ljava/lang/String;Ljava/lang/Object;)V
 createInitialContext
  ()Ljavax/naming/Context;
- ()Ljavax/naming/Context;
+ ()L1javax/naming/Context;
 execute
  <T:Ljava/lang/Object;>(Lorg/springframework/jndi/JndiCallback<TT;>;)TT;
  <T:Ljava/lang/Object;>(Lorg/springframework/jndi/JndiCallback<TT;>;)T0T;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/jndi/support/SimpleJndiBeanFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/jndi/support/SimpleJndiBeanFactory.eea
index 5aa3d3e541..55e572da38 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/jndi/support/SimpleJndiBeanFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/jndi/support/SimpleJndiBeanFactory.eea
@@ -8,7 +8,7 @@ containsBean
  (Ljava/lang/String;)Z
 getAliases
  (Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/String;)[1Ljava/lang/String;
 getBean
  (Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;)Ljava/lang/Object;
@@ -26,10 +26,10 @@ getBean
  <T:Ljava/lang/Object;>(Ljava/lang/String;Ljava/lang/Class<TT;>;)TT;
 getBeanProvider
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/beans/factory/ObjectProvider<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/beans/factory/ObjectProvider<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1org/springframework/beans/factory/ObjectProvider<TT;>;
 getBeanProvider
  <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;)Lorg/springframework/beans/factory/ObjectProvider<TT;>;
- <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;)Lorg/springframework/beans/factory/ObjectProvider<TT;>;
+ <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;)L1org/springframework/beans/factory/ObjectProvider<TT;>;
 getType
  (Ljava/lang/String;)Ljava/lang/Class<*>;
  (Ljava/lang/String;)L0java/lang/Class<*>; # @Inherited(org.springframework.beans.factory.BeanFactory)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/MessageHeaders.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/MessageHeaders.eea
index 57b6c0ed3e..79c41c25ac 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/MessageHeaders.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/MessageHeaders.eea
@@ -71,13 +71,13 @@ keySet
  ()Ljava/util/Set<Ljava/lang/String;>;
 put
  (Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/String;Ljava/lang/Object;)L1java/lang/Object;
 putAll
  (Ljava/util/Map<+Ljava/lang/String;+Ljava/lang/Object;>;)V
  (Ljava/util/Map<+Ljava/lang/String;+Ljava/lang/Object;>;)V
 remove
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/CompositeMessageCondition.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/CompositeMessageCondition.eea
index a0a76ad606..c39118301c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/CompositeMessageCondition.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/CompositeMessageCondition.eea
@@ -9,7 +9,7 @@ super org/springframework/messaging/handler/MessageCondition
  ([Lorg/springframework/messaging/handler/MessageCondition<*>;)V
 combine
  (Lorg/springframework/messaging/handler/CompositeMessageCondition;)Lorg/springframework/messaging/handler/CompositeMessageCondition;
- (Lorg/springframework/messaging/handler/CompositeMessageCondition;)Lorg/springframework/messaging/handler/CompositeMessageCondition;
+ (Lorg/springframework/messaging/handler/CompositeMessageCondition;)L1org/springframework/messaging/handler/CompositeMessageCondition;
 compareTo
  (Lorg/springframework/messaging/handler/CompositeMessageCondition;Lorg/springframework/messaging/Message<*>;)I
  (Lorg/springframework/messaging/handler/CompositeMessageCondition;Lorg/springframework/messaging/Message<*>;)I
@@ -21,7 +21,7 @@ getCondition
  <T::Lorg/springframework/messaging/handler/MessageCondition<TT;>;>(Ljava/lang/Class<TT;>;)TT;
 getMatchingCondition
  (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/handler/CompositeMessageCondition;
- (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/handler/CompositeMessageCondition;
+ (Lorg/springframework/messaging/Message<*>;)L0org/springframework/messaging/handler/CompositeMessageCondition;
 getMessageConditions
  ()Ljava/util/List<Lorg/springframework/messaging/handler/MessageCondition<*>;>;
  ()Ljava/util/List<Lorg/springframework/messaging/handler/MessageCondition<*>;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/DestinationPatternsMessageCondition.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/DestinationPatternsMessageCondition.eea
index be9d8a62f8..7d3d130a73 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/DestinationPatternsMessageCondition.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/DestinationPatternsMessageCondition.eea
@@ -19,7 +19,7 @@ LOOKUP_DESTINATION_HEADER
  ([Ljava/lang/String;Lorg/springframework/util/RouteMatcher;)V
 combine
  (Lorg/springframework/messaging/handler/DestinationPatternsMessageCondition;)Lorg/springframework/messaging/handler/DestinationPatternsMessageCondition;
- (Lorg/springframework/messaging/handler/DestinationPatternsMessageCondition;)Lorg/springframework/messaging/handler/DestinationPatternsMessageCondition;
+ (Lorg/springframework/messaging/handler/DestinationPatternsMessageCondition;)L1org/springframework/messaging/handler/DestinationPatternsMessageCondition;
 compareTo
  (Lorg/springframework/messaging/handler/DestinationPatternsMessageCondition;Lorg/springframework/messaging/Message<*>;)I
  (Lorg/springframework/messaging/handler/DestinationPatternsMessageCondition;Lorg/springframework/messaging/Message<*>;)I
@@ -34,4 +34,4 @@ getPatterns
  ()Ljava/util/Set<Ljava/lang/String;>;
 getToStringInfix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/HandlerMethod$HandlerMethodParameter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/HandlerMethod$HandlerMethodParameter.eea
index 3a7be060a4..3c211e5dae 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/HandlerMethod$HandlerMethodParameter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/HandlerMethod$HandlerMethodParameter.eea
@@ -8,7 +8,7 @@ class org/springframework/messaging/handler/HandlerMethod$HandlerMethodParameter
  (Lorg/springframework/messaging/handler/HandlerMethod;Lorg/springframework/messaging/handler/HandlerMethod$HandlerMethodParameter;)V
 clone
  ()Lorg/springframework/messaging/handler/HandlerMethod$HandlerMethodParameter;
- ()Lorg/springframework/messaging/handler/HandlerMethod$HandlerMethodParameter;
+ ()L1org/springframework/messaging/handler/HandlerMethod$HandlerMethodParameter;
 getContainingClass
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/HandlerMethod.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/HandlerMethod.eea
index 1983f84ad9..cba27bbebb 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/HandlerMethod.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/HandlerMethod.eea
@@ -9,7 +9,7 @@ findProvidedArgument
  (Lorg/springframework/core/MethodParameter;[Ljava/lang/Object;)L0java/lang/Object;
 formatArgumentError
  (Lorg/springframework/core/MethodParameter;Ljava/lang/String;)Ljava/lang/String;
- (Lorg/springframework/core/MethodParameter;Ljava/lang/String;)Ljava/lang/String;
+ (Lorg/springframework/core/MethodParameter;Ljava/lang/String;)L1java/lang/String;
 
 logger
  Lorg/apache/commons/logging/Log;
@@ -32,13 +32,13 @@ assertTargetBean
  (Ljava/lang/reflect/Method;Ljava/lang/Object;[Ljava/lang/Object;)V
 createWithResolvedBean
  ()Lorg/springframework/messaging/handler/HandlerMethod;
- ()Lorg/springframework/messaging/handler/HandlerMethod;
+ ()L1org/springframework/messaging/handler/HandlerMethod;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 formatInvokeError
  (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1java/lang/String;
 getBean
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
@@ -68,10 +68,10 @@ getReturnType
  ()Lorg/springframework/core/MethodParameter;
 getReturnValueType
  (Ljava/lang/Object;)Lorg/springframework/core/MethodParameter;
- (Ljava/lang/Object;)Lorg/springframework/core/MethodParameter;
+ (Ljava/lang/Object;)L1org/springframework/core/MethodParameter;
 getShortLogMessage
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 hasMethodAnnotation
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)Z
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver.eea
index 9ce2d055c7..77dd150ed4 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver.eea
@@ -5,7 +5,7 @@ class org/springframework/messaging/handler/annotation/reactive/AbstractNamedVal
  (Lorg/springframework/core/convert/ConversionService;Lorg/springframework/beans/factory/config/ConfigurableBeanFactory;)V
 createNamedValueInfo
  (Lorg/springframework/core/MethodParameter;)Lorg/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
- (Lorg/springframework/core/MethodParameter;)Lorg/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
+ (Lorg/springframework/core/MethodParameter;)L1org/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
 handleMissingValue
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/messaging/Message<*>;)V
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/messaging/Message<*>;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/reactive/DestinationVariableMethodArgumentResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/reactive/DestinationVariableMethodArgumentResolver.eea
index b1d879bbbd..25aeb3edcb 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/reactive/DestinationVariableMethodArgumentResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/reactive/DestinationVariableMethodArgumentResolver.eea
@@ -9,7 +9,7 @@ DESTINATION_TEMPLATE_VARIABLES_HEADER
  (Lorg/springframework/core/convert/ConversionService;)V
 createNamedValueInfo
  (Lorg/springframework/core/MethodParameter;)Lorg/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
- (Lorg/springframework/core/MethodParameter;)Lorg/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
+ (Lorg/springframework/core/MethodParameter;)L1org/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver$NamedValueInfo; # @Inherited(org.springframework.messaging.handler.annotation.reactive.AbstractNamedValueMethodArgumentResolver)
 handleMissingValue
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/messaging/Message<*>;)V
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/messaging/Message<*>;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/reactive/HeaderMethodArgumentResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/reactive/HeaderMethodArgumentResolver.eea
index 498e9556e3..16b0501eeb 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/reactive/HeaderMethodArgumentResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/reactive/HeaderMethodArgumentResolver.eea
@@ -5,7 +5,7 @@ class org/springframework/messaging/handler/annotation/reactive/HeaderMethodArgu
  (Lorg/springframework/core/convert/ConversionService;Lorg/springframework/beans/factory/config/ConfigurableBeanFactory;)V
 createNamedValueInfo
  (Lorg/springframework/core/MethodParameter;)Lorg/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
- (Lorg/springframework/core/MethodParameter;)Lorg/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
+ (Lorg/springframework/core/MethodParameter;)L1org/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver$NamedValueInfo; # @Inherited(org.springframework.messaging.handler.annotation.reactive.AbstractNamedValueMethodArgumentResolver)
 handleMissingValue
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/messaging/Message<*>;)V
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/messaging/Message<*>;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.eea
index 6502b7bc3a..e831717ce6 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.eea
@@ -6,7 +6,7 @@ super org/springframework/messaging/handler/invocation/reactive/AbstractMethodMe
 
 createExceptionMethodResolverFor
  (Ljava/lang/Class<*>;)Lorg/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver;
- (Ljava/lang/Class<*>;)Lorg/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver;
+ (Ljava/lang/Class<*>;)L1org/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver; # @Inherited(org.springframework.messaging.handler.invocation.reactive.AbstractMethodMessageHandler)
 getCondition
  (Ljava/lang/reflect/AnnotatedElement;)Lorg/springframework/messaging/handler/CompositeMessageCondition;
  (Ljava/lang/reflect/AnnotatedElement;)L0org/springframework/messaging/handler/CompositeMessageCondition;
@@ -21,7 +21,7 @@ getDestination
  (Lorg/springframework/messaging/Message<*>;)L0org/springframework/util/RouteMatcher$Route; # @Inherited(org.springframework.messaging.handler.invocation.reactive.AbstractMethodMessageHandler)
 getDirectLookupMappings
  (Lorg/springframework/messaging/handler/CompositeMessageCondition;)Ljava/util/Set<Ljava/lang/String;>;
- (Lorg/springframework/messaging/handler/CompositeMessageCondition;)Ljava/util/Set<Ljava/lang/String;>;
+ (Lorg/springframework/messaging/handler/CompositeMessageCondition;)L1java/util/Set<Ljava/lang/String;>;
 getMappingComparator
  (Lorg/springframework/messaging/Message<*>;)Ljava/util/Comparator<Lorg/springframework/messaging/handler/CompositeMessageCondition;>;
  (Lorg/springframework/messaging/Message<*>;)Ljava/util/Comparator<Lorg/springframework/messaging/handler/CompositeMessageCondition;>;
@@ -42,7 +42,7 @@ handleMatch
  (Lorg/springframework/messaging/handler/CompositeMessageCondition;Lorg/springframework/messaging/handler/HandlerMethod;Lorg/springframework/messaging/Message<*>;)Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
 initArgumentResolvers
  ()Ljava/util/List<+Lorg/springframework/messaging/handler/invocation/reactive/HandlerMethodArgumentResolver;>;
- ()Ljava/util/List<+Lorg/springframework/messaging/handler/invocation/reactive/HandlerMethodArgumentResolver;>;
+ ()L1java/util/List<+Lorg/springframework/messaging/handler/invocation/reactive/HandlerMethodArgumentResolver;>;
 initReturnValueHandlers
  ()Ljava/util/List<+Lorg/springframework/messaging/handler/invocation/reactive/HandlerMethodReturnValueHandler;>;
  ()Ljava/util/List<+Lorg/springframework/messaging/handler/invocation/reactive/HandlerMethodReturnValueHandler;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.eea
index ba94264c24..785bfec181 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.eea
@@ -5,7 +5,7 @@ class org/springframework/messaging/handler/annotation/support/AbstractNamedValu
  (Lorg/springframework/core/convert/ConversionService;Lorg/springframework/beans/factory/config/ConfigurableBeanFactory;)V
 createNamedValueInfo
  (Lorg/springframework/core/MethodParameter;)Lorg/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
- (Lorg/springframework/core/MethodParameter;)Lorg/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
+ (Lorg/springframework/core/MethodParameter;)L1org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
 handleMissingValue
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/messaging/Message<*>;)V
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/messaging/Message<*>;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/support/DefaultMessageHandlerMethodFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/support/DefaultMessageHandlerMethodFactory.eea
index c15515235e..36e385c9d3 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/support/DefaultMessageHandlerMethodFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/support/DefaultMessageHandlerMethodFactory.eea
@@ -2,10 +2,10 @@ class org/springframework/messaging/handler/annotation/support/DefaultMessageHan
 
 createInvocableHandlerMethod
  (Ljava/lang/Object;Ljava/lang/reflect/Method;)Lorg/springframework/messaging/handler/invocation/InvocableHandlerMethod;
- (Ljava/lang/Object;Ljava/lang/reflect/Method;)Lorg/springframework/messaging/handler/invocation/InvocableHandlerMethod;
+ (Ljava/lang/Object;Ljava/lang/reflect/Method;)L1org/springframework/messaging/handler/invocation/InvocableHandlerMethod; # @Inherited(org.springframework.messaging.handler.annotation.support.MessageHandlerMethodFactory)
 initArgumentResolvers
  ()Ljava/util/List<Lorg/springframework/messaging/handler/invocation/HandlerMethodArgumentResolver;>;
- ()Ljava/util/List<Lorg/springframework/messaging/handler/invocation/HandlerMethodArgumentResolver;>;
+ ()L1java/util/List<Lorg/springframework/messaging/handler/invocation/HandlerMethodArgumentResolver;>;
 setArgumentResolvers
  (Ljava/util/List<Lorg/springframework/messaging/handler/invocation/HandlerMethodArgumentResolver;>;)V
  (Ljava/util/List<Lorg/springframework/messaging/handler/invocation/HandlerMethodArgumentResolver;>;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/support/DestinationVariableMethodArgumentResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/support/DestinationVariableMethodArgumentResolver.eea
index 92c188daf9..918fa87183 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/support/DestinationVariableMethodArgumentResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/support/DestinationVariableMethodArgumentResolver.eea
@@ -9,7 +9,7 @@ DESTINATION_TEMPLATE_VARIABLES_HEADER
  (Lorg/springframework/core/convert/ConversionService;)V
 createNamedValueInfo
  (Lorg/springframework/core/MethodParameter;)Lorg/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
- (Lorg/springframework/core/MethodParameter;)Lorg/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
+ (Lorg/springframework/core/MethodParameter;)L1org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver$NamedValueInfo; # @Inherited(org.springframework.messaging.handler.annotation.support.AbstractNamedValueMethodArgumentResolver)
 handleMissingValue
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/messaging/Message<*>;)V
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/messaging/Message<*>;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolver.eea
index caab21da2f..6843efd66a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolver.eea
@@ -5,7 +5,7 @@ class org/springframework/messaging/handler/annotation/support/HeaderMethodArgum
  (Lorg/springframework/core/convert/ConversionService;Lorg/springframework/beans/factory/config/ConfigurableBeanFactory;)V
 createNamedValueInfo
  (Lorg/springframework/core/MethodParameter;)Lorg/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
- (Lorg/springframework/core/MethodParameter;)Lorg/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
+ (Lorg/springframework/core/MethodParameter;)L1org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver$NamedValueInfo; # @Inherited(org.springframework.messaging.handler.annotation.support.AbstractNamedValueMethodArgumentResolver)
 handleMissingValue
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/messaging/Message<*>;)V
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/messaging/Message<*>;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/support/MessageHandlerMethodFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/support/MessageHandlerMethodFactory.eea
index 4520ce877d..7b7839baa7 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/support/MessageHandlerMethodFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/annotation/support/MessageHandlerMethodFactory.eea
@@ -2,4 +2,4 @@ class org/springframework/messaging/handler/annotation/support/MessageHandlerMet
 
 createInvocableHandlerMethod
  (Ljava/lang/Object;Ljava/lang/reflect/Method;)Lorg/springframework/messaging/handler/invocation/InvocableHandlerMethod;
- (Ljava/lang/Object;Ljava/lang/reflect/Method;)Lorg/springframework/messaging/handler/invocation/InvocableHandlerMethod;
+ (Ljava/lang/Object;Ljava/lang/reflect/Method;)L1org/springframework/messaging/handler/invocation/InvocableHandlerMethod;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver.eea
index 7999da592c..60bf37fba4 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver.eea
@@ -2,7 +2,7 @@ class org/springframework/messaging/handler/invocation/AbstractExceptionHandlerM
 
 getExceptionsFromMethodSignature
  (Ljava/lang/reflect/Method;)Ljava/util/List<Ljava/lang/Class<+Ljava/lang/Throwable;>;>;
- (Ljava/lang/reflect/Method;)Ljava/util/List<Ljava/lang/Class<+Ljava/lang/Throwable;>;>;
+ (Ljava/lang/reflect/Method;)L1java/util/List<Ljava/lang/Class<+Ljava/lang/Throwable;>;>;
 
 <init>
  (Ljava/util/Map<Ljava/lang/Class<+Ljava/lang/Throwable;>;Ljava/lang/reflect/Method;>;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.eea
index 9775305b80..1d3936ac7e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.eea
@@ -8,10 +8,10 @@ logger
 
 createExceptionHandlerMethodResolverFor
  (Ljava/lang/Class<*>;)Lorg/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver;
- (Ljava/lang/Class<*>;)Lorg/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver;
+ (Ljava/lang/Class<*>;)L1org/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver;
 createHandlerMethod
  (Ljava/lang/Object;Ljava/lang/reflect/Method;)Lorg/springframework/messaging/handler/HandlerMethod;
- (Ljava/lang/Object;Ljava/lang/reflect/Method;)Lorg/springframework/messaging/handler/HandlerMethod;
+ (Ljava/lang/Object;Ljava/lang/reflect/Method;)L1org/springframework/messaging/handler/HandlerMethod;
 detectHandlerMethods
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.eea
index 33111455de..ce26a74609 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.eea
@@ -8,7 +8,7 @@ logger
 
 createExceptionMethodResolverFor
  (Ljava/lang/Class<*>;)Lorg/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver;
- (Ljava/lang/Class<*>;)Lorg/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver;
+ (Ljava/lang/Class<*>;)L1org/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver;
 detectHandlerMethods
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
@@ -26,7 +26,7 @@ getArgumentResolvers
  ()Lorg/springframework/messaging/handler/invocation/reactive/HandlerMethodArgumentResolverComposite;
 getBeanName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getDestination
  (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/util/RouteMatcher$Route;
  (Lorg/springframework/messaging/Message<*>;)L0org/springframework/util/RouteMatcher$Route;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/rsocket/DefaultMetadataExtractor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/rsocket/DefaultMetadataExtractor.eea
index 476d3d960e..0b0a49e748 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/rsocket/DefaultMetadataExtractor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/rsocket/DefaultMetadataExtractor.eea
@@ -8,7 +8,7 @@ class org/springframework/messaging/rsocket/DefaultMetadataExtractor
  ([Lorg/springframework/core/codec/Decoder<*>;)V
 extract
  (Lio/rsocket/Payload;Lorg/springframework/util/MimeType;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- (Lio/rsocket/Payload;Lorg/springframework/util/MimeType;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ (Lio/rsocket/Payload;Lorg/springframework/util/MimeType;)L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 getDecoders
  ()Ljava/util/List<+Lorg/springframework/core/codec/Decoder<*>;>;
  ()Ljava/util/List<+Lorg/springframework/core/codec/Decoder<*>;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/rsocket/PayloadUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/rsocket/PayloadUtils.eea
index 2448db1bd4..40f0a87c43 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/rsocket/PayloadUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/rsocket/PayloadUtils.eea
@@ -2,10 +2,10 @@ class org/springframework/messaging/rsocket/PayloadUtils
 
 createPayload
  (Lorg/springframework/core/io/buffer/DataBuffer;)Lio/rsocket/Payload;
- (Lorg/springframework/core/io/buffer/DataBuffer;)Lio/rsocket/Payload;
+ (Lorg/springframework/core/io/buffer/DataBuffer;)L1io/rsocket/Payload;
 createPayload
  (Lorg/springframework/core/io/buffer/DataBuffer;Lorg/springframework/core/io/buffer/DataBuffer;)Lio/rsocket/Payload;
- (Lorg/springframework/core/io/buffer/DataBuffer;Lorg/springframework/core/io/buffer/DataBuffer;)Lio/rsocket/Payload;
+ (Lorg/springframework/core/io/buffer/DataBuffer;Lorg/springframework/core/io/buffer/DataBuffer;)L1io/rsocket/Payload;
 retainDataAndReleasePayload
  (Lio/rsocket/Payload;Lorg/springframework/core/io/buffer/DataBufferFactory;)Lorg/springframework/core/io/buffer/DataBuffer;
  (Lio/rsocket/Payload;Lorg/springframework/core/io/buffer/DataBufferFactory;)Lorg/springframework/core/io/buffer/DataBuffer;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/rsocket/RSocketRequester.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/rsocket/RSocketRequester.eea
index c6d10ad520..96cace7269 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/rsocket/RSocketRequester.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/rsocket/RSocketRequester.eea
@@ -2,10 +2,10 @@ class org/springframework/messaging/rsocket/RSocketRequester
 
 builder
  ()Lorg/springframework/messaging/rsocket/RSocketRequester$Builder;
- ()Lorg/springframework/messaging/rsocket/RSocketRequester$Builder;
+ ()L1org/springframework/messaging/rsocket/RSocketRequester$Builder;
 wrap
  (Lio/rsocket/RSocket;Lorg/springframework/util/MimeType;Lorg/springframework/util/MimeType;Lorg/springframework/messaging/rsocket/RSocketStrategies;)Lorg/springframework/messaging/rsocket/RSocketRequester;
- (Lio/rsocket/RSocket;Lorg/springframework/util/MimeType;Lorg/springframework/util/MimeType;Lorg/springframework/messaging/rsocket/RSocketStrategies;)Lorg/springframework/messaging/rsocket/RSocketRequester;
+ (Lio/rsocket/RSocket;Lorg/springframework/util/MimeType;Lorg/springframework/util/MimeType;Lorg/springframework/messaging/rsocket/RSocketStrategies;)L1org/springframework/messaging/rsocket/RSocketRequester;
 
 dataMimeType
  ()Lorg/springframework/util/MimeType;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/rsocket/RSocketStrategies.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/rsocket/RSocketStrategies.eea
index c161b64bcb..37e8e794d0 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/rsocket/RSocketStrategies.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/rsocket/RSocketStrategies.eea
@@ -2,10 +2,10 @@ class org/springframework/messaging/rsocket/RSocketStrategies
 
 builder
  ()Lorg/springframework/messaging/rsocket/RSocketStrategies$Builder;
- ()Lorg/springframework/messaging/rsocket/RSocketStrategies$Builder;
+ ()L1org/springframework/messaging/rsocket/RSocketStrategies$Builder;
 create
  ()Lorg/springframework/messaging/rsocket/RSocketStrategies;
- ()Lorg/springframework/messaging/rsocket/RSocketStrategies;
+ ()L1org/springframework/messaging/rsocket/RSocketStrategies;
 
 dataBufferFactory
  ()Lorg/springframework/core/io/buffer/DataBufferFactory;
@@ -27,7 +27,7 @@ metadataExtractor
  ()Lorg/springframework/messaging/rsocket/MetadataExtractor;
 mutate
  ()Lorg/springframework/messaging/rsocket/RSocketStrategies$Builder;
- ()Lorg/springframework/messaging/rsocket/RSocketStrategies$Builder;
+ ()L1org/springframework/messaging/rsocket/RSocketStrategies$Builder;
 reactiveAdapterRegistry
  ()Lorg/springframework/core/ReactiveAdapterRegistry;
  ()Lorg/springframework/core/ReactiveAdapterRegistry;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.eea
index fdfe0b7f1b..9751c794bc 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.eea
@@ -56,7 +56,7 @@ getFrameTypes
  ()Ljava/util/Set<Lio/rsocket/frame/FrameType;>;
 getMatchingCondition
  (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition;
- (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition;
+ (Lorg/springframework/messaging/Message<*>;)L0org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition;
 getToStringInfix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.eea
index 7192be7d72..b1e8c83c02 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.eea
@@ -30,7 +30,7 @@ handleNoMatch
  (Lorg/springframework/util/RouteMatcher$Route;Lorg/springframework/messaging/Message<*>;)V
 initReturnValueHandlers
  ()Ljava/util/List<+Lorg/springframework/messaging/handler/invocation/reactive/HandlerMethodReturnValueHandler;>;
- ()Ljava/util/List<+Lorg/springframework/messaging/handler/invocation/reactive/HandlerMethodReturnValueHandler;>;
+ ()L1java/util/List<+Lorg/springframework/messaging/handler/invocation/reactive/HandlerMethodReturnValueHandler;>;
 responder
  ()Lio/rsocket/SocketAcceptor;
  ()Lio/rsocket/SocketAcceptor;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/SimpAttributes.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/SimpAttributes.eea
index f16294d790..f911489079 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/SimpAttributes.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/SimpAttributes.eea
@@ -12,7 +12,7 @@ SESSION_MUTEX_NAME
 
 fromMessage
  (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/simp/SimpAttributes;
- (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/simp/SimpAttributes;
+ (Lorg/springframework/messaging/Message<*>;)L1org/springframework/messaging/simp/SimpAttributes;
 
 <init>
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/SimpMessageHeaderAccessor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/SimpMessageHeaderAccessor.eea
index 2fda45edc0..445dbe5f60 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/SimpMessageHeaderAccessor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/SimpMessageHeaderAccessor.eea
@@ -36,10 +36,10 @@ USER_HEADER
 
 create
  ()Lorg/springframework/messaging/simp/SimpMessageHeaderAccessor;
- ()Lorg/springframework/messaging/simp/SimpMessageHeaderAccessor;
+ ()L1org/springframework/messaging/simp/SimpMessageHeaderAccessor;
 create
  (Lorg/springframework/messaging/simp/SimpMessageType;)Lorg/springframework/messaging/simp/SimpMessageHeaderAccessor;
- (Lorg/springframework/messaging/simp/SimpMessageType;)Lorg/springframework/messaging/simp/SimpMessageHeaderAccessor;
+ (Lorg/springframework/messaging/simp/SimpMessageType;)L1org/springframework/messaging/simp/SimpMessageHeaderAccessor;
 getDestination
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Ljava/lang/String;
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L0java/lang/String;
@@ -63,7 +63,7 @@ getUser
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L0java/security/Principal;
 wrap
  (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/simp/SimpMessageHeaderAccessor;
- (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/simp/SimpMessageHeaderAccessor;
+ (Lorg/springframework/messaging/Message<*>;)L1org/springframework/messaging/simp/SimpMessageHeaderAccessor;
 
 <init>
  (Lorg/springframework/messaging/Message<*>;)V
@@ -73,13 +73,13 @@ wrap
  (Lorg/springframework/messaging/simp/SimpMessageType;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;)V
 createAccessor
  (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/support/MessageHeaderAccessor;
- (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/support/MessageHeaderAccessor;
+ (Lorg/springframework/messaging/Message<*>;)L1org/springframework/messaging/support/MessageHeaderAccessor; # @Inherited(org.springframework.messaging.support.MessageHeaderAccessor)
 getDestination
  ()Ljava/lang/String;
  ()L0java/lang/String;
 getDetailedLogMessage
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(org.springframework.messaging.support.MessageHeaderAccessor)
 getMessageType
  ()Lorg/springframework/messaging/simp/SimpMessageType;
  ()L0org/springframework/messaging/simp/SimpMessageType;
@@ -91,7 +91,7 @@ getSessionId
  ()L0java/lang/String;
 getShortLogMessage
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(org.springframework.messaging.support.MessageHeaderAccessor)
 getSubscriptionId
  ()Ljava/lang/String;
  ()L0java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/SimpMessageTypeMessageCondition.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/SimpMessageTypeMessageCondition.eea
index 0a78e30bf3..c2a33b8de3 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/SimpMessageTypeMessageCondition.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/SimpMessageTypeMessageCondition.eea
@@ -31,4 +31,4 @@ getMessageType
  ()Lorg/springframework/messaging/simp/SimpMessageType;
 getToStringInfix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.eea
index eb585ccdb9..974f3ceb88 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.eea
@@ -9,7 +9,7 @@ super org/springframework/messaging/handler/invocation/AbstractMethodMessageHand
  (Lorg/springframework/messaging/SubscribableChannel;Lorg/springframework/messaging/MessageChannel;Lorg/springframework/messaging/simp/SimpMessageSendingOperations;)V
 createExceptionHandlerMethodResolverFor
  (Ljava/lang/Class<*>;)Lorg/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver;
- (Ljava/lang/Class<*>;)Lorg/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver;
+ (Ljava/lang/Class<*>;)L1org/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver; # @Inherited(org.springframework.messaging.handler.invocation.AbstractMethodMessageHandler)
 getConversionService
  ()Lorg/springframework/core/convert/ConversionService;
  ()Lorg/springframework/core/convert/ConversionService;
@@ -18,7 +18,7 @@ getDestination
  (Lorg/springframework/messaging/Message<*>;)L0java/lang/String; # @Inherited(org.springframework.messaging.handler.invocation.AbstractMethodMessageHandler)
 getDirectLookupDestinations
  (Lorg/springframework/messaging/simp/SimpMessageMappingInfo;)Ljava/util/Set<Ljava/lang/String;>;
- (Lorg/springframework/messaging/simp/SimpMessageMappingInfo;)Ljava/util/Set<Ljava/lang/String;>;
+ (Lorg/springframework/messaging/simp/SimpMessageMappingInfo;)L1java/util/Set<Ljava/lang/String;>;
 getHandlerMethodLogger
  ()Lorg/apache/commons/logging/Log;
  ()L0org/apache/commons/logging/Log; # @Inherited(org.springframework.messaging.handler.invocation.AbstractMethodMessageHandler)
@@ -54,10 +54,10 @@ handleMatch
  (Lorg/springframework/messaging/simp/SimpMessageMappingInfo;Lorg/springframework/messaging/handler/HandlerMethod;Ljava/lang/String;Lorg/springframework/messaging/Message<*>;)V
 initArgumentResolvers
  ()Ljava/util/List<Lorg/springframework/messaging/handler/invocation/HandlerMethodArgumentResolver;>;
- ()Ljava/util/List<Lorg/springframework/messaging/handler/invocation/HandlerMethodArgumentResolver;>;
+ ()L1java/util/List<Lorg/springframework/messaging/handler/invocation/HandlerMethodArgumentResolver;>;
 initReturnValueHandlers
  ()Ljava/util/List<+Lorg/springframework/messaging/handler/invocation/HandlerMethodReturnValueHandler;>;
- ()Ljava/util/List<+Lorg/springframework/messaging/handler/invocation/HandlerMethodReturnValueHandler;>;
+ ()L1java/util/List<+Lorg/springframework/messaging/handler/invocation/HandlerMethodReturnValueHandler;>;
 isHandler
  (Ljava/lang/Class<*>;)Z
  (Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.eea
index 03dbd7f418..ff4ff8f787 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.eea
@@ -8,25 +8,25 @@ addReturnValueHandlers
  (Ljava/util/List<Lorg/springframework/messaging/handler/invocation/HandlerMethodReturnValueHandler;>;)V
 brokerChannel
  (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/core/task/TaskExecutor;)Lorg/springframework/messaging/support/AbstractSubscribableChannel;
- (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/core/task/TaskExecutor;)Lorg/springframework/messaging/support/AbstractSubscribableChannel;
+ (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/core/task/TaskExecutor;)L1org/springframework/messaging/support/AbstractSubscribableChannel;
 brokerChannelExecutor
  (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;)Lorg/springframework/core/task/TaskExecutor;
- (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;)Lorg/springframework/core/task/TaskExecutor;
+ (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;)L1org/springframework/core/task/TaskExecutor;
 brokerMessageConverter
  ()Lorg/springframework/messaging/converter/CompositeMessageConverter;
- ()Lorg/springframework/messaging/converter/CompositeMessageConverter;
+ ()L1org/springframework/messaging/converter/CompositeMessageConverter;
 brokerMessagingTemplate
  (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/converter/CompositeMessageConverter;)Lorg/springframework/messaging/simp/SimpMessagingTemplate;
- (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/converter/CompositeMessageConverter;)Lorg/springframework/messaging/simp/SimpMessagingTemplate;
+ (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/converter/CompositeMessageConverter;)L1org/springframework/messaging/simp/SimpMessagingTemplate;
 clientInboundChannel
  (Lorg/springframework/core/task/TaskExecutor;)Lorg/springframework/messaging/support/AbstractSubscribableChannel;
- (Lorg/springframework/core/task/TaskExecutor;)Lorg/springframework/messaging/support/AbstractSubscribableChannel;
+ (Lorg/springframework/core/task/TaskExecutor;)L1org/springframework/messaging/support/AbstractSubscribableChannel;
 clientInboundChannelExecutor
  ()Lorg/springframework/core/task/TaskExecutor;
  ()Lorg/springframework/core/task/TaskExecutor;
 clientOutboundChannel
  (Lorg/springframework/core/task/TaskExecutor;)Lorg/springframework/messaging/support/AbstractSubscribableChannel;
- (Lorg/springframework/core/task/TaskExecutor;)Lorg/springframework/messaging/support/AbstractSubscribableChannel;
+ (Lorg/springframework/core/task/TaskExecutor;)L1org/springframework/messaging/support/AbstractSubscribableChannel;
 clientOutboundChannelExecutor
  ()Lorg/springframework/core/task/TaskExecutor;
  ()Lorg/springframework/core/task/TaskExecutor;
@@ -44,16 +44,16 @@ configureMessageConverters
  (Ljava/util/List<Lorg/springframework/messaging/converter/MessageConverter;>;)Z
 createAnnotationMethodMessageHandler
  (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/simp/SimpMessagingTemplate;)Lorg/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler;
- (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/simp/SimpMessagingTemplate;)Lorg/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler;
+ (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/simp/SimpMessagingTemplate;)L1org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler;
 createJacksonConverter
  ()Lorg/springframework/messaging/converter/MappingJackson2MessageConverter;
- ()Lorg/springframework/messaging/converter/MappingJackson2MessageConverter;
+ ()L1org/springframework/messaging/converter/MappingJackson2MessageConverter;
 createLocalUserRegistry
  ()Lorg/springframework/messaging/simp/user/SimpUserRegistry;
  ()L0org/springframework/messaging/simp/user/SimpUserRegistry;
 createLocalUserRegistry
  (Ljava/lang/Integer;)Lorg/springframework/messaging/simp/user/SimpUserRegistry;
- (Ljava/lang/Integer;)Lorg/springframework/messaging/simp/user/SimpUserRegistry;
+ (Ljava/lang/Integer;)L1org/springframework/messaging/simp/user/SimpUserRegistry;
 getApplicationContext
  ()Lorg/springframework/context/ApplicationContext;
  ()L0org/springframework/context/ApplicationContext;
@@ -74,7 +74,7 @@ getValidator
  ()L0org/springframework/validation/Validator;
 messageBrokerTaskScheduler
  ()Lorg/springframework/scheduling/TaskScheduler;
- ()Lorg/springframework/scheduling/TaskScheduler;
+ ()L1org/springframework/scheduling/TaskScheduler;
 setApplicationContext
  (Lorg/springframework/context/ApplicationContext;)V
  (Lorg/springframework/context/ApplicationContext;)V
@@ -83,7 +83,7 @@ simpAnnotationMethodMessageHandler
  (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/simp/SimpMessagingTemplate;Lorg/springframework/messaging/converter/CompositeMessageConverter;)Lorg/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler;
 simpValidator
  ()Lorg/springframework/validation/Validator;
- ()Lorg/springframework/validation/Validator;
+ ()L1org/springframework/validation/Validator;
 simpleBrokerMessageHandler
  (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/simp/user/UserDestinationResolver;)Lorg/springframework/messaging/simp/broker/AbstractBrokerMessageHandler;
  (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/simp/user/UserDestinationResolver;)L0org/springframework/messaging/simp/broker/AbstractBrokerMessageHandler;
@@ -92,10 +92,10 @@ stompBrokerRelayMessageHandler
  (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/simp/user/UserDestinationMessageHandler;Lorg/springframework/messaging/MessageHandler;Lorg/springframework/messaging/simp/user/UserDestinationResolver;)L0org/springframework/messaging/simp/broker/AbstractBrokerMessageHandler;
 userDestinationMessageHandler
  (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/simp/user/UserDestinationResolver;)Lorg/springframework/messaging/simp/user/UserDestinationMessageHandler;
- (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/simp/user/UserDestinationResolver;)Lorg/springframework/messaging/simp/user/UserDestinationMessageHandler;
+ (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/simp/user/UserDestinationResolver;)L1org/springframework/messaging/simp/user/UserDestinationMessageHandler;
 userDestinationResolver
  (Lorg/springframework/messaging/simp/user/SimpUserRegistry;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;)Lorg/springframework/messaging/simp/user/UserDestinationResolver;
- (Lorg/springframework/messaging/simp/user/SimpUserRegistry;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;)Lorg/springframework/messaging/simp/user/UserDestinationResolver;
+ (Lorg/springframework/messaging/simp/user/SimpUserRegistry;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;)L1org/springframework/messaging/simp/user/UserDestinationResolver;
 userRegistry
  (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;)Lorg/springframework/messaging/simp/user/SimpUserRegistry;
  (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;)Lorg/springframework/messaging/simp/user/SimpUserRegistry;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/config/SimpleBrokerRegistration.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/config/SimpleBrokerRegistration.eea
index 40bcb3880a..7f338377b8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/config/SimpleBrokerRegistration.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/config/SimpleBrokerRegistration.eea
@@ -5,7 +5,7 @@ class org/springframework/messaging/simp/config/SimpleBrokerRegistration
  (Lorg/springframework/messaging/SubscribableChannel;Lorg/springframework/messaging/MessageChannel;[Ljava/lang/String;)V
 getMessageHandler
  (Lorg/springframework/messaging/SubscribableChannel;)Lorg/springframework/messaging/simp/broker/SimpleBrokerMessageHandler;
- (Lorg/springframework/messaging/SubscribableChannel;)Lorg/springframework/messaging/simp/broker/SimpleBrokerMessageHandler;
+ (Lorg/springframework/messaging/SubscribableChannel;)L1org/springframework/messaging/simp/broker/SimpleBrokerMessageHandler;
 setHeartbeatValue
  ([J)Lorg/springframework/messaging/simp/config/SimpleBrokerRegistration;
  ([J)Lorg/springframework/messaging/simp/config/SimpleBrokerRegistration;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/config/StompBrokerRelayRegistration.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/config/StompBrokerRelayRegistration.eea
index 8650220320..0757f2b570 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/config/StompBrokerRelayRegistration.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/config/StompBrokerRelayRegistration.eea
@@ -5,7 +5,7 @@ class org/springframework/messaging/simp/config/StompBrokerRelayRegistration
  (Lorg/springframework/messaging/SubscribableChannel;Lorg/springframework/messaging/MessageChannel;[Ljava/lang/String;)V
 getMessageHandler
  (Lorg/springframework/messaging/SubscribableChannel;)Lorg/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler;
- (Lorg/springframework/messaging/SubscribableChannel;)Lorg/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler;
+ (Lorg/springframework/messaging/SubscribableChannel;)L1org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler;
 getUserDestinationBroadcast
  ()Ljava/lang/String;
  ()L0java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/stomp/DefaultStompSession.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/stomp/DefaultStompSession.eea
index 2b5d330b2f..39b77d62b5 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/stomp/DefaultStompSession.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/stomp/DefaultStompSession.eea
@@ -12,7 +12,7 @@ acknowledge
  (Ljava/lang/String;Z)Lorg/springframework/messaging/simp/stomp/StompSession$Receiptable;
 acknowledge
  (Lorg/springframework/messaging/simp/stomp/StompHeaders;Z)Lorg/springframework/messaging/simp/stomp/StompSession$Receiptable;
- (Lorg/springframework/messaging/simp/stomp/StompHeaders;Z)Lorg/springframework/messaging/simp/stomp/StompSession$Receiptable;
+ (Lorg/springframework/messaging/simp/stomp/StompHeaders;Z)L1org/springframework/messaging/simp/stomp/StompSession$Receiptable;
 afterConnectFailure
  (Ljava/lang/Throwable;)V
  (Ljava/lang/Throwable;)V
@@ -51,7 +51,7 @@ send
  (Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/messaging/simp/stomp/StompSession$Receiptable;
 send
  (Lorg/springframework/messaging/simp/stomp/StompHeaders;Ljava/lang/Object;)Lorg/springframework/messaging/simp/stomp/StompSession$Receiptable;
- (Lorg/springframework/messaging/simp/stomp/StompHeaders;Ljava/lang/Object;)Lorg/springframework/messaging/simp/stomp/StompSession$Receiptable;
+ (Lorg/springframework/messaging/simp/stomp/StompHeaders;Ljava/lang/Object;)L1org/springframework/messaging/simp/stomp/StompSession$Receiptable;
 setMessageConverter
  (Lorg/springframework/messaging/converter/MessageConverter;)V
  (Lorg/springframework/messaging/converter/MessageConverter;)V
@@ -63,4 +63,4 @@ subscribe
  (Ljava/lang/String;Lorg/springframework/messaging/simp/stomp/StompFrameHandler;)Lorg/springframework/messaging/simp/stomp/StompSession$Subscription;
 subscribe
  (Lorg/springframework/messaging/simp/stomp/StompHeaders;Lorg/springframework/messaging/simp/stomp/StompFrameHandler;)Lorg/springframework/messaging/simp/stomp/StompSession$Subscription;
- (Lorg/springframework/messaging/simp/stomp/StompHeaders;Lorg/springframework/messaging/simp/stomp/StompFrameHandler;)Lorg/springframework/messaging/simp/stomp/StompSession$Subscription;
+ (Lorg/springframework/messaging/simp/stomp/StompHeaders;Lorg/springframework/messaging/simp/stomp/StompFrameHandler;)L1org/springframework/messaging/simp/stomp/StompSession$Subscription;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.eea
index a658d7c106..8548032878 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.eea
@@ -24,7 +24,7 @@ getStats
  ()Lorg/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler$Stats;
 getStatsInfo
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSystemLogin
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/stomp/StompClientSupport.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/stomp/StompClientSupport.eea
index 6e13ea756b..b364883a1c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/stomp/StompClientSupport.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/stomp/StompClientSupport.eea
@@ -2,7 +2,7 @@ class org/springframework/messaging/simp/stomp/StompClientSupport
 
 createSession
  (Lorg/springframework/messaging/simp/stomp/StompHeaders;Lorg/springframework/messaging/simp/stomp/StompSessionHandler;)Lorg/springframework/messaging/simp/stomp/ConnectionHandlingStompSession;
- (Lorg/springframework/messaging/simp/stomp/StompHeaders;Lorg/springframework/messaging/simp/stomp/StompSessionHandler;)Lorg/springframework/messaging/simp/stomp/ConnectionHandlingStompSession;
+ (Lorg/springframework/messaging/simp/stomp/StompHeaders;Lorg/springframework/messaging/simp/stomp/StompSessionHandler;)L1org/springframework/messaging/simp/stomp/ConnectionHandlingStompSession;
 getDefaultHeartbeat
  ()[J
  ()[J
@@ -14,7 +14,7 @@ getTaskScheduler
  ()L0org/springframework/scheduling/TaskScheduler;
 processConnectHeaders
  (Lorg/springframework/messaging/simp/stomp/StompHeaders;)Lorg/springframework/messaging/simp/stomp/StompHeaders;
- (Lorg/springframework/messaging/simp/stomp/StompHeaders;)Lorg/springframework/messaging/simp/stomp/StompHeaders;
+ (Lorg/springframework/messaging/simp/stomp/StompHeaders;)L1org/springframework/messaging/simp/stomp/StompHeaders;
 setDefaultHeartbeat
  ([J)V
  ([J)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/stomp/StompDecoder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/stomp/StompDecoder.eea
index 2132659f9e..ee5d712dd3 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/stomp/StompDecoder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/stomp/StompDecoder.eea
@@ -5,7 +5,7 @@ decode
  (Ljava/nio/ByteBuffer;)Ljava/util/List<Lorg/springframework/messaging/Message<[B>;>;
 decode
  (Ljava/nio/ByteBuffer;Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;)Ljava/util/List<Lorg/springframework/messaging/Message<[B>;>;
- (Ljava/nio/ByteBuffer;Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;)Ljava/util/List<Lorg/springframework/messaging/Message<[B>;>;
+ (Ljava/nio/ByteBuffer;Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;)L1java/util/List<Lorg/springframework/messaging/Message<[B>;>;
 getHeaderInitializer
  ()Lorg/springframework/messaging/support/MessageHeaderInitializer;
  ()L0org/springframework/messaging/support/MessageHeaderInitializer;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/stomp/StompHeaderAccessor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/stomp/StompHeaderAccessor.eea
index d55b77bf2d..991f0665c5 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/stomp/StompHeaderAccessor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/stomp/StompHeaderAccessor.eea
@@ -54,13 +54,13 @@ STOMP_VERSION_HEADER
 
 create
  (Lorg/springframework/messaging/simp/stomp/StompCommand;)Lorg/springframework/messaging/simp/stomp/StompHeaderAccessor;
- (Lorg/springframework/messaging/simp/stomp/StompCommand;)Lorg/springframework/messaging/simp/stomp/StompHeaderAccessor;
+ (Lorg/springframework/messaging/simp/stomp/StompCommand;)L1org/springframework/messaging/simp/stomp/StompHeaderAccessor;
 create
  (Lorg/springframework/messaging/simp/stomp/StompCommand;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;)Lorg/springframework/messaging/simp/stomp/StompHeaderAccessor;
- (Lorg/springframework/messaging/simp/stomp/StompCommand;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;)Lorg/springframework/messaging/simp/stomp/StompHeaderAccessor;
+ (Lorg/springframework/messaging/simp/stomp/StompCommand;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;)L1org/springframework/messaging/simp/stomp/StompHeaderAccessor;
 createForHeartbeat
  ()Lorg/springframework/messaging/simp/stomp/StompHeaderAccessor;
- ()Lorg/springframework/messaging/simp/stomp/StompHeaderAccessor;
+ ()L1org/springframework/messaging/simp/stomp/StompHeaderAccessor;
 getCommand
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/springframework/messaging/simp/stomp/StompCommand;
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L0org/springframework/messaging/simp/stomp/StompCommand;
@@ -72,11 +72,11 @@ getPasscode
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L0java/lang/String;
 wrap
  (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/simp/stomp/StompHeaderAccessor;
- (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/simp/stomp/StompHeaderAccessor;
+ (Lorg/springframework/messaging/Message<*>;)L1org/springframework/messaging/simp/stomp/StompHeaderAccessor;
 
 createAccessor
  (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/support/MessageHeaderAccessor;
- (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/support/MessageHeaderAccessor;
+ (Lorg/springframework/messaging/Message<*>;)L1org/springframework/messaging/support/MessageHeaderAccessor; # @Inherited(org.springframework.messaging.simp.SimpMessageHeaderAccessor)
 getAcceptVersion
  ()Ljava/util/Set<Ljava/lang/String;>;
  ()Ljava/util/Set<Ljava/lang/String;>;
@@ -91,7 +91,7 @@ getContentLength
  ()L0java/lang/Integer;
 getDetailedLogMessage
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(org.springframework.messaging.simp.SimpMessageHeaderAccessor)
 getHeartbeat
  ()[J
  ()[J
@@ -124,7 +124,7 @@ getReceiptId
  ()L0java/lang/String;
 getShortLogMessage
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(org.springframework.messaging.simp.SimpMessageHeaderAccessor)
 getVersion
  ()Ljava/lang/String;
  ()L0java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/stomp/StompSessionHandlerAdapter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/stomp/StompSessionHandlerAdapter.eea
index 40df498fad..9110943db0 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/stomp/StompSessionHandlerAdapter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/stomp/StompSessionHandlerAdapter.eea
@@ -5,7 +5,7 @@ afterConnected
  (Lorg/springframework/messaging/simp/stomp/StompSession;Lorg/springframework/messaging/simp/stomp/StompHeaders;)V
 getPayloadType
  (Lorg/springframework/messaging/simp/stomp/StompHeaders;)Ljava/lang/reflect/Type;
- (Lorg/springframework/messaging/simp/stomp/StompHeaders;)Ljava/lang/reflect/Type;
+ (Lorg/springframework/messaging/simp/stomp/StompHeaders;)L1java/lang/reflect/Type;
 handleException
  (Lorg/springframework/messaging/simp/stomp/StompSession;Lorg/springframework/messaging/simp/stomp/StompCommand;Lorg/springframework/messaging/simp/stomp/StompHeaders;[BLjava/lang/Throwable;)V
  (Lorg/springframework/messaging/simp/stomp/StompSession;Lorg/springframework/messaging/simp/stomp/StompCommand;Lorg/springframework/messaging/simp/stomp/StompHeaders;[BLjava/lang/Throwable;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/user/MultiServerUserRegistry.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/user/MultiServerUserRegistry.eea
index 9bab84295a..60ef23923a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/user/MultiServerUserRegistry.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/simp/user/MultiServerUserRegistry.eea
@@ -5,13 +5,13 @@ class org/springframework/messaging/simp/user/MultiServerUserRegistry
  (Lorg/springframework/messaging/simp/user/SimpUserRegistry;)V
 findSubscriptions
  (Lorg/springframework/messaging/simp/user/SimpSubscriptionMatcher;)Ljava/util/Set<Lorg/springframework/messaging/simp/user/SimpSubscription;>;
- (Lorg/springframework/messaging/simp/user/SimpSubscriptionMatcher;)Ljava/util/Set<Lorg/springframework/messaging/simp/user/SimpSubscription;>;
+ (Lorg/springframework/messaging/simp/user/SimpSubscriptionMatcher;)L1java/util/Set<Lorg/springframework/messaging/simp/user/SimpSubscription;>;
 getUser
  (Ljava/lang/String;)Lorg/springframework/messaging/simp/user/SimpUser;
  (Ljava/lang/String;)L0org/springframework/messaging/simp/user/SimpUser; # @Inherited(org.springframework.messaging.simp.user.SimpUserRegistry)
 getUsers
  ()Ljava/util/Set<Lorg/springframework/messaging/simp/user/SimpUser;>;
- ()Ljava/util/Set<Lorg/springframework/messaging/simp/user/SimpUser;>;
+ ()L1java/util/Set<Lorg/springframework/messaging/simp/user/SimpUser;>;
 onApplicationEvent
  (Lorg/springframework/context/ApplicationEvent;)V
  (Lorg/springframework/context/ApplicationEvent;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/support/AbstractHeaderMapper.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/support/AbstractHeaderMapper.eea
index f53027f5df..1ec38fd835 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/support/AbstractHeaderMapper.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/support/AbstractHeaderMapper.eea
@@ -12,7 +12,7 @@ logger
 
 fromHeaderName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 getHeaderIfAvailable
  <V:Ljava/lang/Object;>(Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Ljava/lang/String;Ljava/lang/Class<TV;>;)TV;
  <V:Ljava/lang/Object;>(Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Ljava/lang/String;Ljava/lang/Class<TV;>;)T0V;
@@ -24,4 +24,4 @@ setOutboundPrefix
  (Ljava/lang/String;)V
 toHeaderName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/support/MessageBuilder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/support/MessageBuilder.eea
index 98fbdb9214..74ae05e413 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/support/MessageBuilder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/support/MessageBuilder.eea
@@ -4,13 +4,13 @@ class org/springframework/messaging/support/MessageBuilder
 
 createMessage
  <T:Ljava/lang/Object;>(TT;Lorg/springframework/messaging/MessageHeaders;)Lorg/springframework/messaging/Message<TT;>;
- <T:Ljava/lang/Object;>(TT;Lorg/springframework/messaging/MessageHeaders;)Lorg/springframework/messaging/Message<TT;>;
+ <T:Ljava/lang/Object;>(TT;Lorg/springframework/messaging/MessageHeaders;)L1org/springframework/messaging/Message<TT;>;
 fromMessage
  <T:Ljava/lang/Object;>(Lorg/springframework/messaging/Message<TT;>;)Lorg/springframework/messaging/support/MessageBuilder<TT;>;
- <T:Ljava/lang/Object;>(Lorg/springframework/messaging/Message<TT;>;)Lorg/springframework/messaging/support/MessageBuilder<TT;>;
+ <T:Ljava/lang/Object;>(Lorg/springframework/messaging/Message<TT;>;)L1org/springframework/messaging/support/MessageBuilder<TT;>;
 withPayload
  <T:Ljava/lang/Object;>(TT;)Lorg/springframework/messaging/support/MessageBuilder<TT;>;
- <T:Ljava/lang/Object;>(TT;)Lorg/springframework/messaging/support/MessageBuilder<TT;>;
+ <T:Ljava/lang/Object;>(TT;)L1org/springframework/messaging/support/MessageBuilder<TT;>;
 
 build
  ()Lorg/springframework/messaging/Message<TT;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/support/MessageHeaderAccessor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/support/MessageHeaderAccessor.eea
index 25f5d98d19..2cb605adfa 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/support/MessageHeaderAccessor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/support/MessageHeaderAccessor.eea
@@ -28,16 +28,16 @@ copyHeadersIfAbsent
  (Ljava/util/Map<Ljava/lang/String;*>;)V
 createAccessor
  (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/support/MessageHeaderAccessor;
- (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/support/MessageHeaderAccessor;
+ (Lorg/springframework/messaging/Message<*>;)L1org/springframework/messaging/support/MessageHeaderAccessor;
 getContentType
  ()Lorg/springframework/util/MimeType;
  ()L0org/springframework/util/MimeType;
 getDetailedLogMessage
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
 getDetailedPayloadLogMessage
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
 getErrorChannel
  ()Ljava/lang/Object;
  ()L0java/lang/Object;
@@ -55,10 +55,10 @@ getReplyChannel
  ()L0java/lang/Object;
 getShortLogMessage
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
 getShortPayloadLogMessage
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
 getTimestamp
  ()Ljava/lang/Long;
  ()L0java/lang/Long;
@@ -94,10 +94,10 @@ setReplyChannelName
  (Ljava/lang/String;)V
 toMap
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ ()L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 toMessageHeaders
  ()Lorg/springframework/messaging/MessageHeaders;
- ()Lorg/springframework/messaging/MessageHeaders;
+ ()L1org/springframework/messaging/MessageHeaders;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.eea
index 5a3cd4c167..d317ca6b02 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.eea
@@ -32,7 +32,7 @@ setLogger
  (Lorg/apache/commons/logging/Log;)V
 shutdown
  ()Lorg/springframework/util/concurrent/ListenableFuture<Ljava/lang/Void;>;
- ()Lorg/springframework/util/concurrent/ListenableFuture<Ljava/lang/Void;>;
+ ()L1org/springframework/util/concurrent/ListenableFuture<Ljava/lang/Void;>;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/tcp/reactor/ReactorNettyTcpConnection.eea b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/tcp/reactor/ReactorNettyTcpConnection.eea
index ee1c9b5d5d..e966806cde 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/messaging/tcp/reactor/ReactorNettyTcpConnection.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/messaging/tcp/reactor/ReactorNettyTcpConnection.eea
@@ -17,4 +17,4 @@ onWriteInactivity
  (Ljava/lang/Runnable;J)V
 send
  (Lorg/springframework/messaging/Message<TP;>;)Lorg/springframework/util/concurrent/ListenableFuture<Ljava/lang/Void;>;
- (Lorg/springframework/messaging/Message<TP;>;)Lorg/springframework/util/concurrent/ListenableFuture<Ljava/lang/Void;>;
+ (Lorg/springframework/messaging/Message<TP;>;)L1org/springframework/util/concurrent/ListenableFuture<Ljava/lang/Void;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/mock/http/client/MockAsyncClientHttpRequest.eea b/libs/eea-spring-5/src/main/resources/org/springframework/mock/http/client/MockAsyncClientHttpRequest.eea
index 91fca2f5ec..7b24f1ff36 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/mock/http/client/MockAsyncClientHttpRequest.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/mock/http/client/MockAsyncClientHttpRequest.eea
@@ -5,4 +5,4 @@ class org/springframework/mock/http/client/MockAsyncClientHttpRequest
  (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)V
 executeAsync
  ()Lorg/springframework/util/concurrent/ListenableFuture<Lorg/springframework/http/client/ClientHttpResponse;>;
- ()Lorg/springframework/util/concurrent/ListenableFuture<Lorg/springframework/http/client/ClientHttpResponse;>;
+ ()L1org/springframework/util/concurrent/ListenableFuture<Lorg/springframework/http/client/ClientHttpResponse;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/mock/http/client/MockClientHttpResponse.eea b/libs/eea-spring-5/src/main/resources/org/springframework/mock/http/client/MockClientHttpResponse.eea
index 105f1d275f..62b7ce416b 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/mock/http/client/MockClientHttpResponse.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/mock/http/client/MockClientHttpResponse.eea
@@ -17,4 +17,4 @@ getStatusCode
  ()Lorg/springframework/http/HttpStatus;
 getStatusText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/mock/http/server/reactive/MockServerHttpRequest.eea b/libs/eea-spring-5/src/main/resources/org/springframework/mock/http/server/reactive/MockServerHttpRequest.eea
index 6cd3c0bce5..5aed9028f7 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/mock/http/server/reactive/MockServerHttpRequest.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/mock/http/server/reactive/MockServerHttpRequest.eea
@@ -11,13 +11,13 @@ head
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BaseBuilder<*>;
 method
  (Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BodyBuilder;
- (Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BodyBuilder;
+ (Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/mock/http/server/reactive/MockServerHttpRequest$BodyBuilder;
 method
  (Lorg/springframework/http/HttpMethod;Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BodyBuilder;
  (Lorg/springframework/http/HttpMethod;Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BodyBuilder;
 method
  (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BodyBuilder;
- (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BodyBuilder;
+ (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)L1org/springframework/mock/http/server/reactive/MockServerHttpRequest$BodyBuilder;
 options
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BaseBuilder<*>;
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BaseBuilder<*>;
@@ -45,7 +45,7 @@ getMethodValue
  ()Ljava/lang/String;
 getNativeRequest
  <T:Ljava/lang/Object;>()TT;
- <T:Ljava/lang/Object;>()TT;
+ <T:Ljava/lang/Object;>()T1T;
 getRemoteAddress
  ()Ljava/net/InetSocketAddress;
  ()L0java/net/InetSocketAddress; # @Inherited(org.springframework.http.server.reactive.ServerHttpRequest)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/mock/http/server/reactive/MockServerHttpResponse.eea b/libs/eea-spring-5/src/main/resources/org/springframework/mock/http/server/reactive/MockServerHttpResponse.eea
index abc51310e3..cf27e1afdf 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/mock/http/server/reactive/MockServerHttpResponse.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/mock/http/server/reactive/MockServerHttpResponse.eea
@@ -11,7 +11,7 @@ getBodyAsString
  ()Lreactor/core/publisher/Mono<Ljava/lang/String;>;
 getNativeResponse
  <T:Ljava/lang/Object;>()TT;
- <T:Ljava/lang/Object;>()TT;
+ <T:Ljava/lang/Object;>()T1T;
 setComplete
  ()Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
  ()Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/mock/jndi/SimpleNamingContext.eea b/libs/eea-spring-5/src/main/resources/org/springframework/mock/jndi/SimpleNamingContext.eea
index 38d9e2fef9..00a02dced1 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/mock/jndi/SimpleNamingContext.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/mock/jndi/SimpleNamingContext.eea
@@ -17,16 +17,16 @@ bind
  (Ljavax/naming/Name;Ljava/lang/Object;)V
 composeName
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 composeName
  (Ljavax/naming/Name;Ljavax/naming/Name;)Ljavax/naming/Name;
- (Ljavax/naming/Name;Ljavax/naming/Name;)Ljavax/naming/Name;
+ (Ljavax/naming/Name;Ljavax/naming/Name;)L1javax/naming/Name;
 createSubcontext
  (Ljava/lang/String;)Ljavax/naming/Context;
- (Ljava/lang/String;)Ljavax/naming/Context;
+ (Ljava/lang/String;)L1javax/naming/Context; # @Inherited(javax.naming.Context)
 createSubcontext
  (Ljavax/naming/Name;)Ljavax/naming/Context;
- (Ljavax/naming/Name;)Ljavax/naming/Context;
+ (Ljavax/naming/Name;)L1javax/naming/Context; # @Inherited(javax.naming.Context)
 destroySubcontext
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
@@ -41,34 +41,34 @@ getNameInNamespace
  ()L1java/lang/String; # @Inherited(javax.naming.Context)
 getNameParser
  (Ljava/lang/String;)Ljavax/naming/NameParser;
- (Ljava/lang/String;)Ljavax/naming/NameParser;
+ (Ljava/lang/String;)L1javax/naming/NameParser;
 getNameParser
  (Ljavax/naming/Name;)Ljavax/naming/NameParser;
- (Ljavax/naming/Name;)Ljavax/naming/NameParser;
+ (Ljavax/naming/Name;)L1javax/naming/NameParser;
 list
  (Ljava/lang/String;)Ljavax/naming/NamingEnumeration<Ljavax/naming/NameClassPair;>;
- (Ljava/lang/String;)Ljavax/naming/NamingEnumeration<Ljavax/naming/NameClassPair;>;
+ (Ljava/lang/String;)L1javax/naming/NamingEnumeration<Ljavax/naming/NameClassPair;>;
 list
  (Ljavax/naming/Name;)Ljavax/naming/NamingEnumeration<Ljavax/naming/NameClassPair;>;
- (Ljavax/naming/Name;)Ljavax/naming/NamingEnumeration<Ljavax/naming/NameClassPair;>;
+ (Ljavax/naming/Name;)L1javax/naming/NamingEnumeration<Ljavax/naming/NameClassPair;>;
 listBindings
  (Ljava/lang/String;)Ljavax/naming/NamingEnumeration<Ljavax/naming/Binding;>;
- (Ljava/lang/String;)Ljavax/naming/NamingEnumeration<Ljavax/naming/Binding;>;
+ (Ljava/lang/String;)L1javax/naming/NamingEnumeration<Ljavax/naming/Binding;>;
 listBindings
  (Ljavax/naming/Name;)Ljavax/naming/NamingEnumeration<Ljavax/naming/Binding;>;
- (Ljavax/naming/Name;)Ljavax/naming/NamingEnumeration<Ljavax/naming/Binding;>;
+ (Ljavax/naming/Name;)L1javax/naming/NamingEnumeration<Ljavax/naming/Binding;>;
 lookup
  (Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;)Ljava/lang/Object;
 lookup
  (Ljavax/naming/Name;)Ljava/lang/Object;
- (Ljavax/naming/Name;)Ljava/lang/Object;
+ (Ljavax/naming/Name;)L1java/lang/Object;
 lookupLink
  (Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;)Ljava/lang/Object;
 lookupLink
  (Ljavax/naming/Name;)Ljava/lang/Object;
- (Ljavax/naming/Name;)Ljava/lang/Object;
+ (Ljavax/naming/Name;)L1java/lang/Object;
 rebind
  (Ljava/lang/String;Ljava/lang/Object;)V
  (Ljava/lang/String;Ljava/lang/Object;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/mock/jndi/SimpleNamingContextBuilder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/mock/jndi/SimpleNamingContextBuilder.eea
index ab6cbe2c43..8dae314c92 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/mock/jndi/SimpleNamingContextBuilder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/mock/jndi/SimpleNamingContextBuilder.eea
@@ -2,7 +2,7 @@ class org/springframework/mock/jndi/SimpleNamingContextBuilder
 
 emptyActivatedContextBuilder
  ()Lorg/springframework/mock/jndi/SimpleNamingContextBuilder;
- ()Lorg/springframework/mock/jndi/SimpleNamingContextBuilder;
+ ()L1org/springframework/mock/jndi/SimpleNamingContextBuilder;
 getCurrentContextBuilder
  ()Lorg/springframework/mock/jndi/SimpleNamingContextBuilder;
  ()L0org/springframework/mock/jndi/SimpleNamingContextBuilder;
@@ -12,4 +12,4 @@ bind
  (Ljava/lang/String;Ljava/lang/Object;)V
 createInitialContextFactory
  (Ljava/util/Hashtable<**>;)Ljavax/naming/spi/InitialContextFactory;
- (Ljava/util/Hashtable<**>;)Ljavax/naming/spi/InitialContextFactory;
+ (Ljava/util/Hashtable<**>;)L1javax/naming/spi/InitialContextFactory; # @Inherited(javax.naming.spi.InitialContextFactoryBuilder)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockAsyncContext.eea b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockAsyncContext.eea
index 6f993831f3..b23a389c2d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockAsyncContext.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockAsyncContext.eea
@@ -14,7 +14,7 @@ addListener
  (Ljavax/servlet/AsyncListener;Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V
 createListener
  <T::Ljavax/servlet/AsyncListener;>(Ljava/lang/Class<TT;>;)TT;
- <T::Ljavax/servlet/AsyncListener;>(Ljava/lang/Class<TT;>;)TT;
+ <T::Ljavax/servlet/AsyncListener;>(Ljava/lang/Class<TT;>;)T1T;
 dispatch
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockBodyContent.eea b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockBodyContent.eea
index a5d81c6574..95c593aa2a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockBodyContent.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockBodyContent.eea
@@ -11,7 +11,7 @@ class org/springframework/mock/web/MockBodyContent
  (Ljava/lang/String;Ljavax/servlet/http/HttpServletResponse;Ljava/io/Writer;)V
 getReader
  ()Ljava/io/Reader;
- ()Ljava/io/Reader;
+ ()L1java/io/Reader;
 getString
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockCookie.eea b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockCookie.eea
index 057f784c6c..3964053335 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockCookie.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockCookie.eea
@@ -2,7 +2,7 @@ class org/springframework/mock/web/MockCookie
 
 parse
  (Ljava/lang/String;)Lorg/springframework/mock/web/MockCookie;
- (Ljava/lang/String;)Lorg/springframework/mock/web/MockCookie;
+ (Ljava/lang/String;)L1org/springframework/mock/web/MockCookie;
 
 <init>
  (Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockExpressionEvaluator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockExpressionEvaluator.eea
index 54db5527b1..a4cf3dac99 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockExpressionEvaluator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockExpressionEvaluator.eea
@@ -11,4 +11,4 @@ evaluate
  (Ljava/lang/String;Ljava/lang/Class;Ljavax/servlet/jsp/el/VariableResolver;Ljavax/servlet/jsp/el/FunctionMapper;)Ljava/lang/Object;
 parseExpression
  (Ljava/lang/String;Ljava/lang/Class;Ljavax/servlet/jsp/el/FunctionMapper;)Ljavax/servlet/jsp/el/Expression;
- (Ljava/lang/String;Ljava/lang/Class;Ljavax/servlet/jsp/el/FunctionMapper;)Ljavax/servlet/jsp/el/Expression;
+ (Ljava/lang/String;Ljava/lang/Class;Ljavax/servlet/jsp/el/FunctionMapper;)L1javax/servlet/jsp/el/Expression;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockHttpServletRequest.eea b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockHttpServletRequest.eea
index c5d86698df..dff35c0eb2 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockHttpServletRequest.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockHttpServletRequest.eea
@@ -138,7 +138,7 @@ getPart
  (Ljava/lang/String;)L0javax/servlet/http/Part;
 getParts
  ()Ljava/util/Collection<Ljavax/servlet/http/Part;>;
- ()Ljava/util/Collection<Ljavax/servlet/http/Part;>;
+ ()L1java/util/Collection<Ljavax/servlet/http/Part;>;
 getPathInfo
  ()Ljava/lang/String;
  ()L0java/lang/String;
@@ -168,7 +168,7 @@ getRemoteUser
  ()L0java/lang/String;
 getRequestDispatcher
  (Ljava/lang/String;)Ljavax/servlet/RequestDispatcher;
- (Ljava/lang/String;)Ljavax/servlet/RequestDispatcher;
+ (Ljava/lang/String;)L1javax/servlet/RequestDispatcher;
 getRequestURI
  ()Ljava/lang/String;
  ()L0java/lang/String;
@@ -309,4 +309,4 @@ startAsync
  (Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)Ljavax/servlet/AsyncContext;
 upgrade
  <T::Ljavax/servlet/http/HttpUpgradeHandler;>(Ljava/lang/Class<TT;>;)TT;
- <T::Ljavax/servlet/http/HttpUpgradeHandler;>(Ljava/lang/Class<TT;>;)TT;
+ <T::Ljavax/servlet/http/HttpUpgradeHandler;>(Ljava/lang/Class<TT;>;)T1T;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockHttpSession.eea b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockHttpSession.eea
index fd3d4a1f6f..4ff284c7a6 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockHttpSession.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockHttpSession.eea
@@ -30,7 +30,7 @@ getServletContext
  ()Ljavax/servlet/ServletContext;
 getSessionContext
  ()Ljavax/servlet/http/HttpSessionContext;
- ()Ljavax/servlet/http/HttpSessionContext;
+ ()L1javax/servlet/http/HttpSessionContext;
 getValue
  (Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;)Ljava/lang/Object;
@@ -48,7 +48,7 @@ removeValue
  (Ljava/lang/String;)V
 serializeState
  ()Ljava/io/Serializable;
- ()Ljava/io/Serializable;
+ ()L1java/io/Serializable;
 setAttribute
  (Ljava/lang/String;Ljava/lang/Object;)V
  (Ljava/lang/String;Ljava/lang/Object;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockMultipartFile.eea b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockMultipartFile.eea
index 9c3170e4bc..900305a71f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockMultipartFile.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockMultipartFile.eea
@@ -20,7 +20,7 @@ getContentType
  ()L0java/lang/String; # @Inherited(org.springframework.web.multipart.MultipartFile)
 getInputStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockMultipartHttpServletRequest.eea b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockMultipartHttpServletRequest.eea
index 93fe39c4d3..d593368907 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockMultipartHttpServletRequest.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockMultipartHttpServletRequest.eea
@@ -20,7 +20,7 @@ getFiles
  (Ljava/lang/String;)Ljava/util/List<Lorg/springframework/web/multipart/MultipartFile;>;
 getMultiFileMap
  ()Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Lorg/springframework/web/multipart/MultipartFile;>;
- ()Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Lorg/springframework/web/multipart/MultipartFile;>;
+ ()L1org/springframework/util/MultiValueMap<Ljava/lang/String;Lorg/springframework/web/multipart/MultipartFile;>;
 getMultipartContentType
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)L0java/lang/String; # @Inherited(org.springframework.web.multipart.MultipartRequest)
@@ -29,7 +29,7 @@ getMultipartHeaders
  (Ljava/lang/String;)L0org/springframework/http/HttpHeaders; # @Inherited(org.springframework.web.multipart.MultipartHttpServletRequest)
 getRequestHeaders
  ()Lorg/springframework/http/HttpHeaders;
- ()Lorg/springframework/http/HttpHeaders;
+ ()L1org/springframework/http/HttpHeaders;
 getRequestMethod
  ()Lorg/springframework/http/HttpMethod;
  ()L0org/springframework/http/HttpMethod; # @Inherited(org.springframework.web.multipart.MultipartHttpServletRequest)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockPageContext.eea b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockPageContext.eea
index 5fc032a835..6d7a282f89 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockPageContext.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockPageContext.eea
@@ -47,7 +47,7 @@ getException
  ()L0java/lang/Exception;
 getExpressionEvaluator
  ()Ljavax/servlet/jsp/el/ExpressionEvaluator;
- ()Ljavax/servlet/jsp/el/ExpressionEvaluator;
+ ()L1javax/servlet/jsp/el/ExpressionEvaluator;
 getOut
  ()Ljavax/servlet/jsp/JspWriter;
  ()Ljavax/servlet/jsp/JspWriter;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockPart.eea b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockPart.eea
index da39136d51..341b54aee4 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockPart.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockPart.eea
@@ -23,7 +23,7 @@ getHeaders
  (Ljava/lang/String;)Ljava/util/Collection<Ljava/lang/String;>;
 getInputStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockServletContext.eea b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockServletContext.eea
index c8c898b9da..b3202c9fda 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockServletContext.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/MockServletContext.eea
@@ -11,19 +11,19 @@ class org/springframework/mock/web/MockServletContext
  (Lorg/springframework/core/io/ResourceLoader;)V
 addFilter
  (Ljava/lang/String;Ljava/lang/Class<+Ljavax/servlet/Filter;>;)Ljavax/servlet/FilterRegistration$Dynamic;
- (Ljava/lang/String;Ljava/lang/Class<+Ljavax/servlet/Filter;>;)Ljavax/servlet/FilterRegistration$Dynamic;
+ (Ljava/lang/String;Ljava/lang/Class<+Ljavax/servlet/Filter;>;)L1javax/servlet/FilterRegistration$Dynamic;
 addFilter
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/servlet/FilterRegistration$Dynamic;
- (Ljava/lang/String;Ljava/lang/String;)Ljavax/servlet/FilterRegistration$Dynamic;
+ (Ljava/lang/String;Ljava/lang/String;)L1javax/servlet/FilterRegistration$Dynamic;
 addFilter
  (Ljava/lang/String;Ljavax/servlet/Filter;)Ljavax/servlet/FilterRegistration$Dynamic;
- (Ljava/lang/String;Ljavax/servlet/Filter;)Ljavax/servlet/FilterRegistration$Dynamic;
+ (Ljava/lang/String;Ljavax/servlet/Filter;)L1javax/servlet/FilterRegistration$Dynamic;
 addInitParameter
  (Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;)V
 addJspFile
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/servlet/ServletRegistration$Dynamic;
- (Ljava/lang/String;Ljava/lang/String;)Ljavax/servlet/ServletRegistration$Dynamic;
+ (Ljava/lang/String;Ljava/lang/String;)L1javax/servlet/ServletRegistration$Dynamic;
 addListener
  (Ljava/lang/Class<+Ljava/util/EventListener;>;)V
  (Ljava/lang/Class<+Ljava/util/EventListener;>;)V
@@ -38,22 +38,22 @@ addMimeType
  (Ljava/lang/String;Lorg/springframework/http/MediaType;)V
 addServlet
  (Ljava/lang/String;Ljava/lang/Class<+Ljavax/servlet/Servlet;>;)Ljavax/servlet/ServletRegistration$Dynamic;
- (Ljava/lang/String;Ljava/lang/Class<+Ljavax/servlet/Servlet;>;)Ljavax/servlet/ServletRegistration$Dynamic;
+ (Ljava/lang/String;Ljava/lang/Class<+Ljavax/servlet/Servlet;>;)L1javax/servlet/ServletRegistration$Dynamic;
 addServlet
  (Ljava/lang/String;Ljava/lang/String;)Ljavax/servlet/ServletRegistration$Dynamic;
- (Ljava/lang/String;Ljava/lang/String;)Ljavax/servlet/ServletRegistration$Dynamic;
+ (Ljava/lang/String;Ljava/lang/String;)L1javax/servlet/ServletRegistration$Dynamic;
 addServlet
  (Ljava/lang/String;Ljavax/servlet/Servlet;)Ljavax/servlet/ServletRegistration$Dynamic;
- (Ljava/lang/String;Ljavax/servlet/Servlet;)Ljavax/servlet/ServletRegistration$Dynamic;
+ (Ljava/lang/String;Ljavax/servlet/Servlet;)L1javax/servlet/ServletRegistration$Dynamic;
 createFilter
  <T::Ljavax/servlet/Filter;>(Ljava/lang/Class<TT;>;)TT;
- <T::Ljavax/servlet/Filter;>(Ljava/lang/Class<TT;>;)TT;
+ <T::Ljavax/servlet/Filter;>(Ljava/lang/Class<TT;>;)T1T;
 createListener
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)TT;
- <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)TT;
+ <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)T1T;
 createServlet
  <T::Ljavax/servlet/Servlet;>(Ljava/lang/Class<TT;>;)TT;
- <T::Ljavax/servlet/Servlet;>(Ljava/lang/Class<TT;>;)TT;
+ <T::Ljavax/servlet/Servlet;>(Ljava/lang/Class<TT;>;)T1T;
 declareRoles
  ([Ljava/lang/String;)V
  ([Ljava/lang/String;)V
@@ -98,7 +98,7 @@ getInitParameterNames
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
 getJspConfigDescriptor
  ()Ljavax/servlet/descriptor/JspConfigDescriptor;
- ()Ljavax/servlet/descriptor/JspConfigDescriptor;
+ ()L1javax/servlet/descriptor/JspConfigDescriptor;
 getMimeType
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)L0java/lang/String;
@@ -113,7 +113,7 @@ getRequestCharacterEncoding
  ()L0java/lang/String;
 getRequestDispatcher
  (Ljava/lang/String;)Ljavax/servlet/RequestDispatcher;
- (Ljava/lang/String;)Ljavax/servlet/RequestDispatcher;
+ (Ljava/lang/String;)L1javax/servlet/RequestDispatcher;
 getResource
  (Ljava/lang/String;)Ljava/net/URL;
  (Ljava/lang/String;)L0java/net/URL;
@@ -122,7 +122,7 @@ getResourceAsStream
  (Ljava/lang/String;)L0java/io/InputStream;
 getResourceLocation
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 getResourcePaths
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
  (Ljava/lang/String;)L0java/util/Set<Ljava/lang/String;>;
@@ -131,7 +131,7 @@ getResponseCharacterEncoding
  ()L0java/lang/String;
 getServerInfo
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getServlet
  (Ljava/lang/String;)Ljavax/servlet/Servlet;
  (Ljava/lang/String;)L0javax/servlet/Servlet;
@@ -155,7 +155,7 @@ getSessionCookieConfig
  ()Ljavax/servlet/SessionCookieConfig;
 getVirtualServerName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 log
  (Ljava/lang/Exception;Ljava/lang/String;)V
  (Ljava/lang/Exception;Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/reactive/function/server/MockServerRequest.eea b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/reactive/function/server/MockServerRequest.eea
index ad69a57c9e..6516a503a9 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/reactive/function/server/MockServerRequest.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/reactive/function/server/MockServerRequest.eea
@@ -2,7 +2,7 @@ class org/springframework/mock/web/reactive/function/server/MockServerRequest
 
 builder
  ()Lorg/springframework/mock/web/reactive/function/server/MockServerRequest$Builder;
- ()Lorg/springframework/mock/web/reactive/function/server/MockServerRequest$Builder;
+ ()L1org/springframework/mock/web/reactive/function/server/MockServerRequest$Builder;
 
 attributes
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/server/MockServerWebExchange.eea b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/server/MockServerWebExchange.eea
index 69bec5f024..68371514f8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/server/MockServerWebExchange.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/mock/web/server/MockServerWebExchange.eea
@@ -2,10 +2,10 @@ class org/springframework/mock/web/server/MockServerWebExchange
 
 builder
  (Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BaseBuilder<*>;)Lorg/springframework/mock/web/server/MockServerWebExchange$Builder;
- (Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BaseBuilder<*>;)Lorg/springframework/mock/web/server/MockServerWebExchange$Builder;
+ (Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BaseBuilder<*>;)L1org/springframework/mock/web/server/MockServerWebExchange$Builder;
 builder
  (Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest;)Lorg/springframework/mock/web/server/MockServerWebExchange$Builder;
- (Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest;)Lorg/springframework/mock/web/server/MockServerWebExchange$Builder;
+ (Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest;)L1org/springframework/mock/web/server/MockServerWebExchange$Builder;
 from
  (Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BaseBuilder<*>;)Lorg/springframework/mock/web/server/MockServerWebExchange;
  (Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BaseBuilder<*>;)Lorg/springframework/mock/web/server/MockServerWebExchange;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/objenesis/instantiator/basic/FailingInstantiator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/objenesis/instantiator/basic/FailingInstantiator.eea
index 66234642ed..da8f1000cc 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/objenesis/instantiator/basic/FailingInstantiator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/objenesis/instantiator/basic/FailingInstantiator.eea
@@ -11,4 +11,4 @@ super org/springframework/objenesis/instantiator/ObjectInstantiator
  (Ljava/lang/Class<TT;>;)V
 newInstance
  ()TT;
- ()TT;
+ ()T1T;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/objenesis/instantiator/basic/NullInstantiator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/objenesis/instantiator/basic/NullInstantiator.eea
index 4d199109db..178ea94174 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/objenesis/instantiator/basic/NullInstantiator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/objenesis/instantiator/basic/NullInstantiator.eea
@@ -11,4 +11,4 @@ super org/springframework/objenesis/instantiator/ObjectInstantiator
  (Ljava/lang/Class<TT;>;)V
 newInstance
  ()TT;
- ()TT;
+ ()T0T;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/objenesis/instantiator/util/ClassUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/objenesis/instantiator/util/ClassUtils.eea
index 8850d2aaf3..bd4999e557 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/objenesis/instantiator/util/ClassUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/objenesis/instantiator/util/ClassUtils.eea
@@ -5,10 +5,10 @@ classNameToInternalClassName
  (Ljava/lang/String;)Ljava/lang/String;
 classNameToResource
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 getExistingClass
  <T:Ljava/lang/Object;>(Ljava/lang/ClassLoader;Ljava/lang/String;)Ljava/lang/Class<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/ClassLoader;Ljava/lang/String;)Ljava/lang/Class<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/ClassLoader;Ljava/lang/String;)L0java/lang/Class<TT;>;
 newInstance
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/objenesis/strategy/PlatformDescription.eea b/libs/eea-spring-5/src/main/resources/org/springframework/objenesis/strategy/PlatformDescription.eea
index 41b033a6b3..e326615b73 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/objenesis/strategy/PlatformDescription.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/objenesis/strategy/PlatformDescription.eea
@@ -42,7 +42,7 @@ VM_VERSION
 
 describePlatform
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 isThisJVM
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/objenesis/strategy/SerializingInstantiatorStrategy.eea b/libs/eea-spring-5/src/main/resources/org/springframework/objenesis/strategy/SerializingInstantiatorStrategy.eea
index 87f70cd653..76bcc508d4 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/objenesis/strategy/SerializingInstantiatorStrategy.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/objenesis/strategy/SerializingInstantiatorStrategy.eea
@@ -2,4 +2,4 @@ class org/springframework/objenesis/strategy/SerializingInstantiatorStrategy
 
 newInstantiatorOf
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/objenesis/instantiator/ObjectInstantiator<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/objenesis/instantiator/ObjectInstantiator<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1org/springframework/objenesis/instantiator/ObjectInstantiator<TT;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/objenesis/strategy/StdInstantiatorStrategy.eea b/libs/eea-spring-5/src/main/resources/org/springframework/objenesis/strategy/StdInstantiatorStrategy.eea
index 9c1ef42028..20bf752702 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/objenesis/strategy/StdInstantiatorStrategy.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/objenesis/strategy/StdInstantiatorStrategy.eea
@@ -2,4 +2,4 @@ class org/springframework/objenesis/strategy/StdInstantiatorStrategy
 
 newInstantiatorOf
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/objenesis/instantiator/ObjectInstantiator<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/objenesis/instantiator/ObjectInstantiator<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1org/springframework/objenesis/instantiator/ObjectInstantiator<TT;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/orm/hibernate5/HibernateTemplate.eea b/libs/eea-spring-5/src/main/resources/org/springframework/orm/hibernate5/HibernateTemplate.eea
index 22bf9c3564..b116254e0b 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/orm/hibernate5/HibernateTemplate.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/orm/hibernate5/HibernateTemplate.eea
@@ -24,7 +24,7 @@ contains
  (Ljava/lang/Object;)Z
 createSessionProxy
  (Lorg/hibernate/Session;)Lorg/hibernate/Session;
- (Lorg/hibernate/Session;)Lorg/hibernate/Session;
+ (Lorg/hibernate/Session;)L1org/hibernate/Session;
 delete
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/orm/hibernate5/HibernateTransactionManager.eea b/libs/eea-spring-5/src/main/resources/org/springframework/orm/hibernate5/HibernateTransactionManager.eea
index 74e044a169..40ab98d511 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/orm/hibernate5/HibernateTransactionManager.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/orm/hibernate5/HibernateTransactionManager.eea
@@ -20,7 +20,7 @@ doCommit
  (Lorg/springframework/transaction/support/DefaultTransactionStatus;)V
 doGetTransaction
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 doResume
  (Ljava/lang/Object;Ljava/lang/Object;)V
  (Ljava/lang/Object;Ljava/lang/Object;)V
@@ -32,7 +32,7 @@ doSetRollbackOnly
  (Lorg/springframework/transaction/support/DefaultTransactionStatus;)V
 doSuspend
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object; # @Inherited(org.springframework.transaction.support.AbstractPlatformTransactionManager)
 getDataSource
  ()Ljavax/sql/DataSource;
  ()L0javax/sql/DataSource;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/orm/hibernate5/support/HibernateDaoSupport.eea b/libs/eea-spring-5/src/main/resources/org/springframework/orm/hibernate5/support/HibernateDaoSupport.eea
index e2901484cf..1fe21070ab 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/orm/hibernate5/support/HibernateDaoSupport.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/orm/hibernate5/support/HibernateDaoSupport.eea
@@ -2,7 +2,7 @@ class org/springframework/orm/hibernate5/support/HibernateDaoSupport
 
 createHibernateTemplate
  (Lorg/hibernate/SessionFactory;)Lorg/springframework/orm/hibernate5/HibernateTemplate;
- (Lorg/hibernate/SessionFactory;)Lorg/springframework/orm/hibernate5/HibernateTemplate;
+ (Lorg/hibernate/SessionFactory;)L1org/springframework/orm/hibernate5/HibernateTemplate;
 currentSession
  ()Lorg/hibernate/Session;
  ()Lorg/hibernate/Session;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/orm/hibernate5/support/OpenSessionInViewInterceptor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/orm/hibernate5/support/OpenSessionInViewInterceptor.eea
index dd104ce41a..a392873725 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/orm/hibernate5/support/OpenSessionInViewInterceptor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/orm/hibernate5/support/OpenSessionInViewInterceptor.eea
@@ -16,7 +16,7 @@ afterConcurrentHandlingStarted
  (Lorg/springframework/web/context/request/WebRequest;)V
 getParticipateAttributeName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSessionFactory
  ()Lorg/hibernate/SessionFactory;
  ()L0org/hibernate/SessionFactory;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.eea
index 77a8bb9db6..73e7215ef9 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.eea
@@ -10,13 +10,13 @@ logger
 
 createEntityManagerFactoryProxy
  (Ljavax/persistence/EntityManagerFactory;)Ljavax/persistence/EntityManagerFactory;
- (Ljavax/persistence/EntityManagerFactory;)Ljavax/persistence/EntityManagerFactory;
+ (Ljavax/persistence/EntityManagerFactory;)L1javax/persistence/EntityManagerFactory;
 createNativeEntityManager
  (Ljava/util/Map<**>;)Ljavax/persistence/EntityManager;
- (Ljava/util/Map<**>;)Ljavax/persistence/EntityManager;
+ (Ljava/util/Map<**>;)L1javax/persistence/EntityManager; # @Inherited(org.springframework.orm.jpa.EntityManagerFactoryInfo)
 createNativeEntityManagerFactory
  ()Ljavax/persistence/EntityManagerFactory;
- ()Ljavax/persistence/EntityManagerFactory;
+ ()L1javax/persistence/EntityManagerFactory;
 getBeanClassLoader
  ()Ljava/lang/ClassLoader;
  ()Ljava/lang/ClassLoader;
@@ -46,7 +46,7 @@ getObject
  ()L0javax/persistence/EntityManagerFactory;
 getObjectType
  ()Ljava/lang/Class<+Ljavax/persistence/EntityManagerFactory;>;
- ()Ljava/lang/Class<+Ljavax/persistence/EntityManagerFactory;>;
+ ()L1java/lang/Class<+Ljavax/persistence/EntityManagerFactory;>;
 getPersistenceProvider
  ()Ljavax/persistence/spi/PersistenceProvider;
  ()L0javax/persistence/spi/PersistenceProvider; # @Inherited(org.springframework.orm.jpa.EntityManagerFactoryInfo)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/EntityManagerFactoryAccessor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/EntityManagerFactoryAccessor.eea
index b7d433feb1..5124937b84 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/EntityManagerFactoryAccessor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/EntityManagerFactoryAccessor.eea
@@ -6,7 +6,7 @@ logger
 
 createEntityManager
  ()Ljavax/persistence/EntityManager;
- ()Ljavax/persistence/EntityManager;
+ ()L1javax/persistence/EntityManager;
 getEntityManagerFactory
  ()Ljavax/persistence/EntityManagerFactory;
  ()L0javax/persistence/EntityManagerFactory;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/EntityManagerFactoryInfo.eea b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/EntityManagerFactoryInfo.eea
index cec5c4e6e4..41ae287609 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/EntityManagerFactoryInfo.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/EntityManagerFactoryInfo.eea
@@ -2,7 +2,7 @@ class org/springframework/orm/jpa/EntityManagerFactoryInfo
 
 createNativeEntityManager
  (Ljava/util/Map<**>;)Ljavax/persistence/EntityManager;
- (Ljava/util/Map<**>;)Ljavax/persistence/EntityManager;
+ (Ljava/util/Map<**>;)L1javax/persistence/EntityManager;
 getBeanClassLoader
  ()Ljava/lang/ClassLoader;
  ()Ljava/lang/ClassLoader;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/ExtendedEntityManagerCreator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/ExtendedEntityManagerCreator.eea
index 277981812b..9f1f742d55 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/ExtendedEntityManagerCreator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/ExtendedEntityManagerCreator.eea
@@ -2,19 +2,19 @@ class org/springframework/orm/jpa/ExtendedEntityManagerCreator
 
 createApplicationManagedEntityManager
  (Ljavax/persistence/EntityManager;Lorg/springframework/orm/jpa/EntityManagerFactoryInfo;)Ljavax/persistence/EntityManager;
- (Ljavax/persistence/EntityManager;Lorg/springframework/orm/jpa/EntityManagerFactoryInfo;)Ljavax/persistence/EntityManager;
+ (Ljavax/persistence/EntityManager;Lorg/springframework/orm/jpa/EntityManagerFactoryInfo;)L1javax/persistence/EntityManager;
 createApplicationManagedEntityManager
  (Ljavax/persistence/EntityManager;Lorg/springframework/orm/jpa/EntityManagerFactoryInfo;Z)Ljavax/persistence/EntityManager;
- (Ljavax/persistence/EntityManager;Lorg/springframework/orm/jpa/EntityManagerFactoryInfo;Z)Ljavax/persistence/EntityManager;
+ (Ljavax/persistence/EntityManager;Lorg/springframework/orm/jpa/EntityManagerFactoryInfo;Z)L1javax/persistence/EntityManager;
 createContainerManagedEntityManager
  (Ljavax/persistence/EntityManager;Lorg/springframework/orm/jpa/EntityManagerFactoryInfo;)Ljavax/persistence/EntityManager;
- (Ljavax/persistence/EntityManager;Lorg/springframework/orm/jpa/EntityManagerFactoryInfo;)Ljavax/persistence/EntityManager;
+ (Ljavax/persistence/EntityManager;Lorg/springframework/orm/jpa/EntityManagerFactoryInfo;)L1javax/persistence/EntityManager;
 createContainerManagedEntityManager
  (Ljavax/persistence/EntityManagerFactory;)Ljavax/persistence/EntityManager;
- (Ljavax/persistence/EntityManagerFactory;)Ljavax/persistence/EntityManager;
+ (Ljavax/persistence/EntityManagerFactory;)L1javax/persistence/EntityManager;
 createContainerManagedEntityManager
  (Ljavax/persistence/EntityManagerFactory;Ljava/util/Map<**>;)Ljavax/persistence/EntityManager;
- (Ljavax/persistence/EntityManagerFactory;Ljava/util/Map<**>;)Ljavax/persistence/EntityManager;
+ (Ljavax/persistence/EntityManagerFactory;Ljava/util/Map<**>;)L1javax/persistence/EntityManager;
 createContainerManagedEntityManager
  (Ljavax/persistence/EntityManagerFactory;Ljava/util/Map<**>;Z)Ljavax/persistence/EntityManager;
- (Ljavax/persistence/EntityManagerFactory;Ljava/util/Map<**>;Z)Ljavax/persistence/EntityManager;
+ (Ljavax/persistence/EntityManagerFactory;Ljava/util/Map<**>;Z)L1javax/persistence/EntityManager;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/JpaTransactionManager.eea b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/JpaTransactionManager.eea
index 4a97835722..5932044271 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/JpaTransactionManager.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/JpaTransactionManager.eea
@@ -8,7 +8,7 @@ closeEntityManagerAfterFailedBegin
  (Lorg/springframework/orm/jpa/JpaTransactionManager$JpaTransactionObject;)V
 createEntityManagerForTransaction
  ()Ljavax/persistence/EntityManager;
- ()Ljavax/persistence/EntityManager;
+ ()L1javax/persistence/EntityManager;
 doBegin
  (Ljava/lang/Object;Lorg/springframework/transaction/TransactionDefinition;)V
  (Ljava/lang/Object;Lorg/springframework/transaction/TransactionDefinition;)V
@@ -20,7 +20,7 @@ doCommit
  (Lorg/springframework/transaction/support/DefaultTransactionStatus;)V
 doGetTransaction
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 doResume
  (Ljava/lang/Object;Ljava/lang/Object;)V
  (Ljava/lang/Object;Ljava/lang/Object;)V
@@ -32,7 +32,7 @@ doSetRollbackOnly
  (Lorg/springframework/transaction/support/DefaultTransactionStatus;)V
 doSuspend
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object; # @Inherited(org.springframework.transaction.support.AbstractPlatformTransactionManager)
 getDataSource
  ()Ljavax/sql/DataSource;
  ()L0javax/sql/DataSource;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/JpaVendorAdapter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/JpaVendorAdapter.eea
index f5978175a5..f914e5ab3d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/JpaVendorAdapter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/JpaVendorAdapter.eea
@@ -2,10 +2,10 @@ class org/springframework/orm/jpa/JpaVendorAdapter
 
 getEntityManagerFactoryInterface
  ()Ljava/lang/Class<+Ljavax/persistence/EntityManagerFactory;>;
- ()Ljava/lang/Class<+Ljavax/persistence/EntityManagerFactory;>;
+ ()L1java/lang/Class<+Ljavax/persistence/EntityManagerFactory;>;
 getEntityManagerInterface
  ()Ljava/lang/Class<+Ljavax/persistence/EntityManager;>;
- ()Ljava/lang/Class<+Ljavax/persistence/EntityManager;>;
+ ()L1java/lang/Class<+Ljavax/persistence/EntityManager;>;
 getJpaDialect
  ()Lorg/springframework/orm/jpa/JpaDialect;
  ()L0org/springframework/orm/jpa/JpaDialect;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.eea
index 28c2063067..fec877218f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.eea
@@ -2,7 +2,7 @@ class org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean
 
 createNativeEntityManagerFactory
  ()Ljavax/persistence/EntityManagerFactory;
- ()Ljavax/persistence/EntityManagerFactory;
+ ()L1javax/persistence/EntityManagerFactory; # @Inherited(org.springframework.orm.jpa.AbstractEntityManagerFactoryBean)
 determinePersistenceUnitInfo
  (Lorg/springframework/orm/jpa/persistenceunit/PersistenceUnitManager;)Ljavax/persistence/spi/PersistenceUnitInfo;
  (Lorg/springframework/orm/jpa/persistenceunit/PersistenceUnitManager;)Ljavax/persistence/spi/PersistenceUnitInfo;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.eea
index 2cf8a9a293..c01c90c50a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.eea
@@ -2,4 +2,4 @@ class org/springframework/orm/jpa/LocalEntityManagerFactoryBean
 
 createNativeEntityManagerFactory
  ()Ljavax/persistence/EntityManagerFactory;
- ()Ljavax/persistence/EntityManagerFactory;
+ ()L1javax/persistence/EntityManagerFactory; # @Inherited(org.springframework.orm.jpa.AbstractEntityManagerFactoryBean)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/SharedEntityManagerCreator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/SharedEntityManagerCreator.eea
index 810512d8ac..547fbfe44f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/SharedEntityManagerCreator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/SharedEntityManagerCreator.eea
@@ -2,16 +2,16 @@ class org/springframework/orm/jpa/SharedEntityManagerCreator
 
 createSharedEntityManager
  (Ljavax/persistence/EntityManagerFactory;)Ljavax/persistence/EntityManager;
- (Ljavax/persistence/EntityManagerFactory;)Ljavax/persistence/EntityManager;
+ (Ljavax/persistence/EntityManagerFactory;)L1javax/persistence/EntityManager;
 createSharedEntityManager
  (Ljavax/persistence/EntityManagerFactory;Ljava/util/Map<**>;)Ljavax/persistence/EntityManager;
- (Ljavax/persistence/EntityManagerFactory;Ljava/util/Map<**>;)Ljavax/persistence/EntityManager;
+ (Ljavax/persistence/EntityManagerFactory;Ljava/util/Map<**>;)L1javax/persistence/EntityManager;
 createSharedEntityManager
  (Ljavax/persistence/EntityManagerFactory;Ljava/util/Map<**>;Z)Ljavax/persistence/EntityManager;
- (Ljavax/persistence/EntityManagerFactory;Ljava/util/Map<**>;Z)Ljavax/persistence/EntityManager;
+ (Ljavax/persistence/EntityManagerFactory;Ljava/util/Map<**>;Z)L1javax/persistence/EntityManager;
 createSharedEntityManager
  (Ljavax/persistence/EntityManagerFactory;Ljava/util/Map<**>;Z[Ljava/lang/Class<*>;)Ljavax/persistence/EntityManager;
- (Ljavax/persistence/EntityManagerFactory;Ljava/util/Map<**>;Z[Ljava/lang/Class<*>;)Ljavax/persistence/EntityManager;
+ (Ljavax/persistence/EntityManagerFactory;Ljava/util/Map<**>;Z[Ljava/lang/Class<*>;)L1javax/persistence/EntityManager;
 createSharedEntityManager
  (Ljavax/persistence/EntityManagerFactory;Ljava/util/Map<**>;[Ljava/lang/Class<*>;)Ljavax/persistence/EntityManager;
- (Ljavax/persistence/EntityManagerFactory;Ljava/util/Map<**>;[Ljava/lang/Class<*>;)Ljavax/persistence/EntityManager;
+ (Ljavax/persistence/EntityManagerFactory;Ljava/util/Map<**>;[Ljava/lang/Class<*>;)L1javax/persistence/EntityManager;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.eea b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.eea
index 9b8f20bd04..f9a59f701a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.eea
@@ -38,7 +38,7 @@ getMappingFileNames
  ()Ljava/util/List<Ljava/lang/String;>;
 getNewTempClassLoader
  ()Ljava/lang/ClassLoader;
- ()Ljava/lang/ClassLoader;
+ ()L1java/lang/ClassLoader;
 getNonJtaDataSource
  ()Ljavax/sql/DataSource;
  ()L0javax/sql/DataSource;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.eea
index 697e8c47ba..b8eefd3eab 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.eea
@@ -6,7 +6,7 @@ DEFAULT_ENTITY_MANAGER_FACTORY_BEAN_NAME
 
 createEntityManager
  (Ljavax/persistence/EntityManagerFactory;)Ljavax/persistence/EntityManager;
- (Ljavax/persistence/EntityManagerFactory;)Ljavax/persistence/EntityManager;
+ (Ljavax/persistence/EntityManagerFactory;)L1javax/persistence/EntityManager;
 doFilterInternal
  (Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V
  (Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.eea
index b1c1c62c39..dc4ff8bad8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.eea
@@ -12,7 +12,7 @@ afterConcurrentHandlingStarted
  (Lorg/springframework/web/context/request/WebRequest;)V
 getParticipateAttributeName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 postHandle
  (Lorg/springframework/web/context/request/WebRequest;Lorg/springframework/ui/ModelMap;)V
  (Lorg/springframework/web/context/request/WebRequest;Lorg/springframework/ui/ModelMap;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/support/SharedEntityManagerBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/support/SharedEntityManagerBean.eea
index 062847b734..790c0b1d69 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/support/SharedEntityManagerBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/support/SharedEntityManagerBean.eea
@@ -9,7 +9,7 @@ getObject
  ()L0javax/persistence/EntityManager;
 getObjectType
  ()Ljava/lang/Class<+Ljavax/persistence/EntityManager;>;
- ()Ljava/lang/Class<+Ljavax/persistence/EntityManager;>;
+ ()L1java/lang/Class<+Ljavax/persistence/EntityManager;>;
 setEntityManagerInterface
  (Ljava/lang/Class<+Ljavax/persistence/EntityManager;>;)V
  (Ljava/lang/Class<+Ljavax/persistence/EntityManager;>;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.eea
index 0da06dd7e7..594c7858c8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.eea
@@ -8,10 +8,10 @@ getDatabasePlatform
  ()L0java/lang/String;
 getEntityManagerFactoryInterface
  ()Ljava/lang/Class<+Ljavax/persistence/EntityManagerFactory;>;
- ()Ljava/lang/Class<+Ljavax/persistence/EntityManagerFactory;>;
+ ()L1java/lang/Class<+Ljavax/persistence/EntityManagerFactory;>; # @Inherited(org.springframework.orm.jpa.JpaVendorAdapter)
 getEntityManagerInterface
  ()Ljava/lang/Class<+Ljavax/persistence/EntityManager;>;
- ()Ljava/lang/Class<+Ljavax/persistence/EntityManager;>;
+ ()L1java/lang/Class<+Ljavax/persistence/EntityManager;>; # @Inherited(org.springframework.orm.jpa.JpaVendorAdapter)
 getJpaDialect
  ()Lorg/springframework/orm/jpa/JpaDialect;
  ()L0org/springframework/orm/jpa/JpaDialect; # @Inherited(org.springframework.orm.jpa.JpaVendorAdapter)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.eea
index cb1ba9fbca..c51ec63b9d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.eea
@@ -5,13 +5,13 @@ determineTargetDatabaseName
  (Lorg/springframework/orm/jpa/vendor/Database;)L0java/lang/String;
 getEntityManagerInterface
  ()Ljava/lang/Class<+Ljavax/persistence/EntityManager;>;
- ()Ljava/lang/Class<+Ljavax/persistence/EntityManager;>;
+ ()L1java/lang/Class<+Ljavax/persistence/EntityManager;>; # @Inherited(org.springframework.orm.jpa.vendor.AbstractJpaVendorAdapter)
 getJpaDialect
  ()Lorg/springframework/orm/jpa/vendor/EclipseLinkJpaDialect;
  ()Lorg/springframework/orm/jpa/vendor/EclipseLinkJpaDialect;
 getJpaPropertyMap
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ ()L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 getPersistenceProvider
  ()Ljavax/persistence/spi/PersistenceProvider;
  ()Ljavax/persistence/spi/PersistenceProvider;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.eea
index f4e36ba233..30ef8eb87e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.eea
@@ -5,10 +5,10 @@ determineDatabaseDialectClass
  (Lorg/springframework/orm/jpa/vendor/Database;)L0java/lang/Class<*>;
 getEntityManagerFactoryInterface
  ()Ljava/lang/Class<+Ljavax/persistence/EntityManagerFactory;>;
- ()Ljava/lang/Class<+Ljavax/persistence/EntityManagerFactory;>;
+ ()L1java/lang/Class<+Ljavax/persistence/EntityManagerFactory;>; # @Inherited(org.springframework.orm.jpa.vendor.AbstractJpaVendorAdapter)
 getEntityManagerInterface
  ()Ljava/lang/Class<+Ljavax/persistence/EntityManager;>;
- ()Ljava/lang/Class<+Ljavax/persistence/EntityManager;>;
+ ()L1java/lang/Class<+Ljavax/persistence/EntityManager;>; # @Inherited(org.springframework.orm.jpa.vendor.AbstractJpaVendorAdapter)
 getJpaDialect
  ()Lorg/springframework/orm/jpa/vendor/HibernateJpaDialect;
  ()Lorg/springframework/orm/jpa/vendor/HibernateJpaDialect;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/oxm/jaxb/Jaxb2Marshaller.eea b/libs/eea-spring-5/src/main/resources/org/springframework/oxm/jaxb/Jaxb2Marshaller.eea
index 3096efe5a4..292cafd87f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/oxm/jaxb/Jaxb2Marshaller.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/oxm/jaxb/Jaxb2Marshaller.eea
@@ -6,13 +6,13 @@ logger
 
 convertJaxbException
  (Ljavax/xml/bind/JAXBException;)Lorg/springframework/oxm/XmlMappingException;
- (Ljavax/xml/bind/JAXBException;)Lorg/springframework/oxm/XmlMappingException;
+ (Ljavax/xml/bind/JAXBException;)L1org/springframework/oxm/XmlMappingException;
 createMarshaller
  ()Ljavax/xml/bind/Marshaller;
- ()Ljavax/xml/bind/Marshaller;
+ ()L1javax/xml/bind/Marshaller;
 createUnmarshaller
  ()Ljavax/xml/bind/Unmarshaller;
- ()Ljavax/xml/bind/Unmarshaller;
+ ()L1javax/xml/bind/Unmarshaller;
 getClassesToBeBound
  ()[Ljava/lang/Class<*>;
  ()[0Ljava/lang/Class<*>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/oxm/jibx/JibxMarshaller.eea b/libs/eea-spring-5/src/main/resources/org/springframework/oxm/jibx/JibxMarshaller.eea
index a1e6efa316..12bd5fb1b3 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/oxm/jibx/JibxMarshaller.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/oxm/jibx/JibxMarshaller.eea
@@ -2,13 +2,13 @@ class org/springframework/oxm/jibx/JibxMarshaller
 
 convertJibxException
  (Lorg/jibx/runtime/JiBXException;Z)Lorg/springframework/oxm/XmlMappingException;
- (Lorg/jibx/runtime/JiBXException;Z)Lorg/springframework/oxm/XmlMappingException;
+ (Lorg/jibx/runtime/JiBXException;Z)L1org/springframework/oxm/XmlMappingException;
 createMarshallingContext
  ()Lorg/jibx/runtime/IMarshallingContext;
- ()Lorg/jibx/runtime/IMarshallingContext;
+ ()L1org/jibx/runtime/IMarshallingContext;
 createUnmarshallingContext
  ()Lorg/jibx/runtime/IUnmarshallingContext;
- ()Lorg/jibx/runtime/IUnmarshallingContext;
+ ()L1org/jibx/runtime/IUnmarshallingContext;
 getDefaultEncoding
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(org.springframework.oxm.support.AbstractMarshaller)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/oxm/support/AbstractMarshaller.eea b/libs/eea-spring-5/src/main/resources/org/springframework/oxm/support/AbstractMarshaller.eea
index 6862c033e1..b9e144164a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/oxm/support/AbstractMarshaller.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/oxm/support/AbstractMarshaller.eea
@@ -9,13 +9,13 @@ buildDocument
  ()Lorg/w3c/dom/Document;
 createDocumentBuilder
  (Ljavax/xml/parsers/DocumentBuilderFactory;)Ljavax/xml/parsers/DocumentBuilder;
- (Ljavax/xml/parsers/DocumentBuilderFactory;)Ljavax/xml/parsers/DocumentBuilder;
+ (Ljavax/xml/parsers/DocumentBuilderFactory;)L1javax/xml/parsers/DocumentBuilder;
 createDocumentBuilderFactory
  ()Ljavax/xml/parsers/DocumentBuilderFactory;
- ()Ljavax/xml/parsers/DocumentBuilderFactory;
+ ()L1javax/xml/parsers/DocumentBuilderFactory;
 createXmlReader
  ()Lorg/xml/sax/XMLReader;
- ()Lorg/xml/sax/XMLReader;
+ ()L1org/xml/sax/XMLReader;
 getDefaultEncoding
  ()Ljava/lang/String;
  ()L0java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/oxm/support/SaxResourceUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/oxm/support/SaxResourceUtils.eea
index 2e0b072c7f..4c8f1b9cfe 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/oxm/support/SaxResourceUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/oxm/support/SaxResourceUtils.eea
@@ -2,4 +2,4 @@ class org/springframework/oxm/support/SaxResourceUtils
 
 createInputSource
  (Lorg/springframework/core/io/Resource;)Lorg/xml/sax/InputSource;
- (Lorg/springframework/core/io/Resource;)Lorg/xml/sax/InputSource;
+ (Lorg/springframework/core/io/Resource;)L1org/xml/sax/InputSource;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/oxm/xstream/CatchAllConverter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/oxm/xstream/CatchAllConverter.eea
index 8873e37bc9..b9e6a96f9f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/oxm/xstream/CatchAllConverter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/oxm/xstream/CatchAllConverter.eea
@@ -8,4 +8,4 @@ marshal
  (Ljava/lang/Object;Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Lcom/thoughtworks/xstream/converters/MarshallingContext;)V
 unmarshal
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;)Ljava/lang/Object;
- (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;)Ljava/lang/Object;
+ (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;)L1java/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/oxm/xstream/XStreamMarshaller.eea b/libs/eea-spring-5/src/main/resources/org/springframework/oxm/xstream/XStreamMarshaller.eea
index f68f99a873..7ce3dc7b5e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/oxm/xstream/XStreamMarshaller.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/oxm/xstream/XStreamMarshaller.eea
@@ -15,7 +15,7 @@ constructXStream
  ()Lcom/thoughtworks/xstream/XStream;
 convertXStreamException
  (Ljava/lang/Exception;Z)Lorg/springframework/oxm/XmlMappingException;
- (Ljava/lang/Exception;Z)Lorg/springframework/oxm/XmlMappingException;
+ (Ljava/lang/Exception;Z)L1org/springframework/oxm/XmlMappingException;
 customizeXStream
  (Lcom/thoughtworks/xstream/XStream;)V
  (Lcom/thoughtworks/xstream/XStream;)V
@@ -132,7 +132,7 @@ unmarshalReader
  (Ljava/io/Reader;Lcom/thoughtworks/xstream/converters/DataHolder;)Ljava/lang/Object;
 unmarshalSaxReader
  (Lorg/xml/sax/XMLReader;Lorg/xml/sax/InputSource;)Ljava/lang/Object;
- (Lorg/xml/sax/XMLReader;Lorg/xml/sax/InputSource;)Ljava/lang/Object;
+ (Lorg/xml/sax/XMLReader;Lorg/xml/sax/InputSource;)L1java/lang/Object;
 unmarshalStreamSource
  (Ljavax/xml/transform/stream/StreamSource;)Ljava/lang/Object;
  (Ljavax/xml/transform/stream/StreamSource;)Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/caucho/HessianClientInterceptor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/caucho/HessianClientInterceptor.eea
index 7e81dfd751..baaeafefdc 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/caucho/HessianClientInterceptor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/caucho/HessianClientInterceptor.eea
@@ -2,10 +2,10 @@ class org/springframework/remoting/caucho/HessianClientInterceptor
 
 convertHessianAccessException
  (Ljava/lang/Throwable;)Lorg/springframework/remoting/RemoteAccessException;
- (Ljava/lang/Throwable;)Lorg/springframework/remoting/RemoteAccessException;
+ (Ljava/lang/Throwable;)L1org/springframework/remoting/RemoteAccessException;
 createHessianProxy
  (Lcom/caucho/hessian/client/HessianProxyFactory;)Ljava/lang/Object;
- (Lcom/caucho/hessian/client/HessianProxyFactory;)Ljava/lang/Object;
+ (Lcom/caucho/hessian/client/HessianProxyFactory;)L1java/lang/Object;
 invoke
  (Lorg/aopalliance/intercept/MethodInvocation;)Ljava/lang/Object;
  (Lorg/aopalliance/intercept/MethodInvocation;)L0java/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.eea
index e6f643df1b..3f9a24cf6b 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.eea
@@ -31,7 +31,7 @@ logger
 
 createObjectInputStream
  (Ljava/io/InputStream;Ljava/lang/String;)Ljava/io/ObjectInputStream;
- (Ljava/io/InputStream;Ljava/lang/String;)Ljava/io/ObjectInputStream;
+ (Ljava/io/InputStream;Ljava/lang/String;)L1java/io/ObjectInputStream;
 decorateInputStream
  (Ljava/io/InputStream;)Ljava/io/InputStream;
  (Ljava/io/InputStream;)Ljava/io/InputStream;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.eea
index 09a8800239..76207fcdc6 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.eea
@@ -5,7 +5,7 @@ class org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestE
  (Lorg/apache/http/client/HttpClient;)V
 createHttpPost
  (Lorg/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration;)Lorg/apache/http/client/methods/HttpPost;
- (Lorg/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration;)Lorg/apache/http/client/methods/HttpPost;
+ (Lorg/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration;)L1org/apache/http/client/methods/HttpPost;
 createRequestConfig
  (Lorg/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration;)Lorg/apache/http/client/config/RequestConfig;
  (Lorg/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration;)L0org/apache/http/client/config/RequestConfig;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/jaxws/AbstractJaxWsServiceExporter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/jaxws/AbstractJaxWsServiceExporter.eea
index a858cbdb85..2206658c86 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/jaxws/AbstractJaxWsServiceExporter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/jaxws/AbstractJaxWsServiceExporter.eea
@@ -2,7 +2,7 @@ class org/springframework/remoting/jaxws/AbstractJaxWsServiceExporter
 
 createEndpoint
  (Ljava/lang/Object;)Ljavax/xml/ws/Endpoint;
- (Ljava/lang/Object;)Ljavax/xml/ws/Endpoint;
+ (Ljava/lang/Object;)L1javax/xml/ws/Endpoint;
 publishEndpoint
  (Ljavax/xml/ws/Endpoint;Ljavax/jws/WebService;)V
  (Ljavax/xml/ws/Endpoint;Ljavax/jws/WebService;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/jaxws/LocalJaxWsServiceFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/jaxws/LocalJaxWsServiceFactory.eea
index b3b1389fac..04f346fb18 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/jaxws/LocalJaxWsServiceFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/jaxws/LocalJaxWsServiceFactory.eea
@@ -2,13 +2,13 @@ class org/springframework/remoting/jaxws/LocalJaxWsServiceFactory
 
 createJaxWsService
  ()Ljavax/xml/ws/Service;
- ()Ljavax/xml/ws/Service;
+ ()L1javax/xml/ws/Service;
 getNamespaceUri
  ()Ljava/lang/String;
  ()L0java/lang/String;
 getQName
  (Ljava/lang/String;)Ljavax/xml/namespace/QName;
- (Ljava/lang/String;)Ljavax/xml/namespace/QName;
+ (Ljava/lang/String;)L1javax/xml/namespace/QName;
 getServiceName
  ()Ljava/lang/String;
  ()L0java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/jaxws/LocalJaxWsServiceFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/jaxws/LocalJaxWsServiceFactoryBean.eea
index 0ec275615e..6a69d753e5 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/jaxws/LocalJaxWsServiceFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/jaxws/LocalJaxWsServiceFactoryBean.eea
@@ -9,4 +9,4 @@ getObject
  ()L0javax/xml/ws/Service;
 getObjectType
  ()Ljava/lang/Class<+Ljavax/xml/ws/Service;>;
- ()Ljava/lang/Class<+Ljavax/xml/ws/Service;>;
+ ()L1java/lang/Class<+Ljavax/xml/ws/Service;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/jaxws/SimpleHttpServerJaxWsServiceExporter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/jaxws/SimpleHttpServerJaxWsServiceExporter.eea
index fa01d9dd71..e4e0bb6f57 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/jaxws/SimpleHttpServerJaxWsServiceExporter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/jaxws/SimpleHttpServerJaxWsServiceExporter.eea
@@ -9,7 +9,7 @@ buildHttpContext
  (Ljavax/xml/ws/Endpoint;Ljava/lang/String;)Lcom/sun/net/httpserver/HttpContext;
 calculateEndpointPath
  (Ljavax/xml/ws/Endpoint;Ljava/lang/String;)Ljava/lang/String;
- (Ljavax/xml/ws/Endpoint;Ljava/lang/String;)Ljava/lang/String;
+ (Ljavax/xml/ws/Endpoint;Ljava/lang/String;)L1java/lang/String;
 publishEndpoint
  (Ljavax/xml/ws/Endpoint;Ljavax/jws/WebService;)V
  (Ljavax/xml/ws/Endpoint;Ljavax/jws/WebService;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/jaxws/SimpleJaxWsServiceExporter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/jaxws/SimpleJaxWsServiceExporter.eea
index 4b6b5fc3be..041acd30e8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/jaxws/SimpleJaxWsServiceExporter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/jaxws/SimpleJaxWsServiceExporter.eea
@@ -6,7 +6,7 @@ DEFAULT_BASE_ADDRESS
 
 calculateEndpointAddress
  (Ljavax/xml/ws/Endpoint;Ljava/lang/String;)Ljava/lang/String;
- (Ljavax/xml/ws/Endpoint;Ljava/lang/String;)Ljava/lang/String;
+ (Ljavax/xml/ws/Endpoint;Ljava/lang/String;)L1java/lang/String;
 publishEndpoint
  (Ljavax/xml/ws/Endpoint;Ljavax/jws/WebService;)V
  (Ljavax/xml/ws/Endpoint;Ljavax/jws/WebService;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.eea b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.eea
index a56e6d38f7..0fd761dec2 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.eea
@@ -14,4 +14,4 @@ getFallbackClassLoader
  ()L0java/lang/ClassLoader; # @Inherited(org.springframework.core.ConfigurableObjectInputStream)
 resolveFallbackIfPossible
  (Ljava/lang/String;Ljava/lang/ClassNotFoundException;)Ljava/lang/Class<*>;
- (Ljava/lang/String;Ljava/lang/ClassNotFoundException;)Ljava/lang/Class<*>;
+ (Ljava/lang/String;Ljava/lang/ClassNotFoundException;)L1java/lang/Class<*>; # @Inherited(org.springframework.core.ConfigurableObjectInputStream)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/rmi/JndiRmiClientInterceptor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/rmi/JndiRmiClientInterceptor.eea
index 597b07ae78..0f137b3537 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/rmi/JndiRmiClientInterceptor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/rmi/JndiRmiClientInterceptor.eea
@@ -2,7 +2,7 @@ class org/springframework/remoting/rmi/JndiRmiClientInterceptor
 
 createRemoteInvocation
  (Lorg/aopalliance/intercept/MethodInvocation;)Lorg/springframework/remoting/support/RemoteInvocation;
- (Lorg/aopalliance/intercept/MethodInvocation;)Lorg/springframework/remoting/support/RemoteInvocation;
+ (Lorg/aopalliance/intercept/MethodInvocation;)L1org/springframework/remoting/support/RemoteInvocation;
 doInvoke
  (Lorg/aopalliance/intercept/MethodInvocation;Ljava/lang/Object;)Ljava/lang/Object;
  (Lorg/aopalliance/intercept/MethodInvocation;Ljava/lang/Object;)L0java/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.eea
index d2e76e7289..03cbe52f31 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.eea
@@ -6,10 +6,10 @@ CONTENT_TYPE_SERIALIZED_OBJECT
 
 createObjectInputStream
  (Ljava/io/InputStream;)Ljava/io/ObjectInputStream;
- (Ljava/io/InputStream;)Ljava/io/ObjectInputStream;
+ (Ljava/io/InputStream;)L1java/io/ObjectInputStream;
 createObjectOutputStream
  (Ljava/io/OutputStream;)Ljava/io/ObjectOutputStream;
- (Ljava/io/OutputStream;)Ljava/io/ObjectOutputStream;
+ (Ljava/io/OutputStream;)L1java/io/ObjectOutputStream;
 doReadRemoteInvocation
  (Ljava/io/ObjectInputStream;)Lorg/springframework/remoting/support/RemoteInvocation;
  (Ljava/io/ObjectInputStream;)Lorg/springframework/remoting/support/RemoteInvocation;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/rmi/RmiClientInterceptorUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/rmi/RmiClientInterceptorUtils.eea
index 767388e77c..ccbaf66d02 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/rmi/RmiClientInterceptorUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/rmi/RmiClientInterceptorUtils.eea
@@ -2,7 +2,7 @@ class org/springframework/remoting/rmi/RmiClientInterceptorUtils
 
 convertRmiAccessException
  (Ljava/lang/reflect/Method;Ljava/lang/Throwable;Ljava/lang/String;)Ljava/lang/Exception;
- (Ljava/lang/reflect/Method;Ljava/lang/Throwable;Ljava/lang/String;)Ljava/lang/Exception;
+ (Ljava/lang/reflect/Method;Ljava/lang/Throwable;Ljava/lang/String;)L1java/lang/Exception;
 convertRmiAccessException
  (Ljava/lang/reflect/Method;Ljava/rmi/RemoteException;Ljava/lang/String;)Ljava/lang/Exception;
  (Ljava/lang/reflect/Method;Ljava/rmi/RemoteException;Ljava/lang/String;)Ljava/lang/Exception;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/rmi/RmiRegistryFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/rmi/RmiRegistryFactoryBean.eea
index e160fd7fa9..b41daf187d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/rmi/RmiRegistryFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/rmi/RmiRegistryFactoryBean.eea
@@ -16,7 +16,7 @@ getObject
  ()Ljava/rmi/registry/Registry;
 getObjectType
  ()Ljava/lang/Class<+Ljava/rmi/registry/Registry;>;
- ()Ljava/lang/Class<+Ljava/rmi/registry/Registry;>;
+ ()L1java/lang/Class<+Ljava/rmi/registry/Registry;>;
 getRegistry
  (I)Ljava/rmi/registry/Registry;
  (I)Ljava/rmi/registry/Registry;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/support/DefaultRemoteInvocationFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/support/DefaultRemoteInvocationFactory.eea
index 469562d4fe..6797f35386 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/support/DefaultRemoteInvocationFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/support/DefaultRemoteInvocationFactory.eea
@@ -2,4 +2,4 @@ class org/springframework/remoting/support/DefaultRemoteInvocationFactory
 
 createRemoteInvocation
  (Lorg/aopalliance/intercept/MethodInvocation;)Lorg/springframework/remoting/support/RemoteInvocation;
- (Lorg/aopalliance/intercept/MethodInvocation;)Lorg/springframework/remoting/support/RemoteInvocation;
+ (Lorg/aopalliance/intercept/MethodInvocation;)L1org/springframework/remoting/support/RemoteInvocation; # @Inherited(org.springframework.remoting.support.RemoteInvocationFactory)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/support/RemoteInvocationBasedAccessor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/support/RemoteInvocationBasedAccessor.eea
index 2b48e594ad..76ee8b50a7 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/support/RemoteInvocationBasedAccessor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/support/RemoteInvocationBasedAccessor.eea
@@ -2,7 +2,7 @@ class org/springframework/remoting/support/RemoteInvocationBasedAccessor
 
 createRemoteInvocation
  (Lorg/aopalliance/intercept/MethodInvocation;)Lorg/springframework/remoting/support/RemoteInvocation;
- (Lorg/aopalliance/intercept/MethodInvocation;)Lorg/springframework/remoting/support/RemoteInvocation;
+ (Lorg/aopalliance/intercept/MethodInvocation;)L1org/springframework/remoting/support/RemoteInvocation;
 getRemoteInvocationFactory
  ()Lorg/springframework/remoting/support/RemoteInvocationFactory;
  ()Lorg/springframework/remoting/support/RemoteInvocationFactory;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/support/RemoteInvocationBasedExporter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/support/RemoteInvocationBasedExporter.eea
index fe7788d1b2..a57b2f1d30 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/support/RemoteInvocationBasedExporter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/support/RemoteInvocationBasedExporter.eea
@@ -8,7 +8,7 @@ invoke
  (Lorg/springframework/remoting/support/RemoteInvocation;Ljava/lang/Object;)Ljava/lang/Object;
 invokeAndCreateResult
  (Lorg/springframework/remoting/support/RemoteInvocation;Ljava/lang/Object;)Lorg/springframework/remoting/support/RemoteInvocationResult;
- (Lorg/springframework/remoting/support/RemoteInvocation;Ljava/lang/Object;)Lorg/springframework/remoting/support/RemoteInvocationResult;
+ (Lorg/springframework/remoting/support/RemoteInvocation;Ljava/lang/Object;)L1org/springframework/remoting/support/RemoteInvocationResult;
 setRemoteInvocationExecutor
  (Lorg/springframework/remoting/support/RemoteInvocationExecutor;)V
  (Lorg/springframework/remoting/support/RemoteInvocationExecutor;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/support/RemoteInvocationFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/support/RemoteInvocationFactory.eea
index f5917a9412..aa68f1793b 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/support/RemoteInvocationFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/support/RemoteInvocationFactory.eea
@@ -2,4 +2,4 @@ class org/springframework/remoting/support/RemoteInvocationFactory
 
 createRemoteInvocation
  (Lorg/aopalliance/intercept/MethodInvocation;)Lorg/springframework/remoting/support/RemoteInvocation;
- (Lorg/aopalliance/intercept/MethodInvocation;)Lorg/springframework/remoting/support/RemoteInvocation;
+ (Lorg/aopalliance/intercept/MethodInvocation;)L1org/springframework/remoting/support/RemoteInvocation;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/support/SimpleHttpServerFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/support/SimpleHttpServerFactoryBean.eea
index 680ff33ad1..954aff454f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/remoting/support/SimpleHttpServerFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/remoting/support/SimpleHttpServerFactoryBean.eea
@@ -13,7 +13,7 @@ getObject
  ()Lcom/sun/net/httpserver/HttpServer;
 getObjectType
  ()Ljava/lang/Class<+Lcom/sun/net/httpserver/HttpServer;>;
- ()Ljava/lang/Class<+Lcom/sun/net/httpserver/HttpServer;>;
+ ()L1java/lang/Class<+Lcom/sun/net/httpserver/HttpServer;>;
 setAuthenticator
  (Lcom/sun/net/httpserver/Authenticator;)V
  (Lcom/sun/net/httpserver/Authenticator;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.eea
index c16d23dcd2..ad85681aa2 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.eea
@@ -8,7 +8,7 @@ class org/springframework/scheduling/annotation/AsyncAnnotationAdvisor
  (Ljava/util/function/Supplier<Ljava/util/concurrent/Executor;>;Ljava/util/function/Supplier<Lorg/springframework/aop/interceptor/AsyncUncaughtExceptionHandler;>;)V
 buildAdvice
  (Ljava/util/function/Supplier<Ljava/util/concurrent/Executor;>;Ljava/util/function/Supplier<Lorg/springframework/aop/interceptor/AsyncUncaughtExceptionHandler;>;)Lorg/aopalliance/aop/Advice;
- (Ljava/util/function/Supplier<Ljava/util/concurrent/Executor;>;Ljava/util/function/Supplier<Lorg/springframework/aop/interceptor/AsyncUncaughtExceptionHandler;>;)Lorg/aopalliance/aop/Advice;
+ (Ljava/util/function/Supplier<Ljava/util/concurrent/Executor;>;Ljava/util/function/Supplier<Lorg/springframework/aop/interceptor/AsyncUncaughtExceptionHandler;>;)L1org/aopalliance/aop/Advice;
 buildPointcut
  (Ljava/util/Set<Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;>;)Lorg/springframework/aop/Pointcut;
  (Ljava/util/Set<Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;>;)Lorg/springframework/aop/Pointcut;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/annotation/AsyncResult.eea b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/annotation/AsyncResult.eea
index 3136efc221..f6fe6eae32 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/annotation/AsyncResult.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/annotation/AsyncResult.eea
@@ -8,10 +8,10 @@ super org/springframework/util/concurrent/ListenableFuture
 
 forExecutionException
  <V:Ljava/lang/Object;>(Ljava/lang/Throwable;)Lorg/springframework/util/concurrent/ListenableFuture<TV;>;
- <V:Ljava/lang/Object;>(Ljava/lang/Throwable;)Lorg/springframework/util/concurrent/ListenableFuture<TV;>;
+ <V:Ljava/lang/Object;>(Ljava/lang/Throwable;)L1org/springframework/util/concurrent/ListenableFuture<TV;>;
 forValue
  <V:Ljava/lang/Object;>(TV;)Lorg/springframework/util/concurrent/ListenableFuture<TV;>;
- <V:Ljava/lang/Object;>(TV;)Lorg/springframework/util/concurrent/ListenableFuture<TV;>;
+ <V:Ljava/lang/Object;>(TV;)L1org/springframework/util/concurrent/ListenableFuture<TV;>;
 
 <init>
  (TV;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/annotation/ProxyAsyncConfiguration.eea b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/annotation/ProxyAsyncConfiguration.eea
index 7946ad2b16..120a11b442 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/annotation/ProxyAsyncConfiguration.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/annotation/ProxyAsyncConfiguration.eea
@@ -2,4 +2,4 @@ class org/springframework/scheduling/annotation/ProxyAsyncConfiguration
 
 asyncAdvisor
  ()Lorg/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessor;
- ()Lorg/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessor;
+ ()L1org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessor;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.eea
index 862e017f54..189dfd9f1b 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.eea
@@ -17,10 +17,10 @@ logger
  (Lorg/springframework/scheduling/config/ScheduledTaskRegistrar;)V
 createRunnable
  (Ljava/lang/Object;Ljava/lang/reflect/Method;)Ljava/lang/Runnable;
- (Ljava/lang/Object;Ljava/lang/reflect/Method;)Ljava/lang/Runnable;
+ (Ljava/lang/Object;Ljava/lang/reflect/Method;)L1java/lang/Runnable;
 getScheduledTasks
  ()Ljava/util/Set<Lorg/springframework/scheduling/config/ScheduledTask;>;
- ()Ljava/util/Set<Lorg/springframework/scheduling/config/ScheduledTask;>;
+ ()L1java/util/Set<Lorg/springframework/scheduling/config/ScheduledTask;>;
 onApplicationEvent
  (Lorg/springframework/context/event/ContextRefreshedEvent;)V
  (Lorg/springframework/context/event/ContextRefreshedEvent;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/annotation/SchedulingConfiguration.eea b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/annotation/SchedulingConfiguration.eea
index d6fc05bb87..6d4faf0477 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/annotation/SchedulingConfiguration.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/annotation/SchedulingConfiguration.eea
@@ -2,4 +2,4 @@ class org/springframework/scheduling/annotation/SchedulingConfiguration
 
 scheduledAnnotationProcessor
  ()Lorg/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor;
- ()Lorg/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor;
+ ()L1org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.eea
index e3e5be6a96..aa98fe39d6 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.eea
@@ -6,16 +6,16 @@ super org/springframework/beans/factory/FactoryBean
 
 createExecutor
  (ILjava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)Ljava/util/concurrent/ScheduledExecutorService;
- (ILjava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)Ljava/util/concurrent/ScheduledExecutorService;
+ (ILjava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)L1java/util/concurrent/ScheduledExecutorService;
 getObject
  ()Ljava/util/concurrent/ScheduledExecutorService;
  ()L0java/util/concurrent/ScheduledExecutorService;
 getObjectType
  ()Ljava/lang/Class<+Ljava/util/concurrent/ScheduledExecutorService;>;
- ()Ljava/lang/Class<+Ljava/util/concurrent/ScheduledExecutorService;>;
+ ()L1java/lang/Class<+Ljava/util/concurrent/ScheduledExecutorService;>;
 getRunnableToSchedule
  (Lorg/springframework/scheduling/concurrent/ScheduledExecutorTask;)Ljava/lang/Runnable;
- (Lorg/springframework/scheduling/concurrent/ScheduledExecutorTask;)Ljava/lang/Runnable;
+ (Lorg/springframework/scheduling/concurrent/ScheduledExecutorTask;)L1java/lang/Runnable;
 initializeExecutor
  (Ljava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)Ljava/util/concurrent/ExecutorService;
  (Ljava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)Ljava/util/concurrent/ExecutorService;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.eea
index eaa18ac345..826f7840ee 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.eea
@@ -6,16 +6,16 @@ super org/springframework/beans/factory/FactoryBean
 
 createExecutor
  (IIILjava/util/concurrent/BlockingQueue<Ljava/lang/Runnable;>;Ljava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)Ljava/util/concurrent/ThreadPoolExecutor;
- (IIILjava/util/concurrent/BlockingQueue<Ljava/lang/Runnable;>;Ljava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)Ljava/util/concurrent/ThreadPoolExecutor;
+ (IIILjava/util/concurrent/BlockingQueue<Ljava/lang/Runnable;>;Ljava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)L1java/util/concurrent/ThreadPoolExecutor;
 createQueue
  (I)Ljava/util/concurrent/BlockingQueue<Ljava/lang/Runnable;>;
- (I)Ljava/util/concurrent/BlockingQueue<Ljava/lang/Runnable;>;
+ (I)L1java/util/concurrent/BlockingQueue<Ljava/lang/Runnable;>;
 getObject
  ()Ljava/util/concurrent/ExecutorService;
  ()L0java/util/concurrent/ExecutorService;
 getObjectType
  ()Ljava/lang/Class<+Ljava/util/concurrent/ExecutorService;>;
- ()Ljava/lang/Class<+Ljava/util/concurrent/ExecutorService;>;
+ ()L1java/lang/Class<+Ljava/util/concurrent/ExecutorService;>;
 initializeExecutor
  (Ljava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)Ljava/util/concurrent/ExecutorService;
  (Ljava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)Ljava/util/concurrent/ExecutorService;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.eea
index 99ec06f8b2..85b52a8ac9 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.eea
@@ -5,7 +5,7 @@ cancelRemainingTask
  (Ljava/lang/Runnable;)V
 createQueue
  (I)Ljava/util/concurrent/BlockingQueue<Ljava/lang/Runnable;>;
- (I)Ljava/util/concurrent/BlockingQueue<Ljava/lang/Runnable;>;
+ (I)L1java/util/concurrent/BlockingQueue<Ljava/lang/Runnable;>;
 execute
  (Ljava/lang/Runnable;)V
  (L1java/lang/Runnable;)V # @Inherited(org.springframework.core.task.TaskExecutor)
@@ -29,7 +29,7 @@ submit
  <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Ljava/util/concurrent/Future<TT;>;
 submitListenable
  (Ljava/lang/Runnable;)Lorg/springframework/util/concurrent/ListenableFuture<*>;
- (Ljava/lang/Runnable;)Lorg/springframework/util/concurrent/ListenableFuture<*>;
+ (Ljava/lang/Runnable;)L1org/springframework/util/concurrent/ListenableFuture<*>;
 submitListenable
  <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Lorg/springframework/util/concurrent/ListenableFuture<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Lorg/springframework/util/concurrent/ListenableFuture<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)L1org/springframework/util/concurrent/ListenableFuture<TT;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.eea b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.eea
index e0f28efa5e..0c35ee20b5 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.eea
@@ -5,7 +5,7 @@ cancelRemainingTask
  (Ljava/lang/Runnable;)V
 createExecutor
  (ILjava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)Ljava/util/concurrent/ScheduledExecutorService;
- (ILjava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)Ljava/util/concurrent/ScheduledExecutorService;
+ (ILjava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)L1java/util/concurrent/ScheduledExecutorService;
 execute
  (Ljava/lang/Runnable;)V
  (L1java/lang/Runnable;)V # @Inherited(org.springframework.core.task.TaskExecutor)
@@ -56,7 +56,7 @@ submit
  <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Ljava/util/concurrent/Future<TT;>;
 submitListenable
  (Ljava/lang/Runnable;)Lorg/springframework/util/concurrent/ListenableFuture<*>;
- (Ljava/lang/Runnable;)Lorg/springframework/util/concurrent/ListenableFuture<*>;
+ (Ljava/lang/Runnable;)L1org/springframework/util/concurrent/ListenableFuture<*>;
 submitListenable
  <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Lorg/springframework/util/concurrent/ListenableFuture<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Lorg/springframework/util/concurrent/ListenableFuture<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)L1org/springframework/util/concurrent/ListenableFuture<TT;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/config/TaskExecutorFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/config/TaskExecutorFactoryBean.eea
index b64f4d06f7..9be9831e72 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/config/TaskExecutorFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/config/TaskExecutorFactoryBean.eea
@@ -9,7 +9,7 @@ getObject
  ()L0org/springframework/core/task/TaskExecutor;
 getObjectType
  ()Ljava/lang/Class<+Lorg/springframework/core/task/TaskExecutor;>;
- ()Ljava/lang/Class<+Lorg/springframework/core/task/TaskExecutor;>;
+ ()L1java/lang/Class<+Lorg/springframework/core/task/TaskExecutor;>;
 setBeanName
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/support/CronExpression.eea b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/support/CronExpression.eea
index 0b91b2ab4c..4175dceda8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/support/CronExpression.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/support/CronExpression.eea
@@ -5,7 +5,7 @@ isValidExpression
  (Ljava/lang/String;)Z
 parse
  (Ljava/lang/String;)Lorg/springframework/scheduling/support/CronExpression;
- (Ljava/lang/String;)Lorg/springframework/scheduling/support/CronExpression;
+ (Ljava/lang/String;)L1org/springframework/scheduling/support/CronExpression;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/support/CronTrigger.eea b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/support/CronTrigger.eea
index 4c9e3d18b1..861525d17e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/support/CronTrigger.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/support/CronTrigger.eea
@@ -14,7 +14,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getExpression
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 nextExecutionTime
  (Lorg/springframework/scheduling/TriggerContext;)Ljava/util/Date;
  (Lorg/springframework/scheduling/TriggerContext;)L0java/util/Date; # @Inherited(org.springframework.scheduling.Trigger)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/support/MethodInvokingRunnable.eea b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/support/MethodInvokingRunnable.eea
index c47258c247..7bcb618b10 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/support/MethodInvokingRunnable.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/scheduling/support/MethodInvokingRunnable.eea
@@ -6,7 +6,7 @@ logger
 
 getInvocationFailureMessage
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 resolveClassName
  (Ljava/lang/String;)Ljava/lang/Class<*>;
  (Ljava/lang/String;)Ljava/lang/Class<*>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/scripting/bsh/BshScriptUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/scripting/bsh/BshScriptUtils.eea
index c7f294e3f2..6f04d62ee5 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/scripting/bsh/BshScriptUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/scripting/bsh/BshScriptUtils.eea
@@ -2,10 +2,10 @@ class org/springframework/scripting/bsh/BshScriptUtils
 
 createBshObject
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
 createBshObject
  (Ljava/lang/String;[Ljava/lang/Class<*>;)Ljava/lang/Object;
- (Ljava/lang/String;[Ljava/lang/Class<*>;)Ljava/lang/Object;
+ (Ljava/lang/String;[Ljava/lang/Class<*>;)L1java/lang/Object;
 createBshObject
  (Ljava/lang/String;[Ljava/lang/Class<*>;Ljava/lang/ClassLoader;)Ljava/lang/Object;
- (Ljava/lang/String;[Ljava/lang/Class<*>;Ljava/lang/ClassLoader;)Ljava/lang/Object;
+ (Ljava/lang/String;[Ljava/lang/Class<*>;Ljava/lang/ClassLoader;)L1java/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/scripting/config/LangNamespaceUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/scripting/config/LangNamespaceUtils.eea
index 8a6eeb16dc..a67f7a6482 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/scripting/config/LangNamespaceUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/scripting/config/LangNamespaceUtils.eea
@@ -2,4 +2,4 @@ class org/springframework/scripting/config/LangNamespaceUtils
 
 registerScriptFactoryPostProcessorIfNecessary
  (Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)Lorg/springframework/beans/factory/config/BeanDefinition;
- (Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)Lorg/springframework/beans/factory/config/BeanDefinition;
+ (Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)L1org/springframework/beans/factory/config/BeanDefinition;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/scripting/groovy/GroovyScriptFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/scripting/groovy/GroovyScriptFactory.eea
index 86998fe002..dc33e39387 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/scripting/groovy/GroovyScriptFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/scripting/groovy/GroovyScriptFactory.eea
@@ -14,7 +14,7 @@ class org/springframework/scripting/groovy/GroovyScriptFactory
  (Ljava/lang/String;[Lorg/codehaus/groovy/control/customizers/CompilationCustomizer;)V
 buildGroovyClassLoader
  (Ljava/lang/ClassLoader;)Lgroovy/lang/GroovyClassLoader;
- (Ljava/lang/ClassLoader;)Lgroovy/lang/GroovyClassLoader;
+ (Ljava/lang/ClassLoader;)L1groovy/lang/GroovyClassLoader;
 executeScript
  (Lorg/springframework/scripting/ScriptSource;Ljava/lang/Class<*>;)Ljava/lang/Object;
  (Lorg/springframework/scripting/ScriptSource;Ljava/lang/Class<*>;)L0java/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/scripting/support/ScriptFactoryPostProcessor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/scripting/support/ScriptFactoryPostProcessor.eea
index c2b6805720..02ba0ad7e2 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/scripting/support/ScriptFactoryPostProcessor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/scripting/support/ScriptFactoryPostProcessor.eea
@@ -19,22 +19,22 @@ logger
 
 convertToScriptSource
  (Ljava/lang/String;Ljava/lang/String;Lorg/springframework/core/io/ResourceLoader;)Lorg/springframework/scripting/ScriptSource;
- (Ljava/lang/String;Ljava/lang/String;Lorg/springframework/core/io/ResourceLoader;)Lorg/springframework/scripting/ScriptSource;
+ (Ljava/lang/String;Ljava/lang/String;Lorg/springframework/core/io/ResourceLoader;)L1org/springframework/scripting/ScriptSource;
 createCompositeInterface
  ([Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
- ([Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
+ ([Ljava/lang/Class<*>;)L1java/lang/Class<*>;
 createConfigInterface
  (Lorg/springframework/beans/factory/config/BeanDefinition;[Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
- (Lorg/springframework/beans/factory/config/BeanDefinition;[Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
+ (Lorg/springframework/beans/factory/config/BeanDefinition;[Ljava/lang/Class<*>;)L1java/lang/Class<*>;
 createRefreshableProxy
  (Lorg/springframework/aop/TargetSource;[Ljava/lang/Class<*>;Z)Ljava/lang/Object;
- (Lorg/springframework/aop/TargetSource;[Ljava/lang/Class<*>;Z)Ljava/lang/Object;
+ (Lorg/springframework/aop/TargetSource;[Ljava/lang/Class<*>;Z)L1java/lang/Object;
 createScriptFactoryBeanDefinition
  (Lorg/springframework/beans/factory/config/BeanDefinition;)Lorg/springframework/beans/factory/config/BeanDefinition;
- (Lorg/springframework/beans/factory/config/BeanDefinition;)Lorg/springframework/beans/factory/config/BeanDefinition;
+ (Lorg/springframework/beans/factory/config/BeanDefinition;)L1org/springframework/beans/factory/config/BeanDefinition;
 createScriptedObjectBeanDefinition
  (Lorg/springframework/beans/factory/config/BeanDefinition;Ljava/lang/String;Lorg/springframework/scripting/ScriptSource;[Ljava/lang/Class<*>;)Lorg/springframework/beans/factory/config/BeanDefinition;
- (Lorg/springframework/beans/factory/config/BeanDefinition;Ljava/lang/String;Lorg/springframework/scripting/ScriptSource;[Ljava/lang/Class<*>;)Lorg/springframework/beans/factory/config/BeanDefinition;
+ (Lorg/springframework/beans/factory/config/BeanDefinition;Ljava/lang/String;Lorg/springframework/scripting/ScriptSource;[Ljava/lang/Class<*>;)L1org/springframework/beans/factory/config/BeanDefinition;
 getScriptSource
  (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/scripting/ScriptSource;
  (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/scripting/ScriptSource;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/MergedContextConfiguration.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/MergedContextConfiguration.eea
index 6a7d222e19..9b9cf3ccba 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/MergedContextConfiguration.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/MergedContextConfiguration.eea
@@ -2,7 +2,7 @@ class org/springframework/test/context/MergedContextConfiguration
 
 nullSafeClassName
  (Lorg/springframework/test/context/ContextLoader;)Ljava/lang/String;
- (Lorg/springframework/test/context/ContextLoader;)Ljava/lang/String;
+ (Lorg/springframework/test/context/ContextLoader;)L1java/lang/String;
 
 <init>
  (Ljava/lang/Class<*>;[Ljava/lang/String;[Ljava/lang/Class<*>;Ljava/util/Set<Ljava/lang/Class<+Lorg/springframework/context/ApplicationContextInitializer<*>;>;>;[Ljava/lang/String;Lorg/springframework/test/context/ContextLoader;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/TestContextAnnotationUtils$UntypedAnnotationDescriptor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/TestContextAnnotationUtils$UntypedAnnotationDescriptor.eea
index 9c515b0af1..880b3e9918 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/TestContextAnnotationUtils$UntypedAnnotationDescriptor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/TestContextAnnotationUtils$UntypedAnnotationDescriptor.eea
@@ -6,7 +6,7 @@ super org/springframework/test/context/TestContextAnnotationUtils$AnnotationDesc
 
 findAllLocalMergedAnnotations
  ()Ljava/util/Set<Ljava/lang/annotation/Annotation;>;
- ()Ljava/util/Set<Ljava/lang/annotation/Annotation;>;
+ ()L1java/util/Set<Ljava/lang/annotation/Annotation;>;
 next
  ()Lorg/springframework/test/context/TestContextAnnotationUtils$UntypedAnnotationDescriptor;
  ()L0org/springframework/test/context/TestContextAnnotationUtils$UntypedAnnotationDescriptor;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.eea
index e4c6f418d8..b8d22fd6a4 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.eea
@@ -5,10 +5,10 @@ class org/springframework/test/context/junit4/SpringJUnit4ClassRunner
  (Ljava/lang/Class<*>;)V
 createTest
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 createTestContextManager
  (Ljava/lang/Class<*>;)Lorg/springframework/test/context/TestContextManager;
- (Ljava/lang/Class<*>;)Lorg/springframework/test/context/TestContextManager;
+ (Ljava/lang/Class<*>;)L1org/springframework/test/context/TestContextManager;
 getDescription
  ()Lorg/junit/runner/Description;
  ()Lorg/junit/runner/Description;
@@ -41,25 +41,25 @@ runChild
  (Lorg/junit/runners/model/FrameworkMethod;Lorg/junit/runner/notification/RunNotifier;)V
 withAfterClasses
  (Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
- (Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
+ (Lorg/junit/runners/model/Statement;)L1org/junit/runners/model/Statement;
 withAfterTestExecutionCallbacks
  (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
- (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
+ (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)L1org/junit/runners/model/Statement;
 withAfters
  (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
- (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
+ (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)L1org/junit/runners/model/Statement;
 withBeforeClasses
  (Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
- (Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
+ (Lorg/junit/runners/model/Statement;)L1org/junit/runners/model/Statement;
 withBeforeTestExecutionCallbacks
  (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
- (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
+ (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)L1org/junit/runners/model/Statement;
 withBefores
  (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
- (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
+ (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)L1org/junit/runners/model/Statement;
 withPotentialRepeat
  (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
- (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
+ (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)L1org/junit/runners/model/Statement;
 withPotentialTimeout
  (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
  (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/AbstractDelegatingSmartContextLoader.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/AbstractDelegatingSmartContextLoader.eea
index 6766577866..5015e9b73f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/AbstractDelegatingSmartContextLoader.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/AbstractDelegatingSmartContextLoader.eea
@@ -11,10 +11,10 @@ loadContext
  (Lorg/springframework/test/context/MergedContextConfiguration;)Lorg/springframework/context/ApplicationContext;
 loadContext
  ([Ljava/lang/String;)Lorg/springframework/context/ApplicationContext;
- ([Ljava/lang/String;)Lorg/springframework/context/ApplicationContext;
+ ([Ljava/lang/String;)L1org/springframework/context/ApplicationContext;
 processContextConfiguration
  (Lorg/springframework/test/context/ContextConfigurationAttributes;)V
  (Lorg/springframework/test/context/ContextConfigurationAttributes;)V
 processLocations
  (Ljava/lang/Class<*>;[Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/Class<*>;[Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/Class<*>;[Ljava/lang/String;)[1Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/AbstractGenericContextLoader.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/AbstractGenericContextLoader.eea
index 4084747c23..1d55e65fb1 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/AbstractGenericContextLoader.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/AbstractGenericContextLoader.eea
@@ -6,10 +6,10 @@ logger
 
 createBeanDefinitionReader
  (Lorg/springframework/context/support/GenericApplicationContext;)Lorg/springframework/beans/factory/support/BeanDefinitionReader;
- (Lorg/springframework/context/support/GenericApplicationContext;)Lorg/springframework/beans/factory/support/BeanDefinitionReader;
+ (Lorg/springframework/context/support/GenericApplicationContext;)L1org/springframework/beans/factory/support/BeanDefinitionReader;
 createContext
  ()Lorg/springframework/context/support/GenericApplicationContext;
- ()Lorg/springframework/context/support/GenericApplicationContext;
+ ()L1org/springframework/context/support/GenericApplicationContext;
 customizeBeanFactory
  (Lorg/springframework/beans/factory/support/DefaultListableBeanFactory;)V
  (Lorg/springframework/beans/factory/support/DefaultListableBeanFactory;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/AbstractTestContextBootstrapper.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/AbstractTestContextBootstrapper.eea
index 6b2b001dc7..105d0e68e4 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/AbstractTestContextBootstrapper.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/AbstractTestContextBootstrapper.eea
@@ -5,7 +5,7 @@ buildMergedContextConfiguration
  ()Lorg/springframework/test/context/MergedContextConfiguration;
 buildTestContext
  ()Lorg/springframework/test/context/TestContext;
- ()Lorg/springframework/test/context/TestContext;
+ ()L1org/springframework/test/context/TestContext;
 getBootstrapContext
  ()Lorg/springframework/test/context/BootstrapContext;
  ()Lorg/springframework/test/context/BootstrapContext;
@@ -23,7 +23,7 @@ getDefaultTestExecutionListenerClassNames
  ()Ljava/util/List<Ljava/lang/String;>;
 getDefaultTestExecutionListenerClasses
  ()Ljava/util/Set<Ljava/lang/Class<+Lorg/springframework/test/context/TestExecutionListener;>;>;
- ()Ljava/util/Set<Ljava/lang/Class<+Lorg/springframework/test/context/TestExecutionListener;>;>;
+ ()L1java/util/Set<Ljava/lang/Class<+Lorg/springframework/test/context/TestExecutionListener;>;>;
 getTestExecutionListeners
  ()Ljava/util/List<Lorg/springframework/test/context/TestExecutionListener;>;
  ()Ljava/util/List<Lorg/springframework/test/context/TestExecutionListener;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/AnnotationConfigContextLoader.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/AnnotationConfigContextLoader.eea
index e81d9ce7fd..1c24a1d15d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/AnnotationConfigContextLoader.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/AnnotationConfigContextLoader.eea
@@ -2,22 +2,22 @@ class org/springframework/test/context/support/AnnotationConfigContextLoader
 
 createBeanDefinitionReader
  (Lorg/springframework/context/support/GenericApplicationContext;)Lorg/springframework/beans/factory/support/BeanDefinitionReader;
- (Lorg/springframework/context/support/GenericApplicationContext;)Lorg/springframework/beans/factory/support/BeanDefinitionReader;
+ (Lorg/springframework/context/support/GenericApplicationContext;)L1org/springframework/beans/factory/support/BeanDefinitionReader; # @Inherited(org.springframework.test.context.support.AbstractGenericContextLoader)
 detectDefaultConfigurationClasses
  (Ljava/lang/Class<*>;)[Ljava/lang/Class<*>;
  (Ljava/lang/Class<*>;)[Ljava/lang/Class<*>;
 generateDefaultLocations
  (Ljava/lang/Class<*>;)[Ljava/lang/String;
- (Ljava/lang/Class<*>;)[Ljava/lang/String;
+ (Ljava/lang/Class<*>;)[1Ljava/lang/String;
 getResourceSuffix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 loadBeanDefinitions
  (Lorg/springframework/context/support/GenericApplicationContext;Lorg/springframework/test/context/MergedContextConfiguration;)V
  (Lorg/springframework/context/support/GenericApplicationContext;Lorg/springframework/test/context/MergedContextConfiguration;)V
 modifyLocations
  (Ljava/lang/Class<*>;[Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/Class<*>;[Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/Class<*>;[Ljava/lang/String;)[1Ljava/lang/String;
 processContextConfiguration
  (Lorg/springframework/test/context/ContextConfigurationAttributes;)V
  (Lorg/springframework/test/context/ContextConfigurationAttributes;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/DefaultTestContextBootstrapper.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/DefaultTestContextBootstrapper.eea
index b6959e7a12..1255da4d55 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/DefaultTestContextBootstrapper.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/DefaultTestContextBootstrapper.eea
@@ -2,4 +2,4 @@ class org/springframework/test/context/support/DefaultTestContextBootstrapper
 
 getDefaultContextLoaderClass
  (Ljava/lang/Class<*>;)Ljava/lang/Class<+Lorg/springframework/test/context/ContextLoader;>;
- (Ljava/lang/Class<*>;)Ljava/lang/Class<+Lorg/springframework/test/context/ContextLoader;>;
+ (Ljava/lang/Class<*>;)L1java/lang/Class<+Lorg/springframework/test/context/ContextLoader;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/GenericGroovyXmlContextLoader.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/GenericGroovyXmlContextLoader.eea
index 6a1e261954..98cad49122 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/GenericGroovyXmlContextLoader.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/GenericGroovyXmlContextLoader.eea
@@ -2,7 +2,7 @@ class org/springframework/test/context/support/GenericGroovyXmlContextLoader
 
 getResourceSuffix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.test.context.support.GenericXmlContextLoader)
 getResourceSuffixes
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/GenericPropertiesContextLoader.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/GenericPropertiesContextLoader.eea
index 413341516a..f114b1e36c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/GenericPropertiesContextLoader.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/GenericPropertiesContextLoader.eea
@@ -2,10 +2,10 @@ class org/springframework/test/context/support/GenericPropertiesContextLoader
 
 createBeanDefinitionReader
  (Lorg/springframework/context/support/GenericApplicationContext;)Lorg/springframework/beans/factory/support/BeanDefinitionReader;
- (Lorg/springframework/context/support/GenericApplicationContext;)Lorg/springframework/beans/factory/support/BeanDefinitionReader;
+ (Lorg/springframework/context/support/GenericApplicationContext;)L1org/springframework/beans/factory/support/BeanDefinitionReader; # @Inherited(org.springframework.test.context.support.AbstractGenericContextLoader)
 getResourceSuffix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 validateMergedContextConfiguration
  (Lorg/springframework/test/context/MergedContextConfiguration;)V
  (Lorg/springframework/test/context/MergedContextConfiguration;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/GenericXmlContextLoader.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/GenericXmlContextLoader.eea
index 3e28fb1934..3d888ba222 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/GenericXmlContextLoader.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/GenericXmlContextLoader.eea
@@ -2,10 +2,10 @@ class org/springframework/test/context/support/GenericXmlContextLoader
 
 createBeanDefinitionReader
  (Lorg/springframework/context/support/GenericApplicationContext;)Lorg/springframework/beans/factory/support/BeanDefinitionReader;
- (Lorg/springframework/context/support/GenericApplicationContext;)Lorg/springframework/beans/factory/support/BeanDefinitionReader;
+ (Lorg/springframework/context/support/GenericApplicationContext;)L1org/springframework/beans/factory/support/BeanDefinitionReader; # @Inherited(org.springframework.test.context.support.AbstractGenericContextLoader)
 getResourceSuffix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 validateMergedContextConfiguration
  (Lorg/springframework/test/context/MergedContextConfiguration;)V
  (Lorg/springframework/test/context/MergedContextConfiguration;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/TestPropertySourceUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/TestPropertySourceUtils.eea
index 0505b376a1..a840b21903 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/TestPropertySourceUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/support/TestPropertySourceUtils.eea
@@ -18,4 +18,4 @@ addPropertiesFilesToEnvironment
  (Lorg/springframework/core/env/ConfigurableEnvironment;Lorg/springframework/core/io/ResourceLoader;[Ljava/lang/String;)V
 convertInlinedPropertiesToMap
  ([Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- ([Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ ([Ljava/lang/String;)L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/transaction/TestContextTransactionUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/transaction/TestContextTransactionUtils.eea
index 74abbff15b..2edd07b496 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/transaction/TestContextTransactionUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/transaction/TestContextTransactionUtils.eea
@@ -9,7 +9,7 @@ DEFAULT_TRANSACTION_MANAGER_NAME
 
 createDelegatingTransactionAttribute
  (Lorg/springframework/test/context/TestContext;Lorg/springframework/transaction/interceptor/TransactionAttribute;)Lorg/springframework/transaction/interceptor/TransactionAttribute;
- (Lorg/springframework/test/context/TestContext;Lorg/springframework/transaction/interceptor/TransactionAttribute;)Lorg/springframework/transaction/interceptor/TransactionAttribute;
+ (Lorg/springframework/test/context/TestContext;Lorg/springframework/transaction/interceptor/TransactionAttribute;)L1org/springframework/transaction/interceptor/TransactionAttribute;
 retrieveDataSource
  (Lorg/springframework/test/context/TestContext;Ljava/lang/String;)Ljavax/sql/DataSource;
  (Lorg/springframework/test/context/TestContext;Ljava/lang/String;)L0javax/sql/DataSource;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/util/TestContextResourceUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/util/TestContextResourceUtils.eea
index fbfaf76f00..529bdc2a26 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/util/TestContextResourceUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/util/TestContextResourceUtils.eea
@@ -2,7 +2,7 @@ class org/springframework/test/context/util/TestContextResourceUtils
 
 convertToClasspathResourcePaths
  (Ljava/lang/Class<*>;Z[Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/Class<*>;Z[Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/Class<*>;Z[Ljava/lang/String;)[1Ljava/lang/String;
 convertToClasspathResourcePaths
  (Ljava/lang/Class<*>;[Ljava/lang/String;)[Ljava/lang/String;
  (Ljava/lang/Class<*>;[Ljava/lang/String;)[Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/web/AbstractGenericWebContextLoader.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/web/AbstractGenericWebContextLoader.eea
index db792b6524..11afb98208 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/web/AbstractGenericWebContextLoader.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/web/AbstractGenericWebContextLoader.eea
@@ -9,7 +9,7 @@ configureWebResources
  (Lorg/springframework/web/context/support/GenericWebApplicationContext;Lorg/springframework/test/context/web/WebMergedContextConfiguration;)V
 createContext
  ()Lorg/springframework/web/context/support/GenericWebApplicationContext;
- ()Lorg/springframework/web/context/support/GenericWebApplicationContext;
+ ()L1org/springframework/web/context/support/GenericWebApplicationContext;
 customizeBeanFactory
  (Lorg/springframework/beans/factory/support/DefaultListableBeanFactory;Lorg/springframework/test/context/web/WebMergedContextConfiguration;)V
  (Lorg/springframework/beans/factory/support/DefaultListableBeanFactory;Lorg/springframework/test/context/web/WebMergedContextConfiguration;)V
@@ -24,7 +24,7 @@ loadContext
  (Lorg/springframework/test/context/MergedContextConfiguration;)Lorg/springframework/context/ConfigurableApplicationContext;
 loadContext
  ([Ljava/lang/String;)Lorg/springframework/context/ApplicationContext;
- ([Ljava/lang/String;)Lorg/springframework/context/ApplicationContext;
+ ([Ljava/lang/String;)L1org/springframework/context/ApplicationContext;
 validateMergedContextConfiguration
  (Lorg/springframework/test/context/web/WebMergedContextConfiguration;)V
  (Lorg/springframework/test/context/web/WebMergedContextConfiguration;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/web/AnnotationConfigWebContextLoader.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/web/AnnotationConfigWebContextLoader.eea
index 2bee4603b6..5293e49881 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/web/AnnotationConfigWebContextLoader.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/web/AnnotationConfigWebContextLoader.eea
@@ -5,16 +5,16 @@ detectDefaultConfigurationClasses
  (Ljava/lang/Class<*>;)[Ljava/lang/Class<*>;
 generateDefaultLocations
  (Ljava/lang/Class<*>;)[Ljava/lang/String;
- (Ljava/lang/Class<*>;)[Ljava/lang/String;
+ (Ljava/lang/Class<*>;)[1Ljava/lang/String;
 getResourceSuffix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 loadBeanDefinitions
  (Lorg/springframework/web/context/support/GenericWebApplicationContext;Lorg/springframework/test/context/web/WebMergedContextConfiguration;)V
  (Lorg/springframework/web/context/support/GenericWebApplicationContext;Lorg/springframework/test/context/web/WebMergedContextConfiguration;)V
 modifyLocations
  (Ljava/lang/Class<*>;[Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/Class<*>;[Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/Class<*>;[Ljava/lang/String;)[1Ljava/lang/String;
 processContextConfiguration
  (Lorg/springframework/test/context/ContextConfigurationAttributes;)V
  (Lorg/springframework/test/context/ContextConfigurationAttributes;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/web/GenericGroovyXmlWebContextLoader.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/web/GenericGroovyXmlWebContextLoader.eea
index be8fc103b7..ea01a7ca68 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/web/GenericGroovyXmlWebContextLoader.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/web/GenericGroovyXmlWebContextLoader.eea
@@ -2,7 +2,7 @@ class org/springframework/test/context/web/GenericGroovyXmlWebContextLoader
 
 getResourceSuffix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.test.context.web.GenericXmlWebContextLoader)
 getResourceSuffixes
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/web/GenericXmlWebContextLoader.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/web/GenericXmlWebContextLoader.eea
index 20c24cfc0c..7b7f022fd8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/web/GenericXmlWebContextLoader.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/web/GenericXmlWebContextLoader.eea
@@ -2,7 +2,7 @@ class org/springframework/test/context/web/GenericXmlWebContextLoader
 
 getResourceSuffix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 loadBeanDefinitions
  (Lorg/springframework/web/context/support/GenericWebApplicationContext;Lorg/springframework/test/context/web/WebMergedContextConfiguration;)V
  (Lorg/springframework/web/context/support/GenericWebApplicationContext;Lorg/springframework/test/context/web/WebMergedContextConfiguration;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/web/WebTestContextBootstrapper.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/web/WebTestContextBootstrapper.eea
index eec5dd1275..45fdd7878f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/context/web/WebTestContextBootstrapper.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/context/web/WebTestContextBootstrapper.eea
@@ -2,7 +2,7 @@ class org/springframework/test/context/web/WebTestContextBootstrapper
 
 getDefaultContextLoaderClass
  (Ljava/lang/Class<*>;)Ljava/lang/Class<+Lorg/springframework/test/context/ContextLoader;>;
- (Ljava/lang/Class<*>;)Ljava/lang/Class<+Lorg/springframework/test/context/ContextLoader;>;
+ (Ljava/lang/Class<*>;)L1java/lang/Class<+Lorg/springframework/test/context/ContextLoader;>; # @Inherited(org.springframework.test.context.support.DefaultTestContextBootstrapper)
 processMergedContextConfiguration
  (Lorg/springframework/test/context/MergedContextConfiguration;)Lorg/springframework/test/context/MergedContextConfiguration;
  (Lorg/springframework/test/context/MergedContextConfiguration;)Lorg/springframework/test/context/MergedContextConfiguration;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/util/MetaAnnotationUtils$UntypedAnnotationDescriptor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/util/MetaAnnotationUtils$UntypedAnnotationDescriptor.eea
index 9b9fa84039..02b8c21b15 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/util/MetaAnnotationUtils$UntypedAnnotationDescriptor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/util/MetaAnnotationUtils$UntypedAnnotationDescriptor.eea
@@ -12,4 +12,4 @@ super org/springframework/test/util/MetaAnnotationUtils$AnnotationDescriptor
  (Ljava/lang/Class<*>;Ljava/lang/annotation/Annotation;)V
 synthesizeAnnotation
  ()Ljava/lang/annotation/Annotation;
- ()Ljava/lang/annotation/Annotation;
+ ()L1java/lang/annotation/Annotation;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/AbstractRequestExpectationManager.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/AbstractRequestExpectationManager.eea
index 4c153c50ac..3f28fa65af 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/AbstractRequestExpectationManager.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/AbstractRequestExpectationManager.eea
@@ -2,22 +2,22 @@ class org/springframework/test/web/client/AbstractRequestExpectationManager
 
 createUnexpectedRequestError
  (Lorg/springframework/http/client/ClientHttpRequest;)Ljava/lang/AssertionError;
- (Lorg/springframework/http/client/ClientHttpRequest;)Ljava/lang/AssertionError;
+ (Lorg/springframework/http/client/ClientHttpRequest;)L1java/lang/AssertionError;
 expectRequest
  (Lorg/springframework/test/web/client/ExpectedCount;Lorg/springframework/test/web/client/RequestMatcher;)Lorg/springframework/test/web/client/ResponseActions;
- (Lorg/springframework/test/web/client/ExpectedCount;Lorg/springframework/test/web/client/RequestMatcher;)Lorg/springframework/test/web/client/ResponseActions;
+ (Lorg/springframework/test/web/client/ExpectedCount;Lorg/springframework/test/web/client/RequestMatcher;)L1org/springframework/test/web/client/ResponseActions;
 getExpectations
  ()Ljava/util/List<Lorg/springframework/test/web/client/RequestExpectation;>;
  ()Ljava/util/List<Lorg/springframework/test/web/client/RequestExpectation;>;
 getRequestDetails
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getRequests
  ()Ljava/util/List<Lorg/springframework/http/client/ClientHttpRequest;>;
  ()Ljava/util/List<Lorg/springframework/http/client/ClientHttpRequest;>;
 matchRequest
  (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/test/web/client/RequestExpectation;
- (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/test/web/client/RequestExpectation;
+ (Lorg/springframework/http/client/ClientHttpRequest;)L1org/springframework/test/web/client/RequestExpectation;
 validateRequest
  (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/http/client/ClientHttpResponse;
  (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/http/client/ClientHttpResponse;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/DefaultRequestExpectation.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/DefaultRequestExpectation.eea
index 5b09385c65..986846712c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/DefaultRequestExpectation.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/DefaultRequestExpectation.eea
@@ -11,7 +11,7 @@ andRespond
  (Lorg/springframework/test/web/client/ResponseCreator;)V
 createResponse
  (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/http/client/ClientHttpResponse;
- (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/http/client/ClientHttpResponse;
+ (Lorg/springframework/http/client/ClientHttpRequest;)L1org/springframework/http/client/ClientHttpResponse; # @Inherited(org.springframework.test.web.client.ResponseCreator)
 getRequestCount
  ()Lorg/springframework/test/web/client/DefaultRequestExpectation$RequestCount;
  ()Lorg/springframework/test/web/client/DefaultRequestExpectation$RequestCount;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/ExpectedCount.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/ExpectedCount.eea
index fb916bbd67..2c78d541de 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/ExpectedCount.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/ExpectedCount.eea
@@ -2,7 +2,7 @@ class org/springframework/test/web/client/ExpectedCount
 
 between
  (II)Lorg/springframework/test/web/client/ExpectedCount;
- (II)Lorg/springframework/test/web/client/ExpectedCount;
+ (II)L1org/springframework/test/web/client/ExpectedCount;
 manyTimes
  ()Lorg/springframework/test/web/client/ExpectedCount;
  ()Lorg/springframework/test/web/client/ExpectedCount;
@@ -11,7 +11,7 @@ max
  (I)Lorg/springframework/test/web/client/ExpectedCount;
 min
  (I)Lorg/springframework/test/web/client/ExpectedCount;
- (I)Lorg/springframework/test/web/client/ExpectedCount;
+ (I)L1org/springframework/test/web/client/ExpectedCount;
 never
  ()Lorg/springframework/test/web/client/ExpectedCount;
  ()Lorg/springframework/test/web/client/ExpectedCount;
@@ -20,7 +20,7 @@ once
  ()Lorg/springframework/test/web/client/ExpectedCount;
 times
  (I)Lorg/springframework/test/web/client/ExpectedCount;
- (I)Lorg/springframework/test/web/client/ExpectedCount;
+ (I)L1org/springframework/test/web/client/ExpectedCount;
 twice
  ()Lorg/springframework/test/web/client/ExpectedCount;
  ()Lorg/springframework/test/web/client/ExpectedCount;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.eea
index 583a4326f9..3230914d2e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.eea
@@ -5,7 +5,7 @@ class org/springframework/test/web/client/MockMvcClientHttpRequestFactory
  (Lorg/springframework/test/web/servlet/MockMvc;)V
 createAsyncRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/AsyncClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/AsyncClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/AsyncClientHttpRequest; # @Inherited(org.springframework.http.client.AsyncClientHttpRequestFactory)
 createRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/ClientHttpRequest; # @Inherited(org.springframework.http.client.ClientHttpRequestFactory)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/MockRestServiceServer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/MockRestServiceServer.eea
index 98dd487b01..80ef5d2c70 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/MockRestServiceServer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/MockRestServiceServer.eea
@@ -2,22 +2,22 @@ class org/springframework/test/web/client/MockRestServiceServer
 
 bindTo
  (Lorg/springframework/web/client/AsyncRestTemplate;)Lorg/springframework/test/web/client/MockRestServiceServer$MockRestServiceServerBuilder;
- (Lorg/springframework/web/client/AsyncRestTemplate;)Lorg/springframework/test/web/client/MockRestServiceServer$MockRestServiceServerBuilder;
+ (Lorg/springframework/web/client/AsyncRestTemplate;)L1org/springframework/test/web/client/MockRestServiceServer$MockRestServiceServerBuilder;
 bindTo
  (Lorg/springframework/web/client/RestTemplate;)Lorg/springframework/test/web/client/MockRestServiceServer$MockRestServiceServerBuilder;
- (Lorg/springframework/web/client/RestTemplate;)Lorg/springframework/test/web/client/MockRestServiceServer$MockRestServiceServerBuilder;
+ (Lorg/springframework/web/client/RestTemplate;)L1org/springframework/test/web/client/MockRestServiceServer$MockRestServiceServerBuilder;
 bindTo
  (Lorg/springframework/web/client/support/RestGatewaySupport;)Lorg/springframework/test/web/client/MockRestServiceServer$MockRestServiceServerBuilder;
- (Lorg/springframework/web/client/support/RestGatewaySupport;)Lorg/springframework/test/web/client/MockRestServiceServer$MockRestServiceServerBuilder;
+ (Lorg/springframework/web/client/support/RestGatewaySupport;)L1org/springframework/test/web/client/MockRestServiceServer$MockRestServiceServerBuilder;
 createServer
  (Lorg/springframework/web/client/AsyncRestTemplate;)Lorg/springframework/test/web/client/MockRestServiceServer;
- (Lorg/springframework/web/client/AsyncRestTemplate;)Lorg/springframework/test/web/client/MockRestServiceServer;
+ (Lorg/springframework/web/client/AsyncRestTemplate;)L1org/springframework/test/web/client/MockRestServiceServer;
 createServer
  (Lorg/springframework/web/client/RestTemplate;)Lorg/springframework/test/web/client/MockRestServiceServer;
- (Lorg/springframework/web/client/RestTemplate;)Lorg/springframework/test/web/client/MockRestServiceServer;
+ (Lorg/springframework/web/client/RestTemplate;)L1org/springframework/test/web/client/MockRestServiceServer;
 createServer
  (Lorg/springframework/web/client/support/RestGatewaySupport;)Lorg/springframework/test/web/client/MockRestServiceServer;
- (Lorg/springframework/web/client/support/RestGatewaySupport;)Lorg/springframework/test/web/client/MockRestServiceServer;
+ (Lorg/springframework/web/client/support/RestGatewaySupport;)L1org/springframework/test/web/client/MockRestServiceServer;
 
 expect
  (Lorg/springframework/test/web/client/ExpectedCount;Lorg/springframework/test/web/client/RequestMatcher;)Lorg/springframework/test/web/client/ResponseActions;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/ResponseCreator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/ResponseCreator.eea
index b84757b65d..a959362dd7 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/ResponseCreator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/ResponseCreator.eea
@@ -2,4 +2,4 @@ class org/springframework/test/web/client/ResponseCreator
 
 createResponse
  (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/http/client/ClientHttpResponse;
- (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/http/client/ClientHttpResponse;
+ (Lorg/springframework/http/client/ClientHttpRequest;)L1org/springframework/http/client/ClientHttpResponse;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/SimpleRequestExpectationManager.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/SimpleRequestExpectationManager.eea
index f446872bb3..bf5319d616 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/SimpleRequestExpectationManager.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/SimpleRequestExpectationManager.eea
@@ -2,4 +2,4 @@ class org/springframework/test/web/client/SimpleRequestExpectationManager
 
 matchRequest
  (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/test/web/client/RequestExpectation;
- (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/test/web/client/RequestExpectation;
+ (Lorg/springframework/http/client/ClientHttpRequest;)L1org/springframework/test/web/client/RequestExpectation; # @Inherited(org.springframework.test.web.client.AbstractRequestExpectationManager)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/UnorderedRequestExpectationManager.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/UnorderedRequestExpectationManager.eea
index 8c87a70e6a..0a2fc96015 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/UnorderedRequestExpectationManager.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/UnorderedRequestExpectationManager.eea
@@ -2,4 +2,4 @@ class org/springframework/test/web/client/UnorderedRequestExpectationManager
 
 matchRequest
  (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/test/web/client/RequestExpectation;
- (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/test/web/client/RequestExpectation;
+ (Lorg/springframework/http/client/ClientHttpRequest;)L1org/springframework/test/web/client/RequestExpectation; # @Inherited(org.springframework.test.web.client.AbstractRequestExpectationManager)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/match/ContentRequestMatchers.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/match/ContentRequestMatchers.eea
index 8398e1a6d6..29fe923d6a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/match/ContentRequestMatchers.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/match/ContentRequestMatchers.eea
@@ -35,10 +35,10 @@ multipartDataContains
  (Ljava/util/Map<Ljava/lang/String;*>;)Lorg/springframework/test/web/client/RequestMatcher;
 node
  (Lorg/hamcrest/Matcher<-Lorg/w3c/dom/Node;>;)Lorg/springframework/test/web/client/RequestMatcher;
- (Lorg/hamcrest/Matcher<-Lorg/w3c/dom/Node;>;)Lorg/springframework/test/web/client/RequestMatcher;
+ (Lorg/hamcrest/Matcher<-Lorg/w3c/dom/Node;>;)L1org/springframework/test/web/client/RequestMatcher;
 source
  (Lorg/hamcrest/Matcher<-Ljavax/xml/transform/Source;>;)Lorg/springframework/test/web/client/RequestMatcher;
- (Lorg/hamcrest/Matcher<-Ljavax/xml/transform/Source;>;)Lorg/springframework/test/web/client/RequestMatcher;
+ (Lorg/hamcrest/Matcher<-Ljavax/xml/transform/Source;>;)L1org/springframework/test/web/client/RequestMatcher;
 string
  (Ljava/lang/String;)Lorg/springframework/test/web/client/RequestMatcher;
  (Ljava/lang/String;)Lorg/springframework/test/web/client/RequestMatcher;
@@ -47,4 +47,4 @@ string
  (Lorg/hamcrest/Matcher<-Ljava/lang/String;>;)Lorg/springframework/test/web/client/RequestMatcher;
 xml
  (Ljava/lang/String;)Lorg/springframework/test/web/client/RequestMatcher;
- (Ljava/lang/String;)Lorg/springframework/test/web/client/RequestMatcher;
+ (Ljava/lang/String;)L1org/springframework/test/web/client/RequestMatcher;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/match/JsonPathRequestMatchers.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/match/JsonPathRequestMatchers.eea
index 07b9fdd0ad..82a0d0680f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/match/JsonPathRequestMatchers.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/match/JsonPathRequestMatchers.eea
@@ -5,43 +5,43 @@ class org/springframework/test/web/client/match/JsonPathRequestMatchers
  (Ljava/lang/String;[Ljava/lang/Object;)V
 doesNotExist
  ()Lorg/springframework/test/web/client/RequestMatcher;
- ()Lorg/springframework/test/web/client/RequestMatcher;
+ ()L1org/springframework/test/web/client/RequestMatcher;
 doesNotHaveJsonPath
  ()Lorg/springframework/test/web/client/RequestMatcher;
- ()Lorg/springframework/test/web/client/RequestMatcher;
+ ()L1org/springframework/test/web/client/RequestMatcher;
 exists
  ()Lorg/springframework/test/web/client/RequestMatcher;
- ()Lorg/springframework/test/web/client/RequestMatcher;
+ ()L1org/springframework/test/web/client/RequestMatcher;
 hasJsonPath
  ()Lorg/springframework/test/web/client/RequestMatcher;
- ()Lorg/springframework/test/web/client/RequestMatcher;
+ ()L1org/springframework/test/web/client/RequestMatcher;
 isArray
  ()Lorg/springframework/test/web/client/RequestMatcher;
- ()Lorg/springframework/test/web/client/RequestMatcher;
+ ()L1org/springframework/test/web/client/RequestMatcher;
 isBoolean
  ()Lorg/springframework/test/web/client/RequestMatcher;
- ()Lorg/springframework/test/web/client/RequestMatcher;
+ ()L1org/springframework/test/web/client/RequestMatcher;
 isEmpty
  ()Lorg/springframework/test/web/client/RequestMatcher;
- ()Lorg/springframework/test/web/client/RequestMatcher;
+ ()L1org/springframework/test/web/client/RequestMatcher;
 isMap
  ()Lorg/springframework/test/web/client/RequestMatcher;
- ()Lorg/springframework/test/web/client/RequestMatcher;
+ ()L1org/springframework/test/web/client/RequestMatcher;
 isNotEmpty
  ()Lorg/springframework/test/web/client/RequestMatcher;
- ()Lorg/springframework/test/web/client/RequestMatcher;
+ ()L1org/springframework/test/web/client/RequestMatcher;
 isNumber
  ()Lorg/springframework/test/web/client/RequestMatcher;
- ()Lorg/springframework/test/web/client/RequestMatcher;
+ ()L1org/springframework/test/web/client/RequestMatcher;
 isString
  ()Lorg/springframework/test/web/client/RequestMatcher;
- ()Lorg/springframework/test/web/client/RequestMatcher;
+ ()L1org/springframework/test/web/client/RequestMatcher;
 value
  (Ljava/lang/Object;)Lorg/springframework/test/web/client/RequestMatcher;
- (Ljava/lang/Object;)Lorg/springframework/test/web/client/RequestMatcher;
+ (Ljava/lang/Object;)L1org/springframework/test/web/client/RequestMatcher;
 value
  <T:Ljava/lang/Object;>(Lorg/hamcrest/Matcher<-TT;>;)Lorg/springframework/test/web/client/RequestMatcher;
- <T:Ljava/lang/Object;>(Lorg/hamcrest/Matcher<-TT;>;)Lorg/springframework/test/web/client/RequestMatcher;
+ <T:Ljava/lang/Object;>(Lorg/hamcrest/Matcher<-TT;>;)L1org/springframework/test/web/client/RequestMatcher;
 value
  <T:Ljava/lang/Object;>(Lorg/hamcrest/Matcher<-TT;>;Ljava/lang/Class<TT;>;)Lorg/springframework/test/web/client/RequestMatcher;
- <T:Ljava/lang/Object;>(Lorg/hamcrest/Matcher<-TT;>;Ljava/lang/Class<TT;>;)Lorg/springframework/test/web/client/RequestMatcher;
+ <T:Ljava/lang/Object;>(Lorg/hamcrest/Matcher<-TT;>;Ljava/lang/Class<TT;>;)L1org/springframework/test/web/client/RequestMatcher;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/match/MockRestRequestMatchers.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/match/MockRestRequestMatchers.eea
index 296fecd2dc..d24d5e6a0c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/match/MockRestRequestMatchers.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/match/MockRestRequestMatchers.eea
@@ -5,7 +5,7 @@ anything
  ()Lorg/springframework/test/web/client/RequestMatcher;
 content
  ()Lorg/springframework/test/web/client/match/ContentRequestMatchers;
- ()Lorg/springframework/test/web/client/match/ContentRequestMatchers;
+ ()L1org/springframework/test/web/client/match/ContentRequestMatchers;
 header
  (Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/test/web/client/RequestMatcher;
  (Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/test/web/client/RequestMatcher;
@@ -20,7 +20,7 @@ headerList
  (Ljava/lang/String;Lorg/hamcrest/Matcher<-Ljava/util/List<Ljava/lang/String;>;>;)Lorg/springframework/test/web/client/RequestMatcher;
 jsonPath
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/client/match/JsonPathRequestMatchers;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/client/match/JsonPathRequestMatchers;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/client/match/JsonPathRequestMatchers;
 jsonPath
  <T:Ljava/lang/Object;>(Ljava/lang/String;Lorg/hamcrest/Matcher<-TT;>;)Lorg/springframework/test/web/client/RequestMatcher;
  <T:Ljava/lang/Object;>(Ljava/lang/String;Lorg/hamcrest/Matcher<-TT;>;)Lorg/springframework/test/web/client/RequestMatcher;
@@ -50,7 +50,7 @@ requestToUriTemplate
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/client/RequestMatcher;
 xpath
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;[Ljava/lang/Object;)Lorg/springframework/test/web/client/match/XpathRequestMatchers;
- (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;[Ljava/lang/Object;)Lorg/springframework/test/web/client/match/XpathRequestMatchers;
+ (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;[Ljava/lang/Object;)L1org/springframework/test/web/client/match/XpathRequestMatchers;
 xpath
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/client/match/XpathRequestMatchers;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/client/match/XpathRequestMatchers;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/client/match/XpathRequestMatchers;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/response/DefaultResponseCreator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/response/DefaultResponseCreator.eea
index 9474b2b166..59d9da8236 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/response/DefaultResponseCreator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/response/DefaultResponseCreator.eea
@@ -17,7 +17,7 @@ contentType
  (Lorg/springframework/http/MediaType;)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
 createResponse
  (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/http/client/ClientHttpResponse;
- (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/http/client/ClientHttpResponse;
+ (Lorg/springframework/http/client/ClientHttpRequest;)L1org/springframework/http/client/ClientHttpResponse; # @Inherited(org.springframework.test.web.client.ResponseCreator)
 headers
  (Lorg/springframework/http/HttpHeaders;)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
  (Lorg/springframework/http/HttpHeaders;)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/response/MockRestResponseCreators.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/response/MockRestResponseCreators.eea
index 061ffad372..a8517ebc4f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/response/MockRestResponseCreators.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/client/response/MockRestResponseCreators.eea
@@ -2,7 +2,7 @@ class org/springframework/test/web/client/response/MockRestResponseCreators
 
 withBadRequest
  ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
- ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
+ ()L1org/springframework/test/web/client/response/DefaultResponseCreator;
 withCreatedEntity
  (Ljava/net/URI;)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
  (Ljava/net/URI;)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
@@ -11,19 +11,19 @@ withException
  (Ljava/io/IOException;)Lorg/springframework/test/web/client/ResponseCreator;
 withNoContent
  ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
- ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
+ ()L1org/springframework/test/web/client/response/DefaultResponseCreator;
 withRawStatus
  (I)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
- (I)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
+ (I)L1org/springframework/test/web/client/response/DefaultResponseCreator;
 withServerError
  ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
- ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
+ ()L1org/springframework/test/web/client/response/DefaultResponseCreator;
 withStatus
  (Lorg/springframework/http/HttpStatus;)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
- (Lorg/springframework/http/HttpStatus;)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
+ (Lorg/springframework/http/HttpStatus;)L1org/springframework/test/web/client/response/DefaultResponseCreator;
 withSuccess
  ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
- ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
+ ()L1org/springframework/test/web/client/response/DefaultResponseCreator;
 withSuccess
  (Ljava/lang/String;Lorg/springframework/http/MediaType;)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
  (Ljava/lang/String;Lorg/springframework/http/MediaType;)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
@@ -35,4 +35,4 @@ withSuccess
  ([BLorg/springframework/http/MediaType;)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
 withUnauthorizedRequest
  ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
- ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
+ ()L1org/springframework/test/web/client/response/DefaultResponseCreator;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/reactive/server/WebTestClient.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/reactive/server/WebTestClient.eea
index 8c8a706626..e0e35b0d03 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/reactive/server/WebTestClient.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/reactive/server/WebTestClient.eea
@@ -6,22 +6,22 @@ WEBTESTCLIENT_REQUEST_ID
 
 bindToApplicationContext
  (Lorg/springframework/context/ApplicationContext;)Lorg/springframework/test/web/reactive/server/WebTestClient$MockServerSpec<*>;
- (Lorg/springframework/context/ApplicationContext;)Lorg/springframework/test/web/reactive/server/WebTestClient$MockServerSpec<*>;
+ (Lorg/springframework/context/ApplicationContext;)L1org/springframework/test/web/reactive/server/WebTestClient$MockServerSpec<*>;
 bindToController
  ([Ljava/lang/Object;)Lorg/springframework/test/web/reactive/server/WebTestClient$ControllerSpec;
- ([Ljava/lang/Object;)Lorg/springframework/test/web/reactive/server/WebTestClient$ControllerSpec;
+ ([Ljava/lang/Object;)L1org/springframework/test/web/reactive/server/WebTestClient$ControllerSpec;
 bindToRouterFunction
  (Lorg/springframework/web/reactive/function/server/RouterFunction<*>;)Lorg/springframework/test/web/reactive/server/WebTestClient$RouterFunctionSpec;
- (Lorg/springframework/web/reactive/function/server/RouterFunction<*>;)Lorg/springframework/test/web/reactive/server/WebTestClient$RouterFunctionSpec;
+ (Lorg/springframework/web/reactive/function/server/RouterFunction<*>;)L1org/springframework/test/web/reactive/server/WebTestClient$RouterFunctionSpec;
 bindToServer
  ()Lorg/springframework/test/web/reactive/server/WebTestClient$Builder;
- ()Lorg/springframework/test/web/reactive/server/WebTestClient$Builder;
+ ()L1org/springframework/test/web/reactive/server/WebTestClient$Builder;
 bindToServer
  (Lorg/springframework/http/client/reactive/ClientHttpConnector;)Lorg/springframework/test/web/reactive/server/WebTestClient$Builder;
- (Lorg/springframework/http/client/reactive/ClientHttpConnector;)Lorg/springframework/test/web/reactive/server/WebTestClient$Builder;
+ (Lorg/springframework/http/client/reactive/ClientHttpConnector;)L1org/springframework/test/web/reactive/server/WebTestClient$Builder;
 bindToWebHandler
  (Lorg/springframework/web/server/WebHandler;)Lorg/springframework/test/web/reactive/server/WebTestClient$MockServerSpec<*>;
- (Lorg/springframework/web/server/WebHandler;)Lorg/springframework/test/web/reactive/server/WebTestClient$MockServerSpec<*>;
+ (Lorg/springframework/web/server/WebHandler;)L1org/springframework/test/web/reactive/server/WebTestClient$MockServerSpec<*>;
 
 delete
  ()Lorg/springframework/test/web/reactive/server/WebTestClient$RequestHeadersUriSpec<*>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/MockMvc.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/MockMvc.eea
index 82909a594e..397b444d8c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/MockMvc.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/MockMvc.eea
@@ -5,4 +5,4 @@ getDispatcherServlet
  ()Lorg/springframework/web/servlet/DispatcherServlet;
 perform
  (Lorg/springframework/test/web/servlet/RequestBuilder;)Lorg/springframework/test/web/servlet/ResultActions;
- (Lorg/springframework/test/web/servlet/RequestBuilder;)Lorg/springframework/test/web/servlet/ResultActions;
+ (Lorg/springframework/test/web/servlet/RequestBuilder;)L1org/springframework/test/web/servlet/ResultActions;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/MockMvcBuilderSupport.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/MockMvcBuilderSupport.eea
index 5425386820..23bb736772 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/MockMvcBuilderSupport.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/MockMvcBuilderSupport.eea
@@ -2,7 +2,7 @@ class org/springframework/test/web/servlet/MockMvcBuilderSupport
 
 createMockMvc
  ([Ljavax/servlet/Filter;Lorg/springframework/mock/web/MockServletConfig;Lorg/springframework/web/context/WebApplicationContext;Lorg/springframework/test/web/servlet/RequestBuilder;Ljava/nio/charset/Charset;Ljava/util/List<Lorg/springframework/test/web/servlet/ResultMatcher;>;Ljava/util/List<Lorg/springframework/test/web/servlet/ResultHandler;>;Ljava/util/List<Lorg/springframework/test/web/servlet/DispatcherServletCustomizer;>;)Lorg/springframework/test/web/servlet/MockMvc;
- ([Ljavax/servlet/Filter;Lorg/springframework/mock/web/MockServletConfig;Lorg/springframework/web/context/WebApplicationContext;Lorg/springframework/test/web/servlet/RequestBuilder;Ljava/nio/charset/Charset;Ljava/util/List<Lorg/springframework/test/web/servlet/ResultMatcher;>;Ljava/util/List<Lorg/springframework/test/web/servlet/ResultHandler;>;Ljava/util/List<Lorg/springframework/test/web/servlet/DispatcherServletCustomizer;>;)Lorg/springframework/test/web/servlet/MockMvc;
+ ([Ljavax/servlet/Filter;Lorg/springframework/mock/web/MockServletConfig;Lorg/springframework/web/context/WebApplicationContext;Lorg/springframework/test/web/servlet/RequestBuilder;Ljava/nio/charset/Charset;Ljava/util/List<Lorg/springframework/test/web/servlet/ResultMatcher;>;Ljava/util/List<Lorg/springframework/test/web/servlet/ResultHandler;>;Ljava/util/List<Lorg/springframework/test/web/servlet/DispatcherServletCustomizer;>;)L1org/springframework/test/web/servlet/MockMvc;
 createMockMvc
  ([Ljavax/servlet/Filter;Lorg/springframework/mock/web/MockServletConfig;Lorg/springframework/web/context/WebApplicationContext;Lorg/springframework/test/web/servlet/RequestBuilder;Ljava/util/List<Lorg/springframework/test/web/servlet/ResultMatcher;>;Ljava/util/List<Lorg/springframework/test/web/servlet/ResultHandler;>;Ljava/util/List<Lorg/springframework/test/web/servlet/DispatcherServletCustomizer;>;)Lorg/springframework/test/web/servlet/MockMvc;
- ([Ljavax/servlet/Filter;Lorg/springframework/mock/web/MockServletConfig;Lorg/springframework/web/context/WebApplicationContext;Lorg/springframework/test/web/servlet/RequestBuilder;Ljava/util/List<Lorg/springframework/test/web/servlet/ResultMatcher;>;Ljava/util/List<Lorg/springframework/test/web/servlet/ResultHandler;>;Ljava/util/List<Lorg/springframework/test/web/servlet/DispatcherServletCustomizer;>;)Lorg/springframework/test/web/servlet/MockMvc;
+ ([Ljavax/servlet/Filter;Lorg/springframework/mock/web/MockServletConfig;Lorg/springframework/web/context/WebApplicationContext;Lorg/springframework/test/web/servlet/RequestBuilder;Ljava/util/List<Lorg/springframework/test/web/servlet/ResultMatcher;>;Ljava/util/List<Lorg/springframework/test/web/servlet/ResultHandler;>;Ljava/util/List<Lorg/springframework/test/web/servlet/DispatcherServletCustomizer;>;)L1org/springframework/test/web/servlet/MockMvc;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/client/MockMvcWebTestClient.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/client/MockMvcWebTestClient.eea
index 7303930e2d..5d05c01757 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/client/MockMvcWebTestClient.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/client/MockMvcWebTestClient.eea
@@ -5,10 +5,10 @@ bindTo
  (Lorg/springframework/test/web/servlet/MockMvc;)Lorg/springframework/test/web/reactive/server/WebTestClient$Builder;
 bindToApplicationContext
  (Lorg/springframework/web/context/WebApplicationContext;)Lorg/springframework/test/web/servlet/client/MockMvcWebTestClient$MockMvcServerSpec<*>;
- (Lorg/springframework/web/context/WebApplicationContext;)Lorg/springframework/test/web/servlet/client/MockMvcWebTestClient$MockMvcServerSpec<*>;
+ (Lorg/springframework/web/context/WebApplicationContext;)L1org/springframework/test/web/servlet/client/MockMvcWebTestClient$MockMvcServerSpec<*>;
 bindToController
  ([Ljava/lang/Object;)Lorg/springframework/test/web/servlet/client/MockMvcWebTestClient$ControllerSpec;
- ([Ljava/lang/Object;)Lorg/springframework/test/web/servlet/client/MockMvcWebTestClient$ControllerSpec;
+ ([Ljava/lang/Object;)L1org/springframework/test/web/servlet/client/MockMvcWebTestClient$ControllerSpec;
 resultActionsFor
  (Lorg/springframework/test/web/reactive/server/ExchangeResult;)Lorg/springframework/test/web/servlet/ResultActions;
- (Lorg/springframework/test/web/reactive/server/ExchangeResult;)Lorg/springframework/test/web/servlet/ResultActions;
+ (Lorg/springframework/test/web/reactive/server/ExchangeResult;)L1org/springframework/test/web/servlet/ResultActions;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder.eea
index c4404a9531..abe28c9e7c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder.eea
@@ -6,13 +6,13 @@ super org/springframework/test/web/servlet/htmlunit/MockMvcWebConnectionBuilderS
 
 mockMvcSetup
  (Lorg/springframework/test/web/servlet/MockMvc;)Lorg/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder;
- (Lorg/springframework/test/web/servlet/MockMvc;)Lorg/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder;
+ (Lorg/springframework/test/web/servlet/MockMvc;)L1org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder;
 webAppContextSetup
  (Lorg/springframework/web/context/WebApplicationContext;)Lorg/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder;
- (Lorg/springframework/web/context/WebApplicationContext;)Lorg/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder;
+ (Lorg/springframework/web/context/WebApplicationContext;)L1org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder;
 webAppContextSetup
  (Lorg/springframework/web/context/WebApplicationContext;Lorg/springframework/test/web/servlet/setup/MockMvcConfigurer;)Lorg/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder;
- (Lorg/springframework/web/context/WebApplicationContext;Lorg/springframework/test/web/servlet/setup/MockMvcConfigurer;)Lorg/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder;
+ (Lorg/springframework/web/context/WebApplicationContext;Lorg/springframework/test/web/servlet/setup/MockMvcConfigurer;)L1org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder;
 
 <init>
  (Lorg/springframework/test/web/servlet/MockMvc;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnectionBuilderSupport.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnectionBuilderSupport.eea
index 88c452535d..f5afea3a74 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnectionBuilderSupport.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnectionBuilderSupport.eea
@@ -19,7 +19,7 @@ contextPath
  (Ljava/lang/String;)TT;
 createConnection
  (Lcom/gargoylesoftware/htmlunit/WebClient;)Lcom/gargoylesoftware/htmlunit/WebConnection;
- (Lcom/gargoylesoftware/htmlunit/WebClient;)Lcom/gargoylesoftware/htmlunit/WebConnection;
+ (Lcom/gargoylesoftware/htmlunit/WebClient;)L1com/gargoylesoftware/htmlunit/WebConnection;
 useMockMvc
  ([Lorg/springframework/test/web/servlet/htmlunit/WebRequestMatcher;)TT;
  ([Lorg/springframework/test/web/servlet/htmlunit/WebRequestMatcher;)TT;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder.eea
index 31887a5dd3..fd8b9c8067 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder.eea
@@ -6,13 +6,13 @@ super org/springframework/test/web/servlet/htmlunit/MockMvcWebConnectionBuilderS
 
 mockMvcSetup
  (Lorg/springframework/test/web/servlet/MockMvc;)Lorg/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder;
- (Lorg/springframework/test/web/servlet/MockMvc;)Lorg/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder;
+ (Lorg/springframework/test/web/servlet/MockMvc;)L1org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder;
 webAppContextSetup
  (Lorg/springframework/web/context/WebApplicationContext;)Lorg/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder;
- (Lorg/springframework/web/context/WebApplicationContext;)Lorg/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder;
+ (Lorg/springframework/web/context/WebApplicationContext;)L1org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder;
 webAppContextSetup
  (Lorg/springframework/web/context/WebApplicationContext;Lorg/springframework/test/web/servlet/setup/MockMvcConfigurer;)Lorg/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder;
- (Lorg/springframework/web/context/WebApplicationContext;Lorg/springframework/test/web/servlet/setup/MockMvcConfigurer;)Lorg/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder;
+ (Lorg/springframework/web/context/WebApplicationContext;Lorg/springframework/test/web/servlet/setup/MockMvcConfigurer;)L1org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder;
 
 <init>
  (Lorg/springframework/test/web/servlet/MockMvc;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.eea
index 9cd9e71f13..e106f6063c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.eea
@@ -39,7 +39,7 @@ cookie
  ([Ljavax/servlet/http/Cookie;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 createServletRequest
  (Ljavax/servlet/ServletContext;)Lorg/springframework/mock/web/MockHttpServletRequest;
- (Ljavax/servlet/ServletContext;)Lorg/springframework/mock/web/MockHttpServletRequest;
+ (Ljavax/servlet/ServletContext;)L1org/springframework/mock/web/MockHttpServletRequest;
 flashAttr
  (Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
  (Ljava/lang/String;Ljava/lang/Object;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.eea
index a8542a071f..ba7d6481d3 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.eea
@@ -2,7 +2,7 @@ class org/springframework/test/web/servlet/request/MockMultipartHttpServletReque
 
 createServletRequest
  (Ljavax/servlet/ServletContext;)Lorg/springframework/mock/web/MockHttpServletRequest;
- (Ljavax/servlet/ServletContext;)Lorg/springframework/mock/web/MockHttpServletRequest;
+ (Ljavax/servlet/ServletContext;)L1org/springframework/mock/web/MockHttpServletRequest; # @Inherited(org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder)
 file
  (Ljava/lang/String;[B)Lorg/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
  (Ljava/lang/String;[B)L1org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.eea
index 5db67d4df3..890db959c0 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.eea
@@ -5,70 +5,70 @@ asyncDispatch
  (Lorg/springframework/test/web/servlet/MvcResult;)Lorg/springframework/test/web/servlet/RequestBuilder;
 delete
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 delete
  (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/net/URI;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 fileUpload
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
 fileUpload
  (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
- (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
+ (Ljava/net/URI;)L1org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
 get
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 get
  (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/net/URI;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 head
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 head
  (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/net/URI;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 multipart
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
 multipart
  (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
- (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
+ (Ljava/net/URI;)L1org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
 multipart
  (Lorg/springframework/http/HttpMethod;Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
- (Lorg/springframework/http/HttpMethod;Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
+ (Lorg/springframework/http/HttpMethod;Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
 multipart
  (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
- (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
+ (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)L1org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
 options
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 options
  (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/net/URI;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 patch
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 patch
  (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/net/URI;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 post
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 post
  (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/net/URI;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 put
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 put
  (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/net/URI;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 request
  (Ljava/lang/String;Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/lang/String;Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/lang/String;Ljava/net/URI;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 request
  (Lorg/springframework/http/HttpMethod;Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Lorg/springframework/http/HttpMethod;Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Lorg/springframework/http/HttpMethod;Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 request
  (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/result/MockMvcResultHandlers.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/result/MockMvcResultHandlers.eea
index 5089b55a76..4786907b56 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/result/MockMvcResultHandlers.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/result/MockMvcResultHandlers.eea
@@ -2,7 +2,7 @@ class org/springframework/test/web/servlet/result/MockMvcResultHandlers
 
 log
  ()Lorg/springframework/test/web/servlet/ResultHandler;
- ()Lorg/springframework/test/web/servlet/ResultHandler;
+ ()L1org/springframework/test/web/servlet/ResultHandler;
 print
  ()Lorg/springframework/test/web/servlet/ResultHandler;
  ()Lorg/springframework/test/web/servlet/ResultHandler;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/result/MockMvcResultMatchers.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/result/MockMvcResultMatchers.eea
index 0319131c4b..aad18ddb6c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/result/MockMvcResultMatchers.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/result/MockMvcResultMatchers.eea
@@ -2,13 +2,13 @@ class org/springframework/test/web/servlet/result/MockMvcResultMatchers
 
 content
  ()Lorg/springframework/test/web/servlet/result/ContentResultMatchers;
- ()Lorg/springframework/test/web/servlet/result/ContentResultMatchers;
+ ()L1org/springframework/test/web/servlet/result/ContentResultMatchers;
 cookie
  ()Lorg/springframework/test/web/servlet/result/CookieResultMatchers;
- ()Lorg/springframework/test/web/servlet/result/CookieResultMatchers;
+ ()L1org/springframework/test/web/servlet/result/CookieResultMatchers;
 flash
  ()Lorg/springframework/test/web/servlet/result/FlashAttributeResultMatchers;
- ()Lorg/springframework/test/web/servlet/result/FlashAttributeResultMatchers;
+ ()L1org/springframework/test/web/servlet/result/FlashAttributeResultMatchers;
 forwardedUrl
  (Ljava/lang/String;)Lorg/springframework/test/web/servlet/ResultMatcher;
  (Ljava/lang/String;)Lorg/springframework/test/web/servlet/ResultMatcher;
@@ -20,13 +20,13 @@ forwardedUrlTemplate
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/ResultMatcher;
 handler
  ()Lorg/springframework/test/web/servlet/result/HandlerResultMatchers;
- ()Lorg/springframework/test/web/servlet/result/HandlerResultMatchers;
+ ()L1org/springframework/test/web/servlet/result/HandlerResultMatchers;
 header
  ()Lorg/springframework/test/web/servlet/result/HeaderResultMatchers;
- ()Lorg/springframework/test/web/servlet/result/HeaderResultMatchers;
+ ()L1org/springframework/test/web/servlet/result/HeaderResultMatchers;
 jsonPath
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/result/JsonPathResultMatchers;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/result/JsonPathResultMatchers;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/result/JsonPathResultMatchers;
 jsonPath
  <T:Ljava/lang/Object;>(Ljava/lang/String;Lorg/hamcrest/Matcher<-TT;>;)Lorg/springframework/test/web/servlet/ResultMatcher;
  <T:Ljava/lang/Object;>(Ljava/lang/String;Lorg/hamcrest/Matcher<-TT;>;)Lorg/springframework/test/web/servlet/ResultMatcher;
@@ -35,7 +35,7 @@ jsonPath
  <T:Ljava/lang/Object;>(Ljava/lang/String;Lorg/hamcrest/Matcher<-TT;>;Ljava/lang/Class<TT;>;)Lorg/springframework/test/web/servlet/ResultMatcher;
 model
  ()Lorg/springframework/test/web/servlet/result/ModelResultMatchers;
- ()Lorg/springframework/test/web/servlet/result/ModelResultMatchers;
+ ()L1org/springframework/test/web/servlet/result/ModelResultMatchers;
 redirectedUrl
  (Ljava/lang/String;)Lorg/springframework/test/web/servlet/ResultMatcher;
  (Ljava/lang/String;)Lorg/springframework/test/web/servlet/ResultMatcher;
@@ -47,16 +47,16 @@ redirectedUrlTemplate
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/ResultMatcher;
 request
  ()Lorg/springframework/test/web/servlet/result/RequestResultMatchers;
- ()Lorg/springframework/test/web/servlet/result/RequestResultMatchers;
+ ()L1org/springframework/test/web/servlet/result/RequestResultMatchers;
 status
  ()Lorg/springframework/test/web/servlet/result/StatusResultMatchers;
- ()Lorg/springframework/test/web/servlet/result/StatusResultMatchers;
+ ()L1org/springframework/test/web/servlet/result/StatusResultMatchers;
 view
  ()Lorg/springframework/test/web/servlet/result/ViewResultMatchers;
- ()Lorg/springframework/test/web/servlet/result/ViewResultMatchers;
+ ()L1org/springframework/test/web/servlet/result/ViewResultMatchers;
 xpath
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/result/XpathResultMatchers;
- (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/result/XpathResultMatchers;
+ (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/result/XpathResultMatchers;
 xpath
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/result/XpathResultMatchers;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/result/XpathResultMatchers;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/result/XpathResultMatchers;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/result/PrintingResultHandler.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/result/PrintingResultHandler.eea
index b65402d20c..a570638fbe 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/result/PrintingResultHandler.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/result/PrintingResultHandler.eea
@@ -5,16 +5,16 @@ class org/springframework/test/web/servlet/result/PrintingResultHandler
  (Lorg/springframework/test/web/servlet/result/PrintingResultHandler$ResultValuePrinter;)V
 getParamsMultiValueMap
  (Lorg/springframework/mock/web/MockHttpServletRequest;)Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
- (Lorg/springframework/mock/web/MockHttpServletRequest;)Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
+ (Lorg/springframework/mock/web/MockHttpServletRequest;)L1org/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
 getPrinter
  ()Lorg/springframework/test/web/servlet/result/PrintingResultHandler$ResultValuePrinter;
  ()Lorg/springframework/test/web/servlet/result/PrintingResultHandler$ResultValuePrinter;
 getRequestHeaders
  (Lorg/springframework/mock/web/MockHttpServletRequest;)Lorg/springframework/http/HttpHeaders;
- (Lorg/springframework/mock/web/MockHttpServletRequest;)Lorg/springframework/http/HttpHeaders;
+ (Lorg/springframework/mock/web/MockHttpServletRequest;)L1org/springframework/http/HttpHeaders;
 getResponseHeaders
  (Lorg/springframework/mock/web/MockHttpServletResponse;)Lorg/springframework/http/HttpHeaders;
- (Lorg/springframework/mock/web/MockHttpServletResponse;)Lorg/springframework/http/HttpHeaders;
+ (Lorg/springframework/mock/web/MockHttpServletResponse;)L1org/springframework/http/HttpHeaders;
 getSessionAttributes
  (Lorg/springframework/mock/web/MockHttpServletRequest;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
  (Lorg/springframework/mock/web/MockHttpServletRequest;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/setup/MockMvcBuilders.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/setup/MockMvcBuilders.eea
index ba33c9a788..7690b5e77b 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/setup/MockMvcBuilders.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/setup/MockMvcBuilders.eea
@@ -2,7 +2,7 @@ class org/springframework/test/web/servlet/setup/MockMvcBuilders
 
 standaloneSetup
  ([Ljava/lang/Object;)Lorg/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder;
- ([Ljava/lang/Object;)Lorg/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder;
+ ([Ljava/lang/Object;)L1org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder;
 webAppContextSetup
  (Lorg/springframework/web/context/WebApplicationContext;)Lorg/springframework/test/web/servlet/setup/DefaultMockMvcBuilder;
- (Lorg/springframework/web/context/WebApplicationContext;)Lorg/springframework/test/web/servlet/setup/DefaultMockMvcBuilder;
+ (Lorg/springframework/web/context/WebApplicationContext;)L1org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/setup/SharedHttpSessionConfigurer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/setup/SharedHttpSessionConfigurer.eea
index 88696ce0ce..7bba0a601f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/setup/SharedHttpSessionConfigurer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/setup/SharedHttpSessionConfigurer.eea
@@ -2,7 +2,7 @@ class org/springframework/test/web/servlet/setup/SharedHttpSessionConfigurer
 
 sharedHttpSession
  ()Lorg/springframework/test/web/servlet/setup/SharedHttpSessionConfigurer;
- ()Lorg/springframework/test/web/servlet/setup/SharedHttpSessionConfigurer;
+ ()L1org/springframework/test/web/servlet/setup/SharedHttpSessionConfigurer;
 
 afterConfigurerAdded
  (Lorg/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder<*>;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.eea
index bb97dd4674..fb19d3d1f2 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.eea
@@ -21,7 +21,7 @@ extendMvcSingletons
  (Ljavax/servlet/ServletContext;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 initWebAppContext
  ()Lorg/springframework/web/context/WebApplicationContext;
- ()Lorg/springframework/web/context/WebApplicationContext;
+ ()L1org/springframework/web/context/WebApplicationContext;
 setAsyncRequestTimeout
  (J)Lorg/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder;
  (J)L1org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/HeuristicCompletionException.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/HeuristicCompletionException.eea
index aa48692269..7857ffdb89 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/HeuristicCompletionException.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/HeuristicCompletionException.eea
@@ -2,7 +2,7 @@ class org/springframework/transaction/HeuristicCompletionException
 
 getStateString
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 
 <init>
  (ILjava/lang/Throwable;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/SavepointManager.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/SavepointManager.eea
index 1aadf6213c..2baf6e98c8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/SavepointManager.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/SavepointManager.eea
@@ -2,7 +2,7 @@ class org/springframework/transaction/SavepointManager
 
 createSavepoint
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 releaseSavepoint
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.eea
index 708ad8a76b..6ff6bf4245 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.eea
@@ -2,7 +2,7 @@ class org/springframework/transaction/annotation/AbstractTransactionManagementCo
 
 transactionalEventListenerFactory
  ()Lorg/springframework/transaction/event/TransactionalEventListenerFactory;
- ()Lorg/springframework/transaction/event/TransactionalEventListenerFactory;
+ ()L1org/springframework/transaction/event/TransactionalEventListenerFactory;
 
 enableTx
  Lorg/springframework/core/annotation/AnnotationAttributes;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.eea
index 577694e12d..645acadf48 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.eea
@@ -11,4 +11,4 @@ parseTransactionAnnotation
  (Ljava/lang/reflect/AnnotatedElement;)L0org/springframework/transaction/interceptor/TransactionAttribute; # @Inherited(org.springframework.transaction.annotation.TransactionAnnotationParser)
 parseTransactionAnnotation
  (Ljavax/ejb/TransactionAttribute;)Lorg/springframework/transaction/interceptor/TransactionAttribute;
- (Ljavax/ejb/TransactionAttribute;)Lorg/springframework/transaction/interceptor/TransactionAttribute;
+ (Ljavax/ejb/TransactionAttribute;)L1org/springframework/transaction/interceptor/TransactionAttribute;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/annotation/JtaTransactionAnnotationParser.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/annotation/JtaTransactionAnnotationParser.eea
index 7771e2a068..7960e80cd6 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/annotation/JtaTransactionAnnotationParser.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/annotation/JtaTransactionAnnotationParser.eea
@@ -14,4 +14,4 @@ parseTransactionAnnotation
  (Ljavax/transaction/Transactional;)Lorg/springframework/transaction/interceptor/TransactionAttribute;
 parseTransactionAnnotation
  (Lorg/springframework/core/annotation/AnnotationAttributes;)Lorg/springframework/transaction/interceptor/TransactionAttribute;
- (Lorg/springframework/core/annotation/AnnotationAttributes;)Lorg/springframework/transaction/interceptor/TransactionAttribute;
+ (Lorg/springframework/core/annotation/AnnotationAttributes;)L1org/springframework/transaction/interceptor/TransactionAttribute;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.eea
index 946d42a627..8899e71a70 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.eea
@@ -2,10 +2,10 @@ class org/springframework/transaction/annotation/ProxyTransactionManagementConfi
 
 transactionAdvisor
  (Lorg/springframework/transaction/interceptor/TransactionAttributeSource;Lorg/springframework/transaction/interceptor/TransactionInterceptor;)Lorg/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor;
- (Lorg/springframework/transaction/interceptor/TransactionAttributeSource;Lorg/springframework/transaction/interceptor/TransactionInterceptor;)Lorg/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor;
+ (Lorg/springframework/transaction/interceptor/TransactionAttributeSource;Lorg/springframework/transaction/interceptor/TransactionInterceptor;)L1org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor;
 transactionAttributeSource
  ()Lorg/springframework/transaction/interceptor/TransactionAttributeSource;
- ()Lorg/springframework/transaction/interceptor/TransactionAttributeSource;
+ ()L1org/springframework/transaction/interceptor/TransactionAttributeSource;
 transactionInterceptor
  (Lorg/springframework/transaction/interceptor/TransactionAttributeSource;)Lorg/springframework/transaction/interceptor/TransactionInterceptor;
- (Lorg/springframework/transaction/interceptor/TransactionAttributeSource;)Lorg/springframework/transaction/interceptor/TransactionInterceptor;
+ (Lorg/springframework/transaction/interceptor/TransactionAttributeSource;)L1org/springframework/transaction/interceptor/TransactionInterceptor;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.eea
index 8fddcdd687..564f1a4c49 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.eea
@@ -11,7 +11,7 @@ parseTransactionAnnotation
  (Ljava/lang/reflect/AnnotatedElement;)L0org/springframework/transaction/interceptor/TransactionAttribute; # @Inherited(org.springframework.transaction.annotation.TransactionAnnotationParser)
 parseTransactionAnnotation
  (Lorg/springframework/core/annotation/AnnotationAttributes;)Lorg/springframework/transaction/interceptor/TransactionAttribute;
- (Lorg/springframework/core/annotation/AnnotationAttributes;)Lorg/springframework/transaction/interceptor/TransactionAttribute;
+ (Lorg/springframework/core/annotation/AnnotationAttributes;)L1org/springframework/transaction/interceptor/TransactionAttribute;
 parseTransactionAnnotation
  (Lorg/springframework/transaction/annotation/Transactional;)Lorg/springframework/transaction/interceptor/TransactionAttribute;
  (Lorg/springframework/transaction/annotation/Transactional;)Lorg/springframework/transaction/interceptor/TransactionAttribute;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/config/JtaTransactionManagerBeanDefinitionParser.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/config/JtaTransactionManagerBeanDefinitionParser.eea
index f495936ce4..891a7ec7f1 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/config/JtaTransactionManagerBeanDefinitionParser.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/config/JtaTransactionManagerBeanDefinitionParser.eea
@@ -5,4 +5,4 @@ getBeanClassName
  (Lorg/w3c/dom/Element;)L0java/lang/String; # @Inherited(org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser)
 resolveId
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/support/AbstractBeanDefinition;Lorg/springframework/beans/factory/xml/ParserContext;)Ljava/lang/String;
- (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/support/AbstractBeanDefinition;Lorg/springframework/beans/factory/xml/ParserContext;)Ljava/lang/String;
+ (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/support/AbstractBeanDefinition;Lorg/springframework/beans/factory/xml/ParserContext;)L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/event/TransactionalApplicationListener.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/event/TransactionalApplicationListener.eea
index 79c19b99c4..ea95a172c3 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/event/TransactionalApplicationListener.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/event/TransactionalApplicationListener.eea
@@ -18,7 +18,7 @@ addCallback
  (Lorg/springframework/transaction/event/TransactionalApplicationListener$SynchronizationCallback;)V
 getListenerId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getTransactionPhase
  ()Lorg/springframework/transaction/event/TransactionPhase;
  ()Lorg/springframework/transaction/event/TransactionPhase;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/event/TransactionalApplicationListenerAdapter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/event/TransactionalApplicationListenerAdapter.eea
index 4bd2e61c32..a243f725b8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/event/TransactionalApplicationListenerAdapter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/event/TransactionalApplicationListenerAdapter.eea
@@ -14,7 +14,7 @@ addCallback
  (Lorg/springframework/transaction/event/TransactionalApplicationListener$SynchronizationCallback;)V
 getListenerId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.transaction.event.TransactionalApplicationListener)
 getTransactionPhase
  ()Lorg/springframework/transaction/event/TransactionPhase;
  ()Lorg/springframework/transaction/event/TransactionPhase;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/event/TransactionalEventListenerFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/event/TransactionalEventListenerFactory.eea
index 7c2707576c..bffeda21b2 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/event/TransactionalEventListenerFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/event/TransactionalEventListenerFactory.eea
@@ -2,7 +2,7 @@ class org/springframework/transaction/event/TransactionalEventListenerFactory
 
 createApplicationListener
  (Ljava/lang/String;Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)Lorg/springframework/context/ApplicationListener<*>;
- (Ljava/lang/String;Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)Lorg/springframework/context/ApplicationListener<*>;
+ (Ljava/lang/String;Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)L1org/springframework/context/ApplicationListener<*>; # @Inherited(org.springframework.context.event.EventListenerFactory)
 supportsMethod
  (Ljava/lang/reflect/Method;)Z
  (Ljava/lang/reflect/Method;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.eea
index 849961cdca..33b5731977 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.eea
@@ -15,7 +15,7 @@ findTransactionAttribute
  (Ljava/lang/reflect/Method;)L0org/springframework/transaction/interceptor/TransactionAttribute;
 getCacheKey
  (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Ljava/lang/Object;
- (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Ljava/lang/Object;
+ (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)L1java/lang/Object;
 getTransactionAttribute
  (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Lorg/springframework/transaction/interceptor/TransactionAttribute;
  (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)L0org/springframework/transaction/interceptor/TransactionAttribute; # @Inherited(org.springframework.transaction.interceptor.TransactionAttributeSource)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/interceptor/TransactionAspectSupport.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/interceptor/TransactionAspectSupport.eea
index 8f408d2607..e1d59b17b2 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/interceptor/TransactionAspectSupport.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/interceptor/TransactionAspectSupport.eea
@@ -22,7 +22,7 @@ completeTransactionAfterThrowing
  (Lorg/springframework/transaction/interceptor/TransactionAspectSupport$TransactionInfo;Ljava/lang/Throwable;)V
 createTransactionIfNecessary
  (Lorg/springframework/transaction/PlatformTransactionManager;Lorg/springframework/transaction/interceptor/TransactionAttribute;Ljava/lang/String;)Lorg/springframework/transaction/interceptor/TransactionAspectSupport$TransactionInfo;
- (Lorg/springframework/transaction/PlatformTransactionManager;Lorg/springframework/transaction/interceptor/TransactionAttribute;Ljava/lang/String;)Lorg/springframework/transaction/interceptor/TransactionAspectSupport$TransactionInfo;
+ (Lorg/springframework/transaction/PlatformTransactionManager;Lorg/springframework/transaction/interceptor/TransactionAttribute;Ljava/lang/String;)L1org/springframework/transaction/interceptor/TransactionAspectSupport$TransactionInfo;
 determineTransactionManager
  (Lorg/springframework/transaction/interceptor/TransactionAttribute;)Lorg/springframework/transaction/TransactionManager;
  (Lorg/springframework/transaction/interceptor/TransactionAttribute;)L0org/springframework/transaction/TransactionManager;
@@ -46,7 +46,7 @@ methodIdentification
  (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)L0java/lang/String;
 prepareTransactionInfo
  (Lorg/springframework/transaction/PlatformTransactionManager;Lorg/springframework/transaction/interceptor/TransactionAttribute;Ljava/lang/String;Lorg/springframework/transaction/TransactionStatus;)Lorg/springframework/transaction/interceptor/TransactionAspectSupport$TransactionInfo;
- (Lorg/springframework/transaction/PlatformTransactionManager;Lorg/springframework/transaction/interceptor/TransactionAttribute;Ljava/lang/String;Lorg/springframework/transaction/TransactionStatus;)Lorg/springframework/transaction/interceptor/TransactionAspectSupport$TransactionInfo;
+ (Lorg/springframework/transaction/PlatformTransactionManager;Lorg/springframework/transaction/interceptor/TransactionAttribute;Ljava/lang/String;Lorg/springframework/transaction/TransactionStatus;)L1org/springframework/transaction/interceptor/TransactionAspectSupport$TransactionInfo;
 setBeanFactory
  (Lorg/springframework/beans/factory/BeanFactory;)V
  (Lorg/springframework/beans/factory/BeanFactory;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.eea
index f1c4bf4446..c55491ad27 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.eea
@@ -2,7 +2,7 @@ class org/springframework/transaction/interceptor/TransactionProxyFactoryBean
 
 createMainInterceptor
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object; # @Inherited(org.springframework.aop.framework.AbstractSingletonProxyFactoryBean)
 postProcessProxyFactory
  (Lorg/springframework/aop/framework/ProxyFactory;)V
  (Lorg/springframework/aop/framework/ProxyFactory;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/jta/JtaTransactionManager.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/jta/JtaTransactionManager.eea
index a41d8a38aa..7edb6312f2 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/jta/JtaTransactionManager.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/jta/JtaTransactionManager.eea
@@ -30,7 +30,7 @@ buildUserTransaction
  (Ljavax/transaction/TransactionManager;)Ljavax/transaction/UserTransaction;
 createTransaction
  (Ljava/lang/String;I)Ljavax/transaction/Transaction;
- (Ljava/lang/String;I)Ljavax/transaction/Transaction;
+ (Ljava/lang/String;I)L1javax/transaction/Transaction; # @Inherited(org.springframework.transaction.jta.TransactionFactory)
 doBegin
  (Ljava/lang/Object;Lorg/springframework/transaction/TransactionDefinition;)V
  (Ljava/lang/Object;Lorg/springframework/transaction/TransactionDefinition;)V
@@ -42,7 +42,7 @@ doCommit
  (Lorg/springframework/transaction/support/DefaultTransactionStatus;)V
 doGetJtaTransaction
  (Ljavax/transaction/UserTransaction;)Lorg/springframework/transaction/jta/JtaTransactionObject;
- (Ljavax/transaction/UserTransaction;)Lorg/springframework/transaction/jta/JtaTransactionObject;
+ (Ljavax/transaction/UserTransaction;)L1org/springframework/transaction/jta/JtaTransactionObject;
 doGetTransaction
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
@@ -69,7 +69,7 @@ doSetRollbackOnly
  (Lorg/springframework/transaction/support/DefaultTransactionStatus;)V
 doSuspend
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object; # @Inherited(org.springframework.transaction.support.AbstractPlatformTransactionManager)
 findTransactionManager
  (Ljavax/transaction/UserTransaction;)Ljavax/transaction/TransactionManager;
  (Ljavax/transaction/UserTransaction;)L0javax/transaction/TransactionManager;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/jta/SimpleTransactionFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/jta/SimpleTransactionFactory.eea
index 25cd4bed93..d5bf44f95b 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/jta/SimpleTransactionFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/jta/SimpleTransactionFactory.eea
@@ -5,4 +5,4 @@ class org/springframework/transaction/jta/SimpleTransactionFactory
  (Ljavax/transaction/TransactionManager;)V
 createTransaction
  (Ljava/lang/String;I)Ljavax/transaction/Transaction;
- (Ljava/lang/String;I)Ljavax/transaction/Transaction;
+ (Ljava/lang/String;I)L1javax/transaction/Transaction; # @Inherited(org.springframework.transaction.jta.TransactionFactory)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/jta/TransactionFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/jta/TransactionFactory.eea
index 3d19fca9cd..5df51bd4a9 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/jta/TransactionFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/jta/TransactionFactory.eea
@@ -2,4 +2,4 @@ class org/springframework/transaction/jta/TransactionFactory
 
 createTransaction
  (Ljava/lang/String;I)Ljavax/transaction/Transaction;
- (Ljava/lang/String;I)Ljavax/transaction/Transaction;
+ (Ljava/lang/String;I)L1javax/transaction/Transaction;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/jta/WebLogicJtaTransactionManager.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/jta/WebLogicJtaTransactionManager.eea
index f4890bfee3..ad6305e62a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/jta/WebLogicJtaTransactionManager.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/jta/WebLogicJtaTransactionManager.eea
@@ -2,7 +2,7 @@ class org/springframework/transaction/jta/WebLogicJtaTransactionManager
 
 createTransaction
  (Ljava/lang/String;I)Ljavax/transaction/Transaction;
- (Ljava/lang/String;I)Ljavax/transaction/Transaction;
+ (Ljava/lang/String;I)L1javax/transaction/Transaction; # @Inherited(org.springframework.transaction.jta.JtaTransactionManager)
 doJtaBegin
  (Lorg/springframework/transaction/jta/JtaTransactionObject;Lorg/springframework/transaction/TransactionDefinition;)V
  (Lorg/springframework/transaction/jta/JtaTransactionObject;Lorg/springframework/transaction/TransactionDefinition;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/reactive/AbstractReactiveTransactionManager.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/reactive/AbstractReactiveTransactionManager.eea
index 7280f068bf..edb83b775e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/reactive/AbstractReactiveTransactionManager.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/reactive/AbstractReactiveTransactionManager.eea
@@ -21,16 +21,16 @@ doGetTransaction
  (Lorg/springframework/transaction/reactive/TransactionSynchronizationManager;)Ljava/lang/Object;
 doResume
  (Lorg/springframework/transaction/reactive/TransactionSynchronizationManager;Ljava/lang/Object;Ljava/lang/Object;)Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
- (Lorg/springframework/transaction/reactive/TransactionSynchronizationManager;Ljava/lang/Object;Ljava/lang/Object;)Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
+ (Lorg/springframework/transaction/reactive/TransactionSynchronizationManager;Ljava/lang/Object;Ljava/lang/Object;)L1reactor/core/publisher/Mono<Ljava/lang/Void;>;
 doRollback
  (Lorg/springframework/transaction/reactive/TransactionSynchronizationManager;Lorg/springframework/transaction/reactive/GenericReactiveTransaction;)Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
  (Lorg/springframework/transaction/reactive/TransactionSynchronizationManager;Lorg/springframework/transaction/reactive/GenericReactiveTransaction;)Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
 doSetRollbackOnly
  (Lorg/springframework/transaction/reactive/TransactionSynchronizationManager;Lorg/springframework/transaction/reactive/GenericReactiveTransaction;)Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
- (Lorg/springframework/transaction/reactive/TransactionSynchronizationManager;Lorg/springframework/transaction/reactive/GenericReactiveTransaction;)Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
+ (Lorg/springframework/transaction/reactive/TransactionSynchronizationManager;Lorg/springframework/transaction/reactive/GenericReactiveTransaction;)L1reactor/core/publisher/Mono<Ljava/lang/Void;>;
 doSuspend
  (Lorg/springframework/transaction/reactive/TransactionSynchronizationManager;Ljava/lang/Object;)Lreactor/core/publisher/Mono<Ljava/lang/Object;>;
- (Lorg/springframework/transaction/reactive/TransactionSynchronizationManager;Ljava/lang/Object;)Lreactor/core/publisher/Mono<Ljava/lang/Object;>;
+ (Lorg/springframework/transaction/reactive/TransactionSynchronizationManager;Ljava/lang/Object;)L1reactor/core/publisher/Mono<Ljava/lang/Object;>;
 getReactiveTransaction
  (Lorg/springframework/transaction/TransactionDefinition;)Lreactor/core/publisher/Mono<Lorg/springframework/transaction/ReactiveTransaction;>;
  (Lorg/springframework/transaction/TransactionDefinition;)Lreactor/core/publisher/Mono<Lorg/springframework/transaction/ReactiveTransaction;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/reactive/TransactionContext.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/reactive/TransactionContext.eea
index 57d1d3094b..bd360120da 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/reactive/TransactionContext.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/reactive/TransactionContext.eea
@@ -11,7 +11,7 @@ getCurrentTransactionName
  ()L0java/lang/String;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getParent
  ()Lorg/springframework/transaction/reactive/TransactionContext;
  ()L0org/springframework/transaction/reactive/TransactionContext;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/reactive/TransactionContextManager.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/reactive/TransactionContextManager.eea
index be350c06f1..20b798e05b 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/reactive/TransactionContextManager.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/reactive/TransactionContextManager.eea
@@ -2,7 +2,7 @@ class org/springframework/transaction/reactive/TransactionContextManager
 
 createTransactionContext
  ()Ljava/util/function/Function<Lreactor/util/context/Context;Lreactor/util/context/Context;>;
- ()Ljava/util/function/Function<Lreactor/util/context/Context;Lreactor/util/context/Context;>;
+ ()L1java/util/function/Function<Lreactor/util/context/Context;Lreactor/util/context/Context;>;
 currentContext
  ()Lreactor/core/publisher/Mono<Lorg/springframework/transaction/reactive/TransactionContext;>;
  ()Lreactor/core/publisher/Mono<Lorg/springframework/transaction/reactive/TransactionContext;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/reactive/TransactionalOperator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/reactive/TransactionalOperator.eea
index 45b54571fc..923b7a5c4c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/reactive/TransactionalOperator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/reactive/TransactionalOperator.eea
@@ -2,10 +2,10 @@ class org/springframework/transaction/reactive/TransactionalOperator
 
 create
  (Lorg/springframework/transaction/ReactiveTransactionManager;)Lorg/springframework/transaction/reactive/TransactionalOperator;
- (Lorg/springframework/transaction/ReactiveTransactionManager;)Lorg/springframework/transaction/reactive/TransactionalOperator;
+ (Lorg/springframework/transaction/ReactiveTransactionManager;)L1org/springframework/transaction/reactive/TransactionalOperator;
 create
  (Lorg/springframework/transaction/ReactiveTransactionManager;Lorg/springframework/transaction/TransactionDefinition;)Lorg/springframework/transaction/reactive/TransactionalOperator;
- (Lorg/springframework/transaction/ReactiveTransactionManager;Lorg/springframework/transaction/TransactionDefinition;)Lorg/springframework/transaction/reactive/TransactionalOperator;
+ (Lorg/springframework/transaction/ReactiveTransactionManager;Lorg/springframework/transaction/TransactionDefinition;)L1org/springframework/transaction/reactive/TransactionalOperator;
 
 execute
  <T:Ljava/lang/Object;>(Lorg/springframework/transaction/reactive/TransactionCallback<TT;>;)Lreactor/core/publisher/Flux<TT;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/support/AbstractPlatformTransactionManager.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/support/AbstractPlatformTransactionManager.eea
index 8f9ec30872..78d56eb9a3 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/support/AbstractPlatformTransactionManager.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/support/AbstractPlatformTransactionManager.eea
@@ -33,7 +33,7 @@ doSetRollbackOnly
  (Lorg/springframework/transaction/support/DefaultTransactionStatus;)V
 doSuspend
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object;
 getTransaction
  (Lorg/springframework/transaction/TransactionDefinition;)Lorg/springframework/transaction/TransactionStatus;
  (Lorg/springframework/transaction/TransactionDefinition;)Lorg/springframework/transaction/TransactionStatus;
@@ -45,7 +45,7 @@ isExistingTransaction
  (Ljava/lang/Object;)Z
 newTransactionStatus
  (Lorg/springframework/transaction/TransactionDefinition;Ljava/lang/Object;ZZZLjava/lang/Object;)Lorg/springframework/transaction/support/DefaultTransactionStatus;
- (Lorg/springframework/transaction/TransactionDefinition;Ljava/lang/Object;ZZZLjava/lang/Object;)Lorg/springframework/transaction/support/DefaultTransactionStatus;
+ (Lorg/springframework/transaction/TransactionDefinition;Ljava/lang/Object;ZZZLjava/lang/Object;)L1org/springframework/transaction/support/DefaultTransactionStatus;
 prepareForCommit
  (Lorg/springframework/transaction/support/DefaultTransactionStatus;)V
  (Lorg/springframework/transaction/support/DefaultTransactionStatus;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/support/AbstractTransactionStatus.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/support/AbstractTransactionStatus.eea
index 09c6b4e2d7..849bd4c7b6 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/support/AbstractTransactionStatus.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/support/AbstractTransactionStatus.eea
@@ -2,13 +2,13 @@ class org/springframework/transaction/support/AbstractTransactionStatus
 
 createSavepoint
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object; # @Inherited(org.springframework.transaction.SavepointManager)
 getSavepoint
  ()Ljava/lang/Object;
  ()L0java/lang/Object;
 getSavepointManager
  ()Lorg/springframework/transaction/SavepointManager;
- ()Lorg/springframework/transaction/SavepointManager;
+ ()L1org/springframework/transaction/SavepointManager;
 releaseSavepoint
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/support/DefaultTransactionDefinition.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/support/DefaultTransactionDefinition.eea
index 4c1acf7518..de3fa1b8f6 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/support/DefaultTransactionDefinition.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/support/DefaultTransactionDefinition.eea
@@ -21,7 +21,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getDefinitionDescription
  ()Ljava/lang/StringBuilder;
- ()Ljava/lang/StringBuilder;
+ ()L1java/lang/StringBuilder;
 getName
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(org.springframework.transaction.TransactionDefinition)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/support/DefaultTransactionStatus.eea b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/support/DefaultTransactionStatus.eea
index e67346bf5c..6d8ed7b3f8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/transaction/support/DefaultTransactionStatus.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/transaction/support/DefaultTransactionStatus.eea
@@ -5,7 +5,7 @@ class org/springframework/transaction/support/DefaultTransactionStatus
  (Ljava/lang/Object;ZZZZLjava/lang/Object;)V
 getSavepointManager
  ()Lorg/springframework/transaction/SavepointManager;
- ()Lorg/springframework/transaction/SavepointManager;
+ ()L1org/springframework/transaction/SavepointManager; # @Inherited(org.springframework.transaction.support.AbstractTransactionStatus)
 getSuspendedResources
  ()Ljava/lang/Object;
  ()L0java/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/ui/context/support/ResourceBundleThemeSource.eea b/libs/eea-spring-5/src/main/resources/org/springframework/ui/context/support/ResourceBundleThemeSource.eea
index 3031ae2c03..b5d8d307a8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/ui/context/support/ResourceBundleThemeSource.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/ui/context/support/ResourceBundleThemeSource.eea
@@ -6,7 +6,7 @@ logger
 
 createMessageSource
  (Ljava/lang/String;)Lorg/springframework/context/MessageSource;
- (Ljava/lang/String;)Lorg/springframework/context/MessageSource;
+ (Ljava/lang/String;)L1org/springframework/context/MessageSource;
 getParentThemeSource
  ()Lorg/springframework/ui/context/ThemeSource;
  ()L0org/springframework/ui/context/ThemeSource; # @Inherited(org.springframework.ui.context.HierarchicalThemeSource)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/AlternativeJdkIdGenerator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/AlternativeJdkIdGenerator.eea
index 62bc72b014..917b6a8c4d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/AlternativeJdkIdGenerator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/AlternativeJdkIdGenerator.eea
@@ -2,4 +2,4 @@ class org/springframework/util/AlternativeJdkIdGenerator
 
 generateId
  ()Ljava/util/UUID;
- ()Ljava/util/UUID;
+ ()L1java/util/UUID;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/AntPathMatcher.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/AntPathMatcher.eea
index 023d840b45..b5db81e14e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/AntPathMatcher.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/AntPathMatcher.eea
@@ -15,16 +15,16 @@ doMatch
  (Ljava/lang/String;Ljava/lang/String;ZLjava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)Z
 extractPathWithinPattern
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 extractUriTemplateVariables
  (Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/util/Map<Ljava/lang/String;Ljava/lang/String;>;
 getPatternComparator
  (Ljava/lang/String;)Ljava/util/Comparator<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/Comparator<Ljava/lang/String;>;
+ (Ljava/lang/String;)L1java/util/Comparator<Ljava/lang/String;>;
 getStringMatcher
  (Ljava/lang/String;)Lorg/springframework/util/AntPathMatcher$AntPathStringMatcher;
- (Ljava/lang/String;)Lorg/springframework/util/AntPathMatcher$AntPathStringMatcher;
+ (Ljava/lang/String;)L1org/springframework/util/AntPathMatcher$AntPathStringMatcher;
 isPattern
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/AutoPopulatingList$ElementFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/AutoPopulatingList$ElementFactory.eea
index a26b9eddd4..f176e508dc 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/AutoPopulatingList$ElementFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/AutoPopulatingList$ElementFactory.eea
@@ -4,4 +4,4 @@ class org/springframework/util/AutoPopulatingList$ElementFactory
 
 createElement
  (I)TE;
- (I)TE;
+ (I)T1E;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/Base64Utils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/Base64Utils.eea
index 7ec9af6941..b6c5771efa 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/Base64Utils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/Base64Utils.eea
@@ -17,10 +17,10 @@ encode
  ([B)[B
 encodeToString
  ([B)Ljava/lang/String;
- ([B)Ljava/lang/String;
+ ([B)L1java/lang/String;
 encodeToUrlSafeString
  ([B)Ljava/lang/String;
- ([B)Ljava/lang/String;
+ ([B)L1java/lang/String;
 encodeUrlSafe
  ([B)[B
  ([B)[B
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/ClassUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/ClassUtils.eea
index 43263c5d64..25d8d5f021 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/ClassUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/ClassUtils.eea
@@ -12,10 +12,10 @@ CLASS_FILE_SUFFIX
 
 addResourcePathToPackagePath
  (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;Ljava/lang/String;)L1java/lang/String;
 classNamesToString
  (Ljava/util/Collection<Ljava/lang/Class<*>;>;)Ljava/lang/String;
- (Ljava/util/Collection<Ljava/lang/Class<*>;>;)Ljava/lang/String;
+ (Ljava/util/Collection<Ljava/lang/Class<*>;>;)L1java/lang/String;
 classNamesToString
  ([Ljava/lang/Class<*>;)Ljava/lang/String;
  ([Ljava/lang/Class<*>;)Ljava/lang/String;
@@ -30,7 +30,7 @@ convertResourcePathToClassName
  (Ljava/lang/String;)Ljava/lang/String;
 createCompositeInterface
  ([Ljava/lang/Class<*>;Ljava/lang/ClassLoader;)Ljava/lang/Class<*>;
- ([Ljava/lang/Class<*>;Ljava/lang/ClassLoader;)Ljava/lang/Class<*>;
+ ([Ljava/lang/Class<*>;Ljava/lang/ClassLoader;)L1java/lang/Class<*>;
 determineCommonAncestor
  (Ljava/lang/Class<*>;Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
  (Ljava/lang/Class<*>;Ljava/lang/Class<*>;)L0java/lang/Class<*>;
@@ -57,7 +57,7 @@ getAllInterfacesForClassAsSet
  (Ljava/lang/Class<*>;Ljava/lang/ClassLoader;)Ljava/util/Set<Ljava/lang/Class<*>;>;
 getClassFileName
  (Ljava/lang/Class<*>;)Ljava/lang/String;
- (Ljava/lang/Class<*>;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;)L1java/lang/String;
 getConstructorIfAvailable
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;[Ljava/lang/Class<*>;)Ljava/lang/reflect/Constructor<TT;>;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;[Ljava/lang/Class<*>;)L0java/lang/reflect/Constructor<TT;>;
@@ -90,13 +90,13 @@ getPackageName
  (Ljava/lang/Class<*>;)Ljava/lang/String;
 getPackageName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 getQualifiedMethodName
  (Ljava/lang/reflect/Method;)Ljava/lang/String;
  (Ljava/lang/reflect/Method;)Ljava/lang/String;
 getQualifiedMethodName
  (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Ljava/lang/String;
- (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Ljava/lang/String;
+ (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)L1java/lang/String;
 getQualifiedName
  (Ljava/lang/Class<*>;)Ljava/lang/String;
  (Ljava/lang/Class<*>;)Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/CollectionUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/CollectionUtils.eea
index d07df924d9..c104eef581 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/CollectionUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/CollectionUtils.eea
@@ -56,10 +56,10 @@ mergePropertiesIntoMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Properties;Ljava/util/Map<TK;TV;>;)V
 newHashMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Ljava/util/HashMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Ljava/util/HashMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)L1java/util/HashMap<TK;TV;>;
 newLinkedHashMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Ljava/util/LinkedHashMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Ljava/util/LinkedHashMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)L1java/util/LinkedHashMap<TK;TV;>;
 toArray
  <A:Ljava/lang/Object;E:TA;>(Ljava/util/Enumeration<TE;>;[TA;)[TA;
  <A:Ljava/lang/Object;E:TA;>(Ljava/util/Enumeration<TE;>;[TA;)[TA;
@@ -68,7 +68,7 @@ toIterator
  <E:Ljava/lang/Object;>(Ljava/util/Enumeration<TE;>;)Ljava/util/Iterator<TE;>;
 toMultiValueMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;Ljava/util/List<TV;>;>;)Lorg/springframework/util/MultiValueMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;Ljava/util/List<TV;>;>;)Lorg/springframework/util/MultiValueMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;Ljava/util/List<TV;>;>;)L1org/springframework/util/MultiValueMap<TK;TV;>;
 unmodifiableMultiValueMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/springframework/util/MultiValueMap<+TK;+TV;>;)Lorg/springframework/util/MultiValueMap<TK;TV;>;
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/springframework/util/MultiValueMap<+TK;+TV;>;)Lorg/springframework/util/MultiValueMap<TK;TV;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/ConcurrentReferenceHashMap$ReferenceManager.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/ConcurrentReferenceHashMap$ReferenceManager.eea
index e0fc21b911..8721efcaac 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/ConcurrentReferenceHashMap$ReferenceManager.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/ConcurrentReferenceHashMap$ReferenceManager.eea
@@ -5,7 +5,7 @@ class org/springframework/util/ConcurrentReferenceHashMap$ReferenceManager
  (Lorg/springframework/util/ConcurrentReferenceHashMap;)V
 createReference
  (Lorg/springframework/util/ConcurrentReferenceHashMap$Entry<TK;TV;>;ILorg/springframework/util/ConcurrentReferenceHashMap$Reference<TK;TV;>;)Lorg/springframework/util/ConcurrentReferenceHashMap$Reference<TK;TV;>;
- (Lorg/springframework/util/ConcurrentReferenceHashMap$Entry<TK;TV;>;ILorg/springframework/util/ConcurrentReferenceHashMap$Reference<TK;TV;>;)Lorg/springframework/util/ConcurrentReferenceHashMap$Reference<TK;TV;>;
+ (Lorg/springframework/util/ConcurrentReferenceHashMap$Entry<TK;TV;>;ILorg/springframework/util/ConcurrentReferenceHashMap$Reference<TK;TV;>;)L1org/springframework/util/ConcurrentReferenceHashMap$Reference<TK;TV;>;
 pollForPurge
  ()Lorg/springframework/util/ConcurrentReferenceHashMap$Reference<TK;TV;>;
  ()L0org/springframework/util/ConcurrentReferenceHashMap$Reference<TK;TV;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/ConcurrentReferenceHashMap.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/ConcurrentReferenceHashMap.eea
index 8a67ce9054..ce65fe7091 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/ConcurrentReferenceHashMap.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/ConcurrentReferenceHashMap.eea
@@ -20,7 +20,7 @@ containsKey
  (L0java/lang/Object;)Z # @Inherited(java.util.AbstractMap)
 createReferenceManager
  ()Lorg/springframework/util/ConcurrentReferenceHashMap<TK;TV;>.ReferenceManager;
- ()Lorg/springframework/util/ConcurrentReferenceHashMap<TK;TV;>.ReferenceManager;
+ ()L1org/springframework/util/ConcurrentReferenceHashMap<TK;TV;>.ReferenceManager;
 entrySet
  ()Ljava/util/Set<Ljava/util/Map$Entry<TK;TV;>;>;
  ()L1java/util/Set<L1java/util/Map$Entry<TK;TV;>;>; # @Inherited(java.util.AbstractMap)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/CustomizableThreadCreator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/CustomizableThreadCreator.eea
index 35d28b50ba..e8ca4b24ee 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/CustomizableThreadCreator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/CustomizableThreadCreator.eea
@@ -5,10 +5,10 @@ class org/springframework/util/CustomizableThreadCreator
  (Ljava/lang/String;)V
 createThread
  (Ljava/lang/Runnable;)Ljava/lang/Thread;
- (Ljava/lang/Runnable;)Ljava/lang/Thread;
+ (Ljava/lang/Runnable;)L1java/lang/Thread;
 getDefaultThreadNamePrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getThreadGroup
  ()Ljava/lang/ThreadGroup;
  ()L0java/lang/ThreadGroup;
@@ -17,7 +17,7 @@ getThreadNamePrefix
  ()Ljava/lang/String;
 nextThreadName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 setThreadGroup
  (Ljava/lang/ThreadGroup;)V
  (Ljava/lang/ThreadGroup;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/FastByteArrayOutputStream.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/FastByteArrayOutputStream.eea
index 11480127bc..4b7e92952c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/FastByteArrayOutputStream.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/FastByteArrayOutputStream.eea
@@ -2,7 +2,7 @@ class org/springframework/util/FastByteArrayOutputStream
 
 getInputStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
 toByteArray
  ()[B
  ()[B
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/FileCopyUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/FileCopyUtils.eea
index 8d03724b10..55f25fa4e0 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/FileCopyUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/FileCopyUtils.eea
@@ -26,4 +26,4 @@ copyToByteArray
  (Ljava/io/InputStream;)[B
 copyToString
  (Ljava/io/Reader;)Ljava/lang/String;
- (Ljava/io/Reader;)Ljava/lang/String;
+ (Ljava/io/Reader;)L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/LinkedCaseInsensitiveMap.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/LinkedCaseInsensitiveMap.eea
index d64faf7df1..36015ca49f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/LinkedCaseInsensitiveMap.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/LinkedCaseInsensitiveMap.eea
@@ -14,7 +14,7 @@ super java/util/Map
  (Ljava/util/Locale;)V
 clone
  ()Lorg/springframework/util/LinkedCaseInsensitiveMap<TV;>;
- ()Lorg/springframework/util/LinkedCaseInsensitiveMap<TV;>;
+ ()L1org/springframework/util/LinkedCaseInsensitiveMap<TV;>;
 computeIfAbsent
  (Ljava/lang/String;Ljava/util/function/Function<-Ljava/lang/String;+TV;>;)TV;
  (Ljava/lang/String;Ljava/util/function/Function<-Ljava/lang/String;+TV;>;)T0V;
@@ -29,7 +29,7 @@ convertKey
  (Ljava/lang/String;)Ljava/lang/String;
 entrySet
  ()Ljava/util/Set<Ljava/util/Map$Entry<Ljava/lang/String;TV;>;>;
- ()Ljava/util/Set<Ljava/util/Map$Entry<Ljava/lang/String;TV;>;>;
+ ()L1java/util/Set<Ljava/util/Map$Entry<Ljava/lang/String;TV;>;>;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -44,7 +44,7 @@ getOrDefault
  (Ljava/lang/Object;TV;)T0V;
 keySet
  ()Ljava/util/Set<Ljava/lang/String;>;
- ()Ljava/util/Set<Ljava/lang/String;>;
+ ()L1java/util/Set<Ljava/lang/String;>;
 put
  (Ljava/lang/String;TV;)TV;
  (Ljava/lang/String;TV;)T0V;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/LinkedMultiValueMap.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/LinkedMultiValueMap.eea
index 175a3fd50a..27933a84d8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/LinkedMultiValueMap.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/LinkedMultiValueMap.eea
@@ -11,7 +11,7 @@ super org/springframework/util/MultiValueMapAdapter
  (Ljava/util/Map<TK;Ljava/util/List<TV;>;>;)V
 clone
  ()Lorg/springframework/util/LinkedMultiValueMap<TK;TV;>;
- ()Lorg/springframework/util/LinkedMultiValueMap<TK;TV;>;
+ ()L1org/springframework/util/LinkedMultiValueMap<TK;TV;>;
 deepCopy
  ()Lorg/springframework/util/LinkedMultiValueMap<TK;TV;>;
- ()Lorg/springframework/util/LinkedMultiValueMap<TK;TV;>;
+ ()L1org/springframework/util/LinkedMultiValueMap<TK;TV;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/MimeTypeUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/MimeTypeUtils.eea
index 000f54c042..dc814c7b3d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/MimeTypeUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/MimeTypeUtils.eea
@@ -72,10 +72,10 @@ TEXT_XML_VALUE
 
 generateMultipartBoundary
  ()[B
- ()[B
+ ()[1B
 generateMultipartBoundaryString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 parseMimeType
  (Ljava/lang/String;)Lorg/springframework/util/MimeType;
  (Ljava/lang/String;)Lorg/springframework/util/MimeType;
@@ -87,7 +87,7 @@ sortBySpecificity
  (Ljava/util/List<Lorg/springframework/util/MimeType;>;)V
 toString
  (Ljava/util/Collection<+Lorg/springframework/util/MimeType;>;)Ljava/lang/String;
- (Ljava/util/Collection<+Lorg/springframework/util/MimeType;>;)Ljava/lang/String;
+ (Ljava/util/Collection<+Lorg/springframework/util/MimeType;>;)L1java/lang/String;
 tokenize
  (Ljava/lang/String;)Ljava/util/List<Ljava/lang/String;>;
  (Ljava/lang/String;)Ljava/util/List<Ljava/lang/String;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/ObjectUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/ObjectUtils.eea
index abde48058b..dfb377ce50 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/ObjectUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/ObjectUtils.eea
@@ -23,7 +23,7 @@ getIdentityHexString
  (Ljava/lang/Object;)Ljava/lang/String;
 identityToString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
 isArray
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
@@ -41,7 +41,7 @@ isEmpty
  ([Ljava/lang/Object;)Z
 nullSafeClassName
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
 nullSafeConciseToString
  (Ljava/lang/Object;)Ljava/lang/String;
  (Ljava/lang/Object;)Ljava/lang/String;
@@ -83,31 +83,31 @@ nullSafeToString
  (Ljava/lang/Object;)Ljava/lang/String;
 nullSafeToString
  ([B)Ljava/lang/String;
- ([B)Ljava/lang/String;
+ ([B)L1java/lang/String;
 nullSafeToString
  ([C)Ljava/lang/String;
- ([C)Ljava/lang/String;
+ ([C)L1java/lang/String;
 nullSafeToString
  ([D)Ljava/lang/String;
- ([D)Ljava/lang/String;
+ ([D)L1java/lang/String;
 nullSafeToString
  ([F)Ljava/lang/String;
- ([F)Ljava/lang/String;
+ ([F)L1java/lang/String;
 nullSafeToString
  ([I)Ljava/lang/String;
- ([I)Ljava/lang/String;
+ ([I)L1java/lang/String;
 nullSafeToString
  ([J)Ljava/lang/String;
- ([J)Ljava/lang/String;
+ ([J)L1java/lang/String;
 nullSafeToString
  ([Ljava/lang/Object;)Ljava/lang/String;
- ([Ljava/lang/Object;)Ljava/lang/String;
+ ([Ljava/lang/Object;)L1java/lang/String;
 nullSafeToString
  ([S)Ljava/lang/String;
- ([S)Ljava/lang/String;
+ ([S)L1java/lang/String;
 nullSafeToString
  ([Z)Ljava/lang/String;
- ([Z)Ljava/lang/String;
+ ([Z)L1java/lang/String;
 toObjectArray
  (Ljava/lang/Object;)[Ljava/lang/Object;
  (Ljava/lang/Object;)[Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/ResourceUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/ResourceUtils.eea
index 024ecae505..4056a74a92 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/ResourceUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/ResourceUtils.eea
@@ -60,13 +60,13 @@ getFile
  (Ljava/net/URI;)Ljava/io/File;
 getFile
  (Ljava/net/URI;Ljava/lang/String;)Ljava/io/File;
- (Ljava/net/URI;Ljava/lang/String;)Ljava/io/File;
+ (Ljava/net/URI;Ljava/lang/String;)L1java/io/File;
 getFile
  (Ljava/net/URL;)Ljava/io/File;
  (Ljava/net/URL;)Ljava/io/File;
 getFile
  (Ljava/net/URL;Ljava/lang/String;)Ljava/io/File;
- (Ljava/net/URL;Ljava/lang/String;)Ljava/io/File;
+ (Ljava/net/URL;Ljava/lang/String;)L1java/io/File;
 getURL
  (Ljava/lang/String;)Ljava/net/URL;
  (Ljava/lang/String;)Ljava/net/URL;
@@ -84,7 +84,7 @@ isUrl
  (Ljava/lang/String;)Z
 toURI
  (Ljava/lang/String;)Ljava/net/URI;
- (Ljava/lang/String;)Ljava/net/URI;
+ (Ljava/lang/String;)L1java/net/URI;
 toURI
  (Ljava/net/URL;)Ljava/net/URI;
  (Ljava/net/URL;)Ljava/net/URI;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/SimpleRouteMatcher.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/SimpleRouteMatcher.eea
index 88b1ed2230..c3a7a0bf7a 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/SimpleRouteMatcher.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/SimpleRouteMatcher.eea
@@ -23,4 +23,4 @@ matchAndExtract
  (Ljava/lang/String;Lorg/springframework/util/RouteMatcher$Route;)L0java/util/Map<Ljava/lang/String;Ljava/lang/String;>; # @Inherited(org.springframework.util.RouteMatcher)
 parseRoute
  (Ljava/lang/String;)Lorg/springframework/util/RouteMatcher$Route;
- (Ljava/lang/String;)Lorg/springframework/util/RouteMatcher$Route;
+ (Ljava/lang/String;)L1org/springframework/util/RouteMatcher$Route;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/StopWatch.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/StopWatch.eea
index 2534191829..a2475c6e5b 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/StopWatch.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/StopWatch.eea
@@ -20,10 +20,10 @@ getTaskInfo
  ()[Lorg/springframework/util/StopWatch$TaskInfo;
 prettyPrint
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 shortSummary
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 start
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/StreamUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/StreamUtils.eea
index 7812235c12..eccad53d93 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/StreamUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/StreamUtils.eea
@@ -20,16 +20,16 @@ copyToString
  (Ljava/io/ByteArrayOutputStream;Ljava/nio/charset/Charset;)Ljava/lang/String;
 copyToString
  (Ljava/io/InputStream;Ljava/nio/charset/Charset;)Ljava/lang/String;
- (Ljava/io/InputStream;Ljava/nio/charset/Charset;)Ljava/lang/String;
+ (Ljava/io/InputStream;Ljava/nio/charset/Charset;)L1java/lang/String;
 drain
  (Ljava/io/InputStream;)I
  (Ljava/io/InputStream;)I
 emptyInput
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
 nonClosing
  (Ljava/io/InputStream;)Ljava/io/InputStream;
- (Ljava/io/InputStream;)Ljava/io/InputStream;
+ (Ljava/io/InputStream;)L1java/io/InputStream;
 nonClosing
  (Ljava/io/OutputStream;)Ljava/io/OutputStream;
- (Ljava/io/OutputStream;)Ljava/io/OutputStream;
+ (Ljava/io/OutputStream;)L1java/io/OutputStream;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/StringUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/StringUtils.eea
index 4d966a3c2d..c8ffecc4d8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/StringUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/StringUtils.eea
@@ -26,10 +26,10 @@ collectionToDelimitedString
  (Ljava/util/Collection<*>;Ljava/lang/String;)Ljava/lang/String;
 collectionToDelimitedString
  (Ljava/util/Collection<*>;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/util/Collection<*>;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/util/Collection<*>;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 commaDelimitedListToSet
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
+ (Ljava/lang/String;)L1java/util/Set<Ljava/lang/String;>;
 commaDelimitedListToStringArray
  (Ljava/lang/String;)[Ljava/lang/String;
  (Ljava/lang/String;)[Ljava/lang/String;
@@ -134,7 +134,7 @@ substringMatch
  (Ljava/lang/CharSequence;ILjava/lang/CharSequence;)Z
 toLanguageTag
  (Ljava/util/Locale;)Ljava/lang/String;
- (Ljava/util/Locale;)Ljava/lang/String;
+ (Ljava/util/Locale;)L1java/lang/String;
 toStringArray
  (Ljava/util/Collection<Ljava/lang/String;>;)[Ljava/lang/String;
  (Ljava/util/Collection<Ljava/lang/String;>;)[Ljava/lang/String;
@@ -176,7 +176,7 @@ truncate
  (Ljava/lang/CharSequence;)Ljava/lang/String;
 truncate
  (Ljava/lang/CharSequence;I)Ljava/lang/String;
- (Ljava/lang/CharSequence;I)Ljava/lang/String;
+ (Ljava/lang/CharSequence;I)L1java/lang/String;
 uncapitalize
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/backoff/ExponentialBackOff.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/backoff/ExponentialBackOff.eea
index cbabfbe6a8..87c7e24dd8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/backoff/ExponentialBackOff.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/backoff/ExponentialBackOff.eea
@@ -2,4 +2,4 @@ class org/springframework/util/backoff/ExponentialBackOff
 
 start
  ()Lorg/springframework/util/backoff/BackOffExecution;
- ()Lorg/springframework/util/backoff/BackOffExecution;
+ ()L1org/springframework/util/backoff/BackOffExecution;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/backoff/FixedBackOff.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/backoff/FixedBackOff.eea
index 9158c80e0a..b18025187e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/backoff/FixedBackOff.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/backoff/FixedBackOff.eea
@@ -2,4 +2,4 @@ class org/springframework/util/backoff/FixedBackOff
 
 start
  ()Lorg/springframework/util/backoff/BackOffExecution;
- ()Lorg/springframework/util/backoff/BackOffExecution;
+ ()L1org/springframework/util/backoff/BackOffExecution;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/concurrent/CompletableToListenableFutureAdapter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/concurrent/CompletableToListenableFutureAdapter.eea
index 41db082e3f..3bc7a338d1 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/concurrent/CompletableToListenableFutureAdapter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/concurrent/CompletableToListenableFutureAdapter.eea
@@ -20,7 +20,7 @@ addCallback
  (Lorg/springframework/util/concurrent/SuccessCallback<-TT;>;Lorg/springframework/util/concurrent/FailureCallback;)V
 completable
  ()Ljava/util/concurrent/CompletableFuture<TT;>;
- ()Ljava/util/concurrent/CompletableFuture<TT;>;
+ ()L1java/util/concurrent/CompletableFuture<TT;>; # @Inherited(org.springframework.util.concurrent.ListenableFuture)
 get
  ()TT;
  ()TT;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/concurrent/ListenableFuture.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/concurrent/ListenableFuture.eea
index 937f591c28..6bcccbb1b0 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/concurrent/ListenableFuture.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/concurrent/ListenableFuture.eea
@@ -14,4 +14,4 @@ addCallback
  (Lorg/springframework/util/concurrent/SuccessCallback<-TT;>;Lorg/springframework/util/concurrent/FailureCallback;)V
 completable
  ()Ljava/util/concurrent/CompletableFuture<TT;>;
- ()Ljava/util/concurrent/CompletableFuture<TT;>;
+ ()L1java/util/concurrent/CompletableFuture<TT;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/concurrent/ListenableFutureTask.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/concurrent/ListenableFutureTask.eea
index 7425086a73..b895dd0b8c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/concurrent/ListenableFutureTask.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/concurrent/ListenableFutureTask.eea
@@ -23,4 +23,4 @@ addCallback
  (Lorg/springframework/util/concurrent/SuccessCallback<-TT;>;Lorg/springframework/util/concurrent/FailureCallback;)V
 completable
  ()Ljava/util/concurrent/CompletableFuture<TT;>;
- ()Ljava/util/concurrent/CompletableFuture<TT;>;
+ ()L1java/util/concurrent/CompletableFuture<TT;>; # @Inherited(org.springframework.util.concurrent.ListenableFuture)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/concurrent/SettableListenableFuture.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/concurrent/SettableListenableFuture.eea
index e63bd98208..ddb9b32a6c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/concurrent/SettableListenableFuture.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/concurrent/SettableListenableFuture.eea
@@ -14,7 +14,7 @@ addCallback
  (Lorg/springframework/util/concurrent/SuccessCallback<-TT;>;Lorg/springframework/util/concurrent/FailureCallback;)V
 completable
  ()Ljava/util/concurrent/CompletableFuture<TT;>;
- ()Ljava/util/concurrent/CompletableFuture<TT;>;
+ ()L1java/util/concurrent/CompletableFuture<TT;>; # @Inherited(org.springframework.util.concurrent.ListenableFuture)
 get
  ()TT;
  ()T0T;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/function/SingletonSupplier.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/function/SingletonSupplier.eea
index 69c844727a..b60b7c5acb 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/function/SingletonSupplier.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/function/SingletonSupplier.eea
@@ -8,10 +8,10 @@ super java/util/function/Supplier
 
 of
  <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;)Lorg/springframework/util/function/SingletonSupplier<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;)Lorg/springframework/util/function/SingletonSupplier<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;)L1org/springframework/util/function/SingletonSupplier<TT;>;
 of
  <T:Ljava/lang/Object;>(TT;)Lorg/springframework/util/function/SingletonSupplier<TT;>;
- <T:Ljava/lang/Object;>(TT;)Lorg/springframework/util/function/SingletonSupplier<TT;>;
+ <T:Ljava/lang/Object;>(TT;)L1org/springframework/util/function/SingletonSupplier<TT;>;
 ofNullable
  <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;)Lorg/springframework/util/function/SingletonSupplier<TT;>;
  <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;)L0org/springframework/util/function/SingletonSupplier<TT;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/unit/DataSize.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/unit/DataSize.eea
index 8fac1f95d0..0ca7d2b6ef 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/unit/DataSize.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/unit/DataSize.eea
@@ -6,22 +6,22 @@ super java/lang/Comparable
 
 of
  (JLorg/springframework/util/unit/DataUnit;)Lorg/springframework/util/unit/DataSize;
- (JLorg/springframework/util/unit/DataUnit;)Lorg/springframework/util/unit/DataSize;
+ (JLorg/springframework/util/unit/DataUnit;)L1org/springframework/util/unit/DataSize;
 ofBytes
  (J)Lorg/springframework/util/unit/DataSize;
- (J)Lorg/springframework/util/unit/DataSize;
+ (J)L1org/springframework/util/unit/DataSize;
 ofGigabytes
  (J)Lorg/springframework/util/unit/DataSize;
- (J)Lorg/springframework/util/unit/DataSize;
+ (J)L1org/springframework/util/unit/DataSize;
 ofKilobytes
  (J)Lorg/springframework/util/unit/DataSize;
- (J)Lorg/springframework/util/unit/DataSize;
+ (J)L1org/springframework/util/unit/DataSize;
 ofMegabytes
  (J)Lorg/springframework/util/unit/DataSize;
- (J)Lorg/springframework/util/unit/DataSize;
+ (J)L1org/springframework/util/unit/DataSize;
 ofTerabytes
  (J)Lorg/springframework/util/unit/DataSize;
- (J)Lorg/springframework/util/unit/DataSize;
+ (J)L1org/springframework/util/unit/DataSize;
 parse
  (Ljava/lang/CharSequence;)Lorg/springframework/util/unit/DataSize;
  (Ljava/lang/CharSequence;)Lorg/springframework/util/unit/DataSize;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/xml/DomUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/xml/DomUtils.eea
index 7fc4236fc6..0528aa611e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/xml/DomUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/xml/DomUtils.eea
@@ -2,7 +2,7 @@ class org/springframework/util/xml/DomUtils
 
 createContentHandler
  (Lorg/w3c/dom/Node;)Lorg/xml/sax/ContentHandler;
- (Lorg/w3c/dom/Node;)Lorg/xml/sax/ContentHandler;
+ (Lorg/w3c/dom/Node;)L1org/xml/sax/ContentHandler;
 getChildElementByTagName
  (Lorg/w3c/dom/Element;Ljava/lang/String;)Lorg/w3c/dom/Element;
  (Lorg/w3c/dom/Element;Ljava/lang/String;)L0org/w3c/dom/Element;
@@ -11,16 +11,16 @@ getChildElementValueByTagName
  (Lorg/w3c/dom/Element;Ljava/lang/String;)L0java/lang/String;
 getChildElements
  (Lorg/w3c/dom/Element;)Ljava/util/List<Lorg/w3c/dom/Element;>;
- (Lorg/w3c/dom/Element;)Ljava/util/List<Lorg/w3c/dom/Element;>;
+ (Lorg/w3c/dom/Element;)L1java/util/List<Lorg/w3c/dom/Element;>;
 getChildElementsByTagName
  (Lorg/w3c/dom/Element;Ljava/lang/String;)Ljava/util/List<Lorg/w3c/dom/Element;>;
  (Lorg/w3c/dom/Element;Ljava/lang/String;)Ljava/util/List<Lorg/w3c/dom/Element;>;
 getChildElementsByTagName
  (Lorg/w3c/dom/Element;[Ljava/lang/String;)Ljava/util/List<Lorg/w3c/dom/Element;>;
- (Lorg/w3c/dom/Element;[Ljava/lang/String;)Ljava/util/List<Lorg/w3c/dom/Element;>;
+ (Lorg/w3c/dom/Element;[Ljava/lang/String;)L1java/util/List<Lorg/w3c/dom/Element;>;
 getTextValue
  (Lorg/w3c/dom/Element;)Ljava/lang/String;
- (Lorg/w3c/dom/Element;)Ljava/lang/String;
+ (Lorg/w3c/dom/Element;)L1java/lang/String;
 nodeNameEquals
  (Lorg/w3c/dom/Node;Ljava/lang/String;)Z
  (Lorg/w3c/dom/Node;Ljava/lang/String;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/util/xml/StaxUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/util/xml/StaxUtils.eea
index 074cd67b1c..549a513524 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/util/xml/StaxUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/util/xml/StaxUtils.eea
@@ -2,58 +2,58 @@ class org/springframework/util/xml/StaxUtils
 
 createContentHandler
  (Ljavax/xml/stream/XMLEventWriter;)Lorg/xml/sax/ContentHandler;
- (Ljavax/xml/stream/XMLEventWriter;)Lorg/xml/sax/ContentHandler;
+ (Ljavax/xml/stream/XMLEventWriter;)L1org/xml/sax/ContentHandler;
 createContentHandler
  (Ljavax/xml/stream/XMLStreamWriter;)Lorg/xml/sax/ContentHandler;
- (Ljavax/xml/stream/XMLStreamWriter;)Lorg/xml/sax/ContentHandler;
+ (Ljavax/xml/stream/XMLStreamWriter;)L1org/xml/sax/ContentHandler;
 createCustomStaxResult
  (Ljavax/xml/stream/XMLEventWriter;)Ljavax/xml/transform/Result;
- (Ljavax/xml/stream/XMLEventWriter;)Ljavax/xml/transform/Result;
+ (Ljavax/xml/stream/XMLEventWriter;)L1javax/xml/transform/Result;
 createCustomStaxResult
  (Ljavax/xml/stream/XMLStreamWriter;)Ljavax/xml/transform/Result;
- (Ljavax/xml/stream/XMLStreamWriter;)Ljavax/xml/transform/Result;
+ (Ljavax/xml/stream/XMLStreamWriter;)L1javax/xml/transform/Result;
 createCustomStaxSource
  (Ljavax/xml/stream/XMLEventReader;)Ljavax/xml/transform/Source;
- (Ljavax/xml/stream/XMLEventReader;)Ljavax/xml/transform/Source;
+ (Ljavax/xml/stream/XMLEventReader;)L1javax/xml/transform/Source;
 createCustomStaxSource
  (Ljavax/xml/stream/XMLStreamReader;)Ljavax/xml/transform/Source;
- (Ljavax/xml/stream/XMLStreamReader;)Ljavax/xml/transform/Source;
+ (Ljavax/xml/stream/XMLStreamReader;)L1javax/xml/transform/Source;
 createDefensiveInputFactory
  ()Ljavax/xml/stream/XMLInputFactory;
- ()Ljavax/xml/stream/XMLInputFactory;
+ ()L1javax/xml/stream/XMLInputFactory;
 createDefensiveInputFactory
  <T:Ljavax/xml/stream/XMLInputFactory;>(Ljava/util/function/Supplier<TT;>;)TT;
- <T:Ljavax/xml/stream/XMLInputFactory;>(Ljava/util/function/Supplier<TT;>;)TT;
+ <T:Ljavax/xml/stream/XMLInputFactory;>(Ljava/util/function/Supplier<TT;>;)T1T;
 createEventStreamReader
  (Ljavax/xml/stream/XMLEventReader;)Ljavax/xml/stream/XMLStreamReader;
- (Ljavax/xml/stream/XMLEventReader;)Ljavax/xml/stream/XMLStreamReader;
+ (Ljavax/xml/stream/XMLEventReader;)L1javax/xml/stream/XMLStreamReader;
 createEventStreamWriter
  (Ljavax/xml/stream/XMLEventWriter;)Ljavax/xml/stream/XMLStreamWriter;
- (Ljavax/xml/stream/XMLEventWriter;)Ljavax/xml/stream/XMLStreamWriter;
+ (Ljavax/xml/stream/XMLEventWriter;)L1javax/xml/stream/XMLStreamWriter;
 createEventStreamWriter
  (Ljavax/xml/stream/XMLEventWriter;Ljavax/xml/stream/XMLEventFactory;)Ljavax/xml/stream/XMLStreamWriter;
- (Ljavax/xml/stream/XMLEventWriter;Ljavax/xml/stream/XMLEventFactory;)Ljavax/xml/stream/XMLStreamWriter;
+ (Ljavax/xml/stream/XMLEventWriter;Ljavax/xml/stream/XMLEventFactory;)L1javax/xml/stream/XMLStreamWriter;
 createStaxResult
  (Ljavax/xml/stream/XMLEventWriter;)Ljavax/xml/transform/Result;
- (Ljavax/xml/stream/XMLEventWriter;)Ljavax/xml/transform/Result;
+ (Ljavax/xml/stream/XMLEventWriter;)L1javax/xml/transform/Result;
 createStaxResult
  (Ljavax/xml/stream/XMLStreamWriter;)Ljavax/xml/transform/Result;
- (Ljavax/xml/stream/XMLStreamWriter;)Ljavax/xml/transform/Result;
+ (Ljavax/xml/stream/XMLStreamWriter;)L1javax/xml/transform/Result;
 createStaxSource
  (Ljavax/xml/stream/XMLEventReader;)Ljavax/xml/transform/Source;
- (Ljavax/xml/stream/XMLEventReader;)Ljavax/xml/transform/Source;
+ (Ljavax/xml/stream/XMLEventReader;)L1javax/xml/transform/Source;
 createStaxSource
  (Ljavax/xml/stream/XMLStreamReader;)Ljavax/xml/transform/Source;
- (Ljavax/xml/stream/XMLStreamReader;)Ljavax/xml/transform/Source;
+ (Ljavax/xml/stream/XMLStreamReader;)L1javax/xml/transform/Source;
 createXMLEventReader
  (Ljava/util/List<Ljavax/xml/stream/events/XMLEvent;>;)Ljavax/xml/stream/XMLEventReader;
- (Ljava/util/List<Ljavax/xml/stream/events/XMLEvent;>;)Ljavax/xml/stream/XMLEventReader;
+ (Ljava/util/List<Ljavax/xml/stream/events/XMLEvent;>;)L1javax/xml/stream/XMLEventReader;
 createXMLReader
  (Ljavax/xml/stream/XMLEventReader;)Lorg/xml/sax/XMLReader;
- (Ljavax/xml/stream/XMLEventReader;)Lorg/xml/sax/XMLReader;
+ (Ljavax/xml/stream/XMLEventReader;)L1org/xml/sax/XMLReader;
 createXMLReader
  (Ljavax/xml/stream/XMLStreamReader;)Lorg/xml/sax/XMLReader;
- (Ljavax/xml/stream/XMLStreamReader;)Lorg/xml/sax/XMLReader;
+ (Ljavax/xml/stream/XMLStreamReader;)L1org/xml/sax/XMLReader;
 getXMLEventReader
  (Ljavax/xml/transform/Source;)Ljavax/xml/stream/XMLEventReader;
  (Ljavax/xml/transform/Source;)L0javax/xml/stream/XMLEventReader;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/validation/AbstractBindingResult.eea b/libs/eea-spring-5/src/main/resources/org/springframework/validation/AbstractBindingResult.eea
index 4fa85dce41..55a4893526 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/validation/AbstractBindingResult.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/validation/AbstractBindingResult.eea
@@ -65,7 +65,7 @@ getRawFieldValue
  (Ljava/lang/String;)L0java/lang/Object; # @Inherited(org.springframework.validation.BindingResult)
 getSuppressedFields
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String; # @Inherited(org.springframework.validation.BindingResult)
 getTarget
  ()Ljava/lang/Object;
  ()L0java/lang/Object; # @Inherited(org.springframework.validation.BindingResult)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/validation/BeanPropertyBindingResult.eea b/libs/eea-spring-5/src/main/resources/org/springframework/validation/BeanPropertyBindingResult.eea
index 88167136e2..0f5bf48793 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/validation/BeanPropertyBindingResult.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/validation/BeanPropertyBindingResult.eea
@@ -8,7 +8,7 @@ class org/springframework/validation/BeanPropertyBindingResult
  (Ljava/lang/Object;Ljava/lang/String;ZI)V
 createBeanWrapper
  ()Lorg/springframework/beans/BeanWrapper;
- ()Lorg/springframework/beans/BeanWrapper;
+ ()L1org/springframework/beans/BeanWrapper;
 getPropertyAccessor
  ()Lorg/springframework/beans/ConfigurablePropertyAccessor;
  ()Lorg/springframework/beans/ConfigurablePropertyAccessor;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/validation/BindException.eea b/libs/eea-spring-5/src/main/resources/org/springframework/validation/BindException.eea
index f91a00c691..c5a1663855 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/validation/BindException.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/validation/BindException.eea
@@ -71,7 +71,7 @@ getRawFieldValue
  (Ljava/lang/String;)L0java/lang/Object; # @Inherited(org.springframework.validation.BindingResult)
 getSuppressedFields
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String; # @Inherited(org.springframework.validation.BindingResult)
 getTarget
  ()Ljava/lang/Object;
  ()L0java/lang/Object; # @Inherited(org.springframework.validation.BindingResult)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/validation/BindingResult.eea b/libs/eea-spring-5/src/main/resources/org/springframework/validation/BindingResult.eea
index 0e9cb6c238..6e87285002 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/validation/BindingResult.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/validation/BindingResult.eea
@@ -21,7 +21,7 @@ getRawFieldValue
  (Ljava/lang/String;)L0java/lang/Object;
 getSuppressedFields
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 getTarget
  ()Ljava/lang/Object;
  ()L0java/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/validation/DataBinder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/validation/DataBinder.eea
index de845474fa..667556c34d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/validation/DataBinder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/validation/DataBinder.eea
@@ -54,10 +54,10 @@ convertIfNecessary
  <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Lorg/springframework/core/convert/TypeDescriptor;)T0T; # @Inherited(org.springframework.beans.TypeConverter)
 createBeanPropertyBindingResult
  ()Lorg/springframework/validation/AbstractPropertyBindingResult;
- ()Lorg/springframework/validation/AbstractPropertyBindingResult;
+ ()L1org/springframework/validation/AbstractPropertyBindingResult;
 createDirectFieldBindingResult
  ()Lorg/springframework/validation/AbstractPropertyBindingResult;
- ()Lorg/springframework/validation/AbstractPropertyBindingResult;
+ ()L1org/springframework/validation/AbstractPropertyBindingResult;
 doBind
  (Lorg/springframework/beans/MutablePropertyValues;)V
  (Lorg/springframework/beans/MutablePropertyValues;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/validation/DefaultMessageCodesResolver$Format.eea b/libs/eea-spring-5/src/main/resources/org/springframework/validation/DefaultMessageCodesResolver$Format.eea
index 79acd3ccc4..558fe77240 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/validation/DefaultMessageCodesResolver$Format.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/validation/DefaultMessageCodesResolver$Format.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 toDelimitedString
  ([Ljava/lang/String;)Ljava/lang/String;
- ([Ljava/lang/String;)Ljava/lang/String;
+ ([Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/validation/DefaultMessageCodesResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/validation/DefaultMessageCodesResolver.eea
index c7f0d67ec3..1ec92e7439 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/validation/DefaultMessageCodesResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/validation/DefaultMessageCodesResolver.eea
@@ -12,7 +12,7 @@ getPrefix
  ()Ljava/lang/String;
 postProcessMessageCode
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 resolveMessageCodes
  (Ljava/lang/String;Ljava/lang/String;)[Ljava/lang/String;
  (Ljava/lang/String;Ljava/lang/String;)[Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/validation/DirectFieldBindingResult.eea b/libs/eea-spring-5/src/main/resources/org/springframework/validation/DirectFieldBindingResult.eea
index c46002b8b0..1349858006 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/validation/DirectFieldBindingResult.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/validation/DirectFieldBindingResult.eea
@@ -8,7 +8,7 @@ class org/springframework/validation/DirectFieldBindingResult
  (Ljava/lang/Object;Ljava/lang/String;Z)V
 createDirectFieldAccessor
  ()Lorg/springframework/beans/ConfigurablePropertyAccessor;
- ()Lorg/springframework/beans/ConfigurablePropertyAccessor;
+ ()L1org/springframework/beans/ConfigurablePropertyAccessor;
 getPropertyAccessor
  ()Lorg/springframework/beans/ConfigurablePropertyAccessor;
  ()Lorg/springframework/beans/ConfigurablePropertyAccessor;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.eea
index 39d9b467da..a26c406462 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.eea
@@ -5,4 +5,4 @@ class org/springframework/validation/beanvalidation/MessageSourceResourceBundleL
  (Lorg/springframework/context/MessageSource;)V
 getResourceBundle
  (Ljava/util/Locale;)Ljava/util/ResourceBundle;
- (Ljava/util/Locale;)Ljava/util/ResourceBundle;
+ (Ljava/util/Locale;)L1java/util/ResourceBundle;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/validation/beanvalidation/MethodValidationInterceptor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/validation/beanvalidation/MethodValidationInterceptor.eea
index 95ce8050a3..5bc45e3f6b 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/validation/beanvalidation/MethodValidationInterceptor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/validation/beanvalidation/MethodValidationInterceptor.eea
@@ -8,7 +8,7 @@ class org/springframework/validation/beanvalidation/MethodValidationInterceptor
  (Ljavax/validation/ValidatorFactory;)V
 determineValidationGroups
  (Lorg/aopalliance/intercept/MethodInvocation;)[Ljava/lang/Class<*>;
- (Lorg/aopalliance/intercept/MethodInvocation;)[Ljava/lang/Class<*>;
+ (Lorg/aopalliance/intercept/MethodInvocation;)[1Ljava/lang/Class<*>;
 invoke
  (Lorg/aopalliance/intercept/MethodInvocation;)Ljava/lang/Object;
  (Lorg/aopalliance/intercept/MethodInvocation;)L0java/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.eea
index 8baea49936..532a36686c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.eea
@@ -2,7 +2,7 @@ class org/springframework/validation/beanvalidation/MethodValidationPostProcesso
 
 createMethodValidationAdvice
  (Ljavax/validation/Validator;)Lorg/aopalliance/aop/Advice;
- (Ljavax/validation/Validator;)Lorg/aopalliance/aop/Advice;
+ (Ljavax/validation/Validator;)L1org/aopalliance/aop/Advice;
 setValidatedAnnotationType
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)V
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/validation/beanvalidation/SpringValidatorAdapter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/validation/beanvalidation/SpringValidatorAdapter.eea
index 2be07e20b9..773b0ce2eb 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/validation/beanvalidation/SpringValidatorAdapter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/validation/beanvalidation/SpringValidatorAdapter.eea
@@ -8,7 +8,7 @@ determineErrorCode
  (Ljavax/validation/metadata/ConstraintDescriptor<*>;)Ljava/lang/String;
 determineField
  (Ljavax/validation/ConstraintViolation<Ljava/lang/Object;>;)Ljava/lang/String;
- (Ljavax/validation/ConstraintViolation<Ljava/lang/Object;>;)Ljava/lang/String;
+ (Ljavax/validation/ConstraintViolation<Ljava/lang/Object;>;)L1java/lang/String;
 forExecutables
  ()Ljavax/validation/executable/ExecutableValidator;
  ()Ljavax/validation/executable/ExecutableValidator;
@@ -23,7 +23,7 @@ getRejectedValue
  (Ljava/lang/String;Ljavax/validation/ConstraintViolation<Ljava/lang/Object;>;Lorg/springframework/validation/BindingResult;)L0java/lang/Object;
 getResolvableField
  (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/context/MessageSourceResolvable;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/context/MessageSourceResolvable;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/springframework/context/MessageSourceResolvable;
 processConstraintViolations
  (Ljava/util/Set<Ljavax/validation/ConstraintViolation<Ljava/lang/Object;>;>;Lorg/springframework/validation/Errors;)V
  (Ljava/util/Set<Ljavax/validation/ConstraintViolation<Ljava/lang/Object;>;>;Lorg/springframework/validation/Errors;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/accept/MappingMediaTypeFileExtensionResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/accept/MappingMediaTypeFileExtensionResolver.eea
index 5cce9acac8..7217efb659 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/accept/MappingMediaTypeFileExtensionResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/accept/MappingMediaTypeFileExtensionResolver.eea
@@ -11,7 +11,7 @@ getAllFileExtensions
  ()Ljava/util/List<Ljava/lang/String;>;
 getAllMediaTypes
  ()Ljava/util/List<Lorg/springframework/http/MediaType;>;
- ()Ljava/util/List<Lorg/springframework/http/MediaType;>;
+ ()L1java/util/List<Lorg/springframework/http/MediaType;>;
 getMediaTypes
  ()Ljava/util/Map<Ljava/lang/String;Lorg/springframework/http/MediaType;>;
  ()Ljava/util/Map<Ljava/lang/String;Lorg/springframework/http/MediaType;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/bind/support/DefaultDataBinderFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/bind/support/DefaultDataBinderFactory.eea
index b33d621317..3409c453f6 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/bind/support/DefaultDataBinderFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/bind/support/DefaultDataBinderFactory.eea
@@ -5,10 +5,10 @@ class org/springframework/web/bind/support/DefaultDataBinderFactory
  (Lorg/springframework/web/bind/support/WebBindingInitializer;)V
 createBinder
  (Lorg/springframework/web/context/request/NativeWebRequest;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/web/bind/WebDataBinder;
- (Lorg/springframework/web/context/request/NativeWebRequest;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/web/bind/WebDataBinder;
+ (Lorg/springframework/web/context/request/NativeWebRequest;Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/web/bind/WebDataBinder; # @Inherited(org.springframework.web.bind.support.WebDataBinderFactory)
 createBinderInstance
  (Ljava/lang/Object;Ljava/lang/String;Lorg/springframework/web/context/request/NativeWebRequest;)Lorg/springframework/web/bind/WebDataBinder;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/springframework/web/context/request/NativeWebRequest;)Lorg/springframework/web/bind/WebDataBinder;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/springframework/web/context/request/NativeWebRequest;)L1org/springframework/web/bind/WebDataBinder;
 initBinder
  (Lorg/springframework/web/bind/WebDataBinder;Lorg/springframework/web/context/request/NativeWebRequest;)V
  (Lorg/springframework/web/bind/WebDataBinder;Lorg/springframework/web/context/request/NativeWebRequest;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/bind/support/DefaultSessionAttributeStore.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/bind/support/DefaultSessionAttributeStore.eea
index a9651712b1..dbc2315221 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/bind/support/DefaultSessionAttributeStore.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/bind/support/DefaultSessionAttributeStore.eea
@@ -5,7 +5,7 @@ cleanupAttribute
  (Lorg/springframework/web/context/request/WebRequest;Ljava/lang/String;)V
 getAttributeNameInSession
  (Lorg/springframework/web/context/request/WebRequest;Ljava/lang/String;)Ljava/lang/String;
- (Lorg/springframework/web/context/request/WebRequest;Ljava/lang/String;)Ljava/lang/String;
+ (Lorg/springframework/web/context/request/WebRequest;Ljava/lang/String;)L1java/lang/String;
 retrieveAttribute
  (Lorg/springframework/web/context/request/WebRequest;Ljava/lang/String;)Ljava/lang/Object;
  (Lorg/springframework/web/context/request/WebRequest;Ljava/lang/String;)L0java/lang/Object; # @Inherited(org.springframework.web.bind.support.SessionAttributeStore)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/bind/support/WebDataBinderFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/bind/support/WebDataBinderFactory.eea
index 5931d5aad8..d682b7c071 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/bind/support/WebDataBinderFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/bind/support/WebDataBinderFactory.eea
@@ -2,4 +2,4 @@ class org/springframework/web/bind/support/WebDataBinderFactory
 
 createBinder
  (Lorg/springframework/web/context/request/NativeWebRequest;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/web/bind/WebDataBinder;
- (Lorg/springframework/web/context/request/NativeWebRequest;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/web/bind/WebDataBinder;
+ (Lorg/springframework/web/context/request/NativeWebRequest;Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/web/bind/WebDataBinder;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/bind/support/WebExchangeBindException.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/bind/support/WebExchangeBindException.eea
index 0b328edf46..e9a4072fd8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/bind/support/WebExchangeBindException.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/bind/support/WebExchangeBindException.eea
@@ -68,7 +68,7 @@ getRawFieldValue
  (Ljava/lang/String;)L0java/lang/Object; # @Inherited(org.springframework.validation.BindingResult)
 getSuppressedFields
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String; # @Inherited(org.springframework.validation.BindingResult)
 getTarget
  ()Ljava/lang/Object;
  ()L0java/lang/Object; # @Inherited(org.springframework.validation.BindingResult)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/client/AsyncRestTemplate.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/client/AsyncRestTemplate.eea
index 0d8b4ff1d8..da668eddd9 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/client/AsyncRestTemplate.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/client/AsyncRestTemplate.eea
@@ -14,7 +14,7 @@ class org/springframework/web/client/AsyncRestTemplate
  (Lorg/springframework/http/client/AsyncClientHttpRequestFactory;Lorg/springframework/web/client/RestTemplate;)V
 acceptHeaderRequestCallback
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/web/client/AsyncRequestCallback;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/web/client/AsyncRequestCallback;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1org/springframework/web/client/AsyncRequestCallback;
 delete
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)Lorg/springframework/util/concurrent/ListenableFuture<*>;
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)Lorg/springframework/util/concurrent/ListenableFuture<*>;
@@ -26,7 +26,7 @@ delete
  (Ljava/net/URI;)Lorg/springframework/util/concurrent/ListenableFuture<*>;
 doExecute
  <T:Ljava/lang/Object;>(Ljava/net/URI;Lorg/springframework/http/HttpMethod;Lorg/springframework/web/client/AsyncRequestCallback;Lorg/springframework/web/client/ResponseExtractor<TT;>;)Lorg/springframework/util/concurrent/ListenableFuture<TT;>;
- <T:Ljava/lang/Object;>(Ljava/net/URI;Lorg/springframework/http/HttpMethod;Lorg/springframework/web/client/AsyncRequestCallback;Lorg/springframework/web/client/ResponseExtractor<TT;>;)Lorg/springframework/util/concurrent/ListenableFuture<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/net/URI;Lorg/springframework/http/HttpMethod;Lorg/springframework/web/client/AsyncRequestCallback;Lorg/springframework/web/client/ResponseExtractor<TT;>;)L1org/springframework/util/concurrent/ListenableFuture<TT;>;
 exchange
  <T:Ljava/lang/Object;>(Ljava/lang/String;Lorg/springframework/http/HttpMethod;Lorg/springframework/http/HttpEntity<*>;Ljava/lang/Class<TT;>;Ljava/util/Map<Ljava/lang/String;*>;)Lorg/springframework/util/concurrent/ListenableFuture<Lorg/springframework/http/ResponseEntity<TT;>;>;
  <T:Ljava/lang/Object;>(Ljava/lang/String;Lorg/springframework/http/HttpMethod;Lorg/springframework/http/HttpEntity<*>;Ljava/lang/Class<TT;>;Ljava/util/Map<Ljava/lang/String;*>;)Lorg/springframework/util/concurrent/ListenableFuture<Lorg/springframework/http/ResponseEntity<TT;>;>;
@@ -89,10 +89,10 @@ headersExtractor
  ()Lorg/springframework/web/client/ResponseExtractor<Lorg/springframework/http/HttpHeaders;>;
 httpEntityCallback
  <T:Ljava/lang/Object;>(Lorg/springframework/http/HttpEntity<TT;>;)Lorg/springframework/web/client/AsyncRequestCallback;
- <T:Ljava/lang/Object;>(Lorg/springframework/http/HttpEntity<TT;>;)Lorg/springframework/web/client/AsyncRequestCallback;
+ <T:Ljava/lang/Object;>(Lorg/springframework/http/HttpEntity<TT;>;)L1org/springframework/web/client/AsyncRequestCallback;
 httpEntityCallback
  <T:Ljava/lang/Object;>(Lorg/springframework/http/HttpEntity<TT;>;Ljava/lang/reflect/Type;)Lorg/springframework/web/client/AsyncRequestCallback;
- <T:Ljava/lang/Object;>(Lorg/springframework/http/HttpEntity<TT;>;Ljava/lang/reflect/Type;)Lorg/springframework/web/client/AsyncRequestCallback;
+ <T:Ljava/lang/Object;>(Lorg/springframework/http/HttpEntity<TT;>;Ljava/lang/reflect/Type;)L1org/springframework/web/client/AsyncRequestCallback;
 optionsForAllow
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)Lorg/springframework/util/concurrent/ListenableFuture<Ljava/util/Set<Lorg/springframework/http/HttpMethod;>;>;
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)Lorg/springframework/util/concurrent/ListenableFuture<Ljava/util/Set<Lorg/springframework/http/HttpMethod;>;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/client/HttpClientErrorException.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/client/HttpClientErrorException.eea
index dc02d8566f..345770d4b9 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/client/HttpClientErrorException.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/client/HttpClientErrorException.eea
@@ -2,10 +2,10 @@ class org/springframework/web/client/HttpClientErrorException
 
 create
  (Ljava/lang/String;Lorg/springframework/http/HttpStatus;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)Lorg/springframework/web/client/HttpClientErrorException;
- (Ljava/lang/String;Lorg/springframework/http/HttpStatus;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)Lorg/springframework/web/client/HttpClientErrorException;
+ (Ljava/lang/String;Lorg/springframework/http/HttpStatus;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)L1org/springframework/web/client/HttpClientErrorException;
 create
  (Lorg/springframework/http/HttpStatus;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)Lorg/springframework/web/client/HttpClientErrorException;
- (Lorg/springframework/http/HttpStatus;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)Lorg/springframework/web/client/HttpClientErrorException;
+ (Lorg/springframework/http/HttpStatus;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)L1org/springframework/web/client/HttpClientErrorException;
 
 <init>
  (Ljava/lang/String;Lorg/springframework/http/HttpStatus;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/client/HttpServerErrorException.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/client/HttpServerErrorException.eea
index 43f4100ae3..0f62ac80c4 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/client/HttpServerErrorException.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/client/HttpServerErrorException.eea
@@ -2,10 +2,10 @@ class org/springframework/web/client/HttpServerErrorException
 
 create
  (Ljava/lang/String;Lorg/springframework/http/HttpStatus;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)Lorg/springframework/web/client/HttpServerErrorException;
- (Ljava/lang/String;Lorg/springframework/http/HttpStatus;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)Lorg/springframework/web/client/HttpServerErrorException;
+ (Ljava/lang/String;Lorg/springframework/http/HttpStatus;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)L1org/springframework/web/client/HttpServerErrorException;
 create
  (Lorg/springframework/http/HttpStatus;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)Lorg/springframework/web/client/HttpServerErrorException;
- (Lorg/springframework/http/HttpStatus;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)Lorg/springframework/web/client/HttpServerErrorException;
+ (Lorg/springframework/http/HttpStatus;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)L1org/springframework/web/client/HttpServerErrorException;
 
 <init>
  (Ljava/lang/String;Lorg/springframework/http/HttpStatus;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/client/RestTemplate.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/client/RestTemplate.eea
index ce15f28154..c919bb0fcf 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/client/RestTemplate.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/client/RestTemplate.eea
@@ -8,7 +8,7 @@ class org/springframework/web/client/RestTemplate
  (Lorg/springframework/http/client/ClientHttpRequestFactory;)V
 acceptHeaderRequestCallback
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/web/client/RequestCallback;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/web/client/RequestCallback;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1org/springframework/web/client/RequestCallback;
 delete
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)V
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)V
@@ -98,10 +98,10 @@ headersExtractor
  ()Lorg/springframework/web/client/ResponseExtractor<Lorg/springframework/http/HttpHeaders;>;
 httpEntityCallback
  <T:Ljava/lang/Object;>(Ljava/lang/Object;)Lorg/springframework/web/client/RequestCallback;
- <T:Ljava/lang/Object;>(Ljava/lang/Object;)Lorg/springframework/web/client/RequestCallback;
+ <T:Ljava/lang/Object;>(Ljava/lang/Object;)L1org/springframework/web/client/RequestCallback;
 httpEntityCallback
  <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/reflect/Type;)Lorg/springframework/web/client/RequestCallback;
- <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/reflect/Type;)Lorg/springframework/web/client/RequestCallback;
+ <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/reflect/Type;)L1org/springframework/web/client/RequestCallback;
 optionsForAllow
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)Ljava/util/Set<Lorg/springframework/http/HttpMethod;>;
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)Ljava/util/Set<Lorg/springframework/http/HttpMethod;>;
@@ -158,7 +158,7 @@ put
  (Ljava/net/URI;Ljava/lang/Object;)V
 responseEntityExtractor
  <T:Ljava/lang/Object;>(Ljava/lang/reflect/Type;)Lorg/springframework/web/client/ResponseExtractor<Lorg/springframework/http/ResponseEntity<TT;>;>;
- <T:Ljava/lang/Object;>(Ljava/lang/reflect/Type;)Lorg/springframework/web/client/ResponseExtractor<Lorg/springframework/http/ResponseEntity<TT;>;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/reflect/Type;)L1org/springframework/web/client/ResponseExtractor<Lorg/springframework/http/ResponseEntity<TT;>;>;
 setDefaultUriVariables
  (Ljava/util/Map<Ljava/lang/String;*>;)V
  (Ljava/util/Map<Ljava/lang/String;*>;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/ContextLoader.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/ContextLoader.eea
index 315b9ed9c9..0897d889c2 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/ContextLoader.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/ContextLoader.eea
@@ -31,7 +31,7 @@ configureAndRefreshWebApplicationContext
  (Lorg/springframework/web/context/ConfigurableWebApplicationContext;Ljavax/servlet/ServletContext;)V
 createWebApplicationContext
  (Ljavax/servlet/ServletContext;)Lorg/springframework/web/context/WebApplicationContext;
- (Ljavax/servlet/ServletContext;)Lorg/springframework/web/context/WebApplicationContext;
+ (Ljavax/servlet/ServletContext;)L1org/springframework/web/context/WebApplicationContext;
 customizeContext
  (Ljavax/servlet/ServletContext;Lorg/springframework/web/context/ConfigurableWebApplicationContext;)V
  (Ljavax/servlet/ServletContext;Lorg/springframework/web/context/ConfigurableWebApplicationContext;)V
@@ -40,7 +40,7 @@ determineContextClass
  (Ljavax/servlet/ServletContext;)Ljava/lang/Class<*>;
 determineContextInitializerClasses
  (Ljavax/servlet/ServletContext;)Ljava/util/List<Ljava/lang/Class<Lorg/springframework/context/ApplicationContextInitializer<Lorg/springframework/context/ConfigurableApplicationContext;>;>;>;
- (Ljavax/servlet/ServletContext;)Ljava/util/List<Ljava/lang/Class<Lorg/springframework/context/ApplicationContextInitializer<Lorg/springframework/context/ConfigurableApplicationContext;>;>;>;
+ (Ljavax/servlet/ServletContext;)L1java/util/List<Ljava/lang/Class<Lorg/springframework/context/ApplicationContextInitializer<Lorg/springframework/context/ConfigurableApplicationContext;>;>;>;
 initWebApplicationContext
  (Ljavax/servlet/ServletContext;)Lorg/springframework/web/context/WebApplicationContext;
  (Ljavax/servlet/ServletContext;)Lorg/springframework/web/context/WebApplicationContext;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/request/FacesRequestAttributes.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/request/FacesRequestAttributes.eea
index d0c719d0fd..d3d3b2356c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/request/FacesRequestAttributes.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/request/FacesRequestAttributes.eea
@@ -20,7 +20,7 @@ getFacesContext
  ()Ljavax/faces/context/FacesContext;
 getSessionId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSessionMutex
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/request/FacesWebRequest.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/request/FacesWebRequest.eea
index a5cd3a2c0a..d6e6334b37 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/request/FacesWebRequest.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/request/FacesWebRequest.eea
@@ -14,7 +14,7 @@ getContextPath
  ()Ljava/lang/String;
 getDescription
  (Z)Ljava/lang/String;
- (Z)Ljava/lang/String;
+ (Z)L1java/lang/String;
 getHeader
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)L0java/lang/String; # @Inherited(org.springframework.web.context.request.WebRequest)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/request/ServletWebRequest.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/request/ServletWebRequest.eea
index 17d290be85..05087bb47f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/request/ServletWebRequest.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/request/ServletWebRequest.eea
@@ -17,7 +17,7 @@ getContextPath
  ()Ljava/lang/String;
 getDescription
  (Z)Ljava/lang/String;
- (Z)Ljava/lang/String;
+ (Z)L1java/lang/String;
 getHeader
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)L0java/lang/String; # @Inherited(org.springframework.web.context.request.WebRequest)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/request/async/TimeoutCallableProcessingInterceptor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/request/async/TimeoutCallableProcessingInterceptor.eea
index a5cb5fc1a4..06eacad4b5 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/request/async/TimeoutCallableProcessingInterceptor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/request/async/TimeoutCallableProcessingInterceptor.eea
@@ -2,4 +2,4 @@ class org/springframework/web/context/request/async/TimeoutCallableProcessingInt
 
 handleTimeout
  <T:Ljava/lang/Object;>(Lorg/springframework/web/context/request/NativeWebRequest;Ljava/util/concurrent/Callable<TT;>;)Ljava/lang/Object;
- <T:Ljava/lang/Object;>(Lorg/springframework/web/context/request/NativeWebRequest;Ljava/util/concurrent/Callable<TT;>;)Ljava/lang/Object;
+ <T:Ljava/lang/Object;>(Lorg/springframework/web/context/request/NativeWebRequest;Ljava/util/concurrent/Callable<TT;>;)L1java/lang/Object;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/request/async/WebAsyncUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/request/async/WebAsyncUtils.eea
index ca092f0e93..78e19f1bca 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/request/async/WebAsyncUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/request/async/WebAsyncUtils.eea
@@ -6,10 +6,10 @@ WEB_ASYNC_MANAGER_ATTRIBUTE
 
 createAsyncWebRequest
  (Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)Lorg/springframework/web/context/request/async/AsyncWebRequest;
- (Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)Lorg/springframework/web/context/request/async/AsyncWebRequest;
+ (Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)L1org/springframework/web/context/request/async/AsyncWebRequest;
 getAsyncManager
  (Ljavax/servlet/ServletRequest;)Lorg/springframework/web/context/request/async/WebAsyncManager;
- (Ljavax/servlet/ServletRequest;)Lorg/springframework/web/context/request/async/WebAsyncManager;
+ (Ljavax/servlet/ServletRequest;)L1org/springframework/web/context/request/async/WebAsyncManager;
 getAsyncManager
  (Lorg/springframework/web/context/request/WebRequest;)Lorg/springframework/web/context/request/async/WebAsyncManager;
- (Lorg/springframework/web/context/request/WebRequest;)Lorg/springframework/web/context/request/async/WebAsyncManager;
+ (Lorg/springframework/web/context/request/WebRequest;)L1org/springframework/web/context/request/async/WebAsyncManager;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/AbstractRefreshableWebApplicationContext.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/AbstractRefreshableWebApplicationContext.eea
index cd48d30de2..8aa42f9b05 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/AbstractRefreshableWebApplicationContext.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/AbstractRefreshableWebApplicationContext.eea
@@ -2,10 +2,10 @@ class org/springframework/web/context/support/AbstractRefreshableWebApplicationC
 
 createEnvironment
  ()Lorg/springframework/core/env/ConfigurableEnvironment;
- ()Lorg/springframework/core/env/ConfigurableEnvironment;
+ ()L1org/springframework/core/env/ConfigurableEnvironment; # @Inherited(org.springframework.context.support.AbstractApplicationContext)
 getApplicationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.context.support.AbstractApplicationContext)
 getConfigLocations
  ()[Ljava/lang/String;
  ()[0Ljava/lang/String; # @Inherited(org.springframework.context.support.AbstractRefreshableConfigApplicationContext)
@@ -14,10 +14,10 @@ getNamespace
  ()L0java/lang/String; # @Inherited(org.springframework.web.context.ConfigurableWebApplicationContext)
 getResourceByPath
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.DefaultResourceLoader)
 getResourcePatternResolver
  ()Lorg/springframework/core/io/support/ResourcePatternResolver;
- ()Lorg/springframework/core/io/support/ResourcePatternResolver;
+ ()L1org/springframework/core/io/support/ResourcePatternResolver; # @Inherited(org.springframework.context.support.AbstractApplicationContext)
 getServletConfig
  ()Ljavax/servlet/ServletConfig;
  ()L0javax/servlet/ServletConfig; # @Inherited(org.springframework.web.context.ConfigurableWebApplicationContext)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.eea
index 3f5a1db41b..9c1b1fd679 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.eea
@@ -2,7 +2,7 @@ class org/springframework/web/context/support/AnnotationConfigWebApplicationCont
 
 getAnnotatedBeanDefinitionReader
  (Lorg/springframework/beans/factory/support/DefaultListableBeanFactory;)Lorg/springframework/context/annotation/AnnotatedBeanDefinitionReader;
- (Lorg/springframework/beans/factory/support/DefaultListableBeanFactory;)Lorg/springframework/context/annotation/AnnotatedBeanDefinitionReader;
+ (Lorg/springframework/beans/factory/support/DefaultListableBeanFactory;)L1org/springframework/context/annotation/AnnotatedBeanDefinitionReader;
 getBeanNameGenerator
  ()Lorg/springframework/beans/factory/support/BeanNameGenerator;
  ()L0org/springframework/beans/factory/support/BeanNameGenerator;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/GenericWebApplicationContext.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/GenericWebApplicationContext.eea
index 2784eb8cfe..1dc95ac2da 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/GenericWebApplicationContext.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/GenericWebApplicationContext.eea
@@ -11,10 +11,10 @@ class org/springframework/web/context/support/GenericWebApplicationContext
  (Lorg/springframework/beans/factory/support/DefaultListableBeanFactory;Ljavax/servlet/ServletContext;)V
 createEnvironment
  ()Lorg/springframework/core/env/ConfigurableEnvironment;
- ()Lorg/springframework/core/env/ConfigurableEnvironment;
+ ()L1org/springframework/core/env/ConfigurableEnvironment; # @Inherited(org.springframework.context.support.AbstractApplicationContext)
 getApplicationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.context.support.AbstractApplicationContext)
 getConfigLocations
  ()[Ljava/lang/String;
  ()[0Ljava/lang/String; # @Inherited(org.springframework.web.context.ConfigurableWebApplicationContext)
@@ -23,10 +23,10 @@ getNamespace
  ()L0java/lang/String; # @Inherited(org.springframework.web.context.ConfigurableWebApplicationContext)
 getResourceByPath
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.DefaultResourceLoader)
 getResourcePatternResolver
  ()Lorg/springframework/core/io/support/ResourcePatternResolver;
- ()Lorg/springframework/core/io/support/ResourcePatternResolver;
+ ()L1org/springframework/core/io/support/ResourcePatternResolver; # @Inherited(org.springframework.context.support.AbstractApplicationContext)
 getServletConfig
  ()Ljavax/servlet/ServletConfig;
  ()L0javax/servlet/ServletConfig; # @Inherited(org.springframework.web.context.ConfigurableWebApplicationContext)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/LiveBeansViewServlet.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/LiveBeansViewServlet.eea
index 396e298c31..0900cb59a0 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/LiveBeansViewServlet.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/LiveBeansViewServlet.eea
@@ -2,7 +2,7 @@ class org/springframework/web/context/support/LiveBeansViewServlet
 
 buildLiveBeansView
  ()Lorg/springframework/context/support/LiveBeansView;
- ()Lorg/springframework/context/support/LiveBeansView;
+ ()L1org/springframework/context/support/LiveBeansView;
 doGet
  (Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V
  (Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/RequestHandledEvent.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/RequestHandledEvent.eea
index ec80ce6609..f9e28ce21b 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/RequestHandledEvent.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/RequestHandledEvent.eea
@@ -8,7 +8,7 @@ class org/springframework/web/context/support/RequestHandledEvent
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;JLjava/lang/Throwable;)V
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getFailureCause
  ()Ljava/lang/Throwable;
  ()L0java/lang/Throwable;
@@ -17,7 +17,7 @@ getSessionId
  ()L0java/lang/String;
 getShortDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getUserName
  ()Ljava/lang/String;
  ()L0java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/ServletContextLiveBeansView.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/ServletContextLiveBeansView.eea
index d7eb46c848..ce18b9b700 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/ServletContextLiveBeansView.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/ServletContextLiveBeansView.eea
@@ -5,4 +5,4 @@ class org/springframework/web/context/support/ServletContextLiveBeansView
  (Ljavax/servlet/ServletContext;)V
 findApplicationContexts
  ()Ljava/util/Set<Lorg/springframework/context/ConfigurableApplicationContext;>;
- ()Ljava/util/Set<Lorg/springframework/context/ConfigurableApplicationContext;>;
+ ()L1java/util/Set<Lorg/springframework/context/ConfigurableApplicationContext;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/ServletContextParameterFactoryBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/ServletContextParameterFactoryBean.eea
index 1d813b5cab..3b867e12d0 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/ServletContextParameterFactoryBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/ServletContextParameterFactoryBean.eea
@@ -9,7 +9,7 @@ getObject
  ()L0java/lang/String;
 getObjectType
  ()Ljava/lang/Class<Ljava/lang/String;>;
- ()Ljava/lang/Class<Ljava/lang/String;>;
+ ()L1java/lang/Class<Ljava/lang/String;>;
 setInitParamName
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/ServletContextResource.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/ServletContextResource.eea
index 76146eb424..670391a148 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/ServletContextResource.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/ServletContextResource.eea
@@ -5,16 +5,16 @@ class org/springframework/web/context/support/ServletContextResource
  (Ljavax/servlet/ServletContext;Ljava/lang/String;)V
 createRelative
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.AbstractResource)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(org.springframework.core.io.AbstractResource)
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getFile
  ()Ljava/io/File;
- ()Ljava/io/File;
+ ()L1java/io/File; # @Inherited(org.springframework.core.io.AbstractFileResolvingResource)
 getFilename
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(org.springframework.core.io.AbstractResource)
@@ -32,4 +32,4 @@ getServletContext
  ()Ljavax/servlet/ServletContext;
 getURL
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L1java/net/URL; # @Inherited(org.springframework.core.io.AbstractResource)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/ServletContextResourceLoader.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/ServletContextResourceLoader.eea
index 5a1875e99b..37ea3bd81e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/ServletContextResourceLoader.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/ServletContextResourceLoader.eea
@@ -5,4 +5,4 @@ class org/springframework/web/context/support/ServletContextResourceLoader
  (Ljavax/servlet/ServletContext;)V
 getResourceByPath
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.DefaultResourceLoader)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/ServletRequestHandledEvent.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/ServletRequestHandledEvent.eea
index 74fb9544ef..4d9e031268 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/ServletRequestHandledEvent.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/ServletRequestHandledEvent.eea
@@ -14,7 +14,7 @@ getClientAddress
  ()Ljava/lang/String;
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.web.context.support.RequestHandledEvent)
 getMethod
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -26,7 +26,7 @@ getServletName
  ()Ljava/lang/String;
 getShortDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.web.context.support.RequestHandledEvent)
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(org.springframework.web.context.support.RequestHandledEvent)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/StaticWebApplicationContext.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/StaticWebApplicationContext.eea
index e04a46ff64..aaebfd863d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/StaticWebApplicationContext.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/context/support/StaticWebApplicationContext.eea
@@ -2,7 +2,7 @@ class org/springframework/web/context/support/StaticWebApplicationContext
 
 createEnvironment
  ()Lorg/springframework/core/env/ConfigurableEnvironment;
- ()Lorg/springframework/core/env/ConfigurableEnvironment;
+ ()L1org/springframework/core/env/ConfigurableEnvironment; # @Inherited(org.springframework.context.support.AbstractApplicationContext)
 getConfigLocations
  ()[Ljava/lang/String;
  ()[0Ljava/lang/String; # @Inherited(org.springframework.web.context.ConfigurableWebApplicationContext)
@@ -11,10 +11,10 @@ getNamespace
  ()L0java/lang/String; # @Inherited(org.springframework.web.context.ConfigurableWebApplicationContext)
 getResourceByPath
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.DefaultResourceLoader)
 getResourcePatternResolver
  ()Lorg/springframework/core/io/support/ResourcePatternResolver;
- ()Lorg/springframework/core/io/support/ResourcePatternResolver;
+ ()L1org/springframework/core/io/support/ResourcePatternResolver; # @Inherited(org.springframework.context.support.AbstractApplicationContext)
 getServletConfig
  ()Ljavax/servlet/ServletConfig;
  ()L0javax/servlet/ServletConfig; # @Inherited(org.springframework.web.context.ConfigurableWebApplicationContext)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/filter/AbstractRequestLoggingFilter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/filter/AbstractRequestLoggingFilter.eea
index 00cb999c4f..77627d52c9 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/filter/AbstractRequestLoggingFilter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/filter/AbstractRequestLoggingFilter.eea
@@ -21,7 +21,7 @@ beforeRequest
  (Ljavax/servlet/http/HttpServletRequest;Ljava/lang/String;)V
 createMessage
  (Ljavax/servlet/http/HttpServletRequest;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljavax/servlet/http/HttpServletRequest;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljavax/servlet/http/HttpServletRequest;Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 doFilterInternal
  (Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V
  (Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/filter/GenericFilterBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/filter/GenericFilterBean.eea
index 5d3e691c14..cf8c870542 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/filter/GenericFilterBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/filter/GenericFilterBean.eea
@@ -9,7 +9,7 @@ addRequiredProperty
  (Ljava/lang/String;)V
 createEnvironment
  ()Lorg/springframework/core/env/Environment;
- ()Lorg/springframework/core/env/Environment;
+ ()L1org/springframework/core/env/Environment;
 getEnvironment
  ()Lorg/springframework/core/env/Environment;
  ()Lorg/springframework/core/env/Environment;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/filter/OncePerRequestFilter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/filter/OncePerRequestFilter.eea
index 57d5f9cbaa..cb0ac1ded8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/filter/OncePerRequestFilter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/filter/OncePerRequestFilter.eea
@@ -15,7 +15,7 @@ doFilterNestedErrorDispatch
  (Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V
 getAlreadyFilteredAttributeName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 isAsyncDispatch
  (Ljavax/servlet/http/HttpServletRequest;)Z
  (Ljavax/servlet/http/HttpServletRequest;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/filter/ShallowEtagHeaderFilter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/filter/ShallowEtagHeaderFilter.eea
index 25b72c7f8d..34230b1bec 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/filter/ShallowEtagHeaderFilter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/filter/ShallowEtagHeaderFilter.eea
@@ -9,7 +9,7 @@ doFilterInternal
  (Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V
 generateETagHeaderValue
  (Ljava/io/InputStream;Z)Ljava/lang/String;
- (Ljava/io/InputStream;Z)Ljava/lang/String;
+ (Ljava/io/InputStream;Z)L1java/lang/String;
 isEligibleForEtag
  (Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;ILjava/io/InputStream;)Z
  (Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;ILjava/io/InputStream;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.eea
index ad70bc4ca4..d20e2874e9 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.eea
@@ -15,7 +15,7 @@ getDelegate
  (Ljavax/faces/context/FacesContext;)Ljavax/faces/application/NavigationHandler;
 getTargetBeanName
  (Ljavax/faces/context/FacesContext;)Ljava/lang/String;
- (Ljavax/faces/context/FacesContext;)Ljava/lang/String;
+ (Ljavax/faces/context/FacesContext;)L1java/lang/String;
 getWebApplicationContext
  (Ljavax/faces/context/FacesContext;)Lorg/springframework/web/context/WebApplicationContext;
  (Ljavax/faces/context/FacesContext;)Lorg/springframework/web/context/WebApplicationContext;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/jsf/el/SpringBeanFacesELResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/jsf/el/SpringBeanFacesELResolver.eea
index c239f8424f..101b97ad04 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/jsf/el/SpringBeanFacesELResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/jsf/el/SpringBeanFacesELResolver.eea
@@ -2,7 +2,7 @@ class org/springframework/web/jsf/el/SpringBeanFacesELResolver
 
 getCommonPropertyType
  (Ljavax/el/ELContext;Ljava/lang/Object;)Ljava/lang/Class<*>;
- (Ljavax/el/ELContext;Ljava/lang/Object;)Ljava/lang/Class<*>;
+ (Ljavax/el/ELContext;Ljava/lang/Object;)L1java/lang/Class<*>;
 getFeatureDescriptors
  (Ljavax/el/ELContext;Ljava/lang/Object;)Ljava/util/Iterator<Ljava/beans/FeatureDescriptor;>;
  (Ljavax/el/ELContext;Ljava/lang/Object;)L0java/util/Iterator<Ljava/beans/FeatureDescriptor;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.eea
index a31d1a941b..ebdc329f3f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.eea
@@ -10,7 +10,7 @@ logger
 
 getCommonPropertyType
  (Ljavax/el/ELContext;Ljava/lang/Object;)Ljava/lang/Class<*>;
- (Ljavax/el/ELContext;Ljava/lang/Object;)Ljava/lang/Class<*>;
+ (Ljavax/el/ELContext;Ljava/lang/Object;)L1java/lang/Class<*>;
 getFeatureDescriptors
  (Ljavax/el/ELContext;Ljava/lang/Object;)Ljava/util/Iterator<Ljava/beans/FeatureDescriptor;>;
  (Ljavax/el/ELContext;Ljava/lang/Object;)L0java/util/Iterator<Ljava/beans/FeatureDescriptor;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/method/ControllerAdviceBean.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/method/ControllerAdviceBean.eea
index 409bb360c7..4e3aebaa64 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/method/ControllerAdviceBean.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/method/ControllerAdviceBean.eea
@@ -2,7 +2,7 @@ class org/springframework/web/method/ControllerAdviceBean
 
 findAnnotatedBeans
  (Lorg/springframework/context/ApplicationContext;)Ljava/util/List<Lorg/springframework/web/method/ControllerAdviceBean;>;
- (Lorg/springframework/context/ApplicationContext;)Ljava/util/List<Lorg/springframework/web/method/ControllerAdviceBean;>;
+ (Lorg/springframework/context/ApplicationContext;)L1java/util/List<Lorg/springframework/web/method/ControllerAdviceBean;>;
 
 <init>
  (Ljava/lang/Object;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/method/HandlerMethod$HandlerMethodParameter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/method/HandlerMethod$HandlerMethodParameter.eea
index 54e98fa956..b2a1cbaae8 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/method/HandlerMethod$HandlerMethodParameter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/method/HandlerMethod$HandlerMethodParameter.eea
@@ -8,7 +8,7 @@ class org/springframework/web/method/HandlerMethod$HandlerMethodParameter
  (Lorg/springframework/web/method/HandlerMethod;Lorg/springframework/web/method/HandlerMethod$HandlerMethodParameter;)V
 clone
  ()Lorg/springframework/web/method/HandlerMethod$HandlerMethodParameter;
- ()Lorg/springframework/web/method/HandlerMethod$HandlerMethodParameter;
+ ()L1org/springframework/web/method/HandlerMethod$HandlerMethodParameter;
 getContainingClass
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/method/HandlerMethod.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/method/HandlerMethod.eea
index 7da0a11ea7..76a37532e4 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/method/HandlerMethod.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/method/HandlerMethod.eea
@@ -9,7 +9,7 @@ findProvidedArgument
  (Lorg/springframework/core/MethodParameter;[Ljava/lang/Object;)L0java/lang/Object;
 formatArgumentError
  (Lorg/springframework/core/MethodParameter;Ljava/lang/String;)Ljava/lang/String;
- (Lorg/springframework/core/MethodParameter;Ljava/lang/String;)Ljava/lang/String;
+ (Lorg/springframework/core/MethodParameter;Ljava/lang/String;)L1java/lang/String;
 
 <init>
  (Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class<*>;)V
@@ -34,13 +34,13 @@ assertTargetBean
  (Ljava/lang/reflect/Method;Ljava/lang/Object;[Ljava/lang/Object;)V
 createWithResolvedBean
  ()Lorg/springframework/web/method/HandlerMethod;
- ()Lorg/springframework/web/method/HandlerMethod;
+ ()L1org/springframework/web/method/HandlerMethod;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 formatInvokeError
  (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1java/lang/String;
 getBean
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
@@ -73,10 +73,10 @@ getReturnType
  ()Lorg/springframework/core/MethodParameter;
 getReturnValueType
  (Ljava/lang/Object;)Lorg/springframework/core/MethodParameter;
- (Ljava/lang/Object;)Lorg/springframework/core/MethodParameter;
+ (Ljava/lang/Object;)L1org/springframework/core/MethodParameter;
 getShortLogMessage
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 hasMethodAnnotation
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)Z
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)Z
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/method/HandlerTypePredicate.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/method/HandlerTypePredicate.eea
index 6c6b8d6df2..ab59b9c576 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/method/HandlerTypePredicate.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/method/HandlerTypePredicate.eea
@@ -6,13 +6,13 @@ super java/util/function/Predicate
 
 builder
  ()Lorg/springframework/web/method/HandlerTypePredicate$Builder;
- ()Lorg/springframework/web/method/HandlerTypePredicate$Builder;
+ ()L1org/springframework/web/method/HandlerTypePredicate$Builder;
 forAnnotation
  ([Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lorg/springframework/web/method/HandlerTypePredicate;
  ([Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lorg/springframework/web/method/HandlerTypePredicate;
 forAnyHandlerType
  ()Lorg/springframework/web/method/HandlerTypePredicate;
- ()Lorg/springframework/web/method/HandlerTypePredicate;
+ ()L1org/springframework/web/method/HandlerTypePredicate;
 forAssignableType
  ([Ljava/lang/Class<*>;)Lorg/springframework/web/method/HandlerTypePredicate;
  ([Ljava/lang/Class<*>;)Lorg/springframework/web/method/HandlerTypePredicate;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.eea
index c800494c34..5f6536f62f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.eea
@@ -5,7 +5,7 @@ class org/springframework/web/method/annotation/AbstractCookieValueMethodArgumen
  (Lorg/springframework/beans/factory/config/ConfigurableBeanFactory;)V
 createNamedValueInfo
  (Lorg/springframework/core/MethodParameter;)Lorg/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
- (Lorg/springframework/core/MethodParameter;)Lorg/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
+ (Lorg/springframework/core/MethodParameter;)L1org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo; # @Inherited(org.springframework.web.method.annotation.AbstractNamedValueMethodArgumentResolver)
 handleMissingValue
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;)V
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.eea
index f14216ed83..2a2e208035 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.eea
@@ -5,7 +5,7 @@ class org/springframework/web/method/annotation/AbstractNamedValueMethodArgument
  (Lorg/springframework/beans/factory/config/ConfigurableBeanFactory;)V
 createNamedValueInfo
  (Lorg/springframework/core/MethodParameter;)Lorg/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
- (Lorg/springframework/core/MethodParameter;)Lorg/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
+ (Lorg/springframework/core/MethodParameter;)L1org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
 handleMissingValue
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;)V
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.eea
index e7627255da..5a75b769a7 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.eea
@@ -5,7 +5,7 @@ class org/springframework/web/method/annotation/ExpressionValueMethodArgumentRes
  (Lorg/springframework/beans/factory/config/ConfigurableBeanFactory;)V
 createNamedValueInfo
  (Lorg/springframework/core/MethodParameter;)Lorg/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
- (Lorg/springframework/core/MethodParameter;)Lorg/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
+ (Lorg/springframework/core/MethodParameter;)L1org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo; # @Inherited(org.springframework.web.method.annotation.AbstractNamedValueMethodArgumentResolver)
 handleMissingValue
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;)V
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.eea
index 1afe25eff9..51bf1b7443 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.eea
@@ -12,7 +12,7 @@ constructAttribute
  (Ljava/lang/reflect/Constructor<*>;Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/web/bind/support/WebDataBinderFactory;Lorg/springframework/web/context/request/NativeWebRequest;)Ljava/lang/Object;
 createAttribute
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/web/bind/support/WebDataBinderFactory;Lorg/springframework/web/context/request/NativeWebRequest;)Ljava/lang/Object;
- (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/web/bind/support/WebDataBinderFactory;Lorg/springframework/web/context/request/NativeWebRequest;)Ljava/lang/Object;
+ (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/web/bind/support/WebDataBinderFactory;Lorg/springframework/web/context/request/NativeWebRequest;)L1java/lang/Object;
 handleReturnValue
  (Ljava/lang/Object;Lorg/springframework/core/MethodParameter;Lorg/springframework/web/method/support/ModelAndViewContainer;Lorg/springframework/web/context/request/NativeWebRequest;)V
  (Ljava/lang/Object;Lorg/springframework/core/MethodParameter;Lorg/springframework/web/method/support/ModelAndViewContainer;Lorg/springframework/web/context/request/NativeWebRequest;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.eea
index 245af05206..d6898a5157 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.eea
@@ -5,7 +5,7 @@ class org/springframework/web/method/annotation/RequestHeaderMethodArgumentResol
  (Lorg/springframework/beans/factory/config/ConfigurableBeanFactory;)V
 createNamedValueInfo
  (Lorg/springframework/core/MethodParameter;)Lorg/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
- (Lorg/springframework/core/MethodParameter;)Lorg/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
+ (Lorg/springframework/core/MethodParameter;)L1org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo; # @Inherited(org.springframework.web.method.annotation.AbstractNamedValueMethodArgumentResolver)
 handleMissingValue
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;)V
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.eea
index 5f493e4728..3f9381882c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.eea
@@ -8,7 +8,7 @@ contributeMethodArgument
  (Lorg/springframework/core/MethodParameter;Ljava/lang/Object;Lorg/springframework/web/util/UriComponentsBuilder;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Lorg/springframework/core/convert/ConversionService;)V
 createNamedValueInfo
  (Lorg/springframework/core/MethodParameter;)Lorg/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
- (Lorg/springframework/core/MethodParameter;)Lorg/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
+ (Lorg/springframework/core/MethodParameter;)L1org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo; # @Inherited(org.springframework.web.method.annotation.AbstractNamedValueMethodArgumentResolver)
 formatUriValue
  (Lorg/springframework/core/convert/ConversionService;Lorg/springframework/core/convert/TypeDescriptor;Ljava/lang/Object;)Ljava/lang/String;
  (Lorg/springframework/core/convert/ConversionService;Lorg/springframework/core/convert/TypeDescriptor;Ljava/lang/Object;)L0java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/SessionAttributesHandler.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/SessionAttributesHandler.eea
index 60b0679ed4..7e7c50dae5 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/SessionAttributesHandler.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/method/annotation/SessionAttributesHandler.eea
@@ -11,7 +11,7 @@ isHandlerSessionAttribute
  (Ljava/lang/String;Ljava/lang/Class<*>;)Z
 retrieveAttributes
  (Lorg/springframework/web/context/request/WebRequest;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- (Lorg/springframework/web/context/request/WebRequest;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ (Lorg/springframework/web/context/request/WebRequest;)L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 storeAttributes
  (Lorg/springframework/web/context/request/WebRequest;Ljava/util/Map<Ljava/lang/String;*>;)V
  (Lorg/springframework/web/context/request/WebRequest;Ljava/util/Map<Ljava/lang/String;*>;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/MultipartFile.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/MultipartFile.eea
index fb8adcdad5..7eeddebd83 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/MultipartFile.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/MultipartFile.eea
@@ -17,7 +17,7 @@ getOriginalFilename
  ()L0java/lang/String;
 getResource
  ()Lorg/springframework/core/io/Resource;
- ()Lorg/springframework/core/io/Resource;
+ ()L1org/springframework/core/io/Resource;
 transferTo
  (Ljava/io/File;)V
  (Ljava/io/File;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/commons/CommonsFileUploadSupport.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/commons/CommonsFileUploadSupport.eea
index 518026a50f..46ab115432 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/commons/CommonsFileUploadSupport.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/commons/CommonsFileUploadSupport.eea
@@ -9,10 +9,10 @@ cleanupFileItems
  (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Lorg/springframework/web/multipart/MultipartFile;>;)V
 createMultipartFile
  (Lorg/apache/commons/fileupload/FileItem;)Lorg/springframework/web/multipart/commons/CommonsMultipartFile;
- (Lorg/apache/commons/fileupload/FileItem;)Lorg/springframework/web/multipart/commons/CommonsMultipartFile;
+ (Lorg/apache/commons/fileupload/FileItem;)L1org/springframework/web/multipart/commons/CommonsMultipartFile;
 getDefaultEncoding
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getFileItemFactory
  ()Lorg/apache/commons/fileupload/disk/DiskFileItemFactory;
  ()Lorg/apache/commons/fileupload/disk/DiskFileItemFactory;
@@ -21,13 +21,13 @@ getFileUpload
  ()Lorg/apache/commons/fileupload/FileUpload;
 newFileItemFactory
  ()Lorg/apache/commons/fileupload/disk/DiskFileItemFactory;
- ()Lorg/apache/commons/fileupload/disk/DiskFileItemFactory;
+ ()L1org/apache/commons/fileupload/disk/DiskFileItemFactory;
 newFileUpload
  (Lorg/apache/commons/fileupload/FileItemFactory;)Lorg/apache/commons/fileupload/FileUpload;
  (Lorg/apache/commons/fileupload/FileItemFactory;)Lorg/apache/commons/fileupload/FileUpload;
 parseFileItems
  (Ljava/util/List<Lorg/apache/commons/fileupload/FileItem;>;Ljava/lang/String;)Lorg/springframework/web/multipart/commons/CommonsFileUploadSupport$MultipartParsingResult;
- (Ljava/util/List<Lorg/apache/commons/fileupload/FileItem;>;Ljava/lang/String;)Lorg/springframework/web/multipart/commons/CommonsFileUploadSupport$MultipartParsingResult;
+ (Ljava/util/List<Lorg/apache/commons/fileupload/FileItem;>;Ljava/lang/String;)L1org/springframework/web/multipart/commons/CommonsFileUploadSupport$MultipartParsingResult;
 prepareFileUpload
  (Ljava/lang/String;)Lorg/apache/commons/fileupload/FileUpload;
  (Ljava/lang/String;)Lorg/apache/commons/fileupload/FileUpload;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/commons/CommonsMultipartFile.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/commons/CommonsMultipartFile.eea
index 5d263dc8ce..39a6011073 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/commons/CommonsMultipartFile.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/commons/CommonsMultipartFile.eea
@@ -9,7 +9,7 @@ logger
  (Lorg/apache/commons/fileupload/FileItem;)V
 getBytes
  ()[B
- ()[B
+ ()[1B
 getContentType
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(org.springframework.web.multipart.MultipartFile)
@@ -27,7 +27,7 @@ getOriginalFilename
  ()L0java/lang/String; # @Inherited(org.springframework.web.multipart.MultipartFile)
 getStorageDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/commons/CommonsMultipartResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/commons/CommonsMultipartResolver.eea
index 15f008a137..8ab13511d0 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/commons/CommonsMultipartResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/commons/CommonsMultipartResolver.eea
@@ -14,13 +14,13 @@ isMultipart
  (Ljavax/servlet/http/HttpServletRequest;)Z
 newFileUpload
  (Lorg/apache/commons/fileupload/FileItemFactory;)Lorg/apache/commons/fileupload/FileUpload;
- (Lorg/apache/commons/fileupload/FileItemFactory;)Lorg/apache/commons/fileupload/FileUpload;
+ (Lorg/apache/commons/fileupload/FileItemFactory;)L1org/apache/commons/fileupload/FileUpload;
 parseRequest
  (Ljavax/servlet/http/HttpServletRequest;)Lorg/springframework/web/multipart/commons/CommonsFileUploadSupport$MultipartParsingResult;
  (Ljavax/servlet/http/HttpServletRequest;)Lorg/springframework/web/multipart/commons/CommonsFileUploadSupport$MultipartParsingResult;
 resolveMultipart
  (Ljavax/servlet/http/HttpServletRequest;)Lorg/springframework/web/multipart/MultipartHttpServletRequest;
- (Ljavax/servlet/http/HttpServletRequest;)Lorg/springframework/web/multipart/MultipartHttpServletRequest;
+ (Ljavax/servlet/http/HttpServletRequest;)L1org/springframework/web/multipart/MultipartHttpServletRequest;
 setServletContext
  (Ljavax/servlet/ServletContext;)V
  (Ljavax/servlet/ServletContext;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.eea
index a74aa8f391..f7a88cdb81 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.eea
@@ -26,7 +26,7 @@ getRequest
  ()Ljavax/servlet/http/HttpServletRequest;
 getRequestHeaders
  ()Lorg/springframework/http/HttpHeaders;
- ()Lorg/springframework/http/HttpHeaders;
+ ()L1org/springframework/http/HttpHeaders;
 getRequestMethod
  ()Lorg/springframework/http/HttpMethod;
  ()L0org/springframework/http/HttpMethod; # @Inherited(org.springframework.web.multipart.MultipartHttpServletRequest)
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/support/ByteArrayMultipartFileEditor.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/support/ByteArrayMultipartFileEditor.eea
index b718ba48ad..7636692da6 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/support/ByteArrayMultipartFileEditor.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/support/ByteArrayMultipartFileEditor.eea
@@ -2,7 +2,7 @@ class org/springframework/web/multipart/support/ByteArrayMultipartFileEditor
 
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.beans.propertyeditors.ByteArrayPropertyEditor)
 setValue
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.eea
index 86761a020b..86d6930f0d 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.eea
@@ -23,7 +23,7 @@ getParameter
  (Ljava/lang/String;)L0java/lang/String;
 getParameterMap
  ()Ljava/util/Map<Ljava/lang/String;[Ljava/lang/String;>;
- ()Ljava/util/Map<Ljava/lang/String;[Ljava/lang/String;>;
+ ()L1java/util/Map<Ljava/lang/String;[Ljava/lang/String;>;
 getParameterNames
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/support/StandardServletMultipartResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/support/StandardServletMultipartResolver.eea
index 8d6cbbf9ef..82a6f2f947 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/support/StandardServletMultipartResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/support/StandardServletMultipartResolver.eea
@@ -8,4 +8,4 @@ isMultipart
  (Ljavax/servlet/http/HttpServletRequest;)Z
 resolveMultipart
  (Ljavax/servlet/http/HttpServletRequest;)Lorg/springframework/web/multipart/MultipartHttpServletRequest;
- (Ljavax/servlet/http/HttpServletRequest;)Lorg/springframework/web/multipart/MultipartHttpServletRequest;
+ (Ljavax/servlet/http/HttpServletRequest;)L1org/springframework/web/multipart/MultipartHttpServletRequest;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/support/StandardServletPartUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/support/StandardServletPartUtils.eea
index 66511c9287..bb4dbcfa49 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/support/StandardServletPartUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/multipart/support/StandardServletPartUtils.eea
@@ -5,7 +5,7 @@ bindParts
  (Ljavax/servlet/http/HttpServletRequest;Lorg/springframework/beans/MutablePropertyValues;Z)V
 getParts
  (Ljavax/servlet/http/HttpServletRequest;)Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljavax/servlet/http/Part;>;
- (Ljavax/servlet/http/HttpServletRequest;)Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljavax/servlet/http/Part;>;
+ (Ljavax/servlet/http/HttpServletRequest;)L1org/springframework/util/MultiValueMap<Ljava/lang/String;Ljavax/servlet/http/Part;>;
 getParts
  (Ljavax/servlet/http/HttpServletRequest;Ljava/lang/String;)Ljava/util/List<Ljavax/servlet/http/Part;>;
  (Ljavax/servlet/http/HttpServletRequest;Ljava/lang/String;)Ljava/util/List<Ljavax/servlet/http/Part;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/server/ServerWebExchange.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/server/ServerWebExchange.eea
index 8de01ebd7b..76b5acadab 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/server/ServerWebExchange.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/server/ServerWebExchange.eea
@@ -57,7 +57,7 @@ getSession
  ()Lreactor/core/publisher/Mono<Lorg/springframework/web/server/WebSession;>;
 mutate
  ()Lorg/springframework/web/server/ServerWebExchange$Builder;
- ()Lorg/springframework/web/server/ServerWebExchange$Builder;
+ ()L1org/springframework/web/server/ServerWebExchange$Builder;
 transformUrl
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/server/adapter/AbstractReactiveWebInitializer.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/server/adapter/AbstractReactiveWebInitializer.eea
index 23c18ac850..e4e9c6cbfa 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/server/adapter/AbstractReactiveWebInitializer.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/server/adapter/AbstractReactiveWebInitializer.eea
@@ -6,16 +6,16 @@ DEFAULT_SERVLET_NAME
 
 createApplicationContext
  ()Lorg/springframework/context/ApplicationContext;
- ()Lorg/springframework/context/ApplicationContext;
+ ()L1org/springframework/context/ApplicationContext;
 getConfigClasses
  ()[Ljava/lang/Class<*>;
  ()[Ljava/lang/Class<*>;
 getServletMapping
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getServletName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 onStartup
  (Ljavax/servlet/ServletContext;)V
  (Ljavax/servlet/ServletContext;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/server/adapter/HttpWebHandlerAdapter.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/server/adapter/HttpWebHandlerAdapter.eea
index 8d2b394414..35ca0657b7 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/server/adapter/HttpWebHandlerAdapter.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/server/adapter/HttpWebHandlerAdapter.eea
@@ -5,10 +5,10 @@ class org/springframework/web/server/adapter/HttpWebHandlerAdapter
  (Lorg/springframework/web/server/WebHandler;)V
 createExchange
  (Lorg/springframework/http/server/reactive/ServerHttpRequest;Lorg/springframework/http/server/reactive/ServerHttpResponse;)Lorg/springframework/web/server/ServerWebExchange;
- (Lorg/springframework/http/server/reactive/ServerHttpRequest;Lorg/springframework/http/server/reactive/ServerHttpResponse;)Lorg/springframework/web/server/ServerWebExchange;
+ (Lorg/springframework/http/server/reactive/ServerHttpRequest;Lorg/springframework/http/server/reactive/ServerHttpResponse;)L1org/springframework/web/server/ServerWebExchange;
 formatRequest
  (Lorg/springframework/http/server/reactive/ServerHttpRequest;)Ljava/lang/String;
- (Lorg/springframework/http/server/reactive/ServerHttpRequest;)Ljava/lang/String;
+ (Lorg/springframework/http/server/reactive/ServerHttpRequest;)L1java/lang/String;
 getApplicationContext
  ()Lorg/springframework/context/ApplicationContext;
  ()L0org/springframework/context/ApplicationContext;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/server/adapter/WebHttpHandlerBuilder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/server/adapter/WebHttpHandlerBuilder.eea
index bb1171deca..2ef7e3fb93 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/server/adapter/WebHttpHandlerBuilder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/server/adapter/WebHttpHandlerBuilder.eea
@@ -18,10 +18,10 @@ WEB_SESSION_MANAGER_BEAN_NAME
 
 applicationContext
  (Lorg/springframework/context/ApplicationContext;)Lorg/springframework/web/server/adapter/WebHttpHandlerBuilder;
- (Lorg/springframework/context/ApplicationContext;)Lorg/springframework/web/server/adapter/WebHttpHandlerBuilder;
+ (Lorg/springframework/context/ApplicationContext;)L1org/springframework/web/server/adapter/WebHttpHandlerBuilder;
 webHandler
  (Lorg/springframework/web/server/WebHandler;)Lorg/springframework/web/server/adapter/WebHttpHandlerBuilder;
- (Lorg/springframework/web/server/WebHandler;)Lorg/springframework/web/server/adapter/WebHttpHandlerBuilder;
+ (Lorg/springframework/web/server/WebHandler;)L1org/springframework/web/server/adapter/WebHttpHandlerBuilder;
 
 build
  ()Lorg/springframework/http/server/reactive/HttpHandler;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/server/i18n/AcceptHeaderLocaleContextResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/server/i18n/AcceptHeaderLocaleContextResolver.eea
index 93047db66f..6bb320add2 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/server/i18n/AcceptHeaderLocaleContextResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/server/i18n/AcceptHeaderLocaleContextResolver.eea
@@ -8,7 +8,7 @@ getSupportedLocales
  ()Ljava/util/List<Ljava/util/Locale;>;
 resolveLocaleContext
  (Lorg/springframework/web/server/ServerWebExchange;)Lorg/springframework/context/i18n/LocaleContext;
- (Lorg/springframework/web/server/ServerWebExchange;)Lorg/springframework/context/i18n/LocaleContext;
+ (Lorg/springframework/web/server/ServerWebExchange;)L1org/springframework/context/i18n/LocaleContext;
 setDefaultLocale
  (Ljava/util/Locale;)V
  (Ljava/util/Locale;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/server/i18n/FixedLocaleContextResolver.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/server/i18n/FixedLocaleContextResolver.eea
index 21e882762c..a15d426b9c 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/server/i18n/FixedLocaleContextResolver.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/server/i18n/FixedLocaleContextResolver.eea
@@ -8,7 +8,7 @@ class org/springframework/web/server/i18n/FixedLocaleContextResolver
  (Ljava/util/Locale;Ljava/util/TimeZone;)V
 resolveLocaleContext
  (Lorg/springframework/web/server/ServerWebExchange;)Lorg/springframework/context/i18n/LocaleContext;
- (Lorg/springframework/web/server/ServerWebExchange;)Lorg/springframework/context/i18n/LocaleContext;
+ (Lorg/springframework/web/server/ServerWebExchange;)L1org/springframework/context/i18n/LocaleContext;
 setLocaleContext
  (Lorg/springframework/web/server/ServerWebExchange;Lorg/springframework/context/i18n/LocaleContext;)V
  (Lorg/springframework/web/server/ServerWebExchange;Lorg/springframework/context/i18n/LocaleContext;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/server/session/InMemoryWebSessionStore.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/server/session/InMemoryWebSessionStore.eea
index fe1647113b..59e84f1d4e 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/server/session/InMemoryWebSessionStore.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/server/session/InMemoryWebSessionStore.eea
@@ -2,7 +2,7 @@ class org/springframework/web/server/session/InMemoryWebSessionStore
 
 createWebSession
  ()Lreactor/core/publisher/Mono<Lorg/springframework/web/server/WebSession;>;
- ()Lreactor/core/publisher/Mono<Lorg/springframework/web/server/WebSession;>;
+ ()L1reactor/core/publisher/Mono<Lorg/springframework/web/server/WebSession;>; # @Inherited(org.springframework.web.server.session.WebSessionStore)
 getClock
  ()Ljava/time/Clock;
  ()Ljava/time/Clock;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/server/session/WebSessionStore.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/server/session/WebSessionStore.eea
index b409e87dd8..cac73bc572 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/server/session/WebSessionStore.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/server/session/WebSessionStore.eea
@@ -2,7 +2,7 @@ class org/springframework/web/server/session/WebSessionStore
 
 createWebSession
  ()Lreactor/core/publisher/Mono<Lorg/springframework/web/server/WebSession;>;
- ()Lreactor/core/publisher/Mono<Lorg/springframework/web/server/WebSession;>;
+ ()L1reactor/core/publisher/Mono<Lorg/springframework/web/server/WebSession;>;
 removeSession
  (Ljava/lang/String;)Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
  (Ljava/lang/String;)Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/util/ContentCachingRequestWrapper.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/util/ContentCachingRequestWrapper.eea
index f96d49693f..23adf4b504 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/util/ContentCachingRequestWrapper.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/util/ContentCachingRequestWrapper.eea
@@ -8,7 +8,7 @@ class org/springframework/web/util/ContentCachingRequestWrapper
  (Ljavax/servlet/http/HttpServletRequest;I)V
 getCharacterEncoding
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getContentAsByteArray
  ()[B
  ()[B
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/util/CookieGenerator.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/util/CookieGenerator.eea
index 05320fdd72..c316cf38b7 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/util/CookieGenerator.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/util/CookieGenerator.eea
@@ -13,7 +13,7 @@ addCookie
  (Ljavax/servlet/http/HttpServletResponse;Ljava/lang/String;)V
 createCookie
  (Ljava/lang/String;)Ljavax/servlet/http/Cookie;
- (Ljava/lang/String;)Ljavax/servlet/http/Cookie;
+ (Ljava/lang/String;)L1javax/servlet/http/Cookie;
 getCookieDomain
  ()Ljava/lang/String;
  ()L0java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/util/DefaultUriBuilderFactory.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/util/DefaultUriBuilderFactory.eea
index 86eb52a24c..93233dc0f5 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/util/DefaultUriBuilderFactory.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/util/DefaultUriBuilderFactory.eea
@@ -8,7 +8,7 @@ class org/springframework/web/util/DefaultUriBuilderFactory
  (Lorg/springframework/web/util/UriComponentsBuilder;)V
 builder
  ()Lorg/springframework/web/util/UriBuilder;
- ()Lorg/springframework/web/util/UriBuilder;
+ ()L1org/springframework/web/util/UriBuilder;
 expand
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)Ljava/net/URI;
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)Ljava/net/URI;
@@ -29,4 +29,4 @@ setEncodingMode
  (Lorg/springframework/web/util/DefaultUriBuilderFactory$EncodingMode;)V
 uriString
  (Ljava/lang/String;)Lorg/springframework/web/util/UriBuilder;
- (Ljava/lang/String;)Lorg/springframework/web/util/UriBuilder;
+ (Ljava/lang/String;)L1org/springframework/web/util/UriBuilder;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/util/HtmlUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/util/HtmlUtils.eea
index 7cc33809a8..673148baae 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/util/HtmlUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/util/HtmlUtils.eea
@@ -5,19 +5,19 @@ htmlEscape
  (Ljava/lang/String;)Ljava/lang/String;
 htmlEscape
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 htmlEscapeDecimal
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
 htmlEscapeDecimal
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 htmlEscapeHex
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
 htmlEscapeHex
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 htmlUnescape
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/util/JavaScriptUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/util/JavaScriptUtils.eea
index 366066ab81..0eb5d41539 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/util/JavaScriptUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/util/JavaScriptUtils.eea
@@ -2,4 +2,4 @@ class org/springframework/web/util/JavaScriptUtils
 
 javaScriptEscape
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/util/UriComponentsBuilder.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/util/UriComponentsBuilder.eea
index a3cf702e68..ded9a44703 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/util/UriComponentsBuilder.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/util/UriComponentsBuilder.eea
@@ -5,22 +5,22 @@ fromHttpRequest
  (Lorg/springframework/http/HttpRequest;)Lorg/springframework/web/util/UriComponentsBuilder;
 fromHttpUrl
  (Ljava/lang/String;)Lorg/springframework/web/util/UriComponentsBuilder;
- (Ljava/lang/String;)Lorg/springframework/web/util/UriComponentsBuilder;
+ (Ljava/lang/String;)L1org/springframework/web/util/UriComponentsBuilder;
 fromOriginHeader
  (Ljava/lang/String;)Lorg/springframework/web/util/UriComponentsBuilder;
- (Ljava/lang/String;)Lorg/springframework/web/util/UriComponentsBuilder;
+ (Ljava/lang/String;)L1org/springframework/web/util/UriComponentsBuilder;
 fromPath
  (Ljava/lang/String;)Lorg/springframework/web/util/UriComponentsBuilder;
- (Ljava/lang/String;)Lorg/springframework/web/util/UriComponentsBuilder;
+ (Ljava/lang/String;)L1org/springframework/web/util/UriComponentsBuilder;
 fromUri
  (Ljava/net/URI;)Lorg/springframework/web/util/UriComponentsBuilder;
- (Ljava/net/URI;)Lorg/springframework/web/util/UriComponentsBuilder;
+ (Ljava/net/URI;)L1org/springframework/web/util/UriComponentsBuilder;
 fromUriString
  (Ljava/lang/String;)Lorg/springframework/web/util/UriComponentsBuilder;
- (Ljava/lang/String;)Lorg/springframework/web/util/UriComponentsBuilder;
+ (Ljava/lang/String;)L1org/springframework/web/util/UriComponentsBuilder;
 newInstance
  ()Lorg/springframework/web/util/UriComponentsBuilder;
- ()Lorg/springframework/web/util/UriComponentsBuilder;
+ ()L1org/springframework/web/util/UriComponentsBuilder;
 parseForwardedFor
  (Lorg/springframework/http/HttpRequest;Ljava/net/InetSocketAddress;)Ljava/net/InetSocketAddress;
  (Lorg/springframework/http/HttpRequest;Ljava/net/InetSocketAddress;)L0java/net/InetSocketAddress;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/util/UriUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/util/UriUtils.eea
index 3f5900d546..60f272a994 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/util/UriUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/util/UriUtils.eea
@@ -62,7 +62,7 @@ encodeQueryParam
  (Ljava/lang/String;Ljava/nio/charset/Charset;)Ljava/lang/String;
 encodeQueryParams
  (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;)Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
- (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;)Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
+ (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;)L1org/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
 encodeScheme
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/util/WebUtils.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/util/WebUtils.eea
index 199d8ce1d6..edbcfccf35 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/util/WebUtils.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/util/WebUtils.eea
@@ -102,7 +102,7 @@ getNativeResponse
  <T:Ljava/lang/Object;>(Ljavax/servlet/ServletResponse;Ljava/lang/Class<TT;>;)T0T;
 getParametersStartingWith
  (Ljavax/servlet/ServletRequest;Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- (Ljavax/servlet/ServletRequest;Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ (Ljavax/servlet/ServletRequest;Ljava/lang/String;)L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 getRealPath
  (Ljavax/servlet/ServletContext;Ljava/lang/String;)Ljava/lang/String;
  (Ljavax/servlet/ServletContext;Ljava/lang/String;)Ljava/lang/String;
@@ -138,7 +138,7 @@ isValidOrigin
  (Lorg/springframework/http/HttpRequest;Ljava/util/Collection<Ljava/lang/String;>;)Z
 parseMatrixVariables
  (Ljava/lang/String;)Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
- (Ljava/lang/String;)Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
+ (Ljava/lang/String;)L1org/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
 removeWebAppRootSystemProperty
  (Ljavax/servlet/ServletContext;)V
  (Ljavax/servlet/ServletContext;)V
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/util/pattern/PathPatternRouteMatcher.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/util/pattern/PathPatternRouteMatcher.eea
index 3a4f1e9fd6..c8a92ac962 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/util/pattern/PathPatternRouteMatcher.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/util/pattern/PathPatternRouteMatcher.eea
@@ -20,4 +20,4 @@ matchAndExtract
  (Ljava/lang/String;Lorg/springframework/util/RouteMatcher$Route;)L0java/util/Map<Ljava/lang/String;Ljava/lang/String;>; # @Inherited(org.springframework.util.RouteMatcher)
 parseRoute
  (Ljava/lang/String;)Lorg/springframework/util/RouteMatcher$Route;
- (Ljava/lang/String;)Lorg/springframework/util/RouteMatcher$Route;
+ (Ljava/lang/String;)L1org/springframework/util/RouteMatcher$Route;
diff --git a/libs/eea-spring-5/src/main/resources/org/springframework/web/util/pattern/PatternParseException.eea b/libs/eea-spring-5/src/main/resources/org/springframework/web/util/pattern/PatternParseException.eea
index 685773eb59..7a73f3eb8f 100644
--- a/libs/eea-spring-5/src/main/resources/org/springframework/web/util/pattern/PatternParseException.eea
+++ b/libs/eea-spring-5/src/main/resources/org/springframework/web/util/pattern/PatternParseException.eea
@@ -11,4 +11,4 @@ getMessageType
  ()Lorg/springframework/web/util/pattern/PatternParseException$PatternMessage;
 toDetailedString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/aspectj/AbstractAspectJAdvice.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/aspectj/AbstractAspectJAdvice.eea
index 53602404d9..b14cead3bf 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/aspectj/AbstractAspectJAdvice.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/aspectj/AbstractAspectJAdvice.eea
@@ -6,7 +6,7 @@ JOIN_POINT_KEY
 
 currentJoinPoint
  ()Lorg/aspectj/lang/JoinPoint;
- ()Lorg/aspectj/lang/JoinPoint;
+ ()L1org/aspectj/lang/JoinPoint;
 
 aspectJAdviceMethod
  Ljava/lang/reflect/Method;
@@ -17,13 +17,13 @@ aspectJAdviceMethod
  (Ljava/lang/reflect/Method;Lorg/springframework/aop/aspectj/AspectJExpressionPointcut;Lorg/springframework/aop/aspectj/AspectInstanceFactory;)V
 argBinding
  (Lorg/aspectj/lang/JoinPoint;Lorg/aspectj/weaver/tools/JoinPointMatch;Ljava/lang/Object;Ljava/lang/Throwable;)[Ljava/lang/Object;
- (Lorg/aspectj/lang/JoinPoint;Lorg/aspectj/weaver/tools/JoinPointMatch;Ljava/lang/Object;Ljava/lang/Throwable;)[Ljava/lang/Object;
+ (Lorg/aspectj/lang/JoinPoint;Lorg/aspectj/weaver/tools/JoinPointMatch;Ljava/lang/Object;Ljava/lang/Throwable;)[1Ljava/lang/Object;
 buildSafePointcut
  ()Lorg/springframework/aop/Pointcut;
- ()Lorg/springframework/aop/Pointcut;
+ ()L1org/springframework/aop/Pointcut;
 createParameterNameDiscoverer
  ()Lorg/springframework/core/ParameterNameDiscoverer;
- ()Lorg/springframework/core/ParameterNameDiscoverer;
+ ()L1org/springframework/core/ParameterNameDiscoverer;
 getAspectClassLoader
  ()Ljava/lang/ClassLoader;
  ()L0java/lang/ClassLoader;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/aspectj/AspectJAroundAdvice.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/aspectj/AspectJAroundAdvice.eea
index 2c6359699c..1cf0fdd2fc 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/aspectj/AspectJAroundAdvice.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/aspectj/AspectJAroundAdvice.eea
@@ -8,4 +8,4 @@ invoke
  (Lorg/aopalliance/intercept/MethodInvocation;)L0java/lang/Object;
 lazyGetProceedingJoinPoint
  (Lorg/springframework/aop/ProxyMethodInvocation;)Lorg/aspectj/lang/ProceedingJoinPoint;
- (Lorg/springframework/aop/ProxyMethodInvocation;)Lorg/aspectj/lang/ProceedingJoinPoint;
+ (Lorg/springframework/aop/ProxyMethodInvocation;)L1org/aspectj/lang/ProceedingJoinPoint;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.eea
index b2846de43b..b0916bc811 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.eea
@@ -8,7 +8,7 @@ getArgs
  ()[Ljava/lang/Object;
 getKind
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSignature
  ()Lorg/aspectj/lang/Signature;
  ()Lorg/aspectj/lang/Signature;
@@ -35,10 +35,10 @@ set$AroundClosure
  (Lorg/aspectj/runtime/internal/AroundClosure;)V
 toLongString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toShortString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.eea
index 53e71e6ecf..6f1e3de641 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.eea
@@ -11,4 +11,4 @@ getAdvisor
  (Ljava/lang/reflect/Method;Lorg/springframework/aop/aspectj/annotation/MetadataAwareAspectInstanceFactory;ILjava/lang/String;)L0org/springframework/aop/Advisor; # @Inherited(org.springframework.aop.aspectj.annotation.AspectJAdvisorFactory)
 getAdvisors
  (Lorg/springframework/aop/aspectj/annotation/MetadataAwareAspectInstanceFactory;)Ljava/util/List<Lorg/springframework/aop/Advisor;>;
- (Lorg/springframework/aop/aspectj/annotation/MetadataAwareAspectInstanceFactory;)Ljava/util/List<Lorg/springframework/aop/Advisor;>;
+ (Lorg/springframework/aop/aspectj/annotation/MetadataAwareAspectInstanceFactory;)L1java/util/List<Lorg/springframework/aop/Advisor;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.eea
index 94fcd2ab42..2571ce8735 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.eea
@@ -2,10 +2,10 @@ class org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDeco
 
 createInterceptorDefinition
  (Lorg/w3c/dom/Node;)Lorg/springframework/beans/factory/config/BeanDefinition;
- (Lorg/w3c/dom/Node;)Lorg/springframework/beans/factory/config/BeanDefinition;
+ (Lorg/w3c/dom/Node;)L1org/springframework/beans/factory/config/BeanDefinition;
 decorate
  (Lorg/w3c/dom/Node;Lorg/springframework/beans/factory/config/BeanDefinitionHolder;Lorg/springframework/beans/factory/xml/ParserContext;)Lorg/springframework/beans/factory/config/BeanDefinitionHolder;
- (Lorg/w3c/dom/Node;Lorg/springframework/beans/factory/config/BeanDefinitionHolder;Lorg/springframework/beans/factory/xml/ParserContext;)Lorg/springframework/beans/factory/config/BeanDefinitionHolder;
+ (Lorg/w3c/dom/Node;Lorg/springframework/beans/factory/config/BeanDefinitionHolder;Lorg/springframework/beans/factory/xml/ParserContext;)L1org/springframework/beans/factory/config/BeanDefinitionHolder;
 getInterceptorNameSuffix
  (Lorg/springframework/beans/factory/config/BeanDefinition;)Ljava/lang/String;
- (Lorg/springframework/beans/factory/config/BeanDefinition;)Ljava/lang/String;
+ (Lorg/springframework/beans/factory/config/BeanDefinition;)L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/config/AdvisorComponentDefinition.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/config/AdvisorComponentDefinition.eea
index c1cd5c1b6f..fc81d8a9e0 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/config/AdvisorComponentDefinition.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/config/AdvisorComponentDefinition.eea
@@ -8,10 +8,10 @@ class org/springframework/aop/config/AdvisorComponentDefinition
  (Ljava/lang/String;Lorg/springframework/beans/factory/config/BeanDefinition;Lorg/springframework/beans/factory/config/BeanDefinition;)V
 getBeanDefinitions
  ()[Lorg/springframework/beans/factory/config/BeanDefinition;
- ()[Lorg/springframework/beans/factory/config/BeanDefinition;
+ ()[1Lorg/springframework/beans/factory/config/BeanDefinition; # @Inherited(org.springframework.beans.factory.parsing.AbstractComponentDefinition)
 getBeanReferences
  ()[Lorg/springframework/beans/factory/config/BeanReference;
- ()[Lorg/springframework/beans/factory/config/BeanReference;
+ ()[1Lorg/springframework/beans/factory/config/BeanReference; # @Inherited(org.springframework.beans.factory.parsing.AbstractComponentDefinition)
 getDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/config/AspectComponentDefinition.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/config/AspectComponentDefinition.eea
index 536f7b25a0..f780fffcba 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/config/AspectComponentDefinition.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/config/AspectComponentDefinition.eea
@@ -5,7 +5,7 @@ class org/springframework/aop/config/AspectComponentDefinition
  (Ljava/lang/String;[Lorg/springframework/beans/factory/config/BeanDefinition;[Lorg/springframework/beans/factory/config/BeanReference;Ljava/lang/Object;)V
 getBeanDefinitions
  ()[Lorg/springframework/beans/factory/config/BeanDefinition;
- ()[Lorg/springframework/beans/factory/config/BeanDefinition;
+ ()[1Lorg/springframework/beans/factory/config/BeanDefinition; # @Inherited(org.springframework.beans.factory.parsing.AbstractComponentDefinition)
 getBeanReferences
  ()[Lorg/springframework/beans/factory/config/BeanReference;
- ()[Lorg/springframework/beans/factory/config/BeanReference;
+ ()[1Lorg/springframework/beans/factory/config/BeanReference; # @Inherited(org.springframework.beans.factory.parsing.AbstractComponentDefinition)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/config/MethodLocatingFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/config/MethodLocatingFactoryBean.eea
index 9c58aa668b..135374f083 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/config/MethodLocatingFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/config/MethodLocatingFactoryBean.eea
@@ -9,7 +9,7 @@ getObject
  ()L0java/lang/reflect/Method;
 getObjectType
  ()Ljava/lang/Class<Ljava/lang/reflect/Method;>;
- ()Ljava/lang/Class<Ljava/lang/reflect/Method;>;
+ ()L1java/lang/Class<Ljava/lang/reflect/Method;>;
 setBeanFactory
  (Lorg/springframework/beans/factory/BeanFactory;)V
  (Lorg/springframework/beans/factory/BeanFactory;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/config/PointcutComponentDefinition.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/config/PointcutComponentDefinition.eea
index 64789327dc..246809dae2 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/config/PointcutComponentDefinition.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/config/PointcutComponentDefinition.eea
@@ -5,7 +5,7 @@ class org/springframework/aop/config/PointcutComponentDefinition
  (Ljava/lang/String;Lorg/springframework/beans/factory/config/BeanDefinition;Ljava/lang/String;)V
 getBeanDefinitions
  ()[Lorg/springframework/beans/factory/config/BeanDefinition;
- ()[Lorg/springframework/beans/factory/config/BeanDefinition;
+ ()[1Lorg/springframework/beans/factory/config/BeanDefinition; # @Inherited(org.springframework.beans.factory.parsing.AbstractComponentDefinition)
 getDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.eea
index e482d94966..ef81cf940e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.eea
@@ -21,4 +21,4 @@ postProcessAfterInitialization
  (Ljava/lang/Object;Ljava/lang/String;)L0java/lang/Object; # @Inherited(org.springframework.beans.factory.config.BeanPostProcessor)
 prepareProxyFactory
  (Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/aop/framework/ProxyFactory;
- (Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/aop/framework/ProxyFactory;
+ (Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/aop/framework/ProxyFactory;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.eea
index d896c074be..1d4729c83b 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.eea
@@ -6,10 +6,10 @@ super org/springframework/beans/factory/FactoryBean
 
 createMainInterceptor
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 createTargetSource
  (Ljava/lang/Object;)Lorg/springframework/aop/TargetSource;
- (Ljava/lang/Object;)Lorg/springframework/aop/TargetSource;
+ (Ljava/lang/Object;)L1org/springframework/aop/TargetSource;
 getObject
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/AdvisedSupport.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/AdvisedSupport.eea
index 2de4415897..cb91b232ff 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/AdvisedSupport.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/AdvisedSupport.eea
@@ -99,7 +99,7 @@ setTargetSource
  (Lorg/springframework/aop/TargetSource;)V
 toProxyConfigString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(org.springframework.aop.framework.ProxyConfig)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/AopProxyFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/AopProxyFactory.eea
index 1ba7e63697..6e4f73c7c8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/AopProxyFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/AopProxyFactory.eea
@@ -2,4 +2,4 @@ class org/springframework/aop/framework/AopProxyFactory
 
 createAopProxy
  (Lorg/springframework/aop/framework/AdvisedSupport;)Lorg/springframework/aop/framework/AopProxy;
- (Lorg/springframework/aop/framework/AdvisedSupport;)Lorg/springframework/aop/framework/AopProxy;
+ (Lorg/springframework/aop/framework/AdvisedSupport;)L1org/springframework/aop/framework/AopProxy;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/DefaultAopProxyFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/DefaultAopProxyFactory.eea
index dfc793f6a0..4cd14972d9 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/DefaultAopProxyFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/DefaultAopProxyFactory.eea
@@ -6,4 +6,4 @@ INSTANCE
 
 createAopProxy
  (Lorg/springframework/aop/framework/AdvisedSupport;)Lorg/springframework/aop/framework/AopProxy;
- (Lorg/springframework/aop/framework/AdvisedSupport;)Lorg/springframework/aop/framework/AopProxy;
+ (Lorg/springframework/aop/framework/AdvisedSupport;)L1org/springframework/aop/framework/AopProxy; # @Inherited(org.springframework.aop.framework.AopProxyFactory)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/ProxyCreatorSupport.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/ProxyCreatorSupport.eea
index afaac91bcb..86de242459 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/ProxyCreatorSupport.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/ProxyCreatorSupport.eea
@@ -8,7 +8,7 @@ addListener
  (L1org/springframework/aop/framework/AdvisedSupportListener;)V
 createAopProxy
  ()Lorg/springframework/aop/framework/AopProxy;
- ()Lorg/springframework/aop/framework/AopProxy;
+ ()L1org/springframework/aop/framework/AopProxy;
 getAopProxyFactory
  ()Lorg/springframework/aop/framework/AopProxyFactory;
  ()Lorg/springframework/aop/framework/AopProxyFactory;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.eea
index ea4737f29d..c7d0950c91 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.eea
@@ -13,10 +13,10 @@ logger
 
 buildAdvisors
  (Ljava/lang/String;[Ljava/lang/Object;)[Lorg/springframework/aop/Advisor;
- (Ljava/lang/String;[Ljava/lang/Object;)[Lorg/springframework/aop/Advisor;
+ (Ljava/lang/String;[Ljava/lang/Object;)[1Lorg/springframework/aop/Advisor;
 createProxy
  (Ljava/lang/Class<*>;Ljava/lang/String;[Ljava/lang/Object;Lorg/springframework/aop/TargetSource;)Ljava/lang/Object;
- (Ljava/lang/Class<*>;Ljava/lang/String;[Ljava/lang/Object;Lorg/springframework/aop/TargetSource;)Ljava/lang/Object;
+ (Ljava/lang/Class<*>;Ljava/lang/String;[Ljava/lang/Object;Lorg/springframework/aop/TargetSource;)L1java/lang/Object;
 customizeProxyFactory
  (Lorg/springframework/aop/framework/ProxyFactory;)V
  (Lorg/springframework/aop/framework/ProxyFactory;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/autoproxy/AbstractBeanFactoryAwareAdvisingPostProcessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/autoproxy/AbstractBeanFactoryAwareAdvisingPostProcessor.eea
index c15a2d8d95..af98b7a34e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/autoproxy/AbstractBeanFactoryAwareAdvisingPostProcessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/autoproxy/AbstractBeanFactoryAwareAdvisingPostProcessor.eea
@@ -5,7 +5,7 @@ isEligible
  (Ljava/lang/Object;Ljava/lang/String;)Z
 prepareProxyFactory
  (Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/aop/framework/ProxyFactory;
- (Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/aop/framework/ProxyFactory;
+ (Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/aop/framework/ProxyFactory; # @Inherited(org.springframework.aop.framework.AbstractAdvisingBeanPostProcessor)
 setBeanFactory
  (Lorg/springframework/beans/factory/BeanFactory;)V
  (Lorg/springframework/beans/factory/BeanFactory;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/autoproxy/BeanFactoryAdvisorRetrievalHelper.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/autoproxy/BeanFactoryAdvisorRetrievalHelper.eea
index 32e8b7c0ea..ae038f682a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/autoproxy/BeanFactoryAdvisorRetrievalHelper.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/framework/autoproxy/BeanFactoryAdvisorRetrievalHelper.eea
@@ -5,7 +5,7 @@ class org/springframework/aop/framework/autoproxy/BeanFactoryAdvisorRetrievalHel
  (Lorg/springframework/beans/factory/config/ConfigurableListableBeanFactory;)V
 findAdvisorBeans
  ()Ljava/util/List<Lorg/springframework/aop/Advisor;>;
- ()Ljava/util/List<Lorg/springframework/aop/Advisor;>;
+ ()L1java/util/List<Lorg/springframework/aop/Advisor;>;
 isEligibleBean
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.eea
index 0b6d1c5115..764ad709b7 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.eea
@@ -2,7 +2,7 @@ class org/springframework/aop/interceptor/AbstractMonitoringInterceptor
 
 createInvocationTraceName
  (Lorg/aopalliance/intercept/MethodInvocation;)Ljava/lang/String;
- (Lorg/aopalliance/intercept/MethodInvocation;)Ljava/lang/String;
+ (Lorg/aopalliance/intercept/MethodInvocation;)L1java/lang/String;
 getPrefix
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/interceptor/CustomizableTraceInterceptor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/interceptor/CustomizableTraceInterceptor.eea
index a0ca2555b6..4cab75b341 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/interceptor/CustomizableTraceInterceptor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/interceptor/CustomizableTraceInterceptor.eea
@@ -30,7 +30,7 @@ invokeUnderTrace
  (Lorg/aopalliance/intercept/MethodInvocation;Lorg/apache/commons/logging/Log;)L0java/lang/Object; # @Inherited(org.springframework.aop.interceptor.AbstractTraceInterceptor)
 replacePlaceholders
  (Ljava/lang/String;Lorg/aopalliance/intercept/MethodInvocation;Ljava/lang/Object;Ljava/lang/Throwable;J)Ljava/lang/String;
- (Ljava/lang/String;Lorg/aopalliance/intercept/MethodInvocation;Ljava/lang/Object;Ljava/lang/Throwable;J)Ljava/lang/String;
+ (Ljava/lang/String;Lorg/aopalliance/intercept/MethodInvocation;Ljava/lang/Object;Ljava/lang/Throwable;J)L1java/lang/String;
 setEnterMessage
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/interceptor/DebugInterceptor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/interceptor/DebugInterceptor.eea
index 3a4ddee2b1..06fe959efe 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/interceptor/DebugInterceptor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/interceptor/DebugInterceptor.eea
@@ -2,7 +2,7 @@ class org/springframework/aop/interceptor/DebugInterceptor
 
 getInvocationDescription
  (Lorg/aopalliance/intercept/MethodInvocation;)Ljava/lang/String;
- (Lorg/aopalliance/intercept/MethodInvocation;)Ljava/lang/String;
+ (Lorg/aopalliance/intercept/MethodInvocation;)L1java/lang/String; # @Inherited(org.springframework.aop.interceptor.SimpleTraceInterceptor)
 invoke
  (Lorg/aopalliance/intercept/MethodInvocation;)Ljava/lang/Object;
  (Lorg/aopalliance/intercept/MethodInvocation;)L0java/lang/Object; # @Inherited(org.springframework.aop.interceptor.AbstractTraceInterceptor)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.eea
index 89623e2780..9d989a215c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.eea
@@ -2,10 +2,10 @@ class org/springframework/aop/interceptor/ExposeBeanNameAdvisors
 
 createAdvisorIntroducingNamedBean
  (Ljava/lang/String;)Lorg/springframework/aop/Advisor;
- (Ljava/lang/String;)Lorg/springframework/aop/Advisor;
+ (Ljava/lang/String;)L1org/springframework/aop/Advisor;
 createAdvisorWithoutIntroduction
  (Ljava/lang/String;)Lorg/springframework/aop/Advisor;
- (Ljava/lang/String;)Lorg/springframework/aop/Advisor;
+ (Ljava/lang/String;)L1org/springframework/aop/Advisor;
 getBeanName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/interceptor/SimpleTraceInterceptor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/interceptor/SimpleTraceInterceptor.eea
index 34f43e5c9b..5bbb4ffcc2 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/interceptor/SimpleTraceInterceptor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/interceptor/SimpleTraceInterceptor.eea
@@ -2,7 +2,7 @@ class org/springframework/aop/interceptor/SimpleTraceInterceptor
 
 getInvocationDescription
  (Lorg/aopalliance/intercept/MethodInvocation;)Ljava/lang/String;
- (Lorg/aopalliance/intercept/MethodInvocation;)Ljava/lang/String;
+ (Lorg/aopalliance/intercept/MethodInvocation;)L1java/lang/String;
 invokeUnderTrace
  (Lorg/aopalliance/intercept/MethodInvocation;Lorg/apache/commons/logging/Log;)Ljava/lang/Object;
  (Lorg/aopalliance/intercept/MethodInvocation;Lorg/apache/commons/logging/Log;)L0java/lang/Object; # @Inherited(org.springframework.aop.interceptor.AbstractTraceInterceptor)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/scope/ScopedProxyUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/scope/ScopedProxyUtils.eea
index af68380106..3d82e94d68 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/scope/ScopedProxyUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/scope/ScopedProxyUtils.eea
@@ -2,13 +2,13 @@ class org/springframework/aop/scope/ScopedProxyUtils
 
 createScopedProxy
  (Lorg/springframework/beans/factory/config/BeanDefinitionHolder;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;Z)Lorg/springframework/beans/factory/config/BeanDefinitionHolder;
- (Lorg/springframework/beans/factory/config/BeanDefinitionHolder;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;Z)Lorg/springframework/beans/factory/config/BeanDefinitionHolder;
+ (Lorg/springframework/beans/factory/config/BeanDefinitionHolder;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;Z)L1org/springframework/beans/factory/config/BeanDefinitionHolder;
 getOriginalBeanName
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
 getTargetBeanName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 isScopedTarget
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/support/ClassFilters.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/support/ClassFilters.eea
index 43003a5a34..98c3178552 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/support/ClassFilters.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/support/ClassFilters.eea
@@ -5,13 +5,13 @@ intersection
  (Lorg/springframework/aop/ClassFilter;Lorg/springframework/aop/ClassFilter;)Lorg/springframework/aop/ClassFilter;
 intersection
  ([Lorg/springframework/aop/ClassFilter;)Lorg/springframework/aop/ClassFilter;
- ([Lorg/springframework/aop/ClassFilter;)Lorg/springframework/aop/ClassFilter;
+ ([Lorg/springframework/aop/ClassFilter;)L1org/springframework/aop/ClassFilter;
 negate
  (Lorg/springframework/aop/ClassFilter;)Lorg/springframework/aop/ClassFilter;
- (Lorg/springframework/aop/ClassFilter;)Lorg/springframework/aop/ClassFilter;
+ (Lorg/springframework/aop/ClassFilter;)L1org/springframework/aop/ClassFilter;
 union
  (Lorg/springframework/aop/ClassFilter;Lorg/springframework/aop/ClassFilter;)Lorg/springframework/aop/ClassFilter;
  (Lorg/springframework/aop/ClassFilter;Lorg/springframework/aop/ClassFilter;)Lorg/springframework/aop/ClassFilter;
 union
  ([Lorg/springframework/aop/ClassFilter;)Lorg/springframework/aop/ClassFilter;
- ([Lorg/springframework/aop/ClassFilter;)Lorg/springframework/aop/ClassFilter;
+ ([Lorg/springframework/aop/ClassFilter;)L1org/springframework/aop/ClassFilter;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/support/MethodMatchers.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/support/MethodMatchers.eea
index 8b38cc3607..26fce261da 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/support/MethodMatchers.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/support/MethodMatchers.eea
@@ -2,13 +2,13 @@ class org/springframework/aop/support/MethodMatchers
 
 intersection
  (Lorg/springframework/aop/MethodMatcher;Lorg/springframework/aop/MethodMatcher;)Lorg/springframework/aop/MethodMatcher;
- (Lorg/springframework/aop/MethodMatcher;Lorg/springframework/aop/MethodMatcher;)Lorg/springframework/aop/MethodMatcher;
+ (Lorg/springframework/aop/MethodMatcher;Lorg/springframework/aop/MethodMatcher;)L1org/springframework/aop/MethodMatcher;
 matches
  (Lorg/springframework/aop/MethodMatcher;Ljava/lang/reflect/Method;Ljava/lang/Class<*>;Z)Z
  (Lorg/springframework/aop/MethodMatcher;Ljava/lang/reflect/Method;Ljava/lang/Class<*>;Z)Z
 negate
  (Lorg/springframework/aop/MethodMatcher;)Lorg/springframework/aop/MethodMatcher;
- (Lorg/springframework/aop/MethodMatcher;)Lorg/springframework/aop/MethodMatcher;
+ (Lorg/springframework/aop/MethodMatcher;)L1org/springframework/aop/MethodMatcher;
 union
  (Lorg/springframework/aop/MethodMatcher;Lorg/springframework/aop/MethodMatcher;)Lorg/springframework/aop/MethodMatcher;
- (Lorg/springframework/aop/MethodMatcher;Lorg/springframework/aop/MethodMatcher;)Lorg/springframework/aop/MethodMatcher;
+ (Lorg/springframework/aop/MethodMatcher;Lorg/springframework/aop/MethodMatcher;)L1org/springframework/aop/MethodMatcher;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/support/RegexpMethodPointcutAdvisor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/support/RegexpMethodPointcutAdvisor.eea
index 3fbeae416c..a538ca3c25 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/support/RegexpMethodPointcutAdvisor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/support/RegexpMethodPointcutAdvisor.eea
@@ -11,7 +11,7 @@ class org/springframework/aop/support/RegexpMethodPointcutAdvisor
  ([Ljava/lang/String;Lorg/aopalliance/aop/Advice;)V
 createPointcut
  ()Lorg/springframework/aop/support/AbstractRegexpMethodPointcut;
- ()Lorg/springframework/aop/support/AbstractRegexpMethodPointcut;
+ ()L1org/springframework/aop/support/AbstractRegexpMethodPointcut;
 getPointcut
  ()Lorg/springframework/aop/Pointcut;
  ()Lorg/springframework/aop/Pointcut;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.eea
index 6942de481e..7c6defa0d6 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.eea
@@ -2,10 +2,10 @@ class org/springframework/aop/support/annotation/AnnotationMatchingPointcut
 
 forClassAnnotation
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lorg/springframework/aop/support/annotation/AnnotationMatchingPointcut;
- (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lorg/springframework/aop/support/annotation/AnnotationMatchingPointcut;
+ (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)L1org/springframework/aop/support/annotation/AnnotationMatchingPointcut;
 forMethodAnnotation
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lorg/springframework/aop/support/annotation/AnnotationMatchingPointcut;
- (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lorg/springframework/aop/support/annotation/AnnotationMatchingPointcut;
+ (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)L1org/springframework/aop/support/annotation/AnnotationMatchingPointcut;
 
 <init>
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aot/generate/AccessControl.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aot/generate/AccessControl.eea
index aefc05e3be..475bc00032 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aot/generate/AccessControl.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aot/generate/AccessControl.eea
@@ -2,13 +2,13 @@ class org/springframework/aot/generate/AccessControl
 
 forClass
  (Ljava/lang/Class<*>;)Lorg/springframework/aot/generate/AccessControl;
- (Ljava/lang/Class<*>;)Lorg/springframework/aot/generate/AccessControl;
+ (Ljava/lang/Class<*>;)L1org/springframework/aot/generate/AccessControl;
 forMember
  (Ljava/lang/reflect/Member;)Lorg/springframework/aot/generate/AccessControl;
- (Ljava/lang/reflect/Member;)Lorg/springframework/aot/generate/AccessControl;
+ (Ljava/lang/reflect/Member;)L1org/springframework/aot/generate/AccessControl;
 forResolvableType
  (Lorg/springframework/core/ResolvableType;)Lorg/springframework/aot/generate/AccessControl;
- (Lorg/springframework/core/ResolvableType;)Lorg/springframework/aot/generate/AccessControl;
+ (Lorg/springframework/core/ResolvableType;)L1org/springframework/aot/generate/AccessControl;
 lowest
  ([Lorg/springframework/aot/generate/AccessControl;)Lorg/springframework/aot/generate/AccessControl;
  ([Lorg/springframework/aot/generate/AccessControl;)Lorg/springframework/aot/generate/AccessControl;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aot/generate/DefaultGenerationContext.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aot/generate/DefaultGenerationContext.eea
index a440b5c365..063f2a241a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aot/generate/DefaultGenerationContext.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aot/generate/DefaultGenerationContext.eea
@@ -20,4 +20,4 @@ getRuntimeHints
  ()Lorg/springframework/aot/hint/RuntimeHints;
 withName
  (Ljava/lang/String;)Lorg/springframework/aot/generate/DefaultGenerationContext;
- (Ljava/lang/String;)Lorg/springframework/aot/generate/DefaultGenerationContext;
+ (Ljava/lang/String;)L1org/springframework/aot/generate/DefaultGenerationContext;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aot/generate/GeneratedMethods.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aot/generate/GeneratedMethods.eea
index d0dc82b7d9..3b2bfa0b80 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aot/generate/GeneratedMethods.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aot/generate/GeneratedMethods.eea
@@ -5,7 +5,7 @@ add
  (Ljava/lang/String;Ljava/util/function/Consumer<Lorg/springframework/javapoet/MethodSpec$Builder;>;)Lorg/springframework/aot/generate/GeneratedMethod;
 add
  ([Ljava/lang/String;Ljava/util/function/Consumer<Lorg/springframework/javapoet/MethodSpec$Builder;>;)Lorg/springframework/aot/generate/GeneratedMethod;
- ([Ljava/lang/String;Ljava/util/function/Consumer<Lorg/springframework/javapoet/MethodSpec$Builder;>;)Lorg/springframework/aot/generate/GeneratedMethod;
+ ([Ljava/lang/String;Ljava/util/function/Consumer<Lorg/springframework/javapoet/MethodSpec$Builder;>;)L1org/springframework/aot/generate/GeneratedMethod;
 withPrefix
  (Ljava/lang/String;)Lorg/springframework/aot/generate/GeneratedMethods;
  (Ljava/lang/String;)Lorg/springframework/aot/generate/GeneratedMethods;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aot/generate/GeneratedTypeReference.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aot/generate/GeneratedTypeReference.eea
index ece35ad715..416bf017f7 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aot/generate/GeneratedTypeReference.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aot/generate/GeneratedTypeReference.eea
@@ -2,7 +2,7 @@ class org/springframework/aot/generate/GeneratedTypeReference
 
 of
  (Lorg/springframework/javapoet/ClassName;)Lorg/springframework/aot/generate/GeneratedTypeReference;
- (Lorg/springframework/javapoet/ClassName;)Lorg/springframework/aot/generate/GeneratedTypeReference;
+ (Lorg/springframework/javapoet/ClassName;)L1org/springframework/aot/generate/GeneratedTypeReference;
 
 getCanonicalName
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aot/generate/ValueCodeGenerator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aot/generate/ValueCodeGenerator.eea
index 204da611ca..59c4b0dd56 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aot/generate/ValueCodeGenerator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aot/generate/ValueCodeGenerator.eea
@@ -2,7 +2,7 @@ class org/springframework/aot/generate/ValueCodeGenerator
 
 with
  (Ljava/util/List<Lorg/springframework/aot/generate/ValueCodeGenerator$Delegate;>;)Lorg/springframework/aot/generate/ValueCodeGenerator;
- (Ljava/util/List<Lorg/springframework/aot/generate/ValueCodeGenerator$Delegate;>;)Lorg/springframework/aot/generate/ValueCodeGenerator;
+ (Ljava/util/List<Lorg/springframework/aot/generate/ValueCodeGenerator$Delegate;>;)L1org/springframework/aot/generate/ValueCodeGenerator;
 with
  ([Lorg/springframework/aot/generate/ValueCodeGenerator$Delegate;)Lorg/springframework/aot/generate/ValueCodeGenerator;
  ([Lorg/springframework/aot/generate/ValueCodeGenerator$Delegate;)Lorg/springframework/aot/generate/ValueCodeGenerator;
@@ -12,7 +12,7 @@ withDefaults
 
 add
  (Ljava/util/List<Lorg/springframework/aot/generate/ValueCodeGenerator$Delegate;>;)Lorg/springframework/aot/generate/ValueCodeGenerator;
- (Ljava/util/List<Lorg/springframework/aot/generate/ValueCodeGenerator$Delegate;>;)Lorg/springframework/aot/generate/ValueCodeGenerator;
+ (Ljava/util/List<Lorg/springframework/aot/generate/ValueCodeGenerator$Delegate;>;)L1org/springframework/aot/generate/ValueCodeGenerator;
 generateCode
  (Ljava/lang/Object;)Lorg/springframework/javapoet/CodeBlock;
  (Ljava/lang/Object;)Lorg/springframework/javapoet/CodeBlock;
@@ -21,4 +21,4 @@ getGeneratedMethods
  ()L0org/springframework/aot/generate/GeneratedMethods;
 scoped
  (Lorg/springframework/aot/generate/GeneratedMethods;)Lorg/springframework/aot/generate/ValueCodeGenerator;
- (Lorg/springframework/aot/generate/GeneratedMethods;)Lorg/springframework/aot/generate/ValueCodeGenerator;
+ (Lorg/springframework/aot/generate/GeneratedMethods;)L1org/springframework/aot/generate/ValueCodeGenerator;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/aot/hint/predicate/ReflectionHintsPredicates.eea b/libs/eea-spring-6/src/main/resources/org/springframework/aot/hint/predicate/ReflectionHintsPredicates.eea
index 0f968f5370..12871e4312 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/aot/hint/predicate/ReflectionHintsPredicates.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/aot/hint/predicate/ReflectionHintsPredicates.eea
@@ -2,28 +2,28 @@ class org/springframework/aot/hint/predicate/ReflectionHintsPredicates
 
 onConstructor
  (Ljava/lang/reflect/Constructor<*>;)Lorg/springframework/aot/hint/predicate/ReflectionHintsPredicates$ConstructorHintPredicate;
- (Ljava/lang/reflect/Constructor<*>;)Lorg/springframework/aot/hint/predicate/ReflectionHintsPredicates$ConstructorHintPredicate;
+ (Ljava/lang/reflect/Constructor<*>;)L1org/springframework/aot/hint/predicate/ReflectionHintsPredicates$ConstructorHintPredicate;
 onField
  (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/springframework/aot/hint/predicate/ReflectionHintsPredicates$FieldHintPredicate;
- (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/springframework/aot/hint/predicate/ReflectionHintsPredicates$FieldHintPredicate;
+ (Ljava/lang/Class<*>;Ljava/lang/String;)L1org/springframework/aot/hint/predicate/ReflectionHintsPredicates$FieldHintPredicate;
 onField
  (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/aot/hint/predicate/ReflectionHintsPredicates$FieldHintPredicate;
  (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/aot/hint/predicate/ReflectionHintsPredicates$FieldHintPredicate;
 onField
  (Ljava/lang/reflect/Field;)Lorg/springframework/aot/hint/predicate/ReflectionHintsPredicates$FieldHintPredicate;
- (Ljava/lang/reflect/Field;)Lorg/springframework/aot/hint/predicate/ReflectionHintsPredicates$FieldHintPredicate;
+ (Ljava/lang/reflect/Field;)L1org/springframework/aot/hint/predicate/ReflectionHintsPredicates$FieldHintPredicate;
 onMethod
  (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/springframework/aot/hint/predicate/ReflectionHintsPredicates$MethodHintPredicate;
- (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/springframework/aot/hint/predicate/ReflectionHintsPredicates$MethodHintPredicate;
+ (Ljava/lang/Class<*>;Ljava/lang/String;)L1org/springframework/aot/hint/predicate/ReflectionHintsPredicates$MethodHintPredicate;
 onMethod
  (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/aot/hint/predicate/ReflectionHintsPredicates$MethodHintPredicate;
  (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/aot/hint/predicate/ReflectionHintsPredicates$MethodHintPredicate;
 onMethod
  (Ljava/lang/reflect/Method;)Lorg/springframework/aot/hint/predicate/ReflectionHintsPredicates$MethodHintPredicate;
- (Ljava/lang/reflect/Method;)Lorg/springframework/aot/hint/predicate/ReflectionHintsPredicates$MethodHintPredicate;
+ (Ljava/lang/reflect/Method;)L1org/springframework/aot/hint/predicate/ReflectionHintsPredicates$MethodHintPredicate;
 onType
  (Ljava/lang/Class<*>;)Lorg/springframework/aot/hint/predicate/ReflectionHintsPredicates$TypeHintPredicate;
- (Ljava/lang/Class<*>;)Lorg/springframework/aot/hint/predicate/ReflectionHintsPredicates$TypeHintPredicate;
+ (Ljava/lang/Class<*>;)L1org/springframework/aot/hint/predicate/ReflectionHintsPredicates$TypeHintPredicate;
 onType
  (Lorg/springframework/aot/hint/TypeReference;)Lorg/springframework/aot/hint/predicate/ReflectionHintsPredicates$TypeHintPredicate;
- (Lorg/springframework/aot/hint/TypeReference;)Lorg/springframework/aot/hint/predicate/ReflectionHintsPredicates$TypeHintPredicate;
+ (Lorg/springframework/aot/hint/TypeReference;)L1org/springframework/aot/hint/predicate/ReflectionHintsPredicates$TypeHintPredicate;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/asm/AnnotationVisitor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/asm/AnnotationVisitor.eea
index f115772e7b..a28d7850db 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/asm/AnnotationVisitor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/asm/AnnotationVisitor.eea
@@ -15,10 +15,10 @@ visit
  (Ljava/lang/String;Ljava/lang/Object;)V
 visitAnnotation
  (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;Ljava/lang/String;)L0org/springframework/asm/AnnotationVisitor;
 visitArray
  (Ljava/lang/String;)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;)L0org/springframework/asm/AnnotationVisitor;
 visitEnum
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/asm/Attribute.eea b/libs/eea-spring-6/src/main/resources/org/springframework/asm/Attribute.eea
index c32f790b27..1aa25518b7 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/asm/Attribute.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/asm/Attribute.eea
@@ -9,10 +9,10 @@ type
  (Ljava/lang/String;)V
 getLabels
  ()[Lorg/springframework/asm/Label;
- ()[Lorg/springframework/asm/Label;
+ ()[1Lorg/springframework/asm/Label;
 read
  (Lorg/springframework/asm/ClassReader;II[CI[Lorg/springframework/asm/Label;)Lorg/springframework/asm/Attribute;
- (Lorg/springframework/asm/ClassReader;II[CI[Lorg/springframework/asm/Label;)Lorg/springframework/asm/Attribute;
+ (Lorg/springframework/asm/ClassReader;II[CI[Lorg/springframework/asm/Label;)L1org/springframework/asm/Attribute;
 write
  (Lorg/springframework/asm/ClassWriter;[BIII)Lorg/springframework/asm/ByteVector;
- (Lorg/springframework/asm/ClassWriter;[BIII)Lorg/springframework/asm/ByteVector;
+ (Lorg/springframework/asm/ClassWriter;[BIII)L1org/springframework/asm/ByteVector;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/asm/ClassReader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/asm/ClassReader.eea
index f895fa30cb..19520fb213 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/asm/ClassReader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/asm/ClassReader.eea
@@ -27,7 +27,7 @@ getClassName
  ()Ljava/lang/String;
 getInterfaces
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 getSuperName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -48,4 +48,4 @@ readPackage
  (I[C)Ljava/lang/String;
 readUTF8
  (I[C)Ljava/lang/String;
- (I[C)Ljava/lang/String;
+ (I[C)L0java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/asm/ClassVisitor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/asm/ClassVisitor.eea
index ba2123d05a..6bc8bb7d89 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/asm/ClassVisitor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/asm/ClassVisitor.eea
@@ -15,22 +15,22 @@ visit
  (IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 visitAnnotation
  (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
 visitAttribute
  (Lorg/springframework/asm/Attribute;)V
  (Lorg/springframework/asm/Attribute;)V
 visitField
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/asm/FieldVisitor;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/asm/FieldVisitor;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)L0org/springframework/asm/FieldVisitor;
 visitInnerClass
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
 visitMethod
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)L0org/springframework/asm/MethodVisitor;
 visitModule
  (Ljava/lang/String;ILjava/lang/String;)Lorg/springframework/asm/ModuleVisitor;
- (Ljava/lang/String;ILjava/lang/String;)Lorg/springframework/asm/ModuleVisitor;
+ (Ljava/lang/String;ILjava/lang/String;)L0org/springframework/asm/ModuleVisitor;
 visitNestHost
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
@@ -45,10 +45,10 @@ visitPermittedSubclass
  (Ljava/lang/String;)V
 visitRecordComponent
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/asm/RecordComponentVisitor;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/asm/RecordComponentVisitor;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L0org/springframework/asm/RecordComponentVisitor;
 visitSource
  (Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;)V
 visitTypeAnnotation
  (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/asm/ClassWriter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/asm/ClassWriter.eea
index 6b6229b7a5..c1859ad87e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/asm/ClassWriter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/asm/ClassWriter.eea
@@ -56,22 +56,22 @@ visit
  (IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 visitAnnotation
  (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
 visitAttribute
  (Lorg/springframework/asm/Attribute;)V
  (Lorg/springframework/asm/Attribute;)V
 visitField
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/asm/FieldVisitor;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/asm/FieldVisitor;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)L0org/springframework/asm/FieldVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
 visitInnerClass
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
 visitMethod
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)L0org/springframework/asm/MethodVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
 visitModule
  (Ljava/lang/String;ILjava/lang/String;)Lorg/springframework/asm/ModuleVisitor;
- (Ljava/lang/String;ILjava/lang/String;)Lorg/springframework/asm/ModuleVisitor;
+ (Ljava/lang/String;ILjava/lang/String;)L0org/springframework/asm/ModuleVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
 visitNestHost
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
@@ -86,10 +86,10 @@ visitPermittedSubclass
  (Ljava/lang/String;)V
 visitRecordComponent
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/asm/RecordComponentVisitor;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/asm/RecordComponentVisitor;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L0org/springframework/asm/RecordComponentVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
 visitSource
  (Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;)V
 visitTypeAnnotation
  (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/asm/FieldVisitor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/asm/FieldVisitor.eea
index dc00c927a9..0a869c6539 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/asm/FieldVisitor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/asm/FieldVisitor.eea
@@ -12,10 +12,10 @@ getDelegate
  ()Lorg/springframework/asm/FieldVisitor;
 visitAnnotation
  (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
 visitAttribute
  (Lorg/springframework/asm/Attribute;)V
  (Lorg/springframework/asm/Attribute;)V
 visitTypeAnnotation
  (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/asm/MethodVisitor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/asm/MethodVisitor.eea
index 0aa9610711..a0925a24c0 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/asm/MethodVisitor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/asm/MethodVisitor.eea
@@ -12,10 +12,10 @@ getDelegate
  ()Lorg/springframework/asm/MethodVisitor;
 visitAnnotation
  (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
 visitAnnotationDefault
  ()Lorg/springframework/asm/AnnotationVisitor;
- ()Lorg/springframework/asm/AnnotationVisitor;
+ ()L0org/springframework/asm/AnnotationVisitor;
 visitAttribute
  (Lorg/springframework/asm/Attribute;)V
  (Lorg/springframework/asm/Attribute;)V
@@ -27,7 +27,7 @@ visitFrame
  (II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 visitInsnAnnotation
  (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
 visitInvokeDynamicInsn
  (Ljava/lang/String;Ljava/lang/String;Lorg/springframework/asm/Handle;[Ljava/lang/Object;)V
  (Ljava/lang/String;Ljava/lang/String;Lorg/springframework/asm/Handle;[Ljava/lang/Object;)V
@@ -48,7 +48,7 @@ visitLocalVariable
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lorg/springframework/asm/Label;Lorg/springframework/asm/Label;I)V
 visitLocalVariableAnnotation
  (ILorg/springframework/asm/TypePath;[Lorg/springframework/asm/Label;[Lorg/springframework/asm/Label;[ILjava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;[Lorg/springframework/asm/Label;[Lorg/springframework/asm/Label;[ILjava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;[Lorg/springframework/asm/Label;[Lorg/springframework/asm/Label;[ILjava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
 visitLookupSwitchInsn
  (Lorg/springframework/asm/Label;[I[Lorg/springframework/asm/Label;)V
  (Lorg/springframework/asm/Label;[I[Lorg/springframework/asm/Label;)V
@@ -66,19 +66,19 @@ visitParameter
  (Ljava/lang/String;I)V
 visitParameterAnnotation
  (ILjava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILjava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILjava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
 visitTableSwitchInsn
  (IILorg/springframework/asm/Label;[Lorg/springframework/asm/Label;)V
  (IILorg/springframework/asm/Label;[Lorg/springframework/asm/Label;)V
 visitTryCatchAnnotation
  (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
 visitTryCatchBlock
  (Lorg/springframework/asm/Label;Lorg/springframework/asm/Label;Lorg/springframework/asm/Label;Ljava/lang/String;)V
  (Lorg/springframework/asm/Label;Lorg/springframework/asm/Label;Lorg/springframework/asm/Label;Ljava/lang/String;)V
 visitTypeAnnotation
  (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
 visitTypeInsn
  (ILjava/lang/String;)V
  (ILjava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/asm/RecordComponentVisitor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/asm/RecordComponentVisitor.eea
index 9184cc5561..b6c9bde247 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/asm/RecordComponentVisitor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/asm/RecordComponentVisitor.eea
@@ -12,10 +12,10 @@ getDelegate
  ()Lorg/springframework/asm/RecordComponentVisitor;
 visitAnnotation
  (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
 visitAttribute
  (Lorg/springframework/asm/Attribute;)V
  (Lorg/springframework/asm/Attribute;)V
 visitTypeAnnotation
  (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/asm/Type.eea b/libs/eea-spring-6/src/main/resources/org/springframework/asm/Type.eea
index 9ee4cedb04..116a81bf3b 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/asm/Type.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/asm/Type.eea
@@ -33,28 +33,28 @@ getArgumentCount
  (Ljava/lang/String;)I
 getArgumentTypes
  (Ljava/lang/String;)[Lorg/springframework/asm/Type;
- (Ljava/lang/String;)[Lorg/springframework/asm/Type;
+ (Ljava/lang/String;)[1Lorg/springframework/asm/Type;
 getArgumentTypes
  (Ljava/lang/reflect/Method;)[Lorg/springframework/asm/Type;
- (Ljava/lang/reflect/Method;)[Lorg/springframework/asm/Type;
+ (Ljava/lang/reflect/Method;)[1Lorg/springframework/asm/Type;
 getArgumentsAndReturnSizes
  (Ljava/lang/String;)I
  (Ljava/lang/String;)I
 getConstructorDescriptor
  (Ljava/lang/reflect/Constructor<*>;)Ljava/lang/String;
- (Ljava/lang/reflect/Constructor<*>;)Ljava/lang/String;
+ (Ljava/lang/reflect/Constructor<*>;)L1java/lang/String;
 getDescriptor
  (Ljava/lang/Class<*>;)Ljava/lang/String;
- (Ljava/lang/Class<*>;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;)L1java/lang/String;
 getInternalName
  (Ljava/lang/Class<*>;)Ljava/lang/String;
  (Ljava/lang/Class<*>;)Ljava/lang/String;
 getMethodDescriptor
  (Ljava/lang/reflect/Method;)Ljava/lang/String;
- (Ljava/lang/reflect/Method;)Ljava/lang/String;
+ (Ljava/lang/reflect/Method;)L1java/lang/String;
 getMethodDescriptor
  (Lorg/springframework/asm/Type;[Lorg/springframework/asm/Type;)Ljava/lang/String;
- (Lorg/springframework/asm/Type;[Lorg/springframework/asm/Type;)Ljava/lang/String;
+ (Lorg/springframework/asm/Type;[Lorg/springframework/asm/Type;)L1java/lang/String;
 getMethodType
  (Ljava/lang/String;)Lorg/springframework/asm/Type;
  (Ljava/lang/String;)Lorg/springframework/asm/Type;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/asm/TypePath.eea b/libs/eea-spring-6/src/main/resources/org/springframework/asm/TypePath.eea
index b83daf2199..0195227d48 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/asm/TypePath.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/asm/TypePath.eea
@@ -2,7 +2,7 @@ class org/springframework/asm/TypePath
 
 fromString
  (Ljava/lang/String;)Lorg/springframework/asm/TypePath;
- (Ljava/lang/String;)Lorg/springframework/asm/TypePath;
+ (Ljava/lang/String;)L0org/springframework/asm/TypePath;
 
 toString
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/AbstractNestablePropertyAccessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/AbstractNestablePropertyAccessor.eea
index a8f2712f83..90f6a9f334 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/AbstractNestablePropertyAccessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/AbstractNestablePropertyAccessor.eea
@@ -17,7 +17,7 @@ convertForProperty
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lorg/springframework/core/convert/TypeDescriptor;)L0java/lang/Object;
 createNotWritablePropertyException
  (Ljava/lang/String;)Lorg/springframework/beans/NotWritablePropertyException;
- (Ljava/lang/String;)Lorg/springframework/beans/NotWritablePropertyException;
+ (Ljava/lang/String;)L1org/springframework/beans/NotWritablePropertyException;
 getFinalPath
  (Lorg/springframework/beans/AbstractNestablePropertyAccessor;Ljava/lang/String;)Ljava/lang/String;
  (Lorg/springframework/beans/AbstractNestablePropertyAccessor;Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/BeanWrapperImpl.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/BeanWrapperImpl.eea
index 9d1a66c1c4..5b9f89296c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/BeanWrapperImpl.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/BeanWrapperImpl.eea
@@ -14,7 +14,7 @@ convertForProperty
  (Ljava/lang/Object;Ljava/lang/String;)L0java/lang/Object;
 createNotWritablePropertyException
  (Ljava/lang/String;)Lorg/springframework/beans/NotWritablePropertyException;
- (Ljava/lang/String;)Lorg/springframework/beans/NotWritablePropertyException;
+ (Ljava/lang/String;)L1org/springframework/beans/NotWritablePropertyException; # @Inherited(org.springframework.beans.AbstractNestablePropertyAccessor)
 getLocalPropertyHandler
  (Ljava/lang/String;)Lorg/springframework/beans/BeanWrapperImpl$BeanPropertyHandler;
  (Ljava/lang/String;)L0org/springframework/beans/BeanWrapperImpl$BeanPropertyHandler;
@@ -26,7 +26,7 @@ getPropertyDescriptors
  ()[Ljava/beans/PropertyDescriptor;
 newNestedPropertyAccessor
  (Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/beans/BeanWrapperImpl;
- (Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/beans/BeanWrapperImpl;
+ (Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/beans/BeanWrapperImpl;
 setBeanInstance
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/DirectFieldAccessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/DirectFieldAccessor.eea
index 6a29d2842c..3bb628ea53 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/DirectFieldAccessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/DirectFieldAccessor.eea
@@ -8,10 +8,10 @@ class org/springframework/beans/DirectFieldAccessor
  (Ljava/lang/Object;Ljava/lang/String;Lorg/springframework/beans/DirectFieldAccessor;)V
 createNotWritablePropertyException
  (Ljava/lang/String;)Lorg/springframework/beans/NotWritablePropertyException;
- (Ljava/lang/String;)Lorg/springframework/beans/NotWritablePropertyException;
+ (Ljava/lang/String;)L1org/springframework/beans/NotWritablePropertyException; # @Inherited(org.springframework.beans.AbstractNestablePropertyAccessor)
 getLocalPropertyHandler
  (Ljava/lang/String;)Lorg/springframework/beans/DirectFieldAccessor$FieldPropertyHandler;
  (Ljava/lang/String;)L0org/springframework/beans/DirectFieldAccessor$FieldPropertyHandler;
 newNestedPropertyAccessor
  (Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/beans/DirectFieldAccessor;
- (Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/beans/DirectFieldAccessor;
+ (Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/beans/DirectFieldAccessor;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/MethodInvocationException.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/MethodInvocationException.eea
index fe8ca640b3..c8b505ac95 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/MethodInvocationException.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/MethodInvocationException.eea
@@ -9,4 +9,4 @@ ERROR_CODE
  (Ljava/beans/PropertyChangeEvent;Ljava/lang/Throwable;)V
 getErrorCode
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/MutablePropertyValues.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/MutablePropertyValues.eea
index f01555a3f6..32091c545f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/MutablePropertyValues.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/MutablePropertyValues.eea
@@ -26,7 +26,7 @@ addPropertyValues
  (Lorg/springframework/beans/PropertyValues;)Lorg/springframework/beans/MutablePropertyValues;
 changesSince
  (Lorg/springframework/beans/PropertyValues;)Lorg/springframework/beans/PropertyValues;
- (Lorg/springframework/beans/PropertyValues;)Lorg/springframework/beans/PropertyValues;
+ (Lorg/springframework/beans/PropertyValues;)L1org/springframework/beans/PropertyValues;
 clearProcessedProperty
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/PropertyAccessorFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/PropertyAccessorFactory.eea
index c1d924531d..2d94cad9df 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/PropertyAccessorFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/PropertyAccessorFactory.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/PropertyAccessorFactory
 
 forBeanPropertyAccess
  (Ljava/lang/Object;)Lorg/springframework/beans/BeanWrapper;
- (Ljava/lang/Object;)Lorg/springframework/beans/BeanWrapper;
+ (Ljava/lang/Object;)L1org/springframework/beans/BeanWrapper;
 forDirectFieldAccess
  (Ljava/lang/Object;)Lorg/springframework/beans/ConfigurablePropertyAccessor;
- (Ljava/lang/Object;)Lorg/springframework/beans/ConfigurablePropertyAccessor;
+ (Ljava/lang/Object;)L1org/springframework/beans/ConfigurablePropertyAccessor;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/PropertyAccessorUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/PropertyAccessorUtils.eea
index 29108918a7..7206017fc4 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/PropertyAccessorUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/PropertyAccessorUtils.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/PropertyAccessorUtils
 
 canonicalPropertyName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 canonicalPropertyNames
  ([Ljava/lang/String;)[Ljava/lang/String;
  ([Ljava/lang/String;)[0Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/PropertyMatches.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/PropertyMatches.eea
index c950cf2e68..46a4f3fdf0 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/PropertyMatches.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/PropertyMatches.eea
@@ -5,13 +5,13 @@ forField
  (Ljava/lang/String;Ljava/lang/Class<*>;)Lorg/springframework/beans/PropertyMatches;
 forField
  (Ljava/lang/String;Ljava/lang/Class<*>;I)Lorg/springframework/beans/PropertyMatches;
- (Ljava/lang/String;Ljava/lang/Class<*>;I)Lorg/springframework/beans/PropertyMatches;
+ (Ljava/lang/String;Ljava/lang/Class<*>;I)L1org/springframework/beans/PropertyMatches;
 forProperty
  (Ljava/lang/String;Ljava/lang/Class<*>;)Lorg/springframework/beans/PropertyMatches;
  (Ljava/lang/String;Ljava/lang/Class<*>;)Lorg/springframework/beans/PropertyMatches;
 forProperty
  (Ljava/lang/String;Ljava/lang/Class<*>;I)Lorg/springframework/beans/PropertyMatches;
- (Ljava/lang/String;Ljava/lang/Class<*>;I)Lorg/springframework/beans/PropertyMatches;
+ (Ljava/lang/String;Ljava/lang/Class<*>;I)L1org/springframework/beans/PropertyMatches;
 
 appendHintMessage
  (Ljava/lang/StringBuilder;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/TypeMismatchException.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/TypeMismatchException.eea
index ee9e8159f3..70d4b75ad5 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/TypeMismatchException.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/TypeMismatchException.eea
@@ -18,7 +18,7 @@ ERROR_CODE
  (Ljava/lang/Object;Ljava/lang/Class<*>;Ljava/lang/Throwable;)V
 getErrorCode
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getPropertyName
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(org.springframework.beans.PropertyAccessException)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/ObjectProvider.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/ObjectProvider.eea
index 460b222094..c2202c46e1 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/ObjectProvider.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/ObjectProvider.eea
@@ -35,7 +35,7 @@ iterator
  ()L1java/util/Iterator<TT;>; # @Inherited(java.lang.Iterable)
 orderedStream
  ()Ljava/util/stream/Stream<TT;>;
- ()Ljava/util/stream/Stream<TT;>;
+ ()L1java/util/stream/Stream<TT;>;
 stream
  ()Ljava/util/stream/Stream<TT;>;
- ()Ljava/util/stream/Stream<TT;>;
+ ()L1java/util/stream/Stream<TT;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/annotation/InjectionMetadata.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/annotation/InjectionMetadata.eea
index a1594ec13b..1639a4e1f7 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/annotation/InjectionMetadata.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/annotation/InjectionMetadata.eea
@@ -6,7 +6,7 @@ EMPTY
 
 forElements
  (Ljava/util/Collection<Lorg/springframework/beans/factory/annotation/InjectionMetadata$InjectedElement;>;Ljava/lang/Class<*>;)Lorg/springframework/beans/factory/annotation/InjectionMetadata;
- (Ljava/util/Collection<Lorg/springframework/beans/factory/annotation/InjectionMetadata$InjectedElement;>;Ljava/lang/Class<*>;)Lorg/springframework/beans/factory/annotation/InjectionMetadata;
+ (Ljava/util/Collection<Lorg/springframework/beans/factory/annotation/InjectionMetadata$InjectedElement;>;Ljava/lang/Class<*>;)L1org/springframework/beans/factory/annotation/InjectionMetadata;
 needsRefresh
  (Lorg/springframework/beans/factory/annotation/InjectionMetadata;Ljava/lang/Class<*>;)Z
  (Lorg/springframework/beans/factory/annotation/InjectionMetadata;Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/aot/AotServices$Loader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/aot/AotServices$Loader.eea
index 5387332aed..50c0129d8d 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/aot/AotServices$Loader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/aot/AotServices$Loader.eea
@@ -2,4 +2,4 @@ class org/springframework/beans/factory/aot/AotServices$Loader
 
 load
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/beans/factory/aot/AotServices<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/beans/factory/aot/AotServices<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1org/springframework/beans/factory/aot/AotServices<TT;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/aot/AotServices.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/aot/AotServices.eea
index cc55b7ba57..929cfa523c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/aot/AotServices.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/aot/AotServices.eea
@@ -18,13 +18,13 @@ factories
  (Ljava/lang/ClassLoader;)Lorg/springframework/beans/factory/aot/AotServices$Loader;
 factories
  (Lorg/springframework/core/io/support/SpringFactoriesLoader;)Lorg/springframework/beans/factory/aot/AotServices$Loader;
- (Lorg/springframework/core/io/support/SpringFactoriesLoader;)Lorg/springframework/beans/factory/aot/AotServices$Loader;
+ (Lorg/springframework/core/io/support/SpringFactoriesLoader;)L1org/springframework/beans/factory/aot/AotServices$Loader;
 factoriesAndBeans
  (Lorg/springframework/beans/factory/ListableBeanFactory;)Lorg/springframework/beans/factory/aot/AotServices$Loader;
  (Lorg/springframework/beans/factory/ListableBeanFactory;)Lorg/springframework/beans/factory/aot/AotServices$Loader;
 factoriesAndBeans
  (Lorg/springframework/core/io/support/SpringFactoriesLoader;Lorg/springframework/beans/factory/ListableBeanFactory;)Lorg/springframework/beans/factory/aot/AotServices$Loader;
- (Lorg/springframework/core/io/support/SpringFactoriesLoader;Lorg/springframework/beans/factory/ListableBeanFactory;)Lorg/springframework/beans/factory/aot/AotServices$Loader;
+ (Lorg/springframework/core/io/support/SpringFactoriesLoader;Lorg/springframework/beans/factory/ListableBeanFactory;)L1org/springframework/beans/factory/aot/AotServices$Loader;
 
 asList
  ()Ljava/util/List<TT;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/aot/BeanInstanceSupplier.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/aot/BeanInstanceSupplier.eea
index 3c660bcdaf..994736e1b8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/aot/BeanInstanceSupplier.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/aot/BeanInstanceSupplier.eea
@@ -8,10 +8,10 @@ super org/springframework/beans/factory/support/InstanceSupplier
 
 forConstructor
  <T:Ljava/lang/Object;>([Ljava/lang/Class<*>;)Lorg/springframework/beans/factory/aot/BeanInstanceSupplier<TT;>;
- <T:Ljava/lang/Object;>([Ljava/lang/Class<*>;)Lorg/springframework/beans/factory/aot/BeanInstanceSupplier<TT;>;
+ <T:Ljava/lang/Object;>([Ljava/lang/Class<*>;)L1org/springframework/beans/factory/aot/BeanInstanceSupplier<TT;>;
 forFactoryMethod
  <T:Ljava/lang/Object;>(Ljava/lang/Class<*>;Ljava/lang/String;[Ljava/lang/Class<*>;)Lorg/springframework/beans/factory/aot/BeanInstanceSupplier<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<*>;Ljava/lang/String;[Ljava/lang/Class<*>;)Lorg/springframework/beans/factory/aot/BeanInstanceSupplier<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<*>;Ljava/lang/String;[Ljava/lang/Class<*>;)L1org/springframework/beans/factory/aot/BeanInstanceSupplier<TT;>;
 
 get
  (Lorg/springframework/beans/factory/support/RegisteredBean;)TT;
@@ -24,10 +24,10 @@ withGenerator
  (Lorg/springframework/util/function/ThrowingBiFunction<Lorg/springframework/beans/factory/support/RegisteredBean;Lorg/springframework/beans/factory/aot/AutowiredArguments;TT;>;)Lorg/springframework/beans/factory/aot/BeanInstanceSupplier<TT;>;
 withGenerator
  (Lorg/springframework/util/function/ThrowingFunction<Lorg/springframework/beans/factory/support/RegisteredBean;TT;>;)Lorg/springframework/beans/factory/aot/BeanInstanceSupplier<TT;>;
- (Lorg/springframework/util/function/ThrowingFunction<Lorg/springframework/beans/factory/support/RegisteredBean;TT;>;)Lorg/springframework/beans/factory/aot/BeanInstanceSupplier<TT;>;
+ (Lorg/springframework/util/function/ThrowingFunction<Lorg/springframework/beans/factory/support/RegisteredBean;TT;>;)L1org/springframework/beans/factory/aot/BeanInstanceSupplier<TT;>;
 withGenerator
  (Lorg/springframework/util/function/ThrowingSupplier<TT;>;)Lorg/springframework/beans/factory/aot/BeanInstanceSupplier<TT;>;
- (Lorg/springframework/util/function/ThrowingSupplier<TT;>;)Lorg/springframework/beans/factory/aot/BeanInstanceSupplier<TT;>;
+ (Lorg/springframework/util/function/ThrowingSupplier<TT;>;)L1org/springframework/beans/factory/aot/BeanInstanceSupplier<TT;>;
 withShortcuts
  ([Ljava/lang/String;)Lorg/springframework/beans/factory/aot/BeanInstanceSupplier<TT;>;
  ([Ljava/lang/String;)Lorg/springframework/beans/factory/aot/BeanInstanceSupplier<TT;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/aot/BeanRegistrationAotContribution.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/aot/BeanRegistrationAotContribution.eea
index d8e2f53ee7..c6da407533 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/aot/BeanRegistrationAotContribution.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/aot/BeanRegistrationAotContribution.eea
@@ -5,7 +5,7 @@ concat
  (Lorg/springframework/beans/factory/aot/BeanRegistrationAotContribution;Lorg/springframework/beans/factory/aot/BeanRegistrationAotContribution;)L0org/springframework/beans/factory/aot/BeanRegistrationAotContribution;
 withCustomCodeFragments
  (Ljava/util/function/UnaryOperator<Lorg/springframework/beans/factory/aot/BeanRegistrationCodeFragments;>;)Lorg/springframework/beans/factory/aot/BeanRegistrationAotContribution;
- (Ljava/util/function/UnaryOperator<Lorg/springframework/beans/factory/aot/BeanRegistrationCodeFragments;>;)Lorg/springframework/beans/factory/aot/BeanRegistrationAotContribution;
+ (Ljava/util/function/UnaryOperator<Lorg/springframework/beans/factory/aot/BeanRegistrationCodeFragments;>;)L1org/springframework/beans/factory/aot/BeanRegistrationAotContribution;
 
 applyTo
  (Lorg/springframework/aot/generate/GenerationContext;Lorg/springframework/beans/factory/aot/BeanRegistrationCode;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/AbstractFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/AbstractFactoryBean.eea
index f69f49443c..bed6304cad 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/AbstractFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/AbstractFactoryBean.eea
@@ -12,7 +12,7 @@ logger
 
 createInstance
  ()TT;
- ()TT;
+ ()T1T;
 destroyInstance
  (TT;)V
  (TT;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/AutowireCapableBeanFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/AutowireCapableBeanFactory.eea
index 4cbe9ffc1c..bca4f75e5d 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/AutowireCapableBeanFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/AutowireCapableBeanFactory.eea
@@ -27,10 +27,10 @@ configureBean
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 createBean
  (Ljava/lang/Class<*>;IZ)Ljava/lang/Object;
- (Ljava/lang/Class<*>;IZ)Ljava/lang/Object;
+ (Ljava/lang/Class<*>;IZ)L1java/lang/Object;
 createBean
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)T1T;
 destroyBean
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/BeanDefinitionHolder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/BeanDefinitionHolder.eea
index 65dce1c3f1..48b434d938 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/BeanDefinitionHolder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/BeanDefinitionHolder.eea
@@ -23,10 +23,10 @@ getBeanName
  ()Ljava/lang/String;
 getLongDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getShortDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSource
  ()Ljava/lang/Object;
  ()L0java/lang/Object; # @Inherited(org.springframework.beans.BeanMetadataElement)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/DependencyDescriptor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/DependencyDescriptor.eea
index fe37011160..57faae86d1 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/DependencyDescriptor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/DependencyDescriptor.eea
@@ -20,7 +20,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(org.springframework.beans.factory.InjectionPoint)
 forFallbackMatch
  ()Lorg/springframework/beans/factory/config/DependencyDescriptor;
- ()Lorg/springframework/beans/factory/config/DependencyDescriptor;
+ ()L1org/springframework/beans/factory/config/DependencyDescriptor;
 getDependencyName
  ()Ljava/lang/String;
  ()L0java/lang/String;
@@ -32,7 +32,7 @@ getResolvableType
  ()Lorg/springframework/core/ResolvableType;
 getTypeDescriptor
  ()Lorg/springframework/core/convert/TypeDescriptor;
- ()Lorg/springframework/core/convert/TypeDescriptor;
+ ()L1org/springframework/core/convert/TypeDescriptor;
 initParameterNameDiscovery
  (Lorg/springframework/core/ParameterNameDiscoverer;)V
  (Lorg/springframework/core/ParameterNameDiscoverer;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/ListFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/ListFactoryBean.eea
index 81d098d95d..9d1e549775 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/ListFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/ListFactoryBean.eea
@@ -6,10 +6,10 @@ super org/springframework/beans/factory/config/AbstractFactoryBean
 
 createInstance
  ()Ljava/util/List<Ljava/lang/Object;>;
- ()Ljava/util/List<Ljava/lang/Object;>;
+ ()L1java/util/List<Ljava/lang/Object;>;
 getObjectType
  ()Ljava/lang/Class<Ljava/util/List;>;
- ()Ljava/lang/Class<Ljava/util/List;>;
+ ()L1java/lang/Class<Ljava/util/List;>;
 setSourceList
  (Ljava/util/List<*>;)V
  (Ljava/util/List<*>;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/MapFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/MapFactoryBean.eea
index f51f515fa2..95efc091d1 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/MapFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/MapFactoryBean.eea
@@ -6,10 +6,10 @@ super org/springframework/beans/factory/config/AbstractFactoryBean
 
 createInstance
  ()Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
- ()Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
+ ()L1java/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
 getObjectType
  ()Ljava/lang/Class<Ljava/util/Map;>;
- ()Ljava/lang/Class<Ljava/util/Map;>;
+ ()L1java/lang/Class<Ljava/util/Map;>;
 setSourceMap
  (Ljava/util/Map<**>;)V
  (Ljava/util/Map<**>;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/MethodInvokingBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/MethodInvokingBean.eea
index 9b40af53f8..dc36a58023 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/MethodInvokingBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/MethodInvokingBean.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/factory/config/MethodInvokingBean
 
 getDefaultTypeConverter
  ()Lorg/springframework/beans/TypeConverter;
- ()Lorg/springframework/beans/TypeConverter;
+ ()L1org/springframework/beans/TypeConverter; # @Inherited(org.springframework.beans.support.ArgumentConvertingMethodInvoker)
 invokeWithTargetException
  ()Ljava/lang/Object;
  ()L0java/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.eea
index fb322f63f8..49a8ef648a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.eea
@@ -6,7 +6,7 @@ super org/springframework/beans/factory/config/AbstractFactoryBean
 
 createInstance
  ()Lorg/springframework/beans/factory/ObjectFactory<Ljava/lang/Object;>;
- ()Lorg/springframework/beans/factory/ObjectFactory<Ljava/lang/Object;>;
+ ()L1org/springframework/beans/factory/ObjectFactory<Ljava/lang/Object;>;
 getObjectType
  ()Ljava/lang/Class<*>;
  ()L0java/lang/Class<*>; # @Inherited(org.springframework.beans.factory.config.AbstractFactoryBean)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/PropertiesFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/PropertiesFactoryBean.eea
index 67dd62595f..ba863dec78 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/PropertiesFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/PropertiesFactoryBean.eea
@@ -6,10 +6,10 @@ super org/springframework/beans/factory/FactoryBean
 
 createProperties
  ()Ljava/util/Properties;
- ()Ljava/util/Properties;
+ ()L1java/util/Properties;
 getObject
  ()Ljava/util/Properties;
  ()L0java/util/Properties;
 getObjectType
  ()Ljava/lang/Class<Ljava/util/Properties;>;
- ()Ljava/lang/Class<Ljava/util/Properties;>;
+ ()L1java/lang/Class<Ljava/util/Properties;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.eea
index d435bd6cf6..a945ee9364 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.eea
@@ -6,7 +6,7 @@ super org/springframework/beans/factory/config/AbstractFactoryBean
 
 createInstance
  ()Ljakarta/inject/Provider<Ljava/lang/Object;>;
- ()Ljakarta/inject/Provider<Ljava/lang/Object;>;
+ ()L1jakarta/inject/Provider<Ljava/lang/Object;>;
 getObjectType
  ()Ljava/lang/Class<*>;
  ()L0java/lang/Class<*>; # @Inherited(org.springframework.beans.factory.config.AbstractFactoryBean)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.eea
index f650a57fa3..4db67c6053 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.eea
@@ -6,7 +6,7 @@ super org/springframework/beans/factory/FactoryBean
 
 createServiceLocatorException
  (Ljava/lang/reflect/Constructor<Ljava/lang/Exception;>;Lorg/springframework/beans/BeansException;)Ljava/lang/Exception;
- (Ljava/lang/reflect/Constructor<Ljava/lang/Exception;>;Lorg/springframework/beans/BeansException;)Ljava/lang/Exception;
+ (Ljava/lang/reflect/Constructor<Ljava/lang/Exception;>;Lorg/springframework/beans/BeansException;)L1java/lang/Exception;
 determineServiceLocatorExceptionConstructor
  (Ljava/lang/Class<+Ljava/lang/Exception;>;)Ljava/lang/reflect/Constructor<Ljava/lang/Exception;>;
  (Ljava/lang/Class<+Ljava/lang/Exception;>;)Ljava/lang/reflect/Constructor<Ljava/lang/Exception;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/SetFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/SetFactoryBean.eea
index 5c7549350a..a5e5d7698e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/SetFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/SetFactoryBean.eea
@@ -6,10 +6,10 @@ super org/springframework/beans/factory/config/AbstractFactoryBean
 
 createInstance
  ()Ljava/util/Set<Ljava/lang/Object;>;
- ()Ljava/util/Set<Ljava/lang/Object;>;
+ ()L1java/util/Set<Ljava/lang/Object;>;
 getObjectType
  ()Ljava/lang/Class<Ljava/util/Set;>;
- ()Ljava/lang/Class<Ljava/util/Set;>;
+ ()L1java/lang/Class<Ljava/util/Set;>;
 setSourceSet
  (Ljava/util/Set<*>;)V
  (Ljava/util/Set<*>;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/YamlMapFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/YamlMapFactoryBean.eea
index 2f5f1cce3d..d6ed1b8c8d 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/YamlMapFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/YamlMapFactoryBean.eea
@@ -6,7 +6,7 @@ super org/springframework/beans/factory/FactoryBean
 
 createMap
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ ()L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 getObject
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
  ()L0java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/YamlProcessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/YamlProcessor.eea
index b9d1081a5b..c2b192d0e7 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/YamlProcessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/YamlProcessor.eea
@@ -2,10 +2,10 @@ class org/springframework/beans/factory/config/YamlProcessor
 
 createYaml
  ()Lorg/yaml/snakeyaml/Yaml;
- ()Lorg/yaml/snakeyaml/Yaml;
+ ()L1org/yaml/snakeyaml/Yaml;
 getFlattenedMap
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 process
  (Lorg/springframework/beans/factory/config/YamlProcessor$MatchCallback;)V
  (Lorg/springframework/beans/factory/config/YamlProcessor$MatchCallback;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/YamlPropertiesFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/YamlPropertiesFactoryBean.eea
index 4816d74c6e..f4c4cb22e4 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/YamlPropertiesFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/config/YamlPropertiesFactoryBean.eea
@@ -6,7 +6,7 @@ super org/springframework/beans/factory/FactoryBean
 
 createProperties
  ()Ljava/util/Properties;
- ()Ljava/util/Properties;
+ ()L1java/util/Properties;
 getObject
  ()Ljava/util/Properties;
  ()L0java/util/Properties;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.eea
index a67037bbc5..936537a64d 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.eea
@@ -11,7 +11,7 @@ applyPropertyToBeanDefinition
  (Ljava/lang/String;Ljava/lang/Object;)V
 bean
  (Ljava/lang/Class<*>;)Lorg/springframework/beans/factory/support/GenericBeanDefinition;
- (Ljava/lang/Class<*>;)Lorg/springframework/beans/factory/support/GenericBeanDefinition;
+ (Ljava/lang/Class<*>;)L1org/springframework/beans/factory/support/GenericBeanDefinition;
 bean
  (Ljava/lang/Class<*>;[Ljava/lang/Object;)Lorg/springframework/beans/factory/support/AbstractBeanDefinition;
  (Ljava/lang/Class<*>;[Ljava/lang/Object;)Lorg/springframework/beans/factory/support/AbstractBeanDefinition;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/parsing/AbstractComponentDefinition.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/parsing/AbstractComponentDefinition.eea
index 7b8127382f..04640d9b64 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/parsing/AbstractComponentDefinition.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/parsing/AbstractComponentDefinition.eea
@@ -2,16 +2,16 @@ class org/springframework/beans/factory/parsing/AbstractComponentDefinition
 
 getBeanDefinitions
  ()[Lorg/springframework/beans/factory/config/BeanDefinition;
- ()[Lorg/springframework/beans/factory/config/BeanDefinition;
+ ()[1Lorg/springframework/beans/factory/config/BeanDefinition;
 getBeanReferences
  ()[Lorg/springframework/beans/factory/config/BeanReference;
- ()[Lorg/springframework/beans/factory/config/BeanReference;
+ ()[1Lorg/springframework/beans/factory/config/BeanReference;
 getDescription
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getInnerBeanDefinitions
  ()[Lorg/springframework/beans/factory/config/BeanDefinition;
- ()[Lorg/springframework/beans/factory/config/BeanDefinition;
+ ()[1Lorg/springframework/beans/factory/config/BeanDefinition;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/parsing/ParseState.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/parsing/ParseState.eea
index e09b791f6b..b1a54ab492 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/parsing/ParseState.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/parsing/ParseState.eea
@@ -8,7 +8,7 @@ push
  (Lorg/springframework/beans/factory/parsing/ParseState$Entry;)V
 snapshot
  ()Lorg/springframework/beans/factory/parsing/ParseState;
- ()Lorg/springframework/beans/factory/parsing/ParseState;
+ ()L1org/springframework/beans/factory/parsing/ParseState;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/serviceloader/AbstractServiceLoaderBasedFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/serviceloader/AbstractServiceLoaderBasedFactoryBean.eea
index 9a1f8de518..30e23a56ac 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/serviceloader/AbstractServiceLoaderBasedFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/serviceloader/AbstractServiceLoaderBasedFactoryBean.eea
@@ -6,7 +6,7 @@ super org/springframework/beans/factory/config/AbstractFactoryBean
 
 createInstance
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 getObjectToExpose
  (Ljava/util/ServiceLoader<*>;)Ljava/lang/Object;
  (Ljava/util/ServiceLoader<*>;)Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/serviceloader/ServiceListFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/serviceloader/ServiceListFactoryBean.eea
index e71a7f755f..1e16c97a54 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/serviceloader/ServiceListFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/serviceloader/ServiceListFactoryBean.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/factory/serviceloader/ServiceListFactoryBean
 
 getObjectToExpose
  (Ljava/util/ServiceLoader<*>;)Ljava/lang/Object;
- (Ljava/util/ServiceLoader<*>;)Ljava/lang/Object;
+ (Ljava/util/ServiceLoader<*>;)L1java/lang/Object;
 getObjectType
  ()Ljava/lang/Class<*>;
  ()L0java/lang/Class<*>; # @Inherited(org.springframework.beans.factory.config.AbstractFactoryBean)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.eea
index 355dc1ac93..e307709c20 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.eea
@@ -50,16 +50,16 @@ copyConfigurationFrom
  (Lorg/springframework/beans/factory/config/ConfigurableBeanFactory;)V
 createBean
  (Ljava/lang/Class<*>;IZ)Ljava/lang/Object;
- (Ljava/lang/Class<*>;IZ)Ljava/lang/Object;
+ (Ljava/lang/Class<*>;IZ)L1java/lang/Object; # @Inherited(org.springframework.beans.factory.config.AutowireCapableBeanFactory)
 createBean
  (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Object;)L1java/lang/Object; # @Inherited(org.springframework.beans.factory.support.AbstractBeanFactory)
 createBean
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)T1T; # @Inherited(org.springframework.beans.factory.config.AutowireCapableBeanFactory)
 createBeanInstance
  (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Object;)Lorg/springframework/beans/BeanWrapper;
- (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Object;)Lorg/springframework/beans/BeanWrapper;
+ (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Object;)L1org/springframework/beans/BeanWrapper;
 destroyBean
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
@@ -110,7 +110,7 @@ initializeBean
  (Ljava/lang/String;Ljava/lang/Object;Lorg/springframework/beans/factory/support/RootBeanDefinition;)Ljava/lang/Object;
 instantiateBean
  (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;)Lorg/springframework/beans/BeanWrapper;
- (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;)Lorg/springframework/beans/BeanWrapper;
+ (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;)L1org/springframework/beans/BeanWrapper;
 instantiateUsingFactoryMethod
  (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Object;)Lorg/springframework/beans/BeanWrapper;
  (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Object;)Lorg/springframework/beans/BeanWrapper;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/AbstractBeanDefinition.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/AbstractBeanDefinition.eea
index 5d5bf4f69b..c00cd719e3 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/AbstractBeanDefinition.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/AbstractBeanDefinition.eea
@@ -45,7 +45,7 @@ getBeanClassName
  ()L0java/lang/String; # @Inherited(org.springframework.beans.factory.config.BeanDefinition)
 getConstructorArgumentValues
  ()Lorg/springframework/beans/factory/config/ConstructorArgumentValues;
- ()Lorg/springframework/beans/factory/config/ConstructorArgumentValues;
+ ()L1org/springframework/beans/factory/config/ConstructorArgumentValues;
 getDependsOn
  ()[Ljava/lang/String;
  ()[0Ljava/lang/String; # @Inherited(org.springframework.beans.factory.config.BeanDefinition)
@@ -84,13 +84,13 @@ getOriginatingBeanDefinition
  ()L0org/springframework/beans/factory/config/BeanDefinition; # @Inherited(org.springframework.beans.factory.config.BeanDefinition)
 getPropertyValues
  ()Lorg/springframework/beans/MutablePropertyValues;
- ()Lorg/springframework/beans/MutablePropertyValues;
+ ()L1org/springframework/beans/MutablePropertyValues;
 getQualifier
  (Ljava/lang/String;)Lorg/springframework/beans/factory/support/AutowireCandidateQualifier;
  (Ljava/lang/String;)L0org/springframework/beans/factory/support/AutowireCandidateQualifier;
 getQualifiers
  ()Ljava/util/Set<Lorg/springframework/beans/factory/support/AutowireCandidateQualifier;>;
- ()Ljava/util/Set<Lorg/springframework/beans/factory/support/AutowireCandidateQualifier;>;
+ ()L1java/util/Set<Lorg/springframework/beans/factory/support/AutowireCandidateQualifier;>;
 getResolvableType
  ()Lorg/springframework/core/ResolvableType;
  ()Lorg/springframework/core/ResolvableType;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/AbstractBeanFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/AbstractBeanFactory.eea
index f3c7ea9a38..385938678a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/AbstractBeanFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/AbstractBeanFactory.eea
@@ -47,7 +47,7 @@ copyRegisteredEditorsTo
  (Lorg/springframework/beans/PropertyEditorRegistry;)V
 createBean
  (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Object;)L1java/lang/Object;
 destroyBean
  (Ljava/lang/String;Ljava/lang/Object;)V
  (Ljava/lang/String;Ljava/lang/Object;)V
@@ -185,7 +185,7 @@ markBeanAsCreated
  (Ljava/lang/String;)V
 originalBeanName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 predictBeanType
  (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
  (Ljava/lang/String;Lorg/springframework/beans/factory/support/RootBeanDefinition;[Ljava/lang/Class<*>;)L0java/lang/Class<*>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/BeanDefinitionBuilder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/BeanDefinitionBuilder.eea
index 9418242d63..8d0251cdff 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/BeanDefinitionBuilder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/BeanDefinitionBuilder.eea
@@ -2,37 +2,37 @@ class org/springframework/beans/factory/support/BeanDefinitionBuilder
 
 childBeanDefinition
  (Ljava/lang/String;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
- (Ljava/lang/String;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
+ (Ljava/lang/String;)L1org/springframework/beans/factory/support/BeanDefinitionBuilder;
 genericBeanDefinition
  ()Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
- ()Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
+ ()L1org/springframework/beans/factory/support/BeanDefinitionBuilder;
 genericBeanDefinition
  (Ljava/lang/Class<*>;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
- (Ljava/lang/Class<*>;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
+ (Ljava/lang/Class<*>;)L1org/springframework/beans/factory/support/BeanDefinitionBuilder;
 genericBeanDefinition
  (Ljava/lang/String;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
- (Ljava/lang/String;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
+ (Ljava/lang/String;)L1org/springframework/beans/factory/support/BeanDefinitionBuilder;
 genericBeanDefinition
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/util/function/Supplier<TT;>;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/util/function/Supplier<TT;>;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/util/function/Supplier<TT;>;)L1org/springframework/beans/factory/support/BeanDefinitionBuilder;
 rootBeanDefinition
  (Ljava/lang/Class<*>;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
  (Ljava/lang/Class<*>;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
 rootBeanDefinition
  (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
- (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
+ (Ljava/lang/Class<*>;Ljava/lang/String;)L1org/springframework/beans/factory/support/BeanDefinitionBuilder;
 rootBeanDefinition
  (Ljava/lang/String;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
  (Ljava/lang/String;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
 rootBeanDefinition
  (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/springframework/beans/factory/support/BeanDefinitionBuilder;
 rootBeanDefinition
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/util/function/Supplier<TT;>;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/util/function/Supplier<TT;>;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
 rootBeanDefinition
  <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;Ljava/util/function/Supplier<TT;>;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
- <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;Ljava/util/function/Supplier<TT;>;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
+ <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;Ljava/util/function/Supplier<TT;>;)L1org/springframework/beans/factory/support/BeanDefinitionBuilder;
 
 addAutowiredProperty
  (Ljava/lang/String;)Lorg/springframework/beans/factory/support/BeanDefinitionBuilder;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.eea
index 417f30da89..a2e961a1ed 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.eea
@@ -6,7 +6,7 @@ GENERATED_BEAN_NAME_SEPARATOR
 
 createBeanDefinition
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/ClassLoader;)Lorg/springframework/beans/factory/support/AbstractBeanDefinition;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/ClassLoader;)Lorg/springframework/beans/factory/support/AbstractBeanDefinition;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/ClassLoader;)L1org/springframework/beans/factory/support/AbstractBeanDefinition;
 generateBeanName
  (Lorg/springframework/beans/factory/config/BeanDefinition;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)Ljava/lang/String;
  (Lorg/springframework/beans/factory/config/BeanDefinition;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)Ljava/lang/String;
@@ -21,4 +21,4 @@ registerWithGeneratedName
  (Lorg/springframework/beans/factory/support/AbstractBeanDefinition;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)Ljava/lang/String;
 uniqueBeanName
  (Ljava/lang/String;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)Ljava/lang/String;
- (Ljava/lang/String;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)Ljava/lang/String;
+ (Ljava/lang/String;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.eea
index a1f3537d88..615b1cb1de 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.eea
@@ -5,7 +5,7 @@ getActualBeanClass
  (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;)Ljava/lang/Class<*>;
 instantiateWithMethodInjection
  (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;)Ljava/lang/Object;
- (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;)Ljava/lang/Object;
+ (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;)L1java/lang/Object; # @Inherited(org.springframework.beans.factory.support.SimpleInstantiationStrategy)
 instantiateWithMethodInjection
  (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;Ljava/lang/reflect/Constructor<*>;[Ljava/lang/Object;)Ljava/lang/Object;
- (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;Ljava/lang/reflect/Constructor<*>;[Ljava/lang/Object;)Ljava/lang/Object;
+ (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;Ljava/lang/reflect/Constructor<*>;[Ljava/lang/Object;)L1java/lang/Object; # @Inherited(org.springframework.beans.factory.support.SimpleInstantiationStrategy)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/ChildBeanDefinition.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/ChildBeanDefinition.eea
index 6bce9c6bd6..ae68217d52 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/ChildBeanDefinition.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/ChildBeanDefinition.eea
@@ -20,7 +20,7 @@ class org/springframework/beans/factory/support/ChildBeanDefinition
  (Lorg/springframework/beans/factory/support/ChildBeanDefinition;)V
 cloneBeanDefinition
  ()Lorg/springframework/beans/factory/support/AbstractBeanDefinition;
- ()Lorg/springframework/beans/factory/support/AbstractBeanDefinition;
+ ()L1org/springframework/beans/factory/support/AbstractBeanDefinition;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(org.springframework.beans.factory.support.AbstractBeanDefinition)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/DefaultListableBeanFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/DefaultListableBeanFactory.eea
index 38170bad87..8e8d6442a2 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/DefaultListableBeanFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/DefaultListableBeanFactory.eea
@@ -32,7 +32,7 @@ doResolveDependency
  (Lorg/springframework/beans/factory/config/DependencyDescriptor;Ljava/lang/String;Ljava/util/Set<Ljava/lang/String;>;Lorg/springframework/beans/TypeConverter;)L0java/lang/Object;
 findAllAnnotationsOnBean
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/String;Ljava/lang/Class<TA;>;Z)Ljava/util/Set<TA;>;
- <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/String;Ljava/lang/Class<TA;>;Z)Ljava/util/Set<TA;>;
+ <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/String;Ljava/lang/Class<TA;>;Z)L1java/util/Set<TA;>;
 findAnnotationOnBean
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/String;Ljava/lang/Class<TA;>;)TA;
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/String;Ljava/lang/Class<TA;>;)T0A; # @Inherited(org.springframework.beans.factory.ListableBeanFactory)
@@ -74,7 +74,7 @@ getBeanNamesForType
  (Lorg/springframework/core/ResolvableType;ZZ)[L1java/lang/String; # @Inherited(org.springframework.beans.factory.ListableBeanFactory)
 getBeanNamesIterator
  ()Ljava/util/Iterator<Ljava/lang/String;>;
- ()Ljava/util/Iterator<Ljava/lang/String;>;
+ ()L1java/util/Iterator<Ljava/lang/String;>;
 getBeanProvider
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/beans/factory/ObjectProvider<TT;>;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/beans/factory/ObjectProvider<TT;>;
@@ -86,7 +86,7 @@ getBeanProvider
  <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;)Lorg/springframework/beans/factory/ObjectProvider<TT;>;
 getBeanProvider
  <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;Z)Lorg/springframework/beans/factory/ObjectProvider<TT;>;
- <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;Z)Lorg/springframework/beans/factory/ObjectProvider<TT;>;
+ <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;Z)L1org/springframework/beans/factory/ObjectProvider<TT;>;
 getBeansOfType
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Ljava/util/Map<Ljava/lang/String;TT;>;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1java/util/Map<L1java/lang/String;TT;>; # @Inherited(org.springframework.beans.factory.ListableBeanFactory)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/GenericBeanDefinition.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/GenericBeanDefinition.eea
index 3b834383cc..2b76047edb 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/GenericBeanDefinition.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/GenericBeanDefinition.eea
@@ -5,7 +5,7 @@ class org/springframework/beans/factory/support/GenericBeanDefinition
  (Lorg/springframework/beans/factory/config/BeanDefinition;)V
 cloneBeanDefinition
  ()Lorg/springframework/beans/factory/support/AbstractBeanDefinition;
- ()Lorg/springframework/beans/factory/support/AbstractBeanDefinition;
+ ()L1org/springframework/beans/factory/support/AbstractBeanDefinition;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(org.springframework.beans.factory.support.AbstractBeanDefinition)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/InstanceSupplier.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/InstanceSupplier.eea
index 51aae345d7..d1c6f71548 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/InstanceSupplier.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/InstanceSupplier.eea
@@ -18,7 +18,7 @@ using
 
 andThen
  <V:Ljava/lang/Object;>(Lorg/springframework/util/function/ThrowingBiFunction<Lorg/springframework/beans/factory/support/RegisteredBean;-TT;+TV;>;)Lorg/springframework/beans/factory/support/InstanceSupplier<TV;>;
- <V:Ljava/lang/Object;>(Lorg/springframework/util/function/ThrowingBiFunction<Lorg/springframework/beans/factory/support/RegisteredBean;-TT;+TV;>;)Lorg/springframework/beans/factory/support/InstanceSupplier<TV;>;
+ <V:Ljava/lang/Object;>(Lorg/springframework/util/function/ThrowingBiFunction<Lorg/springframework/beans/factory/support/RegisteredBean;-TT;+TV;>;)L1org/springframework/beans/factory/support/InstanceSupplier<TV;>;
 get
  (Lorg/springframework/beans/factory/support/RegisteredBean;)TT;
  (Lorg/springframework/beans/factory/support/RegisteredBean;)TT;
@@ -27,4 +27,4 @@ getFactoryMethod
  ()L0java/lang/reflect/Method;
 getWithException
  ()TT;
- ()TT;
+ ()T1T;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/ManagedList.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/ManagedList.eea
index 258a253926..fb514e2cac 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/ManagedList.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/ManagedList.eea
@@ -8,7 +8,7 @@ super java/util/ArrayList
 
 of
  <E:Ljava/lang/Object;>([TE;)Lorg/springframework/beans/factory/support/ManagedList<TE;>;
- <E:Ljava/lang/Object;>([TE;)Lorg/springframework/beans/factory/support/ManagedList<TE;>;
+ <E:Ljava/lang/Object;>([TE;)L1org/springframework/beans/factory/support/ManagedList<TE;>;
 
 getElementTypeName
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/ManagedMap.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/ManagedMap.eea
index d3c4c97696..b0a7d87881 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/ManagedMap.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/ManagedMap.eea
@@ -8,7 +8,7 @@ super java/util/LinkedHashMap
 
 ofEntries
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>([Ljava/util/Map$Entry<+TK;+TV;>;)Lorg/springframework/beans/factory/support/ManagedMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>([Ljava/util/Map$Entry<+TK;+TV;>;)Lorg/springframework/beans/factory/support/ManagedMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>([Ljava/util/Map$Entry<+TK;+TV;>;)L1org/springframework/beans/factory/support/ManagedMap<TK;TV;>;
 
 getKeyTypeName
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/ManagedSet.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/ManagedSet.eea
index a186d5c4d8..89890040fa 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/ManagedSet.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/ManagedSet.eea
@@ -8,7 +8,7 @@ super java/util/LinkedHashSet
 
 of
  <E:Ljava/lang/Object;>([TE;)Lorg/springframework/beans/factory/support/ManagedSet<TE;>;
- <E:Ljava/lang/Object;>([TE;)Lorg/springframework/beans/factory/support/ManagedSet<TE;>;
+ <E:Ljava/lang/Object;>([TE;)L1org/springframework/beans/factory/support/ManagedSet<TE;>;
 
 getElementTypeName
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/RegisteredBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/RegisteredBean.eea
index dda7069018..5473b57fc9 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/RegisteredBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/RegisteredBean.eea
@@ -39,7 +39,7 @@ resolveConstructorOrFactoryMethod
  ()Ljava/lang/reflect/Executable;
 resolveInstantiationDescriptor
  ()Lorg/springframework/beans/factory/support/RegisteredBean$InstantiationDescriptor;
- ()Lorg/springframework/beans/factory/support/RegisteredBean$InstantiationDescriptor;
+ ()L1org/springframework/beans/factory/support/RegisteredBean$InstantiationDescriptor;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/RootBeanDefinition.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/RootBeanDefinition.eea
index dc84d38a99..3f74835df6 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/RootBeanDefinition.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/RootBeanDefinition.eea
@@ -29,7 +29,7 @@ class org/springframework/beans/factory/support/RootBeanDefinition
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/util/function/Supplier<TT;>;)V
 cloneBeanDefinition
  ()Lorg/springframework/beans/factory/support/RootBeanDefinition;
- ()Lorg/springframework/beans/factory/support/RootBeanDefinition;
+ ()L1org/springframework/beans/factory/support/RootBeanDefinition;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(org.springframework.beans.factory.support.AbstractBeanDefinition)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/SimpleInstantiationStrategy.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/SimpleInstantiationStrategy.eea
index dd17b4c760..809d9993e1 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/SimpleInstantiationStrategy.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/SimpleInstantiationStrategy.eea
@@ -12,13 +12,13 @@ instantiate
  (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;)Ljava/lang/Object;
 instantiate
  (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;Ljava/lang/Object;Ljava/lang/reflect/Method;[Ljava/lang/Object;)Ljava/lang/Object;
- (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;Ljava/lang/Object;Ljava/lang/reflect/Method;[Ljava/lang/Object;)Ljava/lang/Object;
+ (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;Ljava/lang/Object;Ljava/lang/reflect/Method;[Ljava/lang/Object;)L1java/lang/Object;
 instantiate
  (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;Ljava/lang/reflect/Constructor<*>;[Ljava/lang/Object;)Ljava/lang/Object;
  (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;Ljava/lang/reflect/Constructor<*>;[Ljava/lang/Object;)Ljava/lang/Object;
 instantiateWithMethodInjection
  (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;)Ljava/lang/Object;
- (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;)Ljava/lang/Object;
+ (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;)L1java/lang/Object;
 instantiateWithMethodInjection
  (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;Ljava/lang/reflect/Constructor<*>;[Ljava/lang/Object;)Ljava/lang/Object;
- (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;Ljava/lang/reflect/Constructor<*>;[Ljava/lang/Object;)Ljava/lang/Object;
+ (Lorg/springframework/beans/factory/support/RootBeanDefinition;Ljava/lang/String;Lorg/springframework/beans/factory/BeanFactory;Ljava/lang/reflect/Constructor<*>;[Ljava/lang/Object;)L1java/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/StaticListableBeanFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/StaticListableBeanFactory.eea
index d85a1eeb31..5ed8d1180e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/StaticListableBeanFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/support/StaticListableBeanFactory.eea
@@ -23,7 +23,7 @@ findAnnotationOnBean
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/String;Ljava/lang/Class<TA;>;Z)T0A; # @Inherited(org.springframework.beans.factory.ListableBeanFactory)
 getAliases
  (Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/String;)[1Ljava/lang/String;
 getBean
  (Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;)Ljava/lang/Object;
@@ -68,7 +68,7 @@ getBeanProvider
  <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;)Lorg/springframework/beans/factory/ObjectProvider<TT;>;
 getBeanProvider
  <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;Z)Lorg/springframework/beans/factory/ObjectProvider<TT;>;
- <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;Z)Lorg/springframework/beans/factory/ObjectProvider<TT;>;
+ <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;Z)L1org/springframework/beans/factory/ObjectProvider<TT;>;
 getBeansOfType
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Ljava/util/Map<Ljava/lang/String;TT;>;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1java/util/Map<L1java/lang/String;TT;>; # @Inherited(org.springframework.beans.factory.ListableBeanFactory)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.eea
index 08d16f03b7..a0b878dbb4 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.eea
@@ -211,7 +211,7 @@ logger
  (Lorg/springframework/beans/factory/xml/XmlReaderContext;)V
 buildTypedStringValue
  (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/beans/factory/config/TypedStringValue;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/beans/factory/config/TypedStringValue;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/springframework/beans/factory/config/TypedStringValue;
 buildTypedStringValueForMap
  (Ljava/lang/String;Ljava/lang/String;Lorg/w3c/dom/Element;)Ljava/lang/Object;
  (Ljava/lang/String;Ljava/lang/String;Lorg/w3c/dom/Element;)Ljava/lang/Object;
@@ -220,7 +220,7 @@ checkNameUniqueness
  (Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;Lorg/w3c/dom/Element;)V
 createBeanDefinition
  (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/beans/factory/support/AbstractBeanDefinition;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/beans/factory/support/AbstractBeanDefinition;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/springframework/beans/factory/support/AbstractBeanDefinition;
 decorateBeanDefinitionIfRequired
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinitionHolder;)Lorg/springframework/beans/factory/config/BeanDefinitionHolder;
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinitionHolder;)Lorg/springframework/beans/factory/config/BeanDefinitionHolder;
@@ -250,7 +250,7 @@ getAutowireMode
  (Ljava/lang/String;)I
 getBeanDefinitionDefaults
  ()Lorg/springframework/beans/factory/support/BeanDefinitionDefaults;
- ()Lorg/springframework/beans/factory/support/BeanDefinitionDefaults;
+ ()L1org/springframework/beans/factory/support/BeanDefinitionDefaults;
 getDefaults
  ()Lorg/springframework/beans/factory/xml/DocumentDefaultsDefinition;
  ()Lorg/springframework/beans/factory/xml/DocumentDefaultsDefinition;
@@ -280,7 +280,7 @@ nodeNameEquals
  (Lorg/w3c/dom/Node;Ljava/lang/String;)Z
 parseArrayElement
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;)Ljava/lang/Object;
- (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;)Ljava/lang/Object;
+ (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;)L1java/lang/Object;
 parseBeanDefinitionAttributes
  (Lorg/w3c/dom/Element;Ljava/lang/String;Lorg/springframework/beans/factory/config/BeanDefinition;Lorg/springframework/beans/factory/support/AbstractBeanDefinition;)Lorg/springframework/beans/factory/support/AbstractBeanDefinition;
  (Lorg/w3c/dom/Element;Ljava/lang/String;Lorg/springframework/beans/factory/config/BeanDefinition;Lorg/springframework/beans/factory/support/AbstractBeanDefinition;)Lorg/springframework/beans/factory/support/AbstractBeanDefinition;
@@ -316,13 +316,13 @@ parseKeyElement
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;Ljava/lang/String;)L0java/lang/Object;
 parseListElement
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;)Ljava/util/List<Ljava/lang/Object;>;
- (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;)Ljava/util/List<Ljava/lang/Object;>;
+ (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;)L1java/util/List<Ljava/lang/Object;>;
 parseLookupOverrideSubElements
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/support/MethodOverrides;)V
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/support/MethodOverrides;)V
 parseMapElement
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;)Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
- (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;)Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
+ (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;)L1java/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
 parseMergeAttribute
  (Lorg/w3c/dom/Element;)Z
  (Lorg/w3c/dom/Element;)Z
@@ -346,7 +346,7 @@ parsePropertyValue
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;Ljava/lang/String;)L0java/lang/Object;
 parsePropsElement
  (Lorg/w3c/dom/Element;)Ljava/util/Properties;
- (Lorg/w3c/dom/Element;)Ljava/util/Properties;
+ (Lorg/w3c/dom/Element;)L1java/util/Properties;
 parseQualifierElement
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/support/AbstractBeanDefinition;)V
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/support/AbstractBeanDefinition;)V
@@ -358,7 +358,7 @@ parseReplacedMethodSubElements
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/support/MethodOverrides;)V
 parseSetElement
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;)Ljava/util/Set<Ljava/lang/Object;>;
- (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;)Ljava/util/Set<Ljava/lang/Object;>;
+ (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/config/BeanDefinition;)L1java/util/Set<Ljava/lang/Object;>;
 parseValueElement
  (Lorg/w3c/dom/Element;Ljava/lang/String;)Ljava/lang/Object;
  (Lorg/w3c/dom/Element;Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.eea
index 499b23f66f..6460bf9518 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.eea
@@ -31,7 +31,7 @@ logger
 
 createDelegate
  (Lorg/springframework/beans/factory/xml/XmlReaderContext;Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/xml/BeanDefinitionParserDelegate;)Lorg/springframework/beans/factory/xml/BeanDefinitionParserDelegate;
- (Lorg/springframework/beans/factory/xml/XmlReaderContext;Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/xml/BeanDefinitionParserDelegate;)Lorg/springframework/beans/factory/xml/BeanDefinitionParserDelegate;
+ (Lorg/springframework/beans/factory/xml/XmlReaderContext;Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/xml/BeanDefinitionParserDelegate;)L1org/springframework/beans/factory/xml/BeanDefinitionParserDelegate;
 doRegisterBeanDefinitions
  (Lorg/w3c/dom/Element;)V
  (Lorg/w3c/dom/Element;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/xml/DefaultDocumentLoader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/xml/DefaultDocumentLoader.eea
index 985d3485b6..6cc5e5520e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/xml/DefaultDocumentLoader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/xml/DefaultDocumentLoader.eea
@@ -2,10 +2,10 @@ class org/springframework/beans/factory/xml/DefaultDocumentLoader
 
 createDocumentBuilder
  (Ljavax/xml/parsers/DocumentBuilderFactory;Lorg/xml/sax/EntityResolver;Lorg/xml/sax/ErrorHandler;)Ljavax/xml/parsers/DocumentBuilder;
- (Ljavax/xml/parsers/DocumentBuilderFactory;Lorg/xml/sax/EntityResolver;Lorg/xml/sax/ErrorHandler;)Ljavax/xml/parsers/DocumentBuilder;
+ (Ljavax/xml/parsers/DocumentBuilderFactory;Lorg/xml/sax/EntityResolver;Lorg/xml/sax/ErrorHandler;)L1javax/xml/parsers/DocumentBuilder;
 createDocumentBuilderFactory
  (IZ)Ljavax/xml/parsers/DocumentBuilderFactory;
- (IZ)Ljavax/xml/parsers/DocumentBuilderFactory;
+ (IZ)L1javax/xml/parsers/DocumentBuilderFactory;
 loadDocument
  (Lorg/xml/sax/InputSource;Lorg/xml/sax/EntityResolver;Lorg/xml/sax/ErrorHandler;IZ)Lorg/w3c/dom/Document;
  (Lorg/xml/sax/InputSource;Lorg/xml/sax/EntityResolver;Lorg/xml/sax/ErrorHandler;IZ)Lorg/w3c/dom/Document;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.eea
index 2c50a12fb8..708f1658e2 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.eea
@@ -5,13 +5,13 @@ class org/springframework/beans/factory/xml/XmlBeanDefinitionReader
  (Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)V
 createBeanDefinitionDocumentReader
  ()Lorg/springframework/beans/factory/xml/BeanDefinitionDocumentReader;
- ()Lorg/springframework/beans/factory/xml/BeanDefinitionDocumentReader;
+ ()L1org/springframework/beans/factory/xml/BeanDefinitionDocumentReader;
 createDefaultNamespaceHandlerResolver
  ()Lorg/springframework/beans/factory/xml/NamespaceHandlerResolver;
- ()Lorg/springframework/beans/factory/xml/NamespaceHandlerResolver;
+ ()L1org/springframework/beans/factory/xml/NamespaceHandlerResolver;
 createReaderContext
  (Lorg/springframework/core/io/Resource;)Lorg/springframework/beans/factory/xml/XmlReaderContext;
- (Lorg/springframework/core/io/Resource;)Lorg/springframework/beans/factory/xml/XmlReaderContext;
+ (Lorg/springframework/core/io/Resource;)L1org/springframework/beans/factory/xml/XmlReaderContext;
 detectValidationMode
  (Lorg/springframework/core/io/Resource;)I
  (Lorg/springframework/core/io/Resource;)I
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/ByteArrayPropertyEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/ByteArrayPropertyEditor.eea
index 5b0511afa4..517b297c46 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/ByteArrayPropertyEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/ByteArrayPropertyEditor.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/propertyeditors/ByteArrayPropertyEditor
 
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CharArrayPropertyEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CharArrayPropertyEditor.eea
index f69d28eeb2..674276c4ab 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CharArrayPropertyEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CharArrayPropertyEditor.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/propertyeditors/CharArrayPropertyEditor
 
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CharacterEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CharacterEditor.eea
index 611980ee68..00dc1bc763 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CharacterEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CharacterEditor.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/propertyeditors/CharacterEditor
 
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CharsetEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CharsetEditor.eea
index 62db858689..44f6160170 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CharsetEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CharsetEditor.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/propertyeditors/CharsetEditor
 
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/ClassArrayEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/ClassArrayEditor.eea
index 0d55d49a2f..921d682839 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/ClassArrayEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/ClassArrayEditor.eea
@@ -5,7 +5,7 @@ class org/springframework/beans/propertyeditors/ClassArrayEditor
  (Ljava/lang/ClassLoader;)V
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/ClassEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/ClassEditor.eea
index 6fd541f16c..552fdb32e5 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/ClassEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/ClassEditor.eea
@@ -5,7 +5,7 @@ class org/springframework/beans/propertyeditors/ClassEditor
  (Ljava/lang/ClassLoader;)V
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CurrencyEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CurrencyEditor.eea
index ce7dbed5e1..3d6215240a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CurrencyEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CurrencyEditor.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/propertyeditors/CurrencyEditor
 
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CustomBooleanEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CustomBooleanEditor.eea
index 792b402a67..8ee522dac0 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CustomBooleanEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CustomBooleanEditor.eea
@@ -30,7 +30,7 @@ VALUE_YES
  (Ljava/lang/String;Ljava/lang/String;Z)V
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CustomCollectionEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CustomCollectionEditor.eea
index 322ec908b1..f69b76abec 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CustomCollectionEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CustomCollectionEditor.eea
@@ -11,10 +11,10 @@ convertElement
  (Ljava/lang/Object;)Ljava/lang/Object;
 createCollection
  (Ljava/lang/Class<+Ljava/util/Collection;>;I)Ljava/util/Collection<Ljava/lang/Object;>;
- (Ljava/lang/Class<+Ljava/util/Collection;>;I)Ljava/util/Collection<Ljava/lang/Object;>;
+ (Ljava/lang/Class<+Ljava/util/Collection;>;I)L1java/util/Collection<Ljava/lang/Object;>;
 getAsText
  ()Ljava/lang/String;
- ()L0java/lang/String;
+ ()L0java/lang/String; # @Inherited(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CustomDateEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CustomDateEditor.eea
index 36a07be5a7..027dcc97c9 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CustomDateEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CustomDateEditor.eea
@@ -8,7 +8,7 @@ class org/springframework/beans/propertyeditors/CustomDateEditor
  (Ljava/text/DateFormat;ZI)V
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CustomMapEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CustomMapEditor.eea
index 23982d94b5..9022315261 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CustomMapEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CustomMapEditor.eea
@@ -14,10 +14,10 @@ convertValue
  (Ljava/lang/Object;)Ljava/lang/Object;
 createMap
  (Ljava/lang/Class<+Ljava/util/Map;>;I)Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
- (Ljava/lang/Class<+Ljava/util/Map;>;I)Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
+ (Ljava/lang/Class<+Ljava/util/Map;>;I)L1java/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
 getAsText
  ()Ljava/lang/String;
- ()L0java/lang/String;
+ ()L0java/lang/String; # @Inherited(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CustomNumberEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CustomNumberEditor.eea
index 958e775802..160d2e65a0 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CustomNumberEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/CustomNumberEditor.eea
@@ -8,7 +8,7 @@ class org/springframework/beans/propertyeditors/CustomNumberEditor
  (Ljava/lang/Class<+Ljava/lang/Number;>;Z)V
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/FileEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/FileEditor.eea
index f6c239396b..2ea11e9ebb 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/FileEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/FileEditor.eea
@@ -5,7 +5,7 @@ class org/springframework/beans/propertyeditors/FileEditor
  (Lorg/springframework/core/io/ResourceEditor;)V
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/InputSourceEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/InputSourceEditor.eea
index 28d79f78f6..f60e39d7b9 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/InputSourceEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/InputSourceEditor.eea
@@ -5,7 +5,7 @@ class org/springframework/beans/propertyeditors/InputSourceEditor
  (Lorg/springframework/core/io/ResourceEditor;)V
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/InputStreamEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/InputStreamEditor.eea
index 593cc622ca..6aa6024a5a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/InputStreamEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/InputStreamEditor.eea
@@ -5,7 +5,7 @@ class org/springframework/beans/propertyeditors/InputStreamEditor
  (Lorg/springframework/core/io/ResourceEditor;)V
 getAsText
  ()Ljava/lang/String;
- ()L0java/lang/String;
+ ()L0java/lang/String; # @Inherited(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/LocaleEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/LocaleEditor.eea
index 1546ba85b5..68d32f0733 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/LocaleEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/LocaleEditor.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/propertyeditors/LocaleEditor
 
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/PathEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/PathEditor.eea
index cb2dd9690f..9651de65a3 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/PathEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/PathEditor.eea
@@ -5,7 +5,7 @@ class org/springframework/beans/propertyeditors/PathEditor
  (Lorg/springframework/core/io/ResourceEditor;)V
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/PatternEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/PatternEditor.eea
index d20bcbc970..a9ed09a814 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/PatternEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/PatternEditor.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/propertyeditors/PatternEditor
 
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/ReaderEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/ReaderEditor.eea
index 2f97669bcd..15a3f4ad80 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/ReaderEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/ReaderEditor.eea
@@ -5,7 +5,7 @@ class org/springframework/beans/propertyeditors/ReaderEditor
  (Lorg/springframework/core/io/ResourceEditor;)V
 getAsText
  ()Ljava/lang/String;
- ()L0java/lang/String;
+ ()L0java/lang/String; # @Inherited(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.eea
index 5fbe255389..bd731818fb 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.eea
@@ -21,7 +21,7 @@ DEFAULT_SEPARATOR
  (Ljava/lang/String;ZZ)V
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/StringTrimmerEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/StringTrimmerEditor.eea
index bd07ac06e3..f0887d963e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/StringTrimmerEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/StringTrimmerEditor.eea
@@ -5,7 +5,7 @@ class org/springframework/beans/propertyeditors/StringTrimmerEditor
  (Ljava/lang/String;Z)V
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/TimeZoneEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/TimeZoneEditor.eea
index fec565a4b5..6e650515ae 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/TimeZoneEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/TimeZoneEditor.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/propertyeditors/TimeZoneEditor
 
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/URIEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/URIEditor.eea
index 348b868e47..3441cdc0cc 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/URIEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/URIEditor.eea
@@ -8,10 +8,10 @@ class org/springframework/beans/propertyeditors/URIEditor
  (Ljava/lang/ClassLoader;Z)V
 createURI
  (Ljava/lang/String;)Ljava/net/URI;
- (Ljava/lang/String;)Ljava/net/URI;
+ (Ljava/lang/String;)L1java/net/URI;
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/URLEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/URLEditor.eea
index 16620fd7cc..5b621d9040 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/URLEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/URLEditor.eea
@@ -5,7 +5,7 @@ class org/springframework/beans/propertyeditors/URLEditor
  (Lorg/springframework/core/io/ResourceEditor;)V
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/UUIDEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/UUIDEditor.eea
index e4398cac4f..d8f391ef20 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/UUIDEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/UUIDEditor.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/propertyeditors/UUIDEditor
 
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/ZoneIdEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/ZoneIdEditor.eea
index ae14eb0b4a..1cbea2fd5b 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/ZoneIdEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/propertyeditors/ZoneIdEditor.eea
@@ -2,7 +2,7 @@ class org/springframework/beans/propertyeditors/ZoneIdEditor
 
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/support/ArgumentConvertingMethodInvoker.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/support/ArgumentConvertingMethodInvoker.eea
index 2c136aae63..c1275ea160 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/support/ArgumentConvertingMethodInvoker.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/support/ArgumentConvertingMethodInvoker.eea
@@ -8,7 +8,7 @@ findMatchingMethod
  ()L0java/lang/reflect/Method; # @Inherited(org.springframework.util.MethodInvoker)
 getDefaultTypeConverter
  ()Lorg/springframework/beans/TypeConverter;
- ()Lorg/springframework/beans/TypeConverter;
+ ()L1org/springframework/beans/TypeConverter;
 getTypeConverter
  ()Lorg/springframework/beans/TypeConverter;
  ()L0org/springframework/beans/TypeConverter;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/beans/support/PagedListHolder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/beans/support/PagedListHolder.eea
index 645804eb3d..9c7378eba1 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/beans/support/PagedListHolder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/beans/support/PagedListHolder.eea
@@ -10,7 +10,7 @@ class org/springframework/beans/support/PagedListHolder
  (Ljava/util/List<TE;>;Lorg/springframework/beans/support/SortDefinition;)V
 copySortDefinition
  (Lorg/springframework/beans/support/SortDefinition;)Lorg/springframework/beans/support/SortDefinition;
- (Lorg/springframework/beans/support/SortDefinition;)Lorg/springframework/beans/support/SortDefinition;
+ (Lorg/springframework/beans/support/SortDefinition;)L1org/springframework/beans/support/SortDefinition;
 doSort
  (Ljava/util/List<TE;>;Lorg/springframework/beans/support/SortDefinition;)V
  (Ljava/util/List<TE;>;Lorg/springframework/beans/support/SortDefinition;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cache/Cache.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cache/Cache.eea
index 1a105e09d3..71fbe944aa 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cache/Cache.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cache/Cache.eea
@@ -32,4 +32,4 @@ retrieve
  (Ljava/lang/Object;)L0java/util/concurrent/CompletableFuture<*>;
 retrieve
  <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/util/function/Supplier<Ljava/util/concurrent/CompletableFuture<TT;>;>;)Ljava/util/concurrent/CompletableFuture<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/util/function/Supplier<Ljava/util/concurrent/CompletableFuture<TT;>;>;)Ljava/util/concurrent/CompletableFuture<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/util/function/Supplier<Ljava/util/concurrent/CompletableFuture<TT;>;>;)L1java/util/concurrent/CompletableFuture<TT;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cache/annotation/ProxyCachingConfiguration.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cache/annotation/ProxyCachingConfiguration.eea
index 84d8cefccf..63e3635de7 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cache/annotation/ProxyCachingConfiguration.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cache/annotation/ProxyCachingConfiguration.eea
@@ -2,10 +2,10 @@ class org/springframework/cache/annotation/ProxyCachingConfiguration
 
 cacheAdvisor
  (Lorg/springframework/cache/interceptor/CacheOperationSource;Lorg/springframework/cache/interceptor/CacheInterceptor;)Lorg/springframework/cache/interceptor/BeanFactoryCacheOperationSourceAdvisor;
- (Lorg/springframework/cache/interceptor/CacheOperationSource;Lorg/springframework/cache/interceptor/CacheInterceptor;)Lorg/springframework/cache/interceptor/BeanFactoryCacheOperationSourceAdvisor;
+ (Lorg/springframework/cache/interceptor/CacheOperationSource;Lorg/springframework/cache/interceptor/CacheInterceptor;)L1org/springframework/cache/interceptor/BeanFactoryCacheOperationSourceAdvisor;
 cacheInterceptor
  (Lorg/springframework/cache/interceptor/CacheOperationSource;)Lorg/springframework/cache/interceptor/CacheInterceptor;
- (Lorg/springframework/cache/interceptor/CacheOperationSource;)Lorg/springframework/cache/interceptor/CacheInterceptor;
+ (Lorg/springframework/cache/interceptor/CacheOperationSource;)L1org/springframework/cache/interceptor/CacheInterceptor;
 cacheOperationSource
  ()Lorg/springframework/cache/interceptor/CacheOperationSource;
- ()Lorg/springframework/cache/interceptor/CacheOperationSource;
+ ()L1org/springframework/cache/interceptor/CacheOperationSource;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cache/concurrent/ConcurrentMapCache.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cache/concurrent/ConcurrentMapCache.eea
index 5e0b2087cf..903f51045e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cache/concurrent/ConcurrentMapCache.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cache/concurrent/ConcurrentMapCache.eea
@@ -44,7 +44,7 @@ retrieve
  (Ljava/lang/Object;)L0java/util/concurrent/CompletableFuture<*>; # @Inherited(org.springframework.cache.Cache)
 retrieve
  <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/util/function/Supplier<Ljava/util/concurrent/CompletableFuture<TT;>;>;)Ljava/util/concurrent/CompletableFuture<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/util/function/Supplier<Ljava/util/concurrent/CompletableFuture<TT;>;>;)Ljava/util/concurrent/CompletableFuture<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/util/function/Supplier<Ljava/util/concurrent/CompletableFuture<TT;>;>;)L1java/util/concurrent/CompletableFuture<TT;>; # @Inherited(org.springframework.cache.Cache)
 toStoreValue
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cache/concurrent/ConcurrentMapCacheManager.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cache/concurrent/ConcurrentMapCacheManager.eea
index c5a20b8d81..280b42d122 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cache/concurrent/ConcurrentMapCacheManager.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cache/concurrent/ConcurrentMapCacheManager.eea
@@ -5,7 +5,7 @@ class org/springframework/cache/concurrent/ConcurrentMapCacheManager
  ([Ljava/lang/String;)V
 createConcurrentMapCache
  (Ljava/lang/String;)Lorg/springframework/cache/Cache;
- (Ljava/lang/String;)Lorg/springframework/cache/Cache;
+ (Ljava/lang/String;)L1org/springframework/cache/Cache;
 getCache
  (Ljava/lang/String;)Lorg/springframework/cache/Cache;
  (Ljava/lang/String;)L0org/springframework/cache/Cache; # @Inherited(org.springframework.cache.CacheManager)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.eea
index 278f8ccf26..4abfa16b34 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.eea
@@ -12,7 +12,7 @@ findCacheOperations
  (Ljava/lang/reflect/Method;)L0java/util/Collection<Lorg/springframework/cache/interceptor/CacheOperation;>;
 getCacheKey
  (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Ljava/lang/Object;
- (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Ljava/lang/Object;
+ (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)L1java/lang/Object;
 getCacheOperations
  (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Ljava/util/Collection<Lorg/springframework/cache/interceptor/CacheOperation;>;
  (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)L0java/util/Collection<Lorg/springframework/cache/interceptor/CacheOperation;>; # @Inherited(org.springframework.cache.interceptor.CacheOperationSource)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/CacheAspectSupport.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/CacheAspectSupport.eea
index dfd5ca0bc7..102381f941 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/CacheAspectSupport.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/CacheAspectSupport.eea
@@ -19,7 +19,7 @@ getBean
  <T:Ljava/lang/Object;>(Ljava/lang/String;Ljava/lang/Class<TT;>;)TT;
 getCacheOperationMetadata
  (Lorg/springframework/cache/interceptor/CacheOperation;Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Lorg/springframework/cache/interceptor/CacheAspectSupport$CacheOperationMetadata;
- (Lorg/springframework/cache/interceptor/CacheOperation;Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Lorg/springframework/cache/interceptor/CacheAspectSupport$CacheOperationMetadata;
+ (Lorg/springframework/cache/interceptor/CacheOperation;Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)L1org/springframework/cache/interceptor/CacheAspectSupport$CacheOperationMetadata;
 getCacheOperationSource
  ()Lorg/springframework/cache/interceptor/CacheOperationSource;
  ()L0org/springframework/cache/interceptor/CacheOperationSource;
@@ -34,7 +34,7 @@ getKeyGenerator
  ()Lorg/springframework/cache/interceptor/KeyGenerator;
 getOperationContext
  (Lorg/springframework/cache/interceptor/CacheOperation;Ljava/lang/reflect/Method;[Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Class<*>;)Lorg/springframework/cache/interceptor/CacheAspectSupport$CacheOperationContext;
- (Lorg/springframework/cache/interceptor/CacheOperation;Ljava/lang/reflect/Method;[Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Class<*>;)Lorg/springframework/cache/interceptor/CacheAspectSupport$CacheOperationContext;
+ (Lorg/springframework/cache/interceptor/CacheOperation;Ljava/lang/reflect/Method;[Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Class<*>;)L1org/springframework/cache/interceptor/CacheAspectSupport$CacheOperationContext;
 invokeOperation
  (Lorg/springframework/cache/interceptor/CacheOperationInvoker;)Ljava/lang/Object;
  (Lorg/springframework/cache/interceptor/CacheOperationInvoker;)L0java/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/CacheEvictOperation$Builder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/CacheEvictOperation$Builder.eea
index 2e1932c145..bf9e67d292 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/CacheEvictOperation$Builder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/CacheEvictOperation$Builder.eea
@@ -5,4 +5,4 @@ build
  ()L1org/springframework/cache/interceptor/CacheEvictOperation;
 getOperationDescription
  ()Ljava/lang/StringBuilder;
- ()Ljava/lang/StringBuilder;
+ ()L1java/lang/StringBuilder; # @Inherited(org.springframework.cache.interceptor.CacheOperation$Builder)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/CacheOperation$Builder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/CacheOperation$Builder.eea
index 9cf35b4edb..7bf220164a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/CacheOperation$Builder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/CacheOperation$Builder.eea
@@ -20,7 +20,7 @@ getKeyGenerator
  ()Ljava/lang/String;
 getOperationDescription
  ()Ljava/lang/StringBuilder;
- ()Ljava/lang/StringBuilder;
+ ()L1java/lang/StringBuilder;
 setCacheManager
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/CacheProxyFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/CacheProxyFactoryBean.eea
index 455175b8b5..3ad0e8e236 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/CacheProxyFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/CacheProxyFactoryBean.eea
@@ -2,7 +2,7 @@ class org/springframework/cache/interceptor/CacheProxyFactoryBean
 
 createMainInterceptor
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object; # @Inherited(org.springframework.aop.framework.AbstractSingletonProxyFactoryBean)
 setBeanFactory
  (Lorg/springframework/beans/factory/BeanFactory;)V
  (Lorg/springframework/beans/factory/BeanFactory;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/CachePutOperation$Builder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/CachePutOperation$Builder.eea
index 59bb123c63..29678bbfa4 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/CachePutOperation$Builder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/CachePutOperation$Builder.eea
@@ -5,7 +5,7 @@ build
  ()L1org/springframework/cache/interceptor/CachePutOperation;
 getOperationDescription
  ()Ljava/lang/StringBuilder;
- ()Ljava/lang/StringBuilder;
+ ()L1java/lang/StringBuilder; # @Inherited(org.springframework.cache.interceptor.CacheOperation$Builder)
 setUnless
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/CacheableOperation$Builder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/CacheableOperation$Builder.eea
index 36daa6f2c4..6e53f11512 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/CacheableOperation$Builder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cache/interceptor/CacheableOperation$Builder.eea
@@ -5,7 +5,7 @@ build
  ()L1org/springframework/cache/interceptor/CacheableOperation;
 getOperationDescription
  ()Ljava/lang/StringBuilder;
- ()Ljava/lang/StringBuilder;
+ ()L1java/lang/StringBuilder; # @Inherited(org.springframework.cache.interceptor.CacheOperation$Builder)
 setUnless
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cache/support/NoOpCache.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cache/support/NoOpCache.eea
index 883fc499c2..4dbffcd79d 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cache/support/NoOpCache.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cache/support/NoOpCache.eea
@@ -35,4 +35,4 @@ retrieve
  (Ljava/lang/Object;)L0java/util/concurrent/CompletableFuture<*>; # @Inherited(org.springframework.cache.Cache)
 retrieve
  <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/util/function/Supplier<Ljava/util/concurrent/CompletableFuture<TT;>;>;)Ljava/util/concurrent/CompletableFuture<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/util/function/Supplier<Ljava/util/concurrent/CompletableFuture<TT;>;>;)Ljava/util/concurrent/CompletableFuture<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/util/function/Supplier<Ljava/util/concurrent/CompletableFuture<TT;>;>;)L1java/util/concurrent/CompletableFuture<TT;>; # @Inherited(org.springframework.cache.Cache)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BeanCopier$Generator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BeanCopier$Generator.eea
index 1642a7b546..3e69d4b26c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BeanCopier$Generator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BeanCopier$Generator.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/beans/BeanCopier$Generator
 
 create
  ()Lorg/springframework/cglib/beans/BeanCopier;
- ()Lorg/springframework/cglib/beans/BeanCopier;
+ ()L1org/springframework/cglib/beans/BeanCopier;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -14,7 +14,7 @@ getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain; # @Inherited(org.springframework.cglib.core.AbstractClassGenerator)
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BeanCopier.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BeanCopier.eea
index dd56ac267d..51ec9006f9 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BeanCopier.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BeanCopier.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/beans/BeanCopier
 
 create
  (Ljava/lang/Class;Ljava/lang/Class;Z)Lorg/springframework/cglib/beans/BeanCopier;
- (Ljava/lang/Class;Ljava/lang/Class;Z)Lorg/springframework/cglib/beans/BeanCopier;
+ (Ljava/lang/Class;Ljava/lang/Class;Z)L1org/springframework/cglib/beans/BeanCopier;
 
 copy
  (Ljava/lang/Object;Ljava/lang/Object;Lorg/springframework/cglib/core/Converter;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BeanGenerator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BeanGenerator.eea
index 8047e9aaad..33bb1005b7 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BeanGenerator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BeanGenerator.eea
@@ -15,10 +15,10 @@ addProperty
  (Ljava/lang/String;Ljava/lang/Class;)V
 create
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 createClass
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -27,10 +27,10 @@ generateClass
  (Lorg/springframework/asm/ClassVisitor;)V
 getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
- ()Ljava/lang/ClassLoader;
+ ()L0java/lang/ClassLoader;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain; # @Inherited(org.springframework.cglib.core.AbstractClassGenerator)
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BeanMap$Generator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BeanMap$Generator.eea
index cf5e00b9e1..3b4a0d6af0 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BeanMap$Generator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BeanMap$Generator.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/beans/BeanMap$Generator
 
 create
  ()Lorg/springframework/cglib/beans/BeanMap;
- ()Lorg/springframework/cglib/beans/BeanMap;
+ ()L1org/springframework/cglib/beans/BeanMap;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -14,7 +14,7 @@ getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain; # @Inherited(org.springframework.cglib.core.AbstractClassGenerator)
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BeanMap.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BeanMap.eea
index 3377d9f26d..b576a6acab 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BeanMap.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BeanMap.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/beans/BeanMap
 
 create
  (Ljava/lang/Object;)Lorg/springframework/cglib/beans/BeanMap;
- (Ljava/lang/Object;)Lorg/springframework/cglib/beans/BeanMap;
+ (Ljava/lang/Object;)L1org/springframework/cglib/beans/BeanMap;
 
 bean
  Ljava/lang/Object;
@@ -49,7 +49,7 @@ putAll
  (Ljava/util/Map;)V
 remove
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object;
 setBean
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BulkBean$Generator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BulkBean$Generator.eea
index b72bf32930..ce6e3e8f12 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BulkBean$Generator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BulkBean$Generator.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/beans/BulkBean$Generator
 
 create
  ()Lorg/springframework/cglib/beans/BulkBean;
- ()Lorg/springframework/cglib/beans/BulkBean;
+ ()L1org/springframework/cglib/beans/BulkBean;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -14,7 +14,7 @@ getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain; # @Inherited(org.springframework.cglib.core.AbstractClassGenerator)
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BulkBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BulkBean.eea
index 49eb273a2c..f05c54c460 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BulkBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/BulkBean.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/beans/BulkBean
 
 create
  (Ljava/lang/Class;[Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/Class;)Lorg/springframework/cglib/beans/BulkBean;
- (Ljava/lang/Class;[Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/Class;)Lorg/springframework/cglib/beans/BulkBean;
+ (Ljava/lang/Class;[Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/Class;)L1org/springframework/cglib/beans/BulkBean;
 
 getters
  [Ljava/lang/String;
@@ -25,7 +25,7 @@ getPropertyTypes
  ()[Ljava/lang/Class;
 getPropertyValues
  (Ljava/lang/Object;)[Ljava/lang/Object;
- (Ljava/lang/Object;)[Ljava/lang/Object;
+ (Ljava/lang/Object;)[1Ljava/lang/Object;
 getPropertyValues
  (Ljava/lang/Object;[Ljava/lang/Object;)V
  (Ljava/lang/Object;[Ljava/lang/Object;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/ImmutableBean$Generator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/ImmutableBean$Generator.eea
index cc0bfda7cf..d074cf40c1 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/ImmutableBean$Generator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/ImmutableBean$Generator.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/beans/ImmutableBean$Generator
 
 create
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -14,7 +14,7 @@ getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain; # @Inherited(org.springframework.cglib.core.AbstractClassGenerator)
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/ImmutableBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/ImmutableBean.eea
index ea9e76beec..8e8098ba80 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/ImmutableBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/beans/ImmutableBean.eea
@@ -2,4 +2,4 @@ class org/springframework/cglib/beans/ImmutableBean
 
 create
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/AbstractClassGenerator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/AbstractClassGenerator.eea
index 927ef6de3f..8bc0a4d2c2 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/AbstractClassGenerator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/AbstractClassGenerator.eea
@@ -11,7 +11,7 @@ getCurrent
  (Lorg/springframework/cglib/core/AbstractClassGenerator$Source;)V
 create
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -32,7 +32,7 @@ getNamingPolicy
  ()Lorg/springframework/cglib/core/NamingPolicy;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain;
 getStrategy
  ()Lorg/springframework/cglib/core/GeneratorStrategy;
  ()Lorg/springframework/cglib/core/GeneratorStrategy;
@@ -59,4 +59,4 @@ unwrapCachedValue
  (TT;)Ljava/lang/Object;
 wrapCachedClass
  (Ljava/lang/Class;)TT;
- (Ljava/lang/Class;)TT;
+ (Ljava/lang/Class;)T1T;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/ClassEmitter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/ClassEmitter.eea
index 074a54b779..f4311a2aa0 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/ClassEmitter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/ClassEmitter.eea
@@ -35,7 +35,7 @@ visit
  (IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 visitField
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/asm/FieldVisitor;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/asm/FieldVisitor;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)L0org/springframework/asm/FieldVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
 visitMethod
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)L0org/springframework/asm/MethodVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/ClassesKey.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/ClassesKey.eea
index 5443dec58b..494fdfb177 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/ClassesKey.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/ClassesKey.eea
@@ -2,4 +2,4 @@ class org/springframework/cglib/core/ClassesKey
 
 create
  ([Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Object;)L1java/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/CodeEmitter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/CodeEmitter.eea
index 9b49eca4c7..346d8620b9 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/CodeEmitter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/CodeEmitter.eea
@@ -11,7 +11,7 @@ array_store
  (Lorg/springframework/asm/Type;)V
 begin_block
  ()Lorg/springframework/cglib/core/Block;
- ()Lorg/springframework/cglib/core/Block;
+ ()L1org/springframework/cglib/core/Block;
 box
  (Lorg/springframework/asm/Type;)V
  (Lorg/springframework/asm/Type;)V
@@ -107,13 +107,13 @@ load_local
  (Lorg/springframework/cglib/core/Local;)V
 make_label
  ()Lorg/springframework/asm/Label;
- ()Lorg/springframework/asm/Label;
+ ()L1org/springframework/asm/Label;
 make_local
  ()Lorg/springframework/cglib/core/Local;
  ()Lorg/springframework/cglib/core/Local;
 make_local
  (Lorg/springframework/asm/Type;)Lorg/springframework/cglib/core/Local;
- (Lorg/springframework/asm/Type;)Lorg/springframework/cglib/core/Local;
+ (Lorg/springframework/asm/Type;)L1org/springframework/cglib/core/Local;
 mark
  (Lorg/springframework/asm/Label;)V
  (Lorg/springframework/asm/Label;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/CollectionUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/CollectionUtils.eea
index 27a76da717..077645bd0f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/CollectionUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/CollectionUtils.eea
@@ -2,16 +2,16 @@ class org/springframework/cglib/core/CollectionUtils
 
 bucket
  (Ljava/util/Collection;Lorg/springframework/cglib/core/Transformer;)Ljava/util/Map;
- (Ljava/util/Collection;Lorg/springframework/cglib/core/Transformer;)Ljava/util/Map;
+ (Ljava/util/Collection;Lorg/springframework/cglib/core/Transformer;)L1java/util/Map;
 filter
  (Ljava/util/Collection;Lorg/springframework/cglib/core/Predicate;)Ljava/util/Collection;
  (Ljava/util/Collection;Lorg/springframework/cglib/core/Predicate;)Ljava/util/Collection;
 getIndexMap
  (Ljava/util/List;)Ljava/util/Map;
- (Ljava/util/List;)Ljava/util/Map;
+ (Ljava/util/List;)L1java/util/Map;
 reverse
  (Ljava/util/Map;Ljava/util/Map;)V
  (Ljava/util/Map;Ljava/util/Map;)V
 transform
  (Ljava/util/Collection;Lorg/springframework/cglib/core/Transformer;)Ljava/util/List;
- (Ljava/util/Collection;Lorg/springframework/cglib/core/Transformer;)Ljava/util/List;
+ (Ljava/util/Collection;Lorg/springframework/cglib/core/Transformer;)L1java/util/List;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/DefaultGeneratorStrategy.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/DefaultGeneratorStrategy.eea
index d7c0e34389..4a8d905b01 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/DefaultGeneratorStrategy.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/DefaultGeneratorStrategy.eea
@@ -12,7 +12,7 @@ getClassVisitor
  ()Lorg/springframework/cglib/core/DebuggingClassWriter;
 getClassWriter
  ()Lorg/springframework/asm/ClassWriter;
- ()Lorg/springframework/asm/ClassWriter;
+ ()L1org/springframework/asm/ClassWriter;
 transform
  (Lorg/springframework/cglib/core/ClassGenerator;)Lorg/springframework/cglib/core/ClassGenerator;
  (Lorg/springframework/cglib/core/ClassGenerator;)Lorg/springframework/cglib/core/ClassGenerator;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/DefaultNamingPolicy.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/DefaultNamingPolicy.eea
index 8907e07f88..87f3e5c0d3 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/DefaultNamingPolicy.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/DefaultNamingPolicy.eea
@@ -9,7 +9,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getClassName
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;Lorg/springframework/cglib/core/Predicate;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;Lorg/springframework/cglib/core/Predicate;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;Lorg/springframework/cglib/core/Predicate;)L1java/lang/String;
 getTag
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/KeyFactory$Generator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/KeyFactory$Generator.eea
index 2fae100ed4..ad0d54d03d 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/KeyFactory$Generator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/KeyFactory$Generator.eea
@@ -5,7 +5,7 @@ addCustomizer
  (Lorg/springframework/cglib/core/KeyFactoryCustomizer;)V
 create
  ()Lorg/springframework/cglib/core/KeyFactory;
- ()Lorg/springframework/cglib/core/KeyFactory;
+ ()L1org/springframework/cglib/core/KeyFactory;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -20,7 +20,7 @@ getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain; # @Inherited(org.springframework.cglib.core.AbstractClassGenerator)
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/KeyFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/KeyFactory.eea
index 7a41cceb8b..67c3f229a0 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/KeyFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/KeyFactory.eea
@@ -15,16 +15,16 @@ STORE_CLASS_AS_STRING
 
 create
  (Ljava/lang/Class;)Lorg/springframework/cglib/core/KeyFactory;
- (Ljava/lang/Class;)Lorg/springframework/cglib/core/KeyFactory;
+ (Ljava/lang/Class;)L1org/springframework/cglib/core/KeyFactory;
 create
  (Ljava/lang/Class;Lorg/springframework/cglib/core/Customizer;)Lorg/springframework/cglib/core/KeyFactory;
- (Ljava/lang/Class;Lorg/springframework/cglib/core/Customizer;)Lorg/springframework/cglib/core/KeyFactory;
+ (Ljava/lang/Class;Lorg/springframework/cglib/core/Customizer;)L1org/springframework/cglib/core/KeyFactory;
 create
  (Ljava/lang/Class;Lorg/springframework/cglib/core/KeyFactoryCustomizer;Ljava/util/List<Lorg/springframework/cglib/core/KeyFactoryCustomizer;>;)Lorg/springframework/cglib/core/KeyFactory;
- (Ljava/lang/Class;Lorg/springframework/cglib/core/KeyFactoryCustomizer;Ljava/util/List<Lorg/springframework/cglib/core/KeyFactoryCustomizer;>;)Lorg/springframework/cglib/core/KeyFactory;
+ (Ljava/lang/Class;Lorg/springframework/cglib/core/KeyFactoryCustomizer;Ljava/util/List<Lorg/springframework/cglib/core/KeyFactoryCustomizer;>;)L1org/springframework/cglib/core/KeyFactory;
 create
  (Ljava/lang/ClassLoader;Ljava/lang/Class;Lorg/springframework/cglib/core/Customizer;)Lorg/springframework/cglib/core/KeyFactory;
- (Ljava/lang/ClassLoader;Ljava/lang/Class;Lorg/springframework/cglib/core/Customizer;)Lorg/springframework/cglib/core/KeyFactory;
+ (Ljava/lang/ClassLoader;Ljava/lang/Class;Lorg/springframework/cglib/core/Customizer;)L1org/springframework/cglib/core/KeyFactory;
 create
  (Ljava/lang/ClassLoader;Ljava/lang/Class;Lorg/springframework/cglib/core/KeyFactoryCustomizer;Ljava/util/List<Lorg/springframework/cglib/core/KeyFactoryCustomizer;>;)Lorg/springframework/cglib/core/KeyFactory;
- (Ljava/lang/ClassLoader;Ljava/lang/Class;Lorg/springframework/cglib/core/KeyFactoryCustomizer;Ljava/util/List<Lorg/springframework/cglib/core/KeyFactoryCustomizer;>;)Lorg/springframework/cglib/core/KeyFactory;
+ (Ljava/lang/ClassLoader;Ljava/lang/Class;Lorg/springframework/cglib/core/KeyFactoryCustomizer;Ljava/util/List<Lorg/springframework/cglib/core/KeyFactoryCustomizer;>;)L1org/springframework/cglib/core/KeyFactory;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/MethodWrapper.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/MethodWrapper.eea
index bb26dfb998..5030cd2a8a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/MethodWrapper.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/MethodWrapper.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/core/MethodWrapper
 
 create
  (Ljava/lang/reflect/Method;)Ljava/lang/Object;
- (Ljava/lang/reflect/Method;)Ljava/lang/Object;
+ (Ljava/lang/reflect/Method;)L1java/lang/Object;
 createSet
  (Ljava/util/Collection;)Ljava/util/Set;
- (Ljava/util/Collection;)Ljava/util/Set;
+ (Ljava/util/Collection;)L1java/util/Set;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/ReflectUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/ReflectUtils.eea
index c137a6d669..c974683d5e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/ReflectUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/ReflectUtils.eea
@@ -35,7 +35,7 @@ findMethod
  (Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/reflect/Method;
 findMethods
  ([Ljava/lang/String;[Ljava/lang/reflect/Method;)[Ljava/lang/reflect/Method;
- ([Ljava/lang/String;[Ljava/lang/reflect/Method;)[Ljava/lang/reflect/Method;
+ ([Ljava/lang/String;[Ljava/lang/reflect/Method;)[1Ljava/lang/reflect/Method;
 findNewInstance
  (Ljava/lang/Class;)Ljava/lang/reflect/Method;
  (Ljava/lang/Class;)Ljava/lang/reflect/Method;
@@ -53,10 +53,10 @@ getBeanSetters
  (Ljava/lang/Class;)[Ljava/beans/PropertyDescriptor;
 getClassInfo
  (Ljava/lang/Class;)Lorg/springframework/cglib/core/ClassInfo;
- (Ljava/lang/Class;)Lorg/springframework/cglib/core/ClassInfo;
+ (Ljava/lang/Class;)L1org/springframework/cglib/core/ClassInfo;
 getClasses
  ([Ljava/lang/Object;)[Ljava/lang/Class;
- ([Ljava/lang/Object;)[Ljava/lang/Class;
+ ([Ljava/lang/Object;)[1Ljava/lang/Class;
 getConstructor
  (Ljava/lang/Class;[Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
  (Ljava/lang/Class;[Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
@@ -68,10 +68,10 @@ getMethodInfo
  (Ljava/lang/reflect/Member;)Lorg/springframework/cglib/core/MethodInfo;
 getMethodInfo
  (Ljava/lang/reflect/Member;I)Lorg/springframework/cglib/core/MethodInfo;
- (Ljava/lang/reflect/Member;I)Lorg/springframework/cglib/core/MethodInfo;
+ (Ljava/lang/reflect/Member;I)L1org/springframework/cglib/core/MethodInfo;
 getNames
  ([Ljava/lang/Class;)[Ljava/lang/String;
- ([Ljava/lang/Class;)[Ljava/lang/String;
+ ([Ljava/lang/Class;)[Ljava/lang/String; # @PolyNull
 getPropertyMethods
  ([Ljava/beans/PropertyDescriptor;ZZ)[Ljava/lang/reflect/Method;
  ([Ljava/beans/PropertyDescriptor;ZZ)[Ljava/lang/reflect/Method;
@@ -80,7 +80,7 @@ getProtectionDomain
  (Ljava/lang/Class;)Ljava/security/ProtectionDomain;
 getSignature
  (Ljava/lang/reflect/Member;)Lorg/springframework/cglib/core/Signature;
- (Ljava/lang/reflect/Member;)Lorg/springframework/cglib/core/Signature;
+ (Ljava/lang/reflect/Member;)L1org/springframework/cglib/core/Signature;
 loadClass
  (Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/Class<*>;
  (Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/Class<*>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/SpringNamingPolicy.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/SpringNamingPolicy.eea
index 9eb8b4aba1..ccec48daf0 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/SpringNamingPolicy.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/SpringNamingPolicy.eea
@@ -6,4 +6,4 @@ INSTANCE
 
 getClassName
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;Lorg/springframework/cglib/core/Predicate;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;Lorg/springframework/cglib/core/Predicate;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;Lorg/springframework/cglib/core/Predicate;)L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/TypeUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/TypeUtils.eea
index 4cf4d692de..e050f0d213 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/TypeUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/core/TypeUtils.eea
@@ -8,19 +8,19 @@ add
  ([Lorg/springframework/asm/Type;Lorg/springframework/asm/Type;)[Lorg/springframework/asm/Type;
 add
  ([Lorg/springframework/asm/Type;[Lorg/springframework/asm/Type;)[Lorg/springframework/asm/Type;
- ([Lorg/springframework/asm/Type;[Lorg/springframework/asm/Type;)[Lorg/springframework/asm/Type;
+ ([Lorg/springframework/asm/Type;[Lorg/springframework/asm/Type;)[1Lorg/springframework/asm/Type;
 emulateClassGetName
  (Lorg/springframework/asm/Type;)Ljava/lang/String;
  (Lorg/springframework/asm/Type;)Ljava/lang/String;
 escapeType
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 fromInternalName
  (Ljava/lang/String;)Lorg/springframework/asm/Type;
  (Ljava/lang/String;)Lorg/springframework/asm/Type;
 fromInternalNames
  ([Ljava/lang/String;)[Lorg/springframework/asm/Type;
- ([Ljava/lang/String;)[Lorg/springframework/asm/Type;
+ ([Ljava/lang/String;)[Lorg/springframework/asm/Type; # @PolyNull
 getBoxedType
  (Lorg/springframework/asm/Type;)Lorg/springframework/asm/Type;
  (Lorg/springframework/asm/Type;)Lorg/springframework/asm/Type;
@@ -44,7 +44,7 @@ getType
  (Ljava/lang/String;)Lorg/springframework/asm/Type;
 getTypes
  ([Ljava/lang/Class;)[Lorg/springframework/asm/Type;
- ([Ljava/lang/Class;)[Lorg/springframework/asm/Type;
+ ([Ljava/lang/Class;)[Lorg/springframework/asm/Type; # @PolyNull
 getUnboxedType
  (Lorg/springframework/asm/Type;)Lorg/springframework/asm/Type;
  (Lorg/springframework/asm/Type;)Lorg/springframework/asm/Type;
@@ -62,19 +62,19 @@ parseConstructor
  (Ljava/lang/String;)Lorg/springframework/cglib/core/Signature;
 parseConstructor
  ([Lorg/springframework/asm/Type;)Lorg/springframework/cglib/core/Signature;
- ([Lorg/springframework/asm/Type;)Lorg/springframework/cglib/core/Signature;
+ ([Lorg/springframework/asm/Type;)L1org/springframework/cglib/core/Signature;
 parseSignature
  (Ljava/lang/String;)Lorg/springframework/cglib/core/Signature;
- (Ljava/lang/String;)Lorg/springframework/cglib/core/Signature;
+ (Ljava/lang/String;)L1org/springframework/cglib/core/Signature;
 parseType
  (Ljava/lang/String;)Lorg/springframework/asm/Type;
  (Ljava/lang/String;)Lorg/springframework/asm/Type;
 parseTypes
  (Ljava/lang/String;)[Lorg/springframework/asm/Type;
- (Ljava/lang/String;)[Lorg/springframework/asm/Type;
+ (Ljava/lang/String;)[1Lorg/springframework/asm/Type;
 toInternalNames
  ([Lorg/springframework/asm/Type;)[Ljava/lang/String;
- ([Lorg/springframework/asm/Type;)[Ljava/lang/String;
+ ([Lorg/springframework/asm/Type;)[Ljava/lang/String; # @PolyNull
 upperFirst
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/proxy/Enhancer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/proxy/Enhancer.eea
index 2c415997ba..c66e72bb67 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/proxy/Enhancer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/proxy/Enhancer.eea
@@ -2,13 +2,13 @@ class org/springframework/cglib/proxy/Enhancer
 
 create
  (Ljava/lang/Class;Lorg/springframework/cglib/proxy/Callback;)Ljava/lang/Object;
- (Ljava/lang/Class;Lorg/springframework/cglib/proxy/Callback;)Ljava/lang/Object;
+ (Ljava/lang/Class;Lorg/springframework/cglib/proxy/Callback;)L1java/lang/Object;
 create
  (Ljava/lang/Class;[Ljava/lang/Class;Lorg/springframework/cglib/proxy/Callback;)Ljava/lang/Object;
- (Ljava/lang/Class;[Ljava/lang/Class;Lorg/springframework/cglib/proxy/Callback;)Ljava/lang/Object;
+ (Ljava/lang/Class;[Ljava/lang/Class;Lorg/springframework/cglib/proxy/Callback;)L1java/lang/Object;
 create
  (Ljava/lang/Class;[Ljava/lang/Class;Lorg/springframework/cglib/proxy/CallbackFilter;[Lorg/springframework/cglib/proxy/Callback;)Ljava/lang/Object;
- (Ljava/lang/Class;[Ljava/lang/Class;Lorg/springframework/cglib/proxy/CallbackFilter;[Lorg/springframework/cglib/proxy/Callback;)Ljava/lang/Object;
+ (Ljava/lang/Class;[Ljava/lang/Class;Lorg/springframework/cglib/proxy/CallbackFilter;[Lorg/springframework/cglib/proxy/Callback;)L1java/lang/Object;
 getMethods
  (Ljava/lang/Class;[Ljava/lang/Class;Ljava/util/List;)V
  (Ljava/lang/Class;[Ljava/lang/Class;Ljava/util/List;)V
@@ -24,13 +24,13 @@ registerStaticCallbacks
 
 create
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 create
  ([Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
- ([Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
+ ([Ljava/lang/Class;[Ljava/lang/Object;)L1java/lang/Object;
 createClass
  ()Ljava/lang/Class;
- ()Ljava/lang/Class;
+ ()L1java/lang/Class;
 filterConstructors
  (Ljava/lang/Class;Ljava/util/List;)V
  (Ljava/lang/Class;Ljava/util/List;)V
@@ -45,10 +45,10 @@ generateClass
  (Lorg/springframework/asm/ClassVisitor;)V
 getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
- ()Ljava/lang/ClassLoader;
+ ()L0java/lang/ClassLoader;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain; # @Inherited(org.springframework.cglib.core.AbstractClassGenerator)
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
@@ -81,4 +81,4 @@ unwrapCachedValue
  (Ljava/lang/Object;)Ljava/lang/Object;
 wrapCachedClass
  (Ljava/lang/Class;)Ljava/lang/Object;
- (Ljava/lang/Class;)Ljava/lang/Object;
+ (Ljava/lang/Class;)L1java/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/proxy/InterfaceMaker.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/proxy/InterfaceMaker.eea
index 54a664b753..1ece311319 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/proxy/InterfaceMaker.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/proxy/InterfaceMaker.eea
@@ -11,7 +11,7 @@ add
  (Lorg/springframework/cglib/core/Signature;[Lorg/springframework/asm/Type;)V
 create
  ()Ljava/lang/Class;
- ()Ljava/lang/Class;
+ ()L1java/lang/Class;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -20,7 +20,7 @@ generateClass
  (Lorg/springframework/asm/ClassVisitor;)V
 getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
- ()Ljava/lang/ClassLoader;
+ ()L0java/lang/ClassLoader;
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/proxy/MethodProxy.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/proxy/MethodProxy.eea
index 391c100fe1..890b2232b6 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/proxy/MethodProxy.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/proxy/MethodProxy.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/proxy/MethodProxy
 
 create
  (Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/cglib/proxy/MethodProxy;
- (Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/cglib/proxy/MethodProxy;
+ (Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1org/springframework/cglib/proxy/MethodProxy;
 find
  (Ljava/lang/Class;Lorg/springframework/cglib/core/Signature;)Lorg/springframework/cglib/proxy/MethodProxy;
  (Ljava/lang/Class;Lorg/springframework/cglib/core/Signature;)Lorg/springframework/cglib/proxy/MethodProxy;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/proxy/Mixin$Generator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/proxy/Mixin$Generator.eea
index ee23f2d61a..7d8e1c42c9 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/proxy/Mixin$Generator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/proxy/Mixin$Generator.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/proxy/Mixin$Generator
 
 create
  ()Lorg/springframework/cglib/proxy/Mixin;
- ()Lorg/springframework/cglib/proxy/Mixin;
+ ()L1org/springframework/cglib/proxy/Mixin;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -14,7 +14,7 @@ getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain; # @Inherited(org.springframework.cglib.core.AbstractClassGenerator)
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/proxy/Mixin.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/proxy/Mixin.eea
index 0b21c9fa2e..9e82941f2a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/proxy/Mixin.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/proxy/Mixin.eea
@@ -2,16 +2,16 @@ class org/springframework/cglib/proxy/Mixin
 
 create
  ([Ljava/lang/Class;[Ljava/lang/Object;)Lorg/springframework/cglib/proxy/Mixin;
- ([Ljava/lang/Class;[Ljava/lang/Object;)Lorg/springframework/cglib/proxy/Mixin;
+ ([Ljava/lang/Class;[Ljava/lang/Object;)L1org/springframework/cglib/proxy/Mixin;
 create
  ([Ljava/lang/Object;)Lorg/springframework/cglib/proxy/Mixin;
- ([Ljava/lang/Object;)Lorg/springframework/cglib/proxy/Mixin;
+ ([Ljava/lang/Object;)L1org/springframework/cglib/proxy/Mixin;
 createBean
  (Ljava/lang/ClassLoader;[Ljava/lang/Object;)Lorg/springframework/cglib/proxy/Mixin;
- (Ljava/lang/ClassLoader;[Ljava/lang/Object;)Lorg/springframework/cglib/proxy/Mixin;
+ (Ljava/lang/ClassLoader;[Ljava/lang/Object;)L1org/springframework/cglib/proxy/Mixin;
 createBean
  ([Ljava/lang/Object;)Lorg/springframework/cglib/proxy/Mixin;
- ([Ljava/lang/Object;)Lorg/springframework/cglib/proxy/Mixin;
+ ([Ljava/lang/Object;)L1org/springframework/cglib/proxy/Mixin;
 getClasses
  ([Ljava/lang/Object;)[Ljava/lang/Class;
  ([Ljava/lang/Object;)[Ljava/lang/Class;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/ConstructorDelegate$Generator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/ConstructorDelegate$Generator.eea
index b1e831e60f..543feb570f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/ConstructorDelegate$Generator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/ConstructorDelegate$Generator.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/reflect/ConstructorDelegate$Generator
 
 create
  ()Lorg/springframework/cglib/reflect/ConstructorDelegate;
- ()Lorg/springframework/cglib/reflect/ConstructorDelegate;
+ ()L1org/springframework/cglib/reflect/ConstructorDelegate;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -14,7 +14,7 @@ getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain; # @Inherited(org.springframework.cglib.core.AbstractClassGenerator)
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/ConstructorDelegate.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/ConstructorDelegate.eea
index 3ef60535cf..a64f14c306 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/ConstructorDelegate.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/ConstructorDelegate.eea
@@ -2,4 +2,4 @@ class org/springframework/cglib/reflect/ConstructorDelegate
 
 create
  (Ljava/lang/Class;Ljava/lang/Class;)Lorg/springframework/cglib/reflect/ConstructorDelegate;
- (Ljava/lang/Class;Ljava/lang/Class;)Lorg/springframework/cglib/reflect/ConstructorDelegate;
+ (Ljava/lang/Class;Ljava/lang/Class;)L1org/springframework/cglib/reflect/ConstructorDelegate;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/FastClass$Generator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/FastClass$Generator.eea
index 7bb4b8d2bd..76f6261e1c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/FastClass$Generator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/FastClass$Generator.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/reflect/FastClass$Generator
 
 create
  ()Lorg/springframework/cglib/reflect/FastClass;
- ()Lorg/springframework/cglib/reflect/FastClass;
+ ()L1org/springframework/cglib/reflect/FastClass;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -14,7 +14,7 @@ getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain; # @Inherited(org.springframework.cglib.core.AbstractClassGenerator)
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/FastClass.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/FastClass.eea
index c1f071c72b..c0e712ac43 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/FastClass.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/FastClass.eea
@@ -2,13 +2,13 @@ class org/springframework/cglib/reflect/FastClass
 
 create
  (Ljava/lang/Class;)Lorg/springframework/cglib/reflect/FastClass;
- (Ljava/lang/Class;)Lorg/springframework/cglib/reflect/FastClass;
+ (Ljava/lang/Class;)L1org/springframework/cglib/reflect/FastClass;
 create
  (Ljava/lang/ClassLoader;Ljava/lang/Class;)Lorg/springframework/cglib/reflect/FastClass;
- (Ljava/lang/ClassLoader;Ljava/lang/Class;)Lorg/springframework/cglib/reflect/FastClass;
+ (Ljava/lang/ClassLoader;Ljava/lang/Class;)L1org/springframework/cglib/reflect/FastClass;
 getSignatureWithoutReturnType
  (Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/String;
- (Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/String;
+ (Ljava/lang/String;[Ljava/lang/Class;)L1java/lang/String;
 
 <init>
  (Ljava/lang/Class;)V
@@ -18,7 +18,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getConstructor
  (Ljava/lang/reflect/Constructor;)Lorg/springframework/cglib/reflect/FastConstructor;
- (Ljava/lang/reflect/Constructor;)Lorg/springframework/cglib/reflect/FastConstructor;
+ (Ljava/lang/reflect/Constructor;)L1org/springframework/cglib/reflect/FastConstructor;
 getConstructor
  ([Ljava/lang/Class;)Lorg/springframework/cglib/reflect/FastConstructor;
  ([Ljava/lang/Class;)Lorg/springframework/cglib/reflect/FastConstructor;
@@ -39,7 +39,7 @@ getMethod
  (Ljava/lang/String;[Ljava/lang/Class;)Lorg/springframework/cglib/reflect/FastMethod;
 getMethod
  (Ljava/lang/reflect/Method;)Lorg/springframework/cglib/reflect/FastMethod;
- (Ljava/lang/reflect/Method;)Lorg/springframework/cglib/reflect/FastMethod;
+ (Ljava/lang/reflect/Method;)L1org/springframework/cglib/reflect/FastMethod;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/MethodDelegate$Generator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/MethodDelegate$Generator.eea
index 524de6a88e..647c678afa 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/MethodDelegate$Generator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/MethodDelegate$Generator.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/reflect/MethodDelegate$Generator
 
 create
  ()Lorg/springframework/cglib/reflect/MethodDelegate;
- ()Lorg/springframework/cglib/reflect/MethodDelegate;
+ ()L1org/springframework/cglib/reflect/MethodDelegate;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -14,7 +14,7 @@ getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain; # @Inherited(org.springframework.cglib.core.AbstractClassGenerator)
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/MethodDelegate.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/MethodDelegate.eea
index a5bfa0e8e2..e1cdaf5748 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/MethodDelegate.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/MethodDelegate.eea
@@ -2,10 +2,10 @@ class org/springframework/cglib/reflect/MethodDelegate
 
 create
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Class;)Lorg/springframework/cglib/reflect/MethodDelegate;
- (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Class;)Lorg/springframework/cglib/reflect/MethodDelegate;
+ (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Class;)L1org/springframework/cglib/reflect/MethodDelegate;
 createStatic
  (Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Class;)Lorg/springframework/cglib/reflect/MethodDelegate;
- (Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Class;)Lorg/springframework/cglib/reflect/MethodDelegate;
+ (Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Class;)L1org/springframework/cglib/reflect/MethodDelegate;
 
 eqMethod
  Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/MulticastDelegate$Generator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/MulticastDelegate$Generator.eea
index 45fc3f04c1..50bb43db48 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/MulticastDelegate$Generator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/MulticastDelegate$Generator.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/reflect/MulticastDelegate$Generator
 
 create
  ()Lorg/springframework/cglib/reflect/MulticastDelegate;
- ()Lorg/springframework/cglib/reflect/MulticastDelegate;
+ ()L1org/springframework/cglib/reflect/MulticastDelegate;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -14,7 +14,7 @@ getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
 getProtectionDomain
  ()Ljava/security/ProtectionDomain;
- ()Ljava/security/ProtectionDomain;
+ ()L0java/security/ProtectionDomain; # @Inherited(org.springframework.cglib.core.AbstractClassGenerator)
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/MulticastDelegate.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/MulticastDelegate.eea
index b2fe51f4ae..0578410314 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/MulticastDelegate.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/reflect/MulticastDelegate.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/reflect/MulticastDelegate
 
 create
  (Ljava/lang/Class;)Lorg/springframework/cglib/reflect/MulticastDelegate;
- (Ljava/lang/Class;)Lorg/springframework/cglib/reflect/MulticastDelegate;
+ (Ljava/lang/Class;)L1org/springframework/cglib/reflect/MulticastDelegate;
 
 targets
  [Ljava/lang/Object;
@@ -16,7 +16,7 @@ addHelper
  (Ljava/lang/Object;)Lorg/springframework/cglib/reflect/MulticastDelegate;
 getTargets
  ()Ljava/util/List;
- ()Ljava/util/List;
+ ()L1java/util/List;
 newInstance
  ()Lorg/springframework/cglib/reflect/MulticastDelegate;
  ()Lorg/springframework/cglib/reflect/MulticastDelegate;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/AbstractClassFilterTransformer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/AbstractClassFilterTransformer.eea
index 9f8235e81c..8b07556fac 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/AbstractClassFilterTransformer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/AbstractClassFilterTransformer.eea
@@ -14,19 +14,19 @@ visit
  (IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 visitAnnotation
  (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
 visitAttribute
  (Lorg/springframework/asm/Attribute;)V
  (Lorg/springframework/asm/Attribute;)V
 visitField
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/asm/FieldVisitor;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/asm/FieldVisitor;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)L0org/springframework/asm/FieldVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
 visitInnerClass
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
 visitMethod
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)L0org/springframework/asm/MethodVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
 visitOuterClass
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/AbstractClassLoader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/AbstractClassLoader.eea
index 44f5cff31c..e3a10eecc2 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/AbstractClassLoader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/AbstractClassLoader.eea
@@ -5,10 +5,10 @@ class org/springframework/cglib/transform/AbstractClassLoader
  (Ljava/lang/ClassLoader;Ljava/lang/ClassLoader;Lorg/springframework/cglib/transform/ClassFilter;)V
 attributes
  ()[Lorg/springframework/asm/Attribute;
- ()[Lorg/springframework/asm/Attribute;
+ ()[0Lorg/springframework/asm/Attribute;
 getGenerator
  (Lorg/springframework/asm/ClassReader;)Lorg/springframework/cglib/core/ClassGenerator;
- (Lorg/springframework/asm/ClassReader;)Lorg/springframework/cglib/core/ClassGenerator;
+ (Lorg/springframework/asm/ClassReader;)L1org/springframework/cglib/core/ClassGenerator;
 loadClass
  (Ljava/lang/String;)Ljava/lang/Class;
  (Ljava/lang/String;)Ljava/lang/Class;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/AnnotationVisitorTee.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/AnnotationVisitorTee.eea
index 445d9371fc..148aad6aa4 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/AnnotationVisitorTee.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/AnnotationVisitorTee.eea
@@ -12,10 +12,10 @@ visit
  (Ljava/lang/String;Ljava/lang/Object;)V
 visitAnnotation
  (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;Ljava/lang/String;)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.AnnotationVisitor)
 visitArray
  (Ljava/lang/String;)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.AnnotationVisitor)
 visitEnum
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/ClassTransformerChain.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/ClassTransformerChain.eea
index 301a3ca73a..d798e2461b 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/ClassTransformerChain.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/ClassTransformerChain.eea
@@ -11,4 +11,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 visitMethod
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)L0org/springframework/asm/MethodVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/ClassVisitorTee.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/ClassVisitorTee.eea
index e6fc189638..da476fbc56 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/ClassVisitorTee.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/ClassVisitorTee.eea
@@ -8,19 +8,19 @@ visit
  (IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 visitAnnotation
  (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
 visitAttribute
  (Lorg/springframework/asm/Attribute;)V
  (Lorg/springframework/asm/Attribute;)V
 visitField
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/asm/FieldVisitor;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/asm/FieldVisitor;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)L0org/springframework/asm/FieldVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
 visitInnerClass
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
 visitMethod
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)L0org/springframework/asm/MethodVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
 visitOuterClass
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
@@ -29,4 +29,4 @@ visitSource
  (Ljava/lang/String;Ljava/lang/String;)V
 visitTypeAnnotation
  (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/FieldVisitorTee.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/FieldVisitorTee.eea
index 461a978719..b4f0c57761 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/FieldVisitorTee.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/FieldVisitorTee.eea
@@ -5,10 +5,10 @@ class org/springframework/cglib/transform/FieldVisitorTee
  (Lorg/springframework/asm/FieldVisitor;Lorg/springframework/asm/FieldVisitor;)V
 visitAnnotation
  (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.FieldVisitor)
 visitAttribute
  (Lorg/springframework/asm/Attribute;)V
  (Lorg/springframework/asm/Attribute;)V
 visitTypeAnnotation
  (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.FieldVisitor)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/MethodFilterTransformer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/MethodFilterTransformer.eea
index d324a6451b..11c7b416f2 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/MethodFilterTransformer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/MethodFilterTransformer.eea
@@ -8,4 +8,4 @@ setTarget
  (Lorg/springframework/asm/ClassVisitor;)V
 visitMethod
  (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
- (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/asm/MethodVisitor;
+ (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)L0org/springframework/asm/MethodVisitor; # @Inherited(org.springframework.asm.ClassVisitor)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/MethodVisitorTee.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/MethodVisitorTee.eea
index 429ff249e3..48ab4e4c70 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/MethodVisitorTee.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/MethodVisitorTee.eea
@@ -5,10 +5,10 @@ class org/springframework/cglib/transform/MethodVisitorTee
  (Lorg/springframework/asm/MethodVisitor;Lorg/springframework/asm/MethodVisitor;)V
 visitAnnotation
  (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.MethodVisitor)
 visitAnnotationDefault
  ()Lorg/springframework/asm/AnnotationVisitor;
- ()Lorg/springframework/asm/AnnotationVisitor;
+ ()L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.MethodVisitor)
 visitAttribute
  (Lorg/springframework/asm/Attribute;)V
  (Lorg/springframework/asm/Attribute;)V
@@ -20,7 +20,7 @@ visitFrame
  (II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 visitInsnAnnotation
  (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.MethodVisitor)
 visitInvokeDynamicInsn
  (Ljava/lang/String;Ljava/lang/String;Lorg/springframework/asm/Handle;[Ljava/lang/Object;)V
  (Ljava/lang/String;Ljava/lang/String;Lorg/springframework/asm/Handle;[Ljava/lang/Object;)V
@@ -41,7 +41,7 @@ visitLocalVariable
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lorg/springframework/asm/Label;Lorg/springframework/asm/Label;I)V
 visitLocalVariableAnnotation
  (ILorg/springframework/asm/TypePath;[Lorg/springframework/asm/Label;[Lorg/springframework/asm/Label;[ILjava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;[Lorg/springframework/asm/Label;[Lorg/springframework/asm/Label;[ILjava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;[Lorg/springframework/asm/Label;[Lorg/springframework/asm/Label;[ILjava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.MethodVisitor)
 visitLookupSwitchInsn
  (Lorg/springframework/asm/Label;[I[Lorg/springframework/asm/Label;)V
  (Lorg/springframework/asm/Label;[I[Lorg/springframework/asm/Label;)V
@@ -59,19 +59,19 @@ visitParameter
  (Ljava/lang/String;I)V
 visitParameterAnnotation
  (ILjava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILjava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILjava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.MethodVisitor)
 visitTableSwitchInsn
  (IILorg/springframework/asm/Label;[Lorg/springframework/asm/Label;)V
  (IILorg/springframework/asm/Label;[Lorg/springframework/asm/Label;)V
 visitTryCatchAnnotation
  (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.MethodVisitor)
 visitTryCatchBlock
  (Lorg/springframework/asm/Label;Lorg/springframework/asm/Label;Lorg/springframework/asm/Label;Ljava/lang/String;)V
  (Lorg/springframework/asm/Label;Lorg/springframework/asm/Label;Lorg/springframework/asm/Label;Ljava/lang/String;)V
 visitTypeAnnotation
  (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
- (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)Lorg/springframework/asm/AnnotationVisitor;
+ (ILorg/springframework/asm/TypePath;Ljava/lang/String;Z)L0org/springframework/asm/AnnotationVisitor; # @Inherited(org.springframework.asm.MethodVisitor)
 visitTypeInsn
  (ILjava/lang/String;)V
  (ILjava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/TransformingClassLoader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/TransformingClassLoader.eea
index ed04bd16a7..c68d135f5a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/TransformingClassLoader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/TransformingClassLoader.eea
@@ -5,4 +5,4 @@ class org/springframework/cglib/transform/TransformingClassLoader
  (Ljava/lang/ClassLoader;Lorg/springframework/cglib/transform/ClassFilter;Lorg/springframework/cglib/transform/ClassTransformerFactory;)V
 getGenerator
  (Lorg/springframework/asm/ClassReader;)Lorg/springframework/cglib/core/ClassGenerator;
- (Lorg/springframework/asm/ClassReader;)Lorg/springframework/cglib/core/ClassGenerator;
+ (Lorg/springframework/asm/ClassReader;)L1org/springframework/cglib/core/ClassGenerator; # @Inherited(org.springframework.cglib.transform.AbstractClassLoader)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/impl/InterceptFieldTransformer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/impl/InterceptFieldTransformer.eea
index d8aa7e9a3c..997272dfe3 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/impl/InterceptFieldTransformer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/impl/InterceptFieldTransformer.eea
@@ -8,7 +8,7 @@ begin_class
  (IILjava/lang/String;Lorg/springframework/asm/Type;[Lorg/springframework/asm/Type;Ljava/lang/String;)V
 begin_method
  (ILorg/springframework/cglib/core/Signature;[Lorg/springframework/asm/Type;)Lorg/springframework/cglib/core/CodeEmitter;
- (ILorg/springframework/cglib/core/Signature;[Lorg/springframework/asm/Type;)Lorg/springframework/cglib/core/CodeEmitter;
+ (ILorg/springframework/cglib/core/Signature;[Lorg/springframework/asm/Type;)L1org/springframework/cglib/core/CodeEmitter;
 declare_field
  (ILjava/lang/String;Lorg/springframework/asm/Type;Ljava/lang/Object;)V
  (ILjava/lang/String;Lorg/springframework/asm/Type;Ljava/lang/Object;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/impl/UndeclaredThrowableStrategy.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/impl/UndeclaredThrowableStrategy.eea
index 3f201897ad..61960f00a1 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/impl/UndeclaredThrowableStrategy.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/transform/impl/UndeclaredThrowableStrategy.eea
@@ -5,4 +5,4 @@ class org/springframework/cglib/transform/impl/UndeclaredThrowableStrategy
  (Ljava/lang/Class;)V
 transform
  (Lorg/springframework/cglib/core/ClassGenerator;)Lorg/springframework/cglib/core/ClassGenerator;
- (Lorg/springframework/cglib/core/ClassGenerator;)Lorg/springframework/cglib/core/ClassGenerator;
+ (Lorg/springframework/cglib/core/ClassGenerator;)L1org/springframework/cglib/core/ClassGenerator;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/util/ParallelSorter$Generator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/util/ParallelSorter$Generator.eea
index 5c2e40c23a..69d1cf8afb 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/util/ParallelSorter$Generator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/util/ParallelSorter$Generator.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/util/ParallelSorter$Generator
 
 create
  ()Lorg/springframework/cglib/util/ParallelSorter;
- ()Lorg/springframework/cglib/util/ParallelSorter;
+ ()L1org/springframework/cglib/util/ParallelSorter;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
@@ -11,7 +11,7 @@ generateClass
  (Lorg/springframework/asm/ClassVisitor;)V
 getDefaultClassLoader
  ()Ljava/lang/ClassLoader;
- ()Ljava/lang/ClassLoader;
+ ()L0java/lang/ClassLoader;
 nextInstance
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/util/ParallelSorter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/util/ParallelSorter.eea
index f2a33abed6..ebd3adf4db 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/util/ParallelSorter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/util/ParallelSorter.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/util/ParallelSorter
 
 create
  ([Ljava/lang/Object;)Lorg/springframework/cglib/util/ParallelSorter;
- ([Ljava/lang/Object;)Lorg/springframework/cglib/util/ParallelSorter;
+ ([Ljava/lang/Object;)L1org/springframework/cglib/util/ParallelSorter;
 
 a
  [Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/util/StringSwitcher$Generator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/util/StringSwitcher$Generator.eea
index 7803cd8482..ed1d34bc8e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/util/StringSwitcher$Generator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/util/StringSwitcher$Generator.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/util/StringSwitcher$Generator
 
 create
  ()Lorg/springframework/cglib/util/StringSwitcher;
- ()Lorg/springframework/cglib/util/StringSwitcher;
+ ()L1org/springframework/cglib/util/StringSwitcher;
 firstInstance
  (Ljava/lang/Class;)Ljava/lang/Object;
  (Ljava/lang/Class;)Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/util/StringSwitcher.eea b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/util/StringSwitcher.eea
index bdd0782923..fd42eb85c3 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/cglib/util/StringSwitcher.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/cglib/util/StringSwitcher.eea
@@ -2,7 +2,7 @@ class org/springframework/cglib/util/StringSwitcher
 
 create
  ([Ljava/lang/String;[IZ)Lorg/springframework/cglib/util/StringSwitcher;
- ([Ljava/lang/String;[IZ)Lorg/springframework/cglib/util/StringSwitcher;
+ ([Ljava/lang/String;[IZ)L1org/springframework/cglib/util/StringSwitcher;
 
 intValue
  (Ljava/lang/String;)I
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/AdviceModeImportSelector.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/AdviceModeImportSelector.eea
index d92af486f8..3f25023da8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/AdviceModeImportSelector.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/AdviceModeImportSelector.eea
@@ -8,7 +8,7 @@ DEFAULT_ADVICE_MODE_ATTRIBUTE_NAME
 
 getAdviceModeAttributeName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 selectImports
  (Lorg/springframework/context/annotation/AdviceMode;)[Ljava/lang/String;
  (Lorg/springframework/context/annotation/AdviceMode;)[0Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/AnnotationScopeMetadataResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/AnnotationScopeMetadataResolver.eea
index 10002d9abd..451182e1c4 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/AnnotationScopeMetadataResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/AnnotationScopeMetadataResolver.eea
@@ -9,7 +9,7 @@ scopeAnnotationType
  (Lorg/springframework/context/annotation/ScopedProxyMode;)V
 resolveScopeMetadata
  (Lorg/springframework/beans/factory/config/BeanDefinition;)Lorg/springframework/context/annotation/ScopeMetadata;
- (Lorg/springframework/beans/factory/config/BeanDefinition;)Lorg/springframework/context/annotation/ScopeMetadata;
+ (Lorg/springframework/beans/factory/config/BeanDefinition;)L1org/springframework/context/annotation/ScopeMetadata;
 setScopeAnnotationType
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)V
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.eea
index 06cf3b798b..cb31d56b7b 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.eea
@@ -17,7 +17,7 @@ checkCandidate
  (Ljava/lang/String;Lorg/springframework/beans/factory/config/BeanDefinition;)Z
 doScan
  ([Ljava/lang/String;)Ljava/util/Set<Lorg/springframework/beans/factory/config/BeanDefinitionHolder;>;
- ([Ljava/lang/String;)Ljava/util/Set<Lorg/springframework/beans/factory/config/BeanDefinitionHolder;>;
+ ([Ljava/lang/String;)L1java/util/Set<Lorg/springframework/beans/factory/config/BeanDefinitionHolder;>;
 getBeanDefinitionDefaults
  ()Lorg/springframework/beans/factory/support/BeanDefinitionDefaults;
  ()Lorg/springframework/beans/factory/support/BeanDefinitionDefaults;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.eea
index d4b96c6610..0d74d6ab86 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.eea
@@ -5,10 +5,10 @@ configureScanner
  (Lorg/springframework/beans/factory/xml/ParserContext;Lorg/w3c/dom/Element;)Lorg/springframework/context/annotation/ClassPathBeanDefinitionScanner;
 createScanner
  (Lorg/springframework/beans/factory/xml/XmlReaderContext;Z)Lorg/springframework/context/annotation/ClassPathBeanDefinitionScanner;
- (Lorg/springframework/beans/factory/xml/XmlReaderContext;Z)Lorg/springframework/context/annotation/ClassPathBeanDefinitionScanner;
+ (Lorg/springframework/beans/factory/xml/XmlReaderContext;Z)L1org/springframework/context/annotation/ClassPathBeanDefinitionScanner;
 createTypeFilter
  (Lorg/w3c/dom/Element;Ljava/lang/ClassLoader;Lorg/springframework/beans/factory/xml/ParserContext;)Lorg/springframework/core/type/filter/TypeFilter;
- (Lorg/w3c/dom/Element;Ljava/lang/ClassLoader;Lorg/springframework/beans/factory/xml/ParserContext;)Lorg/springframework/core/type/filter/TypeFilter;
+ (Lorg/w3c/dom/Element;Ljava/lang/ClassLoader;Lorg/springframework/beans/factory/xml/ParserContext;)L1org/springframework/core/type/filter/TypeFilter;
 parse
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/xml/ParserContext;)Lorg/springframework/beans/factory/config/BeanDefinition;
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/xml/ParserContext;)L0org/springframework/beans/factory/config/BeanDefinition; # @Inherited(org.springframework.beans.factory.xml.BeanDefinitionParser)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.eea
index beb3cebf4e..3f34772fdb 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.eea
@@ -8,7 +8,7 @@ registerScope
  (Ljava/lang/String;Ljava/lang/String;)V
 resolveScopeMetadata
  (Lorg/springframework/beans/factory/config/BeanDefinition;)Lorg/springframework/context/annotation/ScopeMetadata;
- (Lorg/springframework/beans/factory/config/BeanDefinition;)Lorg/springframework/context/annotation/ScopeMetadata;
+ (Lorg/springframework/beans/factory/config/BeanDefinition;)L1org/springframework/context/annotation/ScopeMetadata;
 resolveScopeName
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)L0java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/LoadTimeWeavingConfiguration.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/LoadTimeWeavingConfiguration.eea
index b3771558ed..550f93091e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/LoadTimeWeavingConfiguration.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/LoadTimeWeavingConfiguration.eea
@@ -2,7 +2,7 @@ class org/springframework/context/annotation/LoadTimeWeavingConfiguration
 
 loadTimeWeaver
  ()Lorg/springframework/instrument/classloading/LoadTimeWeaver;
- ()Lorg/springframework/instrument/classloading/LoadTimeWeaver;
+ ()L1org/springframework/instrument/classloading/LoadTimeWeaver;
 setBeanClassLoader
  (Ljava/lang/ClassLoader;)V
  (Ljava/lang/ClassLoader;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/MBeanExportConfiguration.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/MBeanExportConfiguration.eea
index 8804030f9e..a49af658a9 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/MBeanExportConfiguration.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/MBeanExportConfiguration.eea
@@ -2,7 +2,7 @@ class org/springframework/context/annotation/MBeanExportConfiguration
 
 mbeanExporter
  ()Lorg/springframework/jmx/export/annotation/AnnotationMBeanExporter;
- ()Lorg/springframework/jmx/export/annotation/AnnotationMBeanExporter;
+ ()L1org/springframework/jmx/export/annotation/AnnotationMBeanExporter;
 setBeanFactory
  (Lorg/springframework/beans/factory/BeanFactory;)V
  (Lorg/springframework/beans/factory/BeanFactory;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/TypeFilterUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/TypeFilterUtils.eea
index 9406237415..259a8c6544 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/TypeFilterUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/annotation/TypeFilterUtils.eea
@@ -2,4 +2,4 @@ class org/springframework/context/annotation/TypeFilterUtils
 
 createTypeFiltersFor
  (Lorg/springframework/core/annotation/AnnotationAttributes;Lorg/springframework/core/env/Environment;Lorg/springframework/core/io/ResourceLoader;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)Ljava/util/List<Lorg/springframework/core/type/filter/TypeFilter;>;
- (Lorg/springframework/core/annotation/AnnotationAttributes;Lorg/springframework/core/env/Environment;Lorg/springframework/core/io/ResourceLoader;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)Ljava/util/List<Lorg/springframework/core/type/filter/TypeFilter;>;
+ (Lorg/springframework/core/annotation/AnnotationAttributes;Lorg/springframework/core/env/Environment;Lorg/springframework/core/io/ResourceLoader;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)L1java/util/List<Lorg/springframework/core/type/filter/TypeFilter;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/aot/AbstractAotProcessor$Settings.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/aot/AbstractAotProcessor$Settings.eea
index 627ee8cf4a..c6857579cc 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/aot/AbstractAotProcessor$Settings.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/aot/AbstractAotProcessor$Settings.eea
@@ -2,7 +2,7 @@ class org/springframework/context/aot/AbstractAotProcessor$Settings
 
 builder
  ()Lorg/springframework/context/aot/AbstractAotProcessor$Settings$Builder;
- ()Lorg/springframework/context/aot/AbstractAotProcessor$Settings$Builder;
+ ()L1org/springframework/context/aot/AbstractAotProcessor$Settings$Builder;
 
 getArtifactId
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/aot/AbstractAotProcessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/aot/AbstractAotProcessor.eea
index ffa28131bd..710e1057a4 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/aot/AbstractAotProcessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/aot/AbstractAotProcessor.eea
@@ -7,7 +7,7 @@ class org/springframework/context/aot/AbstractAotProcessor
  (Lorg/springframework/context/aot/AbstractAotProcessor$Settings;)V
 createFileSystemGeneratedFiles
  ()Lorg/springframework/aot/generate/FileSystemGeneratedFiles;
- ()Lorg/springframework/aot/generate/FileSystemGeneratedFiles;
+ ()L1org/springframework/aot/generate/FileSystemGeneratedFiles;
 doProcess
  ()TT;
  ()TT;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/aot/ContextAotProcessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/aot/ContextAotProcessor.eea
index df621d8851..ae4bb2861c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/aot/ContextAotProcessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/aot/ContextAotProcessor.eea
@@ -9,7 +9,7 @@ super org/springframework/context/aot/AbstractAotProcessor
  (Ljava/lang/Class<*>;Lorg/springframework/context/aot/AbstractAotProcessor$Settings;)V
 createClassNameGenerator
  ()Lorg/springframework/aot/generate/ClassNameGenerator;
- ()Lorg/springframework/aot/generate/ClassNameGenerator;
+ ()L1org/springframework/aot/generate/ClassNameGenerator;
 doProcess
  ()Lorg/springframework/javapoet/ClassName;
  ()Lorg/springframework/javapoet/ClassName;
@@ -18,7 +18,7 @@ getApplicationClass
  ()Ljava/lang/Class<*>;
 getDefaultNativeImageArguments
  (Ljava/lang/String;)Ljava/util/List<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/List<Ljava/lang/String;>;
+ (Ljava/lang/String;)L1java/util/List<Ljava/lang/String;>;
 performAotProcessing
  (Lorg/springframework/context/support/GenericApplicationContext;)Lorg/springframework/javapoet/ClassName;
  (Lorg/springframework/context/support/GenericApplicationContext;)Lorg/springframework/javapoet/ClassName;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/event/ApplicationListenerMethodAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/event/ApplicationListenerMethodAdapter.eea
index 8ce940ed7a..45e5322c75 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/event/ApplicationListenerMethodAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/event/ApplicationListenerMethodAdapter.eea
@@ -15,13 +15,13 @@ getCondition
  ()L0java/lang/String;
 getDefaultListenerId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getDetailedErrorMessage
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;)L1java/lang/String;
 getListenerId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.context.event.SmartApplicationListener)
 getTargetBean
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/event/DefaultEventListenerFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/event/DefaultEventListenerFactory.eea
index e485405d9c..af4a70e575 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/event/DefaultEventListenerFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/event/DefaultEventListenerFactory.eea
@@ -2,7 +2,7 @@ class org/springframework/context/event/DefaultEventListenerFactory
 
 createApplicationListener
  (Ljava/lang/String;Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)Lorg/springframework/context/ApplicationListener<*>;
- (Ljava/lang/String;Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)Lorg/springframework/context/ApplicationListener<*>;
+ (Ljava/lang/String;Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)L1org/springframework/context/ApplicationListener<*>; # @Inherited(org.springframework.context.event.EventListenerFactory)
 supportsMethod
  (Ljava/lang/reflect/Method;)Z
  (Ljava/lang/reflect/Method;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/event/EventListenerFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/event/EventListenerFactory.eea
index d51f1c3ad4..8587a5f2c0 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/event/EventListenerFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/event/EventListenerFactory.eea
@@ -2,7 +2,7 @@ class org/springframework/context/event/EventListenerFactory
 
 createApplicationListener
  (Ljava/lang/String;Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)Lorg/springframework/context/ApplicationListener<*>;
- (Ljava/lang/String;Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)Lorg/springframework/context/ApplicationListener<*>;
+ (Ljava/lang/String;Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)L1org/springframework/context/ApplicationListener<*>;
 supportsMethod
  (Ljava/lang/reflect/Method;)Z
  (Ljava/lang/reflect/Method;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/event/GenericApplicationListener.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/event/GenericApplicationListener.eea
index e6403d8c21..77bf75dee3 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/event/GenericApplicationListener.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/event/GenericApplicationListener.eea
@@ -2,7 +2,7 @@ class org/springframework/context/event/GenericApplicationListener
 
 forEventType
  <E:Lorg/springframework/context/ApplicationEvent;>(Ljava/lang/Class<TE;>;Ljava/util/function/Consumer<TE;>;)Lorg/springframework/context/event/GenericApplicationListener;
- <E:Lorg/springframework/context/ApplicationEvent;>(Ljava/lang/Class<TE;>;Ljava/util/function/Consumer<TE;>;)Lorg/springframework/context/event/GenericApplicationListener;
+ <E:Lorg/springframework/context/ApplicationEvent;>(Ljava/lang/Class<TE;>;Ljava/util/function/Consumer<TE;>;)L1org/springframework/context/event/GenericApplicationListener;
 
 supportsEventType
  (Ljava/lang/Class<+Lorg/springframework/context/ApplicationEvent;>;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/event/GenericApplicationListenerAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/event/GenericApplicationListenerAdapter.eea
index 81f7ff1eba..dfcab1b2e8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/event/GenericApplicationListenerAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/event/GenericApplicationListenerAdapter.eea
@@ -5,7 +5,7 @@ class org/springframework/context/event/GenericApplicationListenerAdapter
  (Lorg/springframework/context/ApplicationListener<*>;)V
 getListenerId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.context.event.SmartApplicationListener)
 onApplicationEvent
  (Lorg/springframework/context/ApplicationEvent;)V
  (Lorg/springframework/context/ApplicationEvent;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/event/SmartApplicationListener.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/event/SmartApplicationListener.eea
index 7732a6303a..943fea8673 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/event/SmartApplicationListener.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/event/SmartApplicationListener.eea
@@ -6,7 +6,7 @@ super org/springframework/context/ApplicationListener
 
 getListenerId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 supportsEventType
  (Ljava/lang/Class<+Lorg/springframework/context/ApplicationEvent;>;)Z
  (Ljava/lang/Class<+Lorg/springframework/context/ApplicationEvent;>;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/event/SourceFilteringListener.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/event/SourceFilteringListener.eea
index d864b2db0b..21063ec25a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/event/SourceFilteringListener.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/event/SourceFilteringListener.eea
@@ -8,7 +8,7 @@ class org/springframework/context/event/SourceFilteringListener
  (Ljava/lang/Object;Lorg/springframework/context/ApplicationListener<*>;)V
 getListenerId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.context.event.SmartApplicationListener)
 onApplicationEvent
  (Lorg/springframework/context/ApplicationEvent;)V
  (Lorg/springframework/context/ApplicationEvent;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/expression/BeanExpressionContextAccessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/expression/BeanExpressionContextAccessor.eea
index 8eba75b4cf..bd1e1fccaa 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/expression/BeanExpressionContextAccessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/expression/BeanExpressionContextAccessor.eea
@@ -11,7 +11,7 @@ getSpecificTargetClasses
  ()[0Ljava/lang/Class<*>; # @Inherited(org.springframework.expression.PropertyAccessor)
 read
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/expression/TypedValue;
 write
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/expression/BeanFactoryAccessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/expression/BeanFactoryAccessor.eea
index 48e412f13c..8970757d32 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/expression/BeanFactoryAccessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/expression/BeanFactoryAccessor.eea
@@ -11,7 +11,7 @@ getSpecificTargetClasses
  ()[0Ljava/lang/Class<*>; # @Inherited(org.springframework.expression.PropertyAccessor)
 read
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/expression/TypedValue;
 write
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/expression/EnvironmentAccessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/expression/EnvironmentAccessor.eea
index ccd87e39ca..6a81e54413 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/expression/EnvironmentAccessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/expression/EnvironmentAccessor.eea
@@ -11,7 +11,7 @@ getSpecificTargetClasses
  ()[0Ljava/lang/Class<*>; # @Inherited(org.springframework.expression.PropertyAccessor)
 read
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/expression/TypedValue;
 write
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/expression/MapAccessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/expression/MapAccessor.eea
index 5d0daaca98..3d2b51bd55 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/expression/MapAccessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/expression/MapAccessor.eea
@@ -11,13 +11,13 @@ generateCode
  (Ljava/lang/String;Lorg/springframework/asm/MethodVisitor;Lorg/springframework/expression/spel/CodeFlow;)V
 getPropertyType
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L1java/lang/Class<*>;
 getSpecificTargetClasses
  ()[Ljava/lang/Class<*>;
  ()[0Ljava/lang/Class<*>; # @Inherited(org.springframework.expression.PropertyAccessor)
 read
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/expression/TypedValue;
 write
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/AbstractApplicationContext.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/AbstractApplicationContext.eea
index 15726909a5..d971215bd6 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/AbstractApplicationContext.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/AbstractApplicationContext.eea
@@ -37,7 +37,7 @@ containsLocalBean
  (Ljava/lang/String;)Z
 createEnvironment
  ()Lorg/springframework/core/env/ConfigurableEnvironment;
- ()Lorg/springframework/core/env/ConfigurableEnvironment;
+ ()L1org/springframework/core/env/ConfigurableEnvironment;
 findAllAnnotationsOnBean
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/String;Ljava/lang/Class<TA;>;Z)Ljava/util/Set<TA;>;
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/String;Ljava/lang/Class<TA;>;Z)Ljava/util/Set<TA;>;
@@ -58,7 +58,7 @@ getApplicationListeners
  ()Ljava/util/Collection<Lorg/springframework/context/ApplicationListener<*>;>;
 getApplicationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getApplicationStartup
  ()Lorg/springframework/core/metrics/ApplicationStartup;
  ()Lorg/springframework/core/metrics/ApplicationStartup;
@@ -157,7 +157,7 @@ getParentBeanFactory
  ()L0org/springframework/beans/factory/BeanFactory; # @Inherited(org.springframework.beans.factory.HierarchicalBeanFactory)
 getResourcePatternResolver
  ()Lorg/springframework/core/io/support/ResourcePatternResolver;
- ()Lorg/springframework/core/io/support/ResourcePatternResolver;
+ ()L1org/springframework/core/io/support/ResourcePatternResolver;
 getResources
  (Ljava/lang/String;)[Lorg/springframework/core/io/Resource;
  (Ljava/lang/String;)[Lorg/springframework/core/io/Resource;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/AbstractMessageSource.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/AbstractMessageSource.eea
index e4a1e2720a..8e5a6243b3 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/AbstractMessageSource.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/AbstractMessageSource.eea
@@ -29,7 +29,7 @@ getParentMessageSource
  ()L0org/springframework/context/MessageSource; # @Inherited(org.springframework.context.HierarchicalMessageSource)
 resolveArguments
  ([Ljava/lang/Object;Ljava/util/Locale;)[Ljava/lang/Object;
- ([Ljava/lang/Object;Ljava/util/Locale;)[Ljava/lang/Object;
+ ([Ljava/lang/Object;Ljava/util/Locale;)[1Ljava/lang/Object; # @Inherited(org.springframework.context.support.MessageSourceSupport)
 resolveCode
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/text/MessageFormat;
  (Ljava/lang/String;Ljava/util/Locale;)L0java/text/MessageFormat;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/AbstractRefreshableApplicationContext.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/AbstractRefreshableApplicationContext.eea
index f07a8c738e..f8633fb1a6 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/AbstractRefreshableApplicationContext.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/AbstractRefreshableApplicationContext.eea
@@ -8,7 +8,7 @@ cancelRefresh
  (Ljava/lang/Throwable;)V
 createBeanFactory
  ()Lorg/springframework/beans/factory/support/DefaultListableBeanFactory;
- ()Lorg/springframework/beans/factory/support/DefaultListableBeanFactory;
+ ()L1org/springframework/beans/factory/support/DefaultListableBeanFactory;
 customizeBeanFactory
  (Lorg/springframework/beans/factory/support/DefaultListableBeanFactory;)V
  (Lorg/springframework/beans/factory/support/DefaultListableBeanFactory;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/ApplicationObjectSupport.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/ApplicationObjectSupport.eea
index a49e51249a..6e3f603eae 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/ApplicationObjectSupport.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/ApplicationObjectSupport.eea
@@ -18,7 +18,7 @@ obtainApplicationContext
  ()Lorg/springframework/context/ApplicationContext;
 requiredContextClass
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L1java/lang/Class<*>;
 setApplicationContext
  (Lorg/springframework/context/ApplicationContext;)V
  (Lorg/springframework/context/ApplicationContext;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/ConversionServiceFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/ConversionServiceFactoryBean.eea
index 77d10057c0..366169469f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/ConversionServiceFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/ConversionServiceFactoryBean.eea
@@ -6,13 +6,13 @@ super org/springframework/beans/factory/FactoryBean
 
 createConversionService
  ()Lorg/springframework/core/convert/support/GenericConversionService;
- ()Lorg/springframework/core/convert/support/GenericConversionService;
+ ()L1org/springframework/core/convert/support/GenericConversionService;
 getObject
  ()Lorg/springframework/core/convert/ConversionService;
  ()L0org/springframework/core/convert/ConversionService;
 getObjectType
  ()Ljava/lang/Class<+Lorg/springframework/core/convert/ConversionService;>;
- ()Ljava/lang/Class<+Lorg/springframework/core/convert/ConversionService;>;
+ ()L1java/lang/Class<+Lorg/springframework/core/convert/ConversionService;>;
 setConverters
  (Ljava/util/Set<*>;)V
  (Ljava/util/Set<*>;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/DefaultLifecycleProcessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/DefaultLifecycleProcessor.eea
index 7223f10587..56609ad08f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/DefaultLifecycleProcessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/DefaultLifecycleProcessor.eea
@@ -12,7 +12,7 @@ ON_REFRESH_VALUE
 
 getLifecycleBeans
  ()Ljava/util/Map<Ljava/lang/String;Lorg/springframework/context/Lifecycle;>;
- ()Ljava/util/Map<Ljava/lang/String;Lorg/springframework/context/Lifecycle;>;
+ ()L1java/util/Map<Ljava/lang/String;Lorg/springframework/context/Lifecycle;>;
 getPhase
  (Lorg/springframework/context/Lifecycle;)I
  (Lorg/springframework/context/Lifecycle;)I
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/DefaultMessageSourceResolvable.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/DefaultMessageSourceResolvable.eea
index d2944e2ccc..7fd34883a3 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/DefaultMessageSourceResolvable.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/DefaultMessageSourceResolvable.eea
@@ -35,7 +35,7 @@ getDefaultMessage
  ()L0java/lang/String; # @Inherited(org.springframework.context.MessageSourceResolvable)
 resolvableToString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/FileSystemXmlApplicationContext.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/FileSystemXmlApplicationContext.eea
index 10bb16880c..c3b690043b 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/FileSystemXmlApplicationContext.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/FileSystemXmlApplicationContext.eea
@@ -20,4 +20,4 @@ class org/springframework/context/support/FileSystemXmlApplicationContext
  ([Ljava/lang/String;ZLorg/springframework/context/ApplicationContext;)V
 getResourceByPath
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.DefaultResourceLoader)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/MessageSourceAccessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/MessageSourceAccessor.eea
index 82112ff668..68e3b9f807 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/MessageSourceAccessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/MessageSourceAccessor.eea
@@ -14,10 +14,10 @@ getMessage
  (Ljava/lang/String;)Ljava/lang/String;
 getMessage
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 getMessage
  (Ljava/lang/String;Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/util/Locale;)L1java/lang/String;
 getMessage
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
@@ -26,10 +26,10 @@ getMessage
  (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 getMessage
  (Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/String;)L1java/lang/String;
 getMessage
  (Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
- (Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
+ (Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/String;Ljava/util/Locale;)L1java/lang/String;
 getMessage
  (Ljava/lang/String;[Ljava/lang/Object;Ljava/util/Locale;)Ljava/lang/String;
  (Ljava/lang/String;[Ljava/lang/Object;Ljava/util/Locale;)Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/MessageSourceSupport.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/MessageSourceSupport.eea
index cd36eb501f..f23d16b9d4 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/MessageSourceSupport.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/MessageSourceSupport.eea
@@ -6,7 +6,7 @@ logger
 
 createMessageFormat
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/text/MessageFormat;
- (Ljava/lang/String;Ljava/util/Locale;)Ljava/text/MessageFormat;
+ (Ljava/lang/String;Ljava/util/Locale;)L1java/text/MessageFormat;
 formatMessage
  (Ljava/lang/String;[Ljava/lang/Object;Ljava/util/Locale;)Ljava/lang/String;
  (Ljava/lang/String;[Ljava/lang/Object;Ljava/util/Locale;)Ljava/lang/String;
@@ -15,4 +15,4 @@ renderDefaultMessage
  (Ljava/lang/String;[Ljava/lang/Object;Ljava/util/Locale;)Ljava/lang/String;
 resolveArguments
  ([Ljava/lang/Object;Ljava/util/Locale;)[Ljava/lang/Object;
- ([Ljava/lang/Object;Ljava/util/Locale;)[Ljava/lang/Object;
+ ([Ljava/lang/Object;Ljava/util/Locale;)[1Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.eea
index fb492bbaf1..ee29c65461 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.eea
@@ -9,7 +9,7 @@ LOCAL_PROPERTIES_PROPERTY_SOURCE_NAME
 
 createPropertyResolver
  (Lorg/springframework/core/env/MutablePropertySources;)Lorg/springframework/core/env/ConfigurablePropertyResolver;
- (Lorg/springframework/core/env/MutablePropertySources;)Lorg/springframework/core/env/ConfigurablePropertyResolver;
+ (Lorg/springframework/core/env/MutablePropertySources;)L1org/springframework/core/env/ConfigurablePropertyResolver;
 getAppliedPropertySources
  ()Lorg/springframework/core/env/PropertySources;
  ()Lorg/springframework/core/env/PropertySources;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/ReloadableResourceBundleMessageSource.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/ReloadableResourceBundleMessageSource.eea
index c855f71dac..adf05b7020 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/ReloadableResourceBundleMessageSource.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/ReloadableResourceBundleMessageSource.eea
@@ -20,10 +20,10 @@ loadProperties
  (Lorg/springframework/core/io/Resource;Ljava/lang/String;)Ljava/util/Properties;
 mergeProperties
  (Ljava/util/List<Lorg/springframework/context/support/ReloadableResourceBundleMessageSource$PropertiesHolder;>;)Lorg/springframework/context/support/ReloadableResourceBundleMessageSource$PropertiesHolder;
- (Ljava/util/List<Lorg/springframework/context/support/ReloadableResourceBundleMessageSource$PropertiesHolder;>;)Lorg/springframework/context/support/ReloadableResourceBundleMessageSource$PropertiesHolder;
+ (Ljava/util/List<Lorg/springframework/context/support/ReloadableResourceBundleMessageSource$PropertiesHolder;>;)L1org/springframework/context/support/ReloadableResourceBundleMessageSource$PropertiesHolder;
 newProperties
  ()Ljava/util/Properties;
- ()Ljava/util/Properties;
+ ()L1java/util/Properties;
 refreshProperties
  (Ljava/lang/String;Lorg/springframework/context/support/ReloadableResourceBundleMessageSource$PropertiesHolder;)Lorg/springframework/context/support/ReloadableResourceBundleMessageSource$PropertiesHolder;
  (Ljava/lang/String;Lorg/springframework/context/support/ReloadableResourceBundleMessageSource$PropertiesHolder;)Lorg/springframework/context/support/ReloadableResourceBundleMessageSource$PropertiesHolder;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/ResourceBundleMessageSource.eea b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/ResourceBundleMessageSource.eea
index 62ca37bc59..cf2e8d1210 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/context/support/ResourceBundleMessageSource.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/context/support/ResourceBundleMessageSource.eea
@@ -17,10 +17,10 @@ getStringOrNull
  (Ljava/util/ResourceBundle;Ljava/lang/String;)L0java/lang/String;
 loadBundle
  (Ljava/io/InputStream;)Ljava/util/ResourceBundle;
- (Ljava/io/InputStream;)Ljava/util/ResourceBundle;
+ (Ljava/io/InputStream;)L1java/util/ResourceBundle;
 loadBundle
  (Ljava/io/Reader;)Ljava/util/ResourceBundle;
- (Ljava/io/Reader;)Ljava/util/ResourceBundle;
+ (Ljava/io/Reader;)L1java/util/ResourceBundle;
 resolveCode
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/text/MessageFormat;
  (Ljava/lang/String;Ljava/util/Locale;)L0java/text/MessageFormat; # @Inherited(org.springframework.context.support.AbstractMessageSource)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/CollectionFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/CollectionFactory.eea
index caa9f4805c..bee9b5f910 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/CollectionFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/CollectionFactory.eea
@@ -2,31 +2,31 @@ class org/springframework/core/CollectionFactory
 
 createApproximateCollection
  <E:Ljava/lang/Object;>(Ljava/lang/Object;I)Ljava/util/Collection<TE;>;
- <E:Ljava/lang/Object;>(Ljava/lang/Object;I)Ljava/util/Collection<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/lang/Object;I)L1java/util/Collection<TE;>;
 createApproximateMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Object;I)Ljava/util/Map<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Object;I)Ljava/util/Map<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Object;I)L1java/util/Map<TK;TV;>;
 createCollection
  <E:Ljava/lang/Object;>(Ljava/lang/Class<*>;I)Ljava/util/Collection<TE;>;
- <E:Ljava/lang/Object;>(Ljava/lang/Class<*>;I)Ljava/util/Collection<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/lang/Class<*>;I)L1java/util/Collection<TE;>;
 createCollection
  <E:Ljava/lang/Object;>(Ljava/lang/Class<*>;Ljava/lang/Class<*>;I)Ljava/util/Collection<TE;>;
- <E:Ljava/lang/Object;>(Ljava/lang/Class<*>;Ljava/lang/Class<*>;I)Ljava/util/Collection<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/lang/Class<*>;Ljava/lang/Class<*>;I)L1java/util/Collection<TE;>;
 createMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Class<*>;I)Ljava/util/Map<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Class<*>;I)Ljava/util/Map<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Class<*>;I)L1java/util/Map<TK;TV;>;
 createMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Class<*>;Ljava/lang/Class<*>;I)Ljava/util/Map<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Class<*>;Ljava/lang/Class<*>;I)Ljava/util/Map<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/lang/Class<*>;Ljava/lang/Class<*>;I)L1java/util/Map<TK;TV;>;
 createSortedProperties
  (Ljava/util/Properties;Z)Ljava/util/Properties;
- (Ljava/util/Properties;Z)Ljava/util/Properties;
+ (Ljava/util/Properties;Z)L1java/util/Properties;
 createSortedProperties
  (Z)Ljava/util/Properties;
- (Z)Ljava/util/Properties;
+ (Z)L1java/util/Properties;
 createStringAdaptingProperties
  ()Ljava/util/Properties;
- ()Ljava/util/Properties;
+ ()L1java/util/Properties;
 isApproximableCollectionType
  (Ljava/lang/Class<*>;)Z
  (Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/ConfigurableObjectInputStream.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/ConfigurableObjectInputStream.eea
index 09493a03d1..37f32ef274 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/ConfigurableObjectInputStream.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/ConfigurableObjectInputStream.eea
@@ -14,7 +14,7 @@ resolveClass
  (Ljava/io/ObjectStreamClass;)Ljava/lang/Class<*>;
 resolveFallbackIfPossible
  (Ljava/lang/String;Ljava/lang/ClassNotFoundException;)Ljava/lang/Class<*>;
- (Ljava/lang/String;Ljava/lang/ClassNotFoundException;)Ljava/lang/Class<*>;
+ (Ljava/lang/String;Ljava/lang/ClassNotFoundException;)L1java/lang/Class<*>;
 resolveProxyClass
  ([Ljava/lang/String;)Ljava/lang/Class<*>;
  ([Ljava/lang/String;)Ljava/lang/Class<*>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/Constants.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/Constants.eea
index 014e3a7eb7..4ce47b7085 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/Constants.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/Constants.eea
@@ -11,7 +11,7 @@ asObject
  (Ljava/lang/String;)Ljava/lang/Object;
 asString
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 getClassName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -20,25 +20,25 @@ getFieldCache
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 getNames
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
+ (Ljava/lang/String;)L1java/util/Set<Ljava/lang/String;>;
 getNamesForProperty
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
 getNamesForSuffix
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
+ (Ljava/lang/String;)L1java/util/Set<Ljava/lang/String;>;
 getValues
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/Object;>;
- (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/Object;>;
+ (Ljava/lang/String;)L1java/util/Set<Ljava/lang/Object;>;
 getValuesForProperty
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/Object;>;
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/Object;>;
 getValuesForSuffix
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/Object;>;
- (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/Object;>;
+ (Ljava/lang/String;)L1java/util/Set<Ljava/lang/Object;>;
 propertyToConstantNamePrefix
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 toCode
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/Conventions.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/Conventions.eea
index aad91b66b6..9408a7897a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/Conventions.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/Conventions.eea
@@ -5,13 +5,13 @@ attributeNameToPropertyName
  (Ljava/lang/String;)Ljava/lang/String;
 getQualifiedAttributeName
  (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;Ljava/lang/String;)L1java/lang/String;
 getVariableName
  (Ljava/lang/Object;)Ljava/lang/String;
  (Ljava/lang/Object;)Ljava/lang/String;
 getVariableNameForParameter
  (Lorg/springframework/core/MethodParameter;)Ljava/lang/String;
- (Lorg/springframework/core/MethodParameter;)Ljava/lang/String;
+ (Lorg/springframework/core/MethodParameter;)L1java/lang/String;
 getVariableNameForReturnType
  (Ljava/lang/reflect/Method;)Ljava/lang/String;
  (Ljava/lang/reflect/Method;)Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/GenericTypeResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/GenericTypeResolver.eea
index 49f768ca9c..13c0333329 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/GenericTypeResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/GenericTypeResolver.eea
@@ -2,7 +2,7 @@ class org/springframework/core/GenericTypeResolver
 
 getTypeVariableMap
  (Ljava/lang/Class<*>;)Ljava/util/Map<Ljava/lang/reflect/TypeVariable;Ljava/lang/reflect/Type;>;
- (Ljava/lang/Class<*>;)Ljava/util/Map<Ljava/lang/reflect/TypeVariable;Ljava/lang/reflect/Type;>;
+ (Ljava/lang/Class<*>;)L1java/util/Map<Ljava/lang/reflect/TypeVariable;Ljava/lang/reflect/Type;>;
 resolveParameterType
  (Lorg/springframework/core/MethodParameter;Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
  (Lorg/springframework/core/MethodParameter;Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/MethodIntrospector.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/MethodIntrospector.eea
index b5c3253bec..f27a3519a8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/MethodIntrospector.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/MethodIntrospector.eea
@@ -8,4 +8,4 @@ selectMethods
  (Ljava/lang/Class<*>;Lorg/springframework/util/ReflectionUtils$MethodFilter;)Ljava/util/Set<Ljava/lang/reflect/Method;>;
 selectMethods
  <T:Ljava/lang/Object;>(Ljava/lang/Class<*>;Lorg/springframework/core/MethodIntrospector$MetadataLookup<TT;>;)Ljava/util/Map<Ljava/lang/reflect/Method;TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<*>;Lorg/springframework/core/MethodIntrospector$MetadataLookup<TT;>;)Ljava/util/Map<Ljava/lang/reflect/Method;TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<*>;Lorg/springframework/core/MethodIntrospector$MetadataLookup<TT;>;)L1java/util/Map<Ljava/lang/reflect/Method;TT;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/MethodParameter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/MethodParameter.eea
index 2ed29a09ec..9c8d9637eb 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/MethodParameter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/MethodParameter.eea
@@ -5,10 +5,10 @@ findParameterIndex
  (Ljava/lang/reflect/Parameter;)I
 forExecutable
  (Ljava/lang/reflect/Executable;I)Lorg/springframework/core/MethodParameter;
- (Ljava/lang/reflect/Executable;I)Lorg/springframework/core/MethodParameter;
+ (Ljava/lang/reflect/Executable;I)L1org/springframework/core/MethodParameter;
 forFieldAwareConstructor
  (Ljava/lang/reflect/Constructor<*>;ILjava/lang/String;)Lorg/springframework/core/MethodParameter;
- (Ljava/lang/reflect/Constructor<*>;ILjava/lang/String;)Lorg/springframework/core/MethodParameter;
+ (Ljava/lang/reflect/Constructor<*>;ILjava/lang/String;)L1org/springframework/core/MethodParameter;
 forMethodOrConstructor
  (Ljava/lang/Object;I)Lorg/springframework/core/MethodParameter;
  (Ljava/lang/Object;I)Lorg/springframework/core/MethodParameter;
@@ -39,7 +39,7 @@ adaptAnnotationArray
  ([Ljava/lang/annotation/Annotation;)[Ljava/lang/annotation/Annotation;
 clone
  ()Lorg/springframework/core/MethodParameter;
- ()Lorg/springframework/core/MethodParameter;
+ ()L1org/springframework/core/MethodParameter;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/NamedThreadLocal.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/NamedThreadLocal.eea
index a683fb086b..ab59b3ec3e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/NamedThreadLocal.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/NamedThreadLocal.eea
@@ -8,7 +8,7 @@ super java/lang/ThreadLocal
 
 withInitial
  <S:Ljava/lang/Object;>(Ljava/lang/String;Ljava/util/function/Supplier<+TS;>;)Ljava/lang/ThreadLocal<TS;>;
- <S:Ljava/lang/Object;>(Ljava/lang/String;Ljava/util/function/Supplier<+TS;>;)Ljava/lang/ThreadLocal<TS;>;
+ <S:Ljava/lang/Object;>(Ljava/lang/String;Ljava/util/function/Supplier<+TS;>;)L1java/lang/ThreadLocal<TS;>;
 
 <init>
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/ParameterizedTypeReference.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/ParameterizedTypeReference.eea
index 60f827903a..b817b7fca5 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/ParameterizedTypeReference.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/ParameterizedTypeReference.eea
@@ -4,7 +4,7 @@ class org/springframework/core/ParameterizedTypeReference
 
 forType
  <T:Ljava/lang/Object;>(Ljava/lang/reflect/Type;)Lorg/springframework/core/ParameterizedTypeReference<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/reflect/Type;)Lorg/springframework/core/ParameterizedTypeReference<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/reflect/Type;)L1org/springframework/core/ParameterizedTypeReference<TT;>;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/ReactiveAdapterRegistry.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/ReactiveAdapterRegistry.eea
index 8e40de3107..bfb14f4997 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/ReactiveAdapterRegistry.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/ReactiveAdapterRegistry.eea
@@ -2,7 +2,7 @@ class org/springframework/core/ReactiveAdapterRegistry
 
 getSharedInstance
  ()Lorg/springframework/core/ReactiveAdapterRegistry;
- ()Lorg/springframework/core/ReactiveAdapterRegistry;
+ ()L1org/springframework/core/ReactiveAdapterRegistry;
 
 getAdapter
  (Ljava/lang/Class<*>;)Lorg/springframework/core/ReactiveAdapter;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/ResolvableType.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/ResolvableType.eea
index 156d61e36b..3de826f46b 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/ResolvableType.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/ResolvableType.eea
@@ -6,10 +6,10 @@ NONE
 
 forArrayComponent
  (Lorg/springframework/core/ResolvableType;)Lorg/springframework/core/ResolvableType;
- (Lorg/springframework/core/ResolvableType;)Lorg/springframework/core/ResolvableType;
+ (Lorg/springframework/core/ResolvableType;)L1org/springframework/core/ResolvableType;
 forClass
  (Ljava/lang/Class<*>;)Lorg/springframework/core/ResolvableType;
- (Ljava/lang/Class<*>;)Lorg/springframework/core/ResolvableType;
+ (Ljava/lang/Class<*>;)L1org/springframework/core/ResolvableType;
 forClass
  (Ljava/lang/Class<*>;Ljava/lang/Class<*>;)Lorg/springframework/core/ResolvableType;
  (Ljava/lang/Class<*>;Ljava/lang/Class<*>;)Lorg/springframework/core/ResolvableType;
@@ -66,7 +66,7 @@ forMethodReturnType
  (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Lorg/springframework/core/ResolvableType;
 forRawClass
  (Ljava/lang/Class<*>;)Lorg/springframework/core/ResolvableType;
- (Ljava/lang/Class<*>;)Lorg/springframework/core/ResolvableType;
+ (Ljava/lang/Class<*>;)L1org/springframework/core/ResolvableType;
 forType
  (Ljava/lang/reflect/Type;)Lorg/springframework/core/ResolvableType;
  (Ljava/lang/reflect/Type;)Lorg/springframework/core/ResolvableType;
@@ -142,10 +142,10 @@ resolveGeneric
  ([I)L0java/lang/Class<*>;
 resolveGenerics
  ()[Ljava/lang/Class<*>;
- ()[Ljava/lang/Class<*>;
+ ()[1Ljava/lang/Class<*>;
 resolveGenerics
  (Ljava/lang/Class<*>;)[Ljava/lang/Class<*>;
- (Ljava/lang/Class<*>;)[Ljava/lang/Class<*>;
+ (Ljava/lang/Class<*>;)[1Ljava/lang/Class<*>;
 toClass
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/SmartClassLoader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/SmartClassLoader.eea
index 262ff5dbfa..01fc4fe18f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/SmartClassLoader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/SmartClassLoader.eea
@@ -8,4 +8,4 @@ isClassReloadable
  (Ljava/lang/Class<*>;)Z
 publicDefineClass
  (Ljava/lang/String;[BLjava/security/ProtectionDomain;)Ljava/lang/Class<*>;
- (Ljava/lang/String;[BLjava/security/ProtectionDomain;)Ljava/lang/Class<*>;
+ (Ljava/lang/String;[BLjava/security/ProtectionDomain;)L1java/lang/Class<*>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/AnnotatedElementUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/AnnotatedElementUtils.eea
index 825ef8d06c..0b6022630c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/AnnotatedElementUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/AnnotatedElementUtils.eea
@@ -23,7 +23,7 @@ findMergedRepeatableAnnotations
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/reflect/AnnotatedElement;Ljava/lang/Class<TA;>;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Ljava/util/Set<TA;>;
 forAnnotations
  ([Ljava/lang/annotation/Annotation;)Ljava/lang/reflect/AnnotatedElement;
- ([Ljava/lang/annotation/Annotation;)Ljava/lang/reflect/AnnotatedElement;
+ ([Ljava/lang/annotation/Annotation;)L1java/lang/reflect/AnnotatedElement;
 getAllAnnotationAttributes
  (Ljava/lang/reflect/AnnotatedElement;Ljava/lang/String;)Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/Object;>;
  (Ljava/lang/reflect/AnnotatedElement;Ljava/lang/String;)L0org/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/Object;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/AnnotatedMethod$AnnotatedMethodParameter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/AnnotatedMethod$AnnotatedMethodParameter.eea
index 2c8d3659e0..d35782218b 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/AnnotatedMethod$AnnotatedMethodParameter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/AnnotatedMethod$AnnotatedMethodParameter.eea
@@ -8,7 +8,7 @@ class org/springframework/core/annotation/AnnotatedMethod$AnnotatedMethodParamet
  (Lorg/springframework/core/annotation/AnnotatedMethod;Lorg/springframework/core/annotation/AnnotatedMethod$AnnotatedMethodParameter;)V
 clone
  ()Lorg/springframework/core/annotation/AnnotatedMethod$AnnotatedMethodParameter;
- ()Lorg/springframework/core/annotation/AnnotatedMethod$AnnotatedMethodParameter;
+ ()L1org/springframework/core/annotation/AnnotatedMethod$AnnotatedMethodParameter;
 getContainingClass
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/AnnotatedMethod.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/AnnotatedMethod.eea
index ba1e6e88fc..7292123d46 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/AnnotatedMethod.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/AnnotatedMethod.eea
@@ -5,7 +5,7 @@ findProvidedArgument
  (Lorg/springframework/core/MethodParameter;[Ljava/lang/Object;)L0java/lang/Object;
 formatArgumentError
  (Lorg/springframework/core/MethodParameter;Ljava/lang/String;)Ljava/lang/String;
- (Lorg/springframework/core/MethodParameter;Ljava/lang/String;)Ljava/lang/String;
+ (Lorg/springframework/core/MethodParameter;Ljava/lang/String;)L1java/lang/String;
 
 <init>
  (Ljava/lang/reflect/Method;)V
@@ -36,7 +36,7 @@ getReturnType
  ()Lorg/springframework/core/MethodParameter;
 getReturnValueType
  (Ljava/lang/Object;)Lorg/springframework/core/MethodParameter;
- (Ljava/lang/Object;)Lorg/springframework/core/MethodParameter;
+ (Ljava/lang/Object;)L1org/springframework/core/MethodParameter;
 hasMethodAnnotation
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)Z
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/AnnotationFilter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/AnnotationFilter.eea
index 1365d803d5..8a1da542dc 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/AnnotationFilter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/AnnotationFilter.eea
@@ -15,7 +15,7 @@ PLAIN
 
 packages
  ([Ljava/lang/String;)Lorg/springframework/core/annotation/AnnotationFilter;
- ([Ljava/lang/String;)Lorg/springframework/core/annotation/AnnotationFilter;
+ ([Ljava/lang/String;)L1org/springframework/core/annotation/AnnotationFilter;
 
 matches
  (Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/MergedAnnotationPredicates.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/MergedAnnotationPredicates.eea
index ee26b877d2..986ceaf885 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/MergedAnnotationPredicates.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/MergedAnnotationPredicates.eea
@@ -2,7 +2,7 @@ class org/springframework/core/annotation/MergedAnnotationPredicates
 
 firstRunOf
  <A::Ljava/lang/annotation/Annotation;>(Ljava/util/function/Function<-Lorg/springframework/core/annotation/MergedAnnotation<TA;>;*>;)Ljava/util/function/Predicate<Lorg/springframework/core/annotation/MergedAnnotation<TA;>;>;
- <A::Ljava/lang/annotation/Annotation;>(Ljava/util/function/Function<-Lorg/springframework/core/annotation/MergedAnnotation<TA;>;*>;)Ljava/util/function/Predicate<Lorg/springframework/core/annotation/MergedAnnotation<TA;>;>;
+ <A::Ljava/lang/annotation/Annotation;>(Ljava/util/function/Function<-Lorg/springframework/core/annotation/MergedAnnotation<TA;>;*>;)L1java/util/function/Predicate<Lorg/springframework/core/annotation/MergedAnnotation<TA;>;>;
 typeIn
  <A::Ljava/lang/annotation/Annotation;>(Ljava/util/Collection<*>;)Ljava/util/function/Predicate<Lorg/springframework/core/annotation/MergedAnnotation<+TA;>;>;
  <A::Ljava/lang/annotation/Annotation;>(Ljava/util/Collection<*>;)Ljava/util/function/Predicate<Lorg/springframework/core/annotation/MergedAnnotation<+TA;>;>;
@@ -14,4 +14,4 @@ typeIn
  <A::Ljava/lang/annotation/Annotation;>([Ljava/lang/String;)Ljava/util/function/Predicate<Lorg/springframework/core/annotation/MergedAnnotation<+TA;>;>;
 unique
  <A::Ljava/lang/annotation/Annotation;K:Ljava/lang/Object;>(Ljava/util/function/Function<-Lorg/springframework/core/annotation/MergedAnnotation<TA;>;TK;>;)Ljava/util/function/Predicate<Lorg/springframework/core/annotation/MergedAnnotation<TA;>;>;
- <A::Ljava/lang/annotation/Annotation;K:Ljava/lang/Object;>(Ljava/util/function/Function<-Lorg/springframework/core/annotation/MergedAnnotation<TA;>;TK;>;)Ljava/util/function/Predicate<Lorg/springframework/core/annotation/MergedAnnotation<TA;>;>;
+ <A::Ljava/lang/annotation/Annotation;K:Ljava/lang/Object;>(Ljava/util/function/Function<-Lorg/springframework/core/annotation/MergedAnnotation<TA;>;TK;>;)L1java/util/function/Predicate<Lorg/springframework/core/annotation/MergedAnnotation<TA;>;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/MergedAnnotations.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/MergedAnnotations.eea
index 1e02c9f476..df5aa79dc1 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/MergedAnnotations.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/MergedAnnotations.eea
@@ -33,7 +33,7 @@ of
  (Ljava/util/Collection<Lorg/springframework/core/annotation/MergedAnnotation<*>;>;)Lorg/springframework/core/annotation/MergedAnnotations;
 search
  (Lorg/springframework/core/annotation/MergedAnnotations$SearchStrategy;)Lorg/springframework/core/annotation/MergedAnnotations$Search;
- (Lorg/springframework/core/annotation/MergedAnnotations$SearchStrategy;)Lorg/springframework/core/annotation/MergedAnnotations$Search;
+ (Lorg/springframework/core/annotation/MergedAnnotations$SearchStrategy;)L1org/springframework/core/annotation/MergedAnnotations$Search;
 
 get
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)Lorg/springframework/core/annotation/MergedAnnotation<TA;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/RepeatableContainers.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/RepeatableContainers.eea
index 7ad1ce2b2a..a15327f971 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/RepeatableContainers.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/RepeatableContainers.eea
@@ -5,14 +5,14 @@ none
  ()Lorg/springframework/core/annotation/RepeatableContainers;
 of
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lorg/springframework/core/annotation/RepeatableContainers;
- (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lorg/springframework/core/annotation/RepeatableContainers;
+ (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)L1org/springframework/core/annotation/RepeatableContainers;
 standardRepeatables
  ()Lorg/springframework/core/annotation/RepeatableContainers;
  ()Lorg/springframework/core/annotation/RepeatableContainers;
 
 and
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lorg/springframework/core/annotation/RepeatableContainers;
- (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lorg/springframework/core/annotation/RepeatableContainers;
+ (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)L1org/springframework/core/annotation/RepeatableContainers;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/SynthesizingMethodParameter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/SynthesizingMethodParameter.eea
index c427c25d76..03c243f1de 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/SynthesizingMethodParameter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/annotation/SynthesizingMethodParameter.eea
@@ -2,7 +2,7 @@ class org/springframework/core/annotation/SynthesizingMethodParameter
 
 forExecutable
  (Ljava/lang/reflect/Executable;I)Lorg/springframework/core/annotation/SynthesizingMethodParameter;
- (Ljava/lang/reflect/Executable;I)Lorg/springframework/core/annotation/SynthesizingMethodParameter;
+ (Ljava/lang/reflect/Executable;I)L1org/springframework/core/annotation/SynthesizingMethodParameter;
 forParameter
  (Ljava/lang/reflect/Parameter;)Lorg/springframework/core/annotation/SynthesizingMethodParameter;
  (Ljava/lang/reflect/Parameter;)Lorg/springframework/core/annotation/SynthesizingMethodParameter;
@@ -30,4 +30,4 @@ adaptAnnotationArray
  ([Ljava/lang/annotation/Annotation;)[Ljava/lang/annotation/Annotation;
 clone
  ()Lorg/springframework/core/annotation/SynthesizingMethodParameter;
- ()Lorg/springframework/core/annotation/SynthesizingMethodParameter;
+ ()L1org/springframework/core/annotation/SynthesizingMethodParameter;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/codec/AbstractDataBufferDecoder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/codec/AbstractDataBufferDecoder.eea
index 474387f47a..25febd10d7 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/codec/AbstractDataBufferDecoder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/codec/AbstractDataBufferDecoder.eea
@@ -17,4 +17,4 @@ decodeDataBuffer
  (Lorg/springframework/core/io/buffer/DataBuffer;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)T0T;
 decodeToMono
  (Lorg/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lreactor/core/publisher/Mono<TT;>;
- (Lorg/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lreactor/core/publisher/Mono<TT;>;
+ (Lorg/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1reactor/core/publisher/Mono<TT;>; # @Inherited(org.springframework.core.codec.AbstractDecoder)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/codec/AbstractDecoder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/codec/AbstractDecoder.eea
index c9cdaaee15..6d743a9292 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/codec/AbstractDecoder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/codec/AbstractDecoder.eea
@@ -18,7 +18,7 @@ canDecode
  (Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;)Z
 decodeToMono
  (Lorg/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lreactor/core/publisher/Mono<TT;>;
- (Lorg/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lreactor/core/publisher/Mono<TT;>;
+ (Lorg/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1reactor/core/publisher/Mono<TT;>;
 getDecodableMimeTypes
  ()Ljava/util/List<Lorg/springframework/util/MimeType;>;
  ()Ljava/util/List<Lorg/springframework/util/MimeType;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/codec/ByteArrayDecoder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/codec/ByteArrayDecoder.eea
index 7fcedfb2c5..6ff871ac79 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/codec/ByteArrayDecoder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/codec/ByteArrayDecoder.eea
@@ -9,4 +9,4 @@ canDecode
  (Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;)Z
 decode
  (Lorg/springframework/core/io/buffer/DataBuffer;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)[B
- (Lorg/springframework/core/io/buffer/DataBuffer;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)[B
+ (Lorg/springframework/core/io/buffer/DataBuffer;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)[1B
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/codec/Encoder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/codec/Encoder.eea
index 6a3690abab..844ee9bd56 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/codec/Encoder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/codec/Encoder.eea
@@ -10,7 +10,7 @@ encode
  (Lorg/reactivestreams/Publisher<+TT;>;Lorg/springframework/core/io/buffer/DataBufferFactory;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lreactor/core/publisher/Flux<Lorg/springframework/core/io/buffer/DataBuffer;>;
 encodeValue
  (TT;Lorg/springframework/core/io/buffer/DataBufferFactory;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/springframework/core/io/buffer/DataBuffer;
- (TT;Lorg/springframework/core/io/buffer/DataBufferFactory;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/springframework/core/io/buffer/DataBuffer;
+ (TT;Lorg/springframework/core/io/buffer/DataBufferFactory;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1org/springframework/core/io/buffer/DataBuffer;
 getEncodableMimeTypes
  ()Ljava/util/List<Lorg/springframework/util/MimeType;>;
  ()Ljava/util/List<Lorg/springframework/util/MimeType;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/codec/Hints.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/codec/Hints.eea
index 67ce6d1cb9..74f4b35a06 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/codec/Hints.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/codec/Hints.eea
@@ -12,7 +12,7 @@ from
  (Ljava/lang/String;Ljava/lang/Object;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 getLogPrefix
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Ljava/lang/String;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Ljava/lang/String;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1java/lang/String;
 getRequiredHint
  <T:Ljava/lang/Object;>(Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Ljava/lang/String;)TT;
  <T:Ljava/lang/Object;>(Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Ljava/lang/String;)TT;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/codec/ResourceDecoder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/codec/ResourceDecoder.eea
index 9eb8ef8670..21a18ca2cf 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/codec/ResourceDecoder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/codec/ResourceDecoder.eea
@@ -16,4 +16,4 @@ decode
  (Lorg/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lreactor/core/publisher/Flux<Lorg/springframework/core/io/Resource;>;
 decode
  (Lorg/springframework/core/io/buffer/DataBuffer;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/springframework/core/io/Resource;
- (Lorg/springframework/core/io/buffer/DataBuffer;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/springframework/core/io/Resource;
+ (Lorg/springframework/core/io/buffer/DataBuffer;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1org/springframework/core/io/Resource;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/convert/TypeDescriptor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/convert/TypeDescriptor.eea
index d072a1d7ab..e84c3e18e0 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/convert/TypeDescriptor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/convert/TypeDescriptor.eea
@@ -23,7 +23,7 @@ nested
  (Lorg/springframework/core/convert/Property;I)L0org/springframework/core/convert/TypeDescriptor;
 valueOf
  (Ljava/lang/Class<*>;)Lorg/springframework/core/convert/TypeDescriptor;
- (Ljava/lang/Class<*>;)Lorg/springframework/core/convert/TypeDescriptor;
+ (Ljava/lang/Class<*>;)L1org/springframework/core/convert/TypeDescriptor;
 
 <init>
  (Ljava/lang/reflect/Field;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/convert/support/ConvertingPropertyEditorAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/convert/support/ConvertingPropertyEditorAdapter.eea
index 13bb975d02..373a1bb719 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/convert/support/ConvertingPropertyEditorAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/convert/support/ConvertingPropertyEditorAdapter.eea
@@ -5,7 +5,7 @@ class org/springframework/core/convert/support/ConvertingPropertyEditorAdapter
  (Lorg/springframework/core/convert/ConversionService;Lorg/springframework/core/convert/TypeDescriptor;)V
 getAsText
  ()Ljava/lang/String;
- ()L0java/lang/String;
+ ()L0java/lang/String; # @Inherited(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/convert/support/DefaultConversionService.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/convert/support/DefaultConversionService.eea
index bf4283719c..225c717bc2 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/convert/support/DefaultConversionService.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/convert/support/DefaultConversionService.eea
@@ -8,4 +8,4 @@ addDefaultConverters
  (Lorg/springframework/core/convert/converter/ConverterRegistry;)V
 getSharedInstance
  ()Lorg/springframework/core/convert/ConversionService;
- ()Lorg/springframework/core/convert/ConversionService;
+ ()L1org/springframework/core/convert/ConversionService;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/env/AbstractEnvironment.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/env/AbstractEnvironment.eea
index d155a519e0..598d53bc4f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/env/AbstractEnvironment.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/env/AbstractEnvironment.eea
@@ -34,7 +34,7 @@ containsProperty
  (Ljava/lang/String;)Z
 createPropertyResolver
  (Lorg/springframework/core/env/MutablePropertySources;)Lorg/springframework/core/env/ConfigurablePropertyResolver;
- (Lorg/springframework/core/env/MutablePropertySources;)Lorg/springframework/core/env/ConfigurablePropertyResolver;
+ (Lorg/springframework/core/env/MutablePropertySources;)L1org/springframework/core/env/ConfigurablePropertyResolver;
 customizePropertySources
  (Lorg/springframework/core/env/MutablePropertySources;)V
  (Lorg/springframework/core/env/MutablePropertySources;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/env/AbstractPropertyResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/env/AbstractPropertyResolver.eea
index 0146e40105..c3de468978 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/env/AbstractPropertyResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/env/AbstractPropertyResolver.eea
@@ -12,7 +12,7 @@ convertValueIfNecessary
  <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;)T0T;
 getConversionService
  ()Lorg/springframework/core/convert/support/ConfigurableConversionService;
- ()Lorg/springframework/core/convert/support/ConfigurableConversionService;
+ ()L1org/springframework/core/convert/support/ConfigurableConversionService;
 getProperty
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)L0java/lang/String; # @Inherited(org.springframework.core.env.PropertyResolver)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/env/PropertySource.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/env/PropertySource.eea
index a5e9153a4c..cff69cc644 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/env/PropertySource.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/env/PropertySource.eea
@@ -4,7 +4,7 @@ class org/springframework/core/env/PropertySource
 
 named
  (Ljava/lang/String;)Lorg/springframework/core/env/PropertySource<*>;
- (Ljava/lang/String;)Lorg/springframework/core/env/PropertySource<*>;
+ (Ljava/lang/String;)L1org/springframework/core/env/PropertySource<*>;
 
 logger
  Lorg/apache/commons/logging/Log;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/AbstractFileResolvingResource.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/AbstractFileResolvingResource.eea
index e1f924b8e0..bf356e818e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/AbstractFileResolvingResource.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/AbstractFileResolvingResource.eea
@@ -8,7 +8,7 @@ customizeConnection
  (Ljava/net/URLConnection;)V
 getFile
  ()Ljava/io/File;
- ()Ljava/io/File;
+ ()L1java/io/File; # @Inherited(org.springframework.core.io.AbstractResource)
 getFile
  (Ljava/net/URI;)Ljava/io/File;
  (Ljava/net/URI;)Ljava/io/File;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/AbstractResource.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/AbstractResource.eea
index c8cf00e047..8e99ae267f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/AbstractResource.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/AbstractResource.eea
@@ -2,13 +2,13 @@ class org/springframework/core/io/AbstractResource
 
 createRelative
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.Resource)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getFile
  ()Ljava/io/File;
- ()Ljava/io/File;
+ ()L1java/io/File;
 getFileForLastModifiedCheck
  ()Ljava/io/File;
  ()Ljava/io/File;
@@ -20,7 +20,7 @@ getURI
  ()Ljava/net/URI;
 getURL
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L1java/net/URL;
 readableChannel
  ()Ljava/nio/channels/ReadableByteChannel;
  ()Ljava/nio/channels/ReadableByteChannel;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/ByteArrayResource.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/ByteArrayResource.eea
index 557d0e8658..213f493aba 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/ByteArrayResource.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/ByteArrayResource.eea
@@ -14,13 +14,13 @@ getByteArray
  ()[B
 getContentAsByteArray
  ()[B
- ()[B
+ ()[1B
 getContentAsString
  (Ljava/nio/charset/Charset;)Ljava/lang/String;
- (Ljava/nio/charset/Charset;)Ljava/lang/String;
+ (Ljava/nio/charset/Charset;)L1java/lang/String;
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getInputStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/ClassPathResource.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/ClassPathResource.eea
index 17b0006c40..1c1d196b41 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/ClassPathResource.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/ClassPathResource.eea
@@ -11,7 +11,7 @@ class org/springframework/core/io/ClassPathResource
  (Ljava/lang/String;Ljava/lang/ClassLoader;)V
 createRelative
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.AbstractResource)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(org.springframework.core.io.AbstractResource)
@@ -20,7 +20,7 @@ getClassLoader
  ()L0java/lang/ClassLoader;
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getFilename
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(org.springframework.core.io.AbstractResource)
@@ -32,7 +32,7 @@ getPath
  ()Ljava/lang/String;
 getURL
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L1java/net/URL; # @Inherited(org.springframework.core.io.AbstractResource)
 resolveURL
  ()Ljava/net/URL;
  ()L0java/net/URL;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/ClassRelativeResourceLoader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/ClassRelativeResourceLoader.eea
index 5501645c47..5ee9c3ca41 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/ClassRelativeResourceLoader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/ClassRelativeResourceLoader.eea
@@ -5,4 +5,4 @@ class org/springframework/core/io/ClassRelativeResourceLoader
  (Ljava/lang/Class<*>;)V
 getResourceByPath
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.DefaultResourceLoader)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/DefaultResourceLoader$ClassPathContextResource.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/DefaultResourceLoader$ClassPathContextResource.eea
index 4354e2bdf1..0074fa4dee 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/DefaultResourceLoader$ClassPathContextResource.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/DefaultResourceLoader$ClassPathContextResource.eea
@@ -5,7 +5,7 @@ class org/springframework/core/io/DefaultResourceLoader$ClassPathContextResource
  (Ljava/lang/String;Ljava/lang/ClassLoader;)V
 createRelative
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.ClassPathResource)
 getPathWithinContext
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/DefaultResourceLoader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/DefaultResourceLoader.eea
index d43800e47a..1e951c1aee 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/DefaultResourceLoader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/DefaultResourceLoader.eea
@@ -17,7 +17,7 @@ getResource
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
 getResourceByPath
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource;
 getResourceCache
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Ljava/util/Map<Lorg/springframework/core/io/Resource;TT;>;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Ljava/util/Map<Lorg/springframework/core/io/Resource;TT;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/DescriptiveResource.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/DescriptiveResource.eea
index c442315796..0640cf3a8f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/DescriptiveResource.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/DescriptiveResource.eea
@@ -11,4 +11,4 @@ getDescription
  ()Ljava/lang/String;
 getInputStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/FileSystemResource.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/FileSystemResource.eea
index 32a57b614f..9a7a512e4d 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/FileSystemResource.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/FileSystemResource.eea
@@ -14,7 +14,7 @@ class org/springframework/core/io/FileSystemResource
  (Ljava/nio/file/Path;)V
 createRelative
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.AbstractResource)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(org.springframework.core.io.AbstractResource)
@@ -26,10 +26,10 @@ getContentAsString
  (Ljava/nio/charset/Charset;)Ljava/lang/String;
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getFile
  ()Ljava/io/File;
- ()Ljava/io/File;
+ ()L1java/io/File; # @Inherited(org.springframework.core.io.AbstractResource)
 getFilename
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(org.springframework.core.io.AbstractResource)
@@ -47,7 +47,7 @@ getURI
  ()Ljava/net/URI;
 getURL
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L1java/net/URL; # @Inherited(org.springframework.core.io.AbstractResource)
 readableChannel
  ()Ljava/nio/channels/ReadableByteChannel;
  ()Ljava/nio/channels/ReadableByteChannel;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/FileSystemResourceLoader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/FileSystemResourceLoader.eea
index 69e3780e8b..ba4b54490e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/FileSystemResourceLoader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/FileSystemResourceLoader.eea
@@ -2,4 +2,4 @@ class org/springframework/core/io/FileSystemResourceLoader
 
 getResourceByPath
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.DefaultResourceLoader)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/FileUrlResource.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/FileUrlResource.eea
index 6c3d7a2a25..4c5fc91f9b 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/FileUrlResource.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/FileUrlResource.eea
@@ -8,10 +8,10 @@ class org/springframework/core/io/FileUrlResource
  (Ljava/net/URL;)V
 createRelative
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.UrlResource)
 getFile
  ()Ljava/io/File;
- ()Ljava/io/File;
+ ()L1java/io/File; # @Inherited(org.springframework.core.io.UrlResource)
 getOutputStream
  ()Ljava/io/OutputStream;
  ()Ljava/io/OutputStream;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/InputStreamResource.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/InputStreamResource.eea
index 28fdb0318d..53b913f1d4 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/InputStreamResource.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/InputStreamResource.eea
@@ -17,7 +17,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(org.springframework.core.io.AbstractResource)
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getInputStream
  ()Ljava/io/InputStream;
  ()Ljava/io/InputStream;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/ModuleResource.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/ModuleResource.eea
index f43da5be9a..aff5d77aff 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/ModuleResource.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/ModuleResource.eea
@@ -5,13 +5,13 @@ class org/springframework/core/io/ModuleResource
  (Ljava/lang/Module;Ljava/lang/String;)V
 createRelative
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.AbstractResource)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(org.springframework.core.io.AbstractResource)
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getFilename
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(org.springframework.core.io.AbstractResource)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/PathResource.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/PathResource.eea
index f6cb4b5879..09dc39a6a5 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/PathResource.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/PathResource.eea
@@ -11,7 +11,7 @@ class org/springframework/core/io/PathResource
  (Ljava/nio/file/Path;)V
 createRelative
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.AbstractResource)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(org.springframework.core.io.AbstractResource)
@@ -23,10 +23,10 @@ getContentAsString
  (Ljava/nio/charset/Charset;)Ljava/lang/String;
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getFile
  ()Ljava/io/File;
- ()Ljava/io/File;
+ ()L1java/io/File; # @Inherited(org.springframework.core.io.AbstractResource)
 getFilename
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(org.springframework.core.io.AbstractResource)
@@ -38,13 +38,13 @@ getOutputStream
  ()Ljava/io/OutputStream;
 getPath
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getURI
  ()Ljava/net/URI;
  ()Ljava/net/URI;
 getURL
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L1java/net/URL; # @Inherited(org.springframework.core.io.AbstractResource)
 readableChannel
  ()Ljava/nio/channels/ReadableByteChannel;
  ()Ljava/nio/channels/ReadableByteChannel;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/Resource.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/Resource.eea
index 85b1a0dddb..7faf01af41 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/Resource.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/Resource.eea
@@ -2,7 +2,7 @@ class org/springframework/core/io/Resource
 
 createRelative
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource;
 getContentAsByteArray
  ()[B
  ()[B
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/ResourceEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/ResourceEditor.eea
index 07e6d53e29..7226987456 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/ResourceEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/ResourceEditor.eea
@@ -8,7 +8,7 @@ class org/springframework/core/io/ResourceEditor
  (Lorg/springframework/core/io/ResourceLoader;Lorg/springframework/core/env/PropertyResolver;Z)V
 getAsText
  ()Ljava/lang/String;
- ()L0java/lang/String;
+ ()L0java/lang/String; # @Inherited(java.beans.PropertyEditorSupport)
 resolvePath
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/UrlResource.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/UrlResource.eea
index e13faa6112..c9481aa10a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/UrlResource.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/UrlResource.eea
@@ -2,10 +2,10 @@ class org/springframework/core/io/UrlResource
 
 from
  (Ljava/lang/String;)Lorg/springframework/core/io/UrlResource;
- (Ljava/lang/String;)Lorg/springframework/core/io/UrlResource;
+ (Ljava/lang/String;)L1org/springframework/core/io/UrlResource;
 from
  (Ljava/net/URI;)Lorg/springframework/core/io/UrlResource;
- (Ljava/net/URI;)Lorg/springframework/core/io/UrlResource;
+ (Ljava/net/URI;)L1org/springframework/core/io/UrlResource;
 
 <init>
  (Ljava/lang/String;)V
@@ -24,10 +24,10 @@ from
  (Ljava/net/URL;)V
 createRelative
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.AbstractResource)
 createRelativeURL
  (Ljava/lang/String;)Ljava/net/URL;
- (Ljava/lang/String;)Ljava/net/URL;
+ (Ljava/lang/String;)L1java/net/URL;
 customizeConnection
  (Ljava/net/URLConnection;)V
  (Ljava/net/URLConnection;)V
@@ -36,10 +36,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(org.springframework.core.io.AbstractResource)
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getFile
  ()Ljava/io/File;
- ()Ljava/io/File;
+ ()L1java/io/File; # @Inherited(org.springframework.core.io.AbstractFileResolvingResource)
 getFilename
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(org.springframework.core.io.AbstractResource)
@@ -51,4 +51,4 @@ getURI
  ()Ljava/net/URI;
 getURL
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L1java/net/URL; # @Inherited(org.springframework.core.io.AbstractResource)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/VfsResource.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/VfsResource.eea
index 37e631623b..ee3f7877ce 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/VfsResource.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/VfsResource.eea
@@ -5,16 +5,16 @@ class org/springframework/core/io/VfsResource
  (Ljava/lang/Object;)V
 createRelative
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.AbstractResource)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(org.springframework.core.io.AbstractResource)
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getFile
  ()Ljava/io/File;
- ()Ljava/io/File;
+ ()L1java/io/File; # @Inherited(org.springframework.core.io.AbstractResource)
 getFilename
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(org.springframework.core.io.AbstractResource)
@@ -26,4 +26,4 @@ getURI
  ()Ljava/net/URI;
 getURL
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L1java/net/URL; # @Inherited(org.springframework.core.io.AbstractResource)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/DataBuffer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/DataBuffer.eea
index 929e1d579d..d598cc78f7 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/DataBuffer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/DataBuffer.eea
@@ -11,10 +11,10 @@ asInputStream
  ()Ljava/io/InputStream;
 asInputStream
  (Z)Ljava/io/InputStream;
- (Z)Ljava/io/InputStream;
+ (Z)L1java/io/InputStream;
 asOutputStream
  ()Ljava/io/OutputStream;
- ()Ljava/io/OutputStream;
+ ()L1java/io/OutputStream;
 capacity
  (I)Lorg/springframework/core/io/buffer/DataBuffer;
  (I)Lorg/springframework/core/io/buffer/DataBuffer;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/DataBufferUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/DataBufferUtils.eea
index b682733ece..66d763beaa 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/DataBufferUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/DataBufferUtils.eea
@@ -11,13 +11,13 @@ matcher
  ([B)Lorg/springframework/core/io/buffer/DataBufferUtils$Matcher;
 matcher
  ([[B)Lorg/springframework/core/io/buffer/DataBufferUtils$Matcher;
- ([[B)Lorg/springframework/core/io/buffer/DataBufferUtils$Matcher;
+ ([[B)L1org/springframework/core/io/buffer/DataBufferUtils$Matcher;
 outputStreamPublisher
  (Ljava/util/function/Consumer<Ljava/io/OutputStream;>;Lorg/springframework/core/io/buffer/DataBufferFactory;Ljava/util/concurrent/Executor;)Lorg/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;
  (Ljava/util/function/Consumer<Ljava/io/OutputStream;>;Lorg/springframework/core/io/buffer/DataBufferFactory;Ljava/util/concurrent/Executor;)Lorg/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;
 outputStreamPublisher
  (Ljava/util/function/Consumer<Ljava/io/OutputStream;>;Lorg/springframework/core/io/buffer/DataBufferFactory;Ljava/util/concurrent/Executor;I)Lorg/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;
- (Ljava/util/function/Consumer<Ljava/io/OutputStream;>;Lorg/springframework/core/io/buffer/DataBufferFactory;Ljava/util/concurrent/Executor;I)Lorg/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;
+ (Ljava/util/function/Consumer<Ljava/io/OutputStream;>;Lorg/springframework/core/io/buffer/DataBufferFactory;Ljava/util/concurrent/Executor;I)L1org/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;
 read
  (Ljava/nio/file/Path;Lorg/springframework/core/io/buffer/DataBufferFactory;I[Ljava/nio/file/OpenOption;)Lreactor/core/publisher/Flux<Lorg/springframework/core/io/buffer/DataBuffer;>;
  (Ljava/nio/file/Path;Lorg/springframework/core/io/buffer/DataBufferFactory;I[Ljava/nio/file/OpenOption;)Lreactor/core/publisher/Flux<Lorg/springframework/core/io/buffer/DataBuffer;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/DataBufferWrapper.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/DataBufferWrapper.eea
index 6db417954c..2cfaa4d706 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/DataBufferWrapper.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/DataBufferWrapper.eea
@@ -14,10 +14,10 @@ asInputStream
  ()Ljava/io/InputStream;
 asInputStream
  (Z)Ljava/io/InputStream;
- (Z)Ljava/io/InputStream;
+ (Z)L1java/io/InputStream; # @Inherited(org.springframework.core.io.buffer.DataBuffer)
 asOutputStream
  ()Ljava/io/OutputStream;
- ()Ljava/io/OutputStream;
+ ()L1java/io/OutputStream; # @Inherited(org.springframework.core.io.buffer.DataBuffer)
 capacity
  (I)Lorg/springframework/core/io/buffer/DataBuffer;
  (I)Lorg/springframework/core/io/buffer/DataBuffer;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/DefaultDataBuffer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/DefaultDataBuffer.eea
index ead57b799e..5494eaab63 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/DefaultDataBuffer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/DefaultDataBuffer.eea
@@ -38,13 +38,13 @@ readPosition
  (I)Lorg/springframework/core/io/buffer/DefaultDataBuffer;
 readableByteBuffers
  ()Lorg/springframework/core/io/buffer/DataBuffer$ByteBufferIterator;
- ()Lorg/springframework/core/io/buffer/DataBuffer$ByteBufferIterator;
+ ()L1org/springframework/core/io/buffer/DataBuffer$ByteBufferIterator;
 slice
  (II)Lorg/springframework/core/io/buffer/DefaultDataBuffer;
- (II)Lorg/springframework/core/io/buffer/DefaultDataBuffer;
+ (II)L1org/springframework/core/io/buffer/DefaultDataBuffer;
 split
  (I)Lorg/springframework/core/io/buffer/DataBuffer;
- (I)Lorg/springframework/core/io/buffer/DataBuffer;
+ (I)L1org/springframework/core/io/buffer/DataBuffer;
 toByteBuffer
  (II)Ljava/nio/ByteBuffer;
  (II)Ljava/nio/ByteBuffer;
@@ -56,10 +56,10 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toString
  (IILjava/nio/charset/Charset;)Ljava/lang/String;
- (IILjava/nio/charset/Charset;)Ljava/lang/String;
+ (IILjava/nio/charset/Charset;)L1java/lang/String;
 writableByteBuffers
  ()Lorg/springframework/core/io/buffer/DataBuffer$ByteBufferIterator;
- ()Lorg/springframework/core/io/buffer/DataBuffer$ByteBufferIterator;
+ ()L1org/springframework/core/io/buffer/DataBuffer$ByteBufferIterator;
 write
  (B)Lorg/springframework/core/io/buffer/DefaultDataBuffer;
  (B)Lorg/springframework/core/io/buffer/DefaultDataBuffer;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/LimitedDataBufferList.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/LimitedDataBufferList.eea
index 0ef2efdca4..9c6751913e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/LimitedDataBufferList.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/LimitedDataBufferList.eea
@@ -18,7 +18,7 @@ addAll
  (Ljava/util/Collection<+Lorg/springframework/core/io/buffer/DataBuffer;>;)Z
 remove
  (I)Lorg/springframework/core/io/buffer/DataBuffer;
- (I)Lorg/springframework/core/io/buffer/DataBuffer;
+ (I)L1org/springframework/core/io/buffer/DataBuffer;
 remove
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.util.ArrayList)
@@ -30,4 +30,4 @@ removeIf
  (Ljava/util/function/Predicate<-Lorg/springframework/core/io/buffer/DataBuffer;>;)Z
 set
  (ILorg/springframework/core/io/buffer/DataBuffer;)Lorg/springframework/core/io/buffer/DataBuffer;
- (ILorg/springframework/core/io/buffer/DataBuffer;)Lorg/springframework/core/io/buffer/DataBuffer;
+ (ILorg/springframework/core/io/buffer/DataBuffer;)L1org/springframework/core/io/buffer/DataBuffer;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/Netty5DataBuffer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/Netty5DataBuffer.eea
index d4b55b40ff..bf4ffd5b42 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/Netty5DataBuffer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/Netty5DataBuffer.eea
@@ -41,10 +41,10 @@ readableByteBuffers
  ()Lorg/springframework/core/io/buffer/DataBuffer$ByteBufferIterator;
 slice
  (II)Lorg/springframework/core/io/buffer/DataBuffer;
- (II)Lorg/springframework/core/io/buffer/DataBuffer;
+ (II)L1org/springframework/core/io/buffer/DataBuffer;
 split
  (I)Lorg/springframework/core/io/buffer/DataBuffer;
- (I)Lorg/springframework/core/io/buffer/DataBuffer;
+ (I)L1org/springframework/core/io/buffer/DataBuffer;
 toByteBuffer
  (II)Ljava/nio/ByteBuffer;
  (II)Ljava/nio/ByteBuffer;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/Netty5DataBufferFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/Netty5DataBufferFactory.eea
index 5eb96f4ca4..d14cca8f12 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/Netty5DataBufferFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/Netty5DataBufferFactory.eea
@@ -9,10 +9,10 @@ toBuffer
  (Lio/netty5/buffer/BufferAllocator;)V
 allocateBuffer
  ()Lorg/springframework/core/io/buffer/Netty5DataBuffer;
- ()Lorg/springframework/core/io/buffer/Netty5DataBuffer;
+ ()L1org/springframework/core/io/buffer/Netty5DataBuffer;
 allocateBuffer
  (I)Lorg/springframework/core/io/buffer/Netty5DataBuffer;
- (I)Lorg/springframework/core/io/buffer/Netty5DataBuffer;
+ (I)L1org/springframework/core/io/buffer/Netty5DataBuffer;
 getBufferAllocator
  ()Lio/netty5/buffer/BufferAllocator;
  ()Lio/netty5/buffer/BufferAllocator;
@@ -24,10 +24,10 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 wrap
  (Lio/netty5/buffer/Buffer;)Lorg/springframework/core/io/buffer/Netty5DataBuffer;
- (Lio/netty5/buffer/Buffer;)Lorg/springframework/core/io/buffer/Netty5DataBuffer;
+ (Lio/netty5/buffer/Buffer;)L1org/springframework/core/io/buffer/Netty5DataBuffer;
 wrap
  (Ljava/nio/ByteBuffer;)Lorg/springframework/core/io/buffer/Netty5DataBuffer;
- (Ljava/nio/ByteBuffer;)Lorg/springframework/core/io/buffer/Netty5DataBuffer;
+ (Ljava/nio/ByteBuffer;)L1org/springframework/core/io/buffer/Netty5DataBuffer;
 wrap
  ([B)Lorg/springframework/core/io/buffer/Netty5DataBuffer;
- ([B)Lorg/springframework/core/io/buffer/Netty5DataBuffer;
+ ([B)L1org/springframework/core/io/buffer/Netty5DataBuffer;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/NettyDataBuffer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/NettyDataBuffer.eea
index d1a2bad485..d729b5b6d3 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/NettyDataBuffer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/NettyDataBuffer.eea
@@ -44,13 +44,13 @@ retain
  ()Lorg/springframework/core/io/buffer/PooledDataBuffer;
 retainedSlice
  (II)Lorg/springframework/core/io/buffer/NettyDataBuffer;
- (II)Lorg/springframework/core/io/buffer/NettyDataBuffer;
+ (II)L1org/springframework/core/io/buffer/NettyDataBuffer;
 slice
  (II)Lorg/springframework/core/io/buffer/NettyDataBuffer;
- (II)Lorg/springframework/core/io/buffer/NettyDataBuffer;
+ (II)L1org/springframework/core/io/buffer/NettyDataBuffer;
 split
  (I)Lorg/springframework/core/io/buffer/NettyDataBuffer;
- (I)Lorg/springframework/core/io/buffer/NettyDataBuffer;
+ (I)L1org/springframework/core/io/buffer/NettyDataBuffer;
 toByteBuffer
  (II)Ljava/nio/ByteBuffer;
  (II)Ljava/nio/ByteBuffer;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/NettyDataBufferFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/NettyDataBufferFactory.eea
index 3648abc2ca..39d8f93426 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/NettyDataBufferFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/buffer/NettyDataBufferFactory.eea
@@ -9,10 +9,10 @@ toByteBuf
  (Lio/netty/buffer/ByteBufAllocator;)V
 allocateBuffer
  ()Lorg/springframework/core/io/buffer/NettyDataBuffer;
- ()Lorg/springframework/core/io/buffer/NettyDataBuffer;
+ ()L1org/springframework/core/io/buffer/NettyDataBuffer;
 allocateBuffer
  (I)Lorg/springframework/core/io/buffer/NettyDataBuffer;
- (I)Lorg/springframework/core/io/buffer/NettyDataBuffer;
+ (I)L1org/springframework/core/io/buffer/NettyDataBuffer;
 getByteBufAllocator
  ()Lio/netty/buffer/ByteBufAllocator;
  ()Lio/netty/buffer/ByteBufAllocator;
@@ -24,10 +24,10 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 wrap
  (Lio/netty/buffer/ByteBuf;)Lorg/springframework/core/io/buffer/NettyDataBuffer;
- (Lio/netty/buffer/ByteBuf;)Lorg/springframework/core/io/buffer/NettyDataBuffer;
+ (Lio/netty/buffer/ByteBuf;)L1org/springframework/core/io/buffer/NettyDataBuffer;
 wrap
  (Ljava/nio/ByteBuffer;)Lorg/springframework/core/io/buffer/NettyDataBuffer;
- (Ljava/nio/ByteBuffer;)Lorg/springframework/core/io/buffer/NettyDataBuffer;
+ (Ljava/nio/ByteBuffer;)L1org/springframework/core/io/buffer/NettyDataBuffer;
 wrap
  ([B)Lorg/springframework/core/io/buffer/DataBuffer;
- ([B)Lorg/springframework/core/io/buffer/DataBuffer;
+ ([B)L1org/springframework/core/io/buffer/DataBuffer;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/DefaultPropertySourceFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/DefaultPropertySourceFactory.eea
index 68f88780e0..2dbd81478d 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/DefaultPropertySourceFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/DefaultPropertySourceFactory.eea
@@ -2,4 +2,4 @@ class org/springframework/core/io/support/DefaultPropertySourceFactory
 
 createPropertySource
  (Ljava/lang/String;Lorg/springframework/core/io/support/EncodedResource;)Lorg/springframework/core/env/PropertySource<*>;
- (Ljava/lang/String;Lorg/springframework/core/io/support/EncodedResource;)Lorg/springframework/core/env/PropertySource<*>;
+ (Ljava/lang/String;Lorg/springframework/core/io/support/EncodedResource;)L1org/springframework/core/env/PropertySource<*>; # @Inherited(org.springframework.core.io.support.PropertySourceFactory)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/PathMatchingResourcePatternResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/PathMatchingResourcePatternResolver.eea
index 1ff59bc5c6..a57c521296 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/PathMatchingResourcePatternResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/PathMatchingResourcePatternResolver.eea
@@ -14,7 +14,7 @@ addClassPathManifestEntries
  (Ljava/util/Set<Lorg/springframework/core/io/Resource;>;)V
 convertClassLoaderURL
  (Ljava/net/URL;)Lorg/springframework/core/io/Resource;
- (Ljava/net/URL;)Lorg/springframework/core/io/Resource;
+ (Ljava/net/URL;)L1org/springframework/core/io/Resource;
 determineRootDir
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
@@ -41,7 +41,7 @@ getClassLoader
  ()L0java/lang/ClassLoader; # @Inherited(org.springframework.core.io.ResourceLoader)
 getJarFile
  (Ljava/lang/String;)Ljava/util/jar/JarFile;
- (Ljava/lang/String;)Ljava/util/jar/JarFile;
+ (Ljava/lang/String;)L1java/util/jar/JarFile;
 getPathMatcher
  ()Lorg/springframework/util/PathMatcher;
  ()Lorg/springframework/util/PathMatcher;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/PropertiesLoaderSupport.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/PropertiesLoaderSupport.eea
index 296f931be1..e98915f0e3 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/PropertiesLoaderSupport.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/PropertiesLoaderSupport.eea
@@ -12,7 +12,7 @@ loadProperties
  (Ljava/util/Properties;)V
 mergeProperties
  ()Ljava/util/Properties;
- ()Ljava/util/Properties;
+ ()L1java/util/Properties;
 setFileEncoding
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/PropertiesLoaderUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/PropertiesLoaderUtils.eea
index 280b1b7b92..3f5e3c12e8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/PropertiesLoaderUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/PropertiesLoaderUtils.eea
@@ -11,10 +11,10 @@ loadAllProperties
  (Ljava/lang/String;)Ljava/util/Properties;
 loadAllProperties
  (Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/util/Properties;
- (Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/util/Properties;
+ (Ljava/lang/String;Ljava/lang/ClassLoader;)L1java/util/Properties;
 loadProperties
  (Lorg/springframework/core/io/Resource;)Ljava/util/Properties;
- (Lorg/springframework/core/io/Resource;)Ljava/util/Properties;
+ (Lorg/springframework/core/io/Resource;)L1java/util/Properties;
 loadProperties
  (Lorg/springframework/core/io/support/EncodedResource;)Ljava/util/Properties;
- (Lorg/springframework/core/io/support/EncodedResource;)Ljava/util/Properties;
+ (Lorg/springframework/core/io/support/EncodedResource;)L1java/util/Properties;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/PropertySourceFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/PropertySourceFactory.eea
index 0552af6a43..e46ac11ab5 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/PropertySourceFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/PropertySourceFactory.eea
@@ -2,4 +2,4 @@ class org/springframework/core/io/support/PropertySourceFactory
 
 createPropertySource
  (Ljava/lang/String;Lorg/springframework/core/io/support/EncodedResource;)Lorg/springframework/core/env/PropertySource<*>;
- (Ljava/lang/String;Lorg/springframework/core/io/support/EncodedResource;)Lorg/springframework/core/env/PropertySource<*>;
+ (Ljava/lang/String;Lorg/springframework/core/io/support/EncodedResource;)L1org/springframework/core/env/PropertySource<*>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/SpringFactoriesLoader$ArgumentResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/SpringFactoriesLoader$ArgumentResolver.eea
index 4e1ecbe534..bc7d4d60e8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/SpringFactoriesLoader$ArgumentResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/SpringFactoriesLoader$ArgumentResolver.eea
@@ -2,7 +2,7 @@ class org/springframework/core/io/support/SpringFactoriesLoader$ArgumentResolver
 
 from
  (Ljava/util/function/Function<Ljava/lang/Class<*>;Ljava/lang/Object;>;)Lorg/springframework/core/io/support/SpringFactoriesLoader$ArgumentResolver;
- (Ljava/util/function/Function<Ljava/lang/Class<*>;Ljava/lang/Object;>;)Lorg/springframework/core/io/support/SpringFactoriesLoader$ArgumentResolver;
+ (Ljava/util/function/Function<Ljava/lang/Class<*>;Ljava/lang/Object;>;)L1org/springframework/core/io/support/SpringFactoriesLoader$ArgumentResolver;
 none
  ()Lorg/springframework/core/io/support/SpringFactoriesLoader$ArgumentResolver;
  ()Lorg/springframework/core/io/support/SpringFactoriesLoader$ArgumentResolver;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/SpringFactoriesLoader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/SpringFactoriesLoader.eea
index 15c39fd20d..a402543051 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/SpringFactoriesLoader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/io/support/SpringFactoriesLoader.eea
@@ -18,7 +18,7 @@ forResourceLocation
  (Ljava/lang/String;Ljava/lang/ClassLoader;)Lorg/springframework/core/io/support/SpringFactoriesLoader;
 loadFactories
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/ClassLoader;)Ljava/util/List<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/ClassLoader;)Ljava/util/List<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Ljava/lang/ClassLoader;)L1java/util/List<TT;>;
 loadFactoriesResource
  (Ljava/lang/ClassLoader;Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;
  (Ljava/lang/ClassLoader;Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;
@@ -40,7 +40,7 @@ load
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Lorg/springframework/core/io/support/SpringFactoriesLoader$ArgumentResolver;)Ljava/util/List<TT;>;
 load
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Lorg/springframework/core/io/support/SpringFactoriesLoader$ArgumentResolver;Lorg/springframework/core/io/support/SpringFactoriesLoader$FailureHandler;)Ljava/util/List<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Lorg/springframework/core/io/support/SpringFactoriesLoader$ArgumentResolver;Lorg/springframework/core/io/support/SpringFactoriesLoader$FailureHandler;)Ljava/util/List<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Lorg/springframework/core/io/support/SpringFactoriesLoader$ArgumentResolver;Lorg/springframework/core/io/support/SpringFactoriesLoader$FailureHandler;)L1java/util/List<TT;>;
 load
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Lorg/springframework/core/io/support/SpringFactoriesLoader$FailureHandler;)Ljava/util/List<TT;>;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Lorg/springframework/core/io/support/SpringFactoriesLoader$FailureHandler;)Ljava/util/List<TT;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/log/LogDelegateFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/log/LogDelegateFactory.eea
index 3623caf53e..ee5c1bd02d 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/log/LogDelegateFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/log/LogDelegateFactory.eea
@@ -2,7 +2,7 @@ class org/springframework/core/log/LogDelegateFactory
 
 getCompositeLog
  (Lorg/apache/commons/logging/Log;Lorg/apache/commons/logging/Log;[Lorg/apache/commons/logging/Log;)Lorg/apache/commons/logging/Log;
- (Lorg/apache/commons/logging/Log;Lorg/apache/commons/logging/Log;[Lorg/apache/commons/logging/Log;)Lorg/apache/commons/logging/Log;
+ (Lorg/apache/commons/logging/Log;Lorg/apache/commons/logging/Log;[Lorg/apache/commons/logging/Log;)L1org/apache/commons/logging/Log;
 getHiddenLog
  (Ljava/lang/Class<*>;)Lorg/apache/commons/logging/Log;
  (Ljava/lang/Class<*>;)Lorg/apache/commons/logging/Log;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/log/LogFormatUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/log/LogFormatUtils.eea
index 5d9aa75e4e..43503c70ed 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/log/LogFormatUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/log/LogFormatUtils.eea
@@ -2,7 +2,7 @@ class org/springframework/core/log/LogFormatUtils
 
 formatValue
  (Ljava/lang/Object;IZ)Ljava/lang/String;
- (Ljava/lang/Object;IZ)Ljava/lang/String;
+ (Ljava/lang/Object;IZ)L1java/lang/String;
 formatValue
  (Ljava/lang/Object;Z)Ljava/lang/String;
  (Ljava/lang/Object;Z)Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/log/LogMessage.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/log/LogMessage.eea
index 34edda9040..f193af516a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/log/LogMessage.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/log/LogMessage.eea
@@ -2,22 +2,22 @@ class org/springframework/core/log/LogMessage
 
 format
  (Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/core/log/LogMessage;
- (Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/core/log/LogMessage;
+ (Ljava/lang/String;Ljava/lang/Object;)L1org/springframework/core/log/LogMessage;
 format
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)Lorg/springframework/core/log/LogMessage;
- (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)Lorg/springframework/core/log/LogMessage;
+ (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)L1org/springframework/core/log/LogMessage;
 format
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lorg/springframework/core/log/LogMessage;
- (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lorg/springframework/core/log/LogMessage;
+ (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)L1org/springframework/core/log/LogMessage;
 format
  (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lorg/springframework/core/log/LogMessage;
- (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lorg/springframework/core/log/LogMessage;
+ (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)L1org/springframework/core/log/LogMessage;
 format
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/core/log/LogMessage;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/core/log/LogMessage;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/core/log/LogMessage;
 of
  (Ljava/util/function/Supplier<+Ljava/lang/CharSequence;>;)Lorg/springframework/core/log/LogMessage;
- (Ljava/util/function/Supplier<+Ljava/lang/CharSequence;>;)Lorg/springframework/core/log/LogMessage;
+ (Ljava/util/function/Supplier<+Ljava/lang/CharSequence;>;)L1org/springframework/core/log/LogMessage;
 
 subSequence
  (II)Ljava/lang/CharSequence;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/metrics/jfr/FlightRecorderApplicationStartup.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/metrics/jfr/FlightRecorderApplicationStartup.eea
index 62f41bbc8e..6c8ae3b6ae 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/metrics/jfr/FlightRecorderApplicationStartup.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/metrics/jfr/FlightRecorderApplicationStartup.eea
@@ -2,4 +2,4 @@ class org/springframework/core/metrics/jfr/FlightRecorderApplicationStartup
 
 start
  (Ljava/lang/String;)Lorg/springframework/core/metrics/StartupStep;
- (Ljava/lang/String;)Lorg/springframework/core/metrics/StartupStep;
+ (Ljava/lang/String;)L1org/springframework/core/metrics/StartupStep;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/style/DefaultValueStyler.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/style/DefaultValueStyler.eea
index a317dfb9f4..ad07f538a1 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/style/DefaultValueStyler.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/style/DefaultValueStyler.eea
@@ -5,28 +5,28 @@ style
  (Ljava/lang/Object;)Ljava/lang/String;
 styleArray
  ([Ljava/lang/Object;)Ljava/lang/String;
- ([Ljava/lang/Object;)Ljava/lang/String;
+ ([Ljava/lang/Object;)L1java/lang/String;
 styleClass
  (Ljava/lang/Class<*>;)Ljava/lang/String;
  (Ljava/lang/Class<*>;)Ljava/lang/String;
 styleCollection
  (Ljava/util/Collection<*>;)Ljava/lang/String;
- (Ljava/util/Collection<*>;)Ljava/lang/String;
+ (Ljava/util/Collection<*>;)L1java/lang/String;
 styleMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;TV;>;)Ljava/lang/String;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;TV;>;)Ljava/lang/String;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;TV;>;)L1java/lang/String;
 styleMapEntry
  (Ljava/util/Map$Entry<**>;)Ljava/lang/String;
- (Ljava/util/Map$Entry<**>;)Ljava/lang/String;
+ (Ljava/util/Map$Entry<**>;)L1java/lang/String;
 styleMethod
  (Ljava/lang/reflect/Method;)Ljava/lang/String;
- (Ljava/lang/reflect/Method;)Ljava/lang/String;
+ (Ljava/lang/reflect/Method;)L1java/lang/String;
 styleNull
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 styleObject
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
 styleString
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/style/SimpleValueStyler.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/style/SimpleValueStyler.eea
index 874972ec5f..1b1facc09c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/style/SimpleValueStyler.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/style/SimpleValueStyler.eea
@@ -12,22 +12,22 @@ DEFAULT_METHOD_STYLER
  (Ljava/util/function/Function<Ljava/lang/Class<*>;Ljava/lang/String;>;Ljava/util/function/Function<Ljava/lang/reflect/Method;Ljava/lang/String;>;)V
 styleArray
  ([Ljava/lang/Object;)Ljava/lang/String;
- ([Ljava/lang/Object;)Ljava/lang/String;
+ ([Ljava/lang/Object;)L1java/lang/String; # @Inherited(org.springframework.core.style.DefaultValueStyler)
 styleClass
  (Ljava/lang/Class<*>;)Ljava/lang/String;
  (Ljava/lang/Class<*>;)Ljava/lang/String;
 styleCollection
  (Ljava/util/Collection<*>;)Ljava/lang/String;
- (Ljava/util/Collection<*>;)Ljava/lang/String;
+ (Ljava/util/Collection<*>;)L1java/lang/String; # @Inherited(org.springframework.core.style.DefaultValueStyler)
 styleMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;TV;>;)Ljava/lang/String;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;TV;>;)Ljava/lang/String;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;TV;>;)L1java/lang/String; # @Inherited(org.springframework.core.style.DefaultValueStyler)
 styleMethod
  (Ljava/lang/reflect/Method;)Ljava/lang/String;
- (Ljava/lang/reflect/Method;)Ljava/lang/String;
+ (Ljava/lang/reflect/Method;)L1java/lang/String; # @Inherited(org.springframework.core.style.DefaultValueStyler)
 styleNull
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.core.style.DefaultValueStyler)
 styleString
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String; # @Inherited(org.springframework.core.style.DefaultValueStyler)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/task/AsyncTaskExecutor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/task/AsyncTaskExecutor.eea
index 3ff24c6010..e88c879fe7 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/task/AsyncTaskExecutor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/task/AsyncTaskExecutor.eea
@@ -5,10 +5,10 @@ execute
  (Ljava/lang/Runnable;J)V
 submit
  (Ljava/lang/Runnable;)Ljava/util/concurrent/Future<*>;
- (Ljava/lang/Runnable;)Ljava/util/concurrent/Future<*>;
+ (Ljava/lang/Runnable;)L1java/util/concurrent/Future<*>;
 submit
  <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Ljava/util/concurrent/Future<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Ljava/util/concurrent/Future<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)L1java/util/concurrent/Future<TT;>;
 submitCompletable
  (Ljava/lang/Runnable;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
  (Ljava/lang/Runnable;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/task/SimpleAsyncTaskExecutor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/task/SimpleAsyncTaskExecutor.eea
index 5f6c97ec07..0c58d42acd 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/task/SimpleAsyncTaskExecutor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/task/SimpleAsyncTaskExecutor.eea
@@ -29,13 +29,13 @@ setThreadFactory
  (Ljava/util/concurrent/ThreadFactory;)V
 submit
  (Ljava/lang/Runnable;)Ljava/util/concurrent/Future<*>;
- (Ljava/lang/Runnable;)Ljava/util/concurrent/Future<*>;
+ (Ljava/lang/Runnable;)L1java/util/concurrent/Future<*>; # @Inherited(org.springframework.core.task.AsyncTaskExecutor)
 submit
  <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Ljava/util/concurrent/Future<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Ljava/util/concurrent/Future<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)L1java/util/concurrent/Future<TT;>; # @Inherited(org.springframework.core.task.AsyncTaskExecutor)
 submitListenable
  (Ljava/lang/Runnable;)Lorg/springframework/util/concurrent/ListenableFuture<*>;
- (Ljava/lang/Runnable;)Lorg/springframework/util/concurrent/ListenableFuture<*>;
+ (Ljava/lang/Runnable;)L1org/springframework/util/concurrent/ListenableFuture<*>;
 submitListenable
  <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Lorg/springframework/util/concurrent/ListenableFuture<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Lorg/springframework/util/concurrent/ListenableFuture<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)L1org/springframework/util/concurrent/ListenableFuture<TT;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/task/support/TaskExecutorAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/task/support/TaskExecutorAdapter.eea
index e7c10dc3ca..5893ceffa0 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/task/support/TaskExecutorAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/task/support/TaskExecutorAdapter.eea
@@ -14,13 +14,13 @@ setTaskDecorator
  (Lorg/springframework/core/task/TaskDecorator;)V
 submit
  (Ljava/lang/Runnable;)Ljava/util/concurrent/Future<*>;
- (Ljava/lang/Runnable;)Ljava/util/concurrent/Future<*>;
+ (Ljava/lang/Runnable;)L1java/util/concurrent/Future<*>; # @Inherited(org.springframework.core.task.AsyncTaskExecutor)
 submit
  <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Ljava/util/concurrent/Future<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Ljava/util/concurrent/Future<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)L1java/util/concurrent/Future<TT;>; # @Inherited(org.springframework.core.task.AsyncTaskExecutor)
 submitListenable
  (Ljava/lang/Runnable;)Lorg/springframework/util/concurrent/ListenableFuture<*>;
- (Ljava/lang/Runnable;)Lorg/springframework/util/concurrent/ListenableFuture<*>;
+ (Ljava/lang/Runnable;)L1org/springframework/util/concurrent/ListenableFuture<*>;
 submitListenable
  <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Lorg/springframework/util/concurrent/ListenableFuture<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Lorg/springframework/util/concurrent/ListenableFuture<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)L1org/springframework/util/concurrent/ListenableFuture<TT;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/type/StandardClassMetadata.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/type/StandardClassMetadata.eea
index 3f2a210e9a..2ae5c2fb39 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/type/StandardClassMetadata.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/type/StandardClassMetadata.eea
@@ -14,7 +14,7 @@ getEnclosingClassName
  ()L0java/lang/String; # @Inherited(org.springframework.core.type.ClassMetadata)
 getInterfaceNames
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 getIntrospectedClass
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/type/classreading/CachingMetadataReaderFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/type/classreading/CachingMetadataReaderFactory.eea
index 03585b0794..a5e226b47f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/type/classreading/CachingMetadataReaderFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/type/classreading/CachingMetadataReaderFactory.eea
@@ -8,4 +8,4 @@ class org/springframework/core/type/classreading/CachingMetadataReaderFactory
  (Lorg/springframework/core/io/ResourceLoader;)V
 getMetadataReader
  (Lorg/springframework/core/io/Resource;)Lorg/springframework/core/type/classreading/MetadataReader;
- (Lorg/springframework/core/io/Resource;)Lorg/springframework/core/type/classreading/MetadataReader;
+ (Lorg/springframework/core/io/Resource;)L1org/springframework/core/type/classreading/MetadataReader; # @Inherited(org.springframework.core.type.classreading.SimpleMetadataReaderFactory)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.eea
index 9cfe9d9cd5..5083de139f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.eea
@@ -11,7 +11,7 @@ getMetadataReader
  (Ljava/lang/String;)Lorg/springframework/core/type/classreading/MetadataReader;
 getMetadataReader
  (Lorg/springframework/core/io/Resource;)Lorg/springframework/core/type/classreading/MetadataReader;
- (Lorg/springframework/core/io/Resource;)Lorg/springframework/core/type/classreading/MetadataReader;
+ (Lorg/springframework/core/io/Resource;)L1org/springframework/core/type/classreading/MetadataReader;
 getResourceLoader
  ()Lorg/springframework/core/io/ResourceLoader;
  ()Lorg/springframework/core/io/ResourceLoader;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.eea
index 3811813407..5f62988343 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.eea
@@ -8,7 +8,7 @@ class org/springframework/dao/support/PersistenceExceptionTranslationInterceptor
  (Lorg/springframework/dao/support/PersistenceExceptionTranslator;)V
 detectPersistenceExceptionTranslators
  (Lorg/springframework/beans/factory/ListableBeanFactory;)Lorg/springframework/dao/support/PersistenceExceptionTranslator;
- (Lorg/springframework/beans/factory/ListableBeanFactory;)Lorg/springframework/dao/support/PersistenceExceptionTranslator;
+ (Lorg/springframework/beans/factory/ListableBeanFactory;)L1org/springframework/dao/support/PersistenceExceptionTranslator;
 invoke
  (Lorg/aopalliance/intercept/MethodInvocation;)Ljava/lang/Object;
  (Lorg/aopalliance/intercept/MethodInvocation;)L0java/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/common/CompositeStringExpression.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/common/CompositeStringExpression.eea
index 7f6a107c51..41731b764f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/common/CompositeStringExpression.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/common/CompositeStringExpression.eea
@@ -11,16 +11,16 @@ getExpressions
  ()[Lorg/springframework/expression/Expression;
 getValue
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getValue
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
 getValue
  (Lorg/springframework/expression/EvaluationContext;)Ljava/lang/String;
- (Lorg/springframework/expression/EvaluationContext;)Ljava/lang/String;
+ (Lorg/springframework/expression/EvaluationContext;)L1java/lang/String;
 getValue
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;)Ljava/lang/String;
- (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;)Ljava/lang/String;
+ (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;)L1java/lang/String;
 getValue
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)T0T; # @Inherited(org.springframework.expression.Expression)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/CodeFlow.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/CodeFlow.eea
index 23e2d08b4f..10e0b234be 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/CodeFlow.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/CodeFlow.eea
@@ -8,10 +8,10 @@ arrayCodeFor
  (Ljava/lang/String;)I
 createSignatureDescriptor
  (Ljava/lang/reflect/Constructor<*>;)Ljava/lang/String;
- (Ljava/lang/reflect/Constructor<*>;)Ljava/lang/String;
+ (Ljava/lang/reflect/Constructor<*>;)L1java/lang/String;
 createSignatureDescriptor
  (Ljava/lang/reflect/Method;)Ljava/lang/String;
- (Ljava/lang/reflect/Method;)Ljava/lang/String;
+ (Ljava/lang/reflect/Method;)L1java/lang/String;
 insertAnyNecessaryTypeConversionBytecodes
  (Lorg/springframework/asm/MethodVisitor;CLjava/lang/String;)V
  (Lorg/springframework/asm/MethodVisitor;CLjava/lang/String;)V
@@ -65,7 +65,7 @@ isReferenceTypeArray
  (Ljava/lang/String;)Z
 toBoxedDescriptor
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 toDescriptor
  (Ljava/lang/Class<*>;)Ljava/lang/String;
  (Ljava/lang/Class<*>;)Ljava/lang/String;
@@ -74,10 +74,10 @@ toDescriptorFromObject
  (Ljava/lang/Object;)Ljava/lang/String;
 toDescriptors
  ([Ljava/lang/Class<*>;)[Ljava/lang/String;
- ([Ljava/lang/Class<*>;)[Ljava/lang/String;
+ ([Ljava/lang/Class<*>;)[1Ljava/lang/String;
 toJvmDescriptor
  (Ljava/lang/Class<*>;)Ljava/lang/String;
- (Ljava/lang/Class<*>;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;)L1java/lang/String;
 toParamDescriptors
  (Ljava/lang/reflect/Constructor<*>;)[Ljava/lang/String;
  (Ljava/lang/reflect/Constructor<*>;)[Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ExpressionState.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ExpressionState.eea
index 5842b86319..2b02867a6f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ExpressionState.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ExpressionState.eea
@@ -62,7 +62,7 @@ lookupVariable
  (Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
 operate
  (Lorg/springframework/expression/Operation;Ljava/lang/Object;Ljava/lang/Object;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/Operation;Ljava/lang/Object;Ljava/lang/Object;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/Operation;Ljava/lang/Object;Ljava/lang/Object;)L1org/springframework/expression/TypedValue;
 pushActiveContextObject
  (Lorg/springframework/expression/TypedValue;)V
  (Lorg/springframework/expression/TypedValue;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/SpelMessage.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/SpelMessage.eea
index 46cd5f4978..378037c073 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/SpelMessage.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/SpelMessage.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 formatMessage
  ([Ljava/lang/Object;)Ljava/lang/String;
- ([Ljava/lang/Object;)Ljava/lang/String;
+ ([Ljava/lang/Object;)L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Assign.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Assign.eea
index 148f299532..e24107b54d 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Assign.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Assign.eea
@@ -8,4 +8,4 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/BeanReference.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/BeanReference.eea
index ba27ab1be7..2a9d1daf52 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/BeanReference.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/BeanReference.eea
@@ -5,7 +5,7 @@ class org/springframework/expression/spel/ast/BeanReference
  (IILjava/lang/String;)V
 getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/spel/ExpressionState;)L1org/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/CompoundExpression.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/CompoundExpression.eea
index 976ee1adc3..57f051b17a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/CompoundExpression.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/CompoundExpression.eea
@@ -11,13 +11,13 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 getValueRef
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
- (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
+ (Lorg/springframework/expression/spel/ExpressionState;)L1org/springframework/expression/spel/ast/ValueRef; # @Inherited(org.springframework.expression.spel.ast.SpelNodeImpl)
 isWritable
  (Lorg/springframework/expression/spel/ExpressionState;)Z
  (Lorg/springframework/expression/spel/ExpressionState;)Z
 setValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)L1org/springframework/expression/TypedValue; # @Inherited(org.springframework.expression.spel.ast.SpelNodeImpl)
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/ConstructorReference.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/ConstructorReference.eea
index 066a0fe6f4..1874fda1e7 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/ConstructorReference.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/ConstructorReference.eea
@@ -14,4 +14,4 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Elvis.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Elvis.eea
index d570a682cf..b28b168d2e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Elvis.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Elvis.eea
@@ -11,4 +11,4 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/FunctionReference.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/FunctionReference.eea
index 6b7ce42c16..646f208f27 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/FunctionReference.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/FunctionReference.eea
@@ -11,4 +11,4 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Identifier.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Identifier.eea
index e2399bf63f..761fbd8483 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Identifier.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Identifier.eea
@@ -8,4 +8,4 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Indexer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Indexer.eea
index f5fed5aa68..90bb8dc47c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Indexer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Indexer.eea
@@ -11,13 +11,13 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 getValueRef
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
- (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
+ (Lorg/springframework/expression/spel/ExpressionState;)L1org/springframework/expression/spel/ast/ValueRef; # @Inherited(org.springframework.expression.spel.ast.SpelNodeImpl)
 isWritable
  (Lorg/springframework/expression/spel/ExpressionState;)Z
  (Lorg/springframework/expression/spel/ExpressionState;)Z
 setValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)L1org/springframework/expression/TypedValue; # @Inherited(org.springframework.expression.spel.ast.SpelNodeImpl)
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/InlineList.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/InlineList.eea
index 5abfca6f3e..773a085c65 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/InlineList.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/InlineList.eea
@@ -14,4 +14,4 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/InlineMap.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/InlineMap.eea
index aae449e556..c2dd750666 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/InlineMap.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/InlineMap.eea
@@ -11,4 +11,4 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Literal.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Literal.eea
index ca4065a848..8cf6415c2e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Literal.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Literal.eea
@@ -2,13 +2,13 @@ class org/springframework/expression/spel/ast/Literal
 
 getIntLiteral
  (Ljava/lang/String;III)Lorg/springframework/expression/spel/ast/Literal;
- (Ljava/lang/String;III)Lorg/springframework/expression/spel/ast/Literal;
+ (Ljava/lang/String;III)L1org/springframework/expression/spel/ast/Literal;
 getLongLiteral
  (Ljava/lang/String;III)Lorg/springframework/expression/spel/ast/Literal;
- (Ljava/lang/String;III)Lorg/springframework/expression/spel/ast/Literal;
+ (Ljava/lang/String;III)L1org/springframework/expression/spel/ast/Literal;
 getRealLiteral
  (Ljava/lang/String;IIZ)Lorg/springframework/expression/spel/ast/Literal;
- (Ljava/lang/String;IIZ)Lorg/springframework/expression/spel/ast/Literal;
+ (Ljava/lang/String;IIZ)L1org/springframework/expression/spel/ast/Literal;
 
 <init>
  (Ljava/lang/String;II)V
@@ -27,4 +27,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/MethodReference.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/MethodReference.eea
index 911f445ab9..eebfe0aa66 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/MethodReference.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/MethodReference.eea
@@ -14,7 +14,7 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 getValueRef
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
- (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
+ (Lorg/springframework/expression/spel/ExpressionState;)L1org/springframework/expression/spel/ast/ValueRef; # @Inherited(org.springframework.expression.spel.ast.SpelNodeImpl)
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/OpDec.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/OpDec.eea
index 9cc474e60f..4faf0a535e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/OpDec.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/OpDec.eea
@@ -5,10 +5,10 @@ class org/springframework/expression/spel/ast/OpDec
  (IIZ[Lorg/springframework/expression/spel/ast/SpelNodeImpl;)V
 getRightOperand
  ()Lorg/springframework/expression/spel/ast/SpelNodeImpl;
- ()Lorg/springframework/expression/spel/ast/SpelNodeImpl;
+ ()L1org/springframework/expression/spel/ast/SpelNodeImpl;
 getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.expression.spel.ast.Operator)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/OpInc.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/OpInc.eea
index ddd57f3286..dd0e5a3e86 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/OpInc.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/OpInc.eea
@@ -5,10 +5,10 @@ class org/springframework/expression/spel/ast/OpInc
  (IIZ[Lorg/springframework/expression/spel/ast/SpelNodeImpl;)V
 getRightOperand
  ()Lorg/springframework/expression/spel/ast/SpelNodeImpl;
- ()Lorg/springframework/expression/spel/ast/SpelNodeImpl;
+ ()L1org/springframework/expression/spel/ast/SpelNodeImpl;
 getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.expression.spel.ast.Operator)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/OpMinus.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/OpMinus.eea
index 513fc8c373..bed17c22d4 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/OpMinus.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/OpMinus.eea
@@ -14,4 +14,4 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.expression.spel.ast.Operator)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/OpPlus.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/OpPlus.eea
index e4b36ad573..031a313303 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/OpPlus.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/OpPlus.eea
@@ -14,4 +14,4 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.expression.spel.ast.Operator)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Operator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Operator.eea
index cea2c1d147..16164ce2a7 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Operator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Operator.eea
@@ -28,4 +28,4 @@ getRightOperand
  ()Lorg/springframework/expression/spel/ast/SpelNodeImpl;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/OperatorNot.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/OperatorNot.eea
index 11a79e662b..aa395a671e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/OperatorNot.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/OperatorNot.eea
@@ -11,4 +11,4 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/support/BooleanTypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Projection.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Projection.eea
index 77e6a159e0..c0d38e3bc3 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Projection.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Projection.eea
@@ -8,7 +8,7 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 getValueRef
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
- (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
+ (Lorg/springframework/expression/spel/ExpressionState;)L1org/springframework/expression/spel/ast/ValueRef; # @Inherited(org.springframework.expression.spel.ast.SpelNodeImpl)
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/PropertyOrFieldReference.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/PropertyOrFieldReference.eea
index 54355a84e0..cbbc25990a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/PropertyOrFieldReference.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/PropertyOrFieldReference.eea
@@ -14,7 +14,7 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 getValueRef
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
- (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
+ (Lorg/springframework/expression/spel/ExpressionState;)L1org/springframework/expression/spel/ast/ValueRef; # @Inherited(org.springframework.expression.spel.ast.SpelNodeImpl)
 isWritable
  (Lorg/springframework/expression/spel/ExpressionState;)Z
  (Lorg/springframework/expression/spel/ExpressionState;)Z
@@ -23,7 +23,7 @@ isWritableProperty
  (Ljava/lang/String;Lorg/springframework/expression/TypedValue;Lorg/springframework/expression/EvaluationContext;)Z
 setValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)L1org/springframework/expression/TypedValue; # @Inherited(org.springframework.expression.spel.ast.SpelNodeImpl)
 toStringAST
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/QualifiedIdentifier.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/QualifiedIdentifier.eea
index eae29444c9..f6ea9dfa8c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/QualifiedIdentifier.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/QualifiedIdentifier.eea
@@ -8,4 +8,4 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Selection.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Selection.eea
index 251528810d..2373a68ec4 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Selection.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Selection.eea
@@ -8,7 +8,7 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 getValueRef
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
- (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
+ (Lorg/springframework/expression/spel/ExpressionState;)L1org/springframework/expression/spel/ast/ValueRef; # @Inherited(org.springframework.expression.spel.ast.SpelNodeImpl)
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/SpelNodeImpl.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/SpelNodeImpl.eea
index e233574b7a..0c39624ea7 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/SpelNodeImpl.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/SpelNodeImpl.eea
@@ -43,7 +43,7 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 getValueRef
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
- (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
+ (Lorg/springframework/expression/spel/ExpressionState;)L1org/springframework/expression/spel/ast/ValueRef;
 isWritable
  (Lorg/springframework/expression/spel/ExpressionState;)Z
  (Lorg/springframework/expression/spel/ExpressionState;)Z
@@ -55,4 +55,4 @@ setValue
  (Lorg/springframework/expression/spel/ExpressionState;Ljava/lang/Object;)V
 setValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)L1org/springframework/expression/TypedValue;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Ternary.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Ternary.eea
index ff84ff5fda..f7134c7f0c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Ternary.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/Ternary.eea
@@ -11,4 +11,4 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/TypeReference.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/TypeReference.eea
index 098d517542..b73daac1d2 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/TypeReference.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/TypeReference.eea
@@ -11,7 +11,7 @@ generateCode
  (Lorg/springframework/asm/MethodVisitor;Lorg/springframework/expression/spel/CodeFlow;)V
 getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/spel/ExpressionState;)L1org/springframework/expression/TypedValue;
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/VariableReference.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/VariableReference.eea
index 6c35081092..27bea95a61 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/VariableReference.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/ast/VariableReference.eea
@@ -11,13 +11,13 @@ getValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/TypedValue;
 getValueRef
  (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
- (Lorg/springframework/expression/spel/ExpressionState;)Lorg/springframework/expression/spel/ast/ValueRef;
+ (Lorg/springframework/expression/spel/ExpressionState;)L1org/springframework/expression/spel/ast/ValueRef; # @Inherited(org.springframework.expression.spel.ast.SpelNodeImpl)
 isWritable
  (Lorg/springframework/expression/spel/ExpressionState;)Z
  (Lorg/springframework/expression/spel/ExpressionState;)Z
 setValueInternal
  (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/spel/ExpressionState;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)L1org/springframework/expression/TypedValue; # @Inherited(org.springframework.expression.spel.ast.SpelNodeImpl)
 toStringAST
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/standard/SpelCompiler.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/standard/SpelCompiler.eea
index f606c38e9e..60ddf8a7bf 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/standard/SpelCompiler.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/standard/SpelCompiler.eea
@@ -5,7 +5,7 @@ compile
  (Lorg/springframework/expression/Expression;)Z
 getCompiler
  (Ljava/lang/ClassLoader;)Lorg/springframework/expression/spel/standard/SpelCompiler;
- (Ljava/lang/ClassLoader;)Lorg/springframework/expression/spel/standard/SpelCompiler;
+ (Ljava/lang/ClassLoader;)L1org/springframework/expression/spel/standard/SpelCompiler;
 revertToInterpreted
  (Lorg/springframework/expression/Expression;)V
  (Lorg/springframework/expression/Expression;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/support/DataBindingMethodResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/support/DataBindingMethodResolver.eea
index 07a61558d8..b6cde4f797 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/support/DataBindingMethodResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/support/DataBindingMethodResolver.eea
@@ -2,7 +2,7 @@ class org/springframework/expression/spel/support/DataBindingMethodResolver
 
 forInstanceMethodInvocation
  ()Lorg/springframework/expression/spel/support/DataBindingMethodResolver;
- ()Lorg/springframework/expression/spel/support/DataBindingMethodResolver;
+ ()L1org/springframework/expression/spel/support/DataBindingMethodResolver;
 
 isCandidateForInvocation
  (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/support/ReflectiveConstructorExecutor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/support/ReflectiveConstructorExecutor.eea
index a99684e82e..745ee2df51 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/support/ReflectiveConstructorExecutor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/support/ReflectiveConstructorExecutor.eea
@@ -5,7 +5,7 @@ class org/springframework/expression/spel/support/ReflectiveConstructorExecutor
  (Ljava/lang/reflect/Constructor<*>;)V
 execute
  (Lorg/springframework/expression/EvaluationContext;[Ljava/lang/Object;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/EvaluationContext;[Ljava/lang/Object;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/EvaluationContext;[Ljava/lang/Object;)L1org/springframework/expression/TypedValue;
 getConstructor
  ()Ljava/lang/reflect/Constructor<*>;
  ()Ljava/lang/reflect/Constructor<*>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/support/ReflectivePropertyAccessor$OptimalPropertyAccessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/support/ReflectivePropertyAccessor$OptimalPropertyAccessor.eea
index 98d9a04fa8..e1cf8571dc 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/support/ReflectivePropertyAccessor$OptimalPropertyAccessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/support/ReflectivePropertyAccessor$OptimalPropertyAccessor.eea
@@ -21,7 +21,7 @@ getSpecificTargetClasses
  ()[0Ljava/lang/Class<*>; # @Inherited(org.springframework.expression.PropertyAccessor)
 read
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/expression/TypedValue;
 write
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/support/ReflectivePropertyAccessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/support/ReflectivePropertyAccessor.eea
index feaba937ee..0e1efd5fae 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/support/ReflectivePropertyAccessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/support/ReflectivePropertyAccessor.eea
@@ -8,7 +8,7 @@ canWrite
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Z
 createOptimalAccessor
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/PropertyAccessor;
- (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/PropertyAccessor;
+ (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/expression/PropertyAccessor;
 findField
  (Ljava/lang/String;Ljava/lang/Class<*>;Z)Ljava/lang/reflect/Field;
  (Ljava/lang/String;Ljava/lang/Class<*>;Z)L0java/lang/reflect/Field;
@@ -32,7 +32,7 @@ isCandidateForProperty
  (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Z
 read
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
- (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/expression/TypedValue;
+ (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/expression/TypedValue;
 write
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
  (Lorg/springframework/expression/EvaluationContext;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/support/SimpleEvaluationContext.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/support/SimpleEvaluationContext.eea
index 4ad4f4771b..79991568f8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/support/SimpleEvaluationContext.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/support/SimpleEvaluationContext.eea
@@ -2,7 +2,7 @@ class org/springframework/expression/spel/support/SimpleEvaluationContext
 
 forPropertyAccessors
  ([Lorg/springframework/expression/PropertyAccessor;)Lorg/springframework/expression/spel/support/SimpleEvaluationContext$Builder;
- ([Lorg/springframework/expression/PropertyAccessor;)Lorg/springframework/expression/spel/support/SimpleEvaluationContext$Builder;
+ ([Lorg/springframework/expression/PropertyAccessor;)L1org/springframework/expression/spel/support/SimpleEvaluationContext$Builder;
 forReadOnlyDataBinding
  ()Lorg/springframework/expression/spel/support/SimpleEvaluationContext$Builder;
  ()Lorg/springframework/expression/spel/support/SimpleEvaluationContext$Builder;
@@ -12,7 +12,7 @@ forReadWriteDataBinding
 
 assignVariable
  (Ljava/lang/String;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)Lorg/springframework/expression/TypedValue;
- (Ljava/lang/String;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)Lorg/springframework/expression/TypedValue;
+ (Ljava/lang/String;Ljava/util/function/Supplier<Lorg/springframework/expression/TypedValue;>;)L1org/springframework/expression/TypedValue;
 getBeanResolver
  ()Lorg/springframework/expression/BeanResolver;
  ()L0org/springframework/expression/BeanResolver; # @Inherited(org.springframework.expression.EvaluationContext)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/support/StandardOperatorOverloader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/support/StandardOperatorOverloader.eea
index 82c3b53169..5ead5c6b80 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/support/StandardOperatorOverloader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/expression/spel/support/StandardOperatorOverloader.eea
@@ -2,7 +2,7 @@ class org/springframework/expression/spel/support/StandardOperatorOverloader
 
 operate
  (Lorg/springframework/expression/Operation;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- (Lorg/springframework/expression/Operation;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lorg/springframework/expression/Operation;Ljava/lang/Object;Ljava/lang/Object;)L1java/lang/Object;
 overridesOperation
  (Lorg/springframework/expression/Operation;Ljava/lang/Object;Ljava/lang/Object;)Z
  (Lorg/springframework/expression/Operation;Ljava/lang/Object;Ljava/lang/Object;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/format/datetime/DateTimeFormatAnnotationFormatterFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/format/datetime/DateTimeFormatAnnotationFormatterFactory.eea
index 08010cd05b..5cfeea1f09 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/format/datetime/DateTimeFormatAnnotationFormatterFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/format/datetime/DateTimeFormatAnnotationFormatterFactory.eea
@@ -9,7 +9,7 @@ getFieldTypes
  ()Ljava/util/Set<Ljava/lang/Class<*>;>;
 getFormatter
  (Lorg/springframework/format/annotation/DateTimeFormat;Ljava/lang/Class<*>;)Lorg/springframework/format/Formatter<Ljava/util/Date;>;
- (Lorg/springframework/format/annotation/DateTimeFormat;Ljava/lang/Class<*>;)Lorg/springframework/format/Formatter<Ljava/util/Date;>;
+ (Lorg/springframework/format/annotation/DateTimeFormat;Ljava/lang/Class<*>;)L1org/springframework/format/Formatter<Ljava/util/Date;>;
 getParser
  (Lorg/springframework/format/annotation/DateTimeFormat;Ljava/lang/Class<*>;)Lorg/springframework/format/Parser<*>;
  (Lorg/springframework/format/annotation/DateTimeFormat;Ljava/lang/Class<*>;)Lorg/springframework/format/Parser<*>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/format/datetime/standard/DateTimeFormatterFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/format/datetime/standard/DateTimeFormatterFactory.eea
index b6e97530b8..c99323a40b 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/format/datetime/standard/DateTimeFormatterFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/format/datetime/standard/DateTimeFormatterFactory.eea
@@ -5,10 +5,10 @@ class org/springframework/format/datetime/standard/DateTimeFormatterFactory
  (Ljava/lang/String;)V
 createDateTimeFormatter
  ()Ljava/time/format/DateTimeFormatter;
- ()Ljava/time/format/DateTimeFormatter;
+ ()L1java/time/format/DateTimeFormatter;
 createDateTimeFormatter
  (Ljava/time/format/DateTimeFormatter;)Ljava/time/format/DateTimeFormatter;
- (Ljava/time/format/DateTimeFormatter;)Ljava/time/format/DateTimeFormatter;
+ (Ljava/time/format/DateTimeFormatter;)L1java/time/format/DateTimeFormatter;
 setDateStyle
  (Ljava/time/format/FormatStyle;)V
  (Ljava/time/format/FormatStyle;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/format/datetime/standard/InstantFormatter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/format/datetime/standard/InstantFormatter.eea
index faea0399f0..5e2b354fb8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/format/datetime/standard/InstantFormatter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/format/datetime/standard/InstantFormatter.eea
@@ -9,4 +9,4 @@ parse
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/time/Instant;
 print
  (Ljava/time/Instant;Ljava/util/Locale;)Ljava/lang/String;
- (Ljava/time/Instant;Ljava/util/Locale;)Ljava/lang/String;
+ (Ljava/time/Instant;Ljava/util/Locale;)L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/format/datetime/standard/Jsr310DateTimeFormatAnnotationFormatterFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/format/datetime/standard/Jsr310DateTimeFormatAnnotationFormatterFactory.eea
index c514774fad..f1b2aaae18 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/format/datetime/standard/Jsr310DateTimeFormatAnnotationFormatterFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/format/datetime/standard/Jsr310DateTimeFormatAnnotationFormatterFactory.eea
@@ -15,4 +15,4 @@ getParser
  (Lorg/springframework/format/annotation/DateTimeFormat;Ljava/lang/Class<*>;)Lorg/springframework/format/Parser<*>;
 getPrinter
  (Lorg/springframework/format/annotation/DateTimeFormat;Ljava/lang/Class<*>;)Lorg/springframework/format/Printer<*>;
- (Lorg/springframework/format/annotation/DateTimeFormat;Ljava/lang/Class<*>;)Lorg/springframework/format/Printer<*>;
+ (Lorg/springframework/format/annotation/DateTimeFormat;Ljava/lang/Class<*>;)L1org/springframework/format/Printer<*>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/format/support/FormatterPropertyEditorAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/format/support/FormatterPropertyEditorAdapter.eea
index d81adb3907..fe5410caea 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/format/support/FormatterPropertyEditorAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/format/support/FormatterPropertyEditorAdapter.eea
@@ -5,7 +5,7 @@ class org/springframework/format/support/FormatterPropertyEditorAdapter
  (Lorg/springframework/format/Formatter<*>;)V
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 getFieldType
  ()Ljava/lang/Class<*>;
  ()Ljava/lang/Class<*>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/format/support/FormattingConversionServiceFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/format/support/FormattingConversionServiceFactoryBean.eea
index eddaa7e201..5c0754542e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/format/support/FormattingConversionServiceFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/format/support/FormattingConversionServiceFactoryBean.eea
@@ -9,7 +9,7 @@ getObject
  ()L0org/springframework/format/support/FormattingConversionService;
 getObjectType
  ()Ljava/lang/Class<+Lorg/springframework/format/support/FormattingConversionService;>;
- ()Ljava/lang/Class<+Lorg/springframework/format/support/FormattingConversionService;>;
+ ()L1java/lang/Class<+Lorg/springframework/format/support/FormattingConversionService;>;
 setConverters
  (Ljava/util/Set<*>;)V
  (Ljava/util/Set<*>;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/CacheControl.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/CacheControl.eea
index c78209b8e0..1a3fbe2fc1 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/CacheControl.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/CacheControl.eea
@@ -2,19 +2,19 @@ class org/springframework/http/CacheControl
 
 empty
  ()Lorg/springframework/http/CacheControl;
- ()Lorg/springframework/http/CacheControl;
+ ()L1org/springframework/http/CacheControl;
 maxAge
  (JLjava/util/concurrent/TimeUnit;)Lorg/springframework/http/CacheControl;
  (JLjava/util/concurrent/TimeUnit;)Lorg/springframework/http/CacheControl;
 maxAge
  (Ljava/time/Duration;)Lorg/springframework/http/CacheControl;
- (Ljava/time/Duration;)Lorg/springframework/http/CacheControl;
+ (Ljava/time/Duration;)L1org/springframework/http/CacheControl;
 noCache
  ()Lorg/springframework/http/CacheControl;
- ()Lorg/springframework/http/CacheControl;
+ ()L1org/springframework/http/CacheControl;
 noStore
  ()Lorg/springframework/http/CacheControl;
- ()Lorg/springframework/http/CacheControl;
+ ()L1org/springframework/http/CacheControl;
 
 cachePrivate
  ()Lorg/springframework/http/CacheControl;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/ContentDisposition.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/ContentDisposition.eea
index 62f4f4f78d..d6dcb64ad1 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/ContentDisposition.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/ContentDisposition.eea
@@ -5,10 +5,10 @@ attachment
  ()Lorg/springframework/http/ContentDisposition$Builder;
 builder
  (Ljava/lang/String;)Lorg/springframework/http/ContentDisposition$Builder;
- (Ljava/lang/String;)Lorg/springframework/http/ContentDisposition$Builder;
+ (Ljava/lang/String;)L1org/springframework/http/ContentDisposition$Builder;
 empty
  ()Lorg/springframework/http/ContentDisposition;
- ()Lorg/springframework/http/ContentDisposition;
+ ()L1org/springframework/http/ContentDisposition;
 formData
  ()Lorg/springframework/http/ContentDisposition$Builder;
  ()Lorg/springframework/http/ContentDisposition$Builder;
@@ -17,7 +17,7 @@ inline
  ()Lorg/springframework/http/ContentDisposition$Builder;
 parse
  (Ljava/lang/String;)Lorg/springframework/http/ContentDisposition;
- (Ljava/lang/String;)Lorg/springframework/http/ContentDisposition;
+ (Ljava/lang/String;)L1org/springframework/http/ContentDisposition;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/ETag.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/ETag.eea
index 10ca14a0aa..b107171e23 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/ETag.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/ETag.eea
@@ -2,7 +2,7 @@ class org/springframework/http/ETag
 
 parse
  (Ljava/lang/String;)Ljava/util/List<Lorg/springframework/http/ETag;>;
- (Ljava/lang/String;)Ljava/util/List<Lorg/springframework/http/ETag;>;
+ (Ljava/lang/String;)L1java/util/List<Lorg/springframework/http/ETag;>;
 
 <init>
  (Ljava/lang/String;Z)V
@@ -12,7 +12,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 formattedTag
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 tag
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/HttpHeaders.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/HttpHeaders.eea
index 36a2a622fa..3ca1b35eb8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/HttpHeaders.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/HttpHeaders.eea
@@ -193,16 +193,16 @@ WWW_AUTHENTICATE
 
 encodeBasicAuth
  (Ljava/lang/String;Ljava/lang/String;Ljava/nio/charset/Charset;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;Ljava/nio/charset/Charset;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/nio/charset/Charset;)L1java/lang/String;
 formatHeaders
  (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;)Ljava/lang/String;
  (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;)Ljava/lang/String;
 readOnlyHttpHeaders
  (Lorg/springframework/http/HttpHeaders;)Lorg/springframework/http/HttpHeaders;
- (Lorg/springframework/http/HttpHeaders;)Lorg/springframework/http/HttpHeaders;
+ (Lorg/springframework/http/HttpHeaders;)L1org/springframework/http/HttpHeaders;
 readOnlyHttpHeaders
  (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;)Lorg/springframework/http/HttpHeaders;
- (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;)Lorg/springframework/http/HttpHeaders;
+ (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;)L1org/springframework/http/HttpHeaders;
 writableHttpHeaders
  (Lorg/springframework/http/HttpHeaders;)Lorg/springframework/http/HttpHeaders;
  (Lorg/springframework/http/HttpHeaders;)Lorg/springframework/http/HttpHeaders;
@@ -257,7 +257,7 @@ getAccessControlAllowHeaders
  ()Ljava/util/List<Ljava/lang/String;>;
 getAccessControlAllowMethods
  ()Ljava/util/List<Lorg/springframework/http/HttpMethod;>;
- ()Ljava/util/List<Lorg/springframework/http/HttpMethod;>;
+ ()L1java/util/List<Lorg/springframework/http/HttpMethod;>;
 getAccessControlAllowOrigin
  ()Ljava/lang/String;
  ()L0java/lang/String;
@@ -512,7 +512,7 @@ setZonedDateTime
  (Ljava/lang/String;Ljava/time/ZonedDateTime;)V
 toCommaDelimitedString
  (Ljava/util/List<Ljava/lang/String;>;)Ljava/lang/String;
- (Ljava/util/List<Ljava/lang/String;>;)Ljava/lang/String;
+ (Ljava/util/List<Ljava/lang/String;>;)L1java/lang/String;
 toSingleValueMap
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/HttpMethod.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/HttpMethod.eea
index 1672dd2a9a..307b10b5bd 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/HttpMethod.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/HttpMethod.eea
@@ -31,10 +31,10 @@ TRACE
 
 valueOf
  (Ljava/lang/String;)Lorg/springframework/http/HttpMethod;
- (Ljava/lang/String;)Lorg/springframework/http/HttpMethod;
+ (Ljava/lang/String;)L1org/springframework/http/HttpMethod;
 values
  ()[Lorg/springframework/http/HttpMethod;
- ()[Lorg/springframework/http/HttpMethod;
+ ()[1Lorg/springframework/http/HttpMethod;
 
 compareTo
  (Lorg/springframework/http/HttpMethod;)I
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/HttpRange.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/HttpRange.eea
index 737fc26685..d7e6f31bb4 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/HttpRange.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/HttpRange.eea
@@ -2,13 +2,13 @@ class org/springframework/http/HttpRange
 
 createByteRange
  (J)Lorg/springframework/http/HttpRange;
- (J)Lorg/springframework/http/HttpRange;
+ (J)L1org/springframework/http/HttpRange;
 createByteRange
  (JJ)Lorg/springframework/http/HttpRange;
- (JJ)Lorg/springframework/http/HttpRange;
+ (JJ)L1org/springframework/http/HttpRange;
 createSuffixRange
  (J)Lorg/springframework/http/HttpRange;
- (J)Lorg/springframework/http/HttpRange;
+ (J)L1org/springframework/http/HttpRange;
 parseRanges
  (Ljava/lang/String;)Ljava/util/List<Lorg/springframework/http/HttpRange;>;
  (Ljava/lang/String;)Ljava/util/List<Lorg/springframework/http/HttpRange;>;
@@ -17,7 +17,7 @@ toResourceRegions
  (Ljava/util/List<Lorg/springframework/http/HttpRange;>;Lorg/springframework/core/io/Resource;)Ljava/util/List<Lorg/springframework/core/io/support/ResourceRegion;>;
 toString
  (Ljava/util/Collection<Lorg/springframework/http/HttpRange;>;)Ljava/lang/String;
- (Ljava/util/Collection<Lorg/springframework/http/HttpRange;>;)Ljava/lang/String;
+ (Ljava/util/Collection<Lorg/springframework/http/HttpRange;>;)L1java/lang/String;
 
 toResourceRegion
  (Lorg/springframework/core/io/Resource;)Lorg/springframework/core/io/support/ResourceRegion;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/MediaType.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/MediaType.eea
index 7aa0933b4f..4dda3c5d75 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/MediaType.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/MediaType.eea
@@ -192,10 +192,10 @@ asMediaType
  (Lorg/springframework/util/MimeType;)Lorg/springframework/http/MediaType;
 asMediaTypes
  (Ljava/util/List<Lorg/springframework/util/MimeType;>;)Ljava/util/List<Lorg/springframework/http/MediaType;>;
- (Ljava/util/List<Lorg/springframework/util/MimeType;>;)Ljava/util/List<Lorg/springframework/http/MediaType;>;
+ (Ljava/util/List<Lorg/springframework/util/MimeType;>;)L1java/util/List<Lorg/springframework/http/MediaType;>;
 parseMediaType
  (Ljava/lang/String;)Lorg/springframework/http/MediaType;
- (Ljava/lang/String;)Lorg/springframework/http/MediaType;
+ (Ljava/lang/String;)L1org/springframework/http/MediaType;
 parseMediaTypes
  (Ljava/lang/String;)Ljava/util/List<Lorg/springframework/http/MediaType;>;
  (Ljava/lang/String;)Ljava/util/List<Lorg/springframework/http/MediaType;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/MediaTypeEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/MediaTypeEditor.eea
index fb773e58b7..7e4c210306 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/MediaTypeEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/MediaTypeEditor.eea
@@ -2,7 +2,7 @@ class org/springframework/http/MediaTypeEditor
 
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(java.beans.PropertyEditorSupport)
 setAsText
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/ProblemDetail.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/ProblemDetail.eea
index 68d894ee1d..f4281fc236 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/ProblemDetail.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/ProblemDetail.eea
@@ -2,7 +2,7 @@ class org/springframework/http/ProblemDetail
 
 forStatus
  (I)Lorg/springframework/http/ProblemDetail;
- (I)Lorg/springframework/http/ProblemDetail;
+ (I)L1org/springframework/http/ProblemDetail;
 forStatus
  (Lorg/springframework/http/HttpStatusCode;)Lorg/springframework/http/ProblemDetail;
  (Lorg/springframework/http/HttpStatusCode;)Lorg/springframework/http/ProblemDetail;
@@ -33,7 +33,7 @@ getType
  ()Ljava/net/URI;
 initToStringContent
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 setDetail
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/RequestEntity.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/RequestEntity.eea
index d0d375e039..e87cdfb2bd 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/RequestEntity.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/RequestEntity.eea
@@ -26,13 +26,13 @@ head
  (Ljava/net/URI;)Lorg/springframework/http/RequestEntity$HeadersBuilder<*>;
 method
  (Lorg/springframework/http/HttpMethod;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)Lorg/springframework/http/RequestEntity$BodyBuilder;
- (Lorg/springframework/http/HttpMethod;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)Lorg/springframework/http/RequestEntity$BodyBuilder;
+ (Lorg/springframework/http/HttpMethod;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)L1org/springframework/http/RequestEntity$BodyBuilder;
 method
  (Lorg/springframework/http/HttpMethod;Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/http/RequestEntity$BodyBuilder;
- (Lorg/springframework/http/HttpMethod;Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/http/RequestEntity$BodyBuilder;
+ (Lorg/springframework/http/HttpMethod;Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/http/RequestEntity$BodyBuilder;
 method
  (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)Lorg/springframework/http/RequestEntity$BodyBuilder;
- (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)Lorg/springframework/http/RequestEntity$BodyBuilder;
+ (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)L1org/springframework/http/RequestEntity$BodyBuilder;
 options
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/http/RequestEntity$HeadersBuilder<*>;
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/http/RequestEntity$HeadersBuilder<*>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/ResponseEntity.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/ResponseEntity.eea
index 21edc52c4b..8965ffb6c4 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/ResponseEntity.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/ResponseEntity.eea
@@ -14,7 +14,7 @@ badRequest
  ()Lorg/springframework/http/ResponseEntity$BodyBuilder;
 created
  (Ljava/net/URI;)Lorg/springframework/http/ResponseEntity$BodyBuilder;
- (Ljava/net/URI;)Lorg/springframework/http/ResponseEntity$BodyBuilder;
+ (Ljava/net/URI;)L1org/springframework/http/ResponseEntity$BodyBuilder;
 internalServerError
  ()Lorg/springframework/http/ResponseEntity$BodyBuilder;
  ()Lorg/springframework/http/ResponseEntity$BodyBuilder;
@@ -26,7 +26,7 @@ notFound
  ()Lorg/springframework/http/ResponseEntity$HeadersBuilder<*>;
 of
  (Lorg/springframework/http/ProblemDetail;)Lorg/springframework/http/ResponseEntity$HeadersBuilder<*>;
- (Lorg/springframework/http/ProblemDetail;)Lorg/springframework/http/ResponseEntity$HeadersBuilder<*>;
+ (Lorg/springframework/http/ProblemDetail;)L1org/springframework/http/ResponseEntity$HeadersBuilder<*>;
 of
  <T:Ljava/lang/Object;>(Ljava/util/Optional<TT;>;)Lorg/springframework/http/ResponseEntity<TT;>;
  <T:Ljava/lang/Object;>(Ljava/util/Optional<TT;>;)Lorg/springframework/http/ResponseEntity<TT;>;
@@ -41,10 +41,10 @@ ok
  <T:Ljava/lang/Object;>(TT;)Lorg/springframework/http/ResponseEntity<TT;>;
 status
  (I)Lorg/springframework/http/ResponseEntity$BodyBuilder;
- (I)Lorg/springframework/http/ResponseEntity$BodyBuilder;
+ (I)L1org/springframework/http/ResponseEntity$BodyBuilder;
 status
  (Lorg/springframework/http/HttpStatusCode;)Lorg/springframework/http/ResponseEntity$BodyBuilder;
- (Lorg/springframework/http/HttpStatusCode;)Lorg/springframework/http/ResponseEntity$BodyBuilder;
+ (Lorg/springframework/http/HttpStatusCode;)L1org/springframework/http/ResponseEntity$BodyBuilder;
 unprocessableEntity
  ()Lorg/springframework/http/ResponseEntity$BodyBuilder;
  ()Lorg/springframework/http/ResponseEntity$BodyBuilder;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/client/AbstractClientHttpRequestFactoryWrapper.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/client/AbstractClientHttpRequestFactoryWrapper.eea
index 40776f5040..9faecdbc58 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/client/AbstractClientHttpRequestFactoryWrapper.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/client/AbstractClientHttpRequestFactoryWrapper.eea
@@ -5,10 +5,10 @@ class org/springframework/http/client/AbstractClientHttpRequestFactoryWrapper
  (Lorg/springframework/http/client/ClientHttpRequestFactory;)V
 createRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/ClientHttpRequest; # @Inherited(org.springframework.http.client.ClientHttpRequestFactory)
 createRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;Lorg/springframework/http/client/ClientHttpRequestFactory;)Lorg/springframework/http/client/ClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;Lorg/springframework/http/client/ClientHttpRequestFactory;)Lorg/springframework/http/client/ClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;Lorg/springframework/http/client/ClientHttpRequestFactory;)L1org/springframework/http/client/ClientHttpRequest;
 getDelegate
  ()Lorg/springframework/http/client/ClientHttpRequestFactory;
  ()Lorg/springframework/http/client/ClientHttpRequestFactory;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/client/BufferingClientHttpRequestFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/client/BufferingClientHttpRequestFactory.eea
index 8e97cbd90a..cfcedf270f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/client/BufferingClientHttpRequestFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/client/BufferingClientHttpRequestFactory.eea
@@ -5,7 +5,7 @@ class org/springframework/http/client/BufferingClientHttpRequestFactory
  (Lorg/springframework/http/client/ClientHttpRequestFactory;)V
 createRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;Lorg/springframework/http/client/ClientHttpRequestFactory;)Lorg/springframework/http/client/ClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;Lorg/springframework/http/client/ClientHttpRequestFactory;)Lorg/springframework/http/client/ClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;Lorg/springframework/http/client/ClientHttpRequestFactory;)L1org/springframework/http/client/ClientHttpRequest; # @Inherited(org.springframework.http.client.AbstractClientHttpRequestFactoryWrapper)
 shouldBuffer
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Z
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/client/ClientHttpRequestFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/client/ClientHttpRequestFactory.eea
index 878ea82aee..2ff8f1a5a8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/client/ClientHttpRequestFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/client/ClientHttpRequestFactory.eea
@@ -2,4 +2,4 @@ class org/springframework/http/client/ClientHttpRequestFactory
 
 createRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/ClientHttpRequest;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.eea
index 19dba35c9a..fc70dbcbff 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.eea
@@ -8,10 +8,10 @@ createHttpContext
  (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)L0org/apache/hc/core5/http/protocol/HttpContext;
 createHttpUriRequest
  (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)Lorg/apache/hc/core5/http/ClassicHttpRequest;
- (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)Lorg/apache/hc/core5/http/ClassicHttpRequest;
+ (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)L1org/apache/hc/core5/http/ClassicHttpRequest;
 createRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/ClientHttpRequest; # @Inherited(org.springframework.http.client.ClientHttpRequestFactory)
 createRequestConfig
  (Ljava/lang/Object;)Lorg/apache/hc/client5/http/config/RequestConfig;
  (Ljava/lang/Object;)L0org/apache/hc/client5/http/config/RequestConfig;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/client/InterceptingClientHttpRequestFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/client/InterceptingClientHttpRequestFactory.eea
index 30a4094c9c..b00af6a007 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/client/InterceptingClientHttpRequestFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/client/InterceptingClientHttpRequestFactory.eea
@@ -5,4 +5,4 @@ class org/springframework/http/client/InterceptingClientHttpRequestFactory
  (Lorg/springframework/http/client/ClientHttpRequestFactory;Ljava/util/List<Lorg/springframework/http/client/ClientHttpRequestInterceptor;>;)V
 createRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;Lorg/springframework/http/client/ClientHttpRequestFactory;)Lorg/springframework/http/client/ClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;Lorg/springframework/http/client/ClientHttpRequestFactory;)Lorg/springframework/http/client/ClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;Lorg/springframework/http/client/ClientHttpRequestFactory;)L1org/springframework/http/client/ClientHttpRequest; # @Inherited(org.springframework.http.client.AbstractClientHttpRequestFactoryWrapper)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/client/JdkClientHttpRequestFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/client/JdkClientHttpRequestFactory.eea
index 2f5423a155..9f0c737cbe 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/client/JdkClientHttpRequestFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/client/JdkClientHttpRequestFactory.eea
@@ -8,7 +8,7 @@ class org/springframework/http/client/JdkClientHttpRequestFactory
  (Ljava/net/http/HttpClient;Ljava/util/concurrent/Executor;)V
 createRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/ClientHttpRequest; # @Inherited(org.springframework.http.client.ClientHttpRequestFactory)
 setReadTimeout
  (Ljava/time/Duration;)V
  (Ljava/time/Duration;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/client/JettyClientHttpRequestFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/client/JettyClientHttpRequestFactory.eea
index 52e0d45325..44fba24eb7 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/client/JettyClientHttpRequestFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/client/JettyClientHttpRequestFactory.eea
@@ -5,7 +5,7 @@ class org/springframework/http/client/JettyClientHttpRequestFactory
  (Lorg/eclipse/jetty/client/HttpClient;)V
 createRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/ClientHttpRequest; # @Inherited(org.springframework.http.client.ClientHttpRequestFactory)
 setConnectTimeout
  (Ljava/time/Duration;)V
  (Ljava/time/Duration;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/client/MultipartBodyBuilder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/client/MultipartBodyBuilder.eea
index da294dae27..0407ca9971 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/client/MultipartBodyBuilder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/client/MultipartBodyBuilder.eea
@@ -2,10 +2,10 @@ class org/springframework/http/client/MultipartBodyBuilder
 
 asyncPart
  <T:Ljava/lang/Object;P::Lorg/reactivestreams/Publisher<TT;>;>(Ljava/lang/String;TP;Ljava/lang/Class<TT;>;)Lorg/springframework/http/client/MultipartBodyBuilder$PartBuilder;
- <T:Ljava/lang/Object;P::Lorg/reactivestreams/Publisher<TT;>;>(Ljava/lang/String;TP;Ljava/lang/Class<TT;>;)Lorg/springframework/http/client/MultipartBodyBuilder$PartBuilder;
+ <T:Ljava/lang/Object;P::Lorg/reactivestreams/Publisher<TT;>;>(Ljava/lang/String;TP;Ljava/lang/Class<TT;>;)L1org/springframework/http/client/MultipartBodyBuilder$PartBuilder;
 asyncPart
  <T:Ljava/lang/Object;P::Lorg/reactivestreams/Publisher<TT;>;>(Ljava/lang/String;TP;Lorg/springframework/core/ParameterizedTypeReference<TT;>;)Lorg/springframework/http/client/MultipartBodyBuilder$PartBuilder;
- <T:Ljava/lang/Object;P::Lorg/reactivestreams/Publisher<TT;>;>(Ljava/lang/String;TP;Lorg/springframework/core/ParameterizedTypeReference<TT;>;)Lorg/springframework/http/client/MultipartBodyBuilder$PartBuilder;
+ <T:Ljava/lang/Object;P::Lorg/reactivestreams/Publisher<TT;>;>(Ljava/lang/String;TP;Lorg/springframework/core/ParameterizedTypeReference<TT;>;)L1org/springframework/http/client/MultipartBodyBuilder$PartBuilder;
 build
  ()Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Lorg/springframework/http/HttpEntity<*>;>;
  ()L1org/springframework/util/MultiValueMap<Ljava/lang/String;Lorg/springframework/http/HttpEntity<*>;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/client/OkHttp3ClientHttpRequestFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/client/OkHttp3ClientHttpRequestFactory.eea
index 2ae70ced3e..4c785d2afc 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/client/OkHttp3ClientHttpRequestFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/client/OkHttp3ClientHttpRequestFactory.eea
@@ -5,7 +5,7 @@ class org/springframework/http/client/OkHttp3ClientHttpRequestFactory
  (Lokhttp3/OkHttpClient;)V
 createRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/ClientHttpRequest; # @Inherited(org.springframework.http.client.ClientHttpRequestFactory)
 setConnectTimeout
  (Ljava/time/Duration;)V
  (Ljava/time/Duration;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/client/ReactorNettyClientRequestFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/client/ReactorNettyClientRequestFactory.eea
index 105552b6d5..6093c61831 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/client/ReactorNettyClientRequestFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/client/ReactorNettyClientRequestFactory.eea
@@ -8,7 +8,7 @@ class org/springframework/http/client/ReactorNettyClientRequestFactory
  (Lreactor/netty/http/client/HttpClient;)V
 createRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/ClientHttpRequest; # @Inherited(org.springframework.http.client.ClientHttpRequestFactory)
 setConnectTimeout
  (Ljava/time/Duration;)V
  (Ljava/time/Duration;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/client/SimpleClientHttpRequestFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/client/SimpleClientHttpRequestFactory.eea
index c44e840901..aef6d17e5c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/client/SimpleClientHttpRequestFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/client/SimpleClientHttpRequestFactory.eea
@@ -2,7 +2,7 @@ class org/springframework/http/client/SimpleClientHttpRequestFactory
 
 createRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/ClientHttpRequest; # @Inherited(org.springframework.http.client.ClientHttpRequestFactory)
 openConnection
  (Ljava/net/URL;Ljava/net/Proxy;)Ljava/net/HttpURLConnection;
  (Ljava/net/URL;Ljava/net/Proxy;)Ljava/net/HttpURLConnection;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/client/support/HttpAccessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/client/support/HttpAccessor.eea
index 183e573ba0..8102de3f39 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/client/support/HttpAccessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/client/support/HttpAccessor.eea
@@ -6,7 +6,7 @@ logger
 
 createRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/ClientHttpRequest;
 getClientHttpRequestInitializers
  ()Ljava/util/List<Lorg/springframework/http/client/ClientHttpRequestInitializer;>;
  ()Ljava/util/List<Lorg/springframework/http/client/ClientHttpRequestInitializer;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/ClientCodecConfigurer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/ClientCodecConfigurer.eea
index dd86729eae..974eb2bc21 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/ClientCodecConfigurer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/ClientCodecConfigurer.eea
@@ -2,7 +2,7 @@ class org/springframework/http/codec/ClientCodecConfigurer
 
 create
  ()Lorg/springframework/http/codec/ClientCodecConfigurer;
- ()Lorg/springframework/http/codec/ClientCodecConfigurer;
+ ()L1org/springframework/http/codec/ClientCodecConfigurer;
 
 clone
  ()Lorg/springframework/http/codec/ClientCodecConfigurer;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/FormHttpMessageWriter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/FormHttpMessageWriter.eea
index b08bf44cb0..38e5c3c9c7 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/FormHttpMessageWriter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/FormHttpMessageWriter.eea
@@ -22,7 +22,7 @@ getWritableMediaTypes
  ()Ljava/util/List<Lorg/springframework/http/MediaType;>;
 serializeForm
  (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;Ljava/nio/charset/Charset;)Ljava/lang/String;
- (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;Ljava/nio/charset/Charset;)Ljava/lang/String;
+ (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;Ljava/nio/charset/Charset;)L1java/lang/String;
 setDefaultCharset
  (Ljava/nio/charset/Charset;)V
  (Ljava/nio/charset/Charset;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/ServerCodecConfigurer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/ServerCodecConfigurer.eea
index 00e419e463..50902dd8ec 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/ServerCodecConfigurer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/ServerCodecConfigurer.eea
@@ -2,7 +2,7 @@ class org/springframework/http/codec/ServerCodecConfigurer
 
 create
  ()Lorg/springframework/http/codec/ServerCodecConfigurer;
- ()Lorg/springframework/http/codec/ServerCodecConfigurer;
+ ()L1org/springframework/http/codec/ServerCodecConfigurer;
 
 clone
  ()Lorg/springframework/http/codec/ServerCodecConfigurer;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/ServerSentEvent.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/ServerSentEvent.eea
index 06b8e4a991..3a861e7456 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/ServerSentEvent.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/ServerSentEvent.eea
@@ -4,10 +4,10 @@ class org/springframework/http/codec/ServerSentEvent
 
 builder
  <T:Ljava/lang/Object;>()Lorg/springframework/http/codec/ServerSentEvent$Builder<TT;>;
- <T:Ljava/lang/Object;>()Lorg/springframework/http/codec/ServerSentEvent$Builder<TT;>;
+ <T:Ljava/lang/Object;>()L1org/springframework/http/codec/ServerSentEvent$Builder<TT;>;
 builder
  <T:Ljava/lang/Object;>(TT;)Lorg/springframework/http/codec/ServerSentEvent$Builder<TT;>;
- <T:Ljava/lang/Object;>(TT;)Lorg/springframework/http/codec/ServerSentEvent$Builder<TT;>;
+ <T:Ljava/lang/Object;>(TT;)L1org/springframework/http/codec/ServerSentEvent$Builder<TT;>;
 
 comment
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/cbor/Jackson2CborDecoder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/cbor/Jackson2CborDecoder.eea
index 10d118a1e6..1256d7050e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/cbor/Jackson2CborDecoder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/cbor/Jackson2CborDecoder.eea
@@ -5,4 +5,4 @@ class org/springframework/http/codec/cbor/Jackson2CborDecoder
  (Lcom/fasterxml/jackson/databind/ObjectMapper;[Lorg/springframework/util/MimeType;)V
 decode
  (Lorg/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lreactor/core/publisher/Flux<Ljava/lang/Object;>;
- (Lorg/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lreactor/core/publisher/Flux<Ljava/lang/Object;>;
+ (Lorg/reactivestreams/Publisher<Lorg/springframework/core/io/buffer/DataBuffer;>;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1reactor/core/publisher/Flux<Ljava/lang/Object;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/cbor/Jackson2CborEncoder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/cbor/Jackson2CborEncoder.eea
index 3ba96cb3c8..0bcc3027eb 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/cbor/Jackson2CborEncoder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/cbor/Jackson2CborEncoder.eea
@@ -5,4 +5,4 @@ class org/springframework/http/codec/cbor/Jackson2CborEncoder
  (Lcom/fasterxml/jackson/databind/ObjectMapper;[Lorg/springframework/util/MimeType;)V
 encode
  (Lorg/reactivestreams/Publisher<*>;Lorg/springframework/core/io/buffer/DataBufferFactory;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lreactor/core/publisher/Flux<Lorg/springframework/core/io/buffer/DataBuffer;>;
- (Lorg/reactivestreams/Publisher<*>;Lorg/springframework/core/io/buffer/DataBufferFactory;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lreactor/core/publisher/Flux<Lorg/springframework/core/io/buffer/DataBuffer;>;
+ (Lorg/reactivestreams/Publisher<*>;Lorg/springframework/core/io/buffer/DataBufferFactory;Lorg/springframework/core/ResolvableType;Lorg/springframework/util/MimeType;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1reactor/core/publisher/Flux<Lorg/springframework/core/io/buffer/DataBuffer;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/json/Jackson2CodecSupport.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/json/Jackson2CodecSupport.eea
index 50eaf9ee93..182c927324 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/json/Jackson2CodecSupport.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/json/Jackson2CodecSupport.eea
@@ -28,7 +28,7 @@ getMimeTypes
  ()Ljava/util/List<Lorg/springframework/util/MimeType;>;
 getMimeTypes
  (Lorg/springframework/core/ResolvableType;)Ljava/util/List<Lorg/springframework/util/MimeType;>;
- (Lorg/springframework/core/ResolvableType;)Ljava/util/List<Lorg/springframework/util/MimeType;>;
+ (Lorg/springframework/core/ResolvableType;)L1java/util/List<Lorg/springframework/util/MimeType;>;
 getObjectMapper
  ()Lcom/fasterxml/jackson/databind/ObjectMapper;
  ()Lcom/fasterxml/jackson/databind/ObjectMapper;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/multipart/FilePartEvent.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/multipart/FilePartEvent.eea
index 2d5424d27e..efda40fe4c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/multipart/FilePartEvent.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/multipart/FilePartEvent.eea
@@ -2,22 +2,22 @@ class org/springframework/http/codec/multipart/FilePartEvent
 
 create
  (Ljava/lang/String;Ljava/lang/String;Lorg/springframework/http/MediaType;Lreactor/core/publisher/Flux<Lorg/springframework/core/io/buffer/DataBuffer;>;)Lreactor/core/publisher/Flux<Lorg/springframework/http/codec/multipart/FilePartEvent;>;
- (Ljava/lang/String;Ljava/lang/String;Lorg/springframework/http/MediaType;Lreactor/core/publisher/Flux<Lorg/springframework/core/io/buffer/DataBuffer;>;)Lreactor/core/publisher/Flux<Lorg/springframework/http/codec/multipart/FilePartEvent;>;
+ (Ljava/lang/String;Ljava/lang/String;Lorg/springframework/http/MediaType;Lreactor/core/publisher/Flux<Lorg/springframework/core/io/buffer/DataBuffer;>;)L1reactor/core/publisher/Flux<Lorg/springframework/http/codec/multipart/FilePartEvent;>;
 create
  (Ljava/lang/String;Ljava/lang/String;Lorg/springframework/http/MediaType;Lreactor/core/publisher/Flux<Lorg/springframework/core/io/buffer/DataBuffer;>;Ljava/util/function/Consumer<Lorg/springframework/http/HttpHeaders;>;)Lreactor/core/publisher/Flux<Lorg/springframework/http/codec/multipart/FilePartEvent;>;
- (Ljava/lang/String;Ljava/lang/String;Lorg/springframework/http/MediaType;Lreactor/core/publisher/Flux<Lorg/springframework/core/io/buffer/DataBuffer;>;Ljava/util/function/Consumer<Lorg/springframework/http/HttpHeaders;>;)Lreactor/core/publisher/Flux<Lorg/springframework/http/codec/multipart/FilePartEvent;>;
+ (Ljava/lang/String;Ljava/lang/String;Lorg/springframework/http/MediaType;Lreactor/core/publisher/Flux<Lorg/springframework/core/io/buffer/DataBuffer;>;Ljava/util/function/Consumer<Lorg/springframework/http/HttpHeaders;>;)L1reactor/core/publisher/Flux<Lorg/springframework/http/codec/multipart/FilePartEvent;>;
 create
  (Ljava/lang/String;Ljava/nio/file/Path;)Lreactor/core/publisher/Flux<Lorg/springframework/http/codec/multipart/FilePartEvent;>;
- (Ljava/lang/String;Ljava/nio/file/Path;)Lreactor/core/publisher/Flux<Lorg/springframework/http/codec/multipart/FilePartEvent;>;
+ (Ljava/lang/String;Ljava/nio/file/Path;)L1reactor/core/publisher/Flux<Lorg/springframework/http/codec/multipart/FilePartEvent;>;
 create
  (Ljava/lang/String;Ljava/nio/file/Path;Ljava/util/function/Consumer<Lorg/springframework/http/HttpHeaders;>;)Lreactor/core/publisher/Flux<Lorg/springframework/http/codec/multipart/FilePartEvent;>;
- (Ljava/lang/String;Ljava/nio/file/Path;Ljava/util/function/Consumer<Lorg/springframework/http/HttpHeaders;>;)Lreactor/core/publisher/Flux<Lorg/springframework/http/codec/multipart/FilePartEvent;>;
+ (Ljava/lang/String;Ljava/nio/file/Path;Ljava/util/function/Consumer<Lorg/springframework/http/HttpHeaders;>;)L1reactor/core/publisher/Flux<Lorg/springframework/http/codec/multipart/FilePartEvent;>;
 create
  (Ljava/lang/String;Lorg/springframework/core/io/Resource;)Lreactor/core/publisher/Flux<Lorg/springframework/http/codec/multipart/FilePartEvent;>;
- (Ljava/lang/String;Lorg/springframework/core/io/Resource;)Lreactor/core/publisher/Flux<Lorg/springframework/http/codec/multipart/FilePartEvent;>;
+ (Ljava/lang/String;Lorg/springframework/core/io/Resource;)L1reactor/core/publisher/Flux<Lorg/springframework/http/codec/multipart/FilePartEvent;>;
 create
  (Ljava/lang/String;Lorg/springframework/core/io/Resource;Ljava/util/function/Consumer<Lorg/springframework/http/HttpHeaders;>;)Lreactor/core/publisher/Flux<Lorg/springframework/http/codec/multipart/FilePartEvent;>;
- (Ljava/lang/String;Lorg/springframework/core/io/Resource;Ljava/util/function/Consumer<Lorg/springframework/http/HttpHeaders;>;)Lreactor/core/publisher/Flux<Lorg/springframework/http/codec/multipart/FilePartEvent;>;
+ (Ljava/lang/String;Lorg/springframework/core/io/Resource;Ljava/util/function/Consumer<Lorg/springframework/http/HttpHeaders;>;)L1reactor/core/publisher/Flux<Lorg/springframework/http/codec/multipart/FilePartEvent;>;
 
 filename
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/multipart/FormPartEvent.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/multipart/FormPartEvent.eea
index b1cd9df4e6..ef9cd71735 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/multipart/FormPartEvent.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/multipart/FormPartEvent.eea
@@ -2,10 +2,10 @@ class org/springframework/http/codec/multipart/FormPartEvent
 
 create
  (Ljava/lang/String;Ljava/lang/String;)Lreactor/core/publisher/Mono<Lorg/springframework/http/codec/multipart/FormPartEvent;>;
- (Ljava/lang/String;Ljava/lang/String;)Lreactor/core/publisher/Mono<Lorg/springframework/http/codec/multipart/FormPartEvent;>;
+ (Ljava/lang/String;Ljava/lang/String;)L1reactor/core/publisher/Mono<Lorg/springframework/http/codec/multipart/FormPartEvent;>;
 create
  (Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer<Lorg/springframework/http/HttpHeaders;>;)Lreactor/core/publisher/Mono<Lorg/springframework/http/codec/multipart/FormPartEvent;>;
- (Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer<Lorg/springframework/http/HttpHeaders;>;)Lreactor/core/publisher/Mono<Lorg/springframework/http/codec/multipart/FormPartEvent;>;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer<Lorg/springframework/http/HttpHeaders;>;)L1reactor/core/publisher/Mono<Lorg/springframework/http/codec/multipart/FormPartEvent;>;
 
 value
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/multipart/MultipartParser$BodyToken.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/multipart/MultipartParser$BodyToken.eea
index 388a07a533..b656a7c9f9 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/multipart/MultipartParser$BodyToken.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/multipart/MultipartParser$BodyToken.eea
@@ -8,4 +8,4 @@ buffer
  ()Lorg/springframework/core/io/buffer/DataBuffer;
 headers
  ()Lorg/springframework/http/HttpHeaders;
- ()Lorg/springframework/http/HttpHeaders;
+ ()L1org/springframework/http/HttpHeaders;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/multipart/MultipartParser$HeadersToken.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/multipart/MultipartParser$HeadersToken.eea
index 3b0dbf0d94..2f5a97378c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/multipart/MultipartParser$HeadersToken.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/multipart/MultipartParser$HeadersToken.eea
@@ -5,7 +5,7 @@ class org/springframework/http/codec/multipart/MultipartParser$HeadersToken
  (Lorg/springframework/http/HttpHeaders;)V
 buffer
  ()Lorg/springframework/core/io/buffer/DataBuffer;
- ()Lorg/springframework/core/io/buffer/DataBuffer;
+ ()L1org/springframework/core/io/buffer/DataBuffer;
 headers
  ()Lorg/springframework/http/HttpHeaders;
  ()Lorg/springframework/http/HttpHeaders;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/multipart/MultipartWriterSupport.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/multipart/MultipartWriterSupport.eea
index 29f2997f70..84635e8ca3 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/multipart/MultipartWriterSupport.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/multipart/MultipartWriterSupport.eea
@@ -27,7 +27,7 @@ getCharset
  ()Ljava/nio/charset/Charset;
 getMultipartMediaType
  (Lorg/springframework/http/MediaType;[B)Lorg/springframework/http/MediaType;
- (Lorg/springframework/http/MediaType;[B)Lorg/springframework/http/MediaType;
+ (Lorg/springframework/http/MediaType;[B)L1org/springframework/http/MediaType;
 getWritableMediaTypes
  ()Ljava/util/List<Lorg/springframework/http/MediaType;>;
  ()Ljava/util/List<Lorg/springframework/http/MediaType;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/support/DefaultClientCodecConfigurer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/support/DefaultClientCodecConfigurer.eea
index c58bc9b50b..77b1d4253e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/support/DefaultClientCodecConfigurer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/support/DefaultClientCodecConfigurer.eea
@@ -2,10 +2,10 @@ class org/springframework/http/codec/support/DefaultClientCodecConfigurer
 
 clone
  ()Lorg/springframework/http/codec/support/DefaultClientCodecConfigurer;
- ()Lorg/springframework/http/codec/support/DefaultClientCodecConfigurer;
+ ()L1org/springframework/http/codec/support/DefaultClientCodecConfigurer;
 cloneDefaultCodecs
  ()Lorg/springframework/http/codec/support/BaseDefaultCodecs;
- ()Lorg/springframework/http/codec/support/BaseDefaultCodecs;
+ ()L1org/springframework/http/codec/support/BaseDefaultCodecs;
 defaultCodecs
  ()Lorg/springframework/http/codec/ClientCodecConfigurer$ClientDefaultCodecs;
  ()Lorg/springframework/http/codec/ClientCodecConfigurer$ClientDefaultCodecs;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/support/DefaultServerCodecConfigurer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/support/DefaultServerCodecConfigurer.eea
index cfa20b34cc..38be02e28c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/support/DefaultServerCodecConfigurer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/codec/support/DefaultServerCodecConfigurer.eea
@@ -2,10 +2,10 @@ class org/springframework/http/codec/support/DefaultServerCodecConfigurer
 
 clone
  ()Lorg/springframework/http/codec/support/DefaultServerCodecConfigurer;
- ()Lorg/springframework/http/codec/support/DefaultServerCodecConfigurer;
+ ()L1org/springframework/http/codec/support/DefaultServerCodecConfigurer;
 cloneDefaultCodecs
  ()Lorg/springframework/http/codec/support/BaseDefaultCodecs;
- ()Lorg/springframework/http/codec/support/BaseDefaultCodecs;
+ ()L1org/springframework/http/codec/support/BaseDefaultCodecs;
 defaultCodecs
  ()Lorg/springframework/http/codec/ServerCodecConfigurer$ServerDefaultCodecs;
  ()Lorg/springframework/http/codec/ServerCodecConfigurer$ServerDefaultCodecs;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/FormHttpMessageConverter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/FormHttpMessageConverter.eea
index 7972890623..feca374526 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/FormHttpMessageConverter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/FormHttpMessageConverter.eea
@@ -31,7 +31,7 @@ getFormContentType
  (Lorg/springframework/http/MediaType;)Lorg/springframework/http/MediaType;
 getHttpEntity
  (Ljava/lang/Object;)Lorg/springframework/http/HttpEntity<*>;
- (Ljava/lang/Object;)Lorg/springframework/http/HttpEntity<*>;
+ (Ljava/lang/Object;)L1org/springframework/http/HttpEntity<*>;
 getPartConverters
  ()Ljava/util/List<Lorg/springframework/http/converter/HttpMessageConverter<*>;>;
  ()Ljava/util/List<Lorg/springframework/http/converter/HttpMessageConverter<*>;>;
@@ -43,7 +43,7 @@ read
  (Ljava/lang/Class<+Lorg/springframework/util/MultiValueMap<Ljava/lang/String;*>;>;Lorg/springframework/http/HttpInputMessage;)Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
 serializeForm
  (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/Object;>;Ljava/nio/charset/Charset;)Ljava/lang/String;
- (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/Object;>;Ljava/nio/charset/Charset;)Ljava/lang/String;
+ (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/Object;>;Ljava/nio/charset/Charset;)L1java/lang/String;
 setCharset
  (Ljava/nio/charset/Charset;)V
  (Ljava/nio/charset/Charset;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/ResourceHttpMessageConverter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/ResourceHttpMessageConverter.eea
index 3bd2983e25..066552ba12 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/ResourceHttpMessageConverter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/ResourceHttpMessageConverter.eea
@@ -15,7 +15,7 @@ getDefaultContentType
  (Lorg/springframework/core/io/Resource;)Lorg/springframework/http/MediaType;
 readInternal
  (Ljava/lang/Class<+Lorg/springframework/core/io/Resource;>;Lorg/springframework/http/HttpInputMessage;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/Class<+Lorg/springframework/core/io/Resource;>;Lorg/springframework/http/HttpInputMessage;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/Class<+Lorg/springframework/core/io/Resource;>;Lorg/springframework/http/HttpInputMessage;)L1org/springframework/core/io/Resource;
 supports
  (Ljava/lang/Class<*>;)Z
  (Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/ResourceRegionHttpMessageConverter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/ResourceRegionHttpMessageConverter.eea
index 0eb0f0e54d..498c0e2694 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/ResourceRegionHttpMessageConverter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/ResourceRegionHttpMessageConverter.eea
@@ -21,10 +21,10 @@ getDefaultContentType
  (Ljava/lang/Object;)Lorg/springframework/http/MediaType;
 read
  (Ljava/lang/reflect/Type;Ljava/lang/Class<*>;Lorg/springframework/http/HttpInputMessage;)Ljava/lang/Object;
- (Ljava/lang/reflect/Type;Ljava/lang/Class<*>;Lorg/springframework/http/HttpInputMessage;)Ljava/lang/Object;
+ (Ljava/lang/reflect/Type;Ljava/lang/Class<*>;Lorg/springframework/http/HttpInputMessage;)L1java/lang/Object;
 readInternal
  (Ljava/lang/Class<*>;Lorg/springframework/http/HttpInputMessage;)Lorg/springframework/core/io/support/ResourceRegion;
- (Ljava/lang/Class<*>;Lorg/springframework/http/HttpInputMessage;)Lorg/springframework/core/io/support/ResourceRegion;
+ (Ljava/lang/Class<*>;Lorg/springframework/http/HttpInputMessage;)L1org/springframework/core/io/support/ResourceRegion;
 supportsRepeatableWrites
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/StringHttpMessageConverter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/StringHttpMessageConverter.eea
index 343d23a840..becf64cfd1 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/StringHttpMessageConverter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/StringHttpMessageConverter.eea
@@ -16,13 +16,13 @@ addDefaultHeaders
  (Lorg/springframework/http/HttpHeaders;Ljava/lang/String;Lorg/springframework/http/MediaType;)V
 getAcceptedCharsets
  ()Ljava/util/List<Ljava/nio/charset/Charset;>;
- ()Ljava/util/List<Ljava/nio/charset/Charset;>;
+ ()L1java/util/List<Ljava/nio/charset/Charset;>;
 getContentLength
  (Ljava/lang/String;Lorg/springframework/http/MediaType;)Ljava/lang/Long;
  (Ljava/lang/String;Lorg/springframework/http/MediaType;)Ljava/lang/Long;
 readInternal
  (Ljava/lang/Class<+Ljava/lang/String;>;Lorg/springframework/http/HttpInputMessage;)Ljava/lang/String;
- (Ljava/lang/Class<+Ljava/lang/String;>;Lorg/springframework/http/HttpInputMessage;)Ljava/lang/String;
+ (Ljava/lang/Class<+Ljava/lang/String;>;Lorg/springframework/http/HttpInputMessage;)L1java/lang/String;
 supports
  (Ljava/lang/Class<*>;)Z
  (Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.eea
index f0e6ab0bd8..9dd5db7c86 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.eea
@@ -58,7 +58,7 @@ getObjectMappersForType
  (Ljava/lang/Class<*>;)L0java/util/Map<Lorg/springframework/http/MediaType;Lcom/fasterxml/jackson/databind/ObjectMapper;>;
 getSupportedMediaTypes
  (Ljava/lang/Class<*>;)Ljava/util/List<Lorg/springframework/http/MediaType;>;
- (Ljava/lang/Class<*>;)Ljava/util/List<Lorg/springframework/http/MediaType;>;
+ (Ljava/lang/Class<*>;)L1java/util/List<Lorg/springframework/http/MediaType;>;
 logWarningIfNecessary
  (Ljava/lang/reflect/Type;Ljava/lang/Throwable;)V
  (Ljava/lang/reflect/Type;Ljava/lang/Throwable;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/json/GsonBuilderUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/json/GsonBuilderUtils.eea
index c6d808b7a7..ce4f9f308e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/json/GsonBuilderUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/json/GsonBuilderUtils.eea
@@ -2,4 +2,4 @@ class org/springframework/http/converter/json/GsonBuilderUtils
 
 gsonBuilderWithBase64EncodedByteArrays
  ()Lcom/google/gson/GsonBuilder;
- ()Lcom/google/gson/GsonBuilder;
+ ()L1com/google/gson/GsonBuilder;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.eea
index 8b71b771b6..3eec61cdad 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.eea
@@ -5,7 +5,7 @@ cbor
  ()Lorg/springframework/http/converter/json/Jackson2ObjectMapperBuilder;
 json
  ()Lorg/springframework/http/converter/json/Jackson2ObjectMapperBuilder;
- ()Lorg/springframework/http/converter/json/Jackson2ObjectMapperBuilder;
+ ()L1org/springframework/http/converter/json/Jackson2ObjectMapperBuilder;
 smile
  ()Lorg/springframework/http/converter/json/Jackson2ObjectMapperBuilder;
  ()Lorg/springframework/http/converter/json/Jackson2ObjectMapperBuilder;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/xml/AbstractJaxb2HttpMessageConverter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/xml/AbstractJaxb2HttpMessageConverter.eea
index 2ae5f114b9..4275517227 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/xml/AbstractJaxb2HttpMessageConverter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/xml/AbstractJaxb2HttpMessageConverter.eea
@@ -8,10 +8,10 @@ super org/springframework/http/converter/xml/AbstractXmlHttpMessageConverter
 
 createMarshaller
  (Ljava/lang/Class<*>;)Ljakarta/xml/bind/Marshaller;
- (Ljava/lang/Class<*>;)Ljakarta/xml/bind/Marshaller;
+ (Ljava/lang/Class<*>;)L1jakarta/xml/bind/Marshaller;
 createUnmarshaller
  (Ljava/lang/Class<*>;)Ljakarta/xml/bind/Unmarshaller;
- (Ljava/lang/Class<*>;)Ljakarta/xml/bind/Unmarshaller;
+ (Ljava/lang/Class<*>;)L1jakarta/xml/bind/Unmarshaller;
 customizeMarshaller
  (Ljakarta/xml/bind/Marshaller;)V
  (Ljakarta/xml/bind/Marshaller;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.eea
index 9c1f0abc0a..9b36a76a3b 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.eea
@@ -23,16 +23,16 @@ canWrite
  (Ljava/lang/reflect/Type;Ljava/lang/Class<*>;Lorg/springframework/http/MediaType;)Z
 createCollection
  (Ljava/lang/Class<*>;)TT;
- (Ljava/lang/Class<*>;)TT;
+ (Ljava/lang/Class<*>;)T1T;
 createXmlInputFactory
  ()Ljavax/xml/stream/XMLInputFactory;
- ()Ljavax/xml/stream/XMLInputFactory;
+ ()L1javax/xml/stream/XMLInputFactory;
 read
  (Ljava/lang/reflect/Type;Ljava/lang/Class<*>;Lorg/springframework/http/HttpInputMessage;)TT;
  (Ljava/lang/reflect/Type;Ljava/lang/Class<*>;Lorg/springframework/http/HttpInputMessage;)TT;
 readFromSource
  (Ljava/lang/Class<+TT;>;Lorg/springframework/http/HttpHeaders;Ljavax/xml/transform/Source;)TT;
- (Ljava/lang/Class<+TT;>;Lorg/springframework/http/HttpHeaders;Ljavax/xml/transform/Source;)TT;
+ (Ljava/lang/Class<+TT;>;Lorg/springframework/http/HttpHeaders;Ljavax/xml/transform/Source;)T1T;
 supports
  (Ljava/lang/Class<*>;)Z
  (Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/server/PathContainer$Options.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/server/PathContainer$Options.eea
index 9969eaded8..3af94f8e2f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/server/PathContainer$Options.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/server/PathContainer$Options.eea
@@ -9,4 +9,4 @@ MESSAGE_ROUTE
 
 create
  (CZ)Lorg/springframework/http/server/PathContainer$Options;
- (CZ)Lorg/springframework/http/server/PathContainer$Options;
+ (CZ)L1org/springframework/http/server/PathContainer$Options;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/server/RequestPath.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/server/RequestPath.eea
index b20d3c593c..96adaa3dcd 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/server/RequestPath.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/server/RequestPath.eea
@@ -2,7 +2,7 @@ class org/springframework/http/server/RequestPath
 
 parse
  (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/http/server/RequestPath;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/http/server/RequestPath;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/springframework/http/server/RequestPath;
 parse
  (Ljava/net/URI;Ljava/lang/String;)Lorg/springframework/http/server/RequestPath;
  (Ljava/net/URI;Ljava/lang/String;)Lorg/springframework/http/server/RequestPath;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/server/ServletServerHttpRequest.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/server/ServletServerHttpRequest.eea
index 53b4de2feb..e83ace4997 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/server/ServletServerHttpRequest.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/server/ServletServerHttpRequest.eea
@@ -6,7 +6,7 @@ FORM_CHARSET
 
 initURI
  (Ljakarta/servlet/http/HttpServletRequest;)Ljava/net/URI;
- (Ljakarta/servlet/http/HttpServletRequest;)Ljava/net/URI;
+ (Ljakarta/servlet/http/HttpServletRequest;)L1java/net/URI;
 
 <init>
  (Ljakarta/servlet/http/HttpServletRequest;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/server/observation/DefaultServerRequestObservationConvention.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/server/observation/DefaultServerRequestObservationConvention.eea
index 740d6e2014..fdd0e1c80f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/server/observation/DefaultServerRequestObservationConvention.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/server/observation/DefaultServerRequestObservationConvention.eea
@@ -8,7 +8,7 @@ exception
  (Lorg/springframework/http/server/observation/ServerRequestObservationContext;)Lio/micrometer/common/KeyValue;
 getContextualName
  (Lorg/springframework/http/server/observation/ServerRequestObservationContext;)Ljava/lang/String;
- (Lorg/springframework/http/server/observation/ServerRequestObservationContext;)Ljava/lang/String;
+ (Lorg/springframework/http/server/observation/ServerRequestObservationContext;)L1java/lang/String;
 getHighCardinalityKeyValues
  (Lorg/springframework/http/server/observation/ServerRequestObservationContext;)Lio/micrometer/common/KeyValues;
  (Lorg/springframework/http/server/observation/ServerRequestObservationContext;)Lio/micrometer/common/KeyValues;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/AbstractListenerServerHttpResponse.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/AbstractListenerServerHttpResponse.eea
index c70c43dd71..0bf26899ed 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/AbstractListenerServerHttpResponse.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/AbstractListenerServerHttpResponse.eea
@@ -8,7 +8,7 @@ class org/springframework/http/server/reactive/AbstractListenerServerHttpRespons
  (Lorg/springframework/core/io/buffer/DataBufferFactory;Lorg/springframework/http/HttpHeaders;)V
 createBodyFlushProcessor
  ()Lorg/reactivestreams/Processor<-Lorg/reactivestreams/Publisher<+Lorg/springframework/core/io/buffer/DataBuffer;>;Ljava/lang/Void;>;
- ()Lorg/reactivestreams/Processor<-Lorg/reactivestreams/Publisher<+Lorg/springframework/core/io/buffer/DataBuffer;>;Ljava/lang/Void;>;
+ ()L1org/reactivestreams/Processor<-Lorg/reactivestreams/Publisher<+Lorg/springframework/core/io/buffer/DataBuffer;>;Ljava/lang/Void;>;
 writeAndFlushWithInternal
  (Lorg/reactivestreams/Publisher<+Lorg/reactivestreams/Publisher<+Lorg/springframework/core/io/buffer/DataBuffer;>;>;)Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
  (Lorg/reactivestreams/Publisher<+Lorg/reactivestreams/Publisher<+Lorg/springframework/core/io/buffer/DataBuffer;>;>;)Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/AbstractListenerWriteFlushProcessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/AbstractListenerWriteFlushProcessor.eea
index 45140af86f..a45f420c0f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/AbstractListenerWriteFlushProcessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/AbstractListenerWriteFlushProcessor.eea
@@ -15,7 +15,7 @@ rsWriteFlushLogger
  (Ljava/lang/String;)V
 createWriteProcessor
  ()Lorg/reactivestreams/Processor<-TT;Ljava/lang/Void;>;
- ()Lorg/reactivestreams/Processor<-TT;Ljava/lang/Void;>;
+ ()L1org/reactivestreams/Processor<-TT;Ljava/lang/Void;>;
 flushingFailed
  (Ljava/lang/Throwable;)V
  (Ljava/lang/Throwable;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/AbstractServerHttpRequest.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/AbstractServerHttpRequest.eea
index 1bfa21471e..c498451e1e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/AbstractServerHttpRequest.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/AbstractServerHttpRequest.eea
@@ -41,7 +41,7 @@ initLogPrefix
  ()Ljava/lang/String;
 initQueryParams
  ()Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
- ()Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
+ ()L1org/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
 initSslInfo
  ()Lorg/springframework/http/server/reactive/SslInfo;
  ()L0org/springframework/http/server/reactive/SslInfo;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.eea
index 089b80ae67..77c661b314 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.eea
@@ -5,4 +5,4 @@ class org/springframework/http/server/reactive/JettyHttpHandlerAdapter
  (Lorg/springframework/http/server/reactive/HttpHandler;)V
 createResponse
  (Ljakarta/servlet/http/HttpServletResponse;Ljakarta/servlet/AsyncContext;Lorg/springframework/http/server/reactive/ServletServerHttpRequest;)Lorg/springframework/http/server/reactive/ServletServerHttpResponse;
- (Ljakarta/servlet/http/HttpServletResponse;Ljakarta/servlet/AsyncContext;Lorg/springframework/http/server/reactive/ServletServerHttpRequest;)Lorg/springframework/http/server/reactive/ServletServerHttpResponse;
+ (Ljakarta/servlet/http/HttpServletResponse;Ljakarta/servlet/AsyncContext;Lorg/springframework/http/server/reactive/ServletServerHttpRequest;)L1org/springframework/http/server/reactive/ServletServerHttpResponse; # @Inherited(org.springframework.http.server.reactive.ServletHttpHandlerAdapter)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/ServerHttpRequest.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/ServerHttpRequest.eea
index 40e1afbb2a..2cc5f733c6 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/ServerHttpRequest.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/ServerHttpRequest.eea
@@ -23,4 +23,4 @@ getSslInfo
  ()L0org/springframework/http/server/reactive/SslInfo;
 mutate
  ()Lorg/springframework/http/server/reactive/ServerHttpRequest$Builder;
- ()Lorg/springframework/http/server/reactive/ServerHttpRequest$Builder;
+ ()L1org/springframework/http/server/reactive/ServerHttpRequest$Builder;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.eea
index 2750125b44..6505d15f90 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.eea
@@ -5,10 +5,10 @@ class org/springframework/http/server/reactive/ServletHttpHandlerAdapter
  (Lorg/springframework/http/server/reactive/HttpHandler;)V
 createRequest
  (Ljakarta/servlet/http/HttpServletRequest;Ljakarta/servlet/AsyncContext;)Lorg/springframework/http/server/reactive/ServletServerHttpRequest;
- (Ljakarta/servlet/http/HttpServletRequest;Ljakarta/servlet/AsyncContext;)Lorg/springframework/http/server/reactive/ServletServerHttpRequest;
+ (Ljakarta/servlet/http/HttpServletRequest;Ljakarta/servlet/AsyncContext;)L1org/springframework/http/server/reactive/ServletServerHttpRequest;
 createResponse
  (Ljakarta/servlet/http/HttpServletResponse;Ljakarta/servlet/AsyncContext;Lorg/springframework/http/server/reactive/ServletServerHttpRequest;)Lorg/springframework/http/server/reactive/ServletServerHttpResponse;
- (Ljakarta/servlet/http/HttpServletResponse;Ljakarta/servlet/AsyncContext;Lorg/springframework/http/server/reactive/ServletServerHttpRequest;)Lorg/springframework/http/server/reactive/ServletServerHttpResponse;
+ (Ljakarta/servlet/http/HttpServletResponse;Ljakarta/servlet/AsyncContext;Lorg/springframework/http/server/reactive/ServletServerHttpRequest;)L1org/springframework/http/server/reactive/ServletServerHttpResponse;
 getDataBufferFactory
  ()Lorg/springframework/core/io/buffer/DataBufferFactory;
  ()Lorg/springframework/core/io/buffer/DataBufferFactory;
@@ -17,7 +17,7 @@ getServletConfig
  ()L0jakarta/servlet/ServletConfig;
 getServletInfo
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getServletPath
  ()Ljava/lang/String;
  ()L0java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.eea
index dea772b630..6a63c2dc3e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.eea
@@ -5,7 +5,7 @@ class org/springframework/http/server/reactive/TomcatHttpHandlerAdapter
  (Lorg/springframework/http/server/reactive/HttpHandler;)V
 createRequest
  (Ljakarta/servlet/http/HttpServletRequest;Ljakarta/servlet/AsyncContext;)Lorg/springframework/http/server/reactive/ServletServerHttpRequest;
- (Ljakarta/servlet/http/HttpServletRequest;Ljakarta/servlet/AsyncContext;)Lorg/springframework/http/server/reactive/ServletServerHttpRequest;
+ (Ljakarta/servlet/http/HttpServletRequest;Ljakarta/servlet/AsyncContext;)L1org/springframework/http/server/reactive/ServletServerHttpRequest; # @Inherited(org.springframework.http.server.reactive.ServletHttpHandlerAdapter)
 createResponse
  (Ljakarta/servlet/http/HttpServletResponse;Ljakarta/servlet/AsyncContext;Lorg/springframework/http/server/reactive/ServletServerHttpRequest;)Lorg/springframework/http/server/reactive/ServletServerHttpResponse;
- (Ljakarta/servlet/http/HttpServletResponse;Ljakarta/servlet/AsyncContext;Lorg/springframework/http/server/reactive/ServletServerHttpRequest;)Lorg/springframework/http/server/reactive/ServletServerHttpResponse;
+ (Ljakarta/servlet/http/HttpServletResponse;Ljakarta/servlet/AsyncContext;Lorg/springframework/http/server/reactive/ServletServerHttpRequest;)L1org/springframework/http/server/reactive/ServletServerHttpResponse; # @Inherited(org.springframework.http.server.reactive.ServletHttpHandlerAdapter)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/observation/DefaultServerRequestObservationConvention.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/observation/DefaultServerRequestObservationConvention.eea
index b8dbd5d011..913bd1b9b9 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/observation/DefaultServerRequestObservationConvention.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/server/reactive/observation/DefaultServerRequestObservationConvention.eea
@@ -8,7 +8,7 @@ exception
  (Lorg/springframework/http/server/reactive/observation/ServerRequestObservationContext;)Lio/micrometer/common/KeyValue;
 getContextualName
  (Lorg/springframework/http/server/reactive/observation/ServerRequestObservationContext;)Ljava/lang/String;
- (Lorg/springframework/http/server/reactive/observation/ServerRequestObservationContext;)Ljava/lang/String;
+ (Lorg/springframework/http/server/reactive/observation/ServerRequestObservationContext;)L1java/lang/String;
 getHighCardinalityKeyValues
  (Lorg/springframework/http/server/reactive/observation/ServerRequestObservationContext;)Lio/micrometer/common/KeyValues;
  (Lorg/springframework/http/server/reactive/observation/ServerRequestObservationContext;)Lio/micrometer/common/KeyValues;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/support/HttpComponentsHeadersAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/support/HttpComponentsHeadersAdapter.eea
index 817bd72cba..22c4de649a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/support/HttpComponentsHeadersAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/support/HttpComponentsHeadersAdapter.eea
@@ -24,7 +24,7 @@ containsValue
  (L0java/lang/Object;)Z # @Inherited(java.util.Map)
 entrySet
  ()Ljava/util/Set<Ljava/util/Map$Entry<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;>;
- ()Ljava/util/Set<Ljava/util/Map$Entry<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;>;
+ ()L1java/util/Set<Ljava/util/Map$Entry<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;>;
 get
  (Ljava/lang/Object;)Ljava/util/List<Ljava/lang/String;>;
  (Ljava/lang/Object;)L0java/util/List<Ljava/lang/String;>;
@@ -33,7 +33,7 @@ getFirst
  (Ljava/lang/String;)L0java/lang/String;
 keySet
  ()Ljava/util/Set<Ljava/lang/String;>;
- ()Ljava/util/Set<Ljava/lang/String;>;
+ ()L1java/util/Set<Ljava/lang/String;>;
 put
  (Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;)Ljava/util/List<Ljava/lang/String;>;
  (Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;)L0java/util/List<Ljava/lang/String;>;
@@ -57,4 +57,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 values
  ()Ljava/util/Collection<Ljava/util/List<Ljava/lang/String;>;>;
- ()Ljava/util/Collection<Ljava/util/List<Ljava/lang/String;>;>;
+ ()L1java/util/Collection<Ljava/util/List<Ljava/lang/String;>;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/support/JettyHeadersAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/support/JettyHeadersAdapter.eea
index 67e89e4908..d7ab39c077 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/support/JettyHeadersAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/support/JettyHeadersAdapter.eea
@@ -24,7 +24,7 @@ containsValue
  (L0java/lang/Object;)Z # @Inherited(java.util.Map)
 entrySet
  ()Ljava/util/Set<Ljava/util/Map$Entry<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;>;
- ()Ljava/util/Set<Ljava/util/Map$Entry<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;>;
+ ()L1java/util/Set<Ljava/util/Map$Entry<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;>;
 get
  (Ljava/lang/Object;)Ljava/util/List<Ljava/lang/String;>;
  (Ljava/lang/Object;)L0java/util/List<Ljava/lang/String;>;
@@ -33,7 +33,7 @@ getFirst
  (Ljava/lang/String;)Ljava/lang/String;
 keySet
  ()Ljava/util/Set<Ljava/lang/String;>;
- ()Ljava/util/Set<Ljava/lang/String;>;
+ ()L1java/util/Set<Ljava/lang/String;>;
 put
  (Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;)Ljava/util/List<Ljava/lang/String;>;
  (Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;)L0java/util/List<Ljava/lang/String;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/support/Netty4HeadersAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/support/Netty4HeadersAdapter.eea
index 3eac8e09a5..82bf672f8f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/support/Netty4HeadersAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/support/Netty4HeadersAdapter.eea
@@ -24,7 +24,7 @@ containsValue
  (L0java/lang/Object;)Z # @Inherited(java.util.Map)
 entrySet
  ()Ljava/util/Set<Ljava/util/Map$Entry<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;>;
- ()Ljava/util/Set<Ljava/util/Map$Entry<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;>;
+ ()L1java/util/Set<Ljava/util/Map$Entry<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;>;
 get
  (Ljava/lang/Object;)Ljava/util/List<Ljava/lang/String;>;
  (Ljava/lang/Object;)L0java/util/List<Ljava/lang/String;>;
@@ -33,7 +33,7 @@ getFirst
  (Ljava/lang/String;)L0java/lang/String;
 keySet
  ()Ljava/util/Set<Ljava/lang/String;>;
- ()Ljava/util/Set<Ljava/lang/String;>;
+ ()L1java/util/Set<Ljava/lang/String;>;
 put
  (Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;)Ljava/util/List<Ljava/lang/String;>;
  (Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;)L0java/util/List<Ljava/lang/String;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/http/support/Netty5HeadersAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/http/support/Netty5HeadersAdapter.eea
index 358b4f3cb6..b71aa7d727 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/http/support/Netty5HeadersAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/http/support/Netty5HeadersAdapter.eea
@@ -24,7 +24,7 @@ containsValue
  (L0java/lang/Object;)Z # @Inherited(java.util.Map)
 entrySet
  ()Ljava/util/Set<Ljava/util/Map$Entry<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;>;
- ()Ljava/util/Set<Ljava/util/Map$Entry<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;>;
+ ()L1java/util/Set<Ljava/util/Map$Entry<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;>;
 get
  (Ljava/lang/Object;)Ljava/util/List<Ljava/lang/String;>;
  (Ljava/lang/Object;)L0java/util/List<Ljava/lang/String;>;
@@ -33,7 +33,7 @@ getFirst
  (Ljava/lang/String;)L0java/lang/String;
 keySet
  ()Ljava/util/Set<Ljava/lang/String;>;
- ()Ljava/util/Set<Ljava/lang/String;>;
+ ()L1java/util/Set<Ljava/lang/String;>;
 put
  (Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;)Ljava/util/List<Ljava/lang/String;>;
  (Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;)L0java/util/List<Ljava/lang/String;>;
@@ -57,4 +57,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 values
  ()Ljava/util/Collection<Ljava/util/List<Ljava/lang/String;>;>;
- ()Ljava/util/Collection<Ljava/util/List<Ljava/lang/String;>;>;
+ ()L1java/util/Collection<Ljava/util/List<Ljava/lang/String;>;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.eea
index 5ac9eee274..18a1af650a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.eea
@@ -11,4 +11,4 @@ getInstrumentableClassLoader
  ()Ljava/lang/ClassLoader;
 getThrowawayClassLoader
  ()Ljava/lang/ClassLoader;
- ()Ljava/lang/ClassLoader;
+ ()L1java/lang/ClassLoader;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.eea
index 52eadee2d2..2393ad7d7c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.eea
@@ -11,4 +11,4 @@ getInstrumentableClassLoader
  ()Ljava/lang/ClassLoader;
 getThrowawayClassLoader
  ()Ljava/lang/ClassLoader;
- ()Ljava/lang/ClassLoader;
+ ()L1java/lang/ClassLoader;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.eea
index f3e8d98fbf..87e21bf97b 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.eea
@@ -11,4 +11,4 @@ getInstrumentableClassLoader
  ()Ljava/lang/ClassLoader;
 getThrowawayClassLoader
  ()Ljava/lang/ClassLoader;
- ()Ljava/lang/ClassLoader;
+ ()L1java/lang/ClassLoader;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.eea
index dfdd01b714..a9f716860d 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.eea
@@ -11,4 +11,4 @@ getInstrumentableClassLoader
  ()Ljava/lang/ClassLoader;
 getThrowawayClassLoader
  ()Ljava/lang/ClassLoader;
- ()Ljava/lang/ClassLoader;
+ ()L1java/lang/ClassLoader;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/AnnotationSpec.eea b/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/AnnotationSpec.eea
index af9535a8a0..3475790848 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/AnnotationSpec.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/AnnotationSpec.eea
@@ -5,7 +5,7 @@ builder
  (Ljava/lang/Class<*>;)Lorg/springframework/javapoet/AnnotationSpec$Builder;
 builder
  (Lorg/springframework/javapoet/ClassName;)Lorg/springframework/javapoet/AnnotationSpec$Builder;
- (Lorg/springframework/javapoet/ClassName;)Lorg/springframework/javapoet/AnnotationSpec$Builder;
+ (Lorg/springframework/javapoet/ClassName;)L1org/springframework/javapoet/AnnotationSpec$Builder;
 get
  (Ljava/lang/annotation/Annotation;)Lorg/springframework/javapoet/AnnotationSpec;
  (Ljava/lang/annotation/Annotation;)Lorg/springframework/javapoet/AnnotationSpec;
@@ -28,7 +28,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 toBuilder
  ()Lorg/springframework/javapoet/AnnotationSpec$Builder;
- ()Lorg/springframework/javapoet/AnnotationSpec$Builder;
+ ()L1org/springframework/javapoet/AnnotationSpec$Builder;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/ArrayTypeName.eea b/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/ArrayTypeName.eea
index 477834b4f9..510f46db34 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/ArrayTypeName.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/ArrayTypeName.eea
@@ -11,7 +11,7 @@ of
  (Ljava/lang/reflect/Type;)Lorg/springframework/javapoet/ArrayTypeName;
 of
  (Lorg/springframework/javapoet/TypeName;)Lorg/springframework/javapoet/ArrayTypeName;
- (Lorg/springframework/javapoet/TypeName;)Lorg/springframework/javapoet/ArrayTypeName;
+ (Lorg/springframework/javapoet/TypeName;)L1org/springframework/javapoet/ArrayTypeName;
 
 componentType
  Lorg/springframework/javapoet/TypeName;
@@ -19,7 +19,7 @@ componentType
 
 annotated
  (Ljava/util/List<Lorg/springframework/javapoet/AnnotationSpec;>;)Lorg/springframework/javapoet/ArrayTypeName;
- (Ljava/util/List<Lorg/springframework/javapoet/AnnotationSpec;>;)Lorg/springframework/javapoet/ArrayTypeName;
+ (Ljava/util/List<Lorg/springframework/javapoet/AnnotationSpec;>;)L1org/springframework/javapoet/ArrayTypeName;
 withoutAnnotations
  ()Lorg/springframework/javapoet/TypeName;
- ()Lorg/springframework/javapoet/TypeName;
+ ()L1org/springframework/javapoet/TypeName; # @Inherited(org.springframework.javapoet.TypeName)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/ClassName.eea b/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/ClassName.eea
index 130fe36889..e7d40a1d5a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/ClassName.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/ClassName.eea
@@ -10,7 +10,7 @@ OBJECT
 
 bestGuess
  (Ljava/lang/String;)Lorg/springframework/javapoet/ClassName;
- (Ljava/lang/String;)Lorg/springframework/javapoet/ClassName;
+ (Ljava/lang/String;)L1org/springframework/javapoet/ClassName;
 get
  (Ljava/lang/Class<*>;)Lorg/springframework/javapoet/ClassName;
  (Ljava/lang/Class<*>;)Lorg/springframework/javapoet/ClassName;
@@ -35,7 +35,7 @@ enclosingClassName
  ()Lorg/springframework/javapoet/ClassName;
 nestedClass
  (Ljava/lang/String;)Lorg/springframework/javapoet/ClassName;
- (Ljava/lang/String;)Lorg/springframework/javapoet/ClassName;
+ (Ljava/lang/String;)L1org/springframework/javapoet/ClassName;
 packageName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -44,7 +44,7 @@ peerClass
  (Ljava/lang/String;)Lorg/springframework/javapoet/ClassName;
 reflectionName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 simpleName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/CodeBlock.eea b/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/CodeBlock.eea
index 817b21aacb..27d84d3e3c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/CodeBlock.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/CodeBlock.eea
@@ -2,7 +2,7 @@ class org/springframework/javapoet/CodeBlock
 
 builder
  ()Lorg/springframework/javapoet/CodeBlock$Builder;
- ()Lorg/springframework/javapoet/CodeBlock$Builder;
+ ()L1org/springframework/javapoet/CodeBlock$Builder;
 join
  (Ljava/lang/Iterable<Lorg/springframework/javapoet/CodeBlock;>;Ljava/lang/String;)Lorg/springframework/javapoet/CodeBlock;
  (Ljava/lang/Iterable<Lorg/springframework/javapoet/CodeBlock;>;Ljava/lang/String;)Lorg/springframework/javapoet/CodeBlock;
@@ -21,7 +21,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 toBuilder
  ()Lorg/springframework/javapoet/CodeBlock$Builder;
- ()Lorg/springframework/javapoet/CodeBlock$Builder;
+ ()L1org/springframework/javapoet/CodeBlock$Builder;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/JavaFile.eea b/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/JavaFile.eea
index 3c937d0773..fe48d3722d 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/JavaFile.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/JavaFile.eea
@@ -2,7 +2,7 @@ class org/springframework/javapoet/JavaFile
 
 builder
  (Ljava/lang/String;Lorg/springframework/javapoet/TypeSpec;)Lorg/springframework/javapoet/JavaFile$Builder;
- (Ljava/lang/String;Lorg/springframework/javapoet/TypeSpec;)Lorg/springframework/javapoet/JavaFile$Builder;
+ (Ljava/lang/String;Lorg/springframework/javapoet/TypeSpec;)L1org/springframework/javapoet/JavaFile$Builder;
 
 fileComment
  Lorg/springframework/javapoet/CodeBlock;
@@ -22,7 +22,7 @@ toBuilder
  ()Lorg/springframework/javapoet/JavaFile$Builder;
 toJavaFileObject
  ()Ljavax/tools/JavaFileObject;
- ()Ljavax/tools/JavaFileObject;
+ ()L1javax/tools/JavaFileObject;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/MethodSpec.eea b/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/MethodSpec.eea
index 267c4d8daa..a2e33d7841 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/MethodSpec.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/MethodSpec.eea
@@ -2,10 +2,10 @@ class org/springframework/javapoet/MethodSpec
 
 constructorBuilder
  ()Lorg/springframework/javapoet/MethodSpec$Builder;
- ()Lorg/springframework/javapoet/MethodSpec$Builder;
+ ()L1org/springframework/javapoet/MethodSpec$Builder;
 methodBuilder
  (Ljava/lang/String;)Lorg/springframework/javapoet/MethodSpec$Builder;
- (Ljava/lang/String;)Lorg/springframework/javapoet/MethodSpec$Builder;
+ (Ljava/lang/String;)L1org/springframework/javapoet/MethodSpec$Builder;
 overriding
  (Ljavax/lang/model/element/ExecutableElement;)Lorg/springframework/javapoet/MethodSpec$Builder;
  (Ljavax/lang/model/element/ExecutableElement;)Lorg/springframework/javapoet/MethodSpec$Builder;
@@ -52,7 +52,7 @@ hasModifier
  (Ljavax/lang/model/element/Modifier;)Z
 toBuilder
  ()Lorg/springframework/javapoet/MethodSpec$Builder;
- ()Lorg/springframework/javapoet/MethodSpec$Builder;
+ ()L1org/springframework/javapoet/MethodSpec$Builder;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/NameAllocator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/NameAllocator.eea
index 56fe873896..d45e4db8e6 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/NameAllocator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/NameAllocator.eea
@@ -2,11 +2,11 @@ class org/springframework/javapoet/NameAllocator
 
 toJavaIdentifier
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 
 clone
  ()Lorg/springframework/javapoet/NameAllocator;
- ()Lorg/springframework/javapoet/NameAllocator;
+ ()L1org/springframework/javapoet/NameAllocator;
 get
  (Ljava/lang/Object;)Ljava/lang/String;
  (Ljava/lang/Object;)Ljava/lang/String;
@@ -15,4 +15,4 @@ newName
  (Ljava/lang/String;)Ljava/lang/String;
 newName
  (Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/Object;)L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/ParameterizedTypeName.eea b/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/ParameterizedTypeName.eea
index 3c8b183687..b881f9014a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/ParameterizedTypeName.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/ParameterizedTypeName.eea
@@ -2,13 +2,13 @@ class org/springframework/javapoet/ParameterizedTypeName
 
 get
  (Ljava/lang/Class<*>;[Ljava/lang/reflect/Type;)Lorg/springframework/javapoet/ParameterizedTypeName;
- (Ljava/lang/Class<*>;[Ljava/lang/reflect/Type;)Lorg/springframework/javapoet/ParameterizedTypeName;
+ (Ljava/lang/Class<*>;[Ljava/lang/reflect/Type;)L1org/springframework/javapoet/ParameterizedTypeName;
 get
  (Ljava/lang/reflect/ParameterizedType;)Lorg/springframework/javapoet/ParameterizedTypeName;
  (Ljava/lang/reflect/ParameterizedType;)Lorg/springframework/javapoet/ParameterizedTypeName;
 get
  (Lorg/springframework/javapoet/ClassName;[Lorg/springframework/javapoet/TypeName;)Lorg/springframework/javapoet/ParameterizedTypeName;
- (Lorg/springframework/javapoet/ClassName;[Lorg/springframework/javapoet/TypeName;)Lorg/springframework/javapoet/ParameterizedTypeName;
+ (Lorg/springframework/javapoet/ClassName;[Lorg/springframework/javapoet/TypeName;)L1org/springframework/javapoet/ParameterizedTypeName;
 
 rawType
  Lorg/springframework/javapoet/ClassName;
@@ -22,10 +22,10 @@ annotated
  (Ljava/util/List<Lorg/springframework/javapoet/AnnotationSpec;>;)Lorg/springframework/javapoet/ParameterizedTypeName;
 nestedClass
  (Ljava/lang/String;)Lorg/springframework/javapoet/ParameterizedTypeName;
- (Ljava/lang/String;)Lorg/springframework/javapoet/ParameterizedTypeName;
+ (Ljava/lang/String;)L1org/springframework/javapoet/ParameterizedTypeName;
 nestedClass
  (Ljava/lang/String;Ljava/util/List<Lorg/springframework/javapoet/TypeName;>;)Lorg/springframework/javapoet/ParameterizedTypeName;
- (Ljava/lang/String;Ljava/util/List<Lorg/springframework/javapoet/TypeName;>;)Lorg/springframework/javapoet/ParameterizedTypeName;
+ (Ljava/lang/String;Ljava/util/List<Lorg/springframework/javapoet/TypeName;>;)L1org/springframework/javapoet/ParameterizedTypeName;
 withoutAnnotations
  ()Lorg/springframework/javapoet/TypeName;
- ()Lorg/springframework/javapoet/TypeName;
+ ()L1org/springframework/javapoet/TypeName; # @Inherited(org.springframework.javapoet.TypeName)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/TypeName.eea b/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/TypeName.eea
index 856d7a316d..0b548fbd66 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/TypeName.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/TypeName.eea
@@ -44,7 +44,7 @@ annotations
 
 annotated
  (Ljava/util/List<Lorg/springframework/javapoet/AnnotationSpec;>;)Lorg/springframework/javapoet/TypeName;
- (Ljava/util/List<Lorg/springframework/javapoet/AnnotationSpec;>;)Lorg/springframework/javapoet/TypeName;
+ (Ljava/util/List<Lorg/springframework/javapoet/AnnotationSpec;>;)L1org/springframework/javapoet/TypeName;
 annotated
  ([Lorg/springframework/javapoet/AnnotationSpec;)Lorg/springframework/javapoet/TypeName;
  ([Lorg/springframework/javapoet/AnnotationSpec;)Lorg/springframework/javapoet/TypeName;
@@ -53,7 +53,7 @@ box
  ()Lorg/springframework/javapoet/TypeName;
 concatAnnotations
  (Ljava/util/List<Lorg/springframework/javapoet/AnnotationSpec;>;)Ljava/util/List<Lorg/springframework/javapoet/AnnotationSpec;>;
- (Ljava/util/List<Lorg/springframework/javapoet/AnnotationSpec;>;)Ljava/util/List<Lorg/springframework/javapoet/AnnotationSpec;>;
+ (Ljava/util/List<Lorg/springframework/javapoet/AnnotationSpec;>;)L1java/util/List<Lorg/springframework/javapoet/AnnotationSpec;>;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -65,4 +65,4 @@ unbox
  ()Lorg/springframework/javapoet/TypeName;
 withoutAnnotations
  ()Lorg/springframework/javapoet/TypeName;
- ()Lorg/springframework/javapoet/TypeName;
+ ()L1org/springframework/javapoet/TypeName;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/TypeSpec.eea b/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/TypeSpec.eea
index ea0b3002a9..90244b1a8a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/TypeSpec.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/TypeSpec.eea
@@ -11,7 +11,7 @@ anonymousClassBuilder
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/javapoet/TypeSpec$Builder;
 anonymousClassBuilder
  (Lorg/springframework/javapoet/CodeBlock;)Lorg/springframework/javapoet/TypeSpec$Builder;
- (Lorg/springframework/javapoet/CodeBlock;)Lorg/springframework/javapoet/TypeSpec$Builder;
+ (Lorg/springframework/javapoet/CodeBlock;)L1org/springframework/javapoet/TypeSpec$Builder;
 classBuilder
  (Ljava/lang/String;)Lorg/springframework/javapoet/TypeSpec$Builder;
  (Ljava/lang/String;)Lorg/springframework/javapoet/TypeSpec$Builder;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/TypeVariableName.eea b/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/TypeVariableName.eea
index 3b8d00ab01..7639645563 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/TypeVariableName.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/TypeVariableName.eea
@@ -40,4 +40,4 @@ withBounds
  ([Lorg/springframework/javapoet/TypeName;)Lorg/springframework/javapoet/TypeVariableName;
 withoutAnnotations
  ()Lorg/springframework/javapoet/TypeName;
- ()Lorg/springframework/javapoet/TypeName;
+ ()L1org/springframework/javapoet/TypeName; # @Inherited(org.springframework.javapoet.TypeName)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/WildcardTypeName.eea b/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/WildcardTypeName.eea
index 03d3b6ed2a..68b3aa6b4c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/WildcardTypeName.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/javapoet/WildcardTypeName.eea
@@ -11,13 +11,13 @@ subtypeOf
  (Ljava/lang/reflect/Type;)Lorg/springframework/javapoet/WildcardTypeName;
 subtypeOf
  (Lorg/springframework/javapoet/TypeName;)Lorg/springframework/javapoet/WildcardTypeName;
- (Lorg/springframework/javapoet/TypeName;)Lorg/springframework/javapoet/WildcardTypeName;
+ (Lorg/springframework/javapoet/TypeName;)L1org/springframework/javapoet/WildcardTypeName;
 supertypeOf
  (Ljava/lang/reflect/Type;)Lorg/springframework/javapoet/WildcardTypeName;
  (Ljava/lang/reflect/Type;)Lorg/springframework/javapoet/WildcardTypeName;
 supertypeOf
  (Lorg/springframework/javapoet/TypeName;)Lorg/springframework/javapoet/WildcardTypeName;
- (Lorg/springframework/javapoet/TypeName;)Lorg/springframework/javapoet/WildcardTypeName;
+ (Lorg/springframework/javapoet/TypeName;)L1org/springframework/javapoet/WildcardTypeName;
 
 lowerBounds
  Ljava/util/List<Lorg/springframework/javapoet/TypeName;>;
@@ -31,4 +31,4 @@ annotated
  (Ljava/util/List<Lorg/springframework/javapoet/AnnotationSpec;>;)Lorg/springframework/javapoet/WildcardTypeName;
 withoutAnnotations
  ()Lorg/springframework/javapoet/TypeName;
- ()Lorg/springframework/javapoet/TypeName;
+ ()L1org/springframework/javapoet/TypeName; # @Inherited(org.springframework.javapoet.TypeName)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.eea
index c2fd59ac97..ce1fd0ace2 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.eea
@@ -6,13 +6,13 @@ logger
 
 createEndpoint
  (Ljavax/transaction/xa/XAResource;)Ljakarta/resource/spi/endpoint/MessageEndpoint;
- (Ljavax/transaction/xa/XAResource;)Ljakarta/resource/spi/endpoint/MessageEndpoint;
+ (Ljavax/transaction/xa/XAResource;)L1jakarta/resource/spi/endpoint/MessageEndpoint;
 createEndpoint
  (Ljavax/transaction/xa/XAResource;J)Ljakarta/resource/spi/endpoint/MessageEndpoint;
- (Ljavax/transaction/xa/XAResource;J)Ljakarta/resource/spi/endpoint/MessageEndpoint;
+ (Ljavax/transaction/xa/XAResource;J)L1jakarta/resource/spi/endpoint/MessageEndpoint;
 createEndpointInternal
  ()Lorg/springframework/jca/endpoint/AbstractMessageEndpointFactory$AbstractMessageEndpoint;
- ()Lorg/springframework/jca/endpoint/AbstractMessageEndpointFactory$AbstractMessageEndpoint;
+ ()L1org/springframework/jca/endpoint/AbstractMessageEndpointFactory$AbstractMessageEndpoint;
 getActivationName
  ()Ljava/lang/String;
  ()L0java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jca/endpoint/GenericMessageEndpointFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jca/endpoint/GenericMessageEndpointFactory.eea
index 938e559b8e..d862fecbba 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jca/endpoint/GenericMessageEndpointFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jca/endpoint/GenericMessageEndpointFactory.eea
@@ -2,10 +2,10 @@ class org/springframework/jca/endpoint/GenericMessageEndpointFactory
 
 createEndpoint
  (Ljavax/transaction/xa/XAResource;)Ljakarta/resource/spi/endpoint/MessageEndpoint;
- (Ljavax/transaction/xa/XAResource;)Ljakarta/resource/spi/endpoint/MessageEndpoint;
+ (Ljavax/transaction/xa/XAResource;)L1jakarta/resource/spi/endpoint/MessageEndpoint; # @Inherited(org.springframework.jca.endpoint.AbstractMessageEndpointFactory)
 createEndpointInternal
  ()Lorg/springframework/jca/endpoint/AbstractMessageEndpointFactory$AbstractMessageEndpoint;
- ()Lorg/springframework/jca/endpoint/AbstractMessageEndpointFactory$AbstractMessageEndpoint;
+ ()L1org/springframework/jca/endpoint/AbstractMessageEndpointFactory$AbstractMessageEndpoint; # @Inherited(org.springframework.jca.endpoint.AbstractMessageEndpointFactory)
 getMessageListener
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jca/support/ResourceAdapterFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jca/support/ResourceAdapterFactoryBean.eea
index 74c7f7d475..0d246a3fdc 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jca/support/ResourceAdapterFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jca/support/ResourceAdapterFactoryBean.eea
@@ -9,7 +9,7 @@ getObject
  ()L0jakarta/resource/spi/ResourceAdapter;
 getObjectType
  ()Ljava/lang/Class<+Ljakarta/resource/spi/ResourceAdapter;>;
- ()Ljava/lang/Class<+Ljakarta/resource/spi/ResourceAdapter;>;
+ ()L1java/lang/Class<+Ljakarta/resource/spi/ResourceAdapter;>;
 setBootstrapContext
  (Ljakarta/resource/spi/BootstrapContext;)V
  (Ljakarta/resource/spi/BootstrapContext;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jca/support/SimpleBootstrapContext.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jca/support/SimpleBootstrapContext.eea
index 5a8e4b22e4..90297e3d5c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jca/support/SimpleBootstrapContext.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jca/support/SimpleBootstrapContext.eea
@@ -11,7 +11,7 @@ class org/springframework/jca/support/SimpleBootstrapContext
  (Ljakarta/resource/spi/work/WorkManager;Ljakarta/resource/spi/XATerminator;Ljakarta/transaction/TransactionSynchronizationRegistry;)V
 createTimer
  ()Ljava/util/Timer;
- ()Ljava/util/Timer;
+ ()L1java/util/Timer;
 getTransactionSynchronizationRegistry
  ()Ljakarta/transaction/TransactionSynchronizationRegistry;
  ()L0jakarta/transaction/TransactionSynchronizationRegistry;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/config/SortedResourcesFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/config/SortedResourcesFactoryBean.eea
index 7f84992a4c..22119a8dca 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/config/SortedResourcesFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/config/SortedResourcesFactoryBean.eea
@@ -12,10 +12,10 @@ super org/springframework/beans/factory/config/AbstractFactoryBean
  (Lorg/springframework/core/io/ResourceLoader;Ljava/util/List<Ljava/lang/String;>;)V
 createInstance
  ()[Lorg/springframework/core/io/Resource;
- ()[Lorg/springframework/core/io/Resource;
+ ()[1Lorg/springframework/core/io/Resource;
 getObjectType
  ()Ljava/lang/Class<+[Lorg/springframework/core/io/Resource;>;
- ()Ljava/lang/Class<+[Lorg/springframework/core/io/Resource;>;
+ ()L1java/lang/Class<+[Lorg/springframework/core/io/Resource;>;
 setResourceLoader
  (Lorg/springframework/core/io/ResourceLoader;)V
  (Lorg/springframework/core/io/ResourceLoader;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/BeanPropertyRowMapper.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/BeanPropertyRowMapper.eea
index ae091cfe08..95c27f2255 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/BeanPropertyRowMapper.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/BeanPropertyRowMapper.eea
@@ -8,7 +8,7 @@ super org/springframework/jdbc/core/RowMapper
 
 newInstance
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/jdbc/core/BeanPropertyRowMapper<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/jdbc/core/BeanPropertyRowMapper<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1org/springframework/jdbc/core/BeanPropertyRowMapper<TT;>;
 newInstance
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Lorg/springframework/core/convert/ConversionService;)Lorg/springframework/jdbc/core/BeanPropertyRowMapper<TT;>;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Lorg/springframework/core/convert/ConversionService;)Lorg/springframework/jdbc/core/BeanPropertyRowMapper<TT;>;
@@ -64,4 +64,4 @@ suppressProperty
  (Ljava/lang/String;)V
 underscoreName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/CallableStatementCreator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/CallableStatementCreator.eea
index b1e3cb2d9d..a0d8bc5f93 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/CallableStatementCreator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/CallableStatementCreator.eea
@@ -2,4 +2,4 @@ class org/springframework/jdbc/core/CallableStatementCreator
 
 createCallableStatement
  (Ljava/sql/Connection;)Ljava/sql/CallableStatement;
- (Ljava/sql/Connection;)Ljava/sql/CallableStatement;
+ (Ljava/sql/Connection;)L1java/sql/CallableStatement;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/CallableStatementCreatorFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/CallableStatementCreatorFactory.eea
index a91f3c90a6..dba5683f21 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/CallableStatementCreatorFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/CallableStatementCreatorFactory.eea
@@ -17,4 +17,4 @@ newCallableStatementCreator
  (Ljava/util/Map<Ljava/lang/String;*>;)Lorg/springframework/jdbc/core/CallableStatementCreator;
 newCallableStatementCreator
  (Lorg/springframework/jdbc/core/ParameterMapper;)Lorg/springframework/jdbc/core/CallableStatementCreator;
- (Lorg/springframework/jdbc/core/ParameterMapper;)Lorg/springframework/jdbc/core/CallableStatementCreator;
+ (Lorg/springframework/jdbc/core/ParameterMapper;)L1org/springframework/jdbc/core/CallableStatementCreator;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/ColumnMapRowMapper.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/ColumnMapRowMapper.eea
index 9c360f405b..2b3e4f0a80 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/ColumnMapRowMapper.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/ColumnMapRowMapper.eea
@@ -6,7 +6,7 @@ super org/springframework/jdbc/core/RowMapper
 
 createColumnMap
  (I)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- (I)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ (I)L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 getColumnKey
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/DataClassRowMapper.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/DataClassRowMapper.eea
index 585189bb71..fbe5892ea9 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/DataClassRowMapper.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/DataClassRowMapper.eea
@@ -8,7 +8,7 @@ super org/springframework/jdbc/core/BeanPropertyRowMapper
 
 newInstance
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/jdbc/core/DataClassRowMapper<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/jdbc/core/DataClassRowMapper<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1org/springframework/jdbc/core/DataClassRowMapper<TT;>;
 newInstance
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Lorg/springframework/core/convert/ConversionService;)Lorg/springframework/jdbc/core/DataClassRowMapper<TT;>;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Lorg/springframework/core/convert/ConversionService;)Lorg/springframework/jdbc/core/DataClassRowMapper<TT;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/JdbcTemplate.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/JdbcTemplate.eea
index f7257e6c1f..3ebf453df6 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/JdbcTemplate.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/JdbcTemplate.eea
@@ -32,10 +32,10 @@ call
  (Lorg/springframework/jdbc/core/CallableStatementCreator;Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 createConnectionProxy
  (Ljava/sql/Connection;)Ljava/sql/Connection;
- (Ljava/sql/Connection;)Ljava/sql/Connection;
+ (Ljava/sql/Connection;)L1java/sql/Connection;
 createResultsMap
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ ()L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 execute
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
@@ -65,10 +65,10 @@ extractReturnedResults
  (Ljava/sql/CallableStatement;Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;I)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 getColumnMapRowMapper
  ()Lorg/springframework/jdbc/core/RowMapper<Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;>;
- ()Lorg/springframework/jdbc/core/RowMapper<Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;>;
+ ()L1org/springframework/jdbc/core/RowMapper<Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;>;
 getSingleColumnRowMapper
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/jdbc/core/RowMapper<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/jdbc/core/RowMapper<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1org/springframework/jdbc/core/RowMapper<TT;>;
 handleWarnings
  (Ljava/sql/SQLWarning;)V
  (Ljava/sql/SQLWarning;)V
@@ -80,10 +80,10 @@ handleWarnings
  (Ljava/sql/Statement;Ljava/sql/SQLException;)V
 newArgPreparedStatementSetter
  ([Ljava/lang/Object;)Lorg/springframework/jdbc/core/PreparedStatementSetter;
- ([Ljava/lang/Object;)Lorg/springframework/jdbc/core/PreparedStatementSetter;
+ ([Ljava/lang/Object;)L1org/springframework/jdbc/core/PreparedStatementSetter;
 newArgTypePreparedStatementSetter
  ([Ljava/lang/Object;[I)Lorg/springframework/jdbc/core/PreparedStatementSetter;
- ([Ljava/lang/Object;[I)Lorg/springframework/jdbc/core/PreparedStatementSetter;
+ ([Ljava/lang/Object;[I)L1org/springframework/jdbc/core/PreparedStatementSetter;
 processResultSet
  (Ljava/sql/ResultSet;Lorg/springframework/jdbc/core/ResultSetSupportingSqlParameter;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
  (Ljava/sql/ResultSet;Lorg/springframework/jdbc/core/ResultSetSupportingSqlParameter;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
@@ -224,7 +224,7 @@ queryForStream
  <T:Ljava/lang/Object;>(Lorg/springframework/jdbc/core/PreparedStatementCreator;Lorg/springframework/jdbc/core/RowMapper<TT;>;)Ljava/util/stream/Stream<TT;>;
 translateException
  (Ljava/lang/String;Ljava/lang/String;Ljava/sql/SQLException;)Lorg/springframework/dao/DataAccessException;
- (Ljava/lang/String;Ljava/lang/String;Ljava/sql/SQLException;)Lorg/springframework/dao/DataAccessException;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/sql/SQLException;)L1org/springframework/dao/DataAccessException;
 update
  (Ljava/lang/String;)I
  (Ljava/lang/String;)I
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/ParameterMapper.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/ParameterMapper.eea
index 1c9e266887..58b69fae36 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/ParameterMapper.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/ParameterMapper.eea
@@ -2,4 +2,4 @@ class org/springframework/jdbc/core/ParameterMapper
 
 createMap
  (Ljava/sql/Connection;)Ljava/util/Map<Ljava/lang/String;*>;
- (Ljava/sql/Connection;)Ljava/util/Map<Ljava/lang/String;*>;
+ (Ljava/sql/Connection;)L1java/util/Map<Ljava/lang/String;*>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/PreparedStatementCreator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/PreparedStatementCreator.eea
index 64916a6c4b..7d0675f604 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/PreparedStatementCreator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/PreparedStatementCreator.eea
@@ -2,4 +2,4 @@ class org/springframework/jdbc/core/PreparedStatementCreator
 
 createPreparedStatement
  (Ljava/sql/Connection;)Ljava/sql/PreparedStatement;
- (Ljava/sql/Connection;)Ljava/sql/PreparedStatement;
+ (Ljava/sql/Connection;)L1java/sql/PreparedStatement;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/RowMapperResultSetExtractor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/RowMapperResultSetExtractor.eea
index d99faed171..76124168ca 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/RowMapperResultSetExtractor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/RowMapperResultSetExtractor.eea
@@ -14,4 +14,4 @@ super org/springframework/jdbc/core/ResultSetExtractor
  (Lorg/springframework/jdbc/core/RowMapper<TT;>;I)V
 extractData
  (Ljava/sql/ResultSet;)Ljava/util/List<TT;>;
- (Ljava/sql/ResultSet;)Ljava/util/List<TT;>;
+ (Ljava/sql/ResultSet;)L1java/util/List<TT;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/SingleColumnRowMapper.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/SingleColumnRowMapper.eea
index f947dc3a99..2faed8e146 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/SingleColumnRowMapper.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/SingleColumnRowMapper.eea
@@ -8,7 +8,7 @@ super org/springframework/jdbc/core/RowMapper
 
 newInstance
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/jdbc/core/SingleColumnRowMapper<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/jdbc/core/SingleColumnRowMapper<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1org/springframework/jdbc/core/SingleColumnRowMapper<TT;>;
 newInstance
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Lorg/springframework/core/convert/ConversionService;)Lorg/springframework/jdbc/core/SingleColumnRowMapper<TT;>;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;Lorg/springframework/core/convert/ConversionService;)Lorg/springframework/jdbc/core/SingleColumnRowMapper<TT;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/SqlRowSetResultSetExtractor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/SqlRowSetResultSetExtractor.eea
index bfd9c27a89..7725204f4b 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/SqlRowSetResultSetExtractor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/SqlRowSetResultSetExtractor.eea
@@ -6,7 +6,7 @@ super org/springframework/jdbc/core/ResultSetExtractor
 
 createSqlRowSet
  (Ljava/sql/ResultSet;)Lorg/springframework/jdbc/support/rowset/SqlRowSet;
- (Ljava/sql/ResultSet;)Lorg/springframework/jdbc/support/rowset/SqlRowSet;
+ (Ljava/sql/ResultSet;)L1org/springframework/jdbc/support/rowset/SqlRowSet;
 extractData
  (Ljava/sql/ResultSet;)Lorg/springframework/jdbc/support/rowset/SqlRowSet;
  (Ljava/sql/ResultSet;)Lorg/springframework/jdbc/support/rowset/SqlRowSet;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/CallMetaDataContext.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/CallMetaDataContext.eea
index 7e9c5f1b32..aec185a609 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/CallMetaDataContext.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/CallMetaDataContext.eea
@@ -6,13 +6,13 @@ logger
 
 createCallString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 createParameterBinding
  (Lorg/springframework/jdbc/core/SqlParameter;)Ljava/lang/String;
- (Lorg/springframework/jdbc/core/SqlParameter;)Ljava/lang/String;
+ (Lorg/springframework/jdbc/core/SqlParameter;)L1java/lang/String;
 createReturnResultSetParameter
  (Ljava/lang/String;Lorg/springframework/jdbc/core/RowMapper<*>;)Lorg/springframework/jdbc/core/SqlParameter;
- (Ljava/lang/String;Lorg/springframework/jdbc/core/RowMapper<*>;)Lorg/springframework/jdbc/core/SqlParameter;
+ (Ljava/lang/String;Lorg/springframework/jdbc/core/RowMapper<*>;)L1org/springframework/jdbc/core/SqlParameter;
 getCallParameters
  ()Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;
  ()Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;
@@ -21,7 +21,7 @@ getCatalogName
  ()L0java/lang/String;
 getFunctionReturnName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getLimitedInParameterNames
  ()Ljava/util/Set<Ljava/lang/String;>;
  ()Ljava/util/Set<Ljava/lang/String;>;
@@ -54,7 +54,7 @@ processParameters
  (Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;)V
 reconcileParameters
  (Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;)Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;
- (Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;)Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;
+ (Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;)L1java/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;
 setCatalogName
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/CallMetaDataProvider.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/CallMetaDataProvider.eea
index fdc7f6d9c5..56a988e121 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/CallMetaDataProvider.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/CallMetaDataProvider.eea
@@ -8,13 +8,13 @@ catalogNameToUse
  (Ljava/lang/String;)L0java/lang/String;
 createDefaultInOutParameter
  (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
- (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
+ (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)L1org/springframework/jdbc/core/SqlParameter;
 createDefaultInParameter
  (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
- (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
+ (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)L1org/springframework/jdbc/core/SqlParameter;
 createDefaultOutParameter
  (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
- (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
+ (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)L1org/springframework/jdbc/core/SqlParameter;
 getCallParameterMetaData
  ()Ljava/util/List<Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;>;
  ()Ljava/util/List<Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.eea
index bb6ff51c93..579b380301 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.eea
@@ -9,4 +9,4 @@ supportedDatabaseProductsForProcedures
 
 createMetaDataProvider
  (Ljavax/sql/DataSource;Lorg/springframework/jdbc/core/metadata/CallMetaDataContext;)Lorg/springframework/jdbc/core/metadata/CallMetaDataProvider;
- (Ljavax/sql/DataSource;Lorg/springframework/jdbc/core/metadata/CallMetaDataContext;)Lorg/springframework/jdbc/core/metadata/CallMetaDataProvider;
+ (Ljavax/sql/DataSource;Lorg/springframework/jdbc/core/metadata/CallMetaDataContext;)L1org/springframework/jdbc/core/metadata/CallMetaDataProvider;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.eea
index 238db364af..4df4e6b549 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.eea
@@ -15,13 +15,13 @@ catalogNameToUse
  (Ljava/lang/String;)L0java/lang/String; # @Inherited(org.springframework.jdbc.core.metadata.CallMetaDataProvider)
 createDefaultInOutParameter
  (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
- (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
+ (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)L1org/springframework/jdbc/core/SqlParameter; # @Inherited(org.springframework.jdbc.core.metadata.CallMetaDataProvider)
 createDefaultInParameter
  (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
- (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
+ (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)L1org/springframework/jdbc/core/SqlParameter; # @Inherited(org.springframework.jdbc.core.metadata.CallMetaDataProvider)
 createDefaultOutParameter
  (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
- (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
+ (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)L1org/springframework/jdbc/core/SqlParameter; # @Inherited(org.springframework.jdbc.core.metadata.CallMetaDataProvider)
 getCallParameterMetaData
  ()Ljava/util/List<Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;>;
  ()Ljava/util/List<Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;>;
@@ -42,7 +42,7 @@ metaDataSchemaNameToUse
  (Ljava/lang/String;)L0java/lang/String; # @Inherited(org.springframework.jdbc.core.metadata.CallMetaDataProvider)
 namedParameterBindingToUse
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 parameterNameToUse
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)L0java/lang/String; # @Inherited(org.springframework.jdbc.core.metadata.CallMetaDataProvider)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider.eea
index d8e61c1497..53bf7e3b5c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider.eea
@@ -5,7 +5,7 @@ class org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider
  (Ljava/sql/DatabaseMetaData;)V
 createDefaultOutParameter
  (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
- (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
+ (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)L1org/springframework/jdbc/core/SqlParameter; # @Inherited(org.springframework.jdbc.core.metadata.GenericCallMetaDataProvider)
 metaDataCatalogNameToUse
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)L0java/lang/String; # @Inherited(org.springframework.jdbc.core.metadata.GenericCallMetaDataProvider)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/PostgresCallMetaDataProvider.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/PostgresCallMetaDataProvider.eea
index 45e31a4b8f..8ffdf575f4 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/PostgresCallMetaDataProvider.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/PostgresCallMetaDataProvider.eea
@@ -8,7 +8,7 @@ byPassReturnParameter
  (Ljava/lang/String;)Z
 createDefaultOutParameter
  (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
- (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)Lorg/springframework/jdbc/core/SqlParameter;
+ (Ljava/lang/String;Lorg/springframework/jdbc/core/metadata/CallParameterMetaData;)L1org/springframework/jdbc/core/SqlParameter; # @Inherited(org.springframework.jdbc.core.metadata.GenericCallMetaDataProvider)
 metaDataSchemaNameToUse
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)L0java/lang/String; # @Inherited(org.springframework.jdbc.core.metadata.GenericCallMetaDataProvider)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/SqlServerCallMetaDataProvider.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/SqlServerCallMetaDataProvider.eea
index 9b153404cc..e8a27dda8a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/SqlServerCallMetaDataProvider.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/SqlServerCallMetaDataProvider.eea
@@ -8,7 +8,7 @@ byPassReturnParameter
  (Ljava/lang/String;)Z
 namedParameterBindingToUse
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String; # @Inherited(org.springframework.jdbc.core.metadata.GenericCallMetaDataProvider)
 parameterNameToUse
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)L0java/lang/String; # @Inherited(org.springframework.jdbc.core.metadata.GenericCallMetaDataProvider)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/SybaseCallMetaDataProvider.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/SybaseCallMetaDataProvider.eea
index 45dff80343..0860730e06 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/SybaseCallMetaDataProvider.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/SybaseCallMetaDataProvider.eea
@@ -8,7 +8,7 @@ byPassReturnParameter
  (Ljava/lang/String;)Z
 namedParameterBindingToUse
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String; # @Inherited(org.springframework.jdbc.core.metadata.GenericCallMetaDataProvider)
 parameterNameToUse
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)L0java/lang/String; # @Inherited(org.springframework.jdbc.core.metadata.GenericCallMetaDataProvider)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/TableMetaDataContext.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/TableMetaDataContext.eea
index 593404b886..a2acd8f399 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/TableMetaDataContext.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/TableMetaDataContext.eea
@@ -6,10 +6,10 @@ logger
 
 createInsertString
  ([Ljava/lang/String;)Ljava/lang/String;
- ([Ljava/lang/String;)Ljava/lang/String;
+ ([Ljava/lang/String;)L1java/lang/String;
 createInsertTypes
  ()[I
- ()[I
+ ()[1I
 getCatalogName
  ()Ljava/lang/String;
  ()L0java/lang/String;
@@ -27,16 +27,16 @@ getTableName
  ()L0java/lang/String;
 matchInParameterValuesWithInsertColumns
  (Ljava/util/Map<Ljava/lang/String;*>;)Ljava/util/List<Ljava/lang/Object;>;
- (Ljava/util/Map<Ljava/lang/String;*>;)Ljava/util/List<Ljava/lang/Object;>;
+ (Ljava/util/Map<Ljava/lang/String;*>;)L1java/util/List<Ljava/lang/Object;>;
 matchInParameterValuesWithInsertColumns
  (Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)Ljava/util/List<Ljava/lang/Object;>;
- (Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)Ljava/util/List<Ljava/lang/Object;>;
+ (Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)L1java/util/List<Ljava/lang/Object;>;
 processMetaData
  (Ljavax/sql/DataSource;Ljava/util/List<Ljava/lang/String;>;[Ljava/lang/String;)V
  (Ljavax/sql/DataSource;Ljava/util/List<Ljava/lang/String;>;[Ljava/lang/String;)V
 reconcileColumnsToUse
  (Ljava/util/List<Ljava/lang/String;>;[Ljava/lang/String;)Ljava/util/List<Ljava/lang/String;>;
- (Ljava/util/List<Ljava/lang/String;>;[Ljava/lang/String;)Ljava/util/List<Ljava/lang/String;>;
+ (Ljava/util/List<Ljava/lang/String;>;[Ljava/lang/String;)L1java/util/List<Ljava/lang/String;>;
 setCatalogName
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/TableMetaDataProviderFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/TableMetaDataProviderFactory.eea
index 07afe2f27c..ba18064e20 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/TableMetaDataProviderFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/metadata/TableMetaDataProviderFactory.eea
@@ -2,4 +2,4 @@ class org/springframework/jdbc/core/metadata/TableMetaDataProviderFactory
 
 createMetaDataProvider
  (Ljavax/sql/DataSource;Lorg/springframework/jdbc/core/metadata/TableMetaDataContext;)Lorg/springframework/jdbc/core/metadata/TableMetaDataProvider;
- (Ljavax/sql/DataSource;Lorg/springframework/jdbc/core/metadata/TableMetaDataContext;)Lorg/springframework/jdbc/core/metadata/TableMetaDataProvider;
+ (Ljavax/sql/DataSource;Lorg/springframework/jdbc/core/metadata/TableMetaDataContext;)L1org/springframework/jdbc/core/metadata/TableMetaDataProvider;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.eea
index 8ffae21a2c..3b5b271ca9 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.eea
@@ -44,7 +44,7 @@ getPreparedStatementCreator
  (Ljava/lang/String;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;Ljava/util/function/Consumer<Lorg/springframework/jdbc/core/PreparedStatementCreatorFactory;>;)Lorg/springframework/jdbc/core/PreparedStatementCreator;
 getPreparedStatementCreatorFactory
  (Lorg/springframework/jdbc/core/namedparam/ParsedSql;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)Lorg/springframework/jdbc/core/PreparedStatementCreatorFactory;
- (Lorg/springframework/jdbc/core/namedparam/ParsedSql;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)Lorg/springframework/jdbc/core/PreparedStatementCreatorFactory;
+ (Lorg/springframework/jdbc/core/namedparam/ParsedSql;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)L1org/springframework/jdbc/core/PreparedStatementCreatorFactory;
 query
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Lorg/springframework/jdbc/core/RowCallbackHandler;)V
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;Lorg/springframework/jdbc/core/RowCallbackHandler;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/namedparam/NamedParameterUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/namedparam/NamedParameterUtils.eea
index ebb41f9cc3..5b4d097a10 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/namedparam/NamedParameterUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/namedparam/NamedParameterUtils.eea
@@ -2,19 +2,19 @@ class org/springframework/jdbc/core/namedparam/NamedParameterUtils
 
 buildSqlParameterList
  (Lorg/springframework/jdbc/core/namedparam/ParsedSql;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;
- (Lorg/springframework/jdbc/core/namedparam/ParsedSql;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;
+ (Lorg/springframework/jdbc/core/namedparam/ParsedSql;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)L1java/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;
 buildSqlTypeArray
  (Lorg/springframework/jdbc/core/namedparam/ParsedSql;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)[I
- (Lorg/springframework/jdbc/core/namedparam/ParsedSql;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)[I
+ (Lorg/springframework/jdbc/core/namedparam/ParsedSql;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)[1I
 buildValueArray
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)[Ljava/lang/Object;
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)[Ljava/lang/Object;
 buildValueArray
  (Lorg/springframework/jdbc/core/namedparam/ParsedSql;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;)[Ljava/lang/Object;
- (Lorg/springframework/jdbc/core/namedparam/ParsedSql;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;)[Ljava/lang/Object;
+ (Lorg/springframework/jdbc/core/namedparam/ParsedSql;Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;Ljava/util/List<Lorg/springframework/jdbc/core/SqlParameter;>;)[1Ljava/lang/Object;
 parseSqlStatement
  (Ljava/lang/String;)Lorg/springframework/jdbc/core/namedparam/ParsedSql;
- (Ljava/lang/String;)Lorg/springframework/jdbc/core/namedparam/ParsedSql;
+ (Ljava/lang/String;)L1org/springframework/jdbc/core/namedparam/ParsedSql;
 parseSqlStatementIntoString
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.eea
index 1d40ac49e3..d517f46b65 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.eea
@@ -2,16 +2,16 @@ class org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils
 
 createBatch
  (Ljava/util/Collection<*>;)[Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;
- (Ljava/util/Collection<*>;)[Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;
+ (Ljava/util/Collection<*>;)[1Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;
 createBatch
  ([Ljava/lang/Object;)[Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;
- ([Ljava/lang/Object;)[Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;
+ ([Ljava/lang/Object;)[1Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;
 createBatch
  ([Ljava/util/Map<Ljava/lang/String;*>;)[Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;
- ([Ljava/util/Map<Ljava/lang/String;*>;)[Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;
+ ([Ljava/util/Map<Ljava/lang/String;*>;)[1Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;
 extractCaseInsensitiveParameterNames
  (Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
- (Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
+ (Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;)L1java/util/Map<Ljava/lang/String;Ljava/lang/String;>;
 getTypedValue
  (Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;Ljava/lang/String;)Ljava/lang/Object;
  (Lorg/springframework/jdbc/core/namedparam/SqlParameterSource;Ljava/lang/String;)L0java/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/simple/JdbcClient$MappedQuerySpec.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/simple/JdbcClient$MappedQuerySpec.eea
index 2ff4673007..c22f5937e2 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/simple/JdbcClient$MappedQuerySpec.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/simple/JdbcClient$MappedQuerySpec.eea
@@ -10,7 +10,7 @@ optional
  ()Ljava/util/Optional<TT;>;
 set
  ()Ljava/util/Set<TT;>;
- ()Ljava/util/Set<TT;>;
+ ()L1java/util/Set<TT;>;
 single
  ()TT;
  ()TT;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/simple/JdbcClient.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/simple/JdbcClient.eea
index 7acad9afba..08a57d3582 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/simple/JdbcClient.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/simple/JdbcClient.eea
@@ -2,13 +2,13 @@ class org/springframework/jdbc/core/simple/JdbcClient
 
 create
  (Ljavax/sql/DataSource;)Lorg/springframework/jdbc/core/simple/JdbcClient;
- (Ljavax/sql/DataSource;)Lorg/springframework/jdbc/core/simple/JdbcClient;
+ (Ljavax/sql/DataSource;)L1org/springframework/jdbc/core/simple/JdbcClient;
 create
  (Lorg/springframework/jdbc/core/JdbcOperations;)Lorg/springframework/jdbc/core/simple/JdbcClient;
- (Lorg/springframework/jdbc/core/JdbcOperations;)Lorg/springframework/jdbc/core/simple/JdbcClient;
+ (Lorg/springframework/jdbc/core/JdbcOperations;)L1org/springframework/jdbc/core/simple/JdbcClient;
 create
  (Lorg/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations;)Lorg/springframework/jdbc/core/simple/JdbcClient;
- (Lorg/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations;)Lorg/springframework/jdbc/core/simple/JdbcClient;
+ (Lorg/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations;)L1org/springframework/jdbc/core/simple/JdbcClient;
 
 sql
  (Ljava/lang/String;)Lorg/springframework/jdbc/core/simple/JdbcClient$StatementSpec;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/support/AbstractSqlTypeValue.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/support/AbstractSqlTypeValue.eea
index 19466bd1de..4023c3bf99 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/support/AbstractSqlTypeValue.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/support/AbstractSqlTypeValue.eea
@@ -2,7 +2,7 @@ class org/springframework/jdbc/core/support/AbstractSqlTypeValue
 
 createTypeValue
  (Ljava/sql/Connection;ILjava/lang/String;)Ljava/lang/Object;
- (Ljava/sql/Connection;ILjava/lang/String;)Ljava/lang/Object;
+ (Ljava/sql/Connection;ILjava/lang/String;)L1java/lang/Object;
 setTypeValue
  (Ljava/sql/PreparedStatement;IILjava/lang/String;)V
  (Ljava/sql/PreparedStatement;IILjava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/support/JdbcDaoSupport.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/support/JdbcDaoSupport.eea
index 1487a7ac40..add9ea180f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/support/JdbcDaoSupport.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/core/support/JdbcDaoSupport.eea
@@ -2,7 +2,7 @@ class org/springframework/jdbc/core/support/JdbcDaoSupport
 
 createJdbcTemplate
  (Ljavax/sql/DataSource;)Lorg/springframework/jdbc/core/JdbcTemplate;
- (Ljavax/sql/DataSource;)Lorg/springframework/jdbc/core/JdbcTemplate;
+ (Ljavax/sql/DataSource;)L1org/springframework/jdbc/core/JdbcTemplate;
 getConnection
  ()Ljava/sql/Connection;
  ()Ljava/sql/Connection;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/AbstractDataSource.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/AbstractDataSource.eea
index 410f4729b7..b6c74fc238 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/AbstractDataSource.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/AbstractDataSource.eea
@@ -6,7 +6,7 @@ logger
 
 getLogWriter
  ()Ljava/io/PrintWriter;
- ()Ljava/io/PrintWriter;
+ ()L1java/io/PrintWriter;
 getParentLogger
  ()Ljava/util/logging/Logger;
  ()Ljava/util/logging/Logger;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/ConnectionHolder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/ConnectionHolder.eea
index b4b0587795..a5e05c1072 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/ConnectionHolder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/ConnectionHolder.eea
@@ -15,7 +15,7 @@ SAVEPOINT_NAME_PREFIX
  (Lorg/springframework/jdbc/datasource/ConnectionHandle;)V
 createSavepoint
  ()Ljava/sql/Savepoint;
- ()Ljava/sql/Savepoint;
+ ()L1java/sql/Savepoint;
 getConnection
  ()Ljava/sql/Connection;
  ()Ljava/sql/Connection;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/DataSourceTransactionManager.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/DataSourceTransactionManager.eea
index 2803ff8319..59e7420e31 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/DataSourceTransactionManager.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/DataSourceTransactionManager.eea
@@ -14,7 +14,7 @@ doCommit
  (Lorg/springframework/transaction/support/DefaultTransactionStatus;)V
 doGetTransaction
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 doResume
  (Ljava/lang/Object;Ljava/lang/Object;)V
  (Ljava/lang/Object;Ljava/lang/Object;)V
@@ -26,7 +26,7 @@ doSetRollbackOnly
  (Lorg/springframework/transaction/support/DefaultTransactionStatus;)V
 doSuspend
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object; # @Inherited(org.springframework.transaction.support.AbstractPlatformTransactionManager)
 getDataSource
  ()Ljavax/sql/DataSource;
  ()L0javax/sql/DataSource;
@@ -47,4 +47,4 @@ setDataSource
  (Ljavax/sql/DataSource;)V
 translateException
  (Ljava/lang/String;Ljava/sql/SQLException;)Ljava/lang/RuntimeException;
- (Ljava/lang/String;Ljava/sql/SQLException;)Ljava/lang/RuntimeException;
+ (Ljava/lang/String;Ljava/sql/SQLException;)L1java/lang/RuntimeException;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/DelegatingDataSource.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/DelegatingDataSource.eea
index b091e945e5..e3981df22f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/DelegatingDataSource.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/DelegatingDataSource.eea
@@ -5,10 +5,10 @@ class org/springframework/jdbc/datasource/DelegatingDataSource
  (Ljavax/sql/DataSource;)V
 createConnectionBuilder
  ()Ljava/sql/ConnectionBuilder;
- ()Ljava/sql/ConnectionBuilder;
+ ()L1java/sql/ConnectionBuilder; # @Inherited(javax.sql.DataSource)
 createShardingKeyBuilder
  ()Ljava/sql/ShardingKeyBuilder;
- ()Ljava/sql/ShardingKeyBuilder;
+ ()L1java/sql/ShardingKeyBuilder; # @Inherited(javax.sql.CommonDataSource)
 getConnection
  ()Ljava/sql/Connection;
  ()Ljava/sql/Connection;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/JdbcTransactionObjectSupport.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/JdbcTransactionObjectSupport.eea
index 40f51ad3fe..d51092ab7d 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/JdbcTransactionObjectSupport.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/JdbcTransactionObjectSupport.eea
@@ -2,7 +2,7 @@ class org/springframework/jdbc/datasource/JdbcTransactionObjectSupport
 
 createSavepoint
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object; # @Inherited(org.springframework.transaction.SavepointManager)
 getConnectionHolder
  ()Lorg/springframework/jdbc/datasource/ConnectionHolder;
  ()Lorg/springframework/jdbc/datasource/ConnectionHolder;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/ShardingKeyDataSourceAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/ShardingKeyDataSourceAdapter.eea
index 5b2a6c769b..fbe4f1eca7 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/ShardingKeyDataSourceAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/ShardingKeyDataSourceAdapter.eea
@@ -8,7 +8,7 @@ class org/springframework/jdbc/datasource/ShardingKeyDataSourceAdapter
  (Ljavax/sql/DataSource;Lorg/springframework/jdbc/datasource/ShardingKeyProvider;)V
 createConnectionBuilder
  ()Ljava/sql/ConnectionBuilder;
- ()Ljava/sql/ConnectionBuilder;
+ ()L1java/sql/ConnectionBuilder; # @Inherited(org.springframework.jdbc.datasource.DelegatingDataSource)
 getConnection
  ()Ljava/sql/Connection;
  ()Ljava/sql/Connection;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.eea
index af79409e96..8f3e8b263a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.eea
@@ -9,7 +9,7 @@ getDataSource
  ()L0javax/sql/DataSource;
 getDatabase
  ()Lorg/springframework/jdbc/datasource/embedded/EmbeddedDatabase;
- ()Lorg/springframework/jdbc/datasource/embedded/EmbeddedDatabase;
+ ()L1org/springframework/jdbc/datasource/embedded/EmbeddedDatabase;
 setDataSourceFactory
  (Lorg/springframework/jdbc/datasource/embedded/DataSourceFactory;)V
  (Lorg/springframework/jdbc/datasource/embedded/DataSourceFactory;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBean.eea
index a14ad78cfe..4df2f26e28 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBean.eea
@@ -9,7 +9,7 @@ getObject
  ()L0javax/sql/DataSource;
 getObjectType
  ()Ljava/lang/Class<+Ljavax/sql/DataSource;>;
- ()Ljava/lang/Class<+Ljavax/sql/DataSource;>;
+ ()L1java/lang/Class<+Ljavax/sql/DataSource;>;
 setDatabaseCleaner
  (Lorg/springframework/jdbc/datasource/init/DatabasePopulator;)V
  (Lorg/springframework/jdbc/datasource/init/DatabasePopulator;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/embedded/OutputStreamFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/embedded/OutputStreamFactory.eea
index 4a01992a5a..da7c6dfb22 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/embedded/OutputStreamFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/embedded/OutputStreamFactory.eea
@@ -2,4 +2,4 @@ class org/springframework/jdbc/datasource/embedded/OutputStreamFactory
 
 getNoopOutputStream
  ()Ljava/io/OutputStream;
- ()Ljava/io/OutputStream;
+ ()L1java/io/OutputStream;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.eea
index 4442fc6fe6..98cff10377 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.eea
@@ -2,10 +2,10 @@ class org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource
 
 createConnectionBuilder
  ()Ljava/sql/ConnectionBuilder;
- ()Ljava/sql/ConnectionBuilder;
+ ()L1java/sql/ConnectionBuilder; # @Inherited(javax.sql.DataSource)
 createShardingKeyBuilder
  ()Ljava/sql/ShardingKeyBuilder;
- ()Ljava/sql/ShardingKeyBuilder;
+ ()L1java/sql/ShardingKeyBuilder; # @Inherited(javax.sql.CommonDataSource)
 determineCurrentLookupKey
  ()Ljava/lang/Object;
  ()L0java/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/object/BatchSqlUpdate.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/object/BatchSqlUpdate.eea
index cd416d2887..c1cd9340ba 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/object/BatchSqlUpdate.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/object/BatchSqlUpdate.eea
@@ -14,7 +14,7 @@ flush
  ()[I
 getRowsAffected
  ()[I
- ()[I
+ ()[1I
 update
  ([Ljava/lang/Object;)I
  ([Ljava/lang/Object;)I
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/object/MappingSqlQueryWithParameters.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/object/MappingSqlQueryWithParameters.eea
index 760a3f1cd1..ab77c7773b 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/object/MappingSqlQueryWithParameters.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/object/MappingSqlQueryWithParameters.eea
@@ -14,4 +14,4 @@ mapRow
  (Ljava/sql/ResultSet;I[Ljava/lang/Object;Ljava/util/Map<**>;)T0T;
 newRowMapper
  ([Ljava/lang/Object;Ljava/util/Map<**>;)Lorg/springframework/jdbc/core/RowMapper<TT;>;
- ([Ljava/lang/Object;Ljava/util/Map<**>;)Lorg/springframework/jdbc/core/RowMapper<TT;>;
+ ([Ljava/lang/Object;Ljava/util/Map<**>;)L1org/springframework/jdbc/core/RowMapper<TT;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/object/UpdatableSqlQuery.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/object/UpdatableSqlQuery.eea
index 8c316c1ead..681f7ec4b2 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/object/UpdatableSqlQuery.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/object/UpdatableSqlQuery.eea
@@ -11,7 +11,7 @@ super org/springframework/jdbc/object/SqlQuery
  (Ljavax/sql/DataSource;Ljava/lang/String;)V
 newRowMapper
  ([Ljava/lang/Object;Ljava/util/Map<**>;)Lorg/springframework/jdbc/core/RowMapper<TT;>;
- ([Ljava/lang/Object;Ljava/util/Map<**>;)Lorg/springframework/jdbc/core/RowMapper<TT;>;
+ ([Ljava/lang/Object;Ljava/util/Map<**>;)L1org/springframework/jdbc/core/RowMapper<TT;>;
 updateRow
  (Ljava/sql/ResultSet;ILjava/util/Map<**>;)TT;
  (Ljava/sql/ResultSet;ILjava/util/Map<**>;)TT;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.eea
index ec6cec5f72..eafca53b3e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.eea
@@ -6,7 +6,7 @@ logger
 
 buildMessage
  (Ljava/lang/String;Ljava/lang/String;Ljava/sql/SQLException;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;Ljava/sql/SQLException;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/sql/SQLException;)L1java/lang/String;
 doTranslate
  (Ljava/lang/String;Ljava/lang/String;Ljava/sql/SQLException;)Lorg/springframework/dao/DataAccessException;
  (Ljava/lang/String;Ljava/lang/String;Ljava/sql/SQLException;)L0org/springframework/dao/DataAccessException;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/JdbcTransactionManager.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/JdbcTransactionManager.eea
index ff7401d0a7..fe79f718e3 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/JdbcTransactionManager.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/JdbcTransactionManager.eea
@@ -14,4 +14,4 @@ setExceptionTranslator
  (Lorg/springframework/jdbc/support/SQLExceptionTranslator;)V
 translateException
  (Ljava/lang/String;Ljava/sql/SQLException;)Ljava/lang/RuntimeException;
- (Ljava/lang/String;Ljava/sql/SQLException;)Ljava/lang/RuntimeException;
+ (Ljava/lang/String;Ljava/sql/SQLException;)L1java/lang/RuntimeException; # @Inherited(org.springframework.jdbc.datasource.DataSourceTransactionManager)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/JdbcUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/JdbcUtils.eea
index f9b91980a6..1e982bcad0 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/JdbcUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/JdbcUtils.eea
@@ -14,10 +14,10 @@ commonDatabaseName
  (Ljava/lang/String;)L0java/lang/String;
 convertPropertyNameToUnderscoreName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 convertUnderscoreNameToPropertyName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 extractDatabaseMetaData
  <T:Ljava/lang/Object;>(Ljavax/sql/DataSource;Ljava/lang/String;)TT;
  <T:Ljava/lang/Object;>(Ljavax/sql/DataSource;Ljava/lang/String;)TT;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/SQLErrorCodesFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/SQLErrorCodesFactory.eea
index 1dfaaf15e4..f2aadcbbea 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/SQLErrorCodesFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/SQLErrorCodesFactory.eea
@@ -16,7 +16,7 @@ getErrorCodes
  (Ljava/lang/String;)Lorg/springframework/jdbc/support/SQLErrorCodes;
 getErrorCodes
  (Ljavax/sql/DataSource;)Lorg/springframework/jdbc/support/SQLErrorCodes;
- (Ljavax/sql/DataSource;)Lorg/springframework/jdbc/support/SQLErrorCodes;
+ (Ljavax/sql/DataSource;)L1org/springframework/jdbc/support/SQLErrorCodes;
 loadResource
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
  (Ljava/lang/String;)L0org/springframework/core/io/Resource;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.eea
index 5751925d8a..bf6b7c9664 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.eea
@@ -11,7 +11,7 @@ getIncrementerName
  ()Ljava/lang/String;
 nextStringValue
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 setDataSource
  (Ljavax/sql/DataSource;)V
  (Ljavax/sql/DataSource;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/AbstractIdentityColumnMaxValueIncrementer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/AbstractIdentityColumnMaxValueIncrementer.eea
index 315bae2e13..1a6914e90e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/AbstractIdentityColumnMaxValueIncrementer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/AbstractIdentityColumnMaxValueIncrementer.eea
@@ -5,7 +5,7 @@ class org/springframework/jdbc/support/incrementer/AbstractIdentityColumnMaxValu
  (Ljavax/sql/DataSource;Ljava/lang/String;Ljava/lang/String;)V
 getDeleteStatement
  ([J)Ljava/lang/String;
- ([J)Ljava/lang/String;
+ ([J)L1java/lang/String;
 getIdentityStatement
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/Db2LuwMaxValueIncrementer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/Db2LuwMaxValueIncrementer.eea
index 79d79420e3..1bda9a5595 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/Db2LuwMaxValueIncrementer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/Db2LuwMaxValueIncrementer.eea
@@ -5,4 +5,4 @@ class org/springframework/jdbc/support/incrementer/Db2LuwMaxValueIncrementer
  (Ljavax/sql/DataSource;Ljava/lang/String;)V
 getSequenceQuery
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/Db2MainframeMaxValueIncrementer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/Db2MainframeMaxValueIncrementer.eea
index d8a3a5e822..047bcf4e86 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/Db2MainframeMaxValueIncrementer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/Db2MainframeMaxValueIncrementer.eea
@@ -5,4 +5,4 @@ class org/springframework/jdbc/support/incrementer/Db2MainframeMaxValueIncrement
  (Ljavax/sql/DataSource;Ljava/lang/String;)V
 getSequenceQuery
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/DerbyMaxValueIncrementer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/DerbyMaxValueIncrementer.eea
index e64ed10cec..4b195f20cb 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/DerbyMaxValueIncrementer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/DerbyMaxValueIncrementer.eea
@@ -11,10 +11,10 @@ getDummyName
  ()Ljava/lang/String;
 getIdentityStatement
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getIncrementStatement
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 setDummyName
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer.eea
index 595f6edd30..9345563f9e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer.eea
@@ -5,4 +5,4 @@ class org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer
  (Ljavax/sql/DataSource;Ljava/lang/String;)V
 getSequenceQuery
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/HanaSequenceMaxValueIncrementer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/HanaSequenceMaxValueIncrementer.eea
index da1bd9b260..e0f4db5bf3 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/HanaSequenceMaxValueIncrementer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/HanaSequenceMaxValueIncrementer.eea
@@ -5,4 +5,4 @@ class org/springframework/jdbc/support/incrementer/HanaSequenceMaxValueIncrement
  (Ljavax/sql/DataSource;Ljava/lang/String;)V
 getSequenceQuery
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/HsqlMaxValueIncrementer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/HsqlMaxValueIncrementer.eea
index 1d56fc4118..aaad7234aa 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/HsqlMaxValueIncrementer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/HsqlMaxValueIncrementer.eea
@@ -5,7 +5,7 @@ class org/springframework/jdbc/support/incrementer/HsqlMaxValueIncrementer
  (Ljavax/sql/DataSource;Ljava/lang/String;Ljava/lang/String;)V
 getIdentityStatement
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getIncrementStatement
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/HsqlSequenceMaxValueIncrementer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/HsqlSequenceMaxValueIncrementer.eea
index 32e223f4f8..88405b4f18 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/HsqlSequenceMaxValueIncrementer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/HsqlSequenceMaxValueIncrementer.eea
@@ -5,4 +5,4 @@ class org/springframework/jdbc/support/incrementer/HsqlSequenceMaxValueIncrement
  (Ljavax/sql/DataSource;Ljava/lang/String;)V
 getSequenceQuery
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/MariaDBSequenceMaxValueIncrementer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/MariaDBSequenceMaxValueIncrementer.eea
index 18832c1dab..1c6986178b 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/MariaDBSequenceMaxValueIncrementer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/MariaDBSequenceMaxValueIncrementer.eea
@@ -5,4 +5,4 @@ class org/springframework/jdbc/support/incrementer/MariaDBSequenceMaxValueIncrem
  (Ljavax/sql/DataSource;Ljava/lang/String;)V
 getSequenceQuery
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/MySQLIdentityColumnMaxValueIncrementer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/MySQLIdentityColumnMaxValueIncrementer.eea
index faaa35a809..1cf82b5c01 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/MySQLIdentityColumnMaxValueIncrementer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/MySQLIdentityColumnMaxValueIncrementer.eea
@@ -5,7 +5,7 @@ class org/springframework/jdbc/support/incrementer/MySQLIdentityColumnMaxValueIn
  (Ljavax/sql/DataSource;Ljava/lang/String;Ljava/lang/String;)V
 getIdentityStatement
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getIncrementStatement
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/OracleSequenceMaxValueIncrementer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/OracleSequenceMaxValueIncrementer.eea
index f446669cf1..1128f44cc6 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/OracleSequenceMaxValueIncrementer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/OracleSequenceMaxValueIncrementer.eea
@@ -5,4 +5,4 @@ class org/springframework/jdbc/support/incrementer/OracleSequenceMaxValueIncreme
  (Ljavax/sql/DataSource;Ljava/lang/String;)V
 getSequenceQuery
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/PostgresSequenceMaxValueIncrementer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/PostgresSequenceMaxValueIncrementer.eea
index 4f43cc0322..eae67d384f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/PostgresSequenceMaxValueIncrementer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/PostgresSequenceMaxValueIncrementer.eea
@@ -5,4 +5,4 @@ class org/springframework/jdbc/support/incrementer/PostgresSequenceMaxValueIncre
  (Ljavax/sql/DataSource;Ljava/lang/String;)V
 getSequenceQuery
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/SqlServerMaxValueIncrementer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/SqlServerMaxValueIncrementer.eea
index 060e07f2a8..3f16931907 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/SqlServerMaxValueIncrementer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/SqlServerMaxValueIncrementer.eea
@@ -5,7 +5,7 @@ class org/springframework/jdbc/support/incrementer/SqlServerMaxValueIncrementer
  (Ljavax/sql/DataSource;Ljava/lang/String;Ljava/lang/String;)V
 getIdentityStatement
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getIncrementStatement
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/SqlServerSequenceMaxValueIncrementer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/SqlServerSequenceMaxValueIncrementer.eea
index feaecd5006..213636ac78 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/SqlServerSequenceMaxValueIncrementer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/SqlServerSequenceMaxValueIncrementer.eea
@@ -5,4 +5,4 @@ class org/springframework/jdbc/support/incrementer/SqlServerSequenceMaxValueIncr
  (Ljavax/sql/DataSource;Ljava/lang/String;)V
 getSequenceQuery
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncrementer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncrementer.eea
index 495998da23..22c2a155ff 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncrementer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncrementer.eea
@@ -5,4 +5,4 @@ class org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncreme
  (Ljavax/sql/DataSource;Ljava/lang/String;Ljava/lang/String;)V
 getIncrementStatement
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.jdbc.support.incrementer.SybaseMaxValueIncrementer)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer.eea
index cc9df47240..939bf2d890 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer.eea
@@ -5,7 +5,7 @@ class org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer
  (Ljavax/sql/DataSource;Ljava/lang/String;Ljava/lang/String;)V
 getIdentityStatement
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getIncrementStatement
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/lob/DefaultLobHandler.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/lob/DefaultLobHandler.eea
index 3b3abe0e4d..92ef79ea5e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/lob/DefaultLobHandler.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/lob/DefaultLobHandler.eea
@@ -21,4 +21,4 @@ getClobAsString
  (Ljava/sql/ResultSet;I)L0java/lang/String; # @Inherited(org.springframework.jdbc.support.lob.LobHandler)
 getLobCreator
  ()Lorg/springframework/jdbc/support/lob/LobCreator;
- ()Lorg/springframework/jdbc/support/lob/LobCreator;
+ ()L1org/springframework/jdbc/support/lob/LobCreator;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.eea
index 8ab9053b85..dc0d665c40 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.eea
@@ -26,16 +26,16 @@ getXmlAsString
  (Ljava/sql/ResultSet;Ljava/lang/String;)L0java/lang/String; # @Inherited(org.springframework.jdbc.support.xml.SqlXmlHandler)
 newSqlXmlValue
  (Ljava/lang/Class<+Ljavax/xml/transform/Result;>;Lorg/springframework/jdbc/support/xml/XmlResultProvider;)Lorg/springframework/jdbc/support/xml/SqlXmlValue;
- (Ljava/lang/Class<+Ljavax/xml/transform/Result;>;Lorg/springframework/jdbc/support/xml/XmlResultProvider;)Lorg/springframework/jdbc/support/xml/SqlXmlValue;
+ (Ljava/lang/Class<+Ljavax/xml/transform/Result;>;Lorg/springframework/jdbc/support/xml/XmlResultProvider;)L1org/springframework/jdbc/support/xml/SqlXmlValue;
 newSqlXmlValue
  (Ljava/lang/String;)Lorg/springframework/jdbc/support/xml/SqlXmlValue;
- (Ljava/lang/String;)Lorg/springframework/jdbc/support/xml/SqlXmlValue;
+ (Ljava/lang/String;)L1org/springframework/jdbc/support/xml/SqlXmlValue;
 newSqlXmlValue
  (Lorg/springframework/jdbc/support/xml/XmlBinaryStreamProvider;)Lorg/springframework/jdbc/support/xml/SqlXmlValue;
- (Lorg/springframework/jdbc/support/xml/XmlBinaryStreamProvider;)Lorg/springframework/jdbc/support/xml/SqlXmlValue;
+ (Lorg/springframework/jdbc/support/xml/XmlBinaryStreamProvider;)L1org/springframework/jdbc/support/xml/SqlXmlValue;
 newSqlXmlValue
  (Lorg/springframework/jdbc/support/xml/XmlCharacterStreamProvider;)Lorg/springframework/jdbc/support/xml/SqlXmlValue;
- (Lorg/springframework/jdbc/support/xml/XmlCharacterStreamProvider;)Lorg/springframework/jdbc/support/xml/SqlXmlValue;
+ (Lorg/springframework/jdbc/support/xml/XmlCharacterStreamProvider;)L1org/springframework/jdbc/support/xml/SqlXmlValue;
 newSqlXmlValue
  (Lorg/w3c/dom/Document;)Lorg/springframework/jdbc/support/xml/SqlXmlValue;
- (Lorg/w3c/dom/Document;)Lorg/springframework/jdbc/support/xml/SqlXmlValue;
+ (Lorg/w3c/dom/Document;)L1org/springframework/jdbc/support/xml/SqlXmlValue;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/MBeanExporter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/MBeanExporter.eea
index 4df1ebd44f..e3efe10481 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/MBeanExporter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/MBeanExporter.eea
@@ -8,10 +8,10 @@ addExcludedBean
  (Ljava/lang/String;)V
 createAndConfigureMBean
  (Ljava/lang/Object;Ljava/lang/String;)Ljavax/management/modelmbean/ModelMBean;
- (Ljava/lang/Object;Ljava/lang/String;)Ljavax/management/modelmbean/ModelMBean;
+ (Ljava/lang/Object;Ljava/lang/String;)L1javax/management/modelmbean/ModelMBean;
 createModelMBean
  ()Ljavax/management/modelmbean/ModelMBean;
- ()Ljavax/management/modelmbean/ModelMBean;
+ ()L1javax/management/modelmbean/ModelMBean;
 getObjectName
  (Ljava/lang/Object;Ljava/lang/String;)Ljavax/management/ObjectName;
  (Ljava/lang/Object;Ljava/lang/String;)Ljavax/management/ObjectName;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/SpringModelMBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/SpringModelMBean.eea
index fb443c624b..8739ff6ec8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/SpringModelMBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/SpringModelMBean.eea
@@ -8,7 +8,7 @@ getAttribute
  (Ljava/lang/String;)Ljava/lang/Object;
 getAttributes
  ([Ljava/lang/String;)Ljavax/management/AttributeList;
- ([Ljava/lang/String;)Ljavax/management/AttributeList;
+ ([Ljava/lang/String;)L1javax/management/AttributeList; # @Inherited(javax.management.modelmbean.RequiredModelMBean)
 invoke
  (Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/String;)Ljava/lang/Object;
@@ -17,7 +17,7 @@ setAttribute
  (Ljavax/management/Attribute;)V
 setAttributes
  (Ljavax/management/AttributeList;)Ljavax/management/AttributeList;
- (Ljavax/management/AttributeList;)Ljavax/management/AttributeList;
+ (Ljavax/management/AttributeList;)L1javax/management/AttributeList; # @Inherited(javax.management.modelmbean.RequiredModelMBean)
 setManagedResource
  (Ljava/lang/Object;Ljava/lang/String;)V
  (Ljava/lang/Object;Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.eea
index 02a31ce32f..0c34ad4a03 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.eea
@@ -2,7 +2,7 @@ class org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAsse
 
 getNotificationInfo
  (Ljava/lang/Object;Ljava/lang/String;)[Ljavax/management/modelmbean/ModelMBeanNotificationInfo;
- (Ljava/lang/Object;Ljava/lang/String;)[Ljavax/management/modelmbean/ModelMBeanNotificationInfo;
+ (Ljava/lang/Object;Ljava/lang/String;)[1Ljavax/management/modelmbean/ModelMBeanNotificationInfo; # @Inherited(org.springframework.jmx.export.assembler.AbstractMBeanInfoAssembler)
 setNotificationInfoMappings
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)V
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.eea
index 997a6337a4..8ed69a340d 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.eea
@@ -17,16 +17,16 @@ getClassToExpose
  (Ljava/lang/Object;)Ljava/lang/Class<*>;
 getConstructorInfo
  (Ljava/lang/Object;Ljava/lang/String;)[Ljavax/management/modelmbean/ModelMBeanConstructorInfo;
- (Ljava/lang/Object;Ljava/lang/String;)[Ljavax/management/modelmbean/ModelMBeanConstructorInfo;
+ (Ljava/lang/Object;Ljava/lang/String;)[1Ljavax/management/modelmbean/ModelMBeanConstructorInfo;
 getDescription
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
 getMBeanInfo
  (Ljava/lang/Object;Ljava/lang/String;)Ljavax/management/modelmbean/ModelMBeanInfo;
- (Ljava/lang/Object;Ljava/lang/String;)Ljavax/management/modelmbean/ModelMBeanInfo;
+ (Ljava/lang/Object;Ljava/lang/String;)L1javax/management/modelmbean/ModelMBeanInfo;
 getNotificationInfo
  (Ljava/lang/Object;Ljava/lang/String;)[Ljavax/management/modelmbean/ModelMBeanNotificationInfo;
- (Ljava/lang/Object;Ljava/lang/String;)[Ljavax/management/modelmbean/ModelMBeanNotificationInfo;
+ (Ljava/lang/Object;Ljava/lang/String;)[1Ljavax/management/modelmbean/ModelMBeanNotificationInfo;
 getOperationInfo
  (Ljava/lang/Object;Ljava/lang/String;)[Ljavax/management/modelmbean/ModelMBeanOperationInfo;
  (Ljava/lang/Object;Ljava/lang/String;)[Ljavax/management/modelmbean/ModelMBeanOperationInfo;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.eea
index e2d98e31d3..45b59f00eb 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.eea
@@ -69,7 +69,7 @@ applyDefaultCurrencyTimeLimit
  (Ljavax/management/Descriptor;)V
 createModelMBeanOperationInfo
  (Ljava/lang/reflect/Method;Ljava/lang/String;Ljava/lang/String;)Ljavax/management/modelmbean/ModelMBeanOperationInfo;
- (Ljava/lang/reflect/Method;Ljava/lang/String;Ljava/lang/String;)Ljavax/management/modelmbean/ModelMBeanOperationInfo;
+ (Ljava/lang/reflect/Method;Ljava/lang/String;Ljava/lang/String;)L1javax/management/modelmbean/ModelMBeanOperationInfo;
 getAttributeDescription
  (Ljava/beans/PropertyDescriptor;Ljava/lang/String;)Ljava/lang/String;
  (Ljava/beans/PropertyDescriptor;Ljava/lang/String;)Ljava/lang/String;
@@ -90,7 +90,7 @@ getOperationInfo
  (Ljava/lang/Object;Ljava/lang/String;)[Ljavax/management/modelmbean/ModelMBeanOperationInfo;
 getOperationParameters
  (Ljava/lang/reflect/Method;Ljava/lang/String;)[Ljavax/management/MBeanParameterInfo;
- (Ljava/lang/reflect/Method;Ljava/lang/String;)[Ljavax/management/MBeanParameterInfo;
+ (Ljava/lang/reflect/Method;Ljava/lang/String;)[1Ljavax/management/MBeanParameterInfo;
 getParameterNameDiscoverer
  ()Lorg/springframework/core/ParameterNameDiscoverer;
  ()L0org/springframework/core/ParameterNameDiscoverer;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.eea
index a3f800e9cc..93da21d9ec 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.eea
@@ -11,16 +11,16 @@ getAttributeDescription
  (Ljava/beans/PropertyDescriptor;Ljava/lang/String;)Ljava/lang/String;
 getDescription
  (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/Object;Ljava/lang/String;)L1java/lang/String;
 getNotificationInfo
  (Ljava/lang/Object;Ljava/lang/String;)[Ljavax/management/modelmbean/ModelMBeanNotificationInfo;
- (Ljava/lang/Object;Ljava/lang/String;)[Ljavax/management/modelmbean/ModelMBeanNotificationInfo;
+ (Ljava/lang/Object;Ljava/lang/String;)[1Ljavax/management/modelmbean/ModelMBeanNotificationInfo; # @Inherited(org.springframework.jmx.export.assembler.AbstractMBeanInfoAssembler)
 getOperationDescription
  (Ljava/lang/reflect/Method;Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/reflect/Method;Ljava/lang/String;)Ljava/lang/String;
 getOperationParameters
  (Ljava/lang/reflect/Method;Ljava/lang/String;)[Ljavax/management/MBeanParameterInfo;
- (Ljava/lang/reflect/Method;Ljava/lang/String;)[Ljavax/management/MBeanParameterInfo;
+ (Ljava/lang/reflect/Method;Ljava/lang/String;)[1Ljavax/management/MBeanParameterInfo; # @Inherited(org.springframework.jmx.export.assembler.AbstractReflectiveMBeanInfoAssembler)
 includeBean
  (Ljava/lang/Class<*>;Ljava/lang/String;)Z
  (Ljava/lang/Class<*>;Ljava/lang/String;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/metadata/JmxMetadataUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/metadata/JmxMetadataUtils.eea
index 9158aa55f6..855432e5bb 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/metadata/JmxMetadataUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jmx/export/metadata/JmxMetadataUtils.eea
@@ -2,4 +2,4 @@ class org/springframework/jmx/export/metadata/JmxMetadataUtils
 
 convertToModelMBeanNotificationInfo
  (Lorg/springframework/jmx/export/metadata/ManagedNotification;)Ljavax/management/modelmbean/ModelMBeanNotificationInfo;
- (Lorg/springframework/jmx/export/metadata/ManagedNotification;)Ljavax/management/modelmbean/ModelMBeanNotificationInfo;
+ (Lorg/springframework/jmx/export/metadata/ManagedNotification;)L1javax/management/modelmbean/ModelMBeanNotificationInfo;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jmx/support/ConnectorServerFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jmx/support/ConnectorServerFactoryBean.eea
index 71af230897..aebf22bdc9 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jmx/support/ConnectorServerFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jmx/support/ConnectorServerFactoryBean.eea
@@ -13,7 +13,7 @@ getObject
  ()L0javax/management/remote/JMXConnectorServer;
 getObjectType
  ()Ljava/lang/Class<+Ljavax/management/remote/JMXConnectorServer;>;
- ()Ljava/lang/Class<+Ljavax/management/remote/JMXConnectorServer;>;
+ ()L1java/lang/Class<+Ljavax/management/remote/JMXConnectorServer;>;
 setEnvironment
  (Ljava/util/Properties;)V
  (Ljava/util/Properties;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jmx/support/JmxUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jmx/support/JmxUtils.eea
index 5a83dba053..077f22b2dc 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jmx/support/JmxUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jmx/support/JmxUtils.eea
@@ -24,7 +24,7 @@ getMXBeanInterface
  (Ljava/lang/Class<*>;)L0java/lang/Class<*>;
 getMethodSignature
  (Ljava/lang/reflect/Method;)[Ljava/lang/String;
- (Ljava/lang/reflect/Method;)[Ljava/lang/String;
+ (Ljava/lang/reflect/Method;)[1Ljava/lang/String;
 isMBean
  (Ljava/lang/Class<*>;)Z
  (Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.eea
index 376d7f8636..d0e344680e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.eea
@@ -9,7 +9,7 @@ getObject
  ()L0javax/management/MBeanServerConnection;
 getObjectType
  ()Ljava/lang/Class<+Ljavax/management/MBeanServerConnection;>;
- ()Ljava/lang/Class<+Ljavax/management/MBeanServerConnection;>;
+ ()L1java/lang/Class<+Ljavax/management/MBeanServerConnection;>;
 setBeanClassLoader
  (Ljava/lang/ClassLoader;)V
  (Ljava/lang/ClassLoader;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jmx/support/MBeanServerFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jmx/support/MBeanServerFactoryBean.eea
index 85b13cd9f4..3ee2c39dd2 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jmx/support/MBeanServerFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jmx/support/MBeanServerFactoryBean.eea
@@ -10,13 +10,13 @@ logger
 
 createMBeanServer
  (Ljava/lang/String;Z)Ljavax/management/MBeanServer;
- (Ljava/lang/String;Z)Ljavax/management/MBeanServer;
+ (Ljava/lang/String;Z)L1javax/management/MBeanServer;
 getObject
  ()Ljavax/management/MBeanServer;
  ()L0javax/management/MBeanServer;
 getObjectType
  ()Ljava/lang/Class<+Ljavax/management/MBeanServer;>;
- ()Ljava/lang/Class<+Ljavax/management/MBeanServer;>;
+ ()L1java/lang/Class<+Ljavax/management/MBeanServer;>;
 locateMBeanServer
  (Ljava/lang/String;)Ljavax/management/MBeanServer;
  (Ljava/lang/String;)Ljavax/management/MBeanServer;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jndi/JndiLocatorDelegate.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jndi/JndiLocatorDelegate.eea
index 38d98ae075..d4bcbab747 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jndi/JndiLocatorDelegate.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jndi/JndiLocatorDelegate.eea
@@ -6,7 +6,7 @@ IGNORE_JNDI_PROPERTY_NAME
 
 createDefaultResourceRefLocator
  ()Lorg/springframework/jndi/JndiLocatorDelegate;
- ()Lorg/springframework/jndi/JndiLocatorDelegate;
+ ()L1org/springframework/jndi/JndiLocatorDelegate;
 
 lookup
  (Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jndi/JndiLocatorSupport.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jndi/JndiLocatorSupport.eea
index 15f0e5850e..b445889265 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jndi/JndiLocatorSupport.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jndi/JndiLocatorSupport.eea
@@ -6,7 +6,7 @@ CONTAINER_PREFIX
 
 convertJndiName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 lookup
  (Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;)Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jndi/JndiObjectFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jndi/JndiObjectFactoryBean.eea
index a8a96b2fd5..d7cdbe9b74 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jndi/JndiObjectFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jndi/JndiObjectFactoryBean.eea
@@ -6,7 +6,7 @@ super org/springframework/beans/factory/FactoryBean
 
 createCompositeInterface
  ([Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
- ([Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
+ ([Ljava/lang/Class<*>;)L1java/lang/Class<*>;
 getObject
  ()Ljava/lang/Object;
  ()L0java/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jndi/JndiTemplate.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jndi/JndiTemplate.eea
index 1dc94a67ab..47ab9d54bb 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jndi/JndiTemplate.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jndi/JndiTemplate.eea
@@ -12,7 +12,7 @@ bind
  (Ljava/lang/String;Ljava/lang/Object;)V
 createInitialContext
  ()Ljavax/naming/Context;
- ()Ljavax/naming/Context;
+ ()L1javax/naming/Context;
 execute
  <T:Ljava/lang/Object;>(Lorg/springframework/jndi/JndiCallback<TT;>;)TT;
  <T:Ljava/lang/Object;>(Lorg/springframework/jndi/JndiCallback<TT;>;)T0T;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/jndi/support/SimpleJndiBeanFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/jndi/support/SimpleJndiBeanFactory.eea
index 5aa3d3e541..55e572da38 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/jndi/support/SimpleJndiBeanFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/jndi/support/SimpleJndiBeanFactory.eea
@@ -8,7 +8,7 @@ containsBean
  (Ljava/lang/String;)Z
 getAliases
  (Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/String;)[1Ljava/lang/String;
 getBean
  (Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;)Ljava/lang/Object;
@@ -26,10 +26,10 @@ getBean
  <T:Ljava/lang/Object;>(Ljava/lang/String;Ljava/lang/Class<TT;>;)TT;
 getBeanProvider
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/beans/factory/ObjectProvider<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/beans/factory/ObjectProvider<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1org/springframework/beans/factory/ObjectProvider<TT;>;
 getBeanProvider
  <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;)Lorg/springframework/beans/factory/ObjectProvider<TT;>;
- <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;)Lorg/springframework/beans/factory/ObjectProvider<TT;>;
+ <T:Ljava/lang/Object;>(Lorg/springframework/core/ResolvableType;)L1org/springframework/beans/factory/ObjectProvider<TT;>;
 getType
  (Ljava/lang/String;)Ljava/lang/Class<*>;
  (Ljava/lang/String;)L0java/lang/Class<*>; # @Inherited(org.springframework.beans.factory.BeanFactory)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/MessageHeaders.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/MessageHeaders.eea
index 57b6c0ed3e..79c41c25ac 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/MessageHeaders.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/MessageHeaders.eea
@@ -71,13 +71,13 @@ keySet
  ()Ljava/util/Set<Ljava/lang/String;>;
 put
  (Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/String;Ljava/lang/Object;)L1java/lang/Object;
 putAll
  (Ljava/util/Map<+Ljava/lang/String;+Ljava/lang/Object;>;)V
  (Ljava/util/Map<+Ljava/lang/String;+Ljava/lang/Object;>;)V
 remove
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/CompositeMessageCondition.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/CompositeMessageCondition.eea
index 913e8ca3eb..c39118301c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/CompositeMessageCondition.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/CompositeMessageCondition.eea
@@ -9,7 +9,7 @@ super org/springframework/messaging/handler/MessageCondition
  ([Lorg/springframework/messaging/handler/MessageCondition<*>;)V
 combine
  (Lorg/springframework/messaging/handler/CompositeMessageCondition;)Lorg/springframework/messaging/handler/CompositeMessageCondition;
- (Lorg/springframework/messaging/handler/CompositeMessageCondition;)Lorg/springframework/messaging/handler/CompositeMessageCondition;
+ (Lorg/springframework/messaging/handler/CompositeMessageCondition;)L1org/springframework/messaging/handler/CompositeMessageCondition;
 compareTo
  (Lorg/springframework/messaging/handler/CompositeMessageCondition;Lorg/springframework/messaging/Message<*>;)I
  (Lorg/springframework/messaging/handler/CompositeMessageCondition;Lorg/springframework/messaging/Message<*>;)I
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/DestinationPatternsMessageCondition.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/DestinationPatternsMessageCondition.eea
index be9d8a62f8..7d3d130a73 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/DestinationPatternsMessageCondition.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/DestinationPatternsMessageCondition.eea
@@ -19,7 +19,7 @@ LOOKUP_DESTINATION_HEADER
  ([Ljava/lang/String;Lorg/springframework/util/RouteMatcher;)V
 combine
  (Lorg/springframework/messaging/handler/DestinationPatternsMessageCondition;)Lorg/springframework/messaging/handler/DestinationPatternsMessageCondition;
- (Lorg/springframework/messaging/handler/DestinationPatternsMessageCondition;)Lorg/springframework/messaging/handler/DestinationPatternsMessageCondition;
+ (Lorg/springframework/messaging/handler/DestinationPatternsMessageCondition;)L1org/springframework/messaging/handler/DestinationPatternsMessageCondition;
 compareTo
  (Lorg/springframework/messaging/handler/DestinationPatternsMessageCondition;Lorg/springframework/messaging/Message<*>;)I
  (Lorg/springframework/messaging/handler/DestinationPatternsMessageCondition;Lorg/springframework/messaging/Message<*>;)I
@@ -34,4 +34,4 @@ getPatterns
  ()Ljava/util/Set<Ljava/lang/String;>;
 getToStringInfix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/HandlerMethod.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/HandlerMethod.eea
index 990d1c847e..9fd47aff83 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/HandlerMethod.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/HandlerMethod.eea
@@ -25,13 +25,13 @@ assertTargetBean
  (Ljava/lang/reflect/Method;Ljava/lang/Object;[Ljava/lang/Object;)V
 createWithResolvedBean
  ()Lorg/springframework/messaging/handler/HandlerMethod;
- ()Lorg/springframework/messaging/handler/HandlerMethod;
+ ()L1org/springframework/messaging/handler/HandlerMethod;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(org.springframework.core.annotation.AnnotatedMethod)
 formatInvokeError
  (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1java/lang/String;
 getBean
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
@@ -49,7 +49,7 @@ getResolvedFromHandlerMethod
  ()L0org/springframework/messaging/handler/HandlerMethod;
 getShortLogMessage
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 setLogger
  (Lorg/apache/commons/logging/Log;)V
  (Lorg/apache/commons/logging/Log;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver.eea
index 9ce2d055c7..77dd150ed4 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver.eea
@@ -5,7 +5,7 @@ class org/springframework/messaging/handler/annotation/reactive/AbstractNamedVal
  (Lorg/springframework/core/convert/ConversionService;Lorg/springframework/beans/factory/config/ConfigurableBeanFactory;)V
 createNamedValueInfo
  (Lorg/springframework/core/MethodParameter;)Lorg/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
- (Lorg/springframework/core/MethodParameter;)Lorg/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
+ (Lorg/springframework/core/MethodParameter;)L1org/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
 handleMissingValue
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/messaging/Message<*>;)V
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/messaging/Message<*>;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/reactive/DestinationVariableMethodArgumentResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/reactive/DestinationVariableMethodArgumentResolver.eea
index b1d879bbbd..25aeb3edcb 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/reactive/DestinationVariableMethodArgumentResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/reactive/DestinationVariableMethodArgumentResolver.eea
@@ -9,7 +9,7 @@ DESTINATION_TEMPLATE_VARIABLES_HEADER
  (Lorg/springframework/core/convert/ConversionService;)V
 createNamedValueInfo
  (Lorg/springframework/core/MethodParameter;)Lorg/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
- (Lorg/springframework/core/MethodParameter;)Lorg/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
+ (Lorg/springframework/core/MethodParameter;)L1org/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver$NamedValueInfo; # @Inherited(org.springframework.messaging.handler.annotation.reactive.AbstractNamedValueMethodArgumentResolver)
 handleMissingValue
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/messaging/Message<*>;)V
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/messaging/Message<*>;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/reactive/HeaderMethodArgumentResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/reactive/HeaderMethodArgumentResolver.eea
index 498e9556e3..16b0501eeb 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/reactive/HeaderMethodArgumentResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/reactive/HeaderMethodArgumentResolver.eea
@@ -5,7 +5,7 @@ class org/springframework/messaging/handler/annotation/reactive/HeaderMethodArgu
  (Lorg/springframework/core/convert/ConversionService;Lorg/springframework/beans/factory/config/ConfigurableBeanFactory;)V
 createNamedValueInfo
  (Lorg/springframework/core/MethodParameter;)Lorg/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
- (Lorg/springframework/core/MethodParameter;)Lorg/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
+ (Lorg/springframework/core/MethodParameter;)L1org/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver$NamedValueInfo; # @Inherited(org.springframework.messaging.handler.annotation.reactive.AbstractNamedValueMethodArgumentResolver)
 handleMissingValue
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/messaging/Message<*>;)V
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/messaging/Message<*>;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.eea
index 4acd49c5b4..edc50e2168 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.eea
@@ -6,7 +6,7 @@ super org/springframework/messaging/handler/invocation/reactive/AbstractMethodMe
 
 createExceptionMethodResolverFor
  (Ljava/lang/Class<*>;)Lorg/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver;
- (Ljava/lang/Class<*>;)Lorg/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver;
+ (Ljava/lang/Class<*>;)L1org/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver; # @Inherited(org.springframework.messaging.handler.invocation.reactive.AbstractMethodMessageHandler)
 getCondition
  (Ljava/lang/reflect/AnnotatedElement;)Lorg/springframework/messaging/handler/CompositeMessageCondition;
  (Ljava/lang/reflect/AnnotatedElement;)L0org/springframework/messaging/handler/CompositeMessageCondition;
@@ -21,7 +21,7 @@ getDestination
  (Lorg/springframework/messaging/Message<*>;)L0org/springframework/util/RouteMatcher$Route; # @Inherited(org.springframework.messaging.handler.invocation.reactive.AbstractMethodMessageHandler)
 getDirectLookupMappings
  (Lorg/springframework/messaging/handler/CompositeMessageCondition;)Ljava/util/Set<Ljava/lang/String;>;
- (Lorg/springframework/messaging/handler/CompositeMessageCondition;)Ljava/util/Set<Ljava/lang/String;>;
+ (Lorg/springframework/messaging/handler/CompositeMessageCondition;)L1java/util/Set<Ljava/lang/String;>;
 getMappingComparator
  (Lorg/springframework/messaging/Message<*>;)Ljava/util/Comparator<Lorg/springframework/messaging/handler/CompositeMessageCondition;>;
  (Lorg/springframework/messaging/Message<*>;)Ljava/util/Comparator<Lorg/springframework/messaging/handler/CompositeMessageCondition;>;
@@ -42,7 +42,7 @@ handleMatch
  (Lorg/springframework/messaging/handler/CompositeMessageCondition;Lorg/springframework/messaging/handler/HandlerMethod;Lorg/springframework/messaging/Message<*>;)Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
 initArgumentResolvers
  ()Ljava/util/List<+Lorg/springframework/messaging/handler/invocation/reactive/HandlerMethodArgumentResolver;>;
- ()Ljava/util/List<+Lorg/springframework/messaging/handler/invocation/reactive/HandlerMethodArgumentResolver;>;
+ ()L1java/util/List<+Lorg/springframework/messaging/handler/invocation/reactive/HandlerMethodArgumentResolver;>;
 initReturnValueHandlers
  ()Ljava/util/List<+Lorg/springframework/messaging/handler/invocation/reactive/HandlerMethodReturnValueHandler;>;
  ()Ljava/util/List<+Lorg/springframework/messaging/handler/invocation/reactive/HandlerMethodReturnValueHandler;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.eea
index ba94264c24..785bfec181 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.eea
@@ -5,7 +5,7 @@ class org/springframework/messaging/handler/annotation/support/AbstractNamedValu
  (Lorg/springframework/core/convert/ConversionService;Lorg/springframework/beans/factory/config/ConfigurableBeanFactory;)V
 createNamedValueInfo
  (Lorg/springframework/core/MethodParameter;)Lorg/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
- (Lorg/springframework/core/MethodParameter;)Lorg/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
+ (Lorg/springframework/core/MethodParameter;)L1org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
 handleMissingValue
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/messaging/Message<*>;)V
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/messaging/Message<*>;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/support/DefaultMessageHandlerMethodFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/support/DefaultMessageHandlerMethodFactory.eea
index c15515235e..36e385c9d3 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/support/DefaultMessageHandlerMethodFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/support/DefaultMessageHandlerMethodFactory.eea
@@ -2,10 +2,10 @@ class org/springframework/messaging/handler/annotation/support/DefaultMessageHan
 
 createInvocableHandlerMethod
  (Ljava/lang/Object;Ljava/lang/reflect/Method;)Lorg/springframework/messaging/handler/invocation/InvocableHandlerMethod;
- (Ljava/lang/Object;Ljava/lang/reflect/Method;)Lorg/springframework/messaging/handler/invocation/InvocableHandlerMethod;
+ (Ljava/lang/Object;Ljava/lang/reflect/Method;)L1org/springframework/messaging/handler/invocation/InvocableHandlerMethod; # @Inherited(org.springframework.messaging.handler.annotation.support.MessageHandlerMethodFactory)
 initArgumentResolvers
  ()Ljava/util/List<Lorg/springframework/messaging/handler/invocation/HandlerMethodArgumentResolver;>;
- ()Ljava/util/List<Lorg/springframework/messaging/handler/invocation/HandlerMethodArgumentResolver;>;
+ ()L1java/util/List<Lorg/springframework/messaging/handler/invocation/HandlerMethodArgumentResolver;>;
 setArgumentResolvers
  (Ljava/util/List<Lorg/springframework/messaging/handler/invocation/HandlerMethodArgumentResolver;>;)V
  (Ljava/util/List<Lorg/springframework/messaging/handler/invocation/HandlerMethodArgumentResolver;>;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/support/DestinationVariableMethodArgumentResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/support/DestinationVariableMethodArgumentResolver.eea
index 92c188daf9..918fa87183 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/support/DestinationVariableMethodArgumentResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/support/DestinationVariableMethodArgumentResolver.eea
@@ -9,7 +9,7 @@ DESTINATION_TEMPLATE_VARIABLES_HEADER
  (Lorg/springframework/core/convert/ConversionService;)V
 createNamedValueInfo
  (Lorg/springframework/core/MethodParameter;)Lorg/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
- (Lorg/springframework/core/MethodParameter;)Lorg/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
+ (Lorg/springframework/core/MethodParameter;)L1org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver$NamedValueInfo; # @Inherited(org.springframework.messaging.handler.annotation.support.AbstractNamedValueMethodArgumentResolver)
 handleMissingValue
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/messaging/Message<*>;)V
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/messaging/Message<*>;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolver.eea
index caab21da2f..6843efd66a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolver.eea
@@ -5,7 +5,7 @@ class org/springframework/messaging/handler/annotation/support/HeaderMethodArgum
  (Lorg/springframework/core/convert/ConversionService;Lorg/springframework/beans/factory/config/ConfigurableBeanFactory;)V
 createNamedValueInfo
  (Lorg/springframework/core/MethodParameter;)Lorg/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
- (Lorg/springframework/core/MethodParameter;)Lorg/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
+ (Lorg/springframework/core/MethodParameter;)L1org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver$NamedValueInfo; # @Inherited(org.springframework.messaging.handler.annotation.support.AbstractNamedValueMethodArgumentResolver)
 handleMissingValue
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/messaging/Message<*>;)V
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/messaging/Message<*>;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/support/MessageHandlerMethodFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/support/MessageHandlerMethodFactory.eea
index 4520ce877d..7b7839baa7 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/support/MessageHandlerMethodFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/annotation/support/MessageHandlerMethodFactory.eea
@@ -2,4 +2,4 @@ class org/springframework/messaging/handler/annotation/support/MessageHandlerMet
 
 createInvocableHandlerMethod
  (Ljava/lang/Object;Ljava/lang/reflect/Method;)Lorg/springframework/messaging/handler/invocation/InvocableHandlerMethod;
- (Ljava/lang/Object;Ljava/lang/reflect/Method;)Lorg/springframework/messaging/handler/invocation/InvocableHandlerMethod;
+ (Ljava/lang/Object;Ljava/lang/reflect/Method;)L1org/springframework/messaging/handler/invocation/InvocableHandlerMethod;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver.eea
index 7999da592c..60bf37fba4 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver.eea
@@ -2,7 +2,7 @@ class org/springframework/messaging/handler/invocation/AbstractExceptionHandlerM
 
 getExceptionsFromMethodSignature
  (Ljava/lang/reflect/Method;)Ljava/util/List<Ljava/lang/Class<+Ljava/lang/Throwable;>;>;
- (Ljava/lang/reflect/Method;)Ljava/util/List<Ljava/lang/Class<+Ljava/lang/Throwable;>;>;
+ (Ljava/lang/reflect/Method;)L1java/util/List<Ljava/lang/Class<+Ljava/lang/Throwable;>;>;
 
 <init>
  (Ljava/util/Map<Ljava/lang/Class<+Ljava/lang/Throwable;>;Ljava/lang/reflect/Method;>;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.eea
index 9775305b80..1d3936ac7e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.eea
@@ -8,10 +8,10 @@ logger
 
 createExceptionHandlerMethodResolverFor
  (Ljava/lang/Class<*>;)Lorg/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver;
- (Ljava/lang/Class<*>;)Lorg/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver;
+ (Ljava/lang/Class<*>;)L1org/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver;
 createHandlerMethod
  (Ljava/lang/Object;Ljava/lang/reflect/Method;)Lorg/springframework/messaging/handler/HandlerMethod;
- (Ljava/lang/Object;Ljava/lang/reflect/Method;)Lorg/springframework/messaging/handler/HandlerMethod;
+ (Ljava/lang/Object;Ljava/lang/reflect/Method;)L1org/springframework/messaging/handler/HandlerMethod;
 detectHandlerMethods
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.eea
index 33111455de..ce26a74609 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.eea
@@ -8,7 +8,7 @@ logger
 
 createExceptionMethodResolverFor
  (Ljava/lang/Class<*>;)Lorg/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver;
- (Ljava/lang/Class<*>;)Lorg/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver;
+ (Ljava/lang/Class<*>;)L1org/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver;
 detectHandlerMethods
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
@@ -26,7 +26,7 @@ getArgumentResolvers
  ()Lorg/springframework/messaging/handler/invocation/reactive/HandlerMethodArgumentResolverComposite;
 getBeanName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getDestination
  (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/util/RouteMatcher$Route;
  (Lorg/springframework/messaging/Message<*>;)L0org/springframework/util/RouteMatcher$Route;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/DefaultMetadataExtractor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/DefaultMetadataExtractor.eea
index 476d3d960e..0b0a49e748 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/DefaultMetadataExtractor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/DefaultMetadataExtractor.eea
@@ -8,7 +8,7 @@ class org/springframework/messaging/rsocket/DefaultMetadataExtractor
  ([Lorg/springframework/core/codec/Decoder<*>;)V
 extract
  (Lio/rsocket/Payload;Lorg/springframework/util/MimeType;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- (Lio/rsocket/Payload;Lorg/springframework/util/MimeType;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ (Lio/rsocket/Payload;Lorg/springframework/util/MimeType;)L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 getDecoders
  ()Ljava/util/List<+Lorg/springframework/core/codec/Decoder<*>;>;
  ()Ljava/util/List<+Lorg/springframework/core/codec/Decoder<*>;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/PayloadUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/PayloadUtils.eea
index 2448db1bd4..40f0a87c43 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/PayloadUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/PayloadUtils.eea
@@ -2,10 +2,10 @@ class org/springframework/messaging/rsocket/PayloadUtils
 
 createPayload
  (Lorg/springframework/core/io/buffer/DataBuffer;)Lio/rsocket/Payload;
- (Lorg/springframework/core/io/buffer/DataBuffer;)Lio/rsocket/Payload;
+ (Lorg/springframework/core/io/buffer/DataBuffer;)L1io/rsocket/Payload;
 createPayload
  (Lorg/springframework/core/io/buffer/DataBuffer;Lorg/springframework/core/io/buffer/DataBuffer;)Lio/rsocket/Payload;
- (Lorg/springframework/core/io/buffer/DataBuffer;Lorg/springframework/core/io/buffer/DataBuffer;)Lio/rsocket/Payload;
+ (Lorg/springframework/core/io/buffer/DataBuffer;Lorg/springframework/core/io/buffer/DataBuffer;)L1io/rsocket/Payload;
 retainDataAndReleasePayload
  (Lio/rsocket/Payload;Lorg/springframework/core/io/buffer/DataBufferFactory;)Lorg/springframework/core/io/buffer/DataBuffer;
  (Lio/rsocket/Payload;Lorg/springframework/core/io/buffer/DataBufferFactory;)Lorg/springframework/core/io/buffer/DataBuffer;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/RSocketRequester.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/RSocketRequester.eea
index a76ed4f230..06796dc138 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/RSocketRequester.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/RSocketRequester.eea
@@ -2,10 +2,10 @@ class org/springframework/messaging/rsocket/RSocketRequester
 
 builder
  ()Lorg/springframework/messaging/rsocket/RSocketRequester$Builder;
- ()Lorg/springframework/messaging/rsocket/RSocketRequester$Builder;
+ ()L1org/springframework/messaging/rsocket/RSocketRequester$Builder;
 wrap
  (Lio/rsocket/RSocket;Lorg/springframework/util/MimeType;Lorg/springframework/util/MimeType;Lorg/springframework/messaging/rsocket/RSocketStrategies;)Lorg/springframework/messaging/rsocket/RSocketRequester;
- (Lio/rsocket/RSocket;Lorg/springframework/util/MimeType;Lorg/springframework/util/MimeType;Lorg/springframework/messaging/rsocket/RSocketStrategies;)Lorg/springframework/messaging/rsocket/RSocketRequester;
+ (Lio/rsocket/RSocket;Lorg/springframework/util/MimeType;Lorg/springframework/util/MimeType;Lorg/springframework/messaging/rsocket/RSocketStrategies;)L1org/springframework/messaging/rsocket/RSocketRequester;
 
 dataMimeType
  ()Lorg/springframework/util/MimeType;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/RSocketStrategies.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/RSocketStrategies.eea
index c161b64bcb..37e8e794d0 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/RSocketStrategies.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/RSocketStrategies.eea
@@ -2,10 +2,10 @@ class org/springframework/messaging/rsocket/RSocketStrategies
 
 builder
  ()Lorg/springframework/messaging/rsocket/RSocketStrategies$Builder;
- ()Lorg/springframework/messaging/rsocket/RSocketStrategies$Builder;
+ ()L1org/springframework/messaging/rsocket/RSocketStrategies$Builder;
 create
  ()Lorg/springframework/messaging/rsocket/RSocketStrategies;
- ()Lorg/springframework/messaging/rsocket/RSocketStrategies;
+ ()L1org/springframework/messaging/rsocket/RSocketStrategies;
 
 dataBufferFactory
  ()Lorg/springframework/core/io/buffer/DataBufferFactory;
@@ -27,7 +27,7 @@ metadataExtractor
  ()Lorg/springframework/messaging/rsocket/MetadataExtractor;
 mutate
  ()Lorg/springframework/messaging/rsocket/RSocketStrategies$Builder;
- ()Lorg/springframework/messaging/rsocket/RSocketStrategies$Builder;
+ ()L1org/springframework/messaging/rsocket/RSocketStrategies$Builder;
 reactiveAdapterRegistry
  ()Lorg/springframework/core/ReactiveAdapterRegistry;
  ()Lorg/springframework/core/ReactiveAdapterRegistry;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.eea
index 881e031957..a7e98167aa 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.eea
@@ -56,4 +56,4 @@ getMatchingCondition
  (Lorg/springframework/messaging/Message<*>;)L0org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition;
 getToStringInfix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.eea
index 7192be7d72..b1e8c83c02 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.eea
@@ -30,7 +30,7 @@ handleNoMatch
  (Lorg/springframework/util/RouteMatcher$Route;Lorg/springframework/messaging/Message<*>;)V
 initReturnValueHandlers
  ()Ljava/util/List<+Lorg/springframework/messaging/handler/invocation/reactive/HandlerMethodReturnValueHandler;>;
- ()Ljava/util/List<+Lorg/springframework/messaging/handler/invocation/reactive/HandlerMethodReturnValueHandler;>;
+ ()L1java/util/List<+Lorg/springframework/messaging/handler/invocation/reactive/HandlerMethodReturnValueHandler;>;
 responder
  ()Lio/rsocket/SocketAcceptor;
  ()Lio/rsocket/SocketAcceptor;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/service/RSocketRequestValues.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/service/RSocketRequestValues.eea
index 548c0738f3..05e6b18625 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/service/RSocketRequestValues.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/service/RSocketRequestValues.eea
@@ -2,7 +2,7 @@ class org/springframework/messaging/rsocket/service/RSocketRequestValues
 
 builder
  (Ljava/lang/String;)Lorg/springframework/messaging/rsocket/service/RSocketRequestValues$Builder;
- (Ljava/lang/String;)Lorg/springframework/messaging/rsocket/service/RSocketRequestValues$Builder;
+ (Ljava/lang/String;)L1org/springframework/messaging/rsocket/service/RSocketRequestValues$Builder;
 
 <init>
  (Ljava/lang/String;Ljava/util/List<Ljava/lang/Object;>;Lorg/springframework/messaging/rsocket/service/RSocketRequestValues$MetadataHelper;Ljava/lang/Object;Lorg/reactivestreams/Publisher<*>;Lorg/springframework/core/ParameterizedTypeReference<*>;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/service/RSocketServiceProxyFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/service/RSocketServiceProxyFactory.eea
index 7b70dbbb12..dfd8fd0b98 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/service/RSocketServiceProxyFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/rsocket/service/RSocketServiceProxyFactory.eea
@@ -2,11 +2,11 @@ class org/springframework/messaging/rsocket/service/RSocketServiceProxyFactory
 
 builder
  ()Lorg/springframework/messaging/rsocket/service/RSocketServiceProxyFactory$Builder;
- ()Lorg/springframework/messaging/rsocket/service/RSocketServiceProxyFactory$Builder;
+ ()L1org/springframework/messaging/rsocket/service/RSocketServiceProxyFactory$Builder;
 builder
  (Lorg/springframework/messaging/rsocket/RSocketRequester;)Lorg/springframework/messaging/rsocket/service/RSocketServiceProxyFactory$Builder;
  (Lorg/springframework/messaging/rsocket/RSocketRequester;)Lorg/springframework/messaging/rsocket/service/RSocketServiceProxyFactory$Builder;
 
 createClient
  <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;)TS;
- <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;)TS;
+ <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;)T1S;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/SimpAttributes.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/SimpAttributes.eea
index f16294d790..f911489079 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/SimpAttributes.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/SimpAttributes.eea
@@ -12,7 +12,7 @@ SESSION_MUTEX_NAME
 
 fromMessage
  (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/simp/SimpAttributes;
- (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/simp/SimpAttributes;
+ (Lorg/springframework/messaging/Message<*>;)L1org/springframework/messaging/simp/SimpAttributes;
 
 <init>
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/SimpMessageHeaderAccessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/SimpMessageHeaderAccessor.eea
index 2fda45edc0..445dbe5f60 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/SimpMessageHeaderAccessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/SimpMessageHeaderAccessor.eea
@@ -36,10 +36,10 @@ USER_HEADER
 
 create
  ()Lorg/springframework/messaging/simp/SimpMessageHeaderAccessor;
- ()Lorg/springframework/messaging/simp/SimpMessageHeaderAccessor;
+ ()L1org/springframework/messaging/simp/SimpMessageHeaderAccessor;
 create
  (Lorg/springframework/messaging/simp/SimpMessageType;)Lorg/springframework/messaging/simp/SimpMessageHeaderAccessor;
- (Lorg/springframework/messaging/simp/SimpMessageType;)Lorg/springframework/messaging/simp/SimpMessageHeaderAccessor;
+ (Lorg/springframework/messaging/simp/SimpMessageType;)L1org/springframework/messaging/simp/SimpMessageHeaderAccessor;
 getDestination
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Ljava/lang/String;
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L0java/lang/String;
@@ -63,7 +63,7 @@ getUser
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L0java/security/Principal;
 wrap
  (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/simp/SimpMessageHeaderAccessor;
- (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/simp/SimpMessageHeaderAccessor;
+ (Lorg/springframework/messaging/Message<*>;)L1org/springframework/messaging/simp/SimpMessageHeaderAccessor;
 
 <init>
  (Lorg/springframework/messaging/Message<*>;)V
@@ -73,13 +73,13 @@ wrap
  (Lorg/springframework/messaging/simp/SimpMessageType;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;)V
 createAccessor
  (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/support/MessageHeaderAccessor;
- (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/support/MessageHeaderAccessor;
+ (Lorg/springframework/messaging/Message<*>;)L1org/springframework/messaging/support/MessageHeaderAccessor; # @Inherited(org.springframework.messaging.support.MessageHeaderAccessor)
 getDestination
  ()Ljava/lang/String;
  ()L0java/lang/String;
 getDetailedLogMessage
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(org.springframework.messaging.support.MessageHeaderAccessor)
 getMessageType
  ()Lorg/springframework/messaging/simp/SimpMessageType;
  ()L0org/springframework/messaging/simp/SimpMessageType;
@@ -91,7 +91,7 @@ getSessionId
  ()L0java/lang/String;
 getShortLogMessage
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(org.springframework.messaging.support.MessageHeaderAccessor)
 getSubscriptionId
  ()Ljava/lang/String;
  ()L0java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/SimpMessageTypeMessageCondition.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/SimpMessageTypeMessageCondition.eea
index 0a78e30bf3..c2a33b8de3 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/SimpMessageTypeMessageCondition.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/SimpMessageTypeMessageCondition.eea
@@ -31,4 +31,4 @@ getMessageType
  ()Lorg/springframework/messaging/simp/SimpMessageType;
 getToStringInfix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.eea
index eb585ccdb9..974f3ceb88 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.eea
@@ -9,7 +9,7 @@ super org/springframework/messaging/handler/invocation/AbstractMethodMessageHand
  (Lorg/springframework/messaging/SubscribableChannel;Lorg/springframework/messaging/MessageChannel;Lorg/springframework/messaging/simp/SimpMessageSendingOperations;)V
 createExceptionHandlerMethodResolverFor
  (Ljava/lang/Class<*>;)Lorg/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver;
- (Ljava/lang/Class<*>;)Lorg/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver;
+ (Ljava/lang/Class<*>;)L1org/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver; # @Inherited(org.springframework.messaging.handler.invocation.AbstractMethodMessageHandler)
 getConversionService
  ()Lorg/springframework/core/convert/ConversionService;
  ()Lorg/springframework/core/convert/ConversionService;
@@ -18,7 +18,7 @@ getDestination
  (Lorg/springframework/messaging/Message<*>;)L0java/lang/String; # @Inherited(org.springframework.messaging.handler.invocation.AbstractMethodMessageHandler)
 getDirectLookupDestinations
  (Lorg/springframework/messaging/simp/SimpMessageMappingInfo;)Ljava/util/Set<Ljava/lang/String;>;
- (Lorg/springframework/messaging/simp/SimpMessageMappingInfo;)Ljava/util/Set<Ljava/lang/String;>;
+ (Lorg/springframework/messaging/simp/SimpMessageMappingInfo;)L1java/util/Set<Ljava/lang/String;>;
 getHandlerMethodLogger
  ()Lorg/apache/commons/logging/Log;
  ()L0org/apache/commons/logging/Log; # @Inherited(org.springframework.messaging.handler.invocation.AbstractMethodMessageHandler)
@@ -54,10 +54,10 @@ handleMatch
  (Lorg/springframework/messaging/simp/SimpMessageMappingInfo;Lorg/springframework/messaging/handler/HandlerMethod;Ljava/lang/String;Lorg/springframework/messaging/Message<*>;)V
 initArgumentResolvers
  ()Ljava/util/List<Lorg/springframework/messaging/handler/invocation/HandlerMethodArgumentResolver;>;
- ()Ljava/util/List<Lorg/springframework/messaging/handler/invocation/HandlerMethodArgumentResolver;>;
+ ()L1java/util/List<Lorg/springframework/messaging/handler/invocation/HandlerMethodArgumentResolver;>;
 initReturnValueHandlers
  ()Ljava/util/List<+Lorg/springframework/messaging/handler/invocation/HandlerMethodReturnValueHandler;>;
- ()Ljava/util/List<+Lorg/springframework/messaging/handler/invocation/HandlerMethodReturnValueHandler;>;
+ ()L1java/util/List<+Lorg/springframework/messaging/handler/invocation/HandlerMethodReturnValueHandler;>;
 isHandler
  (Ljava/lang/Class<*>;)Z
  (Ljava/lang/Class<*>;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.eea
index a6ed94ebf6..0a43bbeae2 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.eea
@@ -8,25 +8,25 @@ addReturnValueHandlers
  (Ljava/util/List<Lorg/springframework/messaging/handler/invocation/HandlerMethodReturnValueHandler;>;)V
 brokerChannel
  (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/core/task/TaskExecutor;)Lorg/springframework/messaging/support/AbstractSubscribableChannel;
- (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/core/task/TaskExecutor;)Lorg/springframework/messaging/support/AbstractSubscribableChannel;
+ (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/core/task/TaskExecutor;)L1org/springframework/messaging/support/AbstractSubscribableChannel;
 brokerChannelExecutor
  (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;)Lorg/springframework/core/task/TaskExecutor;
- (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;)Lorg/springframework/core/task/TaskExecutor;
+ (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;)L1org/springframework/core/task/TaskExecutor;
 brokerMessageConverter
  ()Lorg/springframework/messaging/converter/CompositeMessageConverter;
- ()Lorg/springframework/messaging/converter/CompositeMessageConverter;
+ ()L1org/springframework/messaging/converter/CompositeMessageConverter;
 brokerMessagingTemplate
  (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/converter/CompositeMessageConverter;)Lorg/springframework/messaging/simp/SimpMessagingTemplate;
- (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/converter/CompositeMessageConverter;)Lorg/springframework/messaging/simp/SimpMessagingTemplate;
+ (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/converter/CompositeMessageConverter;)L1org/springframework/messaging/simp/SimpMessagingTemplate;
 clientInboundChannel
  (Lorg/springframework/core/task/TaskExecutor;)Lorg/springframework/messaging/support/AbstractSubscribableChannel;
- (Lorg/springframework/core/task/TaskExecutor;)Lorg/springframework/messaging/support/AbstractSubscribableChannel;
+ (Lorg/springframework/core/task/TaskExecutor;)L1org/springframework/messaging/support/AbstractSubscribableChannel;
 clientInboundChannelExecutor
  ()Lorg/springframework/core/task/TaskExecutor;
  ()Lorg/springframework/core/task/TaskExecutor;
 clientOutboundChannel
  (Lorg/springframework/core/task/TaskExecutor;)Lorg/springframework/messaging/support/AbstractSubscribableChannel;
- (Lorg/springframework/core/task/TaskExecutor;)Lorg/springframework/messaging/support/AbstractSubscribableChannel;
+ (Lorg/springframework/core/task/TaskExecutor;)L1org/springframework/messaging/support/AbstractSubscribableChannel;
 clientOutboundChannelExecutor
  ()Lorg/springframework/core/task/TaskExecutor;
  ()Lorg/springframework/core/task/TaskExecutor;
@@ -44,13 +44,13 @@ configureMessageConverters
  (Ljava/util/List<Lorg/springframework/messaging/converter/MessageConverter;>;)Z
 createAnnotationMethodMessageHandler
  (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/simp/SimpMessagingTemplate;)Lorg/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler;
- (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/simp/SimpMessagingTemplate;)Lorg/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler;
+ (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/simp/SimpMessagingTemplate;)L1org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler;
 createJacksonConverter
  ()Lorg/springframework/messaging/converter/MappingJackson2MessageConverter;
- ()Lorg/springframework/messaging/converter/MappingJackson2MessageConverter;
+ ()L1org/springframework/messaging/converter/MappingJackson2MessageConverter;
 createLocalUserRegistry
  (Ljava/lang/Integer;)Lorg/springframework/messaging/simp/user/SimpUserRegistry;
- (Ljava/lang/Integer;)Lorg/springframework/messaging/simp/user/SimpUserRegistry;
+ (Ljava/lang/Integer;)L1org/springframework/messaging/simp/user/SimpUserRegistry;
 getApplicationContext
  ()Lorg/springframework/context/ApplicationContext;
  ()L0org/springframework/context/ApplicationContext;
@@ -71,7 +71,7 @@ getValidator
  ()L0org/springframework/validation/Validator;
 messageBrokerTaskScheduler
  ()Lorg/springframework/scheduling/TaskScheduler;
- ()Lorg/springframework/scheduling/TaskScheduler;
+ ()L1org/springframework/scheduling/TaskScheduler;
 setApplicationContext
  (Lorg/springframework/context/ApplicationContext;)V
  (Lorg/springframework/context/ApplicationContext;)V
@@ -80,7 +80,7 @@ simpAnnotationMethodMessageHandler
  (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/simp/SimpMessagingTemplate;Lorg/springframework/messaging/converter/CompositeMessageConverter;)Lorg/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler;
 simpValidator
  ()Lorg/springframework/validation/Validator;
- ()Lorg/springframework/validation/Validator;
+ ()L1org/springframework/validation/Validator;
 simpleBrokerMessageHandler
  (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/simp/user/UserDestinationResolver;)Lorg/springframework/messaging/simp/broker/AbstractBrokerMessageHandler;
  (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/simp/user/UserDestinationResolver;)L0org/springframework/messaging/simp/broker/AbstractBrokerMessageHandler;
@@ -89,10 +89,10 @@ stompBrokerRelayMessageHandler
  (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/simp/user/UserDestinationMessageHandler;Lorg/springframework/messaging/MessageHandler;Lorg/springframework/messaging/simp/user/UserDestinationResolver;)L0org/springframework/messaging/simp/broker/AbstractBrokerMessageHandler;
 userDestinationMessageHandler
  (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/simp/user/UserDestinationResolver;)Lorg/springframework/messaging/simp/user/UserDestinationMessageHandler;
- (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/simp/user/UserDestinationResolver;)Lorg/springframework/messaging/simp/user/UserDestinationMessageHandler;
+ (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/simp/user/UserDestinationResolver;)L1org/springframework/messaging/simp/user/UserDestinationMessageHandler;
 userDestinationResolver
  (Lorg/springframework/messaging/simp/user/SimpUserRegistry;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;)Lorg/springframework/messaging/simp/user/UserDestinationResolver;
- (Lorg/springframework/messaging/simp/user/SimpUserRegistry;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;)Lorg/springframework/messaging/simp/user/UserDestinationResolver;
+ (Lorg/springframework/messaging/simp/user/SimpUserRegistry;Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;)L1org/springframework/messaging/simp/user/UserDestinationResolver;
 userRegistry
  (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;)Lorg/springframework/messaging/simp/user/SimpUserRegistry;
  (Lorg/springframework/messaging/support/AbstractSubscribableChannel;Lorg/springframework/messaging/support/AbstractSubscribableChannel;)Lorg/springframework/messaging/simp/user/SimpUserRegistry;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/config/SimpleBrokerRegistration.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/config/SimpleBrokerRegistration.eea
index 40bcb3880a..7f338377b8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/config/SimpleBrokerRegistration.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/config/SimpleBrokerRegistration.eea
@@ -5,7 +5,7 @@ class org/springframework/messaging/simp/config/SimpleBrokerRegistration
  (Lorg/springframework/messaging/SubscribableChannel;Lorg/springframework/messaging/MessageChannel;[Ljava/lang/String;)V
 getMessageHandler
  (Lorg/springframework/messaging/SubscribableChannel;)Lorg/springframework/messaging/simp/broker/SimpleBrokerMessageHandler;
- (Lorg/springframework/messaging/SubscribableChannel;)Lorg/springframework/messaging/simp/broker/SimpleBrokerMessageHandler;
+ (Lorg/springframework/messaging/SubscribableChannel;)L1org/springframework/messaging/simp/broker/SimpleBrokerMessageHandler;
 setHeartbeatValue
  ([J)Lorg/springframework/messaging/simp/config/SimpleBrokerRegistration;
  ([J)Lorg/springframework/messaging/simp/config/SimpleBrokerRegistration;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/config/StompBrokerRelayRegistration.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/config/StompBrokerRelayRegistration.eea
index 8650220320..0757f2b570 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/config/StompBrokerRelayRegistration.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/config/StompBrokerRelayRegistration.eea
@@ -5,7 +5,7 @@ class org/springframework/messaging/simp/config/StompBrokerRelayRegistration
  (Lorg/springframework/messaging/SubscribableChannel;Lorg/springframework/messaging/MessageChannel;[Ljava/lang/String;)V
 getMessageHandler
  (Lorg/springframework/messaging/SubscribableChannel;)Lorg/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler;
- (Lorg/springframework/messaging/SubscribableChannel;)Lorg/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler;
+ (Lorg/springframework/messaging/SubscribableChannel;)L1org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler;
 getUserDestinationBroadcast
  ()Ljava/lang/String;
  ()L0java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/ConnectionHandlingStompSession.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/ConnectionHandlingStompSession.eea
index 663820c4ea..97a22e2dd7 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/ConnectionHandlingStompSession.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/ConnectionHandlingStompSession.eea
@@ -9,4 +9,4 @@ getSession
  ()Ljava/util/concurrent/CompletableFuture<Lorg/springframework/messaging/simp/stomp/StompSession;>;
 getSessionFuture
  ()Lorg/springframework/util/concurrent/ListenableFuture<Lorg/springframework/messaging/simp/stomp/StompSession;>;
- ()Lorg/springframework/util/concurrent/ListenableFuture<Lorg/springframework/messaging/simp/stomp/StompSession;>;
+ ()L1org/springframework/util/concurrent/ListenableFuture<Lorg/springframework/messaging/simp/stomp/StompSession;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/DefaultStompSession.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/DefaultStompSession.eea
index d734df91df..7d2cf78804 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/DefaultStompSession.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/DefaultStompSession.eea
@@ -12,7 +12,7 @@ acknowledge
  (Ljava/lang/String;Z)Lorg/springframework/messaging/simp/stomp/StompSession$Receiptable;
 acknowledge
  (Lorg/springframework/messaging/simp/stomp/StompHeaders;Z)Lorg/springframework/messaging/simp/stomp/StompSession$Receiptable;
- (Lorg/springframework/messaging/simp/stomp/StompHeaders;Z)Lorg/springframework/messaging/simp/stomp/StompSession$Receiptable;
+ (Lorg/springframework/messaging/simp/stomp/StompHeaders;Z)L1org/springframework/messaging/simp/stomp/StompSession$Receiptable;
 afterConnectFailure
  (Ljava/lang/Throwable;)V
  (Ljava/lang/Throwable;)V
@@ -51,7 +51,7 @@ send
  (Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/messaging/simp/stomp/StompSession$Receiptable;
 send
  (Lorg/springframework/messaging/simp/stomp/StompHeaders;Ljava/lang/Object;)Lorg/springframework/messaging/simp/stomp/StompSession$Receiptable;
- (Lorg/springframework/messaging/simp/stomp/StompHeaders;Ljava/lang/Object;)Lorg/springframework/messaging/simp/stomp/StompSession$Receiptable;
+ (Lorg/springframework/messaging/simp/stomp/StompHeaders;Ljava/lang/Object;)L1org/springframework/messaging/simp/stomp/StompSession$Receiptable;
 setMessageConverter
  (Lorg/springframework/messaging/converter/MessageConverter;)V
  (Lorg/springframework/messaging/converter/MessageConverter;)V
@@ -63,4 +63,4 @@ subscribe
  (Ljava/lang/String;Lorg/springframework/messaging/simp/stomp/StompFrameHandler;)Lorg/springframework/messaging/simp/stomp/StompSession$Subscription;
 subscribe
  (Lorg/springframework/messaging/simp/stomp/StompHeaders;Lorg/springframework/messaging/simp/stomp/StompFrameHandler;)Lorg/springframework/messaging/simp/stomp/StompSession$Subscription;
- (Lorg/springframework/messaging/simp/stomp/StompHeaders;Lorg/springframework/messaging/simp/stomp/StompFrameHandler;)Lorg/springframework/messaging/simp/stomp/StompSession$Subscription;
+ (Lorg/springframework/messaging/simp/stomp/StompHeaders;Lorg/springframework/messaging/simp/stomp/StompFrameHandler;)L1org/springframework/messaging/simp/stomp/StompSession$Subscription;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClient.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClient.eea
index 40bdb48436..e4c39d1af6 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClient.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClient.eea
@@ -11,7 +11,7 @@ connect
  (Lorg/springframework/messaging/simp/stomp/StompHeaders;Lorg/springframework/messaging/simp/stomp/StompSessionHandler;)Lorg/springframework/util/concurrent/ListenableFuture<Lorg/springframework/messaging/simp/stomp/StompSession;>;
 connect
  (Lorg/springframework/messaging/simp/stomp/StompSessionHandler;)Lorg/springframework/util/concurrent/ListenableFuture<Lorg/springframework/messaging/simp/stomp/StompSession;>;
- (Lorg/springframework/messaging/simp/stomp/StompSessionHandler;)Lorg/springframework/util/concurrent/ListenableFuture<Lorg/springframework/messaging/simp/stomp/StompSession;>;
+ (Lorg/springframework/messaging/simp/stomp/StompSessionHandler;)L1org/springframework/util/concurrent/ListenableFuture<Lorg/springframework/messaging/simp/stomp/StompSession;>;
 connectAsync
  (Lorg/springframework/messaging/simp/stomp/StompHeaders;Lorg/springframework/messaging/simp/stomp/StompSessionHandler;)Ljava/util/concurrent/CompletableFuture<Lorg/springframework/messaging/simp/stomp/StompSession;>;
  (Lorg/springframework/messaging/simp/stomp/StompHeaders;Lorg/springframework/messaging/simp/stomp/StompSessionHandler;)Ljava/util/concurrent/CompletableFuture<Lorg/springframework/messaging/simp/stomp/StompSession;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.eea
index a658d7c106..8548032878 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.eea
@@ -24,7 +24,7 @@ getStats
  ()Lorg/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler$Stats;
 getStatsInfo
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSystemLogin
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/StompClientSupport.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/StompClientSupport.eea
index 6e13ea756b..b364883a1c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/StompClientSupport.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/StompClientSupport.eea
@@ -2,7 +2,7 @@ class org/springframework/messaging/simp/stomp/StompClientSupport
 
 createSession
  (Lorg/springframework/messaging/simp/stomp/StompHeaders;Lorg/springframework/messaging/simp/stomp/StompSessionHandler;)Lorg/springframework/messaging/simp/stomp/ConnectionHandlingStompSession;
- (Lorg/springframework/messaging/simp/stomp/StompHeaders;Lorg/springframework/messaging/simp/stomp/StompSessionHandler;)Lorg/springframework/messaging/simp/stomp/ConnectionHandlingStompSession;
+ (Lorg/springframework/messaging/simp/stomp/StompHeaders;Lorg/springframework/messaging/simp/stomp/StompSessionHandler;)L1org/springframework/messaging/simp/stomp/ConnectionHandlingStompSession;
 getDefaultHeartbeat
  ()[J
  ()[J
@@ -14,7 +14,7 @@ getTaskScheduler
  ()L0org/springframework/scheduling/TaskScheduler;
 processConnectHeaders
  (Lorg/springframework/messaging/simp/stomp/StompHeaders;)Lorg/springframework/messaging/simp/stomp/StompHeaders;
- (Lorg/springframework/messaging/simp/stomp/StompHeaders;)Lorg/springframework/messaging/simp/stomp/StompHeaders;
+ (Lorg/springframework/messaging/simp/stomp/StompHeaders;)L1org/springframework/messaging/simp/stomp/StompHeaders;
 setDefaultHeartbeat
  ([J)V
  ([J)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/StompDecoder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/StompDecoder.eea
index 2132659f9e..ee5d712dd3 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/StompDecoder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/StompDecoder.eea
@@ -5,7 +5,7 @@ decode
  (Ljava/nio/ByteBuffer;)Ljava/util/List<Lorg/springframework/messaging/Message<[B>;>;
 decode
  (Ljava/nio/ByteBuffer;Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;)Ljava/util/List<Lorg/springframework/messaging/Message<[B>;>;
- (Ljava/nio/ByteBuffer;Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;)Ljava/util/List<Lorg/springframework/messaging/Message<[B>;>;
+ (Ljava/nio/ByteBuffer;Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;)L1java/util/List<Lorg/springframework/messaging/Message<[B>;>;
 getHeaderInitializer
  ()Lorg/springframework/messaging/support/MessageHeaderInitializer;
  ()L0org/springframework/messaging/support/MessageHeaderInitializer;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/StompHeaderAccessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/StompHeaderAccessor.eea
index d55b77bf2d..991f0665c5 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/StompHeaderAccessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/StompHeaderAccessor.eea
@@ -54,13 +54,13 @@ STOMP_VERSION_HEADER
 
 create
  (Lorg/springframework/messaging/simp/stomp/StompCommand;)Lorg/springframework/messaging/simp/stomp/StompHeaderAccessor;
- (Lorg/springframework/messaging/simp/stomp/StompCommand;)Lorg/springframework/messaging/simp/stomp/StompHeaderAccessor;
+ (Lorg/springframework/messaging/simp/stomp/StompCommand;)L1org/springframework/messaging/simp/stomp/StompHeaderAccessor;
 create
  (Lorg/springframework/messaging/simp/stomp/StompCommand;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;)Lorg/springframework/messaging/simp/stomp/StompHeaderAccessor;
- (Lorg/springframework/messaging/simp/stomp/StompCommand;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;)Lorg/springframework/messaging/simp/stomp/StompHeaderAccessor;
+ (Lorg/springframework/messaging/simp/stomp/StompCommand;Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Ljava/lang/String;>;>;)L1org/springframework/messaging/simp/stomp/StompHeaderAccessor;
 createForHeartbeat
  ()Lorg/springframework/messaging/simp/stomp/StompHeaderAccessor;
- ()Lorg/springframework/messaging/simp/stomp/StompHeaderAccessor;
+ ()L1org/springframework/messaging/simp/stomp/StompHeaderAccessor;
 getCommand
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lorg/springframework/messaging/simp/stomp/StompCommand;
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L0org/springframework/messaging/simp/stomp/StompCommand;
@@ -72,11 +72,11 @@ getPasscode
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L0java/lang/String;
 wrap
  (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/simp/stomp/StompHeaderAccessor;
- (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/simp/stomp/StompHeaderAccessor;
+ (Lorg/springframework/messaging/Message<*>;)L1org/springframework/messaging/simp/stomp/StompHeaderAccessor;
 
 createAccessor
  (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/support/MessageHeaderAccessor;
- (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/support/MessageHeaderAccessor;
+ (Lorg/springframework/messaging/Message<*>;)L1org/springframework/messaging/support/MessageHeaderAccessor; # @Inherited(org.springframework.messaging.simp.SimpMessageHeaderAccessor)
 getAcceptVersion
  ()Ljava/util/Set<Ljava/lang/String;>;
  ()Ljava/util/Set<Ljava/lang/String;>;
@@ -91,7 +91,7 @@ getContentLength
  ()L0java/lang/Integer;
 getDetailedLogMessage
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(org.springframework.messaging.simp.SimpMessageHeaderAccessor)
 getHeartbeat
  ()[J
  ()[J
@@ -124,7 +124,7 @@ getReceiptId
  ()L0java/lang/String;
 getShortLogMessage
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(org.springframework.messaging.simp.SimpMessageHeaderAccessor)
 getVersion
  ()Ljava/lang/String;
  ()L0java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/StompSessionHandlerAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/StompSessionHandlerAdapter.eea
index 40df498fad..9110943db0 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/StompSessionHandlerAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/stomp/StompSessionHandlerAdapter.eea
@@ -5,7 +5,7 @@ afterConnected
  (Lorg/springframework/messaging/simp/stomp/StompSession;Lorg/springframework/messaging/simp/stomp/StompHeaders;)V
 getPayloadType
  (Lorg/springframework/messaging/simp/stomp/StompHeaders;)Ljava/lang/reflect/Type;
- (Lorg/springframework/messaging/simp/stomp/StompHeaders;)Ljava/lang/reflect/Type;
+ (Lorg/springframework/messaging/simp/stomp/StompHeaders;)L1java/lang/reflect/Type;
 handleException
  (Lorg/springframework/messaging/simp/stomp/StompSession;Lorg/springframework/messaging/simp/stomp/StompCommand;Lorg/springframework/messaging/simp/stomp/StompHeaders;[BLjava/lang/Throwable;)V
  (Lorg/springframework/messaging/simp/stomp/StompSession;Lorg/springframework/messaging/simp/stomp/StompCommand;Lorg/springframework/messaging/simp/stomp/StompHeaders;[BLjava/lang/Throwable;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/user/MultiServerUserRegistry.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/user/MultiServerUserRegistry.eea
index 9bab84295a..60ef23923a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/user/MultiServerUserRegistry.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/simp/user/MultiServerUserRegistry.eea
@@ -5,13 +5,13 @@ class org/springframework/messaging/simp/user/MultiServerUserRegistry
  (Lorg/springframework/messaging/simp/user/SimpUserRegistry;)V
 findSubscriptions
  (Lorg/springframework/messaging/simp/user/SimpSubscriptionMatcher;)Ljava/util/Set<Lorg/springframework/messaging/simp/user/SimpSubscription;>;
- (Lorg/springframework/messaging/simp/user/SimpSubscriptionMatcher;)Ljava/util/Set<Lorg/springframework/messaging/simp/user/SimpSubscription;>;
+ (Lorg/springframework/messaging/simp/user/SimpSubscriptionMatcher;)L1java/util/Set<Lorg/springframework/messaging/simp/user/SimpSubscription;>;
 getUser
  (Ljava/lang/String;)Lorg/springframework/messaging/simp/user/SimpUser;
  (Ljava/lang/String;)L0org/springframework/messaging/simp/user/SimpUser; # @Inherited(org.springframework.messaging.simp.user.SimpUserRegistry)
 getUsers
  ()Ljava/util/Set<Lorg/springframework/messaging/simp/user/SimpUser;>;
- ()Ljava/util/Set<Lorg/springframework/messaging/simp/user/SimpUser;>;
+ ()L1java/util/Set<Lorg/springframework/messaging/simp/user/SimpUser;>;
 onApplicationEvent
  (Lorg/springframework/context/ApplicationEvent;)V
  (Lorg/springframework/context/ApplicationEvent;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/support/AbstractHeaderMapper.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/support/AbstractHeaderMapper.eea
index f53027f5df..1ec38fd835 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/support/AbstractHeaderMapper.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/support/AbstractHeaderMapper.eea
@@ -12,7 +12,7 @@ logger
 
 fromHeaderName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 getHeaderIfAvailable
  <V:Ljava/lang/Object;>(Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Ljava/lang/String;Ljava/lang/Class<TV;>;)TV;
  <V:Ljava/lang/Object;>(Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Ljava/lang/String;Ljava/lang/Class<TV;>;)T0V;
@@ -24,4 +24,4 @@ setOutboundPrefix
  (Ljava/lang/String;)V
 toHeaderName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/support/MessageBuilder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/support/MessageBuilder.eea
index 98fbdb9214..74ae05e413 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/support/MessageBuilder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/support/MessageBuilder.eea
@@ -4,13 +4,13 @@ class org/springframework/messaging/support/MessageBuilder
 
 createMessage
  <T:Ljava/lang/Object;>(TT;Lorg/springframework/messaging/MessageHeaders;)Lorg/springframework/messaging/Message<TT;>;
- <T:Ljava/lang/Object;>(TT;Lorg/springframework/messaging/MessageHeaders;)Lorg/springframework/messaging/Message<TT;>;
+ <T:Ljava/lang/Object;>(TT;Lorg/springframework/messaging/MessageHeaders;)L1org/springframework/messaging/Message<TT;>;
 fromMessage
  <T:Ljava/lang/Object;>(Lorg/springframework/messaging/Message<TT;>;)Lorg/springframework/messaging/support/MessageBuilder<TT;>;
- <T:Ljava/lang/Object;>(Lorg/springframework/messaging/Message<TT;>;)Lorg/springframework/messaging/support/MessageBuilder<TT;>;
+ <T:Ljava/lang/Object;>(Lorg/springframework/messaging/Message<TT;>;)L1org/springframework/messaging/support/MessageBuilder<TT;>;
 withPayload
  <T:Ljava/lang/Object;>(TT;)Lorg/springframework/messaging/support/MessageBuilder<TT;>;
- <T:Ljava/lang/Object;>(TT;)Lorg/springframework/messaging/support/MessageBuilder<TT;>;
+ <T:Ljava/lang/Object;>(TT;)L1org/springframework/messaging/support/MessageBuilder<TT;>;
 
 build
  ()Lorg/springframework/messaging/Message<TT;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/support/MessageHeaderAccessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/support/MessageHeaderAccessor.eea
index 25f5d98d19..2cb605adfa 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/support/MessageHeaderAccessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/support/MessageHeaderAccessor.eea
@@ -28,16 +28,16 @@ copyHeadersIfAbsent
  (Ljava/util/Map<Ljava/lang/String;*>;)V
 createAccessor
  (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/support/MessageHeaderAccessor;
- (Lorg/springframework/messaging/Message<*>;)Lorg/springframework/messaging/support/MessageHeaderAccessor;
+ (Lorg/springframework/messaging/Message<*>;)L1org/springframework/messaging/support/MessageHeaderAccessor;
 getContentType
  ()Lorg/springframework/util/MimeType;
  ()L0org/springframework/util/MimeType;
 getDetailedLogMessage
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
 getDetailedPayloadLogMessage
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
 getErrorChannel
  ()Ljava/lang/Object;
  ()L0java/lang/Object;
@@ -55,10 +55,10 @@ getReplyChannel
  ()L0java/lang/Object;
 getShortLogMessage
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
 getShortPayloadLogMessage
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
 getTimestamp
  ()Ljava/lang/Long;
  ()L0java/lang/Long;
@@ -94,10 +94,10 @@ setReplyChannelName
  (Ljava/lang/String;)V
 toMap
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ ()L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 toMessageHeaders
  ()Lorg/springframework/messaging/MessageHeaders;
- ()Lorg/springframework/messaging/MessageHeaders;
+ ()L1org/springframework/messaging/MessageHeaders;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/tcp/TcpConnection.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/tcp/TcpConnection.eea
index 081845ce16..782bc18c29 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/tcp/TcpConnection.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/tcp/TcpConnection.eea
@@ -10,7 +10,7 @@ onWriteInactivity
  (Ljava/lang/Runnable;J)V
 send
  (Lorg/springframework/messaging/Message<TP;>;)Lorg/springframework/util/concurrent/ListenableFuture<Ljava/lang/Void;>;
- (Lorg/springframework/messaging/Message<TP;>;)Lorg/springframework/util/concurrent/ListenableFuture<Ljava/lang/Void;>;
+ (Lorg/springframework/messaging/Message<TP;>;)L1org/springframework/util/concurrent/ListenableFuture<Ljava/lang/Void;>;
 sendAsync
  (Lorg/springframework/messaging/Message<TP;>;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
  (Lorg/springframework/messaging/Message<TP;>;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/tcp/TcpOperations.eea b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/tcp/TcpOperations.eea
index f1b0996942..66c9cc3589 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/messaging/tcp/TcpOperations.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/messaging/tcp/TcpOperations.eea
@@ -4,10 +4,10 @@ class org/springframework/messaging/tcp/TcpOperations
 
 connect
  (Lorg/springframework/messaging/tcp/TcpConnectionHandler<TP;>;)Lorg/springframework/util/concurrent/ListenableFuture<Ljava/lang/Void;>;
- (Lorg/springframework/messaging/tcp/TcpConnectionHandler<TP;>;)Lorg/springframework/util/concurrent/ListenableFuture<Ljava/lang/Void;>;
+ (Lorg/springframework/messaging/tcp/TcpConnectionHandler<TP;>;)L1org/springframework/util/concurrent/ListenableFuture<Ljava/lang/Void;>;
 connect
  (Lorg/springframework/messaging/tcp/TcpConnectionHandler<TP;>;Lorg/springframework/messaging/tcp/ReconnectStrategy;)Lorg/springframework/util/concurrent/ListenableFuture<Ljava/lang/Void;>;
- (Lorg/springframework/messaging/tcp/TcpConnectionHandler<TP;>;Lorg/springframework/messaging/tcp/ReconnectStrategy;)Lorg/springframework/util/concurrent/ListenableFuture<Ljava/lang/Void;>;
+ (Lorg/springframework/messaging/tcp/TcpConnectionHandler<TP;>;Lorg/springframework/messaging/tcp/ReconnectStrategy;)L1org/springframework/util/concurrent/ListenableFuture<Ljava/lang/Void;>;
 connectAsync
  (Lorg/springframework/messaging/tcp/TcpConnectionHandler<TP;>;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
  (Lorg/springframework/messaging/tcp/TcpConnectionHandler<TP;>;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
@@ -16,7 +16,7 @@ connectAsync
  (Lorg/springframework/messaging/tcp/TcpConnectionHandler<TP;>;Lorg/springframework/messaging/tcp/ReconnectStrategy;)Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
 shutdown
  ()Lorg/springframework/util/concurrent/ListenableFuture<Ljava/lang/Void;>;
- ()Lorg/springframework/util/concurrent/ListenableFuture<Ljava/lang/Void;>;
+ ()L1org/springframework/util/concurrent/ListenableFuture<Ljava/lang/Void;>;
 shutdownAsync
  ()Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
  ()Ljava/util/concurrent/CompletableFuture<Ljava/lang/Void;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/mock/http/client/MockClientHttpResponse.eea b/libs/eea-spring-6/src/main/resources/org/springframework/mock/http/client/MockClientHttpResponse.eea
index 508da4fb7e..dd44debbf5 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/mock/http/client/MockClientHttpResponse.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/mock/http/client/MockClientHttpResponse.eea
@@ -17,4 +17,4 @@ getStatusCode
  ()Lorg/springframework/http/HttpStatusCode;
 getStatusText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/mock/http/server/reactive/MockServerHttpRequest.eea b/libs/eea-spring-6/src/main/resources/org/springframework/mock/http/server/reactive/MockServerHttpRequest.eea
index ad89fa5d25..8416aa9e92 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/mock/http/server/reactive/MockServerHttpRequest.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/mock/http/server/reactive/MockServerHttpRequest.eea
@@ -11,13 +11,13 @@ head
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BaseBuilder<*>;
 method
  (Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BodyBuilder;
- (Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BodyBuilder;
+ (Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/mock/http/server/reactive/MockServerHttpRequest$BodyBuilder;
 method
  (Lorg/springframework/http/HttpMethod;Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BodyBuilder;
  (Lorg/springframework/http/HttpMethod;Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BodyBuilder;
 method
  (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BodyBuilder;
- (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BodyBuilder;
+ (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)L1org/springframework/mock/http/server/reactive/MockServerHttpRequest$BodyBuilder;
 options
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BaseBuilder<*>;
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BaseBuilder<*>;
@@ -39,7 +39,7 @@ getLocalAddress
  ()L0java/net/InetSocketAddress; # @Inherited(org.springframework.http.server.reactive.ServerHttpRequest)
 getNativeRequest
  <T:Ljava/lang/Object;>()TT;
- <T:Ljava/lang/Object;>()TT;
+ <T:Ljava/lang/Object;>()T1T;
 getRemoteAddress
  ()Ljava/net/InetSocketAddress;
  ()L0java/net/InetSocketAddress; # @Inherited(org.springframework.http.server.reactive.ServerHttpRequest)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/mock/http/server/reactive/MockServerHttpResponse.eea b/libs/eea-spring-6/src/main/resources/org/springframework/mock/http/server/reactive/MockServerHttpResponse.eea
index abc51310e3..cf27e1afdf 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/mock/http/server/reactive/MockServerHttpResponse.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/mock/http/server/reactive/MockServerHttpResponse.eea
@@ -11,7 +11,7 @@ getBodyAsString
  ()Lreactor/core/publisher/Mono<Ljava/lang/String;>;
 getNativeResponse
  <T:Ljava/lang/Object;>()TT;
- <T:Ljava/lang/Object;>()TT;
+ <T:Ljava/lang/Object;>()T1T;
 setComplete
  ()Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
  ()Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockAsyncContext.eea b/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockAsyncContext.eea
index 5a073f760a..7e60f161d9 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockAsyncContext.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockAsyncContext.eea
@@ -14,7 +14,7 @@ addListener
  (Ljakarta/servlet/AsyncListener;Ljakarta/servlet/ServletRequest;Ljakarta/servlet/ServletResponse;)V
 createListener
  <T::Ljakarta/servlet/AsyncListener;>(Ljava/lang/Class<TT;>;)TT;
- <T::Ljakarta/servlet/AsyncListener;>(Ljava/lang/Class<TT;>;)TT;
+ <T::Ljakarta/servlet/AsyncListener;>(Ljava/lang/Class<TT;>;)T1T;
 dispatch
  (Ljakarta/servlet/ServletContext;Ljava/lang/String;)V
  (Ljakarta/servlet/ServletContext;Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockBodyContent.eea b/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockBodyContent.eea
index 5780b40435..4a569777ec 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockBodyContent.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockBodyContent.eea
@@ -11,7 +11,7 @@ class org/springframework/mock/web/MockBodyContent
  (Ljava/lang/String;Ljava/io/Writer;)V
 getReader
  ()Ljava/io/Reader;
- ()Ljava/io/Reader;
+ ()L1java/io/Reader;
 getString
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockCookie.eea b/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockCookie.eea
index 2d58dab749..c9aeeb06ad 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockCookie.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockCookie.eea
@@ -2,7 +2,7 @@ class org/springframework/mock/web/MockCookie
 
 parse
  (Ljava/lang/String;)Lorg/springframework/mock/web/MockCookie;
- (Ljava/lang/String;)Lorg/springframework/mock/web/MockCookie;
+ (Ljava/lang/String;)L1org/springframework/mock/web/MockCookie;
 
 <init>
  (Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockHttpServletRequest.eea b/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockHttpServletRequest.eea
index c72ae0e84c..81bb39ef03 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockHttpServletRequest.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockHttpServletRequest.eea
@@ -141,7 +141,7 @@ getPart
  (Ljava/lang/String;)L0jakarta/servlet/http/Part;
 getParts
  ()Ljava/util/Collection<Ljakarta/servlet/http/Part;>;
- ()Ljava/util/Collection<Ljakarta/servlet/http/Part;>;
+ ()L1java/util/Collection<Ljakarta/servlet/http/Part;>;
 getPathInfo
  ()Ljava/lang/String;
  ()L0java/lang/String;
@@ -153,7 +153,7 @@ getProtocol
  ()Ljava/lang/String;
 getProtocolRequestId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getQueryString
  ()Ljava/lang/String;
  ()L0java/lang/String;
@@ -171,10 +171,10 @@ getRemoteUser
  ()L0java/lang/String;
 getRequestDispatcher
  (Ljava/lang/String;)Ljakarta/servlet/RequestDispatcher;
- (Ljava/lang/String;)Ljakarta/servlet/RequestDispatcher;
+ (Ljava/lang/String;)L1jakarta/servlet/RequestDispatcher;
 getRequestId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getRequestURI
  ()Ljava/lang/String;
  ()L0java/lang/String;
@@ -192,7 +192,7 @@ getServerName
  ()Ljava/lang/String;
 getServletConnection
  ()Ljakarta/servlet/ServletConnection;
- ()Ljakarta/servlet/ServletConnection;
+ ()L1jakarta/servlet/ServletConnection;
 getServletContext
  ()Ljakarta/servlet/ServletContext;
  ()Ljakarta/servlet/ServletContext;
@@ -321,4 +321,4 @@ startAsync
  (Ljakarta/servlet/ServletRequest;Ljakarta/servlet/ServletResponse;)Ljakarta/servlet/AsyncContext;
 upgrade
  <T::Ljakarta/servlet/http/HttpUpgradeHandler;>(Ljava/lang/Class<TT;>;)TT;
- <T::Ljakarta/servlet/http/HttpUpgradeHandler;>(Ljava/lang/Class<TT;>;)TT;
+ <T::Ljakarta/servlet/http/HttpUpgradeHandler;>(Ljava/lang/Class<TT;>;)T1T;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockHttpSession.eea b/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockHttpSession.eea
index e175650387..988a0656d2 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockHttpSession.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockHttpSession.eea
@@ -33,7 +33,7 @@ removeAttribute
  (Ljava/lang/String;)V
 serializeState
  ()Ljava/io/Serializable;
- ()Ljava/io/Serializable;
+ ()L1java/io/Serializable;
 setAttribute
  (Ljava/lang/String;Ljava/lang/Object;)V
  (Ljava/lang/String;Ljava/lang/Object;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockMultipartFile.eea b/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockMultipartFile.eea
index 9c3170e4bc..900305a71f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockMultipartFile.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockMultipartFile.eea
@@ -20,7 +20,7 @@ getContentType
  ()L0java/lang/String; # @Inherited(org.springframework.web.multipart.MultipartFile)
 getInputStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockMultipartHttpServletRequest.eea b/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockMultipartHttpServletRequest.eea
index ea99254908..04bf8ec5e1 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockMultipartHttpServletRequest.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockMultipartHttpServletRequest.eea
@@ -20,7 +20,7 @@ getFiles
  (Ljava/lang/String;)Ljava/util/List<Lorg/springframework/web/multipart/MultipartFile;>;
 getMultiFileMap
  ()Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Lorg/springframework/web/multipart/MultipartFile;>;
- ()Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Lorg/springframework/web/multipart/MultipartFile;>;
+ ()L1org/springframework/util/MultiValueMap<Ljava/lang/String;Lorg/springframework/web/multipart/MultipartFile;>;
 getMultipartContentType
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)L0java/lang/String; # @Inherited(org.springframework.web.multipart.MultipartRequest)
@@ -29,7 +29,7 @@ getMultipartHeaders
  (Ljava/lang/String;)L0org/springframework/http/HttpHeaders; # @Inherited(org.springframework.web.multipart.MultipartHttpServletRequest)
 getRequestHeaders
  ()Lorg/springframework/http/HttpHeaders;
- ()Lorg/springframework/http/HttpHeaders;
+ ()L1org/springframework/http/HttpHeaders;
 getRequestMethod
  ()Lorg/springframework/http/HttpMethod;
  ()L0org/springframework/http/HttpMethod; # @Inherited(org.springframework.web.multipart.MultipartHttpServletRequest)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockPart.eea b/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockPart.eea
index 841b90711d..5530d54fc3 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockPart.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockPart.eea
@@ -26,7 +26,7 @@ getHeaders
  (Ljava/lang/String;)Ljava/util/Collection<Ljava/lang/String;>;
 getInputStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockServletContext.eea b/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockServletContext.eea
index 74f3f0d733..8090c6c5bc 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockServletContext.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/MockServletContext.eea
@@ -11,19 +11,19 @@ class org/springframework/mock/web/MockServletContext
  (Lorg/springframework/core/io/ResourceLoader;)V
 addFilter
  (Ljava/lang/String;Ljakarta/servlet/Filter;)Ljakarta/servlet/FilterRegistration$Dynamic;
- (Ljava/lang/String;Ljakarta/servlet/Filter;)Ljakarta/servlet/FilterRegistration$Dynamic;
+ (Ljava/lang/String;Ljakarta/servlet/Filter;)L1jakarta/servlet/FilterRegistration$Dynamic;
 addFilter
  (Ljava/lang/String;Ljava/lang/Class<+Ljakarta/servlet/Filter;>;)Ljakarta/servlet/FilterRegistration$Dynamic;
- (Ljava/lang/String;Ljava/lang/Class<+Ljakarta/servlet/Filter;>;)Ljakarta/servlet/FilterRegistration$Dynamic;
+ (Ljava/lang/String;Ljava/lang/Class<+Ljakarta/servlet/Filter;>;)L1jakarta/servlet/FilterRegistration$Dynamic;
 addFilter
  (Ljava/lang/String;Ljava/lang/String;)Ljakarta/servlet/FilterRegistration$Dynamic;
- (Ljava/lang/String;Ljava/lang/String;)Ljakarta/servlet/FilterRegistration$Dynamic;
+ (Ljava/lang/String;Ljava/lang/String;)L1jakarta/servlet/FilterRegistration$Dynamic;
 addInitParameter
  (Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;)V
 addJspFile
  (Ljava/lang/String;Ljava/lang/String;)Ljakarta/servlet/ServletRegistration$Dynamic;
- (Ljava/lang/String;Ljava/lang/String;)Ljakarta/servlet/ServletRegistration$Dynamic;
+ (Ljava/lang/String;Ljava/lang/String;)L1jakarta/servlet/ServletRegistration$Dynamic;
 addListener
  (Ljava/lang/Class<+Ljava/util/EventListener;>;)V
  (Ljava/lang/Class<+Ljava/util/EventListener;>;)V
@@ -38,22 +38,22 @@ addMimeType
  (Ljava/lang/String;Lorg/springframework/http/MediaType;)V
 addServlet
  (Ljava/lang/String;Ljakarta/servlet/Servlet;)Ljakarta/servlet/ServletRegistration$Dynamic;
- (Ljava/lang/String;Ljakarta/servlet/Servlet;)Ljakarta/servlet/ServletRegistration$Dynamic;
+ (Ljava/lang/String;Ljakarta/servlet/Servlet;)L1jakarta/servlet/ServletRegistration$Dynamic;
 addServlet
  (Ljava/lang/String;Ljava/lang/Class<+Ljakarta/servlet/Servlet;>;)Ljakarta/servlet/ServletRegistration$Dynamic;
- (Ljava/lang/String;Ljava/lang/Class<+Ljakarta/servlet/Servlet;>;)Ljakarta/servlet/ServletRegistration$Dynamic;
+ (Ljava/lang/String;Ljava/lang/Class<+Ljakarta/servlet/Servlet;>;)L1jakarta/servlet/ServletRegistration$Dynamic;
 addServlet
  (Ljava/lang/String;Ljava/lang/String;)Ljakarta/servlet/ServletRegistration$Dynamic;
- (Ljava/lang/String;Ljava/lang/String;)Ljakarta/servlet/ServletRegistration$Dynamic;
+ (Ljava/lang/String;Ljava/lang/String;)L1jakarta/servlet/ServletRegistration$Dynamic;
 createFilter
  <T::Ljakarta/servlet/Filter;>(Ljava/lang/Class<TT;>;)TT;
- <T::Ljakarta/servlet/Filter;>(Ljava/lang/Class<TT;>;)TT;
+ <T::Ljakarta/servlet/Filter;>(Ljava/lang/Class<TT;>;)T1T;
 createListener
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)TT;
- <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)TT;
+ <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)T1T;
 createServlet
  <T::Ljakarta/servlet/Servlet;>(Ljava/lang/Class<TT;>;)TT;
- <T::Ljakarta/servlet/Servlet;>(Ljava/lang/Class<TT;>;)TT;
+ <T::Ljakarta/servlet/Servlet;>(Ljava/lang/Class<TT;>;)T1T;
 declareRoles
  ([Ljava/lang/String;)V
  ([Ljava/lang/String;)V
@@ -98,7 +98,7 @@ getInitParameterNames
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
 getJspConfigDescriptor
  ()Ljakarta/servlet/descriptor/JspConfigDescriptor;
- ()Ljakarta/servlet/descriptor/JspConfigDescriptor;
+ ()L1jakarta/servlet/descriptor/JspConfigDescriptor;
 getMimeType
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)L0java/lang/String;
@@ -113,7 +113,7 @@ getRequestCharacterEncoding
  ()L0java/lang/String;
 getRequestDispatcher
  (Ljava/lang/String;)Ljakarta/servlet/RequestDispatcher;
- (Ljava/lang/String;)Ljakarta/servlet/RequestDispatcher;
+ (Ljava/lang/String;)L1jakarta/servlet/RequestDispatcher;
 getResource
  (Ljava/lang/String;)Ljava/net/URL;
  (Ljava/lang/String;)L0java/net/URL;
@@ -122,7 +122,7 @@ getResourceAsStream
  (Ljava/lang/String;)L0java/io/InputStream;
 getResourceLocation
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 getResourcePaths
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
  (Ljava/lang/String;)L0java/util/Set<Ljava/lang/String;>;
@@ -131,7 +131,7 @@ getResponseCharacterEncoding
  ()L0java/lang/String;
 getServerInfo
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getServletContextName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -146,7 +146,7 @@ getSessionCookieConfig
  ()Ljakarta/servlet/SessionCookieConfig;
 getVirtualServerName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 log
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/reactive/function/server/MockServerRequest.eea b/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/reactive/function/server/MockServerRequest.eea
index 5a22fd5b08..3cd766683a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/reactive/function/server/MockServerRequest.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/reactive/function/server/MockServerRequest.eea
@@ -2,7 +2,7 @@ class org/springframework/mock/web/reactive/function/server/MockServerRequest
 
 builder
  ()Lorg/springframework/mock/web/reactive/function/server/MockServerRequest$Builder;
- ()Lorg/springframework/mock/web/reactive/function/server/MockServerRequest$Builder;
+ ()L1org/springframework/mock/web/reactive/function/server/MockServerRequest$Builder;
 
 attributes
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/server/MockServerWebExchange.eea b/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/server/MockServerWebExchange.eea
index 69bec5f024..68371514f8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/server/MockServerWebExchange.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/mock/web/server/MockServerWebExchange.eea
@@ -2,10 +2,10 @@ class org/springframework/mock/web/server/MockServerWebExchange
 
 builder
  (Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BaseBuilder<*>;)Lorg/springframework/mock/web/server/MockServerWebExchange$Builder;
- (Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BaseBuilder<*>;)Lorg/springframework/mock/web/server/MockServerWebExchange$Builder;
+ (Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BaseBuilder<*>;)L1org/springframework/mock/web/server/MockServerWebExchange$Builder;
 builder
  (Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest;)Lorg/springframework/mock/web/server/MockServerWebExchange$Builder;
- (Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest;)Lorg/springframework/mock/web/server/MockServerWebExchange$Builder;
+ (Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest;)L1org/springframework/mock/web/server/MockServerWebExchange$Builder;
 from
  (Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BaseBuilder<*>;)Lorg/springframework/mock/web/server/MockServerWebExchange;
  (Lorg/springframework/mock/http/server/reactive/MockServerHttpRequest$BaseBuilder<*>;)Lorg/springframework/mock/web/server/MockServerWebExchange;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/objenesis/instantiator/basic/FailingInstantiator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/objenesis/instantiator/basic/FailingInstantiator.eea
index 66234642ed..da8f1000cc 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/objenesis/instantiator/basic/FailingInstantiator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/objenesis/instantiator/basic/FailingInstantiator.eea
@@ -11,4 +11,4 @@ super org/springframework/objenesis/instantiator/ObjectInstantiator
  (Ljava/lang/Class<TT;>;)V
 newInstance
  ()TT;
- ()TT;
+ ()T1T;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/objenesis/instantiator/basic/NullInstantiator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/objenesis/instantiator/basic/NullInstantiator.eea
index 4d199109db..178ea94174 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/objenesis/instantiator/basic/NullInstantiator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/objenesis/instantiator/basic/NullInstantiator.eea
@@ -11,4 +11,4 @@ super org/springframework/objenesis/instantiator/ObjectInstantiator
  (Ljava/lang/Class<TT;>;)V
 newInstance
  ()TT;
- ()TT;
+ ()T0T;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/objenesis/instantiator/util/ClassUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/objenesis/instantiator/util/ClassUtils.eea
index 8850d2aaf3..bd4999e557 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/objenesis/instantiator/util/ClassUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/objenesis/instantiator/util/ClassUtils.eea
@@ -5,10 +5,10 @@ classNameToInternalClassName
  (Ljava/lang/String;)Ljava/lang/String;
 classNameToResource
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 getExistingClass
  <T:Ljava/lang/Object;>(Ljava/lang/ClassLoader;Ljava/lang/String;)Ljava/lang/Class<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/ClassLoader;Ljava/lang/String;)Ljava/lang/Class<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/ClassLoader;Ljava/lang/String;)L0java/lang/Class<TT;>;
 newInstance
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)TT;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/objenesis/strategy/PlatformDescription.eea b/libs/eea-spring-6/src/main/resources/org/springframework/objenesis/strategy/PlatformDescription.eea
index 41b033a6b3..e326615b73 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/objenesis/strategy/PlatformDescription.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/objenesis/strategy/PlatformDescription.eea
@@ -42,7 +42,7 @@ VM_VERSION
 
 describePlatform
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 isThisJVM
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/objenesis/strategy/SerializingInstantiatorStrategy.eea b/libs/eea-spring-6/src/main/resources/org/springframework/objenesis/strategy/SerializingInstantiatorStrategy.eea
index 87f70cd653..76bcc508d4 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/objenesis/strategy/SerializingInstantiatorStrategy.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/objenesis/strategy/SerializingInstantiatorStrategy.eea
@@ -2,4 +2,4 @@ class org/springframework/objenesis/strategy/SerializingInstantiatorStrategy
 
 newInstantiatorOf
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/objenesis/instantiator/ObjectInstantiator<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/objenesis/instantiator/ObjectInstantiator<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1org/springframework/objenesis/instantiator/ObjectInstantiator<TT;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/objenesis/strategy/StdInstantiatorStrategy.eea b/libs/eea-spring-6/src/main/resources/org/springframework/objenesis/strategy/StdInstantiatorStrategy.eea
index 9c1ef42028..20bf752702 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/objenesis/strategy/StdInstantiatorStrategy.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/objenesis/strategy/StdInstantiatorStrategy.eea
@@ -2,4 +2,4 @@ class org/springframework/objenesis/strategy/StdInstantiatorStrategy
 
 newInstantiatorOf
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/objenesis/instantiator/ObjectInstantiator<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/objenesis/instantiator/ObjectInstantiator<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1org/springframework/objenesis/instantiator/ObjectInstantiator<TT;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/orm/hibernate5/HibernateTemplate.eea b/libs/eea-spring-6/src/main/resources/org/springframework/orm/hibernate5/HibernateTemplate.eea
index 22bf9c3564..b116254e0b 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/orm/hibernate5/HibernateTemplate.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/orm/hibernate5/HibernateTemplate.eea
@@ -24,7 +24,7 @@ contains
  (Ljava/lang/Object;)Z
 createSessionProxy
  (Lorg/hibernate/Session;)Lorg/hibernate/Session;
- (Lorg/hibernate/Session;)Lorg/hibernate/Session;
+ (Lorg/hibernate/Session;)L1org/hibernate/Session;
 delete
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/orm/hibernate5/HibernateTransactionManager.eea b/libs/eea-spring-6/src/main/resources/org/springframework/orm/hibernate5/HibernateTransactionManager.eea
index 74e044a169..40ab98d511 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/orm/hibernate5/HibernateTransactionManager.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/orm/hibernate5/HibernateTransactionManager.eea
@@ -20,7 +20,7 @@ doCommit
  (Lorg/springframework/transaction/support/DefaultTransactionStatus;)V
 doGetTransaction
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 doResume
  (Ljava/lang/Object;Ljava/lang/Object;)V
  (Ljava/lang/Object;Ljava/lang/Object;)V
@@ -32,7 +32,7 @@ doSetRollbackOnly
  (Lorg/springframework/transaction/support/DefaultTransactionStatus;)V
 doSuspend
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object; # @Inherited(org.springframework.transaction.support.AbstractPlatformTransactionManager)
 getDataSource
  ()Ljavax/sql/DataSource;
  ()L0javax/sql/DataSource;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/orm/hibernate5/support/HibernateDaoSupport.eea b/libs/eea-spring-6/src/main/resources/org/springframework/orm/hibernate5/support/HibernateDaoSupport.eea
index e2901484cf..1fe21070ab 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/orm/hibernate5/support/HibernateDaoSupport.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/orm/hibernate5/support/HibernateDaoSupport.eea
@@ -2,7 +2,7 @@ class org/springframework/orm/hibernate5/support/HibernateDaoSupport
 
 createHibernateTemplate
  (Lorg/hibernate/SessionFactory;)Lorg/springframework/orm/hibernate5/HibernateTemplate;
- (Lorg/hibernate/SessionFactory;)Lorg/springframework/orm/hibernate5/HibernateTemplate;
+ (Lorg/hibernate/SessionFactory;)L1org/springframework/orm/hibernate5/HibernateTemplate;
 currentSession
  ()Lorg/hibernate/Session;
  ()Lorg/hibernate/Session;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/orm/hibernate5/support/OpenSessionInViewInterceptor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/orm/hibernate5/support/OpenSessionInViewInterceptor.eea
index dd104ce41a..a392873725 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/orm/hibernate5/support/OpenSessionInViewInterceptor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/orm/hibernate5/support/OpenSessionInViewInterceptor.eea
@@ -16,7 +16,7 @@ afterConcurrentHandlingStarted
  (Lorg/springframework/web/context/request/WebRequest;)V
 getParticipateAttributeName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSessionFactory
  ()Lorg/hibernate/SessionFactory;
  ()L0org/hibernate/SessionFactory;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.eea
index a0c9a844e8..8b1bcafffe 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.eea
@@ -10,13 +10,13 @@ logger
 
 createEntityManagerFactoryProxy
  (Ljakarta/persistence/EntityManagerFactory;)Ljakarta/persistence/EntityManagerFactory;
- (Ljakarta/persistence/EntityManagerFactory;)Ljakarta/persistence/EntityManagerFactory;
+ (Ljakarta/persistence/EntityManagerFactory;)L1jakarta/persistence/EntityManagerFactory;
 createNativeEntityManager
  (Ljava/util/Map<**>;)Ljakarta/persistence/EntityManager;
- (Ljava/util/Map<**>;)Ljakarta/persistence/EntityManager;
+ (Ljava/util/Map<**>;)L1jakarta/persistence/EntityManager; # @Inherited(org.springframework.orm.jpa.EntityManagerFactoryInfo)
 createNativeEntityManagerFactory
  ()Ljakarta/persistence/EntityManagerFactory;
- ()Ljakarta/persistence/EntityManagerFactory;
+ ()L1jakarta/persistence/EntityManagerFactory;
 getBeanClassLoader
  ()Ljava/lang/ClassLoader;
  ()Ljava/lang/ClassLoader;
@@ -46,7 +46,7 @@ getObject
  ()L0jakarta/persistence/EntityManagerFactory;
 getObjectType
  ()Ljava/lang/Class<+Ljakarta/persistence/EntityManagerFactory;>;
- ()Ljava/lang/Class<+Ljakarta/persistence/EntityManagerFactory;>;
+ ()L1java/lang/Class<+Ljakarta/persistence/EntityManagerFactory;>;
 getPersistenceProvider
  ()Ljakarta/persistence/spi/PersistenceProvider;
  ()L0jakarta/persistence/spi/PersistenceProvider; # @Inherited(org.springframework.orm.jpa.EntityManagerFactoryInfo)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/EntityManagerFactoryAccessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/EntityManagerFactoryAccessor.eea
index 876ff94fcc..b744785b96 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/EntityManagerFactoryAccessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/EntityManagerFactoryAccessor.eea
@@ -6,7 +6,7 @@ logger
 
 createEntityManager
  ()Ljakarta/persistence/EntityManager;
- ()Ljakarta/persistence/EntityManager;
+ ()L1jakarta/persistence/EntityManager;
 getEntityManagerFactory
  ()Ljakarta/persistence/EntityManagerFactory;
  ()L0jakarta/persistence/EntityManagerFactory;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/EntityManagerFactoryInfo.eea b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/EntityManagerFactoryInfo.eea
index 395d7e2d61..c7a2cf482a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/EntityManagerFactoryInfo.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/EntityManagerFactoryInfo.eea
@@ -2,7 +2,7 @@ class org/springframework/orm/jpa/EntityManagerFactoryInfo
 
 createNativeEntityManager
  (Ljava/util/Map<**>;)Ljakarta/persistence/EntityManager;
- (Ljava/util/Map<**>;)Ljakarta/persistence/EntityManager;
+ (Ljava/util/Map<**>;)L1jakarta/persistence/EntityManager;
 getBeanClassLoader
  ()Ljava/lang/ClassLoader;
  ()Ljava/lang/ClassLoader;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/ExtendedEntityManagerCreator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/ExtendedEntityManagerCreator.eea
index a26667111f..cfb0279cf3 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/ExtendedEntityManagerCreator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/ExtendedEntityManagerCreator.eea
@@ -2,19 +2,19 @@ class org/springframework/orm/jpa/ExtendedEntityManagerCreator
 
 createApplicationManagedEntityManager
  (Ljakarta/persistence/EntityManager;Lorg/springframework/orm/jpa/EntityManagerFactoryInfo;)Ljakarta/persistence/EntityManager;
- (Ljakarta/persistence/EntityManager;Lorg/springframework/orm/jpa/EntityManagerFactoryInfo;)Ljakarta/persistence/EntityManager;
+ (Ljakarta/persistence/EntityManager;Lorg/springframework/orm/jpa/EntityManagerFactoryInfo;)L1jakarta/persistence/EntityManager;
 createApplicationManagedEntityManager
  (Ljakarta/persistence/EntityManager;Lorg/springframework/orm/jpa/EntityManagerFactoryInfo;Z)Ljakarta/persistence/EntityManager;
- (Ljakarta/persistence/EntityManager;Lorg/springframework/orm/jpa/EntityManagerFactoryInfo;Z)Ljakarta/persistence/EntityManager;
+ (Ljakarta/persistence/EntityManager;Lorg/springframework/orm/jpa/EntityManagerFactoryInfo;Z)L1jakarta/persistence/EntityManager;
 createContainerManagedEntityManager
  (Ljakarta/persistence/EntityManager;Lorg/springframework/orm/jpa/EntityManagerFactoryInfo;)Ljakarta/persistence/EntityManager;
- (Ljakarta/persistence/EntityManager;Lorg/springframework/orm/jpa/EntityManagerFactoryInfo;)Ljakarta/persistence/EntityManager;
+ (Ljakarta/persistence/EntityManager;Lorg/springframework/orm/jpa/EntityManagerFactoryInfo;)L1jakarta/persistence/EntityManager;
 createContainerManagedEntityManager
  (Ljakarta/persistence/EntityManagerFactory;)Ljakarta/persistence/EntityManager;
- (Ljakarta/persistence/EntityManagerFactory;)Ljakarta/persistence/EntityManager;
+ (Ljakarta/persistence/EntityManagerFactory;)L1jakarta/persistence/EntityManager;
 createContainerManagedEntityManager
  (Ljakarta/persistence/EntityManagerFactory;Ljava/util/Map<**>;)Ljakarta/persistence/EntityManager;
- (Ljakarta/persistence/EntityManagerFactory;Ljava/util/Map<**>;)Ljakarta/persistence/EntityManager;
+ (Ljakarta/persistence/EntityManagerFactory;Ljava/util/Map<**>;)L1jakarta/persistence/EntityManager;
 createContainerManagedEntityManager
  (Ljakarta/persistence/EntityManagerFactory;Ljava/util/Map<**>;Z)Ljakarta/persistence/EntityManager;
- (Ljakarta/persistence/EntityManagerFactory;Ljava/util/Map<**>;Z)Ljakarta/persistence/EntityManager;
+ (Ljakarta/persistence/EntityManagerFactory;Ljava/util/Map<**>;Z)L1jakarta/persistence/EntityManager;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/JpaTransactionManager.eea b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/JpaTransactionManager.eea
index d0b47c20f5..c98502125b 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/JpaTransactionManager.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/JpaTransactionManager.eea
@@ -8,7 +8,7 @@ closeEntityManagerAfterFailedBegin
  (Lorg/springframework/orm/jpa/JpaTransactionManager$JpaTransactionObject;)V
 createEntityManagerForTransaction
  ()Ljakarta/persistence/EntityManager;
- ()Ljakarta/persistence/EntityManager;
+ ()L1jakarta/persistence/EntityManager;
 doBegin
  (Ljava/lang/Object;Lorg/springframework/transaction/TransactionDefinition;)V
  (Ljava/lang/Object;Lorg/springframework/transaction/TransactionDefinition;)V
@@ -20,7 +20,7 @@ doCommit
  (Lorg/springframework/transaction/support/DefaultTransactionStatus;)V
 doGetTransaction
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 doResume
  (Ljava/lang/Object;Ljava/lang/Object;)V
  (Ljava/lang/Object;Ljava/lang/Object;)V
@@ -32,7 +32,7 @@ doSetRollbackOnly
  (Lorg/springframework/transaction/support/DefaultTransactionStatus;)V
 doSuspend
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object; # @Inherited(org.springframework.transaction.support.AbstractPlatformTransactionManager)
 getDataSource
  ()Ljavax/sql/DataSource;
  ()L0javax/sql/DataSource;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/JpaVendorAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/JpaVendorAdapter.eea
index e1912d4bc9..2749ce2a7a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/JpaVendorAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/JpaVendorAdapter.eea
@@ -2,10 +2,10 @@ class org/springframework/orm/jpa/JpaVendorAdapter
 
 getEntityManagerFactoryInterface
  ()Ljava/lang/Class<+Ljakarta/persistence/EntityManagerFactory;>;
- ()Ljava/lang/Class<+Ljakarta/persistence/EntityManagerFactory;>;
+ ()L1java/lang/Class<+Ljakarta/persistence/EntityManagerFactory;>;
 getEntityManagerInterface
  ()Ljava/lang/Class<+Ljakarta/persistence/EntityManager;>;
- ()Ljava/lang/Class<+Ljakarta/persistence/EntityManager;>;
+ ()L1java/lang/Class<+Ljakarta/persistence/EntityManager;>;
 getJpaDialect
  ()Lorg/springframework/orm/jpa/JpaDialect;
  ()L0org/springframework/orm/jpa/JpaDialect;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.eea
index 03def79ffe..4134cc374c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.eea
@@ -2,7 +2,7 @@ class org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean
 
 createNativeEntityManagerFactory
  ()Ljakarta/persistence/EntityManagerFactory;
- ()Ljakarta/persistence/EntityManagerFactory;
+ ()L1jakarta/persistence/EntityManagerFactory; # @Inherited(org.springframework.orm.jpa.AbstractEntityManagerFactoryBean)
 determinePersistenceUnitInfo
  (Lorg/springframework/orm/jpa/persistenceunit/PersistenceUnitManager;)Ljakarta/persistence/spi/PersistenceUnitInfo;
  (Lorg/springframework/orm/jpa/persistenceunit/PersistenceUnitManager;)Ljakarta/persistence/spi/PersistenceUnitInfo;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.eea
index 2c719e331f..9316cc8a71 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.eea
@@ -2,4 +2,4 @@ class org/springframework/orm/jpa/LocalEntityManagerFactoryBean
 
 createNativeEntityManagerFactory
  ()Ljakarta/persistence/EntityManagerFactory;
- ()Ljakarta/persistence/EntityManagerFactory;
+ ()L1jakarta/persistence/EntityManagerFactory; # @Inherited(org.springframework.orm.jpa.AbstractEntityManagerFactoryBean)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/SharedEntityManagerCreator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/SharedEntityManagerCreator.eea
index 3cbff8a54c..ebc12a3107 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/SharedEntityManagerCreator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/SharedEntityManagerCreator.eea
@@ -2,16 +2,16 @@ class org/springframework/orm/jpa/SharedEntityManagerCreator
 
 createSharedEntityManager
  (Ljakarta/persistence/EntityManagerFactory;)Ljakarta/persistence/EntityManager;
- (Ljakarta/persistence/EntityManagerFactory;)Ljakarta/persistence/EntityManager;
+ (Ljakarta/persistence/EntityManagerFactory;)L1jakarta/persistence/EntityManager;
 createSharedEntityManager
  (Ljakarta/persistence/EntityManagerFactory;Ljava/util/Map<**>;)Ljakarta/persistence/EntityManager;
- (Ljakarta/persistence/EntityManagerFactory;Ljava/util/Map<**>;)Ljakarta/persistence/EntityManager;
+ (Ljakarta/persistence/EntityManagerFactory;Ljava/util/Map<**>;)L1jakarta/persistence/EntityManager;
 createSharedEntityManager
  (Ljakarta/persistence/EntityManagerFactory;Ljava/util/Map<**>;Z)Ljakarta/persistence/EntityManager;
- (Ljakarta/persistence/EntityManagerFactory;Ljava/util/Map<**>;Z)Ljakarta/persistence/EntityManager;
+ (Ljakarta/persistence/EntityManagerFactory;Ljava/util/Map<**>;Z)L1jakarta/persistence/EntityManager;
 createSharedEntityManager
  (Ljakarta/persistence/EntityManagerFactory;Ljava/util/Map<**>;Z[Ljava/lang/Class<*>;)Ljakarta/persistence/EntityManager;
- (Ljakarta/persistence/EntityManagerFactory;Ljava/util/Map<**>;Z[Ljava/lang/Class<*>;)Ljakarta/persistence/EntityManager;
+ (Ljakarta/persistence/EntityManagerFactory;Ljava/util/Map<**>;Z[Ljava/lang/Class<*>;)L1jakarta/persistence/EntityManager;
 createSharedEntityManager
  (Ljakarta/persistence/EntityManagerFactory;Ljava/util/Map<**>;[Ljava/lang/Class<*>;)Ljakarta/persistence/EntityManager;
- (Ljakarta/persistence/EntityManagerFactory;Ljava/util/Map<**>;[Ljava/lang/Class<*>;)Ljakarta/persistence/EntityManager;
+ (Ljakarta/persistence/EntityManagerFactory;Ljava/util/Map<**>;[Ljava/lang/Class<*>;)L1jakarta/persistence/EntityManager;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.eea b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.eea
index c2e659d5ab..667fe7258e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.eea
@@ -38,7 +38,7 @@ getMappingFileNames
  ()Ljava/util/List<Ljava/lang/String;>;
 getNewTempClassLoader
  ()Ljava/lang/ClassLoader;
- ()Ljava/lang/ClassLoader;
+ ()L1java/lang/ClassLoader;
 getNonJtaDataSource
  ()Ljavax/sql/DataSource;
  ()L0javax/sql/DataSource;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypes.eea b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypes.eea
index 4d869ff835..be0e5c5454 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypes.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypes.eea
@@ -2,10 +2,10 @@ class org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypes
 
 of
  (Ljava/util/List<Ljava/lang/String;>;Ljava/util/List<Ljava/lang/String;>;)Lorg/springframework/orm/jpa/persistenceunit/PersistenceManagedTypes;
- (Ljava/util/List<Ljava/lang/String;>;Ljava/util/List<Ljava/lang/String;>;)Lorg/springframework/orm/jpa/persistenceunit/PersistenceManagedTypes;
+ (Ljava/util/List<Ljava/lang/String;>;Ljava/util/List<Ljava/lang/String;>;)L1org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypes;
 of
  ([Ljava/lang/String;)Lorg/springframework/orm/jpa/persistenceunit/PersistenceManagedTypes;
- ([Ljava/lang/String;)Lorg/springframework/orm/jpa/persistenceunit/PersistenceManagedTypes;
+ ([Ljava/lang/String;)L1org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypes;
 
 getManagedClassNames
  ()Ljava/util/List<Ljava/lang/String;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.eea
index 137cb81496..6075f09499 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.eea
@@ -6,7 +6,7 @@ DEFAULT_ENTITY_MANAGER_FACTORY_BEAN_NAME
 
 createEntityManager
  (Ljakarta/persistence/EntityManagerFactory;)Ljakarta/persistence/EntityManager;
- (Ljakarta/persistence/EntityManagerFactory;)Ljakarta/persistence/EntityManager;
+ (Ljakarta/persistence/EntityManagerFactory;)L1jakarta/persistence/EntityManager;
 doFilterInternal
  (Ljakarta/servlet/http/HttpServletRequest;Ljakarta/servlet/http/HttpServletResponse;Ljakarta/servlet/FilterChain;)V
  (Ljakarta/servlet/http/HttpServletRequest;Ljakarta/servlet/http/HttpServletResponse;Ljakarta/servlet/FilterChain;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.eea
index b1c1c62c39..dc4ff8bad8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.eea
@@ -12,7 +12,7 @@ afterConcurrentHandlingStarted
  (Lorg/springframework/web/context/request/WebRequest;)V
 getParticipateAttributeName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 postHandle
  (Lorg/springframework/web/context/request/WebRequest;Lorg/springframework/ui/ModelMap;)V
  (Lorg/springframework/web/context/request/WebRequest;Lorg/springframework/ui/ModelMap;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/support/SharedEntityManagerBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/support/SharedEntityManagerBean.eea
index a218bbdab0..d835653854 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/support/SharedEntityManagerBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/support/SharedEntityManagerBean.eea
@@ -9,7 +9,7 @@ getObject
  ()L0jakarta/persistence/EntityManager;
 getObjectType
  ()Ljava/lang/Class<+Ljakarta/persistence/EntityManager;>;
- ()Ljava/lang/Class<+Ljakarta/persistence/EntityManager;>;
+ ()L1java/lang/Class<+Ljakarta/persistence/EntityManager;>;
 setEntityManagerInterface
  (Ljava/lang/Class<+Ljakarta/persistence/EntityManager;>;)V
  (Ljava/lang/Class<+Ljakarta/persistence/EntityManager;>;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.eea
index 023723ddbb..1b24154613 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.eea
@@ -8,10 +8,10 @@ getDatabasePlatform
  ()L0java/lang/String;
 getEntityManagerFactoryInterface
  ()Ljava/lang/Class<+Ljakarta/persistence/EntityManagerFactory;>;
- ()Ljava/lang/Class<+Ljakarta/persistence/EntityManagerFactory;>;
+ ()L1java/lang/Class<+Ljakarta/persistence/EntityManagerFactory;>; # @Inherited(org.springframework.orm.jpa.JpaVendorAdapter)
 getEntityManagerInterface
  ()Ljava/lang/Class<+Ljakarta/persistence/EntityManager;>;
- ()Ljava/lang/Class<+Ljakarta/persistence/EntityManager;>;
+ ()L1java/lang/Class<+Ljakarta/persistence/EntityManager;>; # @Inherited(org.springframework.orm.jpa.JpaVendorAdapter)
 getJpaDialect
  ()Lorg/springframework/orm/jpa/JpaDialect;
  ()L0org/springframework/orm/jpa/JpaDialect; # @Inherited(org.springframework.orm.jpa.JpaVendorAdapter)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.eea
index 3caffd85d9..3e45c36e15 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.eea
@@ -5,13 +5,13 @@ determineTargetDatabaseName
  (Lorg/springframework/orm/jpa/vendor/Database;)L0java/lang/String;
 getEntityManagerInterface
  ()Ljava/lang/Class<+Ljakarta/persistence/EntityManager;>;
- ()Ljava/lang/Class<+Ljakarta/persistence/EntityManager;>;
+ ()L1java/lang/Class<+Ljakarta/persistence/EntityManager;>; # @Inherited(org.springframework.orm.jpa.vendor.AbstractJpaVendorAdapter)
 getJpaDialect
  ()Lorg/springframework/orm/jpa/vendor/EclipseLinkJpaDialect;
  ()Lorg/springframework/orm/jpa/vendor/EclipseLinkJpaDialect;
 getJpaPropertyMap
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ ()L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 getPersistenceProvider
  ()Ljakarta/persistence/spi/PersistenceProvider;
  ()Ljakarta/persistence/spi/PersistenceProvider;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.eea
index 9b1e1f369e..9c5712aaf0 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.eea
@@ -5,10 +5,10 @@ determineDatabaseDialectClass
  (Lorg/springframework/orm/jpa/vendor/Database;)L0java/lang/Class<*>;
 getEntityManagerFactoryInterface
  ()Ljava/lang/Class<+Ljakarta/persistence/EntityManagerFactory;>;
- ()Ljava/lang/Class<+Ljakarta/persistence/EntityManagerFactory;>;
+ ()L1java/lang/Class<+Ljakarta/persistence/EntityManagerFactory;>; # @Inherited(org.springframework.orm.jpa.vendor.AbstractJpaVendorAdapter)
 getEntityManagerInterface
  ()Ljava/lang/Class<+Ljakarta/persistence/EntityManager;>;
- ()Ljava/lang/Class<+Ljakarta/persistence/EntityManager;>;
+ ()L1java/lang/Class<+Ljakarta/persistence/EntityManager;>; # @Inherited(org.springframework.orm.jpa.vendor.AbstractJpaVendorAdapter)
 getJpaDialect
  ()Lorg/springframework/orm/jpa/vendor/HibernateJpaDialect;
  ()Lorg/springframework/orm/jpa/vendor/HibernateJpaDialect;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/oxm/jaxb/Jaxb2Marshaller.eea b/libs/eea-spring-6/src/main/resources/org/springframework/oxm/jaxb/Jaxb2Marshaller.eea
index e153ad362d..7e76d3c500 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/oxm/jaxb/Jaxb2Marshaller.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/oxm/jaxb/Jaxb2Marshaller.eea
@@ -6,13 +6,13 @@ logger
 
 convertJaxbException
  (Ljakarta/xml/bind/JAXBException;)Lorg/springframework/oxm/XmlMappingException;
- (Ljakarta/xml/bind/JAXBException;)Lorg/springframework/oxm/XmlMappingException;
+ (Ljakarta/xml/bind/JAXBException;)L1org/springframework/oxm/XmlMappingException;
 createMarshaller
  ()Ljakarta/xml/bind/Marshaller;
- ()Ljakarta/xml/bind/Marshaller;
+ ()L1jakarta/xml/bind/Marshaller;
 createUnmarshaller
  ()Ljakarta/xml/bind/Unmarshaller;
- ()Ljakarta/xml/bind/Unmarshaller;
+ ()L1jakarta/xml/bind/Unmarshaller;
 getClassesToBeBound
  ()[Ljava/lang/Class<*>;
  ()[0Ljava/lang/Class<*>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/oxm/support/AbstractMarshaller.eea b/libs/eea-spring-6/src/main/resources/org/springframework/oxm/support/AbstractMarshaller.eea
index 6862c033e1..b9e144164a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/oxm/support/AbstractMarshaller.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/oxm/support/AbstractMarshaller.eea
@@ -9,13 +9,13 @@ buildDocument
  ()Lorg/w3c/dom/Document;
 createDocumentBuilder
  (Ljavax/xml/parsers/DocumentBuilderFactory;)Ljavax/xml/parsers/DocumentBuilder;
- (Ljavax/xml/parsers/DocumentBuilderFactory;)Ljavax/xml/parsers/DocumentBuilder;
+ (Ljavax/xml/parsers/DocumentBuilderFactory;)L1javax/xml/parsers/DocumentBuilder;
 createDocumentBuilderFactory
  ()Ljavax/xml/parsers/DocumentBuilderFactory;
- ()Ljavax/xml/parsers/DocumentBuilderFactory;
+ ()L1javax/xml/parsers/DocumentBuilderFactory;
 createXmlReader
  ()Lorg/xml/sax/XMLReader;
- ()Lorg/xml/sax/XMLReader;
+ ()L1org/xml/sax/XMLReader;
 getDefaultEncoding
  ()Ljava/lang/String;
  ()L0java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/oxm/support/SaxResourceUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/oxm/support/SaxResourceUtils.eea
index 2e0b072c7f..4c8f1b9cfe 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/oxm/support/SaxResourceUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/oxm/support/SaxResourceUtils.eea
@@ -2,4 +2,4 @@ class org/springframework/oxm/support/SaxResourceUtils
 
 createInputSource
  (Lorg/springframework/core/io/Resource;)Lorg/xml/sax/InputSource;
- (Lorg/springframework/core/io/Resource;)Lorg/xml/sax/InputSource;
+ (Lorg/springframework/core/io/Resource;)L1org/xml/sax/InputSource;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/oxm/xstream/CatchAllConverter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/oxm/xstream/CatchAllConverter.eea
index 8873e37bc9..b9e6a96f9f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/oxm/xstream/CatchAllConverter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/oxm/xstream/CatchAllConverter.eea
@@ -8,4 +8,4 @@ marshal
  (Ljava/lang/Object;Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Lcom/thoughtworks/xstream/converters/MarshallingContext;)V
 unmarshal
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;)Ljava/lang/Object;
- (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;)Ljava/lang/Object;
+ (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;)L1java/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/oxm/xstream/XStreamMarshaller.eea b/libs/eea-spring-6/src/main/resources/org/springframework/oxm/xstream/XStreamMarshaller.eea
index f68f99a873..7ce3dc7b5e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/oxm/xstream/XStreamMarshaller.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/oxm/xstream/XStreamMarshaller.eea
@@ -15,7 +15,7 @@ constructXStream
  ()Lcom/thoughtworks/xstream/XStream;
 convertXStreamException
  (Ljava/lang/Exception;Z)Lorg/springframework/oxm/XmlMappingException;
- (Ljava/lang/Exception;Z)Lorg/springframework/oxm/XmlMappingException;
+ (Ljava/lang/Exception;Z)L1org/springframework/oxm/XmlMappingException;
 customizeXStream
  (Lcom/thoughtworks/xstream/XStream;)V
  (Lcom/thoughtworks/xstream/XStream;)V
@@ -132,7 +132,7 @@ unmarshalReader
  (Ljava/io/Reader;Lcom/thoughtworks/xstream/converters/DataHolder;)Ljava/lang/Object;
 unmarshalSaxReader
  (Lorg/xml/sax/XMLReader;Lorg/xml/sax/InputSource;)Ljava/lang/Object;
- (Lorg/xml/sax/XMLReader;Lorg/xml/sax/InputSource;)Ljava/lang/Object;
+ (Lorg/xml/sax/XMLReader;Lorg/xml/sax/InputSource;)L1java/lang/Object;
 unmarshalStreamSource
  (Ljavax/xml/transform/stream/StreamSource;)Ljava/lang/Object;
  (Ljavax/xml/transform/stream/StreamSource;)Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.eea
index c16d23dcd2..ad85681aa2 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.eea
@@ -8,7 +8,7 @@ class org/springframework/scheduling/annotation/AsyncAnnotationAdvisor
  (Ljava/util/function/Supplier<Ljava/util/concurrent/Executor;>;Ljava/util/function/Supplier<Lorg/springframework/aop/interceptor/AsyncUncaughtExceptionHandler;>;)V
 buildAdvice
  (Ljava/util/function/Supplier<Ljava/util/concurrent/Executor;>;Ljava/util/function/Supplier<Lorg/springframework/aop/interceptor/AsyncUncaughtExceptionHandler;>;)Lorg/aopalliance/aop/Advice;
- (Ljava/util/function/Supplier<Ljava/util/concurrent/Executor;>;Ljava/util/function/Supplier<Lorg/springframework/aop/interceptor/AsyncUncaughtExceptionHandler;>;)Lorg/aopalliance/aop/Advice;
+ (Ljava/util/function/Supplier<Ljava/util/concurrent/Executor;>;Ljava/util/function/Supplier<Lorg/springframework/aop/interceptor/AsyncUncaughtExceptionHandler;>;)L1org/aopalliance/aop/Advice;
 buildPointcut
  (Ljava/util/Set<Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;>;)Lorg/springframework/aop/Pointcut;
  (Ljava/util/Set<Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;>;)Lorg/springframework/aop/Pointcut;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/annotation/AsyncResult.eea b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/annotation/AsyncResult.eea
index 3136efc221..f6fe6eae32 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/annotation/AsyncResult.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/annotation/AsyncResult.eea
@@ -8,10 +8,10 @@ super org/springframework/util/concurrent/ListenableFuture
 
 forExecutionException
  <V:Ljava/lang/Object;>(Ljava/lang/Throwable;)Lorg/springframework/util/concurrent/ListenableFuture<TV;>;
- <V:Ljava/lang/Object;>(Ljava/lang/Throwable;)Lorg/springframework/util/concurrent/ListenableFuture<TV;>;
+ <V:Ljava/lang/Object;>(Ljava/lang/Throwable;)L1org/springframework/util/concurrent/ListenableFuture<TV;>;
 forValue
  <V:Ljava/lang/Object;>(TV;)Lorg/springframework/util/concurrent/ListenableFuture<TV;>;
- <V:Ljava/lang/Object;>(TV;)Lorg/springframework/util/concurrent/ListenableFuture<TV;>;
+ <V:Ljava/lang/Object;>(TV;)L1org/springframework/util/concurrent/ListenableFuture<TV;>;
 
 <init>
  (TV;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/annotation/ProxyAsyncConfiguration.eea b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/annotation/ProxyAsyncConfiguration.eea
index 7946ad2b16..120a11b442 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/annotation/ProxyAsyncConfiguration.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/annotation/ProxyAsyncConfiguration.eea
@@ -2,4 +2,4 @@ class org/springframework/scheduling/annotation/ProxyAsyncConfiguration
 
 asyncAdvisor
  ()Lorg/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessor;
- ()Lorg/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessor;
+ ()L1org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessor;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.eea
index 20e3031e66..ba10c0ec1d 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.eea
@@ -17,13 +17,13 @@ logger
  (Lorg/springframework/scheduling/config/ScheduledTaskRegistrar;)V
 createRunnable
  (Ljava/lang/Object;Ljava/lang/reflect/Method;)Ljava/lang/Runnable;
- (Ljava/lang/Object;Ljava/lang/reflect/Method;)L0java/lang/Runnable;
+ (Ljava/lang/Object;Ljava/lang/reflect/Method;)L1java/lang/Runnable;
 createRunnable
  (Ljava/lang/Object;Ljava/lang/reflect/Method;Ljava/lang/String;)Ljava/lang/Runnable;
- (Ljava/lang/Object;Ljava/lang/reflect/Method;Ljava/lang/String;)Ljava/lang/Runnable;
+ (Ljava/lang/Object;Ljava/lang/reflect/Method;Ljava/lang/String;)L1java/lang/Runnable;
 getScheduledTasks
  ()Ljava/util/Set<Lorg/springframework/scheduling/config/ScheduledTask;>;
- ()Ljava/util/Set<Lorg/springframework/scheduling/config/ScheduledTask;>;
+ ()L1java/util/Set<Lorg/springframework/scheduling/config/ScheduledTask;>;
 onApplicationEvent
  (Lorg/springframework/context/event/ApplicationContextEvent;)V
  (Lorg/springframework/context/event/ApplicationContextEvent;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/annotation/SchedulingConfiguration.eea b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/annotation/SchedulingConfiguration.eea
index d6fc05bb87..6d4faf0477 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/annotation/SchedulingConfiguration.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/annotation/SchedulingConfiguration.eea
@@ -2,4 +2,4 @@ class org/springframework/scheduling/annotation/SchedulingConfiguration
 
 scheduledAnnotationProcessor
  ()Lorg/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor;
- ()Lorg/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor;
+ ()L1org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.eea
index 0f5691d600..7dea9df94b 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.eea
@@ -20,10 +20,10 @@ setTaskDecorator
  (Lorg/springframework/core/task/TaskDecorator;)V
 submit
  (Ljava/lang/Runnable;)Ljava/util/concurrent/Future<*>;
- (Ljava/lang/Runnable;)Ljava/util/concurrent/Future<*>;
+ (Ljava/lang/Runnable;)L1java/util/concurrent/Future<*>; # @Inherited(org.springframework.core.task.AsyncTaskExecutor)
 submit
  <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Ljava/util/concurrent/Future<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Ljava/util/concurrent/Future<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)L1java/util/concurrent/Future<TT;>; # @Inherited(org.springframework.core.task.AsyncTaskExecutor)
 submitListenable
  (Ljava/lang/Runnable;)Lorg/springframework/util/concurrent/ListenableFuture<*>;
  (Ljava/lang/Runnable;)Lorg/springframework/util/concurrent/ListenableFuture<*>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.eea
index e3e5be6a96..aa98fe39d6 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.eea
@@ -6,16 +6,16 @@ super org/springframework/beans/factory/FactoryBean
 
 createExecutor
  (ILjava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)Ljava/util/concurrent/ScheduledExecutorService;
- (ILjava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)Ljava/util/concurrent/ScheduledExecutorService;
+ (ILjava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)L1java/util/concurrent/ScheduledExecutorService;
 getObject
  ()Ljava/util/concurrent/ScheduledExecutorService;
  ()L0java/util/concurrent/ScheduledExecutorService;
 getObjectType
  ()Ljava/lang/Class<+Ljava/util/concurrent/ScheduledExecutorService;>;
- ()Ljava/lang/Class<+Ljava/util/concurrent/ScheduledExecutorService;>;
+ ()L1java/lang/Class<+Ljava/util/concurrent/ScheduledExecutorService;>;
 getRunnableToSchedule
  (Lorg/springframework/scheduling/concurrent/ScheduledExecutorTask;)Ljava/lang/Runnable;
- (Lorg/springframework/scheduling/concurrent/ScheduledExecutorTask;)Ljava/lang/Runnable;
+ (Lorg/springframework/scheduling/concurrent/ScheduledExecutorTask;)L1java/lang/Runnable;
 initializeExecutor
  (Ljava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)Ljava/util/concurrent/ExecutorService;
  (Ljava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)Ljava/util/concurrent/ExecutorService;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.eea
index eaa18ac345..826f7840ee 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.eea
@@ -6,16 +6,16 @@ super org/springframework/beans/factory/FactoryBean
 
 createExecutor
  (IIILjava/util/concurrent/BlockingQueue<Ljava/lang/Runnable;>;Ljava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)Ljava/util/concurrent/ThreadPoolExecutor;
- (IIILjava/util/concurrent/BlockingQueue<Ljava/lang/Runnable;>;Ljava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)Ljava/util/concurrent/ThreadPoolExecutor;
+ (IIILjava/util/concurrent/BlockingQueue<Ljava/lang/Runnable;>;Ljava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)L1java/util/concurrent/ThreadPoolExecutor;
 createQueue
  (I)Ljava/util/concurrent/BlockingQueue<Ljava/lang/Runnable;>;
- (I)Ljava/util/concurrent/BlockingQueue<Ljava/lang/Runnable;>;
+ (I)L1java/util/concurrent/BlockingQueue<Ljava/lang/Runnable;>;
 getObject
  ()Ljava/util/concurrent/ExecutorService;
  ()L0java/util/concurrent/ExecutorService;
 getObjectType
  ()Ljava/lang/Class<+Ljava/util/concurrent/ExecutorService;>;
- ()Ljava/lang/Class<+Ljava/util/concurrent/ExecutorService;>;
+ ()L1java/lang/Class<+Ljava/util/concurrent/ExecutorService;>;
 initializeExecutor
  (Ljava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)Ljava/util/concurrent/ExecutorService;
  (Ljava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)Ljava/util/concurrent/ExecutorService;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.eea
index 24ae7af75f..dad198bbf7 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.eea
@@ -5,7 +5,7 @@ cancelRemainingTask
  (Ljava/lang/Runnable;)V
 createQueue
  (I)Ljava/util/concurrent/BlockingQueue<Ljava/lang/Runnable;>;
- (I)Ljava/util/concurrent/BlockingQueue<Ljava/lang/Runnable;>;
+ (I)L1java/util/concurrent/BlockingQueue<Ljava/lang/Runnable;>;
 execute
  (Ljava/lang/Runnable;)V
  (L1java/lang/Runnable;)V # @Inherited(org.springframework.core.task.TaskExecutor)
@@ -20,13 +20,13 @@ setTaskDecorator
  (Lorg/springframework/core/task/TaskDecorator;)V
 submit
  (Ljava/lang/Runnable;)Ljava/util/concurrent/Future<*>;
- (Ljava/lang/Runnable;)Ljava/util/concurrent/Future<*>;
+ (Ljava/lang/Runnable;)L1java/util/concurrent/Future<*>; # @Inherited(org.springframework.core.task.AsyncTaskExecutor)
 submit
  <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Ljava/util/concurrent/Future<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Ljava/util/concurrent/Future<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)L1java/util/concurrent/Future<TT;>; # @Inherited(org.springframework.core.task.AsyncTaskExecutor)
 submitListenable
  (Ljava/lang/Runnable;)Lorg/springframework/util/concurrent/ListenableFuture<*>;
- (Ljava/lang/Runnable;)Lorg/springframework/util/concurrent/ListenableFuture<*>;
+ (Ljava/lang/Runnable;)L1org/springframework/util/concurrent/ListenableFuture<*>;
 submitListenable
  <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Lorg/springframework/util/concurrent/ListenableFuture<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Lorg/springframework/util/concurrent/ListenableFuture<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)L1org/springframework/util/concurrent/ListenableFuture<TT;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.eea b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.eea
index e81274e995..d6fb4c4ade 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.eea
@@ -5,7 +5,7 @@ cancelRemainingTask
  (Ljava/lang/Runnable;)V
 createExecutor
  (ILjava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)Ljava/util/concurrent/ScheduledExecutorService;
- (ILjava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)Ljava/util/concurrent/ScheduledExecutorService;
+ (ILjava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)L1java/util/concurrent/ScheduledExecutorService;
 execute
  (Ljava/lang/Runnable;)V
  (L1java/lang/Runnable;)V # @Inherited(org.springframework.core.task.TaskExecutor)
@@ -47,13 +47,13 @@ setErrorHandler
  (Lorg/springframework/util/ErrorHandler;)V
 submit
  (Ljava/lang/Runnable;)Ljava/util/concurrent/Future<*>;
- (Ljava/lang/Runnable;)Ljava/util/concurrent/Future<*>;
+ (Ljava/lang/Runnable;)L1java/util/concurrent/Future<*>; # @Inherited(org.springframework.core.task.AsyncTaskExecutor)
 submit
  <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Ljava/util/concurrent/Future<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Ljava/util/concurrent/Future<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)L1java/util/concurrent/Future<TT;>; # @Inherited(org.springframework.core.task.AsyncTaskExecutor)
 submitListenable
  (Ljava/lang/Runnable;)Lorg/springframework/util/concurrent/ListenableFuture<*>;
- (Ljava/lang/Runnable;)Lorg/springframework/util/concurrent/ListenableFuture<*>;
+ (Ljava/lang/Runnable;)L1org/springframework/util/concurrent/ListenableFuture<*>;
 submitListenable
  <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Lorg/springframework/util/concurrent/ListenableFuture<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Lorg/springframework/util/concurrent/ListenableFuture<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)L1org/springframework/util/concurrent/ListenableFuture<TT;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/config/TaskExecutorFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/config/TaskExecutorFactoryBean.eea
index b64f4d06f7..9be9831e72 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/config/TaskExecutorFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/config/TaskExecutorFactoryBean.eea
@@ -9,7 +9,7 @@ getObject
  ()L0org/springframework/core/task/TaskExecutor;
 getObjectType
  ()Ljava/lang/Class<+Lorg/springframework/core/task/TaskExecutor;>;
- ()Ljava/lang/Class<+Lorg/springframework/core/task/TaskExecutor;>;
+ ()L1java/lang/Class<+Lorg/springframework/core/task/TaskExecutor;>;
 setBeanName
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/support/CronExpression.eea b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/support/CronExpression.eea
index 0b91b2ab4c..4175dceda8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/support/CronExpression.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/support/CronExpression.eea
@@ -5,7 +5,7 @@ isValidExpression
  (Ljava/lang/String;)Z
 parse
  (Ljava/lang/String;)Lorg/springframework/scheduling/support/CronExpression;
- (Ljava/lang/String;)Lorg/springframework/scheduling/support/CronExpression;
+ (Ljava/lang/String;)L1org/springframework/scheduling/support/CronExpression;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/support/CronTrigger.eea b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/support/CronTrigger.eea
index 227d6ee4a4..5a8c1d8346 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/support/CronTrigger.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/support/CronTrigger.eea
@@ -2,16 +2,16 @@ class org/springframework/scheduling/support/CronTrigger
 
 forFixedExecution
  (Ljava/lang/String;)Lorg/springframework/scheduling/support/CronTrigger;
- (Ljava/lang/String;)Lorg/springframework/scheduling/support/CronTrigger;
+ (Ljava/lang/String;)L1org/springframework/scheduling/support/CronTrigger;
 forLenientExecution
  (Ljava/lang/String;)Lorg/springframework/scheduling/support/CronTrigger;
- (Ljava/lang/String;)Lorg/springframework/scheduling/support/CronTrigger;
+ (Ljava/lang/String;)L1org/springframework/scheduling/support/CronTrigger;
 resumeFixedExecution
  (Ljava/lang/String;Ljava/time/Instant;)Lorg/springframework/scheduling/support/CronTrigger;
- (Ljava/lang/String;Ljava/time/Instant;)Lorg/springframework/scheduling/support/CronTrigger;
+ (Ljava/lang/String;Ljava/time/Instant;)L1org/springframework/scheduling/support/CronTrigger;
 resumeLenientExecution
  (Ljava/lang/String;Ljava/time/Instant;)Lorg/springframework/scheduling/support/CronTrigger;
- (Ljava/lang/String;Ljava/time/Instant;)Lorg/springframework/scheduling/support/CronTrigger;
+ (Ljava/lang/String;Ljava/time/Instant;)L1org/springframework/scheduling/support/CronTrigger;
 
 <init>
  (Ljava/lang/String;)V
@@ -27,7 +27,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getExpression
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 nextExecution
  (Lorg/springframework/scheduling/TriggerContext;)Ljava/time/Instant;
  (Lorg/springframework/scheduling/TriggerContext;)L0java/time/Instant; # @Inherited(org.springframework.scheduling.Trigger)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/support/DefaultScheduledTaskObservationConvention.eea b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/support/DefaultScheduledTaskObservationConvention.eea
index abc4a3f622..14b82f63fc 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/support/DefaultScheduledTaskObservationConvention.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/support/DefaultScheduledTaskObservationConvention.eea
@@ -11,13 +11,13 @@ exception
  (Lorg/springframework/scheduling/support/ScheduledTaskObservationContext;)Lio/micrometer/common/KeyValue;
 getContextualName
  (Lorg/springframework/scheduling/support/ScheduledTaskObservationContext;)Ljava/lang/String;
- (Lorg/springframework/scheduling/support/ScheduledTaskObservationContext;)Ljava/lang/String;
+ (Lorg/springframework/scheduling/support/ScheduledTaskObservationContext;)L1java/lang/String;
 getLowCardinalityKeyValues
  (Lorg/springframework/scheduling/support/ScheduledTaskObservationContext;)Lio/micrometer/common/KeyValues;
  (Lorg/springframework/scheduling/support/ScheduledTaskObservationContext;)Lio/micrometer/common/KeyValues;
 getName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 outcome
  (Lorg/springframework/scheduling/support/ScheduledTaskObservationContext;)Lio/micrometer/common/KeyValue;
  (Lorg/springframework/scheduling/support/ScheduledTaskObservationContext;)Lio/micrometer/common/KeyValue;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/support/MethodInvokingRunnable.eea b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/support/MethodInvokingRunnable.eea
index c47258c247..7bcb618b10 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/support/MethodInvokingRunnable.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/support/MethodInvokingRunnable.eea
@@ -6,7 +6,7 @@ logger
 
 getInvocationFailureMessage
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 resolveClassName
  (Ljava/lang/String;)Ljava/lang/Class<*>;
  (Ljava/lang/String;)Ljava/lang/Class<*>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/support/NoOpTaskScheduler.eea b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/support/NoOpTaskScheduler.eea
index b60492f729..414b366ccc 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/support/NoOpTaskScheduler.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/scheduling/support/NoOpTaskScheduler.eea
@@ -2,19 +2,19 @@ class org/springframework/scheduling/support/NoOpTaskScheduler
 
 schedule
  (Ljava/lang/Runnable;Ljava/time/Instant;)Ljava/util/concurrent/ScheduledFuture<*>;
- (Ljava/lang/Runnable;Ljava/time/Instant;)Ljava/util/concurrent/ScheduledFuture<*>;
+ (Ljava/lang/Runnable;Ljava/time/Instant;)L1java/util/concurrent/ScheduledFuture<*>;
 schedule
  (Ljava/lang/Runnable;Lorg/springframework/scheduling/Trigger;)Ljava/util/concurrent/ScheduledFuture<*>;
  (Ljava/lang/Runnable;Lorg/springframework/scheduling/Trigger;)L0java/util/concurrent/ScheduledFuture<*>; # @Inherited(org.springframework.scheduling.TaskScheduler)
 scheduleAtFixedRate
  (Ljava/lang/Runnable;Ljava/time/Duration;)Ljava/util/concurrent/ScheduledFuture<*>;
- (Ljava/lang/Runnable;Ljava/time/Duration;)Ljava/util/concurrent/ScheduledFuture<*>;
+ (Ljava/lang/Runnable;Ljava/time/Duration;)L1java/util/concurrent/ScheduledFuture<*>;
 scheduleAtFixedRate
  (Ljava/lang/Runnable;Ljava/time/Instant;Ljava/time/Duration;)Ljava/util/concurrent/ScheduledFuture<*>;
- (Ljava/lang/Runnable;Ljava/time/Instant;Ljava/time/Duration;)Ljava/util/concurrent/ScheduledFuture<*>;
+ (Ljava/lang/Runnable;Ljava/time/Instant;Ljava/time/Duration;)L1java/util/concurrent/ScheduledFuture<*>;
 scheduleWithFixedDelay
  (Ljava/lang/Runnable;Ljava/time/Duration;)Ljava/util/concurrent/ScheduledFuture<*>;
- (Ljava/lang/Runnable;Ljava/time/Duration;)Ljava/util/concurrent/ScheduledFuture<*>;
+ (Ljava/lang/Runnable;Ljava/time/Duration;)L1java/util/concurrent/ScheduledFuture<*>;
 scheduleWithFixedDelay
  (Ljava/lang/Runnable;Ljava/time/Instant;Ljava/time/Duration;)Ljava/util/concurrent/ScheduledFuture<*>;
- (Ljava/lang/Runnable;Ljava/time/Instant;Ljava/time/Duration;)Ljava/util/concurrent/ScheduledFuture<*>;
+ (Ljava/lang/Runnable;Ljava/time/Instant;Ljava/time/Duration;)L1java/util/concurrent/ScheduledFuture<*>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/scripting/bsh/BshScriptUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/scripting/bsh/BshScriptUtils.eea
index c7f294e3f2..6f04d62ee5 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/scripting/bsh/BshScriptUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/scripting/bsh/BshScriptUtils.eea
@@ -2,10 +2,10 @@ class org/springframework/scripting/bsh/BshScriptUtils
 
 createBshObject
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
 createBshObject
  (Ljava/lang/String;[Ljava/lang/Class<*>;)Ljava/lang/Object;
- (Ljava/lang/String;[Ljava/lang/Class<*>;)Ljava/lang/Object;
+ (Ljava/lang/String;[Ljava/lang/Class<*>;)L1java/lang/Object;
 createBshObject
  (Ljava/lang/String;[Ljava/lang/Class<*>;Ljava/lang/ClassLoader;)Ljava/lang/Object;
- (Ljava/lang/String;[Ljava/lang/Class<*>;Ljava/lang/ClassLoader;)Ljava/lang/Object;
+ (Ljava/lang/String;[Ljava/lang/Class<*>;Ljava/lang/ClassLoader;)L1java/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/scripting/config/LangNamespaceUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/scripting/config/LangNamespaceUtils.eea
index 8a6eeb16dc..a67f7a6482 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/scripting/config/LangNamespaceUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/scripting/config/LangNamespaceUtils.eea
@@ -2,4 +2,4 @@ class org/springframework/scripting/config/LangNamespaceUtils
 
 registerScriptFactoryPostProcessorIfNecessary
  (Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)Lorg/springframework/beans/factory/config/BeanDefinition;
- (Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)Lorg/springframework/beans/factory/config/BeanDefinition;
+ (Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)L1org/springframework/beans/factory/config/BeanDefinition;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/scripting/groovy/GroovyScriptFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/scripting/groovy/GroovyScriptFactory.eea
index 86998fe002..dc33e39387 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/scripting/groovy/GroovyScriptFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/scripting/groovy/GroovyScriptFactory.eea
@@ -14,7 +14,7 @@ class org/springframework/scripting/groovy/GroovyScriptFactory
  (Ljava/lang/String;[Lorg/codehaus/groovy/control/customizers/CompilationCustomizer;)V
 buildGroovyClassLoader
  (Ljava/lang/ClassLoader;)Lgroovy/lang/GroovyClassLoader;
- (Ljava/lang/ClassLoader;)Lgroovy/lang/GroovyClassLoader;
+ (Ljava/lang/ClassLoader;)L1groovy/lang/GroovyClassLoader;
 executeScript
  (Lorg/springframework/scripting/ScriptSource;Ljava/lang/Class<*>;)Ljava/lang/Object;
  (Lorg/springframework/scripting/ScriptSource;Ljava/lang/Class<*>;)L0java/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/scripting/support/ScriptFactoryPostProcessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/scripting/support/ScriptFactoryPostProcessor.eea
index c2b6805720..02ba0ad7e2 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/scripting/support/ScriptFactoryPostProcessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/scripting/support/ScriptFactoryPostProcessor.eea
@@ -19,22 +19,22 @@ logger
 
 convertToScriptSource
  (Ljava/lang/String;Ljava/lang/String;Lorg/springframework/core/io/ResourceLoader;)Lorg/springframework/scripting/ScriptSource;
- (Ljava/lang/String;Ljava/lang/String;Lorg/springframework/core/io/ResourceLoader;)Lorg/springframework/scripting/ScriptSource;
+ (Ljava/lang/String;Ljava/lang/String;Lorg/springframework/core/io/ResourceLoader;)L1org/springframework/scripting/ScriptSource;
 createCompositeInterface
  ([Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
- ([Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
+ ([Ljava/lang/Class<*>;)L1java/lang/Class<*>;
 createConfigInterface
  (Lorg/springframework/beans/factory/config/BeanDefinition;[Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
- (Lorg/springframework/beans/factory/config/BeanDefinition;[Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
+ (Lorg/springframework/beans/factory/config/BeanDefinition;[Ljava/lang/Class<*>;)L1java/lang/Class<*>;
 createRefreshableProxy
  (Lorg/springframework/aop/TargetSource;[Ljava/lang/Class<*>;Z)Ljava/lang/Object;
- (Lorg/springframework/aop/TargetSource;[Ljava/lang/Class<*>;Z)Ljava/lang/Object;
+ (Lorg/springframework/aop/TargetSource;[Ljava/lang/Class<*>;Z)L1java/lang/Object;
 createScriptFactoryBeanDefinition
  (Lorg/springframework/beans/factory/config/BeanDefinition;)Lorg/springframework/beans/factory/config/BeanDefinition;
- (Lorg/springframework/beans/factory/config/BeanDefinition;)Lorg/springframework/beans/factory/config/BeanDefinition;
+ (Lorg/springframework/beans/factory/config/BeanDefinition;)L1org/springframework/beans/factory/config/BeanDefinition;
 createScriptedObjectBeanDefinition
  (Lorg/springframework/beans/factory/config/BeanDefinition;Ljava/lang/String;Lorg/springframework/scripting/ScriptSource;[Ljava/lang/Class<*>;)Lorg/springframework/beans/factory/config/BeanDefinition;
- (Lorg/springframework/beans/factory/config/BeanDefinition;Ljava/lang/String;Lorg/springframework/scripting/ScriptSource;[Ljava/lang/Class<*>;)Lorg/springframework/beans/factory/config/BeanDefinition;
+ (Lorg/springframework/beans/factory/config/BeanDefinition;Ljava/lang/String;Lorg/springframework/scripting/ScriptSource;[Ljava/lang/Class<*>;)L1org/springframework/beans/factory/config/BeanDefinition;
 getScriptSource
  (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/scripting/ScriptSource;
  (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/scripting/ScriptSource;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/MergedContextConfiguration.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/MergedContextConfiguration.eea
index fb7411b060..9d6759a753 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/MergedContextConfiguration.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/MergedContextConfiguration.eea
@@ -2,7 +2,7 @@ class org/springframework/test/context/MergedContextConfiguration
 
 nullSafeClassName
  (Lorg/springframework/test/context/ContextLoader;)Ljava/lang/String;
- (Lorg/springframework/test/context/ContextLoader;)Ljava/lang/String;
+ (Lorg/springframework/test/context/ContextLoader;)L1java/lang/String;
 processStrings
  ([Ljava/lang/String;)[Ljava/lang/String;
  ([Ljava/lang/String;)[Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/SmartContextLoader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/SmartContextLoader.eea
index d97ca5b0f8..0069925600 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/SmartContextLoader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/SmartContextLoader.eea
@@ -5,10 +5,10 @@ loadContext
  (Lorg/springframework/test/context/MergedContextConfiguration;)Lorg/springframework/context/ApplicationContext;
 loadContext
  ([Ljava/lang/String;)Lorg/springframework/context/ApplicationContext;
- ([Ljava/lang/String;)Lorg/springframework/context/ApplicationContext;
+ ([Ljava/lang/String;)L1org/springframework/context/ApplicationContext;
 processContextConfiguration
  (Lorg/springframework/test/context/ContextConfigurationAttributes;)V
  (Lorg/springframework/test/context/ContextConfigurationAttributes;)V
 processLocations
  (Ljava/lang/Class<*>;[Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/Class<*>;[Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/Class<*>;[Ljava/lang/String;)[1Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/TestContextAnnotationUtils$UntypedAnnotationDescriptor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/TestContextAnnotationUtils$UntypedAnnotationDescriptor.eea
index 9c515b0af1..880b3e9918 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/TestContextAnnotationUtils$UntypedAnnotationDescriptor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/TestContextAnnotationUtils$UntypedAnnotationDescriptor.eea
@@ -6,7 +6,7 @@ super org/springframework/test/context/TestContextAnnotationUtils$AnnotationDesc
 
 findAllLocalMergedAnnotations
  ()Ljava/util/Set<Ljava/lang/annotation/Annotation;>;
- ()Ljava/util/Set<Ljava/lang/annotation/Annotation;>;
+ ()L1java/util/Set<Ljava/lang/annotation/Annotation;>;
 next
  ()Lorg/springframework/test/context/TestContextAnnotationUtils$UntypedAnnotationDescriptor;
  ()L0org/springframework/test/context/TestContextAnnotationUtils$UntypedAnnotationDescriptor;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/aot/AotTestAttributes.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/aot/AotTestAttributes.eea
index f4d62c0743..e045b7d90a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/aot/AotTestAttributes.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/aot/AotTestAttributes.eea
@@ -2,7 +2,7 @@ class org/springframework/test/context/aot/AotTestAttributes
 
 getInstance
  ()Lorg/springframework/test/context/aot/AotTestAttributes;
- ()Lorg/springframework/test/context/aot/AotTestAttributes;
+ ()L1org/springframework/test/context/aot/AotTestAttributes;
 
 getBoolean
  (Ljava/lang/String;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/aot/TestAotProcessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/aot/TestAotProcessor.eea
index 4445536c33..65a8b5ef8e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/aot/TestAotProcessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/aot/TestAotProcessor.eea
@@ -9,7 +9,7 @@ super org/springframework/context/aot/AbstractAotProcessor
  (Ljava/util/Set<Ljava/nio/file/Path;>;Lorg/springframework/context/aot/AbstractAotProcessor$Settings;)V
 doProcess
  ()Ljava/lang/Void;
- ()Ljava/lang/Void;
+ ()L0java/lang/Void;
 getClasspathRoots
  ()Ljava/util/Set<Ljava/nio/file/Path;>;
  ()Ljava/util/Set<Ljava/nio/file/Path;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.eea
index e4c6f418d8..b8d22fd6a4 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.eea
@@ -5,10 +5,10 @@ class org/springframework/test/context/junit4/SpringJUnit4ClassRunner
  (Ljava/lang/Class<*>;)V
 createTest
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 createTestContextManager
  (Ljava/lang/Class<*>;)Lorg/springframework/test/context/TestContextManager;
- (Ljava/lang/Class<*>;)Lorg/springframework/test/context/TestContextManager;
+ (Ljava/lang/Class<*>;)L1org/springframework/test/context/TestContextManager;
 getDescription
  ()Lorg/junit/runner/Description;
  ()Lorg/junit/runner/Description;
@@ -41,25 +41,25 @@ runChild
  (Lorg/junit/runners/model/FrameworkMethod;Lorg/junit/runner/notification/RunNotifier;)V
 withAfterClasses
  (Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
- (Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
+ (Lorg/junit/runners/model/Statement;)L1org/junit/runners/model/Statement;
 withAfterTestExecutionCallbacks
  (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
- (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
+ (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)L1org/junit/runners/model/Statement;
 withAfters
  (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
- (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
+ (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)L1org/junit/runners/model/Statement;
 withBeforeClasses
  (Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
- (Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
+ (Lorg/junit/runners/model/Statement;)L1org/junit/runners/model/Statement;
 withBeforeTestExecutionCallbacks
  (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
- (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
+ (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)L1org/junit/runners/model/Statement;
 withBefores
  (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
- (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
+ (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)L1org/junit/runners/model/Statement;
 withPotentialRepeat
  (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
- (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
+ (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)L1org/junit/runners/model/Statement;
 withPotentialTimeout
  (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
  (Lorg/junit/runners/model/FrameworkMethod;Ljava/lang/Object;Lorg/junit/runners/model/Statement;)Lorg/junit/runners/model/Statement;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/AbstractContextLoader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/AbstractContextLoader.eea
index 09c6f7721b..5a1a91d65f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/AbstractContextLoader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/AbstractContextLoader.eea
@@ -23,4 +23,4 @@ processContextConfiguration
  (Lorg/springframework/test/context/ContextConfigurationAttributes;)V
 processLocations
  (Ljava/lang/Class<*>;[Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/Class<*>;[Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/Class<*>;[Ljava/lang/String;)[1Ljava/lang/String; # @Inherited(org.springframework.test.context.SmartContextLoader)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/AbstractGenericContextLoader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/AbstractGenericContextLoader.eea
index 9f717a7392..bb7283d927 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/AbstractGenericContextLoader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/AbstractGenericContextLoader.eea
@@ -6,10 +6,10 @@ logger
 
 createBeanDefinitionReader
  (Lorg/springframework/context/support/GenericApplicationContext;)Lorg/springframework/beans/factory/support/BeanDefinitionReader;
- (Lorg/springframework/context/support/GenericApplicationContext;)Lorg/springframework/beans/factory/support/BeanDefinitionReader;
+ (Lorg/springframework/context/support/GenericApplicationContext;)L1org/springframework/beans/factory/support/BeanDefinitionReader;
 createContext
  ()Lorg/springframework/context/support/GenericApplicationContext;
- ()Lorg/springframework/context/support/GenericApplicationContext;
+ ()L1org/springframework/context/support/GenericApplicationContext;
 customizeBeanFactory
  (Lorg/springframework/beans/factory/support/DefaultListableBeanFactory;)V
  (Lorg/springframework/beans/factory/support/DefaultListableBeanFactory;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/AbstractTestContextBootstrapper.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/AbstractTestContextBootstrapper.eea
index 3decf5cb99..2f3e702af8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/AbstractTestContextBootstrapper.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/AbstractTestContextBootstrapper.eea
@@ -5,7 +5,7 @@ buildMergedContextConfiguration
  ()Lorg/springframework/test/context/MergedContextConfiguration;
 buildTestContext
  ()Lorg/springframework/test/context/TestContext;
- ()Lorg/springframework/test/context/TestContext;
+ ()L1org/springframework/test/context/TestContext;
 getBootstrapContext
  ()Lorg/springframework/test/context/BootstrapContext;
  ()Lorg/springframework/test/context/BootstrapContext;
@@ -23,7 +23,7 @@ getDefaultTestExecutionListeners
  ()Ljava/util/List<Lorg/springframework/test/context/TestExecutionListener;>;
 getTestExecutionListeners
  ()Ljava/util/List<Lorg/springframework/test/context/TestExecutionListener;>;
- ()Ljava/util/List<Lorg/springframework/test/context/TestExecutionListener;>;
+ ()L1java/util/List<Lorg/springframework/test/context/TestExecutionListener;>;
 processMergedContextConfiguration
  (Lorg/springframework/test/context/MergedContextConfiguration;)Lorg/springframework/test/context/MergedContextConfiguration;
  (Lorg/springframework/test/context/MergedContextConfiguration;)Lorg/springframework/test/context/MergedContextConfiguration;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/AnnotationConfigContextLoader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/AnnotationConfigContextLoader.eea
index e81d9ce7fd..1c24a1d15d 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/AnnotationConfigContextLoader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/AnnotationConfigContextLoader.eea
@@ -2,22 +2,22 @@ class org/springframework/test/context/support/AnnotationConfigContextLoader
 
 createBeanDefinitionReader
  (Lorg/springframework/context/support/GenericApplicationContext;)Lorg/springframework/beans/factory/support/BeanDefinitionReader;
- (Lorg/springframework/context/support/GenericApplicationContext;)Lorg/springframework/beans/factory/support/BeanDefinitionReader;
+ (Lorg/springframework/context/support/GenericApplicationContext;)L1org/springframework/beans/factory/support/BeanDefinitionReader; # @Inherited(org.springframework.test.context.support.AbstractGenericContextLoader)
 detectDefaultConfigurationClasses
  (Ljava/lang/Class<*>;)[Ljava/lang/Class<*>;
  (Ljava/lang/Class<*>;)[Ljava/lang/Class<*>;
 generateDefaultLocations
  (Ljava/lang/Class<*>;)[Ljava/lang/String;
- (Ljava/lang/Class<*>;)[Ljava/lang/String;
+ (Ljava/lang/Class<*>;)[1Ljava/lang/String;
 getResourceSuffix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 loadBeanDefinitions
  (Lorg/springframework/context/support/GenericApplicationContext;Lorg/springframework/test/context/MergedContextConfiguration;)V
  (Lorg/springframework/context/support/GenericApplicationContext;Lorg/springframework/test/context/MergedContextConfiguration;)V
 modifyLocations
  (Ljava/lang/Class<*>;[Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/Class<*>;[Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/Class<*>;[Ljava/lang/String;)[1Ljava/lang/String;
 processContextConfiguration
  (Lorg/springframework/test/context/ContextConfigurationAttributes;)V
  (Lorg/springframework/test/context/ContextConfigurationAttributes;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/DefaultTestContextBootstrapper.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/DefaultTestContextBootstrapper.eea
index b6959e7a12..1255da4d55 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/DefaultTestContextBootstrapper.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/DefaultTestContextBootstrapper.eea
@@ -2,4 +2,4 @@ class org/springframework/test/context/support/DefaultTestContextBootstrapper
 
 getDefaultContextLoaderClass
  (Ljava/lang/Class<*>;)Ljava/lang/Class<+Lorg/springframework/test/context/ContextLoader;>;
- (Ljava/lang/Class<*>;)Ljava/lang/Class<+Lorg/springframework/test/context/ContextLoader;>;
+ (Ljava/lang/Class<*>;)L1java/lang/Class<+Lorg/springframework/test/context/ContextLoader;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/GenericGroovyXmlContextLoader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/GenericGroovyXmlContextLoader.eea
index 6a1e261954..98cad49122 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/GenericGroovyXmlContextLoader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/GenericGroovyXmlContextLoader.eea
@@ -2,7 +2,7 @@ class org/springframework/test/context/support/GenericGroovyXmlContextLoader
 
 getResourceSuffix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.test.context.support.GenericXmlContextLoader)
 getResourceSuffixes
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/GenericXmlContextLoader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/GenericXmlContextLoader.eea
index 3e28fb1934..3d888ba222 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/GenericXmlContextLoader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/GenericXmlContextLoader.eea
@@ -2,10 +2,10 @@ class org/springframework/test/context/support/GenericXmlContextLoader
 
 createBeanDefinitionReader
  (Lorg/springframework/context/support/GenericApplicationContext;)Lorg/springframework/beans/factory/support/BeanDefinitionReader;
- (Lorg/springframework/context/support/GenericApplicationContext;)Lorg/springframework/beans/factory/support/BeanDefinitionReader;
+ (Lorg/springframework/context/support/GenericApplicationContext;)L1org/springframework/beans/factory/support/BeanDefinitionReader; # @Inherited(org.springframework.test.context.support.AbstractGenericContextLoader)
 getResourceSuffix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 validateMergedContextConfiguration
  (Lorg/springframework/test/context/MergedContextConfiguration;)V
  (Lorg/springframework/test/context/MergedContextConfiguration;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/TestPropertySourceUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/TestPropertySourceUtils.eea
index 62feb79569..c8b435603c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/TestPropertySourceUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/support/TestPropertySourceUtils.eea
@@ -24,4 +24,4 @@ addPropertySourcesToEnvironment
  (Lorg/springframework/core/env/ConfigurableEnvironment;Lorg/springframework/core/io/ResourceLoader;Ljava/util/List<Lorg/springframework/core/io/support/PropertySourceDescriptor;>;)V
 convertInlinedPropertiesToMap
  ([Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- ([Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ ([Ljava/lang/String;)L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/transaction/TestContextTransactionUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/transaction/TestContextTransactionUtils.eea
index 77ecf33542..944a49a835 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/transaction/TestContextTransactionUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/transaction/TestContextTransactionUtils.eea
@@ -9,10 +9,10 @@ DEFAULT_TRANSACTION_MANAGER_NAME
 
 createDelegatingTransactionAttribute
  (Lorg/springframework/test/context/TestContext;Lorg/springframework/transaction/interceptor/TransactionAttribute;)Lorg/springframework/transaction/interceptor/TransactionAttribute;
- (Lorg/springframework/test/context/TestContext;Lorg/springframework/transaction/interceptor/TransactionAttribute;)Lorg/springframework/transaction/interceptor/TransactionAttribute;
+ (Lorg/springframework/test/context/TestContext;Lorg/springframework/transaction/interceptor/TransactionAttribute;)L1org/springframework/transaction/interceptor/TransactionAttribute;
 createDelegatingTransactionAttribute
  (Lorg/springframework/test/context/TestContext;Lorg/springframework/transaction/interceptor/TransactionAttribute;Z)Lorg/springframework/transaction/interceptor/TransactionAttribute;
- (Lorg/springframework/test/context/TestContext;Lorg/springframework/transaction/interceptor/TransactionAttribute;Z)Lorg/springframework/transaction/interceptor/TransactionAttribute;
+ (Lorg/springframework/test/context/TestContext;Lorg/springframework/transaction/interceptor/TransactionAttribute;Z)L1org/springframework/transaction/interceptor/TransactionAttribute;
 retrieveDataSource
  (Lorg/springframework/test/context/TestContext;Ljava/lang/String;)Ljavax/sql/DataSource;
  (Lorg/springframework/test/context/TestContext;Ljava/lang/String;)L0javax/sql/DataSource;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/util/TestContextResourceUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/util/TestContextResourceUtils.eea
index fbfaf76f00..529bdc2a26 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/util/TestContextResourceUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/util/TestContextResourceUtils.eea
@@ -2,7 +2,7 @@ class org/springframework/test/context/util/TestContextResourceUtils
 
 convertToClasspathResourcePaths
  (Ljava/lang/Class<*>;Z[Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/Class<*>;Z[Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/Class<*>;Z[Ljava/lang/String;)[1Ljava/lang/String;
 convertToClasspathResourcePaths
  (Ljava/lang/Class<*>;[Ljava/lang/String;)[Ljava/lang/String;
  (Ljava/lang/Class<*>;[Ljava/lang/String;)[Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/web/AbstractGenericWebContextLoader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/web/AbstractGenericWebContextLoader.eea
index 1684d2a830..99175683e7 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/web/AbstractGenericWebContextLoader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/web/AbstractGenericWebContextLoader.eea
@@ -9,7 +9,7 @@ configureWebResources
  (Lorg/springframework/web/context/support/GenericWebApplicationContext;Lorg/springframework/test/context/web/WebMergedContextConfiguration;)V
 createContext
  ()Lorg/springframework/web/context/support/GenericWebApplicationContext;
- ()Lorg/springframework/web/context/support/GenericWebApplicationContext;
+ ()L1org/springframework/web/context/support/GenericWebApplicationContext;
 customizeBeanFactory
  (Lorg/springframework/beans/factory/support/DefaultListableBeanFactory;Lorg/springframework/test/context/web/WebMergedContextConfiguration;)V
  (Lorg/springframework/beans/factory/support/DefaultListableBeanFactory;Lorg/springframework/test/context/web/WebMergedContextConfiguration;)V
@@ -24,7 +24,7 @@ loadContext
  (Lorg/springframework/test/context/MergedContextConfiguration;)Lorg/springframework/context/ApplicationContext;
 loadContext
  ([Ljava/lang/String;)Lorg/springframework/context/ApplicationContext;
- ([Ljava/lang/String;)Lorg/springframework/context/ApplicationContext;
+ ([Ljava/lang/String;)L1org/springframework/context/ApplicationContext; # @Inherited(org.springframework.test.context.SmartContextLoader)
 loadContextForAotProcessing
  (Lorg/springframework/test/context/MergedContextConfiguration;)Lorg/springframework/web/context/support/GenericWebApplicationContext;
  (Lorg/springframework/test/context/MergedContextConfiguration;)Lorg/springframework/web/context/support/GenericWebApplicationContext;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/web/AnnotationConfigWebContextLoader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/web/AnnotationConfigWebContextLoader.eea
index 2bee4603b6..5293e49881 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/web/AnnotationConfigWebContextLoader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/web/AnnotationConfigWebContextLoader.eea
@@ -5,16 +5,16 @@ detectDefaultConfigurationClasses
  (Ljava/lang/Class<*>;)[Ljava/lang/Class<*>;
 generateDefaultLocations
  (Ljava/lang/Class<*>;)[Ljava/lang/String;
- (Ljava/lang/Class<*>;)[Ljava/lang/String;
+ (Ljava/lang/Class<*>;)[1Ljava/lang/String;
 getResourceSuffix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 loadBeanDefinitions
  (Lorg/springframework/web/context/support/GenericWebApplicationContext;Lorg/springframework/test/context/web/WebMergedContextConfiguration;)V
  (Lorg/springframework/web/context/support/GenericWebApplicationContext;Lorg/springframework/test/context/web/WebMergedContextConfiguration;)V
 modifyLocations
  (Ljava/lang/Class<*>;[Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/Class<*>;[Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/Class<*>;[Ljava/lang/String;)[1Ljava/lang/String;
 processContextConfiguration
  (Lorg/springframework/test/context/ContextConfigurationAttributes;)V
  (Lorg/springframework/test/context/ContextConfigurationAttributes;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/web/GenericGroovyXmlWebContextLoader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/web/GenericGroovyXmlWebContextLoader.eea
index be8fc103b7..ea01a7ca68 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/web/GenericGroovyXmlWebContextLoader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/web/GenericGroovyXmlWebContextLoader.eea
@@ -2,7 +2,7 @@ class org/springframework/test/context/web/GenericGroovyXmlWebContextLoader
 
 getResourceSuffix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.test.context.web.GenericXmlWebContextLoader)
 getResourceSuffixes
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/web/GenericXmlWebContextLoader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/web/GenericXmlWebContextLoader.eea
index 20c24cfc0c..7b7f022fd8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/web/GenericXmlWebContextLoader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/web/GenericXmlWebContextLoader.eea
@@ -2,7 +2,7 @@ class org/springframework/test/context/web/GenericXmlWebContextLoader
 
 getResourceSuffix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 loadBeanDefinitions
  (Lorg/springframework/web/context/support/GenericWebApplicationContext;Lorg/springframework/test/context/web/WebMergedContextConfiguration;)V
  (Lorg/springframework/web/context/support/GenericWebApplicationContext;Lorg/springframework/test/context/web/WebMergedContextConfiguration;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/web/WebTestContextBootstrapper.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/web/WebTestContextBootstrapper.eea
index eec5dd1275..45fdd7878f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/context/web/WebTestContextBootstrapper.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/context/web/WebTestContextBootstrapper.eea
@@ -2,7 +2,7 @@ class org/springframework/test/context/web/WebTestContextBootstrapper
 
 getDefaultContextLoaderClass
  (Ljava/lang/Class<*>;)Ljava/lang/Class<+Lorg/springframework/test/context/ContextLoader;>;
- (Ljava/lang/Class<*>;)Ljava/lang/Class<+Lorg/springframework/test/context/ContextLoader;>;
+ (Ljava/lang/Class<*>;)L1java/lang/Class<+Lorg/springframework/test/context/ContextLoader;>; # @Inherited(org.springframework.test.context.support.DefaultTestContextBootstrapper)
 processMergedContextConfiguration
  (Lorg/springframework/test/context/MergedContextConfiguration;)Lorg/springframework/test/context/MergedContextConfiguration;
  (Lorg/springframework/test/context/MergedContextConfiguration;)Lorg/springframework/test/context/MergedContextConfiguration;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/AbstractRequestExpectationManager.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/AbstractRequestExpectationManager.eea
index 52e758cf15..89d5d56e04 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/AbstractRequestExpectationManager.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/AbstractRequestExpectationManager.eea
@@ -2,22 +2,22 @@ class org/springframework/test/web/client/AbstractRequestExpectationManager
 
 createUnexpectedRequestError
  (Lorg/springframework/http/client/ClientHttpRequest;)Ljava/lang/AssertionError;
- (Lorg/springframework/http/client/ClientHttpRequest;)Ljava/lang/AssertionError;
+ (Lorg/springframework/http/client/ClientHttpRequest;)L1java/lang/AssertionError;
 expectRequest
  (Lorg/springframework/test/web/client/ExpectedCount;Lorg/springframework/test/web/client/RequestMatcher;)Lorg/springframework/test/web/client/ResponseActions;
- (Lorg/springframework/test/web/client/ExpectedCount;Lorg/springframework/test/web/client/RequestMatcher;)Lorg/springframework/test/web/client/ResponseActions;
+ (Lorg/springframework/test/web/client/ExpectedCount;Lorg/springframework/test/web/client/RequestMatcher;)L1org/springframework/test/web/client/ResponseActions;
 getExpectations
  ()Ljava/util/List<Lorg/springframework/test/web/client/RequestExpectation;>;
  ()Ljava/util/List<Lorg/springframework/test/web/client/RequestExpectation;>;
 getRequestDetails
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getRequests
  ()Ljava/util/List<Lorg/springframework/http/client/ClientHttpRequest;>;
  ()Ljava/util/List<Lorg/springframework/http/client/ClientHttpRequest;>;
 matchRequest
  (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/test/web/client/RequestExpectation;
- (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/test/web/client/RequestExpectation;
+ (Lorg/springframework/http/client/ClientHttpRequest;)L1org/springframework/test/web/client/RequestExpectation;
 validateRequest
  (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/http/client/ClientHttpResponse;
  (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/http/client/ClientHttpResponse;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/DefaultRequestExpectation.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/DefaultRequestExpectation.eea
index 5b09385c65..986846712c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/DefaultRequestExpectation.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/DefaultRequestExpectation.eea
@@ -11,7 +11,7 @@ andRespond
  (Lorg/springframework/test/web/client/ResponseCreator;)V
 createResponse
  (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/http/client/ClientHttpResponse;
- (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/http/client/ClientHttpResponse;
+ (Lorg/springframework/http/client/ClientHttpRequest;)L1org/springframework/http/client/ClientHttpResponse; # @Inherited(org.springframework.test.web.client.ResponseCreator)
 getRequestCount
  ()Lorg/springframework/test/web/client/DefaultRequestExpectation$RequestCount;
  ()Lorg/springframework/test/web/client/DefaultRequestExpectation$RequestCount;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/ExpectedCount.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/ExpectedCount.eea
index fb916bbd67..2c78d541de 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/ExpectedCount.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/ExpectedCount.eea
@@ -2,7 +2,7 @@ class org/springframework/test/web/client/ExpectedCount
 
 between
  (II)Lorg/springframework/test/web/client/ExpectedCount;
- (II)Lorg/springframework/test/web/client/ExpectedCount;
+ (II)L1org/springframework/test/web/client/ExpectedCount;
 manyTimes
  ()Lorg/springframework/test/web/client/ExpectedCount;
  ()Lorg/springframework/test/web/client/ExpectedCount;
@@ -11,7 +11,7 @@ max
  (I)Lorg/springframework/test/web/client/ExpectedCount;
 min
  (I)Lorg/springframework/test/web/client/ExpectedCount;
- (I)Lorg/springframework/test/web/client/ExpectedCount;
+ (I)L1org/springframework/test/web/client/ExpectedCount;
 never
  ()Lorg/springframework/test/web/client/ExpectedCount;
  ()Lorg/springframework/test/web/client/ExpectedCount;
@@ -20,7 +20,7 @@ once
  ()Lorg/springframework/test/web/client/ExpectedCount;
 times
  (I)Lorg/springframework/test/web/client/ExpectedCount;
- (I)Lorg/springframework/test/web/client/ExpectedCount;
+ (I)L1org/springframework/test/web/client/ExpectedCount;
 twice
  ()Lorg/springframework/test/web/client/ExpectedCount;
  ()Lorg/springframework/test/web/client/ExpectedCount;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.eea
index 7a9ea15fd1..6f9d325b36 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.eea
@@ -5,4 +5,4 @@ class org/springframework/test/web/client/MockMvcClientHttpRequestFactory
  (Lorg/springframework/test/web/servlet/MockMvc;)V
 createRequest
  (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)Lorg/springframework/http/client/ClientHttpRequest;
+ (Ljava/net/URI;Lorg/springframework/http/HttpMethod;)L1org/springframework/http/client/ClientHttpRequest; # @Inherited(org.springframework.http.client.ClientHttpRequestFactory)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/MockRestServiceServer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/MockRestServiceServer.eea
index 39be485e6a..ae77ae161d 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/MockRestServiceServer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/MockRestServiceServer.eea
@@ -2,19 +2,19 @@ class org/springframework/test/web/client/MockRestServiceServer
 
 bindTo
  (Lorg/springframework/web/client/RestClient$Builder;)Lorg/springframework/test/web/client/MockRestServiceServer$MockRestServiceServerBuilder;
- (Lorg/springframework/web/client/RestClient$Builder;)Lorg/springframework/test/web/client/MockRestServiceServer$MockRestServiceServerBuilder;
+ (Lorg/springframework/web/client/RestClient$Builder;)L1org/springframework/test/web/client/MockRestServiceServer$MockRestServiceServerBuilder;
 bindTo
  (Lorg/springframework/web/client/RestTemplate;)Lorg/springframework/test/web/client/MockRestServiceServer$MockRestServiceServerBuilder;
- (Lorg/springframework/web/client/RestTemplate;)Lorg/springframework/test/web/client/MockRestServiceServer$MockRestServiceServerBuilder;
+ (Lorg/springframework/web/client/RestTemplate;)L1org/springframework/test/web/client/MockRestServiceServer$MockRestServiceServerBuilder;
 bindTo
  (Lorg/springframework/web/client/support/RestGatewaySupport;)Lorg/springframework/test/web/client/MockRestServiceServer$MockRestServiceServerBuilder;
- (Lorg/springframework/web/client/support/RestGatewaySupport;)Lorg/springframework/test/web/client/MockRestServiceServer$MockRestServiceServerBuilder;
+ (Lorg/springframework/web/client/support/RestGatewaySupport;)L1org/springframework/test/web/client/MockRestServiceServer$MockRestServiceServerBuilder;
 createServer
  (Lorg/springframework/web/client/RestTemplate;)Lorg/springframework/test/web/client/MockRestServiceServer;
- (Lorg/springframework/web/client/RestTemplate;)Lorg/springframework/test/web/client/MockRestServiceServer;
+ (Lorg/springframework/web/client/RestTemplate;)L1org/springframework/test/web/client/MockRestServiceServer;
 createServer
  (Lorg/springframework/web/client/support/RestGatewaySupport;)Lorg/springframework/test/web/client/MockRestServiceServer;
- (Lorg/springframework/web/client/support/RestGatewaySupport;)Lorg/springframework/test/web/client/MockRestServiceServer;
+ (Lorg/springframework/web/client/support/RestGatewaySupport;)L1org/springframework/test/web/client/MockRestServiceServer;
 
 expect
  (Lorg/springframework/test/web/client/ExpectedCount;Lorg/springframework/test/web/client/RequestMatcher;)Lorg/springframework/test/web/client/ResponseActions;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/ResponseCreator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/ResponseCreator.eea
index b84757b65d..a959362dd7 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/ResponseCreator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/ResponseCreator.eea
@@ -2,4 +2,4 @@ class org/springframework/test/web/client/ResponseCreator
 
 createResponse
  (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/http/client/ClientHttpResponse;
- (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/http/client/ClientHttpResponse;
+ (Lorg/springframework/http/client/ClientHttpRequest;)L1org/springframework/http/client/ClientHttpResponse;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/SimpleRequestExpectationManager.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/SimpleRequestExpectationManager.eea
index f446872bb3..bf5319d616 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/SimpleRequestExpectationManager.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/SimpleRequestExpectationManager.eea
@@ -2,4 +2,4 @@ class org/springframework/test/web/client/SimpleRequestExpectationManager
 
 matchRequest
  (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/test/web/client/RequestExpectation;
- (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/test/web/client/RequestExpectation;
+ (Lorg/springframework/http/client/ClientHttpRequest;)L1org/springframework/test/web/client/RequestExpectation; # @Inherited(org.springframework.test.web.client.AbstractRequestExpectationManager)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/UnorderedRequestExpectationManager.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/UnorderedRequestExpectationManager.eea
index 8c87a70e6a..0a2fc96015 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/UnorderedRequestExpectationManager.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/UnorderedRequestExpectationManager.eea
@@ -2,4 +2,4 @@ class org/springframework/test/web/client/UnorderedRequestExpectationManager
 
 matchRequest
  (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/test/web/client/RequestExpectation;
- (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/test/web/client/RequestExpectation;
+ (Lorg/springframework/http/client/ClientHttpRequest;)L1org/springframework/test/web/client/RequestExpectation; # @Inherited(org.springframework.test.web.client.AbstractRequestExpectationManager)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/match/ContentRequestMatchers.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/match/ContentRequestMatchers.eea
index 8398e1a6d6..29fe923d6a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/match/ContentRequestMatchers.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/match/ContentRequestMatchers.eea
@@ -35,10 +35,10 @@ multipartDataContains
  (Ljava/util/Map<Ljava/lang/String;*>;)Lorg/springframework/test/web/client/RequestMatcher;
 node
  (Lorg/hamcrest/Matcher<-Lorg/w3c/dom/Node;>;)Lorg/springframework/test/web/client/RequestMatcher;
- (Lorg/hamcrest/Matcher<-Lorg/w3c/dom/Node;>;)Lorg/springframework/test/web/client/RequestMatcher;
+ (Lorg/hamcrest/Matcher<-Lorg/w3c/dom/Node;>;)L1org/springframework/test/web/client/RequestMatcher;
 source
  (Lorg/hamcrest/Matcher<-Ljavax/xml/transform/Source;>;)Lorg/springframework/test/web/client/RequestMatcher;
- (Lorg/hamcrest/Matcher<-Ljavax/xml/transform/Source;>;)Lorg/springframework/test/web/client/RequestMatcher;
+ (Lorg/hamcrest/Matcher<-Ljavax/xml/transform/Source;>;)L1org/springframework/test/web/client/RequestMatcher;
 string
  (Ljava/lang/String;)Lorg/springframework/test/web/client/RequestMatcher;
  (Ljava/lang/String;)Lorg/springframework/test/web/client/RequestMatcher;
@@ -47,4 +47,4 @@ string
  (Lorg/hamcrest/Matcher<-Ljava/lang/String;>;)Lorg/springframework/test/web/client/RequestMatcher;
 xml
  (Ljava/lang/String;)Lorg/springframework/test/web/client/RequestMatcher;
- (Ljava/lang/String;)Lorg/springframework/test/web/client/RequestMatcher;
+ (Ljava/lang/String;)L1org/springframework/test/web/client/RequestMatcher;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/match/JsonPathRequestMatchers.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/match/JsonPathRequestMatchers.eea
index 07b9fdd0ad..82a0d0680f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/match/JsonPathRequestMatchers.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/match/JsonPathRequestMatchers.eea
@@ -5,43 +5,43 @@ class org/springframework/test/web/client/match/JsonPathRequestMatchers
  (Ljava/lang/String;[Ljava/lang/Object;)V
 doesNotExist
  ()Lorg/springframework/test/web/client/RequestMatcher;
- ()Lorg/springframework/test/web/client/RequestMatcher;
+ ()L1org/springframework/test/web/client/RequestMatcher;
 doesNotHaveJsonPath
  ()Lorg/springframework/test/web/client/RequestMatcher;
- ()Lorg/springframework/test/web/client/RequestMatcher;
+ ()L1org/springframework/test/web/client/RequestMatcher;
 exists
  ()Lorg/springframework/test/web/client/RequestMatcher;
- ()Lorg/springframework/test/web/client/RequestMatcher;
+ ()L1org/springframework/test/web/client/RequestMatcher;
 hasJsonPath
  ()Lorg/springframework/test/web/client/RequestMatcher;
- ()Lorg/springframework/test/web/client/RequestMatcher;
+ ()L1org/springframework/test/web/client/RequestMatcher;
 isArray
  ()Lorg/springframework/test/web/client/RequestMatcher;
- ()Lorg/springframework/test/web/client/RequestMatcher;
+ ()L1org/springframework/test/web/client/RequestMatcher;
 isBoolean
  ()Lorg/springframework/test/web/client/RequestMatcher;
- ()Lorg/springframework/test/web/client/RequestMatcher;
+ ()L1org/springframework/test/web/client/RequestMatcher;
 isEmpty
  ()Lorg/springframework/test/web/client/RequestMatcher;
- ()Lorg/springframework/test/web/client/RequestMatcher;
+ ()L1org/springframework/test/web/client/RequestMatcher;
 isMap
  ()Lorg/springframework/test/web/client/RequestMatcher;
- ()Lorg/springframework/test/web/client/RequestMatcher;
+ ()L1org/springframework/test/web/client/RequestMatcher;
 isNotEmpty
  ()Lorg/springframework/test/web/client/RequestMatcher;
- ()Lorg/springframework/test/web/client/RequestMatcher;
+ ()L1org/springframework/test/web/client/RequestMatcher;
 isNumber
  ()Lorg/springframework/test/web/client/RequestMatcher;
- ()Lorg/springframework/test/web/client/RequestMatcher;
+ ()L1org/springframework/test/web/client/RequestMatcher;
 isString
  ()Lorg/springframework/test/web/client/RequestMatcher;
- ()Lorg/springframework/test/web/client/RequestMatcher;
+ ()L1org/springframework/test/web/client/RequestMatcher;
 value
  (Ljava/lang/Object;)Lorg/springframework/test/web/client/RequestMatcher;
- (Ljava/lang/Object;)Lorg/springframework/test/web/client/RequestMatcher;
+ (Ljava/lang/Object;)L1org/springframework/test/web/client/RequestMatcher;
 value
  <T:Ljava/lang/Object;>(Lorg/hamcrest/Matcher<-TT;>;)Lorg/springframework/test/web/client/RequestMatcher;
- <T:Ljava/lang/Object;>(Lorg/hamcrest/Matcher<-TT;>;)Lorg/springframework/test/web/client/RequestMatcher;
+ <T:Ljava/lang/Object;>(Lorg/hamcrest/Matcher<-TT;>;)L1org/springframework/test/web/client/RequestMatcher;
 value
  <T:Ljava/lang/Object;>(Lorg/hamcrest/Matcher<-TT;>;Ljava/lang/Class<TT;>;)Lorg/springframework/test/web/client/RequestMatcher;
- <T:Ljava/lang/Object;>(Lorg/hamcrest/Matcher<-TT;>;Ljava/lang/Class<TT;>;)Lorg/springframework/test/web/client/RequestMatcher;
+ <T:Ljava/lang/Object;>(Lorg/hamcrest/Matcher<-TT;>;Ljava/lang/Class<TT;>;)L1org/springframework/test/web/client/RequestMatcher;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/match/MockRestRequestMatchers.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/match/MockRestRequestMatchers.eea
index 296fecd2dc..d24d5e6a0c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/match/MockRestRequestMatchers.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/match/MockRestRequestMatchers.eea
@@ -5,7 +5,7 @@ anything
  ()Lorg/springframework/test/web/client/RequestMatcher;
 content
  ()Lorg/springframework/test/web/client/match/ContentRequestMatchers;
- ()Lorg/springframework/test/web/client/match/ContentRequestMatchers;
+ ()L1org/springframework/test/web/client/match/ContentRequestMatchers;
 header
  (Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/test/web/client/RequestMatcher;
  (Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/test/web/client/RequestMatcher;
@@ -20,7 +20,7 @@ headerList
  (Ljava/lang/String;Lorg/hamcrest/Matcher<-Ljava/util/List<Ljava/lang/String;>;>;)Lorg/springframework/test/web/client/RequestMatcher;
 jsonPath
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/client/match/JsonPathRequestMatchers;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/client/match/JsonPathRequestMatchers;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/client/match/JsonPathRequestMatchers;
 jsonPath
  <T:Ljava/lang/Object;>(Ljava/lang/String;Lorg/hamcrest/Matcher<-TT;>;)Lorg/springframework/test/web/client/RequestMatcher;
  <T:Ljava/lang/Object;>(Ljava/lang/String;Lorg/hamcrest/Matcher<-TT;>;)Lorg/springframework/test/web/client/RequestMatcher;
@@ -50,7 +50,7 @@ requestToUriTemplate
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/client/RequestMatcher;
 xpath
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;[Ljava/lang/Object;)Lorg/springframework/test/web/client/match/XpathRequestMatchers;
- (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;[Ljava/lang/Object;)Lorg/springframework/test/web/client/match/XpathRequestMatchers;
+ (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;[Ljava/lang/Object;)L1org/springframework/test/web/client/match/XpathRequestMatchers;
 xpath
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/client/match/XpathRequestMatchers;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/client/match/XpathRequestMatchers;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/client/match/XpathRequestMatchers;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/response/DefaultResponseCreator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/response/DefaultResponseCreator.eea
index 5f5ca9759a..6ca196621e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/response/DefaultResponseCreator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/response/DefaultResponseCreator.eea
@@ -26,7 +26,7 @@ cookies
  ([Lorg/springframework/http/ResponseCookie;)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
 createResponse
  (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/http/client/ClientHttpResponse;
- (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/http/client/ClientHttpResponse;
+ (Lorg/springframework/http/client/ClientHttpRequest;)L1org/springframework/http/client/ClientHttpResponse; # @Inherited(org.springframework.test.web.client.ResponseCreator)
 header
  (Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
  (Ljava/lang/String;[Ljava/lang/String;)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/response/ExecutingResponseCreator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/response/ExecutingResponseCreator.eea
index 48545b74de..adf061ba22 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/response/ExecutingResponseCreator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/response/ExecutingResponseCreator.eea
@@ -5,4 +5,4 @@ class org/springframework/test/web/client/response/ExecutingResponseCreator
  (Lorg/springframework/http/client/ClientHttpRequestFactory;)V
 createResponse
  (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/http/client/ClientHttpResponse;
- (Lorg/springframework/http/client/ClientHttpRequest;)Lorg/springframework/http/client/ClientHttpResponse;
+ (Lorg/springframework/http/client/ClientHttpRequest;)L1org/springframework/http/client/ClientHttpResponse; # @Inherited(org.springframework.test.web.client.ResponseCreator)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/response/MockRestResponseCreators.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/response/MockRestResponseCreators.eea
index ce6eb857c9..4b496e64dd 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/response/MockRestResponseCreators.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/client/response/MockRestResponseCreators.eea
@@ -2,13 +2,13 @@ class org/springframework/test/web/client/response/MockRestResponseCreators
 
 withAccepted
  ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
- ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
+ ()L1org/springframework/test/web/client/response/DefaultResponseCreator;
 withBadGateway
  ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
- ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
+ ()L1org/springframework/test/web/client/response/DefaultResponseCreator;
 withBadRequest
  ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
- ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
+ ()L1org/springframework/test/web/client/response/DefaultResponseCreator;
 withCreatedEntity
  (Ljava/net/URI;)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
  (Ljava/net/URI;)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
@@ -17,34 +17,34 @@ withException
  (Ljava/io/IOException;)Lorg/springframework/test/web/client/ResponseCreator;
 withForbiddenRequest
  ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
- ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
+ ()L1org/springframework/test/web/client/response/DefaultResponseCreator;
 withGatewayTimeout
  ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
- ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
+ ()L1org/springframework/test/web/client/response/DefaultResponseCreator;
 withNoContent
  ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
- ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
+ ()L1org/springframework/test/web/client/response/DefaultResponseCreator;
 withRawStatus
  (I)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
- (I)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
+ (I)L1org/springframework/test/web/client/response/DefaultResponseCreator;
 withRequestConflict
  ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
- ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
+ ()L1org/springframework/test/web/client/response/DefaultResponseCreator;
 withResourceNotFound
  ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
- ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
+ ()L1org/springframework/test/web/client/response/DefaultResponseCreator;
 withServerError
  ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
- ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
+ ()L1org/springframework/test/web/client/response/DefaultResponseCreator;
 withServiceUnavailable
  ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
- ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
+ ()L1org/springframework/test/web/client/response/DefaultResponseCreator;
 withStatus
  (Lorg/springframework/http/HttpStatusCode;)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
- (Lorg/springframework/http/HttpStatusCode;)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
+ (Lorg/springframework/http/HttpStatusCode;)L1org/springframework/test/web/client/response/DefaultResponseCreator;
 withSuccess
  ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
- ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
+ ()L1org/springframework/test/web/client/response/DefaultResponseCreator;
 withSuccess
  (Ljava/lang/String;Lorg/springframework/http/MediaType;)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
  (Ljava/lang/String;Lorg/springframework/http/MediaType;)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
@@ -56,10 +56,10 @@ withSuccess
  ([BLorg/springframework/http/MediaType;)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
 withTooManyRequests
  ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
- ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
+ ()L1org/springframework/test/web/client/response/DefaultResponseCreator;
 withTooManyRequests
  (I)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
  (I)Lorg/springframework/test/web/client/response/DefaultResponseCreator;
 withUnauthorizedRequest
  ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
- ()Lorg/springframework/test/web/client/response/DefaultResponseCreator;
+ ()L1org/springframework/test/web/client/response/DefaultResponseCreator;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/reactive/server/WebTestClient.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/reactive/server/WebTestClient.eea
index 8c8a706626..e0e35b0d03 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/reactive/server/WebTestClient.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/reactive/server/WebTestClient.eea
@@ -6,22 +6,22 @@ WEBTESTCLIENT_REQUEST_ID
 
 bindToApplicationContext
  (Lorg/springframework/context/ApplicationContext;)Lorg/springframework/test/web/reactive/server/WebTestClient$MockServerSpec<*>;
- (Lorg/springframework/context/ApplicationContext;)Lorg/springframework/test/web/reactive/server/WebTestClient$MockServerSpec<*>;
+ (Lorg/springframework/context/ApplicationContext;)L1org/springframework/test/web/reactive/server/WebTestClient$MockServerSpec<*>;
 bindToController
  ([Ljava/lang/Object;)Lorg/springframework/test/web/reactive/server/WebTestClient$ControllerSpec;
- ([Ljava/lang/Object;)Lorg/springframework/test/web/reactive/server/WebTestClient$ControllerSpec;
+ ([Ljava/lang/Object;)L1org/springframework/test/web/reactive/server/WebTestClient$ControllerSpec;
 bindToRouterFunction
  (Lorg/springframework/web/reactive/function/server/RouterFunction<*>;)Lorg/springframework/test/web/reactive/server/WebTestClient$RouterFunctionSpec;
- (Lorg/springframework/web/reactive/function/server/RouterFunction<*>;)Lorg/springframework/test/web/reactive/server/WebTestClient$RouterFunctionSpec;
+ (Lorg/springframework/web/reactive/function/server/RouterFunction<*>;)L1org/springframework/test/web/reactive/server/WebTestClient$RouterFunctionSpec;
 bindToServer
  ()Lorg/springframework/test/web/reactive/server/WebTestClient$Builder;
- ()Lorg/springframework/test/web/reactive/server/WebTestClient$Builder;
+ ()L1org/springframework/test/web/reactive/server/WebTestClient$Builder;
 bindToServer
  (Lorg/springframework/http/client/reactive/ClientHttpConnector;)Lorg/springframework/test/web/reactive/server/WebTestClient$Builder;
- (Lorg/springframework/http/client/reactive/ClientHttpConnector;)Lorg/springframework/test/web/reactive/server/WebTestClient$Builder;
+ (Lorg/springframework/http/client/reactive/ClientHttpConnector;)L1org/springframework/test/web/reactive/server/WebTestClient$Builder;
 bindToWebHandler
  (Lorg/springframework/web/server/WebHandler;)Lorg/springframework/test/web/reactive/server/WebTestClient$MockServerSpec<*>;
- (Lorg/springframework/web/server/WebHandler;)Lorg/springframework/test/web/reactive/server/WebTestClient$MockServerSpec<*>;
+ (Lorg/springframework/web/server/WebHandler;)L1org/springframework/test/web/reactive/server/WebTestClient$MockServerSpec<*>;
 
 delete
  ()Lorg/springframework/test/web/reactive/server/WebTestClient$RequestHeadersUriSpec<*>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/MockMvc.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/MockMvc.eea
index 82909a594e..397b444d8c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/MockMvc.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/MockMvc.eea
@@ -5,4 +5,4 @@ getDispatcherServlet
  ()Lorg/springframework/web/servlet/DispatcherServlet;
 perform
  (Lorg/springframework/test/web/servlet/RequestBuilder;)Lorg/springframework/test/web/servlet/ResultActions;
- (Lorg/springframework/test/web/servlet/RequestBuilder;)Lorg/springframework/test/web/servlet/ResultActions;
+ (Lorg/springframework/test/web/servlet/RequestBuilder;)L1org/springframework/test/web/servlet/ResultActions;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/MockMvcBuilderSupport.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/MockMvcBuilderSupport.eea
index 29ad325f9a..25be9e956c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/MockMvcBuilderSupport.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/MockMvcBuilderSupport.eea
@@ -2,7 +2,7 @@ class org/springframework/test/web/servlet/MockMvcBuilderSupport
 
 createMockMvc
  ([Ljakarta/servlet/Filter;Lorg/springframework/mock/web/MockServletConfig;Lorg/springframework/web/context/WebApplicationContext;Lorg/springframework/test/web/servlet/RequestBuilder;Ljava/nio/charset/Charset;Ljava/util/List<Lorg/springframework/test/web/servlet/ResultMatcher;>;Ljava/util/List<Lorg/springframework/test/web/servlet/ResultHandler;>;Ljava/util/List<Lorg/springframework/test/web/servlet/DispatcherServletCustomizer;>;)Lorg/springframework/test/web/servlet/MockMvc;
- ([Ljakarta/servlet/Filter;Lorg/springframework/mock/web/MockServletConfig;Lorg/springframework/web/context/WebApplicationContext;Lorg/springframework/test/web/servlet/RequestBuilder;Ljava/nio/charset/Charset;Ljava/util/List<Lorg/springframework/test/web/servlet/ResultMatcher;>;Ljava/util/List<Lorg/springframework/test/web/servlet/ResultHandler;>;Ljava/util/List<Lorg/springframework/test/web/servlet/DispatcherServletCustomizer;>;)Lorg/springframework/test/web/servlet/MockMvc;
+ ([Ljakarta/servlet/Filter;Lorg/springframework/mock/web/MockServletConfig;Lorg/springframework/web/context/WebApplicationContext;Lorg/springframework/test/web/servlet/RequestBuilder;Ljava/nio/charset/Charset;Ljava/util/List<Lorg/springframework/test/web/servlet/ResultMatcher;>;Ljava/util/List<Lorg/springframework/test/web/servlet/ResultHandler;>;Ljava/util/List<Lorg/springframework/test/web/servlet/DispatcherServletCustomizer;>;)L1org/springframework/test/web/servlet/MockMvc;
 createMockMvc
  ([Ljakarta/servlet/Filter;Lorg/springframework/mock/web/MockServletConfig;Lorg/springframework/web/context/WebApplicationContext;Lorg/springframework/test/web/servlet/RequestBuilder;Ljava/util/List<Lorg/springframework/test/web/servlet/ResultMatcher;>;Ljava/util/List<Lorg/springframework/test/web/servlet/ResultHandler;>;Ljava/util/List<Lorg/springframework/test/web/servlet/DispatcherServletCustomizer;>;)Lorg/springframework/test/web/servlet/MockMvc;
- ([Ljakarta/servlet/Filter;Lorg/springframework/mock/web/MockServletConfig;Lorg/springframework/web/context/WebApplicationContext;Lorg/springframework/test/web/servlet/RequestBuilder;Ljava/util/List<Lorg/springframework/test/web/servlet/ResultMatcher;>;Ljava/util/List<Lorg/springframework/test/web/servlet/ResultHandler;>;Ljava/util/List<Lorg/springframework/test/web/servlet/DispatcherServletCustomizer;>;)Lorg/springframework/test/web/servlet/MockMvc;
+ ([Ljakarta/servlet/Filter;Lorg/springframework/mock/web/MockServletConfig;Lorg/springframework/web/context/WebApplicationContext;Lorg/springframework/test/web/servlet/RequestBuilder;Ljava/util/List<Lorg/springframework/test/web/servlet/ResultMatcher;>;Ljava/util/List<Lorg/springframework/test/web/servlet/ResultHandler;>;Ljava/util/List<Lorg/springframework/test/web/servlet/DispatcherServletCustomizer;>;)L1org/springframework/test/web/servlet/MockMvc;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/client/MockMvcHttpConnector.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/client/MockMvcHttpConnector.eea
index b82688b16e..57a3a9178b 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/client/MockMvcHttpConnector.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/client/MockMvcHttpConnector.eea
@@ -8,4 +8,4 @@ connect
  (Lorg/springframework/http/HttpMethod;Ljava/net/URI;Ljava/util/function/Function<-Lorg/springframework/http/client/reactive/ClientHttpRequest;Lreactor/core/publisher/Mono<Ljava/lang/Void;>;>;)Lreactor/core/publisher/Mono<Lorg/springframework/http/client/reactive/ClientHttpResponse;>;
 with
  (Ljava/util/List<Lorg/springframework/test/web/servlet/request/RequestPostProcessor;>;)Lorg/springframework/test/web/servlet/client/MockMvcHttpConnector;
- (Ljava/util/List<Lorg/springframework/test/web/servlet/request/RequestPostProcessor;>;)Lorg/springframework/test/web/servlet/client/MockMvcHttpConnector;
+ (Ljava/util/List<Lorg/springframework/test/web/servlet/request/RequestPostProcessor;>;)L1org/springframework/test/web/servlet/client/MockMvcHttpConnector;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/client/MockMvcWebTestClient.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/client/MockMvcWebTestClient.eea
index 7303930e2d..5d05c01757 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/client/MockMvcWebTestClient.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/client/MockMvcWebTestClient.eea
@@ -5,10 +5,10 @@ bindTo
  (Lorg/springframework/test/web/servlet/MockMvc;)Lorg/springframework/test/web/reactive/server/WebTestClient$Builder;
 bindToApplicationContext
  (Lorg/springframework/web/context/WebApplicationContext;)Lorg/springframework/test/web/servlet/client/MockMvcWebTestClient$MockMvcServerSpec<*>;
- (Lorg/springframework/web/context/WebApplicationContext;)Lorg/springframework/test/web/servlet/client/MockMvcWebTestClient$MockMvcServerSpec<*>;
+ (Lorg/springframework/web/context/WebApplicationContext;)L1org/springframework/test/web/servlet/client/MockMvcWebTestClient$MockMvcServerSpec<*>;
 bindToController
  ([Ljava/lang/Object;)Lorg/springframework/test/web/servlet/client/MockMvcWebTestClient$ControllerSpec;
- ([Ljava/lang/Object;)Lorg/springframework/test/web/servlet/client/MockMvcWebTestClient$ControllerSpec;
+ ([Ljava/lang/Object;)L1org/springframework/test/web/servlet/client/MockMvcWebTestClient$ControllerSpec;
 resultActionsFor
  (Lorg/springframework/test/web/reactive/server/ExchangeResult;)Lorg/springframework/test/web/servlet/ResultActions;
- (Lorg/springframework/test/web/reactive/server/ExchangeResult;)Lorg/springframework/test/web/servlet/ResultActions;
+ (Lorg/springframework/test/web/reactive/server/ExchangeResult;)L1org/springframework/test/web/servlet/ResultActions;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder.eea
index c4404a9531..abe28c9e7c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder.eea
@@ -6,13 +6,13 @@ super org/springframework/test/web/servlet/htmlunit/MockMvcWebConnectionBuilderS
 
 mockMvcSetup
  (Lorg/springframework/test/web/servlet/MockMvc;)Lorg/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder;
- (Lorg/springframework/test/web/servlet/MockMvc;)Lorg/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder;
+ (Lorg/springframework/test/web/servlet/MockMvc;)L1org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder;
 webAppContextSetup
  (Lorg/springframework/web/context/WebApplicationContext;)Lorg/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder;
- (Lorg/springframework/web/context/WebApplicationContext;)Lorg/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder;
+ (Lorg/springframework/web/context/WebApplicationContext;)L1org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder;
 webAppContextSetup
  (Lorg/springframework/web/context/WebApplicationContext;Lorg/springframework/test/web/servlet/setup/MockMvcConfigurer;)Lorg/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder;
- (Lorg/springframework/web/context/WebApplicationContext;Lorg/springframework/test/web/servlet/setup/MockMvcConfigurer;)Lorg/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder;
+ (Lorg/springframework/web/context/WebApplicationContext;Lorg/springframework/test/web/servlet/setup/MockMvcConfigurer;)L1org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilder;
 
 <init>
  (Lorg/springframework/test/web/servlet/MockMvc;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnectionBuilderSupport.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnectionBuilderSupport.eea
index 88c452535d..f5afea3a74 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnectionBuilderSupport.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnectionBuilderSupport.eea
@@ -19,7 +19,7 @@ contextPath
  (Ljava/lang/String;)TT;
 createConnection
  (Lcom/gargoylesoftware/htmlunit/WebClient;)Lcom/gargoylesoftware/htmlunit/WebConnection;
- (Lcom/gargoylesoftware/htmlunit/WebClient;)Lcom/gargoylesoftware/htmlunit/WebConnection;
+ (Lcom/gargoylesoftware/htmlunit/WebClient;)L1com/gargoylesoftware/htmlunit/WebConnection;
 useMockMvc
  ([Lorg/springframework/test/web/servlet/htmlunit/WebRequestMatcher;)TT;
  ([Lorg/springframework/test/web/servlet/htmlunit/WebRequestMatcher;)TT;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder.eea
index 31887a5dd3..fd8b9c8067 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder.eea
@@ -6,13 +6,13 @@ super org/springframework/test/web/servlet/htmlunit/MockMvcWebConnectionBuilderS
 
 mockMvcSetup
  (Lorg/springframework/test/web/servlet/MockMvc;)Lorg/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder;
- (Lorg/springframework/test/web/servlet/MockMvc;)Lorg/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder;
+ (Lorg/springframework/test/web/servlet/MockMvc;)L1org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder;
 webAppContextSetup
  (Lorg/springframework/web/context/WebApplicationContext;)Lorg/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder;
- (Lorg/springframework/web/context/WebApplicationContext;)Lorg/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder;
+ (Lorg/springframework/web/context/WebApplicationContext;)L1org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder;
 webAppContextSetup
  (Lorg/springframework/web/context/WebApplicationContext;Lorg/springframework/test/web/servlet/setup/MockMvcConfigurer;)Lorg/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder;
- (Lorg/springframework/web/context/WebApplicationContext;Lorg/springframework/test/web/servlet/setup/MockMvcConfigurer;)Lorg/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder;
+ (Lorg/springframework/web/context/WebApplicationContext;Lorg/springframework/test/web/servlet/setup/MockMvcConfigurer;)L1org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilder;
 
 <init>
  (Lorg/springframework/test/web/servlet/MockMvc;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.eea
index 4edd9b4a1f..ce8418044a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.eea
@@ -39,7 +39,7 @@ cookie
  ([Ljakarta/servlet/http/Cookie;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 createServletRequest
  (Ljakarta/servlet/ServletContext;)Lorg/springframework/mock/web/MockHttpServletRequest;
- (Ljakarta/servlet/ServletContext;)Lorg/springframework/mock/web/MockHttpServletRequest;
+ (Ljakarta/servlet/ServletContext;)L1org/springframework/mock/web/MockHttpServletRequest;
 flashAttr
  (Ljava/lang/String;Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
  (Ljava/lang/String;Ljava/lang/Object;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.eea
index 0690d33b90..6065325d38 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.eea
@@ -2,7 +2,7 @@ class org/springframework/test/web/servlet/request/MockMultipartHttpServletReque
 
 createServletRequest
  (Ljakarta/servlet/ServletContext;)Lorg/springframework/mock/web/MockHttpServletRequest;
- (Ljakarta/servlet/ServletContext;)Lorg/springframework/mock/web/MockHttpServletRequest;
+ (Ljakarta/servlet/ServletContext;)L1org/springframework/mock/web/MockHttpServletRequest; # @Inherited(org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder)
 file
  (Ljava/lang/String;[B)Lorg/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
  (Ljava/lang/String;[B)L1org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.eea
index ac5eb8fff2..6f6c75769f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.eea
@@ -5,64 +5,64 @@ asyncDispatch
  (Lorg/springframework/test/web/servlet/MvcResult;)Lorg/springframework/test/web/servlet/RequestBuilder;
 delete
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 delete
  (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/net/URI;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 get
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 get
  (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/net/URI;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 head
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 head
  (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/net/URI;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 multipart
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
 multipart
  (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
- (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
+ (Ljava/net/URI;)L1org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
 multipart
  (Lorg/springframework/http/HttpMethod;Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
- (Lorg/springframework/http/HttpMethod;Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
+ (Lorg/springframework/http/HttpMethod;Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
 multipart
  (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
- (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
+ (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)L1org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder;
 options
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 options
  (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/net/URI;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 patch
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 patch
  (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/net/URI;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 post
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 post
  (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/net/URI;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 put
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 put
  (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/net/URI;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 request
  (Ljava/lang/String;Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Ljava/lang/String;Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Ljava/lang/String;Ljava/net/URI;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 request
  (Lorg/springframework/http/HttpMethod;Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Lorg/springframework/http/HttpMethod;Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Lorg/springframework/http/HttpMethod;Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
 request
  (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
- (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)Lorg/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
+ (Lorg/springframework/http/HttpMethod;Ljava/net/URI;)L1org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/result/MockMvcResultHandlers.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/result/MockMvcResultHandlers.eea
index 5089b55a76..4786907b56 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/result/MockMvcResultHandlers.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/result/MockMvcResultHandlers.eea
@@ -2,7 +2,7 @@ class org/springframework/test/web/servlet/result/MockMvcResultHandlers
 
 log
  ()Lorg/springframework/test/web/servlet/ResultHandler;
- ()Lorg/springframework/test/web/servlet/ResultHandler;
+ ()L1org/springframework/test/web/servlet/ResultHandler;
 print
  ()Lorg/springframework/test/web/servlet/ResultHandler;
  ()Lorg/springframework/test/web/servlet/ResultHandler;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/result/MockMvcResultMatchers.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/result/MockMvcResultMatchers.eea
index 0319131c4b..aad18ddb6c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/result/MockMvcResultMatchers.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/result/MockMvcResultMatchers.eea
@@ -2,13 +2,13 @@ class org/springframework/test/web/servlet/result/MockMvcResultMatchers
 
 content
  ()Lorg/springframework/test/web/servlet/result/ContentResultMatchers;
- ()Lorg/springframework/test/web/servlet/result/ContentResultMatchers;
+ ()L1org/springframework/test/web/servlet/result/ContentResultMatchers;
 cookie
  ()Lorg/springframework/test/web/servlet/result/CookieResultMatchers;
- ()Lorg/springframework/test/web/servlet/result/CookieResultMatchers;
+ ()L1org/springframework/test/web/servlet/result/CookieResultMatchers;
 flash
  ()Lorg/springframework/test/web/servlet/result/FlashAttributeResultMatchers;
- ()Lorg/springframework/test/web/servlet/result/FlashAttributeResultMatchers;
+ ()L1org/springframework/test/web/servlet/result/FlashAttributeResultMatchers;
 forwardedUrl
  (Ljava/lang/String;)Lorg/springframework/test/web/servlet/ResultMatcher;
  (Ljava/lang/String;)Lorg/springframework/test/web/servlet/ResultMatcher;
@@ -20,13 +20,13 @@ forwardedUrlTemplate
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/ResultMatcher;
 handler
  ()Lorg/springframework/test/web/servlet/result/HandlerResultMatchers;
- ()Lorg/springframework/test/web/servlet/result/HandlerResultMatchers;
+ ()L1org/springframework/test/web/servlet/result/HandlerResultMatchers;
 header
  ()Lorg/springframework/test/web/servlet/result/HeaderResultMatchers;
- ()Lorg/springframework/test/web/servlet/result/HeaderResultMatchers;
+ ()L1org/springframework/test/web/servlet/result/HeaderResultMatchers;
 jsonPath
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/result/JsonPathResultMatchers;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/result/JsonPathResultMatchers;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/result/JsonPathResultMatchers;
 jsonPath
  <T:Ljava/lang/Object;>(Ljava/lang/String;Lorg/hamcrest/Matcher<-TT;>;)Lorg/springframework/test/web/servlet/ResultMatcher;
  <T:Ljava/lang/Object;>(Ljava/lang/String;Lorg/hamcrest/Matcher<-TT;>;)Lorg/springframework/test/web/servlet/ResultMatcher;
@@ -35,7 +35,7 @@ jsonPath
  <T:Ljava/lang/Object;>(Ljava/lang/String;Lorg/hamcrest/Matcher<-TT;>;Ljava/lang/Class<TT;>;)Lorg/springframework/test/web/servlet/ResultMatcher;
 model
  ()Lorg/springframework/test/web/servlet/result/ModelResultMatchers;
- ()Lorg/springframework/test/web/servlet/result/ModelResultMatchers;
+ ()L1org/springframework/test/web/servlet/result/ModelResultMatchers;
 redirectedUrl
  (Ljava/lang/String;)Lorg/springframework/test/web/servlet/ResultMatcher;
  (Ljava/lang/String;)Lorg/springframework/test/web/servlet/ResultMatcher;
@@ -47,16 +47,16 @@ redirectedUrlTemplate
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/ResultMatcher;
 request
  ()Lorg/springframework/test/web/servlet/result/RequestResultMatchers;
- ()Lorg/springframework/test/web/servlet/result/RequestResultMatchers;
+ ()L1org/springframework/test/web/servlet/result/RequestResultMatchers;
 status
  ()Lorg/springframework/test/web/servlet/result/StatusResultMatchers;
- ()Lorg/springframework/test/web/servlet/result/StatusResultMatchers;
+ ()L1org/springframework/test/web/servlet/result/StatusResultMatchers;
 view
  ()Lorg/springframework/test/web/servlet/result/ViewResultMatchers;
- ()Lorg/springframework/test/web/servlet/result/ViewResultMatchers;
+ ()L1org/springframework/test/web/servlet/result/ViewResultMatchers;
 xpath
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/result/XpathResultMatchers;
- (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/result/XpathResultMatchers;
+ (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/result/XpathResultMatchers;
 xpath
  (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/result/XpathResultMatchers;
- (Ljava/lang/String;[Ljava/lang/Object;)Lorg/springframework/test/web/servlet/result/XpathResultMatchers;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1org/springframework/test/web/servlet/result/XpathResultMatchers;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/result/PrintingResultHandler.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/result/PrintingResultHandler.eea
index b65402d20c..a570638fbe 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/result/PrintingResultHandler.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/result/PrintingResultHandler.eea
@@ -5,16 +5,16 @@ class org/springframework/test/web/servlet/result/PrintingResultHandler
  (Lorg/springframework/test/web/servlet/result/PrintingResultHandler$ResultValuePrinter;)V
 getParamsMultiValueMap
  (Lorg/springframework/mock/web/MockHttpServletRequest;)Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
- (Lorg/springframework/mock/web/MockHttpServletRequest;)Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
+ (Lorg/springframework/mock/web/MockHttpServletRequest;)L1org/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
 getPrinter
  ()Lorg/springframework/test/web/servlet/result/PrintingResultHandler$ResultValuePrinter;
  ()Lorg/springframework/test/web/servlet/result/PrintingResultHandler$ResultValuePrinter;
 getRequestHeaders
  (Lorg/springframework/mock/web/MockHttpServletRequest;)Lorg/springframework/http/HttpHeaders;
- (Lorg/springframework/mock/web/MockHttpServletRequest;)Lorg/springframework/http/HttpHeaders;
+ (Lorg/springframework/mock/web/MockHttpServletRequest;)L1org/springframework/http/HttpHeaders;
 getResponseHeaders
  (Lorg/springframework/mock/web/MockHttpServletResponse;)Lorg/springframework/http/HttpHeaders;
- (Lorg/springframework/mock/web/MockHttpServletResponse;)Lorg/springframework/http/HttpHeaders;
+ (Lorg/springframework/mock/web/MockHttpServletResponse;)L1org/springframework/http/HttpHeaders;
 getSessionAttributes
  (Lorg/springframework/mock/web/MockHttpServletRequest;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
  (Lorg/springframework/mock/web/MockHttpServletRequest;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/setup/MockMvcBuilders.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/setup/MockMvcBuilders.eea
index ba33c9a788..7690b5e77b 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/setup/MockMvcBuilders.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/setup/MockMvcBuilders.eea
@@ -2,7 +2,7 @@ class org/springframework/test/web/servlet/setup/MockMvcBuilders
 
 standaloneSetup
  ([Ljava/lang/Object;)Lorg/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder;
- ([Ljava/lang/Object;)Lorg/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder;
+ ([Ljava/lang/Object;)L1org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder;
 webAppContextSetup
  (Lorg/springframework/web/context/WebApplicationContext;)Lorg/springframework/test/web/servlet/setup/DefaultMockMvcBuilder;
- (Lorg/springframework/web/context/WebApplicationContext;)Lorg/springframework/test/web/servlet/setup/DefaultMockMvcBuilder;
+ (Lorg/springframework/web/context/WebApplicationContext;)L1org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/setup/SharedHttpSessionConfigurer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/setup/SharedHttpSessionConfigurer.eea
index 88696ce0ce..7bba0a601f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/setup/SharedHttpSessionConfigurer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/setup/SharedHttpSessionConfigurer.eea
@@ -2,7 +2,7 @@ class org/springframework/test/web/servlet/setup/SharedHttpSessionConfigurer
 
 sharedHttpSession
  ()Lorg/springframework/test/web/servlet/setup/SharedHttpSessionConfigurer;
- ()Lorg/springframework/test/web/servlet/setup/SharedHttpSessionConfigurer;
+ ()L1org/springframework/test/web/servlet/setup/SharedHttpSessionConfigurer;
 
 afterConfigurerAdded
  (Lorg/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder<*>;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.eea
index af4753f308..c4491b0d3c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.eea
@@ -21,7 +21,7 @@ extendMvcSingletons
  (Ljakarta/servlet/ServletContext;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 initWebAppContext
  ()Lorg/springframework/web/context/WebApplicationContext;
- ()Lorg/springframework/web/context/WebApplicationContext;
+ ()L1org/springframework/web/context/WebApplicationContext;
 setAsyncRequestTimeout
  (J)Lorg/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder;
  (J)L1org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/HeuristicCompletionException.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/HeuristicCompletionException.eea
index aa48692269..7857ffdb89 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/HeuristicCompletionException.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/HeuristicCompletionException.eea
@@ -2,7 +2,7 @@ class org/springframework/transaction/HeuristicCompletionException
 
 getStateString
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 
 <init>
  (ILjava/lang/Throwable;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/SavepointManager.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/SavepointManager.eea
index 1aadf6213c..2baf6e98c8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/SavepointManager.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/SavepointManager.eea
@@ -2,7 +2,7 @@ class org/springframework/transaction/SavepointManager
 
 createSavepoint
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 releaseSavepoint
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/TransactionExecution.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/TransactionExecution.eea
index 9a95b3446f..5bedb5e4bc 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/TransactionExecution.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/TransactionExecution.eea
@@ -2,4 +2,4 @@ class org/springframework/transaction/TransactionExecution
 
 getTransactionName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.eea
index 708ad8a76b..6ff6bf4245 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.eea
@@ -2,7 +2,7 @@ class org/springframework/transaction/annotation/AbstractTransactionManagementCo
 
 transactionalEventListenerFactory
  ()Lorg/springframework/transaction/event/TransactionalEventListenerFactory;
- ()Lorg/springframework/transaction/event/TransactionalEventListenerFactory;
+ ()L1org/springframework/transaction/event/TransactionalEventListenerFactory;
 
 enableTx
  Lorg/springframework/core/annotation/AnnotationAttributes;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.eea
index 6d490b5f30..01efc46af1 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.eea
@@ -8,7 +8,7 @@ isCandidateClass
  (Ljava/lang/Class<*>;)Z
 parseTransactionAnnotation
  (Ljakarta/ejb/TransactionAttribute;)Lorg/springframework/transaction/interceptor/TransactionAttribute;
- (Ljakarta/ejb/TransactionAttribute;)Lorg/springframework/transaction/interceptor/TransactionAttribute;
+ (Ljakarta/ejb/TransactionAttribute;)L1org/springframework/transaction/interceptor/TransactionAttribute;
 parseTransactionAnnotation
  (Ljava/lang/reflect/AnnotatedElement;)Lorg/springframework/transaction/interceptor/TransactionAttribute;
  (Ljava/lang/reflect/AnnotatedElement;)L0org/springframework/transaction/interceptor/TransactionAttribute; # @Inherited(org.springframework.transaction.annotation.TransactionAnnotationParser)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/annotation/JtaTransactionAnnotationParser.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/annotation/JtaTransactionAnnotationParser.eea
index 977c3db727..d92bf3a235 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/annotation/JtaTransactionAnnotationParser.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/annotation/JtaTransactionAnnotationParser.eea
@@ -14,4 +14,4 @@ parseTransactionAnnotation
  (Ljava/lang/reflect/AnnotatedElement;)L0org/springframework/transaction/interceptor/TransactionAttribute; # @Inherited(org.springframework.transaction.annotation.TransactionAnnotationParser)
 parseTransactionAnnotation
  (Lorg/springframework/core/annotation/AnnotationAttributes;)Lorg/springframework/transaction/interceptor/TransactionAttribute;
- (Lorg/springframework/core/annotation/AnnotationAttributes;)Lorg/springframework/transaction/interceptor/TransactionAttribute;
+ (Lorg/springframework/core/annotation/AnnotationAttributes;)L1org/springframework/transaction/interceptor/TransactionAttribute;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.eea
index 946d42a627..8899e71a70 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.eea
@@ -2,10 +2,10 @@ class org/springframework/transaction/annotation/ProxyTransactionManagementConfi
 
 transactionAdvisor
  (Lorg/springframework/transaction/interceptor/TransactionAttributeSource;Lorg/springframework/transaction/interceptor/TransactionInterceptor;)Lorg/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor;
- (Lorg/springframework/transaction/interceptor/TransactionAttributeSource;Lorg/springframework/transaction/interceptor/TransactionInterceptor;)Lorg/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor;
+ (Lorg/springframework/transaction/interceptor/TransactionAttributeSource;Lorg/springframework/transaction/interceptor/TransactionInterceptor;)L1org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor;
 transactionAttributeSource
  ()Lorg/springframework/transaction/interceptor/TransactionAttributeSource;
- ()Lorg/springframework/transaction/interceptor/TransactionAttributeSource;
+ ()L1org/springframework/transaction/interceptor/TransactionAttributeSource;
 transactionInterceptor
  (Lorg/springframework/transaction/interceptor/TransactionAttributeSource;)Lorg/springframework/transaction/interceptor/TransactionInterceptor;
- (Lorg/springframework/transaction/interceptor/TransactionAttributeSource;)Lorg/springframework/transaction/interceptor/TransactionInterceptor;
+ (Lorg/springframework/transaction/interceptor/TransactionAttributeSource;)L1org/springframework/transaction/interceptor/TransactionInterceptor;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/annotation/RestrictedTransactionalEventListenerFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/annotation/RestrictedTransactionalEventListenerFactory.eea
index d6091b43d9..895e05c166 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/annotation/RestrictedTransactionalEventListenerFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/annotation/RestrictedTransactionalEventListenerFactory.eea
@@ -2,4 +2,4 @@ class org/springframework/transaction/annotation/RestrictedTransactionalEventLis
 
 createApplicationListener
  (Ljava/lang/String;Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)Lorg/springframework/context/ApplicationListener<*>;
- (Ljava/lang/String;Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)Lorg/springframework/context/ApplicationListener<*>;
+ (Ljava/lang/String;Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)L1org/springframework/context/ApplicationListener<*>; # @Inherited(org.springframework.transaction.event.TransactionalEventListenerFactory)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.eea
index 8fddcdd687..564f1a4c49 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.eea
@@ -11,7 +11,7 @@ parseTransactionAnnotation
  (Ljava/lang/reflect/AnnotatedElement;)L0org/springframework/transaction/interceptor/TransactionAttribute; # @Inherited(org.springframework.transaction.annotation.TransactionAnnotationParser)
 parseTransactionAnnotation
  (Lorg/springframework/core/annotation/AnnotationAttributes;)Lorg/springframework/transaction/interceptor/TransactionAttribute;
- (Lorg/springframework/core/annotation/AnnotationAttributes;)Lorg/springframework/transaction/interceptor/TransactionAttribute;
+ (Lorg/springframework/core/annotation/AnnotationAttributes;)L1org/springframework/transaction/interceptor/TransactionAttribute;
 parseTransactionAnnotation
  (Lorg/springframework/transaction/annotation/Transactional;)Lorg/springframework/transaction/interceptor/TransactionAttribute;
  (Lorg/springframework/transaction/annotation/Transactional;)Lorg/springframework/transaction/interceptor/TransactionAttribute;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/config/JtaTransactionManagerBeanDefinitionParser.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/config/JtaTransactionManagerBeanDefinitionParser.eea
index 76a7cb0230..ac8a7054a8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/config/JtaTransactionManagerBeanDefinitionParser.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/config/JtaTransactionManagerBeanDefinitionParser.eea
@@ -5,4 +5,4 @@ getBeanClass
  (Lorg/w3c/dom/Element;)L0java/lang/Class<*>; # @Inherited(org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser)
 resolveId
  (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/support/AbstractBeanDefinition;Lorg/springframework/beans/factory/xml/ParserContext;)Ljava/lang/String;
- (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/support/AbstractBeanDefinition;Lorg/springframework/beans/factory/xml/ParserContext;)Ljava/lang/String;
+ (Lorg/w3c/dom/Element;Lorg/springframework/beans/factory/support/AbstractBeanDefinition;Lorg/springframework/beans/factory/xml/ParserContext;)L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/event/TransactionalApplicationListener.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/event/TransactionalApplicationListener.eea
index 79c19b99c4..ea95a172c3 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/event/TransactionalApplicationListener.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/event/TransactionalApplicationListener.eea
@@ -18,7 +18,7 @@ addCallback
  (Lorg/springframework/transaction/event/TransactionalApplicationListener$SynchronizationCallback;)V
 getListenerId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getTransactionPhase
  ()Lorg/springframework/transaction/event/TransactionPhase;
  ()Lorg/springframework/transaction/event/TransactionPhase;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/event/TransactionalApplicationListenerAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/event/TransactionalApplicationListenerAdapter.eea
index 4bd2e61c32..a243f725b8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/event/TransactionalApplicationListenerAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/event/TransactionalApplicationListenerAdapter.eea
@@ -14,7 +14,7 @@ addCallback
  (Lorg/springframework/transaction/event/TransactionalApplicationListener$SynchronizationCallback;)V
 getListenerId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.transaction.event.TransactionalApplicationListener)
 getTransactionPhase
  ()Lorg/springframework/transaction/event/TransactionPhase;
  ()Lorg/springframework/transaction/event/TransactionPhase;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/event/TransactionalEventListenerFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/event/TransactionalEventListenerFactory.eea
index 7c2707576c..bffeda21b2 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/event/TransactionalEventListenerFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/event/TransactionalEventListenerFactory.eea
@@ -2,7 +2,7 @@ class org/springframework/transaction/event/TransactionalEventListenerFactory
 
 createApplicationListener
  (Ljava/lang/String;Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)Lorg/springframework/context/ApplicationListener<*>;
- (Ljava/lang/String;Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)Lorg/springframework/context/ApplicationListener<*>;
+ (Ljava/lang/String;Ljava/lang/Class<*>;Ljava/lang/reflect/Method;)L1org/springframework/context/ApplicationListener<*>; # @Inherited(org.springframework.context.event.EventListenerFactory)
 supportsMethod
  (Ljava/lang/reflect/Method;)Z
  (Ljava/lang/reflect/Method;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.eea
index 849961cdca..33b5731977 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.eea
@@ -15,7 +15,7 @@ findTransactionAttribute
  (Ljava/lang/reflect/Method;)L0org/springframework/transaction/interceptor/TransactionAttribute;
 getCacheKey
  (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Ljava/lang/Object;
- (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Ljava/lang/Object;
+ (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)L1java/lang/Object;
 getTransactionAttribute
  (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Lorg/springframework/transaction/interceptor/TransactionAttribute;
  (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)L0org/springframework/transaction/interceptor/TransactionAttribute; # @Inherited(org.springframework.transaction.interceptor.TransactionAttributeSource)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/interceptor/TransactionAspectSupport.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/interceptor/TransactionAspectSupport.eea
index 8f408d2607..e1d59b17b2 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/interceptor/TransactionAspectSupport.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/interceptor/TransactionAspectSupport.eea
@@ -22,7 +22,7 @@ completeTransactionAfterThrowing
  (Lorg/springframework/transaction/interceptor/TransactionAspectSupport$TransactionInfo;Ljava/lang/Throwable;)V
 createTransactionIfNecessary
  (Lorg/springframework/transaction/PlatformTransactionManager;Lorg/springframework/transaction/interceptor/TransactionAttribute;Ljava/lang/String;)Lorg/springframework/transaction/interceptor/TransactionAspectSupport$TransactionInfo;
- (Lorg/springframework/transaction/PlatformTransactionManager;Lorg/springframework/transaction/interceptor/TransactionAttribute;Ljava/lang/String;)Lorg/springframework/transaction/interceptor/TransactionAspectSupport$TransactionInfo;
+ (Lorg/springframework/transaction/PlatformTransactionManager;Lorg/springframework/transaction/interceptor/TransactionAttribute;Ljava/lang/String;)L1org/springframework/transaction/interceptor/TransactionAspectSupport$TransactionInfo;
 determineTransactionManager
  (Lorg/springframework/transaction/interceptor/TransactionAttribute;)Lorg/springframework/transaction/TransactionManager;
  (Lorg/springframework/transaction/interceptor/TransactionAttribute;)L0org/springframework/transaction/TransactionManager;
@@ -46,7 +46,7 @@ methodIdentification
  (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)L0java/lang/String;
 prepareTransactionInfo
  (Lorg/springframework/transaction/PlatformTransactionManager;Lorg/springframework/transaction/interceptor/TransactionAttribute;Ljava/lang/String;Lorg/springframework/transaction/TransactionStatus;)Lorg/springframework/transaction/interceptor/TransactionAspectSupport$TransactionInfo;
- (Lorg/springframework/transaction/PlatformTransactionManager;Lorg/springframework/transaction/interceptor/TransactionAttribute;Ljava/lang/String;Lorg/springframework/transaction/TransactionStatus;)Lorg/springframework/transaction/interceptor/TransactionAspectSupport$TransactionInfo;
+ (Lorg/springframework/transaction/PlatformTransactionManager;Lorg/springframework/transaction/interceptor/TransactionAttribute;Ljava/lang/String;Lorg/springframework/transaction/TransactionStatus;)L1org/springframework/transaction/interceptor/TransactionAspectSupport$TransactionInfo;
 setBeanFactory
  (Lorg/springframework/beans/factory/BeanFactory;)V
  (Lorg/springframework/beans/factory/BeanFactory;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.eea
index f1c4bf4446..c55491ad27 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.eea
@@ -2,7 +2,7 @@ class org/springframework/transaction/interceptor/TransactionProxyFactoryBean
 
 createMainInterceptor
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object; # @Inherited(org.springframework.aop.framework.AbstractSingletonProxyFactoryBean)
 postProcessProxyFactory
  (Lorg/springframework/aop/framework/ProxyFactory;)V
  (Lorg/springframework/aop/framework/ProxyFactory;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/jta/JtaTransactionManager.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/jta/JtaTransactionManager.eea
index f7ac9d7d91..cf5d4332d8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/jta/JtaTransactionManager.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/jta/JtaTransactionManager.eea
@@ -30,7 +30,7 @@ buildUserTransaction
  (Ljakarta/transaction/TransactionManager;)Ljakarta/transaction/UserTransaction;
 createTransaction
  (Ljava/lang/String;I)Ljakarta/transaction/Transaction;
- (Ljava/lang/String;I)Ljakarta/transaction/Transaction;
+ (Ljava/lang/String;I)L1jakarta/transaction/Transaction; # @Inherited(org.springframework.transaction.jta.TransactionFactory)
 doBegin
  (Ljava/lang/Object;Lorg/springframework/transaction/TransactionDefinition;)V
  (Ljava/lang/Object;Lorg/springframework/transaction/TransactionDefinition;)V
@@ -42,7 +42,7 @@ doCommit
  (Lorg/springframework/transaction/support/DefaultTransactionStatus;)V
 doGetJtaTransaction
  (Ljakarta/transaction/UserTransaction;)Lorg/springframework/transaction/jta/JtaTransactionObject;
- (Ljakarta/transaction/UserTransaction;)Lorg/springframework/transaction/jta/JtaTransactionObject;
+ (Ljakarta/transaction/UserTransaction;)L1org/springframework/transaction/jta/JtaTransactionObject;
 doGetTransaction
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
@@ -69,7 +69,7 @@ doSetRollbackOnly
  (Lorg/springframework/transaction/support/DefaultTransactionStatus;)V
 doSuspend
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object; # @Inherited(org.springframework.transaction.support.AbstractPlatformTransactionManager)
 findTransactionManager
  (Ljakarta/transaction/UserTransaction;)Ljakarta/transaction/TransactionManager;
  (Ljakarta/transaction/UserTransaction;)L0jakarta/transaction/TransactionManager;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/jta/SimpleTransactionFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/jta/SimpleTransactionFactory.eea
index db93f6456a..6d0d071d51 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/jta/SimpleTransactionFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/jta/SimpleTransactionFactory.eea
@@ -5,4 +5,4 @@ class org/springframework/transaction/jta/SimpleTransactionFactory
  (Ljakarta/transaction/TransactionManager;)V
 createTransaction
  (Ljava/lang/String;I)Ljakarta/transaction/Transaction;
- (Ljava/lang/String;I)Ljakarta/transaction/Transaction;
+ (Ljava/lang/String;I)L1jakarta/transaction/Transaction; # @Inherited(org.springframework.transaction.jta.TransactionFactory)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/jta/TransactionFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/jta/TransactionFactory.eea
index 53b21cd7b5..c0498ead54 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/jta/TransactionFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/jta/TransactionFactory.eea
@@ -2,4 +2,4 @@ class org/springframework/transaction/jta/TransactionFactory
 
 createTransaction
  (Ljava/lang/String;I)Ljakarta/transaction/Transaction;
- (Ljava/lang/String;I)Ljakarta/transaction/Transaction;
+ (Ljava/lang/String;I)L1jakarta/transaction/Transaction;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/reactive/AbstractReactiveTransactionManager.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/reactive/AbstractReactiveTransactionManager.eea
index 6b636b1f73..de19c99914 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/reactive/AbstractReactiveTransactionManager.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/reactive/AbstractReactiveTransactionManager.eea
@@ -21,16 +21,16 @@ doGetTransaction
  (Lorg/springframework/transaction/reactive/TransactionSynchronizationManager;)Ljava/lang/Object;
 doResume
  (Lorg/springframework/transaction/reactive/TransactionSynchronizationManager;Ljava/lang/Object;Ljava/lang/Object;)Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
- (Lorg/springframework/transaction/reactive/TransactionSynchronizationManager;Ljava/lang/Object;Ljava/lang/Object;)Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
+ (Lorg/springframework/transaction/reactive/TransactionSynchronizationManager;Ljava/lang/Object;Ljava/lang/Object;)L1reactor/core/publisher/Mono<Ljava/lang/Void;>;
 doRollback
  (Lorg/springframework/transaction/reactive/TransactionSynchronizationManager;Lorg/springframework/transaction/reactive/GenericReactiveTransaction;)Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
  (Lorg/springframework/transaction/reactive/TransactionSynchronizationManager;Lorg/springframework/transaction/reactive/GenericReactiveTransaction;)Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
 doSetRollbackOnly
  (Lorg/springframework/transaction/reactive/TransactionSynchronizationManager;Lorg/springframework/transaction/reactive/GenericReactiveTransaction;)Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
- (Lorg/springframework/transaction/reactive/TransactionSynchronizationManager;Lorg/springframework/transaction/reactive/GenericReactiveTransaction;)Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
+ (Lorg/springframework/transaction/reactive/TransactionSynchronizationManager;Lorg/springframework/transaction/reactive/GenericReactiveTransaction;)L1reactor/core/publisher/Mono<Ljava/lang/Void;>;
 doSuspend
  (Lorg/springframework/transaction/reactive/TransactionSynchronizationManager;Ljava/lang/Object;)Lreactor/core/publisher/Mono<Ljava/lang/Object;>;
- (Lorg/springframework/transaction/reactive/TransactionSynchronizationManager;Ljava/lang/Object;)Lreactor/core/publisher/Mono<Ljava/lang/Object;>;
+ (Lorg/springframework/transaction/reactive/TransactionSynchronizationManager;Ljava/lang/Object;)L1reactor/core/publisher/Mono<Ljava/lang/Object;>;
 getReactiveTransaction
  (Lorg/springframework/transaction/TransactionDefinition;)Lreactor/core/publisher/Mono<Lorg/springframework/transaction/ReactiveTransaction;>;
  (Lorg/springframework/transaction/TransactionDefinition;)Lreactor/core/publisher/Mono<Lorg/springframework/transaction/ReactiveTransaction;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/reactive/GenericReactiveTransaction.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/reactive/GenericReactiveTransaction.eea
index d4bb1d984f..2578252183 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/reactive/GenericReactiveTransaction.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/reactive/GenericReactiveTransaction.eea
@@ -14,4 +14,4 @@ getTransaction
  ()Ljava/lang/Object;
 getTransactionName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.transaction.TransactionExecution)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/reactive/TransactionContextManager.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/reactive/TransactionContextManager.eea
index be350c06f1..20b798e05b 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/reactive/TransactionContextManager.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/reactive/TransactionContextManager.eea
@@ -2,7 +2,7 @@ class org/springframework/transaction/reactive/TransactionContextManager
 
 createTransactionContext
  ()Ljava/util/function/Function<Lreactor/util/context/Context;Lreactor/util/context/Context;>;
- ()Ljava/util/function/Function<Lreactor/util/context/Context;Lreactor/util/context/Context;>;
+ ()L1java/util/function/Function<Lreactor/util/context/Context;Lreactor/util/context/Context;>;
 currentContext
  ()Lreactor/core/publisher/Mono<Lorg/springframework/transaction/reactive/TransactionContext;>;
  ()Lreactor/core/publisher/Mono<Lorg/springframework/transaction/reactive/TransactionContext;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/reactive/TransactionalOperator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/reactive/TransactionalOperator.eea
index 45b54571fc..923b7a5c4c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/reactive/TransactionalOperator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/reactive/TransactionalOperator.eea
@@ -2,10 +2,10 @@ class org/springframework/transaction/reactive/TransactionalOperator
 
 create
  (Lorg/springframework/transaction/ReactiveTransactionManager;)Lorg/springframework/transaction/reactive/TransactionalOperator;
- (Lorg/springframework/transaction/ReactiveTransactionManager;)Lorg/springframework/transaction/reactive/TransactionalOperator;
+ (Lorg/springframework/transaction/ReactiveTransactionManager;)L1org/springframework/transaction/reactive/TransactionalOperator;
 create
  (Lorg/springframework/transaction/ReactiveTransactionManager;Lorg/springframework/transaction/TransactionDefinition;)Lorg/springframework/transaction/reactive/TransactionalOperator;
- (Lorg/springframework/transaction/ReactiveTransactionManager;Lorg/springframework/transaction/TransactionDefinition;)Lorg/springframework/transaction/reactive/TransactionalOperator;
+ (Lorg/springframework/transaction/ReactiveTransactionManager;Lorg/springframework/transaction/TransactionDefinition;)L1org/springframework/transaction/reactive/TransactionalOperator;
 
 execute
  <T:Ljava/lang/Object;>(Lorg/springframework/transaction/reactive/TransactionCallback<TT;>;)Lreactor/core/publisher/Flux<TT;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/support/AbstractPlatformTransactionManager.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/support/AbstractPlatformTransactionManager.eea
index dda5daba7d..6994a5f8a0 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/support/AbstractPlatformTransactionManager.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/support/AbstractPlatformTransactionManager.eea
@@ -33,7 +33,7 @@ doSetRollbackOnly
  (Lorg/springframework/transaction/support/DefaultTransactionStatus;)V
 doSuspend
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object;
 getTransaction
  (Lorg/springframework/transaction/TransactionDefinition;)Lorg/springframework/transaction/TransactionStatus;
  (Lorg/springframework/transaction/TransactionDefinition;)Lorg/springframework/transaction/TransactionStatus;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/support/AbstractTransactionStatus.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/support/AbstractTransactionStatus.eea
index 09c6b4e2d7..849bd4c7b6 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/support/AbstractTransactionStatus.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/support/AbstractTransactionStatus.eea
@@ -2,13 +2,13 @@ class org/springframework/transaction/support/AbstractTransactionStatus
 
 createSavepoint
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object; # @Inherited(org.springframework.transaction.SavepointManager)
 getSavepoint
  ()Ljava/lang/Object;
  ()L0java/lang/Object;
 getSavepointManager
  ()Lorg/springframework/transaction/SavepointManager;
- ()Lorg/springframework/transaction/SavepointManager;
+ ()L1org/springframework/transaction/SavepointManager;
 releaseSavepoint
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/support/DefaultTransactionDefinition.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/support/DefaultTransactionDefinition.eea
index 4c1acf7518..de3fa1b8f6 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/support/DefaultTransactionDefinition.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/support/DefaultTransactionDefinition.eea
@@ -21,7 +21,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getDefinitionDescription
  ()Ljava/lang/StringBuilder;
- ()Ljava/lang/StringBuilder;
+ ()L1java/lang/StringBuilder;
 getName
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(org.springframework.transaction.TransactionDefinition)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/support/DefaultTransactionStatus.eea b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/support/DefaultTransactionStatus.eea
index 4e37da107b..3ab09ff8cd 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/transaction/support/DefaultTransactionStatus.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/transaction/support/DefaultTransactionStatus.eea
@@ -8,7 +8,7 @@ class org/springframework/transaction/support/DefaultTransactionStatus
  (Ljava/lang/String;Ljava/lang/Object;ZZZZZLjava/lang/Object;)V
 getSavepointManager
  ()Lorg/springframework/transaction/SavepointManager;
- ()Lorg/springframework/transaction/SavepointManager;
+ ()L1org/springframework/transaction/SavepointManager; # @Inherited(org.springframework.transaction.support.AbstractTransactionStatus)
 getSuspendedResources
  ()Ljava/lang/Object;
  ()L0java/lang/Object;
@@ -17,4 +17,4 @@ getTransaction
  ()Ljava/lang/Object;
 getTransactionName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.transaction.TransactionExecution)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/ui/context/support/ResourceBundleThemeSource.eea b/libs/eea-spring-6/src/main/resources/org/springframework/ui/context/support/ResourceBundleThemeSource.eea
index 3031ae2c03..b5d8d307a8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/ui/context/support/ResourceBundleThemeSource.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/ui/context/support/ResourceBundleThemeSource.eea
@@ -6,7 +6,7 @@ logger
 
 createMessageSource
  (Ljava/lang/String;)Lorg/springframework/context/MessageSource;
- (Ljava/lang/String;)Lorg/springframework/context/MessageSource;
+ (Ljava/lang/String;)L1org/springframework/context/MessageSource;
 getParentThemeSource
  ()Lorg/springframework/ui/context/ThemeSource;
  ()L0org/springframework/ui/context/ThemeSource; # @Inherited(org.springframework.ui.context.HierarchicalThemeSource)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/AlternativeJdkIdGenerator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/AlternativeJdkIdGenerator.eea
index 62bc72b014..917b6a8c4d 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/AlternativeJdkIdGenerator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/AlternativeJdkIdGenerator.eea
@@ -2,4 +2,4 @@ class org/springframework/util/AlternativeJdkIdGenerator
 
 generateId
  ()Ljava/util/UUID;
- ()Ljava/util/UUID;
+ ()L1java/util/UUID;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/AntPathMatcher.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/AntPathMatcher.eea
index 023d840b45..b5db81e14e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/AntPathMatcher.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/AntPathMatcher.eea
@@ -15,16 +15,16 @@ doMatch
  (Ljava/lang/String;Ljava/lang/String;ZLjava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)Z
 extractPathWithinPattern
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 extractUriTemplateVariables
  (Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/util/Map<Ljava/lang/String;Ljava/lang/String;>;
 getPatternComparator
  (Ljava/lang/String;)Ljava/util/Comparator<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/Comparator<Ljava/lang/String;>;
+ (Ljava/lang/String;)L1java/util/Comparator<Ljava/lang/String;>;
 getStringMatcher
  (Ljava/lang/String;)Lorg/springframework/util/AntPathMatcher$AntPathStringMatcher;
- (Ljava/lang/String;)Lorg/springframework/util/AntPathMatcher$AntPathStringMatcher;
+ (Ljava/lang/String;)L1org/springframework/util/AntPathMatcher$AntPathStringMatcher;
 isPattern
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/AutoPopulatingList$ElementFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/AutoPopulatingList$ElementFactory.eea
index a26b9eddd4..f176e508dc 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/AutoPopulatingList$ElementFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/AutoPopulatingList$ElementFactory.eea
@@ -4,4 +4,4 @@ class org/springframework/util/AutoPopulatingList$ElementFactory
 
 createElement
  (I)TE;
- (I)TE;
+ (I)T1E;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/Base64Utils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/Base64Utils.eea
index 7ec9af6941..b6c5771efa 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/Base64Utils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/Base64Utils.eea
@@ -17,10 +17,10 @@ encode
  ([B)[B
 encodeToString
  ([B)Ljava/lang/String;
- ([B)Ljava/lang/String;
+ ([B)L1java/lang/String;
 encodeToUrlSafeString
  ([B)Ljava/lang/String;
- ([B)Ljava/lang/String;
+ ([B)L1java/lang/String;
 encodeUrlSafe
  ([B)[B
  ([B)[B
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/ClassUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/ClassUtils.eea
index eb3e38eaef..9a02f1d0f8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/ClassUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/ClassUtils.eea
@@ -12,10 +12,10 @@ CLASS_FILE_SUFFIX
 
 addResourcePathToPackagePath
  (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;Ljava/lang/String;)L1java/lang/String;
 classNamesToString
  (Ljava/util/Collection<Ljava/lang/Class<*>;>;)Ljava/lang/String;
- (Ljava/util/Collection<Ljava/lang/Class<*>;>;)Ljava/lang/String;
+ (Ljava/util/Collection<Ljava/lang/Class<*>;>;)L1java/lang/String;
 classNamesToString
  ([Ljava/lang/Class<*>;)Ljava/lang/String;
  ([Ljava/lang/Class<*>;)Ljava/lang/String;
@@ -30,7 +30,7 @@ convertResourcePathToClassName
  (Ljava/lang/String;)Ljava/lang/String;
 createCompositeInterface
  ([Ljava/lang/Class<*>;Ljava/lang/ClassLoader;)Ljava/lang/Class<*>;
- ([Ljava/lang/Class<*>;Ljava/lang/ClassLoader;)Ljava/lang/Class<*>;
+ ([Ljava/lang/Class<*>;Ljava/lang/ClassLoader;)L1java/lang/Class<*>;
 determineCommonAncestor
  (Ljava/lang/Class<*>;Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
  (Ljava/lang/Class<*>;Ljava/lang/Class<*>;)L0java/lang/Class<*>;
@@ -57,7 +57,7 @@ getAllInterfacesForClassAsSet
  (Ljava/lang/Class<*>;Ljava/lang/ClassLoader;)Ljava/util/Set<Ljava/lang/Class<*>;>;
 getClassFileName
  (Ljava/lang/Class<*>;)Ljava/lang/String;
- (Ljava/lang/Class<*>;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;)L1java/lang/String;
 getConstructorIfAvailable
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;[Ljava/lang/Class<*>;)Ljava/lang/reflect/Constructor<TT;>;
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;[Ljava/lang/Class<*>;)L0java/lang/reflect/Constructor<TT;>;
@@ -90,13 +90,13 @@ getPackageName
  (Ljava/lang/Class<*>;)Ljava/lang/String;
 getPackageName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 getQualifiedMethodName
  (Ljava/lang/reflect/Method;)Ljava/lang/String;
  (Ljava/lang/reflect/Method;)Ljava/lang/String;
 getQualifiedMethodName
  (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Ljava/lang/String;
- (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)Ljava/lang/String;
+ (Ljava/lang/reflect/Method;Ljava/lang/Class<*>;)L1java/lang/String;
 getQualifiedName
  (Ljava/lang/Class<*>;)Ljava/lang/String;
  (Ljava/lang/Class<*>;)Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/CollectionUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/CollectionUtils.eea
index d07df924d9..c104eef581 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/CollectionUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/CollectionUtils.eea
@@ -56,10 +56,10 @@ mergePropertiesIntoMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Properties;Ljava/util/Map<TK;TV;>;)V
 newHashMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Ljava/util/HashMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Ljava/util/HashMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)L1java/util/HashMap<TK;TV;>;
 newLinkedHashMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Ljava/util/LinkedHashMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Ljava/util/LinkedHashMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)L1java/util/LinkedHashMap<TK;TV;>;
 toArray
  <A:Ljava/lang/Object;E:TA;>(Ljava/util/Enumeration<TE;>;[TA;)[TA;
  <A:Ljava/lang/Object;E:TA;>(Ljava/util/Enumeration<TE;>;[TA;)[TA;
@@ -68,7 +68,7 @@ toIterator
  <E:Ljava/lang/Object;>(Ljava/util/Enumeration<TE;>;)Ljava/util/Iterator<TE;>;
 toMultiValueMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;Ljava/util/List<TV;>;>;)Lorg/springframework/util/MultiValueMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;Ljava/util/List<TV;>;>;)Lorg/springframework/util/MultiValueMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map<TK;Ljava/util/List<TV;>;>;)L1org/springframework/util/MultiValueMap<TK;TV;>;
 unmodifiableMultiValueMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/springframework/util/MultiValueMap<+TK;+TV;>;)Lorg/springframework/util/MultiValueMap<TK;TV;>;
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lorg/springframework/util/MultiValueMap<+TK;+TV;>;)Lorg/springframework/util/MultiValueMap<TK;TV;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/ConcurrentReferenceHashMap$ReferenceManager.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/ConcurrentReferenceHashMap$ReferenceManager.eea
index e0fc21b911..8721efcaac 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/ConcurrentReferenceHashMap$ReferenceManager.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/ConcurrentReferenceHashMap$ReferenceManager.eea
@@ -5,7 +5,7 @@ class org/springframework/util/ConcurrentReferenceHashMap$ReferenceManager
  (Lorg/springframework/util/ConcurrentReferenceHashMap;)V
 createReference
  (Lorg/springframework/util/ConcurrentReferenceHashMap$Entry<TK;TV;>;ILorg/springframework/util/ConcurrentReferenceHashMap$Reference<TK;TV;>;)Lorg/springframework/util/ConcurrentReferenceHashMap$Reference<TK;TV;>;
- (Lorg/springframework/util/ConcurrentReferenceHashMap$Entry<TK;TV;>;ILorg/springframework/util/ConcurrentReferenceHashMap$Reference<TK;TV;>;)Lorg/springframework/util/ConcurrentReferenceHashMap$Reference<TK;TV;>;
+ (Lorg/springframework/util/ConcurrentReferenceHashMap$Entry<TK;TV;>;ILorg/springframework/util/ConcurrentReferenceHashMap$Reference<TK;TV;>;)L1org/springframework/util/ConcurrentReferenceHashMap$Reference<TK;TV;>;
 pollForPurge
  ()Lorg/springframework/util/ConcurrentReferenceHashMap$Reference<TK;TV;>;
  ()L0org/springframework/util/ConcurrentReferenceHashMap$Reference<TK;TV;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/ConcurrentReferenceHashMap.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/ConcurrentReferenceHashMap.eea
index 8a67ce9054..ce65fe7091 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/ConcurrentReferenceHashMap.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/ConcurrentReferenceHashMap.eea
@@ -20,7 +20,7 @@ containsKey
  (L0java/lang/Object;)Z # @Inherited(java.util.AbstractMap)
 createReferenceManager
  ()Lorg/springframework/util/ConcurrentReferenceHashMap<TK;TV;>.ReferenceManager;
- ()Lorg/springframework/util/ConcurrentReferenceHashMap<TK;TV;>.ReferenceManager;
+ ()L1org/springframework/util/ConcurrentReferenceHashMap<TK;TV;>.ReferenceManager;
 entrySet
  ()Ljava/util/Set<Ljava/util/Map$Entry<TK;TV;>;>;
  ()L1java/util/Set<L1java/util/Map$Entry<TK;TV;>;>; # @Inherited(java.util.AbstractMap)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/CustomizableThreadCreator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/CustomizableThreadCreator.eea
index 35d28b50ba..e8ca4b24ee 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/CustomizableThreadCreator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/CustomizableThreadCreator.eea
@@ -5,10 +5,10 @@ class org/springframework/util/CustomizableThreadCreator
  (Ljava/lang/String;)V
 createThread
  (Ljava/lang/Runnable;)Ljava/lang/Thread;
- (Ljava/lang/Runnable;)Ljava/lang/Thread;
+ (Ljava/lang/Runnable;)L1java/lang/Thread;
 getDefaultThreadNamePrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getThreadGroup
  ()Ljava/lang/ThreadGroup;
  ()L0java/lang/ThreadGroup;
@@ -17,7 +17,7 @@ getThreadNamePrefix
  ()Ljava/lang/String;
 nextThreadName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 setThreadGroup
  (Ljava/lang/ThreadGroup;)V
  (Ljava/lang/ThreadGroup;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/FastByteArrayOutputStream.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/FastByteArrayOutputStream.eea
index 532c0f555f..40de0550a9 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/FastByteArrayOutputStream.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/FastByteArrayOutputStream.eea
@@ -2,7 +2,7 @@ class org/springframework/util/FastByteArrayOutputStream
 
 getInputStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
 toByteArray
  ()[B
  ()[B
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/FileCopyUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/FileCopyUtils.eea
index 8d03724b10..55f25fa4e0 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/FileCopyUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/FileCopyUtils.eea
@@ -26,4 +26,4 @@ copyToByteArray
  (Ljava/io/InputStream;)[B
 copyToString
  (Ljava/io/Reader;)Ljava/lang/String;
- (Ljava/io/Reader;)Ljava/lang/String;
+ (Ljava/io/Reader;)L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/LinkedCaseInsensitiveMap.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/LinkedCaseInsensitiveMap.eea
index d0d1747ccd..8a58be8ebb 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/LinkedCaseInsensitiveMap.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/LinkedCaseInsensitiveMap.eea
@@ -14,7 +14,7 @@ super java/util/Map
  (Ljava/util/Locale;)V
 clone
  ()Lorg/springframework/util/LinkedCaseInsensitiveMap<TV;>;
- ()Lorg/springframework/util/LinkedCaseInsensitiveMap<TV;>;
+ ()L1org/springframework/util/LinkedCaseInsensitiveMap<TV;>;
 computeIfAbsent
  (Ljava/lang/String;Ljava/util/function/Function<-Ljava/lang/String;+TV;>;)TV;
  (Ljava/lang/String;Ljava/util/function/Function<-Ljava/lang/String;+TV;>;)T0V;
@@ -29,7 +29,7 @@ convertKey
  (Ljava/lang/String;)Ljava/lang/String;
 entrySet
  ()Ljava/util/Set<Ljava/util/Map$Entry<Ljava/lang/String;TV;>;>;
- ()Ljava/util/Set<Ljava/util/Map$Entry<Ljava/lang/String;TV;>;>;
+ ()L1java/util/Set<Ljava/util/Map$Entry<Ljava/lang/String;TV;>;>;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -47,7 +47,7 @@ getOrDefault
  (Ljava/lang/Object;TV;)T0V;
 keySet
  ()Ljava/util/Set<Ljava/lang/String;>;
- ()Ljava/util/Set<Ljava/lang/String;>;
+ ()L1java/util/Set<Ljava/lang/String;>;
 put
  (Ljava/lang/String;TV;)TV;
  (Ljava/lang/String;TV;)T0V;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/LinkedMultiValueMap.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/LinkedMultiValueMap.eea
index 175a3fd50a..27933a84d8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/LinkedMultiValueMap.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/LinkedMultiValueMap.eea
@@ -11,7 +11,7 @@ super org/springframework/util/MultiValueMapAdapter
  (Ljava/util/Map<TK;Ljava/util/List<TV;>;>;)V
 clone
  ()Lorg/springframework/util/LinkedMultiValueMap<TK;TV;>;
- ()Lorg/springframework/util/LinkedMultiValueMap<TK;TV;>;
+ ()L1org/springframework/util/LinkedMultiValueMap<TK;TV;>;
 deepCopy
  ()Lorg/springframework/util/LinkedMultiValueMap<TK;TV;>;
- ()Lorg/springframework/util/LinkedMultiValueMap<TK;TV;>;
+ ()L1org/springframework/util/LinkedMultiValueMap<TK;TV;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/MimeTypeUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/MimeTypeUtils.eea
index 888459677f..50756e1b6c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/MimeTypeUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/MimeTypeUtils.eea
@@ -72,10 +72,10 @@ TEXT_XML_VALUE
 
 generateMultipartBoundary
  ()[B
- ()[B
+ ()[1B
 generateMultipartBoundaryString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 parseMimeType
  (Ljava/lang/String;)Lorg/springframework/util/MimeType;
  (Ljava/lang/String;)Lorg/springframework/util/MimeType;
@@ -87,7 +87,7 @@ sortBySpecificity
  <T:Lorg/springframework/util/MimeType;>(Ljava/util/List<TT;>;)V
 toString
  (Ljava/util/Collection<+Lorg/springframework/util/MimeType;>;)Ljava/lang/String;
- (Ljava/util/Collection<+Lorg/springframework/util/MimeType;>;)Ljava/lang/String;
+ (Ljava/util/Collection<+Lorg/springframework/util/MimeType;>;)L1java/lang/String;
 tokenize
  (Ljava/lang/String;)Ljava/util/List<Ljava/lang/String;>;
  (Ljava/lang/String;)Ljava/util/List<Ljava/lang/String;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/ObjectUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/ObjectUtils.eea
index edbe2d2dd8..35124f43e8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/ObjectUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/ObjectUtils.eea
@@ -26,7 +26,7 @@ getIdentityHexString
  (Ljava/lang/Object;)Ljava/lang/String;
 identityToString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
 isArray
  (Ljava/lang/Object;)Z
  (Ljava/lang/Object;)Z
@@ -44,7 +44,7 @@ isEmpty
  ([Ljava/lang/Object;)Z
 nullSafeClassName
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
 nullSafeConciseToString
  (Ljava/lang/Object;)Ljava/lang/String;
  (Ljava/lang/Object;)Ljava/lang/String;
@@ -89,31 +89,31 @@ nullSafeToString
  (Ljava/lang/Object;)Ljava/lang/String;
 nullSafeToString
  ([B)Ljava/lang/String;
- ([B)Ljava/lang/String;
+ ([B)L1java/lang/String;
 nullSafeToString
  ([C)Ljava/lang/String;
- ([C)Ljava/lang/String;
+ ([C)L1java/lang/String;
 nullSafeToString
  ([D)Ljava/lang/String;
- ([D)Ljava/lang/String;
+ ([D)L1java/lang/String;
 nullSafeToString
  ([F)Ljava/lang/String;
- ([F)Ljava/lang/String;
+ ([F)L1java/lang/String;
 nullSafeToString
  ([I)Ljava/lang/String;
- ([I)Ljava/lang/String;
+ ([I)L1java/lang/String;
 nullSafeToString
  ([J)Ljava/lang/String;
- ([J)Ljava/lang/String;
+ ([J)L1java/lang/String;
 nullSafeToString
  ([Ljava/lang/Object;)Ljava/lang/String;
- ([Ljava/lang/Object;)Ljava/lang/String;
+ ([Ljava/lang/Object;)L1java/lang/String;
 nullSafeToString
  ([S)Ljava/lang/String;
- ([S)Ljava/lang/String;
+ ([S)L1java/lang/String;
 nullSafeToString
  ([Z)Ljava/lang/String;
- ([Z)Ljava/lang/String;
+ ([Z)L1java/lang/String;
 toObjectArray
  (Ljava/lang/Object;)[Ljava/lang/Object;
  (Ljava/lang/Object;)[Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/ResourceUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/ResourceUtils.eea
index a6d406fbea..73b604aa9c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/ResourceUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/ResourceUtils.eea
@@ -60,13 +60,13 @@ getFile
  (Ljava/net/URI;)Ljava/io/File;
 getFile
  (Ljava/net/URI;Ljava/lang/String;)Ljava/io/File;
- (Ljava/net/URI;Ljava/lang/String;)Ljava/io/File;
+ (Ljava/net/URI;Ljava/lang/String;)L1java/io/File;
 getFile
  (Ljava/net/URL;)Ljava/io/File;
  (Ljava/net/URL;)Ljava/io/File;
 getFile
  (Ljava/net/URL;Ljava/lang/String;)Ljava/io/File;
- (Ljava/net/URL;Ljava/lang/String;)Ljava/io/File;
+ (Ljava/net/URL;Ljava/lang/String;)L1java/io/File;
 getURL
  (Ljava/lang/String;)Ljava/net/URL;
  (Ljava/lang/String;)Ljava/net/URL;
@@ -87,7 +87,7 @@ toRelativeURL
  (Ljava/net/URL;Ljava/lang/String;)Ljava/net/URL;
 toURI
  (Ljava/lang/String;)Ljava/net/URI;
- (Ljava/lang/String;)Ljava/net/URI;
+ (Ljava/lang/String;)L1java/net/URI;
 toURI
  (Ljava/net/URL;)Ljava/net/URI;
  (Ljava/net/URL;)Ljava/net/URI;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/SimpleRouteMatcher.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/SimpleRouteMatcher.eea
index 88b1ed2230..c3a7a0bf7a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/SimpleRouteMatcher.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/SimpleRouteMatcher.eea
@@ -23,4 +23,4 @@ matchAndExtract
  (Ljava/lang/String;Lorg/springframework/util/RouteMatcher$Route;)L0java/util/Map<Ljava/lang/String;Ljava/lang/String;>; # @Inherited(org.springframework.util.RouteMatcher)
 parseRoute
  (Ljava/lang/String;)Lorg/springframework/util/RouteMatcher$Route;
- (Ljava/lang/String;)Lorg/springframework/util/RouteMatcher$Route;
+ (Ljava/lang/String;)L1org/springframework/util/RouteMatcher$Route;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/StopWatch.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/StopWatch.eea
index 17b779de15..735876cace 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/StopWatch.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/StopWatch.eea
@@ -26,13 +26,13 @@ lastTaskInfo
  ()Lorg/springframework/util/StopWatch$TaskInfo;
 prettyPrint
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 prettyPrint
  (Ljava/util/concurrent/TimeUnit;)Ljava/lang/String;
- (Ljava/util/concurrent/TimeUnit;)Ljava/lang/String;
+ (Ljava/util/concurrent/TimeUnit;)L1java/lang/String;
 shortSummary
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 start
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/StreamUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/StreamUtils.eea
index 7812235c12..eccad53d93 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/StreamUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/StreamUtils.eea
@@ -20,16 +20,16 @@ copyToString
  (Ljava/io/ByteArrayOutputStream;Ljava/nio/charset/Charset;)Ljava/lang/String;
 copyToString
  (Ljava/io/InputStream;Ljava/nio/charset/Charset;)Ljava/lang/String;
- (Ljava/io/InputStream;Ljava/nio/charset/Charset;)Ljava/lang/String;
+ (Ljava/io/InputStream;Ljava/nio/charset/Charset;)L1java/lang/String;
 drain
  (Ljava/io/InputStream;)I
  (Ljava/io/InputStream;)I
 emptyInput
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
 nonClosing
  (Ljava/io/InputStream;)Ljava/io/InputStream;
- (Ljava/io/InputStream;)Ljava/io/InputStream;
+ (Ljava/io/InputStream;)L1java/io/InputStream;
 nonClosing
  (Ljava/io/OutputStream;)Ljava/io/OutputStream;
- (Ljava/io/OutputStream;)Ljava/io/OutputStream;
+ (Ljava/io/OutputStream;)L1java/io/OutputStream;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/StringUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/StringUtils.eea
index 3e343c412c..fde164c079 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/StringUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/StringUtils.eea
@@ -26,10 +26,10 @@ collectionToDelimitedString
  (Ljava/util/Collection<*>;Ljava/lang/String;)Ljava/lang/String;
 collectionToDelimitedString
  (Ljava/util/Collection<*>;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/util/Collection<*>;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/util/Collection<*>;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 commaDelimitedListToSet
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
+ (Ljava/lang/String;)L1java/util/Set<Ljava/lang/String;>;
 commaDelimitedListToStringArray
  (Ljava/lang/String;)[Ljava/lang/String;
  (Ljava/lang/String;)[Ljava/lang/String;
@@ -170,7 +170,7 @@ truncate
  (Ljava/lang/CharSequence;)Ljava/lang/String;
 truncate
  (Ljava/lang/CharSequence;I)Ljava/lang/String;
- (Ljava/lang/CharSequence;I)Ljava/lang/String;
+ (Ljava/lang/CharSequence;I)L1java/lang/String;
 uncapitalize
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/backoff/ExponentialBackOff.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/backoff/ExponentialBackOff.eea
index 6c3f1b6884..240e49e694 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/backoff/ExponentialBackOff.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/backoff/ExponentialBackOff.eea
@@ -2,7 +2,7 @@ class org/springframework/util/backoff/ExponentialBackOff
 
 start
  ()Lorg/springframework/util/backoff/BackOffExecution;
- ()Lorg/springframework/util/backoff/BackOffExecution;
+ ()L1org/springframework/util/backoff/BackOffExecution;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/backoff/FixedBackOff.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/backoff/FixedBackOff.eea
index 9158c80e0a..b18025187e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/backoff/FixedBackOff.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/backoff/FixedBackOff.eea
@@ -2,4 +2,4 @@ class org/springframework/util/backoff/FixedBackOff
 
 start
  ()Lorg/springframework/util/backoff/BackOffExecution;
- ()Lorg/springframework/util/backoff/BackOffExecution;
+ ()L1org/springframework/util/backoff/BackOffExecution;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/concurrent/CompletableToListenableFutureAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/concurrent/CompletableToListenableFutureAdapter.eea
index 41db082e3f..3bc7a338d1 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/concurrent/CompletableToListenableFutureAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/concurrent/CompletableToListenableFutureAdapter.eea
@@ -20,7 +20,7 @@ addCallback
  (Lorg/springframework/util/concurrent/SuccessCallback<-TT;>;Lorg/springframework/util/concurrent/FailureCallback;)V
 completable
  ()Ljava/util/concurrent/CompletableFuture<TT;>;
- ()Ljava/util/concurrent/CompletableFuture<TT;>;
+ ()L1java/util/concurrent/CompletableFuture<TT;>; # @Inherited(org.springframework.util.concurrent.ListenableFuture)
 get
  ()TT;
  ()TT;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/concurrent/ListenableFuture.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/concurrent/ListenableFuture.eea
index 937f591c28..6bcccbb1b0 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/concurrent/ListenableFuture.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/concurrent/ListenableFuture.eea
@@ -14,4 +14,4 @@ addCallback
  (Lorg/springframework/util/concurrent/SuccessCallback<-TT;>;Lorg/springframework/util/concurrent/FailureCallback;)V
 completable
  ()Ljava/util/concurrent/CompletableFuture<TT;>;
- ()Ljava/util/concurrent/CompletableFuture<TT;>;
+ ()L1java/util/concurrent/CompletableFuture<TT;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/concurrent/ListenableFutureTask.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/concurrent/ListenableFutureTask.eea
index 7425086a73..b895dd0b8c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/concurrent/ListenableFutureTask.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/concurrent/ListenableFutureTask.eea
@@ -23,4 +23,4 @@ addCallback
  (Lorg/springframework/util/concurrent/SuccessCallback<-TT;>;Lorg/springframework/util/concurrent/FailureCallback;)V
 completable
  ()Ljava/util/concurrent/CompletableFuture<TT;>;
- ()Ljava/util/concurrent/CompletableFuture<TT;>;
+ ()L1java/util/concurrent/CompletableFuture<TT;>; # @Inherited(org.springframework.util.concurrent.ListenableFuture)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/concurrent/SettableListenableFuture.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/concurrent/SettableListenableFuture.eea
index e63bd98208..ddb9b32a6c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/concurrent/SettableListenableFuture.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/concurrent/SettableListenableFuture.eea
@@ -14,7 +14,7 @@ addCallback
  (Lorg/springframework/util/concurrent/SuccessCallback<-TT;>;Lorg/springframework/util/concurrent/FailureCallback;)V
 completable
  ()Ljava/util/concurrent/CompletableFuture<TT;>;
- ()Ljava/util/concurrent/CompletableFuture<TT;>;
+ ()L1java/util/concurrent/CompletableFuture<TT;>; # @Inherited(org.springframework.util.concurrent.ListenableFuture)
 get
  ()TT;
  ()T0T;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/function/SingletonSupplier.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/function/SingletonSupplier.eea
index 69c844727a..b60b7c5acb 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/function/SingletonSupplier.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/function/SingletonSupplier.eea
@@ -8,10 +8,10 @@ super java/util/function/Supplier
 
 of
  <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;)Lorg/springframework/util/function/SingletonSupplier<TT;>;
- <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;)Lorg/springframework/util/function/SingletonSupplier<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;)L1org/springframework/util/function/SingletonSupplier<TT;>;
 of
  <T:Ljava/lang/Object;>(TT;)Lorg/springframework/util/function/SingletonSupplier<TT;>;
- <T:Ljava/lang/Object;>(TT;)Lorg/springframework/util/function/SingletonSupplier<TT;>;
+ <T:Ljava/lang/Object;>(TT;)L1org/springframework/util/function/SingletonSupplier<TT;>;
 ofNullable
  <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;)Lorg/springframework/util/function/SingletonSupplier<TT;>;
  <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;)L0org/springframework/util/function/SingletonSupplier<TT;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/function/ThrowingBiFunction.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/function/ThrowingBiFunction.eea
index e00263990a..893b5b89f6 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/function/ThrowingBiFunction.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/function/ThrowingBiFunction.eea
@@ -24,4 +24,4 @@ applyWithException
  (TT;TU;)TR;
 throwing
  (Ljava/util/function/BiFunction<Ljava/lang/String;Ljava/lang/Exception;Ljava/lang/RuntimeException;>;)Lorg/springframework/util/function/ThrowingBiFunction<TT;TU;TR;>;
- (Ljava/util/function/BiFunction<Ljava/lang/String;Ljava/lang/Exception;Ljava/lang/RuntimeException;>;)Lorg/springframework/util/function/ThrowingBiFunction<TT;TU;TR;>;
+ (Ljava/util/function/BiFunction<Ljava/lang/String;Ljava/lang/Exception;Ljava/lang/RuntimeException;>;)L1org/springframework/util/function/ThrowingBiFunction<TT;TU;TR;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/function/ThrowingConsumer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/function/ThrowingConsumer.eea
index 541ec5ee70..2f30a1248f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/function/ThrowingConsumer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/function/ThrowingConsumer.eea
@@ -24,4 +24,4 @@ acceptWithException
  (TT;)V
 throwing
  (Ljava/util/function/BiFunction<Ljava/lang/String;Ljava/lang/Exception;Ljava/lang/RuntimeException;>;)Lorg/springframework/util/function/ThrowingConsumer<TT;>;
- (Ljava/util/function/BiFunction<Ljava/lang/String;Ljava/lang/Exception;Ljava/lang/RuntimeException;>;)Lorg/springframework/util/function/ThrowingConsumer<TT;>;
+ (Ljava/util/function/BiFunction<Ljava/lang/String;Ljava/lang/Exception;Ljava/lang/RuntimeException;>;)L1org/springframework/util/function/ThrowingConsumer<TT;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/function/ThrowingFunction.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/function/ThrowingFunction.eea
index 1e17fb1a3c..a19747fd9c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/function/ThrowingFunction.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/function/ThrowingFunction.eea
@@ -24,4 +24,4 @@ applyWithException
  (TT;)TR;
 throwing
  (Ljava/util/function/BiFunction<Ljava/lang/String;Ljava/lang/Exception;Ljava/lang/RuntimeException;>;)Lorg/springframework/util/function/ThrowingFunction<TT;TR;>;
- (Ljava/util/function/BiFunction<Ljava/lang/String;Ljava/lang/Exception;Ljava/lang/RuntimeException;>;)Lorg/springframework/util/function/ThrowingFunction<TT;TR;>;
+ (Ljava/util/function/BiFunction<Ljava/lang/String;Ljava/lang/Exception;Ljava/lang/RuntimeException;>;)L1org/springframework/util/function/ThrowingFunction<TT;TR;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/function/ThrowingSupplier.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/function/ThrowingSupplier.eea
index fcd7b01434..ca43ffe7f3 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/function/ThrowingSupplier.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/function/ThrowingSupplier.eea
@@ -24,4 +24,4 @@ getWithException
  ()TT;
 throwing
  (Ljava/util/function/BiFunction<Ljava/lang/String;Ljava/lang/Exception;Ljava/lang/RuntimeException;>;)Lorg/springframework/util/function/ThrowingSupplier<TT;>;
- (Ljava/util/function/BiFunction<Ljava/lang/String;Ljava/lang/Exception;Ljava/lang/RuntimeException;>;)Lorg/springframework/util/function/ThrowingSupplier<TT;>;
+ (Ljava/util/function/BiFunction<Ljava/lang/String;Ljava/lang/Exception;Ljava/lang/RuntimeException;>;)L1org/springframework/util/function/ThrowingSupplier<TT;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/unit/DataSize.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/unit/DataSize.eea
index 8fac1f95d0..0ca7d2b6ef 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/unit/DataSize.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/unit/DataSize.eea
@@ -6,22 +6,22 @@ super java/lang/Comparable
 
 of
  (JLorg/springframework/util/unit/DataUnit;)Lorg/springframework/util/unit/DataSize;
- (JLorg/springframework/util/unit/DataUnit;)Lorg/springframework/util/unit/DataSize;
+ (JLorg/springframework/util/unit/DataUnit;)L1org/springframework/util/unit/DataSize;
 ofBytes
  (J)Lorg/springframework/util/unit/DataSize;
- (J)Lorg/springframework/util/unit/DataSize;
+ (J)L1org/springframework/util/unit/DataSize;
 ofGigabytes
  (J)Lorg/springframework/util/unit/DataSize;
- (J)Lorg/springframework/util/unit/DataSize;
+ (J)L1org/springframework/util/unit/DataSize;
 ofKilobytes
  (J)Lorg/springframework/util/unit/DataSize;
- (J)Lorg/springframework/util/unit/DataSize;
+ (J)L1org/springframework/util/unit/DataSize;
 ofMegabytes
  (J)Lorg/springframework/util/unit/DataSize;
- (J)Lorg/springframework/util/unit/DataSize;
+ (J)L1org/springframework/util/unit/DataSize;
 ofTerabytes
  (J)Lorg/springframework/util/unit/DataSize;
- (J)Lorg/springframework/util/unit/DataSize;
+ (J)L1org/springframework/util/unit/DataSize;
 parse
  (Ljava/lang/CharSequence;)Lorg/springframework/util/unit/DataSize;
  (Ljava/lang/CharSequence;)Lorg/springframework/util/unit/DataSize;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/xml/DomUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/xml/DomUtils.eea
index 7fc4236fc6..0528aa611e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/xml/DomUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/xml/DomUtils.eea
@@ -2,7 +2,7 @@ class org/springframework/util/xml/DomUtils
 
 createContentHandler
  (Lorg/w3c/dom/Node;)Lorg/xml/sax/ContentHandler;
- (Lorg/w3c/dom/Node;)Lorg/xml/sax/ContentHandler;
+ (Lorg/w3c/dom/Node;)L1org/xml/sax/ContentHandler;
 getChildElementByTagName
  (Lorg/w3c/dom/Element;Ljava/lang/String;)Lorg/w3c/dom/Element;
  (Lorg/w3c/dom/Element;Ljava/lang/String;)L0org/w3c/dom/Element;
@@ -11,16 +11,16 @@ getChildElementValueByTagName
  (Lorg/w3c/dom/Element;Ljava/lang/String;)L0java/lang/String;
 getChildElements
  (Lorg/w3c/dom/Element;)Ljava/util/List<Lorg/w3c/dom/Element;>;
- (Lorg/w3c/dom/Element;)Ljava/util/List<Lorg/w3c/dom/Element;>;
+ (Lorg/w3c/dom/Element;)L1java/util/List<Lorg/w3c/dom/Element;>;
 getChildElementsByTagName
  (Lorg/w3c/dom/Element;Ljava/lang/String;)Ljava/util/List<Lorg/w3c/dom/Element;>;
  (Lorg/w3c/dom/Element;Ljava/lang/String;)Ljava/util/List<Lorg/w3c/dom/Element;>;
 getChildElementsByTagName
  (Lorg/w3c/dom/Element;[Ljava/lang/String;)Ljava/util/List<Lorg/w3c/dom/Element;>;
- (Lorg/w3c/dom/Element;[Ljava/lang/String;)Ljava/util/List<Lorg/w3c/dom/Element;>;
+ (Lorg/w3c/dom/Element;[Ljava/lang/String;)L1java/util/List<Lorg/w3c/dom/Element;>;
 getTextValue
  (Lorg/w3c/dom/Element;)Ljava/lang/String;
- (Lorg/w3c/dom/Element;)Ljava/lang/String;
+ (Lorg/w3c/dom/Element;)L1java/lang/String;
 nodeNameEquals
  (Lorg/w3c/dom/Node;Ljava/lang/String;)Z
  (Lorg/w3c/dom/Node;Ljava/lang/String;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/util/xml/StaxUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/util/xml/StaxUtils.eea
index 074cd67b1c..549a513524 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/util/xml/StaxUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/util/xml/StaxUtils.eea
@@ -2,58 +2,58 @@ class org/springframework/util/xml/StaxUtils
 
 createContentHandler
  (Ljavax/xml/stream/XMLEventWriter;)Lorg/xml/sax/ContentHandler;
- (Ljavax/xml/stream/XMLEventWriter;)Lorg/xml/sax/ContentHandler;
+ (Ljavax/xml/stream/XMLEventWriter;)L1org/xml/sax/ContentHandler;
 createContentHandler
  (Ljavax/xml/stream/XMLStreamWriter;)Lorg/xml/sax/ContentHandler;
- (Ljavax/xml/stream/XMLStreamWriter;)Lorg/xml/sax/ContentHandler;
+ (Ljavax/xml/stream/XMLStreamWriter;)L1org/xml/sax/ContentHandler;
 createCustomStaxResult
  (Ljavax/xml/stream/XMLEventWriter;)Ljavax/xml/transform/Result;
- (Ljavax/xml/stream/XMLEventWriter;)Ljavax/xml/transform/Result;
+ (Ljavax/xml/stream/XMLEventWriter;)L1javax/xml/transform/Result;
 createCustomStaxResult
  (Ljavax/xml/stream/XMLStreamWriter;)Ljavax/xml/transform/Result;
- (Ljavax/xml/stream/XMLStreamWriter;)Ljavax/xml/transform/Result;
+ (Ljavax/xml/stream/XMLStreamWriter;)L1javax/xml/transform/Result;
 createCustomStaxSource
  (Ljavax/xml/stream/XMLEventReader;)Ljavax/xml/transform/Source;
- (Ljavax/xml/stream/XMLEventReader;)Ljavax/xml/transform/Source;
+ (Ljavax/xml/stream/XMLEventReader;)L1javax/xml/transform/Source;
 createCustomStaxSource
  (Ljavax/xml/stream/XMLStreamReader;)Ljavax/xml/transform/Source;
- (Ljavax/xml/stream/XMLStreamReader;)Ljavax/xml/transform/Source;
+ (Ljavax/xml/stream/XMLStreamReader;)L1javax/xml/transform/Source;
 createDefensiveInputFactory
  ()Ljavax/xml/stream/XMLInputFactory;
- ()Ljavax/xml/stream/XMLInputFactory;
+ ()L1javax/xml/stream/XMLInputFactory;
 createDefensiveInputFactory
  <T:Ljavax/xml/stream/XMLInputFactory;>(Ljava/util/function/Supplier<TT;>;)TT;
- <T:Ljavax/xml/stream/XMLInputFactory;>(Ljava/util/function/Supplier<TT;>;)TT;
+ <T:Ljavax/xml/stream/XMLInputFactory;>(Ljava/util/function/Supplier<TT;>;)T1T;
 createEventStreamReader
  (Ljavax/xml/stream/XMLEventReader;)Ljavax/xml/stream/XMLStreamReader;
- (Ljavax/xml/stream/XMLEventReader;)Ljavax/xml/stream/XMLStreamReader;
+ (Ljavax/xml/stream/XMLEventReader;)L1javax/xml/stream/XMLStreamReader;
 createEventStreamWriter
  (Ljavax/xml/stream/XMLEventWriter;)Ljavax/xml/stream/XMLStreamWriter;
- (Ljavax/xml/stream/XMLEventWriter;)Ljavax/xml/stream/XMLStreamWriter;
+ (Ljavax/xml/stream/XMLEventWriter;)L1javax/xml/stream/XMLStreamWriter;
 createEventStreamWriter
  (Ljavax/xml/stream/XMLEventWriter;Ljavax/xml/stream/XMLEventFactory;)Ljavax/xml/stream/XMLStreamWriter;
- (Ljavax/xml/stream/XMLEventWriter;Ljavax/xml/stream/XMLEventFactory;)Ljavax/xml/stream/XMLStreamWriter;
+ (Ljavax/xml/stream/XMLEventWriter;Ljavax/xml/stream/XMLEventFactory;)L1javax/xml/stream/XMLStreamWriter;
 createStaxResult
  (Ljavax/xml/stream/XMLEventWriter;)Ljavax/xml/transform/Result;
- (Ljavax/xml/stream/XMLEventWriter;)Ljavax/xml/transform/Result;
+ (Ljavax/xml/stream/XMLEventWriter;)L1javax/xml/transform/Result;
 createStaxResult
  (Ljavax/xml/stream/XMLStreamWriter;)Ljavax/xml/transform/Result;
- (Ljavax/xml/stream/XMLStreamWriter;)Ljavax/xml/transform/Result;
+ (Ljavax/xml/stream/XMLStreamWriter;)L1javax/xml/transform/Result;
 createStaxSource
  (Ljavax/xml/stream/XMLEventReader;)Ljavax/xml/transform/Source;
- (Ljavax/xml/stream/XMLEventReader;)Ljavax/xml/transform/Source;
+ (Ljavax/xml/stream/XMLEventReader;)L1javax/xml/transform/Source;
 createStaxSource
  (Ljavax/xml/stream/XMLStreamReader;)Ljavax/xml/transform/Source;
- (Ljavax/xml/stream/XMLStreamReader;)Ljavax/xml/transform/Source;
+ (Ljavax/xml/stream/XMLStreamReader;)L1javax/xml/transform/Source;
 createXMLEventReader
  (Ljava/util/List<Ljavax/xml/stream/events/XMLEvent;>;)Ljavax/xml/stream/XMLEventReader;
- (Ljava/util/List<Ljavax/xml/stream/events/XMLEvent;>;)Ljavax/xml/stream/XMLEventReader;
+ (Ljava/util/List<Ljavax/xml/stream/events/XMLEvent;>;)L1javax/xml/stream/XMLEventReader;
 createXMLReader
  (Ljavax/xml/stream/XMLEventReader;)Lorg/xml/sax/XMLReader;
- (Ljavax/xml/stream/XMLEventReader;)Lorg/xml/sax/XMLReader;
+ (Ljavax/xml/stream/XMLEventReader;)L1org/xml/sax/XMLReader;
 createXMLReader
  (Ljavax/xml/stream/XMLStreamReader;)Lorg/xml/sax/XMLReader;
- (Ljavax/xml/stream/XMLStreamReader;)Lorg/xml/sax/XMLReader;
+ (Ljavax/xml/stream/XMLStreamReader;)L1org/xml/sax/XMLReader;
 getXMLEventReader
  (Ljavax/xml/transform/Source;)Ljavax/xml/stream/XMLEventReader;
  (Ljavax/xml/transform/Source;)L0javax/xml/stream/XMLEventReader;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/validation/AbstractBindingResult.eea b/libs/eea-spring-6/src/main/resources/org/springframework/validation/AbstractBindingResult.eea
index 2267946088..125875e787 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/validation/AbstractBindingResult.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/validation/AbstractBindingResult.eea
@@ -65,7 +65,7 @@ getRawFieldValue
  (Ljava/lang/String;)L0java/lang/Object; # @Inherited(org.springframework.validation.BindingResult)
 getSuppressedFields
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String; # @Inherited(org.springframework.validation.BindingResult)
 getTarget
  ()Ljava/lang/Object;
  ()L0java/lang/Object; # @Inherited(org.springframework.validation.BindingResult)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/validation/AbstractErrors.eea b/libs/eea-spring-6/src/main/resources/org/springframework/validation/AbstractErrors.eea
index 519c9888df..6e75c894de 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/validation/AbstractErrors.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/validation/AbstractErrors.eea
@@ -14,7 +14,7 @@ getFieldErrors
  (Ljava/lang/String;)Ljava/util/List<Lorg/springframework/validation/FieldError;>;
 getNestedPath
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.validation.Errors)
 isMatchingFieldError
  (Ljava/lang/String;Lorg/springframework/validation/FieldError;)Z
  (Ljava/lang/String;Lorg/springframework/validation/FieldError;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/validation/BeanPropertyBindingResult.eea b/libs/eea-spring-6/src/main/resources/org/springframework/validation/BeanPropertyBindingResult.eea
index 88167136e2..0f5bf48793 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/validation/BeanPropertyBindingResult.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/validation/BeanPropertyBindingResult.eea
@@ -8,7 +8,7 @@ class org/springframework/validation/BeanPropertyBindingResult
  (Ljava/lang/Object;Ljava/lang/String;ZI)V
 createBeanWrapper
  ()Lorg/springframework/beans/BeanWrapper;
- ()Lorg/springframework/beans/BeanWrapper;
+ ()L1org/springframework/beans/BeanWrapper;
 getPropertyAccessor
  ()Lorg/springframework/beans/ConfigurablePropertyAccessor;
  ()Lorg/springframework/beans/ConfigurablePropertyAccessor;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/validation/BindException.eea b/libs/eea-spring-6/src/main/resources/org/springframework/validation/BindException.eea
index f91a00c691..9bd2c659c7 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/validation/BindException.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/validation/BindException.eea
@@ -59,7 +59,7 @@ getModel
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 getNestedPath
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.validation.Errors)
 getObjectName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -71,7 +71,7 @@ getRawFieldValue
  (Ljava/lang/String;)L0java/lang/Object; # @Inherited(org.springframework.validation.BindingResult)
 getSuppressedFields
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String; # @Inherited(org.springframework.validation.BindingResult)
 getTarget
  ()Ljava/lang/Object;
  ()L0java/lang/Object; # @Inherited(org.springframework.validation.BindingResult)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/validation/BindingResult.eea b/libs/eea-spring-6/src/main/resources/org/springframework/validation/BindingResult.eea
index 0e9cb6c238..6e87285002 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/validation/BindingResult.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/validation/BindingResult.eea
@@ -21,7 +21,7 @@ getRawFieldValue
  (Ljava/lang/String;)L0java/lang/Object;
 getSuppressedFields
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 getTarget
  ()Ljava/lang/Object;
  ()L0java/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/validation/DataBinder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/validation/DataBinder.eea
index 1056eda542..409c81668c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/validation/DataBinder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/validation/DataBinder.eea
@@ -57,10 +57,10 @@ convertIfNecessary
  <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/Class<TT;>;Lorg/springframework/core/convert/TypeDescriptor;)T0T; # @Inherited(org.springframework.beans.TypeConverter)
 createBeanPropertyBindingResult
  ()Lorg/springframework/validation/AbstractPropertyBindingResult;
- ()Lorg/springframework/validation/AbstractPropertyBindingResult;
+ ()L1org/springframework/validation/AbstractPropertyBindingResult;
 createDirectFieldBindingResult
  ()Lorg/springframework/validation/AbstractPropertyBindingResult;
- ()Lorg/springframework/validation/AbstractPropertyBindingResult;
+ ()L1org/springframework/validation/AbstractPropertyBindingResult;
 doBind
  (Lorg/springframework/beans/MutablePropertyValues;)V
  (Lorg/springframework/beans/MutablePropertyValues;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/validation/DefaultMessageCodesResolver$Format.eea b/libs/eea-spring-6/src/main/resources/org/springframework/validation/DefaultMessageCodesResolver$Format.eea
index 79acd3ccc4..558fe77240 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/validation/DefaultMessageCodesResolver$Format.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/validation/DefaultMessageCodesResolver$Format.eea
@@ -6,4 +6,4 @@ super java/lang/Enum
 
 toDelimitedString
  ([Ljava/lang/String;)Ljava/lang/String;
- ([Ljava/lang/String;)Ljava/lang/String;
+ ([Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/validation/DefaultMessageCodesResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/validation/DefaultMessageCodesResolver.eea
index c7f0d67ec3..1ec92e7439 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/validation/DefaultMessageCodesResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/validation/DefaultMessageCodesResolver.eea
@@ -12,7 +12,7 @@ getPrefix
  ()Ljava/lang/String;
 postProcessMessageCode
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 resolveMessageCodes
  (Ljava/lang/String;Ljava/lang/String;)[Ljava/lang/String;
  (Ljava/lang/String;Ljava/lang/String;)[Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/validation/DirectFieldBindingResult.eea b/libs/eea-spring-6/src/main/resources/org/springframework/validation/DirectFieldBindingResult.eea
index c46002b8b0..1349858006 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/validation/DirectFieldBindingResult.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/validation/DirectFieldBindingResult.eea
@@ -8,7 +8,7 @@ class org/springframework/validation/DirectFieldBindingResult
  (Ljava/lang/Object;Ljava/lang/String;Z)V
 createDirectFieldAccessor
  ()Lorg/springframework/beans/ConfigurablePropertyAccessor;
- ()Lorg/springframework/beans/ConfigurablePropertyAccessor;
+ ()L1org/springframework/beans/ConfigurablePropertyAccessor;
 getPropertyAccessor
  ()Lorg/springframework/beans/ConfigurablePropertyAccessor;
  ()Lorg/springframework/beans/ConfigurablePropertyAccessor;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/validation/Errors.eea b/libs/eea-spring-6/src/main/resources/org/springframework/validation/Errors.eea
index 22b9c921fb..41627f9417 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/validation/Errors.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/validation/Errors.eea
@@ -42,7 +42,7 @@ getGlobalErrors
  ()Ljava/util/List<Lorg/springframework/validation/ObjectError;>;
 getNestedPath
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getObjectName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/validation/Validator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/validation/Validator.eea
index 97d86d0b0f..8b9a8c46b4 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/validation/Validator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/validation/Validator.eea
@@ -15,4 +15,4 @@ validate
  (Ljava/lang/Object;Lorg/springframework/validation/Errors;)V
 validateObject
  (Ljava/lang/Object;)Lorg/springframework/validation/Errors;
- (Ljava/lang/Object;)Lorg/springframework/validation/Errors;
+ (Ljava/lang/Object;)L1org/springframework/validation/Errors;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.eea
index 39d9b467da..a26c406462 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.eea
@@ -5,4 +5,4 @@ class org/springframework/validation/beanvalidation/MessageSourceResourceBundleL
  (Lorg/springframework/context/MessageSource;)V
 getResourceBundle
  (Ljava/util/Locale;)Ljava/util/ResourceBundle;
- (Ljava/util/Locale;)Ljava/util/ResourceBundle;
+ (Ljava/util/Locale;)L1java/util/ResourceBundle;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/validation/beanvalidation/MethodValidationAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/validation/beanvalidation/MethodValidationAdapter.eea
index 7373330673..7f367a9d11 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/validation/beanvalidation/MethodValidationAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/validation/beanvalidation/MethodValidationAdapter.eea
@@ -11,7 +11,7 @@ class org/springframework/validation/beanvalidation/MethodValidationAdapter
  (Ljava/util/function/Supplier<Ljakarta/validation/Validator;>;)V
 determineValidationGroups
  (Ljava/lang/Object;Ljava/lang/reflect/Method;)[Ljava/lang/Class<*>;
- (Ljava/lang/Object;Ljava/lang/reflect/Method;)[Ljava/lang/Class<*>;
+ (Ljava/lang/Object;Ljava/lang/reflect/Method;)[1Ljava/lang/Class<*>;
 getMessageCodesResolver
  ()Lorg/springframework/validation/MessageCodesResolver;
  ()Lorg/springframework/validation/MessageCodesResolver;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/validation/beanvalidation/MethodValidationInterceptor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/validation/beanvalidation/MethodValidationInterceptor.eea
index c339c310ab..511a4ee65f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/validation/beanvalidation/MethodValidationInterceptor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/validation/beanvalidation/MethodValidationInterceptor.eea
@@ -14,7 +14,7 @@ class org/springframework/validation/beanvalidation/MethodValidationInterceptor
  (Ljava/util/function/Supplier<Ljakarta/validation/Validator;>;Z)V
 determineValidationGroups
  (Lorg/aopalliance/intercept/MethodInvocation;)[Ljava/lang/Class<*>;
- (Lorg/aopalliance/intercept/MethodInvocation;)[Ljava/lang/Class<*>;
+ (Lorg/aopalliance/intercept/MethodInvocation;)[1Ljava/lang/Class<*>;
 invoke
  (Lorg/aopalliance/intercept/MethodInvocation;)Ljava/lang/Object;
  (Lorg/aopalliance/intercept/MethodInvocation;)L0java/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.eea
index 915205f378..136859684d 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.eea
@@ -2,7 +2,7 @@ class org/springframework/validation/beanvalidation/MethodValidationPostProcesso
 
 createMethodValidationAdvice
  (Ljava/util/function/Supplier<Ljakarta/validation/Validator;>;)Lorg/aopalliance/aop/Advice;
- (Ljava/util/function/Supplier<Ljakarta/validation/Validator;>;)Lorg/aopalliance/aop/Advice;
+ (Ljava/util/function/Supplier<Ljakarta/validation/Validator;>;)L1org/aopalliance/aop/Advice;
 setValidatedAnnotationType
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)V
  (Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/validation/beanvalidation/SpringValidatorAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/validation/beanvalidation/SpringValidatorAdapter.eea
index 0bb0d46cd6..fb8d80862a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/validation/beanvalidation/SpringValidatorAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/validation/beanvalidation/SpringValidatorAdapter.eea
@@ -8,7 +8,7 @@ determineErrorCode
  (Ljakarta/validation/metadata/ConstraintDescriptor<*>;)Ljava/lang/String;
 determineField
  (Ljakarta/validation/ConstraintViolation<Ljava/lang/Object;>;)Ljava/lang/String;
- (Ljakarta/validation/ConstraintViolation<Ljava/lang/Object;>;)Ljava/lang/String;
+ (Ljakarta/validation/ConstraintViolation<Ljava/lang/Object;>;)L1java/lang/String;
 forExecutables
  ()Ljakarta/validation/executable/ExecutableValidator;
  ()Ljakarta/validation/executable/ExecutableValidator;
@@ -23,7 +23,7 @@ getRejectedValue
  (Ljava/lang/String;Ljakarta/validation/ConstraintViolation<Ljava/lang/Object;>;Lorg/springframework/validation/BindingResult;)L0java/lang/Object;
 getResolvableField
  (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/context/MessageSourceResolvable;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/springframework/context/MessageSourceResolvable;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/springframework/context/MessageSourceResolvable;
 processConstraintViolations
  (Ljava/util/Set<Ljakarta/validation/ConstraintViolation<Ljava/lang/Object;>;>;Lorg/springframework/validation/Errors;)V
  (Ljava/util/Set<Ljakarta/validation/ConstraintViolation<Ljava/lang/Object;>;>;Lorg/springframework/validation/Errors;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/validation/method/MethodValidationResult.eea b/libs/eea-spring-6/src/main/resources/org/springframework/validation/method/MethodValidationResult.eea
index 263b6b6d7a..c27a1ab009 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/validation/method/MethodValidationResult.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/validation/method/MethodValidationResult.eea
@@ -2,10 +2,10 @@ class org/springframework/validation/method/MethodValidationResult
 
 create
  (Ljava/lang/Object;Ljava/lang/reflect/Method;Ljava/util/List<Lorg/springframework/validation/method/ParameterValidationResult;>;)Lorg/springframework/validation/method/MethodValidationResult;
- (Ljava/lang/Object;Ljava/lang/reflect/Method;Ljava/util/List<Lorg/springframework/validation/method/ParameterValidationResult;>;)Lorg/springframework/validation/method/MethodValidationResult;
+ (Ljava/lang/Object;Ljava/lang/reflect/Method;Ljava/util/List<Lorg/springframework/validation/method/ParameterValidationResult;>;)L1org/springframework/validation/method/MethodValidationResult;
 emptyResult
  ()Lorg/springframework/validation/method/MethodValidationResult;
- ()Lorg/springframework/validation/method/MethodValidationResult;
+ ()L1org/springframework/validation/method/MethodValidationResult;
 
 getAllErrors
  ()Ljava/util/List<+Lorg/springframework/context/MessageSourceResolvable;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/validation/method/ParameterErrors.eea b/libs/eea-spring-6/src/main/resources/org/springframework/validation/method/ParameterErrors.eea
index 9cee9fb31f..e6c8873775 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/validation/method/ParameterErrors.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/validation/method/ParameterErrors.eea
@@ -38,7 +38,7 @@ getGlobalErrors
  ()Ljava/util/List<Lorg/springframework/validation/ObjectError;>;
 getNestedPath
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.validation.Errors)
 getObjectName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/ErrorResponse.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/ErrorResponse.eea
index c3854b8b17..71b93920c5 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/ErrorResponse.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/ErrorResponse.eea
@@ -5,19 +5,19 @@ builder
  (Ljava/lang/Throwable;Lorg/springframework/http/HttpStatusCode;Ljava/lang/String;)Lorg/springframework/web/ErrorResponse$Builder;
 builder
  (Ljava/lang/Throwable;Lorg/springframework/http/ProblemDetail;)Lorg/springframework/web/ErrorResponse$Builder;
- (Ljava/lang/Throwable;Lorg/springframework/http/ProblemDetail;)Lorg/springframework/web/ErrorResponse$Builder;
+ (Ljava/lang/Throwable;Lorg/springframework/http/ProblemDetail;)L1org/springframework/web/ErrorResponse$Builder;
 create
  (Ljava/lang/Throwable;Lorg/springframework/http/HttpStatusCode;Ljava/lang/String;)Lorg/springframework/web/ErrorResponse;
- (Ljava/lang/Throwable;Lorg/springframework/http/HttpStatusCode;Ljava/lang/String;)Lorg/springframework/web/ErrorResponse;
+ (Ljava/lang/Throwable;Lorg/springframework/http/HttpStatusCode;Ljava/lang/String;)L1org/springframework/web/ErrorResponse;
 getDefaultDetailMessageCode
  (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;Ljava/lang/String;)L1java/lang/String;
 getDefaultTitleMessageCode
  (Ljava/lang/Class<*>;)Ljava/lang/String;
- (Ljava/lang/Class<*>;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;)L1java/lang/String;
 getDefaultTypeMessageCode
  (Ljava/lang/Class<*>;)Ljava/lang/String;
- (Ljava/lang/Class<*>;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;)L1java/lang/String;
 
 getBody
  ()Lorg/springframework/http/ProblemDetail;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/accept/MappingMediaTypeFileExtensionResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/accept/MappingMediaTypeFileExtensionResolver.eea
index 5cce9acac8..7217efb659 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/accept/MappingMediaTypeFileExtensionResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/accept/MappingMediaTypeFileExtensionResolver.eea
@@ -11,7 +11,7 @@ getAllFileExtensions
  ()Ljava/util/List<Ljava/lang/String;>;
 getAllMediaTypes
  ()Ljava/util/List<Lorg/springframework/http/MediaType;>;
- ()Ljava/util/List<Lorg/springframework/http/MediaType;>;
+ ()L1java/util/List<Lorg/springframework/http/MediaType;>;
 getMediaTypes
  ()Ljava/util/Map<Ljava/lang/String;Lorg/springframework/http/MediaType;>;
  ()Ljava/util/Map<Ljava/lang/String;Lorg/springframework/http/MediaType;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/EscapedErrors.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/EscapedErrors.eea
index a48a630ccb..56681bb682 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/EscapedErrors.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/EscapedErrors.eea
@@ -38,7 +38,7 @@ getGlobalErrors
  ()Ljava/util/List<Lorg/springframework/validation/ObjectError;>;
 getNestedPath
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.validation.Errors)
 getObjectName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/ServletRequestDataBinder$ServletRequestValueResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/ServletRequestDataBinder$ServletRequestValueResolver.eea
index c6871dbd27..3b3858af91 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/ServletRequestDataBinder$ServletRequestValueResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/ServletRequestDataBinder$ServletRequestValueResolver.eea
@@ -14,7 +14,7 @@ getRequestParameter
  (Ljava/lang/String;Ljava/lang/Class<*>;)L0java/lang/Object;
 initParameterNames
  (Ljakarta/servlet/ServletRequest;)Ljava/util/Set<Ljava/lang/String;>;
- (Ljakarta/servlet/ServletRequest;)Ljava/util/Set<Ljava/lang/String;>;
+ (Ljakarta/servlet/ServletRequest;)L1java/util/Set<Ljava/lang/String;>;
 resolveValue
  (Ljava/lang/String;Ljava/lang/Class<*>;)Ljava/lang/Object;
  (Ljava/lang/String;Ljava/lang/Class<*>;)L0java/lang/Object; # @Inherited(org.springframework.validation.DataBinder$ValueResolver)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/ServletRequestDataBinder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/ServletRequestDataBinder.eea
index c9c6db6285..925f70f1d9 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/ServletRequestDataBinder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/ServletRequestDataBinder.eea
@@ -2,7 +2,7 @@ class org/springframework/web/bind/ServletRequestDataBinder
 
 valueResolver
  (Ljakarta/servlet/ServletRequest;Lorg/springframework/web/bind/WebDataBinder;)Lorg/springframework/validation/DataBinder$ValueResolver;
- (Ljakarta/servlet/ServletRequest;Lorg/springframework/web/bind/WebDataBinder;)Lorg/springframework/validation/DataBinder$ValueResolver;
+ (Ljakarta/servlet/ServletRequest;Lorg/springframework/web/bind/WebDataBinder;)L1org/springframework/validation/DataBinder$ValueResolver;
 
 <init>
  (Ljava/lang/Object;)V
@@ -21,7 +21,7 @@ construct
  (Ljakarta/servlet/ServletRequest;)V
 createValueResolver
  (Ljakarta/servlet/ServletRequest;)Lorg/springframework/web/bind/ServletRequestDataBinder$ServletRequestValueResolver;
- (Ljakarta/servlet/ServletRequest;)Lorg/springframework/web/bind/ServletRequestDataBinder$ServletRequestValueResolver;
+ (Ljakarta/servlet/ServletRequest;)L1org/springframework/web/bind/ServletRequestDataBinder$ServletRequestValueResolver;
 shouldConstructArgument
  (Lorg/springframework/core/MethodParameter;)Z
  (Lorg/springframework/core/MethodParameter;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/support/DefaultDataBinderFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/support/DefaultDataBinderFactory.eea
index a147b93c74..c3797c66ff 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/support/DefaultDataBinderFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/support/DefaultDataBinderFactory.eea
@@ -5,13 +5,13 @@ class org/springframework/web/bind/support/DefaultDataBinderFactory
  (Lorg/springframework/web/bind/support/WebBindingInitializer;)V
 createBinder
  (Lorg/springframework/web/context/request/NativeWebRequest;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/web/bind/WebDataBinder;
- (Lorg/springframework/web/context/request/NativeWebRequest;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/web/bind/WebDataBinder;
+ (Lorg/springframework/web/context/request/NativeWebRequest;Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/web/bind/WebDataBinder; # @Inherited(org.springframework.web.bind.support.WebDataBinderFactory)
 createBinder
  (Lorg/springframework/web/context/request/NativeWebRequest;Ljava/lang/Object;Ljava/lang/String;Lorg/springframework/core/ResolvableType;)Lorg/springframework/web/bind/WebDataBinder;
- (Lorg/springframework/web/context/request/NativeWebRequest;Ljava/lang/Object;Ljava/lang/String;Lorg/springframework/core/ResolvableType;)Lorg/springframework/web/bind/WebDataBinder;
+ (Lorg/springframework/web/context/request/NativeWebRequest;Ljava/lang/Object;Ljava/lang/String;Lorg/springframework/core/ResolvableType;)L1org/springframework/web/bind/WebDataBinder; # @Inherited(org.springframework.web.bind.support.WebDataBinderFactory)
 createBinderInstance
  (Ljava/lang/Object;Ljava/lang/String;Lorg/springframework/web/context/request/NativeWebRequest;)Lorg/springframework/web/bind/WebDataBinder;
- (Ljava/lang/Object;Ljava/lang/String;Lorg/springframework/web/context/request/NativeWebRequest;)Lorg/springframework/web/bind/WebDataBinder;
+ (Ljava/lang/Object;Ljava/lang/String;Lorg/springframework/web/context/request/NativeWebRequest;)L1org/springframework/web/bind/WebDataBinder;
 initBinder
  (Lorg/springframework/web/bind/WebDataBinder;Lorg/springframework/web/context/request/NativeWebRequest;)V
  (Lorg/springframework/web/bind/WebDataBinder;Lorg/springframework/web/context/request/NativeWebRequest;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/support/DefaultSessionAttributeStore.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/support/DefaultSessionAttributeStore.eea
index a9651712b1..dbc2315221 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/support/DefaultSessionAttributeStore.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/support/DefaultSessionAttributeStore.eea
@@ -5,7 +5,7 @@ cleanupAttribute
  (Lorg/springframework/web/context/request/WebRequest;Ljava/lang/String;)V
 getAttributeNameInSession
  (Lorg/springframework/web/context/request/WebRequest;Ljava/lang/String;)Ljava/lang/String;
- (Lorg/springframework/web/context/request/WebRequest;Ljava/lang/String;)Ljava/lang/String;
+ (Lorg/springframework/web/context/request/WebRequest;Ljava/lang/String;)L1java/lang/String;
 retrieveAttribute
  (Lorg/springframework/web/context/request/WebRequest;Ljava/lang/String;)Ljava/lang/Object;
  (Lorg/springframework/web/context/request/WebRequest;Ljava/lang/String;)L0java/lang/Object; # @Inherited(org.springframework.web.bind.support.SessionAttributeStore)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/support/WebDataBinderFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/support/WebDataBinderFactory.eea
index 5627ade4df..9a0dc178b1 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/support/WebDataBinderFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/support/WebDataBinderFactory.eea
@@ -2,7 +2,7 @@ class org/springframework/web/bind/support/WebDataBinderFactory
 
 createBinder
  (Lorg/springframework/web/context/request/NativeWebRequest;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/web/bind/WebDataBinder;
- (Lorg/springframework/web/context/request/NativeWebRequest;Ljava/lang/Object;Ljava/lang/String;)Lorg/springframework/web/bind/WebDataBinder;
+ (Lorg/springframework/web/context/request/NativeWebRequest;Ljava/lang/Object;Ljava/lang/String;)L1org/springframework/web/bind/WebDataBinder;
 createBinder
  (Lorg/springframework/web/context/request/NativeWebRequest;Ljava/lang/Object;Ljava/lang/String;Lorg/springframework/core/ResolvableType;)Lorg/springframework/web/bind/WebDataBinder;
- (Lorg/springframework/web/context/request/NativeWebRequest;Ljava/lang/Object;Ljava/lang/String;Lorg/springframework/core/ResolvableType;)Lorg/springframework/web/bind/WebDataBinder;
+ (Lorg/springframework/web/context/request/NativeWebRequest;Ljava/lang/Object;Ljava/lang/String;Lorg/springframework/core/ResolvableType;)L1org/springframework/web/bind/WebDataBinder;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/support/WebExchangeBindException.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/support/WebExchangeBindException.eea
index ae674a5b4a..2cf6ccf717 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/support/WebExchangeBindException.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/bind/support/WebExchangeBindException.eea
@@ -62,7 +62,7 @@ getModel
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 getNestedPath
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.validation.Errors)
 getObjectName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -74,7 +74,7 @@ getRawFieldValue
  (Ljava/lang/String;)L0java/lang/Object; # @Inherited(org.springframework.validation.BindingResult)
 getSuppressedFields
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String; # @Inherited(org.springframework.validation.BindingResult)
 getTarget
  ()Ljava/lang/Object;
  ()L0java/lang/Object; # @Inherited(org.springframework.validation.BindingResult)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/client/HttpClientErrorException.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/client/HttpClientErrorException.eea
index 4102cff98b..0a25e2ed84 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/client/HttpClientErrorException.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/client/HttpClientErrorException.eea
@@ -2,10 +2,10 @@ class org/springframework/web/client/HttpClientErrorException
 
 create
  (Ljava/lang/String;Lorg/springframework/http/HttpStatusCode;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)Lorg/springframework/web/client/HttpClientErrorException;
- (Ljava/lang/String;Lorg/springframework/http/HttpStatusCode;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)Lorg/springframework/web/client/HttpClientErrorException;
+ (Ljava/lang/String;Lorg/springframework/http/HttpStatusCode;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)L1org/springframework/web/client/HttpClientErrorException;
 create
  (Lorg/springframework/http/HttpStatusCode;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)Lorg/springframework/web/client/HttpClientErrorException;
- (Lorg/springframework/http/HttpStatusCode;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)Lorg/springframework/web/client/HttpClientErrorException;
+ (Lorg/springframework/http/HttpStatusCode;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)L1org/springframework/web/client/HttpClientErrorException;
 
 <init>
  (Ljava/lang/String;Lorg/springframework/http/HttpStatusCode;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/client/HttpServerErrorException.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/client/HttpServerErrorException.eea
index 58cdbe6d84..31d52386d2 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/client/HttpServerErrorException.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/client/HttpServerErrorException.eea
@@ -2,10 +2,10 @@ class org/springframework/web/client/HttpServerErrorException
 
 create
  (Ljava/lang/String;Lorg/springframework/http/HttpStatusCode;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)Lorg/springframework/web/client/HttpServerErrorException;
- (Ljava/lang/String;Lorg/springframework/http/HttpStatusCode;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)Lorg/springframework/web/client/HttpServerErrorException;
+ (Ljava/lang/String;Lorg/springframework/http/HttpStatusCode;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)L1org/springframework/web/client/HttpServerErrorException;
 create
  (Lorg/springframework/http/HttpStatusCode;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)Lorg/springframework/web/client/HttpServerErrorException;
- (Lorg/springframework/http/HttpStatusCode;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)Lorg/springframework/web/client/HttpServerErrorException;
+ (Lorg/springframework/http/HttpStatusCode;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)L1org/springframework/web/client/HttpServerErrorException;
 
 <init>
  (Ljava/lang/String;Lorg/springframework/http/HttpStatusCode;Ljava/lang/String;Lorg/springframework/http/HttpHeaders;[BLjava/nio/charset/Charset;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/client/RestClient.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/client/RestClient.eea
index 7b16a62edf..79cc1c44b3 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/client/RestClient.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/client/RestClient.eea
@@ -2,19 +2,19 @@ class org/springframework/web/client/RestClient
 
 builder
  ()Lorg/springframework/web/client/RestClient$Builder;
- ()Lorg/springframework/web/client/RestClient$Builder;
+ ()L1org/springframework/web/client/RestClient$Builder;
 builder
  (Lorg/springframework/web/client/RestTemplate;)Lorg/springframework/web/client/RestClient$Builder;
- (Lorg/springframework/web/client/RestTemplate;)Lorg/springframework/web/client/RestClient$Builder;
+ (Lorg/springframework/web/client/RestTemplate;)L1org/springframework/web/client/RestClient$Builder;
 create
  ()Lorg/springframework/web/client/RestClient;
- ()Lorg/springframework/web/client/RestClient;
+ ()L1org/springframework/web/client/RestClient;
 create
  (Ljava/lang/String;)Lorg/springframework/web/client/RestClient;
- (Ljava/lang/String;)Lorg/springframework/web/client/RestClient;
+ (Ljava/lang/String;)L1org/springframework/web/client/RestClient;
 create
  (Lorg/springframework/web/client/RestTemplate;)Lorg/springframework/web/client/RestClient;
- (Lorg/springframework/web/client/RestTemplate;)Lorg/springframework/web/client/RestClient;
+ (Lorg/springframework/web/client/RestTemplate;)L1org/springframework/web/client/RestClient;
 
 delete
  ()Lorg/springframework/web/client/RestClient$RequestHeadersUriSpec<*>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/client/RestTemplate.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/client/RestTemplate.eea
index 581294e0d1..6a725ee651 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/client/RestTemplate.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/client/RestTemplate.eea
@@ -8,7 +8,7 @@ class org/springframework/web/client/RestTemplate
  (Lorg/springframework/http/client/ClientHttpRequestFactory;)V
 acceptHeaderRequestCallback
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/web/client/RequestCallback;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/springframework/web/client/RequestCallback;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1org/springframework/web/client/RequestCallback;
 delete
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)V
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)V
@@ -107,10 +107,10 @@ headersExtractor
  ()Lorg/springframework/web/client/ResponseExtractor<Lorg/springframework/http/HttpHeaders;>;
 httpEntityCallback
  <T:Ljava/lang/Object;>(Ljava/lang/Object;)Lorg/springframework/web/client/RequestCallback;
- <T:Ljava/lang/Object;>(Ljava/lang/Object;)Lorg/springframework/web/client/RequestCallback;
+ <T:Ljava/lang/Object;>(Ljava/lang/Object;)L1org/springframework/web/client/RequestCallback;
 httpEntityCallback
  <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/reflect/Type;)Lorg/springframework/web/client/RequestCallback;
- <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/reflect/Type;)Lorg/springframework/web/client/RequestCallback;
+ <T:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/reflect/Type;)L1org/springframework/web/client/RequestCallback;
 optionsForAllow
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)Ljava/util/Set<Lorg/springframework/http/HttpMethod;>;
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)Ljava/util/Set<Lorg/springframework/http/HttpMethod;>;
@@ -167,7 +167,7 @@ put
  (Ljava/net/URI;Ljava/lang/Object;)V
 responseEntityExtractor
  <T:Ljava/lang/Object;>(Ljava/lang/reflect/Type;)Lorg/springframework/web/client/ResponseExtractor<Lorg/springframework/http/ResponseEntity<TT;>;>;
- <T:Ljava/lang/Object;>(Ljava/lang/reflect/Type;)Lorg/springframework/web/client/ResponseExtractor<Lorg/springframework/http/ResponseEntity<TT;>;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/reflect/Type;)L1org/springframework/web/client/ResponseExtractor<Lorg/springframework/http/ResponseEntity<TT;>;>;
 setDefaultUriVariables
  (Ljava/util/Map<Ljava/lang/String;*>;)V
  (Ljava/util/Map<Ljava/lang/String;*>;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/client/support/RestClientAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/client/support/RestClientAdapter.eea
index 7de4d944ec..c76f280497 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/client/support/RestClientAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/client/support/RestClientAdapter.eea
@@ -2,7 +2,7 @@ class org/springframework/web/client/support/RestClientAdapter
 
 create
  (Lorg/springframework/web/client/RestClient;)Lorg/springframework/web/client/support/RestClientAdapter;
- (Lorg/springframework/web/client/RestClient;)Lorg/springframework/web/client/support/RestClientAdapter;
+ (Lorg/springframework/web/client/RestClient;)L1org/springframework/web/client/support/RestClientAdapter;
 
 exchange
  (Lorg/springframework/web/service/invoker/HttpRequestValues;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/client/support/RestTemplateAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/client/support/RestTemplateAdapter.eea
index f069b6572d..9db4c8ff63 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/client/support/RestTemplateAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/client/support/RestTemplateAdapter.eea
@@ -2,7 +2,7 @@ class org/springframework/web/client/support/RestTemplateAdapter
 
 create
  (Lorg/springframework/web/client/RestTemplate;)Lorg/springframework/web/client/support/RestTemplateAdapter;
- (Lorg/springframework/web/client/RestTemplate;)Lorg/springframework/web/client/support/RestTemplateAdapter;
+ (Lorg/springframework/web/client/RestTemplate;)L1org/springframework/web/client/support/RestTemplateAdapter;
 
 exchange
  (Lorg/springframework/web/service/invoker/HttpRequestValues;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/ContextLoader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/ContextLoader.eea
index 1b832286b0..7b812821c8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/ContextLoader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/ContextLoader.eea
@@ -31,7 +31,7 @@ configureAndRefreshWebApplicationContext
  (Lorg/springframework/web/context/ConfigurableWebApplicationContext;Ljakarta/servlet/ServletContext;)V
 createWebApplicationContext
  (Ljakarta/servlet/ServletContext;)Lorg/springframework/web/context/WebApplicationContext;
- (Ljakarta/servlet/ServletContext;)Lorg/springframework/web/context/WebApplicationContext;
+ (Ljakarta/servlet/ServletContext;)L1org/springframework/web/context/WebApplicationContext;
 customizeContext
  (Ljakarta/servlet/ServletContext;Lorg/springframework/web/context/ConfigurableWebApplicationContext;)V
  (Ljakarta/servlet/ServletContext;Lorg/springframework/web/context/ConfigurableWebApplicationContext;)V
@@ -40,7 +40,7 @@ determineContextClass
  (Ljakarta/servlet/ServletContext;)Ljava/lang/Class<*>;
 determineContextInitializerClasses
  (Ljakarta/servlet/ServletContext;)Ljava/util/List<Ljava/lang/Class<Lorg/springframework/context/ApplicationContextInitializer<Lorg/springframework/context/ConfigurableApplicationContext;>;>;>;
- (Ljakarta/servlet/ServletContext;)Ljava/util/List<Ljava/lang/Class<Lorg/springframework/context/ApplicationContextInitializer<Lorg/springframework/context/ConfigurableApplicationContext;>;>;>;
+ (Ljakarta/servlet/ServletContext;)L1java/util/List<Ljava/lang/Class<Lorg/springframework/context/ApplicationContextInitializer<Lorg/springframework/context/ConfigurableApplicationContext;>;>;>;
 initWebApplicationContext
  (Ljakarta/servlet/ServletContext;)Lorg/springframework/web/context/WebApplicationContext;
  (Ljakarta/servlet/ServletContext;)Lorg/springframework/web/context/WebApplicationContext;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/request/FacesRequestAttributes.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/request/FacesRequestAttributes.eea
index 73bbe4f217..a4465a7c23 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/request/FacesRequestAttributes.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/request/FacesRequestAttributes.eea
@@ -20,7 +20,7 @@ getFacesContext
  ()Ljakarta/faces/context/FacesContext;
 getSessionId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSessionMutex
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/request/FacesWebRequest.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/request/FacesWebRequest.eea
index bbc625fba0..d1884a06de 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/request/FacesWebRequest.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/request/FacesWebRequest.eea
@@ -14,7 +14,7 @@ getContextPath
  ()Ljava/lang/String;
 getDescription
  (Z)Ljava/lang/String;
- (Z)Ljava/lang/String;
+ (Z)L1java/lang/String;
 getHeader
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)L0java/lang/String; # @Inherited(org.springframework.web.context.request.WebRequest)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/request/ServletWebRequest.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/request/ServletWebRequest.eea
index 8c84883240..ebb9b33005 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/request/ServletWebRequest.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/request/ServletWebRequest.eea
@@ -17,7 +17,7 @@ getContextPath
  ()Ljava/lang/String;
 getDescription
  (Z)Ljava/lang/String;
- (Z)Ljava/lang/String;
+ (Z)L1java/lang/String;
 getHeader
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)L0java/lang/String; # @Inherited(org.springframework.web.context.request.WebRequest)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/request/async/TimeoutCallableProcessingInterceptor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/request/async/TimeoutCallableProcessingInterceptor.eea
index a5cb5fc1a4..06eacad4b5 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/request/async/TimeoutCallableProcessingInterceptor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/request/async/TimeoutCallableProcessingInterceptor.eea
@@ -2,4 +2,4 @@ class org/springframework/web/context/request/async/TimeoutCallableProcessingInt
 
 handleTimeout
  <T:Ljava/lang/Object;>(Lorg/springframework/web/context/request/NativeWebRequest;Ljava/util/concurrent/Callable<TT;>;)Ljava/lang/Object;
- <T:Ljava/lang/Object;>(Lorg/springframework/web/context/request/NativeWebRequest;Ljava/util/concurrent/Callable<TT;>;)Ljava/lang/Object;
+ <T:Ljava/lang/Object;>(Lorg/springframework/web/context/request/NativeWebRequest;Ljava/util/concurrent/Callable<TT;>;)L1java/lang/Object;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/request/async/WebAsyncUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/request/async/WebAsyncUtils.eea
index 4885b7cc73..7227c398b7 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/request/async/WebAsyncUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/request/async/WebAsyncUtils.eea
@@ -6,10 +6,10 @@ WEB_ASYNC_MANAGER_ATTRIBUTE
 
 createAsyncWebRequest
  (Ljakarta/servlet/http/HttpServletRequest;Ljakarta/servlet/http/HttpServletResponse;)Lorg/springframework/web/context/request/async/AsyncWebRequest;
- (Ljakarta/servlet/http/HttpServletRequest;Ljakarta/servlet/http/HttpServletResponse;)Lorg/springframework/web/context/request/async/AsyncWebRequest;
+ (Ljakarta/servlet/http/HttpServletRequest;Ljakarta/servlet/http/HttpServletResponse;)L1org/springframework/web/context/request/async/AsyncWebRequest;
 getAsyncManager
  (Ljakarta/servlet/ServletRequest;)Lorg/springframework/web/context/request/async/WebAsyncManager;
- (Ljakarta/servlet/ServletRequest;)Lorg/springframework/web/context/request/async/WebAsyncManager;
+ (Ljakarta/servlet/ServletRequest;)L1org/springframework/web/context/request/async/WebAsyncManager;
 getAsyncManager
  (Lorg/springframework/web/context/request/WebRequest;)Lorg/springframework/web/context/request/async/WebAsyncManager;
- (Lorg/springframework/web/context/request/WebRequest;)Lorg/springframework/web/context/request/async/WebAsyncManager;
+ (Lorg/springframework/web/context/request/WebRequest;)L1org/springframework/web/context/request/async/WebAsyncManager;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/AbstractRefreshableWebApplicationContext.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/AbstractRefreshableWebApplicationContext.eea
index 140203670f..464b3cf9f5 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/AbstractRefreshableWebApplicationContext.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/AbstractRefreshableWebApplicationContext.eea
@@ -2,10 +2,10 @@ class org/springframework/web/context/support/AbstractRefreshableWebApplicationC
 
 createEnvironment
  ()Lorg/springframework/core/env/ConfigurableEnvironment;
- ()Lorg/springframework/core/env/ConfigurableEnvironment;
+ ()L1org/springframework/core/env/ConfigurableEnvironment; # @Inherited(org.springframework.context.support.AbstractApplicationContext)
 getApplicationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.context.support.AbstractApplicationContext)
 getConfigLocations
  ()[Ljava/lang/String;
  ()[0Ljava/lang/String; # @Inherited(org.springframework.context.support.AbstractRefreshableConfigApplicationContext)
@@ -14,10 +14,10 @@ getNamespace
  ()L0java/lang/String; # @Inherited(org.springframework.web.context.ConfigurableWebApplicationContext)
 getResourceByPath
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.DefaultResourceLoader)
 getResourcePatternResolver
  ()Lorg/springframework/core/io/support/ResourcePatternResolver;
- ()Lorg/springframework/core/io/support/ResourcePatternResolver;
+ ()L1org/springframework/core/io/support/ResourcePatternResolver; # @Inherited(org.springframework.context.support.AbstractApplicationContext)
 getServletConfig
  ()Ljakarta/servlet/ServletConfig;
  ()L0jakarta/servlet/ServletConfig; # @Inherited(org.springframework.web.context.ConfigurableWebApplicationContext)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.eea
index 3f5a1db41b..9c1b1fd679 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.eea
@@ -2,7 +2,7 @@ class org/springframework/web/context/support/AnnotationConfigWebApplicationCont
 
 getAnnotatedBeanDefinitionReader
  (Lorg/springframework/beans/factory/support/DefaultListableBeanFactory;)Lorg/springframework/context/annotation/AnnotatedBeanDefinitionReader;
- (Lorg/springframework/beans/factory/support/DefaultListableBeanFactory;)Lorg/springframework/context/annotation/AnnotatedBeanDefinitionReader;
+ (Lorg/springframework/beans/factory/support/DefaultListableBeanFactory;)L1org/springframework/context/annotation/AnnotatedBeanDefinitionReader;
 getBeanNameGenerator
  ()Lorg/springframework/beans/factory/support/BeanNameGenerator;
  ()L0org/springframework/beans/factory/support/BeanNameGenerator;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/GenericWebApplicationContext.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/GenericWebApplicationContext.eea
index 74f57ccc0c..159e377055 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/GenericWebApplicationContext.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/GenericWebApplicationContext.eea
@@ -11,10 +11,10 @@ class org/springframework/web/context/support/GenericWebApplicationContext
  (Lorg/springframework/beans/factory/support/DefaultListableBeanFactory;Ljakarta/servlet/ServletContext;)V
 createEnvironment
  ()Lorg/springframework/core/env/ConfigurableEnvironment;
- ()Lorg/springframework/core/env/ConfigurableEnvironment;
+ ()L1org/springframework/core/env/ConfigurableEnvironment; # @Inherited(org.springframework.context.support.AbstractApplicationContext)
 getApplicationName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.context.support.AbstractApplicationContext)
 getConfigLocations
  ()[Ljava/lang/String;
  ()[0Ljava/lang/String; # @Inherited(org.springframework.web.context.ConfigurableWebApplicationContext)
@@ -23,10 +23,10 @@ getNamespace
  ()L0java/lang/String; # @Inherited(org.springframework.web.context.ConfigurableWebApplicationContext)
 getResourceByPath
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.DefaultResourceLoader)
 getResourcePatternResolver
  ()Lorg/springframework/core/io/support/ResourcePatternResolver;
- ()Lorg/springframework/core/io/support/ResourcePatternResolver;
+ ()L1org/springframework/core/io/support/ResourcePatternResolver; # @Inherited(org.springframework.context.support.AbstractApplicationContext)
 getServletConfig
  ()Ljakarta/servlet/ServletConfig;
  ()L0jakarta/servlet/ServletConfig; # @Inherited(org.springframework.web.context.ConfigurableWebApplicationContext)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/RequestHandledEvent.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/RequestHandledEvent.eea
index ec80ce6609..f9e28ce21b 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/RequestHandledEvent.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/RequestHandledEvent.eea
@@ -8,7 +8,7 @@ class org/springframework/web/context/support/RequestHandledEvent
  (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;JLjava/lang/Throwable;)V
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getFailureCause
  ()Ljava/lang/Throwable;
  ()L0java/lang/Throwable;
@@ -17,7 +17,7 @@ getSessionId
  ()L0java/lang/String;
 getShortDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getUserName
  ()Ljava/lang/String;
  ()L0java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/ServletContextParameterFactoryBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/ServletContextParameterFactoryBean.eea
index 234758abb3..d5343b4a74 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/ServletContextParameterFactoryBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/ServletContextParameterFactoryBean.eea
@@ -9,7 +9,7 @@ getObject
  ()L0java/lang/String;
 getObjectType
  ()Ljava/lang/Class<Ljava/lang/String;>;
- ()Ljava/lang/Class<Ljava/lang/String;>;
+ ()L1java/lang/Class<Ljava/lang/String;>;
 setInitParamName
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/ServletContextResource.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/ServletContextResource.eea
index 577bdaecf7..7f104a7652 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/ServletContextResource.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/ServletContextResource.eea
@@ -5,16 +5,16 @@ class org/springframework/web/context/support/ServletContextResource
  (Ljakarta/servlet/ServletContext;Ljava/lang/String;)V
 createRelative
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.AbstractResource)
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(org.springframework.core.io.AbstractResource)
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getFile
  ()Ljava/io/File;
- ()Ljava/io/File;
+ ()L1java/io/File; # @Inherited(org.springframework.core.io.AbstractFileResolvingResource)
 getFilename
  ()Ljava/lang/String;
  ()L0java/lang/String; # @Inherited(org.springframework.core.io.AbstractResource)
@@ -32,4 +32,4 @@ getServletContext
  ()Ljakarta/servlet/ServletContext;
 getURL
  ()Ljava/net/URL;
- ()Ljava/net/URL;
+ ()L1java/net/URL; # @Inherited(org.springframework.core.io.AbstractResource)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/ServletContextResourceLoader.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/ServletContextResourceLoader.eea
index 2ca7e11907..39b929916a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/ServletContextResourceLoader.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/ServletContextResourceLoader.eea
@@ -5,4 +5,4 @@ class org/springframework/web/context/support/ServletContextResourceLoader
  (Ljakarta/servlet/ServletContext;)V
 getResourceByPath
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.DefaultResourceLoader)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/ServletRequestHandledEvent.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/ServletRequestHandledEvent.eea
index 74fb9544ef..4d9e031268 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/ServletRequestHandledEvent.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/ServletRequestHandledEvent.eea
@@ -14,7 +14,7 @@ getClientAddress
  ()Ljava/lang/String;
 getDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.web.context.support.RequestHandledEvent)
 getMethod
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -26,7 +26,7 @@ getServletName
  ()Ljava/lang/String;
 getShortDescription
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.web.context.support.RequestHandledEvent)
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(org.springframework.web.context.support.RequestHandledEvent)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/StaticWebApplicationContext.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/StaticWebApplicationContext.eea
index f6634aa33f..bd4b761dfe 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/StaticWebApplicationContext.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/context/support/StaticWebApplicationContext.eea
@@ -2,7 +2,7 @@ class org/springframework/web/context/support/StaticWebApplicationContext
 
 createEnvironment
  ()Lorg/springframework/core/env/ConfigurableEnvironment;
- ()Lorg/springframework/core/env/ConfigurableEnvironment;
+ ()L1org/springframework/core/env/ConfigurableEnvironment; # @Inherited(org.springframework.context.support.AbstractApplicationContext)
 getConfigLocations
  ()[Ljava/lang/String;
  ()[0Ljava/lang/String; # @Inherited(org.springframework.web.context.ConfigurableWebApplicationContext)
@@ -11,10 +11,10 @@ getNamespace
  ()L0java/lang/String; # @Inherited(org.springframework.web.context.ConfigurableWebApplicationContext)
 getResourceByPath
  (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
- (Ljava/lang/String;)Lorg/springframework/core/io/Resource;
+ (Ljava/lang/String;)L1org/springframework/core/io/Resource; # @Inherited(org.springframework.core.io.DefaultResourceLoader)
 getResourcePatternResolver
  ()Lorg/springframework/core/io/support/ResourcePatternResolver;
- ()Lorg/springframework/core/io/support/ResourcePatternResolver;
+ ()L1org/springframework/core/io/support/ResourcePatternResolver; # @Inherited(org.springframework.context.support.AbstractApplicationContext)
 getServletConfig
  ()Ljakarta/servlet/ServletConfig;
  ()L0jakarta/servlet/ServletConfig; # @Inherited(org.springframework.web.context.ConfigurableWebApplicationContext)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/filter/AbstractRequestLoggingFilter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/filter/AbstractRequestLoggingFilter.eea
index 7d188ee304..1d22a4a888 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/filter/AbstractRequestLoggingFilter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/filter/AbstractRequestLoggingFilter.eea
@@ -21,7 +21,7 @@ beforeRequest
  (Ljakarta/servlet/http/HttpServletRequest;Ljava/lang/String;)V
 createMessage
  (Ljakarta/servlet/http/HttpServletRequest;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljakarta/servlet/http/HttpServletRequest;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljakarta/servlet/http/HttpServletRequest;Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 doFilterInternal
  (Ljakarta/servlet/http/HttpServletRequest;Ljakarta/servlet/http/HttpServletResponse;Ljakarta/servlet/FilterChain;)V
  (Ljakarta/servlet/http/HttpServletRequest;Ljakarta/servlet/http/HttpServletResponse;Ljakarta/servlet/FilterChain;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/filter/ForwardedHeaderFilter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/filter/ForwardedHeaderFilter.eea
index f2106e453a..f784cf46ba 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/filter/ForwardedHeaderFilter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/filter/ForwardedHeaderFilter.eea
@@ -8,7 +8,7 @@ doFilterNestedErrorDispatch
  (Ljakarta/servlet/http/HttpServletRequest;Ljakarta/servlet/http/HttpServletResponse;Ljakarta/servlet/FilterChain;)V
 formatRequest
  (Ljakarta/servlet/http/HttpServletRequest;)Ljava/lang/String;
- (Ljakarta/servlet/http/HttpServletRequest;)Ljava/lang/String;
+ (Ljakarta/servlet/http/HttpServletRequest;)L1java/lang/String;
 shouldNotFilter
  (Ljakarta/servlet/http/HttpServletRequest;)Z
  (Ljakarta/servlet/http/HttpServletRequest;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/filter/GenericFilterBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/filter/GenericFilterBean.eea
index 5e9dd54386..fd0cf26f8a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/filter/GenericFilterBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/filter/GenericFilterBean.eea
@@ -9,7 +9,7 @@ addRequiredProperty
  (Ljava/lang/String;)V
 createEnvironment
  ()Lorg/springframework/core/env/Environment;
- ()Lorg/springframework/core/env/Environment;
+ ()L1org/springframework/core/env/Environment;
 getEnvironment
  ()Lorg/springframework/core/env/Environment;
  ()Lorg/springframework/core/env/Environment;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/filter/OncePerRequestFilter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/filter/OncePerRequestFilter.eea
index 29d7cfc3cb..7ca37a89f2 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/filter/OncePerRequestFilter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/filter/OncePerRequestFilter.eea
@@ -15,7 +15,7 @@ doFilterNestedErrorDispatch
  (Ljakarta/servlet/http/HttpServletRequest;Ljakarta/servlet/http/HttpServletResponse;Ljakarta/servlet/FilterChain;)V
 getAlreadyFilteredAttributeName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 isAsyncDispatch
  (Ljakarta/servlet/http/HttpServletRequest;)Z
  (Ljakarta/servlet/http/HttpServletRequest;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/filter/ShallowEtagHeaderFilter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/filter/ShallowEtagHeaderFilter.eea
index 7cc2fd92eb..af012dd5db 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/filter/ShallowEtagHeaderFilter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/filter/ShallowEtagHeaderFilter.eea
@@ -9,7 +9,7 @@ doFilterInternal
  (Ljakarta/servlet/http/HttpServletRequest;Ljakarta/servlet/http/HttpServletResponse;Ljakarta/servlet/FilterChain;)V
 generateETagHeaderValue
  (Ljava/io/InputStream;Z)Ljava/lang/String;
- (Ljava/io/InputStream;Z)Ljava/lang/String;
+ (Ljava/io/InputStream;Z)L1java/lang/String;
 isEligibleForEtag
  (Ljakarta/servlet/http/HttpServletRequest;Ljakarta/servlet/http/HttpServletResponse;ILjava/io/InputStream;)Z
  (Ljakarta/servlet/http/HttpServletRequest;Ljakarta/servlet/http/HttpServletResponse;ILjava/io/InputStream;)Z
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.eea
index e88f361cd8..847c6773d8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.eea
@@ -15,7 +15,7 @@ getDelegate
  (Ljakarta/faces/context/FacesContext;)Ljakarta/faces/application/NavigationHandler;
 getTargetBeanName
  (Ljakarta/faces/context/FacesContext;)Ljava/lang/String;
- (Ljakarta/faces/context/FacesContext;)Ljava/lang/String;
+ (Ljakarta/faces/context/FacesContext;)L1java/lang/String;
 getWebApplicationContext
  (Ljakarta/faces/context/FacesContext;)Lorg/springframework/web/context/WebApplicationContext;
  (Ljakarta/faces/context/FacesContext;)Lorg/springframework/web/context/WebApplicationContext;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/jsf/el/SpringBeanFacesELResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/jsf/el/SpringBeanFacesELResolver.eea
index 39d32f7e3a..29c8a01946 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/jsf/el/SpringBeanFacesELResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/jsf/el/SpringBeanFacesELResolver.eea
@@ -2,7 +2,7 @@ class org/springframework/web/jsf/el/SpringBeanFacesELResolver
 
 getCommonPropertyType
  (Ljakarta/el/ELContext;Ljava/lang/Object;)Ljava/lang/Class<*>;
- (Ljakarta/el/ELContext;Ljava/lang/Object;)Ljava/lang/Class<*>;
+ (Ljakarta/el/ELContext;Ljava/lang/Object;)L1java/lang/Class<*>;
 getFeatureDescriptors
  (Ljakarta/el/ELContext;Ljava/lang/Object;)Ljava/util/Iterator<Ljava/beans/FeatureDescriptor;>;
  (Ljakarta/el/ELContext;Ljava/lang/Object;)L0java/util/Iterator<Ljava/beans/FeatureDescriptor;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.eea
index 865be53310..00a5a5b243 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.eea
@@ -10,7 +10,7 @@ logger
 
 getCommonPropertyType
  (Ljakarta/el/ELContext;Ljava/lang/Object;)Ljava/lang/Class<*>;
- (Ljakarta/el/ELContext;Ljava/lang/Object;)Ljava/lang/Class<*>;
+ (Ljakarta/el/ELContext;Ljava/lang/Object;)L1java/lang/Class<*>;
 getFeatureDescriptors
  (Ljakarta/el/ELContext;Ljava/lang/Object;)Ljava/util/Iterator<Ljava/beans/FeatureDescriptor;>;
  (Ljakarta/el/ELContext;Ljava/lang/Object;)L0java/util/Iterator<Ljava/beans/FeatureDescriptor;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/method/ControllerAdviceBean.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/method/ControllerAdviceBean.eea
index 409bb360c7..4e3aebaa64 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/method/ControllerAdviceBean.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/method/ControllerAdviceBean.eea
@@ -2,7 +2,7 @@ class org/springframework/web/method/ControllerAdviceBean
 
 findAnnotatedBeans
  (Lorg/springframework/context/ApplicationContext;)Ljava/util/List<Lorg/springframework/web/method/ControllerAdviceBean;>;
- (Lorg/springframework/context/ApplicationContext;)Ljava/util/List<Lorg/springframework/web/method/ControllerAdviceBean;>;
+ (Lorg/springframework/context/ApplicationContext;)L1java/util/List<Lorg/springframework/web/method/ControllerAdviceBean;>;
 
 <init>
  (Ljava/lang/Object;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/method/HandlerMethod.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/method/HandlerMethod.eea
index ec9de07336..ac1950a5e7 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/method/HandlerMethod.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/method/HandlerMethod.eea
@@ -27,16 +27,16 @@ assertTargetBean
  (Ljava/lang/reflect/Method;Ljava/lang/Object;[Ljava/lang/Object;)V
 createWithResolvedBean
  ()Lorg/springframework/web/method/HandlerMethod;
- ()Lorg/springframework/web/method/HandlerMethod;
+ ()L1org/springframework/web/method/HandlerMethod;
 createWithValidateFlags
  ()Lorg/springframework/web/method/HandlerMethod;
- ()Lorg/springframework/web/method/HandlerMethod;
+ ()L1org/springframework/web/method/HandlerMethod;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(org.springframework.core.annotation.AnnotatedMethod)
 formatInvokeError
  (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/String;[Ljava/lang/Object;)L1java/lang/String;
 getBean
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
@@ -57,7 +57,7 @@ getResponseStatusReason
  ()L0java/lang/String;
 getShortLogMessage
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(org.springframework.core.annotation.AnnotatedMethod)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/method/HandlerTypePredicate.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/method/HandlerTypePredicate.eea
index 6c6b8d6df2..ab59b9c576 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/method/HandlerTypePredicate.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/method/HandlerTypePredicate.eea
@@ -6,13 +6,13 @@ super java/util/function/Predicate
 
 builder
  ()Lorg/springframework/web/method/HandlerTypePredicate$Builder;
- ()Lorg/springframework/web/method/HandlerTypePredicate$Builder;
+ ()L1org/springframework/web/method/HandlerTypePredicate$Builder;
 forAnnotation
  ([Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lorg/springframework/web/method/HandlerTypePredicate;
  ([Ljava/lang/Class<+Ljava/lang/annotation/Annotation;>;)Lorg/springframework/web/method/HandlerTypePredicate;
 forAnyHandlerType
  ()Lorg/springframework/web/method/HandlerTypePredicate;
- ()Lorg/springframework/web/method/HandlerTypePredicate;
+ ()L1org/springframework/web/method/HandlerTypePredicate;
 forAssignableType
  ([Ljava/lang/Class<*>;)Lorg/springframework/web/method/HandlerTypePredicate;
  ([Ljava/lang/Class<*>;)Lorg/springframework/web/method/HandlerTypePredicate;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.eea
index c800494c34..5f6536f62f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.eea
@@ -5,7 +5,7 @@ class org/springframework/web/method/annotation/AbstractCookieValueMethodArgumen
  (Lorg/springframework/beans/factory/config/ConfigurableBeanFactory;)V
 createNamedValueInfo
  (Lorg/springframework/core/MethodParameter;)Lorg/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
- (Lorg/springframework/core/MethodParameter;)Lorg/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
+ (Lorg/springframework/core/MethodParameter;)L1org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo; # @Inherited(org.springframework.web.method.annotation.AbstractNamedValueMethodArgumentResolver)
 handleMissingValue
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;)V
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.eea
index f14216ed83..2a2e208035 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.eea
@@ -5,7 +5,7 @@ class org/springframework/web/method/annotation/AbstractNamedValueMethodArgument
  (Lorg/springframework/beans/factory/config/ConfigurableBeanFactory;)V
 createNamedValueInfo
  (Lorg/springframework/core/MethodParameter;)Lorg/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
- (Lorg/springframework/core/MethodParameter;)Lorg/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
+ (Lorg/springframework/core/MethodParameter;)L1org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
 handleMissingValue
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;)V
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.eea
index e7627255da..5a75b769a7 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.eea
@@ -5,7 +5,7 @@ class org/springframework/web/method/annotation/ExpressionValueMethodArgumentRes
  (Lorg/springframework/beans/factory/config/ConfigurableBeanFactory;)V
 createNamedValueInfo
  (Lorg/springframework/core/MethodParameter;)Lorg/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
- (Lorg/springframework/core/MethodParameter;)Lorg/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
+ (Lorg/springframework/core/MethodParameter;)L1org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo; # @Inherited(org.springframework.web.method.annotation.AbstractNamedValueMethodArgumentResolver)
 handleMissingValue
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;)V
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.eea
index 8d611d8581..e776ce3fa2 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.eea
@@ -12,7 +12,7 @@ constructAttribute
  (Lorg/springframework/web/bind/WebDataBinder;Lorg/springframework/web/context/request/NativeWebRequest;)V
 createAttribute
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/web/bind/support/WebDataBinderFactory;Lorg/springframework/web/context/request/NativeWebRequest;)Ljava/lang/Object;
- (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/web/bind/support/WebDataBinderFactory;Lorg/springframework/web/context/request/NativeWebRequest;)L0java/lang/Object;
+ (Ljava/lang/String;Lorg/springframework/core/MethodParameter;Lorg/springframework/web/bind/support/WebDataBinderFactory;Lorg/springframework/web/context/request/NativeWebRequest;)L1java/lang/Object;
 handleReturnValue
  (Ljava/lang/Object;Lorg/springframework/core/MethodParameter;Lorg/springframework/web/method/support/ModelAndViewContainer;Lorg/springframework/web/context/request/NativeWebRequest;)V
  (Ljava/lang/Object;Lorg/springframework/core/MethodParameter;Lorg/springframework/web/method/support/ModelAndViewContainer;Lorg/springframework/web/context/request/NativeWebRequest;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.eea
index 245af05206..d6898a5157 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.eea
@@ -5,7 +5,7 @@ class org/springframework/web/method/annotation/RequestHeaderMethodArgumentResol
  (Lorg/springframework/beans/factory/config/ConfigurableBeanFactory;)V
 createNamedValueInfo
  (Lorg/springframework/core/MethodParameter;)Lorg/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
- (Lorg/springframework/core/MethodParameter;)Lorg/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
+ (Lorg/springframework/core/MethodParameter;)L1org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo; # @Inherited(org.springframework.web.method.annotation.AbstractNamedValueMethodArgumentResolver)
 handleMissingValue
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;)V
  (Ljava/lang/String;Lorg/springframework/core/MethodParameter;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.eea
index 5f493e4728..3f9381882c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.eea
@@ -8,7 +8,7 @@ contributeMethodArgument
  (Lorg/springframework/core/MethodParameter;Ljava/lang/Object;Lorg/springframework/web/util/UriComponentsBuilder;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Lorg/springframework/core/convert/ConversionService;)V
 createNamedValueInfo
  (Lorg/springframework/core/MethodParameter;)Lorg/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
- (Lorg/springframework/core/MethodParameter;)Lorg/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo;
+ (Lorg/springframework/core/MethodParameter;)L1org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver$NamedValueInfo; # @Inherited(org.springframework.web.method.annotation.AbstractNamedValueMethodArgumentResolver)
 formatUriValue
  (Lorg/springframework/core/convert/ConversionService;Lorg/springframework/core/convert/TypeDescriptor;Ljava/lang/Object;)Ljava/lang/String;
  (Lorg/springframework/core/convert/ConversionService;Lorg/springframework/core/convert/TypeDescriptor;Ljava/lang/Object;)L0java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/SessionAttributesHandler.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/SessionAttributesHandler.eea
index daf789af01..51cb5393e3 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/SessionAttributesHandler.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/method/annotation/SessionAttributesHandler.eea
@@ -15,7 +15,7 @@ isHandlerSessionAttribute
  (Ljava/lang/String;Ljava/lang/Class<*>;)Z
 retrieveAttributes
  (Lorg/springframework/web/context/request/WebRequest;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- (Lorg/springframework/web/context/request/WebRequest;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ (Lorg/springframework/web/context/request/WebRequest;)L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 storeAttributes
  (Lorg/springframework/web/context/request/WebRequest;Ljava/util/Map<Ljava/lang/String;*>;)V
  (Lorg/springframework/web/context/request/WebRequest;Ljava/util/Map<Ljava/lang/String;*>;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/multipart/MultipartFile.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/multipart/MultipartFile.eea
index fb8adcdad5..7eeddebd83 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/multipart/MultipartFile.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/multipart/MultipartFile.eea
@@ -17,7 +17,7 @@ getOriginalFilename
  ()L0java/lang/String;
 getResource
  ()Lorg/springframework/core/io/Resource;
- ()Lorg/springframework/core/io/Resource;
+ ()L1org/springframework/core/io/Resource;
 transferTo
  (Ljava/io/File;)V
  (Ljava/io/File;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.eea
index 588e2656d0..29a6427d9e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.eea
@@ -26,7 +26,7 @@ getRequest
  ()Ljakarta/servlet/http/HttpServletRequest;
 getRequestHeaders
  ()Lorg/springframework/http/HttpHeaders;
- ()Lorg/springframework/http/HttpHeaders;
+ ()L1org/springframework/http/HttpHeaders;
 getRequestMethod
  ()Lorg/springframework/http/HttpMethod;
  ()L0org/springframework/http/HttpMethod; # @Inherited(org.springframework.web.multipart.MultipartHttpServletRequest)
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/multipart/support/ByteArrayMultipartFileEditor.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/multipart/support/ByteArrayMultipartFileEditor.eea
index b718ba48ad..7636692da6 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/multipart/support/ByteArrayMultipartFileEditor.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/multipart/support/ByteArrayMultipartFileEditor.eea
@@ -2,7 +2,7 @@ class org/springframework/web/multipart/support/ByteArrayMultipartFileEditor
 
 getAsText
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.springframework.beans.propertyeditors.ByteArrayPropertyEditor)
 setValue
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.eea
index 73e809596d..e67fc7449e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.eea
@@ -23,7 +23,7 @@ getParameter
  (Ljava/lang/String;)L0java/lang/String;
 getParameterMap
  ()Ljava/util/Map<Ljava/lang/String;[Ljava/lang/String;>;
- ()Ljava/util/Map<Ljava/lang/String;[Ljava/lang/String;>;
+ ()L1java/util/Map<Ljava/lang/String;[Ljava/lang/String;>;
 getParameterNames
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/multipart/support/StandardServletMultipartResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/multipart/support/StandardServletMultipartResolver.eea
index 37c4640d9f..e0b28350a3 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/multipart/support/StandardServletMultipartResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/multipart/support/StandardServletMultipartResolver.eea
@@ -8,4 +8,4 @@ isMultipart
  (Ljakarta/servlet/http/HttpServletRequest;)Z
 resolveMultipart
  (Ljakarta/servlet/http/HttpServletRequest;)Lorg/springframework/web/multipart/MultipartHttpServletRequest;
- (Ljakarta/servlet/http/HttpServletRequest;)Lorg/springframework/web/multipart/MultipartHttpServletRequest;
+ (Ljakarta/servlet/http/HttpServletRequest;)L1org/springframework/web/multipart/MultipartHttpServletRequest;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/multipart/support/StandardServletPartUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/multipart/support/StandardServletPartUtils.eea
index 6f551eb3f7..278d27ad8f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/multipart/support/StandardServletPartUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/multipart/support/StandardServletPartUtils.eea
@@ -5,7 +5,7 @@ bindParts
  (Ljakarta/servlet/http/HttpServletRequest;Lorg/springframework/beans/MutablePropertyValues;Z)V
 getParts
  (Ljakarta/servlet/http/HttpServletRequest;)Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljakarta/servlet/http/Part;>;
- (Ljakarta/servlet/http/HttpServletRequest;)Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljakarta/servlet/http/Part;>;
+ (Ljakarta/servlet/http/HttpServletRequest;)L1org/springframework/util/MultiValueMap<Ljava/lang/String;Ljakarta/servlet/http/Part;>;
 getParts
  (Ljakarta/servlet/http/HttpServletRequest;Ljava/lang/String;)Ljava/util/List<Ljakarta/servlet/http/Part;>;
  (Ljakarta/servlet/http/HttpServletRequest;Ljava/lang/String;)Ljava/util/List<Ljakarta/servlet/http/Part;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/server/ServerWebExchange.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/server/ServerWebExchange.eea
index 634e69c8e9..1938a1cd17 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/server/ServerWebExchange.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/server/ServerWebExchange.eea
@@ -60,7 +60,7 @@ getSession
  ()Lreactor/core/publisher/Mono<Lorg/springframework/web/server/WebSession;>;
 mutate
  ()Lorg/springframework/web/server/ServerWebExchange$Builder;
- ()Lorg/springframework/web/server/ServerWebExchange$Builder;
+ ()L1org/springframework/web/server/ServerWebExchange$Builder;
 transformUrl
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/server/adapter/AbstractReactiveWebInitializer.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/server/adapter/AbstractReactiveWebInitializer.eea
index baeb6baa81..57b43f8b88 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/server/adapter/AbstractReactiveWebInitializer.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/server/adapter/AbstractReactiveWebInitializer.eea
@@ -6,16 +6,16 @@ DEFAULT_SERVLET_NAME
 
 createApplicationContext
  ()Lorg/springframework/context/ApplicationContext;
- ()Lorg/springframework/context/ApplicationContext;
+ ()L1org/springframework/context/ApplicationContext;
 getConfigClasses
  ()[Ljava/lang/Class<*>;
  ()[Ljava/lang/Class<*>;
 getServletMapping
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getServletName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 onStartup
  (Ljakarta/servlet/ServletContext;)V
  (Ljakarta/servlet/ServletContext;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/server/adapter/HttpWebHandlerAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/server/adapter/HttpWebHandlerAdapter.eea
index e70e7ff4c1..ffc74032dc 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/server/adapter/HttpWebHandlerAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/server/adapter/HttpWebHandlerAdapter.eea
@@ -5,10 +5,10 @@ class org/springframework/web/server/adapter/HttpWebHandlerAdapter
  (Lorg/springframework/web/server/WebHandler;)V
 createExchange
  (Lorg/springframework/http/server/reactive/ServerHttpRequest;Lorg/springframework/http/server/reactive/ServerHttpResponse;)Lorg/springframework/web/server/ServerWebExchange;
- (Lorg/springframework/http/server/reactive/ServerHttpRequest;Lorg/springframework/http/server/reactive/ServerHttpResponse;)Lorg/springframework/web/server/ServerWebExchange;
+ (Lorg/springframework/http/server/reactive/ServerHttpRequest;Lorg/springframework/http/server/reactive/ServerHttpResponse;)L1org/springframework/web/server/ServerWebExchange;
 formatRequest
  (Lorg/springframework/http/server/reactive/ServerHttpRequest;)Ljava/lang/String;
- (Lorg/springframework/http/server/reactive/ServerHttpRequest;)Ljava/lang/String;
+ (Lorg/springframework/http/server/reactive/ServerHttpRequest;)L1java/lang/String;
 getApplicationContext
  ()Lorg/springframework/context/ApplicationContext;
  ()L0org/springframework/context/ApplicationContext;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/server/adapter/WebHttpHandlerBuilder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/server/adapter/WebHttpHandlerBuilder.eea
index 1e2df83e47..05e7ecfa44 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/server/adapter/WebHttpHandlerBuilder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/server/adapter/WebHttpHandlerBuilder.eea
@@ -18,10 +18,10 @@ WEB_SESSION_MANAGER_BEAN_NAME
 
 applicationContext
  (Lorg/springframework/context/ApplicationContext;)Lorg/springframework/web/server/adapter/WebHttpHandlerBuilder;
- (Lorg/springframework/context/ApplicationContext;)Lorg/springframework/web/server/adapter/WebHttpHandlerBuilder;
+ (Lorg/springframework/context/ApplicationContext;)L1org/springframework/web/server/adapter/WebHttpHandlerBuilder;
 webHandler
  (Lorg/springframework/web/server/WebHandler;)Lorg/springframework/web/server/adapter/WebHttpHandlerBuilder;
- (Lorg/springframework/web/server/WebHandler;)Lorg/springframework/web/server/adapter/WebHttpHandlerBuilder;
+ (Lorg/springframework/web/server/WebHandler;)L1org/springframework/web/server/adapter/WebHttpHandlerBuilder;
 
 build
  ()Lorg/springframework/http/server/reactive/HttpHandler;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/server/i18n/AcceptHeaderLocaleContextResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/server/i18n/AcceptHeaderLocaleContextResolver.eea
index 93047db66f..6bb320add2 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/server/i18n/AcceptHeaderLocaleContextResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/server/i18n/AcceptHeaderLocaleContextResolver.eea
@@ -8,7 +8,7 @@ getSupportedLocales
  ()Ljava/util/List<Ljava/util/Locale;>;
 resolveLocaleContext
  (Lorg/springframework/web/server/ServerWebExchange;)Lorg/springframework/context/i18n/LocaleContext;
- (Lorg/springframework/web/server/ServerWebExchange;)Lorg/springframework/context/i18n/LocaleContext;
+ (Lorg/springframework/web/server/ServerWebExchange;)L1org/springframework/context/i18n/LocaleContext;
 setDefaultLocale
  (Ljava/util/Locale;)V
  (Ljava/util/Locale;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/server/i18n/FixedLocaleContextResolver.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/server/i18n/FixedLocaleContextResolver.eea
index 21e882762c..a15d426b9c 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/server/i18n/FixedLocaleContextResolver.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/server/i18n/FixedLocaleContextResolver.eea
@@ -8,7 +8,7 @@ class org/springframework/web/server/i18n/FixedLocaleContextResolver
  (Ljava/util/Locale;Ljava/util/TimeZone;)V
 resolveLocaleContext
  (Lorg/springframework/web/server/ServerWebExchange;)Lorg/springframework/context/i18n/LocaleContext;
- (Lorg/springframework/web/server/ServerWebExchange;)Lorg/springframework/context/i18n/LocaleContext;
+ (Lorg/springframework/web/server/ServerWebExchange;)L1org/springframework/context/i18n/LocaleContext;
 setLocaleContext
  (Lorg/springframework/web/server/ServerWebExchange;Lorg/springframework/context/i18n/LocaleContext;)V
  (Lorg/springframework/web/server/ServerWebExchange;Lorg/springframework/context/i18n/LocaleContext;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/server/session/InMemoryWebSessionStore.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/server/session/InMemoryWebSessionStore.eea
index fe1647113b..59e84f1d4e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/server/session/InMemoryWebSessionStore.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/server/session/InMemoryWebSessionStore.eea
@@ -2,7 +2,7 @@ class org/springframework/web/server/session/InMemoryWebSessionStore
 
 createWebSession
  ()Lreactor/core/publisher/Mono<Lorg/springframework/web/server/WebSession;>;
- ()Lreactor/core/publisher/Mono<Lorg/springframework/web/server/WebSession;>;
+ ()L1reactor/core/publisher/Mono<Lorg/springframework/web/server/WebSession;>; # @Inherited(org.springframework.web.server.session.WebSessionStore)
 getClock
  ()Ljava/time/Clock;
  ()Ljava/time/Clock;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/server/session/WebSessionStore.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/server/session/WebSessionStore.eea
index b409e87dd8..cac73bc572 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/server/session/WebSessionStore.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/server/session/WebSessionStore.eea
@@ -2,7 +2,7 @@ class org/springframework/web/server/session/WebSessionStore
 
 createWebSession
  ()Lreactor/core/publisher/Mono<Lorg/springframework/web/server/WebSession;>;
- ()Lreactor/core/publisher/Mono<Lorg/springframework/web/server/WebSession;>;
+ ()L1reactor/core/publisher/Mono<Lorg/springframework/web/server/WebSession;>;
 removeSession
  (Ljava/lang/String;)Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
  (Ljava/lang/String;)Lreactor/core/publisher/Mono<Ljava/lang/Void;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/service/invoker/HttpClientAdapter.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/service/invoker/HttpClientAdapter.eea
index 9154f937d8..bc421d189e 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/service/invoker/HttpClientAdapter.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/service/invoker/HttpClientAdapter.eea
@@ -2,7 +2,7 @@ class org/springframework/web/service/invoker/HttpClientAdapter
 
 asReactorExchangeAdapter
  ()Lorg/springframework/web/service/invoker/ReactorHttpExchangeAdapter;
- ()Lorg/springframework/web/service/invoker/ReactorHttpExchangeAdapter;
+ ()L1org/springframework/web/service/invoker/ReactorHttpExchangeAdapter;
 requestToBodilessEntity
  (Lorg/springframework/web/service/invoker/HttpRequestValues;)Lreactor/core/publisher/Mono<Lorg/springframework/http/ResponseEntity<Ljava/lang/Void;>;>;
  (Lorg/springframework/web/service/invoker/HttpRequestValues;)Lreactor/core/publisher/Mono<Lorg/springframework/http/ResponseEntity<Ljava/lang/Void;>;>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/service/invoker/HttpRequestValues$Builder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/service/invoker/HttpRequestValues$Builder.eea
index 6b35fd98f0..12e2fe0f97 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/service/invoker/HttpRequestValues$Builder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/service/invoker/HttpRequestValues$Builder.eea
@@ -26,10 +26,10 @@ buildMultipartBody
  ()Ljava/lang/Object;
 createRequestValues
  (Lorg/springframework/http/HttpMethod;Ljava/net/URI;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Lorg/springframework/http/HttpHeaders;Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Ljava/lang/Object;)Lorg/springframework/web/service/invoker/HttpRequestValues;
- (Lorg/springframework/http/HttpMethod;Ljava/net/URI;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Lorg/springframework/http/HttpHeaders;Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Ljava/lang/Object;)Lorg/springframework/web/service/invoker/HttpRequestValues;
+ (Lorg/springframework/http/HttpMethod;Ljava/net/URI;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Lorg/springframework/http/HttpHeaders;Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Ljava/lang/Object;)L1org/springframework/web/service/invoker/HttpRequestValues;
 createRequestValues
  (Lorg/springframework/http/HttpMethod;Ljava/net/URI;Lorg/springframework/web/util/UriBuilderFactory;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Lorg/springframework/http/HttpHeaders;Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Ljava/lang/Object;)Lorg/springframework/web/service/invoker/HttpRequestValues;
- (Lorg/springframework/http/HttpMethod;Ljava/net/URI;Lorg/springframework/web/util/UriBuilderFactory;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Lorg/springframework/http/HttpHeaders;Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Ljava/lang/Object;)Lorg/springframework/web/service/invoker/HttpRequestValues;
+ (Lorg/springframework/http/HttpMethod;Ljava/net/URI;Lorg/springframework/web/util/UriBuilderFactory;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Lorg/springframework/http/HttpHeaders;Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Ljava/lang/Object;)L1org/springframework/web/service/invoker/HttpRequestValues;
 setAccept
  (Ljava/util/List<Lorg/springframework/http/MediaType;>;)Lorg/springframework/web/service/invoker/HttpRequestValues$Builder;
  (Ljava/util/List<Lorg/springframework/http/MediaType;>;)L1org/springframework/web/service/invoker/HttpRequestValues$Builder;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/service/invoker/HttpRequestValues.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/service/invoker/HttpRequestValues.eea
index c697b082d7..a4d28af7c3 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/service/invoker/HttpRequestValues.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/service/invoker/HttpRequestValues.eea
@@ -2,7 +2,7 @@ class org/springframework/web/service/invoker/HttpRequestValues
 
 builder
  ()Lorg/springframework/web/service/invoker/HttpRequestValues$Builder;
- ()Lorg/springframework/web/service/invoker/HttpRequestValues$Builder;
+ ()L1org/springframework/web/service/invoker/HttpRequestValues$Builder;
 
 <init>
  (Lorg/springframework/http/HttpMethod;Ljava/net/URI;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Lorg/springframework/http/HttpHeaders;Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Ljava/lang/Object;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/service/invoker/HttpServiceProxyFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/service/invoker/HttpServiceProxyFactory.eea
index 52add4899a..842604a251 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/service/invoker/HttpServiceProxyFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/service/invoker/HttpServiceProxyFactory.eea
@@ -2,7 +2,7 @@ class org/springframework/web/service/invoker/HttpServiceProxyFactory
 
 builder
  ()Lorg/springframework/web/service/invoker/HttpServiceProxyFactory$Builder;
- ()Lorg/springframework/web/service/invoker/HttpServiceProxyFactory$Builder;
+ ()L1org/springframework/web/service/invoker/HttpServiceProxyFactory$Builder;
 builder
  (Lorg/springframework/web/service/invoker/HttpClientAdapter;)Lorg/springframework/web/service/invoker/HttpServiceProxyFactory$Builder;
  (Lorg/springframework/web/service/invoker/HttpClientAdapter;)Lorg/springframework/web/service/invoker/HttpServiceProxyFactory$Builder;
@@ -12,4 +12,4 @@ builderFor
 
 createClient
  <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;)TS;
- <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;)TS;
+ <S:Ljava/lang/Object;>(Ljava/lang/Class<TS;>;)T1S;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/service/invoker/ReactiveHttpRequestValues$Builder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/service/invoker/ReactiveHttpRequestValues$Builder.eea
index 587e40b4f3..dce98ab92a 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/service/invoker/ReactiveHttpRequestValues$Builder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/service/invoker/ReactiveHttpRequestValues$Builder.eea
@@ -29,7 +29,7 @@ buildMultipartBody
  ()Ljava/lang/Object;
 createRequestValues
  (Lorg/springframework/http/HttpMethod;Ljava/net/URI;Lorg/springframework/web/util/UriBuilderFactory;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Lorg/springframework/http/HttpHeaders;Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Ljava/lang/Object;)Lorg/springframework/web/service/invoker/ReactiveHttpRequestValues;
- (Lorg/springframework/http/HttpMethod;Ljava/net/URI;Lorg/springframework/web/util/UriBuilderFactory;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Lorg/springframework/http/HttpHeaders;Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Ljava/lang/Object;)Lorg/springframework/web/service/invoker/ReactiveHttpRequestValues;
+ (Lorg/springframework/http/HttpMethod;Ljava/net/URI;Lorg/springframework/web/util/UriBuilderFactory;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;Lorg/springframework/http/HttpHeaders;Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;Ljava/lang/Object;)L1org/springframework/web/service/invoker/ReactiveHttpRequestValues;
 setAccept
  (Ljava/util/List<Lorg/springframework/http/MediaType;>;)Lorg/springframework/web/service/invoker/ReactiveHttpRequestValues$Builder;
  (Ljava/util/List<Lorg/springframework/http/MediaType;>;)L1org/springframework/web/service/invoker/ReactiveHttpRequestValues$Builder;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/service/invoker/ReactiveHttpRequestValues.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/service/invoker/ReactiveHttpRequestValues.eea
index 74d9add8b5..d1c09a5250 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/service/invoker/ReactiveHttpRequestValues.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/service/invoker/ReactiveHttpRequestValues.eea
@@ -2,7 +2,7 @@ class org/springframework/web/service/invoker/ReactiveHttpRequestValues
 
 builder
  ()Lorg/springframework/web/service/invoker/ReactiveHttpRequestValues$Builder;
- ()Lorg/springframework/web/service/invoker/ReactiveHttpRequestValues$Builder;
+ ()L1org/springframework/web/service/invoker/ReactiveHttpRequestValues$Builder;
 
 getBody
  ()Lorg/reactivestreams/Publisher<*>;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/util/BindErrorUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/util/BindErrorUtils.eea
index 37f6f7ff2d..c74e864ef8 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/util/BindErrorUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/util/BindErrorUtils.eea
@@ -5,7 +5,7 @@ resolve
  <E::Lorg/springframework/context/MessageSourceResolvable;>(Ljava/util/List<TE;>;)Ljava/util/Map<TE;Ljava/lang/String;>;
 resolve
  <E::Lorg/springframework/context/MessageSourceResolvable;>(Ljava/util/List<TE;>;Lorg/springframework/context/MessageSource;Ljava/util/Locale;)Ljava/util/Map<TE;Ljava/lang/String;>;
- <E::Lorg/springframework/context/MessageSourceResolvable;>(Ljava/util/List<TE;>;Lorg/springframework/context/MessageSource;Ljava/util/Locale;)Ljava/util/Map<TE;Ljava/lang/String;>;
+ <E::Lorg/springframework/context/MessageSourceResolvable;>(Ljava/util/List<TE;>;Lorg/springframework/context/MessageSource;Ljava/util/Locale;)L1java/util/Map<TE;Ljava/lang/String;>;
 resolveAndJoin
  (Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/util/List<+Lorg/springframework/context/MessageSourceResolvable;>;Lorg/springframework/context/MessageSource;Ljava/util/Locale;)Ljava/lang/String;
  (Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/util/List<+Lorg/springframework/context/MessageSourceResolvable;>;Lorg/springframework/context/MessageSource;Ljava/util/Locale;)Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/util/ContentCachingRequestWrapper.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/util/ContentCachingRequestWrapper.eea
index ddb45add04..c2a49b2bd9 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/util/ContentCachingRequestWrapper.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/util/ContentCachingRequestWrapper.eea
@@ -8,7 +8,7 @@ class org/springframework/web/util/ContentCachingRequestWrapper
  (Ljakarta/servlet/http/HttpServletRequest;I)V
 getCharacterEncoding
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getContentAsByteArray
  ()[B
  ()[B
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/util/CookieGenerator.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/util/CookieGenerator.eea
index d38439e595..8304929cc2 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/util/CookieGenerator.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/util/CookieGenerator.eea
@@ -13,7 +13,7 @@ addCookie
  (Ljakarta/servlet/http/HttpServletResponse;Ljava/lang/String;)V
 createCookie
  (Ljava/lang/String;)Ljakarta/servlet/http/Cookie;
- (Ljava/lang/String;)Ljakarta/servlet/http/Cookie;
+ (Ljava/lang/String;)L1jakarta/servlet/http/Cookie;
 getCookieDomain
  ()Ljava/lang/String;
  ()L0java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/util/DefaultUriBuilderFactory.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/util/DefaultUriBuilderFactory.eea
index 86eb52a24c..93233dc0f5 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/util/DefaultUriBuilderFactory.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/util/DefaultUriBuilderFactory.eea
@@ -8,7 +8,7 @@ class org/springframework/web/util/DefaultUriBuilderFactory
  (Lorg/springframework/web/util/UriComponentsBuilder;)V
 builder
  ()Lorg/springframework/web/util/UriBuilder;
- ()Lorg/springframework/web/util/UriBuilder;
+ ()L1org/springframework/web/util/UriBuilder;
 expand
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)Ljava/net/URI;
  (Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;*>;)Ljava/net/URI;
@@ -29,4 +29,4 @@ setEncodingMode
  (Lorg/springframework/web/util/DefaultUriBuilderFactory$EncodingMode;)V
 uriString
  (Ljava/lang/String;)Lorg/springframework/web/util/UriBuilder;
- (Ljava/lang/String;)Lorg/springframework/web/util/UriBuilder;
+ (Ljava/lang/String;)L1org/springframework/web/util/UriBuilder;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/util/HtmlUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/util/HtmlUtils.eea
index 7cc33809a8..673148baae 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/util/HtmlUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/util/HtmlUtils.eea
@@ -5,19 +5,19 @@ htmlEscape
  (Ljava/lang/String;)Ljava/lang/String;
 htmlEscape
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 htmlEscapeDecimal
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
 htmlEscapeDecimal
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 htmlEscapeHex
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
 htmlEscapeHex
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 htmlUnescape
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/util/JavaScriptUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/util/JavaScriptUtils.eea
index 366066ab81..0eb5d41539 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/util/JavaScriptUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/util/JavaScriptUtils.eea
@@ -2,4 +2,4 @@ class org/springframework/web/util/JavaScriptUtils
 
 javaScriptEscape
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/util/UriComponentsBuilder.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/util/UriComponentsBuilder.eea
index a3cf702e68..ded9a44703 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/util/UriComponentsBuilder.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/util/UriComponentsBuilder.eea
@@ -5,22 +5,22 @@ fromHttpRequest
  (Lorg/springframework/http/HttpRequest;)Lorg/springframework/web/util/UriComponentsBuilder;
 fromHttpUrl
  (Ljava/lang/String;)Lorg/springframework/web/util/UriComponentsBuilder;
- (Ljava/lang/String;)Lorg/springframework/web/util/UriComponentsBuilder;
+ (Ljava/lang/String;)L1org/springframework/web/util/UriComponentsBuilder;
 fromOriginHeader
  (Ljava/lang/String;)Lorg/springframework/web/util/UriComponentsBuilder;
- (Ljava/lang/String;)Lorg/springframework/web/util/UriComponentsBuilder;
+ (Ljava/lang/String;)L1org/springframework/web/util/UriComponentsBuilder;
 fromPath
  (Ljava/lang/String;)Lorg/springframework/web/util/UriComponentsBuilder;
- (Ljava/lang/String;)Lorg/springframework/web/util/UriComponentsBuilder;
+ (Ljava/lang/String;)L1org/springframework/web/util/UriComponentsBuilder;
 fromUri
  (Ljava/net/URI;)Lorg/springframework/web/util/UriComponentsBuilder;
- (Ljava/net/URI;)Lorg/springframework/web/util/UriComponentsBuilder;
+ (Ljava/net/URI;)L1org/springframework/web/util/UriComponentsBuilder;
 fromUriString
  (Ljava/lang/String;)Lorg/springframework/web/util/UriComponentsBuilder;
- (Ljava/lang/String;)Lorg/springframework/web/util/UriComponentsBuilder;
+ (Ljava/lang/String;)L1org/springframework/web/util/UriComponentsBuilder;
 newInstance
  ()Lorg/springframework/web/util/UriComponentsBuilder;
- ()Lorg/springframework/web/util/UriComponentsBuilder;
+ ()L1org/springframework/web/util/UriComponentsBuilder;
 parseForwardedFor
  (Lorg/springframework/http/HttpRequest;Ljava/net/InetSocketAddress;)Ljava/net/InetSocketAddress;
  (Lorg/springframework/http/HttpRequest;Ljava/net/InetSocketAddress;)L0java/net/InetSocketAddress;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/util/UriUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/util/UriUtils.eea
index 3f5900d546..60f272a994 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/util/UriUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/util/UriUtils.eea
@@ -62,7 +62,7 @@ encodeQueryParam
  (Ljava/lang/String;Ljava/nio/charset/Charset;)Ljava/lang/String;
 encodeQueryParams
  (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;)Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
- (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;)Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
+ (Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;)L1org/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
 encodeScheme
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/util/WebUtils.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/util/WebUtils.eea
index c8d450982b..79db060f22 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/util/WebUtils.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/util/WebUtils.eea
@@ -102,7 +102,7 @@ getNativeResponse
  <T:Ljava/lang/Object;>(Ljakarta/servlet/ServletResponse;Ljava/lang/Class<TT;>;)T0T;
 getParametersStartingWith
  (Ljakarta/servlet/ServletRequest;Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
- (Ljakarta/servlet/ServletRequest;Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
+ (Ljakarta/servlet/ServletRequest;Ljava/lang/String;)L1java/util/Map<Ljava/lang/String;Ljava/lang/Object;>;
 getRealPath
  (Ljakarta/servlet/ServletContext;Ljava/lang/String;)Ljava/lang/String;
  (Ljakarta/servlet/ServletContext;Ljava/lang/String;)Ljava/lang/String;
@@ -138,7 +138,7 @@ isValidOrigin
  (Lorg/springframework/http/HttpRequest;Ljava/util/Collection<Ljava/lang/String;>;)Z
 parseMatrixVariables
  (Ljava/lang/String;)Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
- (Ljava/lang/String;)Lorg/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
+ (Ljava/lang/String;)L1org/springframework/util/MultiValueMap<Ljava/lang/String;Ljava/lang/String;>;
 removeWebAppRootSystemProperty
  (Ljakarta/servlet/ServletContext;)V
  (Ljakarta/servlet/ServletContext;)V
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/util/pattern/PathPatternRouteMatcher.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/util/pattern/PathPatternRouteMatcher.eea
index 3a4f1e9fd6..c8a92ac962 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/util/pattern/PathPatternRouteMatcher.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/util/pattern/PathPatternRouteMatcher.eea
@@ -20,4 +20,4 @@ matchAndExtract
  (Ljava/lang/String;Lorg/springframework/util/RouteMatcher$Route;)L0java/util/Map<Ljava/lang/String;Ljava/lang/String;>; # @Inherited(org.springframework.util.RouteMatcher)
 parseRoute
  (Ljava/lang/String;)Lorg/springframework/util/RouteMatcher$Route;
- (Ljava/lang/String;)Lorg/springframework/util/RouteMatcher$Route;
+ (Ljava/lang/String;)L1org/springframework/util/RouteMatcher$Route;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/web/util/pattern/PatternParseException.eea b/libs/eea-spring-6/src/main/resources/org/springframework/web/util/pattern/PatternParseException.eea
index 685773eb59..7a73f3eb8f 100644
--- a/libs/eea-spring-6/src/main/resources/org/springframework/web/util/pattern/PatternParseException.eea
+++ b/libs/eea-spring-6/src/main/resources/org/springframework/web/util/pattern/PatternParseException.eea
@@ -11,4 +11,4 @@ getMessageType
  ()Lorg/springframework/web/util/pattern/PatternParseException$PatternMessage;
 toDetailedString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/Application.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/Application.eea
index fad6463444..bc400b6d05 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/Application.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/Application.eea
@@ -20,7 +20,7 @@ getApplicationKeys
 
 createRequestCycle
  (Lorg/apache/wicket/request/Request;Lorg/apache/wicket/request/Response;)Lorg/apache/wicket/request/cycle/RequestCycle;
- (Lorg/apache/wicket/request/Request;Lorg/apache/wicket/request/Response;)Lorg/apache/wicket/request/cycle/RequestCycle;
+ (Lorg/apache/wicket/request/Request;Lorg/apache/wicket/request/Response;)L1org/apache/wicket/request/cycle/RequestCycle;
 decorateHeaderResponse
  (Lorg/apache/wicket/markup/head/IHeaderResponse;)Lorg/apache/wicket/markup/head/IHeaderResponse;
  (Lorg/apache/wicket/markup/head/IHeaderResponse;)Lorg/apache/wicket/markup/head/IHeaderResponse;
@@ -176,28 +176,28 @@ logResponseTarget
  (Lorg/apache/wicket/request/IRequestHandler;)V
 newConverterLocator
  ()Lorg/apache/wicket/IConverterLocator;
- ()Lorg/apache/wicket/IConverterLocator;
+ ()L1org/apache/wicket/IConverterLocator;
 newMapperContext
  ()Lorg/apache/wicket/core/request/mapper/IMapperContext;
- ()Lorg/apache/wicket/core/request/mapper/IMapperContext;
+ ()L1org/apache/wicket/core/request/mapper/IMapperContext;
 newPageFactory
  ()Lorg/apache/wicket/IPageFactory;
- ()Lorg/apache/wicket/IPageFactory;
+ ()L1org/apache/wicket/IPageFactory;
 newRequestLogger
  ()Lorg/apache/wicket/protocol/http/IRequestLogger;
- ()Lorg/apache/wicket/protocol/http/IRequestLogger;
+ ()L1org/apache/wicket/protocol/http/IRequestLogger;
 newResourceBundles
  (Lorg/apache/wicket/request/resource/ResourceReferenceRegistry;)Lorg/apache/wicket/ResourceBundles;
- (Lorg/apache/wicket/request/resource/ResourceReferenceRegistry;)Lorg/apache/wicket/ResourceBundles;
+ (Lorg/apache/wicket/request/resource/ResourceReferenceRegistry;)L1org/apache/wicket/ResourceBundles;
 newResourceReferenceRegistry
  ()Lorg/apache/wicket/request/resource/ResourceReferenceRegistry;
- ()Lorg/apache/wicket/request/resource/ResourceReferenceRegistry;
+ ()L1org/apache/wicket/request/resource/ResourceReferenceRegistry;
 newSession
  (Lorg/apache/wicket/request/Request;Lorg/apache/wicket/request/Response;)Lorg/apache/wicket/Session;
  (Lorg/apache/wicket/request/Request;Lorg/apache/wicket/request/Response;)Lorg/apache/wicket/Session;
 newSharedResources
  (Lorg/apache/wicket/request/resource/ResourceReferenceRegistry;)Lorg/apache/wicket/SharedResources;
- (Lorg/apache/wicket/request/resource/ResourceReferenceRegistry;)Lorg/apache/wicket/SharedResources;
+ (Lorg/apache/wicket/request/resource/ResourceReferenceRegistry;)L1org/apache/wicket/SharedResources;
 onEvent
  (Lorg/apache/wicket/event/IEvent<*>;)V
  (L1org/apache/wicket/event/IEvent<*>;)V # @Inherited(org.apache.wicket.event.IEventSink)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/AttributeModifier.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/AttributeModifier.eea
index 05af196aef..23db97844a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/AttributeModifier.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/AttributeModifier.eea
@@ -24,10 +24,10 @@ remove
  (Ljava/lang/String;)Lorg/apache/wicket/AttributeModifier;
 replace
  (Ljava/lang/String;Ljava/io/Serializable;)Lorg/apache/wicket/AttributeModifier;
- (Ljava/lang/String;Ljava/io/Serializable;)Lorg/apache/wicket/AttributeModifier;
+ (Ljava/lang/String;Ljava/io/Serializable;)L1org/apache/wicket/AttributeModifier;
 replace
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<*>;)Lorg/apache/wicket/AttributeModifier;
- (Ljava/lang/String;Lorg/apache/wicket/model/IModel<*>;)Lorg/apache/wicket/AttributeModifier;
+ (Ljava/lang/String;Lorg/apache/wicket/model/IModel<*>;)L1org/apache/wicket/AttributeModifier;
 
 <init>
  (Ljava/lang/String;Ljava/io/Serializable;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/Component.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/Component.eea
index 1fbf74c20a..7105bfe1f0 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/Component.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/Component.eea
@@ -37,7 +37,7 @@ checkHierarchyChange
  (Lorg/apache/wicket/Component;)V
 createConverter
  (Ljava/lang/Class<*>;)Lorg/apache/wicket/util/convert/IConverter<*>;
- (Ljava/lang/Class<*>;)Lorg/apache/wicket/util/convert/IConverter<*>;
+ (Ljava/lang/Class<*>;)L0org/apache/wicket/util/convert/IConverter<*>;
 debug
  (Ljava/io/Serializable;)V
  (Ljava/io/Serializable;)V
@@ -46,19 +46,19 @@ error
  (Ljava/io/Serializable;)V
 exceptionMessage
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 fatal
  (Ljava/io/Serializable;)V
  (Ljava/io/Serializable;)V
 findMarkupStream
  ()Lorg/apache/wicket/markup/MarkupStream;
- ()Lorg/apache/wicket/markup/MarkupStream;
+ ()L1org/apache/wicket/markup/MarkupStream;
 findPage
  ()Lorg/apache/wicket/Page;
  ()Lorg/apache/wicket/Page;
 findParent
  <Z:Ljava/lang/Object;>(Ljava/lang/Class<TZ;>;)TZ;
- <Z:Ljava/lang/Object;>(Ljava/lang/Class<TZ;>;)TZ;
+ <Z:Ljava/lang/Object;>(Ljava/lang/Class<TZ;>;)T0Z;
 findParentWithAssociatedMarkup
  ()Lorg/apache/wicket/MarkupContainer;
  ()Lorg/apache/wicket/MarkupContainer;
@@ -85,7 +85,7 @@ getBehaviors
  <M:Lorg/apache/wicket/behavior/Behavior;>(Ljava/lang/Class<TM;>;)Ljava/util/List<TM;>;
 getClassRelativePath
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getConverter
  <C:Ljava/lang/Object;>(Ljava/lang/Class<TC;>;)Lorg/apache/wicket/util/convert/IConverter<TC;>;
  <C:Ljava/lang/Object;>(Ljava/lang/Class<TC;>;)Lorg/apache/wicket/util/convert/IConverter<TC;>;
@@ -94,7 +94,7 @@ getDefaultModel
  ()Lorg/apache/wicket/model/IModel<*>;
 getDefaultModelObject
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 getDefaultModelObjectAsString
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -103,7 +103,7 @@ getDefaultModelObjectAsString
  (Ljava/lang/Object;)Ljava/lang/String;
 getFeedbackMessages
  ()Lorg/apache/wicket/feedback/FeedbackMessages;
- ()Lorg/apache/wicket/feedback/FeedbackMessages;
+ ()L1org/apache/wicket/feedback/FeedbackMessages;
 getId
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -133,7 +133,7 @@ getMarkupId
  (Z)Ljava/lang/String;
 getMarkupIdFromMarkup
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getMarkupIdImpl
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
@@ -142,7 +142,7 @@ getMarkupSourcingStrategy
  ()Lorg/apache/wicket/markup/html/panel/IMarkupSourcingStrategy;
 getMarkupTag
  ()Lorg/apache/wicket/markup/ComponentTag;
- ()Lorg/apache/wicket/markup/ComponentTag;
+ ()L0org/apache/wicket/markup/ComponentTag;
 getMetaData
  <M::Ljava/io/Serializable;>(Lorg/apache/wicket/MetaDataKey<TM;>;)TM;
  <M::Ljava/io/Serializable;>(Lorg/apache/wicket/MetaDataKey<TM;>;)TM;
@@ -160,7 +160,7 @@ getParent
  ()Lorg/apache/wicket/MarkupContainer;
 getPath
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getRequest
  ()Lorg/apache/wicket/request/Request;
  ()Lorg/apache/wicket/request/Request;
@@ -187,7 +187,7 @@ getStyle
  ()Ljava/lang/String;
 getVariation
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 info
  (Ljava/io/Serializable;)V
  (Ljava/io/Serializable;)V
@@ -205,7 +205,7 @@ isBehaviorAccepted
  (Lorg/apache/wicket/behavior/Behavior;)Z
 newMarkupSourcingStrategy
  ()Lorg/apache/wicket/markup/html/panel/IMarkupSourcingStrategy;
- ()Lorg/apache/wicket/markup/html/panel/IMarkupSourcingStrategy;
+ ()L0org/apache/wicket/markup/html/panel/IMarkupSourcingStrategy;
 onComponentTag
  (Lorg/apache/wicket/markup/ComponentTag;)V
  (L1org/apache/wicket/markup/ComponentTag;)V
@@ -337,7 +337,7 @@ visitParents
  <R:Ljava/lang/Object;C:Lorg/apache/wicket/MarkupContainer;>(Ljava/lang/Class<TC;>;Lorg/apache/wicket/util/visit/IVisitor<TC;TR;>;)TR;
 visitParents
  <R:Ljava/lang/Object;C:Lorg/apache/wicket/MarkupContainer;>(Ljava/lang/Class<TC;>;Lorg/apache/wicket/util/visit/IVisitor<TC;TR;>;Lorg/apache/wicket/util/visit/IVisitFilter;)TR;
- <R:Ljava/lang/Object;C:Lorg/apache/wicket/MarkupContainer;>(Ljava/lang/Class<TC;>;Lorg/apache/wicket/util/visit/IVisitor<TC;TR;>;Lorg/apache/wicket/util/visit/IVisitFilter;)TR;
+ <R:Ljava/lang/Object;C:Lorg/apache/wicket/MarkupContainer;>(Ljava/lang/Class<TC;>;Lorg/apache/wicket/util/visit/IVisitor<TC;TR;>;Lorg/apache/wicket/util/visit/IVisitFilter;)T0R;
 warn
  (Ljava/io/Serializable;)V
  (Ljava/io/Serializable;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/DefaultExceptionMapper.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/DefaultExceptionMapper.eea
index 999b2cd466..4201b03419 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/DefaultExceptionMapper.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/DefaultExceptionMapper.eea
@@ -2,10 +2,10 @@ class org/apache/wicket/DefaultExceptionMapper
 
 createPageRequestHandler
  (Lorg/apache/wicket/core/request/handler/PageProvider;)Lorg/apache/wicket/core/request/handler/RenderPageRequestHandler;
- (Lorg/apache/wicket/core/request/handler/PageProvider;)Lorg/apache/wicket/core/request/handler/RenderPageRequestHandler;
+ (Lorg/apache/wicket/core/request/handler/PageProvider;)L1org/apache/wicket/core/request/handler/RenderPageRequestHandler;
 extractCurrentPage
  ()Lorg/apache/wicket/Page;
- ()Lorg/apache/wicket/Page;
+ ()L0org/apache/wicket/Page;
 handleNestedException
  (Ljava/lang/Exception;Ljava/lang/RuntimeException;)Lorg/apache/wicket/request/IRequestHandler;
  (Ljava/lang/Exception;Ljava/lang/RuntimeException;)Lorg/apache/wicket/request/IRequestHandler;
@@ -14,7 +14,7 @@ map
  (Ljava/lang/Exception;)Lorg/apache/wicket/request/IRequestHandler;
 mapExpectedExceptions
  (Ljava/lang/Exception;Lorg/apache/wicket/Application;)Lorg/apache/wicket/request/IRequestHandler;
- (Ljava/lang/Exception;Lorg/apache/wicket/Application;)Lorg/apache/wicket/request/IRequestHandler;
+ (Ljava/lang/Exception;Lorg/apache/wicket/Application;)L0org/apache/wicket/request/IRequestHandler;
 mapUnexpectedExceptions
  (Ljava/lang/Exception;Lorg/apache/wicket/Application;)Lorg/apache/wicket/request/IRequestHandler;
  (Ljava/lang/Exception;Lorg/apache/wicket/Application;)Lorg/apache/wicket/request/IRequestHandler;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/DefaultMapperContext.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/DefaultMapperContext.eea
index d359e02554..0d7f9c37a9 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/DefaultMapperContext.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/DefaultMapperContext.eea
@@ -5,22 +5,22 @@ class org/apache/wicket/DefaultMapperContext
  (Lorg/apache/wicket/Application;)V
 getBookmarkableIdentifier
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getHomePageClass
  ()Ljava/lang/Class<+Lorg/apache/wicket/request/component/IRequestablePage;>;
  ()Ljava/lang/Class<+Lorg/apache/wicket/request/component/IRequestablePage;>;
 getNamespace
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getPageIdentifier
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getPageInstance
  (I)Lorg/apache/wicket/request/component/IRequestablePage;
  (I)Lorg/apache/wicket/request/component/IRequestablePage;
 getResourceIdentifier
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getResourceReferenceRegistry
  ()Lorg/apache/wicket/request/resource/ResourceReferenceRegistry;
  ()Lorg/apache/wicket/request/resource/ResourceReferenceRegistry;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/DefaultMarkupIdGenerator.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/DefaultMarkupIdGenerator.eea
index 848661119b..c651935d41 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/DefaultMarkupIdGenerator.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/DefaultMarkupIdGenerator.eea
@@ -2,4 +2,4 @@ class org/apache/wicket/DefaultMarkupIdGenerator
 
 generateMarkupId
  (Lorg/apache/wicket/Component;Z)Ljava/lang/String;
- (Lorg/apache/wicket/Component;Z)Ljava/lang/String;
+ (Lorg/apache/wicket/Component;Z)L0java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/DefaultPageManagerProvider.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/DefaultPageManagerProvider.eea
index 48c6a6f86d..ae1b53cef8 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/DefaultPageManagerProvider.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/DefaultPageManagerProvider.eea
@@ -9,25 +9,25 @@ application
  (Lorg/apache/wicket/Application;)V
 get
  ()Lorg/apache/wicket/page/IPageManager;
- ()Lorg/apache/wicket/page/IPageManager;
+ ()L1org/apache/wicket/page/IPageManager;
 getSerializer
  ()Lorg/apache/wicket/serialize/ISerializer;
  ()Lorg/apache/wicket/serialize/ISerializer;
 newAsynchronousStore
  (Lorg/apache/wicket/pageStore/IPageStore;)Lorg/apache/wicket/pageStore/IPageStore;
- (Lorg/apache/wicket/pageStore/IPageStore;)Lorg/apache/wicket/pageStore/IPageStore;
+ (Lorg/apache/wicket/pageStore/IPageStore;)L1org/apache/wicket/pageStore/IPageStore;
 newCachingStore
  (Lorg/apache/wicket/pageStore/IPageStore;)Lorg/apache/wicket/pageStore/IPageStore;
- (Lorg/apache/wicket/pageStore/IPageStore;)Lorg/apache/wicket/pageStore/IPageStore;
+ (Lorg/apache/wicket/pageStore/IPageStore;)L1org/apache/wicket/pageStore/IPageStore;
 newCryptingStore
  (Lorg/apache/wicket/pageStore/IPageStore;)Lorg/apache/wicket/pageStore/IPageStore;
- (Lorg/apache/wicket/pageStore/IPageStore;)Lorg/apache/wicket/pageStore/IPageStore;
+ (Lorg/apache/wicket/pageStore/IPageStore;)L1org/apache/wicket/pageStore/IPageStore;
 newPersistentStore
  ()Lorg/apache/wicket/pageStore/IPageStore;
- ()Lorg/apache/wicket/pageStore/IPageStore;
+ ()L1org/apache/wicket/pageStore/IPageStore;
 newRequestStore
  (Lorg/apache/wicket/pageStore/IPageStore;)Lorg/apache/wicket/pageStore/IPageStore;
- (Lorg/apache/wicket/pageStore/IPageStore;)Lorg/apache/wicket/pageStore/IPageStore;
+ (Lorg/apache/wicket/pageStore/IPageStore;)L1org/apache/wicket/pageStore/IPageStore;
 newSerializingStore
  (Lorg/apache/wicket/pageStore/IPageStore;)Lorg/apache/wicket/pageStore/IPageStore;
- (Lorg/apache/wicket/pageStore/IPageStore;)Lorg/apache/wicket/pageStore/IPageStore;
+ (Lorg/apache/wicket/pageStore/IPageStore;)L1org/apache/wicket/pageStore/IPageStore;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/DequeueContext.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/DequeueContext.eea
index b3ca1dd92c..f7167724c0 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/DequeueContext.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/DequeueContext.eea
@@ -5,7 +5,7 @@ class org/apache/wicket/DequeueContext
  (Lorg/apache/wicket/markup/IMarkupFragment;Lorg/apache/wicket/MarkupContainer;Z)V
 findComponentToDequeue
  (Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
- (Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
+ (Lorg/apache/wicket/markup/ComponentTag;)L0org/apache/wicket/Component;
 peekContainer
  ()Lorg/apache/wicket/MarkupContainer;
  ()Lorg/apache/wicket/MarkupContainer;
@@ -23,7 +23,7 @@ restore
  (Lorg/apache/wicket/DequeueContext$Bookmark;)V
 save
  ()Lorg/apache/wicket/DequeueContext$Bookmark;
- ()Lorg/apache/wicket/DequeueContext$Bookmark;
+ ()L1org/apache/wicket/DequeueContext$Bookmark;
 takeTag
  ()Lorg/apache/wicket/markup/ComponentTag;
- ()Lorg/apache/wicket/markup/ComponentTag;
+ ()L0org/apache/wicket/markup/ComponentTag;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/Localizer.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/Localizer.eea
index 93f75f293a..3ced704b30 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/Localizer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/Localizer.eea
@@ -6,10 +6,10 @@ get
 
 getCacheKey
  (Ljava/lang/String;Lorg/apache/wicket/Component;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Lorg/apache/wicket/Component;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Lorg/apache/wicket/Component;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 getFromCache
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getString
  (Ljava/lang/String;Lorg/apache/wicket/Component;)Ljava/lang/String;
  (Ljava/lang/String;Lorg/apache/wicket/Component;)Ljava/lang/String;
@@ -33,13 +33,13 @@ getStringIgnoreSettings
  (Ljava/lang/String;Lorg/apache/wicket/Component;Lorg/apache/wicket/model/IModel<*>;Ljava/lang/String;)Ljava/lang/String;
 getStringIgnoreSettings
  (Ljava/lang/String;Lorg/apache/wicket/Component;Lorg/apache/wicket/model/IModel<*>;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Lorg/apache/wicket/Component;Lorg/apache/wicket/model/IModel<*>;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Lorg/apache/wicket/Component;Lorg/apache/wicket/model/IModel<*>;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)L0java/lang/String;
 getStringResourceLoaders
  ()Ljava/util/List<Lorg/apache/wicket/resource/loader/IStringResourceLoader;>;
  ()Ljava/util/List<Lorg/apache/wicket/resource/loader/IStringResourceLoader;>;
 newCache
  ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
- ()Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
+ ()L1java/util/Map<Ljava/lang/String;Ljava/lang/String;>;
 putIntoCache
  (Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/MarkupContainer.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/MarkupContainer.eea
index 981f76104d..091e84f81e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/MarkupContainer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/MarkupContainer.eea
@@ -24,7 +24,7 @@ autoAdd
  (Lorg/apache/wicket/Component;Lorg/apache/wicket/markup/MarkupStream;)Z
 canDequeueTag
  (Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/DequeueTagAction;
- (Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/DequeueTagAction;
+ (Lorg/apache/wicket/markup/ComponentTag;)L0org/apache/wicket/DequeueTagAction;
 contains
  (Lorg/apache/wicket/Component;Z)Z
  (Lorg/apache/wicket/Component;Z)Z
@@ -42,19 +42,19 @@ findComponentToDequeue
  (Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
 get
  (Ljava/lang/String;)Lorg/apache/wicket/Component;
- (Ljava/lang/String;)Lorg/apache/wicket/Component;
+ (Ljava/lang/String;)L0org/apache/wicket/Component;
 getAssociatedMarkup
  ()Lorg/apache/wicket/markup/Markup;
- ()Lorg/apache/wicket/markup/Markup;
+ ()L0org/apache/wicket/markup/Markup;
 getAssociatedMarkupStream
  (Z)Lorg/apache/wicket/markup/MarkupStream;
- (Z)Lorg/apache/wicket/markup/MarkupStream;
+ (Z)L0org/apache/wicket/markup/MarkupStream;
 getMarkup
  (Lorg/apache/wicket/Component;)Lorg/apache/wicket/markup/IMarkupFragment;
  (Lorg/apache/wicket/Component;)Lorg/apache/wicket/markup/IMarkupFragment;
 getMarkupType
  ()Lorg/apache/wicket/markup/MarkupType;
- ()Lorg/apache/wicket/markup/MarkupType;
+ ()L0org/apache/wicket/markup/MarkupType;
 getRegionMarkup
  ()Lorg/apache/wicket/markup/IMarkupFragment;
  ()Lorg/apache/wicket/markup/IMarkupFragment;
@@ -63,13 +63,13 @@ internalAdd
  (Lorg/apache/wicket/Component;)V
 iterator
  ()Ljava/util/Iterator<Lorg/apache/wicket/Component;>;
- ()Ljava/util/Iterator<Lorg/apache/wicket/Component;>;
+ ()L1java/util/Iterator<Lorg/apache/wicket/Component;>;
 iterator
  (Ljava/util/Comparator<Lorg/apache/wicket/Component;>;)Ljava/util/Iterator<Lorg/apache/wicket/Component;>;
  (Ljava/util/Comparator<Lorg/apache/wicket/Component;>;)Ljava/util/Iterator<Lorg/apache/wicket/Component;>;
 newDequeueContext
  ()Lorg/apache/wicket/DequeueContext;
- ()Lorg/apache/wicket/DequeueContext;
+ ()L0org/apache/wicket/DequeueContext;
 onComponentTagBody
  (Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)V
  (Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)V
@@ -111,7 +111,7 @@ toString
  ()L1java/lang/String; # @Inherited(org.apache.wicket.Component)
 toString
  (Z)Ljava/lang/String;
- (Z)Ljava/lang/String;
+ (Z)L1java/lang/String;
 visitChildren
  <R:Ljava/lang/Object;>(Lorg/apache/wicket/util/visit/IVisitor<Lorg/apache/wicket/Component;TR;>;)TR;
  <R:Ljava/lang/Object;>(Lorg/apache/wicket/util/visit/IVisitor<Lorg/apache/wicket/Component;TR;>;)TR;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/MetaDataKey.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/MetaDataKey.eea
index 1d9bbd5af1..aa8095d7e8 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/MetaDataKey.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/MetaDataKey.eea
@@ -7,10 +7,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 get
  ([Lorg/apache/wicket/MetaDataEntry<*>;)TT;
- ([Lorg/apache/wicket/MetaDataEntry<*>;)TT;
+ ([Lorg/apache/wicket/MetaDataEntry<*>;)T0T;
 set
  ([Lorg/apache/wicket/MetaDataEntry<*>;Ljava/lang/Object;)[Lorg/apache/wicket/MetaDataEntry<*>;
- ([Lorg/apache/wicket/MetaDataEntry<*>;Ljava/lang/Object;)[Lorg/apache/wicket/MetaDataEntry<*>;
+ ([Lorg/apache/wicket/MetaDataEntry<*>;Ljava/lang/Object;)[1Lorg/apache/wicket/MetaDataEntry<*>;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/Page.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/Page.eea
index 66c463f102..9a76e099aa 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/Page.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/Page.eea
@@ -17,7 +17,7 @@ getId
  ()Ljava/lang/String;
 getMarkupType
  ()Lorg/apache/wicket/markup/MarkupType;
- ()Lorg/apache/wicket/markup/MarkupType;
+ ()L1org/apache/wicket/markup/MarkupType; # @Overrides(org.apache.wicket.MarkupContainer)
 getPageClass
  ()Ljava/lang/Class<+Lorg/apache/wicket/Page;>;
  ()Ljava/lang/Class<+Lorg/apache/wicket/Page;>;
@@ -26,10 +26,10 @@ getPageParameters
  ()Lorg/apache/wicket/request/mapper/parameter/PageParameters;
 getPageReference
  ()Lorg/apache/wicket/PageReference;
- ()Lorg/apache/wicket/PageReference;
+ ()L1org/apache/wicket/PageReference;
 hierarchyAsString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 setStatelessHint
  (Z)Lorg/apache/wicket/Page;
  (Z)Lorg/apache/wicket/Page;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ResourceBundles.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ResourceBundles.eea
index 12563ffa5b..df64c8e6fa 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ResourceBundles.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ResourceBundles.eea
@@ -20,4 +20,4 @@ findBundle
  (Lorg/apache/wicket/markup/head/HeaderItem;)Lorg/apache/wicket/markup/head/HeaderItem;
 newBundleResourceReference
  <T:Lorg/apache/wicket/markup/head/HeaderItem;:Lorg/apache/wicket/markup/head/IReferenceHeaderItem;>(Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/List<TT;>;)Lorg/apache/wicket/resource/bundles/ConcatResourceBundleReference<TT;>;
- <T:Lorg/apache/wicket/markup/head/HeaderItem;:Lorg/apache/wicket/markup/head/IReferenceHeaderItem;>(Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/List<TT;>;)Lorg/apache/wicket/resource/bundles/ConcatResourceBundleReference<TT;>;
+ <T:Lorg/apache/wicket/markup/head/HeaderItem;:Lorg/apache/wicket/markup/head/IReferenceHeaderItem;>(Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/List<TT;>;)L1org/apache/wicket/resource/bundles/ConcatResourceBundleReference<TT;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/Session.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/Session.eea
index 6115b7d2eb..03e1384f0b 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/Session.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/Session.eea
@@ -39,7 +39,7 @@ getApplication
  ()Lorg/apache/wicket/Application;
 getAttribute
  (Ljava/lang/String;)Ljava/io/Serializable;
- (Ljava/lang/String;)Ljava/io/Serializable;
+ (Ljava/lang/String;)L0java/io/Serializable;
 getAttributeNames
  ()Ljava/util/List<Ljava/lang/String;>;
  ()Ljava/util/List<Ljava/lang/String;>;
@@ -81,7 +81,7 @@ info
  (Ljava/io/Serializable;)V
 newPageAccessSynchronizer
  (Ljava/time/Duration;)Lorg/apache/wicket/page/PageAccessSynchronizer;
- (Ljava/time/Duration;)Lorg/apache/wicket/page/PageAccessSynchronizer;
+ (Ljava/time/Duration;)L1org/apache/wicket/page/PageAccessSynchronizer;
 onEvent
  (Lorg/apache/wicket/event/IEvent<*>;)V
  (L1org/apache/wicket/event/IEvent<*>;)V # @Inherited(org.apache.wicket.event.IEventSink)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/SystemMapper.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/SystemMapper.eea
index 76e9f821ab..2fa751a467 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/SystemMapper.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/SystemMapper.eea
@@ -8,16 +8,16 @@ getResourceCachingStrategy
  ()Ljava/util/function/Supplier<Lorg/apache/wicket/request/resource/caching/IResourceCachingStrategy;>;
 newBookmarkableMapper
  ()Lorg/apache/wicket/request/IRequestMapper;
- ()Lorg/apache/wicket/request/IRequestMapper;
+ ()L1org/apache/wicket/request/IRequestMapper;
 newBufferedResponseMapper
  ()Lorg/apache/wicket/request/IRequestMapper;
- ()Lorg/apache/wicket/request/IRequestMapper;
+ ()L1org/apache/wicket/request/IRequestMapper;
 newHomePageMapper
  (Ljava/util/function/Supplier<Ljava/lang/Class<+Lorg/apache/wicket/request/component/IRequestablePage;>;>;)Lorg/apache/wicket/request/IRequestMapper;
- (Ljava/util/function/Supplier<Ljava/lang/Class<+Lorg/apache/wicket/request/component/IRequestablePage;>;>;)Lorg/apache/wicket/request/IRequestMapper;
+ (Ljava/util/function/Supplier<Ljava/lang/Class<+Lorg/apache/wicket/request/component/IRequestablePage;>;>;)L1org/apache/wicket/request/IRequestMapper;
 newPageInstanceMapper
  ()Lorg/apache/wicket/request/IRequestMapper;
- ()Lorg/apache/wicket/request/IRequestMapper;
+ ()L1org/apache/wicket/request/IRequestMapper;
 newUrlResourceReferenceMapper
  ()Lorg/apache/wicket/request/IRequestMapper;
- ()Lorg/apache/wicket/request/IRequestMapper;
+ ()L1org/apache/wicket/request/IRequestMapper;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ThreadContext.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ThreadContext.eea
index bb976967ba..4b56760f01 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ThreadContext.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ThreadContext.eea
@@ -5,16 +5,16 @@ detach
  ()Lorg/apache/wicket/ThreadContext;
 get
  (Z)Lorg/apache/wicket/ThreadContext;
- (Z)Lorg/apache/wicket/ThreadContext;
+ (Z)L1org/apache/wicket/ThreadContext;
 getApplication
  ()Lorg/apache/wicket/Application;
- ()Lorg/apache/wicket/Application;
+ ()L0org/apache/wicket/Application;
 getRequestCycle
  ()Lorg/apache/wicket/request/cycle/RequestCycle;
- ()Lorg/apache/wicket/request/cycle/RequestCycle;
+ ()L0org/apache/wicket/request/cycle/RequestCycle;
 getSession
  ()Lorg/apache/wicket/Session;
- ()Lorg/apache/wicket/Session;
+ ()L0org/apache/wicket/Session;
 restore
  (Lorg/apache/wicket/ThreadContext;)V
  (Lorg/apache/wicket/ThreadContext;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.eea
index cc18eead8f..8292b83fbd 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.eea
@@ -2,14 +2,14 @@ class org/apache/wicket/ajax/AbstractAjaxTimerBehavior
 
 onTimer
  (Ljava/time/Duration;Lorg/danekja/java/util/function/serializable/SerializableConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)Lorg/apache/wicket/ajax/AbstractAjaxTimerBehavior;
- (Ljava/time/Duration;Lorg/danekja/java/util/function/serializable/SerializableConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)Lorg/apache/wicket/ajax/AbstractAjaxTimerBehavior;
+ (Ljava/time/Duration;Lorg/danekja/java/util/function/serializable/SerializableConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)L1org/apache/wicket/ajax/AbstractAjaxTimerBehavior;
 
 <init>
  (Ljava/time/Duration;)V
  (Ljava/time/Duration;)V
 getTimerId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getUpdateInterval
  ()Ljava/time/Duration;
  ()Ljava/time/Duration;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.eea
index 98a2c118e1..5c2d05a027 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.eea
@@ -6,22 +6,22 @@ INDICATOR
 
 findIndicatorId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getAttributes
  ()Lorg/apache/wicket/ajax/attributes/AjaxRequestAttributes;
- ()Lorg/apache/wicket/ajax/attributes/AjaxRequestAttributes;
+ ()L1org/apache/wicket/ajax/attributes/AjaxRequestAttributes;
 getCallbackFunction
  ([Lorg/apache/wicket/ajax/attributes/CallbackParameter;)Ljava/lang/CharSequence;
- ([Lorg/apache/wicket/ajax/attributes/CallbackParameter;)Ljava/lang/CharSequence;
+ ([Lorg/apache/wicket/ajax/attributes/CallbackParameter;)L1java/lang/CharSequence;
 getCallbackFunctionBody
  ([Lorg/apache/wicket/ajax/attributes/CallbackParameter;)Ljava/lang/CharSequence;
- ([Lorg/apache/wicket/ajax/attributes/CallbackParameter;)Ljava/lang/CharSequence;
+ ([Lorg/apache/wicket/ajax/attributes/CallbackParameter;)L1java/lang/CharSequence;
 getCallbackScript
  ()Ljava/lang/CharSequence;
  ()Ljava/lang/CharSequence;
 getCallbackScript
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/Component;)L1java/lang/CharSequence;
 onMethodMismatch
  ()Lorg/apache/wicket/markup/html/form/Form$MethodMismatchResponse;
  ()Lorg/apache/wicket/markup/html/form/Form$MethodMismatchResponse;
@@ -33,7 +33,7 @@ renderAjaxAttributes
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
 renderAjaxAttributes
  (Lorg/apache/wicket/Component;Lorg/apache/wicket/ajax/attributes/AjaxRequestAttributes;)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/Component;Lorg/apache/wicket/ajax/attributes/AjaxRequestAttributes;)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/Component;Lorg/apache/wicket/ajax/attributes/AjaxRequestAttributes;)L1java/lang/CharSequence;
 renderHead
  (Lorg/apache/wicket/Component;Lorg/apache/wicket/markup/head/IHeaderResponse;)V
  (Lorg/apache/wicket/Component;Lorg/apache/wicket/markup/head/IHeaderResponse;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AjaxClientInfoBehavior.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AjaxClientInfoBehavior.eea
index 383c1294b0..e77d054934 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AjaxClientInfoBehavior.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AjaxClientInfoBehavior.eea
@@ -2,14 +2,14 @@ class org/apache/wicket/ajax/AjaxClientInfoBehavior
 
 onClientInfo
  (Lorg/danekja/java/util/function/serializable/SerializableBiConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;Lorg/apache/wicket/protocol/http/request/WebClientInfo;>;)Lorg/apache/wicket/ajax/AjaxClientInfoBehavior;
- (Lorg/danekja/java/util/function/serializable/SerializableBiConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;Lorg/apache/wicket/protocol/http/request/WebClientInfo;>;)Lorg/apache/wicket/ajax/AjaxClientInfoBehavior;
+ (Lorg/danekja/java/util/function/serializable/SerializableBiConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;Lorg/apache/wicket/protocol/http/request/WebClientInfo;>;)L1org/apache/wicket/ajax/AjaxClientInfoBehavior;
 
 <init>
  (Ljava/time/Duration;)V
  (Ljava/time/Duration;)V
 newWebClientInfo
  (Lorg/apache/wicket/request/cycle/RequestCycle;)Lorg/apache/wicket/protocol/http/request/WebClientInfo;
- (Lorg/apache/wicket/request/cycle/RequestCycle;)Lorg/apache/wicket/protocol/http/request/WebClientInfo;
+ (Lorg/apache/wicket/request/cycle/RequestCycle;)L1org/apache/wicket/protocol/http/request/WebClientInfo;
 onClientInfo
  (Lorg/apache/wicket/ajax/AjaxRequestTarget;Lorg/apache/wicket/protocol/http/request/WebClientInfo;)V
  (Lorg/apache/wicket/ajax/AjaxRequestTarget;Lorg/apache/wicket/protocol/http/request/WebClientInfo;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AjaxEventBehavior.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AjaxEventBehavior.eea
index 9a5c361544..55c5906557 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AjaxEventBehavior.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AjaxEventBehavior.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/ajax/AjaxEventBehavior
 
 onEvent
  (Ljava/lang/String;Lorg/danekja/java/util/function/serializable/SerializableConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)Lorg/apache/wicket/ajax/AjaxEventBehavior;
- (Ljava/lang/String;Lorg/danekja/java/util/function/serializable/SerializableConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)Lorg/apache/wicket/ajax/AjaxEventBehavior;
+ (Ljava/lang/String;Lorg/danekja/java/util/function/serializable/SerializableConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)L1org/apache/wicket/ajax/AjaxEventBehavior;
 
 <init>
  (Ljava/lang/String;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AjaxNewWindowNotifyingBehavior.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AjaxNewWindowNotifyingBehavior.eea
index a4971aa691..5cc9c0d404 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AjaxNewWindowNotifyingBehavior.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AjaxNewWindowNotifyingBehavior.eea
@@ -2,14 +2,14 @@ class org/apache/wicket/ajax/AjaxNewWindowNotifyingBehavior
 
 onNewWindow
  (Lorg/danekja/java/util/function/serializable/SerializableConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)Lorg/apache/wicket/ajax/AjaxNewWindowNotifyingBehavior;
- (Lorg/danekja/java/util/function/serializable/SerializableConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)Lorg/apache/wicket/ajax/AjaxNewWindowNotifyingBehavior;
+ (Lorg/danekja/java/util/function/serializable/SerializableConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)L1org/apache/wicket/ajax/AjaxNewWindowNotifyingBehavior;
 
 getWindowName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 newWindowName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 onNewWindow
  (Lorg/apache/wicket/ajax/AjaxRequestTarget;)V
  (Lorg/apache/wicket/ajax/AjaxRequestTarget;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AjaxOnDomReadyClientInfoBehavior.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AjaxOnDomReadyClientInfoBehavior.eea
index 2ed70a7a15..2d6453fb35 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AjaxOnDomReadyClientInfoBehavior.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AjaxOnDomReadyClientInfoBehavior.eea
@@ -2,11 +2,11 @@ class org/apache/wicket/ajax/AjaxOnDomReadyClientInfoBehavior
 
 onClientInfo
  (Lorg/danekja/java/util/function/serializable/SerializableBiConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;Lorg/apache/wicket/protocol/http/request/WebClientInfo;>;)Lorg/apache/wicket/ajax/AjaxOnDomReadyClientInfoBehavior;
- (Lorg/danekja/java/util/function/serializable/SerializableBiConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;Lorg/apache/wicket/protocol/http/request/WebClientInfo;>;)Lorg/apache/wicket/ajax/AjaxOnDomReadyClientInfoBehavior;
+ (Lorg/danekja/java/util/function/serializable/SerializableBiConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;Lorg/apache/wicket/protocol/http/request/WebClientInfo;>;)L1org/apache/wicket/ajax/AjaxOnDomReadyClientInfoBehavior;
 
 newWebClientInfo
  (Lorg/apache/wicket/request/cycle/RequestCycle;)Lorg/apache/wicket/protocol/http/request/WebClientInfo;
- (Lorg/apache/wicket/request/cycle/RequestCycle;)Lorg/apache/wicket/protocol/http/request/WebClientInfo;
+ (Lorg/apache/wicket/request/cycle/RequestCycle;)L1org/apache/wicket/protocol/http/request/WebClientInfo;
 onClientInfo
  (Lorg/apache/wicket/ajax/AjaxRequestTarget;Lorg/apache/wicket/protocol/http/request/WebClientInfo;)V
  (Lorg/apache/wicket/ajax/AjaxRequestTarget;Lorg/apache/wicket/protocol/http/request/WebClientInfo;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AjaxSelfUpdatingTimerBehavior.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AjaxSelfUpdatingTimerBehavior.eea
index 4cf09eca73..fe14d5bc64 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AjaxSelfUpdatingTimerBehavior.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/AjaxSelfUpdatingTimerBehavior.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/ajax/AjaxSelfUpdatingTimerBehavior
 
 onSelfUpdate
  (Ljava/time/Duration;Lorg/danekja/java/util/function/serializable/SerializableConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)Lorg/apache/wicket/ajax/AjaxSelfUpdatingTimerBehavior;
- (Ljava/time/Duration;Lorg/danekja/java/util/function/serializable/SerializableConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)Lorg/apache/wicket/ajax/AjaxSelfUpdatingTimerBehavior;
+ (Ljava/time/Duration;Lorg/danekja/java/util/function/serializable/SerializableConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)L1org/apache/wicket/ajax/AjaxSelfUpdatingTimerBehavior;
 
 <init>
  (Ljava/time/Duration;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/CancelEventIfAjaxListener.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/CancelEventIfAjaxListener.eea
index 51a08a4f21..feeaf4426e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/CancelEventIfAjaxListener.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/CancelEventIfAjaxListener.eea
@@ -2,4 +2,4 @@ class org/apache/wicket/ajax/CancelEventIfAjaxListener
 
 getBeforeHandler
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/Component;)L1java/lang/CharSequence; # @Overrides(org.apache.wicket.ajax.attributes.AjaxCallListener)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/WicketAjaxJQueryResourceReference.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/WicketAjaxJQueryResourceReference.eea
index c47a9c9544..97281d9331 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/WicketAjaxJQueryResourceReference.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/WicketAjaxJQueryResourceReference.eea
@@ -6,4 +6,4 @@ get
 
 getDependencies
  ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
- ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
+ ()L1java/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>; # @Inherited(org.apache.wicket.request.resource.ResourceReference)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/attributes/AjaxCallListener.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/attributes/AjaxCallListener.eea
index 17c94fa02b..41d06d0d3e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/attributes/AjaxCallListener.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/attributes/AjaxCallListener.eea
@@ -2,31 +2,31 @@ class org/apache/wicket/ajax/attributes/AjaxCallListener
 
 getAfterHandler
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/Component;)L0java/lang/CharSequence; # @Inherited(org.apache.wicket.ajax.attributes.IAjaxCallListener)
 getBeforeHandler
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/Component;)L0java/lang/CharSequence; # @Inherited(org.apache.wicket.ajax.attributes.IAjaxCallListener)
 getBeforeSendHandler
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/Component;)L0java/lang/CharSequence; # @Inherited(org.apache.wicket.ajax.attributes.IAjaxCallListener)
 getCompleteHandler
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/Component;)L0java/lang/CharSequence; # @Inherited(org.apache.wicket.ajax.attributes.IAjaxCallListener)
 getDoneHandler
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/Component;)L0java/lang/CharSequence; # @Inherited(org.apache.wicket.ajax.attributes.IAjaxCallListener)
 getFailureHandler
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/Component;)L0java/lang/CharSequence; # @Inherited(org.apache.wicket.ajax.attributes.IAjaxCallListener)
 getInitHandler
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/Component;)L0java/lang/CharSequence; # @Inherited(org.apache.wicket.ajax.attributes.IAjaxCallListener)
 getPrecondition
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/Component;)L0java/lang/CharSequence; # @Inherited(org.apache.wicket.ajax.attributes.IAjaxCallListener)
 getSuccessHandler
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/Component;)L0java/lang/CharSequence; # @Inherited(org.apache.wicket.ajax.attributes.IAjaxCallListener)
 onAfter
  (Ljava/lang/CharSequence;)Lorg/apache/wicket/ajax/attributes/AjaxCallListener;
  (Ljava/lang/CharSequence;)Lorg/apache/wicket/ajax/attributes/AjaxCallListener;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/attributes/CallbackParameter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/attributes/CallbackParameter.eea
index a82e8f0b5a..69c313d56f 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/attributes/CallbackParameter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/attributes/CallbackParameter.eea
@@ -2,16 +2,16 @@ class org/apache/wicket/ajax/attributes/CallbackParameter
 
 context
  (Ljava/lang/String;)Lorg/apache/wicket/ajax/attributes/CallbackParameter;
- (Ljava/lang/String;)Lorg/apache/wicket/ajax/attributes/CallbackParameter;
+ (Ljava/lang/String;)L1org/apache/wicket/ajax/attributes/CallbackParameter;
 converted
  (Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/ajax/attributes/CallbackParameter;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/ajax/attributes/CallbackParameter;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/apache/wicket/ajax/attributes/CallbackParameter;
 explicit
  (Ljava/lang/String;)Lorg/apache/wicket/ajax/attributes/CallbackParameter;
- (Ljava/lang/String;)Lorg/apache/wicket/ajax/attributes/CallbackParameter;
+ (Ljava/lang/String;)L1org/apache/wicket/ajax/attributes/CallbackParameter;
 resolved
  (Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/ajax/attributes/CallbackParameter;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/ajax/attributes/CallbackParameter;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/apache/wicket/ajax/attributes/CallbackParameter;
 
 getAjaxParameterCode
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/attributes/IAjaxCallListener.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/attributes/IAjaxCallListener.eea
index f8a78e042a..18e284feec 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/attributes/IAjaxCallListener.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/attributes/IAjaxCallListener.eea
@@ -2,28 +2,28 @@ class org/apache/wicket/ajax/attributes/IAjaxCallListener
 
 getAfterHandler
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/Component;)L0java/lang/CharSequence;
 getBeforeHandler
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/Component;)L0java/lang/CharSequence;
 getBeforeSendHandler
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/Component;)L0java/lang/CharSequence;
 getCompleteHandler
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/Component;)L0java/lang/CharSequence;
 getDoneHandler
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/Component;)L0java/lang/CharSequence;
 getFailureHandler
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/Component;)L0java/lang/CharSequence;
 getInitHandler
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/Component;)L0java/lang/CharSequence;
 getPrecondition
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/Component;)L0java/lang/CharSequence;
 getSuccessHandler
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/Component;)L0java/lang/CharSequence;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.eea
index daf56ce816..1d4fa14137 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior
 
 onUpdateChoice
  (Lorg/danekja/java/util/function/serializable/SerializableConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)Lorg/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior;
- (Lorg/danekja/java/util/function/serializable/SerializableConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)Lorg/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior;
+ (Lorg/danekja/java/util/function/serializable/SerializableConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)L1org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior;
 
 checkComponent
  (Lorg/apache/wicket/markup/html/form/FormComponent<*>;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.eea
index 8174bf3c9d..a3dab96dba 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior
 
 onUpdate
  (Ljava/lang/String;Lorg/danekja/java/util/function/serializable/SerializableConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)Lorg/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior;
- (Ljava/lang/String;Lorg/danekja/java/util/function/serializable/SerializableConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)Lorg/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior;
+ (Ljava/lang/String;Lorg/danekja/java/util/function/serializable/SerializableConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)L1org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior;
 
 <init>
  (Ljava/lang/String;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.eea
index 5fc0f85552..36dfcdba15 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/ajax/form/AjaxFormSubmitBehavior
 
 onSubmit
  (Ljava/lang/String;Lorg/danekja/java/util/function/serializable/SerializableConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)Lorg/apache/wicket/ajax/form/AjaxFormSubmitBehavior;
- (Ljava/lang/String;Lorg/danekja/java/util/function/serializable/SerializableConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)Lorg/apache/wicket/ajax/form/AjaxFormSubmitBehavior;
+ (Ljava/lang/String;Lorg/danekja/java/util/function/serializable/SerializableConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)L1org/apache/wicket/ajax/form/AjaxFormSubmitBehavior;
 
 <init>
  (Ljava/lang/String;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/form/OnChangeAjaxBehavior.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/form/OnChangeAjaxBehavior.eea
index 1587dbdd63..dabc51d8ac 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/form/OnChangeAjaxBehavior.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/form/OnChangeAjaxBehavior.eea
@@ -9,7 +9,7 @@ EVENT_NAME
 
 onChange
  (Lorg/danekja/java/util/function/serializable/SerializableConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)Lorg/apache/wicket/ajax/form/OnChangeAjaxBehavior;
- (Lorg/danekja/java/util/function/serializable/SerializableConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)Lorg/apache/wicket/ajax/form/OnChangeAjaxBehavior;
+ (Lorg/danekja/java/util/function/serializable/SerializableConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)L1org/apache/wicket/ajax/form/OnChangeAjaxBehavior;
 
 updateAjaxAttributes
  (Lorg/apache/wicket/ajax/attributes/AjaxRequestAttributes;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/json/JSONFunction.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/json/JSONFunction.eea
index 7f674fcc97..5be4590e48 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/json/JSONFunction.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/json/JSONFunction.eea
@@ -8,7 +8,7 @@ subSequence
  (II)L1java/lang/CharSequence; # @Inherited(java.lang.CharSequence)
 toJSONString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/json/JsonUtils.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/json/JsonUtils.eea
index 1df6deaad8..0b48284d0a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/json/JsonUtils.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/json/JsonUtils.eea
@@ -2,4 +2,4 @@ class org/apache/wicket/ajax/json/JsonUtils
 
 asArray
  (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lcom/github/openjson/JSONArray;
- (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)Lcom/github/openjson/JSONArray;
+ (Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)L1com/github/openjson/JSONArray;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.eea
index a7ddc5d0c6..39ac4179c4 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.eea
@@ -14,7 +14,7 @@ super org/apache/wicket/markup/html/link/Link
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)V
 newAjaxEventBehavior
  (Ljava/lang/String;)Lorg/apache/wicket/ajax/AjaxEventBehavior;
- (Ljava/lang/String;)Lorg/apache/wicket/ajax/AjaxEventBehavior;
+ (Ljava/lang/String;)L1org/apache/wicket/ajax/AjaxEventBehavior;
 onClick
  (Ljava/util/Optional<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)V
  (Ljava/util/Optional<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/AjaxLink.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/AjaxLink.eea
index a5477a759f..b6890642cb 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/AjaxLink.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/AjaxLink.eea
@@ -14,7 +14,7 @@ super org/apache/wicket/IGenericComponent
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)V
 newAjaxEventBehavior
  (Ljava/lang/String;)Lorg/apache/wicket/ajax/AjaxEventBehavior;
- (Ljava/lang/String;)Lorg/apache/wicket/ajax/AjaxEventBehavior;
+ (Ljava/lang/String;)L1org/apache/wicket/ajax/AjaxEventBehavior;
 onClick
  (Lorg/apache/wicket/ajax/AjaxRequestTarget;)V
  (Lorg/apache/wicket/ajax/AjaxRequestTarget;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/form/AjaxButton.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/form/AjaxButton.eea
index 67c861c1b6..33aed461af 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/form/AjaxButton.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/form/AjaxButton.eea
@@ -17,7 +17,7 @@ getForm
  ()Lorg/apache/wicket/markup/html/form/Form<*>;
 newAjaxFormSubmitBehavior
  (Ljava/lang/String;)Lorg/apache/wicket/ajax/form/AjaxFormSubmitBehavior;
- (Ljava/lang/String;)Lorg/apache/wicket/ajax/form/AjaxFormSubmitBehavior;
+ (Ljava/lang/String;)L1org/apache/wicket/ajax/form/AjaxFormSubmitBehavior;
 onAfterSubmit
  (Lorg/apache/wicket/ajax/AjaxRequestTarget;)V
  (Lorg/apache/wicket/ajax/AjaxRequestTarget;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.eea
index 27576e1d69..e0b0b6f2ab 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.eea
@@ -11,7 +11,7 @@ getForm
  ()Lorg/apache/wicket/markup/html/form/Form<*>;
 newAjaxEventBehavior
  (Lorg/apache/wicket/markup/html/form/Form<*>;Ljava/lang/String;)Lorg/apache/wicket/ajax/form/AjaxFormSubmitBehavior;
- (Lorg/apache/wicket/markup/html/form/Form<*>;Ljava/lang/String;)Lorg/apache/wicket/ajax/form/AjaxFormSubmitBehavior;
+ (Lorg/apache/wicket/markup/html/form/Form<*>;Ljava/lang/String;)L1org/apache/wicket/ajax/form/AjaxFormSubmitBehavior;
 onAfterSubmit
  (Ljava/util/Optional<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)V
  (Ljava/util/Optional<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.eea
index 1e0bf6602f..9359bb60d1 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.eea
@@ -8,7 +8,7 @@ class org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink
  (Ljava/lang/String;Lorg/apache/wicket/markup/html/form/Form<*>;)V
 newAjaxFormSubmitBehavior
  (Ljava/lang/String;)Lorg/apache/wicket/ajax/form/AjaxFormSubmitBehavior;
- (Ljava/lang/String;)Lorg/apache/wicket/ajax/form/AjaxFormSubmitBehavior;
+ (Ljava/lang/String;)L1org/apache/wicket/ajax/form/AjaxFormSubmitBehavior;
 onAfterSubmit
  (Lorg/apache/wicket/ajax/AjaxRequestTarget;)V
  (Lorg/apache/wicket/ajax/AjaxRequestTarget;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigation.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigation.eea
index 161d4b7de5..b3f79a7643 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigation.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigation.eea
@@ -8,4 +8,4 @@ class org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigation
  (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;Lorg/apache/wicket/markup/html/navigation/paging/IPagingLabelProvider;)V
 newPagingNavigationLink
  (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;J)Lorg/apache/wicket/markup/html/link/Link<*>;
- (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;J)Lorg/apache/wicket/markup/html/link/Link<*>;
+ (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;J)L1org/apache/wicket/markup/html/link/Link<*>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationIncrementLink.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationIncrementLink.eea
index d4b850fd9c..9582a39b15 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationIncrementLink.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationIncrementLink.eea
@@ -9,7 +9,7 @@ super org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementL
  (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;I)V
 newAjaxPagingNavigationBehavior
  (Lorg/apache/wicket/markup/html/navigation/paging/IPageable;Ljava/lang/String;)Lorg/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationBehavior;
- (Lorg/apache/wicket/markup/html/navigation/paging/IPageable;Ljava/lang/String;)Lorg/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationBehavior;
+ (Lorg/apache/wicket/markup/html/navigation/paging/IPageable;Ljava/lang/String;)L1org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationBehavior;
 onClick
  (Lorg/apache/wicket/ajax/AjaxRequestTarget;)V
  (Lorg/apache/wicket/ajax/AjaxRequestTarget;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationLink.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationLink.eea
index 9d1f655aab..072413bf99 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationLink.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationLink.eea
@@ -9,7 +9,7 @@ super org/apache/wicket/markup/html/navigation/paging/PagingNavigationLink
  (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;J)V
 newAjaxPagingNavigationBehavior
  (Lorg/apache/wicket/markup/html/navigation/paging/IPageable;Ljava/lang/String;)Lorg/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationBehavior;
- (Lorg/apache/wicket/markup/html/navigation/paging/IPageable;Ljava/lang/String;)Lorg/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationBehavior;
+ (Lorg/apache/wicket/markup/html/navigation/paging/IPageable;Ljava/lang/String;)L1org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationBehavior;
 onClick
  (Lorg/apache/wicket/ajax/AjaxRequestTarget;)V
  (Lorg/apache/wicket/ajax/AjaxRequestTarget;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.eea
index fd58e49f2a..fbbbca172d 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.eea
@@ -8,10 +8,10 @@ class org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator
  (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;Lorg/apache/wicket/markup/html/navigation/paging/IPagingLabelProvider;)V
 newNavigation
  (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;Lorg/apache/wicket/markup/html/navigation/paging/IPagingLabelProvider;)Lorg/apache/wicket/markup/html/navigation/paging/PagingNavigation;
- (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;Lorg/apache/wicket/markup/html/navigation/paging/IPagingLabelProvider;)Lorg/apache/wicket/markup/html/navigation/paging/PagingNavigation;
+ (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;Lorg/apache/wicket/markup/html/navigation/paging/IPagingLabelProvider;)L1org/apache/wicket/markup/html/navigation/paging/PagingNavigation; # @Inherited(org.apache.wicket.markup.html.navigation.paging.PagingNavigator)
 newPagingNavigationIncrementLink
  (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;I)Lorg/apache/wicket/markup/html/link/AbstractLink;
- (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;I)Lorg/apache/wicket/markup/html/link/AbstractLink;
+ (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;I)L1org/apache/wicket/markup/html/link/AbstractLink; # @Inherited(org.apache.wicket.markup.html.navigation.paging.PagingNavigator)
 newPagingNavigationLink
  (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;I)Lorg/apache/wicket/markup/html/link/AbstractLink;
  (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;I)Lorg/apache/wicket/markup/html/link/AbstractLink;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/application/WildcardMatcherHelper.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/application/WildcardMatcherHelper.eea
index 8b5ee9db6d..440e115d0b 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/application/WildcardMatcherHelper.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/application/WildcardMatcherHelper.eea
@@ -2,4 +2,4 @@ class org/apache/wicket/application/WildcardMatcherHelper
 
 match
  (Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
+ (Ljava/lang/String;Ljava/lang/String;)L0java/util/Map<Ljava/lang/String;Ljava/lang/String;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/authentication/strategy/DefaultAuthenticationStrategy.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/authentication/strategy/DefaultAuthenticationStrategy.eea
index be352c516e..b712380672 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/authentication/strategy/DefaultAuthenticationStrategy.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/authentication/strategy/DefaultAuthenticationStrategy.eea
@@ -12,10 +12,10 @@ cookieKey
  (Ljava/lang/String;Lorg/apache/wicket/util/crypt/ICrypt;)V
 decode
  (Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/String;)[0Ljava/lang/String;
 encode
  (Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;[Ljava/lang/String;)L1java/lang/String;
 getCookieUtils
  ()Lorg/apache/wicket/util/cookies/CookieUtils;
  ()Lorg/apache/wicket/util/cookies/CookieUtils;
@@ -24,7 +24,7 @@ getCrypt
  ()Lorg/apache/wicket/util/crypt/ICrypt;
 load
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String;
 save
  (Ljava/lang/String;[Ljava/lang/String;)V
  (Ljava/lang/String;[Ljava/lang/String;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/authentication/strategy/NoOpAuthenticationStrategy.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/authentication/strategy/NoOpAuthenticationStrategy.eea
index 0f88a2af05..ff70df66f0 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/authentication/strategy/NoOpAuthenticationStrategy.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/authentication/strategy/NoOpAuthenticationStrategy.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/authentication/strategy/NoOpAuthenticationStrategy
 
 load
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String;
 save
  (Ljava/lang/String;[Ljava/lang/String;)V
  (Ljava/lang/String;[Ljava/lang/String;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/behavior/Behavior.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/behavior/Behavior.eea
index 6ba7f2192c..18f6c55b81 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/behavior/Behavior.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/behavior/Behavior.eea
@@ -2,10 +2,10 @@ class org/apache/wicket/behavior/Behavior
 
 onAttribute
  (Ljava/lang/String;Lorg/danekja/java/util/function/serializable/SerializableFunction<Ljava/lang/String;Ljava/lang/CharSequence;>;)Lorg/apache/wicket/behavior/Behavior;
- (Ljava/lang/String;Lorg/danekja/java/util/function/serializable/SerializableFunction<Ljava/lang/String;Ljava/lang/CharSequence;>;)Lorg/apache/wicket/behavior/Behavior;
+ (Ljava/lang/String;Lorg/danekja/java/util/function/serializable/SerializableFunction<Ljava/lang/String;Ljava/lang/CharSequence;>;)L1org/apache/wicket/behavior/Behavior;
 onTag
  (Lorg/danekja/java/util/function/serializable/SerializableBiConsumer<Lorg/apache/wicket/Component;Lorg/apache/wicket/markup/ComponentTag;>;)Lorg/apache/wicket/behavior/Behavior;
- (Lorg/danekja/java/util/function/serializable/SerializableBiConsumer<Lorg/apache/wicket/Component;Lorg/apache/wicket/markup/ComponentTag;>;)Lorg/apache/wicket/behavior/Behavior;
+ (Lorg/danekja/java/util/function/serializable/SerializableBiConsumer<Lorg/apache/wicket/Component;Lorg/apache/wicket/markup/ComponentTag;>;)L1org/apache/wicket/behavior/Behavior;
 
 afterRender
  (Lorg/apache/wicket/Component;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/random/ISecureRandomSupplier.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/random/ISecureRandomSupplier.eea
index a924928d57..8476b0284c 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/random/ISecureRandomSupplier.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/random/ISecureRandomSupplier.eea
@@ -8,4 +8,4 @@ getRandomBase64
  (I)Ljava/lang/String;
 getRandomBytes
  (I)[B
- (I)[B
+ (I)[1B
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/handler/IPageRequestHandler.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/handler/IPageRequestHandler.eea
index 1033a7bab3..621f6d245e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/handler/IPageRequestHandler.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/handler/IPageRequestHandler.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/core/request/handler/IPageRequestHandler
 
 getPage
  (Lorg/apache/wicket/request/IRequestHandler;)Lorg/apache/wicket/Page;
- (Lorg/apache/wicket/request/IRequestHandler;)Lorg/apache/wicket/Page;
+ (Lorg/apache/wicket/request/IRequestHandler;)L0org/apache/wicket/Page;
 
 getPage
  ()Lorg/apache/wicket/request/component/IRequestablePage;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/handler/PageProvider.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/handler/PageProvider.eea
index 285bdbe24c..3cdc8b4d66 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/handler/PageProvider.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/handler/PageProvider.eea
@@ -29,7 +29,7 @@ getPageInstance
  ()Lorg/apache/wicket/request/component/IRequestablePage;
 getPageParameters
  ()Lorg/apache/wicket/request/mapper/parameter/PageParameters;
- ()Lorg/apache/wicket/request/mapper/parameter/PageParameters;
+ ()L0org/apache/wicket/request/mapper/parameter/PageParameters;
 getPageSource
  ()Lorg/apache/wicket/core/request/mapper/IPageSource;
  ()Lorg/apache/wicket/core/request/mapper/IPageSource;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/handler/logger/PageLogData.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/handler/logger/PageLogData.eea
index afb3fa43ab..d3fef6dd0d 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/handler/logger/PageLogData.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/handler/logger/PageLogData.eea
@@ -20,7 +20,7 @@ getRenderCount
  ()Ljava/lang/Integer;
 optional
  <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<TT;>;)T0T;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.eea
index f7d81076e4..03005135dc 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.eea
@@ -30,13 +30,13 @@ getCompatibilityScore
  (L1org/apache/wicket/request/Request;)I # @Inherited(org.apache.wicket.request.IRequestMapper)
 getMatchedSegmentSizes
  (Lorg/apache/wicket/request/Url;)[I
- (Lorg/apache/wicket/request/Url;)[I
+ (Lorg/apache/wicket/request/Url;)[0I
 getPageInfo
  (Lorg/apache/wicket/core/request/handler/IPageRequestHandler;)Lorg/apache/wicket/request/mapper/info/PageInfo;
- (Lorg/apache/wicket/core/request/handler/IPageRequestHandler;)Lorg/apache/wicket/request/mapper/info/PageInfo;
+ (Lorg/apache/wicket/core/request/handler/IPageRequestHandler;)L1org/apache/wicket/request/mapper/info/PageInfo;
 getPathSegments
  ([Ljava/lang/String;)Ljava/util/List<Lorg/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$MountPathSegment;>;
- ([Ljava/lang/String;)Ljava/util/List<Lorg/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$MountPathSegment;>;
+ ([Ljava/lang/String;)L1java/util/List<Lorg/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$MountPathSegment;>;
 isFixedSegment
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
@@ -48,19 +48,19 @@ mapRequest
  (L1org/apache/wicket/request/Request;)L0org/apache/wicket/request/IRequestHandler; # @Inherited(org.apache.wicket.request.IRequestMapper)
 newPageParameters
  ()Lorg/apache/wicket/request/mapper/parameter/PageParameters;
- ()Lorg/apache/wicket/request/mapper/parameter/PageParameters;
+ ()L1org/apache/wicket/request/mapper/parameter/PageParameters;
 parseRequest
  (Lorg/apache/wicket/request/Request;)Lorg/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo;
  (Lorg/apache/wicket/request/Request;)Lorg/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo;
 processBookmarkable
  (Ljava/lang/Class<+Lorg/apache/wicket/request/component/IRequestablePage;>;Lorg/apache/wicket/request/mapper/parameter/PageParameters;)Lorg/apache/wicket/request/IRequestHandler;
- (Ljava/lang/Class<+Lorg/apache/wicket/request/component/IRequestablePage;>;Lorg/apache/wicket/request/mapper/parameter/PageParameters;)Lorg/apache/wicket/request/IRequestHandler;
+ (Ljava/lang/Class<+Lorg/apache/wicket/request/component/IRequestablePage;>;Lorg/apache/wicket/request/mapper/parameter/PageParameters;)L1org/apache/wicket/request/IRequestHandler;
 processHybrid
  (Lorg/apache/wicket/request/mapper/info/PageInfo;Ljava/lang/Class<+Lorg/apache/wicket/request/component/IRequestablePage;>;Lorg/apache/wicket/request/mapper/parameter/PageParameters;Ljava/lang/Integer;)Lorg/apache/wicket/request/IRequestHandler;
- (Lorg/apache/wicket/request/mapper/info/PageInfo;Ljava/lang/Class<+Lorg/apache/wicket/request/component/IRequestablePage;>;Lorg/apache/wicket/request/mapper/parameter/PageParameters;Ljava/lang/Integer;)Lorg/apache/wicket/request/IRequestHandler;
+ (Lorg/apache/wicket/request/mapper/info/PageInfo;Ljava/lang/Class<+Lorg/apache/wicket/request/component/IRequestablePage;>;Lorg/apache/wicket/request/mapper/parameter/PageParameters;Ljava/lang/Integer;)L1org/apache/wicket/request/IRequestHandler;
 processListener
  (Lorg/apache/wicket/request/mapper/info/PageComponentInfo;Ljava/lang/Class<+Lorg/apache/wicket/request/component/IRequestablePage;>;Lorg/apache/wicket/request/mapper/parameter/PageParameters;)Lorg/apache/wicket/request/IRequestHandler;
- (Lorg/apache/wicket/request/mapper/info/PageComponentInfo;Ljava/lang/Class<+Lorg/apache/wicket/request/component/IRequestablePage;>;Lorg/apache/wicket/request/mapper/parameter/PageParameters;)Lorg/apache/wicket/request/IRequestHandler;
+ (Lorg/apache/wicket/request/mapper/info/PageComponentInfo;Ljava/lang/Class<+Lorg/apache/wicket/request/component/IRequestablePage;>;Lorg/apache/wicket/request/mapper/parameter/PageParameters;)L1org/apache/wicket/request/IRequestHandler;
 resolveUserLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/BookmarkableMapper.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/BookmarkableMapper.eea
index c2f4481744..735432dbbd 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/BookmarkableMapper.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/BookmarkableMapper.eea
@@ -11,7 +11,7 @@ getCompatibilityScore
  (L1org/apache/wicket/request/Request;)I # @Inherited(org.apache.wicket.core.request.mapper.AbstractBookmarkableMapper)
 parseRequest
  (Lorg/apache/wicket/request/Request;)Lorg/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo;
- (Lorg/apache/wicket/request/Request;)Lorg/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo;
+ (Lorg/apache/wicket/request/Request;)L0org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo;
 urlStartsWithAndHasPageClass
  (Lorg/apache/wicket/request/Url;[Ljava/lang/String;)Z
  (Lorg/apache/wicket/request/Url;[Ljava/lang/String;)Z
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/CryptoMapper$HashedSegmentGenerator.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/CryptoMapper$HashedSegmentGenerator.eea
index fac898a118..7d4a7b5c0e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/CryptoMapper$HashedSegmentGenerator.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/CryptoMapper$HashedSegmentGenerator.eea
@@ -8,4 +8,4 @@ hashString
  (Ljava/lang/String;)I
 next
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/CryptoMapper.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/CryptoMapper.eea
index 52a80b1279..e5bb0e5aed 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/CryptoMapper.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/CryptoMapper.eea
@@ -8,16 +8,16 @@ class org/apache/wicket/core/request/mapper/CryptoMapper
  (Lorg/apache/wicket/request/IRequestMapper;Lorg/apache/wicket/Application;)V
 decryptEntireUrl
  (Lorg/apache/wicket/request/Request;Lorg/apache/wicket/request/Url;)Lorg/apache/wicket/request/Url;
- (Lorg/apache/wicket/request/Request;Lorg/apache/wicket/request/Url;)Lorg/apache/wicket/request/Url;
+ (Lorg/apache/wicket/request/Request;Lorg/apache/wicket/request/Url;)L0org/apache/wicket/request/Url;
 decryptRequestListenerParameter
  (Lorg/apache/wicket/request/Request;Lorg/apache/wicket/request/Url;)Lorg/apache/wicket/request/Url;
- (Lorg/apache/wicket/request/Request;Lorg/apache/wicket/request/Url;)Lorg/apache/wicket/request/Url;
+ (Lorg/apache/wicket/request/Request;Lorg/apache/wicket/request/Url;)L0org/apache/wicket/request/Url;
 decryptUrl
  (Lorg/apache/wicket/request/Request;Lorg/apache/wicket/request/Url;)Lorg/apache/wicket/request/Url;
- (Lorg/apache/wicket/request/Request;Lorg/apache/wicket/request/Url;)Lorg/apache/wicket/request/Url;
+ (Lorg/apache/wicket/request/Request;Lorg/apache/wicket/request/Url;)L0org/apache/wicket/request/Url;
 encryptEntireUrl
  (Lorg/apache/wicket/request/Url;)Lorg/apache/wicket/request/Url;
- (Lorg/apache/wicket/request/Url;)Lorg/apache/wicket/request/Url;
+ (Lorg/apache/wicket/request/Url;)L1org/apache/wicket/request/Url;
 encryptRequestListenerParameter
  (Lorg/apache/wicket/request/Url;)Lorg/apache/wicket/request/Url;
  (Lorg/apache/wicket/request/Url;)Lorg/apache/wicket/request/Url;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/HomePageMapper.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/HomePageMapper.eea
index 87ab6de1c5..21d8dfa1c7 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/HomePageMapper.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/HomePageMapper.eea
@@ -14,4 +14,4 @@ getCompatibilityScore
  (L1org/apache/wicket/request/Request;)I # @Inherited(org.apache.wicket.core.request.mapper.AbstractBookmarkableMapper)
 parseRequest
  (Lorg/apache/wicket/request/Request;)Lorg/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo;
- (Lorg/apache/wicket/request/Request;)Lorg/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo;
+ (Lorg/apache/wicket/request/Request;)L0org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo; # @Inherited(org.apache.wicket.core.request.mapper.MountedMapper)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/MapperUtils.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/MapperUtils.eea
index fce9ca4fb8..f848e8a137 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/MapperUtils.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/MapperUtils.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/core/request/mapper/MapperUtils
 
 getPageComponentInfo
  (Lorg/apache/wicket/request/Url;)Lorg/apache/wicket/request/mapper/info/PageComponentInfo;
- (Lorg/apache/wicket/request/Url;)Lorg/apache/wicket/request/mapper/info/PageComponentInfo;
+ (Lorg/apache/wicket/request/Url;)L0org/apache/wicket/request/mapper/info/PageComponentInfo;
 parsePageComponentInfoParameter
  (Lorg/apache/wicket/request/Url$QueryParameter;)Lorg/apache/wicket/request/mapper/info/PageComponentInfo;
- (Lorg/apache/wicket/request/Url$QueryParameter;)Lorg/apache/wicket/request/mapper/info/PageComponentInfo;
+ (Lorg/apache/wicket/request/Url$QueryParameter;)L0org/apache/wicket/request/mapper/info/PageComponentInfo;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/MountedMapper.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/MountedMapper.eea
index 8f8c210999..2270b1eaf7 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/MountedMapper.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/MountedMapper.eea
@@ -14,7 +14,7 @@ class org/apache/wicket/core/request/mapper/MountedMapper
  (Ljava/lang/String;Ljava/util/function/Supplier<Ljava/lang/Class<+Lorg/apache/wicket/request/component/IRequestablePage;>;>;Lorg/apache/wicket/request/mapper/parameter/IPageParametersEncoder;)V
 buildUrl
  (Lorg/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo;)Lorg/apache/wicket/request/Url;
- (Lorg/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo;)Lorg/apache/wicket/request/Url;
+ (Lorg/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo;)L0org/apache/wicket/request/Url;
 checkPageClass
  (Ljava/lang/Class<+Lorg/apache/wicket/request/component/IRequestablePage;>;)Z
  (Ljava/lang/Class<+Lorg/apache/wicket/request/component/IRequestablePage;>;)Z
@@ -23,7 +23,7 @@ mapHandler
  (L1org/apache/wicket/request/IRequestHandler;)L0org/apache/wicket/request/Url; # @Inherited(org.apache.wicket.core.request.mapper.AbstractBookmarkableMapper)
 parseRequest
  (Lorg/apache/wicket/request/Request;)Lorg/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo;
- (Lorg/apache/wicket/request/Request;)Lorg/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo;
+ (Lorg/apache/wicket/request/Request;)L0org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/PackageMapper.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/PackageMapper.eea
index f250b36c97..8af7365c09 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/PackageMapper.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/PackageMapper.eea
@@ -8,13 +8,13 @@ class org/apache/wicket/core/request/mapper/PackageMapper
  (Ljava/lang/String;Lorg/apache/wicket/util/lang/PackageName;Lorg/apache/wicket/request/mapper/parameter/IPageParametersEncoder;)V
 buildUrl
  (Lorg/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo;)Lorg/apache/wicket/request/Url;
- (Lorg/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo;)Lorg/apache/wicket/request/Url;
+ (Lorg/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo;)L0org/apache/wicket/request/Url;
 checkPageClass
  (Ljava/lang/Class<+Lorg/apache/wicket/request/component/IRequestablePage;>;)Z
  (Ljava/lang/Class<+Lorg/apache/wicket/request/component/IRequestablePage;>;)Z
 parseRequest
  (Lorg/apache/wicket/request/Request;)Lorg/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo;
- (Lorg/apache/wicket/request/Request;)Lorg/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo;
+ (Lorg/apache/wicket/request/Request;)L0org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo;
 transformForUrl
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/ResourceMapper.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/ResourceMapper.eea
index 1ebb8d8f6a..1afcf14eb8 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/ResourceMapper.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/request/mapper/ResourceMapper.eea
@@ -11,7 +11,7 @@ addCachingDecoration
  (Lorg/apache/wicket/request/Url;Lorg/apache/wicket/request/mapper/parameter/PageParameters;)V
 buildUrl
  (Lorg/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo;)Lorg/apache/wicket/request/Url;
- (Lorg/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo;)Lorg/apache/wicket/request/Url;
+ (Lorg/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo;)L1org/apache/wicket/request/Url;
 getCachingStrategy
  ()Lorg/apache/wicket/request/resource/caching/IResourceCachingStrategy;
  ()Lorg/apache/wicket/request/resource/caching/IResourceCachingStrategy;
@@ -26,7 +26,7 @@ mapRequest
  (L1org/apache/wicket/request/Request;)L0org/apache/wicket/request/IRequestHandler; # @Inherited(org.apache.wicket.core.request.mapper.AbstractBookmarkableMapper)
 parseRequest
  (Lorg/apache/wicket/request/Request;)Lorg/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo;
- (Lorg/apache/wicket/request/Request;)Lorg/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo;
+ (Lorg/apache/wicket/request/Request;)L1org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper$UrlInfo;
 removeCachingDecoration
  (Lorg/apache/wicket/request/Url;Lorg/apache/wicket/request/mapper/parameter/PageParameters;)V
  (Lorg/apache/wicket/request/Url;Lorg/apache/wicket/request/mapper/parameter/PageParameters;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/crypt/AESCrypt.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/crypt/AESCrypt.eea
index 435a17e393..ab23598b54 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/crypt/AESCrypt.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/crypt/AESCrypt.eea
@@ -11,4 +11,4 @@ decrypt
  ([B)[B
 encrypt
  ([B)[B
- ([B)[B
+ ([B)[1B
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/crypt/AbstractJceCrypt.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/crypt/AbstractJceCrypt.eea
index bbbb1ce2d7..03bee22209 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/crypt/AbstractJceCrypt.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/crypt/AbstractJceCrypt.eea
@@ -5,10 +5,10 @@ decrypt
  ([B)[B
 decryptUrlSafe
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 encrypt
  ([B)[B
  ([B)[B
 encryptUrlSafe
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/crypt/AbstractKeyInSessionCryptFactory.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/crypt/AbstractKeyInSessionCryptFactory.eea
index cdca2e3f65..cc30f5ed19 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/crypt/AbstractKeyInSessionCryptFactory.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/crypt/AbstractKeyInSessionCryptFactory.eea
@@ -4,7 +4,7 @@ class org/apache/wicket/core/util/crypt/AbstractKeyInSessionCryptFactory
 
 createCrypt
  (TT;)Lorg/apache/wicket/util/crypt/ICrypt;
- (TT;)Lorg/apache/wicket/util/crypt/ICrypt;
+ (TT;)L1org/apache/wicket/util/crypt/ICrypt;
 generateKey
  (Lorg/apache/wicket/Session;)TT;
  (Lorg/apache/wicket/Session;)TT;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/crypt/KeyInSessionSunJceCryptFactory.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/crypt/KeyInSessionSunJceCryptFactory.eea
index 4e0a877335..8f50df5604 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/crypt/KeyInSessionSunJceCryptFactory.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/crypt/KeyInSessionSunJceCryptFactory.eea
@@ -9,7 +9,7 @@ super org/apache/wicket/core/util/crypt/AbstractKeyInSessionCryptFactory
  (Ljava/lang/String;)V
 createCrypt
  (Lorg/apache/wicket/core/util/crypt/KeyInSessionSunJceCryptFactory$CryptData;)Lorg/apache/wicket/util/crypt/ICrypt;
- (Lorg/apache/wicket/core/util/crypt/KeyInSessionSunJceCryptFactory$CryptData;)Lorg/apache/wicket/util/crypt/ICrypt;
+ (Lorg/apache/wicket/core/util/crypt/KeyInSessionSunJceCryptFactory$CryptData;)L1org/apache/wicket/util/crypt/ICrypt;
 generateKey
  (Lorg/apache/wicket/Session;)Lorg/apache/wicket/core/util/crypt/KeyInSessionSunJceCryptFactory$CryptData;
- (Lorg/apache/wicket/Session;)Lorg/apache/wicket/core/util/crypt/KeyInSessionSunJceCryptFactory$CryptData;
+ (Lorg/apache/wicket/Session;)L1org/apache/wicket/core/util/crypt/KeyInSessionSunJceCryptFactory$CryptData;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/file/WebApplicationPath.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/file/WebApplicationPath.eea
index 73c6a23008..bfeed911a8 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/file/WebApplicationPath.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/file/WebApplicationPath.eea
@@ -5,7 +5,7 @@ class org/apache/wicket/core/util/file/WebApplicationPath
  (Ljakarta/servlet/ServletContext;Ljava/lang/String;)V
 find
  (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/apache/wicket/util/resource/IResourceStream;
- (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/apache/wicket/util/resource/IResourceStream;
+ (Ljava/lang/Class<*>;Ljava/lang/String;)L1org/apache/wicket/util/resource/IResourceStream;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/lang/PropertyResolver$AbstractGetAndSet.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/lang/PropertyResolver$AbstractGetAndSet.eea
index 0fb01304ff..c8a28b9320 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/lang/PropertyResolver$AbstractGetAndSet.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/lang/PropertyResolver$AbstractGetAndSet.eea
@@ -2,13 +2,13 @@ class org/apache/wicket/core/util/lang/PropertyResolver$AbstractGetAndSet
 
 getField
  ()Ljava/lang/reflect/Field;
- ()Ljava/lang/reflect/Field;
+ ()L0java/lang/reflect/Field;
 getGetter
  ()Ljava/lang/reflect/Method;
- ()Ljava/lang/reflect/Method;
+ ()L0java/lang/reflect/Method;
 getSetter
  ()Ljava/lang/reflect/Method;
- ()Ljava/lang/reflect/Method;
+ ()L0java/lang/reflect/Method;
 getTargetClass
  ()Ljava/lang/Class<*>;
- ()Ljava/lang/Class<*>;
+ ()L0java/lang/Class<*>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/lang/PropertyResolver$CachingPropertyLocator.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/lang/PropertyResolver$CachingPropertyLocator.eea
index c42c6ce096..d647646e25 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/lang/PropertyResolver$CachingPropertyLocator.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/lang/PropertyResolver$CachingPropertyLocator.eea
@@ -5,4 +5,4 @@ class org/apache/wicket/core/util/lang/PropertyResolver$CachingPropertyLocator
  (Lorg/apache/wicket/core/util/lang/PropertyResolver$IPropertyLocator;)V
 get
  (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/apache/wicket/core/util/lang/PropertyResolver$IGetAndSet;
- (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/apache/wicket/core/util/lang/PropertyResolver$IGetAndSet;
+ (Ljava/lang/Class<*>;Ljava/lang/String;)L0org/apache/wicket/core/util/lang/PropertyResolver$IGetAndSet;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/lang/PropertyResolver$DefaultPropertyLocator.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/lang/PropertyResolver$DefaultPropertyLocator.eea
index 1fc616fa4c..7584a544e2 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/lang/PropertyResolver$DefaultPropertyLocator.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/lang/PropertyResolver$DefaultPropertyLocator.eea
@@ -2,4 +2,4 @@ class org/apache/wicket/core/util/lang/PropertyResolver$DefaultPropertyLocator
 
 get
  (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/apache/wicket/core/util/lang/PropertyResolver$IGetAndSet;
- (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/apache/wicket/core/util/lang/PropertyResolver$IGetAndSet;
+ (Ljava/lang/Class<*>;Ljava/lang/String;)L1org/apache/wicket/core/util/lang/PropertyResolver$IGetAndSet;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/lang/PropertyResolver.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/lang/PropertyResolver.eea
index 638f3b2e6b..39c6a2209c 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/lang/PropertyResolver.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/lang/PropertyResolver.eea
@@ -23,7 +23,7 @@ getPropertySetter
  (Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/reflect/Method;
 getValue
  (Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/String;Ljava/lang/Object;)L0java/lang/Object;
 setLocator
  (Lorg/apache/wicket/Application;Lorg/apache/wicket/core/util/lang/PropertyResolver$IPropertyLocator;)V
  (Lorg/apache/wicket/Application;Lorg/apache/wicket/core/util/lang/PropertyResolver$IPropertyLocator;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/lang/WicketObjects.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/lang/WicketObjects.eea
index 356b179b64..df38af307e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/lang/WicketObjects.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/lang/WicketObjects.eea
@@ -5,7 +5,7 @@ cloneObject
  <T:Ljava/lang/Object;>(TT;)TT;
 newInstance
  <T:Ljava/lang/Object;>(Ljava/lang/String;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/String;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/String;)T0T;
 resolveClass
  <T:Ljava/lang/Object;>(Ljava/lang/String;)Ljava/lang/Class<TT;>;
  <T:Ljava/lang/Object;>(Ljava/lang/String;)Ljava/lang/Class<TT;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/objects/checker/CheckingObjectOutputStream.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/objects/checker/CheckingObjectOutputStream.eea
index ec08bf0cc6..a087c26914 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/objects/checker/CheckingObjectOutputStream.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/objects/checker/CheckingObjectOutputStream.eea
@@ -5,7 +5,7 @@ class org/apache/wicket/core/util/objects/checker/CheckingObjectOutputStream
  (Ljava/io/OutputStream;[Lorg/apache/wicket/core/util/objects/checker/IObjectChecker;)V
 toPrettyPrintedStack
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 writeObjectOverride
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/objects/checker/DifferentPageChecker.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/objects/checker/DifferentPageChecker.eea
index 7446679a92..d12489aadb 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/objects/checker/DifferentPageChecker.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/objects/checker/DifferentPageChecker.eea
@@ -2,4 +2,4 @@ class org/apache/wicket/core/util/objects/checker/DifferentPageChecker
 
 doCheck
  (Ljava/lang/Object;)Lorg/apache/wicket/core/util/objects/checker/IObjectChecker$Result;
- (Ljava/lang/Object;)Lorg/apache/wicket/core/util/objects/checker/IObjectChecker$Result;
+ (Ljava/lang/Object;)L1org/apache/wicket/core/util/objects/checker/IObjectChecker$Result;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/objects/checker/NotDetachedModelChecker.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/objects/checker/NotDetachedModelChecker.eea
index a6ec63414e..3d4727d0ae 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/objects/checker/NotDetachedModelChecker.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/objects/checker/NotDetachedModelChecker.eea
@@ -5,4 +5,4 @@ class org/apache/wicket/core/util/objects/checker/NotDetachedModelChecker
  (Ljava/util/List<Ljava/lang/Class<*>;>;)V
 doCheck
  (Ljava/lang/Object;)Lorg/apache/wicket/core/util/objects/checker/IObjectChecker$Result;
- (Ljava/lang/Object;)Lorg/apache/wicket/core/util/objects/checker/IObjectChecker$Result;
+ (Ljava/lang/Object;)L1org/apache/wicket/core/util/objects/checker/IObjectChecker$Result;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/objects/checker/ObjectSerializationChecker.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/objects/checker/ObjectSerializationChecker.eea
index ca02c2f735..038fc1d786 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/objects/checker/ObjectSerializationChecker.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/objects/checker/ObjectSerializationChecker.eea
@@ -5,4 +5,4 @@ class org/apache/wicket/core/util/objects/checker/ObjectSerializationChecker
  (Ljava/io/NotSerializableException;)V
 check
  (Ljava/lang/Object;)Lorg/apache/wicket/core/util/objects/checker/IObjectChecker$Result;
- (Ljava/lang/Object;)Lorg/apache/wicket/core/util/objects/checker/IObjectChecker$Result;
+ (Ljava/lang/Object;)L1org/apache/wicket/core/util/objects/checker/IObjectChecker$Result;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/objects/checker/OrphanComponentChecker.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/objects/checker/OrphanComponentChecker.eea
index 6d51cb621f..2cb100f35b 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/objects/checker/OrphanComponentChecker.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/objects/checker/OrphanComponentChecker.eea
@@ -5,4 +5,4 @@ class org/apache/wicket/core/util/objects/checker/OrphanComponentChecker
  (Ljava/util/List<Ljava/lang/Class<*>;>;)V
 doCheck
  (Ljava/lang/Object;)Lorg/apache/wicket/core/util/objects/checker/IObjectChecker$Result;
- (Ljava/lang/Object;)Lorg/apache/wicket/core/util/objects/checker/IObjectChecker$Result;
+ (Ljava/lang/Object;)L1org/apache/wicket/core/util/objects/checker/IObjectChecker$Result;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/objects/checker/SessionChecker.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/objects/checker/SessionChecker.eea
index 68b9050b93..806292afec 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/objects/checker/SessionChecker.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/objects/checker/SessionChecker.eea
@@ -2,4 +2,4 @@ class org/apache/wicket/core/util/objects/checker/SessionChecker
 
 doCheck
  (Ljava/lang/Object;)Lorg/apache/wicket/core/util/objects/checker/IObjectChecker$Result;
- (Ljava/lang/Object;)Lorg/apache/wicket/core/util/objects/checker/IObjectChecker$Result;
+ (Ljava/lang/Object;)L1org/apache/wicket/core/util/objects/checker/IObjectChecker$Result;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/ClassPathResourceFinder.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/ClassPathResourceFinder.eea
index 006e3be7fe..5b85f8bdd7 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/ClassPathResourceFinder.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/ClassPathResourceFinder.eea
@@ -5,7 +5,7 @@ class org/apache/wicket/core/util/resource/ClassPathResourceFinder
  (Ljava/lang/String;)V
 find
  (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/apache/wicket/util/resource/IResourceStream;
- (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/apache/wicket/util/resource/IResourceStream;
+ (Ljava/lang/Class<*>;Ljava/lang/String;)L0org/apache/wicket/util/resource/IResourceStream;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/PackageResourceStream.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/PackageResourceStream.eea
index 2a31641866..df2a272148 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/PackageResourceStream.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/PackageResourceStream.eea
@@ -8,13 +8,13 @@ class org/apache/wicket/core/util/resource/PackageResourceStream
  (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)V
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(org.apache.wicket.util.resource.AbstractResourceStream)
 getInputStream
  ()Ljava/io/InputStream;
  ()Ljava/io/InputStream;
 lastModifiedTime
  ()Ljava/time/Instant;
- ()Ljava/time/Instant;
+ ()L0java/time/Instant; # @Inherited(org.apache.wicket.util.resource.AbstractResourceStream)
 length
  ()Lorg/apache/wicket/util/lang/Bytes;
- ()Lorg/apache/wicket/util/lang/Bytes;
+ ()L0org/apache/wicket/util/lang/Bytes; # @Inherited(org.apache.wicket.util.resource.AbstractResourceStream)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/UrlResourceStream.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/UrlResourceStream.eea
index e04c8bc213..2ce476d793 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/UrlResourceStream.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/UrlResourceStream.eea
@@ -5,7 +5,7 @@ class org/apache/wicket/core/util/resource/UrlResourceStream
  (Ljava/net/URL;)V
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(org.apache.wicket.util.resource.AbstractResourceStream)
 getInputStream
  ()Ljava/io/InputStream;
  ()Ljava/io/InputStream;
@@ -14,10 +14,10 @@ getURL
  ()Ljava/net/URL;
 lastModifiedTime
  ()Ljava/time/Instant;
- ()Ljava/time/Instant;
+ ()L0java/time/Instant; # @Inherited(org.apache.wicket.util.resource.AbstractResourceStream)
 length
  ()Lorg/apache/wicket/util/lang/Bytes;
- ()Lorg/apache/wicket/util/lang/Bytes;
+ ()L0org/apache/wicket/util/lang/Bytes; # @Inherited(org.apache.wicket.util.resource.AbstractResourceStream)
 locationAsString
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/WebExternalResourceStream.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/WebExternalResourceStream.eea
index da6235146f..90abf3acab 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/WebExternalResourceStream.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/WebExternalResourceStream.eea
@@ -5,13 +5,13 @@ class org/apache/wicket/core/util/resource/WebExternalResourceStream
  (Ljava/lang/String;)V
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(org.apache.wicket.util.resource.AbstractResourceStream)
 getInputStream
  ()Ljava/io/InputStream;
  ()Ljava/io/InputStream;
 lastModifiedTime
  ()Ljava/time/Instant;
- ()Ljava/time/Instant;
+ ()L0java/time/Instant; # @Inherited(org.apache.wicket.util.resource.AbstractResourceStream)
 length
  ()Lorg/apache/wicket/util/lang/Bytes;
- ()Lorg/apache/wicket/util/lang/Bytes;
+ ()L0org/apache/wicket/util/lang/Bytes; # @Inherited(org.apache.wicket.util.resource.AbstractResourceStream)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/locator/LocaleResourceNameIterator.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/locator/LocaleResourceNameIterator.eea
index e8dab25928..1ff77050ae 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/locator/LocaleResourceNameIterator.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/locator/LocaleResourceNameIterator.eea
@@ -9,7 +9,7 @@ super java/util/Iterator
  (Ljava/util/Locale;Z)V
 getLocale
  ()Ljava/util/Locale;
- ()Ljava/util/Locale;
+ ()L0java/util/Locale;
 next
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/locator/OsgiResourceStreamLocator.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/locator/OsgiResourceStreamLocator.eea
index e5d666be18..4e17add0b9 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/locator/OsgiResourceStreamLocator.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/locator/OsgiResourceStreamLocator.eea
@@ -5,4 +5,4 @@ class org/apache/wicket/core/util/resource/locator/OsgiResourceStreamLocator
  (Lorg/apache/wicket/util/file/IResourceFinder;)V
 locate
  (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/apache/wicket/util/resource/IResourceStream;
- (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/apache/wicket/util/resource/IResourceStream;
+ (Ljava/lang/Class<*>;Ljava/lang/String;)L0org/apache/wicket/util/resource/IResourceStream; # @Inherited(org.apache.wicket.core.util.resource.locator.ResourceStreamLocator)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/locator/ResourceNameIterator.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/locator/ResourceNameIterator.eea
index 2cba70ab6e..ac8f14b31d 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/locator/ResourceNameIterator.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/locator/ResourceNameIterator.eea
@@ -17,16 +17,16 @@ getVariation
  ()Ljava/lang/String;
 newExtensionResourceNameIterator
  (Ljava/lang/Iterable<Ljava/lang/String;>;)Lorg/apache/wicket/core/util/resource/locator/ExtensionResourceNameIterator;
- (Ljava/lang/Iterable<Ljava/lang/String;>;)Lorg/apache/wicket/core/util/resource/locator/ExtensionResourceNameIterator;
+ (Ljava/lang/Iterable<Ljava/lang/String;>;)L1org/apache/wicket/core/util/resource/locator/ExtensionResourceNameIterator;
 newLocaleResourceNameIterator
  (Ljava/util/Locale;Z)Lorg/apache/wicket/core/util/resource/locator/LocaleResourceNameIterator;
- (Ljava/util/Locale;Z)Lorg/apache/wicket/core/util/resource/locator/LocaleResourceNameIterator;
+ (Ljava/util/Locale;Z)L1org/apache/wicket/core/util/resource/locator/LocaleResourceNameIterator;
 newStyleAndVariationResourceNameIterator
  (Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/core/util/resource/locator/StyleAndVariationResourceNameIterator;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/core/util/resource/locator/StyleAndVariationResourceNameIterator;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/apache/wicket/core/util/resource/locator/StyleAndVariationResourceNameIterator;
 next
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/locator/ResourceStreamLocator.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/locator/ResourceStreamLocator.eea
index 66e04444f4..31921d5de2 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/locator/ResourceStreamLocator.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/locator/ResourceStreamLocator.eea
@@ -8,13 +8,13 @@ class org/apache/wicket/core/util/resource/locator/ResourceStreamLocator
  ([Lorg/apache/wicket/util/file/IResourceFinder;)V
 locate
  (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/apache/wicket/util/resource/IResourceStream;
- (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/apache/wicket/util/resource/IResourceStream;
+ (Ljava/lang/Class<*>;Ljava/lang/String;)L0org/apache/wicket/util/resource/IResourceStream;
 locate
  (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Z)Lorg/apache/wicket/util/resource/IResourceStream;
- (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Z)Lorg/apache/wicket/util/resource/IResourceStream;
+ (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Z)L0org/apache/wicket/util/resource/IResourceStream;
 newResourceNameIterator
  (Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Iterable<Ljava/lang/String;>;Z)Lorg/apache/wicket/core/util/resource/locator/IResourceNameIterator;
- (Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Iterable<Ljava/lang/String;>;Z)Lorg/apache/wicket/core/util/resource/locator/IResourceNameIterator;
+ (Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Iterable<Ljava/lang/String;>;Z)L1org/apache/wicket/core/util/resource/locator/IResourceNameIterator;
 newResourceNameIterator
  (Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Lorg/apache/wicket/core/util/resource/locator/IResourceNameIterator;
  (Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Lorg/apache/wicket/core/util/resource/locator/IResourceNameIterator;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/locator/StyleAndVariationResourceNameIterator.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/locator/StyleAndVariationResourceNameIterator.eea
index 1593b8638b..8bbedc7544 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/locator/StyleAndVariationResourceNameIterator.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/resource/locator/StyleAndVariationResourceNameIterator.eea
@@ -9,10 +9,10 @@ super java/util/Iterator
  (Ljava/lang/String;Ljava/lang/String;)V
 getStyle
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getVariation
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 next
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/string/ComponentRenderer.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/string/ComponentRenderer.eea
index 6e80a9f435..32c1cbb299 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/string/ComponentRenderer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/string/ComponentRenderer.eea
@@ -12,7 +12,7 @@ renderPage
  (Lorg/apache/wicket/Application;)V
 newRequest
  ()Lorg/apache/wicket/request/Request;
- ()Lorg/apache/wicket/request/Request;
+ ()L1org/apache/wicket/request/Request;
 renderComponent
  (Ljava/util/function/Supplier<Lorg/apache/wicket/Component;>;)Ljava/lang/CharSequence;
  (Ljava/util/function/Supplier<Lorg/apache/wicket/Component;>;)Ljava/lang/CharSequence;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/string/ComponentStrings.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/string/ComponentStrings.eea
index 1ea9760fc4..2d35566129 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/string/ComponentStrings.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/string/ComponentStrings.eea
@@ -2,4 +2,4 @@ class org/apache/wicket/core/util/string/ComponentStrings
 
 toString
  (Lorg/apache/wicket/Component;Ljava/lang/Throwable;)Ljava/lang/String;
- (Lorg/apache/wicket/Component;Ljava/lang/Throwable;)Ljava/lang/String;
+ (Lorg/apache/wicket/Component;Ljava/lang/Throwable;)L1java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/string/CssUtils.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/string/CssUtils.eea
index 213f9903fd..88003598cd 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/string/CssUtils.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/string/CssUtils.eea
@@ -36,7 +36,7 @@ INLINE_OPEN_TAG_START
 
 key
  (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/Class<*>;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;Ljava/lang/String;)L1java/lang/String;
 writeCloseTag
  (Lorg/apache/wicket/request/Response;)V
  (Lorg/apache/wicket/request/Response;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/string/interpolator/PropertyVariableInterpolator.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/string/interpolator/PropertyVariableInterpolator.eea
index 0e7aeb70e1..b14372bc0d 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/string/interpolator/PropertyVariableInterpolator.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/core/util/string/interpolator/PropertyVariableInterpolator.eea
@@ -5,7 +5,7 @@ class org/apache/wicket/core/util/string/interpolator/PropertyVariableInterpolat
  (Ljava/lang/String;Ljava/lang/Object;)V
 getValue
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
  (Ljava/lang/Object;)Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/csp/CSPDirective.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/csp/CSPDirective.eea
index 23b040976a..688c4fe01c 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/csp/CSPDirective.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/csp/CSPDirective.eea
@@ -6,7 +6,7 @@ super java/lang/Enum
 
 fromValue
  (Ljava/lang/String;)Lorg/apache/wicket/csp/CSPDirective;
- (Ljava/lang/String;)Lorg/apache/wicket/csp/CSPDirective;
+ (Ljava/lang/String;)L0org/apache/wicket/csp/CSPDirective;
 
 checkValueForDirective
  (Lorg/apache/wicket/csp/CSPRenderable;Ljava/util/List<Lorg/apache/wicket/csp/CSPRenderable;>;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/csp/CSPHeaderMode.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/csp/CSPHeaderMode.eea
index e23c5ae7d0..a57440098a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/csp/CSPHeaderMode.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/csp/CSPHeaderMode.eea
@@ -9,4 +9,4 @@ getHeader
  ()Ljava/lang/String;
 getLegacyHeader
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/csp/ContentSecurityPolicySettings.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/csp/ContentSecurityPolicySettings.eea
index 88836ab894..e418945c34 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/csp/ContentSecurityPolicySettings.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/csp/ContentSecurityPolicySettings.eea
@@ -12,7 +12,7 @@ blocking
  ()Lorg/apache/wicket/csp/CSPHeaderConfiguration;
 createNonce
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 enforce
  (Lorg/apache/wicket/protocol/http/WebApplication;)V
  (Lorg/apache/wicket/protocol/http/WebApplication;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/AjaxDisableComponentListener.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/AjaxDisableComponentListener.eea
index b88af6b499..258b9ac8cd 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/AjaxDisableComponentListener.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/AjaxDisableComponentListener.eea
@@ -5,10 +5,10 @@ generateHandlerJavaScript
  (Lorg/apache/wicket/Component;Z)Ljava/lang/String;
 getBeforeHandler
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/Component;)L0java/lang/CharSequence; # @Inherited(org.apache.wicket.ajax.attributes.AjaxCallListener)
 getCompleteHandler
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/Component;)L0java/lang/CharSequence; # @Inherited(org.apache.wicket.ajax.attributes.AjaxCallListener)
 getFailureHandler
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/Component;)L0java/lang/CharSequence; # @Inherited(org.apache.wicket.ajax.attributes.AjaxCallListener)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.eea
index 0e74e6e75c..2ba7ab6a07 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.eea
@@ -29,7 +29,7 @@ super org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;Lorg/apache/wicket/model/IModel<+Ljava/util/List<+TT;>;>;Lorg/apache/wicket/markup/html/form/IChoiceRenderer<-TT;>;)V
 newEditor
  (Lorg/apache/wicket/MarkupContainer;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/markup/html/form/FormComponent<TT;>;
- (Lorg/apache/wicket/MarkupContainer;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/markup/html/form/FormComponent<TT;>;
+ (Lorg/apache/wicket/MarkupContainer;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/markup/html/form/FormComponent<TT;>; # @Inherited(org.apache.wicket.extensions.ajax.markup.html.AjaxEditableLabel)
 newLabel
  (Lorg/apache/wicket/MarkupContainer;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/Component;
- (Lorg/apache/wicket/MarkupContainer;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/Component;
+ (Lorg/apache/wicket/MarkupContainer;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/Component; # @Inherited(org.apache.wicket.extensions.ajax.markup.html.AjaxEditableLabel)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.eea
index 1ae8b0d09d..59039053ac 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.eea
@@ -17,7 +17,7 @@ add
  (Lorg/apache/wicket/validation/IValidator<TT;>;)Lorg/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel<TT;>;
 defaultNullLabel
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getEditor
  ()Lorg/apache/wicket/markup/html/form/FormComponent<TT;>;
  ()Lorg/apache/wicket/markup/html/form/FormComponent<TT;>;
@@ -26,13 +26,13 @@ getLabel
  ()Lorg/apache/wicket/Component;
 getLabelAjaxEvent
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 newEditor
  (Lorg/apache/wicket/MarkupContainer;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/markup/html/form/FormComponent<TT;>;
- (Lorg/apache/wicket/MarkupContainer;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/markup/html/form/FormComponent<TT;>;
+ (Lorg/apache/wicket/MarkupContainer;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/markup/html/form/FormComponent<TT;>;
 newLabel
  (Lorg/apache/wicket/MarkupContainer;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/Component;
- (Lorg/apache/wicket/MarkupContainer;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/Component;
+ (Lorg/apache/wicket/MarkupContainer;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/Component;
 onCancel
  (Lorg/apache/wicket/ajax/AjaxRequestTarget;)V
  (Lorg/apache/wicket/ajax/AjaxRequestTarget;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.eea
index 907785bffb..4a8d74addb 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.eea
@@ -14,13 +14,13 @@ super org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)V
 defaultNullLabel
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.apache.wicket.extensions.ajax.markup.html.AjaxEditableLabel)
 getLabelAjaxEvent
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Inherited(org.apache.wicket.extensions.ajax.markup.html.AjaxEditableLabel)
 newEditor
  (Lorg/apache/wicket/MarkupContainer;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/markup/html/form/FormComponent<TT;>;
- (Lorg/apache/wicket/MarkupContainer;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/markup/html/form/FormComponent<TT;>;
+ (Lorg/apache/wicket/MarkupContainer;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/markup/html/form/FormComponent<TT;>; # @Inherited(org.apache.wicket.extensions.ajax.markup.html.AjaxEditableLabel)
 newLabel
  (Lorg/apache/wicket/MarkupContainer;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/markup/html/basic/MultiLineLabel;
- (Lorg/apache/wicket/MarkupContainer;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/markup/html/basic/MultiLineLabel;
+ (Lorg/apache/wicket/MarkupContainer;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/markup/html/basic/MultiLineLabel;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.eea
index a61cb7535f..781b5d442b 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.eea
@@ -14,10 +14,10 @@ getIndicatorUrl
  ()Ljava/lang/CharSequence;
 getMarkupId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSpanClass
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 renderHead
  (Lorg/apache/wicket/Component;Lorg/apache/wicket/markup/head/IHeaderResponse;)V
  (Lorg/apache/wicket/Component;Lorg/apache/wicket/markup/head/IHeaderResponse;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxButton.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxButton.eea
index 12028a35e5..d11e32bd92 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxButton.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxButton.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxButton
 
 onSubmit
  (Ljava/lang/String;Lorg/danekja/java/util/function/serializable/SerializableBiConsumer<Lorg/apache/wicket/ajax/markup/html/form/AjaxButton;Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)Lorg/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxButton;
- (Ljava/lang/String;Lorg/danekja/java/util/function/serializable/SerializableBiConsumer<Lorg/apache/wicket/ajax/markup/html/form/AjaxButton;Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)Lorg/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxButton;
+ (Ljava/lang/String;Lorg/danekja/java/util/function/serializable/SerializableBiConsumer<Lorg/apache/wicket/ajax/markup/html/form/AjaxButton;Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)L1org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxButton;
 
 <init>
  (Ljava/lang/String;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxLink.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxLink.eea
index b375ef8bb0..d46982fa4b 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxLink.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxLink.eea
@@ -8,7 +8,7 @@ super org/apache/wicket/ajax/markup/html/AjaxLink
 
 onClick
  <T:Ljava/lang/Object;>(Ljava/lang/String;Lorg/danekja/java/util/function/serializable/SerializableBiConsumer<Lorg/apache/wicket/ajax/markup/html/AjaxLink<TT;>;Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)Lorg/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxLink<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/String;Lorg/danekja/java/util/function/serializable/SerializableBiConsumer<Lorg/apache/wicket/ajax/markup/html/AjaxLink<TT;>;Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)Lorg/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxLink<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/String;Lorg/danekja/java/util/function/serializable/SerializableBiConsumer<Lorg/apache/wicket/ajax/markup/html/AjaxLink<TT;>;Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)L1org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxLink<TT;>;
 
 <init>
  (Ljava/lang/String;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.eea
index 2c58d5ff48..6faad34e2d 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.eea
@@ -13,7 +13,7 @@ settings
  (Lorg/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteSettings;)V
 constructSettingsJS
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 onRequest
  (Ljava/lang/String;Lorg/apache/wicket/request/cycle/RequestCycle;)V
  (Ljava/lang/String;Lorg/apache/wicket/request/cycle/RequestCycle;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteRenderer.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteRenderer.eea
index fb7838d642..d1c8606c7b 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteRenderer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteRenderer.eea
@@ -8,7 +8,7 @@ super org/apache/wicket/extensions/ajax/markup/html/autocomplete/IAutoCompleteRe
 
 getOnSelectJavaScriptExpression
  (TT;)Ljava/lang/CharSequence;
- (TT;)Ljava/lang/CharSequence;
+ (TT;)L0java/lang/CharSequence;
 getTextValue
  (TT;)Ljava/lang/String;
  (TT;)Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTextField.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTextField.eea
index b41ee655ec..827ad0bcec 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTextField.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTextField.eea
@@ -44,7 +44,7 @@ getChoices
  (Ljava/lang/String;)Ljava/util/Iterator<TT;>;
 newAutoCompleteBehavior
  (Lorg/apache/wicket/extensions/ajax/markup/html/autocomplete/IAutoCompleteRenderer<TT;>;Lorg/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteSettings;)Lorg/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior<TT;>;
- (Lorg/apache/wicket/extensions/ajax/markup/html/autocomplete/IAutoCompleteRenderer<TT;>;Lorg/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteSettings;)Lorg/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior<TT;>;
+ (Lorg/apache/wicket/extensions/ajax/markup/html/autocomplete/IAutoCompleteRenderer<TT;>;Lorg/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteSettings;)L1org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior<TT;>;
 onComponentTag
  (Lorg/apache/wicket/markup/ComponentTag;)V
  (L1org/apache/wicket/markup/ComponentTag;)V # @Inherited(org.apache.wicket.markup.html.form.TextField)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.eea
index 8d46a9d00c..3b14168845 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.eea
@@ -18,13 +18,13 @@ getCss
  ()Lorg/apache/wicket/request/resource/ResourceReference;
 getOnProgressUpdatedCallBack
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 newBarComponent
  (Ljava/lang/String;)Lorg/apache/wicket/MarkupContainer;
- (Ljava/lang/String;)Lorg/apache/wicket/MarkupContainer;
+ (Ljava/lang/String;)L1org/apache/wicket/MarkupContainer;
 newStatusComponent
  (Ljava/lang/String;)Lorg/apache/wicket/MarkupContainer;
- (Ljava/lang/String;)Lorg/apache/wicket/MarkupContainer;
+ (Ljava/lang/String;)L1org/apache/wicket/MarkupContainer;
 renderHead
  (Lorg/apache/wicket/markup/head/IHeaderResponse;)V
  (L1org/apache/wicket/markup/head/IHeaderResponse;)V # @Inherited(org.apache.wicket.Component)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/modal/ModalDialog.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/modal/ModalDialog.eea
index dc137ad2ef..979889a1b9 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/modal/ModalDialog.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/modal/ModalDialog.eea
@@ -18,10 +18,10 @@ closeOnEscape
  ()Lorg/apache/wicket/extensions/ajax/markup/html/modal/ModalDialog;
 newDialog
  (Ljava/lang/String;)Lorg/apache/wicket/markup/html/WebMarkupContainer;
- (Ljava/lang/String;)Lorg/apache/wicket/markup/html/WebMarkupContainer;
+ (Ljava/lang/String;)L1org/apache/wicket/markup/html/WebMarkupContainer;
 newOverlay
  (Ljava/lang/String;)Lorg/apache/wicket/markup/html/WebMarkupContainer;
- (Ljava/lang/String;)Lorg/apache/wicket/markup/html/WebMarkupContainer;
+ (Ljava/lang/String;)L1org/apache/wicket/markup/html/WebMarkupContainer;
 open
  (Lorg/apache/wicket/Component;Lorg/apache/wicket/ajax/AjaxRequestTarget;)Lorg/apache/wicket/extensions/ajax/markup/html/modal/ModalDialog;
  (Lorg/apache/wicket/Component;Lorg/apache/wicket/ajax/AjaxRequestTarget;)Lorg/apache/wicket/extensions/ajax/markup/html/modal/ModalDialog;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByBorder.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByBorder.eea
index df46b82d98..4123609d87 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByBorder.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByBorder.eea
@@ -11,7 +11,7 @@ super org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder
  (Ljava/lang/String;TS;Lorg/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator<TS;>;)V
 newOrderByLink
  (Ljava/lang/String;TS;Lorg/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator<TS;>;)Lorg/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink<TS;>;
- (Ljava/lang/String;TS;Lorg/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator<TS;>;)Lorg/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink<TS;>;
+ (Ljava/lang/String;TS;Lorg/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator<TS;>;)L1org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink<TS;>; # @Inherited(org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByBorder)
 onAjaxClick
  (Lorg/apache/wicket/ajax/AjaxRequestTarget;)V
  (Lorg/apache/wicket/ajax/AjaxRequestTarget;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxOrderByLink.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxOrderByLink.eea
index cc3adadec0..7e0b6f8780 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxOrderByLink.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxOrderByLink.eea
@@ -11,7 +11,7 @@ super org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink
  (Ljava/lang/String;TS;Lorg/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator<TS;>;)V
 newAjaxEventBehavior
  (Ljava/lang/String;)Lorg/apache/wicket/ajax/AjaxEventBehavior;
- (Ljava/lang/String;)Lorg/apache/wicket/ajax/AjaxEventBehavior;
+ (Ljava/lang/String;)L1org/apache/wicket/ajax/AjaxEventBehavior;
 onClick
  (Lorg/apache/wicket/ajax/AjaxRequestTarget;)V
  (Lorg/apache/wicket/ajax/AjaxRequestTarget;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackHeadersToolbar.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackHeadersToolbar.eea
index 062070a737..23e56fb3ff 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackHeadersToolbar.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackHeadersToolbar.eea
@@ -11,7 +11,7 @@ super org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolba
  (Lorg/apache/wicket/extensions/markup/html/repeater/data/table/DataTable<*TS;>;Lorg/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator<TS;>;)V
 newSortableHeader
  (Ljava/lang/String;TS;Lorg/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator<TS;>;)Lorg/apache/wicket/markup/html/WebMarkupContainer;
- (Ljava/lang/String;TS;Lorg/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator<TS;>;)Lorg/apache/wicket/markup/html/WebMarkupContainer;
+ (Ljava/lang/String;TS;Lorg/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator<TS;>;)L1org/apache/wicket/markup/html/WebMarkupContainer; # @Inherited(org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar)
 updateAjaxAttributes
  (Lorg/apache/wicket/ajax/attributes/AjaxRequestAttributes;)V
  (Lorg/apache/wicket/ajax/attributes/AjaxRequestAttributes;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxNavigationToolbar.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxNavigationToolbar.eea
index 05d1150b67..8d7047c657 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxNavigationToolbar.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxNavigationToolbar.eea
@@ -5,4 +5,4 @@ class org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxNavi
  (Lorg/apache/wicket/extensions/markup/html/repeater/data/table/DataTable<**>;)V
 newPagingNavigator
  (Ljava/lang/String;Lorg/apache/wicket/extensions/markup/html/repeater/data/table/DataTable<**>;)Lorg/apache/wicket/markup/html/navigation/paging/PagingNavigator;
- (Ljava/lang/String;Lorg/apache/wicket/extensions/markup/html/repeater/data/table/DataTable<**>;)Lorg/apache/wicket/markup/html/navigation/paging/PagingNavigator;
+ (Ljava/lang/String;Lorg/apache/wicket/extensions/markup/html/repeater/data/table/DataTable<**>;)L1org/apache/wicket/markup/html/navigation/paging/PagingNavigator; # @Inherited(org.apache.wicket.extensions.markup.html.repeater.data.table.NavigationToolbar)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/tabs/AjaxTabbedPanel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/tabs/AjaxTabbedPanel.eea
index 3a4a38a8b9..c54322eaa3 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/tabs/AjaxTabbedPanel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/ajax/markup/html/tabs/AjaxTabbedPanel.eea
@@ -14,7 +14,7 @@ super org/apache/wicket/extensions/markup/html/tabs/TabbedPanel
  (Ljava/lang/String;Ljava/util/List<TT;>;Lorg/apache/wicket/model/IModel<Ljava/lang/Integer;>;)V
 newLink
  (Ljava/lang/String;I)Lorg/apache/wicket/markup/html/WebMarkupContainer;
- (Ljava/lang/String;I)Lorg/apache/wicket/markup/html/WebMarkupContainer;
+ (Ljava/lang/String;I)L1org/apache/wicket/markup/html/WebMarkupContainer; # @Inherited(org.apache.wicket.extensions.markup.html.tabs.TabbedPanel)
 onAjaxUpdate
  (Ljava/util/Optional<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)V
  (Ljava/util/Optional<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/breadcrumb/BreadCrumbBar.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/breadcrumb/BreadCrumbBar.eea
index 1bb38680bc..730f8048d4 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/breadcrumb/BreadCrumbBar.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/breadcrumb/BreadCrumbBar.eea
@@ -14,10 +14,10 @@ getActive
  ()Lorg/apache/wicket/extensions/breadcrumb/IBreadCrumbParticipant;
 getSeparatorMarkup
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 newBreadCrumbComponent
  (Ljava/lang/String;JILorg/apache/wicket/extensions/breadcrumb/IBreadCrumbParticipant;)Lorg/apache/wicket/Component;
- (Ljava/lang/String;JILorg/apache/wicket/extensions/breadcrumb/IBreadCrumbParticipant;)Lorg/apache/wicket/Component;
+ (Ljava/lang/String;JILorg/apache/wicket/extensions/breadcrumb/IBreadCrumbParticipant;)L1org/apache/wicket/Component;
 removeListener
  (Lorg/apache/wicket/extensions/breadcrumb/IBreadCrumbModelListener;)V
  (L1org/apache/wicket/extensions/breadcrumb/IBreadCrumbModelListener;)V # @Inherited(org.apache.wicket.extensions.breadcrumb.IBreadCrumbModel)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanelFactory.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanelFactory.eea
index 5b3e2da941..9fc709671b 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanelFactory.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanelFactory.eea
@@ -5,4 +5,4 @@ class org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanelFactory
  (Ljava/lang/Class<+Lorg/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanel;>;)V
 create
  (Ljava/lang/String;Lorg/apache/wicket/extensions/breadcrumb/IBreadCrumbModel;)Lorg/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanel;
- (Ljava/lang/String;Lorg/apache/wicket/extensions/breadcrumb/IBreadCrumbModel;)Lorg/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanel;
+ (Ljava/lang/String;Lorg/apache/wicket/extensions/breadcrumb/IBreadCrumbModel;)L1org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanel; # @Inherited(org.apache.wicket.extensions.breadcrumb.panel.IBreadCrumbPanelFactory)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/breadcrumb/panel/IBreadCrumbPanelFactory.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/breadcrumb/panel/IBreadCrumbPanelFactory.eea
index eb483c7b59..efdfa943ca 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/breadcrumb/panel/IBreadCrumbPanelFactory.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/breadcrumb/panel/IBreadCrumbPanelFactory.eea
@@ -2,4 +2,4 @@ class org/apache/wicket/extensions/breadcrumb/panel/IBreadCrumbPanelFactory
 
 create
  (Ljava/lang/String;Lorg/apache/wicket/extensions/breadcrumb/IBreadCrumbModel;)Lorg/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanel;
- (Ljava/lang/String;Lorg/apache/wicket/extensions/breadcrumb/IBreadCrumbModel;)Lorg/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanel;
+ (Ljava/lang/String;Lorg/apache/wicket/extensions/breadcrumb/IBreadCrumbModel;)L1org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanel;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.eea
index 6dab8d7241..467a8215b4 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.eea
@@ -11,7 +11,7 @@ class org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;)V
 getLinkParser
  ()Lorg/apache/wicket/extensions/markup/html/basic/ILinkParser;
- ()Lorg/apache/wicket/extensions/markup/html/basic/ILinkParser;
+ ()L1org/apache/wicket/extensions/markup/html/basic/ILinkParser;
 getSmartLink
  (Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
  (Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.eea
index a7e54d7423..501a05d5ff 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.eea
@@ -8,7 +8,7 @@ class org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;)V
 getLinkParser
  ()Lorg/apache/wicket/extensions/markup/html/basic/ILinkParser;
- ()Lorg/apache/wicket/extensions/markup/html/basic/ILinkParser;
+ ()L1org/apache/wicket/extensions/markup/html/basic/ILinkParser;
 getSmartLink
  (Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
  (Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/DateTextField.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/DateTextField.eea
index 9d0ad91fbe..2d17e00b49 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/DateTextField.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/DateTextField.eea
@@ -18,10 +18,10 @@ super org/apache/wicket/markup/html/form/TextField
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/util/Date;>;Ljava/lang/String;)V
 createConverter
  (Ljava/lang/Class<*>;)Lorg/apache/wicket/util/convert/IConverter<*>;
- (Ljava/lang/Class<*>;)Lorg/apache/wicket/util/convert/IConverter<*>;
+ (Ljava/lang/Class<*>;)L0org/apache/wicket/util/convert/IConverter<*>; # @Inherited(org.apache.wicket.Component)
 getInputTypes
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(org.apache.wicket.markup.html.form.TextField)
 getTextFormat
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTextField.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTextField.eea
index cedcdbe416..587b494756 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTextField.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTextField.eea
@@ -21,7 +21,7 @@ super org/apache/wicket/markup/html/form/TextField
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/time/LocalDate;>;Ljava/time/format/FormatStyle;)V
 createConverter
  (Ljava/lang/Class<*>;)Lorg/apache/wicket/util/convert/IConverter<*>;
- (Ljava/lang/Class<*>;)Lorg/apache/wicket/util/convert/IConverter<*>;
+ (Ljava/lang/Class<*>;)L0org/apache/wicket/util/convert/IConverter<*>; # @Inherited(org.apache.wicket.Component)
 getTextFormat
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTimeField.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTimeField.eea
index 2460ce1218..bb4561efac 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTimeField.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTimeField.eea
@@ -12,7 +12,7 @@ super org/apache/wicket/extensions/markup/html/form/datetime/AbstractDateTimeFie
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/time/LocalDateTime;>;)V
 createTemporal
  (Ljava/time/LocalDate;Ljava/time/LocalTime;)Ljava/time/LocalDateTime;
- (Ljava/time/LocalDate;Ljava/time/LocalTime;)Ljava/time/LocalDateTime;
+ (Ljava/time/LocalDate;Ljava/time/LocalTime;)L1java/time/LocalDateTime;
 getLocalDate
  (Ljava/time/LocalDateTime;)Ljava/time/LocalDate;
  (Ljava/time/LocalDateTime;)Ljava/time/LocalDate;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTimeTextField.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTimeTextField.eea
index 0c419b07b8..6c63e7e05c 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTimeTextField.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTimeTextField.eea
@@ -18,7 +18,7 @@ super org/apache/wicket/markup/html/form/TextField
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/time/LocalDateTime;>;Ljava/time/format/FormatStyle;Ljava/time/format/FormatStyle;)V
 createConverter
  (Ljava/lang/Class<*>;)Lorg/apache/wicket/util/convert/IConverter<*>;
- (Ljava/lang/Class<*>;)Lorg/apache/wicket/util/convert/IConverter<*>;
+ (Ljava/lang/Class<*>;)L0org/apache/wicket/util/convert/IConverter<*>; # @Inherited(org.apache.wicket.Component)
 getTextFormat
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/LocalTimeTextField.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/LocalTimeTextField.eea
index 3b3ece85d7..281ef6b5b3 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/LocalTimeTextField.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/LocalTimeTextField.eea
@@ -18,7 +18,7 @@ super org/apache/wicket/markup/html/form/TextField
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/time/LocalTime;>;Ljava/time/format/FormatStyle;)V
 createConverter
  (Ljava/lang/Class<*>;)Lorg/apache/wicket/util/convert/IConverter<*>;
- (Ljava/lang/Class<*>;)Lorg/apache/wicket/util/convert/IConverter<*>;
+ (Ljava/lang/Class<*>;)L0org/apache/wicket/util/convert/IConverter<*>; # @Inherited(org.apache.wicket.Component)
 getTextFormat
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/TimeField$HoursModel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/TimeField$HoursModel.eea
index 661b3b6081..4114f183b0 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/TimeField$HoursModel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/TimeField$HoursModel.eea
@@ -9,7 +9,7 @@ super org/apache/wicket/model/IModel
  (Lorg/apache/wicket/extensions/markup/html/form/datetime/TimeField;)V
 getObject
  ()Ljava/lang/Integer;
- ()Ljava/lang/Integer;
+ ()L0java/lang/Integer;
 setObject
  (Ljava/lang/Integer;)V
  (Ljava/lang/Integer;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/TimeField.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/TimeField.eea
index ecc05a28be..0b9597dfde 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/TimeField.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/TimeField.eea
@@ -19,10 +19,10 @@ MINUTES_CSS_CLASS_KEY
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/time/LocalTime;>;)V
 getInput
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(org.apache.wicket.markup.html.form.FormComponent)
 newHoursTextField
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/lang/Integer;>;Ljava/lang/Class<Ljava/lang/Integer;>;)Lorg/apache/wicket/markup/html/form/TextField<Ljava/lang/Integer;>;
- (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/lang/Integer;>;Ljava/lang/Class<Ljava/lang/Integer;>;)Lorg/apache/wicket/markup/html/form/TextField<Ljava/lang/Integer;>;
+ (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/lang/Integer;>;Ljava/lang/Class<Ljava/lang/Integer;>;)L1org/apache/wicket/markup/html/form/TextField<Ljava/lang/Integer;>;
 newMinutesTextField
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/lang/Integer;>;Ljava/lang/Class<Ljava/lang/Integer;>;)Lorg/apache/wicket/markup/html/form/TextField<Ljava/lang/Integer;>;
- (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/lang/Integer;>;Ljava/lang/Class<Ljava/lang/Integer;>;)Lorg/apache/wicket/markup/html/form/TextField<Ljava/lang/Integer;>;
+ (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/lang/Integer;>;Ljava/lang/Class<Ljava/lang/Integer;>;)L1org/apache/wicket/markup/html/form/TextField<Ljava/lang/Integer;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/ZonedDateTimeField.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/ZonedDateTimeField.eea
index d4d2f81c49..5097979ea4 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/ZonedDateTimeField.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/ZonedDateTimeField.eea
@@ -12,7 +12,7 @@ super org/apache/wicket/extensions/markup/html/form/datetime/AbstractDateTimeFie
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/time/ZonedDateTime;>;)V
 createTemporal
  (Ljava/time/LocalDate;Ljava/time/LocalTime;)Ljava/time/ZonedDateTime;
- (Ljava/time/LocalDate;Ljava/time/LocalTime;)Ljava/time/ZonedDateTime;
+ (Ljava/time/LocalDate;Ljava/time/LocalTime;)L1java/time/ZonedDateTime;
 getLocalDate
  (Ljava/time/ZonedDateTime;)Ljava/time/LocalDate;
  (Ljava/time/ZonedDateTime;)Ljava/time/LocalDate;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/ZonedToLocalDateTimeModel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/ZonedToLocalDateTimeModel.eea
index dee8f75494..a30fcdb17a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/ZonedToLocalDateTimeModel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/datetime/ZonedToLocalDateTimeModel.eea
@@ -9,10 +9,10 @@ super org/apache/wicket/model/IModel
  (Lorg/apache/wicket/model/IModel<Ljava/time/ZonedDateTime;>;)V
 getClientTimeZone
  ()Ljava/time/ZoneId;
- ()Ljava/time/ZoneId;
+ ()L0java/time/ZoneId;
 getObject
  ()Ljava/time/LocalDateTime;
- ()Ljava/time/LocalDateTime;
+ ()L0java/time/LocalDateTime;
 getTargetTimeZone
  ()Ljava/time/ZoneId;
  ()Ljava/time/ZoneId;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/palette/Palette.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/palette/Palette.eea
index 80f7aaaaad..4d74048b07 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/palette/Palette.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/palette/Palette.eea
@@ -17,7 +17,7 @@ super org/apache/wicket/markup/html/form/FormComponentPanel
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<+Ljava/util/Collection<TT;>;>;Lorg/apache/wicket/model/IModel<+Ljava/util/Collection<+TT;>;>;Lorg/apache/wicket/markup/html/form/IChoiceRenderer<-TT;>;IZZ)V
 buildJSCall
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 getAddAllOnClickJS
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -26,10 +26,10 @@ getAddOnClickJS
  ()Ljava/lang/String;
 getAdditionalAttributesForChoices
  (Ljava/lang/Object;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
- (Ljava/lang/Object;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
+ (Ljava/lang/Object;)L0java/util/Map<Ljava/lang/String;Ljava/lang/String;>;
 getAdditionalAttributesForSelection
  (Ljava/lang/Object;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
- (Ljava/lang/Object;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
+ (Ljava/lang/Object;)L0java/util/Map<Ljava/lang/String;Ljava/lang/String;>;
 getChoiceRenderer
  ()Lorg/apache/wicket/markup/html/form/IChoiceRenderer<-TT;>;
  ()Lorg/apache/wicket/markup/html/form/IChoiceRenderer<-TT;>;
@@ -74,37 +74,37 @@ getUpOnClickJS
  ()Ljava/lang/String;
 newAddAllComponent
  ()Lorg/apache/wicket/Component;
- ()Lorg/apache/wicket/Component;
+ ()L1org/apache/wicket/Component;
 newAddComponent
  ()Lorg/apache/wicket/Component;
- ()Lorg/apache/wicket/Component;
+ ()L1org/apache/wicket/Component;
 newAvailableHeader
  (Ljava/lang/String;)Lorg/apache/wicket/Component;
- (Ljava/lang/String;)Lorg/apache/wicket/Component;
+ (Ljava/lang/String;)L1org/apache/wicket/Component;
 newChoicesComponent
  ()Lorg/apache/wicket/Component;
- ()Lorg/apache/wicket/Component;
+ ()L1org/apache/wicket/Component;
 newDownComponent
  ()Lorg/apache/wicket/Component;
- ()Lorg/apache/wicket/Component;
+ ()L1org/apache/wicket/Component;
 newRecorderComponent
  ()Lorg/apache/wicket/extensions/markup/html/form/palette/component/Recorder<TT;>;
- ()Lorg/apache/wicket/extensions/markup/html/form/palette/component/Recorder<TT;>;
+ ()L1org/apache/wicket/extensions/markup/html/form/palette/component/Recorder<TT;>;
 newRemoveAllComponent
  ()Lorg/apache/wicket/Component;
- ()Lorg/apache/wicket/Component;
+ ()L1org/apache/wicket/Component;
 newRemoveComponent
  ()Lorg/apache/wicket/Component;
- ()Lorg/apache/wicket/Component;
+ ()L1org/apache/wicket/Component;
 newSelectedHeader
  (Ljava/lang/String;)Lorg/apache/wicket/Component;
- (Ljava/lang/String;)Lorg/apache/wicket/Component;
+ (Ljava/lang/String;)L1org/apache/wicket/Component;
 newSelectionComponent
  ()Lorg/apache/wicket/Component;
- ()Lorg/apache/wicket/Component;
+ ()L1org/apache/wicket/Component;
 newUpComponent
  ()Lorg/apache/wicket/Component;
- ()Lorg/apache/wicket/Component;
+ ()L1org/apache/wicket/Component;
 renderHead
  (Lorg/apache/wicket/markup/head/IHeaderResponse;)V
  (L1org/apache/wicket/markup/head/IHeaderResponse;)V # @Inherited(org.apache.wicket.Component)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.eea
index a7f8d504f9..293cdb9c52 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.eea
@@ -11,10 +11,10 @@ super org/apache/wicket/markup/html/form/FormComponent
  (Ljava/lang/String;Lorg/apache/wicket/extensions/markup/html/form/palette/Palette<TT;>;)V
 getAdditionalAttributes
  (TT;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
- (TT;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
+ (TT;)L0java/util/Map<Ljava/lang/String;Ljava/lang/String;>;
 getModelValue
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getOptionsIterator
  ()Ljava/util/Iterator<TT;>;
  ()Ljava/util/Iterator<TT;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.eea
index c820ab5544..e4d6558a0f 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.eea
@@ -14,7 +14,7 @@ getPalette
  ()Lorg/apache/wicket/extensions/markup/html/form/palette/Palette<TT;>;
 getSelectedList
  ()Ljava/util/List<TT;>;
- ()Ljava/util/List<TT;>;
+ ()L1java/util/List<TT;>;
 getUnselectedList
  ()Ljava/util/List<TT;>;
- ()Ljava/util/List<TT;>;
+ ()L1java/util/List<TT;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/select/Select.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/select/Select.eea
index 0111112f01..0403d92eac 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/select/Select.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/select/Select.eea
@@ -14,7 +14,7 @@ super org/apache/wicket/markup/html/form/FormComponent
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)V
 getModelValue
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 isSelected
  (Lorg/apache/wicket/model/IModel<*>;)Z
  (Lorg/apache/wicket/model/IModel<*>;)Z
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/select/SelectOption.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/select/SelectOption.eea
index c60cd876a6..7e35872f82 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/select/SelectOption.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/select/SelectOption.eea
@@ -14,7 +14,7 @@ super org/apache/wicket/IGenericComponent
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)V
 getValue
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 onComponentTag
  (Lorg/apache/wicket/markup/ComponentTag;)V
  (L1org/apache/wicket/markup/ComponentTag;)V # @Inherited(org.apache.wicket.Component)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.eea
index fe26261304..65adc0c772 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.eea
@@ -10,7 +10,7 @@ class org/apache/wicket/extensions/markup/html/form/select/SelectOptions
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<+Ljava/util/Collection<+TT;>;>;Lorg/apache/wicket/extensions/markup/html/form/select/IOptionRenderer<TT;>;)V
 newOption
  (Ljava/lang/String;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/extensions/markup/html/form/select/SelectOption<TT;>;
- (Ljava/lang/String;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/extensions/markup/html/form/select/SelectOption<TT;>;
+ (Ljava/lang/String;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/extensions/markup/html/form/select/SelectOption<TT;>;
 setRecreateChoices
  (Z)Lorg/apache/wicket/extensions/markup/html/form/select/SelectOptions<TT;>;
  (Z)Lorg/apache/wicket/extensions/markup/html/form/select/SelectOptions<TT;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.eea
index 1adae2e5dc..77a2b53973 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.eea
@@ -14,13 +14,13 @@ internalGetPopulators
  ()Ljava/util/List<+Lorg/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator<TT;>;>;
 newCellItem
  (Ljava/lang/String;ILorg/apache/wicket/model/IModel<Lorg/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator<TT;>;>;)Lorg/apache/wicket/markup/repeater/Item<Lorg/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator<TT;>;>;
- (Ljava/lang/String;ILorg/apache/wicket/model/IModel<Lorg/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator<TT;>;>;)Lorg/apache/wicket/markup/repeater/Item<Lorg/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator<TT;>;>;
+ (Ljava/lang/String;ILorg/apache/wicket/model/IModel<Lorg/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator<TT;>;>;)L1org/apache/wicket/markup/repeater/Item<Lorg/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator<TT;>;>;
 newItem
  (Ljava/lang/String;ILorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/markup/repeater/Item<TT;>;
- (Ljava/lang/String;ILorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/markup/repeater/Item<TT;>;
+ (Ljava/lang/String;ILorg/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/markup/repeater/Item<TT;>; # @Inherited(org.apache.wicket.markup.repeater.RefreshingView)
 newRowItem
  (Ljava/lang/String;ILorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/markup/repeater/Item<TT;>;
- (Ljava/lang/String;ILorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/markup/repeater/Item<TT;>;
+ (Ljava/lang/String;ILorg/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/markup/repeater/Item<TT;>;
 populateItem
  (Lorg/apache/wicket/markup/repeater/Item<TT;>;)V
  (Lorg/apache/wicket/markup/repeater/Item<TT;>;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.eea
index 4333d6bcf0..a975a2891e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.eea
@@ -17,7 +17,7 @@ SORT_NONE_CSS_CLASS_KEY
  (Ljava/lang/String;TS;Lorg/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator<TS;>;)V
 newOrderByLink
  (Ljava/lang/String;TS;Lorg/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator<TS;>;)Lorg/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink<TS;>;
- (Ljava/lang/String;TS;Lorg/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator<TS;>;)Lorg/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink<TS;>;
+ (Ljava/lang/String;TS;Lorg/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator<TS;>;)L1org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink<TS;>;
 onComponentTag
  (Lorg/apache/wicket/markup/ComponentTag;)V
  (L1org/apache/wicket/markup/ComponentTag;)V # @Inherited(org.apache.wicket.Component)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.eea
index f9c1dfe4b4..75f86528f9 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.eea
@@ -14,13 +14,13 @@ super org/apache/wicket/extensions/markup/html/repeater/data/table/IStyledColumn
  (Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;TS;)V
 getCssClass
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getDisplayModel
  ()Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;
  ()Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;
 getHeader
  (Ljava/lang/String;)Lorg/apache/wicket/Component;
- (Ljava/lang/String;)Lorg/apache/wicket/Component;
+ (Ljava/lang/String;)L1org/apache/wicket/Component;
 getSortProperty
  ()TS;
  ()TS;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable$Caption.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable$Caption.eea
index 713c4b799c..4fbe3772b1 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable$Caption.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable$Caption.eea
@@ -5,4 +5,4 @@ class org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable$Cap
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;)V
 initModel
  ()Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;
- ()Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;
+ ()L0org/apache/wicket/model/IModel<Ljava/lang/String;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.eea
index e35ec47e60..c622978759 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.eea
@@ -22,7 +22,7 @@ getCaption
  ()Lorg/apache/wicket/extensions/markup/html/repeater/data/table/DataTable$Caption;
 getCaptionModel
  ()Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;
- ()Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;
+ ()L0org/apache/wicket/model/IModel<Ljava/lang/String;>;
 getColGroup
  ()Lorg/apache/wicket/extensions/markup/html/repeater/data/table/ColGroup;
  ()Lorg/apache/wicket/extensions/markup/html/repeater/data/table/ColGroup;
@@ -37,13 +37,13 @@ getTopToolbars
  ()Lorg/apache/wicket/markup/html/WebMarkupContainer;
 newBodyContainer
  (Ljava/lang/String;)Lorg/apache/wicket/markup/html/WebMarkupContainer;
- (Ljava/lang/String;)Lorg/apache/wicket/markup/html/WebMarkupContainer;
+ (Ljava/lang/String;)L1org/apache/wicket/markup/html/WebMarkupContainer;
 newCellItem
  (Ljava/lang/String;ILorg/apache/wicket/model/IModel<Lorg/apache/wicket/extensions/markup/html/repeater/data/table/IColumn<TT;TS;>;>;)Lorg/apache/wicket/markup/repeater/Item<Lorg/apache/wicket/extensions/markup/html/repeater/data/table/IColumn<TT;TS;>;>;
- (Ljava/lang/String;ILorg/apache/wicket/model/IModel<Lorg/apache/wicket/extensions/markup/html/repeater/data/table/IColumn<TT;TS;>;>;)Lorg/apache/wicket/markup/repeater/Item<Lorg/apache/wicket/extensions/markup/html/repeater/data/table/IColumn<TT;TS;>;>;
+ (Ljava/lang/String;ILorg/apache/wicket/model/IModel<Lorg/apache/wicket/extensions/markup/html/repeater/data/table/IColumn<TT;TS;>;>;)L1org/apache/wicket/markup/repeater/Item<Lorg/apache/wicket/extensions/markup/html/repeater/data/table/IColumn<TT;TS;>;>;
 newDataGridView
  (Ljava/lang/String;Ljava/util/List<+Lorg/apache/wicket/extensions/markup/html/repeater/data/table/IColumn<TT;TS;>;>;Lorg/apache/wicket/markup/repeater/data/IDataProvider<TT;>;)Lorg/apache/wicket/extensions/markup/html/repeater/data/grid/DataGridView<TT;>;
- (Ljava/lang/String;Ljava/util/List<+Lorg/apache/wicket/extensions/markup/html/repeater/data/table/IColumn<TT;TS;>;>;Lorg/apache/wicket/markup/repeater/data/IDataProvider<TT;>;)Lorg/apache/wicket/extensions/markup/html/repeater/data/grid/DataGridView<TT;>;
+ (Ljava/lang/String;Ljava/util/List<+Lorg/apache/wicket/extensions/markup/html/repeater/data/table/IColumn<TT;TS;>;>;Lorg/apache/wicket/markup/repeater/data/IDataProvider<TT;>;)L1org/apache/wicket/extensions/markup/html/repeater/data/grid/DataGridView<TT;>;
 newRowItem
  (Ljava/lang/String;ILorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/markup/repeater/Item<TT;>;
  (L1java/lang/String;IL1org/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/markup/repeater/Item<TT;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/HeaderlessColumn.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/HeaderlessColumn.eea
index 2b05c055d9..dbba51b38d 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/HeaderlessColumn.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/HeaderlessColumn.eea
@@ -8,4 +8,4 @@ super org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColum
 
 getHeader
  (Ljava/lang/String;)Lorg/apache/wicket/Component;
- (Ljava/lang/String;)Lorg/apache/wicket/Component;
+ (Ljava/lang/String;)L1org/apache/wicket/Component; # @Inherited(org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.eea
index 715a997dc1..6720dd4cdd 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.eea
@@ -7,4 +7,4 @@ class org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolba
  <T:Ljava/lang/Object;>(Lorg/apache/wicket/extensions/markup/html/repeater/data/table/DataTable<TT;TS;>;Lorg/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator<TS;>;)V
 newSortableHeader
  (Ljava/lang/String;TS;Lorg/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator<TS;>;)Lorg/apache/wicket/markup/html/WebMarkupContainer;
- (Ljava/lang/String;TS;Lorg/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator<TS;>;)Lorg/apache/wicket/markup/html/WebMarkupContainer;
+ (Ljava/lang/String;TS;Lorg/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator<TS;>;)L1org/apache/wicket/markup/html/WebMarkupContainer;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/LambdaColumn.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/LambdaColumn.eea
index f244c50725..0c88e76c94 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/LambdaColumn.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/LambdaColumn.eea
@@ -17,7 +17,7 @@ super org/apache/wicket/extensions/markup/html/repeater/data/table/export/IExpor
  (Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;TS;Lorg/danekja/java/util/function/serializable/SerializableFunction<TT;*>;)V
 getDataModel
  (Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/model/IModel<*>;
- (Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/model/IModel<*>;
+ (Lorg/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/model/IModel<*>;
 populateItem
  (Lorg/apache/wicket/markup/repeater/Item<Lorg/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator<TT;>;>;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)V
  (Lorg/apache/wicket/markup/repeater/Item<Lorg/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator<TT;>;>;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.eea
index c44bdd0bfe..82a3df34b2 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.eea
@@ -5,7 +5,7 @@ class org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToo
  (Lorg/apache/wicket/extensions/markup/html/repeater/data/table/DataTable<**>;)V
 newNavigatorLabel
  (Ljava/lang/String;Lorg/apache/wicket/extensions/markup/html/repeater/data/table/DataTable<**>;)Lorg/apache/wicket/Component;
- (Ljava/lang/String;Lorg/apache/wicket/extensions/markup/html/repeater/data/table/DataTable<**>;)Lorg/apache/wicket/Component;
+ (Ljava/lang/String;Lorg/apache/wicket/extensions/markup/html/repeater/data/table/DataTable<**>;)L1org/apache/wicket/Component;
 newPagingNavigator
  (Ljava/lang/String;Lorg/apache/wicket/extensions/markup/html/repeater/data/table/DataTable<**>;)Lorg/apache/wicket/markup/html/navigation/paging/PagingNavigator;
- (Ljava/lang/String;Lorg/apache/wicket/extensions/markup/html/repeater/data/table/DataTable<**>;)Lorg/apache/wicket/markup/html/navigation/paging/PagingNavigator;
+ (Ljava/lang/String;Lorg/apache/wicket/extensions/markup/html/repeater/data/table/DataTable<**>;)L1org/apache/wicket/markup/html/navigation/paging/PagingNavigator;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.eea
index 8766eac1c7..4ce5faed6e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.eea
@@ -17,7 +17,7 @@ super org/apache/wicket/extensions/markup/html/repeater/data/table/export/IExpor
  (Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;TS;Ljava/lang/String;)V
 getDataModel
  (Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/model/IModel<*>;
- (Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/model/IModel<*>;
+ (Lorg/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/model/IModel<*>;
 getPropertyExpression
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/export/AbstractExportableColumn.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/export/AbstractExportableColumn.eea
index a6f8321469..10b4e5d5a4 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/export/AbstractExportableColumn.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/export/AbstractExportableColumn.eea
@@ -17,7 +17,7 @@ super org/apache/wicket/extensions/markup/html/repeater/data/table/export/IExpor
  (Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;TS;)V
 createDisplayComponent
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<*>;)Lorg/apache/wicket/Component;
- (Ljava/lang/String;Lorg/apache/wicket/model/IModel<*>;)Lorg/apache/wicket/Component;
+ (Ljava/lang/String;Lorg/apache/wicket/model/IModel<*>;)L1org/apache/wicket/Component;
 populateItem
  (Lorg/apache/wicket/markup/repeater/Item<Lorg/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator<TT;>;>;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)V
  (Lorg/apache/wicket/markup/repeater/Item<Lorg/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator<TT;>;>;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/export/CSVDataExporter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/export/CSVDataExporter.eea
index 965b94b42c..43520163e6 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/export/CSVDataExporter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/export/CSVDataExporter.eea
@@ -8,13 +8,13 @@ getCharacterSet
  ()Ljava/lang/String;
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getConverterLocator
  ()Lorg/apache/wicket/IConverterLocator;
  ()Lorg/apache/wicket/IConverterLocator;
 quoteValue
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 setCharacterSet
  (Ljava/lang/String;)Lorg/apache/wicket/extensions/markup/html/repeater/data/table/export/CSVDataExporter;
  (Ljava/lang/String;)Lorg/apache/wicket/extensions/markup/html/repeater/data/table/export/CSVDataExporter;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar$DataExportResourceStreamWriter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar$DataExportResourceStreamWriter.eea
index 6f95cbb0b0..02ca9f8bd8 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar$DataExportResourceStreamWriter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar$DataExportResourceStreamWriter.eea
@@ -5,7 +5,7 @@ class org/apache/wicket/extensions/markup/html/repeater/data/table/export/Export
  (Lorg/apache/wicket/extensions/markup/html/repeater/data/table/export/IDataExporter;Lorg/apache/wicket/extensions/markup/html/repeater/data/table/DataTable<**>;)V
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(org.apache.wicket.util.resource.AbstractResourceStreamWriter)
 write
  (Ljava/io/OutputStream;)V
  (Ljava/io/OutputStream;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar.eea
index e60f5e8567..86fee657ca 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar.eea
@@ -14,7 +14,7 @@ addDataExporter
  (Lorg/apache/wicket/extensions/markup/html/repeater/data/table/export/IDataExporter;)Lorg/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar;
 createExportLink
  (Ljava/lang/String;Lorg/apache/wicket/extensions/markup/html/repeater/data/table/export/IDataExporter;)Lorg/apache/wicket/Component;
- (Ljava/lang/String;Lorg/apache/wicket/extensions/markup/html/repeater/data/table/export/IDataExporter;)Lorg/apache/wicket/Component;
+ (Ljava/lang/String;Lorg/apache/wicket/extensions/markup/html/repeater/data/table/export/IDataExporter;)L1org/apache/wicket/Component;
 getCacheDuration
  ()Ljava/time/Duration;
  ()Ljava/time/Duration;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.eea
index 404b5639ff..e6902413c1 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.eea
@@ -19,4 +19,4 @@ getChoice
  ()Lorg/apache/wicket/markup/html/form/DropDownChoice<TT;>;
 newDropDownChoice
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;Lorg/apache/wicket/model/IModel<+Ljava/util/List<+TT;>;>;Lorg/apache/wicket/markup/html/form/IChoiceRenderer<-TT;>;)Lorg/apache/wicket/markup/html/form/DropDownChoice<TT;>;
- (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;Lorg/apache/wicket/model/IModel<+Ljava/util/List<+TT;>;>;Lorg/apache/wicket/markup/html/form/IChoiceRenderer<-TT;>;)Lorg/apache/wicket/markup/html/form/DropDownChoice<TT;>;
+ (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;Lorg/apache/wicket/model/IModel<+Ljava/util/List<+TT;>;>;Lorg/apache/wicket/markup/html/form/IChoiceRenderer<-TT;>;)L1org/apache/wicket/markup/html/form/DropDownChoice<TT;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.eea
index 6fbc94c098..27917e8f4b 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.eea
@@ -14,7 +14,7 @@ super org/apache/wicket/extensions/markup/html/repeater/data/table/filter/Filter
  (Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;TS;Ljava/lang/String;Lorg/apache/wicket/model/IModel<+Ljava/util/List<+TY;>;>;)V
 getChoiceRenderer
  ()Lorg/apache/wicket/markup/html/form/IChoiceRenderer<TY;>;
- ()Lorg/apache/wicket/markup/html/form/IChoiceRenderer<TY;>;
+ ()L0org/apache/wicket/markup/html/form/IChoiceRenderer<TY;>;
 getFilter
  (Ljava/lang/String;Lorg/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm<*>;)Lorg/apache/wicket/Component;
  (L1java/lang/String;L1org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm<*>;)L0org/apache/wicket/Component; # @Inherited(org.apache.wicket.extensions.markup.html.repeater.data.table.filter.IFilteredColumn)
@@ -23,4 +23,4 @@ getFilterChoices
  ()Lorg/apache/wicket/model/IModel<+Ljava/util/List<+TY;>;>;
 getFilterModel
  (Lorg/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm<*>;)Lorg/apache/wicket/model/IModel<TY;>;
- (Lorg/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm<*>;)Lorg/apache/wicket/model/IModel<TY;>;
+ (Lorg/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm<*>;)L1org/apache/wicket/model/IModel<TY;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.eea
index bbb8bae58c..472adc97f5 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.eea
@@ -17,7 +17,7 @@ generateHiddenInputMarkup
  ()Ljava/lang/String;
 getFocusTrackerFieldCssId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getFocusTrackingHandler
  (Lorg/apache/wicket/Component;)Ljava/lang/String;
  (Lorg/apache/wicket/Component;)Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.eea
index ec22ab82b0..478963ca4e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.eea
@@ -17,4 +17,4 @@ getFilter
  (L1java/lang/String;L1org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm<*>;)L0org/apache/wicket/Component; # @Inherited(org.apache.wicket.extensions.markup.html.repeater.data.table.filter.IFilteredColumn)
 getFilterModel
  (Lorg/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm<*>;)Lorg/apache/wicket/model/IModel<TF;>;
- (Lorg/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm<*>;)Lorg/apache/wicket/model/IModel<TF;>;
+ (Lorg/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm<*>;)L1org/apache/wicket/model/IModel<TF;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/AbstractTree.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/AbstractTree.eea
index cc9227e81a..198706a444 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/AbstractTree.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/AbstractTree.eea
@@ -38,7 +38,7 @@ newModel
  ()Lorg/apache/wicket/model/IModel<Ljava/util/Set<TT;>;>;
 newNodeComponent
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/Component;
- (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/Component;
+ (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/Component;
 setItemReuseStrategy
  (Lorg/apache/wicket/markup/repeater/IItemReuseStrategy;)Lorg/apache/wicket/extensions/markup/html/repeater/tree/AbstractTree<TT;>;
  (Lorg/apache/wicket/markup/repeater/IItemReuseStrategy;)Lorg/apache/wicket/extensions/markup/html/repeater/tree/AbstractTree<TT;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/DefaultNestedTree.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/DefaultNestedTree.eea
index aacd127ea4..553dc41d3e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/DefaultNestedTree.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/DefaultNestedTree.eea
@@ -14,4 +14,4 @@ super org/apache/wicket/extensions/markup/html/repeater/tree/NestedTree
  (Ljava/lang/String;Lorg/apache/wicket/extensions/markup/html/repeater/tree/ITreeProvider<TT;>;Lorg/apache/wicket/model/IModel<+Ljava/util/Set<TT;>;>;)V
 newContentComponent
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/Component;
- (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/Component;
+ (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/Component;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/DefaultTableTree.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/DefaultTableTree.eea
index 86c94cecf5..cc652fc8ba 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/DefaultTableTree.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/DefaultTableTree.eea
@@ -14,7 +14,7 @@ super org/apache/wicket/extensions/markup/html/repeater/tree/TableTree
  (Ljava/lang/String;Ljava/util/List<+Lorg/apache/wicket/extensions/markup/html/repeater/data/table/IColumn<TT;TS;>;>;Lorg/apache/wicket/extensions/markup/html/repeater/tree/ISortableTreeProvider<TT;TS;>;ILorg/apache/wicket/model/IModel<+Ljava/util/Set<TT;>;>;)V
 newContentComponent
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/Component;
- (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/Component;
+ (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/Component;
 newRowItem
  (Ljava/lang/String;ILorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/markup/repeater/Item<TT;>;
- (Ljava/lang/String;ILorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/markup/repeater/Item<TT;>;
+ (Ljava/lang/String;ILorg/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/markup/repeater/Item<TT;>; # @Inherited(org.apache.wicket.extensions.markup.html.repeater.tree.TableTree)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/NestedTree.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/NestedTree.eea
index 051aafd47c..71db6c1103 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/NestedTree.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/NestedTree.eea
@@ -14,10 +14,10 @@ super org/apache/wicket/extensions/markup/html/repeater/tree/AbstractTree
  (Ljava/lang/String;Lorg/apache/wicket/extensions/markup/html/repeater/tree/ITreeProvider<TT;>;Lorg/apache/wicket/model/IModel<+Ljava/util/Set<TT;>;>;)V
 newNodeComponent
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/Component;
- (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/Component;
+ (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/Component; # @Inherited(org.apache.wicket.extensions.markup.html.repeater.tree.AbstractTree)
 newSubtree
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/Component;
- (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/Component;
+ (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/Component;
 updateBranch
  (TT;Lorg/apache/wicket/core/request/handler/IPartialPageRequestHandler;)V
  (TT;Lorg/apache/wicket/core/request/handler/IPartialPageRequestHandler;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/Node.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/Node.eea
index 8dcaeb9cde..c876600e03 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/Node.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/Node.eea
@@ -20,10 +20,10 @@ OTHER_CLASS_KEY
  (Ljava/lang/String;Lorg/apache/wicket/extensions/markup/html/repeater/tree/AbstractTree<TT;>;Lorg/apache/wicket/model/IModel<TT;>;)V
 createContent
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/Component;
- (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/Component;
+ (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/Component;
 createJunctionComponent
  (Ljava/lang/String;)Lorg/apache/wicket/MarkupContainer;
- (Ljava/lang/String;)Lorg/apache/wicket/MarkupContainer;
+ (Ljava/lang/String;)L1org/apache/wicket/MarkupContainer;
 getCollapsedStyleClass
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.eea
index 5521b4a475..787d31705c 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.eea
@@ -17,13 +17,13 @@ getTable
  ()Lorg/apache/wicket/extensions/markup/html/repeater/data/table/DataTable<TT;TS;>;
 newDataProvider
  (Lorg/apache/wicket/extensions/markup/html/repeater/tree/ITreeProvider<TT;>;)Lorg/apache/wicket/extensions/markup/html/repeater/tree/table/ITreeDataProvider<TT;>;
- (Lorg/apache/wicket/extensions/markup/html/repeater/tree/ITreeProvider<TT;>;)Lorg/apache/wicket/extensions/markup/html/repeater/tree/table/ITreeDataProvider<TT;>;
+ (Lorg/apache/wicket/extensions/markup/html/repeater/tree/ITreeProvider<TT;>;)L1org/apache/wicket/extensions/markup/html/repeater/tree/table/ITreeDataProvider<TT;>;
 newDataTable
  (Ljava/lang/String;Ljava/util/List<+Lorg/apache/wicket/extensions/markup/html/repeater/data/table/IColumn<TT;TS;>;>;Lorg/apache/wicket/markup/repeater/data/IDataProvider<TT;>;J)Lorg/apache/wicket/extensions/markup/html/repeater/data/table/DataTable<TT;TS;>;
- (Ljava/lang/String;Ljava/util/List<+Lorg/apache/wicket/extensions/markup/html/repeater/data/table/IColumn<TT;TS;>;>;Lorg/apache/wicket/markup/repeater/data/IDataProvider<TT;>;J)Lorg/apache/wicket/extensions/markup/html/repeater/data/table/DataTable<TT;TS;>;
+ (Ljava/lang/String;Ljava/util/List<+Lorg/apache/wicket/extensions/markup/html/repeater/data/table/IColumn<TT;TS;>;>;Lorg/apache/wicket/markup/repeater/data/IDataProvider<TT;>;J)L1org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable<TT;TS;>;
 newRowItem
  (Ljava/lang/String;ILorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/markup/repeater/Item<TT;>;
- (Ljava/lang/String;ILorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/markup/repeater/Item<TT;>;
+ (Ljava/lang/String;ILorg/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/markup/repeater/Item<TT;>;
 setItemReuseStrategy
  (Lorg/apache/wicket/markup/repeater/IItemReuseStrategy;)Lorg/apache/wicket/extensions/markup/html/repeater/tree/TableTree<TT;TS;>;
  (Lorg/apache/wicket/markup/repeater/IItemReuseStrategy;)Lorg/apache/wicket/extensions/markup/html/repeater/tree/TableTree<TT;TS;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/content/CheckedFolder.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/content/CheckedFolder.eea
index 35a44bf892..87609c36a3 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/content/CheckedFolder.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/content/CheckedFolder.eea
@@ -11,7 +11,7 @@ super org/apache/wicket/extensions/markup/html/repeater/tree/content/Folder
  (Ljava/lang/String;Lorg/apache/wicket/extensions/markup/html/repeater/tree/AbstractTree<TT;>;Lorg/apache/wicket/model/IModel<TT;>;)V
 newCheckBox
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/Component;
- (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/Component;
+ (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/Component;
 newCheckBoxModel
  (Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/model/IModel<Ljava/lang/Boolean;>;
  (Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/model/IModel<Ljava/lang/Boolean;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/content/Folder.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/content/Folder.eea
index ef3973f810..9316d803af 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/content/Folder.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/content/Folder.eea
@@ -36,7 +36,7 @@ getSelectedStyleClass
  ()Ljava/lang/String;
 getStyleClass
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 onClick
  (Ljava/util/Optional<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)V
  (Ljava/util/Optional<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/content/StyledLinkLabel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/content/StyledLinkLabel.eea
index 237d77ef4d..eac57b795f 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/content/StyledLinkLabel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/content/StyledLinkLabel.eea
@@ -16,13 +16,13 @@ getStyleClass
  ()Ljava/lang/String;
 newLabelComponent
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/Component;
- (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/Component;
+ (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/Component;
 newLabelModel
  (Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/model/IModel<*>;
  (Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/model/IModel<*>;
 newLinkComponent
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/MarkupContainer;
- (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/MarkupContainer;
+ (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/MarkupContainer;
 onClick
  (Ljava/util/Optional<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)V
  (Ljava/util/Optional<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/nested/Subtree.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/nested/Subtree.eea
index 666c4dc82b..40facacad9 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/nested/Subtree.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/nested/Subtree.eea
@@ -13,4 +13,4 @@ getModelObject
  ()TT;
 newBranchItem
  (Ljava/lang/String;ILorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/extensions/markup/html/repeater/tree/nested/BranchItem<TT;>;
- (Ljava/lang/String;ILorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/extensions/markup/html/repeater/tree/nested/BranchItem<TT;>;
+ (Ljava/lang/String;ILorg/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/extensions/markup/html/repeater/tree/nested/BranchItem<TT;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModel.eea
index 40858d324d..36b843533d 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModel.eea
@@ -17,7 +17,7 @@ getBranches
  ()[Z
 getObject
  ()TT;
- ()TT;
+ ()T0T; # @Inherited(org.apache.wicket.model.IWrapModel)
 getWrappedModel
  ()Lorg/apache/wicket/model/IModel<TT;>;
  ()Lorg/apache/wicket/model/IModel<TT;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeColumn.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeColumn.eea
index c50ebfe1a4..1dcdf495b8 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeColumn.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeColumn.eea
@@ -14,7 +14,7 @@ super org/apache/wicket/extensions/markup/html/repeater/tree/table/AbstractTreeC
  (Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;TS;)V
 getCssClass
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn)
 populateItem
  (Lorg/apache/wicket/markup/repeater/Item<Lorg/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator<TT;>;>;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)V
  (Lorg/apache/wicket/markup/repeater/Item<Lorg/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator<TT;>;>;Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProvider.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProvider.eea
index 8e65aeb2e1..951c68b15a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProvider.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProvider.eea
@@ -14,7 +14,7 @@ iterateChildren
  (TT;)Z
 iterator
  (JJ)Ljava/util/Iterator<+TT;>;
- (JJ)Ljava/util/Iterator<+TT;>;
+ (JJ)L1java/util/Iterator<+TT;>;
 model
  (TT;)Lorg/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModel<TT;>;
  (TT;)Lorg/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModel<TT;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubset.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubset.eea
index 86e3191b3a..e2efed5060 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubset.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubset.eea
@@ -26,7 +26,7 @@ containsAll
  (L1java/util/Collection<*>;)Z # @Inherited(java.util.Set)
 createModel
  ()Lorg/apache/wicket/model/IModel<Ljava/util/Set<TT;>;>;
- ()Lorg/apache/wicket/model/IModel<Ljava/util/Set<TT;>;>;
+ ()L1org/apache/wicket/model/IModel<Ljava/util/Set<TT;>;>;
 iterator
  ()Ljava/util/Iterator<TT;>;
  ()L1java/util/Iterator<TT;>; # @Inherited(java.lang.Iterable)
@@ -44,4 +44,4 @@ toArray
  ()[1Ljava/lang/Object; # @Inherited(java.util.Set)
 toArray
  <S:Ljava/lang/Object;>([TS;)[TS;
- <S:Ljava/lang/Object;>([TS;)[TS;
+ <S:Ljava/lang/Object;>([TS;)[1TS;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProvider.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProvider.eea
index 7779d649fa..f00b14f225 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProvider.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProvider.eea
@@ -27,7 +27,7 @@ cast
  (Ljava/lang/Object;)TT;
 getChildren
  (TT;)Ljava/util/Iterator<TT;>;
- (TT;)Ljava/util/Iterator<TT;>;
+ (TT;)L1java/util/Iterator<TT;>;
 getRoots
  ()Ljava/util/Iterator<TT;>;
  ()Ljava/util/Iterator<TT;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.eea
index 73e59974b2..7df3eb5115 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.eea
@@ -38,16 +38,16 @@ initModel
  ()Lorg/apache/wicket/model/IModel<*>;
 newLink
  (Ljava/lang/String;I)Lorg/apache/wicket/markup/html/WebMarkupContainer;
- (Ljava/lang/String;I)Lorg/apache/wicket/markup/html/WebMarkupContainer;
+ (Ljava/lang/String;I)L1org/apache/wicket/markup/html/WebMarkupContainer;
 newTabContainer
  (I)Lorg/apache/wicket/markup/html/list/LoopItem;
- (I)Lorg/apache/wicket/markup/html/list/LoopItem;
+ (I)L1org/apache/wicket/markup/html/list/LoopItem;
 newTabsContainer
  (Ljava/lang/String;)Lorg/apache/wicket/markup/html/WebMarkupContainer;
- (Ljava/lang/String;)Lorg/apache/wicket/markup/html/WebMarkupContainer;
+ (Ljava/lang/String;)L1org/apache/wicket/markup/html/WebMarkupContainer;
 newTitle
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<*>;I)Lorg/apache/wicket/Component;
- (Ljava/lang/String;Lorg/apache/wicket/model/IModel<*>;I)Lorg/apache/wicket/Component;
+ (Ljava/lang/String;Lorg/apache/wicket/model/IModel<*>;I)L1org/apache/wicket/Component;
 setSelectedTab
  (I)Lorg/apache/wicket/extensions/markup/html/tabs/TabbedPanel<TT;>;
  (I)Lorg/apache/wicket/extensions/markup/html/tabs/TabbedPanel<TT;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/rating/RatingPanel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/rating/RatingPanel.eea
index eaebdfee5a..158d5d575a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/rating/RatingPanel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/rating/RatingPanel.eea
@@ -27,16 +27,16 @@ STAR1
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<+Ljava/lang/Number;>;Lorg/apache/wicket/model/IModel<Ljava/lang/Integer;>;Lorg/apache/wicket/model/IModel<Ljava/lang/Integer;>;Lorg/apache/wicket/model/IModel<Ljava/lang/Boolean;>;Z)V
 getActiveStarUrl
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 getInactiveStarUrl
  (I)Ljava/lang/String;
- (I)Ljava/lang/String;
+ (I)L1java/lang/String;
 newRatingLabel
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<+Ljava/lang/Number;>;Lorg/apache/wicket/model/IModel<Ljava/lang/Integer;>;)Lorg/apache/wicket/Component;
- (Ljava/lang/String;Lorg/apache/wicket/model/IModel<+Ljava/lang/Number;>;Lorg/apache/wicket/model/IModel<Ljava/lang/Integer;>;)Lorg/apache/wicket/Component;
+ (Ljava/lang/String;Lorg/apache/wicket/model/IModel<+Ljava/lang/Number;>;Lorg/apache/wicket/model/IModel<Ljava/lang/Integer;>;)L1org/apache/wicket/Component;
 newRatingStarBar
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/lang/Integer;>;)Lorg/apache/wicket/Component;
- (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/lang/Integer;>;)Lorg/apache/wicket/Component;
+ (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/lang/Integer;>;)L1org/apache/wicket/Component;
 onRated
  (ILjava/util/Optional<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)V
  (ILjava/util/Optional<Lorg/apache/wicket/ajax/AjaxRequestTarget;>;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/util/encoding/CharSetMap.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/util/encoding/CharSetMap.eea
index 4d78bd61f6..170bd658c2 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/util/encoding/CharSetMap.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/util/encoding/CharSetMap.eea
@@ -15,7 +15,7 @@ loadPath
  (Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
 loadResource
  (Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
+ (Ljava/lang/String;)L0java/util/Map<Ljava/lang/String;Ljava/lang/String;>;
 loadStream
  (Ljava/io/InputStream;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
  (Ljava/io/InputStream;)Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;
@@ -34,13 +34,13 @@ loadStream
  (Ljava/util/Properties;)V
 getCharSet
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 getCharSet
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 getCharSet
  (Ljava/util/Locale;)Ljava/lang/String;
- (Ljava/util/Locale;)Ljava/lang/String;
+ (Ljava/util/Locale;)L1java/lang/String;
 getCharSet
  (Ljava/util/Locale;Ljava/lang/String;)Ljava/lang/String;
  (Ljava/util/Locale;Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/wizard/StaticContentStep.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/wizard/StaticContentStep.eea
index bbbc293a84..e47a394bb7 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/wizard/StaticContentStep.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/wizard/StaticContentStep.eea
@@ -14,7 +14,7 @@ class org/apache/wicket/extensions/wizard/StaticContentStep
  (Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;Lorg/apache/wicket/model/IModel<*>;Z)V
 getContent
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getContentModel
  ()Lorg/apache/wicket/model/IModel<*>;
  ()Lorg/apache/wicket/model/IModel<*>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/wizard/Wizard.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/wizard/Wizard.eea
index 4485102029..b7bc256db9 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/wizard/Wizard.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/wizard/Wizard.eea
@@ -39,13 +39,13 @@ init
  (Lorg/apache/wicket/extensions/wizard/IWizardModel;)V
 newButtonBar
  (Ljava/lang/String;)Lorg/apache/wicket/Component;
- (Ljava/lang/String;)Lorg/apache/wicket/Component;
+ (Ljava/lang/String;)L1org/apache/wicket/Component;
 newFeedbackPanel
  (Ljava/lang/String;)Lorg/apache/wicket/Component;
- (Ljava/lang/String;)Lorg/apache/wicket/Component;
+ (Ljava/lang/String;)L1org/apache/wicket/Component;
 newForm
  <E:Ljava/lang/Object;>(Ljava/lang/String;)Lorg/apache/wicket/markup/html/form/Form<TE;>;
- <E:Ljava/lang/Object;>(Ljava/lang/String;)Lorg/apache/wicket/markup/html/form/Form<TE;>;
+ <E:Ljava/lang/Object;>(Ljava/lang/String;)L1org/apache/wicket/markup/html/form/Form<TE;>;
 newOverviewBar
  (Ljava/lang/String;)Lorg/apache/wicket/Component;
  (Ljava/lang/String;)Lorg/apache/wicket/Component;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/wizard/WizardButtonBar.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/wizard/WizardButtonBar.eea
index 18ed47c1fc..99e9c234a1 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/wizard/WizardButtonBar.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/wizard/WizardButtonBar.eea
@@ -5,19 +5,19 @@ class org/apache/wicket/extensions/wizard/WizardButtonBar
  (Ljava/lang/String;Lorg/apache/wicket/extensions/wizard/IWizard;)V
 getDefaultButton
  (Lorg/apache/wicket/extensions/wizard/IWizardModel;)Lorg/apache/wicket/extensions/wizard/WizardButton;
- (Lorg/apache/wicket/extensions/wizard/IWizardModel;)Lorg/apache/wicket/extensions/wizard/WizardButton;
+ (Lorg/apache/wicket/extensions/wizard/IWizardModel;)L0org/apache/wicket/extensions/wizard/WizardButton;
 newCancelButton
  (Ljava/lang/String;Lorg/apache/wicket/extensions/wizard/IWizard;)Lorg/apache/wicket/extensions/wizard/WizardButton;
- (Ljava/lang/String;Lorg/apache/wicket/extensions/wizard/IWizard;)Lorg/apache/wicket/extensions/wizard/WizardButton;
+ (Ljava/lang/String;Lorg/apache/wicket/extensions/wizard/IWizard;)L1org/apache/wicket/extensions/wizard/WizardButton;
 newFinishButton
  (Ljava/lang/String;Lorg/apache/wicket/extensions/wizard/IWizard;)Lorg/apache/wicket/extensions/wizard/WizardButton;
- (Ljava/lang/String;Lorg/apache/wicket/extensions/wizard/IWizard;)Lorg/apache/wicket/extensions/wizard/WizardButton;
+ (Ljava/lang/String;Lorg/apache/wicket/extensions/wizard/IWizard;)L1org/apache/wicket/extensions/wizard/WizardButton;
 newLastButton
  (Ljava/lang/String;Lorg/apache/wicket/extensions/wizard/IWizard;)Lorg/apache/wicket/extensions/wizard/WizardButton;
- (Ljava/lang/String;Lorg/apache/wicket/extensions/wizard/IWizard;)Lorg/apache/wicket/extensions/wizard/WizardButton;
+ (Ljava/lang/String;Lorg/apache/wicket/extensions/wizard/IWizard;)L1org/apache/wicket/extensions/wizard/WizardButton;
 newNextButton
  (Ljava/lang/String;Lorg/apache/wicket/extensions/wizard/IWizard;)Lorg/apache/wicket/extensions/wizard/WizardButton;
- (Ljava/lang/String;Lorg/apache/wicket/extensions/wizard/IWizard;)Lorg/apache/wicket/extensions/wizard/WizardButton;
+ (Ljava/lang/String;Lorg/apache/wicket/extensions/wizard/IWizard;)L1org/apache/wicket/extensions/wizard/WizardButton;
 newPreviousButton
  (Ljava/lang/String;Lorg/apache/wicket/extensions/wizard/IWizard;)Lorg/apache/wicket/extensions/wizard/WizardButton;
- (Ljava/lang/String;Lorg/apache/wicket/extensions/wizard/IWizard;)Lorg/apache/wicket/extensions/wizard/WizardButton;
+ (Ljava/lang/String;Lorg/apache/wicket/extensions/wizard/IWizard;)L1org/apache/wicket/extensions/wizard/WizardButton;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/wizard/WizardStep.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/wizard/WizardStep.eea
index 8a9b5766fe..c32cec528f 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/wizard/WizardStep.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/wizard/WizardStep.eea
@@ -17,13 +17,13 @@ add
  (Lorg/apache/wicket/markup/html/form/validation/IFormValidator;)V
 getHeader
  (Ljava/lang/String;Lorg/apache/wicket/Component;Lorg/apache/wicket/extensions/wizard/IWizard;)Lorg/apache/wicket/Component;
- (Ljava/lang/String;Lorg/apache/wicket/Component;Lorg/apache/wicket/extensions/wizard/IWizard;)Lorg/apache/wicket/Component;
+ (Ljava/lang/String;Lorg/apache/wicket/Component;Lorg/apache/wicket/extensions/wizard/IWizard;)L1org/apache/wicket/Component;
 getSummary
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getTitle
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getView
  (Ljava/lang/String;Lorg/apache/wicket/Component;Lorg/apache/wicket/extensions/wizard/IWizard;)Lorg/apache/wicket/Component;
  (Ljava/lang/String;Lorg/apache/wicket/Component;Lorg/apache/wicket/extensions/wizard/IWizard;)Lorg/apache/wicket/Component;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardModel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardModel.eea
index ec66c5f6cd..2fdada495c 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardModel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardModel.eea
@@ -17,4 +17,4 @@ setActiveStep
  (Lorg/apache/wicket/extensions/wizard/dynamic/IDynamicWizardStep;)V
 stepIterator
  ()Ljava/util/Iterator<Lorg/apache/wicket/extensions/wizard/IWizardStep;>;
- ()Ljava/util/Iterator<Lorg/apache/wicket/extensions/wizard/IWizardStep;>;
+ ()L0java/util/Iterator<Lorg/apache/wicket/extensions/wizard/IWizardStep;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardStep.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardStep.eea
index 05ab794d85..2acca227c1 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardStep.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardStep.eea
@@ -17,7 +17,7 @@ class org/apache/wicket/extensions/wizard/dynamic/DynamicWizardStep
  (Lorg/apache/wicket/extensions/wizard/dynamic/IDynamicWizardStep;Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;Lorg/apache/wicket/model/IModel<*>;)V
 last
  ()Lorg/apache/wicket/extensions/wizard/dynamic/IDynamicWizardStep;
- ()Lorg/apache/wicket/extensions/wizard/dynamic/IDynamicWizardStep;
+ ()L1org/apache/wicket/extensions/wizard/dynamic/IDynamicWizardStep;
 previous
  ()Lorg/apache/wicket/extensions/wizard/dynamic/IDynamicWizardStep;
  ()Lorg/apache/wicket/extensions/wizard/dynamic/IDynamicWizardStep;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/feedback/FeedbackCollector.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/feedback/FeedbackCollector.eea
index 6888e35b02..b9a0d50696 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/feedback/FeedbackCollector.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/feedback/FeedbackCollector.eea
@@ -11,7 +11,7 @@ collect
  ()Ljava/util/List<Lorg/apache/wicket/feedback/FeedbackMessage;>;
 collect
  (Lorg/apache/wicket/feedback/IFeedbackMessageFilter;)Ljava/util/List<Lorg/apache/wicket/feedback/FeedbackMessage;>;
- (Lorg/apache/wicket/feedback/IFeedbackMessageFilter;)Ljava/util/List<Lorg/apache/wicket/feedback/FeedbackMessage;>;
+ (Lorg/apache/wicket/feedback/IFeedbackMessageFilter;)L1java/util/List<Lorg/apache/wicket/feedback/FeedbackMessage;>;
 setIncludeSession
  (Z)Lorg/apache/wicket/feedback/FeedbackCollector;
  (Z)Lorg/apache/wicket/feedback/FeedbackCollector;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/feedback/FeedbackMessages.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/feedback/FeedbackMessages.eea
index a54b0128c3..dfb5334d2a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/feedback/FeedbackMessages.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/feedback/FeedbackMessages.eea
@@ -24,10 +24,10 @@ fatal
  (Lorg/apache/wicket/Component;Ljava/io/Serializable;)V
 first
  ()Lorg/apache/wicket/feedback/FeedbackMessage;
- ()Lorg/apache/wicket/feedback/FeedbackMessage;
+ ()L0org/apache/wicket/feedback/FeedbackMessage;
 first
  (I)Lorg/apache/wicket/feedback/FeedbackMessage;
- (I)Lorg/apache/wicket/feedback/FeedbackMessage;
+ (I)L0org/apache/wicket/feedback/FeedbackMessage;
 hasMessage
  (Lorg/apache/wicket/feedback/IFeedbackMessageFilter;)Z
  (Lorg/apache/wicket/feedback/IFeedbackMessageFilter;)Z
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/feedback/FencedFeedbackPanel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/feedback/FencedFeedbackPanel.eea
index 4a0718c22a..6500d159d9 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/feedback/FencedFeedbackPanel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/feedback/FencedFeedbackPanel.eea
@@ -14,4 +14,4 @@ class org/apache/wicket/feedback/FencedFeedbackPanel
  (Ljava/lang/String;Lorg/apache/wicket/feedback/IFeedbackMessageFilter;)V
 newFeedbackMessagesModel
  ()Lorg/apache/wicket/feedback/FeedbackMessagesModel;
- ()Lorg/apache/wicket/feedback/FeedbackMessagesModel;
+ ()L1org/apache/wicket/feedback/FeedbackMessagesModel; # @Inherited(org.apache.wicket.markup.html.panel.FeedbackPanel)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/ComponentTag.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/ComponentTag.eea
index f13b59cc6e..2329f5533c 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/ComponentTag.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/ComponentTag.eea
@@ -57,7 +57,7 @@ getType
  ()Lorg/apache/wicket/markup/parser/XmlTag$TagType;
 getUserData
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 getXmlTag
  ()Lorg/apache/wicket/markup/parser/XmlTag;
  ()Lorg/apache/wicket/markup/parser/XmlTag;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/ContainerInfo.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/ContainerInfo.eea
index a8d4a2e7ee..a573f3e58c 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/ContainerInfo.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/ContainerInfo.eea
@@ -14,7 +14,7 @@ getContainerClass
  ()Ljava/lang/Class<*>;
 getFileExtension
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/DefaultMarkupCacheKeyProvider.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/DefaultMarkupCacheKeyProvider.eea
index b803e4c01f..2b547aea2d 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/DefaultMarkupCacheKeyProvider.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/DefaultMarkupCacheKeyProvider.eea
@@ -2,4 +2,4 @@ class org/apache/wicket/markup/DefaultMarkupCacheKeyProvider
 
 getCacheKey
  (Lorg/apache/wicket/MarkupContainer;Ljava/lang/Class<*>;)Ljava/lang/String;
- (Lorg/apache/wicket/MarkupContainer;Ljava/lang/Class<*>;)Ljava/lang/String;
+ (Lorg/apache/wicket/MarkupContainer;Ljava/lang/Class<*>;)L1java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.eea
index 6d3175a4e7..ba7fd5324b 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.eea
@@ -2,4 +2,4 @@ class org/apache/wicket/markup/DefaultMarkupResourceStreamProvider
 
 getMarkupResourceStream
  (Lorg/apache/wicket/MarkupContainer;Ljava/lang/Class<*>;)Lorg/apache/wicket/util/resource/IResourceStream;
- (Lorg/apache/wicket/MarkupContainer;Ljava/lang/Class<*>;)Lorg/apache/wicket/util/resource/IResourceStream;
+ (Lorg/apache/wicket/MarkupContainer;Ljava/lang/Class<*>;)L0org/apache/wicket/util/resource/IResourceStream;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/Markup.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/Markup.eea
index a3aa77467f..39dae6ee92 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/Markup.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/Markup.eea
@@ -46,4 +46,4 @@ toString
  ()L1java/lang/String; # @Inherited(org.apache.wicket.markup.AbstractMarkupFragment)
 toString
  (Z)Ljava/lang/String;
- (Z)Ljava/lang/String;
+ (Z)L1java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MarkupCache.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MarkupCache.eea
index 995dfaf2d9..2336efa50f 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MarkupCache.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MarkupCache.eea
@@ -6,7 +6,7 @@ get
 
 getMarkup
  (Lorg/apache/wicket/MarkupContainer;Ljava/lang/Class<*>;Z)Lorg/apache/wicket/markup/Markup;
- (Lorg/apache/wicket/MarkupContainer;Ljava/lang/Class<*>;Z)Lorg/apache/wicket/markup/Markup;
+ (Lorg/apache/wicket/MarkupContainer;Ljava/lang/Class<*>;Z)L0org/apache/wicket/markup/Markup;
 getMarkupCache
  ()Lorg/apache/wicket/markup/MarkupCache$ICache<Ljava/lang/String;Lorg/apache/wicket/markup/Markup;>;
  ()Lorg/apache/wicket/markup/MarkupCache$ICache<Ljava/lang/String;Lorg/apache/wicket/markup/Markup;>;
@@ -15,10 +15,10 @@ getMarkupCacheKeyProvider
  (Lorg/apache/wicket/MarkupContainer;)Lorg/apache/wicket/markup/IMarkupCacheKeyProvider;
 getMarkupFromCache
  (Ljava/lang/String;Lorg/apache/wicket/MarkupContainer;)Lorg/apache/wicket/markup/Markup;
- (Ljava/lang/String;Lorg/apache/wicket/MarkupContainer;)Lorg/apache/wicket/markup/Markup;
+ (Ljava/lang/String;Lorg/apache/wicket/MarkupContainer;)L0org/apache/wicket/markup/Markup;
 newCacheImplementation
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Lorg/apache/wicket/markup/MarkupCache$ICache<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Lorg/apache/wicket/markup/MarkupCache$ICache<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>()L1org/apache/wicket/markup/MarkupCache$ICache<TK;TV;>;
 onMarkupNotFound
  (Ljava/lang/String;Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/Markup;)Lorg/apache/wicket/markup/Markup;
  (Ljava/lang/String;Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/Markup;)Lorg/apache/wicket/markup/Markup;
@@ -27,4 +27,4 @@ putIntoCache
  (Ljava/lang/String;Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/Markup;)Lorg/apache/wicket/markup/Markup;
 removeMarkup
  (Ljava/lang/String;)Lorg/apache/wicket/markup/IMarkupFragment;
- (Ljava/lang/String;)Lorg/apache/wicket/markup/IMarkupFragment;
+ (Ljava/lang/String;)L0org/apache/wicket/markup/IMarkupFragment;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MarkupFactory.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MarkupFactory.eea
index d5d147da25..0fd28f43cc 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MarkupFactory.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MarkupFactory.eea
@@ -12,7 +12,7 @@ getContainerClass
  (Lorg/apache/wicket/MarkupContainer;Ljava/lang/Class<*>;)Ljava/lang/Class<*>;
 getMarkup
  (Lorg/apache/wicket/MarkupContainer;Ljava/lang/Class<*>;Z)Lorg/apache/wicket/markup/Markup;
- (Lorg/apache/wicket/MarkupContainer;Ljava/lang/Class<*>;Z)Lorg/apache/wicket/markup/Markup;
+ (Lorg/apache/wicket/MarkupContainer;Ljava/lang/Class<*>;Z)L0org/apache/wicket/markup/Markup;
 getMarkup
  (Lorg/apache/wicket/MarkupContainer;Z)Lorg/apache/wicket/markup/Markup;
  (Lorg/apache/wicket/MarkupContainer;Z)Lorg/apache/wicket/markup/Markup;
@@ -21,22 +21,22 @@ getMarkupCache
  ()Lorg/apache/wicket/markup/IMarkupCache;
 getMarkupLoader
  ()Lorg/apache/wicket/markup/loader/IMarkupLoader;
- ()Lorg/apache/wicket/markup/loader/IMarkupLoader;
+ ()L1org/apache/wicket/markup/loader/IMarkupLoader;
 getMarkupResourceStream
  (Lorg/apache/wicket/MarkupContainer;Ljava/lang/Class<*>;)Lorg/apache/wicket/markup/MarkupResourceStream;
- (Lorg/apache/wicket/MarkupContainer;Ljava/lang/Class<*>;)Lorg/apache/wicket/markup/MarkupResourceStream;
+ (Lorg/apache/wicket/MarkupContainer;Ljava/lang/Class<*>;)L0org/apache/wicket/markup/MarkupResourceStream;
 getMarkupResourceStreamProvider
  (Lorg/apache/wicket/MarkupContainer;)Lorg/apache/wicket/markup/IMarkupResourceStreamProvider;
  (Lorg/apache/wicket/MarkupContainer;)Lorg/apache/wicket/markup/IMarkupResourceStreamProvider;
 loadMarkup
  (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupResourceStream;Z)Lorg/apache/wicket/markup/Markup;
- (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupResourceStream;Z)Lorg/apache/wicket/markup/Markup;
+ (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupResourceStream;Z)L0org/apache/wicket/markup/Markup;
 newMarkupParser
  (Lorg/apache/wicket/markup/MarkupResourceStream;)Lorg/apache/wicket/markup/MarkupParser;
- (Lorg/apache/wicket/markup/MarkupResourceStream;)Lorg/apache/wicket/markup/MarkupParser;
+ (Lorg/apache/wicket/markup/MarkupResourceStream;)L1org/apache/wicket/markup/MarkupParser;
 newXmlPullParser
  ()Lorg/apache/wicket/markup/parser/IXmlPullParser;
- ()Lorg/apache/wicket/markup/parser/IXmlPullParser;
+ ()L1org/apache/wicket/markup/parser/IXmlPullParser;
 onAppendMarkupFilter
  (Lorg/apache/wicket/markup/parser/IMarkupFilter;)Lorg/apache/wicket/markup/parser/IMarkupFilter;
  (Lorg/apache/wicket/markup/parser/IMarkupFilter;)Lorg/apache/wicket/markup/parser/IMarkupFilter;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MarkupFragment.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MarkupFragment.eea
index aba019ca80..e4b17bc96e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MarkupFragment.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MarkupFragment.eea
@@ -5,7 +5,7 @@ class org/apache/wicket/markup/MarkupFragment
  (Lorg/apache/wicket/markup/IMarkupFragment;I)V
 find
  (Ljava/lang/String;)Lorg/apache/wicket/markup/IMarkupFragment;
- (Ljava/lang/String;)Lorg/apache/wicket/markup/IMarkupFragment;
+ (Ljava/lang/String;)L0org/apache/wicket/markup/IMarkupFragment;
 get
  (I)Lorg/apache/wicket/markup/MarkupElement;
  (I)Lorg/apache/wicket/markup/MarkupElement;
@@ -17,7 +17,7 @@ getRootMarkup
  ()Lorg/apache/wicket/markup/Markup;
 iterator
  ()Ljava/util/Iterator<Lorg/apache/wicket/markup/MarkupElement;>;
- ()Ljava/util/Iterator<Lorg/apache/wicket/markup/MarkupElement;>;
+ ()L1java/util/Iterator<Lorg/apache/wicket/markup/MarkupElement;>;
 toString
  (Z)Ljava/lang/String;
- (Z)Ljava/lang/String;
+ (Z)L1java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MarkupParser.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MarkupParser.eea
index c8cc454edf..d3c8c32262 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MarkupParser.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MarkupParser.eea
@@ -24,7 +24,7 @@ getMarkupFilters
  ()Lorg/apache/wicket/markup/MarkupParser$MarkupFilterList;
 initializeMarkupFilters
  (Lorg/apache/wicket/markup/Markup;)Lorg/apache/wicket/markup/MarkupParser$MarkupFilterList;
- (Lorg/apache/wicket/markup/Markup;)Lorg/apache/wicket/markup/MarkupParser$MarkupFilterList;
+ (Lorg/apache/wicket/markup/Markup;)L1org/apache/wicket/markup/MarkupParser$MarkupFilterList;
 onAppendMarkupFilter
  (Lorg/apache/wicket/markup/parser/IMarkupFilter;)Lorg/apache/wicket/markup/parser/IMarkupFilter;
  (Lorg/apache/wicket/markup/parser/IMarkupFilter;)Lorg/apache/wicket/markup/parser/IMarkupFilter;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MarkupResourceStream.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MarkupResourceStream.eea
index 9af26083bf..2e1c026419 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MarkupResourceStream.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MarkupResourceStream.eea
@@ -15,7 +15,7 @@ getBaseMarkup
  ()Lorg/apache/wicket/markup/Markup;
 getBaseMarkupResourceStream
  ()Lorg/apache/wicket/markup/MarkupResourceStream;
- ()Lorg/apache/wicket/markup/MarkupResourceStream;
+ ()L0org/apache/wicket/markup/MarkupResourceStream;
 getCacheKey
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -63,7 +63,7 @@ length
  ()Lorg/apache/wicket/util/lang/Bytes;
 locationAsString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 setBaseMarkup
  (Lorg/apache/wicket/markup/Markup;)V
  (Lorg/apache/wicket/markup/Markup;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MarkupStream.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MarkupStream.eea
index 62cda5fad4..417a5030a2 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MarkupStream.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MarkupStream.eea
@@ -38,7 +38,7 @@ getResource
  ()Lorg/apache/wicket/util/resource/IResourceStream;
 getTag
  ()Lorg/apache/wicket/markup/ComponentTag;
- ()Lorg/apache/wicket/markup/ComponentTag;
+ ()L0org/apache/wicket/markup/ComponentTag;
 getTagAttribute
  (Ljava/lang/String;Z)Ljava/lang/String;
  (Ljava/lang/String;Z)Ljava/lang/String;
@@ -47,10 +47,10 @@ getWicketNamespace
  ()Ljava/lang/String;
 next
  ()Lorg/apache/wicket/markup/MarkupElement;
- ()Lorg/apache/wicket/markup/MarkupElement;
+ ()L0org/apache/wicket/markup/MarkupElement;
 nextOpenTag
  ()Lorg/apache/wicket/markup/MarkupElement;
- ()Lorg/apache/wicket/markup/MarkupElement;
+ ()L0org/apache/wicket/markup/MarkupElement;
 setCurrentIndex
  (I)Lorg/apache/wicket/markup/MarkupStream;
  (I)Lorg/apache/wicket/markup/MarkupStream;
@@ -68,7 +68,7 @@ throwMarkupException
  (Ljava/lang/String;)V
 toHtmlDebugString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MergedMarkup.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MergedMarkup.eea
index b25402d8ca..0ab41579ce 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MergedMarkup.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/MergedMarkup.eea
@@ -5,4 +5,4 @@ class org/apache/wicket/markup/MergedMarkup
  (Lorg/apache/wicket/markup/Markup;Lorg/apache/wicket/markup/Markup;I)V
 locationAsString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/RawMarkup.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/RawMarkup.eea
index 25cded9b90..222ec11f5f 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/RawMarkup.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/RawMarkup.eea
@@ -17,4 +17,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toUserDebugString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/TagUtils.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/TagUtils.eea
index f37861c317..dec16fbd12 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/TagUtils.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/TagUtils.eea
@@ -9,7 +9,7 @@ copyAttributes
  (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/ComponentTag;)V
 findTagMarkup
  (Lorg/apache/wicket/markup/IMarkupFragment;Ljava/lang/String;Ljava/lang/String;I)Lorg/apache/wicket/markup/IMarkupFragment;
- (Lorg/apache/wicket/markup/IMarkupFragment;Ljava/lang/String;Ljava/lang/String;I)Lorg/apache/wicket/markup/IMarkupFragment;
+ (Lorg/apache/wicket/markup/IMarkupFragment;Ljava/lang/String;Ljava/lang/String;I)L0org/apache/wicket/markup/IMarkupFragment;
 isBodyTag
  (Lorg/apache/wicket/markup/ComponentTag;)Z
  (Lorg/apache/wicket/markup/ComponentTag;)Z
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/CssHeaderItem.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/CssHeaderItem.eea
index 0b66e2eb7d..3d53e57d64 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/CssHeaderItem.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/CssHeaderItem.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/markup/head/CssHeaderItem
 
 forCSS
  (Ljava/lang/CharSequence;Ljava/lang/String;)Lorg/apache/wicket/markup/head/CssContentHeaderItem;
- (Ljava/lang/CharSequence;Ljava/lang/String;)Lorg/apache/wicket/markup/head/CssContentHeaderItem;
+ (Ljava/lang/CharSequence;Ljava/lang/String;)L1org/apache/wicket/markup/head/CssContentHeaderItem;
 forReference
  (Lorg/apache/wicket/request/resource/ResourceReference;)Lorg/apache/wicket/markup/head/CssReferenceHeaderItem;
  (Lorg/apache/wicket/request/resource/ResourceReference;)Lorg/apache/wicket/markup/head/CssReferenceHeaderItem;
@@ -11,19 +11,19 @@ forReference
  (Lorg/apache/wicket/request/resource/ResourceReference;Ljava/lang/String;)Lorg/apache/wicket/markup/head/CssReferenceHeaderItem;
 forReference
  (Lorg/apache/wicket/request/resource/ResourceReference;Lorg/apache/wicket/request/mapper/parameter/PageParameters;Ljava/lang/String;)Lorg/apache/wicket/markup/head/CssReferenceHeaderItem;
- (Lorg/apache/wicket/request/resource/ResourceReference;Lorg/apache/wicket/request/mapper/parameter/PageParameters;Ljava/lang/String;)Lorg/apache/wicket/markup/head/CssReferenceHeaderItem;
+ (Lorg/apache/wicket/request/resource/ResourceReference;Lorg/apache/wicket/request/mapper/parameter/PageParameters;Ljava/lang/String;)L1org/apache/wicket/markup/head/CssReferenceHeaderItem;
 forReference
  (Lorg/apache/wicket/request/resource/ResourceReference;Lorg/apache/wicket/request/mapper/parameter/PageParameters;Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/markup/head/CssReferenceHeaderItem;
- (Lorg/apache/wicket/request/resource/ResourceReference;Lorg/apache/wicket/request/mapper/parameter/PageParameters;Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/markup/head/CssReferenceHeaderItem;
+ (Lorg/apache/wicket/request/resource/ResourceReference;Lorg/apache/wicket/request/mapper/parameter/PageParameters;Ljava/lang/String;Ljava/lang/String;)L1org/apache/wicket/markup/head/CssReferenceHeaderItem;
 forUrl
  (Ljava/lang/String;)Lorg/apache/wicket/markup/head/CssUrlReferenceHeaderItem;
  (Ljava/lang/String;)Lorg/apache/wicket/markup/head/CssUrlReferenceHeaderItem;
 forUrl
  (Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/markup/head/CssUrlReferenceHeaderItem;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/markup/head/CssUrlReferenceHeaderItem;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/apache/wicket/markup/head/CssUrlReferenceHeaderItem;
 forUrl
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/markup/head/CssUrlReferenceHeaderItem;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/markup/head/CssUrlReferenceHeaderItem;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)L1org/apache/wicket/markup/head/CssUrlReferenceHeaderItem;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/CssReferenceHeaderItem.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/CssReferenceHeaderItem.eea
index 63258b5cda..c707e17e2a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/CssReferenceHeaderItem.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/CssReferenceHeaderItem.eea
@@ -11,13 +11,13 @@ equals
  (L0java/lang/Object;)Z # @Inherited(org.apache.wicket.markup.head.AbstractCssReferenceHeaderItem)
 getCrossOrigin
  ()Lorg/apache/wicket/markup/html/CrossOrigin;
- ()Lorg/apache/wicket/markup/html/CrossOrigin;
+ ()L0org/apache/wicket/markup/html/CrossOrigin;
 getDependencies
  ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
- ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
+ ()L1java/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>; # @Inherited(org.apache.wicket.markup.head.HeaderItem)
 getIntegrity
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getPageParameters
  ()Lorg/apache/wicket/request/mapper/parameter/PageParameters;
  ()Lorg/apache/wicket/request/mapper/parameter/PageParameters;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/HeaderItem.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/HeaderItem.eea
index 191af6cd51..51013201c1 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/HeaderItem.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/HeaderItem.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/markup/head/HeaderItem
 
 getDependencies
  ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
- ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
+ ()L1java/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
 getProvidedResources
  ()Ljava/lang/Iterable<+Lorg/apache/wicket/markup/head/HeaderItem;>;
  ()Ljava/lang/Iterable<+Lorg/apache/wicket/markup/head/HeaderItem;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/JavaScriptHeaderItem.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/JavaScriptHeaderItem.eea
index b88a297490..d01f0a859f 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/JavaScriptHeaderItem.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/JavaScriptHeaderItem.eea
@@ -8,16 +8,16 @@ forReference
  (Lorg/apache/wicket/request/resource/ResourceReference;Ljava/lang/String;)Lorg/apache/wicket/markup/head/JavaScriptReferenceHeaderItem;
 forReference
  (Lorg/apache/wicket/request/resource/ResourceReference;Lorg/apache/wicket/request/mapper/parameter/PageParameters;Ljava/lang/String;)Lorg/apache/wicket/markup/head/JavaScriptReferenceHeaderItem;
- (Lorg/apache/wicket/request/resource/ResourceReference;Lorg/apache/wicket/request/mapper/parameter/PageParameters;Ljava/lang/String;)Lorg/apache/wicket/markup/head/JavaScriptReferenceHeaderItem;
+ (Lorg/apache/wicket/request/resource/ResourceReference;Lorg/apache/wicket/request/mapper/parameter/PageParameters;Ljava/lang/String;)L1org/apache/wicket/markup/head/JavaScriptReferenceHeaderItem;
 forScript
  (Ljava/lang/CharSequence;Ljava/lang/String;)Lorg/apache/wicket/markup/head/JavaScriptContentHeaderItem;
- (Ljava/lang/CharSequence;Ljava/lang/String;)Lorg/apache/wicket/markup/head/JavaScriptContentHeaderItem;
+ (Ljava/lang/CharSequence;Ljava/lang/String;)L1org/apache/wicket/markup/head/JavaScriptContentHeaderItem;
 forUrl
  (Ljava/lang/String;)Lorg/apache/wicket/markup/head/JavaScriptUrlReferenceHeaderItem;
  (Ljava/lang/String;)Lorg/apache/wicket/markup/head/JavaScriptUrlReferenceHeaderItem;
 forUrl
  (Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/markup/head/JavaScriptUrlReferenceHeaderItem;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/markup/head/JavaScriptUrlReferenceHeaderItem;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/apache/wicket/markup/head/JavaScriptUrlReferenceHeaderItem;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/JavaScriptReferenceHeaderItem.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/JavaScriptReferenceHeaderItem.eea
index 9b7af5adc5..39368b2f6f 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/JavaScriptReferenceHeaderItem.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/JavaScriptReferenceHeaderItem.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(org.apache.wicket.markup.head.AbstractJavaScriptReferenceHeaderItem)
 getDependencies
  ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
- ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
+ ()L1java/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>; # @Inherited(org.apache.wicket.markup.head.HeaderItem)
 getPageParameters
  ()Lorg/apache/wicket/request/mapper/parameter/PageParameters;
  ()Lorg/apache/wicket/request/mapper/parameter/PageParameters;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/MetaDataHeaderItem.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/MetaDataHeaderItem.eea
index e909a40391..372031138c 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/MetaDataHeaderItem.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/MetaDataHeaderItem.eea
@@ -12,19 +12,19 @@ forHttpEquiv
  (Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/markup/head/MetaDataHeaderItem;
 forHttpEquiv
  (Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;)Lorg/apache/wicket/markup/head/MetaDataHeaderItem;
- (Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;)Lorg/apache/wicket/markup/head/MetaDataHeaderItem;
+ (Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;)L1org/apache/wicket/markup/head/MetaDataHeaderItem;
 forLinkTag
  (Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/markup/head/MetaDataHeaderItem;
  (Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/markup/head/MetaDataHeaderItem;
 forLinkTag
  (Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;)Lorg/apache/wicket/markup/head/MetaDataHeaderItem;
- (Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;)Lorg/apache/wicket/markup/head/MetaDataHeaderItem;
+ (Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;)L1org/apache/wicket/markup/head/MetaDataHeaderItem;
 forMetaTag
  (Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/markup/head/MetaDataHeaderItem;
  (Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/markup/head/MetaDataHeaderItem;
 forMetaTag
  (Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;)Lorg/apache/wicket/markup/head/MetaDataHeaderItem;
- (Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;)Lorg/apache/wicket/markup/head/MetaDataHeaderItem;
+ (Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;)L1org/apache/wicket/markup/head/MetaDataHeaderItem;
 
 <init>
  (Ljava/lang/String;)V
@@ -40,7 +40,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 generateString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getRenderTokens
  ()Ljava/lang/Iterable<*>;
  ()Ljava/lang/Iterable<*>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/OnDomReadyHeaderItem.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/OnDomReadyHeaderItem.eea
index cb9de0c539..7c09c7358c 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/OnDomReadyHeaderItem.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/OnDomReadyHeaderItem.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/markup/head/OnDomReadyHeaderItem
 
 forScript
  (Ljava/lang/CharSequence;)Lorg/apache/wicket/markup/head/OnDomReadyHeaderItem;
- (Ljava/lang/CharSequence;)Lorg/apache/wicket/markup/head/OnDomReadyHeaderItem;
+ (Ljava/lang/CharSequence;)L1org/apache/wicket/markup/head/OnDomReadyHeaderItem;
 
 <init>
  (Ljava/lang/CharSequence;)V
@@ -12,7 +12,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getDependencies
  ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
- ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
+ ()L1java/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>; # @Inherited(org.apache.wicket.markup.head.HeaderItem)
 getJavaScript
  ()Ljava/lang/CharSequence;
  ()Ljava/lang/CharSequence;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/OnEventHeaderItem.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/OnEventHeaderItem.eea
index b38e599e59..f953c0139d 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/OnEventHeaderItem.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/OnEventHeaderItem.eea
@@ -8,7 +8,7 @@ forMarkupId
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/CharSequence;)Lorg/apache/wicket/markup/head/OnEventHeaderItem;
 forScript
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/CharSequence;)Lorg/apache/wicket/markup/head/OnEventHeaderItem;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/CharSequence;)Lorg/apache/wicket/markup/head/OnEventHeaderItem;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/CharSequence;)L1org/apache/wicket/markup/head/OnEventHeaderItem;
 
 <init>
  (Ljava/lang/String;Ljava/lang/String;)V
@@ -21,10 +21,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getCompleteJavaScript
  ()Ljava/lang/CharSequence;
- ()Ljava/lang/CharSequence;
+ ()L1java/lang/CharSequence;
 getDependencies
  ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
- ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
+ ()L1java/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>; # @Inherited(org.apache.wicket.markup.head.HeaderItem)
 getEvent
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/OnLoadHeaderItem.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/OnLoadHeaderItem.eea
index 5b987563f6..a34941fc13 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/OnLoadHeaderItem.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/OnLoadHeaderItem.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/markup/head/OnLoadHeaderItem
 
 forScript
  (Ljava/lang/CharSequence;)Lorg/apache/wicket/markup/head/OnLoadHeaderItem;
- (Ljava/lang/CharSequence;)Lorg/apache/wicket/markup/head/OnLoadHeaderItem;
+ (Ljava/lang/CharSequence;)L1org/apache/wicket/markup/head/OnLoadHeaderItem;
 
 <init>
  (Ljava/lang/CharSequence;)V
@@ -12,7 +12,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getDependencies
  ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
- ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
+ ()L1java/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>; # @Inherited(org.apache.wicket.markup.head.HeaderItem)
 getJavaScript
  ()Ljava/lang/CharSequence;
  ()Ljava/lang/CharSequence;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/PriorityHeaderItem.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/PriorityHeaderItem.eea
index a4eeedf804..2ded00891d 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/PriorityHeaderItem.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/PriorityHeaderItem.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getDependencies
  ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
- ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
+ ()L1java/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>; # @Inherited(org.apache.wicket.markup.head.HeaderItem)
 getProvidedResources
  ()Ljava/lang/Iterable<+Lorg/apache/wicket/markup/head/HeaderItem;>;
  ()Ljava/lang/Iterable<+Lorg/apache/wicket/markup/head/HeaderItem;>;
@@ -26,4 +26,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 wrap
  (Lorg/apache/wicket/markup/head/HeaderItem;)Lorg/apache/wicket/markup/head/PriorityHeaderItem;
- (Lorg/apache/wicket/markup/head/HeaderItem;)Lorg/apache/wicket/markup/head/PriorityHeaderItem;
+ (Lorg/apache/wicket/markup/head/HeaderItem;)L1org/apache/wicket/markup/head/PriorityHeaderItem;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/StringHeaderItem.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/StringHeaderItem.eea
index ce21f7c18e..2f9db38b29 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/StringHeaderItem.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/StringHeaderItem.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/markup/head/StringHeaderItem
 
 forString
  (Ljava/lang/CharSequence;)Lorg/apache/wicket/markup/head/StringHeaderItem;
- (Ljava/lang/CharSequence;)Lorg/apache/wicket/markup/head/StringHeaderItem;
+ (Ljava/lang/CharSequence;)L1org/apache/wicket/markup/head/StringHeaderItem;
 
 <init>
  (Ljava/lang/CharSequence;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/filter/FilteredHeaderItem.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/filter/FilteredHeaderItem.eea
index d6684d8fae..e31723eaca 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/filter/FilteredHeaderItem.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/filter/FilteredHeaderItem.eea
@@ -8,7 +8,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getDependencies
  ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
- ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
+ ()L1java/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>; # @Inherited(org.apache.wicket.markup.head.HeaderItem)
 getFilterName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -29,4 +29,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 wrap
  (Lorg/apache/wicket/markup/head/HeaderItem;)Lorg/apache/wicket/markup/head/filter/FilteredHeaderItem;
- (Lorg/apache/wicket/markup/head/HeaderItem;)Lorg/apache/wicket/markup/head/filter/FilteredHeaderItem;
+ (Lorg/apache/wicket/markup/head/HeaderItem;)L1org/apache/wicket/markup/head/filter/FilteredHeaderItem;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/filter/JavaScriptFilteredIntoFooterHeaderResponse.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/filter/JavaScriptFilteredIntoFooterHeaderResponse.eea
index 2203b17bc1..6bf91c16bd 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/filter/JavaScriptFilteredIntoFooterHeaderResponse.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/filter/JavaScriptFilteredIntoFooterHeaderResponse.eea
@@ -5,7 +5,7 @@ class org/apache/wicket/markup/head/filter/JavaScriptFilteredIntoFooterHeaderRes
  (Lorg/apache/wicket/markup/head/IHeaderResponse;Ljava/lang/String;)V
 createFooterFilter
  (Ljava/lang/String;)Lorg/apache/wicket/markup/head/filter/FilteringHeaderResponse$IHeaderResponseFilter;
- (Ljava/lang/String;)Lorg/apache/wicket/markup/head/filter/FilteringHeaderResponse$IHeaderResponseFilter;
+ (Ljava/lang/String;)L1org/apache/wicket/markup/head/filter/FilteringHeaderResponse$IHeaderResponseFilter;
 createHeaderFilter
  (Ljava/lang/String;Lorg/apache/wicket/markup/head/filter/FilteringHeaderResponse$IHeaderResponseFilter;)Lorg/apache/wicket/markup/head/filter/FilteringHeaderResponse$IHeaderResponseFilter;
- (Ljava/lang/String;Lorg/apache/wicket/markup/head/filter/FilteringHeaderResponse$IHeaderResponseFilter;)Lorg/apache/wicket/markup/head/filter/FilteringHeaderResponse$IHeaderResponseFilter;
+ (Ljava/lang/String;Lorg/apache/wicket/markup/head/filter/FilteringHeaderResponse$IHeaderResponseFilter;)L1org/apache/wicket/markup/head/filter/FilteringHeaderResponse$IHeaderResponseFilter;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/http2/PushHeaderItem.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/http2/PushHeaderItem.eea
index 4f30d478e0..4672fc4342 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/http2/PushHeaderItem.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/head/http2/PushHeaderItem.eea
@@ -24,7 +24,7 @@ getPageModificationTime
  ()Ljava/time/Instant;
 getRenderTokens
  ()Ljava/lang/Iterable<*>;
- ()Ljava/lang/Iterable<*>;
+ ()L1java/lang/Iterable<*>;
 isHttp2
  (Ljakarta/servlet/http/HttpServletRequest;)Z
  (Ljakarta/servlet/http/HttpServletRequest;)Z
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/MarkupUtil.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/MarkupUtil.eea
index 78d8bd7177..38ea4e7fb7 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/MarkupUtil.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/MarkupUtil.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/markup/html/MarkupUtil
 
 findStartTag
  (Lorg/apache/wicket/markup/IMarkupFragment;Ljava/lang/String;)Lorg/apache/wicket/markup/IMarkupFragment;
- (Lorg/apache/wicket/markup/IMarkupFragment;Ljava/lang/String;)Lorg/apache/wicket/markup/IMarkupFragment;
+ (Lorg/apache/wicket/markup/IMarkupFragment;Ljava/lang/String;)L0org/apache/wicket/markup/IMarkupFragment;
 isMarkupHtml5Compliant
  (Lorg/apache/wicket/MarkupContainer;)Z
  (Lorg/apache/wicket/MarkupContainer;)Z
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/TransparentWebMarkupContainer.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/TransparentWebMarkupContainer.eea
index 6e64ed77e3..a70e228218 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/TransparentWebMarkupContainer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/TransparentWebMarkupContainer.eea
@@ -11,4 +11,4 @@ internalRenderHead
  (Lorg/apache/wicket/markup/html/internal/HtmlHeaderContainer;)V
 resolve
  (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
- (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
+ (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)L0org/apache/wicket/Component;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/WebPage.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/WebPage.eea
index 9fff791f7f..638ea548ac 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/WebPage.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/WebPage.eea
@@ -11,7 +11,7 @@ configureResponse
  (L1org/apache/wicket/request/http/WebResponse;)V
 getMarkupType
  ()Lorg/apache/wicket/markup/MarkupType;
- ()L1org/apache/wicket/markup/MarkupType;
+ ()L1org/apache/wicket/markup/MarkupType; # @Inherited(org.apache.wicket.Page)
 homePageLink
  (Ljava/lang/String;)Lorg/apache/wicket/markup/html/link/BookmarkablePageLink<Ljava/lang/Void;>;
  (Ljava/lang/String;)L1org/apache/wicket/markup/html/link/BookmarkablePageLink<Ljava/lang/Void;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/basic/EnumLabel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/basic/EnumLabel.eea
index 8c5bcc1804..2606b69ca1 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/basic/EnumLabel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/basic/EnumLabel.eea
@@ -17,7 +17,7 @@ super org/apache/wicket/IGenericComponent
  (Ljava/lang/String;TT;)V
 nullValue
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 onComponentTag
  (Lorg/apache/wicket/markup/ComponentTag;)V
  (L1org/apache/wicket/markup/ComponentTag;)V # @Inherited(org.apache.wicket.Component)
@@ -26,4 +26,4 @@ onComponentTagBody
  (Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)V
 resourceKey
  (TT;)Ljava/lang/String;
- (TT;)Ljava/lang/String;
+ (TT;)L1java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/border/Border$BorderBodyContainer.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/border/Border$BorderBodyContainer.eea
index cc7bb1e2e4..b489c429eb 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/border/Border$BorderBodyContainer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/border/Border$BorderBodyContainer.eea
@@ -5,16 +5,16 @@ class org/apache/wicket/markup/html/border/Border$BorderBodyContainer
  (Lorg/apache/wicket/markup/html/border/Border;Ljava/lang/String;)V
 findComponentToDequeue
  (Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
- (Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
+ (Lorg/apache/wicket/markup/ComponentTag;)L0org/apache/wicket/Component;
 getMarkup
  ()Lorg/apache/wicket/markup/IMarkupFragment;
  ()Lorg/apache/wicket/markup/IMarkupFragment;
 getMarkup
  (Lorg/apache/wicket/Component;)Lorg/apache/wicket/markup/IMarkupFragment;
- (Lorg/apache/wicket/Component;)Lorg/apache/wicket/markup/IMarkupFragment;
+ (Lorg/apache/wicket/Component;)L0org/apache/wicket/markup/IMarkupFragment;
 newDequeueContext
  ()Lorg/apache/wicket/DequeueContext;
- ()Lorg/apache/wicket/DequeueContext;
+ ()L0org/apache/wicket/DequeueContext; # @Inherited(org.apache.wicket.MarkupContainer)
 onComponentTag
  (Lorg/apache/wicket/markup/ComponentTag;)V
  (L1org/apache/wicket/markup/ComponentTag;)V # @Inherited(org.apache.wicket.Component)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/border/Border.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/border/Border.eea
index 705c5a957f..8fbb879150 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/border/Border.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/border/Border.eea
@@ -27,7 +27,7 @@ addToBorder
  ([Lorg/apache/wicket/Component;)Lorg/apache/wicket/markup/html/border/Border;
 canDequeueTag
  (Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/DequeueTagAction;
- (Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/DequeueTagAction;
+ (Lorg/apache/wicket/markup/ComponentTag;)L0org/apache/wicket/DequeueTagAction; # @Inherited(org.apache.wicket.MarkupContainer)
 findComponentToDequeue
  (Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
  (Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
@@ -42,7 +42,7 @@ getRegionMarkup
  ()Lorg/apache/wicket/markup/IMarkupFragment;
 newMarkupSourcingStrategy
  ()Lorg/apache/wicket/markup/html/panel/IMarkupSourcingStrategy;
- ()Lorg/apache/wicket/markup/html/panel/IMarkupSourcingStrategy;
+ ()L1org/apache/wicket/markup/html/panel/IMarkupSourcingStrategy; # @Overrides(org.apache.wicket.Component)
 queue
  ([Lorg/apache/wicket/Component;)Lorg/apache/wicket/markup/html/border/Border;
  ([Lorg/apache/wicket/Component;)Lorg/apache/wicket/markup/html/border/Border;
@@ -69,4 +69,4 @@ replaceInBorder
  (Lorg/apache/wicket/Component;)Lorg/apache/wicket/markup/html/border/Border;
 resolve
  (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
- (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
+ (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)L0org/apache/wicket/Component;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/border/BorderPanel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/border/BorderPanel.eea
index 7c7cc167e3..2ffca8a730 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/border/BorderPanel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/border/BorderPanel.eea
@@ -14,7 +14,7 @@ newBodyContainer
  (Ljava/lang/String;)Lorg/apache/wicket/markup/html/border/Body;
 newMarkupSourcingStrategy
  ()Lorg/apache/wicket/markup/html/panel/IMarkupSourcingStrategy;
- ()Lorg/apache/wicket/markup/html/panel/IMarkupSourcingStrategy;
+ ()L0org/apache/wicket/markup/html/panel/IMarkupSourcingStrategy; # @Inherited(org.apache.wicket.markup.html.panel.Panel)
 setBodyContainer
  (Lorg/apache/wicket/markup/html/border/Body;)Lorg/apache/wicket/markup/html/border/Body;
  (Lorg/apache/wicket/markup/html/border/Body;)Lorg/apache/wicket/markup/html/border/Body;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/AbstractChoice.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/AbstractChoice.eea
index 733c3061d5..10d2285607 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/AbstractChoice.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/AbstractChoice.eea
@@ -44,13 +44,13 @@ getChoiceRenderer
  ()Lorg/apache/wicket/markup/html/form/IChoiceRenderer<-TE;>;
 getChoices
  ()Ljava/util/List<+TE;>;
- ()Ljava/util/List<+TE;>;
+ ()L0java/util/List<+TE;>;
 getChoicesModel
  ()Lorg/apache/wicket/model/IModel<+Ljava/util/List<+TE;>;>;
  ()Lorg/apache/wicket/model/IModel<+Ljava/util/List<+TE;>;>;
 getDefaultChoice
  (Ljava/lang/String;)Ljava/lang/CharSequence;
- (Ljava/lang/String;)Ljava/lang/CharSequence;
+ (Ljava/lang/String;)L1java/lang/CharSequence;
 isDisabled
  (TE;ILjava/lang/String;)Z
  (TE;ILjava/lang/String;)Z
@@ -74,4 +74,4 @@ setOptionAttributes
  (Lorg/apache/wicket/util/string/AppendingStringBuffer;TE;ILjava/lang/String;)V
 setType
  (Ljava/lang/Class<*>;)Lorg/apache/wicket/markup/html/form/FormComponent<TT;>;
- (Ljava/lang/Class<*>;)Lorg/apache/wicket/markup/html/form/FormComponent<TT;>;
+ (Ljava/lang/Class<*>;)L1org/apache/wicket/markup/html/form/FormComponent<TT;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.eea
index 4094c00950..c7f88e79d8 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.eea
@@ -38,16 +38,16 @@ convertChoiceIdToChoice
  (Ljava/lang/String;)TT;
 convertValue
  ([Ljava/lang/String;)TT;
- ([Ljava/lang/String;)TT;
+ ([Ljava/lang/String;)T0T; # @Inherited(org.apache.wicket.markup.html.form.FormComponent)
 getDefaultChoice
  (Ljava/lang/String;)Ljava/lang/CharSequence;
- (Ljava/lang/String;)Ljava/lang/CharSequence;
+ (Ljava/lang/String;)L1java/lang/CharSequence; # @Inherited(org.apache.wicket.markup.html.form.AbstractChoice)
 getModelValue
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getNullKey
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getNullKeyDisplayValue
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -56,7 +56,7 @@ getNullValidDisplayValue
  ()Ljava/lang/String;
 getNullValidKey
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 isSelected
  (TT;ILjava/lang/String;)Z
  (TT;ILjava/lang/String;)Z
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/AutoLabelResolver.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/AutoLabelResolver.eea
index c57de4605f..6f3038d38e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/AutoLabelResolver.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/AutoLabelResolver.eea
@@ -18,8 +18,8 @@ MARKER_KEY
 
 getLabelIdFor
  (Lorg/apache/wicket/Component;)Ljava/lang/String;
- (Lorg/apache/wicket/Component;)Ljava/lang/String;
+ (Lorg/apache/wicket/Component;)L1java/lang/String;
 
 resolve
  (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
- (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
+ (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)L0org/apache/wicket/Component;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/AutoLabelTextResolver.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/AutoLabelTextResolver.eea
index f1b23eb6f6..a799c7b412 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/AutoLabelTextResolver.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/AutoLabelTextResolver.eea
@@ -6,4 +6,4 @@ LABEL
 
 resolve
  (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
- (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
+ (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)L0org/apache/wicket/Component;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/Button.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/Button.eea
index 6d92d3d7ed..7be3cffd5f 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/Button.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/Button.eea
@@ -15,10 +15,10 @@ getForm
  ()Lorg/apache/wicket/markup/html/form/Form<*>;
 getOnClickScript
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 initModel
  ()Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;
- ()Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;
+ ()L0org/apache/wicket/model/IModel<Ljava/lang/String;>;
 onComponentTag
  (Lorg/apache/wicket/markup/ComponentTag;)V
  (L1org/apache/wicket/markup/ComponentTag;)V # @Inherited(org.apache.wicket.markup.html.form.FormComponent)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/Check.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/Check.eea
index 1903dc0ec1..d02cdaa73d 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/Check.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/Check.eea
@@ -23,7 +23,7 @@ getGroup
  ()Lorg/apache/wicket/markup/html/form/CheckGroup<TT;>;
 getValue
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 onComponentTag
  (Lorg/apache/wicket/markup/ComponentTag;)V
  (L1org/apache/wicket/markup/ComponentTag;)V # @Inherited(org.apache.wicket.Component)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/CheckBox.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/CheckBox.eea
index b0f6ab54e7..24288df6ab 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/CheckBox.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/CheckBox.eea
@@ -12,7 +12,7 @@ super org/apache/wicket/markup/html/form/FormComponent
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/lang/Boolean;>;)V
 createConverter
  (Ljava/lang/Class<*>;)Lorg/apache/wicket/util/convert/IConverter<*>;
- (Ljava/lang/Class<*>;)Lorg/apache/wicket/util/convert/IConverter<*>;
+ (Ljava/lang/Class<*>;)L0org/apache/wicket/util/convert/IConverter<*>; # @Inherited(org.apache.wicket.Component)
 onComponentTag
  (Lorg/apache/wicket/markup/ComponentTag;)V
  (L1org/apache/wicket/markup/ComponentTag;)V # @Inherited(org.apache.wicket.markup.html.form.FormComponent)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.eea
index 4c9a0165f2..9234502b60 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.eea
@@ -38,13 +38,13 @@ appendOptionHtml
  (Lorg/apache/wicket/util/string/AppendingStringBuffer;TT;ILjava/lang/String;)V
 getAdditionalAttributes
  (ITT;)Lorg/apache/wicket/util/value/IValueMap;
- (ITT;)Lorg/apache/wicket/util/value/IValueMap;
+ (ITT;)L0org/apache/wicket/util/value/IValueMap;
 getAdditionalAttributesForLabel
  (ITT;)Lorg/apache/wicket/util/value/IValueMap;
- (ITT;)Lorg/apache/wicket/util/value/IValueMap;
+ (ITT;)L0org/apache/wicket/util/value/IValueMap;
 getCheckBoxMarkupId
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 getPrefix
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/CheckBoxSelector.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/CheckBoxSelector.eea
index 35990dbe19..2dcb20b294 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/CheckBoxSelector.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/CheckBoxSelector.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/markup/html/form/CheckBoxSelector
 
 collectCheckBoxes
  (Lorg/apache/wicket/markup/html/WebMarkupContainer;)Ljava/lang/Iterable<Lorg/apache/wicket/markup/html/form/CheckBox;>;
- (Lorg/apache/wicket/markup/html/WebMarkupContainer;)Ljava/lang/Iterable<Lorg/apache/wicket/markup/html/form/CheckBox;>;
+ (Lorg/apache/wicket/markup/html/WebMarkupContainer;)L1java/lang/Iterable<Lorg/apache/wicket/markup/html/form/CheckBox;>;
 
 <init>
  (Ljava/lang/String;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/CheckGroup.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/CheckGroup.eea
index 682889e322..62219a33f4 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/CheckGroup.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/CheckGroup.eea
@@ -20,7 +20,7 @@ convertValue
  ([Ljava/lang/String;)Ljava/util/Collection<TT;>;
 getModelValue
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 onComponentTag
  (Lorg/apache/wicket/markup/ComponentTag;)V
  (L1org/apache/wicket/markup/ComponentTag;)V # @Inherited(org.apache.wicket.markup.html.form.FormComponent)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/EmailTextField.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/EmailTextField.eea
index ee060bed32..2e30e5effd 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/EmailTextField.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/EmailTextField.eea
@@ -21,4 +21,4 @@ super org/apache/wicket/markup/html/form/TextField
  (Ljava/lang/String;Lorg/apache/wicket/validation/IValidator<Ljava/lang/String;>;)V
 getInputTypes
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(org.apache.wicket.markup.html.form.TextField)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/EnumChoiceRenderer.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/EnumChoiceRenderer.eea
index 9986f186ff..2b7b7a620a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/EnumChoiceRenderer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/EnumChoiceRenderer.eea
@@ -17,4 +17,4 @@ getIdValue
  (TT;I)Ljava/lang/String;
 resourceKey
  (TT;)Ljava/lang/String;
- (TT;)Ljava/lang/String;
+ (TT;)L1java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/Form.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/Form.eea
index 0c3aa2b6f0..36c30d1017 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/Form.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/Form.eea
@@ -36,7 +36,7 @@ findForm
  (Lorg/apache/wicket/Component;)Lorg/apache/wicket/markup/html/form/Form<*>;
 getRootFormRelativeId
  (Lorg/apache/wicket/Component;)Ljava/lang/String;
- (Lorg/apache/wicket/Component;)Ljava/lang/String;
+ (Lorg/apache/wicket/Component;)L1java/lang/String;
 
 <init>
  (Ljava/lang/String;)V
@@ -76,25 +76,25 @@ getFormValidators
  ()Ljava/util/Collection<Lorg/apache/wicket/markup/html/form/validation/IFormValidator;>;
 getInputNamePrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getJsForListenerUrl
  (Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
- (Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+ (Ljava/lang/CharSequence;)L1java/lang/CharSequence;
 getJsForSubmitter
  (Lorg/apache/wicket/markup/html/form/IFormSubmittingComponent;Z)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/markup/html/form/IFormSubmittingComponent;Z)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/markup/html/form/IFormSubmittingComponent;Z)L1java/lang/CharSequence;
 getMaxSize
  ()Lorg/apache/wicket/util/lang/Bytes;
  ()Lorg/apache/wicket/util/lang/Bytes;
 getMethod
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getRootForm
  ()Lorg/apache/wicket/markup/html/form/Form<*>;
  ()Lorg/apache/wicket/markup/html/form/Form<*>;
 getValidatorKeyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 onComponentTag
  (Lorg/apache/wicket/markup/ComponentTag;)V
  (L1org/apache/wicket/markup/ComponentTag;)V # @Inherited(org.apache.wicket.Component)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/FormComponent.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/FormComponent.eea
index 38a43f78b7..92bb19e743 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/FormComponent.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/FormComponent.eea
@@ -34,7 +34,7 @@ add
  ([Lorg/apache/wicket/validation/IValidator<-TT;>;)Lorg/apache/wicket/markup/html/form/FormComponent<TT;>;
 convertValue
  ([Ljava/lang/String;)TT;
- ([Ljava/lang/String;)TT;
+ ([Ljava/lang/String;)T0T;
 error
  (Lorg/apache/wicket/validation/IValidationError;)V
  (Lorg/apache/wicket/validation/IValidationError;)V
@@ -52,7 +52,7 @@ getForm
  ()Lorg/apache/wicket/markup/html/form/Form<*>;
 getInput
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getInputAsArray
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
@@ -73,7 +73,7 @@ getType
  ()Ljava/lang/Class<TT;>;
 getValidatorKeyPrefix
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getValidators
  ()Ljava/util/List<Lorg/apache/wicket/validation/IValidator<-TT;>;>;
  ()Ljava/util/List<Lorg/apache/wicket/validation/IValidator<-TT;>;>;
@@ -82,13 +82,13 @@ getValue
  ()Ljava/lang/String;
 inputAsIntArray
  ()[I
- ()[I
+ ()[0I
 newValidatable
  ()Lorg/apache/wicket/validation/IValidatable<TT;>;
- ()Lorg/apache/wicket/validation/IValidatable<TT;>;
+ ()L1org/apache/wicket/validation/IValidatable<TT;>;
 newValidationError
  (Lorg/apache/wicket/util/convert/ConversionException;)Lorg/apache/wicket/validation/ValidationError;
- (Lorg/apache/wicket/util/convert/ConversionException;)Lorg/apache/wicket/validation/ValidationError;
+ (Lorg/apache/wicket/util/convert/ConversionException;)L1org/apache/wicket/validation/ValidationError;
 onComponentTag
  (Lorg/apache/wicket/markup/ComponentTag;)V
  (L1org/apache/wicket/markup/ComponentTag;)V # @Inherited(org.apache.wicket.Component)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/FormComponentPanel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/FormComponentPanel.eea
index 25c69b572e..1b6c16a8f9 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/FormComponentPanel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/FormComponentPanel.eea
@@ -14,7 +14,7 @@ super org/apache/wicket/markup/html/form/FormComponent
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)V
 newMarkupSourcingStrategy
  ()Lorg/apache/wicket/markup/html/panel/IMarkupSourcingStrategy;
- ()Lorg/apache/wicket/markup/html/panel/IMarkupSourcingStrategy;
+ ()L0org/apache/wicket/markup/html/panel/IMarkupSourcingStrategy; # @Inherited(org.apache.wicket.Component)
 onComponentTag
  (Lorg/apache/wicket/markup/ComponentTag;)V
  (L1org/apache/wicket/markup/ComponentTag;)V # @Inherited(org.apache.wicket.markup.html.form.FormComponent)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/FormComponentUpdatingBehavior.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/FormComponentUpdatingBehavior.eea
index 5054b41495..1805ebb36b 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/FormComponentUpdatingBehavior.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/FormComponentUpdatingBehavior.eea
@@ -5,7 +5,7 @@ bind
  (Lorg/apache/wicket/Component;)V
 getEvent
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getFormComponent
  ()Lorg/apache/wicket/markup/html/form/FormComponent<*>;
  ()Lorg/apache/wicket/markup/html/form/FormComponent<*>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/HiddenField.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/HiddenField.eea
index c45c1b9b0f..1a35a5b7fd 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/HiddenField.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/HiddenField.eea
@@ -20,4 +20,4 @@ super org/apache/wicket/markup/html/form/TextField
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;Ljava/lang/Class<TT;>;)V
 getInputTypes
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(org.apache.wicket.markup.html.form.TextField)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/IChoiceRenderer.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/IChoiceRenderer.eea
index c3fbda0918..a4aca967ad 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/IChoiceRenderer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/IChoiceRenderer.eea
@@ -10,4 +10,4 @@ getIdValue
  (TT;I)Ljava/lang/String;
 getObject
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<+Ljava/util/List<+TT;>;>;)TT;
- (Ljava/lang/String;Lorg/apache/wicket/model/IModel<+Ljava/util/List<+TT;>;>;)TT;
+ (Ljava/lang/String;Lorg/apache/wicket/model/IModel<+Ljava/util/List<+TT;>;>;)T0T;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/ListMultipleChoice.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/ListMultipleChoice.eea
index 6456db56e8..ab47d6ebe4 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/ListMultipleChoice.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/ListMultipleChoice.eea
@@ -38,13 +38,13 @@ super org/apache/wicket/markup/html/form/AbstractChoice
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<+Ljava/util/List<+TT;>;>;Lorg/apache/wicket/markup/html/form/IChoiceRenderer<-TT;>;)V
 convertChoiceIdsToChoices
  ([Ljava/lang/String;)Ljava/util/List<TT;>;
- ([Ljava/lang/String;)Ljava/util/List<TT;>;
+ ([Ljava/lang/String;)L1java/util/List<TT;>;
 convertValue
  ([Ljava/lang/String;)Ljava/util/Collection<TT;>;
  ([Ljava/lang/String;)Ljava/util/Collection<TT;>;
 getModelValue
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 isSelected
  (TT;ILjava/lang/String;)Z
  (TT;ILjava/lang/String;)Z
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/NumberTextField.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/NumberTextField.eea
index 96b634e7eb..74941c6be8 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/NumberTextField.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/NumberTextField.eea
@@ -24,7 +24,7 @@ ANY
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TN;>;Ljava/lang/Class<TN;>;)V
 getInputTypes
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(org.apache.wicket.markup.html.form.TextField)
 getModelValue
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/PasswordTextField.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/PasswordTextField.eea
index 17b044d1e5..2dbc87dc1e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/PasswordTextField.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/PasswordTextField.eea
@@ -12,7 +12,7 @@ super org/apache/wicket/markup/html/form/TextField
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;)V
 getInputTypes
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(org.apache.wicket.markup.html.form.TextField)
 onComponentTag
  (Lorg/apache/wicket/markup/ComponentTag;)V
  (L1org/apache/wicket/markup/ComponentTag;)V # @Inherited(org.apache.wicket.markup.html.form.TextField)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/Radio.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/Radio.eea
index b5d02f9688..c4c09f2743 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/Radio.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/Radio.eea
@@ -23,7 +23,7 @@ getGroup
  ()Lorg/apache/wicket/markup/html/form/RadioGroup<TT;>;
 getValue
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 onComponentTag
  (Lorg/apache/wicket/markup/ComponentTag;)V
  (L1org/apache/wicket/markup/ComponentTag;)V # @Inherited(org.apache.wicket.Component)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/RadioChoice.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/RadioChoice.eea
index cf2324bae4..8fa2414903 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/RadioChoice.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/RadioChoice.eea
@@ -38,13 +38,13 @@ appendOptionHtml
  (Lorg/apache/wicket/util/string/AppendingStringBuffer;TT;ILjava/lang/String;)V
 getAdditionalAttributes
  (ITT;)Lorg/apache/wicket/util/value/IValueMap;
- (ITT;)Lorg/apache/wicket/util/value/IValueMap;
+ (ITT;)L0org/apache/wicket/util/value/IValueMap;
 getAdditionalAttributesForLabel
  (ITT;)Lorg/apache/wicket/util/value/IValueMap;
- (ITT;)Lorg/apache/wicket/util/value/IValueMap;
+ (ITT;)L0org/apache/wicket/util/value/IValueMap;
 getDefaultChoice
  (Ljava/lang/String;)Ljava/lang/CharSequence;
- (Ljava/lang/String;)Ljava/lang/CharSequence;
+ (Ljava/lang/String;)L1java/lang/CharSequence; # @Inherited(org.apache.wicket.markup.html.form.AbstractSingleSelectChoice)
 getPrefix
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/RadioGroup.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/RadioGroup.eea
index 1929e20e1c..5a7bb58368 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/RadioGroup.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/RadioGroup.eea
@@ -14,7 +14,7 @@ super org/apache/wicket/markup/html/form/FormComponent
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)V
 convertValue
  ([Ljava/lang/String;)TT;
- ([Ljava/lang/String;)TT;
+ ([Ljava/lang/String;)T0T; # @Inherited(org.apache.wicket.markup.html.form.FormComponent)
 getModelValue
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/RangeTextField.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/RangeTextField.eea
index fd3a8d672d..1670640ab5 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/RangeTextField.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/RangeTextField.eea
@@ -17,4 +17,4 @@ super org/apache/wicket/markup/html/form/NumberTextField
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TN;>;Ljava/lang/Class<TN;>;)V
 getInputTypes
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(org.apache.wicket.markup.html.form.NumberTextField)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/SubmitLink.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/SubmitLink.eea
index 2aa3b2de4d..4c10b3304f 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/SubmitLink.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/SubmitLink.eea
@@ -14,7 +14,7 @@ class org/apache/wicket/markup/html/form/SubmitLink
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<*>;Lorg/apache/wicket/markup/html/form/Form<*>;)V
 getTriggerJavaScript
  ()Ljava/lang/CharSequence;
- ()Ljava/lang/CharSequence;
+ ()L0java/lang/CharSequence;
 onComponentTag
  (Lorg/apache/wicket/markup/ComponentTag;)V
  (L1org/apache/wicket/markup/ComponentTag;)V # @Inherited(org.apache.wicket.Component)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/TextField.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/TextField.eea
index 2da85dd8ad..cd33e1f7ef 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/TextField.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/TextField.eea
@@ -20,7 +20,7 @@ super org/apache/wicket/markup/html/form/AbstractTextComponent
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;Ljava/lang/Class<TT;>;)V
 getInputTypes
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String;
 onComponentTag
  (Lorg/apache/wicket/markup/ComponentTag;)V
  (L1org/apache/wicket/markup/ComponentTag;)V # @Inherited(org.apache.wicket.markup.html.form.FormComponent)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/UrlTextField.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/UrlTextField.eea
index e3023c3df3..0d840e9496 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/UrlTextField.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/UrlTextField.eea
@@ -15,4 +15,4 @@ super org/apache/wicket/markup/html/form/TextField
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;Lorg/apache/wicket/validation/validator/UrlValidator;)V
 getInputTypes
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String; # @Inherited(org.apache.wicket.markup.html.form.TextField)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/FileUploadField.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/FileUploadField.eea
index 640f9dd62e..8f7db4e0c1 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/FileUploadField.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/FileUploadField.eea
@@ -12,7 +12,7 @@ super org/apache/wicket/markup/html/form/FormComponent
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<+Ljava/util/List<Lorg/apache/wicket/markup/html/form/upload/FileUpload;>;>;)V
 convertValue
  ([Ljava/lang/String;)Ljava/util/List<Lorg/apache/wicket/markup/html/form/upload/FileUpload;>;
- ([Ljava/lang/String;)Ljava/util/List<Lorg/apache/wicket/markup/html/form/upload/FileUpload;>;
+ ([Ljava/lang/String;)L0java/util/List<Lorg/apache/wicket/markup/html/form/upload/FileUpload;>;
 getFileUpload
  ()Lorg/apache/wicket/markup/html/form/upload/FileUpload;
  ()Lorg/apache/wicket/markup/html/form/upload/FileUpload;
@@ -21,7 +21,7 @@ getFileUploads
  ()Ljava/util/List<Lorg/apache/wicket/markup/html/form/upload/FileUpload;>;
 getInputAsArray
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[0Ljava/lang/String;
 onComponentTag
  (Lorg/apache/wicket/markup/ComponentTag;)V
  (L1org/apache/wicket/markup/ComponentTag;)V # @Inherited(org.apache.wicket.markup.html.form.FormComponent)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/FilesSelectedBehavior.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/FilesSelectedBehavior.eea
index b4f783ebab..1908e1ce6d 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/FilesSelectedBehavior.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/FilesSelectedBehavior.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/markup/html/form/upload/FilesSelectedBehavior
 
 onSelected
  (Lorg/danekja/java/util/function/serializable/SerializableBiConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;Ljava/util/List<Lorg/apache/wicket/markup/html/form/upload/FileDescription;>;>;)Lorg/apache/wicket/markup/html/form/upload/FilesSelectedBehavior;
- (Lorg/danekja/java/util/function/serializable/SerializableBiConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;Ljava/util/List<Lorg/apache/wicket/markup/html/form/upload/FileDescription;>;>;)Lorg/apache/wicket/markup/html/form/upload/FilesSelectedBehavior;
+ (Lorg/danekja/java/util/function/serializable/SerializableBiConsumer<Lorg/apache/wicket/ajax/AjaxRequestTarget;Ljava/util/List<Lorg/apache/wicket/markup/html/form/upload/FileDescription;>;>;)L1org/apache/wicket/markup/html/form/upload/FilesSelectedBehavior;
 
 onSelected
  (Lorg/apache/wicket/ajax/AjaxRequestTarget;Ljava/util/List<Lorg/apache/wicket/markup/html/form/upload/FileDescription;>;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/resource/AbstractFileUploadResource.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/resource/AbstractFileUploadResource.eea
index 85b2ef975f..a1a89e409c 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/resource/AbstractFileUploadResource.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/resource/AbstractFileUploadResource.eea
@@ -18,10 +18,10 @@ generateJsonResponse
  (Lorg/apache/wicket/request/resource/AbstractResource$ResourceResponse;Lorg/apache/wicket/protocol/http/servlet/ServletWebRequest;Ljava/util/List<Lorg/apache/wicket/markup/html/form/upload/FileUpload;>;)Ljava/lang/String;
 getFileUploadExceptionKey
  (Lorg/apache/commons/fileupload2/core/FileUploadException;)Ljava/lang/String;
- (Lorg/apache/commons/fileupload2/core/FileUploadException;)Ljava/lang/String;
+ (Lorg/apache/commons/fileupload2/core/FileUploadException;)L1java/lang/String;
 newResourceResponse
  (Lorg/apache/wicket/request/resource/IResource$Attributes;)Lorg/apache/wicket/request/resource/AbstractResource$ResourceResponse;
- (Lorg/apache/wicket/request/resource/IResource$Attributes;)Lorg/apache/wicket/request/resource/AbstractResource$ResourceResponse;
+ (Lorg/apache/wicket/request/resource/IResource$Attributes;)L1org/apache/wicket/request/resource/AbstractResource$ResourceResponse;
 prepareResponse
  (Lorg/apache/wicket/request/resource/AbstractResource$ResourceResponse;Lorg/apache/wicket/protocol/http/servlet/ServletWebRequest;Ljava/util/List<Lorg/apache/wicket/markup/html/form/upload/FileUpload;>;)V
  (Lorg/apache/wicket/request/resource/AbstractResource$ResourceResponse;Lorg/apache/wicket/protocol/http/servlet/ServletWebRequest;Ljava/util/List<Lorg/apache/wicket/markup/html/form/upload/FileUpload;>;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/resource/FileUploadResourceReference.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/resource/FileUploadResourceReference.eea
index 0d45d663e8..67acbdec5f 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/resource/FileUploadResourceReference.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/resource/FileUploadResourceReference.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/markup/html/form/upload/resource/FileUploadResourceRefer
 
 createNewInstance
  (Lorg/apache/wicket/markup/html/form/upload/resource/IUploadsFileManager;)Lorg/apache/wicket/markup/html/form/upload/resource/FileUploadResourceReference;
- (Lorg/apache/wicket/markup/html/form/upload/resource/IUploadsFileManager;)Lorg/apache/wicket/markup/html/form/upload/resource/FileUploadResourceReference;
+ (Lorg/apache/wicket/markup/html/form/upload/resource/IUploadsFileManager;)L1org/apache/wicket/markup/html/form/upload/resource/FileUploadResourceReference;
 getInstance
  ()Lorg/apache/wicket/markup/html/form/upload/resource/FileUploadResourceReference;
  ()Lorg/apache/wicket/markup/html/form/upload/resource/FileUploadResourceReference;
@@ -15,7 +15,7 @@ generateFileInfo
  (Lcom/github/openjson/JSONObject;Lorg/apache/wicket/markup/html/form/upload/FileUpload;)V
 getResource
  ()Lorg/apache/wicket/request/resource/IResource;
- ()Lorg/apache/wicket/request/resource/IResource;
+ ()L1org/apache/wicket/request/resource/IResource;
 getUploadFileManager
  ()Lorg/apache/wicket/markup/html/form/upload/resource/IUploadsFileManager;
  ()Lorg/apache/wicket/markup/html/form/upload/resource/IUploadsFileManager;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/resource/FileUploadToResourceField$UploadInfo.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/resource/FileUploadToResourceField$UploadInfo.eea
index 63a244d1fc..e2d0b61f9f 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/resource/FileUploadToResourceField$UploadInfo.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/resource/FileUploadToResourceField$UploadInfo.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/markup/html/form/upload/resource/FileUploadToResourceFie
 
 fromJson
  (Ljava/lang/String;)Ljava/util/List<Lorg/apache/wicket/markup/html/form/upload/resource/FileUploadToResourceField$UploadInfo;>;
- (Ljava/lang/String;)Ljava/util/List<Lorg/apache/wicket/markup/html/form/upload/resource/FileUploadToResourceField$UploadInfo;>;
+ (Ljava/lang/String;)L1java/util/List<Lorg/apache/wicket/markup/html/form/upload/resource/FileUploadToResourceField$UploadInfo;>;
 
 <init>
  (Ljava/lang/String;JLjava/lang/String;)V
@@ -12,7 +12,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 get
  ()[B
- ()[B
+ ()[0B
 getClientFileName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/resource/FileUploadToResourceField.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/resource/FileUploadToResourceField.eea
index 2e26cbb2b8..dd822f0aea 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/resource/FileUploadToResourceField.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/resource/FileUploadToResourceField.eea
@@ -15,40 +15,40 @@ fileManager
  ()Lorg/apache/wicket/markup/html/form/upload/resource/IUploadsFileManager;
 generateAUniqueApplicationWiseId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getClientBeforeSendCallBack
  ()Ljava/lang/CharSequence;
- ()Ljava/lang/CharSequence;
+ ()L1java/lang/CharSequence;
 getClientSideCancelCallBack
  ()Ljava/lang/CharSequence;
- ()Ljava/lang/CharSequence;
+ ()L1java/lang/CharSequence;
 getClientSideSuccessCallBack
  ()Ljava/lang/CharSequence;
- ()Ljava/lang/CharSequence;
+ ()L1java/lang/CharSequence;
 getClientSideUploadErrorCallBack
  ()Ljava/lang/CharSequence;
- ()Ljava/lang/CharSequence;
+ ()L1java/lang/CharSequence;
 getFileMaxSize
  ()Lorg/apache/wicket/util/lang/Bytes;
  ()Lorg/apache/wicket/util/lang/Bytes;
 getFileUpload
  ()Lorg/apache/wicket/markup/html/form/upload/FileUpload;
- ()Lorg/apache/wicket/markup/html/form/upload/FileUpload;
+ ()L1org/apache/wicket/markup/html/form/upload/FileUpload;
 getFileUploadResourceReference
  ()Lorg/apache/wicket/markup/html/form/upload/resource/FileUploadResourceReference;
  ()Lorg/apache/wicket/markup/html/form/upload/resource/FileUploadResourceReference;
 getFileUploads
  ()Ljava/util/List<Lorg/apache/wicket/markup/html/form/upload/FileUpload;>;
- ()Ljava/util/List<Lorg/apache/wicket/markup/html/form/upload/FileUpload;>;
+ ()L1java/util/List<Lorg/apache/wicket/markup/html/form/upload/FileUpload;>;
 getMaxSize
  ()Lorg/apache/wicket/util/lang/Bytes;
  ()Lorg/apache/wicket/util/lang/Bytes;
 getTriggerCancelUploadScript
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getTriggerUploadScript
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 onUploadCanceled
  (Lorg/apache/wicket/ajax/AjaxRequestTarget;)V
  (Lorg/apache/wicket/ajax/AjaxRequestTarget;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/resource/FolderUploadsFileManager.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/resource/FolderUploadsFileManager.eea
index 8812792dae..111c3581af 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/resource/FolderUploadsFileManager.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/upload/resource/FolderUploadsFileManager.eea
@@ -5,7 +5,7 @@ class org/apache/wicket/markup/html/form/upload/resource/FolderUploadsFileManage
  (Lorg/apache/wicket/util/file/File;)V
 getFile
  (Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/util/file/File;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/util/file/File;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/apache/wicket/util/file/File;
 getFolder
  ()Lorg/apache/wicket/util/file/File;
  ()Lorg/apache/wicket/util/file/File;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackBorder.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackBorder.eea
index 60c3989dd1..65768ac900 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackBorder.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackBorder.eea
@@ -5,4 +5,4 @@ class org/apache/wicket/markup/html/form/validation/FormComponentFeedbackBorder
  (Ljava/lang/String;)V
 getMessagesFilter
  ()Lorg/apache/wicket/feedback/IFeedbackMessageFilter;
- ()Lorg/apache/wicket/feedback/IFeedbackMessageFilter;
+ ()L1org/apache/wicket/feedback/IFeedbackMessageFilter;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/image/ExternalSource.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/image/ExternalSource.eea
index 9f10a6a2b7..d0d3e4b359 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/image/ExternalSource.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/image/ExternalSource.eea
@@ -11,7 +11,7 @@ class org/apache/wicket/markup/html/image/ExternalSource
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/util/List<Ljava/io/Serializable;>;>;)V
 getCrossOrigin
  ()Lorg/apache/wicket/markup/html/CrossOrigin;
- ()Lorg/apache/wicket/markup/html/CrossOrigin;
+ ()L0org/apache/wicket/markup/html/CrossOrigin;
 getMedia
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/image/Image.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/image/Image.eea
index a183386242..dfa61ae1dd 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/image/Image.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/image/Image.eea
@@ -41,7 +41,7 @@ getImageResourceReference
  ()Lorg/apache/wicket/request/resource/ResourceReference;
 initModel
  ()Lorg/apache/wicket/model/IModel<*>;
- ()Lorg/apache/wicket/model/IModel<*>;
+ ()L0org/apache/wicket/model/IModel<*>;
 onComponentTag
  (Lorg/apache/wicket/markup/ComponentTag;)V
  (L1org/apache/wicket/markup/ComponentTag;)V # @Inherited(org.apache.wicket.Component)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/image/Source.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/image/Source.eea
index 024552c08e..b1cd46f953 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/image/Source.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/image/Source.eea
@@ -20,7 +20,7 @@ class org/apache/wicket/markup/html/image/Source
  (Ljava/lang/String;[Lorg/apache/wicket/request/resource/ResourceReference;)V
 getCrossOrigin
  ()Lorg/apache/wicket/markup/html/CrossOrigin;
- ()Lorg/apache/wicket/markup/html/CrossOrigin;
+ ()L0org/apache/wicket/markup/html/CrossOrigin;
 getMedia
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResource.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResource.eea
index 1c4650d141..6325c9cd7b 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResource.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResource.eea
@@ -8,16 +8,16 @@ class org/apache/wicket/markup/html/image/resource/DefaultButtonImageResource
  (Ljava/lang/String;)V
 getBackgroundColor
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L1java/awt/Color;
 getColor
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L1java/awt/Color;
 getFont
  ()Ljava/awt/Font;
- ()Ljava/awt/Font;
+ ()L1java/awt/Font;
 getTextColor
  ()Ljava/awt/Color;
- ()Ljava/awt/Color;
+ ()L1java/awt/Color;
 render
  (Ljava/awt/Graphics2D;Lorg/apache/wicket/request/resource/IResource$Attributes;)Z
  (Ljava/awt/Graphics2D;Lorg/apache/wicket/request/resource/IResource$Attributes;)Z
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResourceFactory.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResourceFactory.eea
index 1545c1d7e4..8bfde76f32 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResourceFactory.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResourceFactory.eea
@@ -2,4 +2,4 @@ class org/apache/wicket/markup/html/image/resource/DefaultButtonImageResourceFac
 
 newResource
  (Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/request/resource/IResource;
- (Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/request/resource/IResource;
+ (Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)L1org/apache/wicket/request/resource/IResource;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/include/Include.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/include/Include.eea
index 73bcc774e8..1f84218fb0 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/include/Include.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/include/Include.eea
@@ -15,7 +15,7 @@ super org/apache/wicket/IGenericComponent
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/lang/String;>;)V
 getCharset
  ()Ljava/nio/charset/Charset;
- ()Ljava/nio/charset/Charset;
+ ()L0java/nio/charset/Charset;
 importAsString
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/internal/Enclosure.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/internal/Enclosure.eea
index 42cee0cd6b..f17c1d96f4 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/internal/Enclosure.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/internal/Enclosure.eea
@@ -8,7 +8,7 @@ getChild
  ()Lorg/apache/wicket/Component;
 getChildId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getEnclosureParent
  ()Lorg/apache/wicket/MarkupContainer;
  ()Lorg/apache/wicket/MarkupContainer;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.eea
index 2c64d391fd..aa24218ecc 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.eea
@@ -11,7 +11,7 @@ getMarkup
  ()Lorg/apache/wicket/markup/IMarkupFragment;
 newHeaderResponse
  ()Lorg/apache/wicket/markup/head/IHeaderResponse;
- ()Lorg/apache/wicket/markup/head/IHeaderResponse;
+ ()L1org/apache/wicket/markup/head/IHeaderResponse;
 okToRenderComponent
  (Ljava/lang/String;Ljava/lang/String;)Z
  (Ljava/lang/String;Ljava/lang/String;)Z
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/link/Link.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/link/Link.eea
index 2186120db8..ae9fcbbaad 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/link/Link.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/link/Link.eea
@@ -14,13 +14,13 @@ super org/apache/wicket/IGenericComponent
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<TT;>;)V
 appendAnchor
  (Lorg/apache/wicket/markup/ComponentTag;Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/markup/ComponentTag;Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/markup/ComponentTag;Ljava/lang/CharSequence;)L1java/lang/CharSequence;
 getAnchor
  ()Lorg/apache/wicket/Component;
  ()Lorg/apache/wicket/Component;
 getOnClickScript
  (Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
- (Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+ (Ljava/lang/CharSequence;)L0java/lang/CharSequence;
 getPopupSettings
  ()Lorg/apache/wicket/markup/html/link/PopupSettings;
  ()Lorg/apache/wicket/markup/html/link/PopupSettings;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/link/PopupSettings.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/link/PopupSettings.eea
index 517c336cbe..3d3714729f 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/link/PopupSettings.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/link/PopupSettings.eea
@@ -8,7 +8,7 @@ class org/apache/wicket/markup/html/link/PopupSettings
  (Ljava/lang/String;I)V
 getPopupJavaScript
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 setHeight
  (I)Lorg/apache/wicket/markup/html/link/PopupSettings;
  (I)Lorg/apache/wicket/markup/html/link/PopupSettings;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/list/ListView.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/list/ListView.eea
index 1a11fc04ee..5ee1ae6a15 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/list/ListView.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/list/ListView.eea
@@ -16,7 +16,7 @@ getList
  ()Ljava/util/List<TT;>;
 getListItemModel
  (Lorg/apache/wicket/model/IModel<+Ljava/util/List<TT;>;>;I)Lorg/apache/wicket/model/IModel<TT;>;
- (Lorg/apache/wicket/model/IModel<+Ljava/util/List<TT;>;>;I)Lorg/apache/wicket/model/IModel<TT;>;
+ (Lorg/apache/wicket/model/IModel<+Ljava/util/List<TT;>;>;I)L1org/apache/wicket/model/IModel<TT;>;
 getModel
  ()Lorg/apache/wicket/model/IModel<+Ljava/util/List<TT;>;>;
  ()Lorg/apache/wicket/model/IModel<+Ljava/util/List<TT;>;>;
@@ -25,13 +25,13 @@ getModelObject
  ()Ljava/util/List<TT;>;
 moveDownLink
  (Ljava/lang/String;Lorg/apache/wicket/markup/html/list/ListItem<TT;>;)Lorg/apache/wicket/markup/html/link/Link<Ljava/lang/Void;>;
- (Ljava/lang/String;Lorg/apache/wicket/markup/html/list/ListItem<TT;>;)Lorg/apache/wicket/markup/html/link/Link<Ljava/lang/Void;>;
+ (Ljava/lang/String;Lorg/apache/wicket/markup/html/list/ListItem<TT;>;)L1org/apache/wicket/markup/html/link/Link<Ljava/lang/Void;>;
 moveUpLink
  (Ljava/lang/String;Lorg/apache/wicket/markup/html/list/ListItem<TT;>;)Lorg/apache/wicket/markup/html/link/Link<Ljava/lang/Void;>;
- (Ljava/lang/String;Lorg/apache/wicket/markup/html/list/ListItem<TT;>;)Lorg/apache/wicket/markup/html/link/Link<Ljava/lang/Void;>;
+ (Ljava/lang/String;Lorg/apache/wicket/markup/html/list/ListItem<TT;>;)L1org/apache/wicket/markup/html/link/Link<Ljava/lang/Void;>;
 newItem
  (ILorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/markup/html/list/ListItem<TT;>;
- (ILorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/markup/html/list/ListItem<TT;>;
+ (ILorg/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/markup/html/list/ListItem<TT;>;
 onBeginPopulateItem
  (Lorg/apache/wicket/markup/html/list/ListItem<TT;>;)V
  (Lorg/apache/wicket/markup/html/list/ListItem<TT;>;)V
@@ -40,7 +40,7 @@ populateItem
  (Lorg/apache/wicket/markup/html/list/ListItem<TT;>;)V
 removeLink
  (Ljava/lang/String;Lorg/apache/wicket/markup/html/list/ListItem<TT;>;)Lorg/apache/wicket/markup/html/link/Link<Ljava/lang/Void;>;
- (Ljava/lang/String;Lorg/apache/wicket/markup/html/list/ListItem<TT;>;)Lorg/apache/wicket/markup/html/link/Link<Ljava/lang/Void;>;
+ (Ljava/lang/String;Lorg/apache/wicket/markup/html/list/ListItem<TT;>;)L1org/apache/wicket/markup/html/link/Link<Ljava/lang/Void;>;
 renderChild
  (Lorg/apache/wicket/Component;)V
  (Lorg/apache/wicket/Component;)V
@@ -49,7 +49,7 @@ renderItem
  (Lorg/apache/wicket/markup/html/list/ListItem<*>;)V
 renderIterator
  ()Ljava/util/Iterator<Lorg/apache/wicket/Component;>;
- ()Ljava/util/Iterator<Lorg/apache/wicket/Component;>;
+ ()L1java/util/Iterator<Lorg/apache/wicket/Component;>;
 setList
  (Ljava/util/List<TT;>;)Lorg/apache/wicket/markup/html/list/ListView<TT;>;
  (Ljava/util/List<TT;>;)Lorg/apache/wicket/markup/html/list/ListView<TT;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/list/Loop.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/list/Loop.eea
index 11b9146e2a..e9807c6215 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/list/Loop.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/list/Loop.eea
@@ -8,7 +8,7 @@ class org/apache/wicket/markup/html/list/Loop
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/lang/Integer;>;)V
 newItem
  (I)Lorg/apache/wicket/markup/html/list/LoopItem;
- (I)Lorg/apache/wicket/markup/html/list/LoopItem;
+ (I)L1org/apache/wicket/markup/html/list/LoopItem;
 populateItem
  (Lorg/apache/wicket/markup/html/list/LoopItem;)V
  (Lorg/apache/wicket/markup/html/list/LoopItem;)V
@@ -20,4 +20,4 @@ renderItem
  (Lorg/apache/wicket/markup/html/list/LoopItem;)V
 renderIterator
  ()Ljava/util/Iterator<Lorg/apache/wicket/Component;>;
- ()Ljava/util/Iterator<Lorg/apache/wicket/Component;>;
+ ()L1java/util/Iterator<Lorg/apache/wicket/Component;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/list/PageableListView.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/list/PageableListView.eea
index 283de746d0..165521d61b 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/list/PageableListView.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/list/PageableListView.eea
@@ -14,7 +14,7 @@ super org/apache/wicket/markup/html/list/ListView
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<+Ljava/util/List<TT;>;>;J)V
 setStartIndex
  (I)Lorg/apache/wicket/markup/html/list/ListView<TT;>;
- (I)Lorg/apache/wicket/markup/html/list/ListView<TT;>;
+ (I)L1org/apache/wicket/markup/html/list/ListView<TT;>;
 setViewSize
  (I)Lorg/apache/wicket/markup/html/list/ListView<TT;>;
- (I)Lorg/apache/wicket/markup/html/list/ListView<TT;>;
+ (I)L1org/apache/wicket/markup/html/list/ListView<TT;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/list/PropertyListView.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/list/PropertyListView.eea
index 18a80fb7a9..2edcdab8d1 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/list/PropertyListView.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/list/PropertyListView.eea
@@ -17,4 +17,4 @@ super org/apache/wicket/markup/html/list/ListView
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<+Ljava/util/List<TT;>;>;)V
 getListItemModel
  (Lorg/apache/wicket/model/IModel<+Ljava/util/List<TT;>;>;I)Lorg/apache/wicket/model/IModel<TT;>;
- (Lorg/apache/wicket/model/IModel<+Ljava/util/List<TT;>;>;I)Lorg/apache/wicket/model/IModel<TT;>;
+ (Lorg/apache/wicket/model/IModel<+Ljava/util/List<TT;>;>;I)L1org/apache/wicket/model/IModel<TT;>; # @Inherited(org.apache.wicket.markup.html.list.ListView)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.eea
index 345ee4b946..795319ca84 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.eea
@@ -18,7 +18,7 @@ getSeparator
  ()Ljava/lang/String;
 newPagingNavigationLink
  (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;J)Lorg/apache/wicket/markup/html/link/AbstractLink;
- (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;J)Lorg/apache/wicket/markup/html/link/AbstractLink;
+ (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;J)L1org/apache/wicket/markup/html/link/AbstractLink;
 populateItem
  (Lorg/apache/wicket/markup/html/list/LoopItem;)V
  (Lorg/apache/wicket/markup/html/list/LoopItem;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/navigation/paging/PagingNavigator.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/navigation/paging/PagingNavigator.eea
index 04bed2b8e5..2cad8be190 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/navigation/paging/PagingNavigator.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/navigation/paging/PagingNavigator.eea
@@ -14,10 +14,10 @@ getPagingNavigation
  ()Lorg/apache/wicket/markup/html/navigation/paging/PagingNavigation;
 newNavigation
  (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;Lorg/apache/wicket/markup/html/navigation/paging/IPagingLabelProvider;)Lorg/apache/wicket/markup/html/navigation/paging/PagingNavigation;
- (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;Lorg/apache/wicket/markup/html/navigation/paging/IPagingLabelProvider;)Lorg/apache/wicket/markup/html/navigation/paging/PagingNavigation;
+ (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;Lorg/apache/wicket/markup/html/navigation/paging/IPagingLabelProvider;)L1org/apache/wicket/markup/html/navigation/paging/PagingNavigation;
 newPagingNavigationIncrementLink
  (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;I)Lorg/apache/wicket/markup/html/link/AbstractLink;
- (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;I)Lorg/apache/wicket/markup/html/link/AbstractLink;
+ (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;I)L1org/apache/wicket/markup/html/link/AbstractLink;
 newPagingNavigationLink
  (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;I)Lorg/apache/wicket/markup/html/link/AbstractLink;
  (Ljava/lang/String;Lorg/apache/wicket/markup/html/navigation/paging/IPageable;I)Lorg/apache/wicket/markup/html/link/AbstractLink;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/pages/BrowserInfoForm.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/pages/BrowserInfoForm.eea
index 80a5816461..37bcb8ee98 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/pages/BrowserInfoForm.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/pages/BrowserInfoForm.eea
@@ -13,7 +13,7 @@ JS
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Lorg/apache/wicket/protocol/http/ClientProperties;>;)V
 createForm
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Lorg/apache/wicket/protocol/http/ClientProperties;>;)Lorg/apache/wicket/markup/html/form/Form<Lorg/apache/wicket/protocol/http/ClientProperties;>;
- (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Lorg/apache/wicket/protocol/http/ClientProperties;>;)Lorg/apache/wicket/markup/html/form/Form<Lorg/apache/wicket/protocol/http/ClientProperties;>;
+ (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Lorg/apache/wicket/protocol/http/ClientProperties;>;)L1org/apache/wicket/markup/html/form/Form<Lorg/apache/wicket/protocol/http/ClientProperties;>;
 getFormMarkupId
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/pages/BrowserInfoPage.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/pages/BrowserInfoPage.eea
index 8d8220de63..28e1a6e28f 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/pages/BrowserInfoPage.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/pages/BrowserInfoPage.eea
@@ -5,7 +5,7 @@ newClientInfo
  ()Lorg/apache/wicket/protocol/http/ClientProperties;
 newWebClientInfo
  (Lorg/apache/wicket/request/cycle/RequestCycle;)Lorg/apache/wicket/protocol/http/request/WebClientInfo;
- (Lorg/apache/wicket/request/cycle/RequestCycle;)Lorg/apache/wicket/protocol/http/request/WebClientInfo;
+ (Lorg/apache/wicket/request/cycle/RequestCycle;)L1org/apache/wicket/protocol/http/request/WebClientInfo;
 renderHead
  (Lorg/apache/wicket/markup/head/IHeaderResponse;)V
  (L1org/apache/wicket/markup/head/IHeaderResponse;)V # @Inherited(org.apache.wicket.Component)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/pages/ExceptionErrorPage.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/pages/ExceptionErrorPage.eea
index 83efd82e9e..e9b56bc01c 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/pages/ExceptionErrorPage.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/pages/ExceptionErrorPage.eea
@@ -5,10 +5,10 @@ class org/apache/wicket/markup/html/pages/ExceptionErrorPage
  (Ljava/lang/Throwable;Lorg/apache/wicket/Page;)V
 getErrorMessage
  (Ljava/lang/Throwable;)Ljava/lang/String;
- (Ljava/lang/Throwable;)Ljava/lang/String;
+ (Ljava/lang/Throwable;)L1java/lang/String;
 getStackTrace
  (Ljava/lang/Throwable;)Ljava/lang/String;
- (Ljava/lang/Throwable;)Ljava/lang/String;
+ (Ljava/lang/Throwable;)L1java/lang/String;
 getThrowable
  ()Ljava/lang/Throwable;
  ()Ljava/lang/Throwable;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/panel/BorderMarkupSourcingStrategy.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/panel/BorderMarkupSourcingStrategy.eea
index 0caf92e092..b874699625 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/panel/BorderMarkupSourcingStrategy.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/panel/BorderMarkupSourcingStrategy.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/markup/html/panel/BorderMarkupSourcingStrategy
 
 getMarkup
  (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/Component;)Lorg/apache/wicket/markup/IMarkupFragment;
- (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/Component;)Lorg/apache/wicket/markup/IMarkupFragment;
+ (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/Component;)L0org/apache/wicket/markup/IMarkupFragment;
 onComponentTagBody
  (Lorg/apache/wicket/Component;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)V
  (Lorg/apache/wicket/Component;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.eea
index 0dff303f54..899cd267d9 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.eea
@@ -6,7 +6,7 @@ get
 
 getMarkup
  (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/Component;)Lorg/apache/wicket/markup/IMarkupFragment;
- (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/Component;)Lorg/apache/wicket/markup/IMarkupFragment;
+ (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/Component;)L0org/apache/wicket/markup/IMarkupFragment;
 onComponentTag
  (Lorg/apache/wicket/Component;Lorg/apache/wicket/markup/ComponentTag;)V
  (Lorg/apache/wicket/Component;Lorg/apache/wicket/markup/ComponentTag;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/panel/FeedbackPanel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/panel/FeedbackPanel.eea
index bc08d4daa0..216dc02df8 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/panel/FeedbackPanel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/panel/FeedbackPanel.eea
@@ -8,7 +8,7 @@ class org/apache/wicket/markup/html/panel/FeedbackPanel
  (Ljava/lang/String;Lorg/apache/wicket/feedback/IFeedbackMessageFilter;)V
 getCSSClass
  (Lorg/apache/wicket/feedback/FeedbackMessage;)Ljava/lang/String;
- (Lorg/apache/wicket/feedback/FeedbackMessage;)Ljava/lang/String;
+ (Lorg/apache/wicket/feedback/FeedbackMessage;)L1java/lang/String;
 getCurrentMessages
  ()Ljava/util/List<Lorg/apache/wicket/feedback/FeedbackMessage;>;
  ()Ljava/util/List<Lorg/apache/wicket/feedback/FeedbackMessage;>;
@@ -23,13 +23,13 @@ getSortingComparator
  ()Ljava/util/Comparator<Lorg/apache/wicket/feedback/FeedbackMessage;>;
 newFeedbackMessagesModel
  ()Lorg/apache/wicket/feedback/FeedbackMessagesModel;
- ()Lorg/apache/wicket/feedback/FeedbackMessagesModel;
+ ()L1org/apache/wicket/feedback/FeedbackMessagesModel;
 newMessageDisplayComponent
  (Ljava/lang/String;Lorg/apache/wicket/feedback/FeedbackMessage;)Lorg/apache/wicket/Component;
- (Ljava/lang/String;Lorg/apache/wicket/feedback/FeedbackMessage;)Lorg/apache/wicket/Component;
+ (Ljava/lang/String;Lorg/apache/wicket/feedback/FeedbackMessage;)L1org/apache/wicket/Component;
 newMessageItem
  (ILorg/apache/wicket/model/IModel<Lorg/apache/wicket/feedback/FeedbackMessage;>;)Lorg/apache/wicket/markup/html/list/ListItem<Lorg/apache/wicket/feedback/FeedbackMessage;>;
- (ILorg/apache/wicket/model/IModel<Lorg/apache/wicket/feedback/FeedbackMessage;>;)Lorg/apache/wicket/markup/html/list/ListItem<Lorg/apache/wicket/feedback/FeedbackMessage;>;
+ (ILorg/apache/wicket/model/IModel<Lorg/apache/wicket/feedback/FeedbackMessage;>;)L1org/apache/wicket/markup/html/list/ListItem<Lorg/apache/wicket/feedback/FeedbackMessage;>;
 setFilter
  (Lorg/apache/wicket/feedback/IFeedbackMessageFilter;)Lorg/apache/wicket/markup/html/panel/FeedbackPanel;
  (Lorg/apache/wicket/feedback/IFeedbackMessageFilter;)Lorg/apache/wicket/markup/html/panel/FeedbackPanel;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/panel/Fragment.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/panel/Fragment.eea
index c9f3a20d71..6824e03591 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/panel/Fragment.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/panel/Fragment.eea
@@ -14,7 +14,7 @@ getAssociatedMarkupId
  ()Ljava/lang/String;
 newDequeueContext
  ()Lorg/apache/wicket/DequeueContext;
- ()Lorg/apache/wicket/DequeueContext;
+ ()L0org/apache/wicket/DequeueContext; # @Inherited(org.apache.wicket.MarkupContainer)
 newMarkupSourcingStrategy
  ()Lorg/apache/wicket/markup/html/panel/IMarkupSourcingStrategy;
- ()Lorg/apache/wicket/markup/html/panel/IMarkupSourcingStrategy;
+ ()L0org/apache/wicket/markup/html/panel/IMarkupSourcingStrategy; # @Inherited(org.apache.wicket.Component)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/panel/Panel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/panel/Panel.eea
index 6ee23809a8..ecdfd35837 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/panel/Panel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/html/panel/Panel.eea
@@ -15,4 +15,4 @@ getRegionMarkup
  ()Lorg/apache/wicket/markup/IMarkupFragment;
 newMarkupSourcingStrategy
  ()Lorg/apache/wicket/markup/html/panel/IMarkupSourcingStrategy;
- ()Lorg/apache/wicket/markup/html/panel/IMarkupSourcingStrategy;
+ ()L0org/apache/wicket/markup/html/panel/IMarkupSourcingStrategy; # @Inherited(org.apache.wicket.Component)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/TagStack.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/TagStack.eea
index 3698e835a1..f966389c5b 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/TagStack.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/TagStack.eea
@@ -12,4 +12,4 @@ assertValidInStack
  (Lorg/apache/wicket/markup/ComponentTag;)V
 getNotClosedTag
  ()Lorg/apache/wicket/markup/ComponentTag;
- ()Lorg/apache/wicket/markup/ComponentTag;
+ ()L0org/apache/wicket/markup/ComponentTag;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/XmlPullParser.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/XmlPullParser.eea
index fe6b72a4fc..adbb48bfda 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/XmlPullParser.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/XmlPullParser.eea
@@ -30,7 +30,7 @@ next
  ()Lorg/apache/wicket/markup/parser/IXmlPullParser$HttpTagType;
 nextTag
  ()Lorg/apache/wicket/markup/parser/XmlTag;
- ()Lorg/apache/wicket/markup/parser/XmlTag;
+ ()L0org/apache/wicket/markup/parser/XmlTag;
 parse
  (Ljava/io/InputStream;)V
  (Ljava/io/InputStream;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/XmlTag.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/XmlTag.eea
index 77eda54667..d4be0d82fe 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/XmlTag.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/XmlTag.eea
@@ -68,13 +68,13 @@ toCharSequence
  ()Ljava/lang/CharSequence;
 toDebugString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toUserDebugString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toXmlString
  ()Ljava/lang/CharSequence;
- ()Ljava/lang/CharSequence;
+ ()L1java/lang/CharSequence;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/EnclosureHandler.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/EnclosureHandler.eea
index 358187dd03..03a729bc14 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/EnclosureHandler.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/EnclosureHandler.eea
@@ -15,4 +15,4 @@ onComponentTag
  (Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/markup/MarkupElement;
 resolve
  (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
- (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
+ (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)L0org/apache/wicket/Component;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/InlineEnclosureHandler.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/InlineEnclosureHandler.eea
index cdaf09976b..b561dfa392 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/InlineEnclosureHandler.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/InlineEnclosureHandler.eea
@@ -15,4 +15,4 @@ onComponentTag
  (Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/markup/MarkupElement;
 resolve
  (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
- (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
+ (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)L0org/apache/wicket/Component;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.eea
index 986abf1f87..5ab72e6bca 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.eea
@@ -18,4 +18,4 @@ postProcess
  (Lorg/apache/wicket/markup/Markup;)V
 resolve
  (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
- (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
+ (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)L0org/apache/wicket/Component;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/RootMarkupFilter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/RootMarkupFilter.eea
index 71aada7f8d..7831e0880c 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/RootMarkupFilter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/RootMarkupFilter.eea
@@ -5,10 +5,10 @@ class org/apache/wicket/markup/parser/filter/RootMarkupFilter
  (Lorg/apache/wicket/markup/parser/IXmlPullParser;Lorg/apache/wicket/markup/MarkupResourceStream;)V
 getNextFilter
  ()Lorg/apache/wicket/markup/parser/IMarkupFilter;
- ()Lorg/apache/wicket/markup/parser/IMarkupFilter;
+ ()L0org/apache/wicket/markup/parser/IMarkupFilter;
 nextElement
  ()Lorg/apache/wicket/markup/MarkupElement;
- ()Lorg/apache/wicket/markup/MarkupElement;
+ ()L0org/apache/wicket/markup/MarkupElement;
 onComponentTag
  (Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/markup/MarkupElement;
  (Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/markup/MarkupElement;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.eea
index cc2298a2ac..ed5258f24c 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.eea
@@ -18,4 +18,4 @@ onComponentTag
  (Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/markup/MarkupElement;
 resolve
  (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
- (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
+ (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)L0org/apache/wicket/Component;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.eea
index efe07fb14a..4b330d337a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.eea
@@ -12,4 +12,4 @@ onComponentTag
  (Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/markup/MarkupElement;
 resolve
  (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
- (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
+ (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)L0org/apache/wicket/Component;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.eea
index 3096176e0d..c97a9c9a2a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.eea
@@ -25,4 +25,4 @@ registerWellKnownTagName
  (Lorg/apache/wicket/markup/MarkupResourceStream;)V
 onComponentTag
  (Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/markup/MarkupElement;
- (Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/markup/MarkupElement;
+ (Lorg/apache/wicket/markup/ComponentTag;)L1org/apache/wicket/markup/MarkupElement;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/AbstractPageableView.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/AbstractPageableView.eea
index 044ea5fe8a..4efbe650aa 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/AbstractPageableView.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/AbstractPageableView.eea
@@ -14,7 +14,7 @@ super org/apache/wicket/markup/repeater/RefreshingView
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<+Ljava/util/Collection<+TT;>;>;)V
 getItemModels
  ()Ljava/util/Iterator<Lorg/apache/wicket/model/IModel<TT;>;>;
- ()Ljava/util/Iterator<Lorg/apache/wicket/model/IModel<TT;>;>;
+ ()L1java/util/Iterator<Lorg/apache/wicket/model/IModel<TT;>;>;
 getItemModels
  (JJ)Ljava/util/Iterator<Lorg/apache/wicket/model/IModel<TT;>;>;
  (JJ)Ljava/util/Iterator<Lorg/apache/wicket/model/IModel<TT;>;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/DefaultItemReuseStrategy.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/DefaultItemReuseStrategy.eea
index 601df97aa8..ff13fb673c 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/DefaultItemReuseStrategy.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/DefaultItemReuseStrategy.eea
@@ -6,4 +6,4 @@ getInstance
 
 getItems
  <T:Ljava/lang/Object;>(Lorg/apache/wicket/markup/repeater/IItemFactory<TT;>;Ljava/util/Iterator<Lorg/apache/wicket/model/IModel<TT;>;>;Ljava/util/Iterator<Lorg/apache/wicket/markup/repeater/Item<TT;>;>;)Ljava/util/Iterator<Lorg/apache/wicket/markup/repeater/Item<TT;>;>;
- <T:Ljava/lang/Object;>(Lorg/apache/wicket/markup/repeater/IItemFactory<TT;>;Ljava/util/Iterator<Lorg/apache/wicket/model/IModel<TT;>;>;Ljava/util/Iterator<Lorg/apache/wicket/markup/repeater/Item<TT;>;>;)Ljava/util/Iterator<Lorg/apache/wicket/markup/repeater/Item<TT;>;>;
+ <T:Ljava/lang/Object;>(Lorg/apache/wicket/markup/repeater/IItemFactory<TT;>;Ljava/util/Iterator<Lorg/apache/wicket/model/IModel<TT;>;>;Ljava/util/Iterator<Lorg/apache/wicket/markup/repeater/Item<TT;>;>;)L1java/util/Iterator<Lorg/apache/wicket/markup/repeater/Item<TT;>;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/RefreshingView.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/RefreshingView.eea
index 4336749289..1644d9d261 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/RefreshingView.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/RefreshingView.eea
@@ -22,10 +22,10 @@ getItems
  ()Ljava/util/Iterator<Lorg/apache/wicket/markup/repeater/Item<TT;>;>;
 newItem
  (Ljava/lang/String;ILorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/markup/repeater/Item<TT;>;
- (Ljava/lang/String;ILorg/apache/wicket/model/IModel<TT;>;)Lorg/apache/wicket/markup/repeater/Item<TT;>;
+ (Ljava/lang/String;ILorg/apache/wicket/model/IModel<TT;>;)L1org/apache/wicket/markup/repeater/Item<TT;>;
 newItemFactory
  ()Lorg/apache/wicket/markup/repeater/IItemFactory<TT;>;
- ()Lorg/apache/wicket/markup/repeater/IItemFactory<TT;>;
+ ()L1org/apache/wicket/markup/repeater/IItemFactory<TT;>;
 populateItem
  (Lorg/apache/wicket/markup/repeater/Item<TT;>;)V
  (Lorg/apache/wicket/markup/repeater/Item<TT;>;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/ReuseIfModelsEqualStrategy.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/ReuseIfModelsEqualStrategy.eea
index ef90d52586..b0830948a1 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/ReuseIfModelsEqualStrategy.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/ReuseIfModelsEqualStrategy.eea
@@ -6,4 +6,4 @@ getInstance
 
 getItems
  <T:Ljava/lang/Object;>(Lorg/apache/wicket/markup/repeater/IItemFactory<TT;>;Ljava/util/Iterator<Lorg/apache/wicket/model/IModel<TT;>;>;Ljava/util/Iterator<Lorg/apache/wicket/markup/repeater/Item<TT;>;>;)Ljava/util/Iterator<Lorg/apache/wicket/markup/repeater/Item<TT;>;>;
- <T:Ljava/lang/Object;>(Lorg/apache/wicket/markup/repeater/IItemFactory<TT;>;Ljava/util/Iterator<Lorg/apache/wicket/model/IModel<TT;>;>;Ljava/util/Iterator<Lorg/apache/wicket/markup/repeater/Item<TT;>;>;)Ljava/util/Iterator<Lorg/apache/wicket/markup/repeater/Item<TT;>;>;
+ <T:Ljava/lang/Object;>(Lorg/apache/wicket/markup/repeater/IItemFactory<TT;>;Ljava/util/Iterator<Lorg/apache/wicket/model/IModel<TT;>;>;Ljava/util/Iterator<Lorg/apache/wicket/markup/repeater/Item<TT;>;>;)L1java/util/Iterator<Lorg/apache/wicket/markup/repeater/Item<TT;>;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/data/DataViewBase.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/data/DataViewBase.eea
index b592458456..aa02faf7de 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/data/DataViewBase.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/data/DataViewBase.eea
@@ -11,7 +11,7 @@ super org/apache/wicket/markup/repeater/AbstractPageableView
  (Ljava/lang/String;Lorg/apache/wicket/markup/repeater/data/IDataProvider<TT;>;)V
 getItemModels
  (JJ)Ljava/util/Iterator<Lorg/apache/wicket/model/IModel<TT;>;>;
- (JJ)Ljava/util/Iterator<Lorg/apache/wicket/model/IModel<TT;>;>;
+ (JJ)L1java/util/Iterator<Lorg/apache/wicket/model/IModel<TT;>;>;
 internalGetDataProvider
  ()Lorg/apache/wicket/markup/repeater/data/IDataProvider<TT;>;
  ()Lorg/apache/wicket/markup/repeater/data/IDataProvider<TT;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/data/EmptyDataProvider.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/data/EmptyDataProvider.eea
index 528131b583..13301499a8 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/data/EmptyDataProvider.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/data/EmptyDataProvider.eea
@@ -15,4 +15,4 @@ iterator
  (JJ)Ljava/util/Iterator<TT;>;
 model
  (Ljava/lang/Object;)Lorg/apache/wicket/model/IModel<TT;>;
- (Ljava/lang/Object;)Lorg/apache/wicket/model/IModel<TT;>;
+ (Ljava/lang/Object;)L0org/apache/wicket/model/IModel<TT;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/data/GridView.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/data/GridView.eea
index 308e543338..6c2108e913 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/data/GridView.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/data/GridView.eea
@@ -17,13 +17,13 @@ getDataProvider
  ()Lorg/apache/wicket/markup/repeater/data/IDataProvider<TT;>;
 getItems
  ()Ljava/util/Iterator<Lorg/apache/wicket/markup/repeater/Item<TT;>;>;
- ()Ljava/util/Iterator<Lorg/apache/wicket/markup/repeater/Item<TT;>;>;
+ ()L1java/util/Iterator<Lorg/apache/wicket/markup/repeater/Item<TT;>;>;
 newEmptyItem
  (Ljava/lang/String;I)Lorg/apache/wicket/markup/repeater/Item<TT;>;
- (Ljava/lang/String;I)Lorg/apache/wicket/markup/repeater/Item<TT;>;
+ (Ljava/lang/String;I)L1org/apache/wicket/markup/repeater/Item<TT;>;
 newRowItem
  (Ljava/lang/String;I)Lorg/apache/wicket/markup/repeater/Item<*>;
- (Ljava/lang/String;I)Lorg/apache/wicket/markup/repeater/Item<*>;
+ (Ljava/lang/String;I)L1org/apache/wicket/markup/repeater/Item<*>;
 populateEmptyItem
  (Lorg/apache/wicket/markup/repeater/Item<TT;>;)V
  (Lorg/apache/wicket/markup/repeater/Item<TT;>;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/data/ListDataProvider.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/data/ListDataProvider.eea
index 242fc966cf..7828023204 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/data/ListDataProvider.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/repeater/data/ListDataProvider.eea
@@ -17,4 +17,4 @@ iterator
  (JJ)Ljava/util/Iterator<TT;>;
 model
  (TT;)Lorg/apache/wicket/model/IModel<TT;>;
- (TT;)Lorg/apache/wicket/model/IModel<TT;>;
+ (TT;)L1org/apache/wicket/model/IModel<TT;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/AutoLinkResolver$AbstractAutolinkResolverDelegate.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/AutoLinkResolver$AbstractAutolinkResolverDelegate.eea
index 2d2fd6ac7a..7c226833dd 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/AutoLinkResolver$AbstractAutolinkResolverDelegate.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/AutoLinkResolver$AbstractAutolinkResolverDelegate.eea
@@ -2,4 +2,4 @@ class org/apache/wicket/markup/resolver/AutoLinkResolver$AbstractAutolinkResolve
 
 newPackageResourceReferenceAutoComponent
  (Ljava/lang/String;Lorg/apache/wicket/markup/resolver/AutoLinkResolver$PathInfo;Ljava/lang/String;)Lorg/apache/wicket/Component;
- (Ljava/lang/String;Lorg/apache/wicket/markup/resolver/AutoLinkResolver$PathInfo;Ljava/lang/String;)Lorg/apache/wicket/Component;
+ (Ljava/lang/String;Lorg/apache/wicket/markup/resolver/AutoLinkResolver$PathInfo;Ljava/lang/String;)L0org/apache/wicket/Component;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/AutoLinkResolver$AutolinkBookmarkablePageLink.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/AutoLinkResolver$AutolinkBookmarkablePageLink.eea
index 7ff18fc874..2f62a5372e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/AutoLinkResolver$AutolinkBookmarkablePageLink.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/AutoLinkResolver$AutolinkBookmarkablePageLink.eea
@@ -11,7 +11,7 @@ super org/apache/wicket/markup/html/link/BookmarkablePageLink
  <C:Lorg/apache/wicket/Page;>(Ljava/lang/String;Ljava/lang/Class<TC;>;Lorg/apache/wicket/request/mapper/parameter/PageParameters;Ljava/lang/String;)V
 getURL
  ()Ljava/lang/CharSequence;
- ()Ljava/lang/CharSequence;
+ ()L1java/lang/CharSequence;
 resolve
  (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
  (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/AutoLinkResolver.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/AutoLinkResolver.eea
index 71a5966784..caba2d039f 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/AutoLinkResolver.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/AutoLinkResolver.eea
@@ -8,4 +8,4 @@ getAutolinkResolverDelegate
  (Ljava/lang/String;)Lorg/apache/wicket/markup/resolver/AutoLinkResolver$IAutolinkResolverDelegate;
 resolve
  (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
- (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
+ (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)L0org/apache/wicket/Component;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/ComponentResolvers.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/ComponentResolvers.eea
index 01c6f905ef..40a91b8937 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/ComponentResolvers.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/ComponentResolvers.eea
@@ -5,7 +5,7 @@ resolve
  (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;Lorg/apache/wicket/markup/resolver/ComponentResolvers$ResolverFilter;)Lorg/apache/wicket/Component;
 resolveByApplication
  (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;Lorg/apache/wicket/markup/resolver/ComponentResolvers$ResolverFilter;)Lorg/apache/wicket/Component;
- (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;Lorg/apache/wicket/markup/resolver/ComponentResolvers$ResolverFilter;)Lorg/apache/wicket/Component;
+ (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;Lorg/apache/wicket/markup/resolver/ComponentResolvers$ResolverFilter;)L0org/apache/wicket/Component;
 resolveByComponentHierarchy
  (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
- (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
+ (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)L0org/apache/wicket/Component;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/HtmlHeaderResolver.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/HtmlHeaderResolver.eea
index a598bd00d2..484db3c6fa 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/HtmlHeaderResolver.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/HtmlHeaderResolver.eea
@@ -9,7 +9,7 @@ HEADER_ITEMS
 
 newHtmlHeaderContainer
  (Ljava/lang/String;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/markup/html/internal/HtmlHeaderContainer;
- (Ljava/lang/String;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/markup/html/internal/HtmlHeaderContainer;
+ (Ljava/lang/String;Lorg/apache/wicket/markup/ComponentTag;)L1org/apache/wicket/markup/html/internal/HtmlHeaderContainer;
 resolve
  (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
- (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
+ (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)L0org/apache/wicket/Component;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/WicketContainerResolver.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/WicketContainerResolver.eea
index 058c074b05..2c0b0ed0c7 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/WicketContainerResolver.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/WicketContainerResolver.eea
@@ -6,4 +6,4 @@ CONTAINER
 
 resolve
  (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
- (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
+ (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)L0org/apache/wicket/Component;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/WicketMessageResolver.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/WicketMessageResolver.eea
index 3086c66110..238b7cb46c 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/WicketMessageResolver.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/resolver/WicketMessageResolver.eea
@@ -12,4 +12,4 @@ MESSAGE
 
 resolve
  (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
- (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)Lorg/apache/wicket/Component;
+ (Lorg/apache/wicket/MarkupContainer;Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)L0org/apache/wicket/Component;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.eea
index 0221b7483d..8994f05e80 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.eea
@@ -8,7 +8,7 @@ class org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<*>;)V
 newResponse
  ()Lorg/apache/wicket/request/Response;
- ()Lorg/apache/wicket/request/Response;
+ ()L1org/apache/wicket/request/Response;
 onComponentTagBody
  (Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)V
  (Lorg/apache/wicket/markup/MarkupStream;Lorg/apache/wicket/markup/ComponentTag;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.eea
index 40ee729b51..8a9a543638 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.eea
@@ -11,7 +11,7 @@ detach
  (Lorg/apache/wicket/Component;)V
 newResponse
  (Lorg/apache/wicket/request/http/WebResponse;)Lorg/apache/wicket/protocol/http/BufferedWebResponse;
- (Lorg/apache/wicket/request/http/WebResponse;)Lorg/apache/wicket/protocol/http/BufferedWebResponse;
+ (Lorg/apache/wicket/request/http/WebResponse;)L1org/apache/wicket/protocol/http/BufferedWebResponse;
 transform
  (Lorg/apache/wicket/Component;Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
  (Lorg/apache/wicket/Component;Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/mock/MockApplication.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/mock/MockApplication.eea
index 396fe24942..f8360539cf 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/mock/MockApplication.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/mock/MockApplication.eea
@@ -5,10 +5,10 @@ getConfigurationType
  ()Lorg/apache/wicket/RuntimeConfigurationType;
 getHomePage
  ()Ljava/lang/Class<+Lorg/apache/wicket/Page;>;
- ()Ljava/lang/Class<+Lorg/apache/wicket/Page;>;
+ ()L1java/lang/Class<+Lorg/apache/wicket/Page;>;
 getInitParameter
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getSession
  ()Lorg/apache/wicket/Session;
  ()Lorg/apache/wicket/Session;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/mock/MockPageManager.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/mock/MockPageManager.eea
index 3faf523b74..b7f844a737 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/mock/MockPageManager.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/mock/MockPageManager.eea
@@ -5,7 +5,7 @@ getPage
  (I)Lorg/apache/wicket/page/IManageablePage;
 getPageStore
  ()Lorg/apache/wicket/pageStore/IPageStore;
- ()Lorg/apache/wicket/pageStore/IPageStore;
+ ()L1org/apache/wicket/pageStore/IPageStore;
 removePage
  (Lorg/apache/wicket/page/IManageablePage;)V
  (Lorg/apache/wicket/page/IManageablePage;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/mock/MockPageStore.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/mock/MockPageStore.eea
index 5a0143aecc..5f80c095c2 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/mock/MockPageStore.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/mock/MockPageStore.eea
@@ -8,7 +8,7 @@ canBeAsynchronous
  (Lorg/apache/wicket/pageStore/IPageContext;)Z
 getPage
  (Lorg/apache/wicket/pageStore/IPageContext;I)Lorg/apache/wicket/page/IManageablePage;
- (Lorg/apache/wicket/pageStore/IPageContext;I)Lorg/apache/wicket/page/IManageablePage;
+ (Lorg/apache/wicket/pageStore/IPageContext;I)L0org/apache/wicket/page/IManageablePage;
 getPages
  ()Ljava/util/List<Lorg/apache/wicket/page/IManageablePage;>;
  ()Ljava/util/List<Lorg/apache/wicket/page/IManageablePage;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/mock/MockRequestParameters.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/mock/MockRequestParameters.eea
index 7e28de74dd..ecf007da96 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/mock/MockRequestParameters.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/mock/MockRequestParameters.eea
@@ -11,7 +11,7 @@ getParameterValue
  (Ljava/lang/String;)Lorg/apache/wicket/util/string/StringValue;
 getParameterValues
  (Ljava/lang/String;)Ljava/util/List<Lorg/apache/wicket/util/string/StringValue;>;
- (Ljava/lang/String;)Ljava/util/List<Lorg/apache/wicket/util/string/StringValue;>;
+ (Ljava/lang/String;)L0java/util/List<Lorg/apache/wicket/util/string/StringValue;>;
 setParameterValue
  (Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/mock/MockWebRequest.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/mock/MockWebRequest.eea
index 9cd9dfa299..62c54fa9ca 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/mock/MockWebRequest.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/mock/MockWebRequest.eea
@@ -35,16 +35,16 @@ getCookies
  ()Ljava/util/List<Ljakarta/servlet/http/Cookie;>;
 getDateHeader
  (Ljava/lang/String;)Ljava/time/Instant;
- (Ljava/lang/String;)Ljava/time/Instant;
+ (Ljava/lang/String;)L0java/time/Instant;
 getFilterPath
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(org.apache.wicket.request.Request)
 getHeader
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 getHeaders
  (Ljava/lang/String;)Ljava/util/List<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/List<Ljava/lang/String;>;
+ (Ljava/lang/String;)L1java/util/List<Ljava/lang/String;>;
 getLocale
  ()Ljava/util/Locale;
  ()L1java/util/Locale; # @Inherited(org.apache.wicket.request.Request)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/mock/MockWebResponse.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/mock/MockWebResponse.eea
index a55b01d5ad..237b73da76 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/mock/MockWebResponse.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/mock/MockWebResponse.eea
@@ -11,13 +11,13 @@ clearCookie
  (Ljakarta/servlet/http/Cookie;)V
 encodeRedirectURL
  (Ljava/lang/CharSequence;)Ljava/lang/String;
- (Ljava/lang/CharSequence;)Ljava/lang/String;
+ (Ljava/lang/CharSequence;)L1java/lang/String;
 encodeURL
  (Ljava/lang/CharSequence;)Ljava/lang/String;
- (Ljava/lang/CharSequence;)Ljava/lang/String;
+ (Ljava/lang/CharSequence;)L1java/lang/String;
 getBinaryResponse
  ()[B
- ()[B
+ ()[0B
 getContainerResponse
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/AbstractPropertyModel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/AbstractPropertyModel.eea
index f4e9b708cd..843e805eae 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/AbstractPropertyModel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/AbstractPropertyModel.eea
@@ -17,22 +17,22 @@ super org/apache/wicket/model/IPropertyReflectionAwareModel
  (Ljava/lang/Object;)V
 getObject
  ()TT;
- ()TT;
+ ()T0T;
 getObjectClass
  ()Ljava/lang/Class<TT;>;
- ()Ljava/lang/Class<TT;>;
+ ()L0java/lang/Class<TT;>;
 getPropertyExpression
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getPropertyField
  ()Ljava/lang/reflect/Field;
- ()Ljava/lang/reflect/Field;
+ ()L0java/lang/reflect/Field;
 getPropertyGetter
  ()Ljava/lang/reflect/Method;
- ()Ljava/lang/reflect/Method;
+ ()L0java/lang/reflect/Method;
 getPropertySetter
  ()Ljava/lang/reflect/Method;
- ()Ljava/lang/reflect/Method;
+ ()L0java/lang/reflect/Method;
 propertyExpression
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/ChainingModel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/ChainingModel.eea
index eebb618c9e..298696ab4d 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/ChainingModel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/ChainingModel.eea
@@ -11,7 +11,7 @@ super org/apache/wicket/model/IModel
  (Ljava/lang/Object;)V
 getChainedModel
  ()Lorg/apache/wicket/model/IModel<*>;
- ()Lorg/apache/wicket/model/IModel<*>;
+ ()L0org/apache/wicket/model/IModel<*>;
 getInnermostModelOrObject
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/ComponentDetachableModel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/ComponentDetachableModel.eea
index 927489ad34..f12f861d67 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/ComponentDetachableModel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/ComponentDetachableModel.eea
@@ -8,10 +8,10 @@ super org/apache/wicket/model/IComponentAssignedModel
 
 getObject
  ()TT;
- ()TT;
+ ()T1T;
 getObject
  (Lorg/apache/wicket/Component;)TT;
- (Lorg/apache/wicket/Component;)TT;
+ (Lorg/apache/wicket/Component;)T0T;
 setObject
  (Lorg/apache/wicket/Component;TT;)V
  (Lorg/apache/wicket/Component;TT;)V
@@ -20,4 +20,4 @@ setObject
  (TT;)V
 wrapOnAssignment
  (Lorg/apache/wicket/Component;)Lorg/apache/wicket/model/IWrapModel<TT;>;
- (Lorg/apache/wicket/Component;)Lorg/apache/wicket/model/IWrapModel<TT;>;
+ (Lorg/apache/wicket/Component;)L1org/apache/wicket/model/IWrapModel<TT;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/ComponentModel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/ComponentModel.eea
index 56e1148c9b..5416a64f39 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/ComponentModel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/ComponentModel.eea
@@ -11,10 +11,10 @@ super org/apache/wicket/model/IComponentAssignedModel
 
 getObject
  ()TT;
- ()TT;
+ ()T1T;
 getObject
  (Lorg/apache/wicket/Component;)TT;
- (Lorg/apache/wicket/Component;)TT;
+ (Lorg/apache/wicket/Component;)T0T;
 setObject
  (Lorg/apache/wicket/Component;TT;)V
  (Lorg/apache/wicket/Component;TT;)V
@@ -23,4 +23,4 @@ setObject
  (TT;)V
 wrapOnAssignment
  (Lorg/apache/wicket/Component;)Lorg/apache/wicket/model/IWrapModel<TT;>;
- (Lorg/apache/wicket/Component;)Lorg/apache/wicket/model/IWrapModel<TT;>;
+ (Lorg/apache/wicket/Component;)L1org/apache/wicket/model/IWrapModel<TT;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/ComponentPropertyModel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/ComponentPropertyModel.eea
index e60316fef6..cd6d0e7e69 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/ComponentPropertyModel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/ComponentPropertyModel.eea
@@ -11,10 +11,10 @@ super org/apache/wicket/model/IComponentAssignedModel
  (Ljava/lang/String;)V
 getObject
  ()TT;
- ()TT;
+ ()T1T;
 setObject
  (TT;)V
  (TT;)V
 wrapOnAssignment
  (Lorg/apache/wicket/Component;)Lorg/apache/wicket/model/IWrapModel<TT;>;
- (Lorg/apache/wicket/Component;)Lorg/apache/wicket/model/IWrapModel<TT;>;
+ (Lorg/apache/wicket/Component;)L1org/apache/wicket/model/IWrapModel<TT;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/CompoundPropertyModel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/CompoundPropertyModel.eea
index 661c1f8172..c200ed0706 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/CompoundPropertyModel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/CompoundPropertyModel.eea
@@ -11,10 +11,10 @@ super org/apache/wicket/model/IComponentInheritedModel
 
 of
  <Z::Ljava/io/Serializable;>(TZ;)Lorg/apache/wicket/model/CompoundPropertyModel<TZ;>;
- <Z::Ljava/io/Serializable;>(TZ;)Lorg/apache/wicket/model/CompoundPropertyModel<TZ;>;
+ <Z::Ljava/io/Serializable;>(TZ;)L1org/apache/wicket/model/CompoundPropertyModel<TZ;>;
 of
  <Z:Ljava/lang/Object;>(Lorg/apache/wicket/model/IModel<TZ;>;)Lorg/apache/wicket/model/CompoundPropertyModel<TZ;>;
- <Z:Ljava/lang/Object;>(Lorg/apache/wicket/model/IModel<TZ;>;)Lorg/apache/wicket/model/CompoundPropertyModel<TZ;>;
+ <Z:Ljava/lang/Object;>(Lorg/apache/wicket/model/IModel<TZ;>;)L1org/apache/wicket/model/CompoundPropertyModel<TZ;>;
 
 <init>
  (Lorg/apache/wicket/model/IModel<TT;>;)V
@@ -24,10 +24,10 @@ of
  (TT;)V
 bind
  <S:Ljava/lang/Object;>(Ljava/lang/String;)Lorg/apache/wicket/model/IModel<TS;>;
- <S:Ljava/lang/Object;>(Ljava/lang/String;)Lorg/apache/wicket/model/IModel<TS;>;
+ <S:Ljava/lang/Object;>(Ljava/lang/String;)L1org/apache/wicket/model/IModel<TS;>;
 propertyExpression
  (Lorg/apache/wicket/Component;)Ljava/lang/String;
  (Lorg/apache/wicket/Component;)Ljava/lang/String;
 wrapOnInheritance
  <C:Ljava/lang/Object;>(Lorg/apache/wicket/Component;)Lorg/apache/wicket/model/IWrapModel<TC;>;
- <C:Ljava/lang/Object;>(Lorg/apache/wicket/Component;)Lorg/apache/wicket/model/IWrapModel<TC;>;
+ <C:Ljava/lang/Object;>(Lorg/apache/wicket/Component;)L1org/apache/wicket/model/IWrapModel<TC;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/IModel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/IModel.eea
index 316e23a82b..fc71e0338f 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/IModel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/IModel.eea
@@ -11,28 +11,28 @@ as
  <R:TT;>(Ljava/lang/Class<TR;>;)Lorg/apache/wicket/model/IModel<TR;>;
 combineWith
  <R:Ljava/lang/Object;U:Ljava/lang/Object;>(Lorg/apache/wicket/model/IModel<TU;>;Lorg/danekja/java/util/function/serializable/SerializableBiFunction<-TT;-TU;TR;>;)Lorg/apache/wicket/model/IModel<TR;>;
- <R:Ljava/lang/Object;U:Ljava/lang/Object;>(Lorg/apache/wicket/model/IModel<TU;>;Lorg/danekja/java/util/function/serializable/SerializableBiFunction<-TT;-TU;TR;>;)Lorg/apache/wicket/model/IModel<TR;>;
+ <R:Ljava/lang/Object;U:Ljava/lang/Object;>(Lorg/apache/wicket/model/IModel<TU;>;Lorg/danekja/java/util/function/serializable/SerializableBiFunction<-TT;-TU;TR;>;)L1org/apache/wicket/model/IModel<TR;>;
 filter
  (Lorg/danekja/java/util/function/serializable/SerializablePredicate<-TT;>;)Lorg/apache/wicket/model/IModel<TT;>;
- (Lorg/danekja/java/util/function/serializable/SerializablePredicate<-TT;>;)Lorg/apache/wicket/model/IModel<TT;>;
+ (Lorg/danekja/java/util/function/serializable/SerializablePredicate<-TT;>;)L1org/apache/wicket/model/IModel<TT;>;
 flatMap
  <R:Ljava/lang/Object;>(Lorg/danekja/java/util/function/serializable/SerializableFunction<-TT;Lorg/apache/wicket/model/IModel<TR;>;>;)Lorg/apache/wicket/model/IModel<TR;>;
- <R:Ljava/lang/Object;>(Lorg/danekja/java/util/function/serializable/SerializableFunction<-TT;Lorg/apache/wicket/model/IModel<TR;>;>;)Lorg/apache/wicket/model/IModel<TR;>;
+ <R:Ljava/lang/Object;>(Lorg/danekja/java/util/function/serializable/SerializableFunction<-TT;Lorg/apache/wicket/model/IModel<TR;>;>;)L1org/apache/wicket/model/IModel<TR;>;
 getObject
  ()TT;
  ()TT;
 isPresent
  ()Lorg/apache/wicket/model/IModel<Ljava/lang/Boolean;>;
- ()Lorg/apache/wicket/model/IModel<Ljava/lang/Boolean;>;
+ ()L1org/apache/wicket/model/IModel<Ljava/lang/Boolean;>;
 map
  <R:Ljava/lang/Object;>(Lorg/danekja/java/util/function/serializable/SerializableFunction<-TT;TR;>;)Lorg/apache/wicket/model/IModel<TR;>;
- <R:Ljava/lang/Object;>(Lorg/danekja/java/util/function/serializable/SerializableFunction<-TT;TR;>;)Lorg/apache/wicket/model/IModel<TR;>;
+ <R:Ljava/lang/Object;>(Lorg/danekja/java/util/function/serializable/SerializableFunction<-TT;TR;>;)L1org/apache/wicket/model/IModel<TR;>;
 orElse
  (TT;)Lorg/apache/wicket/model/IModel<TT;>;
- (TT;)Lorg/apache/wicket/model/IModel<TT;>;
+ (TT;)L1org/apache/wicket/model/IModel<TT;>;
 orElseGet
  (Lorg/danekja/java/util/function/serializable/SerializableSupplier<+TT;>;)Lorg/apache/wicket/model/IModel<TT;>;
- (Lorg/danekja/java/util/function/serializable/SerializableSupplier<+TT;>;)Lorg/apache/wicket/model/IModel<TT;>;
+ (Lorg/danekja/java/util/function/serializable/SerializableSupplier<+TT;>;)L1org/apache/wicket/model/IModel<TT;>;
 setObject
  (TT;)V
  (TT;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/IWrapModel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/IWrapModel.eea
index 904853641e..fc084cf396 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/IWrapModel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/IWrapModel.eea
@@ -8,7 +8,7 @@ super org/apache/wicket/model/IModel
 
 getObject
  ()TT;
- ()TT;
+ ()T0T;
 getWrappedModel
  ()Lorg/apache/wicket/model/IModel<*>;
  ()Lorg/apache/wicket/model/IModel<*>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/LambdaModel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/LambdaModel.eea
index b04f1fd4a7..3d8a47e6f9 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/LambdaModel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/LambdaModel.eea
@@ -11,10 +11,10 @@ of
  <R:Ljava/lang/Object;>(Lorg/danekja/java/util/function/serializable/SerializableSupplier<TR;>;)Lorg/apache/wicket/model/IModel<TR;>;
 of
  <R:Ljava/lang/Object;>(Lorg/danekja/java/util/function/serializable/SerializableSupplier<TR;>;Lorg/danekja/java/util/function/serializable/SerializableConsumer<TR;>;)Lorg/apache/wicket/model/IModel<TR;>;
- <R:Ljava/lang/Object;>(Lorg/danekja/java/util/function/serializable/SerializableSupplier<TR;>;Lorg/danekja/java/util/function/serializable/SerializableConsumer<TR;>;)Lorg/apache/wicket/model/IModel<TR;>;
+ <R:Ljava/lang/Object;>(Lorg/danekja/java/util/function/serializable/SerializableSupplier<TR;>;Lorg/danekja/java/util/function/serializable/SerializableConsumer<TR;>;)L1org/apache/wicket/model/IModel<TR;>;
 of
  <X:Ljava/lang/Object;R:Ljava/lang/Object;>(Lorg/apache/wicket/model/IModel<TX;>;Lorg/danekja/java/util/function/serializable/SerializableFunction<TX;TR;>;Lorg/danekja/java/util/function/serializable/SerializableBiConsumer<TX;TR;>;)Lorg/apache/wicket/model/IModel<TR;>;
- <X:Ljava/lang/Object;R:Ljava/lang/Object;>(Lorg/apache/wicket/model/IModel<TX;>;Lorg/danekja/java/util/function/serializable/SerializableFunction<TX;TR;>;Lorg/danekja/java/util/function/serializable/SerializableBiConsumer<TX;TR;>;)Lorg/apache/wicket/model/IModel<TR;>;
+ <X:Ljava/lang/Object;R:Ljava/lang/Object;>(Lorg/apache/wicket/model/IModel<TX;>;Lorg/danekja/java/util/function/serializable/SerializableFunction<TX;TR;>;Lorg/danekja/java/util/function/serializable/SerializableBiConsumer<TX;TR;>;)L1org/apache/wicket/model/IModel<TR;>;
 
 setObject
  (TT;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/LoadableDetachableModel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/LoadableDetachableModel.eea
index 49bf5ec5aa..b16d9cb1a4 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/LoadableDetachableModel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/LoadableDetachableModel.eea
@@ -8,7 +8,7 @@ super org/apache/wicket/model/IModel
 
 of
  <T:Ljava/lang/Object;>(Lorg/danekja/java/util/function/serializable/SerializableSupplier<TT;>;)Lorg/apache/wicket/model/LoadableDetachableModel<TT;>;
- <T:Ljava/lang/Object;>(Lorg/danekja/java/util/function/serializable/SerializableSupplier<TT;>;)Lorg/apache/wicket/model/LoadableDetachableModel<TT;>;
+ <T:Ljava/lang/Object;>(Lorg/danekja/java/util/function/serializable/SerializableSupplier<TT;>;)L1org/apache/wicket/model/LoadableDetachableModel<TT;>;
 
 <init>
  (TT;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/Model.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/Model.eea
index 7cfda0be18..bd0915a2a7 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/Model.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/Model.eea
@@ -36,7 +36,7 @@ getObject
  ()TT;
 getObjectClass
  ()Ljava/lang/Class<TT;>;
- ()Ljava/lang/Class<TT;>;
+ ()L0java/lang/Class<TT;>;
 setObject
  (TT;)V
  (TT;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/PropertyModel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/PropertyModel.eea
index 57e4b58b33..620de21917 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/PropertyModel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/PropertyModel.eea
@@ -8,7 +8,7 @@ super org/apache/wicket/model/AbstractPropertyModel
 
 of
  <Z:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/String;)Lorg/apache/wicket/model/PropertyModel<TZ;>;
- <Z:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/String;)Lorg/apache/wicket/model/PropertyModel<TZ;>;
+ <Z:Ljava/lang/Object;>(Ljava/lang/Object;Ljava/lang/String;)L1org/apache/wicket/model/PropertyModel<TZ;>;
 
 <init>
  (Ljava/lang/Object;Ljava/lang/String;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/ResourceModel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/ResourceModel.eea
index fb2bfb84ad..d886759530 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/ResourceModel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/ResourceModel.eea
@@ -21,4 +21,4 @@ setObject
  (Ljava/lang/String;)V
 wrapOnAssignment
  (Lorg/apache/wicket/Component;)Lorg/apache/wicket/model/IWrapModel<Ljava/lang/String;>;
- (Lorg/apache/wicket/Component;)Lorg/apache/wicket/model/IWrapModel<Ljava/lang/String;>;
+ (Lorg/apache/wicket/Component;)L1org/apache/wicket/model/IWrapModel<Ljava/lang/String;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/StringResourceModel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/StringResourceModel.eea
index 56ce2bb21f..71b006b79a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/StringResourceModel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/StringResourceModel.eea
@@ -60,4 +60,4 @@ toString
  ()L1java/lang/String; # @Inherited(org.apache.wicket.model.LoadableDetachableModel)
 wrapOnAssignment
  (Lorg/apache/wicket/Component;)Lorg/apache/wicket/model/IWrapModel<Ljava/lang/String;>;
- (Lorg/apache/wicket/Component;)Lorg/apache/wicket/model/IWrapModel<Ljava/lang/String;>;
+ (Lorg/apache/wicket/Component;)L1org/apache/wicket/model/IWrapModel<Ljava/lang/String;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/util/CollectionModel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/util/CollectionModel.eea
index 2821a9753a..c8f31079f9 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/util/CollectionModel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/util/CollectionModel.eea
@@ -11,4 +11,4 @@ super org/apache/wicket/model/util/GenericBaseModel
  (Ljava/util/Collection<TT;>;)V
 createSerializableVersionOf
  (Ljava/util/Collection<TT;>;)Ljava/util/Collection<TT;>;
- (Ljava/util/Collection<TT;>;)Ljava/util/Collection<TT;>;
+ (Ljava/util/Collection<TT;>;)L1java/util/Collection<TT;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/util/GenericBaseModel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/util/GenericBaseModel.eea
index bcdf8cd817..f951a5467b 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/util/GenericBaseModel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/util/GenericBaseModel.eea
@@ -8,7 +8,7 @@ super org/apache/wicket/model/IObjectClassAwareModel
 
 createSerializableVersionOf
  (TT;)TT;
- (TT;)TT;
+ (TT;)T1T;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -17,7 +17,7 @@ getObject
  ()TT;
 getObjectClass
  ()Ljava/lang/Class<TT;>;
- ()Ljava/lang/Class<TT;>;
+ ()L0java/lang/Class<TT;>;
 setObject
  (TT;)V
  (TT;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/util/ListModel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/util/ListModel.eea
index 981cf413f6..2609929300 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/util/ListModel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/util/ListModel.eea
@@ -11,4 +11,4 @@ super org/apache/wicket/model/util/GenericBaseModel
  (Ljava/util/List<TT;>;)V
 createSerializableVersionOf
  (Ljava/util/List<TT;>;)Ljava/util/List<TT;>;
- (Ljava/util/List<TT;>;)Ljava/util/List<TT;>;
+ (Ljava/util/List<TT;>;)Ljava/util/List<TT;>; # @PolyNull
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/util/MapModel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/util/MapModel.eea
index 7f692d443b..673663f9b2 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/util/MapModel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/util/MapModel.eea
@@ -11,4 +11,4 @@ super org/apache/wicket/model/util/GenericBaseModel
  (Ljava/util/Map<TK;TV;>;)V
 createSerializableVersionOf
  (Ljava/util/Map<TK;TV;>;)Ljava/util/Map<TK;TV;>;
- (Ljava/util/Map<TK;TV;>;)Ljava/util/Map<TK;TV;>;
+ (Ljava/util/Map<TK;TV;>;)L1java/util/Map<TK;TV;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/util/SetModel.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/util/SetModel.eea
index e9f07fe532..1c436f0e50 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/util/SetModel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/model/util/SetModel.eea
@@ -11,4 +11,4 @@ super org/apache/wicket/model/util/GenericBaseModel
  (Ljava/util/Set<TT;>;)V
 createSerializableVersionOf
  (Ljava/util/Set<TT;>;)Ljava/util/Set<TT;>;
- (Ljava/util/Set<TT;>;)Ljava/util/Set<TT;>;
+ (Ljava/util/Set<TT;>;)L1java/util/Set<TT;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/page/PageAccessSynchronizer.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/page/PageAccessSynchronizer.eea
index be34954dec..d162cd0f50 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/page/PageAccessSynchronizer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/page/PageAccessSynchronizer.eea
@@ -8,4 +8,4 @@ class org/apache/wicket/page/PageAccessSynchronizer
  (Lorg/apache/wicket/page/IPageLockManager;)V
 adapt
  (Lorg/apache/wicket/page/IPageManager;)Lorg/apache/wicket/page/IPageManager;
- (Lorg/apache/wicket/page/IPageManager;)Lorg/apache/wicket/page/IPageManager;
+ (Lorg/apache/wicket/page/IPageManager;)L1org/apache/wicket/page/IPageManager;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/page/PageManager.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/page/PageManager.eea
index c7da0a59bf..810a7d11b1 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/page/PageManager.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/page/PageManager.eea
@@ -5,7 +5,7 @@ class org/apache/wicket/page/PageManager
  (Lorg/apache/wicket/pageStore/IPageStore;)V
 createPageContext
  ()Lorg/apache/wicket/pageStore/IPageContext;
- ()Lorg/apache/wicket/pageStore/IPageContext;
+ ()L1org/apache/wicket/pageStore/IPageContext;
 getPage
  (I)Lorg/apache/wicket/page/IManageablePage;
  (I)Lorg/apache/wicket/page/IManageablePage;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/AbstractPersistentPageStore.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/AbstractPersistentPageStore.eea
index 82963137fb..ef6a65c090 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/AbstractPersistentPageStore.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/AbstractPersistentPageStore.eea
@@ -14,10 +14,10 @@ canBeAsynchronous
  (Lorg/apache/wicket/pageStore/IPageContext;)Z
 createSessionIdentifier
  (Lorg/apache/wicket/pageStore/IPageContext;)Ljava/lang/String;
- (Lorg/apache/wicket/pageStore/IPageContext;)Ljava/lang/String;
+ (Lorg/apache/wicket/pageStore/IPageContext;)L1java/lang/String;
 getPage
  (Lorg/apache/wicket/pageStore/IPageContext;I)Lorg/apache/wicket/page/IManageablePage;
- (Lorg/apache/wicket/pageStore/IPageContext;I)Lorg/apache/wicket/page/IManageablePage;
+ (Lorg/apache/wicket/pageStore/IPageContext;I)L0org/apache/wicket/page/IManageablePage;
 getPersistedPage
  (Ljava/lang/String;I)Lorg/apache/wicket/page/IManageablePage;
  (Ljava/lang/String;I)Lorg/apache/wicket/page/IManageablePage;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/AsynchronousPageStore.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/AsynchronousPageStore.eea
index 48f02a9232..12d7c86ca0 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/AsynchronousPageStore.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/AsynchronousPageStore.eea
@@ -8,7 +8,7 @@ addPage
  (Lorg/apache/wicket/pageStore/IPageContext;Lorg/apache/wicket/page/IManageablePage;)V
 getPage
  (Lorg/apache/wicket/pageStore/IPageContext;I)Lorg/apache/wicket/page/IManageablePage;
- (Lorg/apache/wicket/pageStore/IPageContext;I)Lorg/apache/wicket/page/IManageablePage;
+ (Lorg/apache/wicket/pageStore/IPageContext;I)L0org/apache/wicket/page/IManageablePage;
 removeAllPages
  (Lorg/apache/wicket/pageStore/IPageContext;)V
  (Lorg/apache/wicket/pageStore/IPageContext;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/CryptingPageStore.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/CryptingPageStore.eea
index 87a203e8c5..0d1844113d 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/CryptingPageStore.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/CryptingPageStore.eea
@@ -11,7 +11,7 @@ canBeAsynchronous
  (Lorg/apache/wicket/pageStore/IPageContext;)Z
 getPage
  (Lorg/apache/wicket/pageStore/IPageContext;I)Lorg/apache/wicket/page/IManageablePage;
- (Lorg/apache/wicket/pageStore/IPageContext;I)Lorg/apache/wicket/page/IManageablePage;
+ (Lorg/apache/wicket/pageStore/IPageContext;I)L1org/apache/wicket/page/IManageablePage;
 newCrypter
  ()Lorg/apache/wicket/pageStore/crypt/ICrypter;
  ()Lorg/apache/wicket/pageStore/crypt/ICrypter;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/DiskPageStore$DiskData.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/DiskPageStore$DiskData.eea
index b09a7731dd..a1b01f3f5c 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/DiskPageStore$DiskData.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/DiskPageStore$DiskData.eea
@@ -14,7 +14,7 @@ loadData
  (Lorg/apache/wicket/pageStore/disk/PageWindowManager$FileWindow;)[B
 loadPage
  (I)[B
- (I)[B
+ (I)[0B
 savePage
  (ILjava/lang/String;[B)V
  (ILjava/lang/String;[B)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/DiskPageStore.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/DiskPageStore.eea
index 661eb24ffe..ec18ab22ea 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/DiskPageStore.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/DiskPageStore.eea
@@ -11,10 +11,10 @@ getDiskData
  (Ljava/lang/String;Z)Lorg/apache/wicket/pageStore/DiskPageStore$DiskData;
 getPersistedPage
  (Ljava/lang/String;I)Lorg/apache/wicket/page/IManageablePage;
- (Ljava/lang/String;I)Lorg/apache/wicket/page/IManageablePage;
+ (Ljava/lang/String;I)L0org/apache/wicket/page/IManageablePage;
 getPersistedPages
  (Ljava/lang/String;)Ljava/util/List<Lorg/apache/wicket/pageStore/IPersistedPage;>;
- (Ljava/lang/String;)Ljava/util/List<Lorg/apache/wicket/pageStore/IPersistedPage;>;
+ (Ljava/lang/String;)L1java/util/List<Lorg/apache/wicket/pageStore/IPersistedPage;>;
 getSessionIdentifiers
  ()Ljava/util/Set<Ljava/lang/String;>;
  ()Ljava/util/Set<Ljava/lang/String;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/FilePageStore.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/FilePageStore.eea
index c103ba9fa7..b155a8874e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/FilePageStore.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/FilePageStore.eea
@@ -8,22 +8,22 @@ addPersistedPage
  (Ljava/lang/String;Lorg/apache/wicket/page/IManageablePage;)V
 getPageType
  (Ljava/io/File;)Ljava/lang/String;
- (Ljava/io/File;)Ljava/lang/String;
+ (Ljava/io/File;)L1java/lang/String;
 getPersistedPage
  (Ljava/lang/String;I)Lorg/apache/wicket/page/IManageablePage;
- (Ljava/lang/String;I)Lorg/apache/wicket/page/IManageablePage;
+ (Ljava/lang/String;I)L0org/apache/wicket/page/IManageablePage;
 getPersistedPages
  (Ljava/lang/String;)Ljava/util/List<Lorg/apache/wicket/pageStore/IPersistedPage;>;
- (Ljava/lang/String;)Ljava/util/List<Lorg/apache/wicket/pageStore/IPersistedPage;>;
+ (Ljava/lang/String;)L1java/util/List<Lorg/apache/wicket/pageStore/IPersistedPage;>;
 getSessionIdentifiers
  ()Ljava/util/Set<Ljava/lang/String;>;
- ()Ljava/util/Set<Ljava/lang/String;>;
+ ()L1java/util/Set<Ljava/lang/String;>;
 getTotalSize
  ()Lorg/apache/wicket/util/lang/Bytes;
  ()Lorg/apache/wicket/util/lang/Bytes;
 readFile
  (Ljava/io/File;)[B
- (Ljava/io/File;)[B
+ (Ljava/io/File;)[1B
 removeAllPersistedPages
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/GroupingPageStore.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/GroupingPageStore.eea
index f451084a93..ccc6c50323 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/GroupingPageStore.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/GroupingPageStore.eea
@@ -8,10 +8,10 @@ addPage
  (Lorg/apache/wicket/pageStore/IPageContext;Lorg/apache/wicket/page/IManageablePage;)V
 getGroup
  (Lorg/apache/wicket/page/IManageablePage;)Ljava/lang/String;
- (Lorg/apache/wicket/page/IManageablePage;)Ljava/lang/String;
+ (Lorg/apache/wicket/page/IManageablePage;)L1java/lang/String;
 getPage
  (Lorg/apache/wicket/pageStore/IPageContext;I)Lorg/apache/wicket/page/IManageablePage;
- (Lorg/apache/wicket/pageStore/IPageContext;I)Lorg/apache/wicket/page/IManageablePage;
+ (Lorg/apache/wicket/pageStore/IPageContext;I)L0org/apache/wicket/page/IManageablePage;
 removeAllPages
  (Lorg/apache/wicket/pageStore/IPageContext;)V
  (Lorg/apache/wicket/pageStore/IPageContext;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/InMemoryPageStore$MemoryData.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/InMemoryPageStore$MemoryData.eea
index 67f34e34fd..5bf5620c9b 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/InMemoryPageStore$MemoryData.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/InMemoryPageStore$MemoryData.eea
@@ -5,10 +5,10 @@ add
  (Lorg/apache/wicket/page/IManageablePage;)V
 get
  (I)Lorg/apache/wicket/page/IManageablePage;
- (I)Lorg/apache/wicket/page/IManageablePage;
+ (I)L0org/apache/wicket/page/IManageablePage;
 iterator
  ()Ljava/util/Iterator<Lorg/apache/wicket/page/IManageablePage;>;
  ()Ljava/util/Iterator<Lorg/apache/wicket/page/IManageablePage;>;
 remove
  (I)Lorg/apache/wicket/page/IManageablePage;
- (I)Lorg/apache/wicket/page/IManageablePage;
+ (I)L0org/apache/wicket/page/IManageablePage;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/InMemoryPageStore$SizeLimitedData.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/InMemoryPageStore$SizeLimitedData.eea
index 8ac5c48f24..b1e48c1842 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/InMemoryPageStore$SizeLimitedData.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/InMemoryPageStore$SizeLimitedData.eea
@@ -8,4 +8,4 @@ add
  (Lorg/apache/wicket/page/IManageablePage;)V
 remove
  (I)Lorg/apache/wicket/page/IManageablePage;
- (I)Lorg/apache/wicket/page/IManageablePage;
+ (I)L0org/apache/wicket/page/IManageablePage; # @Inherited(org.apache.wicket.pageStore.InMemoryPageStore$MemoryData)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/InMemoryPageStore.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/InMemoryPageStore.eea
index 56e3448d7c..626a445bf4 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/InMemoryPageStore.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/InMemoryPageStore.eea
@@ -14,7 +14,7 @@ addPersistedPage
  (Ljava/lang/String;Lorg/apache/wicket/page/IManageablePage;)V
 getPersistedPage
  (Ljava/lang/String;I)Lorg/apache/wicket/page/IManageablePage;
- (Ljava/lang/String;I)Lorg/apache/wicket/page/IManageablePage;
+ (Ljava/lang/String;I)L0org/apache/wicket/page/IManageablePage;
 getPersistedPages
  (Ljava/lang/String;)Ljava/util/List<Lorg/apache/wicket/pageStore/IPersistedPage;>;
  (Ljava/lang/String;)Ljava/util/List<Lorg/apache/wicket/pageStore/IPersistedPage;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/InSessionPageStore$SessionData.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/InSessionPageStore$SessionData.eea
index e81160facc..2d2b63b09f 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/InSessionPageStore$SessionData.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/InSessionPageStore$SessionData.eea
@@ -5,10 +5,10 @@ add
  (Lorg/apache/wicket/page/IManageablePage;)V
 get
  (I)Lorg/apache/wicket/page/IManageablePage;
- (I)Lorg/apache/wicket/page/IManageablePage;
+ (I)L0org/apache/wicket/page/IManageablePage;
 remove
  (I)Lorg/apache/wicket/page/IManageablePage;
- (I)Lorg/apache/wicket/page/IManageablePage;
+ (I)L0org/apache/wicket/page/IManageablePage;
 supportSessionSerialization
  (Lorg/apache/wicket/serialize/ISerializer;)V
  (Lorg/apache/wicket/serialize/ISerializer;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/InSessionPageStore.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/InSessionPageStore.eea
index c66cf23e78..35efde7e56 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/InSessionPageStore.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/InSessionPageStore.eea
@@ -14,7 +14,7 @@ getKey
  ()Lorg/apache/wicket/MetaDataKey<Lorg/apache/wicket/pageStore/InSessionPageStore$SessionData;>;
 getPage
  (Lorg/apache/wicket/pageStore/IPageContext;I)Lorg/apache/wicket/page/IManageablePage;
- (Lorg/apache/wicket/pageStore/IPageContext;I)Lorg/apache/wicket/page/IManageablePage;
+ (Lorg/apache/wicket/pageStore/IPageContext;I)L0org/apache/wicket/page/IManageablePage;
 removeAllPages
  (Lorg/apache/wicket/pageStore/IPageContext;)V
  (Lorg/apache/wicket/pageStore/IPageContext;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/NoopPageStore.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/NoopPageStore.eea
index 2611c2f567..d9591b3d73 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/NoopPageStore.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/NoopPageStore.eea
@@ -8,7 +8,7 @@ canBeAsynchronous
  (Lorg/apache/wicket/pageStore/IPageContext;)Z
 getPage
  (Lorg/apache/wicket/pageStore/IPageContext;I)Lorg/apache/wicket/page/IManageablePage;
- (Lorg/apache/wicket/pageStore/IPageContext;I)Lorg/apache/wicket/page/IManageablePage;
+ (Lorg/apache/wicket/pageStore/IPageContext;I)L0org/apache/wicket/page/IManageablePage;
 removeAllPages
  (Lorg/apache/wicket/pageStore/IPageContext;)V
  (Lorg/apache/wicket/pageStore/IPageContext;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/disk/NestedFolders.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/disk/NestedFolders.eea
index cb10130aff..ac15c5b32f 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/disk/NestedFolders.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/disk/NestedFolders.eea
@@ -5,10 +5,10 @@ class org/apache/wicket/pageStore/disk/NestedFolders
  (Ljava/io/File;)V
 get
  (Ljava/lang/String;Z)Ljava/io/File;
- (Ljava/lang/String;Z)Ljava/io/File;
+ (Ljava/lang/String;Z)L1java/io/File;
 getAll
  ()Ljava/util/Set<Ljava/io/File;>;
- ()Ljava/util/Set<Ljava/io/File;>;
+ ()L1java/util/Set<Ljava/io/File;>;
 getBase
  ()Ljava/io/File;
  ()Ljava/io/File;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/disk/PageWindowManager.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/disk/PageWindowManager.eea
index 09dcac2f01..cd81faad0a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/disk/PageWindowManager.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/pageStore/disk/PageWindowManager.eea
@@ -2,10 +2,10 @@ class org/apache/wicket/pageStore/disk/PageWindowManager
 
 createPageWindow
  (ILjava/lang/String;I)Lorg/apache/wicket/pageStore/disk/PageWindowManager$FileWindow;
- (ILjava/lang/String;I)Lorg/apache/wicket/pageStore/disk/PageWindowManager$FileWindow;
+ (ILjava/lang/String;I)L1org/apache/wicket/pageStore/disk/PageWindowManager$FileWindow;
 getFileWindows
  ()Ljava/util/List<Lorg/apache/wicket/pageStore/disk/PageWindowManager$FileWindow;>;
- ()Ljava/util/List<Lorg/apache/wicket/pageStore/disk/PageWindowManager$FileWindow;>;
+ ()L1java/util/List<Lorg/apache/wicket/pageStore/disk/PageWindowManager$FileWindow;>;
 getPageWindow
  (I)Lorg/apache/wicket/pageStore/disk/PageWindowManager$FileWindow;
- (I)Lorg/apache/wicket/pageStore/disk/PageWindowManager$FileWindow;
+ (I)L0org/apache/wicket/pageStore/disk/PageWindowManager$FileWindow;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/AbstractRequestLogger.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/AbstractRequestLogger.eea
index 33c53b8b12..c9ce37878e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/AbstractRequestLogger.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/AbstractRequestLogger.eea
@@ -8,7 +8,7 @@ formatDate
  (Ljava/util/Date;)Ljava/lang/String;
 getCurrentRequest
  ()Lorg/apache/wicket/protocol/http/IRequestLogger$RequestData;
- ()Lorg/apache/wicket/protocol/http/IRequestLogger$RequestData;
+ ()L1org/apache/wicket/protocol/http/IRequestLogger$RequestData;
 getLiveSessions
  ()[Lorg/apache/wicket/protocol/http/IRequestLogger$SessionData;
  ()[Lorg/apache/wicket/protocol/http/IRequestLogger$SessionData;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/BufferedWebResponse.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/BufferedWebResponse.eea
index 192be0fbc7..5657cb2f24 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/BufferedWebResponse.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/BufferedWebResponse.eea
@@ -14,16 +14,16 @@ clearCookie
  (Ljakarta/servlet/http/Cookie;)V
 encodeRedirectURL
  (Ljava/lang/CharSequence;)Ljava/lang/String;
- (Ljava/lang/CharSequence;)Ljava/lang/String;
+ (Ljava/lang/CharSequence;)L0java/lang/String;
 encodeURL
  (Ljava/lang/CharSequence;)Ljava/lang/String;
- (Ljava/lang/CharSequence;)Ljava/lang/String;
+ (Ljava/lang/CharSequence;)L0java/lang/String;
 getContainerResponse
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
 getText
  ()Ljava/lang/CharSequence;
- ()Ljava/lang/CharSequence;
+ ()L0java/lang/CharSequence;
 sendError
  (ILjava/lang/String;)V
  (ILjava/lang/String;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.eea
index 36f0969d1a..a760f66d93 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.eea
@@ -6,10 +6,10 @@ APP_CLASS_PARAM
 
 createApplication
  (Ljava/lang/String;)Lorg/apache/wicket/protocol/http/WebApplication;
- (Ljava/lang/String;)Lorg/apache/wicket/protocol/http/WebApplication;
+ (Ljava/lang/String;)L1org/apache/wicket/protocol/http/WebApplication;
 createApplication
  (Lorg/apache/wicket/protocol/http/WicketFilter;)Lorg/apache/wicket/protocol/http/WebApplication;
- (Lorg/apache/wicket/protocol/http/WicketFilter;)Lorg/apache/wicket/protocol/http/WebApplication;
+ (Lorg/apache/wicket/protocol/http/WicketFilter;)L1org/apache/wicket/protocol/http/WebApplication; # @Inherited(org.apache.wicket.protocol.http.IWebApplicationFactory)
 destroy
  (Lorg/apache/wicket/protocol/http/WicketFilter;)V
  (Lorg/apache/wicket/protocol/http/WicketFilter;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/IRequestLogger$RequestData.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/IRequestLogger$RequestData.eea
index 26ca3b86e3..c4b6f9d22a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/IRequestLogger$RequestData.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/IRequestLogger$RequestData.eea
@@ -41,7 +41,7 @@ getSessionSize
  ()Ljava/lang/Long;
 getStartDate
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L1java/util/Date;
 getTimeTaken
  ()Ljava/lang/Long;
  ()Ljava/lang/Long;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/IRequestLogger$SessionData.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/IRequestLogger$SessionData.eea
index c205b0f1fd..97a729c8a3 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/IRequestLogger$SessionData.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/IRequestLogger$SessionData.eea
@@ -12,7 +12,7 @@ compareTo
  (L1org/apache/wicket/protocol/http/IRequestLogger$SessionData;)I
 getLastActive
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L1java/util/Date;
 getSessionId
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -21,7 +21,7 @@ getSessionInfo
  ()Ljava/lang/Object;
 getStartDate
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L1java/util/Date;
 setSessionInfo
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/IWebApplicationFactory.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/IWebApplicationFactory.eea
index 8abc19e078..233805c6f2 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/IWebApplicationFactory.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/IWebApplicationFactory.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/protocol/http/IWebApplicationFactory
 
 createApplication
  (Lorg/apache/wicket/protocol/http/WicketFilter;)Lorg/apache/wicket/protocol/http/WebApplication;
- (Lorg/apache/wicket/protocol/http/WicketFilter;)Lorg/apache/wicket/protocol/http/WebApplication;
+ (Lorg/apache/wicket/protocol/http/WicketFilter;)L1org/apache/wicket/protocol/http/WebApplication;
 destroy
  (Lorg/apache/wicket/protocol/http/WicketFilter;)V
  (Lorg/apache/wicket/protocol/http/WicketFilter;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/OriginResourceIsolationPolicy.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/OriginResourceIsolationPolicy.eea
index 032a743bd6..46fb2df557 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/OriginResourceIsolationPolicy.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/OriginResourceIsolationPolicy.eea
@@ -5,7 +5,7 @@ addAcceptedOrigin
  (Ljava/lang/String;)Lorg/apache/wicket/protocol/http/OriginResourceIsolationPolicy;
 getTargetUriFromRequest
  (Ljakarta/servlet/http/HttpServletRequest;)Ljava/lang/String;
- (Ljakarta/servlet/http/HttpServletRequest;)Ljava/lang/String;
+ (Ljakarta/servlet/http/HttpServletRequest;)L0java/lang/String;
 isLocalOrigin
  (Ljakarta/servlet/http/HttpServletRequest;Ljava/lang/String;)Z
  (Ljakarta/servlet/http/HttpServletRequest;Ljava/lang/String;)Z
@@ -17,4 +17,4 @@ isWhitelistedHost
  (Ljava/lang/String;)Z
 normalizeUri
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/ReloadingWicketServlet.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/ReloadingWicketServlet.eea
index 0c3117f546..bbee98a741 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/ReloadingWicketServlet.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/ReloadingWicketServlet.eea
@@ -2,4 +2,4 @@ class org/apache/wicket/protocol/http/ReloadingWicketServlet
 
 newWicketFilter
  ()Lorg/apache/wicket/protocol/http/WicketFilter;
- ()Lorg/apache/wicket/protocol/http/WicketFilter;
+ ()L1org/apache/wicket/protocol/http/WicketFilter; # @Inherited(org.apache.wicket.protocol.http.WicketServlet)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/RequestUtils.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/RequestUtils.eea
index e2556ff429..aa57396732 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/RequestUtils.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/RequestUtils.eea
@@ -11,4 +11,4 @@ removeDoubleDots
  (Ljava/lang/String;)Ljava/lang/String;
 toAbsolutePath
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/WebApplication.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/WebApplication.eea
index 611eda552b..4448d71b5e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/WebApplication.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/WebApplication.eea
@@ -64,25 +64,25 @@ mount
  (Lorg/apache/wicket/request/IRequestMapper;)V
 mountPackage
  <P:Lorg/apache/wicket/Page;>(Ljava/lang/String;Ljava/lang/Class<TP;>;)Lorg/apache/wicket/core/request/mapper/PackageMapper;
- <P:Lorg/apache/wicket/Page;>(Ljava/lang/String;Ljava/lang/Class<TP;>;)Lorg/apache/wicket/core/request/mapper/PackageMapper;
+ <P:Lorg/apache/wicket/Page;>(Ljava/lang/String;Ljava/lang/Class<TP;>;)L1org/apache/wicket/core/request/mapper/PackageMapper;
 mountPage
  <T:Lorg/apache/wicket/Page;>(Ljava/lang/String;Ljava/lang/Class<TT;>;)Lorg/apache/wicket/core/request/mapper/MountedMapper;
- <T:Lorg/apache/wicket/Page;>(Ljava/lang/String;Ljava/lang/Class<TT;>;)Lorg/apache/wicket/core/request/mapper/MountedMapper;
+ <T:Lorg/apache/wicket/Page;>(Ljava/lang/String;Ljava/lang/Class<TT;>;)L1org/apache/wicket/core/request/mapper/MountedMapper;
 mountResource
  (Ljava/lang/String;Lorg/apache/wicket/request/resource/ResourceReference;)Lorg/apache/wicket/core/request/mapper/ResourceMapper;
- (Ljava/lang/String;Lorg/apache/wicket/request/resource/ResourceReference;)Lorg/apache/wicket/core/request/mapper/ResourceMapper;
+ (Ljava/lang/String;Lorg/apache/wicket/request/resource/ResourceReference;)L1org/apache/wicket/core/request/mapper/ResourceMapper;
 newAjaxRequestTarget
  (Lorg/apache/wicket/Page;)Lorg/apache/wicket/ajax/AjaxRequestTarget;
  (Lorg/apache/wicket/Page;)Lorg/apache/wicket/ajax/AjaxRequestTarget;
 newSession
  (Lorg/apache/wicket/request/Request;Lorg/apache/wicket/request/Response;)Lorg/apache/wicket/Session;
- (Lorg/apache/wicket/request/Request;Lorg/apache/wicket/request/Response;)Lorg/apache/wicket/Session;
+ (Lorg/apache/wicket/request/Request;Lorg/apache/wicket/request/Response;)L1org/apache/wicket/Session;
 newWebRequest
  (Ljakarta/servlet/http/HttpServletRequest;Ljava/lang/String;)Lorg/apache/wicket/request/http/WebRequest;
- (Ljakarta/servlet/http/HttpServletRequest;Ljava/lang/String;)Lorg/apache/wicket/request/http/WebRequest;
+ (Ljakarta/servlet/http/HttpServletRequest;Ljava/lang/String;)L1org/apache/wicket/request/http/WebRequest;
 newWebResponse
  (Lorg/apache/wicket/request/http/WebRequest;Ljakarta/servlet/http/HttpServletResponse;)Lorg/apache/wicket/request/http/WebResponse;
- (Lorg/apache/wicket/request/http/WebRequest;Ljakarta/servlet/http/HttpServletResponse;)Lorg/apache/wicket/request/http/WebResponse;
+ (Lorg/apache/wicket/request/http/WebRequest;Ljakarta/servlet/http/HttpServletResponse;)L1org/apache/wicket/request/http/WebResponse;
 renderXmlDecl
  (Lorg/apache/wicket/markup/html/WebPage;Z)V
  (Lorg/apache/wicket/markup/html/WebPage;Z)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/WebSession.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/WebSession.eea
index 8a82d6ea46..23073c04b7 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/WebSession.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/WebSession.eea
@@ -15,4 +15,4 @@ getClientInfo
  ()Lorg/apache/wicket/protocol/http/request/WebClientInfo;
 newBrowserInfoPage
  ()Lorg/apache/wicket/markup/html/WebPage;
- ()Lorg/apache/wicket/markup/html/WebPage;
+ ()L1org/apache/wicket/markup/html/WebPage;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/WicketFilter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/WicketFilter.eea
index 3d75fefb1e..2b1dec42ba 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/WicketFilter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/WicketFilter.eea
@@ -15,7 +15,7 @@ IGNORE_PATHS_PARAM
  (Lorg/apache/wicket/protocol/http/WebApplication;)V
 checkIfRedirectRequired
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L0java/lang/String;
 doFilter
  (Ljakarta/servlet/ServletRequest;Ljakarta/servlet/ServletResponse;Ljakarta/servlet/FilterChain;)V
  (Ljakarta/servlet/ServletRequest;Ljakarta/servlet/ServletResponse;Ljakarta/servlet/FilterChain;)V
@@ -39,7 +39,7 @@ getFilterPath
  (Ljakarta/servlet/http/HttpServletRequest;)Ljava/lang/String;
 getFilterPathFromAnnotation
  (Z)Ljava/lang/String;
- (Z)Ljava/lang/String;
+ (Z)L0java/lang/String;
 getFilterPathFromConfig
  (Ljakarta/servlet/FilterConfig;)Ljava/lang/String;
  (Ljakarta/servlet/FilterConfig;)Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/WicketServlet.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/WicketServlet.eea
index 3ca84ad63c..0f56b15755 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/WicketServlet.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/WicketServlet.eea
@@ -12,4 +12,4 @@ doPost
  (Ljakarta/servlet/http/HttpServletRequest;Ljakarta/servlet/http/HttpServletResponse;)V
 newWicketFilter
  ()Lorg/apache/wicket/protocol/http/WicketFilter;
- ()Lorg/apache/wicket/protocol/http/WicketFilter;
+ ()L1org/apache/wicket/protocol/http/WicketFilter;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/mock/CookieCollection.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/mock/CookieCollection.eea
index ef7d1d3b66..9c45de7dfa 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/mock/CookieCollection.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/mock/CookieCollection.eea
@@ -11,10 +11,10 @@ addAll
  ([Ljakarta/servlet/http/Cookie;)V
 allAsList
  ()Ljava/util/List<Ljakarta/servlet/http/Cookie;>;
- ()Ljava/util/List<Ljakarta/servlet/http/Cookie;>;
+ ()L1java/util/List<Ljakarta/servlet/http/Cookie;>;
 asList
  ()Ljava/util/List<Ljakarta/servlet/http/Cookie;>;
- ()Ljava/util/List<Ljakarta/servlet/http/Cookie;>;
+ ()L1java/util/List<Ljakarta/servlet/http/Cookie;>;
 expiredAsList
  ()Ljava/util/List<Ljakarta/servlet/http/Cookie;>;
- ()Ljava/util/List<Ljakarta/servlet/http/Cookie;>;
+ ()L1java/util/List<Ljakarta/servlet/http/Cookie;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/mock/Cookies.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/mock/Cookies.eea
index 1e55833be5..4ff24871eb 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/mock/Cookies.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/mock/Cookies.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/protocol/http/mock/Cookies
 
 copyOf
  (Ljakarta/servlet/http/Cookie;)Ljakarta/servlet/http/Cookie;
- (Ljakarta/servlet/http/Cookie;)Ljakarta/servlet/http/Cookie;
+ (Ljakarta/servlet/http/Cookie;)L0jakarta/servlet/http/Cookie;
 isEqual
  (Ljakarta/servlet/http/Cookie;Ljakarta/servlet/http/Cookie;)Z
  (Ljakarta/servlet/http/Cookie;Ljakarta/servlet/http/Cookie;)Z
@@ -11,4 +11,4 @@ isExpired
  (Ljakarta/servlet/http/Cookie;)Z
 keyOf
  (Ljakarta/servlet/http/Cookie;)Lorg/apache/wicket/protocol/http/mock/Cookies$Key;
- (Ljakarta/servlet/http/Cookie;)Lorg/apache/wicket/protocol/http/mock/Cookies$Key;
+ (Ljakarta/servlet/http/Cookie;)L1org/apache/wicket/protocol/http/mock/Cookies$Key;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.eea
index 7d31a6d6d2..65fad79d8b 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.eea
@@ -32,7 +32,7 @@ changeSessionId
  ()Ljava/lang/String;
 getAsyncContext
  ()Ljakarta/servlet/AsyncContext;
- ()Ljakarta/servlet/AsyncContext;
+ ()L0jakarta/servlet/AsyncContext;
 getAttribute
  (Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;)Ljava/lang/Object;
@@ -50,28 +50,28 @@ getCharset
  ()Ljava/nio/charset/Charset;
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getContextPath
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getCookie
  (Ljava/lang/String;)Ljakarta/servlet/http/Cookie;
- (Ljava/lang/String;)Ljakarta/servlet/http/Cookie;
+ (Ljava/lang/String;)L0jakarta/servlet/http/Cookie;
 getCookies
  ()[Ljakarta/servlet/http/Cookie;
- ()[Ljakarta/servlet/http/Cookie;
+ ()[0Ljakarta/servlet/http/Cookie;
 getDateHeader
  (Ljava/lang/String;)J
  (Ljava/lang/String;)J
 getDispatcherType
  ()Ljakarta/servlet/DispatcherType;
- ()Ljakarta/servlet/DispatcherType;
+ ()L0jakarta/servlet/DispatcherType;
 getFilterPrefix
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getHeader
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getHeaderNames
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
@@ -80,16 +80,16 @@ getHeaders
  (Ljava/lang/String;)Ljava/util/Enumeration<Ljava/lang/String;>;
 getInputStream
  ()Ljakarta/servlet/ServletInputStream;
- ()Ljakarta/servlet/ServletInputStream;
+ ()L1jakarta/servlet/ServletInputStream;
 getIntHeader
  (Ljava/lang/String;)I
  (Ljava/lang/String;)I
 getLocalAddr
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getLocalName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
@@ -101,10 +101,10 @@ getMethod
  ()Ljava/lang/String;
 getParameter
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getParameterMap
  ()Ljava/util/Map<Ljava/lang/String;[Ljava/lang/String;>;
- ()Ljava/util/Map<Ljava/lang/String;[Ljava/lang/String;>;
+ ()L1java/util/Map<Ljava/lang/String;[Ljava/lang/String;>;
 getParameterNames
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
@@ -122,28 +122,28 @@ getPathInfo
  ()Ljava/lang/String;
 getPathTranslated
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getPostParameters
  ()Lorg/apache/wicket/mock/MockRequestParameters;
  ()Lorg/apache/wicket/mock/MockRequestParameters;
 getProtocol
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getProtocolRequestId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getQueryString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getReader
  ()Ljava/io/BufferedReader;
- ()Ljava/io/BufferedReader;
+ ()L1java/io/BufferedReader;
 getRemoteAddr
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getRemoteHost
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getRemoteUser
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -152,16 +152,16 @@ getRequestDispatcher
  (Ljava/lang/String;)Ljakarta/servlet/RequestDispatcher;
 getRequestId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getRequestURI
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getRequestURL
  ()Ljava/lang/StringBuffer;
- ()Ljava/lang/StringBuffer;
+ ()L1java/lang/StringBuffer;
 getRequestedSessionId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getScheme
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -170,13 +170,13 @@ getServerName
  ()Ljava/lang/String;
 getServletConnection
  ()Ljakarta/servlet/ServletConnection;
- ()Ljakarta/servlet/ServletConnection;
+ ()L0jakarta/servlet/ServletConnection;
 getServletContext
  ()Ljakarta/servlet/ServletContext;
  ()Ljakarta/servlet/ServletContext;
 getServletPath
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getSession
  ()Ljakarta/servlet/http/HttpSession;
  ()Ljakarta/servlet/http/HttpSession;
@@ -188,7 +188,7 @@ getUrl
  ()Lorg/apache/wicket/request/Url;
 getUserPrincipal
  ()Ljava/security/Principal;
- ()Ljava/security/Principal;
+ ()L0java/security/Principal;
 initialize
  (Ljava/util/Locale;)V
  (Ljava/util/Locale;)V
@@ -251,10 +251,10 @@ setUrl
  (Lorg/apache/wicket/request/Url;)V
 startAsync
  ()Ljakarta/servlet/AsyncContext;
- ()Ljakarta/servlet/AsyncContext;
+ ()L0jakarta/servlet/AsyncContext;
 startAsync
  (Ljakarta/servlet/ServletRequest;Ljakarta/servlet/ServletResponse;)Ljakarta/servlet/AsyncContext;
- (Ljakarta/servlet/ServletRequest;Ljakarta/servlet/ServletResponse;)Ljakarta/servlet/AsyncContext;
+ (Ljakarta/servlet/ServletRequest;Ljakarta/servlet/ServletResponse;)L0jakarta/servlet/AsyncContext;
 upgrade
  <T::Ljakarta/servlet/http/HttpUpgradeHandler;>(Ljava/lang/Class<TT;>;)TT;
- <T::Ljakarta/servlet/http/HttpUpgradeHandler;>(Ljava/lang/Class<TT;>;)TT;
+ <T::Ljakarta/servlet/http/HttpUpgradeHandler;>(Ljava/lang/Class<TT;>;)T0T;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.eea
index 03e8fc6b4e..476b030516 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.eea
@@ -5,7 +5,7 @@ append2digits
  (Ljava/lang/StringBuilder;I)V
 formatDate
  (J)Ljava/lang/String;
- (J)Ljava/lang/String;
+ (J)L1java/lang/String;
 formatDate
  (Ljava/lang/StringBuilder;Ljava/util/Calendar;Z)V
  (Ljava/lang/StringBuilder;Ljava/util/Calendar;Z)V
@@ -48,16 +48,16 @@ getContentType
  ()Ljava/lang/String;
 getCookies
  ()Ljava/util/List<Ljakarta/servlet/http/Cookie;>;
- ()Ljava/util/List<Ljakarta/servlet/http/Cookie;>;
+ ()L1java/util/List<Ljakarta/servlet/http/Cookie;>;
 getDocument
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getErrorMessage
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getHeader
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getHeaderNames
  ()Ljava/util/Set<Ljava/lang/String;>;
  ()Ljava/util/Set<Ljava/lang/String;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/mock/MockServletContext.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/mock/MockServletContext.eea
index 4cf114d0e8..9c3d63d086 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/mock/MockServletContext.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/mock/MockServletContext.eea
@@ -5,19 +5,19 @@ class org/apache/wicket/protocol/http/mock/MockServletContext
  (Lorg/apache/wicket/Application;Ljava/lang/String;)V
 addFilter
  (Ljava/lang/String;Ljakarta/servlet/Filter;)Ljakarta/servlet/FilterRegistration$Dynamic;
- (Ljava/lang/String;Ljakarta/servlet/Filter;)Ljakarta/servlet/FilterRegistration$Dynamic;
+ (Ljava/lang/String;Ljakarta/servlet/Filter;)L0jakarta/servlet/FilterRegistration$Dynamic;
 addFilter
  (Ljava/lang/String;Ljava/lang/Class<+Ljakarta/servlet/Filter;>;)Ljakarta/servlet/FilterRegistration$Dynamic;
- (Ljava/lang/String;Ljava/lang/Class<+Ljakarta/servlet/Filter;>;)Ljakarta/servlet/FilterRegistration$Dynamic;
+ (Ljava/lang/String;Ljava/lang/Class<+Ljakarta/servlet/Filter;>;)L0jakarta/servlet/FilterRegistration$Dynamic;
 addFilter
  (Ljava/lang/String;Ljava/lang/String;)Ljakarta/servlet/FilterRegistration$Dynamic;
- (Ljava/lang/String;Ljava/lang/String;)Ljakarta/servlet/FilterRegistration$Dynamic;
+ (Ljava/lang/String;Ljava/lang/String;)L0jakarta/servlet/FilterRegistration$Dynamic;
 addInitParameter
  (Ljava/lang/String;Ljava/lang/String;)V
  (Ljava/lang/String;Ljava/lang/String;)V
 addJspFile
  (Ljava/lang/String;Ljava/lang/String;)Ljakarta/servlet/ServletRegistration$Dynamic;
- (Ljava/lang/String;Ljava/lang/String;)Ljakarta/servlet/ServletRegistration$Dynamic;
+ (Ljava/lang/String;Ljava/lang/String;)L0jakarta/servlet/ServletRegistration$Dynamic;
 addListener
  (Ljava/lang/Class<+Ljava/util/EventListener;>;)V
  (Ljava/lang/Class<+Ljava/util/EventListener;>;)V
@@ -41,13 +41,13 @@ addServlet
  (Ljava/lang/String;Ljava/lang/String;)Ljakarta/servlet/ServletRegistration$Dynamic;
 createFilter
  <T::Ljakarta/servlet/Filter;>(Ljava/lang/Class<TT;>;)TT;
- <T::Ljakarta/servlet/Filter;>(Ljava/lang/Class<TT;>;)TT;
+ <T::Ljakarta/servlet/Filter;>(Ljava/lang/Class<TT;>;)T0T;
 createListener
  <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)TT;
- <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)TT;
+ <T::Ljava/util/EventListener;>(Ljava/lang/Class<TT;>;)T0T;
 createServlet
  <T::Ljakarta/servlet/Servlet;>(Ljava/lang/Class<TT;>;)TT;
- <T::Ljakarta/servlet/Servlet;>(Ljava/lang/Class<TT;>;)TT;
+ <T::Ljakarta/servlet/Servlet;>(Ljava/lang/Class<TT;>;)T1T;
 declareRoles
  ([Ljava/lang/String;)V
  ([Ljava/lang/String;)V
@@ -59,13 +59,13 @@ getAttributeNames
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
 getClassLoader
  ()Ljava/lang/ClassLoader;
- ()Ljava/lang/ClassLoader;
+ ()L0java/lang/ClassLoader;
 getContext
  (Ljava/lang/String;)Ljakarta/servlet/ServletContext;
  (Ljava/lang/String;)Ljakarta/servlet/ServletContext;
 getContextPath
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getDefaultSessionTrackingModes
  ()Ljava/util/Set<Ljakarta/servlet/SessionTrackingMode;>;
  ()Ljava/util/Set<Ljakarta/servlet/SessionTrackingMode;>;
@@ -74,10 +74,10 @@ getEffectiveSessionTrackingModes
  ()Ljava/util/Set<Ljakarta/servlet/SessionTrackingMode;>;
 getFilterRegistration
  (Ljava/lang/String;)Ljakarta/servlet/FilterRegistration;
- (Ljava/lang/String;)Ljakarta/servlet/FilterRegistration;
+ (Ljava/lang/String;)L0jakarta/servlet/FilterRegistration;
 getFilterRegistrations
  ()Ljava/util/Map<Ljava/lang/String;+Ljakarta/servlet/FilterRegistration;>;
- ()Ljava/util/Map<Ljava/lang/String;+Ljakarta/servlet/FilterRegistration;>;
+ ()L0java/util/Map<Ljava/lang/String;+Ljakarta/servlet/FilterRegistration;>;
 getInitParameter
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
@@ -86,37 +86,37 @@ getInitParameterNames
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
 getJspConfigDescriptor
  ()Ljakarta/servlet/descriptor/JspConfigDescriptor;
- ()Ljakarta/servlet/descriptor/JspConfigDescriptor;
+ ()L0jakarta/servlet/descriptor/JspConfigDescriptor;
 getMimeType
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getNamedDispatcher
  (Ljava/lang/String;)Ljakarta/servlet/RequestDispatcher;
  (Ljava/lang/String;)Ljakarta/servlet/RequestDispatcher;
 getRealPath
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getRequestCharacterEncoding
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getRequestDispatcher
  (Ljava/lang/String;)Ljakarta/servlet/RequestDispatcher;
- (Ljava/lang/String;)Ljakarta/servlet/RequestDispatcher;
+ (Ljava/lang/String;)L1jakarta/servlet/RequestDispatcher;
 getResource
  (Ljava/lang/String;)Ljava/net/URL;
  (Ljava/lang/String;)Ljava/net/URL;
 getResourceAsStream
  (Ljava/lang/String;)Ljava/io/InputStream;
- (Ljava/lang/String;)Ljava/io/InputStream;
+ (Ljava/lang/String;)L0java/io/InputStream;
 getResourcePaths
  (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
- (Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
+ (Ljava/lang/String;)L0java/util/Set<Ljava/lang/String;>;
 getResponseCharacterEncoding
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 getServerInfo
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getServletContextName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -131,7 +131,7 @@ getSessionCookieConfig
  ()Ljakarta/servlet/SessionCookieConfig;
 getVirtualServerName
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 log
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/ErrorAttributes.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/ErrorAttributes.eea
index 9b379d866c..daab44bfa6 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/ErrorAttributes.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/ErrorAttributes.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/protocol/http/servlet/ErrorAttributes
 
 of
  (Ljakarta/servlet/http/HttpServletRequest;Ljava/lang/String;)Lorg/apache/wicket/protocol/http/servlet/ErrorAttributes;
- (Ljakarta/servlet/http/HttpServletRequest;Ljava/lang/String;)Lorg/apache/wicket/protocol/http/servlet/ErrorAttributes;
+ (Ljakarta/servlet/http/HttpServletRequest;Ljava/lang/String;)L0org/apache/wicket/protocol/http/servlet/ErrorAttributes;
 
 getException
  ()Ljava/lang/Throwable;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/ForwardAttributes.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/ForwardAttributes.eea
index 51f3dfc4ce..940209f05a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/ForwardAttributes.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/ForwardAttributes.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/protocol/http/servlet/ForwardAttributes
 
 of
  (Ljakarta/servlet/http/HttpServletRequest;Ljava/lang/String;)Lorg/apache/wicket/protocol/http/servlet/ForwardAttributes;
- (Ljakarta/servlet/http/HttpServletRequest;Ljava/lang/String;)Lorg/apache/wicket/protocol/http/servlet/ForwardAttributes;
+ (Ljakarta/servlet/http/HttpServletRequest;Ljava/lang/String;)L0org/apache/wicket/protocol/http/servlet/ForwardAttributes;
 
 getContextPath
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.eea
index 44f58db23a..270815537a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.eea
@@ -8,7 +8,7 @@ class org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest
  (Ljakarta/servlet/http/HttpServletRequest;Ljava/lang/String;Lorg/apache/wicket/request/Url;)V
 cloneWithUrl
  (Lorg/apache/wicket/request/Url;)Lorg/apache/wicket/protocol/http/servlet/ServletWebRequest;
- (Lorg/apache/wicket/request/Url;)Lorg/apache/wicket/protocol/http/servlet/ServletWebRequest;
+ (Lorg/apache/wicket/request/Url;)L1org/apache/wicket/protocol/http/servlet/ServletWebRequest;
 getFileMaxSize
  ()Lorg/apache/wicket/util/lang/Bytes;
  ()Lorg/apache/wicket/util/lang/Bytes;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.eea
index 26a2f2c362..550025bea7 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.eea
@@ -18,7 +18,7 @@ setUploadInfo
  (Ljakarta/servlet/http/HttpServletRequest;Ljava/lang/String;Lorg/apache/wicket/util/lang/Bytes;Ljava/lang/String;Lorg/apache/commons/fileupload2/core/FileItemFactory;)V
 generatePostParameters
  ()Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lorg/apache/wicket/util/string/StringValue;>;>;
- ()Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lorg/apache/wicket/util/string/StringValue;>;>;
+ ()L1java/util/Map<Ljava/lang/String;Ljava/util/List<Lorg/apache/wicket/util/string/StringValue;>;>; # @Inherited(org.apache.wicket.protocol.http.servlet.ServletWebRequest)
 getFile
  (Ljava/lang/String;)Ljava/util/List<Lorg/apache/commons/fileupload2/core/FileItem;>;
  (Ljava/lang/String;)Ljava/util/List<Lorg/apache/commons/fileupload2/core/FileItem;>;
@@ -27,10 +27,10 @@ getFiles
  ()Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lorg/apache/commons/fileupload2/core/FileItem;>;>;
 newFileUpload
  (Ljava/lang/String;)Lorg/apache/commons/fileupload2/core/AbstractFileUpload;
- (Ljava/lang/String;)Lorg/apache/commons/fileupload2/core/AbstractFileUpload;
+ (Ljava/lang/String;)L1org/apache/commons/fileupload2/core/AbstractFileUpload;
 newMultipartWebRequest
  (Lorg/apache/wicket/util/lang/Bytes;Ljava/lang/String;)Lorg/apache/wicket/protocol/http/servlet/MultipartServletWebRequest;
- (Lorg/apache/wicket/util/lang/Bytes;Ljava/lang/String;)Lorg/apache/wicket/protocol/http/servlet/MultipartServletWebRequest;
+ (Lorg/apache/wicket/util/lang/Bytes;Ljava/lang/String;)L1org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest; # @Inherited(org.apache.wicket.protocol.http.servlet.ServletWebRequest)
 newMultipartWebRequest
  (Lorg/apache/wicket/util/lang/Bytes;Ljava/lang/String;Lorg/apache/commons/fileupload2/core/FileItemFactory;)Lorg/apache/wicket/protocol/http/servlet/MultipartServletWebRequest;
- (Lorg/apache/wicket/util/lang/Bytes;Ljava/lang/String;Lorg/apache/commons/fileupload2/core/FileItemFactory;)Lorg/apache/wicket/protocol/http/servlet/MultipartServletWebRequest;
+ (Lorg/apache/wicket/util/lang/Bytes;Ljava/lang/String;Lorg/apache/commons/fileupload2/core/FileItemFactory;)L1org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest; # @Inherited(org.apache.wicket.protocol.http.servlet.ServletWebRequest)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactory.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactory.eea
index 705e846c1c..cb9ee2f3bb 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactory.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactory.eea
@@ -14,7 +14,7 @@ needsWrapper
  (Ljakarta/servlet/http/HttpServletRequest;)Z
 newRequestWrapper
  (Ljakarta/servlet/http/HttpServletRequest;)Ljakarta/servlet/http/HttpServletRequest;
- (Ljakarta/servlet/http/HttpServletRequest;)Ljakarta/servlet/http/HttpServletRequest;
+ (Ljakarta/servlet/http/HttpServletRequest;)L1jakarta/servlet/http/HttpServletRequest;
 setConfig
  (Lorg/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactory$Config;)V
  (Lorg/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactory$Config;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/ServletWebRequest.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/ServletWebRequest.eea
index b3254436fc..4fd93d9ca9 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/ServletWebRequest.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/ServletWebRequest.eea
@@ -11,7 +11,7 @@ cloneWithUrl
  (Lorg/apache/wicket/request/Url;)Lorg/apache/wicket/protocol/http/servlet/ServletWebRequest;
 generatePostParameters
  ()Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lorg/apache/wicket/util/string/StringValue;>;>;
- ()Ljava/util/Map<Ljava/lang/String;Ljava/util/List<Lorg/apache/wicket/util/string/StringValue;>;>;
+ ()L1java/util/Map<Ljava/lang/String;Ljava/util/List<Lorg/apache/wicket/util/string/StringValue;>;>;
 getCharset
  ()Ljava/nio/charset/Charset;
  ()L1java/nio/charset/Charset; # @Inherited(org.apache.wicket.request.Request)
@@ -29,7 +29,7 @@ getCookies
  ()Ljava/util/List<Ljakarta/servlet/http/Cookie;>;
 getDateHeader
  (Ljava/lang/String;)Ljava/time/Instant;
- (Ljava/lang/String;)Ljava/time/Instant;
+ (Ljava/lang/String;)L0java/time/Instant;
 getFilterPath
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(org.apache.wicket.request.Request)
@@ -56,7 +56,7 @@ getUrl
  ()L1org/apache/wicket/request/Url; # @Inherited(org.apache.wicket.request.Request)
 newMultipartWebRequest
  (Lorg/apache/wicket/util/lang/Bytes;Ljava/lang/String;)Lorg/apache/wicket/protocol/http/servlet/MultipartServletWebRequest;
- (Lorg/apache/wicket/util/lang/Bytes;Ljava/lang/String;)Lorg/apache/wicket/protocol/http/servlet/MultipartServletWebRequest;
+ (Lorg/apache/wicket/util/lang/Bytes;Ljava/lang/String;)L1org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest;
 newMultipartWebRequest
  (Lorg/apache/wicket/util/lang/Bytes;Ljava/lang/String;Lorg/apache/commons/fileupload2/core/FileItemFactory;)Lorg/apache/wicket/protocol/http/servlet/MultipartServletWebRequest;
- (Lorg/apache/wicket/util/lang/Bytes;Ljava/lang/String;Lorg/apache/commons/fileupload2/core/FileItemFactory;)Lorg/apache/wicket/protocol/http/servlet/MultipartServletWebRequest;
+ (Lorg/apache/wicket/util/lang/Bytes;Ljava/lang/String;Lorg/apache/commons/fileupload2/core/FileItemFactory;)L1org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/UploadInfo.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/UploadInfo.eea
index 79bba1f2f6..d10fa4eab6 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/UploadInfo.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/UploadInfo.eea
@@ -11,4 +11,4 @@ getTotalBytesString
  ()Ljava/lang/String;
 getTransferRateString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/XForwardedRequestWrapper.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/XForwardedRequestWrapper.eea
index e93ddeffb8..2d0bf29992 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/XForwardedRequestWrapper.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/XForwardedRequestWrapper.eea
@@ -8,7 +8,7 @@ getDateHeader
  (Ljava/lang/String;)J
 getHeader
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getHeaderNames
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
  ()Ljava/util/Enumeration<Ljava/lang/String;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/XForwardedRequestWrapperFactory.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/XForwardedRequestWrapperFactory.eea
index 9110067852..70e5797952 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/XForwardedRequestWrapperFactory.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/http/servlet/XForwardedRequestWrapperFactory.eea
@@ -36,7 +36,7 @@ needsWrapper
  (Ljakarta/servlet/http/HttpServletRequest;)Z
 newRequestWrapper
  (Ljakarta/servlet/http/HttpServletRequest;)Ljakarta/servlet/http/HttpServletRequest;
- (Ljakarta/servlet/http/HttpServletRequest;)Ljakarta/servlet/http/HttpServletRequest;
+ (Ljakarta/servlet/http/HttpServletRequest;)L1jakarta/servlet/http/HttpServletRequest;
 setConfig
  (Lorg/apache/wicket/protocol/http/servlet/XForwardedRequestWrapperFactory$Config;)V
  (Lorg/apache/wicket/protocol/http/servlet/XForwardedRequestWrapperFactory$Config;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/https/HttpsMapper.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/https/HttpsMapper.eea
index 324aa93932..c97f0ef909 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/https/HttpsMapper.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/protocol/https/HttpsMapper.eea
@@ -5,10 +5,10 @@ class org/apache/wicket/protocol/https/HttpsMapper
  (Lorg/apache/wicket/request/IRequestMapper;Lorg/apache/wicket/protocol/https/HttpsConfig;)V
 createRedirectHandler
  (Ljava/lang/String;)Lorg/apache/wicket/request/IRequestHandler;
- (Ljava/lang/String;)Lorg/apache/wicket/request/IRequestHandler;
+ (Ljava/lang/String;)L1org/apache/wicket/request/IRequestHandler;
 createRedirectUrl
  (Lorg/apache/wicket/request/IRequestHandler;Lorg/apache/wicket/request/Request;Lorg/apache/wicket/protocol/https/Scheme;)Ljava/lang/String;
- (Lorg/apache/wicket/request/IRequestHandler;Lorg/apache/wicket/request/Request;Lorg/apache/wicket/protocol/https/Scheme;)Ljava/lang/String;
+ (Lorg/apache/wicket/request/IRequestHandler;Lorg/apache/wicket/request/Request;Lorg/apache/wicket/protocol/https/Scheme;)L1java/lang/String;
 getCompatibilityScore
  (Lorg/apache/wicket/request/Request;)I
  (L1org/apache/wicket/request/Request;)I # @Inherited(org.apache.wicket.request.IRequestMapper)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/HttpHeaderCollection.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/HttpHeaderCollection.eea
index b71c92037b..7117697559 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/HttpHeaderCollection.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/HttpHeaderCollection.eea
@@ -11,10 +11,10 @@ containsHeader
  (Ljava/lang/String;)Z
 getDateHeader
  (Ljava/lang/String;)Ljava/time/Instant;
- (Ljava/lang/String;)Ljava/time/Instant;
+ (Ljava/lang/String;)L0java/time/Instant;
 getHeader
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getHeaderNames
  ()Ljava/util/Set<Ljava/lang/String;>;
  ()Ljava/util/Set<Ljava/lang/String;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/Response.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/Response.eea
index c63ec78476..e7bf8de079 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/Response.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/Response.eea
@@ -8,7 +8,7 @@ getContainerResponse
  ()Ljava/lang/Object;
 getOutputStream
  ()Ljava/io/OutputStream;
- ()Ljava/io/OutputStream;
+ ()L1java/io/OutputStream;
 write
  (Ljava/lang/CharSequence;)V
  (Ljava/lang/CharSequence;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/Url.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/Url.eea
index 92ac3faa5c..4ce9ff833a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/Url.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/Url.eea
@@ -8,7 +8,7 @@ parse
  (Ljava/lang/CharSequence;Ljava/nio/charset/Charset;)Lorg/apache/wicket/request/Url;
 parse
  (Ljava/lang/CharSequence;Ljava/nio/charset/Charset;Z)Lorg/apache/wicket/request/Url;
- (Ljava/lang/CharSequence;Ljava/nio/charset/Charset;Z)Lorg/apache/wicket/request/Url;
+ (Ljava/lang/CharSequence;Ljava/nio/charset/Charset;Z)L1org/apache/wicket/request/Url;
 
 <init>
  (Ljava/nio/charset/Charset;)V
@@ -30,7 +30,7 @@ addQueryParameter
  (Ljava/lang/String;Ljava/lang/Object;)V
 canonical
  ()Lorg/apache/wicket/request/Url;
- ()Lorg/apache/wicket/request/Url;
+ ()L1org/apache/wicket/request/Url;
 concatSegments
  (Ljava/util/List<Ljava/lang/String;>;)V
  (Ljava/util/List<Ljava/lang/String;>;)V
@@ -51,7 +51,7 @@ getPath
  ()Ljava/lang/String;
 getPath
  (Ljava/nio/charset/Charset;)Ljava/lang/String;
- (Ljava/nio/charset/Charset;)Ljava/lang/String;
+ (Ljava/nio/charset/Charset;)L1java/lang/String;
 getPort
  ()Ljava/lang/Integer;
  ()Ljava/lang/Integer;
@@ -60,7 +60,7 @@ getProtocol
  ()Ljava/lang/String;
 getQueryParameter
  (Ljava/lang/String;)Lorg/apache/wicket/request/Url$QueryParameter;
- (Ljava/lang/String;)Lorg/apache/wicket/request/Url$QueryParameter;
+ (Ljava/lang/String;)L0org/apache/wicket/request/Url$QueryParameter;
 getQueryParameterValue
  (Ljava/lang/String;)Lorg/apache/wicket/util/string/StringValue;
  (Ljava/lang/String;)Lorg/apache/wicket/util/string/StringValue;
@@ -72,7 +72,7 @@ getQueryString
  ()Ljava/lang/String;
 getQueryString
  (Ljava/nio/charset/Charset;)Ljava/lang/String;
- (Ljava/nio/charset/Charset;)Ljava/lang/String;
+ (Ljava/nio/charset/Charset;)L0java/lang/String;
 getSegments
  ()Ljava/util/List<Ljava/lang/String;>;
  ()Ljava/util/List<Ljava/lang/String;>;
@@ -111,4 +111,4 @@ toString
  (Lorg/apache/wicket/request/Url$StringMode;)Ljava/lang/String;
 toString
  (Lorg/apache/wicket/request/Url$StringMode;Ljava/nio/charset/Charset;)Ljava/lang/String;
- (Lorg/apache/wicket/request/Url$StringMode;Ljava/nio/charset/Charset;)Ljava/lang/String;
+ (Lorg/apache/wicket/request/Url$StringMode;Ljava/nio/charset/Charset;)L1java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/UrlRenderer.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/UrlRenderer.eea
index 8ed4890f21..dcf8ff530c 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/UrlRenderer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/UrlRenderer.eea
@@ -8,7 +8,7 @@ getBaseUrl
  ()Lorg/apache/wicket/request/Url;
 renderContextRelativeUrl
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 renderFullUrl
  (Lorg/apache/wicket/request/Url;)Ljava/lang/String;
  (Lorg/apache/wicket/request/Url;)Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/cycle/IRequestCycleListener.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/cycle/IRequestCycleListener.eea
index 02323a108d..7389fb7e71 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/cycle/IRequestCycleListener.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/cycle/IRequestCycleListener.eea
@@ -11,7 +11,7 @@ onEndRequest
  (Lorg/apache/wicket/request/cycle/RequestCycle;)V
 onException
  (Lorg/apache/wicket/request/cycle/RequestCycle;Ljava/lang/Exception;)Lorg/apache/wicket/request/IRequestHandler;
- (Lorg/apache/wicket/request/cycle/RequestCycle;Ljava/lang/Exception;)Lorg/apache/wicket/request/IRequestHandler;
+ (Lorg/apache/wicket/request/cycle/RequestCycle;Ljava/lang/Exception;)L0org/apache/wicket/request/IRequestHandler;
 onExceptionRequestHandlerResolved
  (Lorg/apache/wicket/request/cycle/RequestCycle;Lorg/apache/wicket/request/IRequestHandler;Ljava/lang/Exception;)V
  (Lorg/apache/wicket/request/cycle/RequestCycle;Lorg/apache/wicket/request/IRequestHandler;Ljava/lang/Exception;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/cycle/RequestCycle.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/cycle/RequestCycle.eea
index 3179afc2af..e5bd38aaaa 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/cycle/RequestCycle.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/cycle/RequestCycle.eea
@@ -52,7 +52,7 @@ mapUrlFor
  <C:Lorg/apache/wicket/Page;>(Ljava/lang/Class<TC;>;Lorg/apache/wicket/request/mapper/parameter/PageParameters;)Lorg/apache/wicket/request/Url;
 newUrlRenderer
  ()Lorg/apache/wicket/request/UrlRenderer;
- ()Lorg/apache/wicket/request/UrlRenderer;
+ ()L1org/apache/wicket/request/UrlRenderer;
 onEvent
  (Lorg/apache/wicket/event/IEvent<*>;)V
  (L1org/apache/wicket/event/IEvent<*>;)V # @Inherited(org.apache.wicket.event.IEventSink)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/cycle/RequestCycleListenerCollection.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/cycle/RequestCycleListenerCollection.eea
index 971809250e..7508e22918 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/cycle/RequestCycleListenerCollection.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/cycle/RequestCycleListenerCollection.eea
@@ -15,7 +15,7 @@ onEndRequest
  (Lorg/apache/wicket/request/cycle/RequestCycle;)V
 onException
  (Lorg/apache/wicket/request/cycle/RequestCycle;Ljava/lang/Exception;)Lorg/apache/wicket/request/IRequestHandler;
- (Lorg/apache/wicket/request/cycle/RequestCycle;Ljava/lang/Exception;)Lorg/apache/wicket/request/IRequestHandler;
+ (Lorg/apache/wicket/request/cycle/RequestCycle;Ljava/lang/Exception;)L0org/apache/wicket/request/IRequestHandler; # @Inherited(org.apache.wicket.request.cycle.IRequestCycleListener)
 onExceptionRequestHandlerResolved
  (Lorg/apache/wicket/request/cycle/RequestCycle;Lorg/apache/wicket/request/IRequestHandler;Ljava/lang/Exception;)V
  (Lorg/apache/wicket/request/cycle/RequestCycle;Lorg/apache/wicket/request/IRequestHandler;Ljava/lang/Exception;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/handler/render/PageRenderer.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/handler/render/PageRenderer.eea
index 56b9741e7b..fe8232223c 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/handler/render/PageRenderer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/handler/render/PageRenderer.eea
@@ -17,7 +17,7 @@ getRenderPageRequestHandler
  ()Lorg/apache/wicket/core/request/handler/RenderPageRequestHandler;
 getSessionId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 respond
  (Lorg/apache/wicket/request/cycle/RequestCycle;)V
  (Lorg/apache/wicket/request/cycle/RequestCycle;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/handler/render/WebPageRenderer.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/handler/render/WebPageRenderer.eea
index 90d3cc3924..8683673a8b 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/handler/render/WebPageRenderer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/handler/render/WebPageRenderer.eea
@@ -14,7 +14,7 @@ redirectTo
  (Lorg/apache/wicket/request/Url;Lorg/apache/wicket/request/cycle/RequestCycle;)V
 renderPage
  (Lorg/apache/wicket/request/Url;Lorg/apache/wicket/request/cycle/RequestCycle;)Lorg/apache/wicket/protocol/http/BufferedWebResponse;
- (Lorg/apache/wicket/request/Url;Lorg/apache/wicket/request/cycle/RequestCycle;)Lorg/apache/wicket/protocol/http/BufferedWebResponse;
+ (Lorg/apache/wicket/request/Url;Lorg/apache/wicket/request/cycle/RequestCycle;)L0org/apache/wicket/protocol/http/BufferedWebResponse;
 respond
  (Lorg/apache/wicket/request/cycle/RequestCycle;)V
  (Lorg/apache/wicket/request/cycle/RequestCycle;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/http/WebRequest.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/http/WebRequest.eea
index 5595825a53..4a493951c7 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/http/WebRequest.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/http/WebRequest.eea
@@ -24,10 +24,10 @@ PARAM_AJAX_REQUEST_ANTI_CACHE
 
 cloneWithUrl
  (Lorg/apache/wicket/request/Url;)Lorg/apache/wicket/request/http/WebRequest;
- (Lorg/apache/wicket/request/Url;)Lorg/apache/wicket/request/http/WebRequest;
+ (Lorg/apache/wicket/request/Url;)L1org/apache/wicket/request/http/WebRequest;
 getCookie
  (Ljava/lang/String;)Ljakarta/servlet/http/Cookie;
- (Ljava/lang/String;)Ljakarta/servlet/http/Cookie;
+ (Ljava/lang/String;)L0jakarta/servlet/http/Cookie;
 getCookies
  ()Ljava/util/List<Ljakarta/servlet/http/Cookie;>;
  ()Ljava/util/List<Ljakarta/servlet/http/Cookie;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/mapper/AbstractMapper.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/mapper/AbstractMapper.eea
index 0d6c6d0b2f..e8d0f591ee 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/mapper/AbstractMapper.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/mapper/AbstractMapper.eea
@@ -2,13 +2,13 @@ class org/apache/wicket/request/mapper/AbstractMapper
 
 encodePageParameters
  (Lorg/apache/wicket/request/Url;Lorg/apache/wicket/request/mapper/parameter/PageParameters;Lorg/apache/wicket/request/mapper/parameter/IPageParametersEncoder;)Lorg/apache/wicket/request/Url;
- (Lorg/apache/wicket/request/Url;Lorg/apache/wicket/request/mapper/parameter/PageParameters;Lorg/apache/wicket/request/mapper/parameter/IPageParametersEncoder;)Lorg/apache/wicket/request/Url;
+ (Lorg/apache/wicket/request/Url;Lorg/apache/wicket/request/mapper/parameter/PageParameters;Lorg/apache/wicket/request/mapper/parameter/IPageParametersEncoder;)L1org/apache/wicket/request/Url;
 extractPageParameters
  (Lorg/apache/wicket/request/Request;ILorg/apache/wicket/request/mapper/parameter/IPageParametersEncoder;)Lorg/apache/wicket/request/mapper/parameter/PageParameters;
  (Lorg/apache/wicket/request/Request;ILorg/apache/wicket/request/mapper/parameter/IPageParametersEncoder;)Lorg/apache/wicket/request/mapper/parameter/PageParameters;
 getMountSegments
  (Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/String;)[1Ljava/lang/String;
 getOptionalPlaceholder
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
@@ -17,7 +17,7 @@ getPlaceholder
  (Ljava/lang/String;)Ljava/lang/String;
 getPlaceholder
  (Ljava/lang/String;C)Ljava/lang/String;
- (Ljava/lang/String;C)Ljava/lang/String;
+ (Ljava/lang/String;C)L0java/lang/String;
 removeMetaParameter
  (Lorg/apache/wicket/request/Url;)V
  (Lorg/apache/wicket/request/Url;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/mapper/info/ComponentInfo.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/mapper/info/ComponentInfo.eea
index 58ff5a17a3..e2c7fe189a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/mapper/info/ComponentInfo.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/mapper/info/ComponentInfo.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/request/mapper/info/ComponentInfo
 
 parse
  (Ljava/lang/String;)Lorg/apache/wicket/request/mapper/info/ComponentInfo;
- (Ljava/lang/String;)Lorg/apache/wicket/request/mapper/info/ComponentInfo;
+ (Ljava/lang/String;)L0org/apache/wicket/request/mapper/info/ComponentInfo;
 
 <init>
  (Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/mapper/info/PageComponentInfo.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/mapper/info/PageComponentInfo.eea
index a9bf209174..bbff545455 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/mapper/info/PageComponentInfo.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/mapper/info/PageComponentInfo.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/request/mapper/info/PageComponentInfo
 
 parse
  (Ljava/lang/String;)Lorg/apache/wicket/request/mapper/info/PageComponentInfo;
- (Ljava/lang/String;)Lorg/apache/wicket/request/mapper/info/PageComponentInfo;
+ (Ljava/lang/String;)L0org/apache/wicket/request/mapper/info/PageComponentInfo;
 
 <init>
  (Lorg/apache/wicket/request/mapper/info/PageInfo;Lorg/apache/wicket/request/mapper/info/ComponentInfo;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/mapper/info/PageInfo.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/mapper/info/PageInfo.eea
index c7934b113b..4de9e87a70 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/mapper/info/PageInfo.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/mapper/info/PageInfo.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/request/mapper/info/PageInfo
 
 parse
  (Ljava/lang/String;)Lorg/apache/wicket/request/mapper/info/PageInfo;
- (Ljava/lang/String;)Lorg/apache/wicket/request/mapper/info/PageInfo;
+ (Ljava/lang/String;)L0org/apache/wicket/request/mapper/info/PageInfo;
 
 <init>
  (Ljava/lang/Integer;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.eea
index 43aa075234..a89829cf69 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/request/mapper/parameter/PageParametersEncoder
 
 decodePageParameters
  (Lorg/apache/wicket/request/Url;)Lorg/apache/wicket/request/mapper/parameter/PageParameters;
- (Lorg/apache/wicket/request/Url;)Lorg/apache/wicket/request/mapper/parameter/PageParameters;
+ (Lorg/apache/wicket/request/Url;)L1org/apache/wicket/request/mapper/parameter/PageParameters;
 encodePageParameters
  (Lorg/apache/wicket/request/mapper/parameter/PageParameters;)Lorg/apache/wicket/request/Url;
- (Lorg/apache/wicket/request/mapper/parameter/PageParameters;)Lorg/apache/wicket/request/Url;
+ (Lorg/apache/wicket/request/mapper/parameter/PageParameters;)L1org/apache/wicket/request/Url;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/mapper/parameter/UrlPathPageParametersEncoder.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/mapper/parameter/UrlPathPageParametersEncoder.eea
index ac0a70a08f..fbc93a6856 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/mapper/parameter/UrlPathPageParametersEncoder.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/mapper/parameter/UrlPathPageParametersEncoder.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/request/mapper/parameter/UrlPathPageParametersEncoder
 
 decodePageParameters
  (Lorg/apache/wicket/request/Url;)Lorg/apache/wicket/request/mapper/parameter/PageParameters;
- (Lorg/apache/wicket/request/Url;)Lorg/apache/wicket/request/mapper/parameter/PageParameters;
+ (Lorg/apache/wicket/request/Url;)L1org/apache/wicket/request/mapper/parameter/PageParameters;
 encodePageParameters
  (Lorg/apache/wicket/request/mapper/parameter/PageParameters;)Lorg/apache/wicket/request/Url;
- (Lorg/apache/wicket/request/mapper/parameter/PageParameters;)Lorg/apache/wicket/request/Url;
+ (Lorg/apache/wicket/request/mapper/parameter/PageParameters;)L1org/apache/wicket/request/Url;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.eea
index 82779051a1..26626c90cb 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.eea
@@ -11,4 +11,4 @@ getParameterValue
  (Ljava/lang/String;)Lorg/apache/wicket/util/string/StringValue;
 getParameterValues
  (Ljava/lang/String;)Ljava/util/List<Lorg/apache/wicket/util/string/StringValue;>;
- (Ljava/lang/String;)Ljava/util/List<Lorg/apache/wicket/util/string/StringValue;>;
+ (Ljava/lang/String;)L0java/util/List<Lorg/apache/wicket/util/string/StringValue;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/parameter/EmptyRequestParameters.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/parameter/EmptyRequestParameters.eea
index 2037668151..48daf9bc04 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/parameter/EmptyRequestParameters.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/parameter/EmptyRequestParameters.eea
@@ -12,4 +12,4 @@ getParameterValue
  (Ljava/lang/String;)Lorg/apache/wicket/util/string/StringValue;
 getParameterValues
  (Ljava/lang/String;)Ljava/util/List<Lorg/apache/wicket/util/string/StringValue;>;
- (Ljava/lang/String;)Ljava/util/List<Lorg/apache/wicket/util/string/StringValue;>;
+ (Ljava/lang/String;)L0java/util/List<Lorg/apache/wicket/util/string/StringValue;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.eea
index 17a4e4a63f..83443b2771 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.eea
@@ -11,4 +11,4 @@ getParameterValue
  (Ljava/lang/String;)Lorg/apache/wicket/util/string/StringValue;
 getParameterValues
  (Ljava/lang/String;)Ljava/util/List<Lorg/apache/wicket/util/string/StringValue;>;
- (Ljava/lang/String;)Ljava/util/List<Lorg/apache/wicket/util/string/StringValue;>;
+ (Ljava/lang/String;)L0java/util/List<Lorg/apache/wicket/util/string/StringValue;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/BaseDataResource.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/BaseDataResource.eea
index e661a119ad..3ff574a475 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/BaseDataResource.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/BaseDataResource.eea
@@ -25,7 +25,7 @@ getLength
  (T1T;)L1java/lang/Long;
 newResourceResponse
  (Lorg/apache/wicket/request/resource/IResource$Attributes;)Lorg/apache/wicket/request/resource/AbstractResource$ResourceResponse;
- (Lorg/apache/wicket/request/resource/IResource$Attributes;)Lorg/apache/wicket/request/resource/AbstractResource$ResourceResponse;
+ (Lorg/apache/wicket/request/resource/IResource$Attributes;)L1org/apache/wicket/request/resource/AbstractResource$ResourceResponse;
 writeData
  (Lorg/apache/wicket/request/Response;TT;)V
  (L1org/apache/wicket/request/Response;TT;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/CharSequenceResource.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/CharSequenceResource.eea
index e342fc45bd..90c7116454 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/CharSequenceResource.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/CharSequenceResource.eea
@@ -15,7 +15,7 @@ super org/apache/wicket/request/resource/BaseDataResource
  (Ljava/lang/String;Ljava/lang/CharSequence;Ljava/lang/String;)V
 getCharset
  ()Ljava/nio/charset/Charset;
- ()Ljava/nio/charset/Charset;
+ ()L0java/nio/charset/Charset;
 getLength
  (Ljava/lang/CharSequence;)Ljava/lang/Long;
  (Ljava/lang/CharSequence;)Ljava/lang/Long;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/ContextRelativeResource.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/ContextRelativeResource.eea
index 9c238c552a..5b7c31ac6b 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/ContextRelativeResource.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/ContextRelativeResource.eea
@@ -8,10 +8,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getCacheKey
  ()Ljava/io/Serializable;
- ()Ljava/io/Serializable;
+ ()L1java/io/Serializable;
 getResourceStream
  ()Lorg/apache/wicket/util/resource/IResourceStream;
- ()Lorg/apache/wicket/util/resource/IResourceStream;
+ ()L1org/apache/wicket/util/resource/IResourceStream;
 newResourceResponse
  (Lorg/apache/wicket/request/resource/IResource$Attributes;)Lorg/apache/wicket/request/resource/AbstractResource$ResourceResponse;
- (Lorg/apache/wicket/request/resource/IResource$Attributes;)Lorg/apache/wicket/request/resource/AbstractResource$ResourceResponse;
+ (Lorg/apache/wicket/request/resource/IResource$Attributes;)L1org/apache/wicket/request/resource/AbstractResource$ResourceResponse;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/ContextRelativeResourceReference.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/ContextRelativeResourceReference.eea
index b205865f52..b4e6f8cd50 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/ContextRelativeResourceReference.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/ContextRelativeResourceReference.eea
@@ -14,7 +14,7 @@ class org/apache/wicket/request/resource/ContextRelativeResourceReference
  (Ljava/lang/String;Z)V
 buildContextRelativeResource
  (Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/request/resource/ContextRelativeResource;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/request/resource/ContextRelativeResource;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/apache/wicket/request/resource/ContextRelativeResource;
 getMinPostfix
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/CssResourceReference.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/CssResourceReference.eea
index d9e45d11d9..c7eeaec1e8 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/CssResourceReference.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/CssResourceReference.eea
@@ -11,4 +11,4 @@ class org/apache/wicket/request/resource/CssResourceReference
  (Lorg/apache/wicket/request/resource/ResourceReference$Key;)V
 getResource
  ()Lorg/apache/wicket/request/resource/CssPackageResource;
- ()Lorg/apache/wicket/request/resource/CssPackageResource;
+ ()L1org/apache/wicket/request/resource/CssPackageResource;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/DynamicImageResource.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/DynamicImageResource.eea
index 984dc18a27..2251cf6a40 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/DynamicImageResource.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/DynamicImageResource.eea
@@ -14,7 +14,7 @@ getImageData
  (Lorg/apache/wicket/request/resource/IResource$Attributes;)[B
 newResourceResponse
  (Lorg/apache/wicket/request/resource/IResource$Attributes;)Lorg/apache/wicket/request/resource/AbstractResource$ResourceResponse;
- (Lorg/apache/wicket/request/resource/IResource$Attributes;)Lorg/apache/wicket/request/resource/AbstractResource$ResourceResponse;
+ (Lorg/apache/wicket/request/resource/IResource$Attributes;)L1org/apache/wicket/request/resource/AbstractResource$ResourceResponse;
 setFormat
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/IResourceReferenceFactory.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/IResourceReferenceFactory.eea
index cea1ec1618..b15b0ff424 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/IResourceReferenceFactory.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/IResourceReferenceFactory.eea
@@ -2,4 +2,4 @@ class org/apache/wicket/request/resource/IResourceReferenceFactory
 
 create
  (Lorg/apache/wicket/request/resource/ResourceReference$Key;)Lorg/apache/wicket/request/resource/ResourceReference;
- (Lorg/apache/wicket/request/resource/ResourceReference$Key;)Lorg/apache/wicket/request/resource/ResourceReference;
+ (Lorg/apache/wicket/request/resource/ResourceReference$Key;)L1org/apache/wicket/request/resource/ResourceReference;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/JavaScriptResourceReference.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/JavaScriptResourceReference.eea
index 336d7f98e5..5a14686240 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/JavaScriptResourceReference.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/JavaScriptResourceReference.eea
@@ -11,4 +11,4 @@ class org/apache/wicket/request/resource/JavaScriptResourceReference
  (Lorg/apache/wicket/request/resource/ResourceReference$Key;)V
 getResource
  ()Lorg/apache/wicket/request/resource/JavaScriptPackageResource;
- ()Lorg/apache/wicket/request/resource/JavaScriptPackageResource;
+ ()L1org/apache/wicket/request/resource/JavaScriptPackageResource;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/MetaInfStaticResourceReference.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/MetaInfStaticResourceReference.eea
index 95394015c8..03f7e2441e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/MetaInfStaticResourceReference.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/MetaInfStaticResourceReference.eea
@@ -5,4 +5,4 @@ class org/apache/wicket/request/resource/MetaInfStaticResourceReference
  (Ljava/lang/Class<*>;Ljava/lang/String;)V
 mapHandler
  (Lorg/apache/wicket/request/IRequestHandler;)Lorg/apache/wicket/request/Url;
- (Lorg/apache/wicket/request/IRequestHandler;)Lorg/apache/wicket/request/Url;
+ (Lorg/apache/wicket/request/IRequestHandler;)L0org/apache/wicket/request/Url;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/PackageResource.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/PackageResource.eea
index 1b23dd59ce..7f9fdd22d3 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/PackageResource.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/PackageResource.eea
@@ -21,10 +21,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getCacheKey
  ()Ljava/io/Serializable;
- ()Ljava/io/Serializable;
+ ()L0java/io/Serializable;
 getCompressor
  ()Lorg/apache/wicket/resource/ITextResourceCompressor;
- ()Lorg/apache/wicket/resource/ITextResourceCompressor;
+ ()L0org/apache/wicket/resource/ITextResourceCompressor;
 getName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/PackageResourceReference.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/PackageResourceReference.eea
index 22ab3ac996..a93854eeb3 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/PackageResourceReference.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/PackageResourceReference.eea
@@ -17,10 +17,10 @@ getMinifiedName
  ()Ljava/lang/String;
 getResource
  ()Lorg/apache/wicket/request/resource/PackageResource;
- ()Lorg/apache/wicket/request/resource/PackageResource;
+ ()L1org/apache/wicket/request/resource/PackageResource;
 getUrlAttributes
  ()Lorg/apache/wicket/request/resource/ResourceReference$UrlAttributes;
- ()Lorg/apache/wicket/request/resource/ResourceReference$UrlAttributes;
+ ()L1org/apache/wicket/request/resource/ResourceReference$UrlAttributes; # @Inherited(org.apache.wicket.request.resource.ResourceReference)
 readBuffered
  (Z)Lorg/apache/wicket/request/resource/PackageResourceReference;
  (Z)Lorg/apache/wicket/request/resource/PackageResourceReference;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/ResourceReference.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/ResourceReference.eea
index 1d9bffc9d0..0f3c89b150 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/ResourceReference.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/ResourceReference.eea
@@ -2,10 +2,10 @@ class org/apache/wicket/request/resource/ResourceReference
 
 of
  (Ljava/lang/String;Lorg/danekja/java/util/function/serializable/SerializableSupplier<Lorg/apache/wicket/request/resource/IResource;>;)Lorg/apache/wicket/request/resource/ResourceReference;
- (Ljava/lang/String;Lorg/danekja/java/util/function/serializable/SerializableSupplier<Lorg/apache/wicket/request/resource/IResource;>;)Lorg/apache/wicket/request/resource/ResourceReference;
+ (Ljava/lang/String;Lorg/danekja/java/util/function/serializable/SerializableSupplier<Lorg/apache/wicket/request/resource/IResource;>;)L1org/apache/wicket/request/resource/ResourceReference;
 of
  (Lorg/apache/wicket/request/resource/ResourceReference$Key;Lorg/danekja/java/util/function/serializable/SerializableSupplier<Lorg/apache/wicket/request/resource/IResource;>;)Lorg/apache/wicket/request/resource/ResourceReference;
- (Lorg/apache/wicket/request/resource/ResourceReference$Key;Lorg/danekja/java/util/function/serializable/SerializableSupplier<Lorg/apache/wicket/request/resource/IResource;>;)Lorg/apache/wicket/request/resource/ResourceReference;
+ (Lorg/apache/wicket/request/resource/ResourceReference$Key;Lorg/danekja/java/util/function/serializable/SerializableSupplier<Lorg/apache/wicket/request/resource/IResource;>;)L1org/apache/wicket/request/resource/ResourceReference;
 
 <init>
  (Ljava/lang/Class<*>;Ljava/lang/String;)V
@@ -24,10 +24,10 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getDependencies
  ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
- ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
+ ()L1java/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
 getExtension
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getKey
  ()Lorg/apache/wicket/request/resource/ResourceReference$Key;
  ()Lorg/apache/wicket/request/resource/ResourceReference$Key;
@@ -48,7 +48,7 @@ getStyle
  ()Ljava/lang/String;
 getUrlAttributes
  ()Lorg/apache/wicket/request/resource/ResourceReference$UrlAttributes;
- ()Lorg/apache/wicket/request/resource/ResourceReference$UrlAttributes;
+ ()L1org/apache/wicket/request/resource/ResourceReference$UrlAttributes;
 getVariation
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/ResourceReferenceRegistry$DefaultResourceReferenceFactory.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/ResourceReferenceRegistry$DefaultResourceReferenceFactory.eea
index 03610a12d2..7e04ba2eaa 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/ResourceReferenceRegistry$DefaultResourceReferenceFactory.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/ResourceReferenceRegistry$DefaultResourceReferenceFactory.eea
@@ -2,4 +2,4 @@ class org/apache/wicket/request/resource/ResourceReferenceRegistry$DefaultResour
 
 create
  (Lorg/apache/wicket/request/resource/ResourceReference$Key;)Lorg/apache/wicket/request/resource/ResourceReference;
- (Lorg/apache/wicket/request/resource/ResourceReference$Key;)Lorg/apache/wicket/request/resource/ResourceReference;
+ (Lorg/apache/wicket/request/resource/ResourceReference$Key;)L1org/apache/wicket/request/resource/ResourceReference; # @Inherited(org.apache.wicket.request.resource.IResourceReferenceFactory)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/ResourceReferenceRegistry.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/ResourceReferenceRegistry.eea
index 7eeb73c418..b71614890d 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/ResourceReferenceRegistry.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/ResourceReferenceRegistry.eea
@@ -5,7 +5,7 @@ class org/apache/wicket/request/resource/ResourceReferenceRegistry
  (Lorg/apache/wicket/request/resource/IResourceReferenceFactory;)V
 createDefaultResourceReference
  (Lorg/apache/wicket/request/resource/ResourceReference$Key;)Lorg/apache/wicket/request/resource/ResourceReference;
- (Lorg/apache/wicket/request/resource/ResourceReference$Key;)Lorg/apache/wicket/request/resource/ResourceReference;
+ (Lorg/apache/wicket/request/resource/ResourceReference$Key;)L1org/apache/wicket/request/resource/ResourceReference;
 getResourceReference
  (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;ZZ)Lorg/apache/wicket/request/resource/ResourceReference;
  (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;ZZ)Lorg/apache/wicket/request/resource/ResourceReference;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/ResourceStreamResource.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/ResourceStreamResource.eea
index c353b98e67..0183d50a63 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/ResourceStreamResource.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/ResourceStreamResource.eea
@@ -11,7 +11,7 @@ getResourceStream
  (Lorg/apache/wicket/request/resource/IResource$Attributes;)Lorg/apache/wicket/util/resource/IResourceStream;
 newResourceResponse
  (Lorg/apache/wicket/request/resource/IResource$Attributes;)Lorg/apache/wicket/request/resource/AbstractResource$ResourceResponse;
- (Lorg/apache/wicket/request/resource/IResource$Attributes;)Lorg/apache/wicket/request/resource/AbstractResource$ResourceResponse;
+ (Lorg/apache/wicket/request/resource/IResource$Attributes;)L1org/apache/wicket/request/resource/AbstractResource$ResourceResponse;
 setCacheDuration
  (Ljava/time/Duration;)Lorg/apache/wicket/request/resource/ResourceStreamResource;
  (Ljava/time/Duration;)Lorg/apache/wicket/request/resource/ResourceStreamResource;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/UrlResourceReference.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/UrlResourceReference.eea
index b105fad8d9..bd01f58dcb 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/UrlResourceReference.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/UrlResourceReference.eea
@@ -5,10 +5,10 @@ class org/apache/wicket/request/resource/UrlResourceReference
  (Lorg/apache/wicket/request/Url;)V
 getResource
  ()Lorg/apache/wicket/request/resource/IResource;
- ()Lorg/apache/wicket/request/resource/IResource;
+ ()L0org/apache/wicket/request/resource/IResource;
 getUrl
  ()Lorg/apache/wicket/request/Url;
- ()Lorg/apache/wicket/request/Url;
+ ()L1org/apache/wicket/request/Url;
 setContextRelative
  (Z)Lorg/apache/wicket/request/resource/UrlResourceReference;
  (Z)Lorg/apache/wicket/request/resource/UrlResourceReference;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/caching/version/CachingResourceVersion.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/caching/version/CachingResourceVersion.eea
index 478039e29c..9bcc6e0276 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/caching/version/CachingResourceVersion.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/caching/version/CachingResourceVersion.eea
@@ -8,7 +8,7 @@ class org/apache/wicket/request/resource/caching/version/CachingResourceVersion
  (Lorg/apache/wicket/request/resource/caching/version/IResourceVersion;I)V
 getVersion
  (Lorg/apache/wicket/request/resource/caching/IStaticCacheableResource;)Ljava/lang/String;
- (Lorg/apache/wicket/request/resource/caching/IStaticCacheableResource;)Ljava/lang/String;
+ (Lorg/apache/wicket/request/resource/caching/IStaticCacheableResource;)L0java/lang/String;
 getVersionPattern
  ()Ljava/util/regex/Pattern;
  ()Ljava/util/regex/Pattern;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/caching/version/LastModifiedResourceVersion.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/caching/version/LastModifiedResourceVersion.eea
index b5be1716fc..41de60e215 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/caching/version/LastModifiedResourceVersion.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/caching/version/LastModifiedResourceVersion.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/request/resource/caching/version/LastModifiedResourceVer
 
 getVersion
  (Lorg/apache/wicket/request/resource/caching/IStaticCacheableResource;)Ljava/lang/String;
- (Lorg/apache/wicket/request/resource/caching/IStaticCacheableResource;)Ljava/lang/String;
+ (Lorg/apache/wicket/request/resource/caching/IStaticCacheableResource;)L0java/lang/String;
 getVersionPattern
  ()Ljava/util/regex/Pattern;
  ()Ljava/util/regex/Pattern;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/caching/version/MessageDigestResourceVersion.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/caching/version/MessageDigestResourceVersion.eea
index 4483ec7158..828c25e596 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/caching/version/MessageDigestResourceVersion.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/request/resource/caching/version/MessageDigestResourceVersion.eea
@@ -14,7 +14,7 @@ getMessageDigest
  ()Ljava/security/MessageDigest;
 getVersion
  (Lorg/apache/wicket/request/resource/caching/IStaticCacheableResource;)Ljava/lang/String;
- (Lorg/apache/wicket/request/resource/caching/IStaticCacheableResource;)Ljava/lang/String;
+ (Lorg/apache/wicket/request/resource/caching/IStaticCacheableResource;)L0java/lang/String;
 getVersionPattern
  ()Ljava/util/regex/Pattern;
  ()Ljava/util/regex/Pattern;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/FileSystemResource.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/FileSystemResource.eea
index 1f273653e1..17f69149ab 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/FileSystemResource.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/FileSystemResource.eea
@@ -5,7 +5,7 @@ class org/apache/wicket/resource/FileSystemResource
  (Ljava/nio/file/Path;)V
 createResourceResponse
  (Lorg/apache/wicket/request/resource/IResource$Attributes;Ljava/nio/file/Path;)Lorg/apache/wicket/request/resource/AbstractResource$ResourceResponse;
- (Lorg/apache/wicket/request/resource/IResource$Attributes;Ljava/nio/file/Path;)Lorg/apache/wicket/request/resource/AbstractResource$ResourceResponse;
+ (Lorg/apache/wicket/request/resource/IResource$Attributes;Ljava/nio/file/Path;)L1org/apache/wicket/request/resource/AbstractResource$ResourceResponse;
 getInputStream
  ()Ljava/io/InputStream;
  ()Ljava/io/InputStream;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/FileSystemResourceReference.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/FileSystemResourceReference.eea
index 88bca58ca5..29d2fff963 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/FileSystemResourceReference.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/FileSystemResourceReference.eea
@@ -18,7 +18,7 @@ getPath
  (Ljava/lang/String;Ljava/nio/file/Path;)V
 getFileSystemResource
  ()Lorg/apache/wicket/resource/FileSystemResource;
- ()Lorg/apache/wicket/resource/FileSystemResource;
+ ()L1org/apache/wicket/resource/FileSystemResource;
 getResource
  ()Lorg/apache/wicket/request/resource/IResource;
  ()Lorg/apache/wicket/request/resource/IResource;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/IsoPropertiesFilePropertiesLoader.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/IsoPropertiesFilePropertiesLoader.eea
index ad160f96cf..d9c4d7bf1e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/IsoPropertiesFilePropertiesLoader.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/IsoPropertiesFilePropertiesLoader.eea
@@ -8,7 +8,7 @@ getFileExtension
  ()Ljava/lang/String;
 loadJavaProperties
  (Ljava/io/InputStream;)Ljava/util/Properties;
- (Ljava/io/InputStream;)Ljava/util/Properties;
+ (Ljava/io/InputStream;)L1java/util/Properties;
 loadWicketProperties
  (Ljava/io/InputStream;)Lorg/apache/wicket/util/value/ValueMap;
- (Ljava/io/InputStream;)Lorg/apache/wicket/util/value/ValueMap;
+ (Ljava/io/InputStream;)L0org/apache/wicket/util/value/ValueMap;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/JQueryPluginResourceReference.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/JQueryPluginResourceReference.eea
index ef0ed50c2f..731e48ecb0 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/JQueryPluginResourceReference.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/JQueryPluginResourceReference.eea
@@ -8,4 +8,4 @@ class org/apache/wicket/resource/JQueryPluginResourceReference
  (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)V
 getDependencies
  ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
- ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
+ ()L1java/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>; # @Inherited(org.apache.wicket.request.resource.ResourceReference)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/PropertiesFactory.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/PropertiesFactory.eea
index 0e08ade3bb..ff27e7a3a3 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/PropertiesFactory.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/PropertiesFactory.eea
@@ -17,10 +17,10 @@ getPropertiesLoaders
  ()Ljava/util/List<Lorg/apache/wicket/resource/IPropertiesLoader;>;
 load
  (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/apache/wicket/resource/Properties;
- (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/apache/wicket/resource/Properties;
+ (Ljava/lang/Class<*>;Ljava/lang/String;)L0org/apache/wicket/resource/Properties;
 loadFromLoader
  (Lorg/apache/wicket/resource/IPropertiesLoader;Lorg/apache/wicket/util/resource/IResourceStream;)Lorg/apache/wicket/util/value/ValueMap;
- (Lorg/apache/wicket/resource/IPropertiesLoader;Lorg/apache/wicket/util/resource/IResourceStream;)Lorg/apache/wicket/util/value/ValueMap;
+ (Lorg/apache/wicket/resource/IPropertiesLoader;Lorg/apache/wicket/util/resource/IResourceStream;)L0org/apache/wicket/util/value/ValueMap;
 newPropertiesCache
  ()Ljava/util/Map<Ljava/lang/String;Lorg/apache/wicket/resource/Properties;>;
- ()Ljava/util/Map<Ljava/lang/String;Lorg/apache/wicket/resource/Properties;>;
+ ()L1java/util/Map<Ljava/lang/String;Lorg/apache/wicket/resource/Properties;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/ResourceUtil.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/ResourceUtil.eea
index b2681c79f4..9fa22338df 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/ResourceUtil.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/ResourceUtil.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/resource/ResourceUtil
 
 decodeResourceReferenceAttributes
  (Ljava/lang/String;)Lorg/apache/wicket/request/resource/ResourceReference$UrlAttributes;
- (Ljava/lang/String;)Lorg/apache/wicket/request/resource/ResourceReference$UrlAttributes;
+ (Ljava/lang/String;)L1org/apache/wicket/request/resource/ResourceReference$UrlAttributes;
 decodeResourceReferenceAttributes
  (Lorg/apache/wicket/request/Url;)Lorg/apache/wicket/request/resource/ResourceReference$UrlAttributes;
  (Lorg/apache/wicket/request/Url;)Lorg/apache/wicket/request/resource/ResourceReference$UrlAttributes;
@@ -11,19 +11,19 @@ encodeResourceReferenceAttributes
  (Lorg/apache/wicket/request/Url;Lorg/apache/wicket/request/resource/ResourceReference;)V
 encodeResourceReferenceAttributes
  (Lorg/apache/wicket/request/resource/ResourceReference$UrlAttributes;)Ljava/lang/String;
- (Lorg/apache/wicket/request/resource/ResourceReference$UrlAttributes;)Ljava/lang/String;
+ (Lorg/apache/wicket/request/resource/ResourceReference$UrlAttributes;)L0java/lang/String;
 escapeAttributesSeparator
  (Ljava/lang/String;)Ljava/lang/CharSequence;
  (Ljava/lang/String;)Ljava/lang/CharSequence;
 parseLocale
  (Ljava/lang/String;)Ljava/util/Locale;
- (Ljava/lang/String;)Ljava/util/Locale;
+ (Ljava/lang/String;)L0java/util/Locale;
 readString
  (Lorg/apache/wicket/util/resource/IResourceStream;)Ljava/lang/String;
  (Lorg/apache/wicket/util/resource/IResourceStream;)Ljava/lang/String;
 readString
  (Lorg/apache/wicket/util/resource/IResourceStream;Ljava/nio/charset/Charset;)Ljava/lang/String;
- (Lorg/apache/wicket/util/resource/IResourceStream;Ljava/nio/charset/Charset;)Ljava/lang/String;
+ (Lorg/apache/wicket/util/resource/IResourceStream;Ljava/nio/charset/Charset;)L1java/lang/String;
 unescapeAttributesSeparator
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/UtfPropertiesFilePropertiesLoader.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/UtfPropertiesFilePropertiesLoader.eea
index eb9740ed57..fcec99f537 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/UtfPropertiesFilePropertiesLoader.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/UtfPropertiesFilePropertiesLoader.eea
@@ -8,7 +8,7 @@ getFileExtension
  ()Ljava/lang/String;
 loadJavaProperties
  (Ljava/io/InputStream;)Ljava/util/Properties;
- (Ljava/io/InputStream;)Ljava/util/Properties;
+ (Ljava/io/InputStream;)L1java/util/Properties;
 loadWicketProperties
  (Ljava/io/InputStream;)Lorg/apache/wicket/util/value/ValueMap;
- (Ljava/io/InputStream;)Lorg/apache/wicket/util/value/ValueMap;
+ (Ljava/io/InputStream;)L0org/apache/wicket/util/value/ValueMap;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/XmlFilePropertiesLoader.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/XmlFilePropertiesLoader.eea
index 2b76a095d1..badce483c1 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/XmlFilePropertiesLoader.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/XmlFilePropertiesLoader.eea
@@ -8,7 +8,7 @@ getFileExtension
  ()Ljava/lang/String;
 loadJavaProperties
  (Ljava/io/InputStream;)Ljava/util/Properties;
- (Ljava/io/InputStream;)Ljava/util/Properties;
+ (Ljava/io/InputStream;)L1java/util/Properties;
 loadWicketProperties
  (Ljava/io/InputStream;)Lorg/apache/wicket/util/value/ValueMap;
- (Ljava/io/InputStream;)Lorg/apache/wicket/util/value/ValueMap;
+ (Ljava/io/InputStream;)L0org/apache/wicket/util/value/ValueMap;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/bundles/ConcatBundleResource.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/bundles/ConcatBundleResource.eea
index 4baecf28f4..f4e495b3ee 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/bundles/ConcatBundleResource.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/bundles/ConcatBundleResource.eea
@@ -5,19 +5,19 @@ class org/apache/wicket/resource/bundles/ConcatBundleResource
  (Ljava/util/List<+Lorg/apache/wicket/markup/head/IReferenceHeaderItem;>;)V
 findContentType
  (Ljava/util/List<Lorg/apache/wicket/util/resource/IResourceStream;>;)Ljava/lang/String;
- (Ljava/util/List<Lorg/apache/wicket/util/resource/IResourceStream;>;)Ljava/lang/String;
+ (Ljava/util/List<Lorg/apache/wicket/util/resource/IResourceStream;>;)L0java/lang/String;
 findLastModified
  (Ljava/util/List<Lorg/apache/wicket/util/resource/IResourceStream;>;)Ljava/time/Instant;
  (Ljava/util/List<Lorg/apache/wicket/util/resource/IResourceStream;>;)Ljava/time/Instant;
 getCacheKey
  ()Ljava/io/Serializable;
- ()Ljava/io/Serializable;
+ ()L0java/io/Serializable;
 getCompressor
  ()Lorg/apache/wicket/resource/ITextResourceCompressor;
  ()Lorg/apache/wicket/resource/ITextResourceCompressor;
 getResourceStream
  ()Lorg/apache/wicket/util/resource/IResourceStream;
- ()Lorg/apache/wicket/util/resource/IResourceStream;
+ ()L0org/apache/wicket/util/resource/IResourceStream;
 newResourceResponse
  (Lorg/apache/wicket/request/resource/IResource$Attributes;)Lorg/apache/wicket/request/resource/AbstractResource$ResourceResponse;
  (Lorg/apache/wicket/request/resource/IResource$Attributes;)Lorg/apache/wicket/request/resource/AbstractResource$ResourceResponse;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/bundles/ConcatResourceBundleReference.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/bundles/ConcatResourceBundleReference.eea
index 0332c497fa..0f2eac8ede 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/bundles/ConcatResourceBundleReference.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/bundles/ConcatResourceBundleReference.eea
@@ -19,13 +19,13 @@ getCompressor
  ()Lorg/apache/wicket/resource/ITextResourceCompressor;
 getDependencies
  ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
- ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
+ ()L1java/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>; # @Inherited(org.apache.wicket.request.resource.ResourceReference)
 getProvidedResources
  ()Ljava/util/List<TT;>;
  ()Ljava/util/List<TT;>;
 getResource
  ()Lorg/apache/wicket/request/resource/IResource;
- ()Lorg/apache/wicket/request/resource/IResource;
+ ()L1org/apache/wicket/request/resource/IResource;
 setCompressor
  (Lorg/apache/wicket/resource/ITextResourceCompressor;)V
  (Lorg/apache/wicket/resource/ITextResourceCompressor;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/bundles/ReplacementResourceBundleReference.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/bundles/ReplacementResourceBundleReference.eea
index 66dc630694..2e80201b43 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/bundles/ReplacementResourceBundleReference.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/bundles/ReplacementResourceBundleReference.eea
@@ -5,4 +5,4 @@ class org/apache/wicket/resource/bundles/ReplacementResourceBundleReference
  (Lorg/apache/wicket/request/resource/ResourceReference;)V
 getDependencies
  ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
- ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
+ ()L1java/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>; # @Inherited(org.apache.wicket.resource.bundles.ResourceBundleReference)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/bundles/ResourceBundleReference.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/bundles/ResourceBundleReference.eea
index ae51e9a622..e16f55c81a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/bundles/ResourceBundleReference.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/bundles/ResourceBundleReference.eea
@@ -11,7 +11,7 @@ getBundleReference
  ()Lorg/apache/wicket/request/resource/ResourceReference;
 getDependencies
  ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
- ()Ljava/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>;
+ ()L1java/util/List<Lorg/apache/wicket/markup/head/HeaderItem;>; # @Inherited(org.apache.wicket.request.resource.ResourceReference)
 getProvidedResources
  ()Ljava/lang/Iterable<+Lorg/apache/wicket/markup/head/HeaderItem;>;
  ()Ljava/lang/Iterable<+Lorg/apache/wicket/markup/head/HeaderItem;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/loader/BundleStringResourceLoader.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/loader/BundleStringResourceLoader.eea
index a471c61e42..05cfa754fd 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/loader/BundleStringResourceLoader.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/loader/BundleStringResourceLoader.eea
@@ -5,7 +5,7 @@ class org/apache/wicket/resource/loader/BundleStringResourceLoader
  (Ljava/lang/String;)V
 loadStringResource
  (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)L0java/lang/String;
 loadStringResource
  (Lorg/apache/wicket/Component;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
  (Lorg/apache/wicket/Component;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/loader/ClassStringResourceLoader.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/loader/ClassStringResourceLoader.eea
index 7cda2c4498..907336f4fb 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/loader/ClassStringResourceLoader.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/loader/ClassStringResourceLoader.eea
@@ -5,7 +5,7 @@ class org/apache/wicket/resource/loader/ClassStringResourceLoader
  (Ljava/lang/Class<*>;)V
 loadStringResource
  (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)L0java/lang/String; # @Inherited(org.apache.wicket.resource.loader.ComponentStringResourceLoader)
 loadStringResource
  (Lorg/apache/wicket/Component;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
  (Lorg/apache/wicket/Component;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/loader/ComponentStringResourceLoader.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/loader/ComponentStringResourceLoader.eea
index ec1b2e5ef6..7066b7f939 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/loader/ComponentStringResourceLoader.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/loader/ComponentStringResourceLoader.eea
@@ -5,7 +5,7 @@ getPropertiesFactory
  ()Lorg/apache/wicket/resource/IPropertiesFactory;
 getResourcePath
  (Lorg/apache/wicket/Component;)Ljava/lang/String;
- (Lorg/apache/wicket/Component;)Ljava/lang/String;
+ (Lorg/apache/wicket/Component;)L1java/lang/String;
 isStopResourceSearch
  (Ljava/lang/Class<*>;)Z
  (Ljava/lang/Class<*>;)Z
@@ -14,7 +14,7 @@ isStopResourceSearch
  (Lorg/apache/wicket/Component;)Z
 loadStringResource
  (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)L0java/lang/String;
 loadStringResource
  (Lorg/apache/wicket/Component;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
  (Lorg/apache/wicket/Component;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/loader/InitializerStringResourceLoader.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/loader/InitializerStringResourceLoader.eea
index d646ffb543..0bf03d1a7b 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/loader/InitializerStringResourceLoader.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/loader/InitializerStringResourceLoader.eea
@@ -5,7 +5,7 @@ class org/apache/wicket/resource/loader/InitializerStringResourceLoader
  (Ljava/util/List<Lorg/apache/wicket/IInitializer;>;)V
 loadStringResource
  (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)L0java/lang/String; # @Inherited(org.apache.wicket.resource.loader.ComponentStringResourceLoader)
 loadStringResource
  (Lorg/apache/wicket/Component;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
  (Lorg/apache/wicket/Component;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/loader/PackageStringResourceLoader.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/loader/PackageStringResourceLoader.eea
index e91b09e472..6d7f8a3c11 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/loader/PackageStringResourceLoader.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/loader/PackageStringResourceLoader.eea
@@ -5,7 +5,7 @@ getFilename
  ()Ljava/lang/String;
 loadStringResource
  (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)L0java/lang/String; # @Inherited(org.apache.wicket.resource.loader.ComponentStringResourceLoader)
 setFilename
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/loader/ValidatorStringResourceLoader.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/loader/ValidatorStringResourceLoader.eea
index ba0179a08a..ddccd6ed7a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/loader/ValidatorStringResourceLoader.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/resource/loader/ValidatorStringResourceLoader.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/resource/loader/ValidatorStringResourceLoader
 
 loadStringResource
  (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)L0java/lang/String; # @Inherited(org.apache.wicket.resource.loader.ComponentStringResourceLoader)
 loadStringResource
  (Lorg/apache/wicket/Component;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Lorg/apache/wicket/Component;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Lorg/apache/wicket/Component;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)L0java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/response/ByteArrayResponse.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/response/ByteArrayResponse.eea
index e2a31372b1..4d3cc5db5a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/response/ByteArrayResponse.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/response/ByteArrayResponse.eea
@@ -5,7 +5,7 @@ class org/apache/wicket/response/ByteArrayResponse
  (Lorg/apache/wicket/request/Response;)V
 encodeURL
  (Ljava/lang/CharSequence;)Ljava/lang/String;
- (Ljava/lang/CharSequence;)Ljava/lang/String;
+ (Ljava/lang/CharSequence;)L0java/lang/String;
 getBytes
  ()[B
  ()[B
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/response/NullResponse.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/response/NullResponse.eea
index f2491775dc..2d5d264e13 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/response/NullResponse.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/response/NullResponse.eea
@@ -6,10 +6,10 @@ getInstance
 
 encodeURL
  (Ljava/lang/CharSequence;)Ljava/lang/String;
- (Ljava/lang/CharSequence;)Ljava/lang/String;
+ (Ljava/lang/CharSequence;)L0java/lang/String;
 getContainerResponse
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 write
  (Ljava/lang/CharSequence;)V
  (Ljava/lang/CharSequence;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/response/StringResponse.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/response/StringResponse.eea
index b8c737265a..53314ac89a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/response/StringResponse.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/response/StringResponse.eea
@@ -2,13 +2,13 @@ class org/apache/wicket/response/StringResponse
 
 encodeURL
  (Ljava/lang/CharSequence;)Ljava/lang/String;
- (Ljava/lang/CharSequence;)Ljava/lang/String;
+ (Ljava/lang/CharSequence;)L0java/lang/String;
 getBuffer
  ()Ljava/lang/CharSequence;
- ()Ljava/lang/CharSequence;
+ ()L1java/lang/CharSequence;
 getContainerResponse
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/serialize/java/DeflatedJavaSerializer.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/serialize/java/DeflatedJavaSerializer.eea
index d0fec4fd4f..7d9864c1dc 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/serialize/java/DeflatedJavaSerializer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/serialize/java/DeflatedJavaSerializer.eea
@@ -5,10 +5,10 @@ class org/apache/wicket/serialize/java/DeflatedJavaSerializer
  (Ljava/lang/String;)V
 createDeflater
  ()Ljava/util/zip/Deflater;
- ()Ljava/util/zip/Deflater;
+ ()L1java/util/zip/Deflater;
 newObjectInputStream
  (Ljava/io/InputStream;)Ljava/io/ObjectInputStream;
- (Ljava/io/InputStream;)Ljava/io/ObjectInputStream;
+ (Ljava/io/InputStream;)L1java/io/ObjectInputStream; # @Inherited(org.apache.wicket.serialize.java.JavaSerializer)
 newObjectOutputStream
  (Ljava/io/OutputStream;)Ljava/io/ObjectOutputStream;
- (Ljava/io/OutputStream;)Ljava/io/ObjectOutputStream;
+ (Ljava/io/OutputStream;)L1java/io/ObjectOutputStream; # @Inherited(org.apache.wicket.serialize.java.JavaSerializer)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/serialize/java/JavaSerializer.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/serialize/java/JavaSerializer.eea
index 0c8e3f1011..cda64ff67b 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/serialize/java/JavaSerializer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/serialize/java/JavaSerializer.eea
@@ -8,10 +8,10 @@ deserialize
  ([B)Ljava/lang/Object;
 newObjectInputStream
  (Ljava/io/InputStream;)Ljava/io/ObjectInputStream;
- (Ljava/io/InputStream;)Ljava/io/ObjectInputStream;
+ (Ljava/io/InputStream;)L1java/io/ObjectInputStream;
 newObjectOutputStream
  (Ljava/io/OutputStream;)Ljava/io/ObjectOutputStream;
- (Ljava/io/OutputStream;)Ljava/io/ObjectOutputStream;
+ (Ljava/io/OutputStream;)L1java/io/ObjectOutputStream;
 serialize
  (Ljava/lang/Object;)[B
- (Ljava/lang/Object;)[B
+ (Ljava/lang/Object;)[0B
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/session/HttpSessionStore.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/session/HttpSessionStore.eea
index 809cfbf726..dee0471253 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/session/HttpSessionStore.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/session/HttpSessionStore.eea
@@ -8,10 +8,10 @@ flushSession
  (Lorg/apache/wicket/request/Request;Lorg/apache/wicket/Session;)V
 getAttribute
  (Lorg/apache/wicket/request/Request;Ljava/lang/String;)Ljava/io/Serializable;
- (Lorg/apache/wicket/request/Request;Ljava/lang/String;)Ljava/io/Serializable;
+ (Lorg/apache/wicket/request/Request;Ljava/lang/String;)L0java/io/Serializable;
 getAttributeNames
  (Lorg/apache/wicket/request/Request;)Ljava/util/List<Ljava/lang/String;>;
- (Lorg/apache/wicket/request/Request;)Ljava/util/List<Ljava/lang/String;>;
+ (Lorg/apache/wicket/request/Request;)L1java/util/List<Ljava/lang/String;>;
 getBindListeners
  ()Ljava/util/Set<Lorg/apache/wicket/session/ISessionStore$BindListener;>;
  ()Ljava/util/Set<Lorg/apache/wicket/session/ISessionStore$BindListener;>;
@@ -32,7 +32,7 @@ invalidate
  (Lorg/apache/wicket/request/Request;)V
 lookup
  (Lorg/apache/wicket/request/Request;)Lorg/apache/wicket/Session;
- (Lorg/apache/wicket/request/Request;)Lorg/apache/wicket/Session;
+ (Lorg/apache/wicket/request/Request;)L0org/apache/wicket/Session;
 onBind
  (Lorg/apache/wicket/request/Request;Lorg/apache/wicket/Session;)V
  (Lorg/apache/wicket/request/Request;Lorg/apache/wicket/Session;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/settings/DefaultUnauthorizedResourceRequestListener.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/settings/DefaultUnauthorizedResourceRequestListener.eea
index d801496c1c..e4ea20f3c7 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/settings/DefaultUnauthorizedResourceRequestListener.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/settings/DefaultUnauthorizedResourceRequestListener.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/settings/DefaultUnauthorizedResourceRequestListener
 
 createErrorMessage
  (Lorg/apache/wicket/request/resource/IResource;Lorg/apache/wicket/request/mapper/parameter/PageParameters;)Ljava/lang/String;
- (Lorg/apache/wicket/request/resource/IResource;Lorg/apache/wicket/request/mapper/parameter/PageParameters;)Ljava/lang/String;
+ (Lorg/apache/wicket/request/resource/IResource;Lorg/apache/wicket/request/mapper/parameter/PageParameters;)L1java/lang/String;
 onUnauthorizedRequest
  (Lorg/apache/wicket/request/resource/IResource;Lorg/apache/wicket/request/mapper/parameter/PageParameters;)V
  (Lorg/apache/wicket/request/resource/IResource;Lorg/apache/wicket/request/mapper/parameter/PageParameters;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/settings/RequestCycleSettings.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/settings/RequestCycleSettings.eea
index b0b9f5d4a5..0a6b21c477 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/settings/RequestCycleSettings.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/settings/RequestCycleSettings.eea
@@ -8,7 +8,7 @@ getRenderStrategy
  ()Lorg/apache/wicket/settings/RequestCycleSettings$RenderStrategy;
 getResponseFilters
  ()Ljava/util/List<Lorg/apache/wicket/response/filter/IResponseFilter;>;
- ()Ljava/util/List<Lorg/apache/wicket/response/filter/IResponseFilter;>;
+ ()L0java/util/List<Lorg/apache/wicket/response/filter/IResponseFilter;>;
 getResponseRequestEncoding
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/LazyInitializer.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/LazyInitializer.eea
index 35379fc0ee..5d3a8b85dc 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/LazyInitializer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/LazyInitializer.eea
@@ -8,7 +8,7 @@ super java/util/function/Supplier
 
 createInstance
  ()TT;
- ()TT;
+ ()T1T;
 get
  ()TT;
  ()TT;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/LongEncoder.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/LongEncoder.eea
index 24f957fb4f..ab8455c110 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/LongEncoder.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/LongEncoder.eea
@@ -15,4 +15,4 @@ encode
  (J)Ljava/lang/String;
 encode
  (JLjava/lang/String;)Ljava/lang/String;
- (JLjava/lang/String;)Ljava/lang/String;
+ (JLjava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/NullProvider.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/NullProvider.eea
index 2a3f3ca104..668148d79f 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/NullProvider.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/NullProvider.eea
@@ -8,4 +8,4 @@ super java/util/function/Supplier
 
 get
  ()TT;
- ()TT;
+ ()T0T;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/ValueProvider.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/ValueProvider.eea
index 50d8509c62..a6984f3dc0 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/ValueProvider.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/ValueProvider.eea
@@ -8,7 +8,7 @@ super java/util/function/Supplier
 
 of
  <T:Ljava/lang/Object;>(TT;)Lorg/apache/wicket/util/ValueProvider<TT;>;
- <T:Ljava/lang/Object;>(TT;)Lorg/apache/wicket/util/ValueProvider<TT;>;
+ <T:Ljava/lang/Object;>(TT;)L1org/apache/wicket/util/ValueProvider<TT;>;
 
 <init>
  (TT;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/collections/ClassMetaCache.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/collections/ClassMetaCache.eea
index 03cfa12633..381e0e1ec9 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/collections/ClassMetaCache.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/collections/ClassMetaCache.eea
@@ -4,7 +4,7 @@ class org/apache/wicket/util/collections/ClassMetaCache
 
 get
  (Ljava/lang/Class<*>;)TT;
- (Ljava/lang/Class<*>;)TT;
+ (Ljava/lang/Class<*>;)T0T;
 put
  (Ljava/lang/Class<*>;TT;)TT;
  (Ljava/lang/Class<*>;TT;)TT;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/collections/IntHashMap.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/collections/IntHashMap.eea
index 25af205312..3f3b1905ac 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/collections/IntHashMap.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/collections/IntHashMap.eea
@@ -13,13 +13,13 @@ entrySet
  ()Ljava/util/Set<Lorg/apache/wicket/util/collections/IntHashMap$Entry<TV;>;>;
 get
  (I)TV;
- (I)TV;
+ (I)T0V;
 keySet
  ()Ljava/util/Set<Ljava/lang/Integer;>;
  ()Ljava/util/Set<Ljava/lang/Integer;>;
 put
  (ITV;)TV;
- (ITV;)TV;
+ (ITV;)T0V;
 putAll
  (Lorg/apache/wicket/util/collections/IntHashMap<TV;>;)V
  (Lorg/apache/wicket/util/collections/IntHashMap<TV;>;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/collections/MultiMap.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/collections/MultiMap.eea
index f307542307..f5ce46819b 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/collections/MultiMap.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/collections/MultiMap.eea
@@ -14,7 +14,7 @@ addValue
  (TK;TV;)V
 getFirstValue
  (TK;)TV;
- (TK;)TV;
+ (TK;)T0V;
 removeValue
  (TK;TV;)V
  (TK;TV;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/AbstractConverter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/AbstractConverter.eea
index 989d322576..45e75b9588 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/AbstractConverter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/AbstractConverter.eea
@@ -8,7 +8,7 @@ super org/apache/wicket/util/convert/IConverter
 
 convertToString
  (TC;Ljava/util/Locale;)Ljava/lang/String;
- (TC;Ljava/util/Locale;)Ljava/lang/String;
+ (TC;Ljava/util/Locale;)Ljava/lang/String; # @PolyNull
 getTargetType
  ()Ljava/lang/Class<TC;>;
  ()Ljava/lang/Class<TC;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/AbstractDateConverter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/AbstractDateConverter.eea
index fabe8506d5..390a00f3b7 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/AbstractDateConverter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/AbstractDateConverter.eea
@@ -8,13 +8,13 @@ super org/apache/wicket/util/convert/converter/AbstractConverter
 
 convertToObject
  (Ljava/lang/String;Ljava/util/Locale;)TD;
- (Ljava/lang/String;Ljava/util/Locale;)TD;
+ (Ljava/lang/String;Ljava/util/Locale;)T0D;
 convertToString
  (TD;Ljava/util/Locale;)Ljava/lang/String;
  (TD;Ljava/util/Locale;)Ljava/lang/String;
 createDateLike
  (J)TD;
- (J)TD;
+ (J)T1D;
 getDateFormat
  (Ljava/util/Locale;)Ljava/text/DateFormat;
  (Ljava/util/Locale;)Ljava/text/DateFormat;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/AbstractJavaTimeConverter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/AbstractJavaTimeConverter.eea
index 56cc3ca1cf..3c0d2efce5 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/AbstractJavaTimeConverter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/AbstractJavaTimeConverter.eea
@@ -8,13 +8,13 @@ super org/apache/wicket/util/convert/converter/AbstractConverter
 
 convertToObject
  (Ljava/lang/String;Ljava/util/Locale;)TT;
- (Ljava/lang/String;Ljava/util/Locale;)TT;
+ (Ljava/lang/String;Ljava/util/Locale;)T0T;
 convertToString
  (TT;Ljava/util/Locale;)Ljava/lang/String;
  (TT;Ljava/util/Locale;)Ljava/lang/String;
 createTemporal
  (Ljava/time/temporal/TemporalAccessor;)TT;
- (Ljava/time/temporal/TemporalAccessor;)TT;
+ (Ljava/time/temporal/TemporalAccessor;)T1T;
 getDateTimeFormatter
  ()Ljava/time/format/DateTimeFormatter;
  ()Ljava/time/format/DateTimeFormatter;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/AbstractNumberConverter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/AbstractNumberConverter.eea
index 047cdb55a9..92d482e12e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/AbstractNumberConverter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/AbstractNumberConverter.eea
@@ -17,4 +17,4 @@ newNumberFormat
  (Ljava/util/Locale;)Ljava/text/NumberFormat;
 parse
  (Ljava/lang/Object;Ljava/math/BigDecimal;Ljava/math/BigDecimal;Ljava/util/Locale;)Ljava/math/BigDecimal;
- (Ljava/lang/Object;Ljava/math/BigDecimal;Ljava/math/BigDecimal;Ljava/util/Locale;)Ljava/math/BigDecimal;
+ (Ljava/lang/Object;Ljava/math/BigDecimal;Ljava/math/BigDecimal;Ljava/util/Locale;)L0java/math/BigDecimal;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/BigDecimalConverter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/BigDecimalConverter.eea
index 38a35e6fa9..c1832cca61 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/BigDecimalConverter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/BigDecimalConverter.eea
@@ -9,4 +9,4 @@ convertToObject
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/math/BigDecimal;
 getTargetType
  ()Ljava/lang/Class<Ljava/math/BigDecimal;>;
- ()Ljava/lang/Class<Ljava/math/BigDecimal;>;
+ ()L1java/lang/Class<Ljava/math/BigDecimal;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/BigIntegerConverter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/BigIntegerConverter.eea
index 9865eaff50..2b758bbdd5 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/BigIntegerConverter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/BigIntegerConverter.eea
@@ -6,7 +6,7 @@ super org/apache/wicket/util/convert/converter/AbstractIntegerConverter
 
 convertToObject
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/math/BigInteger;
- (Ljava/lang/String;Ljava/util/Locale;)Ljava/math/BigInteger;
+ (Ljava/lang/String;Ljava/util/Locale;)L0java/math/BigInteger;
 getTargetType
  ()Ljava/lang/Class<Ljava/math/BigInteger;>;
- ()Ljava/lang/Class<Ljava/math/BigInteger;>;
+ ()L1java/lang/Class<Ljava/math/BigInteger;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/BooleanConverter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/BooleanConverter.eea
index 6be61cb7be..ed4868df81 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/BooleanConverter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/BooleanConverter.eea
@@ -13,4 +13,4 @@ convertToObject
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/Boolean;
 getTargetType
  ()Ljava/lang/Class<Ljava/lang/Boolean;>;
- ()Ljava/lang/Class<Ljava/lang/Boolean;>;
+ ()L1java/lang/Class<Ljava/lang/Boolean;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/ByteConverter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/ByteConverter.eea
index f529b54393..0e5a395c18 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/ByteConverter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/ByteConverter.eea
@@ -10,7 +10,7 @@ INSTANCE
 
 convertToObject
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/Byte;
- (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/Byte;
+ (Ljava/lang/String;Ljava/util/Locale;)L0java/lang/Byte;
 getTargetType
  ()Ljava/lang/Class<Ljava/lang/Byte;>;
- ()Ljava/lang/Class<Ljava/lang/Byte;>;
+ ()L1java/lang/Class<Ljava/lang/Byte;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/CalendarConverter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/CalendarConverter.eea
index 811e0f0dfc..8a240571e2 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/CalendarConverter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/CalendarConverter.eea
@@ -9,7 +9,7 @@ super org/apache/wicket/util/convert/IConverter
  (Lorg/apache/wicket/util/convert/IConverter<Ljava/util/Date;>;)V
 convertToObject
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/util/Calendar;
- (Ljava/lang/String;Ljava/util/Locale;)Ljava/util/Calendar;
+ (Ljava/lang/String;Ljava/util/Locale;)L0java/util/Calendar;
 convertToString
  (Ljava/util/Calendar;Ljava/util/Locale;)Ljava/lang/String;
  (Ljava/util/Calendar;Ljava/util/Locale;)Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/CharacterConverter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/CharacterConverter.eea
index 1c52884dba..d81b8a92ce 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/CharacterConverter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/CharacterConverter.eea
@@ -10,7 +10,7 @@ INSTANCE
 
 convertToObject
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/Character;
- (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/Character;
+ (Ljava/lang/String;Ljava/util/Locale;)L0java/lang/Character;
 getTargetType
  ()Ljava/lang/Class<Ljava/lang/Character;>;
- ()Ljava/lang/Class<Ljava/lang/Character;>;
+ ()L1java/lang/Class<Ljava/lang/Character;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/DateConverter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/DateConverter.eea
index 1269f36adf..03db135463 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/DateConverter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/DateConverter.eea
@@ -6,7 +6,7 @@ super org/apache/wicket/util/convert/converter/AbstractDateConverter
 
 createDateLike
  (J)Ljava/util/Date;
- (J)Ljava/util/Date;
+ (J)L1java/util/Date;
 getTargetType
  ()Ljava/lang/Class<Ljava/util/Date;>;
- ()Ljava/lang/Class<Ljava/util/Date;>;
+ ()L1java/lang/Class<Ljava/util/Date;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/DoubleConverter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/DoubleConverter.eea
index 4df4803ff3..27890d9f23 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/DoubleConverter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/DoubleConverter.eea
@@ -10,7 +10,7 @@ INSTANCE
 
 convertToObject
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/Double;
- (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/Double;
+ (Ljava/lang/String;Ljava/util/Locale;)L0java/lang/Double;
 getTargetType
  ()Ljava/lang/Class<Ljava/lang/Double;>;
- ()Ljava/lang/Class<Ljava/lang/Double;>;
+ ()L1java/lang/Class<Ljava/lang/Double;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/FloatConverter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/FloatConverter.eea
index b0f542a211..6427bc95f4 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/FloatConverter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/FloatConverter.eea
@@ -10,7 +10,7 @@ INSTANCE
 
 convertToObject
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/Float;
- (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/Float;
+ (Ljava/lang/String;Ljava/util/Locale;)L0java/lang/Float;
 getTargetType
  ()Ljava/lang/Class<Ljava/lang/Float;>;
- ()Ljava/lang/Class<Ljava/lang/Float;>;
+ ()L1java/lang/Class<Ljava/lang/Float;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/IntegerConverter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/IntegerConverter.eea
index 90abb0daed..856c948c7e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/IntegerConverter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/IntegerConverter.eea
@@ -10,7 +10,7 @@ INSTANCE
 
 convertToObject
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/Integer;
- (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/Integer;
+ (Ljava/lang/String;Ljava/util/Locale;)L0java/lang/Integer;
 getTargetType
  ()Ljava/lang/Class<Ljava/lang/Integer;>;
- ()Ljava/lang/Class<Ljava/lang/Integer;>;
+ ()L1java/lang/Class<Ljava/lang/Integer;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/LocalDateConverter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/LocalDateConverter.eea
index d90137eced..e51fc40309 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/LocalDateConverter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/LocalDateConverter.eea
@@ -6,10 +6,10 @@ super org/apache/wicket/util/convert/converter/AbstractJavaTimeConverter
 
 createTemporal
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/LocalDate;
- (Ljava/time/temporal/TemporalAccessor;)Ljava/time/LocalDate;
+ (Ljava/time/temporal/TemporalAccessor;)L1java/time/LocalDate;
 getDateTimeFormatter
  ()Ljava/time/format/DateTimeFormatter;
  ()Ljava/time/format/DateTimeFormatter;
 getTargetType
  ()Ljava/lang/Class<Ljava/time/LocalDate;>;
- ()Ljava/lang/Class<Ljava/time/LocalDate;>;
+ ()L1java/lang/Class<Ljava/time/LocalDate;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/LocalDateTimeConverter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/LocalDateTimeConverter.eea
index b9d3e2417e..85466d6f38 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/LocalDateTimeConverter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/LocalDateTimeConverter.eea
@@ -6,10 +6,10 @@ super org/apache/wicket/util/convert/converter/AbstractJavaTimeConverter
 
 createTemporal
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/LocalDateTime;
- (Ljava/time/temporal/TemporalAccessor;)Ljava/time/LocalDateTime;
+ (Ljava/time/temporal/TemporalAccessor;)L1java/time/LocalDateTime;
 getDateTimeFormatter
  ()Ljava/time/format/DateTimeFormatter;
  ()Ljava/time/format/DateTimeFormatter;
 getTargetType
  ()Ljava/lang/Class<Ljava/time/LocalDateTime;>;
- ()Ljava/lang/Class<Ljava/time/LocalDateTime;>;
+ ()L1java/lang/Class<Ljava/time/LocalDateTime;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/LocalTimeConverter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/LocalTimeConverter.eea
index afb0e03788..4042947a98 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/LocalTimeConverter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/LocalTimeConverter.eea
@@ -6,10 +6,10 @@ super org/apache/wicket/util/convert/converter/AbstractJavaTimeConverter
 
 createTemporal
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/LocalTime;
- (Ljava/time/temporal/TemporalAccessor;)Ljava/time/LocalTime;
+ (Ljava/time/temporal/TemporalAccessor;)L1java/time/LocalTime;
 getDateTimeFormatter
  ()Ljava/time/format/DateTimeFormatter;
  ()Ljava/time/format/DateTimeFormatter;
 getTargetType
  ()Ljava/lang/Class<Ljava/time/LocalTime;>;
- ()Ljava/lang/Class<Ljava/time/LocalTime;>;
+ ()L1java/lang/Class<Ljava/time/LocalTime;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/LongConverter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/LongConverter.eea
index 23237cdb1d..d4801452e9 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/LongConverter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/LongConverter.eea
@@ -10,7 +10,7 @@ INSTANCE
 
 convertToObject
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/Long;
- (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/Long;
+ (Ljava/lang/String;Ljava/util/Locale;)L0java/lang/Long;
 getTargetType
  ()Ljava/lang/Class<Ljava/lang/Long;>;
- ()Ljava/lang/Class<Ljava/lang/Long;>;
+ ()L1java/lang/Class<Ljava/lang/Long;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/ShortConverter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/ShortConverter.eea
index c0c6e2ff93..4c660d2bbb 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/ShortConverter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/ShortConverter.eea
@@ -10,7 +10,7 @@ INSTANCE
 
 convertToObject
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/Short;
- (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/Short;
+ (Ljava/lang/String;Ljava/util/Locale;)L0java/lang/Short;
 getTargetType
  ()Ljava/lang/Class<Ljava/lang/Short;>;
- ()Ljava/lang/Class<Ljava/lang/Short;>;
+ ()L1java/lang/Class<Ljava/lang/Short;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/SqlDateConverter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/SqlDateConverter.eea
index 8f17e8a855..1245f57f1a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/SqlDateConverter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/SqlDateConverter.eea
@@ -6,7 +6,7 @@ super org/apache/wicket/util/convert/converter/AbstractDateConverter
 
 createDateLike
  (J)Ljava/sql/Date;
- (J)Ljava/sql/Date;
+ (J)L1java/sql/Date;
 getTargetType
  ()Ljava/lang/Class<Ljava/sql/Date;>;
- ()Ljava/lang/Class<Ljava/sql/Date;>;
+ ()L1java/lang/Class<Ljava/sql/Date;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/SqlTimeConverter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/SqlTimeConverter.eea
index a40822500f..452017e4c7 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/SqlTimeConverter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/SqlTimeConverter.eea
@@ -6,10 +6,10 @@ super org/apache/wicket/util/convert/converter/AbstractDateConverter
 
 createDateLike
  (J)Ljava/sql/Time;
- (J)Ljava/sql/Time;
+ (J)L1java/sql/Time;
 getDateFormat
  (Ljava/util/Locale;)Ljava/text/DateFormat;
  (Ljava/util/Locale;)Ljava/text/DateFormat;
 getTargetType
  ()Ljava/lang/Class<Ljava/sql/Time;>;
- ()Ljava/lang/Class<Ljava/sql/Time;>;
+ ()L1java/lang/Class<Ljava/sql/Time;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/SqlTimestampConverter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/SqlTimestampConverter.eea
index 0d5d072f71..78dd67e98e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/SqlTimestampConverter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/SqlTimestampConverter.eea
@@ -6,10 +6,10 @@ super org/apache/wicket/util/convert/converter/AbstractDateConverter
 
 createDateLike
  (J)Ljava/sql/Timestamp;
- (J)Ljava/sql/Timestamp;
+ (J)L1java/sql/Timestamp;
 getDateFormat
  (Ljava/util/Locale;)Ljava/text/DateFormat;
  (Ljava/util/Locale;)Ljava/text/DateFormat;
 getTargetType
  ()Ljava/lang/Class<Ljava/sql/Timestamp;>;
- ()Ljava/lang/Class<Ljava/sql/Timestamp;>;
+ ()L1java/lang/Class<Ljava/sql/Timestamp;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/ZonedDateTimeConverter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/ZonedDateTimeConverter.eea
index bf8eaec78e..b55c48912e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/ZonedDateTimeConverter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/convert/converter/ZonedDateTimeConverter.eea
@@ -6,10 +6,10 @@ super org/apache/wicket/util/convert/converter/AbstractJavaTimeConverter
 
 createTemporal
  (Ljava/time/temporal/TemporalAccessor;)Ljava/time/ZonedDateTime;
- (Ljava/time/temporal/TemporalAccessor;)Ljava/time/ZonedDateTime;
+ (Ljava/time/temporal/TemporalAccessor;)L1java/time/ZonedDateTime;
 getDateTimeFormatter
  ()Ljava/time/format/DateTimeFormatter;
  ()Ljava/time/format/DateTimeFormatter;
 getTargetType
  ()Ljava/lang/Class<Ljava/time/ZonedDateTime;>;
- ()Ljava/lang/Class<Ljava/time/ZonedDateTime;>;
+ ()L1java/lang/Class<Ljava/time/ZonedDateTime;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/cookies/CookieUtils.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/cookies/CookieUtils.eea
index 6b6e8c670d..b8e84a040a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/cookies/CookieUtils.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/cookies/CookieUtils.eea
@@ -13,7 +13,7 @@ setAttribute
  (Lorg/apache/wicket/util/cookies/CookieDefaults;)V
 getCookie
  (Ljava/lang/String;)Ljakarta/servlet/http/Cookie;
- (Ljava/lang/String;)Ljakarta/servlet/http/Cookie;
+ (Ljava/lang/String;)L0jakarta/servlet/http/Cookie;
 getKey
  (Lorg/apache/wicket/markup/html/form/FormComponent<*>;)Ljava/lang/String;
  (Lorg/apache/wicket/markup/html/form/FormComponent<*>;)Ljava/lang/String;
@@ -31,7 +31,7 @@ initializeCookie
  (Ljakarta/servlet/http/Cookie;)V
 load
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 load
  (Lorg/apache/wicket/markup/html/form/FormComponent<*>;)Ljava/lang/String;
  (Lorg/apache/wicket/markup/html/form/FormComponent<*>;)Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/crypt/AbstractCrypt.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/crypt/AbstractCrypt.eea
index e701ec2d73..407b8adea0 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/crypt/AbstractCrypt.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/crypt/AbstractCrypt.eea
@@ -5,10 +5,10 @@ crypt
  ([BI)[B
 decryptUrlSafe
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 encryptUrlSafe
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getKey
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/crypt/CipherUtils.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/crypt/CipherUtils.eea
index a157ed57fe..277214a508 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/crypt/CipherUtils.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/crypt/CipherUtils.eea
@@ -5,4 +5,4 @@ generateKey
  (Ljava/lang/String;ILjava/security/SecureRandom;)Ljavax/crypto/SecretKey;
 generatePBEKey
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[BII)Ljavax/crypto/SecretKey;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[BII)Ljavax/crypto/SecretKey;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[BII)L1javax/crypto/SecretKey;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/crypt/StringUtils.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/crypt/StringUtils.eea
index 826d60fd31..b03f30f524 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/crypt/StringUtils.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/crypt/StringUtils.eea
@@ -23,7 +23,7 @@ getBytesUtf8
  (Ljava/lang/String;)[B
 newString
  ([BLjava/lang/String;)Ljava/lang/String;
- ([BLjava/lang/String;)Ljava/lang/String;
+ ([BLjava/lang/String;)Ljava/lang/String; # @PolyNull
 newStringIso8859_1
  ([B)Ljava/lang/String;
  ([B)Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/crypt/SunJceCrypt.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/crypt/SunJceCrypt.eea
index 18e5e794c2..46ab453263 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/crypt/SunJceCrypt.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/crypt/SunJceCrypt.eea
@@ -6,7 +6,7 @@ DEFAULT_CRYPT_METHOD
 
 randomSalt
  ()[B
- ()[B
+ ()[1B
 
 <init>
  (Ljava/lang/String;[BI)V
@@ -16,13 +16,13 @@ randomSalt
  ([BI)V
 createCipher
  (Ljavax/crypto/SecretKey;Ljava/security/spec/AlgorithmParameterSpec;I)Ljavax/crypto/Cipher;
- (Ljavax/crypto/SecretKey;Ljava/security/spec/AlgorithmParameterSpec;I)Ljavax/crypto/Cipher;
+ (Ljavax/crypto/SecretKey;Ljava/security/spec/AlgorithmParameterSpec;I)L1javax/crypto/Cipher;
 createKeySpec
  ()Ljava/security/spec/KeySpec;
- ()Ljava/security/spec/KeySpec;
+ ()L1java/security/spec/KeySpec;
 createParameterSpec
  ()Ljava/security/spec/AlgorithmParameterSpec;
- ()Ljava/security/spec/AlgorithmParameterSpec;
+ ()L1java/security/spec/AlgorithmParameterSpec;
 crypt
  ([BI)[B
  ([BI)[B
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/crypt/TrivialCrypt.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/crypt/TrivialCrypt.eea
index b0a375ab87..385bcaf3e8 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/crypt/TrivialCrypt.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/crypt/TrivialCrypt.eea
@@ -2,4 +2,4 @@ class org/apache/wicket/util/crypt/TrivialCrypt
 
 crypt
  ([BI)[B
- ([BI)[B
+ ([BI)[1B
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/Chunk.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/Chunk.eea
index d8605ce149..5f141a19b7 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/Chunk.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/Chunk.eea
@@ -34,7 +34,7 @@ chunk
  ()Ljava/util/List<Ljava/lang/Object;>;
 rangeString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 rangeString
  (Ljava/lang/StringBuilder;)V
  (Ljava/lang/StringBuilder;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/Delta.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/Delta.eea
index 8a79853267..ab492bd07c 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/Delta.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/Delta.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/util/diff/Delta
 
 newDelta
  (Lorg/apache/wicket/util/diff/Chunk;Lorg/apache/wicket/util/diff/Chunk;)Lorg/apache/wicket/util/diff/Delta;
- (Lorg/apache/wicket/util/diff/Chunk;Lorg/apache/wicket/util/diff/Chunk;)Lorg/apache/wicket/util/diff/Delta;
+ (Lorg/apache/wicket/util/diff/Chunk;Lorg/apache/wicket/util/diff/Chunk;)L0org/apache/wicket/util/diff/Delta;
 
 original
  Lorg/apache/wicket/util/diff/Chunk;
@@ -34,7 +34,7 @@ patch
  (Ljava/util/List<Ljava/lang/Object;>;)V
 toRCSString
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 toRCSString
  (Ljava/lang/StringBuilder;Ljava/lang/String;)V
  (Ljava/lang/StringBuilder;Ljava/lang/String;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/Diff.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/Diff.eea
index 909bce497d..cd4d04990a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/Diff.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/Diff.eea
@@ -21,7 +21,7 @@ diff
  ([Ljava/lang/Object;[Ljava/lang/Object;Lorg/apache/wicket/util/diff/DiffAlgorithm;)Lorg/apache/wicket/util/diff/Revision;
 editAll
  ([Ljava/lang/Object;)[Ljava/lang/Object;
- ([Ljava/lang/Object;)[Ljava/lang/Object;
+ ([Ljava/lang/Object;)[1Ljava/lang/Object;
 randomEdit
  ([Ljava/lang/Object;)[Ljava/lang/Object;
  ([Ljava/lang/Object;)[Ljava/lang/Object;
@@ -33,7 +33,7 @@ randomSequence
  (I)[Ljava/lang/Object;
 randomSequence
  (IJ)[Ljava/lang/Object;
- (IJ)[Ljava/lang/Object;
+ (IJ)[1Ljava/lang/Object;
 shuffle
  ([Ljava/lang/Object;)[Ljava/lang/Object;
  ([Ljava/lang/Object;)[Ljava/lang/Object;
@@ -56,7 +56,7 @@ orig
  ([Ljava/lang/Object;Lorg/apache/wicket/util/diff/DiffAlgorithm;)V
 defaultAlgorithm
  ()Lorg/apache/wicket/util/diff/DiffAlgorithm;
- ()Lorg/apache/wicket/util/diff/DiffAlgorithm;
+ ()L1org/apache/wicket/util/diff/DiffAlgorithm;
 diff
  ([Ljava/lang/Object;)Lorg/apache/wicket/util/diff/Revision;
  ([Ljava/lang/Object;)Lorg/apache/wicket/util/diff/Revision;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/Revision.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/Revision.eea
index 8021af8bc8..e7c1368e7d 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/Revision.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/Revision.eea
@@ -23,7 +23,7 @@ toRCSString
  ()Ljava/lang/String;
 toRCSString
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 toRCSString
  (Ljava/lang/StringBuilder;)V
  (Ljava/lang/StringBuilder;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/ToString.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/ToString.eea
index d7520fe00d..fea36241a4 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/ToString.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/ToString.eea
@@ -5,7 +5,7 @@ arrayToString
  ([Ljava/lang/Object;)Ljava/lang/String;
 arrayToString
  ([Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
- ([Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
+ ([Ljava/lang/Object;Ljava/lang/String;)L1java/lang/String;
 stringToArray
  (Ljava/lang/String;)[Ljava/lang/String;
  (Ljava/lang/String;)[Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/myers/MyersDiff.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/myers/MyersDiff.eea
index e8c90deb22..30f5b2a2bb 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/myers/MyersDiff.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/myers/MyersDiff.eea
@@ -5,7 +5,7 @@ buildPath
  ([Ljava/lang/Object;[Ljava/lang/Object;)Lorg/apache/wicket/util/diff/myers/PathNode;
 buildRevision
  (Lorg/apache/wicket/util/diff/myers/PathNode;[Ljava/lang/Object;[Ljava/lang/Object;)Lorg/apache/wicket/util/diff/Revision;
- (Lorg/apache/wicket/util/diff/myers/PathNode;[Ljava/lang/Object;[Ljava/lang/Object;)Lorg/apache/wicket/util/diff/Revision;
+ (Lorg/apache/wicket/util/diff/myers/PathNode;[Ljava/lang/Object;[Ljava/lang/Object;)L1org/apache/wicket/util/diff/Revision;
 
 diff
  ([Ljava/lang/Object;[Ljava/lang/Object;)Lorg/apache/wicket/util/diff/Revision;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/myers/PathNode.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/myers/PathNode.eea
index b7f0bc7f74..4e5b54ba34 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/myers/PathNode.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/diff/myers/PathNode.eea
@@ -9,7 +9,7 @@ prev
  (IILorg/apache/wicket/util/diff/myers/PathNode;)V
 previousSnake
  ()Lorg/apache/wicket/util/diff/myers/PathNode;
- ()Lorg/apache/wicket/util/diff/myers/PathNode;
+ ()L0org/apache/wicket/util/diff/myers/PathNode;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/file/File.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/file/File.eea
index 62b258da65..cf3d33b1bf 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/file/File.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/file/File.eea
@@ -20,22 +20,22 @@ class org/apache/wicket/util/file/File
  (Lorg/apache/wicket/util/file/File;Ljava/lang/String;)V
 file
  (Ljava/lang/String;)Lorg/apache/wicket/util/file/File;
- (Ljava/lang/String;)Lorg/apache/wicket/util/file/File;
+ (Ljava/lang/String;)L1org/apache/wicket/util/file/File;
 getExtension
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getParentFolder
  ()Lorg/apache/wicket/util/file/Folder;
- ()Lorg/apache/wicket/util/file/Folder;
+ ()L1org/apache/wicket/util/file/Folder;
 inputStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
 lastModifiedTime
  ()Ljava/time/Instant;
- ()Ljava/time/Instant;
+ ()L0java/time/Instant;
 outputStream
  ()Ljava/io/OutputStream;
- ()Ljava/io/OutputStream;
+ ()L1java/io/OutputStream;
 readObject
  ()Ljava/lang/Object;
  ()L1java/lang/Object;
@@ -44,7 +44,7 @@ readString
  ()Ljava/lang/String;
 toQuotedString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 write
  (Ljava/io/InputStream;)I
  (L1java/io/InputStream;)I
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/file/Files.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/file/Files.eea
index 88589ceefb..69c65648c7 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/file/Files.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/file/Files.eea
@@ -11,22 +11,22 @@ copy
  (Ljava/io/File;Ljava/io/File;)V
 extension
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 filename
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
 getLastModified
  (Ljava/io/File;)Ljava/time/Instant;
- (Ljava/io/File;)Ljava/time/Instant;
+ (Ljava/io/File;)L0java/time/Instant;
 getLocalFileFromUrl
  (Ljava/lang/String;)Ljava/io/File;
- (Ljava/lang/String;)Ljava/io/File;
+ (Ljava/lang/String;)L0java/io/File;
 getLocalFileFromUrl
  (Ljava/net/URL;)Ljava/io/File;
  (Ljava/net/URL;)Ljava/io/File;
 list
  (Ljava/io/File;)[Ljava/io/File;
- (Ljava/io/File;)[Ljava/io/File;
+ (Ljava/io/File;)[1Ljava/io/File;
 mkdirs
  (Ljava/io/File;)Z
  (Ljava/io/File;)Z
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/file/Folder.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/file/Folder.eea
index 8609be994b..67a0f8f693 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/file/Folder.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/file/Folder.eea
@@ -17,7 +17,7 @@ class org/apache/wicket/util/file/Folder
  (Lorg/apache/wicket/util/file/Folder;Ljava/lang/String;)V
 folder
  (Ljava/lang/String;)Lorg/apache/wicket/util/file/Folder;
- (Ljava/lang/String;)Lorg/apache/wicket/util/file/Folder;
+ (Ljava/lang/String;)L1org/apache/wicket/util/file/Folder;
 freeDiskSpace
  ()Lorg/apache/wicket/util/lang/Bytes;
  ()Lorg/apache/wicket/util/lang/Bytes;
@@ -26,13 +26,13 @@ getFiles
  ()[Lorg/apache/wicket/util/file/File;
 getFiles
  (Lorg/apache/wicket/util/file/Folder$FileFilter;)[Lorg/apache/wicket/util/file/File;
- (Lorg/apache/wicket/util/file/Folder$FileFilter;)[Lorg/apache/wicket/util/file/File;
+ (Lorg/apache/wicket/util/file/Folder$FileFilter;)[1Lorg/apache/wicket/util/file/File;
 getFolders
  ()[Lorg/apache/wicket/util/file/Folder;
  ()[Lorg/apache/wicket/util/file/Folder;
 getFolders
  (Lorg/apache/wicket/util/file/Folder$FolderFilter;)[Lorg/apache/wicket/util/file/Folder;
- (Lorg/apache/wicket/util/file/Folder$FolderFilter;)[Lorg/apache/wicket/util/file/Folder;
+ (Lorg/apache/wicket/util/file/Folder$FolderFilter;)[1Lorg/apache/wicket/util/file/Folder;
 getNestedFiles
  ()[Lorg/apache/wicket/util/file/File;
  ()[Lorg/apache/wicket/util/file/File;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/file/Path.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/file/Path.eea
index 94d20ad25e..556d3a3c3d 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/file/Path.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/file/Path.eea
@@ -8,7 +8,7 @@ class org/apache/wicket/util/file/Path
  (Lorg/apache/wicket/util/file/Folder;)V
 find
  (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/apache/wicket/util/resource/IResourceStream;
- (Ljava/lang/Class<*>;Ljava/lang/String;)Lorg/apache/wicket/util/resource/IResourceStream;
+ (Ljava/lang/Class<*>;Ljava/lang/String;)L0org/apache/wicket/util/resource/IResourceStream;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/file/WebXmlFile.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/file/WebXmlFile.eea
index bf5d6fabfc..dd4fbed6c2 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/file/WebXmlFile.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/file/WebXmlFile.eea
@@ -5,7 +5,7 @@ getFilterPath
  (ZLjakarta/servlet/ServletContext;Ljava/lang/String;)Ljava/util/Set<Ljava/lang/String;>;
 getFilterPath
  (ZLjava/lang/String;Ljava/io/InputStream;)Ljava/util/Set<Ljava/lang/String;>;
- (ZLjava/lang/String;Ljava/io/InputStream;)Ljava/util/Set<Ljava/lang/String;>;
+ (ZLjava/lang/String;Ljava/io/InputStream;)L1java/util/Set<Ljava/lang/String;>;
 getUniqueFilterPath
  (ZLjakarta/servlet/FilterConfig;)Ljava/lang/String;
  (ZLjakarta/servlet/FilterConfig;)Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/image/ImageUtil.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/image/ImageUtil.eea
index 0ffc54b210..e17a384da6 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/image/ImageUtil.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/image/ImageUtil.eea
@@ -2,4 +2,4 @@ class org/apache/wicket/util/image/ImageUtil
 
 createBase64EncodedImage
  (Lorg/apache/wicket/request/resource/PackageResourceReference;Z)Ljava/lang/CharSequence;
- (Lorg/apache/wicket/request/resource/PackageResourceReference;Z)Ljava/lang/CharSequence;
+ (Lorg/apache/wicket/request/resource/PackageResourceReference;Z)L1java/lang/CharSequence;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/ByteArrayOutputStream.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/ByteArrayOutputStream.eea
index e7281fe16c..1531ec01c5 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/ByteArrayOutputStream.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/ByteArrayOutputStream.eea
@@ -2,13 +2,13 @@ class org/apache/wicket/util/io/ByteArrayOutputStream
 
 toByteArray
  ()[B
- ()[B
+ ()[1B
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
 toString
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 write
  ([BII)V
  ([1BII)V # @Inherited(java.io.OutputStream)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/ByteOrderMark.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/ByteOrderMark.eea
index f8b7c20f27..3ad583399c 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/ByteOrderMark.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/ByteOrderMark.eea
@@ -24,7 +24,7 @@ equals
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
 getBytes
  ()[B
- ()[B
+ ()[1B
 getCharsetName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/Connections.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/Connections.eea
index 44f1f5550a..30add9b8dc 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/Connections.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/Connections.eea
@@ -8,4 +8,4 @@ closeQuietly
  (Ljava/net/URLConnection;)V
 getLastModified
  (Ljava/net/URL;)Ljava/time/Instant;
- (Ljava/net/URL;)Ljava/time/Instant;
+ (Ljava/net/URL;)L0java/time/Instant;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/DeferredFileOutputStream$FileFactory.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/DeferredFileOutputStream$FileFactory.eea
index aeab42ea64..11cfa38565 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/DeferredFileOutputStream$FileFactory.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/DeferredFileOutputStream$FileFactory.eea
@@ -2,4 +2,4 @@ class org/apache/wicket/util/io/DeferredFileOutputStream$FileFactory
 
 createFile
  ()Ljava/io/File;
- ()Ljava/io/File;
+ ()L1java/io/File;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/DeferredFileOutputStream.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/DeferredFileOutputStream.eea
index 61374063a5..8c8f4e8294 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/DeferredFileOutputStream.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/DeferredFileOutputStream.eea
@@ -8,7 +8,7 @@ class org/apache/wicket/util/io/DeferredFileOutputStream
  (ILorg/apache/wicket/util/io/DeferredFileOutputStream$FileFactory;)V
 getData
  ()[B
- ()[B
+ ()[0B
 getFile
  ()Ljava/io/File;
  ()Ljava/io/File;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/IOUtils.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/IOUtils.eea
index 04e3b63bc4..9a966015e6 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/IOUtils.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/IOUtils.eea
@@ -50,13 +50,13 @@ toCharArray
  (Ljava/io/Reader;)[C
 toString
  (Ljava/io/InputStream;)Ljava/lang/String;
- (Ljava/io/InputStream;)Ljava/lang/String;
+ (Ljava/io/InputStream;)L1java/lang/String;
 toString
  (Ljava/io/InputStream;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/io/InputStream;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/io/InputStream;Ljava/lang/String;)L1java/lang/String;
 toString
  (Ljava/io/Reader;)Ljava/lang/String;
- (Ljava/io/Reader;)Ljava/lang/String;
+ (Ljava/io/Reader;)L1java/lang/String;
 write
  (Ljava/lang/String;Ljava/io/OutputStream;)V
  (Ljava/lang/String;Ljava/io/OutputStream;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/Streams.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/Streams.eea
index 40ac2e9509..20fb0847c8 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/Streams.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/io/Streams.eea
@@ -23,4 +23,4 @@ readString
  (Ljava/io/InputStream;Ljava/lang/CharSequence;)Ljava/lang/String;
 readString
  (Ljava/io/Reader;)Ljava/lang/String;
- (Ljava/io/Reader;)Ljava/lang/String;
+ (Ljava/io/Reader;)L1java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/lang/Bytes.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/lang/Bytes.eea
index a28d7f48f5..dbe79c0fd6 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/lang/Bytes.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/lang/Bytes.eea
@@ -9,7 +9,7 @@ bytes
  (D)Lorg/apache/wicket/util/lang/Bytes;
 bytes
  (J)Lorg/apache/wicket/util/lang/Bytes;
- (J)Lorg/apache/wicket/util/lang/Bytes;
+ (J)L1org/apache/wicket/util/lang/Bytes;
 gigabytes
  (D)Lorg/apache/wicket/util/lang/Bytes;
  (D)Lorg/apache/wicket/util/lang/Bytes;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/lang/EnumeratedType.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/lang/EnumeratedType.eea
index 5b1c8cfc28..96e6b95a1e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/lang/EnumeratedType.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/lang/EnumeratedType.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/util/lang/EnumeratedType
 
 getValues
  (Ljava/lang/Class<+Lorg/apache/wicket/util/lang/EnumeratedType;>;)Ljava/util/List<Lorg/apache/wicket/util/lang/EnumeratedType;>;
- (Ljava/lang/Class<+Lorg/apache/wicket/util/lang/EnumeratedType;>;)Ljava/util/List<Lorg/apache/wicket/util/lang/EnumeratedType;>;
+ (Ljava/lang/Class<+Lorg/apache/wicket/util/lang/EnumeratedType;>;)L1java/util/List<Lorg/apache/wicket/util/lang/EnumeratedType;>;
 
 <init>
  (Ljava/lang/String;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/lang/Exceptions.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/lang/Exceptions.eea
index 65ef3363a2..00cc42ab64 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/lang/Exceptions.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/lang/Exceptions.eea
@@ -5,7 +5,7 @@ findCause
  <T:Ljava/lang/Throwable;>(Ljava/lang/Throwable;Ljava/lang/Class<TT;>;)TT;
 visit
  <T:Ljava/lang/Object;>(Ljava/lang/Throwable;Lorg/apache/wicket/util/lang/Exceptions$IThrowableVisitor<TT;>;)TT;
- <T:Ljava/lang/Object;>(Ljava/lang/Throwable;Lorg/apache/wicket/util/lang/Exceptions$IThrowableVisitor<TT;>;)TT;
+ <T:Ljava/lang/Object;>(Ljava/lang/Throwable;Lorg/apache/wicket/util/lang/Exceptions$IThrowableVisitor<TT;>;)T0T;
 
 getRootCause
  (Ljava/lang/Throwable;)Ljava/lang/Throwable;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/lang/Generics.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/lang/Generics.eea
index 981d3c4a2a..7fdc3326f9 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/lang/Generics.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/lang/Generics.eea
@@ -5,19 +5,19 @@ iterator
  <T:Ljava/lang/Object;>(Ljava/util/Iterator<*>;)Ljava/util/Iterator<TT;>;
 newArrayList
  <T:Ljava/lang/Object;>()Ljava/util/ArrayList<TT;>;
- <T:Ljava/lang/Object;>()Ljava/util/ArrayList<TT;>;
+ <T:Ljava/lang/Object;>()L1java/util/ArrayList<TT;>;
 newArrayList
  <T:Ljava/lang/Object;>(I)Ljava/util/ArrayList<TT;>;
- <T:Ljava/lang/Object;>(I)Ljava/util/ArrayList<TT;>;
+ <T:Ljava/lang/Object;>(I)L1java/util/ArrayList<TT;>;
 newConcurrentHashMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Ljava/util/concurrent/ConcurrentHashMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Ljava/util/concurrent/ConcurrentHashMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>()L1java/util/concurrent/ConcurrentHashMap<TK;TV;>;
 newConcurrentHashMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Ljava/util/concurrent/ConcurrentHashMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Ljava/util/concurrent/ConcurrentHashMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)L1java/util/concurrent/ConcurrentHashMap<TK;TV;>;
 newHashMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Ljava/util/HashMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Ljava/util/HashMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>()L1java/util/HashMap<TK;TV;>;
 newHashMap
  <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Ljava/util/HashMap<TK;TV;>;
- <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)Ljava/util/HashMap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(I)L1java/util/HashMap<TK;TV;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/lang/PackageName.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/lang/PackageName.eea
index ca135e5a0a..66a85e6ecc 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/lang/PackageName.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/lang/PackageName.eea
@@ -2,10 +2,10 @@ class org/apache/wicket/util/lang/PackageName
 
 forClass
  (Ljava/lang/Class<*>;)Lorg/apache/wicket/util/lang/PackageName;
- (Ljava/lang/Class<*>;)Lorg/apache/wicket/util/lang/PackageName;
+ (Ljava/lang/Class<*>;)L1org/apache/wicket/util/lang/PackageName;
 forPackage
  (Ljava/lang/Package;)Lorg/apache/wicket/util/lang/PackageName;
- (Ljava/lang/Package;)Lorg/apache/wicket/util/lang/PackageName;
+ (Ljava/lang/Package;)L1org/apache/wicket/util/lang/PackageName;
 
 equals
  (Ljava/lang/Object;)Z
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/reference/ClassReference.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/reference/ClassReference.eea
index d3b4ee9955..b1aa88cd86 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/reference/ClassReference.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/reference/ClassReference.eea
@@ -8,7 +8,7 @@ super java/util/function/Supplier
 
 of
  <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/apache/wicket/util/reference/ClassReference<TT;>;
- <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)Lorg/apache/wicket/util/reference/ClassReference<TT;>;
+ <T:Ljava/lang/Object;>(Ljava/lang/Class<TT;>;)L1org/apache/wicket/util/reference/ClassReference<TT;>;
 
 <init>
  (Ljava/lang/Class<TT;>;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/AbstractResourceStream.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/AbstractResourceStream.eea
index ab221bd29c..be99bcedc5 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/AbstractResourceStream.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/AbstractResourceStream.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/util/resource/AbstractResourceStream
 
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
@@ -14,10 +14,10 @@ getVariation
  ()Ljava/lang/String;
 lastModifiedTime
  ()Ljava/time/Instant;
- ()Ljava/time/Instant;
+ ()L0java/time/Instant;
 length
  ()Lorg/apache/wicket/util/lang/Bytes;
- ()Lorg/apache/wicket/util/lang/Bytes;
+ ()L0org/apache/wicket/util/lang/Bytes;
 setLocale
  (Ljava/util/Locale;)V
  (Ljava/util/Locale;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/AbstractResourceStreamWriter.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/AbstractResourceStreamWriter.eea
index 6ff0795de2..0e85a51123 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/AbstractResourceStreamWriter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/AbstractResourceStreamWriter.eea
@@ -2,10 +2,10 @@ class org/apache/wicket/util/resource/AbstractResourceStreamWriter
 
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 getInputStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
 getLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
@@ -20,7 +20,7 @@ lastModifiedTime
  ()Ljava/time/Instant;
 length
  ()Lorg/apache/wicket/util/lang/Bytes;
- ()Lorg/apache/wicket/util/lang/Bytes;
+ ()L0org/apache/wicket/util/lang/Bytes;
 setLocale
  (Ljava/util/Locale;)V
  (Ljava/util/Locale;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/AbstractStringResourceStream.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/AbstractStringResourceStream.eea
index 0f267eefee..e5a265b992 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/AbstractStringResourceStream.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/AbstractStringResourceStream.eea
@@ -12,22 +12,22 @@ asString
  ()Ljava/lang/String;
 getCharset
  ()Ljava/nio/charset/Charset;
- ()Ljava/nio/charset/Charset;
+ ()L0java/nio/charset/Charset;
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(org.apache.wicket.util.resource.AbstractResourceStream)
 getInputStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
 getString
  ()Ljava/lang/String;
  ()Ljava/lang/String;
 lastModifiedTime
  ()Ljava/time/Instant;
- ()Ljava/time/Instant;
+ ()L0java/time/Instant; # @Inherited(org.apache.wicket.util.resource.AbstractResourceStream)
 length
  ()Lorg/apache/wicket/util/lang/Bytes;
- ()Lorg/apache/wicket/util/lang/Bytes;
+ ()L0org/apache/wicket/util/lang/Bytes; # @Inherited(org.apache.wicket.util.resource.AbstractResourceStream)
 setCharset
  (Ljava/nio/charset/Charset;)V
  (Ljava/nio/charset/Charset;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/FileResourceStream.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/FileResourceStream.eea
index 3fee2a6407..6745ff491e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/FileResourceStream.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/FileResourceStream.eea
@@ -8,7 +8,7 @@ class org/apache/wicket/util/resource/FileResourceStream
  (Lorg/apache/wicket/util/file/File;)V
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(org.apache.wicket.util.resource.AbstractResourceStream)
 getFile
  ()Lorg/apache/wicket/util/file/File;
  ()Lorg/apache/wicket/util/file/File;
@@ -17,13 +17,13 @@ getInputStream
  ()Ljava/io/InputStream;
 lastModifiedTime
  ()Ljava/time/Instant;
- ()Ljava/time/Instant;
+ ()L0java/time/Instant; # @Inherited(org.apache.wicket.util.resource.AbstractResourceStream)
 length
  ()Lorg/apache/wicket/util/lang/Bytes;
- ()Lorg/apache/wicket/util/lang/Bytes;
+ ()L0org/apache/wicket/util/lang/Bytes; # @Inherited(org.apache.wicket.util.resource.AbstractResourceStream)
 locationAsString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/FileSystemResourceStream.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/FileSystemResourceStream.eea
index c47268428b..fbb6e80650 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/FileSystemResourceStream.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/FileSystemResourceStream.eea
@@ -11,7 +11,7 @@ class org/apache/wicket/util/resource/FileSystemResourceStream
  (Lorg/apache/wicket/util/file/File;)V
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(org.apache.wicket.util.resource.AbstractResourceStream)
 getInputStream
  ()Ljava/io/InputStream;
  ()Ljava/io/InputStream;
@@ -20,13 +20,13 @@ getPath
  ()Ljava/nio/file/Path;
 lastModifiedTime
  ()Ljava/time/Instant;
- ()Ljava/time/Instant;
+ ()L0java/time/Instant; # @Inherited(org.apache.wicket.util.resource.AbstractResourceStream)
 length
  ()Lorg/apache/wicket/util/lang/Bytes;
- ()Lorg/apache/wicket/util/lang/Bytes;
+ ()L0org/apache/wicket/util/lang/Bytes; # @Inherited(org.apache.wicket.util.resource.AbstractResourceStream)
 locationAsString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/ResourceUtils.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/ResourceUtils.eea
index 03d894dd59..c444cc2844 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/ResourceUtils.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/ResourceUtils.eea
@@ -12,4 +12,4 @@ getLocaleFromFilename
  (Ljava/lang/String;)Lorg/apache/wicket/util/resource/ResourceUtils$PathLocale;
 getMinifiedName
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/StringBufferResourceStream.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/StringBufferResourceStream.eea
index fa3fe80e6a..8c6dda9df6 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/StringBufferResourceStream.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/StringBufferResourceStream.eea
@@ -11,7 +11,7 @@ clear
  ()Lorg/apache/wicket/util/resource/StringBufferResourceStream;
 getString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 prepend
  (Ljava/lang/CharSequence;)Lorg/apache/wicket/util/resource/StringBufferResourceStream;
  (Ljava/lang/CharSequence;)Lorg/apache/wicket/util/resource/StringBufferResourceStream;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/StringResourceStream.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/StringResourceStream.eea
index 276a2ad42a..6eaa520340 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/StringResourceStream.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/StringResourceStream.eea
@@ -11,7 +11,7 @@ asString
  ()Ljava/lang/String;
 getString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/XSLTResourceStream.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/XSLTResourceStream.eea
index 6dfa2ba8eb..cbb1b6bdee 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/XSLTResourceStream.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/XSLTResourceStream.eea
@@ -8,16 +8,16 @@ class org/apache/wicket/util/resource/XSLTResourceStream
  (Lorg/apache/wicket/util/resource/IResourceStream;Lorg/apache/wicket/util/resource/IResourceStream;Ljavax/xml/transform/TransformerFactory;)V
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(org.apache.wicket.util.resource.AbstractResourceStream)
 getInputStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
 getParameters
  ()Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
- ()Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
+ ()L0java/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;
 lastModifiedTime
  ()Ljava/time/Instant;
- ()Ljava/time/Instant;
+ ()L0java/time/Instant; # @Inherited(org.apache.wicket.util.resource.AbstractResourceStream)
 length
  ()Lorg/apache/wicket/util/lang/Bytes;
- ()Lorg/apache/wicket/util/lang/Bytes;
+ ()L0org/apache/wicket/util/lang/Bytes; # @Inherited(org.apache.wicket.util.resource.AbstractResourceStream)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/ZipResourceStream.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/ZipResourceStream.eea
index 52a808f9ec..d42529a3f0 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/ZipResourceStream.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/resource/ZipResourceStream.eea
@@ -8,13 +8,13 @@ class org/apache/wicket/util/resource/ZipResourceStream
  (Lorg/apache/wicket/util/file/File;Z)V
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(org.apache.wicket.util.resource.AbstractResourceStream)
 getInputStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream;
 lastModifiedTime
  ()Ljava/time/Instant;
- ()Ljava/time/Instant;
+ ()L0java/time/Instant; # @Inherited(org.apache.wicket.util.resource.AbstractResourceStream)
 length
  ()Lorg/apache/wicket/util/lang/Bytes;
- ()Lorg/apache/wicket/util/lang/Bytes;
+ ()L0org/apache/wicket/util/lang/Bytes; # @Inherited(org.apache.wicket.util.resource.AbstractResourceStream)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/string/AbstractStringList.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/string/AbstractStringList.eea
index 94aa2dfb57..d01bb38c37 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/string/AbstractStringList.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/string/AbstractStringList.eea
@@ -11,16 +11,16 @@ join
  ()Ljava/lang/String;
 join
  (IILjava/lang/String;)Ljava/lang/String;
- (IILjava/lang/String;)Ljava/lang/String;
+ (IILjava/lang/String;)L1java/lang/String;
 join
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
 toArray
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String;
 toList
  ()Ljava/util/List<Ljava/lang/String;>;
- ()Ljava/util/List<Ljava/lang/String;>;
+ ()L1java/util/List<Ljava/lang/String;>;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.lang.Object)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/string/StringList.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/string/StringList.eea
index 4823542a2b..2b60f700d7 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/string/StringList.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/string/StringList.eea
@@ -2,25 +2,25 @@ class org/apache/wicket/util/string/StringList
 
 repeat
  (ILjava/lang/String;)Lorg/apache/wicket/util/string/StringList;
- (ILjava/lang/String;)Lorg/apache/wicket/util/string/StringList;
+ (ILjava/lang/String;)L1org/apache/wicket/util/string/StringList;
 tokenize
  (Ljava/lang/String;)Lorg/apache/wicket/util/string/StringList;
  (Ljava/lang/String;)Lorg/apache/wicket/util/string/StringList;
 tokenize
  (Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/util/string/StringList;
- (Ljava/lang/String;Ljava/lang/String;)Lorg/apache/wicket/util/string/StringList;
+ (Ljava/lang/String;Ljava/lang/String;)L1org/apache/wicket/util/string/StringList;
 valueOf
  (Ljava/lang/String;)Lorg/apache/wicket/util/string/StringList;
- (Ljava/lang/String;)Lorg/apache/wicket/util/string/StringList;
+ (Ljava/lang/String;)L1org/apache/wicket/util/string/StringList;
 valueOf
  (Ljava/util/Collection<*>;)Lorg/apache/wicket/util/string/StringList;
- (Ljava/util/Collection<*>;)Lorg/apache/wicket/util/string/StringList;
+ (Ljava/util/Collection<*>;)L1org/apache/wicket/util/string/StringList;
 valueOf
  ([Ljava/lang/Object;)Lorg/apache/wicket/util/string/StringList;
- ([Ljava/lang/Object;)Lorg/apache/wicket/util/string/StringList;
+ ([Ljava/lang/Object;)L1org/apache/wicket/util/string/StringList;
 valueOf
  ([Ljava/lang/String;)Lorg/apache/wicket/util/string/StringList;
- ([Ljava/lang/String;)Lorg/apache/wicket/util/string/StringList;
+ ([Ljava/lang/String;)L1org/apache/wicket/util/string/StringList;
 
 add
  (ILjava/lang/String;)V
@@ -42,10 +42,10 @@ getList
  ()Ljava/util/List<Ljava/lang/String;>;
 iterator
  ()Lorg/apache/wicket/util/string/IStringIterator;
- ()Lorg/apache/wicket/util/string/IStringIterator;
+ ()L1org/apache/wicket/util/string/IStringIterator;
 prepend
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
 toArray
  ()[Ljava/lang/String;
- ()[Ljava/lang/String;
+ ()[1Ljava/lang/String; # @Inherited(org.apache.wicket.util.string.AbstractStringList)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/string/StringValue.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/string/StringValue.eea
index e7b3b665c2..ee0ca54562 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/string/StringValue.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/string/StringValue.eea
@@ -23,10 +23,10 @@ valueOf
  (Ljava/lang/Object;Ljava/util/Locale;)Lorg/apache/wicket/util/string/StringValue;
 valueOf
  (Ljava/lang/String;)Lorg/apache/wicket/util/string/StringValue;
- (Ljava/lang/String;)Lorg/apache/wicket/util/string/StringValue;
+ (Ljava/lang/String;)L1org/apache/wicket/util/string/StringValue;
 valueOf
  (Ljava/lang/String;Ljava/util/Locale;)Lorg/apache/wicket/util/string/StringValue;
- (Ljava/lang/String;Ljava/util/Locale;)Lorg/apache/wicket/util/string/StringValue;
+ (Ljava/lang/String;Ljava/util/Locale;)L1org/apache/wicket/util/string/StringValue;
 valueOf
  (Lorg/apache/wicket/util/string/AppendingStringBuffer;)Lorg/apache/wicket/util/string/StringValue;
  (Lorg/apache/wicket/util/string/AppendingStringBuffer;)Lorg/apache/wicket/util/string/StringValue;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/string/Strings.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/string/Strings.eea
index ca2248e764..51c50c7eea 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/string/Strings.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/string/Strings.eea
@@ -24,7 +24,7 @@ beforeLastPathComponent
  (Ljava/lang/String;C)Ljava/lang/String;
 capitalize
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)Ljava/lang/String; # @PolyNull
 defaultIfEmpty
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
@@ -78,7 +78,7 @@ replaceAll
  (Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 replaceHtmlEscapeNumber
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)Ljava/lang/String; # @PolyNull
 split
  (Ljava/lang/String;C)[Ljava/lang/String;
  (Ljava/lang/String;C)[Ljava/lang/String;
@@ -105,7 +105,7 @@ toEscapedUnicode
  (Ljava/lang/String;)Ljava/lang/String;
 toHexString
  ([B)Ljava/lang/String;
- ([B)Ljava/lang/String;
+ ([B)L1java/lang/String;
 toMultilineMarkup
  (Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
  (Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
@@ -114,7 +114,7 @@ toString
  (Ljava/lang/Object;)Ljava/lang/String;
 toString
  (Ljava/lang/Throwable;)Ljava/lang/String;
- (Ljava/lang/Throwable;)Ljava/lang/String;
+ (Ljava/lang/Throwable;)L1java/lang/String;
 unescapeMarkup
  (Ljava/lang/String;)Ljava/lang/CharSequence;
  (Ljava/lang/String;)Ljava/lang/CharSequence;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/string/interpolator/MapVariableInterpolator.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/string/interpolator/MapVariableInterpolator.eea
index d78cacbf82..6778c3e9e0 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/string/interpolator/MapVariableInterpolator.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/string/interpolator/MapVariableInterpolator.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/util/string/interpolator/MapVariableInterpolator
 
 interpolate
  (Ljava/lang/String;Ljava/util/Map<**>;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/util/Map<**>;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/util/Map<**>;)L1java/lang/String;
 
 <init>
  (Ljava/lang/String;Ljava/util/Map<**>;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/template/CssTemplate.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/template/CssTemplate.eea
index 2f815407d2..26f6d71ca9 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/template/CssTemplate.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/template/CssTemplate.eea
@@ -5,10 +5,10 @@ class org/apache/wicket/util/template/CssTemplate
  (Lorg/apache/wicket/util/template/TextTemplate;)V
 getAfterTemplateContents
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getBeforeTemplateContents
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getString
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/template/JavaScriptTemplate.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/template/JavaScriptTemplate.eea
index 895feea786..1af05d2c83 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/template/JavaScriptTemplate.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/template/JavaScriptTemplate.eea
@@ -5,10 +5,10 @@ class org/apache/wicket/util/template/JavaScriptTemplate
  (Lorg/apache/wicket/util/template/TextTemplate;)V
 getAfterTemplateContents
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getBeforeTemplateContents
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getString
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/template/PackageTextTemplate.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/template/PackageTextTemplate.eea
index 18bc026635..36cb8b0227 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/template/PackageTextTemplate.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/template/PackageTextTemplate.eea
@@ -21,7 +21,7 @@ DEFAULT_ENCODING
  (Ljava/lang/Class<*>;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/String;)V
 getString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 interpolate
  (Ljava/util/Map<Ljava/lang/String;*>;)Lorg/apache/wicket/util/template/TextTemplate;
  (Ljava/util/Map<Ljava/lang/String;*>;)Lorg/apache/wicket/util/template/TextTemplate;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/template/TextTemplateDecorator.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/template/TextTemplateDecorator.eea
index 0f97accf10..4c42e172e6 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/template/TextTemplateDecorator.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/template/TextTemplateDecorator.eea
@@ -12,7 +12,7 @@ asString
  ()Ljava/lang/String;
 asString
  (Ljava/util/Map<Ljava/lang/String;*>;)Ljava/lang/String;
- (Ljava/util/Map<Ljava/lang/String;*>;)Ljava/lang/String;
+ (Ljava/util/Map<Ljava/lang/String;*>;)L1java/lang/String;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
@@ -24,10 +24,10 @@ getBeforeTemplateContents
  ()Ljava/lang/String;
 getContentType
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Inherited(org.apache.wicket.util.resource.AbstractStringResourceStream)
 getInputStream
  ()Ljava/io/InputStream;
- ()Ljava/io/InputStream;
+ ()L1java/io/InputStream; # @Inherited(org.apache.wicket.util.resource.AbstractStringResourceStream)
 getLocale
  ()Ljava/util/Locale;
  ()Ljava/util/Locale;
@@ -36,7 +36,7 @@ getString
  ()Ljava/lang/String;
 lastModifiedTime
  ()Ljava/time/Instant;
- ()Ljava/time/Instant;
+ ()L0java/time/Instant; # @Inherited(org.apache.wicket.util.resource.AbstractStringResourceStream)
 setCharset
  (Ljava/nio/charset/Charset;)V
  (Ljava/nio/charset/Charset;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/value/AttributeMap.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/value/AttributeMap.eea
index a348b77380..cd06e3f3f6 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/value/AttributeMap.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/value/AttributeMap.eea
@@ -11,7 +11,7 @@ putAttribute
  (Ljava/lang/String;Z)Z
 toCharSequence
  ()Ljava/lang/CharSequence;
- ()Ljava/lang/CharSequence;
+ ()L1java/lang/CharSequence;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(org.apache.wicket.util.value.ValueMap)
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/value/ValueMap.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/value/ValueMap.eea
index dc16f7cded..6b2a4bcfc5 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/value/ValueMap.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/value/ValueMap.eea
@@ -25,13 +25,13 @@ add
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;
 getAsBoolean
  (Ljava/lang/String;)Ljava/lang/Boolean;
- (Ljava/lang/String;)Ljava/lang/Boolean;
+ (Ljava/lang/String;)L0java/lang/Boolean;
 getAsBoolean
  (Ljava/lang/String;Z)Z
  (Ljava/lang/String;Z)Z
 getAsDouble
  (Ljava/lang/String;)Ljava/lang/Double;
- (Ljava/lang/String;)Ljava/lang/Double;
+ (Ljava/lang/String;)L0java/lang/Double;
 getAsDouble
  (Ljava/lang/String;D)D
  (Ljava/lang/String;D)D
@@ -55,13 +55,13 @@ getAsInstant
  (Ljava/lang/String;)Ljava/time/Instant;
 getAsInteger
  (Ljava/lang/String;)Ljava/lang/Integer;
- (Ljava/lang/String;)Ljava/lang/Integer;
+ (Ljava/lang/String;)L0java/lang/Integer;
 getAsInteger
  (Ljava/lang/String;I)I
  (Ljava/lang/String;I)I
 getAsLong
  (Ljava/lang/String;)Ljava/lang/Long;
- (Ljava/lang/String;)Ljava/lang/Long;
+ (Ljava/lang/String;)L0java/lang/Long;
 getAsLong
  (Ljava/lang/String;J)J
  (Ljava/lang/String;J)J
@@ -73,7 +73,7 @@ getBoolean
  (Ljava/lang/String;)Z
 getCharSequence
  (Ljava/lang/String;)Ljava/lang/CharSequence;
- (Ljava/lang/String;)Ljava/lang/CharSequence;
+ (Ljava/lang/String;)L0java/lang/CharSequence;
 getDouble
  (Ljava/lang/String;)D
  (Ljava/lang/String;)D
@@ -94,7 +94,7 @@ getInt
  (Ljava/lang/String;I)I
 getKey
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getLong
  (Ljava/lang/String;)J
  (Ljava/lang/String;)J
@@ -103,13 +103,13 @@ getLong
  (Ljava/lang/String;J)J
 getString
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getString
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 getStringArray
  (Ljava/lang/String;)[Ljava/lang/String;
- (Ljava/lang/String;)[Ljava/lang/String;
+ (Ljava/lang/String;)[0Ljava/lang/String;
 getStringValue
  (Ljava/lang/String;)Lorg/apache/wicket/util/string/StringValue;
  (Ljava/lang/String;)Lorg/apache/wicket/util/string/StringValue;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/watch/ModificationWatcher.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/watch/ModificationWatcher.eea
index e6d593ff07..ff707addbf 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/watch/ModificationWatcher.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/watch/ModificationWatcher.eea
@@ -11,7 +11,7 @@ getEntries
  ()Ljava/util/Set<Lorg/apache/wicket/util/watch/IModifiable;>;
 remove
  (Lorg/apache/wicket/util/watch/IModifiable;)Lorg/apache/wicket/util/watch/IModifiable;
- (Lorg/apache/wicket/util/watch/IModifiable;)Lorg/apache/wicket/util/watch/IModifiable;
+ (Lorg/apache/wicket/util/watch/IModifiable;)L0org/apache/wicket/util/watch/IModifiable;
 start
  (Ljava/time/Duration;)V
  (Ljava/time/Duration;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/xml/CustomEntityResolver$ServletApiEntityLocator.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/xml/CustomEntityResolver$ServletApiEntityLocator.eea
index e3b3d2ca1b..ca77a27877 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/xml/CustomEntityResolver$ServletApiEntityLocator.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/xml/CustomEntityResolver$ServletApiEntityLocator.eea
@@ -2,4 +2,4 @@ class org/apache/wicket/util/xml/CustomEntityResolver$ServletApiEntityLocator
 
 locateInputSource
  ()Lorg/xml/sax/InputSource;
- ()Lorg/xml/sax/InputSource;
+ ()L0org/xml/sax/InputSource;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/xml/CustomEntityResolver.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/xml/CustomEntityResolver.eea
index 7317560c2f..6cfe7eb5ba 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/xml/CustomEntityResolver.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/util/xml/CustomEntityResolver.eea
@@ -2,7 +2,7 @@ class org/apache/wicket/util/xml/CustomEntityResolver
 
 getPreloaded
  ()Lorg/apache/wicket/util/xml/CustomEntityResolver;
- ()Lorg/apache/wicket/util/xml/CustomEntityResolver;
+ ()L1org/apache/wicket/util/xml/CustomEntityResolver;
 
 put
  (Lorg/apache/wicket/util/xml/CustomEntityResolver$EntityKey;Lorg/apache/wicket/util/xml/CustomEntityResolver$EntityLocator;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/validation/ValidationError.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/validation/ValidationError.eea
index d641e1c7ad..8c37f47738 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/validation/ValidationError.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/validation/ValidationError.eea
@@ -20,7 +20,7 @@ addKey
  (Lorg/apache/wicket/validation/IValidator<*>;Ljava/lang/String;)Lorg/apache/wicket/validation/ValidationError;
 getErrorMessage
  (Lorg/apache/wicket/validation/IErrorMessageSource;)Ljava/io/Serializable;
- (Lorg/apache/wicket/validation/IErrorMessageSource;)Ljava/io/Serializable;
+ (Lorg/apache/wicket/validation/IErrorMessageSource;)L1java/io/Serializable;
 getKeys
  ()Ljava/util/List<Ljava/lang/String;>;
  ()Ljava/util/List<Ljava/lang/String;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/validation/validator/DateValidator.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/validation/validator/DateValidator.eea
index c2d2c5370c..cdc6e2d3c6 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/validation/validator/DateValidator.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/validation/validator/DateValidator.eea
@@ -6,22 +6,22 @@ super org/apache/wicket/validation/validator/RangeValidator
 
 maximum
  (Ljava/util/Date;)Lorg/apache/wicket/validation/validator/DateValidator;
- (Ljava/util/Date;)Lorg/apache/wicket/validation/validator/DateValidator;
+ (Ljava/util/Date;)L1org/apache/wicket/validation/validator/DateValidator;
 maximum
  (Ljava/util/Date;Ljava/lang/String;)Lorg/apache/wicket/validation/validator/DateValidator;
- (Ljava/util/Date;Ljava/lang/String;)Lorg/apache/wicket/validation/validator/DateValidator;
+ (Ljava/util/Date;Ljava/lang/String;)L1org/apache/wicket/validation/validator/DateValidator;
 minimum
  (Ljava/util/Date;)Lorg/apache/wicket/validation/validator/DateValidator;
- (Ljava/util/Date;)Lorg/apache/wicket/validation/validator/DateValidator;
+ (Ljava/util/Date;)L1org/apache/wicket/validation/validator/DateValidator;
 minimum
  (Ljava/util/Date;Ljava/lang/String;)Lorg/apache/wicket/validation/validator/DateValidator;
- (Ljava/util/Date;Ljava/lang/String;)Lorg/apache/wicket/validation/validator/DateValidator;
+ (Ljava/util/Date;Ljava/lang/String;)L1org/apache/wicket/validation/validator/DateValidator;
 range
  (Ljava/util/Date;Ljava/util/Date;)Lorg/apache/wicket/validation/validator/DateValidator;
- (Ljava/util/Date;Ljava/util/Date;)Lorg/apache/wicket/validation/validator/DateValidator;
+ (Ljava/util/Date;Ljava/util/Date;)L1org/apache/wicket/validation/validator/DateValidator;
 range
  (Ljava/util/Date;Ljava/util/Date;Ljava/lang/String;)Lorg/apache/wicket/validation/validator/DateValidator;
- (Ljava/util/Date;Ljava/util/Date;Ljava/lang/String;)Lorg/apache/wicket/validation/validator/DateValidator;
+ (Ljava/util/Date;Ljava/util/Date;Ljava/lang/String;)L1org/apache/wicket/validation/validator/DateValidator;
 
 <init>
  (Ljava/util/Date;Ljava/util/Date;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/validation/validator/RangeValidator.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/validation/validator/RangeValidator.eea
index 7147410097..6fcdd1185c 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/validation/validator/RangeValidator.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/validation/validator/RangeValidator.eea
@@ -8,13 +8,13 @@ super org/apache/wicket/validation/validator/AbstractRangeValidator
 
 maximum
  <T::Ljava/lang/Comparable<-TT;>;:Ljava/io/Serializable;>(TT;)Lorg/apache/wicket/validation/validator/RangeValidator<TT;>;
- <T::Ljava/lang/Comparable<-TT;>;:Ljava/io/Serializable;>(TT;)Lorg/apache/wicket/validation/validator/RangeValidator<TT;>;
+ <T::Ljava/lang/Comparable<-TT;>;:Ljava/io/Serializable;>(TT;)L1org/apache/wicket/validation/validator/RangeValidator<TT;>;
 minimum
  <T::Ljava/lang/Comparable<-TT;>;:Ljava/io/Serializable;>(TT;)Lorg/apache/wicket/validation/validator/RangeValidator<TT;>;
- <T::Ljava/lang/Comparable<-TT;>;:Ljava/io/Serializable;>(TT;)Lorg/apache/wicket/validation/validator/RangeValidator<TT;>;
+ <T::Ljava/lang/Comparable<-TT;>;:Ljava/io/Serializable;>(TT;)L1org/apache/wicket/validation/validator/RangeValidator<TT;>;
 range
  <T::Ljava/lang/Comparable<-TT;>;:Ljava/io/Serializable;>(TT;TT;)Lorg/apache/wicket/validation/validator/RangeValidator<TT;>;
- <T::Ljava/lang/Comparable<-TT;>;:Ljava/io/Serializable;>(TT;TT;)Lorg/apache/wicket/validation/validator/RangeValidator<TT;>;
+ <T::Ljava/lang/Comparable<-TT;>;:Ljava/io/Serializable;>(TT;TT;)L1org/apache/wicket/validation/validator/RangeValidator<TT;>;
 
 <init>
  (TZ;TZ;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/validation/validator/StringValidator.eea b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/validation/validator/StringValidator.eea
index 3ecd7a75f0..735972c166 100644
--- a/libs/eea-wicket-10/src/main/resources/org/apache/wicket/validation/validator/StringValidator.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/apache/wicket/validation/validator/StringValidator.eea
@@ -6,16 +6,16 @@ super org/apache/wicket/validation/validator/AbstractRangeValidator
 
 exactLength
  (I)Lorg/apache/wicket/validation/validator/StringValidator;
- (I)Lorg/apache/wicket/validation/validator/StringValidator;
+ (I)L1org/apache/wicket/validation/validator/StringValidator;
 lengthBetween
  (II)Lorg/apache/wicket/validation/validator/StringValidator;
- (II)Lorg/apache/wicket/validation/validator/StringValidator;
+ (II)L1org/apache/wicket/validation/validator/StringValidator;
 maximumLength
  (I)Lorg/apache/wicket/validation/validator/StringValidator;
- (I)Lorg/apache/wicket/validation/validator/StringValidator;
+ (I)L1org/apache/wicket/validation/validator/StringValidator;
 minimumLength
  (I)Lorg/apache/wicket/validation/validator/StringValidator;
- (I)Lorg/apache/wicket/validation/validator/StringValidator;
+ (I)L1org/apache/wicket/validation/validator/StringValidator;
 
 <init>
  (Ljava/lang/Integer;Ljava/lang/Integer;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/datetime/DateConverter.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/datetime/DateConverter.eea
index 4cfac6a587..a95eaa18d2 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/datetime/DateConverter.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/datetime/DateConverter.eea
@@ -6,13 +6,13 @@ super org/apache/wicket/util/convert/IConverter
 
 convertToObject
  (Ljava/lang/String;Ljava/util/Locale;)Ljava/util/Date;
- (Ljava/lang/String;Ljava/util/Locale;)Ljava/util/Date;
+ (Ljava/lang/String;Ljava/util/Locale;)L0java/util/Date;
 convertToString
  (Ljava/util/Date;Ljava/util/Locale;)Ljava/lang/String;
  (Ljava/util/Date;Ljava/util/Locale;)Ljava/lang/String;
 getClientTimeZone
  ()Ljava/util/TimeZone;
- ()Ljava/util/TimeZone;
+ ()L0java/util/TimeZone;
 getDatePattern
  (Ljava/util/Locale;)Ljava/lang/String;
  (Ljava/util/Locale;)Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/datetime/extensions/yui/calendar/AbstractCalendar.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/datetime/extensions/yui/calendar/AbstractCalendar.eea
index 28aa76344a..07655f77dd 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/datetime/extensions/yui/calendar/AbstractCalendar.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/datetime/extensions/yui/calendar/AbstractCalendar.eea
@@ -14,10 +14,10 @@ configureWidgetProperties
  (Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;)V
 getJavaScriptId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getJavaScriptWidgetId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 renderHead
  (Lorg/apache/wicket/markup/head/IHeaderResponse;)V
  (L1org/apache/wicket/markup/head/IHeaderResponse;)V # @Inherited(org.apache.wicket.Component)
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/datetime/extensions/yui/calendar/DatePicker.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/datetime/extensions/yui/calendar/DatePicker.eea
index 46dffdbcce..7816c64eef 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/datetime/extensions/yui/calendar/DatePicker.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/datetime/extensions/yui/calendar/DatePicker.eea
@@ -24,7 +24,7 @@ filterEmpty
  ([Ljava/lang/String;)[Ljava/lang/String;
 getAdditionalJavaScript
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getComponentMarkupId
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -39,16 +39,16 @@ getFirstDayOfWeek
  (Ljava/util/Locale;)I
 getIconAltText
  ()Ljava/lang/CharSequence;
- ()Ljava/lang/CharSequence;
+ ()L1java/lang/CharSequence;
 getIconId
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getIconStyle
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getIconTitle
  ()Ljava/lang/CharSequence;
- ()Ljava/lang/CharSequence;
+ ()L1java/lang/CharSequence;
 getIconUrl
  ()Ljava/lang/CharSequence;
  ()Ljava/lang/CharSequence;
@@ -81,4 +81,4 @@ substring
  ([Ljava/lang/String;I)[Ljava/lang/String;
 substring
  ([Ljava/lang/String;II)[Ljava/lang/String;
- ([Ljava/lang/String;II)[Ljava/lang/String;
+ ([Ljava/lang/String;II)[0Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/datetime/extensions/yui/calendar/DateTimeField.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/datetime/extensions/yui/calendar/DateTimeField.eea
index b33ef4a86d..6bb424dc37 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/datetime/extensions/yui/calendar/DateTimeField.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/datetime/extensions/yui/calendar/DateTimeField.eea
@@ -35,7 +35,7 @@ getAmOrPm
  ()Lorg/wicketstuff/datetime/extensions/yui/calendar/DateTimeField$AM_PM;
 getClientTimeZone
  ()Ljava/util/TimeZone;
- ()Ljava/util/TimeZone;
+ ()L0java/util/TimeZone;
 getDate
  ()Ljava/util/Date;
  ()Ljava/util/Date;
@@ -47,28 +47,28 @@ getHours
  ()Ljava/lang/Integer;
 getInput
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String; # @Overrides(org.apache.wicket.markup.html.form.FormComponent)
 getMinutes
  ()Ljava/lang/Integer;
  ()Ljava/lang/Integer;
 newDateInstance
  ()Ljava/util/Date;
- ()Ljava/util/Date;
+ ()L1java/util/Date;
 newDateInstance
  (J)Ljava/util/Date;
- (J)Ljava/util/Date;
+ (J)L1java/util/Date;
 newDatePicker
  ()Lorg/wicketstuff/datetime/extensions/yui/calendar/DatePicker;
- ()Lorg/wicketstuff/datetime/extensions/yui/calendar/DatePicker;
+ ()L1org/wicketstuff/datetime/extensions/yui/calendar/DatePicker;
 newDateTextField
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/util/Date;>;)Lorg/wicketstuff/datetime/markup/html/form/DateTextField;
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/util/Date;>;)Lorg/wicketstuff/datetime/markup/html/form/DateTextField;
 newHoursTextField
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/lang/Integer;>;Ljava/lang/Class<Ljava/lang/Integer;>;)Lorg/apache/wicket/markup/html/form/TextField<Ljava/lang/Integer;>;
- (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/lang/Integer;>;Ljava/lang/Class<Ljava/lang/Integer;>;)Lorg/apache/wicket/markup/html/form/TextField<Ljava/lang/Integer;>;
+ (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/lang/Integer;>;Ljava/lang/Class<Ljava/lang/Integer;>;)L1org/apache/wicket/markup/html/form/TextField<Ljava/lang/Integer;>;
 newMinutesTextField
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/lang/Integer;>;Ljava/lang/Class<Ljava/lang/Integer;>;)Lorg/apache/wicket/markup/html/form/TextField<Ljava/lang/Integer;>;
- (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/lang/Integer;>;Ljava/lang/Class<Ljava/lang/Integer;>;)Lorg/apache/wicket/markup/html/form/TextField<Ljava/lang/Integer;>;
+ (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/lang/Integer;>;Ljava/lang/Class<Ljava/lang/Integer;>;)L1org/apache/wicket/markup/html/form/TextField<Ljava/lang/Integer;>;
 setAmOrPm
  (Lorg/wicketstuff/datetime/extensions/yui/calendar/DateTimeField$AM_PM;)V
  (Lorg/wicketstuff/datetime/extensions/yui/calendar/DateTimeField$AM_PM;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/datetime/markup/html/basic/DateLabel.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/datetime/markup/html/basic/DateLabel.eea
index 030b1ca30b..a257c20ea4 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/datetime/markup/html/basic/DateLabel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/datetime/markup/html/basic/DateLabel.eea
@@ -37,7 +37,7 @@ withConverter
  (Ljava/lang/String;Lorg/wicketstuff/datetime/DateConverter;)V
 createConverter
  (Ljava/lang/Class<*>;)Lorg/apache/wicket/util/convert/IConverter<*>;
- (Ljava/lang/Class<*>;)Lorg/apache/wicket/util/convert/IConverter<*>;
+ (Ljava/lang/Class<*>;)L0org/apache/wicket/util/convert/IConverter<*>; # @Inherited(org.apache.wicket.Component)
 getAfter
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/datetime/markup/html/form/DateTextField.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/datetime/markup/html/form/DateTextField.eea
index 0052ca55e7..4ff4265b11 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/datetime/markup/html/form/DateTextField.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/datetime/markup/html/form/DateTextField.eea
@@ -21,10 +21,10 @@ forShortStyle
  (Ljava/lang/String;)Lorg/wicketstuff/datetime/markup/html/form/DateTextField;
 forShortStyle
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/util/Date;>;Z)Lorg/wicketstuff/datetime/markup/html/form/DateTextField;
- (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/util/Date;>;Z)Lorg/wicketstuff/datetime/markup/html/form/DateTextField;
+ (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/util/Date;>;Z)L1org/wicketstuff/datetime/markup/html/form/DateTextField;
 withConverter
  (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/util/Date;>;Lorg/wicketstuff/datetime/DateConverter;)Lorg/wicketstuff/datetime/markup/html/form/DateTextField;
- (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/util/Date;>;Lorg/wicketstuff/datetime/DateConverter;)Lorg/wicketstuff/datetime/markup/html/form/DateTextField;
+ (Ljava/lang/String;Lorg/apache/wicket/model/IModel<Ljava/util/Date;>;Lorg/wicketstuff/datetime/DateConverter;)L1org/wicketstuff/datetime/markup/html/form/DateTextField;
 withConverter
  (Ljava/lang/String;Lorg/wicketstuff/datetime/DateConverter;)Lorg/wicketstuff/datetime/markup/html/form/DateTextField;
  (Ljava/lang/String;Lorg/wicketstuff/datetime/DateConverter;)Lorg/wicketstuff/datetime/markup/html/form/DateTextField;
@@ -37,7 +37,7 @@ withConverter
  (Ljava/lang/String;Lorg/wicketstuff/datetime/DateConverter;)V
 createConverter
  (Ljava/lang/Class<*>;)Lorg/apache/wicket/util/convert/IConverter<*>;
- (Ljava/lang/Class<*>;)Lorg/apache/wicket/util/convert/IConverter<*>;
+ (Ljava/lang/Class<*>;)L0org/apache/wicket/util/convert/IConverter<*>; # @Inherited(org.apache.wicket.Component)
 getTextFormat
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/APanel.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/APanel.eea
index 8da6e43587..fdb4b2d5d9 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/APanel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/APanel.eea
@@ -8,4 +8,4 @@ class org/wicketstuff/minis/behavior/apanel/APanel
  (Ljava/lang/String;Lorg/wicketstuff/minis/behavior/apanel/ILayout;)V
 getMarkupResourceStream
  (Lorg/apache/wicket/MarkupContainer;Ljava/lang/Class<*>;)Lorg/apache/wicket/util/resource/IResourceStream;
- (Lorg/apache/wicket/MarkupContainer;Ljava/lang/Class<*>;)Lorg/apache/wicket/util/resource/IResourceStream;
+ (Lorg/apache/wicket/MarkupContainer;Ljava/lang/Class<*>;)L1org/apache/wicket/util/resource/IResourceStream;
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/FlowLayout.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/FlowLayout.eea
index d948135ebc..d522a7ad6d 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/FlowLayout.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/FlowLayout.eea
@@ -11,4 +11,4 @@ onBeforeTag
  (Lorg/apache/wicket/Component;Ljava/lang/StringBuilder;)V
 renderComponents
  (Ljava/util/List<+Lorg/apache/wicket/Component;>;)Ljava/lang/CharSequence;
- (Ljava/util/List<+Lorg/apache/wicket/Component;>;)Ljava/lang/CharSequence;
+ (Ljava/util/List<+Lorg/apache/wicket/Component;>;)L1java/lang/CharSequence;
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/GridLayout.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/GridLayout.eea
index ca818c63b1..b047e35ac8 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/GridLayout.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/GridLayout.eea
@@ -11,4 +11,4 @@ onGridRow
  (Lorg/apache/wicket/markup/parser/XmlTag;)V
 renderComponents
  (Ljava/util/List<+Lorg/apache/wicket/Component;>;)Ljava/lang/CharSequence;
- (Ljava/util/List<+Lorg/apache/wicket/Component;>;)Ljava/lang/CharSequence;
+ (Ljava/util/List<+Lorg/apache/wicket/Component;>;)L1java/lang/CharSequence;
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$BaseRenderer.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$BaseRenderer.eea
index 39756e09a9..5a81709411 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$BaseRenderer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$BaseRenderer.eea
@@ -8,4 +8,4 @@ super org/wicketstuff/minis/behavior/apanel/IComponentRenderer
 
 getIdAttribute
  (Lorg/apache/wicket/Component;)Ljava/lang/String;
- (Lorg/apache/wicket/Component;)Ljava/lang/String;
+ (Lorg/apache/wicket/Component;)L1java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$ButtonRenderer.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$ButtonRenderer.eea
index 0a78a11398..9f6a6903f1 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$ButtonRenderer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$ButtonRenderer.eea
@@ -6,7 +6,7 @@ super org/wicketstuff/minis/behavior/apanel/RenderersList$BaseRenderer
 
 getComponentClass
  ()Ljava/lang/Class<Lorg/apache/wicket/markup/html/form/Button;>;
- ()Ljava/lang/Class<Lorg/apache/wicket/markup/html/form/Button;>;
+ ()L1java/lang/Class<Lorg/apache/wicket/markup/html/form/Button;>;
 getMarkup
  (Lorg/apache/wicket/markup/html/form/Button;)Ljava/lang/CharSequence;
  (Lorg/apache/wicket/markup/html/form/Button;)Ljava/lang/CharSequence;
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$DefaultRenderer.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$DefaultRenderer.eea
index 48cbc415ae..5697271866 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$DefaultRenderer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$DefaultRenderer.eea
@@ -6,7 +6,7 @@ super org/wicketstuff/minis/behavior/apanel/RenderersList$BaseRenderer
 
 getComponentClass
  ()Ljava/lang/Class<Lorg/apache/wicket/Component;>;
- ()Ljava/lang/Class<Lorg/apache/wicket/Component;>;
+ ()L1java/lang/Class<Lorg/apache/wicket/Component;>;
 getMarkup
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
  (Lorg/apache/wicket/Component;)Ljava/lang/CharSequence;
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$DefaultWebMarkupContainerRenderer.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$DefaultWebMarkupContainerRenderer.eea
index 7450f8ade0..71b1dffd0c 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$DefaultWebMarkupContainerRenderer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$DefaultWebMarkupContainerRenderer.eea
@@ -6,7 +6,7 @@ super org/wicketstuff/minis/behavior/apanel/RenderersList$BaseWebMarkupContainer
 
 getComponentClass
  ()Ljava/lang/Class<Lorg/apache/wicket/markup/html/WebMarkupContainer;>;
- ()Ljava/lang/Class<Lorg/apache/wicket/markup/html/WebMarkupContainer;>;
+ ()L1java/lang/Class<Lorg/apache/wicket/markup/html/WebMarkupContainer;>;
 getMarkup
  (Lorg/apache/wicket/markup/html/WebMarkupContainer;)Ljava/lang/CharSequence;
  (Lorg/apache/wicket/markup/html/WebMarkupContainer;)Ljava/lang/CharSequence;
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$FormRenderer.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$FormRenderer.eea
index 0c5276e8b3..d942bc286e 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$FormRenderer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$FormRenderer.eea
@@ -6,7 +6,7 @@ super org/wicketstuff/minis/behavior/apanel/RenderersList$BaseWebMarkupContainer
 
 getComponentClass
  ()Ljava/lang/Class<Lorg/apache/wicket/markup/html/form/Form;>;
- ()Ljava/lang/Class<Lorg/apache/wicket/markup/html/form/Form;>;
+ ()L1java/lang/Class<Lorg/apache/wicket/markup/html/form/Form;>;
 getMarkup
  (Lorg/apache/wicket/markup/html/form/Form;)Ljava/lang/CharSequence;
  (Lorg/apache/wicket/markup/html/form/Form;)Ljava/lang/CharSequence;
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$LabelRenderer.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$LabelRenderer.eea
index 4da3f4c0a1..364109d466 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$LabelRenderer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$LabelRenderer.eea
@@ -6,7 +6,7 @@ super org/wicketstuff/minis/behavior/apanel/RenderersList$BaseRenderer
 
 getComponentClass
  ()Ljava/lang/Class<Lorg/apache/wicket/markup/html/basic/Label;>;
- ()Ljava/lang/Class<Lorg/apache/wicket/markup/html/basic/Label;>;
+ ()L1java/lang/Class<Lorg/apache/wicket/markup/html/basic/Label;>;
 getMarkup
  (Lorg/apache/wicket/markup/html/basic/Label;)Ljava/lang/CharSequence;
  (Lorg/apache/wicket/markup/html/basic/Label;)Ljava/lang/CharSequence;
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$LinkRenderer.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$LinkRenderer.eea
index a1da0392d2..c9bf074b6b 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$LinkRenderer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$LinkRenderer.eea
@@ -6,7 +6,7 @@ super org/wicketstuff/minis/behavior/apanel/RenderersList$BaseWebMarkupContainer
 
 getComponentClass
  ()Ljava/lang/Class<Lorg/apache/wicket/markup/html/link/Link;>;
- ()Ljava/lang/Class<Lorg/apache/wicket/markup/html/link/Link;>;
+ ()L1java/lang/Class<Lorg/apache/wicket/markup/html/link/Link;>;
 getMarkup
  (Lorg/apache/wicket/markup/html/link/Link;)Ljava/lang/CharSequence;
  (Lorg/apache/wicket/markup/html/link/Link;)Ljava/lang/CharSequence;
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$ListViewRenderer.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$ListViewRenderer.eea
index a71e01333e..1b1a47f290 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$ListViewRenderer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$ListViewRenderer.eea
@@ -6,7 +6,7 @@ super org/wicketstuff/minis/behavior/apanel/RenderersList$BaseWebMarkupContainer
 
 getComponentClass
  ()Ljava/lang/Class<Lorg/apache/wicket/markup/html/list/ListView;>;
- ()Ljava/lang/Class<Lorg/apache/wicket/markup/html/list/ListView;>;
+ ()L1java/lang/Class<Lorg/apache/wicket/markup/html/list/ListView;>;
 getMarkup
  (Lorg/apache/wicket/markup/html/list/ListView;)Ljava/lang/CharSequence;
  (Lorg/apache/wicket/markup/html/list/ListView;)Ljava/lang/CharSequence;
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$RepeatingViewRenderer.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$RepeatingViewRenderer.eea
index 6ba5eae3c4..fff2d90bf1 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$RepeatingViewRenderer.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/apanel/RenderersList$RepeatingViewRenderer.eea
@@ -6,7 +6,7 @@ super org/wicketstuff/minis/behavior/apanel/RenderersList$BaseWebMarkupContainer
 
 getComponentClass
  ()Ljava/lang/Class<Lorg/apache/wicket/markup/repeater/RepeatingView;>;
- ()Ljava/lang/Class<Lorg/apache/wicket/markup/repeater/RepeatingView;>;
+ ()L1java/lang/Class<Lorg/apache/wicket/markup/repeater/RepeatingView;>;
 getMarkup
  (Lorg/apache/wicket/markup/repeater/RepeatingView;)Ljava/lang/CharSequence;
  (Lorg/apache/wicket/markup/repeater/RepeatingView;)Ljava/lang/CharSequence;
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior.eea
index e55982f3a1..26ebcca6f3 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior.eea
@@ -2,31 +2,31 @@ class org/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior
 
 ie10
  ()Lorg/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
- ()Lorg/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
+ ()L1org/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
 ie11
  ()Lorg/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
- ()Lorg/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
+ ()L1org/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
 ie8
  ()Lorg/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
- ()Lorg/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
+ ()L1org/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
 ie9
  ()Lorg/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
- ()Lorg/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
+ ()L1org/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
 ieEdge
  ()Lorg/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
- ()Lorg/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
+ ()L1org/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
 ieEmulate10
  ()Lorg/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
- ()Lorg/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
+ ()L1org/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
 ieEmulate11
  ()Lorg/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
- ()Lorg/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
+ ()L1org/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
 ieEmulate8
  ()Lorg/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
- ()Lorg/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
+ ()L1org/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
 ieEmulate9
  ()Lorg/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
- ()Lorg/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
+ ()L1org/wicketstuff/minis/behavior/ie/DocumentCompatibilityBehavior;
 
 <init>
  (Ljava/lang/String;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/prototip/PrototipBehaviour.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/prototip/PrototipBehaviour.eea
index 105b93433c..c2cd8b161b 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/prototip/PrototipBehaviour.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/prototip/PrototipBehaviour.eea
@@ -80,4 +80,4 @@ setTooltipComponent
  (Lorg/apache/wicket/Component;)Lorg/wicketstuff/minis/behavior/prototip/PrototipBehaviour;
 toJavascript
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/prototip/PrototipSettings.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/prototip/PrototipSettings.eea
index 02be2bb25c..c193c0cef1 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/prototip/PrototipSettings.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/prototip/PrototipSettings.eea
@@ -41,7 +41,7 @@ getOffset_y
  ()Ljava/lang/String;
 getOptionsString
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 getShowOn
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/reflection/ReflectionBehavior$Javascript.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/reflection/ReflectionBehavior$Javascript.eea
index 358e48e8f3..d8588b0d07 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/reflection/ReflectionBehavior$Javascript.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/reflection/ReflectionBehavior$Javascript.eea
@@ -2,7 +2,7 @@ class org/wicketstuff/minis/behavior/reflection/ReflectionBehavior$Javascript
 
 hide
  (Ljava/lang/String;)Ljava/lang/CharSequence;
- (Ljava/lang/String;)Ljava/lang/CharSequence;
+ (Ljava/lang/String;)L1java/lang/CharSequence;
 show
  (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;)Ljava/lang/CharSequence;
- (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;)Ljava/lang/CharSequence;
+ (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;)L1java/lang/CharSequence;
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/safari/PersistedCacheBehavior.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/safari/PersistedCacheBehavior.eea
index 579565bc5c..56ec8d56dd 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/safari/PersistedCacheBehavior.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/safari/PersistedCacheBehavior.eea
@@ -6,7 +6,7 @@ REF
 
 prevent
  ()Lorg/wicketstuff/minis/behavior/safari/PersistedCacheBehavior;
- ()Lorg/wicketstuff/minis/behavior/safari/PersistedCacheBehavior;
+ ()L1org/wicketstuff/minis/behavior/safari/PersistedCacheBehavior;
 
 bind
  (Lorg/apache/wicket/Component;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/spinner/Spinner.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/spinner/Spinner.eea
index 492b649563..221f98abc0 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/spinner/Spinner.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/spinner/Spinner.eea
@@ -14,10 +14,10 @@ configure
  (Ljava/util/Properties;)V
 getSpinDownComponent
  ()Lorg/apache/wicket/Component;
- ()Lorg/apache/wicket/Component;
+ ()L0org/apache/wicket/Component;
 getSpinUpComponent
  ()Lorg/apache/wicket/Component;
- ()Lorg/apache/wicket/Component;
+ ()L0org/apache/wicket/Component;
 renderHead
  (Lorg/apache/wicket/Component;Lorg/apache/wicket/markup/head/IHeaderResponse;)V
  (Lorg/apache/wicket/Component;Lorg/apache/wicket/markup/head/IHeaderResponse;)V
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/styleswitcher/StyleSwitcher$Javascript.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/styleswitcher/StyleSwitcher$Javascript.eea
index e2e78b2f44..4377a8331a 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/styleswitcher/StyleSwitcher$Javascript.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/styleswitcher/StyleSwitcher$Javascript.eea
@@ -2,4 +2,4 @@ class org/wicketstuff/minis/behavior/styleswitcher/StyleSwitcher$Javascript
 
 forActivatingStylesheet
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/tooltipsy/TooltipsyOptions$TooltipsyOptionsBuilder.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/tooltipsy/TooltipsyOptions$TooltipsyOptionsBuilder.eea
index b13d8beedc..5be21a99bf 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/tooltipsy/TooltipsyOptions$TooltipsyOptionsBuilder.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/tooltipsy/TooltipsyOptions$TooltipsyOptionsBuilder.eea
@@ -2,7 +2,7 @@ class org/wicketstuff/minis/behavior/tooltipsy/TooltipsyOptions$TooltipsyOptions
 
 getResult
  ()Lorg/wicketstuff/minis/behavior/tooltipsy/TooltipsyOptions;
- ()Lorg/wicketstuff/minis/behavior/tooltipsy/TooltipsyOptions;
+ ()L1org/wicketstuff/minis/behavior/tooltipsy/TooltipsyOptions;
 setAlign
  (Lorg/wicketstuff/minis/behavior/tooltipsy/TooltipsyOptions$TooltipsyAlignment;)Lorg/wicketstuff/minis/behavior/tooltipsy/TooltipsyOptions$TooltipsyOptionsBuilder;
  (Lorg/wicketstuff/minis/behavior/tooltipsy/TooltipsyOptions$TooltipsyAlignment;)L1org/wicketstuff/minis/behavior/tooltipsy/TooltipsyOptions$TooltipsyOptionsBuilder;
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/tooltipsy/TooltipsyOptions.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/tooltipsy/TooltipsyOptions.eea
index 2c41b5d951..d6398ff0b3 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/tooltipsy/TooltipsyOptions.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/tooltipsy/TooltipsyOptions.eea
@@ -17,10 +17,10 @@ getHideJavaScript
  ()Ljava/lang/String;
 getOffset
  ()Lorg/wicketstuff/minis/behavior/tooltipsy/TooltipsyOptions$Offset;
- ()Lorg/wicketstuff/minis/behavior/tooltipsy/TooltipsyOptions$Offset;
+ ()L1org/wicketstuff/minis/behavior/tooltipsy/TooltipsyOptions$Offset;
 getParameterString
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 getShowJavaScript
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/validator/StringValidatorWithMaxLength.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/validator/StringValidatorWithMaxLength.eea
index aaa7ddb18e..a89de482b6 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/validator/StringValidatorWithMaxLength.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/validator/StringValidatorWithMaxLength.eea
@@ -9,10 +9,10 @@ addMaxLengthToTag
  (Lorg/apache/wicket/Component;Lorg/apache/wicket/markup/ComponentTag;I)V
 exactLength
  (I)Lorg/apache/wicket/validation/validator/StringValidator;
- (I)Lorg/apache/wicket/validation/validator/StringValidator;
+ (I)L1org/apache/wicket/validation/validator/StringValidator;
 lengthBetween
  (II)Lorg/apache/wicket/validation/validator/StringValidator;
- (II)Lorg/apache/wicket/validation/validator/StringValidator;
+ (II)L1org/apache/wicket/validation/validator/StringValidator;
 maximumLength
  (I)Lorg/apache/wicket/validation/validator/StringValidator;
- (I)Lorg/apache/wicket/validation/validator/StringValidator;
+ (I)L1org/apache/wicket/validation/validator/StringValidator;
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/veil/VeilResources$Javascript$Generic.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/veil/VeilResources$Javascript$Generic.eea
index 3cd15f4018..6b84fb3ef1 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/veil/VeilResources$Javascript$Generic.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/behavior/veil/VeilResources$Javascript$Generic.eea
@@ -2,16 +2,16 @@ class org/wicketstuff/minis/behavior/veil/VeilResources$Javascript$Generic
 
 hide
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 show
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
 show
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
 toggle
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
 toggle
  (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/model/ReplacingResourceModel.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/model/ReplacingResourceModel.eea
index 1a4d4aec8c..8282fba70b 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/model/ReplacingResourceModel.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/model/ReplacingResourceModel.eea
@@ -12,4 +12,4 @@ getObject
  ()Ljava/lang/String;
 wrapOnAssignment
  (Lorg/apache/wicket/Component;)Lorg/apache/wicket/model/IWrapModel<Ljava/lang/String;>;
- (Lorg/apache/wicket/Component;)Lorg/apache/wicket/model/IWrapModel<Ljava/lang/String;>;
+ (Lorg/apache/wicket/Component;)L1org/apache/wicket/model/IWrapModel<Ljava/lang/String;>;
diff --git a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/model/collection/DetachableHashSet.eea b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/model/collection/DetachableHashSet.eea
index afad0c9f0c..e266aba7fc 100644
--- a/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/model/collection/DetachableHashSet.eea
+++ b/libs/eea-wicket-10/src/main/resources/org/wicketstuff/minis/model/collection/DetachableHashSet.eea
@@ -11,4 +11,4 @@ super org/wicketstuff/minis/model/collection/DetachableSet
  (Lorg/wicketstuff/minis/model/IDetachCodec<TT;>;)V
 newAttachedStore
  ()Ljava/util/Collection<TT;>;
- ()Ljava/util/Collection<TT;>;
+ ()L1java/util/Collection<TT;>;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/XStream.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/XStream.eea
index b56fe3b3a8..d2f1b723ae 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/XStream.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/XStream.eea
@@ -121,37 +121,37 @@ allowTypesByWildcard
  ([0Ljava/lang/String;)V
 createObjectInputStream
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;)Ljava/io/ObjectInputStream;
- (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;)Ljava/io/ObjectInputStream;
+ (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;)L1java/io/ObjectInputStream;
 createObjectInputStream
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/DataHolder;)Ljava/io/ObjectInputStream;
- (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/DataHolder;)Ljava/io/ObjectInputStream;
+ (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/DataHolder;)L1java/io/ObjectInputStream;
 createObjectInputStream
  (Ljava/io/InputStream;)Ljava/io/ObjectInputStream;
- (Ljava/io/InputStream;)Ljava/io/ObjectInputStream;
+ (Ljava/io/InputStream;)L1java/io/ObjectInputStream;
 createObjectInputStream
  (Ljava/io/Reader;)Ljava/io/ObjectInputStream;
- (Ljava/io/Reader;)Ljava/io/ObjectInputStream;
+ (Ljava/io/Reader;)L1java/io/ObjectInputStream;
 createObjectOutputStream
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;)Ljava/io/ObjectOutputStream;
- (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;)Ljava/io/ObjectOutputStream;
+ (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;)L1java/io/ObjectOutputStream;
 createObjectOutputStream
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Ljava/lang/String;)Ljava/io/ObjectOutputStream;
- (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Ljava/lang/String;)Ljava/io/ObjectOutputStream;
+ (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Ljava/lang/String;)L1java/io/ObjectOutputStream;
 createObjectOutputStream
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Ljava/lang/String;Lcom/thoughtworks/xstream/converters/DataHolder;)Ljava/io/ObjectOutputStream;
- (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Ljava/lang/String;Lcom/thoughtworks/xstream/converters/DataHolder;)Ljava/io/ObjectOutputStream;
+ (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Ljava/lang/String;Lcom/thoughtworks/xstream/converters/DataHolder;)L1java/io/ObjectOutputStream;
 createObjectOutputStream
  (Ljava/io/OutputStream;)Ljava/io/ObjectOutputStream;
- (Ljava/io/OutputStream;)Ljava/io/ObjectOutputStream;
+ (Ljava/io/OutputStream;)L1java/io/ObjectOutputStream;
 createObjectOutputStream
  (Ljava/io/OutputStream;Ljava/lang/String;)Ljava/io/ObjectOutputStream;
- (Ljava/io/OutputStream;Ljava/lang/String;)Ljava/io/ObjectOutputStream;
+ (Ljava/io/OutputStream;Ljava/lang/String;)L1java/io/ObjectOutputStream;
 createObjectOutputStream
  (Ljava/io/Writer;)Ljava/io/ObjectOutputStream;
- (Ljava/io/Writer;)Ljava/io/ObjectOutputStream;
+ (Ljava/io/Writer;)L1java/io/ObjectOutputStream;
 createObjectOutputStream
  (Ljava/io/Writer;Ljava/lang/String;)Ljava/io/ObjectOutputStream;
- (Ljava/io/Writer;Ljava/lang/String;)Ljava/io/ObjectOutputStream;
+ (Ljava/io/Writer;Ljava/lang/String;)L1java/io/ObjectOutputStream;
 denyPermission
  (Lcom/thoughtworks/xstream/security/TypePermission;)V
  (Lcom/thoughtworks/xstream/security/TypePermission;)V
@@ -232,7 +232,7 @@ marshal
  (Ljava/lang/Object;Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Lcom/thoughtworks/xstream/converters/DataHolder;)V
 newDataHolder
  ()Lcom/thoughtworks/xstream/converters/DataHolder;
- ()Lcom/thoughtworks/xstream/converters/DataHolder;
+ ()L1com/thoughtworks/xstream/converters/DataHolder;
 omitField
  (Ljava/lang/Class;Ljava/lang/String;)V
  (Ljava/lang/Class;Ljava/lang/String;)V
@@ -268,7 +268,7 @@ setMarshallingStrategy
  (Lcom/thoughtworks/xstream/MarshallingStrategy;)V
 toXML
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
 toXML
  (Ljava/lang/Object;Ljava/io/OutputStream;)V
  (Ljava/lang/Object;Ljava/io/OutputStream;)V
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/XStreamer.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/XStreamer.eea
index 568e151be0..40681b16e6 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/XStreamer.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/XStreamer.eea
@@ -30,7 +30,7 @@ fromXML
  (Ljava/lang/String;[Lcom/thoughtworks/xstream/security/TypePermission;)Ljava/lang/Object;
 toXML
  (Lcom/thoughtworks/xstream/XStream;Ljava/lang/Object;)Ljava/lang/String;
- (Lcom/thoughtworks/xstream/XStream;Ljava/lang/Object;)Ljava/lang/String;
+ (Lcom/thoughtworks/xstream/XStream;Ljava/lang/Object;)L1java/lang/String;
 toXML
  (Lcom/thoughtworks/xstream/XStream;Ljava/lang/Object;Ljava/io/Writer;)V
  (Lcom/thoughtworks/xstream/XStream;Ljava/lang/Object;Ljava/io/Writer;)V
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/AbstractSingleValueConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/AbstractSingleValueConverter.eea
index 861a906ea6..8bef9d2e27 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/AbstractSingleValueConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/AbstractSingleValueConverter.eea
@@ -8,4 +8,4 @@ fromString
  (Ljava/lang/String;)Ljava/lang/Object;
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/BigDecimalConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/BigDecimalConverter.eea
index c3c4a862d3..8145d9fdcc 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/BigDecimalConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/BigDecimalConverter.eea
@@ -5,4 +5,4 @@ canConvert
  (Ljava/lang/Class;)Z
 fromString
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/BigIntegerConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/BigIntegerConverter.eea
index ce5201fe3d..c109621bb1 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/BigIntegerConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/BigIntegerConverter.eea
@@ -5,4 +5,4 @@ canConvert
  (Ljava/lang/Class;)Z
 fromString
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/BooleanConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/BooleanConverter.eea
index 04738e9c88..a5332ac42f 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/BooleanConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/BooleanConverter.eea
@@ -24,4 +24,4 @@ shouldConvert
  (Ljava/lang/Class;Ljava/lang/Object;)Z
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/CharConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/CharConverter.eea
index a7dac37347..686d7b0ee0 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/CharConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/CharConverter.eea
@@ -11,7 +11,7 @@ marshal
  (L0java/lang/Object;L1com/thoughtworks/xstream/io/HierarchicalStreamWriter;L1com/thoughtworks/xstream/converters/MarshallingContext;)V # @Inherited(com.thoughtworks.xstream.converters.Converter)
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
 unmarshal
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;)Ljava/lang/Object;
  (L1com/thoughtworks/xstream/io/HierarchicalStreamReader;L1com/thoughtworks/xstream/converters/UnmarshallingContext;)L0java/lang/Object; # @Inherited(com.thoughtworks.xstream.converters.Converter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/DateConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/DateConverter.eea
index 41ffb1a6f1..ac202039f4 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/DateConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/DateConverter.eea
@@ -29,4 +29,4 @@ fromString
  (Ljava/lang/String;)Ljava/lang/Object;
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/StringBufferConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/StringBufferConverter.eea
index ef0141388d..b959dde689 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/StringBufferConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/StringBufferConverter.eea
@@ -5,4 +5,4 @@ canConvert
  (Ljava/lang/Class;)Z
 fromString
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/StringBuilderConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/StringBuilderConverter.eea
index 3defb7241e..8ba6cfa3ba 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/StringBuilderConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/StringBuilderConverter.eea
@@ -5,4 +5,4 @@ canConvert
  (Ljava/lang/Class;)Z
 fromString
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/URIConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/URIConverter.eea
index 10133639b0..b41f7179ab 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/URIConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/URIConverter.eea
@@ -5,4 +5,4 @@ canConvert
  (Ljava/lang/Class;)Z
 fromString
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/URLConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/URLConverter.eea
index dd657bffc1..dee1156228 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/URLConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/basic/URLConverter.eea
@@ -5,4 +5,4 @@ canConvert
  (Ljava/lang/Class;)Z
 fromString
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/collections/AbstractCollectionConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/collections/AbstractCollectionConverter.eea
index 2061f705d2..25d3368bb8 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/collections/AbstractCollectionConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/collections/AbstractCollectionConverter.eea
@@ -8,7 +8,7 @@ canConvert
  (Ljava/lang/Class;)Z
 createCollection
  (Ljava/lang/Class;)Ljava/lang/Object;
- (Ljava/lang/Class;)Ljava/lang/Object;
+ (Ljava/lang/Class;)L1java/lang/Object;
 mapper
  ()Lcom/thoughtworks/xstream/mapper/Mapper;
  ()Lcom/thoughtworks/xstream/mapper/Mapper;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/collections/CollectionConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/collections/CollectionConverter.eea
index 4ff48364c8..df72d34493 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/collections/CollectionConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/collections/CollectionConverter.eea
@@ -14,7 +14,7 @@ canConvert
  (Ljava/lang/Class;)Z
 createCollection
  (Ljava/lang/Class;)Ljava/lang/Object;
- (Ljava/lang/Class;)Ljava/lang/Object;
+ (Ljava/lang/Class;)L1java/lang/Object; # @Inherited(com.thoughtworks.xstream.converters.collections.AbstractCollectionConverter)
 marshal
  (Ljava/lang/Object;Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Lcom/thoughtworks/xstream/converters/MarshallingContext;)V
  (L0java/lang/Object;L1com/thoughtworks/xstream/io/HierarchicalStreamWriter;L1com/thoughtworks/xstream/converters/MarshallingContext;)V # @Inherited(com.thoughtworks.xstream.converters.collections.AbstractCollectionConverter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/collections/MapConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/collections/MapConverter.eea
index b20babd11d..45e222cbc4 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/collections/MapConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/collections/MapConverter.eea
@@ -11,7 +11,7 @@ canConvert
  (Ljava/lang/Class;)Z
 createCollection
  (Ljava/lang/Class;)Ljava/lang/Object;
- (Ljava/lang/Class;)Ljava/lang/Object;
+ (Ljava/lang/Class;)L1java/lang/Object; # @Inherited(com.thoughtworks.xstream.converters.collections.AbstractCollectionConverter)
 marshal
  (Ljava/lang/Object;Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Lcom/thoughtworks/xstream/converters/MarshallingContext;)V
  (L0java/lang/Object;L1com/thoughtworks/xstream/io/HierarchicalStreamWriter;L1com/thoughtworks/xstream/converters/MarshallingContext;)V # @Inherited(com.thoughtworks.xstream.converters.collections.AbstractCollectionConverter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/collections/TreeMapConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/collections/TreeMapConverter.eea
index 16edf65fab..c41c1ca23c 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/collections/TreeMapConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/collections/TreeMapConverter.eea
@@ -17,4 +17,4 @@ unmarshal
  (L1com/thoughtworks/xstream/io/HierarchicalStreamReader;L1com/thoughtworks/xstream/converters/UnmarshallingContext;)L0java/lang/Object; # @Inherited(com.thoughtworks.xstream.converters.collections.MapConverter)
 unmarshalComparator
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;Ljava/util/TreeMap;)Ljava/util/Comparator;
- (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;Ljava/util/TreeMap;)Ljava/util/Comparator;
+ (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;Ljava/util/TreeMap;)L0java/util/Comparator;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/enums/EnumSingleValueConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/enums/EnumSingleValueConverter.eea
index 817482d91a..93a584c25a 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/enums/EnumSingleValueConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/enums/EnumSingleValueConverter.eea
@@ -11,4 +11,4 @@ fromString
  (Ljava/lang/String;)Ljava/lang/Object;
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/enums/EnumToStringConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/enums/EnumToStringConverter.eea
index d9c298d34c..8a9248580e 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/enums/EnumToStringConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/enums/EnumToStringConverter.eea
@@ -16,4 +16,4 @@ fromString
  (Ljava/lang/String;)Ljava/lang/Object;
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/AtomicBooleanConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/AtomicBooleanConverter.eea
index 362bbfb977..7a58a4d787 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/AtomicBooleanConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/AtomicBooleanConverter.eea
@@ -5,13 +5,13 @@ canConvert
  (Ljava/lang/Class;)Z
 fromString
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
 marshal
  (Ljava/lang/Object;Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Lcom/thoughtworks/xstream/converters/MarshallingContext;)V
  (L0java/lang/Object;L1com/thoughtworks/xstream/io/HierarchicalStreamWriter;L1com/thoughtworks/xstream/converters/MarshallingContext;)V # @Inherited(com.thoughtworks.xstream.converters.Converter)
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(com.thoughtworks.xstream.converters.basic.BooleanConverter)
 unmarshal
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;)Ljava/lang/Object;
  (L1com/thoughtworks/xstream/io/HierarchicalStreamReader;L1com/thoughtworks/xstream/converters/UnmarshallingContext;)L0java/lang/Object; # @Inherited(com.thoughtworks.xstream.converters.Converter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/AtomicIntegerConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/AtomicIntegerConverter.eea
index 8f78efdf8b..5c9bfeb1c8 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/AtomicIntegerConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/AtomicIntegerConverter.eea
@@ -5,13 +5,13 @@ canConvert
  (Ljava/lang/Class;)Z
 fromString
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
 marshal
  (Ljava/lang/Object;Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Lcom/thoughtworks/xstream/converters/MarshallingContext;)V
  (L0java/lang/Object;L1com/thoughtworks/xstream/io/HierarchicalStreamWriter;L1com/thoughtworks/xstream/converters/MarshallingContext;)V # @Inherited(com.thoughtworks.xstream.converters.Converter)
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter)
 unmarshal
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;)Ljava/lang/Object;
  (L1com/thoughtworks/xstream/io/HierarchicalStreamReader;L1com/thoughtworks/xstream/converters/UnmarshallingContext;)L0java/lang/Object; # @Inherited(com.thoughtworks.xstream.converters.Converter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/AtomicLongConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/AtomicLongConverter.eea
index 194cc04302..af43ae9bf8 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/AtomicLongConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/AtomicLongConverter.eea
@@ -5,13 +5,13 @@ canConvert
  (Ljava/lang/Class;)Z
 fromString
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
 marshal
  (Ljava/lang/Object;Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Lcom/thoughtworks/xstream/converters/MarshallingContext;)V
  (L0java/lang/Object;L1com/thoughtworks/xstream/io/HierarchicalStreamWriter;L1com/thoughtworks/xstream/converters/MarshallingContext;)V # @Inherited(com.thoughtworks.xstream.converters.Converter)
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter)
 unmarshal
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;)Ljava/lang/Object;
  (L1com/thoughtworks/xstream/io/HierarchicalStreamReader;L1com/thoughtworks/xstream/converters/UnmarshallingContext;)L0java/lang/Object; # @Inherited(com.thoughtworks.xstream.converters.Converter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/CharsetConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/CharsetConverter.eea
index 72d23ce683..aa41d87554 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/CharsetConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/CharsetConverter.eea
@@ -8,4 +8,4 @@ fromString
  (Ljava/lang/String;)Ljava/lang/Object;
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/FileConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/FileConverter.eea
index 45acdb35ee..6f25f9d935 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/FileConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/FileConverter.eea
@@ -5,7 +5,7 @@ canConvert
  (Ljava/lang/Class;)Z
 fromString
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/ISO8601DateConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/ISO8601DateConverter.eea
index 39cd8b6dd2..f0ecc59c68 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/ISO8601DateConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/ISO8601DateConverter.eea
@@ -8,4 +8,4 @@ fromString
  (Ljava/lang/String;)Ljava/lang/Object;
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/ISO8601GregorianCalendarConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/ISO8601GregorianCalendarConverter.eea
index eaf8dc7e9f..f73e1ac984 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/ISO8601GregorianCalendarConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/ISO8601GregorianCalendarConverter.eea
@@ -8,4 +8,4 @@ fromString
  (Ljava/lang/String;)Ljava/lang/Object;
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/ISO8601SqlTimestampConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/ISO8601SqlTimestampConverter.eea
index 29b738f1a6..81a181431a 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/ISO8601SqlTimestampConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/ISO8601SqlTimestampConverter.eea
@@ -5,7 +5,7 @@ canConvert
  (Ljava/lang/Class;)Z
 fromString
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(com.thoughtworks.xstream.converters.extended.ISO8601DateConverter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/JavaClassConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/JavaClassConverter.eea
index 2df405ae51..9148a1f8fe 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/JavaClassConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/JavaClassConverter.eea
@@ -17,4 +17,4 @@ fromString
  (Ljava/lang/String;)Ljava/lang/Object;
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/LocaleConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/LocaleConverter.eea
index 1f35f5f6d7..c8a2f4de20 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/LocaleConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/LocaleConverter.eea
@@ -5,4 +5,4 @@ canConvert
  (Ljava/lang/Class;)Z
 fromString
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/NamedCollectionConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/NamedCollectionConverter.eea
index 01219c5f94..f5dbfaa28f 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/NamedCollectionConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/NamedCollectionConverter.eea
@@ -8,7 +8,7 @@ class com/thoughtworks/xstream/converters/extended/NamedCollectionConverter
  (Ljava/lang/Class;Lcom/thoughtworks/xstream/mapper/Mapper;Ljava/lang/String;Ljava/lang/Class;)V
 readBareItem
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;Ljava/lang/Object;)Ljava/lang/Object;
- (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;Ljava/lang/Object;)L0java/lang/Object;
 writeCompleteItem
  (Ljava/lang/Object;Lcom/thoughtworks/xstream/converters/MarshallingContext;Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;)V
  (Ljava/lang/Object;Lcom/thoughtworks/xstream/converters/MarshallingContext;Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;)V
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/NamedMapConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/NamedMapConverter.eea
index 81154680ae..6169b68156 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/NamedMapConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/NamedMapConverter.eea
@@ -20,7 +20,7 @@ populateMap
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;Ljava/util/Map;Ljava/util/Map;)V
 readItem
  (Ljava/lang/Class;Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Class;Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Class;Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;Ljava/lang/Object;)L0java/lang/Object;
 writeItem
  (Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Object;Lcom/thoughtworks/xstream/converters/MarshallingContext;Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;)V
  (Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Object;Lcom/thoughtworks/xstream/converters/MarshallingContext;Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;)V
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/OptionalDoubleConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/OptionalDoubleConverter.eea
index 8b42ee90dc..291c4150bb 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/OptionalDoubleConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/OptionalDoubleConverter.eea
@@ -11,7 +11,7 @@ marshal
  (L0java/lang/Object;L1com/thoughtworks/xstream/io/HierarchicalStreamWriter;L1com/thoughtworks/xstream/converters/MarshallingContext;)V # @Inherited(com.thoughtworks.xstream.converters.Converter)
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter)
 unmarshal
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;)Ljava/lang/Object;
  (L1com/thoughtworks/xstream/io/HierarchicalStreamReader;L1com/thoughtworks/xstream/converters/UnmarshallingContext;)L0java/lang/Object; # @Inherited(com.thoughtworks.xstream.converters.Converter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/OptionalIntConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/OptionalIntConverter.eea
index 6289e67ca5..1eaedf73f1 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/OptionalIntConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/OptionalIntConverter.eea
@@ -11,7 +11,7 @@ marshal
  (L0java/lang/Object;L1com/thoughtworks/xstream/io/HierarchicalStreamWriter;L1com/thoughtworks/xstream/converters/MarshallingContext;)V # @Inherited(com.thoughtworks.xstream.converters.Converter)
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter)
 unmarshal
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;)Ljava/lang/Object;
  (L1com/thoughtworks/xstream/io/HierarchicalStreamReader;L1com/thoughtworks/xstream/converters/UnmarshallingContext;)L0java/lang/Object; # @Inherited(com.thoughtworks.xstream.converters.Converter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/OptionalLongConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/OptionalLongConverter.eea
index 919b8f26e7..278d286ff8 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/OptionalLongConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/OptionalLongConverter.eea
@@ -11,7 +11,7 @@ marshal
  (L0java/lang/Object;L1com/thoughtworks/xstream/io/HierarchicalStreamWriter;L1com/thoughtworks/xstream/converters/MarshallingContext;)V # @Inherited(com.thoughtworks.xstream.converters.Converter)
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter)
 unmarshal
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;)Ljava/lang/Object;
  (L1com/thoughtworks/xstream/io/HierarchicalStreamReader;L1com/thoughtworks/xstream/converters/UnmarshallingContext;)L0java/lang/Object; # @Inherited(com.thoughtworks.xstream.converters.Converter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/PathConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/PathConverter.eea
index 46a97bb7e9..b0d532e5fc 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/PathConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/PathConverter.eea
@@ -8,4 +8,4 @@ fromString
  (Ljava/lang/String;)Ljava/nio/file/Path;
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/SqlTimestampConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/SqlTimestampConverter.eea
index 25972fb535..0d0f858bce 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/SqlTimestampConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/SqlTimestampConverter.eea
@@ -11,4 +11,4 @@ fromString
  (Ljava/lang/String;)Ljava/lang/Object;
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/StackTraceElementConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/StackTraceElementConverter.eea
index 352f7fa308..59f81c23f1 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/StackTraceElementConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/StackTraceElementConverter.eea
@@ -8,4 +8,4 @@ fromString
  (Ljava/lang/String;)Ljava/lang/Object;
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/StackTraceElementFactory.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/StackTraceElementFactory.eea
index 9c1290a2aa..18ce287749 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/StackTraceElementFactory.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/StackTraceElementFactory.eea
@@ -2,7 +2,7 @@ class com/thoughtworks/xstream/converters/extended/StackTraceElementFactory
 
 create
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/StackTraceElement;
- (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/StackTraceElement;
+ (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)L1java/lang/StackTraceElement;
 element
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StackTraceElement;
  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StackTraceElement;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/SubjectConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/SubjectConverter.eea
index e76b560bb4..cc6b79450c 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/SubjectConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/SubjectConverter.eea
@@ -23,7 +23,7 @@ marshalReadOnly
  (ZLcom/thoughtworks/xstream/io/HierarchicalStreamWriter;)V
 populateSet
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;)Ljava/util/Set;
- (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;)Ljava/util/Set;
+ (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;)L1java/util/Set;
 unmarshal
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;)Ljava/lang/Object;
  (L1com/thoughtworks/xstream/io/HierarchicalStreamReader;L1com/thoughtworks/xstream/converters/UnmarshallingContext;)L0java/lang/Object; # @Inherited(com.thoughtworks.xstream.converters.collections.AbstractCollectionConverter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/ToStringConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/ToStringConverter.eea
index 5244e00506..d89e4cae0c 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/ToStringConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/extended/ToStringConverter.eea
@@ -11,4 +11,4 @@ fromString
  (Ljava/lang/String;)Ljava/lang/Object;
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/javabean/BeanProvider.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/javabean/BeanProvider.eea
index 841d50de67..f3664a8304 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/javabean/BeanProvider.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/javabean/BeanProvider.eea
@@ -22,7 +22,7 @@ canStreamProperty
  (Ljava/beans/PropertyDescriptor;)Z
 getDefaultConstrutor
  (Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
- (Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
+ (Ljava/lang/Class;)L0java/lang/reflect/Constructor;
 getProperty
  (Ljava/lang/String;Ljava/lang/Class;)Ljava/beans/PropertyDescriptor;
  (Ljava/lang/String;Ljava/lang/Class;)Ljava/beans/PropertyDescriptor;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/javabean/ComparingPropertySorter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/javabean/ComparingPropertySorter.eea
index c12b2c2bd8..e704879cdf 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/javabean/ComparingPropertySorter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/javabean/ComparingPropertySorter.eea
@@ -5,4 +5,4 @@ class com/thoughtworks/xstream/converters/javabean/ComparingPropertySorter
  (Ljava/util/Comparator;)V
 sort
  (Ljava/lang/Class;Ljava/util/Map;)Ljava/util/Map;
- (Ljava/lang/Class;Ljava/util/Map;)Ljava/util/Map;
+ (Ljava/lang/Class;Ljava/util/Map;)L1java/util/Map;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/javabean/PropertyDictionary.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/javabean/PropertyDictionary.eea
index 135af8358b..08566b4ed3 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/javabean/PropertyDictionary.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/javabean/PropertyDictionary.eea
@@ -8,7 +8,7 @@ propertiesFor
  (Ljava/lang/Class;)Ljava/util/Iterator;
 property
  (Ljava/lang/Class;Ljava/lang/String;)Lcom/thoughtworks/xstream/converters/javabean/BeanProperty;
- (Ljava/lang/Class;Ljava/lang/String;)Lcom/thoughtworks/xstream/converters/javabean/BeanProperty;
+ (Ljava/lang/Class;Ljava/lang/String;)L1com/thoughtworks/xstream/converters/javabean/BeanProperty;
 propertyDescriptor
  (Ljava/lang/Class;Ljava/lang/String;)Ljava/beans/PropertyDescriptor;
  (Ljava/lang/Class;Ljava/lang/String;)Ljava/beans/PropertyDescriptor;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/reflection/AbstractAttributedCharacterIteratorAttributeConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/reflection/AbstractAttributedCharacterIteratorAttributeConverter.eea
index 85b9514dfe..b8b41dbf17 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/reflection/AbstractAttributedCharacterIteratorAttributeConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/reflection/AbstractAttributedCharacterIteratorAttributeConverter.eea
@@ -11,4 +11,4 @@ fromString
  (Ljava/lang/String;)Ljava/lang/Object;
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/reflection/CGLIBEnhancedConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/reflection/CGLIBEnhancedConverter.eea
index a5fdc4f7e2..cff01d666a 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/reflection/CGLIBEnhancedConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/reflection/CGLIBEnhancedConverter.eea
@@ -14,7 +14,7 @@ canConvert
  (Ljava/lang/Class;)Z
 hierarchyFor
  (Ljava/lang/Class;)Ljava/util/List;
- (Ljava/lang/Class;)Ljava/util/List;
+ (Ljava/lang/Class;)L1java/util/List; # @Inherited(com.thoughtworks.xstream.converters.reflection.SerializableConverter)
 marshal
  (Ljava/lang/Object;Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Lcom/thoughtworks/xstream/converters/MarshallingContext;)V
  (L0java/lang/Object;L1com/thoughtworks/xstream/io/HierarchicalStreamWriter;L1com/thoughtworks/xstream/converters/MarshallingContext;)V # @Inherited(com.thoughtworks.xstream.converters.reflection.AbstractReflectionConverter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/reflection/NativeFieldKeySorter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/reflection/NativeFieldKeySorter.eea
index 40fb4d922e..3df5ae143c 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/reflection/NativeFieldKeySorter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/reflection/NativeFieldKeySorter.eea
@@ -2,4 +2,4 @@ class com/thoughtworks/xstream/converters/reflection/NativeFieldKeySorter
 
 sort
  (Ljava/lang/Class;Ljava/util/Map;)Ljava/util/Map;
- (Ljava/lang/Class;Ljava/util/Map;)Ljava/util/Map;
+ (Ljava/lang/Class;Ljava/util/Map;)L1java/util/Map;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/reflection/SerializableConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/reflection/SerializableConverter.eea
index 06ec493704..ce927c412d 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/reflection/SerializableConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/reflection/SerializableConverter.eea
@@ -26,7 +26,7 @@ doUnmarshalConditionally
  (Ljava/lang/Object;Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/UnmarshallingContext;)Ljava/lang/Object;
 hierarchyFor
  (Ljava/lang/Class;)Ljava/util/List;
- (Ljava/lang/Class;)Ljava/util/List;
+ (Ljava/lang/Class;)L1java/util/List;
 marshalUnserializableParent
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Lcom/thoughtworks/xstream/converters/MarshallingContext;Ljava/lang/Object;)V
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Lcom/thoughtworks/xstream/converters/MarshallingContext;Ljava/lang/Object;)V
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/time/HijrahDateConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/time/HijrahDateConverter.eea
index 5662953b81..7ad7e765c8 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/time/HijrahDateConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/converters/time/HijrahDateConverter.eea
@@ -9,7 +9,7 @@ canConvert
  (Ljava/lang/Class;)Z
 chronoLocalDateOf
  (Ljava/time/chrono/HijrahEra;III)Ljava/time/chrono/ChronoLocalDate;
- (Ljava/time/chrono/HijrahEra;III)Ljava/time/chrono/ChronoLocalDate;
+ (Ljava/time/chrono/HijrahEra;III)L0java/time/chrono/ChronoLocalDate;
 eraOf
  (Ljava/lang/String;)Ljava/time/chrono/HijrahEra;
  (Ljava/lang/String;)Ljava/time/chrono/HijrahEra;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/AbstractReferenceMarshaller.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/AbstractReferenceMarshaller.eea
index 3b8bfb4a59..1c68e7a7d8 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/AbstractReferenceMarshaller.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/AbstractReferenceMarshaller.eea
@@ -8,10 +8,10 @@ convert
  (Ljava/lang/Object;Lcom/thoughtworks/xstream/converters/Converter;)V
 createReference
  (Lcom/thoughtworks/xstream/io/path/Path;Ljava/lang/Object;)Ljava/lang/String;
- (Lcom/thoughtworks/xstream/io/path/Path;Ljava/lang/Object;)Ljava/lang/String;
+ (Lcom/thoughtworks/xstream/io/path/Path;Ljava/lang/Object;)L1java/lang/String;
 createReferenceKey
  (Lcom/thoughtworks/xstream/io/path/Path;Ljava/lang/Object;)Ljava/lang/Object;
- (Lcom/thoughtworks/xstream/io/path/Path;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lcom/thoughtworks/xstream/io/path/Path;Ljava/lang/Object;)L1java/lang/Object;
 fireValidReference
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/AbstractTreeMarshallingStrategy.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/AbstractTreeMarshallingStrategy.eea
index 4732201168..a113288fbf 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/AbstractTreeMarshallingStrategy.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/AbstractTreeMarshallingStrategy.eea
@@ -2,10 +2,10 @@ class com/thoughtworks/xstream/core/AbstractTreeMarshallingStrategy
 
 createMarshallingContext
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;)Lcom/thoughtworks/xstream/core/TreeMarshaller;
- (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;)Lcom/thoughtworks/xstream/core/TreeMarshaller;
+ (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;)L1com/thoughtworks/xstream/core/TreeMarshaller;
 createUnmarshallingContext
  (Ljava/lang/Object;Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;)Lcom/thoughtworks/xstream/core/TreeUnmarshaller;
- (Ljava/lang/Object;Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;)Lcom/thoughtworks/xstream/core/TreeUnmarshaller;
+ (Ljava/lang/Object;Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;)L1com/thoughtworks/xstream/core/TreeUnmarshaller;
 marshal
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Ljava/lang/Object;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;Lcom/thoughtworks/xstream/converters/DataHolder;)V
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Ljava/lang/Object;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;Lcom/thoughtworks/xstream/converters/DataHolder;)V
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/DefaultConverterLookup.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/DefaultConverterLookup.eea
index 130c8b0a8e..a6d752aca2 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/DefaultConverterLookup.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/DefaultConverterLookup.eea
@@ -8,7 +8,7 @@ class com/thoughtworks/xstream/core/DefaultConverterLookup
  (Ljava/util/Map;)V
 lookupConverterForType
  (Ljava/lang/Class;)Lcom/thoughtworks/xstream/converters/Converter;
- (Ljava/lang/Class;)Lcom/thoughtworks/xstream/converters/Converter;
+ (Ljava/lang/Class;)L0com/thoughtworks/xstream/converters/Converter;
 registerConverter
  (Lcom/thoughtworks/xstream/converters/Converter;I)V
  (Lcom/thoughtworks/xstream/converters/Converter;I)V
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/JVM.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/JVM.eea
index c8d9d14eb1..9129cdb2b6 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/JVM.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/JVM.eea
@@ -5,16 +5,16 @@ getBase64Codec
  ()Lcom/thoughtworks/xstream/core/StringCodec;
 getStaxInputFactory
  ()Ljava/lang/Class;
- ()Ljava/lang/Class;
+ ()L0java/lang/Class;
 getStaxOutputFactory
  ()Ljava/lang/Class;
- ()Ljava/lang/Class;
+ ()L0java/lang/Class;
 loadClassForName
  (Ljava/lang/String;)Ljava/lang/Class;
  (Ljava/lang/String;)Ljava/lang/Class;
 loadClassForName
  (Ljava/lang/String;Z)Ljava/lang/Class;
- (Ljava/lang/String;Z)Ljava/lang/Class;
+ (Ljava/lang/String;Z)L0java/lang/Class;
 main
  ([Ljava/lang/String;)V
  ([Ljava/lang/String;)V
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/ReferenceByIdMarshaller.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/ReferenceByIdMarshaller.eea
index ba3ab97ba9..8823e4d5e3 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/ReferenceByIdMarshaller.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/ReferenceByIdMarshaller.eea
@@ -8,10 +8,10 @@ class com/thoughtworks/xstream/core/ReferenceByIdMarshaller
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;Lcom/thoughtworks/xstream/core/ReferenceByIdMarshaller$IDGenerator;)V
 createReference
  (Lcom/thoughtworks/xstream/io/path/Path;Ljava/lang/Object;)Ljava/lang/String;
- (Lcom/thoughtworks/xstream/io/path/Path;Ljava/lang/Object;)Ljava/lang/String;
+ (Lcom/thoughtworks/xstream/io/path/Path;Ljava/lang/Object;)L1java/lang/String; # @Inherited(com.thoughtworks.xstream.core.AbstractReferenceMarshaller)
 createReferenceKey
  (Lcom/thoughtworks/xstream/io/path/Path;Ljava/lang/Object;)Ljava/lang/Object;
- (Lcom/thoughtworks/xstream/io/path/Path;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lcom/thoughtworks/xstream/io/path/Path;Ljava/lang/Object;)L1java/lang/Object; # @Inherited(com.thoughtworks.xstream.core.AbstractReferenceMarshaller)
 fireValidReference
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/ReferenceByIdMarshallingStrategy.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/ReferenceByIdMarshallingStrategy.eea
index 5ad3d604a9..2ddd1fc75c 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/ReferenceByIdMarshallingStrategy.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/ReferenceByIdMarshallingStrategy.eea
@@ -2,7 +2,7 @@ class com/thoughtworks/xstream/core/ReferenceByIdMarshallingStrategy
 
 createMarshallingContext
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;)Lcom/thoughtworks/xstream/core/TreeMarshaller;
- (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;)Lcom/thoughtworks/xstream/core/TreeMarshaller;
+ (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;)L1com/thoughtworks/xstream/core/TreeMarshaller; # @Inherited(com.thoughtworks.xstream.core.AbstractTreeMarshallingStrategy)
 createUnmarshallingContext
  (Ljava/lang/Object;Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;)Lcom/thoughtworks/xstream/core/TreeUnmarshaller;
- (Ljava/lang/Object;Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;)Lcom/thoughtworks/xstream/core/TreeUnmarshaller;
+ (Ljava/lang/Object;Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;)L1com/thoughtworks/xstream/core/TreeUnmarshaller; # @Inherited(com.thoughtworks.xstream.core.AbstractTreeMarshallingStrategy)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/ReferenceByXPathMarshaller.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/ReferenceByXPathMarshaller.eea
index bc871bf7c8..3189c028e9 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/ReferenceByXPathMarshaller.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/ReferenceByXPathMarshaller.eea
@@ -5,10 +5,10 @@ class com/thoughtworks/xstream/core/ReferenceByXPathMarshaller
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;I)V
 createReference
  (Lcom/thoughtworks/xstream/io/path/Path;Ljava/lang/Object;)Ljava/lang/String;
- (Lcom/thoughtworks/xstream/io/path/Path;Ljava/lang/Object;)Ljava/lang/String;
+ (Lcom/thoughtworks/xstream/io/path/Path;Ljava/lang/Object;)L1java/lang/String; # @Inherited(com.thoughtworks.xstream.core.AbstractReferenceMarshaller)
 createReferenceKey
  (Lcom/thoughtworks/xstream/io/path/Path;Ljava/lang/Object;)Ljava/lang/Object;
- (Lcom/thoughtworks/xstream/io/path/Path;Ljava/lang/Object;)Ljava/lang/Object;
+ (Lcom/thoughtworks/xstream/io/path/Path;Ljava/lang/Object;)L1java/lang/Object; # @Inherited(com.thoughtworks.xstream.core.AbstractReferenceMarshaller)
 fireValidReference
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/ReferenceByXPathMarshallingStrategy.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/ReferenceByXPathMarshallingStrategy.eea
index 212fe1b336..e095cd2b88 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/ReferenceByXPathMarshallingStrategy.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/ReferenceByXPathMarshallingStrategy.eea
@@ -2,7 +2,7 @@ class com/thoughtworks/xstream/core/ReferenceByXPathMarshallingStrategy
 
 createMarshallingContext
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;)Lcom/thoughtworks/xstream/core/TreeMarshaller;
- (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;)Lcom/thoughtworks/xstream/core/TreeMarshaller;
+ (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;)L1com/thoughtworks/xstream/core/TreeMarshaller; # @Inherited(com.thoughtworks.xstream.core.AbstractTreeMarshallingStrategy)
 createUnmarshallingContext
  (Ljava/lang/Object;Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;)Lcom/thoughtworks/xstream/core/TreeUnmarshaller;
- (Ljava/lang/Object;Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;)Lcom/thoughtworks/xstream/core/TreeUnmarshaller;
+ (Ljava/lang/Object;Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;)L1com/thoughtworks/xstream/core/TreeUnmarshaller; # @Inherited(com.thoughtworks.xstream.core.AbstractTreeMarshallingStrategy)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/TreeMarshaller.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/TreeMarshaller.eea
index 1cda3ab856..38026269e3 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/TreeMarshaller.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/TreeMarshaller.eea
@@ -21,7 +21,7 @@ convertAnother
  (Ljava/lang/Object;Lcom/thoughtworks/xstream/converters/Converter;)V
 get
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L0java/lang/Object;
 getMapper
  ()Lcom/thoughtworks/xstream/mapper/Mapper;
  ()Lcom/thoughtworks/xstream/mapper/Mapper;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/TreeMarshallingStrategy.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/TreeMarshallingStrategy.eea
index d65035e18a..f459e476cc 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/TreeMarshallingStrategy.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/TreeMarshallingStrategy.eea
@@ -2,7 +2,7 @@ class com/thoughtworks/xstream/core/TreeMarshallingStrategy
 
 createMarshallingContext
  (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;)Lcom/thoughtworks/xstream/core/TreeMarshaller;
- (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;)Lcom/thoughtworks/xstream/core/TreeMarshaller;
+ (Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;)L1com/thoughtworks/xstream/core/TreeMarshaller; # @Inherited(com.thoughtworks.xstream.core.AbstractTreeMarshallingStrategy)
 createUnmarshallingContext
  (Ljava/lang/Object;Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;)Lcom/thoughtworks/xstream/core/TreeUnmarshaller;
- (Ljava/lang/Object;Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;)Lcom/thoughtworks/xstream/core/TreeUnmarshaller;
+ (Ljava/lang/Object;Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;Lcom/thoughtworks/xstream/converters/ConverterLookup;Lcom/thoughtworks/xstream/mapper/Mapper;)L1com/thoughtworks/xstream/core/TreeUnmarshaller; # @Inherited(com.thoughtworks.xstream.core.AbstractTreeMarshallingStrategy)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/TreeUnmarshaller.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/TreeUnmarshaller.eea
index 34463d340a..1b5942ccd6 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/TreeUnmarshaller.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/TreeUnmarshaller.eea
@@ -21,10 +21,10 @@ convertAnother
  (Ljava/lang/Object;Ljava/lang/Class;Lcom/thoughtworks/xstream/converters/Converter;)Ljava/lang/Object;
 currentObject
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object;
 get
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L0java/lang/Object;
 getMapper
  ()Lcom/thoughtworks/xstream/mapper/Mapper;
  ()Lcom/thoughtworks/xstream/mapper/Mapper;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/Base64Encoder.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/Base64Encoder.eea
index cd4a15a252..167a5cd6bb 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/Base64Encoder.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/Base64Encoder.eea
@@ -5,4 +5,4 @@ decode
  (Ljava/lang/String;)[B
 encode
  ([B)Ljava/lang/String;
- ([B)Ljava/lang/String;
+ ([B)L1java/lang/String;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/Cloneables.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/Cloneables.eea
index 13dd61ec86..ae3550f0a0 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/Cloneables.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/Cloneables.eea
@@ -2,7 +2,7 @@ class com/thoughtworks/xstream/core/util/Cloneables
 
 clone
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L0java/lang/Object;
 cloneIfPossible
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/CustomObjectInputStream.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/CustomObjectInputStream.eea
index e8599eadb7..44db662947 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/CustomObjectInputStream.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/CustomObjectInputStream.eea
@@ -5,7 +5,7 @@ getInstance
  (Lcom/thoughtworks/xstream/converters/DataHolder;Lcom/thoughtworks/xstream/core/util/CustomObjectInputStream$StreamCallback;)Lcom/thoughtworks/xstream/core/util/CustomObjectInputStream;
 getInstance
  (Lcom/thoughtworks/xstream/converters/DataHolder;Lcom/thoughtworks/xstream/core/util/CustomObjectInputStream$StreamCallback;Lcom/thoughtworks/xstream/core/ClassLoaderReference;)Lcom/thoughtworks/xstream/core/util/CustomObjectInputStream;
- (Lcom/thoughtworks/xstream/converters/DataHolder;Lcom/thoughtworks/xstream/core/util/CustomObjectInputStream$StreamCallback;Lcom/thoughtworks/xstream/core/ClassLoaderReference;)Lcom/thoughtworks/xstream/core/util/CustomObjectInputStream;
+ (Lcom/thoughtworks/xstream/converters/DataHolder;Lcom/thoughtworks/xstream/core/util/CustomObjectInputStream$StreamCallback;Lcom/thoughtworks/xstream/core/ClassLoaderReference;)L1com/thoughtworks/xstream/core/util/CustomObjectInputStream;
 getInstance
  (Lcom/thoughtworks/xstream/converters/DataHolder;Lcom/thoughtworks/xstream/core/util/CustomObjectInputStream$StreamCallback;Ljava/lang/ClassLoader;)Lcom/thoughtworks/xstream/core/util/CustomObjectInputStream;
  (Lcom/thoughtworks/xstream/converters/DataHolder;Lcom/thoughtworks/xstream/core/util/CustomObjectInputStream$StreamCallback;Ljava/lang/ClassLoader;)Lcom/thoughtworks/xstream/core/util/CustomObjectInputStream;
@@ -33,7 +33,7 @@ read
  ([1BII)I # @Inherited(java.io.ObjectInputStream)
 readFields
  ()Ljava/io/ObjectInputStream$GetField;
- ()Ljava/io/ObjectInputStream$GetField;
+ ()L1java/io/ObjectInputStream$GetField; # @Inherited(java.io.ObjectInputStream)
 readFully
  ([B)V
  ([1B)V # @Inherited(java.io.ObjectInputStream)
@@ -45,7 +45,7 @@ readLine
  ()L0java/lang/String; # @Inherited(java.io.ObjectInputStream)
 readObjectOverride
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L0java/lang/Object; # @Inherited(java.io.ObjectInputStream)
 readUTF
  ()Ljava/lang/String;
  ()L1java/lang/String; # @Inherited(java.io.ObjectInputStream)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/CustomObjectOutputStream.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/CustomObjectOutputStream.eea
index 9ae999ef9b..6a4324087e 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/CustomObjectOutputStream.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/CustomObjectOutputStream.eea
@@ -2,7 +2,7 @@ class com/thoughtworks/xstream/core/util/CustomObjectOutputStream
 
 getInstance
  (Lcom/thoughtworks/xstream/converters/DataHolder;Lcom/thoughtworks/xstream/core/util/CustomObjectOutputStream$StreamCallback;)Lcom/thoughtworks/xstream/core/util/CustomObjectOutputStream;
- (Lcom/thoughtworks/xstream/converters/DataHolder;Lcom/thoughtworks/xstream/core/util/CustomObjectOutputStream$StreamCallback;)Lcom/thoughtworks/xstream/core/util/CustomObjectOutputStream;
+ (Lcom/thoughtworks/xstream/converters/DataHolder;Lcom/thoughtworks/xstream/core/util/CustomObjectOutputStream$StreamCallback;)L1com/thoughtworks/xstream/core/util/CustomObjectOutputStream;
 
 <init>
  (Lcom/thoughtworks/xstream/core/util/CustomObjectOutputStream$StreamCallback;)V
@@ -18,7 +18,7 @@ pushCallback
  (Lcom/thoughtworks/xstream/core/util/CustomObjectOutputStream$StreamCallback;)V
 putFields
  ()Ljava/io/ObjectOutputStream$PutField;
- ()Ljava/io/ObjectOutputStream$PutField;
+ ()L1java/io/ObjectOutputStream$PutField;
 write
  ([B)V
  ([1B)V # @Inherited(java.io.ObjectOutputStream)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/ISO8601JavaTimeConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/ISO8601JavaTimeConverter.eea
index e354a82921..5f39233a14 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/ISO8601JavaTimeConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/ISO8601JavaTimeConverter.eea
@@ -8,4 +8,4 @@ fromString
  (Ljava/lang/String;)Ljava/lang/Object;
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/ISO8601JodaTimeConverter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/ISO8601JodaTimeConverter.eea
index e53efeb450..a1f96169ad 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/ISO8601JodaTimeConverter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/ISO8601JodaTimeConverter.eea
@@ -8,4 +8,4 @@ fromString
  (Ljava/lang/String;)Ljava/lang/Object;
 toString
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String; # @Inherited(com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/PresortedMap.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/PresortedMap.eea
index a932ec4031..611a6d27de 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/PresortedMap.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/PresortedMap.eea
@@ -17,34 +17,34 @@ entrySet
  ()Ljava/util/Set;
 firstKey
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 get
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object;
 headMap
  (Ljava/lang/Object;)Ljava/util/SortedMap;
- (Ljava/lang/Object;)Ljava/util/SortedMap;
+ (Ljava/lang/Object;)L1java/util/SortedMap;
 keySet
  ()Ljava/util/Set;
- ()Ljava/util/Set;
+ ()L1java/util/Set;
 lastKey
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
 put
  (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;Ljava/lang/Object;)L0java/lang/Object;
 putAll
  (Ljava/util/Map;)V
  (Ljava/util/Map;)V
 remove
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L1java/lang/Object;
 subMap
  (Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/SortedMap;
- (Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/SortedMap;
+ (Ljava/lang/Object;Ljava/lang/Object;)L1java/util/SortedMap;
 tailMap
  (Ljava/lang/Object;)Ljava/util/SortedMap;
- (Ljava/lang/Object;)Ljava/util/SortedMap;
+ (Ljava/lang/Object;)L1java/util/SortedMap;
 values
  ()Ljava/util/Collection;
- ()Ljava/util/Collection;
+ ()L1java/util/Collection;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/PresortedSet.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/PresortedSet.eea
index 43f9a74df0..a3e335344d 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/PresortedSet.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/PresortedSet.eea
@@ -29,7 +29,7 @@ first
  ()Ljava/lang/Object;
 headSet
  (Ljava/lang/Object;)Ljava/util/SortedSet;
- (Ljava/lang/Object;)Ljava/util/SortedSet;
+ (Ljava/lang/Object;)L1java/util/SortedSet;
 iterator
  ()Ljava/util/Iterator;
  ()Ljava/util/Iterator;
@@ -50,10 +50,10 @@ subList
  (II)Ljava/util/List;
 subSet
  (Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/SortedSet;
- (Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/SortedSet;
+ (Ljava/lang/Object;Ljava/lang/Object;)L1java/util/SortedSet;
 tailSet
  (Ljava/lang/Object;)Ljava/util/SortedSet;
- (Ljava/lang/Object;)Ljava/util/SortedSet;
+ (Ljava/lang/Object;)L1java/util/SortedSet;
 toArray
  ()[Ljava/lang/Object;
  ()[1Ljava/lang/Object; # @Inherited(java.util.Set)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/PrioritizedList.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/PrioritizedList.eea
index 8c4431c9bc..e92e7a7304 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/PrioritizedList.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/PrioritizedList.eea
@@ -5,4 +5,4 @@ add
  (Ljava/lang/Object;I)V
 iterator
  ()Ljava/util/Iterator;
- ()Ljava/util/Iterator;
+ ()L1java/util/Iterator;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/WeakCache.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/WeakCache.eea
index 6843215fd6..9f5ef7ea5f 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/WeakCache.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/core/util/WeakCache.eea
@@ -11,16 +11,16 @@ containsValue
  (L0java/lang/Object;)Z # @Inherited(java.util.AbstractMap)
 createReference
  (Ljava/lang/Object;)Ljava/lang/ref/Reference;
- (Ljava/lang/Object;)Ljava/lang/ref/Reference;
+ (Ljava/lang/Object;)L1java/lang/ref/Reference;
 entrySet
  ()Ljava/util/Set;
- ()Ljava/util/Set;
+ ()L1java/util/Set;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.util.AbstractMap)
 get
  (Ljava/lang/Object;)Ljava/lang/Object;
- (Ljava/lang/Object;)Ljava/lang/Object;
+ (Ljava/lang/Object;)L0java/lang/Object;
 keySet
  ()Ljava/util/Set;
  ()Ljava/util/Set;
@@ -35,4 +35,4 @@ toString
  ()L1java/lang/String; # @Inherited(java.util.AbstractMap)
 values
  ()Ljava/util/Collection;
- ()Ljava/util/Collection;
+ ()L1java/util/Collection;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/AbstractDriver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/AbstractDriver.eea
index f2bcf81b06..7bce97805b 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/AbstractDriver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/AbstractDriver.eea
@@ -5,10 +5,10 @@ class com/thoughtworks/xstream/io/AbstractDriver
  (Lcom/thoughtworks/xstream/io/naming/NameCoder;)V
 createReader
  (Ljava/io/File;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/File;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/File;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createReader
  (Ljava/net/URL;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/net/URL;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/net/URL;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 getNameCoder
  ()Lcom/thoughtworks/xstream/io/naming/NameCoder;
  ()Lcom/thoughtworks/xstream/io/naming/NameCoder;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/AbstractReader.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/AbstractReader.eea
index 22824e5bad..3d2ac54a46 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/AbstractReader.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/AbstractReader.eea
@@ -17,7 +17,7 @@ encodeNode
  (Ljava/lang/String;)Ljava/lang/String;
 peekNextChild
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 underlyingReader
  ()Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
  ()Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/HierarchicalStreamDriver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/HierarchicalStreamDriver.eea
index 5ba0b4b145..22e6a397ff 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/HierarchicalStreamDriver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/HierarchicalStreamDriver.eea
@@ -2,19 +2,19 @@ class com/thoughtworks/xstream/io/HierarchicalStreamDriver
 
 createReader
  (Ljava/io/File;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/File;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/File;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader;
 createReader
  (Ljava/io/InputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/InputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/InputStream;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader;
 createReader
  (Ljava/io/Reader;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/Reader;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/Reader;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader;
 createReader
  (Ljava/net/URL;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/net/URL;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/net/URL;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader;
 createWriter
  (Ljava/io/OutputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
- (Ljava/io/OutputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
+ (Ljava/io/OutputStream;)L1com/thoughtworks/xstream/io/HierarchicalStreamWriter;
 createWriter
  (Ljava/io/Writer;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
- (Ljava/io/Writer;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
+ (Ljava/io/Writer;)L1com/thoughtworks/xstream/io/HierarchicalStreamWriter;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/binary/BinaryStreamDriver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/binary/BinaryStreamDriver.eea
index b8ae075dfd..30f516bbb4 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/binary/BinaryStreamDriver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/binary/BinaryStreamDriver.eea
@@ -2,13 +2,13 @@ class com/thoughtworks/xstream/io/binary/BinaryStreamDriver
 
 createReader
  (Ljava/io/InputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/InputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/InputStream;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createReader
  (Ljava/io/Reader;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/Reader;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/Reader;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createWriter
  (Ljava/io/OutputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
- (Ljava/io/OutputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
+ (Ljava/io/OutputStream;)L1com/thoughtworks/xstream/io/HierarchicalStreamWriter; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createWriter
  (Ljava/io/Writer;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
- (Ljava/io/Writer;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
+ (Ljava/io/Writer;)L1com/thoughtworks/xstream/io/HierarchicalStreamWriter; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/binary/BinaryStreamReader.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/binary/BinaryStreamReader.eea
index ec63fc2572..6342547989 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/binary/BinaryStreamReader.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/binary/BinaryStreamReader.eea
@@ -26,7 +26,7 @@ getValue
  ()Ljava/lang/String;
 peekNextChild
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String;
 pushBack
  (Lcom/thoughtworks/xstream/io/binary/Token;)V
  (Lcom/thoughtworks/xstream/io/binary/Token;)V
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/json/JettisonMappedXmlDriver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/json/JettisonMappedXmlDriver.eea
index 3ee9c620f6..e7116567b2 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/json/JettisonMappedXmlDriver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/json/JettisonMappedXmlDriver.eea
@@ -18,19 +18,19 @@ mof
  (Lorg/codehaus/jettison/mapped/Configuration;Z)V
 createReader
  (Ljava/io/File;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/File;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/File;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.AbstractDriver)
 createReader
  (Ljava/io/InputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/InputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/InputStream;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createReader
  (Ljava/io/Reader;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/Reader;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/Reader;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createReader
  (Ljava/net/URL;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/net/URL;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/net/URL;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.AbstractDriver)
 createWriter
  (Ljava/io/OutputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
- (Ljava/io/OutputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
+ (Ljava/io/OutputStream;)L1com/thoughtworks/xstream/io/HierarchicalStreamWriter; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createWriter
  (Ljava/io/Writer;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
- (Ljava/io/Writer;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
+ (Ljava/io/Writer;)L1com/thoughtworks/xstream/io/HierarchicalStreamWriter; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/json/JsonHierarchicalStreamDriver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/json/JsonHierarchicalStreamDriver.eea
index cd792a9e98..b855402a18 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/json/JsonHierarchicalStreamDriver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/json/JsonHierarchicalStreamDriver.eea
@@ -5,19 +5,19 @@ class com/thoughtworks/xstream/io/json/JsonHierarchicalStreamDriver
  (Lcom/thoughtworks/xstream/io/naming/NameCoder;)V
 createReader
  (Ljava/io/File;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/File;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/File;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.AbstractDriver)
 createReader
  (Ljava/io/InputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/InputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/InputStream;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createReader
  (Ljava/io/Reader;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/Reader;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/Reader;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createReader
  (Ljava/net/URL;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/net/URL;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/net/URL;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.AbstractDriver)
 createWriter
  (Ljava/io/OutputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
- (Ljava/io/OutputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
+ (Ljava/io/OutputStream;)L1com/thoughtworks/xstream/io/HierarchicalStreamWriter; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createWriter
  (Ljava/io/Writer;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
- (Ljava/io/Writer;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
+ (Ljava/io/Writer;)L1com/thoughtworks/xstream/io/HierarchicalStreamWriter; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/path/Path.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/path/Path.eea
index ed426f361e..b86c1a660c 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/path/Path.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/path/Path.eea
@@ -8,7 +8,7 @@ class com/thoughtworks/xstream/io/path/Path
  ([Ljava/lang/String;)V
 apply
  (Lcom/thoughtworks/xstream/io/path/Path;)Lcom/thoughtworks/xstream/io/path/Path;
- (Lcom/thoughtworks/xstream/io/path/Path;)Lcom/thoughtworks/xstream/io/path/Path;
+ (Lcom/thoughtworks/xstream/io/path/Path;)L1com/thoughtworks/xstream/io/path/Path;
 equals
  (Ljava/lang/Object;)Z
  (L0java/lang/Object;)Z # @Inherited(java.lang.Object)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/AbstractDocumentReader.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/AbstractDocumentReader.eea
index 6f6d881204..40b6b21c28 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/AbstractDocumentReader.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/AbstractDocumentReader.eea
@@ -14,7 +14,7 @@ appendErrors
  (Lcom/thoughtworks/xstream/converters/ErrorWriter;)V
 getAttributeNames
  ()Ljava/util/Iterator;
- ()Ljava/util/Iterator;
+ ()L1java/util/Iterator;
 getChild
  (I)Ljava/lang/Object;
  (I)Ljava/lang/Object;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/AbstractDocumentWriter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/AbstractDocumentWriter.eea
index 26273b4e1c..d78de5ba6e 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/AbstractDocumentWriter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/AbstractDocumentWriter.eea
@@ -8,7 +8,7 @@ class com/thoughtworks/xstream/io/xml/AbstractDocumentWriter
  (Ljava/lang/Object;Lcom/thoughtworks/xstream/io/xml/XmlFriendlyReplacer;)V
 createNode
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object;
 getCurrent
  ()Ljava/lang/Object;
  ()Ljava/lang/Object;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/AbstractPullReader.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/AbstractPullReader.eea
index 33adf36247..964bedb9f1 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/AbstractPullReader.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/AbstractPullReader.eea
@@ -8,7 +8,7 @@ class com/thoughtworks/xstream/io/xml/AbstractPullReader
  (Lcom/thoughtworks/xstream/io/xml/XmlFriendlyReplacer;)V
 getAttributeNames
  ()Ljava/util/Iterator;
- ()Ljava/util/Iterator;
+ ()L1java/util/Iterator;
 getNodeName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
@@ -17,7 +17,7 @@ getValue
  ()Ljava/lang/String;
 peekNextChild
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Overrides(com.thoughtworks.xstream.io.AbstractReader)
 pullElementName
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/AbstractXmlDriver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/AbstractXmlDriver.eea
index f9742fe2e3..64709ac22b 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/AbstractXmlDriver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/AbstractXmlDriver.eea
@@ -8,4 +8,4 @@ class com/thoughtworks/xstream/io/xml/AbstractXmlDriver
  (Lcom/thoughtworks/xstream/io/xml/XmlFriendlyReplacer;)V
 xmlFriendlyReplacer
  ()Lcom/thoughtworks/xstream/io/xml/XmlFriendlyReplacer;
- ()Lcom/thoughtworks/xstream/io/xml/XmlFriendlyReplacer;
+ ()L0com/thoughtworks/xstream/io/xml/XmlFriendlyReplacer;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/AbstractXppDomDriver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/AbstractXppDomDriver.eea
index e3f91f156a..789ced075f 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/AbstractXppDomDriver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/AbstractXppDomDriver.eea
@@ -5,16 +5,16 @@ class com/thoughtworks/xstream/io/xml/AbstractXppDomDriver
  (Lcom/thoughtworks/xstream/io/naming/NameCoder;)V
 createParser
  ()Lorg/xmlpull/v1/XmlPullParser;
- ()Lorg/xmlpull/v1/XmlPullParser;
+ ()L1org/xmlpull/v1/XmlPullParser;
 createReader
  (Ljava/io/InputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/InputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/InputStream;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createReader
  (Ljava/io/Reader;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/Reader;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/Reader;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createWriter
  (Ljava/io/OutputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
- (Ljava/io/OutputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
+ (Ljava/io/OutputStream;)L1com/thoughtworks/xstream/io/HierarchicalStreamWriter; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createWriter
  (Ljava/io/Writer;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
- (Ljava/io/Writer;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
+ (Ljava/io/Writer;)L1com/thoughtworks/xstream/io/HierarchicalStreamWriter; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/AbstractXppDriver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/AbstractXppDriver.eea
index 29ea062c46..aaf540e7fc 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/AbstractXppDriver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/AbstractXppDriver.eea
@@ -5,16 +5,16 @@ class com/thoughtworks/xstream/io/xml/AbstractXppDriver
  (Lcom/thoughtworks/xstream/io/naming/NameCoder;)V
 createParser
  ()Lorg/xmlpull/v1/XmlPullParser;
- ()Lorg/xmlpull/v1/XmlPullParser;
+ ()L1org/xmlpull/v1/XmlPullParser;
 createReader
  (Ljava/io/InputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/InputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/InputStream;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createReader
  (Ljava/io/Reader;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/Reader;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/Reader;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createWriter
  (Ljava/io/OutputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
- (Ljava/io/OutputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
+ (Ljava/io/OutputStream;)L1com/thoughtworks/xstream/io/HierarchicalStreamWriter; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createWriter
  (Ljava/io/Writer;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
- (Ljava/io/Writer;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
+ (Ljava/io/Writer;)L1com/thoughtworks/xstream/io/HierarchicalStreamWriter; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/BEAStaxDriver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/BEAStaxDriver.eea
index 4e2cec3099..2195b50231 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/BEAStaxDriver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/BEAStaxDriver.eea
@@ -17,7 +17,7 @@ class com/thoughtworks/xstream/io/xml/BEAStaxDriver
  (Lcom/thoughtworks/xstream/io/xml/XmlFriendlyNameCoder;)V
 createInputFactory
  ()Ljavax/xml/stream/XMLInputFactory;
- ()Ljavax/xml/stream/XMLInputFactory;
+ ()L1javax/xml/stream/XMLInputFactory; # @Inherited(com.thoughtworks.xstream.io.xml.StaxDriver)
 createOutputFactory
  ()Ljavax/xml/stream/XMLOutputFactory;
- ()Ljavax/xml/stream/XMLOutputFactory;
+ ()L1javax/xml/stream/XMLOutputFactory; # @Inherited(com.thoughtworks.xstream.io.xml.StaxDriver)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/Dom4JDriver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/Dom4JDriver.eea
index 3b1b3f8edf..21cb221b69 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/Dom4JDriver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/Dom4JDriver.eea
@@ -14,25 +14,25 @@ class com/thoughtworks/xstream/io/xml/Dom4JDriver
  (Lorg/dom4j/DocumentFactory;Lorg/dom4j/io/OutputFormat;Lcom/thoughtworks/xstream/io/xml/XmlFriendlyReplacer;)V
 createReader
  ()Lorg/dom4j/io/SAXReader;
- ()Lorg/dom4j/io/SAXReader;
+ ()L1org/dom4j/io/SAXReader;
 createReader
  (Ljava/io/File;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/File;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/File;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.AbstractDriver)
 createReader
  (Ljava/io/InputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/InputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/InputStream;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createReader
  (Ljava/io/Reader;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/Reader;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/Reader;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createReader
  (Ljava/net/URL;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/net/URL;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/net/URL;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.AbstractDriver)
 createWriter
  (Ljava/io/OutputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
- (Ljava/io/OutputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
+ (Ljava/io/OutputStream;)L1com/thoughtworks/xstream/io/HierarchicalStreamWriter; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createWriter
  (Ljava/io/Writer;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
- (Ljava/io/Writer;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
+ (Ljava/io/Writer;)L1com/thoughtworks/xstream/io/HierarchicalStreamWriter; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 getDocumentFactory
  ()Lorg/dom4j/DocumentFactory;
  ()Lorg/dom4j/DocumentFactory;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/Dom4JReader.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/Dom4JReader.eea
index fc1c347bc0..db1c3cebcc 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/Dom4JReader.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/Dom4JReader.eea
@@ -47,7 +47,7 @@ getValue
  ()Ljava/lang/String;
 peekNextChild
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Overrides(com.thoughtworks.xstream.io.AbstractReader)
 reassignCurrentElement
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/Dom4JWriter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/Dom4JWriter.eea
index 0bebeb00a1..bad5124603 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/Dom4JWriter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/Dom4JWriter.eea
@@ -29,7 +29,7 @@ addAttribute
  (Ljava/lang/String;Ljava/lang/String;)V
 createNode
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object; # @Inherited(com.thoughtworks.xstream.io.xml.AbstractDocumentWriter)
 setValue
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/DomDriver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/DomDriver.eea
index 0ba6b5fa99..2de6aa172c 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/DomDriver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/DomDriver.eea
@@ -11,22 +11,22 @@ class com/thoughtworks/xstream/io/xml/DomDriver
  (Ljava/lang/String;Lcom/thoughtworks/xstream/io/xml/XmlFriendlyReplacer;)V
 createDocumentBuilderFactory
  ()Ljavax/xml/parsers/DocumentBuilderFactory;
- ()Ljavax/xml/parsers/DocumentBuilderFactory;
+ ()L1javax/xml/parsers/DocumentBuilderFactory;
 createReader
  (Ljava/io/File;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/File;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/File;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.AbstractDriver)
 createReader
  (Ljava/io/InputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/InputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/InputStream;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createReader
  (Ljava/io/Reader;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/Reader;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/Reader;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createReader
  (Ljava/net/URL;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/net/URL;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/net/URL;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.AbstractDriver)
 createWriter
  (Ljava/io/OutputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
- (Ljava/io/OutputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
+ (Ljava/io/OutputStream;)L1com/thoughtworks/xstream/io/HierarchicalStreamWriter; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createWriter
  (Ljava/io/Writer;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
- (Ljava/io/Writer;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
+ (Ljava/io/Writer;)L1com/thoughtworks/xstream/io/HierarchicalStreamWriter; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/DomReader.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/DomReader.eea
index bc6bebf441..bdddf780d7 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/DomReader.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/DomReader.eea
@@ -38,10 +38,10 @@ getParent
  ()Ljava/lang/Object;
 getValue
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 peekNextChild
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Overrides(com.thoughtworks.xstream.io.AbstractReader)
 reassignCurrentElement
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/DomWriter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/DomWriter.eea
index b71ec59b06..f158715f4a 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/DomWriter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/DomWriter.eea
@@ -29,7 +29,7 @@ addAttribute
  (Ljava/lang/String;Ljava/lang/String;)V
 createNode
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object; # @Inherited(com.thoughtworks.xstream.io.xml.AbstractDocumentWriter)
 setValue
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/JDom2Driver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/JDom2Driver.eea
index 8d37cba04b..a1798a72ec 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/JDom2Driver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/JDom2Driver.eea
@@ -5,22 +5,22 @@ class com/thoughtworks/xstream/io/xml/JDom2Driver
  (Lcom/thoughtworks/xstream/io/naming/NameCoder;)V
 createBuilder
  ()Lorg/jdom2/input/SAXBuilder;
- ()Lorg/jdom2/input/SAXBuilder;
+ ()L1org/jdom2/input/SAXBuilder;
 createReader
  (Ljava/io/File;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/File;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/File;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.AbstractDriver)
 createReader
  (Ljava/io/InputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/InputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/InputStream;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createReader
  (Ljava/io/Reader;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/Reader;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/Reader;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createReader
  (Ljava/net/URL;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/net/URL;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/net/URL;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.AbstractDriver)
 createWriter
  (Ljava/io/OutputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
- (Ljava/io/OutputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
+ (Ljava/io/OutputStream;)L1com/thoughtworks/xstream/io/HierarchicalStreamWriter; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createWriter
  (Ljava/io/Writer;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
- (Ljava/io/Writer;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
+ (Ljava/io/Writer;)L1com/thoughtworks/xstream/io/HierarchicalStreamWriter; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/JDom2Reader.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/JDom2Reader.eea
index c744773232..1bb832e878 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/JDom2Reader.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/JDom2Reader.eea
@@ -35,7 +35,7 @@ getValue
  ()Ljava/lang/String;
 peekNextChild
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Overrides(com.thoughtworks.xstream.io.AbstractReader)
 reassignCurrentElement
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/JDom2Writer.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/JDom2Writer.eea
index 65da37393a..6d9e089791 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/JDom2Writer.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/JDom2Writer.eea
@@ -23,7 +23,7 @@ addAttribute
  (Ljava/lang/String;Ljava/lang/String;)V
 createNode
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object; # @Inherited(com.thoughtworks.xstream.io.xml.AbstractDocumentWriter)
 setValue
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/JDomDriver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/JDomDriver.eea
index c23572360e..1e3ac3c7bb 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/JDomDriver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/JDomDriver.eea
@@ -8,22 +8,22 @@ class com/thoughtworks/xstream/io/xml/JDomDriver
  (Lcom/thoughtworks/xstream/io/xml/XmlFriendlyReplacer;)V
 createBuilder
  ()Lorg/jdom/input/SAXBuilder;
- ()Lorg/jdom/input/SAXBuilder;
+ ()L1org/jdom/input/SAXBuilder;
 createReader
  (Ljava/io/File;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/File;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/File;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.AbstractDriver)
 createReader
  (Ljava/io/InputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/InputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/InputStream;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createReader
  (Ljava/io/Reader;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/Reader;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/Reader;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createReader
  (Ljava/net/URL;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/net/URL;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/net/URL;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.AbstractDriver)
 createWriter
  (Ljava/io/OutputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
- (Ljava/io/OutputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
+ (Ljava/io/OutputStream;)L1com/thoughtworks/xstream/io/HierarchicalStreamWriter; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createWriter
  (Ljava/io/Writer;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
- (Ljava/io/Writer;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
+ (Ljava/io/Writer;)L1com/thoughtworks/xstream/io/HierarchicalStreamWriter; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/JDomReader.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/JDomReader.eea
index 5ce62e4f9f..c171e15506 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/JDomReader.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/JDomReader.eea
@@ -41,7 +41,7 @@ getValue
  ()Ljava/lang/String;
 peekNextChild
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Overrides(com.thoughtworks.xstream.io.AbstractReader)
 reassignCurrentElement
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/JDomWriter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/JDomWriter.eea
index a0a850ae7a..ac5272cce7 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/JDomWriter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/JDomWriter.eea
@@ -32,7 +32,7 @@ addAttribute
  (Ljava/lang/String;Ljava/lang/String;)V
 createNode
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object; # @Inherited(com.thoughtworks.xstream.io.xml.AbstractDocumentWriter)
 setValue
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/KXml2DomDriver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/KXml2DomDriver.eea
index fe3628c96f..1f59113df2 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/KXml2DomDriver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/KXml2DomDriver.eea
@@ -5,4 +5,4 @@ class com/thoughtworks/xstream/io/xml/KXml2DomDriver
  (Lcom/thoughtworks/xstream/io/naming/NameCoder;)V
 createParser
  ()Lorg/xmlpull/v1/XmlPullParser;
- ()Lorg/xmlpull/v1/XmlPullParser;
+ ()L1org/xmlpull/v1/XmlPullParser; # @Inherited(com.thoughtworks.xstream.io.xml.AbstractXppDomDriver)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/KXml2Driver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/KXml2Driver.eea
index 3aaad4c730..e83cb8e0c4 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/KXml2Driver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/KXml2Driver.eea
@@ -5,4 +5,4 @@ class com/thoughtworks/xstream/io/xml/KXml2Driver
  (Lcom/thoughtworks/xstream/io/naming/NameCoder;)V
 createParser
  ()Lorg/xmlpull/v1/XmlPullParser;
- ()Lorg/xmlpull/v1/XmlPullParser;
+ ()L1org/xmlpull/v1/XmlPullParser; # @Inherited(com.thoughtworks.xstream.io.xml.AbstractXppDriver)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/MXParserDomDriver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/MXParserDomDriver.eea
index 9da57271dd..2d6487b6e1 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/MXParserDomDriver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/MXParserDomDriver.eea
@@ -5,4 +5,4 @@ class com/thoughtworks/xstream/io/xml/MXParserDomDriver
  (Lcom/thoughtworks/xstream/io/naming/NameCoder;)V
 createParser
  ()Lorg/xmlpull/v1/XmlPullParser;
- ()Lorg/xmlpull/v1/XmlPullParser;
+ ()L1org/xmlpull/v1/XmlPullParser; # @Inherited(com.thoughtworks.xstream.io.xml.AbstractXppDomDriver)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/MXParserDriver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/MXParserDriver.eea
index 760f5cfa9b..fadf785855 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/MXParserDriver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/MXParserDriver.eea
@@ -5,4 +5,4 @@ class com/thoughtworks/xstream/io/xml/MXParserDriver
  (Lcom/thoughtworks/xstream/io/naming/NameCoder;)V
 createParser
  ()Lorg/xmlpull/v1/XmlPullParser;
- ()Lorg/xmlpull/v1/XmlPullParser;
+ ()L1org/xmlpull/v1/XmlPullParser; # @Inherited(com.thoughtworks.xstream.io.xml.AbstractXppDriver)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/SjsxpDriver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/SjsxpDriver.eea
index 3c9a24750e..30da2f3e6b 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/SjsxpDriver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/SjsxpDriver.eea
@@ -11,7 +11,7 @@ class com/thoughtworks/xstream/io/xml/SjsxpDriver
  (Lcom/thoughtworks/xstream/io/xml/XmlFriendlyNameCoder;)V
 createInputFactory
  ()Ljavax/xml/stream/XMLInputFactory;
- ()Ljavax/xml/stream/XMLInputFactory;
+ ()L1javax/xml/stream/XMLInputFactory; # @Inherited(com.thoughtworks.xstream.io.xml.StaxDriver)
 createOutputFactory
  ()Ljavax/xml/stream/XMLOutputFactory;
- ()Ljavax/xml/stream/XMLOutputFactory;
+ ()L1javax/xml/stream/XMLOutputFactory; # @Inherited(com.thoughtworks.xstream.io.xml.StaxDriver)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/StandardStaxDriver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/StandardStaxDriver.eea
index f8f4346509..95406a7594 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/StandardStaxDriver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/StandardStaxDriver.eea
@@ -17,7 +17,7 @@ class com/thoughtworks/xstream/io/xml/StandardStaxDriver
  (Lcom/thoughtworks/xstream/io/xml/XmlFriendlyNameCoder;)V
 createInputFactory
  ()Ljavax/xml/stream/XMLInputFactory;
- ()Ljavax/xml/stream/XMLInputFactory;
+ ()L1javax/xml/stream/XMLInputFactory; # @Inherited(com.thoughtworks.xstream.io.xml.StaxDriver)
 createOutputFactory
  ()Ljavax/xml/stream/XMLOutputFactory;
- ()Ljavax/xml/stream/XMLOutputFactory;
+ ()L1javax/xml/stream/XMLOutputFactory; # @Inherited(com.thoughtworks.xstream.io.xml.StaxDriver)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/StaxDriver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/StaxDriver.eea
index 3c0443a9cd..e9e65c8dcc 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/StaxDriver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/StaxDriver.eea
@@ -17,46 +17,46 @@ class com/thoughtworks/xstream/io/xml/StaxDriver
  (Lcom/thoughtworks/xstream/io/xml/XmlFriendlyReplacer;)V
 createInputFactory
  ()Ljavax/xml/stream/XMLInputFactory;
- ()Ljavax/xml/stream/XMLInputFactory;
+ ()L1javax/xml/stream/XMLInputFactory;
 createOutputFactory
  ()Ljavax/xml/stream/XMLOutputFactory;
- ()Ljavax/xml/stream/XMLOutputFactory;
+ ()L1javax/xml/stream/XMLOutputFactory;
 createParser
  (Ljava/io/InputStream;)Ljavax/xml/stream/XMLStreamReader;
- (Ljava/io/InputStream;)Ljavax/xml/stream/XMLStreamReader;
+ (Ljava/io/InputStream;)L1javax/xml/stream/XMLStreamReader;
 createParser
  (Ljava/io/Reader;)Ljavax/xml/stream/XMLStreamReader;
- (Ljava/io/Reader;)Ljavax/xml/stream/XMLStreamReader;
+ (Ljava/io/Reader;)L1javax/xml/stream/XMLStreamReader;
 createParser
  (Ljavax/xml/transform/Source;)Ljavax/xml/stream/XMLStreamReader;
- (Ljavax/xml/transform/Source;)Ljavax/xml/stream/XMLStreamReader;
+ (Ljavax/xml/transform/Source;)L1javax/xml/stream/XMLStreamReader;
 createReader
  (Ljava/io/File;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/File;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/File;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.AbstractDriver)
 createReader
  (Ljava/io/InputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/InputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/InputStream;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createReader
  (Ljava/io/Reader;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/Reader;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/Reader;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createReader
  (Ljava/net/URL;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/net/URL;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/net/URL;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.AbstractDriver)
 createStaxReader
  (Ljavax/xml/stream/XMLStreamReader;)Lcom/thoughtworks/xstream/io/xml/AbstractPullReader;
- (Ljavax/xml/stream/XMLStreamReader;)Lcom/thoughtworks/xstream/io/xml/AbstractPullReader;
+ (Ljavax/xml/stream/XMLStreamReader;)L1com/thoughtworks/xstream/io/xml/AbstractPullReader;
 createStaxWriter
  (Ljavax/xml/stream/XMLStreamWriter;)Lcom/thoughtworks/xstream/io/xml/StaxWriter;
- (Ljavax/xml/stream/XMLStreamWriter;)Lcom/thoughtworks/xstream/io/xml/StaxWriter;
+ (Ljavax/xml/stream/XMLStreamWriter;)L1com/thoughtworks/xstream/io/xml/StaxWriter;
 createStaxWriter
  (Ljavax/xml/stream/XMLStreamWriter;Z)Lcom/thoughtworks/xstream/io/xml/StaxWriter;
- (Ljavax/xml/stream/XMLStreamWriter;Z)Lcom/thoughtworks/xstream/io/xml/StaxWriter;
+ (Ljavax/xml/stream/XMLStreamWriter;Z)L1com/thoughtworks/xstream/io/xml/StaxWriter;
 createWriter
  (Ljava/io/OutputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
- (Ljava/io/OutputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
+ (Ljava/io/OutputStream;)L1com/thoughtworks/xstream/io/HierarchicalStreamWriter; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createWriter
  (Ljava/io/Writer;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
- (Ljava/io/Writer;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
+ (Ljava/io/Writer;)L1com/thoughtworks/xstream/io/HierarchicalStreamWriter; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 getInputFactory
  ()Ljavax/xml/stream/XMLInputFactory;
  ()Ljavax/xml/stream/XMLInputFactory;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/WstxDriver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/WstxDriver.eea
index 9f2898cb30..969ca4e377 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/WstxDriver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/WstxDriver.eea
@@ -17,7 +17,7 @@ class com/thoughtworks/xstream/io/xml/WstxDriver
  (Lcom/thoughtworks/xstream/io/xml/XmlFriendlyNameCoder;)V
 createInputFactory
  ()Ljavax/xml/stream/XMLInputFactory;
- ()Ljavax/xml/stream/XMLInputFactory;
+ ()L1javax/xml/stream/XMLInputFactory; # @Inherited(com.thoughtworks.xstream.io.xml.StaxDriver)
 createOutputFactory
  ()Ljavax/xml/stream/XMLOutputFactory;
- ()Ljavax/xml/stream/XMLOutputFactory;
+ ()L1javax/xml/stream/XMLOutputFactory; # @Inherited(com.thoughtworks.xstream.io.xml.StaxDriver)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XmlFriendlyNameCoder.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XmlFriendlyNameCoder.eea
index e7307a40e5..319857c7f6 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XmlFriendlyNameCoder.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XmlFriendlyNameCoder.eea
@@ -11,7 +11,7 @@ clone
  ()L1java/lang/Object; # @Inherited(java.lang.Object)
 createCacheMap
  ()Ljava/util/Map;
- ()Ljava/util/Map;
+ ()L1java/util/Map;
 decodeAttribute
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XomDriver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XomDriver.eea
index 67bf22e1f1..b4d1c7220c 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XomDriver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XomDriver.eea
@@ -17,25 +17,25 @@ class com/thoughtworks/xstream/io/xml/XomDriver
  (Lnu/xom/Builder;Lcom/thoughtworks/xstream/io/xml/XmlFriendlyReplacer;)V
 createBuilder
  ()Lnu/xom/Builder;
- ()Lnu/xom/Builder;
+ ()L1nu/xom/Builder;
 createReader
  (Ljava/io/File;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/File;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/File;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.AbstractDriver)
 createReader
  (Ljava/io/InputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/InputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/InputStream;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createReader
  (Ljava/io/Reader;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/io/Reader;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/io/Reader;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createReader
  (Ljava/net/URL;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
- (Ljava/net/URL;)Lcom/thoughtworks/xstream/io/HierarchicalStreamReader;
+ (Ljava/net/URL;)L1com/thoughtworks/xstream/io/HierarchicalStreamReader; # @Inherited(com.thoughtworks.xstream.io.AbstractDriver)
 createWriter
  (Ljava/io/OutputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
- (Ljava/io/OutputStream;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
+ (Ljava/io/OutputStream;)L1com/thoughtworks/xstream/io/HierarchicalStreamWriter; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 createWriter
  (Ljava/io/Writer;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
- (Ljava/io/Writer;)Lcom/thoughtworks/xstream/io/HierarchicalStreamWriter;
+ (Ljava/io/Writer;)L1com/thoughtworks/xstream/io/HierarchicalStreamWriter; # @Inherited(com.thoughtworks.xstream.io.HierarchicalStreamDriver)
 getBuilder
  ()Lnu/xom/Builder;
  ()Lnu/xom/Builder;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XomReader.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XomReader.eea
index 033d03389f..abcd0ae8ee 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XomReader.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XomReader.eea
@@ -38,10 +38,10 @@ getParent
  ()Ljava/lang/Object;
 getValue
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L1java/lang/String;
 peekNextChild
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Overrides(com.thoughtworks.xstream.io.AbstractReader)
 reassignCurrentElement
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XomWriter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XomWriter.eea
index 417fbd1656..8c0909d5c4 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XomWriter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XomWriter.eea
@@ -14,7 +14,7 @@ addAttribute
  (Ljava/lang/String;Ljava/lang/String;)V
 createNode
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object; # @Inherited(com.thoughtworks.xstream.io.xml.AbstractDocumentWriter)
 setValue
  (Ljava/lang/String;)V
  (Ljava/lang/String;)V
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/Xpp3DomDriver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/Xpp3DomDriver.eea
index 4a37634d2d..45b70188b5 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/Xpp3DomDriver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/Xpp3DomDriver.eea
@@ -5,4 +5,4 @@ class com/thoughtworks/xstream/io/xml/Xpp3DomDriver
  (Lcom/thoughtworks/xstream/io/naming/NameCoder;)V
 createParser
  ()Lorg/xmlpull/v1/XmlPullParser;
- ()Lorg/xmlpull/v1/XmlPullParser;
+ ()L1org/xmlpull/v1/XmlPullParser; # @Inherited(com.thoughtworks.xstream.io.xml.AbstractXppDomDriver)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/Xpp3Driver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/Xpp3Driver.eea
index 4509fd9842..12ac5a8219 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/Xpp3Driver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/Xpp3Driver.eea
@@ -5,4 +5,4 @@ class com/thoughtworks/xstream/io/xml/Xpp3Driver
  (Lcom/thoughtworks/xstream/io/naming/NameCoder;)V
 createParser
  ()Lorg/xmlpull/v1/XmlPullParser;
- ()Lorg/xmlpull/v1/XmlPullParser;
+ ()L1org/xmlpull/v1/XmlPullParser; # @Inherited(com.thoughtworks.xstream.io.xml.AbstractXppDriver)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XppDomDriver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XppDomDriver.eea
index f53e9ca002..7a9cf4982a 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XppDomDriver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XppDomDriver.eea
@@ -8,4 +8,4 @@ class com/thoughtworks/xstream/io/xml/XppDomDriver
  (Lcom/thoughtworks/xstream/io/xml/XmlFriendlyReplacer;)V
 createParser
  ()Lorg/xmlpull/v1/XmlPullParser;
- ()Lorg/xmlpull/v1/XmlPullParser;
+ ()L1org/xmlpull/v1/XmlPullParser; # @Inherited(com.thoughtworks.xstream.io.xml.AbstractXppDomDriver)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XppDomReader.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XppDomReader.eea
index b6f2b5a8fa..6cb680cb28 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XppDomReader.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XppDomReader.eea
@@ -32,7 +32,7 @@ getValue
  ()Ljava/lang/String;
 peekNextChild
  ()Ljava/lang/String;
- ()Ljava/lang/String;
+ ()L0java/lang/String; # @Overrides(com.thoughtworks.xstream.io.AbstractReader)
 reassignCurrentElement
  (Ljava/lang/Object;)V
  (Ljava/lang/Object;)V
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XppDomWriter.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XppDomWriter.eea
index f1eec6416d..436251ab11 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XppDomWriter.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XppDomWriter.eea
@@ -20,7 +20,7 @@ addAttribute
  (Ljava/lang/String;Ljava/lang/String;)V
 createNode
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L1java/lang/Object; # @Inherited(com.thoughtworks.xstream.io.xml.AbstractDocumentWriter)
 getConfiguration
  ()Lcom/thoughtworks/xstream/io/xml/xppdom/XppDom;
  ()Lcom/thoughtworks/xstream/io/xml/xppdom/XppDom;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XppDriver.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XppDriver.eea
index a0900beee0..eaf7eb08f9 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XppDriver.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XppDriver.eea
@@ -2,7 +2,7 @@ class com/thoughtworks/xstream/io/xml/XppDriver
 
 createDefaultParser
  ()Lorg/xmlpull/v1/XmlPullParser;
- ()Lorg/xmlpull/v1/XmlPullParser;
+ ()L1org/xmlpull/v1/XmlPullParser;
 
 <init>
  (Lcom/thoughtworks/xstream/io/naming/NameCoder;)V
@@ -12,4 +12,4 @@ createDefaultParser
  (Lcom/thoughtworks/xstream/io/xml/XmlFriendlyReplacer;)V
 createParser
  ()Lorg/xmlpull/v1/XmlPullParser;
- ()Lorg/xmlpull/v1/XmlPullParser;
+ ()L1org/xmlpull/v1/XmlPullParser; # @Inherited(com.thoughtworks.xstream.io.xml.AbstractXppDriver)
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XppReader.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XppReader.eea
index 836a9cd807..aba681a173 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XppReader.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/XppReader.eea
@@ -17,7 +17,7 @@ appendErrors
  (Lcom/thoughtworks/xstream/converters/ErrorWriter;)V
 createParser
  ()Lorg/xmlpull/v1/XmlPullParser;
- ()Lorg/xmlpull/v1/XmlPullParser;
+ ()L1org/xmlpull/v1/XmlPullParser;
 getAttribute
  (I)Ljava/lang/String;
  (I)Ljava/lang/String;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/xppdom/XppDom.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/xppdom/XppDom.eea
index 91ef110cb1..93301f2536 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/xppdom/XppDom.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/xppdom/XppDom.eea
@@ -12,7 +12,7 @@ addChild
  (Lcom/thoughtworks/xstream/io/xml/xppdom/XppDom;)V
 getAttribute
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L0java/lang/String;
 getAttributeNames
  ()[Ljava/lang/String;
  ()[Ljava/lang/String;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/xppdom/XppFactory.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/xppdom/XppFactory.eea
index 8323874648..d8b5feae89 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/xppdom/XppFactory.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/io/xml/xppdom/XppFactory.eea
@@ -11,4 +11,4 @@ buildDom
  (Ljava/lang/String;)Lcom/thoughtworks/xstream/io/xml/xppdom/XppDom;
 createDefaultParser
  ()Lorg/xmlpull/v1/XmlPullParser;
- ()Lorg/xmlpull/v1/XmlPullParser;
+ ()L1org/xmlpull/v1/XmlPullParser;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/mapper/AbstractXmlFriendlyMapper.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/mapper/AbstractXmlFriendlyMapper.eea
index e08846fe9c..5255fb0c50 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/mapper/AbstractXmlFriendlyMapper.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/mapper/AbstractXmlFriendlyMapper.eea
@@ -5,13 +5,13 @@ class com/thoughtworks/xstream/mapper/AbstractXmlFriendlyMapper
  (Lcom/thoughtworks/xstream/mapper/Mapper;)V
 escapeClassName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 escapeFieldName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 unescapeClassName
  (Ljava/lang/String;)Ljava/lang/String;
  (Ljava/lang/String;)Ljava/lang/String;
 unescapeFieldName
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/mapper/AttributeMapper.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/mapper/AttributeMapper.eea
index 953ff1f367..e58a1dfaf1 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/mapper/AttributeMapper.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/mapper/AttributeMapper.eea
@@ -20,7 +20,7 @@ addAttributeFor
  (Ljava/lang/reflect/Field;)V
 getConverterFromAttribute
  (Ljava/lang/Class;Ljava/lang/String;)Lcom/thoughtworks/xstream/converters/SingleValueConverter;
- (Ljava/lang/Class;Ljava/lang/String;)Lcom/thoughtworks/xstream/converters/SingleValueConverter;
+ (Ljava/lang/Class;Ljava/lang/String;)L0com/thoughtworks/xstream/converters/SingleValueConverter;
 getConverterFromAttribute
  (Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Class;)Lcom/thoughtworks/xstream/converters/SingleValueConverter;
  (Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Class;)Lcom/thoughtworks/xstream/converters/SingleValueConverter;
@@ -29,10 +29,10 @@ getConverterFromAttribute
  (Ljava/lang/String;)Lcom/thoughtworks/xstream/converters/SingleValueConverter;
 getConverterFromItemType
  (Ljava/lang/Class;)Lcom/thoughtworks/xstream/converters/SingleValueConverter;
- (Ljava/lang/Class;)Lcom/thoughtworks/xstream/converters/SingleValueConverter;
+ (Ljava/lang/Class;)L0com/thoughtworks/xstream/converters/SingleValueConverter;
 getConverterFromItemType
  (Ljava/lang/String;Ljava/lang/Class;)Lcom/thoughtworks/xstream/converters/SingleValueConverter;
- (Ljava/lang/String;Ljava/lang/Class;)Lcom/thoughtworks/xstream/converters/SingleValueConverter;
+ (Ljava/lang/String;Ljava/lang/Class;)L0com/thoughtworks/xstream/converters/SingleValueConverter;
 getConverterFromItemType
  (Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Class;)Lcom/thoughtworks/xstream/converters/SingleValueConverter;
  (Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Class;)Lcom/thoughtworks/xstream/converters/SingleValueConverter;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/mapper/DefaultMapper.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/mapper/DefaultMapper.eea
index 076ad33911..8361420cd1 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/mapper/DefaultMapper.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/mapper/DefaultMapper.eea
@@ -26,34 +26,34 @@ defaultImplementationOf
  (Ljava/lang/Class;)Ljava/lang/Class;
 getConverterFromAttribute
  (Ljava/lang/Class;Ljava/lang/String;)Lcom/thoughtworks/xstream/converters/SingleValueConverter;
- (Ljava/lang/Class;Ljava/lang/String;)Lcom/thoughtworks/xstream/converters/SingleValueConverter;
+ (Ljava/lang/Class;Ljava/lang/String;)L0com/thoughtworks/xstream/converters/SingleValueConverter;
 getConverterFromAttribute
  (Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Class;)Lcom/thoughtworks/xstream/converters/SingleValueConverter;
- (Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Class;)Lcom/thoughtworks/xstream/converters/SingleValueConverter;
+ (Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Class;)L0com/thoughtworks/xstream/converters/SingleValueConverter;
 getConverterFromAttribute
  (Ljava/lang/String;)Lcom/thoughtworks/xstream/converters/SingleValueConverter;
- (Ljava/lang/String;)Lcom/thoughtworks/xstream/converters/SingleValueConverter;
+ (Ljava/lang/String;)L0com/thoughtworks/xstream/converters/SingleValueConverter;
 getConverterFromItemType
  (Ljava/lang/Class;)Lcom/thoughtworks/xstream/converters/SingleValueConverter;
- (Ljava/lang/Class;)Lcom/thoughtworks/xstream/converters/SingleValueConverter;
+ (Ljava/lang/Class;)L0com/thoughtworks/xstream/converters/SingleValueConverter;
 getConverterFromItemType
  (Ljava/lang/String;Ljava/lang/Class;)Lcom/thoughtworks/xstream/converters/SingleValueConverter;
- (Ljava/lang/String;Ljava/lang/Class;)Lcom/thoughtworks/xstream/converters/SingleValueConverter;
+ (Ljava/lang/String;Ljava/lang/Class;)L0com/thoughtworks/xstream/converters/SingleValueConverter;
 getConverterFromItemType
  (Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Class;)Lcom/thoughtworks/xstream/converters/SingleValueConverter;
- (Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Class;)Lcom/thoughtworks/xstream/converters/SingleValueConverter;
+ (Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Class;)L0com/thoughtworks/xstream/converters/SingleValueConverter;
 getFieldNameForItemTypeAndName
  (Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)L0java/lang/String;
 getImplicitCollectionDefForFieldName
  (Ljava/lang/Class;Ljava/lang/String;)Lcom/thoughtworks/xstream/mapper/Mapper$ImplicitCollectionMapping;
- (Ljava/lang/Class;Ljava/lang/String;)Lcom/thoughtworks/xstream/mapper/Mapper$ImplicitCollectionMapping;
+ (Ljava/lang/Class;Ljava/lang/String;)L0com/thoughtworks/xstream/mapper/Mapper$ImplicitCollectionMapping;
 getItemTypeForItemFieldName
  (Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Class;
- (Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Class;
+ (Ljava/lang/Class;Ljava/lang/String;)L0java/lang/Class;
 getLocalConverter
  (Ljava/lang/Class;Ljava/lang/String;)Lcom/thoughtworks/xstream/converters/Converter;
- (Ljava/lang/Class;Ljava/lang/String;)Lcom/thoughtworks/xstream/converters/Converter;
+ (Ljava/lang/Class;Ljava/lang/String;)L0com/thoughtworks/xstream/converters/Converter;
 isIgnoredElement
  (Ljava/lang/String;)Z
  (Ljava/lang/String;)Z
@@ -65,7 +65,7 @@ isReferenceable
  (Ljava/lang/Class;)Z
 lookupMapperOfType
  (Ljava/lang/Class;)Lcom/thoughtworks/xstream/mapper/Mapper;
- (Ljava/lang/Class;)Lcom/thoughtworks/xstream/mapper/Mapper;
+ (Ljava/lang/Class;)L0com/thoughtworks/xstream/mapper/Mapper;
 lookupName
  (Ljava/lang/Class;)Ljava/lang/String;
  (Ljava/lang/Class;)Ljava/lang/String;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/mapper/ImplicitCollectionMapper.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/mapper/ImplicitCollectionMapper.eea
index 265696e233..94777095d7 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/mapper/ImplicitCollectionMapper.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/mapper/ImplicitCollectionMapper.eea
@@ -14,10 +14,10 @@ add
  (Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/String;)V
 getFieldNameForItemTypeAndName
  (Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)L0java/lang/String;
 getImplicitCollectionDefForFieldName
  (Ljava/lang/Class;Ljava/lang/String;)Lcom/thoughtworks/xstream/mapper/Mapper$ImplicitCollectionMapping;
- (Ljava/lang/Class;Ljava/lang/String;)Lcom/thoughtworks/xstream/mapper/Mapper$ImplicitCollectionMapping;
+ (Ljava/lang/Class;Ljava/lang/String;)L0com/thoughtworks/xstream/mapper/Mapper$ImplicitCollectionMapping;
 getItemTypeForItemFieldName
  (Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Class;
- (Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Class;
+ (Ljava/lang/Class;Ljava/lang/String;)L0java/lang/Class;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/persistence/AbstractFilePersistenceStrategy$XmlMapEntriesIterator.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/persistence/AbstractFilePersistenceStrategy$XmlMapEntriesIterator.eea
index 2cf1e65a95..1dcb946a84 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/persistence/AbstractFilePersistenceStrategy$XmlMapEntriesIterator.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/persistence/AbstractFilePersistenceStrategy$XmlMapEntriesIterator.eea
@@ -5,4 +5,4 @@ class com/thoughtworks/xstream/persistence/AbstractFilePersistenceStrategy$XmlMa
  (Lcom/thoughtworks/xstream/persistence/AbstractFilePersistenceStrategy;)V
 next
  ()Ljava/lang/Object;
- ()Ljava/lang/Object;
+ ()L1java/lang/Object;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/persistence/AbstractFilePersistenceStrategy.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/persistence/AbstractFilePersistenceStrategy.eea
index 8717214209..f93d2158f5 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/persistence/AbstractFilePersistenceStrategy.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/persistence/AbstractFilePersistenceStrategy.eea
@@ -26,7 +26,7 @@ isValid
  (Ljava/io/File;Ljava/lang/String;)Z
 iterator
  ()Ljava/util/Iterator;
- ()Ljava/util/Iterator;
+ ()L1java/util/Iterator;
 put
  (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/persistence/FilePersistenceStrategy.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/persistence/FilePersistenceStrategy.eea
index 4ea3f80781..4de5a85885 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/persistence/FilePersistenceStrategy.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/persistence/FilePersistenceStrategy.eea
@@ -11,16 +11,16 @@ class com/thoughtworks/xstream/persistence/FilePersistenceStrategy
  (Ljava/io/File;Lcom/thoughtworks/xstream/XStream;Ljava/lang/String;Ljava/lang/String;)V
 escape
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 extractKey
  (Ljava/lang/String;)Ljava/lang/Object;
- (Ljava/lang/String;)Ljava/lang/Object;
+ (Ljava/lang/String;)L0java/lang/Object;
 getName
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
 isValid
  (Ljava/io/File;Ljava/lang/String;)Z
  (Ljava/io/File;Ljava/lang/String;)Z
 unescape
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/persistence/FileStreamStrategy.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/persistence/FileStreamStrategy.eea
index 3a172aca20..a900d3236d 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/persistence/FileStreamStrategy.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/persistence/FileStreamStrategy.eea
@@ -8,13 +8,13 @@ class com/thoughtworks/xstream/persistence/FileStreamStrategy
  (Ljava/io/File;Lcom/thoughtworks/xstream/XStream;)V
 escape
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
 extractKey
  (Ljava/lang/String;)Ljava/lang/Object;
  (Ljava/lang/String;)Ljava/lang/Object;
 getName
  (Ljava/lang/Object;)Ljava/lang/String;
- (Ljava/lang/Object;)Ljava/lang/String;
+ (Ljava/lang/Object;)L1java/lang/String;
 unescape
  (Ljava/lang/String;)Ljava/lang/String;
- (Ljava/lang/String;)Ljava/lang/String;
+ (Ljava/lang/String;)L1java/lang/String;
diff --git a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/persistence/XmlMap.eea b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/persistence/XmlMap.eea
index 66cdc49ff1..b28a4cbaf4 100644
--- a/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/persistence/XmlMap.eea
+++ b/libs/eea-xstream-1/src/main/resources/com/thoughtworks/xstream/persistence/XmlMap.eea
@@ -5,7 +5,7 @@ class com/thoughtworks/xstream/persistence/XmlMap
  (Lcom/thoughtworks/xstream/persistence/PersistenceStrategy;)V
 entrySet
  ()Ljava/util/Set;
- ()Ljava/util/Set;
+ ()L1java/util/Set;
 get
  (Ljava/lang/Object;)Ljava/lang/Object;
  (Ljava/lang/Object;)Ljava/lang/Object;